From 74d38db3b5e6a029d035f980a6b7cd7d2de51519 Mon Sep 17 00:00:00 2001
From: Adrian Parvin Ouano <me@adrianpar.vin>
Date: Sun, 8 Oct 2023 01:23:00 +0800
Subject: [PATCH 001/931] alumacc: merge eq independent of sign

---
 passes/techmap/alumacc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/techmap/alumacc.cc b/passes/techmap/alumacc.cc
index e4e70004c..bd183d815 100644
--- a/passes/techmap/alumacc.cc
+++ b/passes/techmap/alumacc.cc
@@ -451,7 +451,7 @@ struct AlumaccWorker
 			alunode_t *n = nullptr;
 
 			for (auto node : sig_alu[RTLIL::SigSig(A, B)])
-				if (node->is_signed == is_signed && node->invert_b && node->c == State::S1) {
+				if (node->invert_b && node->c == State::S1) {
 					n = node;
 					break;
 				}

From 535ecf84acff0207088ff1fcf3c0491adc5e3d4f Mon Sep 17 00:00:00 2001
From: Adrian Parvin Ouano <me@adrianpar.vin>
Date: Sun, 8 Oct 2023 00:09:27 +0800
Subject: [PATCH 002/931] alumacc: merge independent of sign

---
 passes/techmap/alumacc.cc | 60 +++++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/passes/techmap/alumacc.cc b/passes/techmap/alumacc.cc
index bd183d815..dbb117ff4 100644
--- a/passes/techmap/alumacc.cc
+++ b/passes/techmap/alumacc.cc
@@ -40,34 +40,51 @@ struct AlumaccWorker
 	{
 		std::vector<RTLIL::Cell*> cells;
 		RTLIL::SigSpec a, b, c, y;
-		std::vector<tuple<bool, bool, bool, bool, RTLIL::SigSpec>> cmp;
+		std::vector<tuple<bool, bool, bool, bool, bool, RTLIL::SigSpec>> cmp;
 		bool is_signed, invert_b;
 
 		RTLIL::Cell *alu_cell;
-		RTLIL::SigSpec cached_lt, cached_gt, cached_eq, cached_ne;
+		RTLIL::SigSpec cached_lt, cached_slt, cached_gt, cached_sgt, cached_eq, cached_ne;
 		RTLIL::SigSpec cached_cf, cached_of, cached_sf;
 
-		RTLIL::SigSpec get_lt() {
-			if (GetSize(cached_lt) == 0) {
-				if (is_signed) {
+		RTLIL::SigSpec get_lt(bool is_signed) {
+			if (is_signed) {
+				if (GetSize(cached_slt) == 0) {
 					get_of();
 					get_sf();
-					cached_lt = alu_cell->module->Xor(NEW_ID, cached_of, cached_sf);
+					cached_slt = alu_cell->module->Xor(NEW_ID, cached_of, cached_sf);
 				}
-				else
+
+				return cached_slt;
+			} else {
+				if (GetSize(cached_lt) == 0) {
 					cached_lt = get_cf();
+				}
+
+				return cached_lt;
 			}
-			return cached_lt;
 		}
 
-		RTLIL::SigSpec get_gt() {
-			if (GetSize(cached_gt) == 0) {
-				get_lt();
-				get_eq();
-				SigSpec Or = alu_cell->module->Or(NEW_ID, cached_lt, cached_eq);
-				cached_gt = alu_cell->module->Not(NEW_ID, Or, false, alu_cell->get_src_attribute());
+		RTLIL::SigSpec get_gt(bool is_signed) {
+			if (is_signed) {
+				if (GetSize(cached_sgt) == 0) {
+					get_lt(is_signed);
+					get_eq();
+					SigSpec Or = alu_cell->module->Or(NEW_ID, cached_slt, cached_eq);
+					cached_sgt = alu_cell->module->Not(NEW_ID, Or, false, alu_cell->get_src_attribute());
+				}
+
+				return cached_sgt;
+			} else {
+				if (GetSize(cached_gt) == 0) {
+					get_lt(is_signed);
+					get_eq();
+					SigSpec Or = alu_cell->module->Or(NEW_ID, cached_lt, cached_eq);
+					cached_gt = alu_cell->module->Not(NEW_ID, Or, false, alu_cell->get_src_attribute());
+				}
+
+				return cached_gt;
 			}
-			return cached_gt;
 		}
 
 		RTLIL::SigSpec get_eq() {
@@ -413,7 +430,7 @@ struct AlumaccWorker
 			alunode_t *n = nullptr;
 
 			for (auto node : sig_alu[RTLIL::SigSig(A, B)])
-				if (node->is_signed == is_signed && node->invert_b && node->c == State::S1) {
+				if (node->invert_b && node->c == State::S1) {
 					n = node;
 					break;
 				}
@@ -433,7 +450,7 @@ struct AlumaccWorker
 			}
 
 			n->cells.push_back(cell);
-			n->cmp.push_back(std::make_tuple(cmp_less, !cmp_less, cmp_equal, false, Y));
+			n->cmp.push_back(std::make_tuple(cmp_less, !cmp_less, cmp_equal, false, is_signed, Y));
 		}
 
 		for (auto cell : eq_cells)
@@ -459,7 +476,7 @@ struct AlumaccWorker
 			if (n != nullptr) {
 				log("  creating $alu model for %s (%s): merged with %s.\n", log_id(cell), log_id(cell->type), log_id(n->cells.front()));
 				n->cells.push_back(cell);
-				n->cmp.push_back(std::make_tuple(false, false, cmp_equal, !cmp_equal, Y));
+				n->cmp.push_back(std::make_tuple(false, false, cmp_equal, !cmp_equal, false, Y));
 			}
 		}
 	}
@@ -508,11 +525,12 @@ struct AlumaccWorker
 				bool cmp_gt = std::get<1>(it);
 				bool cmp_eq = std::get<2>(it);
 				bool cmp_ne = std::get<3>(it);
-				RTLIL::SigSpec cmp_y = std::get<4>(it);
+				bool is_signed = std::get<4>(it);
+				RTLIL::SigSpec cmp_y = std::get<5>(it);
 
 				RTLIL::SigSpec sig;
-				if (cmp_lt) sig.append(n->get_lt());
-				if (cmp_gt) sig.append(n->get_gt());
+				if (cmp_lt) sig.append(n->get_lt(is_signed));
+				if (cmp_gt) sig.append(n->get_gt(is_signed));
 				if (cmp_eq) sig.append(n->get_eq());
 				if (cmp_ne) sig.append(n->get_ne());
 

From 062dbf2c9674ab046337279f5042445c4085ceb8 Mon Sep 17 00:00:00 2001
From: Adrian Parvin Ouano <me@adrianpar.vin>
Date: Mon, 9 Oct 2023 00:36:22 +0800
Subject: [PATCH 003/931] alumacc: add signed-independent comparison tests

---
 tests/opt/alumacc.ys | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tests/opt/alumacc.ys

diff --git a/tests/opt/alumacc.ys b/tests/opt/alumacc.ys
new file mode 100644
index 000000000..043bdaaee
--- /dev/null
+++ b/tests/opt/alumacc.ys
@@ -0,0 +1,33 @@
+read_verilog <<EOT
+module top(...);
+
+input [7:0] ra;
+input [7:0] rb;
+output gt;
+output sgt;
+output lt;
+output slt;
+
+output ge;
+output eq;
+output seq;
+output ne;
+
+assign gt = ra > rb;
+assign sgt = $signed(ra) > $signed(rb);
+assign lt = ra < rb;
+assign slt = $signed(ra) < $signed(rb);
+
+assign ge = ra >= rb;
+assign eq = ra == rb;
+assign seq = $signed(ra) == $signed(rb);
+assign ne = ra != rb;
+
+endmodule
+EOT
+
+proc
+
+equiv_opt -assert alumacc
+alumacc
+select -assert-count 1 t:$alu

From 6f7f71fe038cc95df77b5efbe978ce1af5e2997e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Tue, 9 Jan 2024 19:31:11 +0100
Subject: [PATCH 004/931] read_blif: Represent sequential elements with gate
 cells

When reading the BLIF input, represent the native sequential elements
with fine-grained cells like `$_FF_` instead of the coarse-grained cells
like `$ff` which we were using up to now.

There are two reasons for this:

 * The sequential elements in BLIF are always single-bit, so the gate
   cells are a better fit.

 * This makes it symmetrical to the BLIF backend which only understands
   the fine-grained cells, and only translates those to the native BLIF
   features.
---
 frontends/blif/blifparse.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontends/blif/blifparse.cc b/frontends/blif/blifparse.cc
index ebbe082a2..72f942425 100644
--- a/frontends/blif/blifparse.cc
+++ b/frontends/blif/blifparse.cc
@@ -352,17 +352,17 @@ void parse_blif(RTLIL::Design *design, std::istream &f, IdString dff_name, bool
 					goto no_latch_clock;
 
 				if (!strcmp(edge, "re"))
-					cell = module->addDff(NEW_ID, blif_wire(clock), blif_wire(d), blif_wire(q));
+					cell = module->addDffGate(NEW_ID, blif_wire(clock), blif_wire(d), blif_wire(q));
 				else if (!strcmp(edge, "fe"))
-					cell = module->addDff(NEW_ID, blif_wire(clock), blif_wire(d), blif_wire(q), false);
+					cell = module->addDffGate(NEW_ID, blif_wire(clock), blif_wire(d), blif_wire(q), false);
 				else if (!strcmp(edge, "ah"))
-					cell = module->addDlatch(NEW_ID, blif_wire(clock), blif_wire(d), blif_wire(q));
+					cell = module->addDlatchGate(NEW_ID, blif_wire(clock), blif_wire(d), blif_wire(q));
 				else if (!strcmp(edge, "al"))
-					cell = module->addDlatch(NEW_ID, blif_wire(clock), blif_wire(d), blif_wire(q), false);
+					cell = module->addDlatchGate(NEW_ID, blif_wire(clock), blif_wire(d), blif_wire(q), false);
 				else {
 			no_latch_clock:
 					if (dff_name.empty()) {
-						cell = module->addFf(NEW_ID, blif_wire(d), blif_wire(q));
+						cell = module->addFfGate(NEW_ID, blif_wire(d), blif_wire(q));
 					} else {
 						cell = module->addCell(NEW_ID, dff_name);
 						cell->setPort(ID::D, blif_wire(d));

From 672c89498a1e21065b2d3624cb705134656783e5 Mon Sep 17 00:00:00 2001
From: Zapta <zapta@users.noreply.github.com>
Date: Sat, 2 Mar 2024 11:20:53 -0800
Subject: [PATCH 005/931] Added to the Show command a -wireshape
 <graphviz-shape> flag. This allows to control the shape of wire nodes, for
 example, -wireshape plaintext. The motivation is to allow the user to reduce
 visual loads of wires. This does not change the default behavior of using a
 diamond shape.

---
 passes/cmds/show.cc | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index 82b5c6bcf..9383aafcd 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -60,6 +60,7 @@ struct ShowWorker
 	RTLIL::Module *module;
 	uint32_t currentColor;
 	bool genWidthLabels;
+	std::string wireshape;
 	bool genSignedLabels;
 	bool stretchIO;
 	bool enumerateIds;
@@ -429,16 +430,19 @@ struct ShowWorker
 
 		std::map<std::string, std::string> wires_on_demand;
 		for (auto wire : module->selected_wires()) {
-			const char *shape = "diamond";
+		    std::string shape = wireshape;
 			if (wire->port_input || wire->port_output)
 				shape = "octagon";
+			const bool is_borderless = (shape == "plaintext") || (shape == "plain") || (shape == "none");
 			if (wire->name.isPublic()) {
 				std::string src_href;
 				if (href && wire->attributes.count(ID::src) > 0)
 					src_href = stringf(", href=\"%s\" ", escape(wire->attributes.at(ID::src).decode_string()));
-				fprintf(f, "n%d [ shape=%s, label=\"%s\", %s%s];\n",
-						id2num(wire->name), shape, findLabel(wire->name.str()),
-						nextColor(RTLIL::SigSpec(wire), "color=\"black\", fontcolor=\"black\"").c_str(),
+				fprintf(f, "n%d [ shape=%s,%s label=\"%s\", %s%s];\n",
+						id2num(wire->name), shape.c_str(), is_borderless? " margin=0, width=0" : "",  findLabel(wire->name.str()),
+						is_borderless
+						    ? "color=\"none\", fontcolor=\"black\""
+							: nextColor(RTLIL::SigSpec(wire), "color=\"black\", fontcolor=\"black\"").c_str(), 
 						src_href.c_str());
 				if (wire->port_input)
 					all_sources.insert(stringf("n%d", id2num(wire->name)));
@@ -617,10 +621,10 @@ struct ShowWorker
 	}
 
 	ShowWorker(FILE *f, RTLIL::Design *design, std::vector<RTLIL::Design*> &libs, uint32_t colorSeed, bool genWidthLabels,
-			bool genSignedLabels, bool stretchIO, bool enumerateIds, bool abbreviateIds, bool notitle, bool href,
+			const std::string wireshape, bool genSignedLabels, bool stretchIO, bool enumerateIds, bool abbreviateIds, bool notitle, bool href,
 			const std::vector<std::pair<std::string, RTLIL::Selection>> &color_selections,
 			const std::vector<std::pair<std::string, RTLIL::Selection>> &label_selections, RTLIL::IdString colorattr) :
-			f(f), design(design), currentColor(colorSeed), genWidthLabels(genWidthLabels),
+			f(f), design(design), currentColor(colorSeed), genWidthLabels(genWidthLabels), wireshape(wireshape),
 			genSignedLabels(genSignedLabels), stretchIO(stretchIO), enumerateIds(enumerateIds), abbreviateIds(abbreviateIds),
 			notitle(notitle), href(href), color_selections(color_selections), label_selections(label_selections), colorattr(colorattr)
 	{
@@ -708,6 +712,9 @@ struct ShowPass : public Pass {
 		log("        Use the specified attribute to assign colors. A unique color is\n");
 		log("        assigned to each unique value of this attribute.\n");
 		log("\n");
+		log("    -wireshape <graphviz_shape>\n");
+		log("        Use the specified shape for wire nodes. E.g. plaintext.\n");
+		log("\n");
 		log("    -width\n");
 		log("        annotate buses with a label indicating the width of the bus.\n");
 		log("\n");
@@ -766,6 +773,7 @@ struct ShowPass : public Pass {
 		std::string prefix = stringf("%s/.yosys_show", getenv("HOME") ? getenv("HOME") : ".");
 #endif
 		std::string viewer_exe;
+		std::string flag_wireshape = "diamond";
 		std::vector<std::string> libfiles;
 		std::vector<RTLIL::Design*> libs;
 		uint32_t colorSeed = 0;
@@ -830,6 +838,10 @@ struct ShowPass : public Pass {
 				format = args[++argidx];
 				continue;
 			}
+			if (arg == "-wireshape" && argidx+1 < args.size()) {
+				flag_wireshape = args[++argidx];
+				continue;
+			}
 			if (arg == "-width") {
 				flag_width= true;
 				continue;
@@ -912,7 +924,7 @@ struct ShowPass : public Pass {
 				delete lib;
 			log_cmd_error("Can't open dot file `%s' for writing.\n", dot_file.c_str());
 		}
-		ShowWorker worker(f, design, libs, colorSeed, flag_width, flag_signed, flag_stretch, flag_enum, flag_abbreviate, flag_notitle, flag_href, color_selections, label_selections, colorattr);
+		ShowWorker worker(f, design, libs, colorSeed, flag_width, flag_wireshape, flag_signed, flag_stretch, flag_enum, flag_abbreviate, flag_notitle, flag_href, color_selections, label_selections, colorattr);
 		fclose(f);
 
 		for (auto lib : libs)

From 40b387a70b2e3757bd8c8612758b0333761473a1 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Wed, 3 Jul 2024 22:12:06 +0100
Subject: [PATCH 006/931] smtbmc: Support skipping steps in cover mode

---
 backends/smt2/smtbmc.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/backends/smt2/smtbmc.py b/backends/smt2/smtbmc.py
index c3bdcebbe..1dcedc8ca 100644
--- a/backends/smt2/smtbmc.py
+++ b/backends/smt2/smtbmc.py
@@ -1866,6 +1866,11 @@ elif covermode:
             smt_assert_antecedent("(|%s_t| s%d s%d)" % (topmod, step-1, step))
             smt_assert_antecedent("(not (|%s_is| s%d))" % (topmod, step))
 
+        if step < skip_steps:
+            print_msg("Skipping step %d.." % (step))
+            step += 1
+            continue
+
         while "1" in cover_mask:
             print_msg("Checking cover reachability in step %d.." % (step))
             smt_push()

From 9047290683467fe981684462abf0d3d89191d148 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Wed, 6 Nov 2024 19:49:09 +0100
Subject: [PATCH 007/931] write_btor: support $buf

* treated the same as $pos
---
 backends/btor/btor.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backends/btor/btor.cc b/backends/btor/btor.cc
index c3637bc8f..2def5eaba 100644
--- a/backends/btor/btor.cc
+++ b/backends/btor/btor.cc
@@ -508,7 +508,7 @@ struct BtorWorker
 			goto okay;
 		}
 
-		if (cell->type.in(ID($not), ID($neg), ID($_NOT_), ID($pos)))
+		if (cell->type.in(ID($not), ID($neg), ID($_NOT_), ID($pos), ID($buf)))
 		{
 			string btor_op;
 			if (cell->type.in(ID($not), ID($_NOT_))) btor_op = "not";
@@ -520,9 +520,9 @@ struct BtorWorker
 			int nid_a = get_sig_nid(cell->getPort(ID::A), width, a_signed);
 			SigSpec sig = sigmap(cell->getPort(ID::Y));
 
-			// the $pos cell just passes through, all other cells need an actual operation applied
+			// the $pos/$buf cells just pass through, all other cells need an actual operation applied
 			int nid = nid_a;
-			if (cell->type != ID($pos))
+			if (!cell->type.in(ID($pos), ID($buf)))
 			{
 				log_assert(!btor_op.empty());
 				int sid = get_bv_sid(width);

From d7c66889052854a40d577e8d216c328256cd869a Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Fri, 15 Nov 2024 11:47:09 +0100
Subject: [PATCH 008/931] write_btor: support $_BUF_

---
 backends/btor/btor.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backends/btor/btor.cc b/backends/btor/btor.cc
index 2def5eaba..ad8f4b680 100644
--- a/backends/btor/btor.cc
+++ b/backends/btor/btor.cc
@@ -508,7 +508,7 @@ struct BtorWorker
 			goto okay;
 		}
 
-		if (cell->type.in(ID($not), ID($neg), ID($_NOT_), ID($pos), ID($buf)))
+		if (cell->type.in(ID($not), ID($neg), ID($_NOT_), ID($pos), ID($buf), ID($_BUF_)))
 		{
 			string btor_op;
 			if (cell->type.in(ID($not), ID($_NOT_))) btor_op = "not";
@@ -522,7 +522,7 @@ struct BtorWorker
 
 			// the $pos/$buf cells just pass through, all other cells need an actual operation applied
 			int nid = nid_a;
-			if (!cell->type.in(ID($pos), ID($buf)))
+			if (!cell->type.in(ID($pos), ID($buf), ID($_BUF_)))
 			{
 				log_assert(!btor_op.empty());
 				int sid = get_bv_sid(width);

From 583eb1addb82b033647aaee150ee02acd1d9e9fd Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Fri, 15 Nov 2024 15:15:42 +0100
Subject: [PATCH 009/931] pyosys: dereference cpp objects when constructing a
 tuple

* This fixes a bug where when converting a tuple from python to c++,
  get_cpp_obj() was called (returning a pointer) without dereferencing
  the pointer to get the underlying object
---
 misc/py_wrap_generator.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/misc/py_wrap_generator.py b/misc/py_wrap_generator.py
index b0ac1e82e..6715951fc 100644
--- a/misc/py_wrap_generator.py
+++ b/misc/py_wrap_generator.py
@@ -515,11 +515,11 @@ class TupleTranslator(PythonDictTranslator):
 		if types[0].name.split(" ")[-1] in primitive_types:
 			text += varname + "___tmp_0, "
 		else:
-			text += varname + "___tmp_0.get_cpp_obj(), "
+			text += "*" + varname + "___tmp_0.get_cpp_obj(), "
 		if types[1].name.split(" ")[-1] in primitive_types:
 			text += varname + "___tmp_1);"
 		else:
-			text += varname + "___tmp_1.get_cpp_obj());"
+			text += "*" + varname + "___tmp_1.get_cpp_obj());"
 		return text
 
 	#Generate c++ code to translate to a boost::python::tuple

From 0a1c664f02cabd9d057060aa6fb3bf4602334843 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 25 Mar 2025 12:15:54 +1300
Subject: [PATCH 010/931] simplify: Skip AST_PRIMITIVE in AST_CELLARRAY

Otherwise the `AST_PRIMITIVE` simplifies to the corresponding function and is no longer caught by the check for `AST_PRIMITIVE`s, raising an assertion error instead of an input error.
Add bug4785.ys to tests/verilog to demonstrate.
---
 frontends/ast/simplify.cc | 3 ++-
 tests/verilog/bug4785.ys  | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 tests/verilog/bug4785.ys

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index d35756d4e..9c23c769f 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1758,7 +1758,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			break;
 		if (type == AST_GENBLOCK)
 			break;
-		if (type == AST_CELLARRAY && children[i]->type == AST_CELL)
+		if (type == AST_CELLARRAY && (children[i]->type == AST_CELL || children[i]->type == AST_PRIMITIVE))
 			continue;
 		if (type == AST_BLOCK && !str.empty())
 			break;
@@ -2741,6 +2741,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			if (new_cell->type == AST_PRIMITIVE) {
 				input_error("Cell arrays of primitives are currently not supported.\n");
 			} else {
+				this->dumpAst(NULL, "    ");
 				log_assert(new_cell->children.at(0)->type == AST_CELLTYPE);
 				new_cell->children.at(0)->str = stringf("$array:%d:%d:%s", i, num, new_cell->children.at(0)->str.c_str());
 			}
diff --git a/tests/verilog/bug4785.ys b/tests/verilog/bug4785.ys
new file mode 100644
index 000000000..174765983
--- /dev/null
+++ b/tests/verilog/bug4785.ys
@@ -0,0 +1,9 @@
+logger -expect error "Cell arrays of primitives are currently not supported" 1
+read_verilog <<EOT
+module test(in1, in2, out1);
+  input in1, in2;
+  output out1;
+
+  nand  #2 t_nand[0:7](out1, in1, in2);
+endmodule
+EOT

From af8e85b7d27558bfc11ee95e11d4d9f141aef5e6 Mon Sep 17 00:00:00 2001
From: David Anderson <dave@natulte.net>
Date: Mon, 21 Apr 2025 11:39:33 -0700
Subject: [PATCH 011/931] techlibs/lattice: add missing clock muxes to ECP5
 block ram blackboxes

prjtrellis documentation shows that EBR clock inputs have optional inverters.
The bram techmap outputs those parameters, and nextpnr consumes them. But for
whatever reason, Diamond doesn't include those parameters in its blackbox
models. This makes synth_lattice fail when targeting ECP5 with a design that
maps block RAMs if you include any pass that needs cells_bb_ecp5.v's definitions.

This change fixes up the ECP5 bram blackbox models at generation time, by
adding the missing parameters back in.

Signed-off-by: David Anderson <dave@natulte.net>
---
 techlibs/lattice/cells_bb_ecp5.v |  4 ++++
 techlibs/lattice/cells_xtra.py   | 21 ++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/techlibs/lattice/cells_bb_ecp5.v b/techlibs/lattice/cells_bb_ecp5.v
index fc22495e2..20a8134c3 100644
--- a/techlibs/lattice/cells_bb_ecp5.v
+++ b/techlibs/lattice/cells_bb_ecp5.v
@@ -19,6 +19,8 @@ endmodule
 
 (* blackbox *)
 module DP16KD (...);
+    parameter CLKAMUX = "CLKA";
+    parameter CLKBMUX = "CLKB";
     parameter DATA_WIDTH_A = 18;
     parameter DATA_WIDTH_B = 18;
     parameter REGMODE_A = "NOREG";
@@ -215,6 +217,8 @@ endmodule
 
 (* blackbox *)
 module PDPW16KD (...);
+    parameter CLKRMUX = "CLKR";
+    parameter CLKWMUX = "CLKW";
     parameter DATA_WIDTH_W = 36;
     parameter DATA_WIDTH_R = 36;
     parameter GSR = "ENABLED";
diff --git a/techlibs/lattice/cells_xtra.py b/techlibs/lattice/cells_xtra.py
index c17281cc7..5531fd2b2 100644
--- a/techlibs/lattice/cells_xtra.py
+++ b/techlibs/lattice/cells_xtra.py
@@ -11,10 +11,11 @@ import re
 
 
 class Cell:
-    def __init__(self, name, keep=False, port_attrs={}):
+    def __init__(self, name, keep=False, port_attrs={}, extra_params={}):
         self.name = name
         self.keep = keep
         self.port_attrs = port_attrs
+        self.extra_params = extra_params
         self.found = False
 
 class State(Enum):
@@ -120,8 +121,18 @@ devices = [
         #Cell("XOR3"),
         #Cell("XOR4"),
         #Cell("XOR5"),
-        Cell("DP16KD"),
-        Cell("PDPW16KD"),
+        Cell("DP16KD", extra_params={
+            # Optional clock inverters, present in prjtrellis data but
+            # not in Diamond bb models.
+            "CLKAMUX": "CLKA",
+            "CLKBMUX": "CLKB",
+        }),
+        Cell("PDPW16KD", extra_params={
+            # Optional clock inverters, present in prjtrellis data but
+            # not in Diamond bb models.
+            "CLKWMUX": "CLKW",
+            "CLKRMUX": "CLKR",
+        }),
         #Cell("DPR16X4C"),
         #Cell("SPR16X4C"),
         #Cell("LVDSOB"),
@@ -795,6 +806,10 @@ def xtract_cells_decl(device, cells, dirs, outf):
                         rng = None
                     module_ports.append((kind, rng, port))
             elif l.startswith('parameter ') and state == State.IN_MODULE:
+                if cell.extra_params:
+                    for name, default in sorted(cell.extra_params.items()):
+                        outf.write('    parameter {} = "{}";\n'.format(name, default))
+                    cell.extra_params = None
                 l = l.strip()
                 if l.endswith((';', ',')):
                     l = l[:-1]

From 7cbe6ed048ab647f2be7ba11173bda3251d68a41 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Wed, 7 May 2025 14:36:48 +0200
Subject: [PATCH 012/931] kernel: add safer variants of as_int

---
 kernel/rtlil.cc | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
 kernel/rtlil.h  |  6 ++++++
 2 files changed, 62 insertions(+)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index dd78b202d..9f5972c32 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -380,6 +380,30 @@ int RTLIL::Const::as_int(bool is_signed) const
 	return ret;
 }
 
+bool RTLIL::Const::convertible_to_int(bool is_signed) const
+{
+	auto size = get_min_size(is_signed);
+	return (size > 0 && size <= 32);
+}
+
+std::optional<int> RTLIL::Const::try_as_int(bool is_signed) const
+{
+	if (!convertible_to_int(is_signed))
+		return std::nullopt;
+	return as_int(is_signed);
+}
+
+int RTLIL::Const::as_int_saturating(bool is_signed) const
+{
+	if (!convertible_to_int(is_signed)) {
+		const auto min_size = get_min_size(is_signed);
+		log_assert(min_size > 0);
+		const auto neg = get_bits().at(min_size - 1);
+		return neg ? std::numeric_limits<int>::min() : std::numeric_limits<int>::max();
+	}
+	return as_int(is_signed);
+}
+
 int RTLIL::Const::get_min_size(bool is_signed) const
 {
 	if (empty()) return 0;
@@ -5462,6 +5486,38 @@ int RTLIL::SigSpec::as_int(bool is_signed) const
 	return 0;
 }
 
+bool RTLIL::SigSpec::convertible_to_int(bool is_signed) const
+{
+	cover("kernel.rtlil.sigspec.convertible_to_int");
+
+	pack();
+	if (!is_fully_const())
+		return false;
+
+	return RTLIL::Const(chunks_[0].data).convertible_to_int(is_signed);
+}
+
+std::optional<int> RTLIL::SigSpec::try_as_int(bool is_signed) const
+{
+	cover("kernel.rtlil.sigspec.try_as_int");
+
+	pack();
+	if (!is_fully_const())
+		return std::nullopt;
+
+	return RTLIL::Const(chunks_[0].data).try_as_int(is_signed);
+}
+
+int RTLIL::SigSpec::as_int_saturating(bool is_signed) const
+{
+	cover("kernel.rtlil.sigspec.try_as_int");
+
+	pack();
+	log_assert(is_fully_const() && GetSize(chunks_) <= 1);
+	log_assert(!empty());
+	return RTLIL::Const(chunks_[0].data).as_int_saturating(is_signed);
+}
+
 std::string RTLIL::SigSpec::as_string() const
 {
 	cover("kernel.rtlil.sigspec.as_string");
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 96c8c523b..50c96c71b 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -754,6 +754,9 @@ public:
 	std::vector<RTLIL::State>& bits();
 	bool as_bool() const;
 	int as_int(bool is_signed = false) const;
+	bool convertible_to_int(bool is_signed = false) const;
+	std::optional<int> try_as_int(bool is_signed = false) const;
+	int as_int_saturating(bool is_signed = false) const;
 	std::string as_string(const char* any = "-") const;
 	static Const from_string(const std::string &str);
 	std::vector<RTLIL::State> to_bits() const;
@@ -1131,6 +1134,9 @@ public:
 
 	bool as_bool() const;
 	int as_int(bool is_signed = false) const;
+	bool convertible_to_int(bool is_signed = false) const;
+	std::optional<int> try_as_int(bool is_signed = false) const;
+	int as_int_saturating(bool is_signed = false) const;
 	std::string as_string() const;
 	RTLIL::Const as_const() const;
 	RTLIL::Wire *as_wire() const;

From 0dcd94b6ad22612e884cb55337c1ec0441715805 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Wed, 7 May 2025 14:41:13 +0200
Subject: [PATCH 013/931] opt_expr: saturate shift amount instead of
 overflowing for large shifts

---
 passes/opt/opt_expr.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/passes/opt/opt_expr.cc b/passes/opt/opt_expr.cc
index 74f5b386a..1c8bb4feb 100644
--- a/passes/opt/opt_expr.cc
+++ b/passes/opt/opt_expr.cc
@@ -1307,7 +1307,12 @@ skip_fine_alu:
 		if (cell->type.in(ID($shl), ID($shr), ID($sshl), ID($sshr), ID($shift), ID($shiftx)) && (keepdc ? assign_map(cell->getPort(ID::B)).is_fully_def() : assign_map(cell->getPort(ID::B)).is_fully_const()))
 		{
 			bool sign_ext = cell->type == ID($sshr) && cell->getParam(ID::A_SIGNED).as_bool();
-			int shift_bits = assign_map(cell->getPort(ID::B)).as_int(cell->type.in(ID($shift), ID($shiftx)) && cell->getParam(ID::B_SIGNED).as_bool());
+			RTLIL::SigSpec sig_b = assign_map(cell->getPort(ID::B));
+			const bool b_sign_ext = cell->type.in(ID($shift), ID($shiftx)) && cell->getParam(ID::B_SIGNED).as_bool();
+			// We saturate the value to prevent overflow, but note that this could
+			// cause incorrect opimization in the impractical case that A is 2^32 bits
+			// wide
+			int shift_bits = sig_b.as_int_saturating(b_sign_ext);
 
 			if (cell->type.in(ID($shl), ID($sshl)))
 				shift_bits *= -1;

From af933b4f3801fa560e0ec4a4f33f99ff41265920 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Wed, 7 May 2025 15:12:33 +0200
Subject: [PATCH 014/931] tests: check shifts by amounts that overflow int

---
 tests/opt/opt_expr_shift.ys | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/opt/opt_expr_shift.ys b/tests/opt/opt_expr_shift.ys
index aac2e6f62..5944bfa33 100644
--- a/tests/opt/opt_expr_shift.ys
+++ b/tests/opt/opt_expr_shift.ys
@@ -48,3 +48,25 @@ select -assert-none t:$shl
 select -assert-none t:$shr
 select -assert-none t:$sshl
 select -assert-none t:$sshr
+
+design -reset
+
+read_verilog <<EOT
+module top (in, out1, out2);
+	input wire in;
+	output wire [7:0] out1;
+	output wire [7:0] out2;
+
+	assign out1 = (in >> 36'hfffffffff);
+	wire signed [35:0] shamt = 36'hfffffffff;
+	assign out2 = (in >> shamt);
+endmodule
+EOT
+
+equiv_opt opt_expr
+
+design -load postopt
+select -assert-none t:$shl
+select -assert-none t:$shr
+select -assert-none t:$sshl
+select -assert-none t:$sshr

From 547382504b0d2b842b2d326079f621c164c7c194 Mon Sep 17 00:00:00 2001
From: KrystalDelusion <93062060+KrystalDelusion@users.noreply.github.com>
Date: Thu, 8 May 2025 10:37:04 +1200
Subject: [PATCH 015/931] Update verilog_frontend.cc

`read_verilog_file_list` should not try to read arguments as selection args.  Without this, trying to pass a file without a `-f|-F` flag is misleading, in the best case giving a warning about the selection not matching any module, or in worst case just doing nothing (if the filename is a valid selection).
---
 frontends/verilog/verilog_frontend.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index 14a0f16c0..1f272ca4f 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -753,7 +753,7 @@ struct VerilogFileList : public Pass {
 			break;
 		}
 
-		extra_args(args, argidx, design);
+		extra_args(args, argidx, design, false);
 	}
 } VerilogFilelist;
 

From e2485000c7d7158097be01e29a6e18d7fe899d00 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Thu, 8 May 2025 11:08:20 +0200
Subject: [PATCH 016/931] kernel: handle unsigned case for as_int_saturating
 correctly

* This fixes #5105
---
 kernel/rtlil.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 9f5972c32..c08e78dce 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -396,6 +396,9 @@ std::optional<int> RTLIL::Const::try_as_int(bool is_signed) const
 int RTLIL::Const::as_int_saturating(bool is_signed) const
 {
 	if (!convertible_to_int(is_signed)) {
+		if (!is_signed)
+			return std::numeric_limits<int>::max();
+
 		const auto min_size = get_min_size(is_signed);
 		log_assert(min_size > 0);
 		const auto neg = get_bits().at(min_size - 1);

From d59380b3a0e6596f141e8f96de1b58b7540385f2 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Thu, 8 May 2025 11:09:01 +0200
Subject: [PATCH 017/931] tests: more complete testing of shift edgecases

---
 tests/opt/opt_expr_shift.ys | 55 ++++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 7 deletions(-)

diff --git a/tests/opt/opt_expr_shift.ys b/tests/opt/opt_expr_shift.ys
index 5944bfa33..943d370dc 100644
--- a/tests/opt/opt_expr_shift.ys
+++ b/tests/opt/opt_expr_shift.ys
@@ -20,7 +20,11 @@ module top (
 	output wire        [7:0] sshr_uu,
 	output wire signed [7:0] sshr_us,
 	output wire        [7:0] sshr_su,
-	output wire signed [7:0] sshr_ss
+	output wire signed [7:0] sshr_ss,
+	output wire        [7:0] shiftx_uu,
+	output wire signed [7:0] shiftx_us,
+	output wire        [7:0] shiftx_su,
+	output wire signed [7:0] shiftx_ss
 );
 	assign  shl_uu = in_u << 20;
 	assign  shl_us = in_u << 20;
@@ -38,9 +42,20 @@ module top (
 	assign sshr_us = in_u >>> 20;
 	assign sshr_su = in_s >>> 20;
 	assign sshr_ss = in_s >>> 20;
+	wire [7:0] shamt = 20;
+	assign shiftx_uu = in_u[shamt +: 8];
+	assign shiftx_us = in_u[shamt +: 8];
+	assign shiftx_su = in_s[shamt +: 8];
+	assign shiftx_ss = in_s[shamt +: 8];
 endmodule
 EOT
 
+select -assert-count 4 t:$shl
+select -assert-count 4 t:$shr
+select -assert-count 4 t:$sshl
+select -assert-count 4 t:$sshr
+select -assert-count 4 t:$shiftx
+
 equiv_opt opt_expr
 
 design -load postopt
@@ -48,21 +63,46 @@ select -assert-none t:$shl
 select -assert-none t:$shr
 select -assert-none t:$sshl
 select -assert-none t:$sshr
+select -assert-none t:$shiftx
 
 design -reset
 
 read_verilog <<EOT
-module top (in, out1, out2);
-	input wire in;
-	output wire [7:0] out1;
-	output wire [7:0] out2;
+module top (
+	input  wire        [3:0]  in,
+	output wire        [7:0]  shl,
+	output wire        [7:0]  shr,
+	output wire        [7:0] sshl,
+	output wire        [7:0] sshr,
+	output wire        [7:0] shiftx,
+
+	output wire        [7:0]  shl_s,
+	output wire        [7:0]  shr_s,
+	output wire        [7:0] sshl_s,
+	output wire        [7:0] sshr_s,
+	output wire        [7:0] shiftx_s,
+);
+	assign  shl = in << 36'hfffffffff;
+	assign  shr = in >> 36'hfffffffff;
+	assign sshl = in <<< 36'hfffffffff;
+	assign sshr = in >>> 36'hfffffffff;
+	assign shiftx = in[36'hfffffffff +: 8];
 
-	assign out1 = (in >> 36'hfffffffff);
 	wire signed [35:0] shamt = 36'hfffffffff;
-	assign out2 = (in >> shamt);
+	assign  shl_s = in << shamt;
+	assign  shr_s = in >> shamt;
+	assign sshl_s = in <<< shamt;
+	assign sshr_s = in >>> shamt;
+	assign shiftx_s = in[shamt +: 8];
 endmodule
 EOT
 
+select -assert-count 2 t:$shl
+select -assert-count 2 t:$shr
+select -assert-count 2 t:$sshl
+select -assert-count 2 t:$sshr
+select -assert-count 1 t:$shiftx
+
 equiv_opt opt_expr
 
 design -load postopt
@@ -70,3 +110,4 @@ select -assert-none t:$shl
 select -assert-none t:$shr
 select -assert-none t:$sshl
 select -assert-none t:$sshr
+select -assert-none t:$shiftx

From 0d621ecc110641bf912dd61efe031ef2bd066843 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 9 May 2025 11:36:39 +0200
Subject: [PATCH 018/931] libcache: add -quiet and -verbose

---
 passes/techmap/libcache.cc | 29 +++++++++++++++++++++++++----
 passes/techmap/libparse.cc |  6 ++++--
 passes/techmap/libparse.h  |  1 +
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/passes/techmap/libcache.cc b/passes/techmap/libcache.cc
index 19f1fa87d..177258e7f 100644
--- a/passes/techmap/libcache.cc
+++ b/passes/techmap/libcache.cc
@@ -29,7 +29,7 @@
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
-		log("    libcache {-enable|-disable|-purge} { -all | [path]... }\n");
+		log("    libcache [-verbose] {-enable|-disable|-purge} { -all | [path]... }\n");
 		log("\n");
 		log("Controls the default and per path caching of liberty file data.\n");
 		log("\n");
@@ -47,6 +47,13 @@
 		log("\n");
 		log("Displays the current cache settings and cached paths.\n");
 		log("\n");
+		log("    libcache {-verbose|-quiet}\n");
+		log("\n");
+		log("Controls cache use logging.\n");
+		log("\n");
+		log("    -verbose   Enable printing info when cache is used\n");
+		log("    -quiet     Disable printing info when cache is used (default)\n");
+		log("\n");
 	}
 	void execute(std::vector<std::string> args, RTLIL::Design *) override
 	{
@@ -55,6 +62,8 @@
 		bool purge = false;
 		bool all = false;
 		bool list = false;
+		bool verbose = false;
+		bool quiet = false;
 		std::vector<std::string> paths;
 
 		size_t argidx;
@@ -79,16 +88,24 @@
 				list = true;
 				continue;
 			}
+			if (args[argidx] == "-verbose") {
+				verbose = true;
+				continue;
+			}
+			if (args[argidx] == "-quiet") {
+				quiet = true;
+				continue;
+			}
 			std::string fname = args[argidx];
 			rewrite_filename(fname);
 			paths.push_back(fname);
 			break;
 		}
-		int modes = enable + disable + purge + list;
+		int modes = enable + disable + purge + list + verbose + quiet;
 		if (modes == 0)
-			log_cmd_error("At least one of -enable, -disable, -purge or -list is required.\n");
+			log_cmd_error("At least one of -enable, -disable, -purge, -list,\n-verbose, or -quiet is required.\n");
 		if (modes > 1)
-			log_cmd_error("Only one of -enable, -disable, -purge or -list may be present.\n");
+			log_cmd_error("Only one of -enable, -disable, -purge, -list,\n-verbose, or -quiet may be present.\n");
 
 		if (all && !paths.empty())
 			log_cmd_error("The -all option cannot be combined with a list of paths.\n");
@@ -121,6 +138,10 @@
 					LibertyAstCache::instance.cache_path.erase(path);
 				}
 			}
+		} else if (verbose) {
+			LibertyAstCache::instance.verbose = true;
+		} else if (quiet) {
+			LibertyAstCache::instance.verbose = false;
 		} else {
 			log_assert(false);
 		}
diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index 5594d5443..85ed35ea1 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -41,7 +41,8 @@ std::shared_ptr<const LibertyAst> LibertyAstCache::cached_ast(const std::string
 	auto it = cached.find(fname);
 	if (it == cached.end())
 		return nullptr;
-	log("Using cached data for liberty file `%s'\n", fname.c_str());
+	if (verbose)
+		log("Using cached data for liberty file `%s'\n", fname.c_str());
 	return it->second;
 }
 
@@ -51,7 +52,8 @@ void LibertyAstCache::parsed_ast(const std::string &fname, const std::shared_ptr
 	bool should_cache = it == cache_path.end() ? cache_by_default : it->second;
 	if (!should_cache)
 		return;
-	log("Caching data for liberty file `%s'\n", fname.c_str());
+	if (verbose)
+		log("Caching data for liberty file `%s'\n", fname.c_str());
 	cached.emplace(fname, ast);
 }
 
diff --git a/passes/techmap/libparse.h b/passes/techmap/libparse.h
index 61dc83867..949adbdcf 100644
--- a/passes/techmap/libparse.h
+++ b/passes/techmap/libparse.h
@@ -140,6 +140,7 @@ namespace Yosys
 		dict<std::string, std::shared_ptr<const LibertyAst>> cached;
 
 		bool cache_by_default = false;
+		bool verbose = false;
 		dict<std::string, bool> cache_path;
 
 		std::shared_ptr<const LibertyAst> cached_ast(const std::string &fname);

From 9d2f9f7557c145daa156d7fefcbdba838ff61616 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 9 May 2025 12:40:38 +0200
Subject: [PATCH 019/931] libcache: fix test

---
 tests/liberty/libcache.ys | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/liberty/libcache.ys b/tests/liberty/libcache.ys
index a741a9df1..04257aa92 100644
--- a/tests/liberty/libcache.ys
+++ b/tests/liberty/libcache.ys
@@ -1,3 +1,4 @@
+libcache -verbose
 libcache -enable busdef.lib
 
 logger -expect log "Caching is disabled by default." 1
@@ -14,8 +15,8 @@ logger -expect log "Caching data" 1
 read_liberty -lib busdef.lib; design -reset
 logger -check-expected
 
-logger -expect log "Using caching data" 1
-log Using caching data
+logger -expect log "Using cached data" 1
+log Using cached data
 read_liberty normal.lib; design -reset
 logger -check-expected
 
@@ -23,6 +24,13 @@ logger -expect log "Using cached data" 1
 read_liberty -lib busdef.lib; design -reset
 logger -check-expected
 
+libcache -quiet
+logger -expect log "Using cached data" 1
+log Using cached data
+read_liberty -lib busdef.lib; design -reset
+logger -check-expected
+libcache -verbose
+
 libcache -purge busdef.lib
 
 logger -expect log "Caching is disabled by default." 1

From 2ca2ecaa1cc93f4449862f3283ffd696b9c7e204 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 9 May 2025 12:40:45 +0200
Subject: [PATCH 020/931] libcache: fix help

---
 passes/techmap/libcache.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/techmap/libcache.cc b/passes/techmap/libcache.cc
index 177258e7f..e299f43ec 100644
--- a/passes/techmap/libcache.cc
+++ b/passes/techmap/libcache.cc
@@ -29,7 +29,7 @@
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
-		log("    libcache [-verbose] {-enable|-disable|-purge} { -all | [path]... }\n");
+		log("    libcache {-enable|-disable|-purge} { -all | [path]... }\n");
 		log("\n");
 		log("Controls the default and per path caching of liberty file data.\n");
 		log("\n");

From 2522bcd49272d9a2b9ef68cbe8bf2bd27a581cbb Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 9 May 2025 14:21:10 +0200
Subject: [PATCH 021/931] aiger: fix -map and -vmap

---
 backends/aiger/aiger.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backends/aiger/aiger.cc b/backends/aiger/aiger.cc
index f2cb5d9bc..0e5706a75 100644
--- a/backends/aiger/aiger.cc
+++ b/backends/aiger/aiger.cc
@@ -698,7 +698,7 @@ struct AigerWriter
 				}
 
 				if (wire->port_output) {
-					int o = ordered_outputs.at(sig[i]);
+					int o = ordered_outputs.at(SigSpec(wire, i));
 					output_lines[o] += stringf("output %d %d %s\n", o, index, log_id(wire));
 				}
 

From cbf069849ec48669b67b8252e04662acc3a75eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Fri, 9 May 2025 16:01:47 +0200
Subject: [PATCH 022/931] aiger: add regression test for sliced output segfault

---
 tests/aiger/io.ys | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 tests/aiger/io.ys

diff --git a/tests/aiger/io.ys b/tests/aiger/io.ys
new file mode 100644
index 000000000..eae7f358d
--- /dev/null
+++ b/tests/aiger/io.ys
@@ -0,0 +1,10 @@
+read_verilog <<EOF
+module bad(
+	input in,
+	output reg [1:0] out
+);
+	assign out = {in, 1'b0};
+endmodule
+EOF
+proc
+write_aiger -vmap /dev/null /dev/null

From 5e72464a15b70b25d89bd2cd999c76e7d8506b32 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 6 May 2025 12:02:00 +0200
Subject: [PATCH 023/931] rtlil: enable single-bit vector wires

---
 backends/verilog/verilog_backend.cc |  3 +++
 frontends/ast/genrtlil.cc           |  1 +
 frontends/ast/simplify.cc           |  6 ++++++
 kernel/constids.inc                 |  1 +
 tests/verilog/sbvector.ys           | 20 ++++++++++++++++++++
 5 files changed, 31 insertions(+)
 create mode 100644 tests/verilog/sbvector.ys

diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index 2bc6ff3b8..1b828dcbd 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -419,6 +419,9 @@ void dump_wire(std::ostream &f, std::string indent, RTLIL::Wire *wire)
 			range = stringf(" [%d:%d]", wire->start_offset, wire->width - 1 + wire->start_offset);
 		else
 			range = stringf(" [%d:%d]", wire->width - 1 + wire->start_offset, wire->start_offset);
+	} else {
+		if (wire->attributes.count(ID::single_bit_vector))
+			range = stringf(" [%d:%d]", wire->start_offset, wire->start_offset);
 	}
 	if (wire->port_input && !wire->port_output)
 		f << stringf("%s" "input%s %s;\n", indent.c_str(), range.c_str(), id(wire->name).c_str());
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index d3982b92b..26ed0e3e4 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -1446,6 +1446,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			wire->port_input = is_input;
 			wire->port_output = is_output;
 			wire->upto = range_swapped;
+
 			wire->is_signed = is_signed;
 
 			for (auto &attr : attributes) {
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 3411d6c03..a45eb1cc1 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -2084,6 +2084,8 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					std::swap(range_left, range_right);
 					range_swapped = force_upto;
 				}
+				if (range_left == range_right)
+					set_attribute(ID::single_bit_vector, mkconst_int(1, false));
 			}
 		} else {
 			if (!range_valid)
@@ -2092,6 +2094,10 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			range_swapped = false;
 			range_left = 0;
 			range_right = 0;
+			if (attributes.count(ID::single_bit_vector)) {
+				delete attributes[ID::single_bit_vector];
+				attributes.erase(ID::single_bit_vector);
+			}
 		}
 	}
 
diff --git a/kernel/constids.inc b/kernel/constids.inc
index 4fdbb3dc8..055ebf2a8 100644
--- a/kernel/constids.inc
+++ b/kernel/constids.inc
@@ -184,6 +184,7 @@ X(romstyle)
 X(S)
 X(SET)
 X(SET_POLARITY)
+X(single_bit_vector)
 X(SIZE)
 X(SRC)
 X(src)
diff --git a/tests/verilog/sbvector.ys b/tests/verilog/sbvector.ys
new file mode 100644
index 000000000..3481f6f45
--- /dev/null
+++ b/tests/verilog/sbvector.ys
@@ -0,0 +1,20 @@
+read_verilog <<EOT
+module foo(
+	output o,
+	input [0:0] i1,
+	input i2
+);
+	assign o = i1 ^ i2;
+endmodule
+EOT
+
+logger -expect log "wire width 1 input 2 \\i1" 1
+logger -expect log "wire input 3 \\i2" 1
+dump
+logger -check-expected
+
+write_verilog verilog_sbvector.out
+!grep -qF 'wire [0:0] i1;' verilog_sbvector.out
+!grep -qF 'input [0:0] i1;' verilog_sbvector.out
+!grep -qF 'wire i2;' verilog_sbvector.out
+!grep -qF 'input i2;' verilog_sbvector.out

From e5171d6aa1468c5f9b5a2b4c43a370541f1d2ac1 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 12 May 2025 13:23:02 +0200
Subject: [PATCH 024/931] verific: support single_bit_vector

---
 frontends/verific/verific.cc |  4 ++++
 tests/verilog/sbvector.ys    | 20 +++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 95bede420..411804566 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -1557,6 +1557,8 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 		wire->start_offset = min(portbus->LeftIndex(), portbus->RightIndex());
 		wire->upto = portbus->IsUp();
 		import_attributes(wire->attributes, portbus, nl, portbus->Size());
+		if (portbus->Size() == 1)
+			wire->set_bool_attribute(ID::single_bit_vector);
 		SetIter si ;
 		Port *port ;
 		FOREACH_PORT_OF_PORTBUS(portbus, si, port) {
@@ -1755,6 +1757,8 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 				break;
 			}
 			import_attributes(wire->attributes, netbus, nl, netbus->Size());
+			if (netbus->Size() == 1)
+				wire->set_bool_attribute(ID::single_bit_vector);
 
 			RTLIL::Const initval = Const(State::Sx, GetSize(wire));
 			bool initval_valid = false;
diff --git a/tests/verilog/sbvector.ys b/tests/verilog/sbvector.ys
index 3481f6f45..ab8092700 100644
--- a/tests/verilog/sbvector.ys
+++ b/tests/verilog/sbvector.ys
@@ -4,17 +4,27 @@ module foo(
 	input [0:0] i1,
 	input i2
 );
-	assign o = i1 ^ i2;
+    wire [0:0] w1 = i1 ^ i2;
+    wire w2 = ~i1;
+	assign o = w1 ^ w2;
 endmodule
 EOT
 
-logger -expect log "wire width 1 input 2 \\i1" 1
-logger -expect log "wire input 3 \\i2" 1
-dump
-logger -check-expected
+hierarchy
+proc
+select -assert-count 1 w:i1
+select -assert-count 1 w:i1 a:single_bit_vector %i
+select -assert-count 1 w:i2
+select -assert-count 0 w:i2 a:single_bit_vector %i
+select -assert-count 1 w:w1
+select -assert-count 1 w:w1 a:single_bit_vector %i
+select -assert-count 1 w:w2
+select -assert-count 0 w:w2 a:single_bit_vector %i
 
 write_verilog verilog_sbvector.out
 !grep -qF 'wire [0:0] i1;' verilog_sbvector.out
 !grep -qF 'input [0:0] i1;' verilog_sbvector.out
 !grep -qF 'wire i2;' verilog_sbvector.out
 !grep -qF 'input i2;' verilog_sbvector.out
+!grep -qF 'wire [0:0] w1;' verilog_sbvector.out
+!grep -qF 'wire w2;' verilog_sbvector.out

From f73c6a9c9ac1dcaee9ce283c73a6cf9fae07bc6e Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 12 May 2025 13:36:25 +0200
Subject: [PATCH 025/931] write_verilog: don't dump single_bit_vector attribute

---
 backends/verilog/verilog_backend.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index 1b828dcbd..10cf7c52e 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -383,6 +383,7 @@ void dump_attributes(std::ostream &f, std::string indent, dict<RTLIL::IdString,
 	if (attr2comment)
 		as_comment = true;
 	for (auto it = attributes.begin(); it != attributes.end(); ++it) {
+		if (it->first == ID::single_bit_vector) continue;
 		if (it->first == ID::init && regattr) continue;
 		f << stringf("%s" "%s %s", indent.c_str(), as_comment ? "/*" : "(*", id(it->first).c_str());
 		f << stringf(" = ");

From 64a115e6f0869f3d31d2a6dc6a4eee606491dca8 Mon Sep 17 00:00:00 2001
From: RonxBulld <526677628@qq.com>
Date: Sun, 18 May 2025 01:07:06 +0800
Subject: [PATCH 026/931] Disable STRIP operations when appropriate.

---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 304753d98..8eb471e23 100644
--- a/Makefile
+++ b/Makefile
@@ -455,6 +455,7 @@ endif
 
 ifeq ($(ENABLE_DEBUG),1)
 CXXFLAGS := -Og -DDEBUG $(filter-out $(OPT_LEVEL),$(CXXFLAGS))
+STRIP :=
 endif
 
 ifeq ($(ENABLE_ABC),1)
@@ -983,20 +984,20 @@ install: $(TARGETS) $(EXTRA_TARGETS)
 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(BINDIR)
 	$(INSTALL_SUDO) cp $(filter-out libyosys.so,$(TARGETS)) $(DESTDIR)$(BINDIR)
 ifneq ($(filter $(PROGRAM_PREFIX)yosys,$(TARGETS)),)
-	$(INSTALL_SUDO) $(STRIP) -S $(DESTDIR)$(BINDIR)/$(PROGRAM_PREFIX)yosys
+	if [ -n "$(STRIP)" ]; then $(INSTALL_SUDO) $(STRIP) -S $(DESTDIR)$(BINDIR)/$(PROGRAM_PREFIX)yosys; fi
 endif
 ifneq ($(filter $(PROGRAM_PREFIX)yosys-abc,$(TARGETS)),)
-	$(INSTALL_SUDO) $(STRIP) $(DESTDIR)$(BINDIR)/$(PROGRAM_PREFIX)yosys-abc
+	if [ -n "$(STRIP)" ]; then $(INSTALL_SUDO) $(STRIP) $(DESTDIR)$(BINDIR)/$(PROGRAM_PREFIX)yosys-abc; fi
 endif
 ifneq ($(filter $(PROGRAM_PREFIX)yosys-filterlib,$(TARGETS)),)
-	$(INSTALL_SUDO) $(STRIP) $(DESTDIR)$(BINDIR)/$(PROGRAM_PREFIX)yosys-filterlib
+	if [ -n "$(STRIP)" ]; then $(INSTALL_SUDO) $(STRIP) $(DESTDIR)$(BINDIR)/$(PROGRAM_PREFIX)yosys-filterlib; fi
 endif
 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(DATDIR)
 	$(INSTALL_SUDO) cp -r share/. $(DESTDIR)$(DATDIR)/.
 ifeq ($(ENABLE_LIBYOSYS),1)
 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(LIBDIR)
 	$(INSTALL_SUDO) cp libyosys.so $(DESTDIR)$(LIBDIR)/
-	$(INSTALL_SUDO) $(STRIP) -S $(DESTDIR)$(LIBDIR)/libyosys.so
+	if [ -n "$(STRIP)" ]; then $(INSTALL_SUDO) $(STRIP) -S $(DESTDIR)$(LIBDIR)/libyosys.so; fi
 ifeq ($(ENABLE_PYOSYS),1)
 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys
 	$(INSTALL_SUDO) cp libyosys.so $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys/libyosys.so

From 3001473ae5280469ad3e4a057d7a43f5482c1f36 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 21 May 2025 16:09:39 +1200
Subject: [PATCH 027/931] functional.cc: Maintain port ordering

Based on #4753.
---
 kernel/functional.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kernel/functional.cc b/kernel/functional.cc
index adf7bfb0c..178995de8 100644
--- a/kernel/functional.cc
+++ b/kernel/functional.cc
@@ -518,10 +518,12 @@ public:
 			if (cell->type.in(ID($assert), ID($assume), ID($live), ID($fair), ID($cover), ID($check)))
 				queue.emplace_back(cell);
 		}
-		for (auto wire : module->wires()) {
-			if (wire->port_input)
+		for (auto port : module->ports) {
+			auto *wire = module->wire(port);
+			if (wire && wire->port_input) {
 				factory.add_input(wire->name, ID($input), Sort(wire->width));
-			if (wire->port_output) {
+			}
+			if (wire && wire->port_output) {
 				auto &output = factory.add_output(wire->name, ID($output), Sort(wire->width));
 				output.set_value(enqueue(DriveChunk(DriveChunkWire(wire, 0, wire->width))));
 			}

From 847558547b04c309a6ebe350d2ae2bd4f01da60a Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 21 May 2025 16:21:27 +1200
Subject: [PATCH 028/931] functional.cc: Reverse port iteration

---
 kernel/functional.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/functional.cc b/kernel/functional.cc
index 178995de8..4983703e3 100644
--- a/kernel/functional.cc
+++ b/kernel/functional.cc
@@ -518,8 +518,8 @@ public:
 			if (cell->type.in(ID($assert), ID($assume), ID($live), ID($fair), ID($cover), ID($check)))
 				queue.emplace_back(cell);
 		}
-		for (auto port : module->ports) {
-			auto *wire = module->wire(port);
+		for (auto riter = module->ports.rbegin(); riter != module->ports.rend(); ++riter) {
+			auto *wire = module->wire(*riter);
 			if (wire && wire->port_input) {
 				factory.add_input(wire->name, ID($input), Sort(wire->width));
 			}

From 761dc6f62aebbe80bb6eb10bc028418bb036e302 Mon Sep 17 00:00:00 2001
From: mikesinouye <mikeinouye@google.com>
Date: Wed, 21 May 2025 15:18:29 -0700
Subject: [PATCH 029/931] Allow reading of gzipped files when not in NDEBUG

---
 kernel/gzip.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/gzip.cc b/kernel/gzip.cc
index 6790b536e..24907d8cf 100644
--- a/kernel/gzip.cc
+++ b/kernel/gzip.cc
@@ -127,7 +127,8 @@ std::istream* uncompressed(const std::string filename, std::ios_base::openmode m
 				filename.c_str(), unsigned(magic[2]));
 		gzip_istream* s = new gzip_istream();
 		delete f;
-		log_assert(s->open(filename.c_str()));
+		bool ok = s->open(filename.c_str());
+		log_assert(ok && "Failed to open gzipped file.\n");
 		return s;
 #else
 		log_cmd_error("File `%s' is a gzip file, but Yosys is compiled without zlib.\n", filename.c_str());

From 98eec369210302a6d2aee856a00a571d019a1b00 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Wed, 21 May 2025 12:20:08 +0100
Subject: [PATCH 030/931] kernel: add comments to as_int family of methods

---
 kernel/rtlil.h | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 50c96c71b..fb9efca51 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -753,10 +753,26 @@ public:
 
 	std::vector<RTLIL::State>& bits();
 	bool as_bool() const;
+
+	// Convert the constant value to a C++ int.
+	// NOTE: If the constant is too wide to fit in int (32 bits) this will
+	// truncate any higher bits, potentially over/underflowing. Consider using
+	// try_as_int, as_int_saturating, or guarding behind convertible_to_int
+	// instead.
 	int as_int(bool is_signed = false) const;
+
+	// Returns true iff the constant can be converted to an int without
+	// over/underflow.
 	bool convertible_to_int(bool is_signed = false) const;
+
+	// Returns the constant's value as an int if it can be represented without
+	// over/underflow, or std::nullopt otherwise.
 	std::optional<int> try_as_int(bool is_signed = false) const;
+
+	// Returns the constant's value as an int if it can be represented without
+	// over/underflow, otherwise the max/min value for int depending on the sign.
 	int as_int_saturating(bool is_signed = false) const;
+
 	std::string as_string(const char* any = "-") const;
 	static Const from_string(const std::string &str);
 	std::vector<RTLIL::State> to_bits() const;
@@ -1133,10 +1149,27 @@ public:
 	bool is_onehot(int *pos = nullptr) const;
 
 	bool as_bool() const;
+
+	// Convert the SigSpec to a C++ int, assuming all bits are constant.
+	// NOTE: If the value is too wide to fit in int (32 bits) this will
+	// truncate any higher bits, potentially over/underflowing. Consider using
+	// try_as_int, as_int_saturating, or guarding behind convertible_to_int
+	// instead.
 	int as_int(bool is_signed = false) const;
+
+	// Returns true iff the SigSpec is constant and can be converted to an int
+	// without over/underflow.
 	bool convertible_to_int(bool is_signed = false) const;
+
+	// Returns the SigSpec's value as an int if it is a constant and can be
+	// represented without over/underflow, or std::nullopt otherwise.
 	std::optional<int> try_as_int(bool is_signed = false) const;
+
+	// Returns an all constant SigSpec's value as an int if it can be represented
+	// without over/underflow, otherwise the max/min value for int depending on
+	// the sign.
 	int as_int_saturating(bool is_signed = false) const;
+
 	std::string as_string() const;
 	RTLIL::Const as_const() const;
 	RTLIL::Wire *as_wire() const;

From 6c67b29bbb52cc7f0fbb86ebde87c46503efb5e2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 23 May 2025 00:24:38 +0000
Subject: [PATCH 031/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 304753d98..74857d3a8 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.53+39
+YOSYS_VER := 0.53+49
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 4f0cbf2ee6c38faed20a1896e5b93c2c3f45a460 Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Thu, 22 May 2025 18:52:33 -0600
Subject: [PATCH 032/931] Fix typo ("exist" -> "exit").

---
 passes/cmds/logger.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc
index 3277e1608..241a8799f 100644
--- a/passes/cmds/logger.cc
+++ b/passes/cmds/logger.cc
@@ -67,7 +67,7 @@ struct LoggerPass : public Pass {
 		log("    -check-expected\n");
 		log("        verifies that the patterns previously set up by -expect have actually\n");
 		log("        been met, then clears the expected log list.  If this is not called\n");
-		log("        manually, the check will happen at yosys exist time instead.\n");
+		log("        manually, the check will happen at yosys exit time instead.\n");
 		log("\n");
 	}
 

From 9770ece187f11482eb8e86d66765881a781a5f01 Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Thu, 22 May 2025 19:12:35 -0600
Subject: [PATCH 033/931] Accept (and ignore) SystemVerilog unique/priority if.

Add support to the "read_verilog -sv" parser to validate the
"unique", "unique0", and "priority" keywords in contexts where
they're legal according to 1800-2012 12.4.2.

This affects only the grammar accepted; the behaviour of conditionals
is not changed.  (But accepting this syntax will provide scope for
possible optimisations as future work.)

Three test cases ("unique_if", "unique_if_else", and
"unique_if_else_begin") verify that the keywords are accepted where
legal and rejected where illegal, as described in the final paragraph
of 12.4.2.
---
 docs/source/yosys_internals/verilog.rst |  6 ++++++
 frontends/verilog/verilog_parser.y      | 28 +++++++++++++++++++++++--
 kernel/constids.inc                     |  1 +
 tests/verilog/unique_if.ys              | 10 +++++++++
 tests/verilog/unique_if_else.ys         | 11 ++++++++++
 tests/verilog/unique_if_else_begin.ys   | 12 +++++++++++
 6 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 tests/verilog/unique_if.ys
 create mode 100644 tests/verilog/unique_if_else.ys
 create mode 100644 tests/verilog/unique_if_else_begin.ys

diff --git a/docs/source/yosys_internals/verilog.rst b/docs/source/yosys_internals/verilog.rst
index a1941963d..eef215e5d 100644
--- a/docs/source/yosys_internals/verilog.rst
+++ b/docs/source/yosys_internals/verilog.rst
@@ -375,3 +375,9 @@ from SystemVerilog:
   ports are inputs or outputs are supported.
 
 - Assignments within expressions are supported.
+
+- The ``unique``, ``unique0``, and ``priority`` SystemVerilog keywords are
+  accepted on ``if`` and ``case`` conditionals.  (Those keywords are currently
+  handled in the same way as their equivalent ``full_case`` and
+  ``parallel_case`` attributes on ``case`` statements, and checked
+  for syntactic validity but otherwise ignored on ``if`` statements.)
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 9d0956c8e..e70542a92 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -426,7 +426,7 @@ static const AstNode *addAsgnBinopStmt(dict<IdString, AstNode*> *attr, AstNode *
 %type <boolean> opt_property always_comb_or_latch always_or_always_ff
 %type <boolean> opt_signedness_default_signed opt_signedness_default_unsigned
 %type <integer> integer_atom_type integer_vector_type
-%type <al> attr case_attr
+%type <al> attr if_attr case_attr
 %type <ast> struct_union
 %type <ast_node_type> asgn_binop inc_or_dec_op
 %type <ast> genvar_identifier
@@ -2871,7 +2871,7 @@ behavioral_stmt:
 		ast_stack.pop_back();
 		ast_stack.pop_back();
 	} |
-	attr TOK_IF '(' expr ')' {
+	if_attr TOK_IF '(' expr ')' {
 		AstNode *node = new AstNode(AST_CASE);
 		AstNode *block = new AstNode(AST_BLOCK);
 		AstNode *cond = new AstNode(AST_COND, AstNode::mkconst_int(1, false, 1), block);
@@ -2901,6 +2901,29 @@ behavioral_stmt:
 		ast_stack.pop_back();
 	};
 
+if_attr:
+	attr {
+		$$ = $1;
+	} |
+	attr TOK_UNIQUE0 {
+		AstNode *context = ast_stack.back();
+		if( context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if) )
+			frontend_verilog_yyerror("unique0 keyword cannot be used for 'else if' branch.");
+		$$ = $1; // accept unique0 keyword, but ignore it for now
+	} |
+	attr TOK_PRIORITY {
+		AstNode *context = ast_stack.back();
+		if( context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if) )
+			frontend_verilog_yyerror("priority keyword cannot be used for 'else if' branch.");
+		$$ = $1; // accept priority keyword, but ignore it for now
+	} |
+	attr TOK_UNIQUE {
+		AstNode *context = ast_stack.back();
+		if( context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if) )
+			frontend_verilog_yyerror("unique keyword cannot be used for 'else if' branch.");
+		$$ = $1; // accept unique keyword, but ignore it for now
+	};
+
 case_attr:
 	attr {
 		$$ = $1;
@@ -2948,6 +2971,7 @@ behavioral_stmt_list:
 optional_else:
 	TOK_ELSE {
 		AstNode *block = new AstNode(AST_BLOCK);
+		block->attributes[ID::promoted_if] = AstNode::mkconst_int(1, false );
 		AstNode *cond = new AstNode(AST_COND, new AstNode(AST_DEFAULT), block);
 		SET_AST_NODE_LOC(cond, @1, @1);
 
diff --git a/kernel/constids.inc b/kernel/constids.inc
index 4fdbb3dc8..c9b645d53 100644
--- a/kernel/constids.inc
+++ b/kernel/constids.inc
@@ -153,6 +153,7 @@ X(parameter)
 X(PORTID)
 X(PRIORITY)
 X(PRIORITY_MASK)
+X(promoted_if)
 X(Q)
 X(R)
 X(ram_block)
diff --git a/tests/verilog/unique_if.ys b/tests/verilog/unique_if.ys
new file mode 100644
index 000000000..07140b195
--- /dev/null
+++ b/tests/verilog/unique_if.ys
@@ -0,0 +1,10 @@
+read_verilog -sv <<EOF
+module top( input[2:0] a );
+always_comb begin
+    // example from 1800-2012 12.4.2
+    unique if ((a==0) || (a==1)) $display("0 or 1");
+    else if (a == 2) $display("2");
+    else if (a == 4) $display("4");
+end
+endmodule
+EOF
diff --git a/tests/verilog/unique_if_else.ys b/tests/verilog/unique_if_else.ys
new file mode 100644
index 000000000..22184f04f
--- /dev/null
+++ b/tests/verilog/unique_if_else.ys
@@ -0,0 +1,11 @@
+logger -expect error "unique keyword cannot be used for 'else if' branch" 1
+read_verilog -sv <<EOF
+module top( input[2:0] a );
+always_comb begin
+    // invalid example from 1800-2012 12.4.2
+    unique if ((a==0) || (a==1)) $display("0 or 1");
+    else unique if (a == 2) $display("2");
+    else if (a == 4) $display("4");
+end
+endmodule
+EOF
diff --git a/tests/verilog/unique_if_else_begin.ys b/tests/verilog/unique_if_else_begin.ys
new file mode 100644
index 000000000..dcd40adbd
--- /dev/null
+++ b/tests/verilog/unique_if_else_begin.ys
@@ -0,0 +1,12 @@
+read_verilog -sv <<EOF
+module top( input[2:0] a );
+always_comb begin
+    // example from 1800-2012 12.4.2
+    unique if ((a==0) || (a==1)) $display("0 or 1");
+    else begin
+        unique if (a == 2) $display("2");
+        else if (a == 4) $display("4");
+    end
+end
+endmodule
+EOF

From 209df95fb94602394e70665ceeacced2f081cf82 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 24 May 2025 00:23:33 +0000
Subject: [PATCH 034/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 74857d3a8..6ea8e3949 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.53+49
+YOSYS_VER := 0.53+60
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 73e45d29d699d4894fcd0f4739744290a7a04373 Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Sat, 24 May 2025 08:32:58 -0600
Subject: [PATCH 035/931] Add semantic test cases for SystemVerilog
 priority/unique/unique0 "if".

The tests/verilog/*_if_enc.ys scripts instantiate simple encoder
modules, both with and without the SystemVerilog priority/unique/unique0
keywords, and check for consistency between the two for the subset
of inputs where the priority/unique/unique0 "if" result is
well-defined.

These tests vacuously succeed at the moment, since priority/unique
keywords are silently ignored and therefore the generated logic is
trivially identical.  But the test cases will be capable of detecting
certain types of unsound optimisation if priority/unique handling is
introduced later.
---
 tests/verilog/priority_if_enc.ys | 41 ++++++++++++++++++++++++++++++++
 tests/verilog/unique0_if_enc.ys  | 41 ++++++++++++++++++++++++++++++++
 tests/verilog/unique_if_enc.ys   | 41 ++++++++++++++++++++++++++++++++
 3 files changed, 123 insertions(+)
 create mode 100644 tests/verilog/priority_if_enc.ys
 create mode 100644 tests/verilog/unique0_if_enc.ys
 create mode 100644 tests/verilog/unique_if_enc.ys

diff --git a/tests/verilog/priority_if_enc.ys b/tests/verilog/priority_if_enc.ys
new file mode 100644
index 000000000..7ca09cad7
--- /dev/null
+++ b/tests/verilog/priority_if_enc.ys
@@ -0,0 +1,41 @@
+logger -expect log "SAT proof finished - no model found: SUCCESS" 1
+
+read_verilog -sv <<EOF
+// A somewhat contrived model of an encoder, relying on SystemVerilog's
+// strong "if" semantics to guarantee priority encoder behaviour.
+module encoder( input [ 2:0 ] x, output reg [ 1:0 ] y );
+    always_comb begin
+        y = 2'b00;
+
+        if( x[ 2 ] ) y = 2'b11;
+        else if( x[ 1 ] ) y = 2'b10;
+        else if( x[ 0 ] ) y = 2'b01;
+    end
+endmodule
+
+// Almost the same thing, but by using "priority if" we introduce
+// "don't care" states, essentially conveying permission to synthesise
+// a simple encoder instead.
+module dut( input [ 2:0 ] x, output reg [ 1:0 ] y );
+    always_comb begin
+        y = 2'b00;
+
+        priority if( x[ 2 ] ) y = 2'b11;
+        else if( x[ 1 ] ) y = 2'b10;
+        else if( x[ 0 ] ) y = 2'b01;
+    end
+endmodule
+
+// A simple test bench to detect mismatches between the two encoders.
+module compare_encoders( input [ 2:0 ] x, output ok );
+    wire [ 1:0 ] encout;
+    wire [ 1:0 ] dutout;
+    encoder e( x, encout );
+    dut d( x, dutout );
+    // The "priority if" above assumes $countones( x ) > 0.
+    assign ok = encout == dutout || !$countones( x );
+endmodule
+EOF
+
+synth -flatten -top compare_encoders
+sat -prove ok 1
diff --git a/tests/verilog/unique0_if_enc.ys b/tests/verilog/unique0_if_enc.ys
new file mode 100644
index 000000000..e0384067d
--- /dev/null
+++ b/tests/verilog/unique0_if_enc.ys
@@ -0,0 +1,41 @@
+logger -expect log "SAT proof finished - no model found: SUCCESS" 1
+
+read_verilog -sv <<EOF
+// A somewhat contrived model of an encoder, relying on SystemVerilog's
+// strong "if" semantics to guarantee priority encoder behaviour.
+module encoder( input [ 2:0 ] x, output reg [ 1:0 ] y );
+    always_comb begin
+        y = 2'b00;
+
+        if( x[ 2 ] ) y = 2'b11;
+        else if( x[ 1 ] ) y = 2'b10;
+        else if( x[ 0 ] ) y = 2'b01;
+    end
+endmodule
+
+// Almost the same thing, but by using "unique0 if" we introduce
+// "don't care" states, essentially conveying permission to synthesise
+// a simple encoder instead.
+module dut( input [ 2:0 ] x, output reg [ 1:0 ] y );
+    always_comb begin
+        y = 2'b00;
+
+        unique0 if( x[ 2 ] ) y = 2'b11;
+        else if( x[ 1 ] ) y = 2'b10;
+        else if( x[ 0 ] ) y = 2'b01;
+    end
+endmodule
+
+// A simple test bench to detect mismatches between the two encoders.
+module compare_encoders( input [ 2:0 ] x, output ok );
+    wire [ 1:0 ] encout;
+    wire [ 1:0 ] dutout;
+    encoder e( x, encout );
+    dut d( x, dutout );
+    // The "unique0 if" above assumes $onehot0( x ).
+    assign ok = encout == dutout || !$onehot0( x );
+endmodule
+EOF
+
+synth -flatten -top compare_encoders
+sat -prove ok 1
diff --git a/tests/verilog/unique_if_enc.ys b/tests/verilog/unique_if_enc.ys
new file mode 100644
index 000000000..c188d84fe
--- /dev/null
+++ b/tests/verilog/unique_if_enc.ys
@@ -0,0 +1,41 @@
+logger -expect log "SAT proof finished - no model found: SUCCESS" 1
+
+read_verilog -sv <<EOF
+// A somewhat contrived model of an encoder, relying on SystemVerilog's
+// strong "if" semantics to guarantee priority encoder behaviour.
+module encoder( input [ 2:0 ] x, output reg [ 1:0 ] y );
+    always_comb begin
+        y = 2'b00;
+
+        if( x[ 2 ] ) y = 2'b11;
+        else if( x[ 1 ] ) y = 2'b10;
+        else if( x[ 0 ] ) y = 2'b01;
+    end
+endmodule
+
+// Almost the same thing, but by using "unique if" we introduce
+// "don't care" states, essentially conveying permission to synthesise
+// a simple encoder instead.
+module dut( input [ 2:0 ] x, output reg [ 1:0 ] y );
+    always_comb begin
+        y = 2'b00;
+
+        unique if( x[ 2 ] ) y = 2'b11;
+        else if( x[ 1 ] ) y = 2'b10;
+        else if( x[ 0 ] ) y = 2'b01;
+    end
+endmodule
+
+// A simple test bench to detect mismatches between the two encoders.
+module compare_encoders( input [ 2:0 ] x, output ok );
+    wire [ 1:0 ] encout;
+    wire [ 1:0 ] dutout;
+    encoder e( x, encout );
+    dut d( x, dutout );
+    // The "unique if" above assumes $onehot( x ).
+    assign ok = encout == dutout || !$onehot( x );
+endmodule
+EOF
+
+synth -flatten -top compare_encoders
+sat -prove ok 1

From 995a893afdae5710b2986824fbd82b07e1aa02ad Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 26 May 2025 12:16:58 +1200
Subject: [PATCH 036/931] Tests: Add svtypes/typedef_struct_global.ys

---
 tests/svtypes/typedef_struct_global.ys | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 tests/svtypes/typedef_struct_global.ys

diff --git a/tests/svtypes/typedef_struct_global.ys b/tests/svtypes/typedef_struct_global.ys
new file mode 100644
index 000000000..0fed440e4
--- /dev/null
+++ b/tests/svtypes/typedef_struct_global.ys
@@ -0,0 +1,13 @@
+read_verilog -sv << EOF
+typedef struct packed {
+	logic y;
+	logic x;
+} Vec_2_B;
+
+module top;
+
+	Vec_2_B two_dee;
+	wire foo = two_dee.x;
+
+endmodule
+EOF

From 32ce23458faaaae453f6ba5a1180b1931385179e Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 26 May 2025 12:19:33 +1200
Subject: [PATCH 037/931] read_verilog: Mark struct as custom type

Being a custom type means that it will be resolved *before* (e.g.) a wire can use it as a type.
---
 frontends/ast/simplify.cc          | 1 +
 frontends/verilog/verilog_parser.y | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 55087c772..749767743 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1433,6 +1433,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				current_ast_mod->children.push_back(wnode);
 			}
 			basic_prep = true;
+			is_custom_type = false;
 		}
 		break;
 
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 9d0956c8e..68c3ec6ff 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -1855,7 +1855,7 @@ struct_decl:
 	}
 	;
 
-struct_type: struct_union { astbuf2 = $1; } struct_body { $$ = astbuf2; }
+struct_type: struct_union { astbuf2 = $1; astbuf2->is_custom_type = true; } struct_body { $$ = astbuf2; }
 	;
 
 struct_union:

From 33a22b5cd135b55b9e4d0f195832282be542e4b2 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Mon, 26 May 2025 15:28:14 +0100
Subject: [PATCH 038/931] kernel: fix convertible_to_int for overflowing
 unsigned values

---
 kernel/rtlil.cc | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index c08e78dce..021aff73b 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -383,7 +383,23 @@ int RTLIL::Const::as_int(bool is_signed) const
 bool RTLIL::Const::convertible_to_int(bool is_signed) const
 {
 	auto size = get_min_size(is_signed);
-	return (size > 0 && size <= 32);
+
+	if (size <= 0)
+		return false;
+
+	// If it fits in 31 bits it is definitely convertible
+	if (size <= 31)
+		return true;
+
+	// If it fits in 32 bits, it is convertible if signed or if unsigned and the
+	// leading bit is not 1
+	if (size == 32) {
+		if (is_signed)
+			return true;
+		return get_bits().at(31) != State::S1;
+	}
+
+	return false;
 }
 
 std::optional<int> RTLIL::Const::try_as_int(bool is_signed) const

From 353fd0f7f424f5a7ae303b14285f108fc648468e Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Mon, 26 May 2025 15:28:44 +0100
Subject: [PATCH 039/931] tests: test opt_expr for 32 bit unsigned shifts

---
 tests/opt/opt_expr_shift.ys | 47 +++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/tests/opt/opt_expr_shift.ys b/tests/opt/opt_expr_shift.ys
index 943d370dc..5a27562f6 100644
--- a/tests/opt/opt_expr_shift.ys
+++ b/tests/opt/opt_expr_shift.ys
@@ -111,3 +111,50 @@ select -assert-none t:$shr
 select -assert-none t:$sshl
 select -assert-none t:$sshr
 select -assert-none t:$shiftx
+
+design -reset
+
+read_verilog <<EOT
+module top (
+	input  wire        [3:0]  in,
+	output wire        [7:0]  shl,
+	output wire        [7:0]  shr,
+	output wire        [7:0] sshl,
+	output wire        [7:0] sshr,
+	output wire        [7:0] shiftx,
+
+	output wire        [7:0]  shl_s,
+	output wire        [7:0]  shr_s,
+	output wire        [7:0] sshl_s,
+	output wire        [7:0] sshr_s,
+	output wire        [7:0] shiftx_s,
+);
+	assign  shl = in << 32'hffffffff;
+	assign  shr = in >> 32'hffffffff;
+	assign sshl = in <<< 32'hffffffff;
+	assign sshr = in >>> 32'hffffffff;
+	assign shiftx = in[32'hffffffff +: 8];
+
+	wire signed [31:0] shamt = 32'hffffffff;
+	assign  shl_s = in << shamt;
+	assign  shr_s = in >> shamt;
+	assign sshl_s = in <<< shamt;
+	assign sshr_s = in >>> shamt;
+	assign shiftx_s = in[shamt +: 8];
+endmodule
+EOT
+
+select -assert-count 2 t:$shl
+select -assert-count 2 t:$shr
+select -assert-count 2 t:$sshl
+select -assert-count 2 t:$sshr
+select -assert-count 1 t:$shiftx
+
+equiv_opt opt_expr
+
+design -load postopt
+select -assert-none t:$shl
+select -assert-none t:$shr
+select -assert-none t:$sshl
+select -assert-none t:$sshr
+select -assert-none t:$shiftx

From e0c1e88f19a34aa91d53246e86810a8467de7ae4 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Mon, 26 May 2025 15:34:13 +0100
Subject: [PATCH 040/931] kernel: use try_as_int to implement as_int_compress

---
 kernel/rtlil.cc | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 021aff73b..1cdc15bb5 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -455,18 +455,7 @@ void RTLIL::Const::compress(bool is_signed)
 
 std::optional<int> RTLIL::Const::as_int_compress(bool is_signed) const
 {
-	auto size = get_min_size(is_signed);
-	if(size == 0 || size > 32)
-		return std::nullopt;
-
-	int32_t ret = 0;
-	for (auto i = 0; i < size && i < 32; i++)
-		if ((*this)[i] == State::S1)
-			ret |= 1 << i;
-	if (is_signed && (*this)[size-1] == State::S1)
-		for (auto i = size; i < 32; i++)
-			ret |= 1 << i;
-	return ret;
+	return try_as_int(is_signed);
 }
 
 std::string RTLIL::Const::as_string(const char* any) const

From 45a6940f402c400935646cd03afc5a9482930ab0 Mon Sep 17 00:00:00 2001
From: gatecat <gatecat@ds0.me>
Date: Mon, 26 May 2025 11:11:51 +0200
Subject: [PATCH 041/931] cxxrtl: Add debug items for state with private names

Signed-off-by: gatecat <gatecat@ds0.me>
---
 backends/cxxrtl/cxxrtl_backend.cc                 | 5 +++--
 backends/cxxrtl/runtime/cxxrtl/capi/cxxrtl_capi.h | 4 ++++
 backends/cxxrtl/runtime/cxxrtl/cxxrtl.h           | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/backends/cxxrtl/cxxrtl_backend.cc b/backends/cxxrtl/cxxrtl_backend.cc
index 819b2c1df..7080f54d5 100644
--- a/backends/cxxrtl/cxxrtl_backend.cc
+++ b/backends/cxxrtl/cxxrtl_backend.cc
@@ -2429,8 +2429,6 @@ struct CxxrtlWorker {
 			inc_indent();
 				for (auto wire : module->wires()) {
 					const auto &debug_wire_type = debug_wire_types[wire];
-					if (!wire->name.isPublic())
-						continue;
 					count_public_wires++;
 					switch (debug_wire_type.type) {
 						case WireType::BUFFERED:
@@ -2438,6 +2436,9 @@ struct CxxrtlWorker {
 							// Member wire
 							std::vector<std::string> flags;
 
+							if (!wire->name.isPublic())
+								flags.push_back("GENERATED");
+
 							if (wire->port_input && wire->port_output)
 								flags.push_back("INOUT");
 							else if (wire->port_output)
diff --git a/backends/cxxrtl/runtime/cxxrtl/capi/cxxrtl_capi.h b/backends/cxxrtl/runtime/cxxrtl/capi/cxxrtl_capi.h
index ae42733ad..62ca38943 100644
--- a/backends/cxxrtl/runtime/cxxrtl/capi/cxxrtl_capi.h
+++ b/backends/cxxrtl/runtime/cxxrtl/capi/cxxrtl_capi.h
@@ -200,6 +200,10 @@ enum cxxrtl_flag {
 	// node, such as inputs and dangling wires.
 	CXXRTL_UNDRIVEN = 1 << 4,
 
+	// Generated correspond to netlist nodes that correspond to state with an internal name, that
+	// need to be saved, but wouldn't otherwise have a debug item generated.
+	CXXRTL_GENERATED = 1 << 5,
+
 	// More object flags may be added in the future, but the existing ones will never change.
 };
 
diff --git a/backends/cxxrtl/runtime/cxxrtl/cxxrtl.h b/backends/cxxrtl/runtime/cxxrtl/cxxrtl.h
index 9b4f5774f..fbbe2373f 100644
--- a/backends/cxxrtl/runtime/cxxrtl/cxxrtl.h
+++ b/backends/cxxrtl/runtime/cxxrtl/cxxrtl.h
@@ -1294,6 +1294,7 @@ struct debug_item : ::cxxrtl_object {
 		DRIVEN_SYNC = CXXRTL_DRIVEN_SYNC,
 		DRIVEN_COMB = CXXRTL_DRIVEN_COMB,
 		UNDRIVEN    = CXXRTL_UNDRIVEN,
+		GENERATED = CXXRTL_GENERATED,
 	};
 
 	debug_item(const ::cxxrtl_object &object) : cxxrtl_object(object) {}

From 4f968c669521786a58573672a6a9e49fe6a648f2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 27 May 2025 00:24:03 +0000
Subject: [PATCH 042/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e6b60ed39..f82265da0 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.53+60
+YOSYS_VER := 0.53+67
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From e4ab6acb4644cddafb1387e4069855db9727bfd1 Mon Sep 17 00:00:00 2001
From: Lofty <dan.ravensloft@gmail.com>
Date: Tue, 27 May 2025 09:13:14 +0100
Subject: [PATCH 043/931] Add genlib support to abc_new

---
 passes/techmap/abc9_exe.cc | 25 +++++++++++++++++++++----
 passes/techmap/abc_new.cc  |  3 ++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/passes/techmap/abc9_exe.cc b/passes/techmap/abc9_exe.cc
index 651a8375c..dcc507fca 100644
--- a/passes/techmap/abc9_exe.cc
+++ b/passes/techmap/abc9_exe.cc
@@ -168,7 +168,7 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 		vector<int> lut_costs, bool dff_mode, std::string delay_target, std::string /*lutin_shared*/, bool fast_mode,
 		bool show_tempdir, std::string box_file, std::string lut_file,
 		std::vector<std::string> liberty_files, std::string wire_delay, std::string tempdir_name,
-		std::string constr_file, std::vector<std::string> dont_use_cells)
+		std::string constr_file, std::vector<std::string> dont_use_cells, std::vector<std::string> genlib_files)
 {
 	std::string abc9_script;
 
@@ -186,6 +186,10 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 		}
 		if (!constr_file.empty())
 			abc9_script += stringf("read_constr -v \"%s\"; ", constr_file.c_str());
+	} else if (!genlib_files.empty()) {
+		for (std::string genlib_file : genlib_files) {
+			abc9_script += stringf("read_genlib \"%s\"; ", genlib_file.c_str());
+		}
 	}
 
 	log_assert(!box_file.empty());
@@ -384,9 +388,14 @@ struct Abc9ExePass : public Pass {
 		log("        read the given Liberty file as a description of the target cell library.\n");
 		log("        this option can be used multiple times.\n");
 		log("\n");
+		log("    -genlib <file>\n");
+		log("        read the given genlib file as a description of the target cell library.\n");
+		log("        this option can be used multiple times.\n");
+		log("\n");
 		log("    -dont_use <cell_name>\n");
 		log("        avoid usage of the technology cell <cell_name> when mapping the design.\n");
-		log("        this option can be used multiple times.\n");
+		log("        this option can be used multiple times. only supported with Liberty\n");
+		log("        cell libraries.\n");
 		log("\n");
 		log("    -D <picoseconds>\n");
 		log("        set delay target. the string {D} in the default scripts above is\n");
@@ -441,7 +450,7 @@ struct Abc9ExePass : public Pass {
 
 		std::string exe_file = yosys_abc_executable;
 		std::string script_file, clk_str, box_file, lut_file, constr_file;
-		std::vector<std::string> liberty_files, dont_use_cells;
+		std::vector<std::string> liberty_files, genlib_files, dont_use_cells;
 		std::string delay_target, lutin_shared = "-S 1", wire_delay;
 		std::string tempdir_name;
 		bool fast_mode = false, dff_mode = false;
@@ -530,9 +539,15 @@ struct Abc9ExePass : public Pass {
 				continue;
 			}
 			if (arg == "-liberty" && argidx+1 < args.size()) {
+				rewrite_filename(args[argidx+1]);
 				liberty_files.push_back(args[++argidx]);
 				continue;
 			}
+			if (arg == "-genlib" && argidx+1 < args.size()) {
+				rewrite_filename(args[argidx+1]);
+				genlib_files.push_back(args[++argidx]);
+				continue;
+			}
 			if (arg == "-dont_use" && argidx+1 < args.size()) {
 				dont_use_cells.push_back(args[++argidx]);
 				continue;
@@ -601,11 +616,13 @@ struct Abc9ExePass : public Pass {
 		if (tempdir_name.empty())
 			log_cmd_error("abc9_exe '-cwd' option is mandatory.\n");
 
+		if (!genlib_files.empty() && !dont_use_cells.empty())
+			log_cmd_error("abc9_exe '-genlib' is incompatible with '-dont_use'.\n");
 
 		abc9_module(design, script_file, exe_file, lut_costs, dff_mode,
 				delay_target, lutin_shared, fast_mode, show_tempdir,
 				box_file, lut_file, liberty_files, wire_delay, tempdir_name,
-				constr_file, dont_use_cells);
+				constr_file, dont_use_cells, genlib_files);
 	}
 } Abc9ExePass;
 
diff --git a/passes/techmap/abc_new.cc b/passes/techmap/abc_new.cc
index dfa2e2f71..00bd23f86 100644
--- a/passes/techmap/abc_new.cc
+++ b/passes/techmap/abc_new.cc
@@ -68,6 +68,7 @@ struct AbcNewPass : public ScriptPass {
 		log("    -constr <file>\n");
 		log("    -dont_use <cell_name>\n");
 		log("    -liberty <file>\n");
+		log("    -genlib <file>\n");
 		log("        these options are passed on to the 'abc9_exe' command which invokes\n");
 		log("        the ABC tool on individual modules of the design. please see\n");
 		log("        'help abc9_exe' for more details\n");
@@ -90,7 +91,7 @@ struct AbcNewPass : public ScriptPass {
 			if (args[argidx] == "-exe" || args[argidx] == "-script" ||
 					args[argidx] == "-D" ||
 					args[argidx] == "-constr" || args[argidx] == "-dont_use" ||
-					args[argidx] == "-liberty") {
+					args[argidx] == "-liberty" || args[argidx] == "-genlib") {
 				abc_exe_options += " " + args[argidx] + " " + args[argidx + 1];
 				argidx++;
 			} else if (args[argidx] == "-run" && argidx + 1 < args.size()) {

From e046e3cdbf0ab2eb0e5e377eb04867bcb9b26c43 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 28 May 2025 00:24:34 +0000
Subject: [PATCH 044/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f82265da0..ebf886d52 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.53+67
+YOSYS_VER := 0.53+70
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 0072a267cc5380963917fa2971b8198cbc54b635 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Thu, 29 May 2025 16:20:16 +1200
Subject: [PATCH 045/931] write_aiger: Add no-sort option

Prevents sorting input/output bits so that they remain in the same order they were read in.
---
 backends/aiger/aiger.cc | 70 ++++++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 25 deletions(-)

diff --git a/backends/aiger/aiger.cc b/backends/aiger/aiger.cc
index 617d7d85f..3da98d79d 100644
--- a/backends/aiger/aiger.cc
+++ b/backends/aiger/aiger.cc
@@ -132,7 +132,7 @@ struct AigerWriter
 		return a;
 	}
 
-	AigerWriter(Module *module, bool zinit_mode, bool imode, bool omode, bool bmode, bool lmode) : module(module), zinit_mode(zinit_mode), sigmap(module)
+	AigerWriter(Module *module, bool no_sort, bool zinit_mode, bool imode, bool omode, bool bmode, bool lmode) : module(module), zinit_mode(zinit_mode), sigmap(module)
 	{
 		pool<SigBit> undriven_bits;
 		pool<SigBit> unused_bits;
@@ -152,6 +152,34 @@ struct AigerWriter
 			if (wire->port_input)
 				sigmap.add(wire);
 
+		// handle ports
+		for (auto riter = module->ports.rbegin(); riter != module->ports.rend(); ++riter) {
+			auto *wire = module->wire(*riter);
+			for (int i = 0; i < GetSize(wire); i++)
+			{
+				SigBit wirebit(wire, i);
+				SigBit bit = sigmap(wirebit);
+
+				if (bit.wire == nullptr) {
+					if (wire->port_output) {
+						aig_map[wirebit] = (bit == State::S1) ? 1 : 0;
+						output_bits.insert(wirebit);
+					}
+					continue;
+				}
+
+				if (wire->port_input)
+					input_bits.insert(bit);
+
+				if (wire->port_output) {
+					if (bit != wirebit)
+						alias_map[wirebit] = bit;
+					output_bits.insert(wirebit);
+				}
+			}
+		}
+
+		// handle wires
 		for (auto wire : module->wires())
 		{
 			if (wire->attributes.count(ID::init)) {
@@ -167,25 +195,13 @@ struct AigerWriter
 				SigBit wirebit(wire, i);
 				SigBit bit = sigmap(wirebit);
 
-				if (bit.wire == nullptr) {
-					if (wire->port_output) {
-						aig_map[wirebit] = (bit == State::S1) ? 1 : 0;
-						output_bits.insert(wirebit);
-					}
+				if (bit.wire == nullptr)
+					continue;
+				if (wire->port_input || wire->port_output)
 					continue;
-				}
 
 				undriven_bits.insert(bit);
 				unused_bits.insert(bit);
-
-				if (wire->port_input)
-					input_bits.insert(bit);
-
-				if (wire->port_output) {
-					if (bit != wirebit)
-						alias_map[wirebit] = bit;
-					output_bits.insert(wirebit);
-				}
 			}
 
 			if (wire->width == 1) {
@@ -200,12 +216,6 @@ struct AigerWriter
 			}
 		}
 
-		for (auto bit : input_bits)
-			undriven_bits.erase(bit);
-
-		for (auto bit : output_bits)
-			unused_bits.erase(bit);
-
 		for (auto cell : module->cells())
 		{
 			if (cell->type == ID($_NOT_))
@@ -343,8 +353,10 @@ struct AigerWriter
 		}
 
 		init_map.sort();
-		input_bits.sort();
-		output_bits.sort();
+		if (!no_sort) {
+			input_bits.sort();
+			output_bits.sort();
+		}
 		not_map.sort();
 		ff_map.sort();
 		and_map.sort();
@@ -901,6 +913,9 @@ struct AigerBackend : public Backend {
 		log("    -symbols\n");
 		log("        include a symbol table in the generated AIGER file\n");
 		log("\n");
+		log("    -no-sort\n");
+		log("        don't sort input/output ports\n");
+		log("\n");
 		log("    -map <filename>\n");
 		log("        write an extra file with port and latch symbols\n");
 		log("\n");
@@ -925,6 +940,7 @@ struct AigerBackend : public Backend {
 		bool zinit_mode = false;
 		bool miter_mode = false;
 		bool symbols_mode = false;
+		bool no_sort = false;
 		bool verbose_map = false;
 		bool imode = false;
 		bool omode = false;
@@ -955,6 +971,10 @@ struct AigerBackend : public Backend {
 				symbols_mode = true;
 				continue;
 			}
+			if (args[argidx] == "-no-sort") {
+				no_sort = true;
+				continue;
+			}
 			if (map_filename.empty() && args[argidx] == "-map" && argidx+1 < args.size()) {
 				map_filename = args[++argidx];
 				continue;
@@ -1008,7 +1028,7 @@ struct AigerBackend : public Backend {
 		if (!top_module->memories.empty())
 			log_error("Found unmapped memories in module %s: unmapped memories are not supported in AIGER backend!\n", log_id(top_module));
 
-		AigerWriter writer(top_module, zinit_mode, imode, omode, bmode, lmode);
+		AigerWriter writer(top_module, no_sort, zinit_mode, imode, omode, bmode, lmode);
 		writer.write_aiger(*f, ascii_mode, miter_mode, symbols_mode);
 
 		if (!map_filename.empty()) {

From 370d5871f4bd04d6ccd57457827dc1dfcaf74d1e Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Thu, 29 May 2025 20:42:49 -0600
Subject: [PATCH 046/931] verilog: implement SystemVerilog
 unique/unique0/priority if semantics.

There are two elements involved:

1) Apply the relevant full_case and/or parallel_case attribute(s) to
the generated AST_CASE node(s), so that the existing AST frontend and
subsequent passes will generate RTLIL with appropriate behaviour.
(This is handled in the parser "if_attr" non-terminal.)

2) Rearrange the AST_CASE structure when necessary.  For "priority if"
(i.e., full_case), this requires only ensuring that directly nested
"else if" branches also inherit the full_case attribute.  For
"unique if" and "unique0 if" (i.e., parallel_case+full_case and
parallel_case alone), there are two steps:
    a) Flatten the AST_CASE structure such that any direct "else if"
    branches are mapped to additional AST_CONDs in the parent;
    b) Reverse the "direction" of the test: the constant 1 (true)
    is provided in the AST_CASE node, and the expression(s) in the
    if statement(s) are given in each AST_COND.  This is necessary
    because the constant 1, being the common factor, must occupy the
    shared AST_CASE position.
(This is handled in the parser "TOK_IF" expansion of behavioral_stmt.)

Observe that:
 * The generated AST has not been changed for bare "if"s (those
 without unique/priority).  This should minimise the risk of
 unexpected regressions.

 * It is possible that the flattening described in 2) a) above might
 affect the behaviour of expressions with side effects in "unique if"
 statements (consider "unique if( a ) ...; else if( b++ ) ...": if
 a is true, is b incremented?).  While it might be possible to provide
 precise semantics here, IEEE 1800-2012 12.4.2 seems to be deliberately
 vague ("In unique-if and unique0-if, the conditions may be evaluated
 and compared in any order[...] The presence of side effects in
 conditions may cause nondeterministic results.") and so it seems
 doubtful that there is benefit in Yosys providing stronger promises
 on the interpretation of questionable code.
---
 docs/source/yosys_internals/verilog.rst |  5 +--
 frontends/verilog/verilog_parser.y      | 44 ++++++++++++++++++-------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/docs/source/yosys_internals/verilog.rst b/docs/source/yosys_internals/verilog.rst
index eef215e5d..128280c06 100644
--- a/docs/source/yosys_internals/verilog.rst
+++ b/docs/source/yosys_internals/verilog.rst
@@ -377,7 +377,4 @@ from SystemVerilog:
 - Assignments within expressions are supported.
 
 - The ``unique``, ``unique0``, and ``priority`` SystemVerilog keywords are
-  accepted on ``if`` and ``case`` conditionals.  (Those keywords are currently
-  handled in the same way as their equivalent ``full_case`` and
-  ``parallel_case`` attributes on ``case`` statements, and checked
-  for syntactic validity but otherwise ignored on ``if`` statements.)
+  supported on ``if`` and ``case`` conditionals.
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index e70542a92..485b5391c 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -2872,16 +2872,34 @@ behavioral_stmt:
 		ast_stack.pop_back();
 	} |
 	if_attr TOK_IF '(' expr ')' {
-		AstNode *node = new AstNode(AST_CASE);
+		AstNode *node = 0;
+		AstNode *context = ast_stack.back();
+		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if)) {
+			AstNode *outer = ast_stack[ast_stack.size() - 2];
+			log_assert (outer && outer->type == AST_CASE);
+			if (outer->get_bool_attribute(ID::parallel_case)) {
+				// parallel "else if": append condition to outer "if"
+				node = outer;
+				log_assert (node->children.size());
+				delete node->children.back();
+				node->children.pop_back();
+			} else if (outer->get_bool_attribute(ID::full_case))
+				(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
+		}
+		AstNode *expr = new AstNode(AST_REDUCE_BOOL, $4);
+		if (!node) {
+			// not parallel "else if": begin new construction
+			node = new AstNode(AST_CASE);
+			append_attr(node, $1);
+			ast_stack.back()->children.push_back(node);
+			node->children.push_back(node->get_bool_attribute(ID::parallel_case) ? AstNode::mkconst_int(1, false, 1) : expr);
+		}
 		AstNode *block = new AstNode(AST_BLOCK);
-		AstNode *cond = new AstNode(AST_COND, AstNode::mkconst_int(1, false, 1), block);
+		AstNode *cond = new AstNode(AST_COND, node->get_bool_attribute(ID::parallel_case) ? expr : AstNode::mkconst_int(1, false, 1), block);
 		SET_AST_NODE_LOC(cond, @4, @4);
-		ast_stack.back()->children.push_back(node);
-		node->children.push_back(new AstNode(AST_REDUCE_BOOL, $4));
 		node->children.push_back(cond);
 		ast_stack.push_back(node);
 		ast_stack.push_back(block);
-		append_attr(node, $1);
 	} behavioral_stmt {
 		SET_AST_NODE_LOC(ast_stack.back(), @7, @7);
 	} optional_else {
@@ -2907,21 +2925,25 @@ if_attr:
 	} |
 	attr TOK_UNIQUE0 {
 		AstNode *context = ast_stack.back();
-		if( context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if) )
+		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
 			frontend_verilog_yyerror("unique0 keyword cannot be used for 'else if' branch.");
-		$$ = $1; // accept unique0 keyword, but ignore it for now
+		(*$1)[ID::parallel_case] = AstNode::mkconst_int(1, false);
+		$$ = $1;
 	} |
 	attr TOK_PRIORITY {
 		AstNode *context = ast_stack.back();
-		if( context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if) )
+		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
 			frontend_verilog_yyerror("priority keyword cannot be used for 'else if' branch.");
-		$$ = $1; // accept priority keyword, but ignore it for now
+		(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
+		$$ = $1;
 	} |
 	attr TOK_UNIQUE {
 		AstNode *context = ast_stack.back();
-		if( context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if) )
+		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
 			frontend_verilog_yyerror("unique keyword cannot be used for 'else if' branch.");
-		$$ = $1; // accept unique keyword, but ignore it for now
+		(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
+		(*$1)[ID::parallel_case] = AstNode::mkconst_int(1, false);
+		$$ = $1;
 	};
 
 case_attr:

From 7b09dc31af5ca7319ec41b2c1e91dde44a5dce42 Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Thu, 29 May 2025 20:43:41 -0600
Subject: [PATCH 047/931] tests: add cases covering full_case and parallel_case
 semantics

This is @KrystalDelusion's suggestion in PR #5141 to verify
sensible implementation of all 4 possible full_case/parallel_case
combinations.

(Also including two similar tests to check the Verilog frontend
applies the correct attributes when given SystemVerilog
priority/unique case and if statements.)
---
 tests/proc/case_attr.ys               | 57 +++++++++++++++++++++++++++
 tests/verilog/unique_priority_case.ys | 54 +++++++++++++++++++++++++
 tests/verilog/unique_priority_if.ys   | 54 +++++++++++++++++++++++++
 3 files changed, 165 insertions(+)
 create mode 100644 tests/proc/case_attr.ys
 create mode 100644 tests/verilog/unique_priority_case.ys
 create mode 100644 tests/verilog/unique_priority_if.ys

diff --git a/tests/proc/case_attr.ys b/tests/proc/case_attr.ys
new file mode 100644
index 000000000..63be79fe5
--- /dev/null
+++ b/tests/proc/case_attr.ys
@@ -0,0 +1,57 @@
+read_verilog -sv << EOF
+module top (input A, B, C, D, E, F, output reg W, X, Y, Z);
+	always @* begin
+		W = F;
+		(* full_case *)
+		case (C)
+			A: W = D;
+			B: W = E;
+		endcase
+	end
+
+	always @* begin
+		X = F;
+		case (C)
+			A: X = D;
+			B: X = E;
+		endcase
+	end
+
+	always @* begin
+		Y = F;
+		(* full_case, parallel_case *)
+		case (C)
+			A: Y = D;
+			B: Y = E;
+		endcase
+	end
+
+	always @* begin
+		Z = F;
+		(* parallel_case *)
+		case (C)
+			A: Z = D;
+			B: Z = E;
+		endcase
+	end
+endmodule
+EOF
+prep
+# For the ones which use full_case, the F signal shouldn't be included in
+# the input cone of W and Y.
+select -set full o:W o:Y %u %ci*
+select -assert-none i:F @full %i
+select -assert-count 1 o:X %ci* i:F %i
+select -assert-count 1 o:Z %ci* i:F %i
+
+# And for parallel_case there should be 1 $pmux compared to the 2 $mux
+# cells without.
+select -assert-none o:W %ci* t:$pmux %i
+select -assert-none o:X %ci* t:$pmux %i
+select -assert-count 1 o:Y %ci* t:$pmux %i
+select -assert-count 1 o:Z %ci* t:$pmux %i
+
+select -assert-count 2 o:W %ci* t:$mux %i
+select -assert-count 2 o:X %ci* t:$mux %i
+select -assert-none o:Y %ci* t:$mux %i
+select -assert-none o:Z %ci* t:$mux %i
diff --git a/tests/verilog/unique_priority_case.ys b/tests/verilog/unique_priority_case.ys
new file mode 100644
index 000000000..1f87fb19c
--- /dev/null
+++ b/tests/verilog/unique_priority_case.ys
@@ -0,0 +1,54 @@
+read_verilog -sv << EOF
+module top (input A, B, C, D, E, F, output reg W, X, Y, Z);
+	always_comb begin
+		W = F;
+		priority case (C)
+			A: W = D;
+			B: W = E;
+		endcase
+	end
+
+	always_comb begin
+		X = F;
+		case (C)
+			A: X = D;
+			B: X = E;
+		endcase
+	end
+
+	always_comb begin
+		Y = F;
+		unique case (C)
+			A: Y = D;
+			B: Y = E;
+		endcase
+	end
+
+	always_comb begin
+		Z = F;
+		unique0 case (C)
+			A: Z = D;
+			B: Z = E;
+		endcase
+	end
+endmodule
+EOF
+prep
+# For the ones which use priority/unique, the F signal shouldn't be included in
+# the input cone of W and Y.
+select -set full o:W o:Y %u %ci*
+select -assert-none i:F @full %i
+select -assert-count 1 o:X %ci* i:F %i
+select -assert-count 1 o:Z %ci* i:F %i
+
+# And for unique/unique0 there should be 1 $pmux compared to the 2 $mux
+# cells without.
+select -assert-none o:W %ci* t:$pmux %i
+select -assert-none o:X %ci* t:$pmux %i
+select -assert-count 1 o:Y %ci* t:$pmux %i
+select -assert-count 1 o:Z %ci* t:$pmux %i
+
+select -assert-count 2 o:W %ci* t:$mux %i
+select -assert-count 2 o:X %ci* t:$mux %i
+select -assert-none o:Y %ci* t:$mux %i
+select -assert-none o:Z %ci* t:$mux %i
diff --git a/tests/verilog/unique_priority_if.ys b/tests/verilog/unique_priority_if.ys
new file mode 100644
index 000000000..a6053e809
--- /dev/null
+++ b/tests/verilog/unique_priority_if.ys
@@ -0,0 +1,54 @@
+read_verilog -sv << EOF
+module top (input A, B, C, D, E, F, output reg W, X, Y, Z);
+	always_comb begin
+		W = F;
+		priority if (C == A)
+			W = D;
+		else if (C == B)
+			W = E;
+	end
+
+	always_comb begin
+		X = F;
+		if (C == A)
+			X = D;
+		else if (C == B)
+			X = E;
+	end
+
+	always_comb begin
+		Y = F;
+		unique if (C == A)
+			Y = D;
+		else if (C == B)
+			Y = E;
+	end
+
+	always_comb begin
+		Z = F;
+		unique0 if (C == A)
+			Z = D;
+		else if (C == B)
+			Z = E;
+	end
+endmodule
+EOF
+prep
+# For the ones which use priority/unique, the F signal shouldn't be included in
+# the input cone of W and Y.
+select -set full o:W o:Y %u %ci*
+select -assert-none i:F @full %i
+select -assert-count 1 o:X %ci* i:F %i
+select -assert-count 1 o:Z %ci* i:F %i
+
+# And for unique/unique0 there should be 1 $pmux compared to the 2 $mux
+# cells without.
+select -assert-none o:W %ci* t:$pmux %i
+select -assert-none o:X %ci* t:$pmux %i
+select -assert-count 1 o:Y %ci* t:$pmux %i
+select -assert-count 1 o:Z %ci* t:$pmux %i
+
+select -assert-count 2 o:W %ci* t:$mux %i
+select -assert-count 2 o:X %ci* t:$mux %i
+select -assert-none o:Y %ci* t:$mux %i
+select -assert-none o:Z %ci* t:$mux %i

From 7a9d727bd0319619b3d1a37bd5998977ef0c3ac9 Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Thu, 29 May 2025 21:26:28 -0600
Subject: [PATCH 048/931] docs: several small documentation fixes.

---
 docs/source/appendix/primer.rst                           | 8 ++++----
 .../more_scripting/interactive_investigation.rst          | 2 +-
 docs/source/using_yosys/synthesis/abc.rst                 | 2 +-
 docs/source/yosys_internals/flow/verilog_frontend.rst     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/source/appendix/primer.rst b/docs/source/appendix/primer.rst
index 50656af78..f54f99e52 100644
--- a/docs/source/appendix/primer.rst
+++ b/docs/source/appendix/primer.rst
@@ -72,7 +72,7 @@ circuits.
 Tools exist to synthesize high level code (usually in the form of C/C++/SystemC
 code with additional metadata) to behavioural HDL code (usually in the form of
 Verilog or VHDL code). Aside from the many commercial tools for high level
-synthesis there are also a number of FOSS tools for high level synthesis .
+synthesis there are also a number of FOSS tools for high level synthesis.
 
 Behavioural level
 ~~~~~~~~~~~~~~~~~
@@ -185,7 +185,7 @@ advantage that it has a unique normalized form. The latter has much better worst
 case performance and is therefore better suited for the synthesis of large logic
 functions.
 
-Good FOSS tools exists for multi-level logic synthesis .
+Good FOSS tools exists for multi-level logic synthesis.
 
 Yosys contains basic logic synthesis functionality but can also use ABC for the
 logic synthesis step. Using ABC is recommended.
@@ -221,7 +221,7 @@ design description as input and generates an RTL, logical gate or physical gate
 level description of the design as output. Yosys' main strengths are behavioural
 and RTL synthesis. A wide range of commands (synthesis passes) exist within
 Yosys that can be used to perform a wide range of synthesis tasks within the
-domain of behavioural, rtl and logic synthesis. Yosys is designed to be
+domain of behavioural, RTL and logic synthesis. Yosys is designed to be
 extensible and therefore is a good basis for implementing custom synthesis tools
 for specialised tasks.
 
@@ -572,7 +572,7 @@ of lexical tokens given in :numref:`Tab. %s <tab:Basics_tokens>`.
 	TOK_SEMICOLON  \-
 	============== ===============
 
-The lexer is usually generated by a lexer generator (e.g. flex ) from a
+The lexer is usually generated by a lexer generator (e.g. flex) from a
 description file that is using regular expressions to specify the text pattern
 that should match the individual tokens.
 
diff --git a/docs/source/using_yosys/more_scripting/interactive_investigation.rst b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
index c6180306d..e9c9bc9ac 100644
--- a/docs/source/using_yosys/more_scripting/interactive_investigation.rst
+++ b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
@@ -73,7 +73,7 @@ contain bits that are not 0 or 1 (i.e. ``x`` or ``z``). Ordinary 32-bit
 constants are written using decimal numbers.
 
 Single-bit signals are shown as thin arrows pointing from the driver to the
-load. Signals that are multiple bits wide are shown as think arrows.
+load. Signals that are multiple bits wide are shown as thick arrows.
 
 Finally *processes* are shown in boxes with round corners. Processes are Yosys'
 internal representation of the decision-trees and synchronization events
diff --git a/docs/source/using_yosys/synthesis/abc.rst b/docs/source/using_yosys/synthesis/abc.rst
index 91de775e6..0b24af3a1 100644
--- a/docs/source/using_yosys/synthesis/abc.rst
+++ b/docs/source/using_yosys/synthesis/abc.rst
@@ -176,5 +176,5 @@ implemented as whiteboxes too.
 Boxes are arguably the biggest advantage that ABC9 has over ABC: by being aware
 of carry chains and DSPs, it avoids optimising for a path that isn't the actual
 critical path, while the generally-longer paths result in ABC9 being able to
-reduce design area by mapping other logic to larger-but-slower cells.
+reduce design area by mapping other logic to smaller-but-slower cells.
 
diff --git a/docs/source/yosys_internals/flow/verilog_frontend.rst b/docs/source/yosys_internals/flow/verilog_frontend.rst
index e53466687..b6a7ba8a0 100644
--- a/docs/source/yosys_internals/flow/verilog_frontend.rst
+++ b/docs/source/yosys_internals/flow/verilog_frontend.rst
@@ -626,7 +626,7 @@ pass and the passes it launches:
    | This pass replaces the ``RTLIL::SyncRule``\ s to d-type flip-flops (with
      asynchronous resets if necessary).
 
--  | `proc_dff`
+-  | `proc_memwr`
    | This pass replaces the ``RTLIL::MemWriteAction``\ s with `$memwr` cells.
 
 -  | `proc_clean`

From 70291f0e4954a81dfae5a236ecafda9abc43e5f7 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Fri, 30 May 2025 14:25:35 +0100
Subject: [PATCH 049/931] read_verilog: fix -1 constant used to correct post
 increment/decrement

---
 frontends/verilog/verilog_parser.y | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 9d0956c8e..fa624d471 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -336,7 +336,8 @@ static AstNode *addIncOrDecExpr(AstNode *lhs, dict<IdString, AstNode*> *attr, AS
 	log_assert(stmt->type == AST_ASSIGN_EQ);
 	AstNode *expr = stmt->children[0]->clone();
 	if (undo) {
-		AstNode *minus_one = AstNode::mkconst_int(-1, true, 1);
+		AstNode *one = AstNode::mkconst_int(1, false, 1);
+		AstNode *minus_one = new AstNode(AST_NEG, one);
 		expr = new AstNode(op, expr, minus_one);
 	}
 	SET_AST_NODE_LOC(expr, begin, end);

From 3790be114f770b336b9aa815236504f8173870bd Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Fri, 30 May 2025 14:36:05 +0100
Subject: [PATCH 050/931] tests: add tests for verilog pre/post
 increment/decrement in expressions

---
 tests/verilog/incdec.ys | 68 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 tests/verilog/incdec.ys

diff --git a/tests/verilog/incdec.ys b/tests/verilog/incdec.ys
new file mode 100644
index 000000000..9133061a5
--- /dev/null
+++ b/tests/verilog/incdec.ys
@@ -0,0 +1,68 @@
+# From https://github.com/YosysHQ/yosys/issues/5151
+read_verilog -sv <<EOT
+module expr_postsub_comb (
+    input logic [7:0] in_val_m2,
+    input logic [7:0] sub_val_m2,
+    output logic [7:0] out_diff_m2,
+    output logic [7:0] var_out_m2
+);
+    logic [7:0] var_m2;
+    always_comb begin
+      var_m2 = in_val_m2;
+      out_diff_m2 = (var_m2--) - sub_val_m2;
+      var_out_m2 = var_m2;
+    end
+
+    always_comb assert(out_diff_m2 == in_val_m2 - sub_val_m2);
+endmodule
+EOT
+
+prep
+chformal -lower
+sat -prove-asserts -verify
+
+design -reset
+
+read_verilog -sv <<EOT
+module top(
+	input logic [7:0] a,
+	output logic [7:0] pre_inc,
+	output logic [7:0] pre_dec,
+	output logic [7:0] post_inc,
+	output logic [7:0] post_dec
+);
+
+logic [7:0] a_pre_inc, a_pre_dec, a_post_inc, a_post_dec;
+always_comb begin
+	a_pre_inc = a;
+	a_pre_dec = a;
+	a_post_inc = a;
+	a_post_dec = a;
+
+	pre_inc = ++a_pre_inc;
+	pre_dec = --a_pre_dec;
+	post_inc = a_post_inc++;
+	post_dec = a_post_dec--;
+end
+
+wire [7:0] a_inc = a + 1;
+wire [7:0] a_dec = a - 1;
+
+always_comb begin
+	assert(a_pre_inc == a_inc);
+	assert(a_pre_dec == a_dec);
+	assert(a_post_inc == a_inc);
+	assert(a_post_dec == a_dec);
+
+	assert(pre_inc == a_inc);
+	assert(pre_dec == a_dec);
+	assert(post_inc == a);
+	assert(post_dec == a);
+end
+
+endmodule
+EOT
+
+prep
+chformal -lower
+sat -prove-asserts -verify

From e421a03d5aab5b16d86b4c4b2b8d842b064281ab Mon Sep 17 00:00:00 2001
From: Lofty <dan.ravensloft@gmail.com>
Date: Fri, 30 May 2025 22:05:54 +0100
Subject: [PATCH 051/931] CODEOWNERS: add myself for the ABC doc

---
 CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CODEOWNERS b/CODEOWNERS
index 879bb8dee..ef8c803ed 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -20,6 +20,7 @@ passes/opt/opt_lut.cc          @whitequark
 passes/techmap/abc9*.cc        @eddiehung @Ravenslofty
 backends/aiger/xaiger.cc       @eddiehung
 docs/                          @KrystalDelusion
+docs/source/using_yosys/synthesis/abc.rst @KrystalDelusion @Ravenslofty
 .github/workflows/*.yml        @mmicko
 
 ## External Contributors

From 06db8828b2aa4c06f9bd5dae069a016026abadc0 Mon Sep 17 00:00:00 2001
From: KrystalDelusion <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 31 May 2025 09:10:27 +1200
Subject: [PATCH 052/931] abc.rst: Clarify larger-but-slower

---
 docs/source/using_yosys/synthesis/abc.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/source/using_yosys/synthesis/abc.rst b/docs/source/using_yosys/synthesis/abc.rst
index 0b24af3a1..ba12cabc1 100644
--- a/docs/source/using_yosys/synthesis/abc.rst
+++ b/docs/source/using_yosys/synthesis/abc.rst
@@ -176,5 +176,6 @@ implemented as whiteboxes too.
 Boxes are arguably the biggest advantage that ABC9 has over ABC: by being aware
 of carry chains and DSPs, it avoids optimising for a path that isn't the actual
 critical path, while the generally-longer paths result in ABC9 being able to
-reduce design area by mapping other logic to smaller-but-slower cells.
+reduce design area by mapping other logic to slower cells with greater logic
+density.
 

From aac562d36af6c8bf16072c2cc8ed0a2f778a3413 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 31 May 2025 09:55:00 +1200
Subject: [PATCH 053/931] aiger.cc: Explicit unsorted-pool-as-LIFO

---
 backends/aiger/aiger.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backends/aiger/aiger.cc b/backends/aiger/aiger.cc
index 3da98d79d..5b07a7195 100644
--- a/backends/aiger/aiger.cc
+++ b/backends/aiger/aiger.cc
@@ -153,6 +153,9 @@ struct AigerWriter
 				sigmap.add(wire);
 
 		// handle ports
+		// provided the input_bits and output_bits don't get sorted they
+		// will be returned in reverse order, so add them in reverse to
+		// match
 		for (auto riter = module->ports.rbegin(); riter != module->ports.rend(); ++riter) {
 			auto *wire = module->wire(*riter);
 			for (int i = 0; i < GetSize(wire); i++)
@@ -353,6 +356,7 @@ struct AigerWriter
 		}
 
 		init_map.sort();
+		// we are relying here on unsorted pools iterating last-in-first-out
 		if (!no_sort) {
 			input_bits.sort();
 			output_bits.sort();

From 6e3922e1c76a8ea2c689daab4d04198af92a387f Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 31 May 2025 09:57:43 +1200
Subject: [PATCH 054/931] functional.cc: Explicit unsorted-pool-as-LIFO

---
 kernel/functional.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/functional.cc b/kernel/functional.cc
index 4983703e3..211527926 100644
--- a/kernel/functional.cc
+++ b/kernel/functional.cc
@@ -518,6 +518,7 @@ public:
 			if (cell->type.in(ID($assert), ID($assume), ID($live), ID($fair), ID($cover), ID($check)))
 				queue.emplace_back(cell);
 		}
+		// we are relying here on unsorted pools iterating last-in-first-out
 		for (auto riter = module->ports.rbegin(); riter != module->ports.rend(); ++riter) {
 			auto *wire = module->wire(*riter);
 			if (wire && wire->port_input) {

From ab0e3cc05f9e25759450f9fd60d0f0056a4a75e1 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 31 May 2025 12:04:42 +1200
Subject: [PATCH 055/931] Proc: Use selections consistently

All `proc_*` passes now use the same module and process for loops, using `design->all_selected_modules()` and `mod->selected_processes()` respectively.
This simplifies the code, and makes the couple `proc_*` passes that were ignoring boxed modules stop doing that (which seems to have been erroneous rather than intentional).
---
 passes/proc/proc_arst.cc   | 63 ++++++++++++++++++--------------------
 passes/proc/proc_clean.cc  | 18 +++++------
 passes/proc/proc_dff.cc    | 12 +++-----
 passes/proc/proc_dlatch.cc |  9 +++---
 passes/proc/proc_init.cc   | 12 +++-----
 passes/proc/proc_memwr.cc  |  9 +++---
 passes/proc/proc_mux.cc    |  8 ++---
 passes/proc/proc_prune.cc  | 11 ++-----
 passes/proc/proc_rmdead.cc | 14 +++------
 passes/proc/proc_rom.cc    | 11 ++-----
 10 files changed, 69 insertions(+), 98 deletions(-)

diff --git a/passes/proc/proc_arst.cc b/passes/proc/proc_arst.cc
index f01682957..3cd3f6fe4 100644
--- a/passes/proc/proc_arst.cc
+++ b/passes/proc/proc_arst.cc
@@ -288,43 +288,40 @@ struct ProcArstPass : public Pass {
 		extra_args(args, argidx, design);
 		pool<Wire*> delete_initattr_wires;
 
-		for (auto mod : design->modules())
-			if (design->selected(mod)) {
-				SigMap assign_map(mod);
-				for (auto &proc_it : mod->processes) {
-					if (!design->selected(mod, proc_it.second))
-						continue;
-					proc_arst(mod, proc_it.second, assign_map);
-					if (global_arst.empty() || mod->wire(global_arst) == nullptr)
-						continue;
-					std::vector<RTLIL::SigSig> arst_actions;
-					for (auto sync : proc_it.second->syncs)
-						if (sync->type == RTLIL::SyncType::STp || sync->type == RTLIL::SyncType::STn)
-							for (auto &act : sync->actions) {
-								RTLIL::SigSpec arst_sig, arst_val;
-								for (auto &chunk : act.first.chunks())
-									if (chunk.wire && chunk.wire->attributes.count(ID::init)) {
-										RTLIL::SigSpec value = chunk.wire->attributes.at(ID::init);
-										value.extend_u0(chunk.wire->width, false);
-										arst_sig.append(chunk);
-										arst_val.append(value.extract(chunk.offset, chunk.width));
-										delete_initattr_wires.insert(chunk.wire);
-									}
-								if (arst_sig.size()) {
-									log("Added global reset to process %s: %s <- %s\n",
-											proc_it.first.c_str(), log_signal(arst_sig), log_signal(arst_val));
-									arst_actions.push_back(RTLIL::SigSig(arst_sig, arst_val));
+		for (auto mod : design->all_selected_modules()) {
+			SigMap assign_map(mod);
+			for (auto proc : mod->selected_processes()) {
+				proc_arst(mod, proc, assign_map);
+				if (global_arst.empty() || mod->wire(global_arst) == nullptr)
+					continue;
+				std::vector<RTLIL::SigSig> arst_actions;
+				for (auto sync : proc->syncs)
+					if (sync->type == RTLIL::SyncType::STp || sync->type == RTLIL::SyncType::STn)
+						for (auto &act : sync->actions) {
+							RTLIL::SigSpec arst_sig, arst_val;
+							for (auto &chunk : act.first.chunks())
+								if (chunk.wire && chunk.wire->attributes.count(ID::init)) {
+									RTLIL::SigSpec value = chunk.wire->attributes.at(ID::init);
+									value.extend_u0(chunk.wire->width, false);
+									arst_sig.append(chunk);
+									arst_val.append(value.extract(chunk.offset, chunk.width));
+									delete_initattr_wires.insert(chunk.wire);
 								}
+							if (arst_sig.size()) {
+								log("Added global reset to process %s: %s <- %s\n",
+										proc->name.c_str(), log_signal(arst_sig), log_signal(arst_val));
+								arst_actions.push_back(RTLIL::SigSig(arst_sig, arst_val));
 							}
-					if (!arst_actions.empty()) {
-						RTLIL::SyncRule *sync = new RTLIL::SyncRule;
-						sync->type = global_arst_neg ? RTLIL::SyncType::ST0 : RTLIL::SyncType::ST1;
-						sync->signal = mod->wire(global_arst);
-						sync->actions = arst_actions;
-						proc_it.second->syncs.push_back(sync);
-					}
+						}
+				if (!arst_actions.empty()) {
+					RTLIL::SyncRule *sync = new RTLIL::SyncRule;
+					sync->type = global_arst_neg ? RTLIL::SyncType::ST0 : RTLIL::SyncType::ST1;
+					sync->signal = mod->wire(global_arst);
+					sync->actions = arst_actions;
+					proc->syncs.push_back(sync);
 				}
 			}
+		}
 
 		for (auto wire : delete_initattr_wires)
 			wire->attributes.erase(ID::init);
diff --git a/passes/proc/proc_clean.cc b/passes/proc/proc_clean.cc
index 95cb0e88c..b8bd74f50 100644
--- a/passes/proc/proc_clean.cc
+++ b/passes/proc/proc_clean.cc
@@ -208,19 +208,15 @@ struct ProcCleanPass : public Pass {
 		}
 		extra_args(args, argidx, design);
 
-		for (auto mod : design->modules()) {
+		for (auto mod : design->all_selected_modules()) {
 			std::vector<RTLIL::Process *> delme;
-			if (!design->selected(mod))
-				continue;
-			for (auto &proc_it : mod->processes) {
-				if (!design->selected(mod, proc_it.second))
-					continue;
-				proc_clean(mod, proc_it.second, total_count, quiet);
-				if (proc_it.second->syncs.size() == 0 && proc_it.second->root_case.switches.size() == 0 &&
-						proc_it.second->root_case.actions.size() == 0) {
+			for (auto proc : mod->selected_processes()) {
+				proc_clean(mod, proc, total_count, quiet);
+				if (proc->syncs.size() == 0 && proc->root_case.switches.size() == 0 &&
+						proc->root_case.actions.size() == 0) {
 					if (!quiet)
-						log("Removing empty process `%s.%s'.\n", log_id(mod), proc_it.second->name.c_str());
-					delme.push_back(proc_it.second);
+						log("Removing empty process `%s.%s'.\n", log_id(mod), proc->name.c_str());
+					delme.push_back(proc);
 				}
 			}
 			for (auto proc : delme) {
diff --git a/passes/proc/proc_dff.cc b/passes/proc/proc_dff.cc
index d094abf1b..7e3c56552 100644
--- a/passes/proc/proc_dff.cc
+++ b/passes/proc/proc_dff.cc
@@ -306,13 +306,11 @@ struct ProcDffPass : public Pass {
 
 		extra_args(args, 1, design);
 
-		for (auto mod : design->modules())
-			if (design->selected(mod)) {
-				ConstEval ce(mod);
-				for (auto &proc_it : mod->processes)
-					if (design->selected(mod, proc_it.second))
-						proc_dff(mod, proc_it.second, ce);
-			}
+		for (auto mod : design->all_selected_modules()) {
+			ConstEval ce(mod);
+			for (auto proc : mod->selected_processes())
+				proc_dff(mod, proc, ce);
+		}
 	}
 } ProcDffPass;
 
diff --git a/passes/proc/proc_dlatch.cc b/passes/proc/proc_dlatch.cc
index e038a202c..f170dbf36 100644
--- a/passes/proc/proc_dlatch.cc
+++ b/passes/proc/proc_dlatch.cc
@@ -463,11 +463,10 @@ struct ProcDlatchPass : public Pass {
 
 		extra_args(args, 1, design);
 
-		for (auto module : design->selected_modules()) {
-			proc_dlatch_db_t db(module);
-			for (auto &proc_it : module->processes)
-				if (design->selected(module, proc_it.second))
-					proc_dlatch(db, proc_it.second);
+		for (auto mod : design->all_selected_modules()) {
+			proc_dlatch_db_t db(mod);
+			for (auto proc : mod->selected_processes())
+				proc_dlatch(db, proc);
 			db.fixup_muxes();
 		}
 	}
diff --git a/passes/proc/proc_init.cc b/passes/proc/proc_init.cc
index 86e704852..817ced404 100644
--- a/passes/proc/proc_init.cc
+++ b/passes/proc/proc_init.cc
@@ -91,13 +91,11 @@ struct ProcInitPass : public Pass {
 
 		extra_args(args, 1, design);
 
-		for (auto mod : design->modules())
-			if (design->selected(mod)) {
-				SigMap sigmap(mod);
-				for (auto &proc_it : mod->processes)
-					if (design->selected(mod, proc_it.second))
-						proc_init(mod, sigmap, proc_it.second);
-			}
+		for (auto mod : design->all_selected_modules()) {
+			SigMap sigmap(mod);
+			for (auto proc : mod->selected_processes())
+				proc_init(mod, sigmap, proc);
+		}
 	}
 } ProcInitPass;
 
diff --git a/passes/proc/proc_memwr.cc b/passes/proc/proc_memwr.cc
index 58bf9fdd3..88aea39bb 100644
--- a/passes/proc/proc_memwr.cc
+++ b/passes/proc/proc_memwr.cc
@@ -99,9 +99,9 @@ struct ProcMemWrPass : public Pass {
 
 		extra_args(args, 1, design);
 
-		for (auto module : design->selected_modules()) {
+		for (auto mod : design->all_selected_modules()) {
 			dict<IdString, int> next_port_id;
-			for (auto cell : module->cells()) {
+			for (auto cell : mod->cells()) {
 				if (cell->type.in(ID($memwr), ID($memwr_v2))) {
 					bool is_compat = cell->type == ID($memwr);
 					IdString memid = cell->parameters.at(ID::MEMID).decode_string();
@@ -110,9 +110,8 @@ struct ProcMemWrPass : public Pass {
 						next_port_id[memid] = port_id + 1;
 				}
 			}
-			for (auto &proc_it : module->processes)
-				if (design->selected(module, proc_it.second))
-					proc_memwr(module, proc_it.second, next_port_id);
+			for (auto proc : mod->selected_processes())
+				proc_memwr(mod, proc, next_port_id);
 		}
 	}
 } ProcMemWrPass;
diff --git a/passes/proc/proc_mux.cc b/passes/proc/proc_mux.cc
index 2f539c960..61e7f4960 100644
--- a/passes/proc/proc_mux.cc
+++ b/passes/proc/proc_mux.cc
@@ -468,11 +468,9 @@ struct ProcMuxPass : public Pass {
 		}
 		extra_args(args, argidx, design);
 
-		for (auto mod : design->modules())
-			if (design->selected(mod))
-				for (auto &proc_it : mod->processes)
-					if (design->selected(mod, proc_it.second))
-						proc_mux(mod, proc_it.second, ifxmode);
+		for (auto mod : design->all_selected_modules())
+			for (auto proc : mod->selected_processes())
+				proc_mux(mod, proc, ifxmode);
 	}
 } ProcMuxPass;
 
diff --git a/passes/proc/proc_prune.cc b/passes/proc/proc_prune.cc
index 3433557ee..08903d93f 100644
--- a/passes/proc/proc_prune.cc
+++ b/passes/proc/proc_prune.cc
@@ -127,15 +127,10 @@ struct ProcPrunePass : public Pass {
 
 		extra_args(args, 1, design);
 
-		for (auto mod : design->modules()) {
-			if (!design->selected(mod))
-				continue;
+		for (auto mod : design->all_selected_modules()) {
 			PruneWorker worker(mod);
-			for (auto &proc_it : mod->processes) {
-				if (!design->selected(mod, proc_it.second))
-					continue;
-				worker.do_process(proc_it.second);
-			}
+			for (auto proc : mod->selected_processes())
+				worker.do_process(proc);
 			total_removed_count += worker.removed_count;
 			total_promoted_count += worker.promoted_count;
 		}
diff --git a/passes/proc/proc_rmdead.cc b/passes/proc/proc_rmdead.cc
index 2ec11415a..8f5eda085 100644
--- a/passes/proc/proc_rmdead.cc
+++ b/passes/proc/proc_rmdead.cc
@@ -147,21 +147,17 @@ struct ProcRmdeadPass : public Pass {
 		extra_args(args, 1, design);
 
 		int total_counter = 0;
-		for (auto mod : design->modules()) {
-			if (!design->selected(mod))
-				continue;
-			for (auto &proc_it : mod->processes) {
-				if (!design->selected(mod, proc_it.second))
-					continue;
+		for (auto mod : design->all_selected_modules()) {
+			for (auto proc : mod->selected_processes()) {
 				int counter = 0, full_case_counter = 0;
-				for (auto switch_it : proc_it.second->root_case.switches)
+				for (auto switch_it : proc->root_case.switches)
 					proc_rmdead(switch_it, counter, full_case_counter);
 				if (counter > 0)
 					log("Removed %d dead cases from process %s in module %s.\n", counter,
-							log_id(proc_it.first), log_id(mod));
+							log_id(proc), log_id(mod));
 				if (full_case_counter > 0)
 					log("Marked %d switch rules as full_case in process %s in module %s.\n",
-							full_case_counter, log_id(proc_it.first), log_id(mod));
+							full_case_counter, log_id(proc), log_id(mod));
 				total_counter += counter;
 			}
 		}
diff --git a/passes/proc/proc_rom.cc b/passes/proc/proc_rom.cc
index 5f8e47ceb..d3b781e60 100644
--- a/passes/proc/proc_rom.cc
+++ b/passes/proc/proc_rom.cc
@@ -243,15 +243,10 @@ struct ProcRomPass : public Pass {
 
 		extra_args(args, 1, design);
 
-		for (auto mod : design->modules()) {
-			if (!design->selected(mod))
-				continue;
+		for (auto mod : design->all_selected_modules()) {
 			RomWorker worker(mod);
-			for (auto &proc_it : mod->processes) {
-				if (!design->selected(mod, proc_it.second))
-					continue;
-				worker.do_process(proc_it.second);
-			}
+			for (auto proc : mod->selected_processes())
+				worker.do_process(proc);
 			total_count += worker.count;
 		}
 

From 45e8ff476edacc4f3a2bd18a90ae0dbf09b9c182 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Sat, 31 May 2025 01:08:15 +0100
Subject: [PATCH 056/931] read_verilog: copy inout ports in and out of
 functions/tasks

---
 frontends/ast/simplify.cc | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 55087c772..1f9944e2e 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -4099,16 +4099,24 @@ skip_dynamic_range_lvalue_expansion:;
 						delete arg;
 						continue;
 					}
+
 					AstNode *wire_id = new AstNode(AST_IDENTIFIER);
 					wire_id->str = wire->str;
-					AstNode *assign = child->is_input ?
-							new AstNode(AST_ASSIGN_EQ, wire_id, arg) :
-							new AstNode(AST_ASSIGN_EQ, arg, wire_id);
-					assign->children[0]->was_checked = true;
-					if (child->is_input)
+
+					if (child->is_input) {
+						AstNode *assign = new AstNode(AST_ASSIGN_EQ, wire_id->clone(), arg->clone());
+						assign->children[0]->was_checked = true;
 						new_stmts.push_back(assign);
-					else
+					}
+
+					if (child->is_output) {
+						AstNode *assign = new AstNode(AST_ASSIGN_EQ, arg->clone(), wire_id->clone());
+						assign->children[0]->was_checked = true;
 						output_assignments.push_back(assign);
+					}
+
+					delete arg;
+					delete wire_id;
 				}
 			}
 

From 785cabcb0f77ae35258ee0bd6c48ccbdd72474c7 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 31 May 2025 12:16:37 +1200
Subject: [PATCH 057/931] abc9_ops: Skip opt_expr in proc

---
 passes/techmap/abc9_ops.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index 6cb569b5a..ee0a903c2 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -123,7 +123,7 @@ void check(RTLIL::Design *design, bool dff_mode)
 					log_error("Module '%s' with (* abc9_flop *) is a blackbox.\n", log_id(derived_type));
 
 				if (derived_module->has_processes())
-					Pass::call_on_module(design, derived_module, "proc");
+					Pass::call_on_module(design, derived_module, "proc -noopt");
 
 				bool found = false;
 				for (auto derived_cell : derived_module->cells()) {
@@ -204,7 +204,7 @@ void prep_hier(RTLIL::Design *design, bool dff_mode)
 
 			if (!unmap_design->module(derived_type)) {
 				if (derived_module->has_processes())
-					Pass::call_on_module(design, derived_module, "proc");
+					Pass::call_on_module(design, derived_module, "proc -noopt");
 
 				if (derived_module->get_bool_attribute(ID::abc9_flop)) {
 					for (auto derived_cell : derived_module->cells())
@@ -834,7 +834,7 @@ void prep_xaiger(RTLIL::Module *module, bool dff)
 				holes_cell = holes_module->addCell(NEW_ID, cell->type);
 
 				if (box_module->has_processes())
-					Pass::call_on_module(design, box_module, "proc");
+					Pass::call_on_module(design, box_module, "proc -noopt");
 
 				int box_inputs = 0;
 				for (auto port_name : box_ports.at(cell->type)) {

From 97f51bb4b73ad32036c0d4273487221afabcacb6 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Sat, 31 May 2025 01:21:06 +0100
Subject: [PATCH 058/931] tests: add tests for task/function argument
 input/output copying

---
 tests/verilog/func_task_arg_copying.ys | 132 +++++++++++++++++++++++++
 1 file changed, 132 insertions(+)
 create mode 100644 tests/verilog/func_task_arg_copying.ys

diff --git a/tests/verilog/func_task_arg_copying.ys b/tests/verilog/func_task_arg_copying.ys
new file mode 100644
index 000000000..e87c2781b
--- /dev/null
+++ b/tests/verilog/func_task_arg_copying.ys
@@ -0,0 +1,132 @@
+# https://github.com/YosysHQ/yosys/issues/5157
+read_verilog -sv <<EOT
+module stmt_if_task (
+    output logic [7:0] out_val_m6,
+    input logic [7:0] in_val_m6,
+    input bit condition_m6
+);
+    logic [7:0] var_m6;
+    task automatic update_conditional_m6(input bit cond, inout logic [7:0] val);
+        if (cond) begin
+            val++;
+        end else begin
+            --val;
+        end
+    endtask
+    always_comb begin
+        var_m6 = in_val_m6;
+        update_conditional_m6(condition_m6, var_m6);
+        out_val_m6 = var_m6;
+    end
+
+    wire [7:0] m6_inc = in_val_m6 + 1;
+    wire [7:0] m6_dec = in_val_m6 - 1;
+    always_comb assert(out_val_m6 == (condition_m6 ? m6_inc : m6_dec));
+endmodule
+EOT
+
+prep
+chformal -lower
+sat -prove-asserts -verify
+
+design -reset
+
+read_verilog -sv <<EOT
+module top (
+	output logic [7:0] out
+);
+	task automatic set_to_5(inout logic [7:0] val);
+		val = 5;
+	endtask
+
+	always_comb begin
+		out = 0;
+		set_to_5(out);
+	end
+
+	always_comb assert(out == 5);
+endmodule
+EOT
+
+prep
+chformal -lower
+sat -prove-asserts -verify
+
+design -reset
+
+read_verilog -sv <<EOT
+module top (
+	output logic [7:0] a,
+	output logic [7:0] b,
+	output logic [7:0] c
+);
+	task automatic modify(
+		input logic [7:0] t_in,
+		output logic [7:0] t_out,
+		inout logic [7:0] t_inout
+	);
+		assert(t_in == 5);
+		t_in = 6;
+		t_out = 7;
+		assert(t_inout == 8);
+		t_inout = 9;
+	endtask
+
+	always_comb begin
+		a = 5;
+		b = 4;
+		c = 8;
+
+		modify(a, b, c);
+
+		assert(a == 5);
+		assert(b == 7);
+		assert(c == 9);
+	end
+endmodule
+EOT
+
+prep
+chformal -lower
+sat -prove-asserts -verify
+
+design -reset
+
+read_verilog -sv <<EOT
+module top (
+	output logic [7:0] a,
+	output logic [7:0] b,
+	output logic [7:0] c
+);
+	function logic [7:0] modify(
+		input logic [7:0] t_in,
+		output logic [7:0] t_out,
+		inout logic [7:0] t_inout
+	);
+		assert(t_in == 5);
+		t_in = 6;
+		t_out = 7;
+		assert(t_inout == 8);
+		t_inout = 9;
+		modify = 10;
+	endfunction
+
+	logic [7:0] result;
+	always_comb begin
+		a = 5;
+		b = 4;
+		c = 8;
+
+		result = modify(a, b, c);
+
+		assert(a == 5);
+		assert(b == 7);
+		assert(c == 9);
+		assert(result == 10);
+	end
+endmodule
+EOT
+
+prep
+chformal -lower
+sat -prove-asserts -verify

From 86282027c047c965f29d067e59a5c2bd17bf6a69 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 31 May 2025 00:23:36 +0000
Subject: [PATCH 059/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ebf886d52..cff6796c3 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.53+70
+YOSYS_VER := 0.53+81
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 62660b221f7e106dd3d966775a49f96fe65e2248 Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Fri, 30 May 2025 21:13:20 -0600
Subject: [PATCH 060/931] docs: restore and update the note about if/case
 attributes.

---
 docs/source/yosys_internals/verilog.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/source/yosys_internals/verilog.rst b/docs/source/yosys_internals/verilog.rst
index 128280c06..0039aaab7 100644
--- a/docs/source/yosys_internals/verilog.rst
+++ b/docs/source/yosys_internals/verilog.rst
@@ -377,4 +377,7 @@ from SystemVerilog:
 - Assignments within expressions are supported.
 
 - The ``unique``, ``unique0``, and ``priority`` SystemVerilog keywords are
-  supported on ``if`` and ``case`` conditionals.
+  supported on ``if`` and ``case`` conditionals.  (The Verilog frontend
+  will process conditionals using these keywords by annotating their
+  representation with the appropriate ``full_case`` and/or ``parallel_case``
+  attributes, which are described above.)

From 10bb0f472fd2ccd6e28b63e20189ce1922ec7ceb Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Fri, 30 May 2025 21:43:33 -0600
Subject: [PATCH 061/931] docs: mention related effects for multiplexers in the
 cell library.

---
 docs/source/cell/word_mux.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/cell/word_mux.rst b/docs/source/cell/word_mux.rst
index 3eca310f3..234d1016b 100644
--- a/docs/source/cell/word_mux.rst
+++ b/docs/source/cell/word_mux.rst
@@ -24,8 +24,8 @@ are zero, the value from ``A`` input is sent to the output. If the :math:`n`\
 'th bit from ``S`` is set, the value :math:`n`\ 'th ``WIDTH`` bits wide slice of
 the ``B`` input is sent to the output. When more than one bit from ``S`` is set
 the output is undefined. Cells of this type are used to model "parallel cases"
-(defined by using the ``parallel_case`` attribute or detected by an
-optimization).
+(defined by using the ``parallel_case`` attribute, the ``unique`` or ``unique0``
+SystemVerilog keywords, or detected by an optimization).
 
 The `$tribuf` cell is used to implement tristate logic. Cells of this type have
 a ``WIDTH`` parameter and inputs ``A`` and ``EN`` and an output ``Y``. The ``A``

From ca7d94af9953f372da0a3e77780f8b3c2f873440 Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Sat, 31 May 2025 22:38:44 -0600
Subject: [PATCH 062/931] verilog: improve string literal matching speed (fixes
 #5076)

Use a greedy regular expression to match input inside a string
literal, so that flex can accumulate a longer match instead of
invoking a rule for each individual character.
---
 frontends/verilog/verilog_lexer.l | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 8a3734302..8148748d8 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -336,7 +336,7 @@ TIME_SCALE_SUFFIX [munpf]?s
 }
 
 \"		{ BEGIN(STRING); }
-<STRING>\\.	{ yymore(); real_location = old_location; }
+<STRING>([^\"]|\\.)+	{ yymore(); real_location = old_location; }
 <STRING>\"	{
 	BEGIN(0);
 	char *yystr = strdup(yytext);
@@ -376,7 +376,6 @@ TIME_SCALE_SUFFIX [munpf]?s
 	free(yystr);
 	return TOK_STRING;
 }
-<STRING>.	{ yymore(); real_location = old_location; }
 
 and|nand|or|nor|xor|xnor|not|buf|bufif0|bufif1|notif0|notif1 {
 	yylval->string = new std::string(yytext);

From 784de0f6e3cdac8e68f0f0685b4f4e9de4ba433d Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 4 Jun 2025 08:01:21 +0200
Subject: [PATCH 063/931] Make attrmap able to alter memory attributes as well

---
 passes/techmap/attrmap.cc | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/passes/techmap/attrmap.cc b/passes/techmap/attrmap.cc
index 96e65ff2e..58f5a47e5 100644
--- a/passes/techmap/attrmap.cc
+++ b/passes/techmap/attrmap.cc
@@ -270,26 +270,19 @@ struct AttrmapPass : public Pass {
 		{
 			for (auto module : design->selected_modules())
 			{
-				for (auto wire : module->selected_wires())
+				for (auto wire : module->selected_members())
 					attrmap_apply(stringf("%s.%s", log_id(module), log_id(wire)), actions, wire->attributes);
 
-				for (auto cell : module->selected_cells())
-					attrmap_apply(stringf("%s.%s", log_id(module), log_id(cell)), actions, cell->attributes);
-
-				for (auto proc : module->processes)
+				for (auto proc : module->selected_processes())
 				{
-					if (!design->selected(module, proc.second))
-						continue;
-					attrmap_apply(stringf("%s.%s", log_id(module), log_id(proc.first)), actions, proc.second->attributes);
-
-					std::vector<RTLIL::CaseRule*> all_cases = {&proc.second->root_case};
+					std::vector<RTLIL::CaseRule*> all_cases = {&proc->root_case};
 					while (!all_cases.empty()) {
 						RTLIL::CaseRule *cs = all_cases.back();
 						all_cases.pop_back();
-						attrmap_apply(stringf("%s.%s (case)", log_id(module), log_id(proc.first)), actions, cs->attributes);
+						attrmap_apply(stringf("%s.%s (case)", log_id(module), log_id(proc)), actions, cs->attributes);
 
 						for (auto &sw : cs->switches) {
-							attrmap_apply(stringf("%s.%s (switch)", log_id(module), log_id(proc.first)), actions, sw->attributes);
+							attrmap_apply(stringf("%s.%s (switch)", log_id(module), log_id(proc)), actions, sw->attributes);
 							all_cases.insert(all_cases.end(), sw->cases.begin(), sw->cases.end());
 						}
 					}

From c37b7b3bf4d347f67636cc8978e38fbc49e09173 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 4 Jun 2025 10:32:03 +0200
Subject: [PATCH 064/931] simplify: fix single_bit_vector memory leak

---
 frontends/ast/simplify.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 749767743..ef5e49519 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -2087,7 +2087,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					std::swap(range_left, range_right);
 					range_swapped = force_upto;
 				}
-				if (range_left == range_right)
+				if (range_left == range_right && !attributes.count(ID::single_bit_vector))
 					set_attribute(ID::single_bit_vector, mkconst_int(1, false));
 			}
 		} else {

From 19cdbc5a0ced3b02cddf6bba227c7901d9fbbf99 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Wed, 4 Jun 2025 21:02:21 +0100
Subject: [PATCH 065/931] opt_dff: don't remove cells until all have been
 visited to prevent UAF

---
 passes/opt/opt_dff.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/passes/opt/opt_dff.cc b/passes/opt/opt_dff.cc
index 8539432c0..726516fea 100644
--- a/passes/opt/opt_dff.cc
+++ b/passes/opt/opt_dff.cc
@@ -737,6 +737,7 @@ struct OptDffWorker
 	bool run_constbits() {
 		ModWalker modwalker(module->design, module);
 		QuickConeSat qcsat(modwalker);
+		std::vector<RTLIL::Cell*> cells_to_remove;
 
 		// Run as a separate sub-pass, so that we don't mutate (non-FF) cells under ModWalker.
 		bool did_something = false;
@@ -830,7 +831,7 @@ struct OptDffWorker
 					if (!removed_sigbits.count(i))
 						keep_bits.push_back(i);
 				if (keep_bits.empty()) {
-					module->remove(cell);
+					cells_to_remove.emplace_back(cell);
 					did_something = true;
 					continue;
 				}
@@ -840,6 +841,8 @@ struct OptDffWorker
 				did_something = true;
 			}
 		}
+		for (auto* cell : cells_to_remove)
+			module->remove(cell);
 		return did_something;
 	}
 };

From 50b63c64818c604ad6a9b98071687acfbdfd0698 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 5 Jun 2025 00:24:30 +0000
Subject: [PATCH 066/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cff6796c3..66d051be4 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.53+81
+YOSYS_VER := 0.53+98
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 239c265093d9ca3715de6a69d59ed6cbd095a3b3 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 5 Jun 2025 10:58:06 +0200
Subject: [PATCH 067/931] splitnets: handle single-bit vectors consistently

---
 passes/cmds/splitnets.cc   |  6 +++++-
 tests/various/splitnets.ys | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 tests/various/splitnets.ys

diff --git a/passes/cmds/splitnets.cc b/passes/cmds/splitnets.cc
index bd8b9ceac..9e606dee1 100644
--- a/passes/cmds/splitnets.cc
+++ b/passes/cmds/splitnets.cc
@@ -207,8 +207,12 @@ struct SplitnetsPass : public Pass {
 			else
 			{
 				for (auto wire : module->wires()) {
-					if (wire->width > 1 && (wire->port_id == 0 || flag_ports) && design->selected(module, wire))
+					if (((wire->width > 1) || (wire->has_attribute(ID::single_bit_vector)))
+						&& (wire->port_id == 0 || flag_ports)
+						&& design->selected(module, wire)) {
+						wire->attributes.erase(ID::single_bit_vector);
 						worker.splitmap[wire] = std::vector<RTLIL::SigBit>();
+					}
 				}
 
 				for (auto &it : worker.splitmap)
diff --git a/tests/various/splitnets.ys b/tests/various/splitnets.ys
new file mode 100644
index 000000000..29652d508
--- /dev/null
+++ b/tests/various/splitnets.ys
@@ -0,0 +1,32 @@
+read_verilog <<EOT
+module test_module (
+  a,
+  b,
+  x,
+  y
+);
+  input [0:0] a;
+  output [0:0] b;
+  input [1:0] x;
+  output [1:0] y;
+  assign b = a;
+  assign y = x;
+endmodule
+EOT
+proc
+
+splitnets -ports -format __:
+
+select -assert-count 0 w:a;
+select -assert-count 1 w:a_0_;
+select -assert-count 0 w:a_1_;
+select -assert-count 0 w:b;
+select -assert-count 1 w:b_0_;
+select -assert-count 0 w:b_1_;
+
+select -assert-count 0 w:x;
+select -assert-count 1 w:x_0_;
+select -assert-count 1 w:x_1_;
+select -assert-count 0 w:y;
+select -assert-count 1 w:y_0_;
+select -assert-count 1 w:y_1_;

From a16227b2091d3a7a0c5207ad06842a496607587b Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 6 Jun 2025 15:14:40 +0200
Subject: [PATCH 068/931] Revert "Change the implementation of log_debug in
 kernel/log.h from a macro function to a normal function."

This reverts commit 15cfce061a118111984e013a46fd0bbdc064a9ed.
---
 kernel/log.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/log.h b/kernel/log.h
index 6c834c6c6..e26ef072c 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -148,7 +148,7 @@ static inline bool ys_debug(int n = 0) { if (log_force_debug) return true; log_d
 #else
 static inline bool ys_debug(int = 0) { return false; }
 #endif
-static inline void log_debug(const char *format, ...) { if (ys_debug(1)) { va_list args; va_start(args, format); logv(format, args); va_end(args); } }
+#  define log_debug(...) do { if (ys_debug(1)) log(__VA_ARGS__); } while (0)
 
 static inline void log_suppressed() {
 	if (log_debug_suppressed && !log_make_debug) {

From f1dea786031c232ffb26e322a3131eb928f91c94 Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Fri, 6 Jun 2025 15:37:42 +0200
Subject: [PATCH 069/931] don't warn for every blackbox from verific

---
 passes/hierarchy/hierarchy.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/hierarchy/hierarchy.cc b/passes/hierarchy/hierarchy.cc
index d94b5cef6..69ef744ca 100644
--- a/passes/hierarchy/hierarchy.cc
+++ b/passes/hierarchy/hierarchy.cc
@@ -1452,7 +1452,7 @@ struct HierarchyPass : public Pass {
 
 					bool resize_widths = !keep_portwidths && GetSize(w) != GetSize(conn.second);
 					if (resize_widths && verific_mod && boxed_params)
-						log_warning("Ignoring width mismatch on %s.%s.%s from verific, is port width parametrizable?\n",
+						log_debug("Ignoring width mismatch on %s.%s.%s from verific, is port width parametrizable?\n",
 								log_id(module), log_id(cell), log_id(conn.first)
 						);
 					else if (resize_widths) {

From f22248f056b640f63aaeff40510b78d45244d0d4 Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Fri, 6 Jun 2025 16:30:50 +0200
Subject: [PATCH 070/931] downgrade verific warnings about common coding styles

---
 frontends/verific/verific.cc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 411804566..d12f8a5a5 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -3489,6 +3489,14 @@ struct VerificPass : public Pass {
 			// WARNING: instantiating unknown module 'XYZ' (VERI-1063)
 			Message::SetMessageType("VERI-1063", VERIFIC_ERROR);
 
+			// Downgrade warnings about things that are normal
+			// VERIFIC-WARNING [VERI-1209] foo.sv:98: expression size 7 truncated to fit in target size 6
+			Message::SetMessageType("VERI-1209", VERIFIC_INFO);
+			// VERIFIC-WARNING [VERI-1142] foo.sv:55: system task 'display' is ignored for synthesis
+			Message::SetMessageType("VERI-1142", VERIFIC_INFO);
+			// VERIFIC-WARNING [VERI-2418] foo.svh:503: parameter 'all_cfgs_gp' declared inside package 'bp_common_pkg' shall be treated as localparam
+			Message::SetMessageType("VERI-2418", VERIFIC_INFO);
+
 			// https://github.com/YosysHQ/yosys/issues/1055
 			RuntimeFlags::SetVar("veri_elaborate_top_level_modules_having_interface_ports", 1) ;
 #endif
@@ -3547,6 +3555,9 @@ struct VerificPass : public Pass {
 				} else if (Strings::compare(args[argidx].c_str(), "warnings")) {
 					Message::SetAllMessageType(VERIFIC_WARNING, new_type);
 				} else if (Strings::compare(args[argidx].c_str(), "infos")) {
+					Message::SetMessageType("VERI-1209", new_type);
+					Message::SetMessageType("VERI-1142", new_type);
+					Message::SetMessageType("VERI-2418", new_type);
 					Message::SetAllMessageType(VERIFIC_INFO, new_type);
 				} else if (Strings::compare(args[argidx].c_str(), "comments")) {
 					Message::SetAllMessageType(VERIFIC_COMMENT, new_type);

From 3fe31294d63d610da9f776932fdc56481532bb66 Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Fri, 6 Jun 2025 16:41:25 +0200
Subject: [PATCH 071/931] disable warning for intentional use of deprecated
 function (to assert the feature isn't used any more)

---
 kernel/rtlil.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 1cdc15bb5..189db0648 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -2409,7 +2409,14 @@ void RTLIL::Module::check()
 			// assertion check below to make sure that there are no
 			// cases where a cell has a blackbox attribute since
 			// that is deprecated
+			#ifdef __GNUC__
+			#pragma GCC diagnostic push
+			#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+			#endif
 			log_assert(!it.second->get_blackbox_attribute());
+			#ifdef __GNUC__
+			#pragma GCC diagnostic pop
+			#endif
 		}
 	}
 

From 8c38e2081d3171ba6b374d6421b8a5a66f190697 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Fri, 6 Jun 2025 23:46:07 +0100
Subject: [PATCH 072/931] opt_dff: don't emit cells until all have been visited
 to prevent UAF

---
 passes/opt/opt_dff.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/passes/opt/opt_dff.cc b/passes/opt/opt_dff.cc
index 726516fea..4ed4b0cb6 100644
--- a/passes/opt/opt_dff.cc
+++ b/passes/opt/opt_dff.cc
@@ -737,9 +737,12 @@ struct OptDffWorker
 	bool run_constbits() {
 		ModWalker modwalker(module->design, module);
 		QuickConeSat qcsat(modwalker);
-		std::vector<RTLIL::Cell*> cells_to_remove;
 
-		// Run as a separate sub-pass, so that we don't mutate (non-FF) cells under ModWalker.
+		// Defer mutating cells by removing them/emiting new flip flops so that
+		// cell references in modwalker are not invalidated
+		std::vector<RTLIL::Cell*> cells_to_remove;
+		std::vector<FfData> ffs_to_emit;
+
 		bool did_something = false;
 		for (auto cell : module->selected_cells()) {
 			if (!RTLIL::builtin_ff_cell_types().count(cell->type))
@@ -837,12 +840,14 @@ struct OptDffWorker
 				}
 				ff = ff.slice(keep_bits);
 				ff.cell = cell;
-				ff.emit();
+				ffs_to_emit.emplace_back(ff);
 				did_something = true;
 			}
 		}
 		for (auto* cell : cells_to_remove)
 			module->remove(cell);
+		for (auto& ff : ffs_to_emit)
+			ff.emit();
 		return did_something;
 	}
 };

From 7160c9180051b49b5a5a9c0559c3d6cb469f089a Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Fri, 6 Jun 2025 23:46:23 +0100
Subject: [PATCH 073/931] tests: add test for #5164 opt_dff -sat UAF

---
 tests/opt/bug5164.ys | 60 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 tests/opt/bug5164.ys

diff --git a/tests/opt/bug5164.ys b/tests/opt/bug5164.ys
new file mode 100644
index 000000000..4ee71fe45
--- /dev/null
+++ b/tests/opt/bug5164.ys
@@ -0,0 +1,60 @@
+read_rtlil <<EOT
+module \module137
+  wire input 1 \clk
+  wire width 1 output 1 \qa
+  wire width 1 \qb
+  cell $dff \dffa
+    parameter \CLK_POLARITY 1
+    parameter \WIDTH 1
+    connect \CLK \clk
+    connect \D \qb
+    connect \Q \qa
+  end
+  cell $dff \dffb
+    parameter \CLK_POLARITY 1
+    parameter \WIDTH 1
+    connect \CLK \clk
+    connect \D 1'x
+    connect \Q \qb
+  end
+end
+EOT
+equiv_opt -assert opt_dff -sat
+
+design -reset
+
+read_rtlil <<EOT
+module \module137
+  wire output 1 width 9 $2\reg204[8:0]
+  wire input 1 \clk
+  wire width 9 $auto$wreduce.cc:514:run$19340
+  wire width 9 $auto$wreduce.cc:514:run$19341
+  wire width 15 \dffout
+  attribute \init 9'000000000
+  wire width 9 \reg204
+  cell $dff $auto$ff.cc:266:slice$26225
+    parameter \CLK_POLARITY 1
+    parameter \WIDTH 15
+    connect \CLK \clk
+    connect \D { 9'x \reg204 [8:3] }
+    connect \Q \dffout
+  end
+  cell $dff $auto$ff.cc:266:slice$26292
+    parameter \CLK_POLARITY 1
+    parameter \WIDTH 9
+    connect \CLK \clk
+    connect \D $2\reg204[8:0]
+    connect \Q \reg204
+  end
+  cell $mux $procmux$4510
+    parameter \WIDTH 9
+    connect \A 9'x
+    connect \B 9'x
+    connect \S 1'x
+    connect \Y $auto$wreduce.cc:514:run$19340
+  end
+  connect $2\reg204[8:0] $auto$wreduce.cc:514:run$19340
+  connect $auto$wreduce.cc:514:run$19341 [8:3] 6'000000
+end
+EOT
+equiv_opt -assert opt_dff -sat

From 2a25d9241339042ec3a9cea7267091180b7148e9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 7 Jun 2025 00:24:11 +0000
Subject: [PATCH 074/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 66d051be4..4db573410 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.53+98
+YOSYS_VER := 0.53+101
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From d079240d38c6513d87bf5a03bd78df5e093e78a9 Mon Sep 17 00:00:00 2001
From: RonxBulld <526677628@qq.com>
Date: Sat, 7 Jun 2025 22:21:09 +0800
Subject: [PATCH 075/931] Allows calling yosys_shutdown and then yosys_setup to
 restart.

---
 kernel/yosys.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 7d0d688fc..196b78186 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -187,12 +187,14 @@ int run_command(const std::string &command, std::function<void(const std::string
 #endif
 
 bool already_setup = false;
+bool already_shutdown = false;
 
 void yosys_setup()
 {
 	if(already_setup)
 		return;
 	already_setup = true;
+	already_shutdown = false;
 
 #ifdef WITH_PYTHON
 	// With Python 3.12, calling PyImport_AppendInittab on an already
@@ -224,12 +226,11 @@ bool yosys_already_setup()
 	return already_setup;
 }
 
-bool already_shutdown = false;
-
 void yosys_shutdown()
 {
 	if(already_shutdown)
 		return;
+	already_setup = false;
 	already_shutdown = true;
 	log_pop();
 

From db72ec3bde296a9512b2d1e6fabf81cfb07c2c1b Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 9 Jun 2025 07:23:54 +0200
Subject: [PATCH 076/931] Release version 0.54

---
 CHANGELOG           | 15 ++++++++++++++-
 Makefile            |  4 ++--
 docs/source/conf.py |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bdf30260e..bc216234a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,21 @@
 List of major changes and improvements between releases
 =======================================================
 
-Yosys 0.53 .. Yosys 0.54-dev
+Yosys 0.53 .. Yosys 0.54
 --------------------------
+ * New commands and options
+    - Added "-genlib" option to "abc_new" and "abc9_exe" passes.
+    - Added "-verbose" and "-quiet" options to "libcache" pass.
+    - Added "-no-sort" option to "write_aiger" pass.
+
+ * Various
+    - Added "muldiv_c" peepopt.
+    - Accept (and ignore) SystemVerilog unique/priority if.
+    - "read_verilog" copy inout ports in and out of functions/tasks.
+    - Enable single-bit vector wires in RTLIL.
+
+ * Xilinx support
+    - Single-port URAM mapping to support memories 2048 x 144b 
 
 Yosys 0.52 .. Yosys 0.53
 --------------------------
diff --git a/Makefile b/Makefile
index 4db573410..0b81181c1 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.53+101
+YOSYS_VER := 0.54
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -183,7 +183,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 53c22ab.. | wc -l`/;" Makefile
+#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 53c22ab.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index bfcb28730..100605336 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -6,7 +6,7 @@ import os
 project = 'YosysHQ Yosys'
 author = 'YosysHQ GmbH'
 copyright ='2025 YosysHQ GmbH'
-yosys_ver = "0.53"
+yosys_ver = "0.54"
 
 # select HTML theme
 html_theme = 'furo-ys'

From c16cc539d4afca8fdf42aac2168a62bc2c3d2ff0 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 9 Jun 2025 08:12:26 +0200
Subject: [PATCH 077/931] Next dev cycle

---
 CHANGELOG | 3 +++
 Makefile  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bc216234a..537c5682d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 List of major changes and improvements between releases
 =======================================================
 
+Yosys 0.54 .. Yosys 0.55-dev
+--------------------------
+
 Yosys 0.53 .. Yosys 0.54
 --------------------------
  * New commands and options
diff --git a/Makefile b/Makefile
index 0b81181c1..b53526039 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.54
+YOSYS_VER := 0.54+0
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -183,7 +183,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 53c22ab.. | wc -l`/;" Makefile
+	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline db72ec3.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 

From a5edbc8836a923ba1c35fc7b4d7c50980dfc998b Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 9 Jun 2025 19:07:53 +0200
Subject: [PATCH 078/931] Update CI, windows-2019 is deprecated

---
 .github/workflows/extra-builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 0c3146e41..d7ceb3fe3 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -36,7 +36,7 @@ jobs:
   
   vs-build:
     name: Visual Studio build
-    runs-on: windows-2019
+    runs-on: windows-latest
     needs: [vs-prep, pre_job]
     if: needs.pre_job.outputs.should_skip != 'true'
     steps:  

From c561ba84e37991ff9f1d4404308d4d5d6f06ec25 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 10 Jun 2025 00:24:41 +0000
Subject: [PATCH 079/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b53526039..caa808a3a 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.54+0
+YOSYS_VER := 0.54+1
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 4ade617c41487ac4b6ab4ccc57b8d3bdb6cef158 Mon Sep 17 00:00:00 2001
From: KrystalDelusion <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 13 Jun 2025 10:31:53 +1200
Subject: [PATCH 080/931] driver.cc: Don't split options on commas

---
 kernel/driver.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/driver.cc b/kernel/driver.cc
index 9acc58dc4..76c11853e 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -20,6 +20,7 @@
 #include "kernel/yosys.h"
 #include "kernel/hashlib.h"
 #include "libs/sha1/sha1.h"
+#define CXXOPTS_VECTOR_DELIMITER '\0'
 #include "libs/cxxopts/include/cxxopts.hpp"
 #include <iostream>
 

From f019e44e74e33ea48c8039c86cf69d841a13a3c3 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Fri, 13 Jun 2025 21:27:31 +0200
Subject: [PATCH 081/931] verificsva: Support the followed-by operator in cover
 mode

The implementation for the implication operator in cover mode actually
implements the followed-by operator, so we can re-use it unchanged.

It is not always the correct behavior for the implication operator in
cover mode, but a) it will only cause false positives not miss anything
so if the behavior is unexpected it will be visible in the produced
traces, b) it is unlikely to make a difference for most properties one
would practically use in cover mode, c) at least one other widely used
SVA implementations behaves the same way and d) it's not clear whether
we can fix this without rewriting most of verificsva.cc
---
 frontends/verific/verificsva.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontends/verific/verificsva.cc b/frontends/verific/verificsva.cc
index 860d3c166..7652f8130 100644
--- a/frontends/verific/verificsva.cc
+++ b/frontends/verific/verificsva.cc
@@ -1613,7 +1613,10 @@ struct VerificSvaImporter
 		}
 		else
 		if (inst->Type() == PRIM_SVA_OVERLAPPED_IMPLICATION ||
-				inst->Type() == PRIM_SVA_NON_OVERLAPPED_IMPLICATION)
+				inst->Type() == PRIM_SVA_NON_OVERLAPPED_IMPLICATION ||
+				(mode_cover && (
+					inst->Type() == PRIM_SVA_OVERLAPPED_FOLLOWED_BY ||
+					inst->Type() == PRIM_SVA_NON_OVERLAPPED_IMPLICATION)))
 		{
 			Net *antecedent_net = inst->GetInput1();
 			Net *consequent_net = inst->GetInput2();
@@ -1621,7 +1624,7 @@ struct VerificSvaImporter
 
 			SvaFsm antecedent_fsm(clocking, trig);
 			node = parse_sequence(antecedent_fsm, antecedent_fsm.createStartNode(), antecedent_net);
-			if (inst->Type() == PRIM_SVA_NON_OVERLAPPED_IMPLICATION) {
+			if (inst->Type() == PRIM_SVA_NON_OVERLAPPED_IMPLICATION || inst->Type() == PRIM_SVA_NON_OVERLAPPED_FOLLOWED_BY) {
 				int next_node = antecedent_fsm.createNode();
 				antecedent_fsm.createEdge(node, next_node);
 				node = next_node;

From 45131f44251b151381f4bb38eed98d8a758be741 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 14 Jun 2025 10:54:06 +1200
Subject: [PATCH 082/931] chformal: Add -assert2cover option

Also add to chformal tests.
---
 passes/cmds/chformal.cc         | 13 +++++++++++++
 tests/various/chformal_check.ys | 11 +++++++++++
 2 files changed, 24 insertions(+)

diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index e027103bb..572ed2153 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -115,6 +115,7 @@ struct ChformalPass : public Pass {
 		log("\n");
 #endif
 		log("    -assert2assume\n");
+		log("    -assert2cover\n");
 		log("    -assume2assert\n");
 		log("    -live2fair\n");
 		log("    -fair2live\n");
@@ -129,6 +130,7 @@ struct ChformalPass : public Pass {
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		bool assert2assume = false;
+		bool assert2cover = false;
 		bool assume2assert = false;
 		bool live2fair = false;
 		bool fair2live = false;
@@ -187,6 +189,11 @@ struct ChformalPass : public Pass {
 				mode = 'c';
 				continue;
 			}
+			if ((mode == 0 || mode == 'c') && args[argidx] == "-assert2cover") {
+				assert2cover = true;
+				mode = 'c';
+				continue;
+			}
 			if ((mode == 0 || mode == 'c') && args[argidx] == "-assume2assert") {
 				assume2assert = true;
 				mode = 'c';
@@ -218,6 +225,10 @@ struct ChformalPass : public Pass {
 			constr_types.insert(ID($cover));
 		}
 
+		if (assert2assume && assert2cover) {
+			log_cmd_error("Cannot use both -assert2assume and -assert2cover.\n");
+		}
+
 		if (mode == 0)
 			log_cmd_error("Mode option is missing.\n");
 
@@ -381,6 +392,8 @@ struct ChformalPass : public Pass {
 					IdString flavor = formal_flavor(cell);
 					if (assert2assume && flavor == ID($assert))
 						set_formal_flavor(cell, ID($assume));
+					if (assert2cover && flavor == ID($assert))
+						set_formal_flavor(cell, ID($cover));
 					else if (assume2assert && flavor == ID($assume))
 						set_formal_flavor(cell, ID($assert));
 					else if (live2fair && flavor == ID($live))
diff --git a/tests/various/chformal_check.ys b/tests/various/chformal_check.ys
index 951543fa5..2b2d292e4 100644
--- a/tests/various/chformal_check.ys
+++ b/tests/various/chformal_check.ys
@@ -36,6 +36,12 @@ select -assert-count 1 t:$assert
 
 design -load prep
 
+chformal -assert2cover
+
+select -assert-count 1 t:$check r:FLAVOR=cover %i
+
+design -load prep
+
 chformal -assert2assume
 async2sync
 chformal -lower
@@ -66,3 +72,8 @@ design -copy-from gate -as gate top
 miter -equiv -flatten -make_assert gold gate miter
 
 sat -verify -prove-asserts -tempinduct miter
+
+design -load prep
+
+logger -expect error "Cannot use both" 1
+chformal -assert2assume -assert2cover

From fa68299b251127eb8a7375790e8a2a5294a914d1 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 14 Jun 2025 11:06:38 +1200
Subject: [PATCH 083/931] tests/verific: Add chformal tests

---
 tests/verific/chformal.ys | 74 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 tests/verific/chformal.ys

diff --git a/tests/verific/chformal.ys b/tests/verific/chformal.ys
new file mode 100644
index 000000000..0734f7bb7
--- /dev/null
+++ b/tests/verific/chformal.ys
@@ -0,0 +1,74 @@
+verific -formal <<EOT
+
+module top(input clk, a, en);
+    reg a_q = '0;
+    reg en_q = '0;
+
+    always @(posedge clk) begin
+        a_q <= a;
+        en_q <= en;
+    end
+
+    always @(posedge clk)
+        if (en_q)
+            assert(a_q);
+endmodule
+EOT
+
+prep
+
+design -save prep
+
+select -assert-count 1 t:$assert
+
+chformal -assert2assume
+
+select -assert-count 1 t:$assume
+
+chformal -assume2assert
+
+select -assert-count 1 t:$assert
+
+async2sync
+
+chformal -lower
+select -assert-count 1 t:$assert
+
+design -load prep
+
+chformal -assert2cover
+
+select -assert-count 1 t:$cover
+
+design -load prep
+
+chformal -assert2assume
+async2sync
+chformal -lower
+chformal -assume -early
+
+rename -enumerate -pattern assume_% t:$assume
+expose -evert t:$assume
+
+design -save gold
+
+design -load prep
+
+chformal -assert2assume
+chformal -assume -early
+async2sync
+chformal -lower
+
+rename -enumerate -pattern assume_% t:$assume
+expose -evert t:$assume
+
+design -save gate
+
+design -reset
+
+design -copy-from gold -as gold top
+design -copy-from gate -as gate top
+
+miter -equiv -flatten -make_assert gold gate miter
+
+sat -verify -prove-asserts -tempinduct miter

From cd71f190cd8c24748432abe1071f84609b589d9c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 14 Jun 2025 00:24:06 +0000
Subject: [PATCH 084/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index caa808a3a..b452105b1 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.54+1
+YOSYS_VER := 0.54+15
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 41107e5473f117d9314dca6b0bfb140612c130fb Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 16 Jun 2025 21:26:08 +0200
Subject: [PATCH 085/931] log: add -expect types prefix-log, prefix-warning,
 prefix-error

---
 kernel/log.cc         | 81 ++++++++++++++++++++++++++-----------------
 kernel/log.h          |  1 +
 passes/cmds/logger.cc | 17 ++++++---
 3 files changed, 63 insertions(+), 36 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index fabbe09fd..49b2e29cd 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -44,6 +44,7 @@ std::vector<std::string> log_scratchpads;
 std::map<std::string, std::set<std::string>> log_hdump;
 std::vector<std::regex> log_warn_regexes, log_nowarn_regexes, log_werror_regexes;
 dict<std::string, LogExpectedItem> log_expect_log, log_expect_warning, log_expect_error;
+dict<std::string, LogExpectedItem> log_expect_prefix_log, log_expect_prefix_warning, log_expect_prefix_error;
 std::set<std::string> log_warnings, log_experimentals, log_experimentals_ignored;
 int log_warnings_count = 0;
 int log_warnings_count_noexpect = 0;
@@ -178,7 +179,7 @@ void logv(const char *format, va_list ap)
 	{
 		log_warn_regex_recusion_guard = true;
 
-		if (log_warn_regexes.empty() && log_expect_log.empty())
+		if (log_warn_regexes.empty() && log_expect_log.empty() && log_expect_prefix_log.empty())
 		{
 			linebuffer.clear();
 		}
@@ -191,9 +192,9 @@ void logv(const char *format, va_list ap)
 					if (std::regex_search(linebuffer, re))
 						log_warning("Found log message matching -W regex:\n%s", str.c_str());
 
-				for (auto &item : log_expect_log)
-					if (std::regex_search(linebuffer, item.second.pattern))
-						item.second.current_count++;
+				for (auto &[_, item] : log_expect_log)
+					if (std::regex_search(linebuffer, item.pattern))
+						item.current_count++;
 
 				linebuffer.clear();
 			}
@@ -266,9 +267,15 @@ static void logv_warning_with_prefix(const char *prefix,
 				log_error("%s",  message.c_str());
 
 		bool warning_match = false;
-		for (auto &item : log_expect_warning)
-			if (std::regex_search(message, item.second.pattern)) {
-				item.second.current_count++;
+		for (auto &[_, item] : log_expect_warning)
+			if (std::regex_search(message, item.pattern)) {
+				item.current_count++;
+				warning_match = true;
+			}
+
+		for (auto &[_, item] : log_expect_prefix_warning)
+			if (std::regex_search(string(prefix) + message, item.pattern)) {
+				item.current_count++;
 				warning_match = true;
 			}
 
@@ -355,9 +362,13 @@ static void logv_error_with_prefix(const char *prefix,
 
 	log_make_debug = bak_log_make_debug;
 
-	for (auto &item : log_expect_error)
-		if (std::regex_search(log_last_error, item.second.pattern))
-			item.second.current_count++;
+	for (auto &[_, item] : log_expect_error)
+		if (std::regex_search(log_last_error, item.pattern))
+			item.current_count++;
+
+	for (auto &[_, item] : log_expect_prefix_error)
+		if (std::regex_search(string(prefix) + string(log_last_error), item.pattern))
+			item.current_count++;
 
 	log_check_expected();
 
@@ -711,38 +722,39 @@ void log_check_expected()
 	// copy out all of the expected logs so that they cannot be re-checked
 	// or match against themselves
 	dict<std::string, LogExpectedItem> expect_log, expect_warning, expect_error;
+	dict<std::string, LogExpectedItem> expect_prefix_log, expect_prefix_warning, expect_prefix_error;
 	std::swap(expect_warning, log_expect_warning);
 	std::swap(expect_log, log_expect_log);
 	std::swap(expect_error, log_expect_error);
+	std::swap(expect_prefix_warning, log_expect_prefix_warning);
+	std::swap(expect_prefix_log, log_expect_prefix_log);
+	std::swap(expect_prefix_error, log_expect_prefix_error);
 
-	for (auto &item : expect_warning) {
-		if (item.second.current_count == 0) {
+	auto check = [&](const std::string kind, std::string pattern, LogExpectedItem item) {
+		if (item.current_count == 0) {
 			log_warn_regexes.clear();
-			log_error("Expected warning pattern '%s' not found !\n", item.first.c_str());
+			log_error("Expected %s pattern '%s' not found !\n", kind.c_str(), pattern.c_str());
 		}
-		if (item.second.current_count != item.second.expected_count) {
+		if (item.current_count != item.expected_count) {
 			log_warn_regexes.clear();
-			log_error("Expected warning pattern '%s' found %d time(s), instead of %d time(s) !\n",
-				item.first.c_str(), item.second.current_count, item.second.expected_count);
+			log_error("Expected %s pattern '%s' found %d time(s), instead of %d time(s) !\n",
+				kind.c_str(), pattern.c_str(), item.current_count, item.expected_count);
 		}
-	}
+	};
 
-	for (auto &item : expect_log) {
-		if (item.second.current_count == 0) {
-			log_warn_regexes.clear();
-			log_error("Expected log pattern '%s' not found !\n", item.first.c_str());
-		}
-		if (item.second.current_count != item.second.expected_count) {
-			log_warn_regexes.clear();
-			log_error("Expected log pattern '%s' found %d time(s), instead of %d time(s) !\n",
-				item.first.c_str(), item.second.current_count, item.second.expected_count);
-		}
-	}
+	for (auto &[pattern, item] : expect_warning)
+		check("warning", pattern, item);
+	for (auto &[pattern, item] : expect_prefix_warning)
+		check("prefixed warning", pattern, item);
+	for (auto &[pattern, item] : expect_log)
+		check("log", pattern, item);
+	for (auto &[pattern, item] : expect_prefix_log)
+		check("prefixed log", pattern, item);
 
-	for (auto &item : expect_error)
-		if (item.second.current_count == item.second.expected_count) {
+	auto check_err = [&](const std::string kind, std::string pattern, LogExpectedItem item) {
+		if (item.current_count == item.expected_count) {
 			log_warn_regexes.clear();
-			log("Expected error pattern '%s' found !!!\n", item.first.c_str());
+			log("Expected %s pattern '%s' found !!!\n", kind.c_str(), pattern.c_str());
 			yosys_shutdown();
 			#ifdef EMSCRIPTEN
 				throw 0;
@@ -753,8 +765,13 @@ void log_check_expected()
 			#endif
 		} else {
 			log_warn_regexes.clear();
-			log_error("Expected error pattern '%s' not found !\n", item.first.c_str());
+			log_error("Expected %s pattern '%s' not found !\n", kind.c_str(), pattern.c_str());
 		}
+	};
+	for (auto &[pattern, item] : expect_error)
+		check_err("error", pattern, item);
+	for (auto &[pattern, item] : expect_prefix_error)
+		check_err("prefixed error", pattern, item);
 }
 
 // ---------------------------------------------------
diff --git a/kernel/log.h b/kernel/log.h
index e26ef072c..48997d250 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -201,6 +201,7 @@ struct LogExpectedItem
 };
 
 extern dict<std::string, LogExpectedItem> log_expect_log, log_expect_warning, log_expect_error;
+extern dict<std::string, LogExpectedItem> log_expect_prefix_log, log_expect_prefix_warning, log_expect_prefix_error;
 void log_check_expected();
 
 const char *log_signal(const RTLIL::SigSpec &sig, bool autoint = true);
diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc
index 241a8799f..9b7ab1183 100644
--- a/passes/cmds/logger.cc
+++ b/passes/cmds/logger.cc
@@ -60,6 +60,8 @@ struct LoggerPass : public Pass {
 		log("    -expect <type> <regex> <expected_count>\n");
 		log("        expect log, warning or error to appear. matched errors will terminate\n");
 		log("        with exit code 0.\n");
+		log("        Types prefix-log, prefix-warning and prefix-error match the entire\n");
+		log("        logged string, including filename if present.\n");
 		log("\n");
 		log("    -expect-no-warnings\n");
 		log("        gives error in case there is at least one warning that is not expected.\n");
@@ -151,26 +153,33 @@ struct LoggerPass : public Pass {
 			}
 			if (args[argidx] == "-expect" && argidx+3 < args.size()) {
 				std::string type = args[++argidx];
-				if (type!="error" && type!="warning" && type!="log")
+				if (type!="error" && type!="warning" && type!="log"
+						&& type!="prefix-error" && type!="prefix-warning" && type!="prefix-log")
 					log_cmd_error("Expect command require type to be 'log', 'warning' or 'error' !\n");
-				if (type=="error" && log_expect_error.size()>0)
+				if ((type=="error" || type=="prefix-error") && log_expect_error.size()>0)
 					log_cmd_error("Only single error message can be expected !\n");
 				std::string pattern = args[++argidx];
-				if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2);					
+				if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2);
 				int count = atoi(args[++argidx].c_str());
 				if (count<=0)
 					log_cmd_error("Number of expected messages must be higher then 0 !\n");
-				if (type=="error" && count!=1)
+				if ((type=="error" || type=="prefix-error") && count!=1)
 					log_cmd_error("Expected error message occurrences must be 1 !\n");
 				log("Added regex '%s' to expected %s messages list.\n",
 					pattern.c_str(), type.c_str());
 				try {
 					if (type == "error")
 						log_expect_error[pattern] = LogExpectedItem(YS_REGEX_COMPILE(pattern), count);
+					else if (type == "prefix-error")
+						log_expect_prefix_error[pattern] = LogExpectedItem(YS_REGEX_COMPILE(pattern), count);
 					else if (type == "warning")
 						log_expect_warning[pattern] = LogExpectedItem(YS_REGEX_COMPILE(pattern), count);
+					else if (type == "prefix-warning")
+						log_expect_prefix_warning[pattern] = LogExpectedItem(YS_REGEX_COMPILE(pattern), count);
 					else if (type == "log")
 						log_expect_log[pattern] = LogExpectedItem(YS_REGEX_COMPILE(pattern), count);
+					else if (type == "prefix-log")
+						log_expect_prefix_log[pattern] = LogExpectedItem(YS_REGEX_COMPILE(pattern), count);
 					else log_abort();
 				}
 				catch (const std::regex_error& e) {

From 49cd3887a76ab40c5595460c6f162f07085de321 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 16 Jun 2025 21:48:12 +0200
Subject: [PATCH 086/931] const2ast: add diagnostics tests

---
 tests/verilog/constparser_f.ys      | 6 ++++++
 tests/verilog/constparser_f_file.sv | 3 +++
 tests/verilog/constparser_f_file.ys | 2 ++
 tests/verilog/constparser_g.ys      | 6 ++++++
 4 files changed, 17 insertions(+)
 create mode 100644 tests/verilog/constparser_f.ys
 create mode 100644 tests/verilog/constparser_f_file.sv
 create mode 100644 tests/verilog/constparser_f_file.ys
 create mode 100644 tests/verilog/constparser_g.ys

diff --git a/tests/verilog/constparser_f.ys b/tests/verilog/constparser_f.ys
new file mode 100644
index 000000000..3dd3f1323
--- /dev/null
+++ b/tests/verilog/constparser_f.ys
@@ -0,0 +1,6 @@
+read_verilog <<EOT
+module test (y);
+    output signed [2:0] y = 1'b1;
+endmodule
+EOT
+dump
diff --git a/tests/verilog/constparser_f_file.sv b/tests/verilog/constparser_f_file.sv
new file mode 100644
index 000000000..9699a3a2a
--- /dev/null
+++ b/tests/verilog/constparser_f_file.sv
@@ -0,0 +1,3 @@
+module test (y);
+    output signed [2:0] y = 1'bf;
+endmodule
diff --git a/tests/verilog/constparser_f_file.ys b/tests/verilog/constparser_f_file.ys
new file mode 100644
index 000000000..9063cfbf5
--- /dev/null
+++ b/tests/verilog/constparser_f_file.ys
@@ -0,0 +1,2 @@
+logger -expect prefix-error "./constparser_f_file.sv:2: ERROR: Digit larger than 1 used in in base-2 constant." 1
+read_verilog -sv ./constparser_f_file.sv
diff --git a/tests/verilog/constparser_g.ys b/tests/verilog/constparser_g.ys
new file mode 100644
index 000000000..37e31ba20
--- /dev/null
+++ b/tests/verilog/constparser_g.ys
@@ -0,0 +1,6 @@
+logger -expect prefix-error "<<EOT:2: ERROR: syntax error, unexpected invalid token, expecting TOK_BASED_CONSTVAL" 1
+read_verilog <<EOT
+module test (y);
+    output signed [2:0] y = 1'bg;
+endmodule
+EOT

From 4276756f32bc0f84df7885e54e4fe112bc35e898 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 16 Jun 2025 22:50:31 +0200
Subject: [PATCH 087/931] fixup! const2ast: add diagnostics tests

---
 tests/verilog/constparser_f.ys | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/verilog/constparser_f.ys b/tests/verilog/constparser_f.ys
index 3dd3f1323..4c5eff46f 100644
--- a/tests/verilog/constparser_f.ys
+++ b/tests/verilog/constparser_f.ys
@@ -1,6 +1,7 @@
+logger -expect prefix-error "<<EOT:2: ERROR: Digit larger than 1 used in in base-2 constant." 1
 read_verilog <<EOT
 module test (y);
-    output signed [2:0] y = 1'b1;
+    output signed [2:0] y = 1'bf;
 endmodule
 EOT
 dump

From 834a7294b7c790612e9d1a686b374130b43d814e Mon Sep 17 00:00:00 2001
From: garytwong <garytwong@users.noreply.github.com>
Date: Thu, 19 Jun 2025 16:41:18 +0000
Subject: [PATCH 088/931] verilog: fix string literal regular expression
 (#5187)

* verilog: fix string literal regular expression.

A backslash was improperly quoted, causing string literal matching
to fail when the final token before a closing quote was an escaped
backslash.

* verilog: add regression test for string literal regex bug.

Test for bug triggered by escaped backslash immediately before
closing quote (introduced in ca7d94af and fixed by 40aa7eaf).
---
 frontends/verilog/verilog_lexer.l | 2 +-
 tests/verilog/bug5160.v           | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 tests/verilog/bug5160.v

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 8148748d8..40162b8d3 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -336,7 +336,7 @@ TIME_SCALE_SUFFIX [munpf]?s
 }
 
 \"		{ BEGIN(STRING); }
-<STRING>([^\"]|\\.)+	{ yymore(); real_location = old_location; }
+<STRING>([^\\"]|\\.)+	{ yymore(); real_location = old_location; }
 <STRING>\"	{
 	BEGIN(0);
 	char *yystr = strdup(yytext);
diff --git a/tests/verilog/bug5160.v b/tests/verilog/bug5160.v
new file mode 100644
index 000000000..5b141a360
--- /dev/null
+++ b/tests/verilog/bug5160.v
@@ -0,0 +1,5 @@
+// Regression test for bug mentioned in #5160:
+// https://github.com/YosysHQ/yosys/pull/5160#issuecomment-2983643084
+module top;
+    initial $display( "\\" );
+endmodule

From 059228dd4e11b151df2ccb11d4e48e07abf33e8e Mon Sep 17 00:00:00 2001
From: Jiahui Xu <jxu@ethz.ch>
Date: Thu, 19 Jun 2025 18:47:48 +0200
Subject: [PATCH 089/931] Makefile: remove hardcoded -soname for libyosys.so

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b452105b1..ac999417e 100644
--- a/Makefile
+++ b/Makefile
@@ -747,7 +747,7 @@ libyosys.so: $(filter-out kernel/driver.o,$(OBJS))
 ifeq ($(OS), Darwin)
 	$(P) $(CXX) -o libyosys.so -shared -undefined dynamic_lookup -Wl,-install_name,$(LIBDIR)/libyosys.so $(LINKFLAGS) $^ $(LIBS) $(LIBS_VERIFIC)
 else
-	$(P) $(CXX) -o libyosys.so -shared -Wl,-soname,$(LIBDIR)/libyosys.so $(LINKFLAGS) $^ $(LIBS) $(LIBS_VERIFIC)
+	$(P) $(CXX) -o libyosys.so -shared -Wl,-soname,libyosys.so $(LINKFLAGS) $^ $(LIBS) $(LIBS_VERIFIC)
 endif
 
 %.o: %.cc

From 44aa313ba976b68476aaa3d548098d7f54e61094 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 20 Jun 2025 00:24:40 +0000
Subject: [PATCH 090/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b452105b1..e742928b3 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.54+15
+YOSYS_VER := 0.54+17
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From beaca05b405c9547375358df9a86a6193e80902d Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 21 Jun 2025 09:49:56 +1200
Subject: [PATCH 091/931] Include boxes in attrmap

Rename `selected_members` iterator to memb.
Add comment on `selected_processes` loop for clarity.
---
 passes/techmap/attrmap.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/passes/techmap/attrmap.cc b/passes/techmap/attrmap.cc
index 58f5a47e5..7f5bfc94f 100644
--- a/passes/techmap/attrmap.cc
+++ b/passes/techmap/attrmap.cc
@@ -263,16 +263,17 @@ struct AttrmapPass : public Pass {
 
 		if (modattr_mode)
 		{
-			for (auto module : design->selected_whole_modules())
+			for (auto module : design->all_selected_whole_modules())
 				attrmap_apply(stringf("%s", log_id(module)), actions, module->attributes);
 		}
 		else
 		{
-			for (auto module : design->selected_modules())
+			for (auto module : design->all_selected_modules())
 			{
-				for (auto wire : module->selected_members())
-					attrmap_apply(stringf("%s.%s", log_id(module), log_id(wire)), actions, wire->attributes);
+				for (auto memb : module->selected_members())
+					attrmap_apply(stringf("%s.%s", log_id(module), log_id(memb)), actions, memb->attributes);
 
+				// attrmap already applied to process itself during above loop, but not its children
 				for (auto proc : module->selected_processes())
 				{
 					std::vector<RTLIL::CaseRule*> all_cases = {&proc->root_case};

From 34a2abeddb5054df29140baf1c6d5af02a9aac63 Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Fri, 20 Jun 2025 17:26:20 -0600
Subject: [PATCH 092/931] verilog: fix parser "if" memory errors.

Fix buggy memory allocation introduced in #5152:

1) clean up ast_stack to reflect AST node rearrangement when necessary,
to avoid dangling pointer;
2) call free_attr() on unused attribute list when no new syntax node is
created, to avoid leaking it.
---
 frontends/verilog/verilog_parser.y | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 7e53005f3..17edc357d 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -2874,6 +2874,7 @@ behavioral_stmt:
 	} |
 	if_attr TOK_IF '(' expr ')' {
 		AstNode *node = 0;
+		AstNode *block = new AstNode(AST_BLOCK);
 		AstNode *context = ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if)) {
 			AstNode *outer = ast_stack[ast_stack.size() - 2];
@@ -2882,8 +2883,10 @@ behavioral_stmt:
 				// parallel "else if": append condition to outer "if"
 				node = outer;
 				log_assert (node->children.size());
+				ast_stack.pop_back();
 				delete node->children.back();
 				node->children.pop_back();
+				ast_stack.push_back(block);
 			} else if (outer->get_bool_attribute(ID::full_case))
 				(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
 		}
@@ -2894,8 +2897,8 @@ behavioral_stmt:
 			append_attr(node, $1);
 			ast_stack.back()->children.push_back(node);
 			node->children.push_back(node->get_bool_attribute(ID::parallel_case) ? AstNode::mkconst_int(1, false, 1) : expr);
-		}
-		AstNode *block = new AstNode(AST_BLOCK);
+		} else
+			free_attr($1);
 		AstNode *cond = new AstNode(AST_COND, node->get_bool_attribute(ID::parallel_case) ? expr : AstNode::mkconst_int(1, false, 1), block);
 		SET_AST_NODE_LOC(cond, @4, @4);
 		node->children.push_back(cond);

From a0a77cd1d0b8710e8bbfb6f3188b5d43bdaf44fd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 24 Jun 2025 00:24:55 +0000
Subject: [PATCH 093/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e742928b3..77771b6b0 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.54+17
+YOSYS_VER := 0.54+23
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 778079b058a54c3d935bb4e39a8aa26957fb14dd Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 24 Jun 2025 12:01:12 +0200
Subject: [PATCH 094/931] dfflibmap: propagate negated next_state to output
 correctly

---
 passes/techmap/dfflibmap.cc                |  18 +++-
 tests/techmap/dfflibmap_dffsr_not_next.lib |  28 +++++
 tests/techmap/dfflibmap_formal.ys          | 116 +++++++++++++++++++++
 3 files changed, 160 insertions(+), 2 deletions(-)
 create mode 100644 tests/techmap/dfflibmap_dffsr_not_next.lib
 create mode 100644 tests/techmap/dfflibmap_formal.ys

diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index d00fee83b..f0b0ef20b 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -392,9 +392,21 @@ static void find_cell_sr(std::vector<const LibertyAst *> cells, IdString cell_ty
 			continue;
 		if (!parse_next_state(cell, ff->find("next_state"), cell_next_pin, cell_next_pol, cell_enable_pin, cell_enable_pol))
 			continue;
-		if (!parse_pin(cell, ff->find("preset"), cell_set_pin, cell_set_pol) || cell_set_pol != setpol)
+
+		if (!parse_pin(cell, ff->find("preset"), cell_set_pin, cell_set_pol))
 			continue;
-		if (!parse_pin(cell, ff->find("clear"), cell_clr_pin, cell_clr_pol) || cell_clr_pol != clrpol)
+		if (!parse_pin(cell, ff->find("clear"), cell_clr_pin, cell_clr_pol))
+			continue;
+		if (!cell_next_pol) {
+			// next_state is negated
+			// we later propagate this inversion to the output,
+			// which requires the swap of set and reset
+			std::swap(cell_set_pin, cell_clr_pin);
+			std::swap(cell_set_pol, cell_clr_pol);
+		}
+		if (cell_set_pol != setpol)
+			continue;
+		if (cell_clr_pol != clrpol)
 			continue;
 
 		std::map<std::string, char> this_cell_ports;
@@ -432,12 +444,14 @@ static void find_cell_sr(std::vector<const LibertyAst *> cells, IdString cell_ty
 				for (size_t pos = value.find_first_of("\" \t"); pos != std::string::npos; pos = value.find_first_of("\" \t"))
 					value.erase(pos, 1);
 				if (value == ff->args[0]) {
+					// next_state negation propagated to output
 					this_cell_ports[pin->args[0]] = cell_next_pol ? 'Q' : 'q';
 					if (cell_next_pol)
 						found_noninv_output = true;
 					found_output = true;
 				} else
 				if (value == ff->args[1]) {
+					// next_state negation propagated to output
 					this_cell_ports[pin->args[0]] = cell_next_pol ? 'q' : 'Q';
 					if (!cell_next_pol)
 						found_noninv_output = true;
diff --git a/tests/techmap/dfflibmap_dffsr_not_next.lib b/tests/techmap/dfflibmap_dffsr_not_next.lib
new file mode 100644
index 000000000..579dedb10
--- /dev/null
+++ b/tests/techmap/dfflibmap_dffsr_not_next.lib
@@ -0,0 +1,28 @@
+library (test_not_next) {
+  cell (dffsr_not_next) {
+    area : 1.0;
+    pin (Q) {
+      direction : output;
+      function : "STATE";
+    }
+    pin (CLK) {
+      clock : true;
+      direction : input;
+    }
+    pin (D) {
+      direction : input;
+    }
+    pin (RN) {
+      direction : input;
+    }
+    pin (SN) {
+      direction : input;
+    }
+    ff (STATE,STATEN) {
+      clear : "!SN";
+      clocked_on : "CLK";
+      next_state : "!D";
+      preset : "!RN";
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/techmap/dfflibmap_formal.ys b/tests/techmap/dfflibmap_formal.ys
new file mode 100644
index 000000000..11c90ea6c
--- /dev/null
+++ b/tests/techmap/dfflibmap_formal.ys
@@ -0,0 +1,116 @@
+##################################################################
+
+read_verilog -sv -icells <<EOT
+
+module top(input C, D, E, S, R, output [11:0] Q);
+
+$_DFF_P_ ff0 (.C(C), .D(D), .Q(Q[0]));
+$_DFF_PP0_ ff1 (.C(C), .D(D), .R(R), .Q(Q[1]));
+$_DFF_PP1_ ff2 (.C(C), .D(D), .R(R), .Q(Q[2]));
+
+// Formal checking of directly instantiated DFFSR doesn't work at the moment
+// likely due to an equiv_induct assume bug #5196
+
+// // Workaround for DFFSR bug #5194
+// assume property (~R || ~S);
+// $_DFFSR_PPP_ ff3 (.C(C), .D(D), .R(R), .S(S), .Q(Q[3]));
+// $_DFFSR_NNN_ ff4 (.C(C), .D(D), .R(~R), .S(~S), .Q(Q[4]));
+
+$_DFFE_PP_ ff5 (.C(C), .D(D), .E(E), .Q(Q[5]));
+
+assign Q[11:6] = ~Q[5:0];
+
+endmodule
+
+EOT
+
+proc
+opt
+read_liberty dfflibmap_dffn_dffe.lib
+read_liberty dfflibmap_dffsr_not_next.lib
+
+copy top top_unmapped
+dfflibmap -liberty dfflibmap_dffn_dffe.lib -liberty dfflibmap_dffsr_not_next.lib top
+
+async2sync
+flatten
+opt_clean -purge
+equiv_make top top_unmapped equiv
+equiv_induct equiv
+equiv_status -assert equiv
+
+##################################################################
+
+design -reset
+read_verilog -sv -icells <<EOT
+
+module top(input C, D, E, S, R, output [11:0] Q);
+
+$_DFF_P_ ff0 (.C(C), .D(D), .Q(Q[0]));
+$_DFF_PP0_ ff1 (.C(C), .D(D), .R(R), .Q(Q[1]));
+$_DFF_PP1_ ff2 (.C(C), .D(D), .R(R), .Q(Q[2]));
+
+// Formal checking of directly instantiated DFFSR doesn't work at the moment
+// likely due to an equiv_induct assume bug #5196
+
+// // Workaround for DFFSR bug #5194
+// assume property (~R || ~S);
+// $_DFFSR_PPP_ ff3 (.C(C), .D(D), .R(R), .S(S), .Q(Q[3]));
+// $_DFFSR_NNN_ ff4 (.C(C), .D(D), .R(~R), .S(~S), .Q(Q[4]));
+
+$_DFFE_PP_ ff5 (.C(C), .D(D), .E(E), .Q(Q[5]));
+
+assign Q[11:6] = ~Q[5:0];
+
+endmodule
+
+EOT
+
+proc
+opt
+read_liberty dfflibmap_dffr_not_next.lib
+
+copy top top_unmapped
+dfflibmap -liberty dfflibmap_dffr_not_next.lib top
+
+async2sync
+flatten
+opt_clean -purge
+equiv_make top top_unmapped equiv
+equiv_induct equiv
+equiv_status -assert equiv
+
+##################################################################
+
+design -reset
+read_verilog <<EOT
+
+module top(input C, D, E, S, R, output Q);
+// DFFSR with priority R over S
+always @(posedge C, posedge R, posedge S)
+    if (R == 1)
+        Q <= 0;
+    else if (S == 1)
+        Q <= 1;
+    else
+        Q <= D;
+
+endmodule
+
+EOT
+
+proc
+opt
+read_liberty dfflibmap_dffn_dffe.lib
+read_liberty dfflibmap_dffsr_not_next.lib
+
+copy top top_unmapped
+simplemap top
+dfflibmap -liberty dfflibmap_dffn_dffe.lib -liberty dfflibmap_dffsr_not_next.lib top
+
+async2sync
+flatten
+opt_clean -purge
+equiv_make top top_unmapped equiv
+equiv_induct equiv
+equiv_status -assert equiv
\ No newline at end of file

From 73cbcffbbb42f6804085ce91c1f3c7612f505115 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 24 Jun 2025 12:31:30 +0200
Subject: [PATCH 095/931] fixup! dfflibmap: propagate negated next_state to
 output correctly

---
 tests/techmap/dfflibmap_dffr_not_next.lib | 33 +++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tests/techmap/dfflibmap_dffr_not_next.lib

diff --git a/tests/techmap/dfflibmap_dffr_not_next.lib b/tests/techmap/dfflibmap_dffr_not_next.lib
new file mode 100644
index 000000000..74004bea1
--- /dev/null
+++ b/tests/techmap/dfflibmap_dffr_not_next.lib
@@ -0,0 +1,33 @@
+library(test) {
+  cell (dffr_not_next) {
+    area : 6;
+    ff("IQ", "IQN") {
+      next_state : "!D";
+      clocked_on : "CLK";
+      clear      : "CLEAR";
+      preset     : "PRESET";
+      clear_preset_var1 : L;
+      clear_preset_var2 : L;
+    }
+    pin(D) {
+      direction : input;
+    }
+    pin(CLK) {
+      direction : input;
+    }
+    pin(CLEAR) {
+      direction : input;
+    }
+    pin(PRESET) {
+      direction : input;
+    }
+    pin(Q) {
+      direction: output;
+      function : "IQ";
+    }
+    pin(QN) {
+      direction: output;
+      function : "IQN";
+    }
+  }
+}

From 2b659626a3b5f4c3fe506e624f4d4aa55c835fc4 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 13 Jun 2025 14:25:22 +0200
Subject: [PATCH 096/931] rename: add -unescape

---
 backends/verilog/verilog_backend.cc | 106 ++++++++++++++++------------
 backends/verilog/verilog_backend.h  |  39 ++++++++++
 passes/cmds/rename.cc               |  75 ++++++++++++++++++++
 tests/various/rename_unescape.ys    |  41 +++++++++++
 4 files changed, 215 insertions(+), 46 deletions(-)
 create mode 100644 backends/verilog/verilog_backend.h
 create mode 100644 tests/various/rename_unescape.ys

diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index 997740a7c..1cef7be60 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -28,12 +28,71 @@
 #include "kernel/ff.h"
 #include "kernel/mem.h"
 #include "kernel/fmt.h"
+#include "backends/verilog/verilog_backend.h"
 #include <string>
 #include <sstream>
 #include <set>
 #include <map>
 
 USING_YOSYS_NAMESPACE
+
+using namespace VERILOG_BACKEND;
+
+const pool<string> VERILOG_BACKEND::verilog_keywords() {
+	static const pool<string> res = {
+		// IEEE 1800-2017 Annex B
+		"accept_on", "alias", "always", "always_comb", "always_ff", "always_latch", "and", "assert", "assign", "assume", "automatic", "before",
+		"begin", "bind", "bins", "binsof", "bit", "break", "buf", "bufif0", "bufif1", "byte", "case", "casex", "casez", "cell", "chandle",
+		"checker", "class", "clocking", "cmos", "config", "const", "constraint", "context", "continue", "cover", "covergroup", "coverpoint",
+		"cross", "deassign", "default", "defparam", "design", "disable", "dist", "do", "edge", "else", "end", "endcase", "endchecker",
+		"endclass", "endclocking", "endconfig", "endfunction", "endgenerate", "endgroup", "endinterface", "endmodule", "endpackage",
+		"endprimitive", "endprogram", "endproperty", "endsequence", "endspecify", "endtable", "endtask", "enum", "event", "eventually",
+		"expect", "export", "extends", "extern", "final", "first_match", "for", "force", "foreach", "forever", "fork", "forkjoin", "function",
+		"generate", "genvar", "global", "highz0", "highz1", "if", "iff", "ifnone", "ignore_bins", "illegal_bins", "implements", "implies",
+		"import", "incdir", "include", "initial", "inout", "input", "inside", "instance", "int", "integer", "interconnect", "interface",
+		"intersect", "join", "join_any", "join_none", "large", "let", "liblist", "library", "local", "localparam", "logic", "longint",
+		"macromodule", "matches", "medium", "modport", "module", "nand", "negedge", "nettype", "new", "nexttime", "nmos", "nor",
+		"noshowcancelled", "not", "notif0", "notif1", "null", "or", "output", "package", "packed", "parameter", "pmos", "posedge", "primitive",
+		"priority", "program", "property", "protected", "pull0", "pull1", "pulldown", "pullup", "pulsestyle_ondetect", "pulsestyle_onevent",
+		"pure", "rand", "randc", "randcase", "randsequence", "rcmos", "real", "realtime", "ref", "reg", "reject_on", "release", "repeat",
+		"restrict", "return", "rnmos", "rpmos", "rtran", "rtranif0", "rtranif1", "s_always", "s_eventually", "s_nexttime", "s_until",
+		"s_until_with", "scalared", "sequence", "shortint", "shortreal", "showcancelled", "signed", "small", "soft", "solve", "specify",
+		"specparam", "static", "string", "strong", "strong0", "strong1", "struct", "super", "supply0", "supply1", "sync_accept_on",
+		"sync_reject_on", "table", "tagged", "task", "this", "throughout", "time", "timeprecision", "timeunit", "tran", "tranif0", "tranif1",
+		"tri", "tri0", "tri1", "triand", "trior", "trireg", "type", "typedef", "union", "unique", "unique0", "unsigned", "until", "until_with",
+		"untyped", "use", "uwire", "var", "vectored", "virtual", "void", "wait", "wait_order", "wand", "weak", "weak0", "weak1", "while",
+		"wildcard", "wire", "with", "within", "wor", "xnor", "xor",
+	};
+	return res;
+}
+
+bool VERILOG_BACKEND::char_is_verilog_escaped(char c) {
+	if ('0' <= c && c <= '9')
+		return false;
+	if ('a' <= c && c <= 'z')
+		return false;
+	if ('A' <= c && c <= 'Z')
+		return false;
+	if (c == '_')
+		return false;
+
+	return true;
+}
+
+bool VERILOG_BACKEND::id_is_verilog_escaped(const std::string &str) {
+	if ('0' <= str[0] && str[0] <= '9')
+		return true;
+
+	for (int i = 0; str[i]; i++)
+		if (char_is_verilog_escaped(str[i]))
+			return true;
+
+	if (verilog_keywords().count(str))
+		return true;
+
+	return false;
+}
+
 PRIVATE_NAMESPACE_BEGIN
 
 bool verbose, norename, noattr, attr2comment, noexpr, nodec, nohex, nostr, extmem, defparam, decimal, siminit, systemverilog, simple_lhs, noparallelcase;
@@ -105,7 +164,6 @@ std::string next_auto_id()
 std::string id(RTLIL::IdString internal_id, bool may_rename = true)
 {
 	const char *str = internal_id.c_str();
-	bool do_escape = false;
 
 	if (may_rename && auto_name_map.count(internal_id) != 0)
 		return stringf("%s_%0*d_", auto_prefix.c_str(), auto_name_digits, auto_name_offset + auto_name_map[internal_id]);
@@ -113,51 +171,7 @@ std::string id(RTLIL::IdString internal_id, bool may_rename = true)
 	if (*str == '\\')
 		str++;
 
-	if ('0' <= *str && *str <= '9')
-		do_escape = true;
-
-	for (int i = 0; str[i]; i++)
-	{
-		if ('0' <= str[i] && str[i] <= '9')
-			continue;
-		if ('a' <= str[i] && str[i] <= 'z')
-			continue;
-		if ('A' <= str[i] && str[i] <= 'Z')
-			continue;
-		if (str[i] == '_')
-			continue;
-		do_escape = true;
-		break;
-	}
-
-	static const pool<string> keywords = {
-		// IEEE 1800-2017 Annex B
-		"accept_on", "alias", "always", "always_comb", "always_ff", "always_latch", "and", "assert", "assign", "assume", "automatic", "before",
-		"begin", "bind", "bins", "binsof", "bit", "break", "buf", "bufif0", "bufif1", "byte", "case", "casex", "casez", "cell", "chandle",
-		"checker", "class", "clocking", "cmos", "config", "const", "constraint", "context", "continue", "cover", "covergroup", "coverpoint",
-		"cross", "deassign", "default", "defparam", "design", "disable", "dist", "do", "edge", "else", "end", "endcase", "endchecker",
-		"endclass", "endclocking", "endconfig", "endfunction", "endgenerate", "endgroup", "endinterface", "endmodule", "endpackage",
-		"endprimitive", "endprogram", "endproperty", "endsequence", "endspecify", "endtable", "endtask", "enum", "event", "eventually",
-		"expect", "export", "extends", "extern", "final", "first_match", "for", "force", "foreach", "forever", "fork", "forkjoin", "function",
-		"generate", "genvar", "global", "highz0", "highz1", "if", "iff", "ifnone", "ignore_bins", "illegal_bins", "implements", "implies",
-		"import", "incdir", "include", "initial", "inout", "input", "inside", "instance", "int", "integer", "interconnect", "interface",
-		"intersect", "join", "join_any", "join_none", "large", "let", "liblist", "library", "local", "localparam", "logic", "longint",
-		"macromodule", "matches", "medium", "modport", "module", "nand", "negedge", "nettype", "new", "nexttime", "nmos", "nor",
-		"noshowcancelled", "not", "notif0", "notif1", "null", "or", "output", "package", "packed", "parameter", "pmos", "posedge", "primitive",
-		"priority", "program", "property", "protected", "pull0", "pull1", "pulldown", "pullup", "pulsestyle_ondetect", "pulsestyle_onevent",
-		"pure", "rand", "randc", "randcase", "randsequence", "rcmos", "real", "realtime", "ref", "reg", "reject_on", "release", "repeat",
-		"restrict", "return", "rnmos", "rpmos", "rtran", "rtranif0", "rtranif1", "s_always", "s_eventually", "s_nexttime", "s_until",
-		"s_until_with", "scalared", "sequence", "shortint", "shortreal", "showcancelled", "signed", "small", "soft", "solve", "specify",
-		"specparam", "static", "string", "strong", "strong0", "strong1", "struct", "super", "supply0", "supply1", "sync_accept_on",
-		"sync_reject_on", "table", "tagged", "task", "this", "throughout", "time", "timeprecision", "timeunit", "tran", "tranif0", "tranif1",
-		"tri", "tri0", "tri1", "triand", "trior", "trireg", "type", "typedef", "union", "unique", "unique0", "unsigned", "until", "until_with",
-		"untyped", "use", "uwire", "var", "vectored", "virtual", "void", "wait", "wait_order", "wand", "weak", "weak0", "weak1", "while",
-		"wildcard", "wire", "with", "within", "wor", "xnor", "xor",
-	};
-	if (keywords.count(str))
-		do_escape = true;
-
-	if (do_escape)
+	if (id_is_verilog_escaped(str))
 		return "\\" + std::string(str) + " ";
 	return std::string(str);
 }
diff --git a/backends/verilog/verilog_backend.h b/backends/verilog/verilog_backend.h
new file mode 100644
index 000000000..7e550a37c
--- /dev/null
+++ b/backends/verilog/verilog_backend.h
@@ -0,0 +1,39 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ *  ---
+ *
+ *  A simple and straightforward Verilog backend.
+ *
+ */
+
+#ifndef VERILOG_BACKEND_H
+#define VERILOG_BACKEND_H
+
+#include <string>
+
+YOSYS_NAMESPACE_BEGIN
+namespace VERILOG_BACKEND {
+
+    const pool<string> verilog_keywords();
+    bool char_is_verilog_escaped(char c);
+    bool id_is_verilog_escaped(const std::string &str);
+
+}; /* namespace VERILOG_BACKEND */
+YOSYS_NAMESPACE_END
+
+#endif /* VERILOG_BACKEND_H */
diff --git a/passes/cmds/rename.cc b/passes/cmds/rename.cc
index fe8b4a444..02cab3221 100644
--- a/passes/cmds/rename.cc
+++ b/passes/cmds/rename.cc
@@ -20,6 +20,7 @@
 #include "kernel/register.h"
 #include "kernel/rtlil.h"
 #include "kernel/log.h"
+#include "backends/verilog/verilog_backend.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -186,6 +187,26 @@ static bool rename_witness(RTLIL::Design *design, dict<RTLIL::Module *, int> &ca
 	return has_witness_signals;
 }
 
+static std::string renamed_unescaped(const std::string& str)
+{
+	std::string new_str = "";
+
+	if ('0' <= str[0] && str[0] <= '9')
+		new_str = '_' + new_str;
+
+	for (char c : str) {
+		if (VERILOG_BACKEND::char_is_verilog_escaped(c))
+			new_str += '_';
+		else
+			new_str += c;
+	}
+
+	if (VERILOG_BACKEND::verilog_keywords().count(str))
+		new_str += "_";
+
+	return new_str;
+}
+
 struct RenamePass : public Pass {
 	RenamePass() : Pass("rename", "rename object in the design") { }
 	void help() override
@@ -252,6 +273,12 @@ struct RenamePass : public Pass {
 		log("can be used to change the random number generator seed from the default, but it\n");
 		log("must be non-zero.\n");
 		log("\n");
+		log("\n");
+		log("    rename -unescape [selection]\n");
+		log("\n");
+		log("Rename all selected public wires and cells that have to be escaped.\n");
+		log("Replaces characters with underscores or adds additional underscores and numbers.\n");
+		log("\n");
 	}
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
@@ -265,6 +292,7 @@ struct RenamePass : public Pass {
 		bool flag_top = false;
 		bool flag_output = false;
 		bool flag_scramble_name = false;
+		bool flag_unescape = false;
 		bool got_mode = false;
 		unsigned int seed = 1;
 
@@ -312,6 +340,11 @@ struct RenamePass : public Pass {
 				got_mode = true;
 				continue;
 			}
+			if (arg == "-unescape" && !got_mode) {
+				flag_unescape = true;
+				got_mode = true;
+				continue;
+			}
 			if (arg == "-pattern" && argidx+1 < args.size() && args[argidx+1].find('%') != std::string::npos) {
 				int pos = args[++argidx].find('%');
 				pattern_prefix = args[argidx].substr(0, pos);
@@ -491,6 +524,48 @@ struct RenamePass : public Pass {
 					module->rename(it.first, it.second);
 			}
 		}
+		else if (flag_unescape)
+		{
+			extra_args(args, argidx, design);
+
+			for (auto module : design->selected_modules())
+			{
+				dict<RTLIL::Wire *, IdString> new_wire_names;
+				dict<RTLIL::Cell *, IdString> new_cell_names;
+
+				for (auto wire : module->selected_wires()) {
+					auto name = wire->name.str();
+					if (name[0] != '\\')
+						continue;
+					name = name.substr(1);
+					if (!VERILOG_BACKEND::id_is_verilog_escaped(name))
+						continue;
+					new_wire_names[wire] = module->uniquify("\\" + renamed_unescaped(name));
+					auto new_name = new_wire_names[wire].str().substr(1);
+					if (VERILOG_BACKEND::id_is_verilog_escaped(new_name))
+						log_error("Failed to rename wire %s -> %s\n", name.c_str(), new_name.c_str());
+				}
+
+				for (auto cell : module->selected_cells()) {
+					auto name = cell->name.str();
+					if (name[0] != '\\')
+						continue;
+					name = name.substr(1);
+					if (!VERILOG_BACKEND::id_is_verilog_escaped(name))
+						continue;
+					new_cell_names[cell] = module->uniquify("\\" + renamed_unescaped(name));
+					auto new_name = new_cell_names[cell].str().substr(1);
+					if (VERILOG_BACKEND::id_is_verilog_escaped(new_name))
+						log_error("Failed to rename cell %s -> %s\n", name.c_str(), new_name.c_str());
+				}
+
+				for (auto &it : new_wire_names)
+					module->rename(it.first, it.second);
+
+				for (auto &it : new_cell_names)
+					module->rename(it.first, it.second);
+			}
+		}
 		else
 		{
 			if (argidx+2 != args.size())
diff --git a/tests/various/rename_unescape.ys b/tests/various/rename_unescape.ys
new file mode 100644
index 000000000..546d97357
--- /dev/null
+++ b/tests/various/rename_unescape.ys
@@ -0,0 +1,41 @@
+read_verilog <<EOF
+module top();
+    wire \a[0] ;
+    wire \0b ;
+    wire c;
+    wire d_;
+    wire d$;
+    wire \$e ;
+    wire \wire ;
+    wire add = c + d$;
+endmodule
+EOF
+
+dump
+# Replace brackets with _
+select -assert-count 1 w:a[0]
+# Prefix first character numeric with _
+select -assert-count 1 w:\0b
+# Do nothing to simple identifiers
+select -assert-count 1 w:c
+select -assert-count 1 w:d_
+# Replace dollars with _
+# and resolve conflict with existing d_
+select -assert-count 1 w:d$
+# Public but starts with dollar is legal
+select -assert-count 1 w:$e
+# Colliding with keyword
+select -assert-count 1 w:wire
+# Don't touch internal names
+select -assert-count 1 w:$add$<<EOF:*$1_Y
+
+rename -unescape
+
+select -assert-count 1 w:a_0_
+select -assert-count 1 w:_0b
+select -assert-count 1 w:c
+select -assert-count 1 w:d_
+select -assert-count 1 w:d__1
+select -assert-count 1 w:_e
+select -assert-count 1 w:wire_
+select -assert-count 1 w:$add$<<EOF:*$1_Y

From ef3f541501851f52e5ff6e6296992eb20e5a2788 Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Thu, 26 Jun 2025 13:21:53 +0200
Subject: [PATCH 097/931] add linecoverage command to generate lcov report from
 selection

---
 passes/cmds/Makefile.inc    |   1 +
 passes/cmds/linecoverage.cc | 148 ++++++++++++++++++++++++++++++++++++
 tests/various/lcov.gold     |  43 +++++++++++
 tests/various/lcov.v        |  55 ++++++++++++++
 tests/various/lcov.ys       |   4 +
 5 files changed, 251 insertions(+)
 create mode 100644 passes/cmds/linecoverage.cc
 create mode 100644 tests/various/lcov.gold
 create mode 100644 tests/various/lcov.v
 create mode 100644 tests/various/lcov.ys

diff --git a/passes/cmds/Makefile.inc b/passes/cmds/Makefile.inc
index 4ecaea7dd..9bf615a7e 100644
--- a/passes/cmds/Makefile.inc
+++ b/passes/cmds/Makefile.inc
@@ -56,3 +56,4 @@ OBJS += passes/cmds/setenv.o
 OBJS += passes/cmds/abstract.o
 OBJS += passes/cmds/test_select.o
 OBJS += passes/cmds/timeest.o
+OBJS += passes/cmds/linecoverage.o
diff --git a/passes/cmds/linecoverage.cc b/passes/cmds/linecoverage.cc
new file mode 100644
index 000000000..01dc2973c
--- /dev/null
+++ b/passes/cmds/linecoverage.cc
@@ -0,0 +1,148 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include "kernel/yosys.h"
+#include "kernel/sigtools.h"
+
+#include <regex>
+
+USING_YOSYS_NAMESPACE
+PRIVATE_NAMESPACE_BEGIN
+
+
+static const std::regex src_re("(.*):(\\d+)\\.(\\d+)-(\\d+)\\.(\\d+)");
+
+struct CoveragePass : public Pass {
+	CoveragePass() : Pass("linecoverage", "write coverage information to file") { }
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    linecoverage [options] [selection]\n");
+		log("\n");
+		log("This command writes coverage information on the design based on the current\n");
+		log("selection, where items in the selection are considered covered and items not in\n");
+		log("the selection are considered uncovered. If the same source location is found\n");
+		log("both on items inside and out of the selection, it is considered uncovered.\n");
+		log("\n");
+		log("    -lcov <filename>\n");
+		log("        write coverage information in lcov format to this file\n");
+		log("\n");
+	}
+
+	std::string extract_src_filename(std::string src) const
+	{
+		std::smatch m;
+		if (std::regex_match(src, m, src_re)) {
+			return m[1].str();
+		};
+		return "";
+	}
+
+	std::pair<int, int> extract_src_lines(std::string src) const
+	{
+		std::smatch m;
+		if (std::regex_match(src, m, src_re)) {
+			return std::make_pair(stoi(m[2].str()), stoi(m[4].str()));
+		};
+		return std::make_pair(0,0);
+	}
+
+	void execute(std::vector<std::string> args, RTLIL::Design *design) override
+	{
+		std::string ofile;
+
+		log_header(design, "Executing linecoverage pass.\n");
+
+		size_t argidx;
+		for (argidx = 1; argidx < args.size(); argidx++)
+		{
+			if (args[argidx] == "-lcov" && argidx+1 < args.size()) {
+				ofile = args[++argidx];
+				continue;
+			}
+			break;
+		}
+		extra_args(args, argidx, design);
+
+		std::ofstream fout;
+		if (!ofile.empty()) {
+			fout.open(ofile, std::ios::out | std::ios::trunc);
+			if (!fout.is_open())
+				log_error("Could not open file \"%s\" with write access.\n", ofile.c_str());
+		}
+
+		std::map<std::string, std::set<int>> uncovered_lines;
+		std::map<std::string, std::set<int>> all_lines;
+		
+		for (auto module : design->modules())
+		{
+			log_debug("Module %s:\n", log_id(module));
+			for (auto wire: module->wires()) {
+				log_debug("%s\t%s\t%s\n", module->selected(wire) ? "*" : " ", wire->get_src_attribute().c_str(), log_id(wire->name));
+				for (auto src: wire->get_strpool_attribute(ID::src)) {
+					auto filename = extract_src_filename(src);
+					if (filename.empty()) continue;
+					auto [begin, end] = extract_src_lines(src);
+					for (int l = begin; l <=end; l++) {
+						if (l == 0) continue;
+						all_lines[filename].insert(l);
+						if (!module->selected(wire))
+							uncovered_lines[filename].insert(l);
+					}
+				}
+			}
+			for (auto cell: module->cells()) {
+				log_debug("%s\t%s\t%s\n", module->selected(cell) ? "*" : " ", cell->get_src_attribute().c_str(), log_id(cell->name));
+				for (auto src: cell->get_strpool_attribute(ID::src)) {
+					auto filename = extract_src_filename(src);
+					if (filename.empty()) continue;
+					auto [begin, end] = extract_src_lines(src);
+					for (int l = begin; l <=end; l++) {
+						if (l == 0) continue;
+						all_lines[filename].insert(l);
+						if (!module->selected(cell))
+							uncovered_lines[filename].insert(l);
+					}
+				}
+			}
+			log_debug("\n");
+		}
+
+		if(!ofile.empty()) {
+			for (const auto& file_entry : all_lines) {
+				fout << "SF:" << file_entry.first << "\n";
+				for (int l : file_entry.second) {
+					fout << "DA:" << l << ",";
+					if (uncovered_lines.count(file_entry.first) && uncovered_lines[file_entry.first].count(l))
+						fout << "0";
+					else 
+						fout << "1";
+					fout << "\n";
+				}
+				fout << "LF:" << file_entry.second.size() << "\n";
+				fout << "LH:" << (uncovered_lines.count(file_entry.first) ? uncovered_lines[file_entry.first].size() : 0) << "\n";
+				fout << "end_of_record\n";
+			}
+		}
+
+	}
+} CoveragePass;
+
+PRIVATE_NAMESPACE_END
diff --git a/tests/various/lcov.gold b/tests/various/lcov.gold
new file mode 100644
index 000000000..564783557
--- /dev/null
+++ b/tests/various/lcov.gold
@@ -0,0 +1,43 @@
+SF:lcov.v
+DA:2,1
+DA:3,1
+DA:4,1
+DA:5,1
+DA:6,1
+DA:7,1
+DA:8,1
+DA:9,0
+DA:13,1
+DA:14,1
+DA:17,1
+DA:18,1
+DA:19,1
+DA:21,0
+DA:22,0
+DA:23,0
+DA:24,0
+DA:25,0
+DA:26,0
+DA:27,0
+DA:28,0
+DA:29,0
+DA:30,0
+DA:32,1
+DA:33,1
+DA:36,0
+DA:37,0
+DA:38,0
+DA:40,0
+DA:41,0
+DA:42,0
+DA:43,0
+DA:44,0
+DA:45,0
+DA:46,0
+DA:48,0
+DA:49,0
+DA:52,1
+DA:53,0
+LF:39
+LH:24
+end_of_record
diff --git a/tests/various/lcov.v b/tests/various/lcov.v
new file mode 100644
index 000000000..c481638cd
--- /dev/null
+++ b/tests/various/lcov.v
@@ -0,0 +1,55 @@
+module top (
+    input  wire        clk,
+    input  wire        rst,
+    input  wire [7:0]  a,
+    input  wire [7:0]  b,
+    input  wire [3:0]  c,
+    input  wire        en,
+    output wire [7:0]  out1,
+    output wire [7:0]  out2
+);
+
+    // Shared intermediate signal
+    wire [7:0] ab_sum;
+    assign ab_sum = a + b;
+
+    // Logic cone for out1
+    wire [7:0] cone1_1, cone1_2;
+    assign cone1_1 = ab_sum ^ {4{c[1:0]}};
+    assign cone1_2 = (a & b) | {4{c[3:2]}};
+
+    reg  [7:0] reg1, reg2; // only reg1 feeds into out1, but both share a source location
+    always @(posedge clk or posedge rst) begin
+        if (rst) begin
+            reg1 <= 8'h00;
+            reg2 <= 8'hFF;
+        end else if (en) begin
+            reg1 <= cone1_1 + cone1_2;
+            reg2 <= cone1_2 - cone1_1;
+        end
+    end
+
+    wire [7:0] cone1_3;
+    assign cone1_3 = reg1 & ~a[0];
+
+    // Logic cone for out2
+    wire [7:0] cone2_1, cone2_2;
+    assign cone2_1 = (ab_sum << 1) | (a >> 2);
+    assign cone2_2 = (b ^ {4{c[2:0]}}) & 8'hAA;
+
+    reg  [7:0] reg3;
+    always @(posedge clk or posedge rst) begin
+        if (rst)
+            reg3 <= 8'h0F;
+        else
+            reg3 <= cone2_1 ^ cone2_2 ^ reg1[7:0];
+    end
+
+    wire [7:0] cone2_3;
+    assign cone2_3 = reg3 | (reg2 ^ 8'h55);
+
+    // Outputs
+    assign out1 = cone1_3 | (reg1 ^ 8'hA5);
+    assign out2 = cone2_3 & (reg3 | 8'h5A);
+
+endmodule
diff --git a/tests/various/lcov.ys b/tests/various/lcov.ys
new file mode 100644
index 000000000..f1d233acc
--- /dev/null
+++ b/tests/various/lcov.ys
@@ -0,0 +1,4 @@
+read_verilog lcov.v
+prep -top top
+linecoverage -lcov lcov.out o:\out1 %ci*
+exec -expect-return 0 -- diff -q lcov.out lcov.gold

From e6961d8c9ff181771c57a11cae116470176c6629 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 28 Jun 2025 11:33:18 +1200
Subject: [PATCH 098/931] CI: Test with ASAN as well

New matrix variable for sanitizer, running `undefined` and `address` separately
(because they are mutually exclusive).  Probably don't need to run both
sanitizers on both os targets, but it's probably fine.
---
 .github/workflows/test-build.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index b88662f0f..22d3a94f8 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -40,6 +40,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -57,7 +58,7 @@ jobs:
           mkdir build
           cd build
           make -f ../Makefile config-$CC
-          echo 'SANITIZER = undefined' >> Makefile.conf
+          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
           make -f ../Makefile -j$procs ENABLE_LTO=1
 
       - name: Log yosys-config output
@@ -73,7 +74,7 @@ jobs:
       - name: Store build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
           path: build.tar
           retention-days: 1
 
@@ -84,10 +85,12 @@ jobs:
     if: needs.pre_job.outputs.should_skip != 'true'
     env:
       CC: clang
+      ASAN_OPTIONS: halt_on_error=1
       UBSAN_OPTIONS: halt_on_error=1
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -136,7 +139,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Uncompress build
         shell: bash
@@ -168,6 +171,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -181,7 +185,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Uncompress build
         shell: bash

From 017524d7a2a1a170b1f22ae3df996b3b4ce875d6 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 28 Jun 2025 11:33:18 +1200
Subject: [PATCH 099/931] tests/verific: Don't ASAN verific

---
 tests/verific/run-test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/verific/run-test.sh b/tests/verific/run-test.sh
index dee032827..2e340916d 100755
--- a/tests/verific/run-test.sh
+++ b/tests/verific/run-test.sh
@@ -2,3 +2,4 @@
 set -eu
 source ../gen-tests-makefile.sh
 generate_mk --yosys-scripts --bash
+sed -i '1i\export ASAN_OPTIONS=halt_on_error=0' run-test.mk

From 67583fee48be2428781f86e323c21886054559cb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 30 Jun 2025 00:27:10 +0000
Subject: [PATCH 100/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 77771b6b0..3c2bc11b6 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.54+23
+YOSYS_VER := 0.54+29
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 8a4f4651436a9c37eb30d697917478df730381b2 Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Tue, 1 Jul 2025 11:33:03 +0200
Subject: [PATCH 101/931] update test to use suggested selection for assertions

---
 tests/various/lcov.gold | 3 ++-
 tests/various/lcov.v    | 4 ++++
 tests/various/lcov.ys   | 8 ++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/various/lcov.gold b/tests/various/lcov.gold
index 564783557..5b160fae8 100644
--- a/tests/various/lcov.gold
+++ b/tests/various/lcov.gold
@@ -38,6 +38,7 @@ DA:48,0
 DA:49,0
 DA:52,1
 DA:53,0
-LF:39
+DA:56,1
+LF:40
 LH:24
 end_of_record
diff --git a/tests/various/lcov.v b/tests/various/lcov.v
index c481638cd..09fccf70f 100644
--- a/tests/various/lcov.v
+++ b/tests/various/lcov.v
@@ -52,4 +52,8 @@ module top (
     assign out1 = cone1_3 | (reg1 ^ 8'hA5);
     assign out2 = cone2_3 & (reg3 | 8'h5A);
 
+    always @(posedge clk) begin
+        assert (out1 == 8'h42);
+    end
+
 endmodule
diff --git a/tests/various/lcov.ys b/tests/various/lcov.ys
index f1d233acc..8122611c0 100644
--- a/tests/various/lcov.ys
+++ b/tests/various/lcov.ys
@@ -1,4 +1,8 @@
-read_verilog lcov.v
+read_verilog -formal lcov.v
 prep -top top
-linecoverage -lcov lcov.out o:\out1 %ci*
+async2sync
+chformal -lower
+select -set covered t:$assert %ci*
+select -set irrelevant o:* %ci* %n
+linecoverage -lcov lcov.out @covered @irrelevant %u
 exec -expect-return 0 -- diff -q lcov.out lcov.gold

From 85e7c68fc60d785b743851e0233f8430c61865a3 Mon Sep 17 00:00:00 2001
From: YRabbit <rabbit@yrabbit.cyou>
Date: Wed, 2 Jul 2025 12:39:18 +1000
Subject: [PATCH 102/931] Gowin. BUGFIX. Fix multi-line descriptions.

If let's say the enumeration of inputs took several lines, then all
after the first one were ignored. Since the first line ended with a
comma, an error was generated when trying to use the resulting file.

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
---
 techlibs/gowin/cells_xtra.py     |  10 +
 techlibs/gowin/cells_xtra_gw5a.v | 601 +++++++++++++++++++++++++++++--
 2 files changed, 585 insertions(+), 26 deletions(-)

diff --git a/techlibs/gowin/cells_xtra.py b/techlibs/gowin/cells_xtra.py
index be2e0eff3..7a7c9ac0a 100644
--- a/techlibs/gowin/cells_xtra.py
+++ b/techlibs/gowin/cells_xtra.py
@@ -11,6 +11,7 @@ import re
 class State(Enum):
     OUTSIDE = auto()
     IN_MODULE = auto()
+    IN_MODULE_MULTILINE = auto()
     IN_PARAMETER = auto()
 
 _skip = { # These are already described, no need to extract them from the vendor files
@@ -47,12 +48,20 @@ def xtract_cells_decl(dir, fout):
                 fout.write(l)
                 if l[-1] != '\n':
                     fout.write('\n')
+                if l.rstrip()[-1] != ';':
+                    state = State.IN_MODULE_MULTILINE
             elif l.startswith('parameter') and state == State.IN_MODULE:
                 fout.write(l)
                 if l.rstrip()[-1] == ',':
                     state = State.IN_PARAMETER
                 if l[-1] != '\n':
                     fout.write('\n')
+            elif l and state == State.IN_MODULE_MULTILINE:
+                fout.write(l)
+                if l[-1] != '\n':
+                    fout.write('\n')
+                if l.rstrip()[-1] == ';':
+                    state = State.IN_MODULE
             elif state == State.IN_PARAMETER:
                 fout.write(l)
                 if l.rstrip()[-1] == ';':
@@ -65,6 +74,7 @@ def xtract_cells_decl(dir, fout):
                 if l[-1] != '\n':
                     fout.write('\n')
 
+
 if __name__ == '__main__':
     parser = ArgumentParser(description='Extract Gowin blackbox cell definitions.')
     parser.add_argument('gowin_dir', nargs='?', default='/opt/gowin/')
diff --git a/techlibs/gowin/cells_xtra_gw5a.v b/techlibs/gowin/cells_xtra_gw5a.v
index d19435f85..c82f6af25 100644
--- a/techlibs/gowin/cells_xtra_gw5a.v
+++ b/techlibs/gowin/cells_xtra_gw5a.v
@@ -80,19 +80,8 @@ endmodule
 module MIPI_OBUF_A (...);
 output O, OB;
 input  I, IB, IL, MODESEL;
-endmodule
-
-module IBUF_R (...);
-input  I;
-input RTEN;
-output O;
-endmodule
-
-module IOBUF_R (...);
-input I,OEN;
-input RTEN;
-output O;
-inout IO;
+inout IO, IOB;
+input OEN, OENB;
 endmodule
 
 module ELVDS_IOBUF_R (...);
@@ -113,6 +102,21 @@ input I, IB;
 input ADCEN;
 endmodule
 
+module MIPI_CPHY_IBUF (...);
+output OH0, OL0, OB0, OH1, OL1, OB1, OH2, OL2, OB2;
+inout IO0, IOB0, IO1, IOB1, IO2, IOB2;
+input  I0, IB0, I1, IB1, I2, IB2;
+input OEN, OENB;
+input HSEN;
+endmodule
+
+module MIPI_CPHY_OBUF (...);
+output O0, OB0, O1, OB1, O2, OB2;
+input  I0, IB0, IL0, I1, IB1, IL1, I2, IB2, IL2;
+inout IO0, IOB0, IO1, IOB1, IO2, IOB2;
+input OEN, OENB, MODESEL, VCOME;
+endmodule
+
 module SDPB (...);
 parameter READ_MODE = 1'b0; 
 parameter BIT_WIDTH_0 = 32; 
@@ -598,8 +602,8 @@ endmodule
 
 
 module SDP36KE (...);
-parameter ECC_WRITE_EN="FALSE"; 
-parameter ECC_READ_EN="FALSE"; 
+parameter ECC_WRITE_EN="TRUE"; 
+parameter ECC_READ_EN="TRUE"; 
 parameter READ_MODE = 1'b0; 
 parameter BLK_SEL_A = 3'b000;
 parameter BLK_SEL_B = 3'b000;
@@ -764,6 +768,14 @@ output [7:0] ECCP;
 endmodule
 
 
+module SDP136K (...);
+input CLKA, CLKB;
+input WE, RE;
+input [10:0] ADA, ADB;
+input [67:0] DI;
+output [67:0] DO;
+endmodule
+
 module MULTADDALU12X12 (...);
 parameter A0REG_CLK = "BYPASS"; 
 parameter A0REG_CE = "CE0"; 
@@ -980,6 +992,24 @@ input  PSEL;
 input  PADDSUB;
 endmodule
 
+module MULTACC (...);
+output  [23:0] DATAO, CASO;
+input CE, CLK;
+input [5:0] COFFIN0, COFFIN1, COFFIN2;
+input [9:0] DATAIN0, DATAIN1;
+input [9:0] DATAIN2;
+input RSTN;
+input [23:0] CASI;
+parameter COFFIN_WIDTH = 4; 
+parameter DATAIN_WIDTH = 8; 
+parameter IREG = 1'b0; 
+parameter OREG = 1'b0; 
+parameter PREG = 1'b0; 
+parameter ACC_EN = "FALSE";  
+parameter CASI_EN = "FALSE"; 
+parameter CASO_EN = "FALSE"; 
+endmodule
+
 module IDDR_MEM (...);
 input D, ICLK, PCLK;
 input [2:0] WADDR;
@@ -1048,6 +1078,12 @@ output  Q0,  Q1;
 endmodule
 
 
+module OSER14 (...);
+input D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, D13;
+input PCLK, FCLK, RESET;
+output  Q;
+endmodule
+
 module IODELAY (...);
 parameter C_STATIC_DLY = 0; 
 parameter DYN_DLY_EN = "FALSE";
@@ -1066,13 +1102,39 @@ output [31:0] Q;
 input D;
 input PCLK, FCLKP, FCLKN, FCLKQP, FCLKQN;
 input RESET;
-output DF;
-input  SDTAP;
-input  VALUE;
-input  [7:0] DLYSTEP;
-parameter C_STATIC_DLY = 0; 
-parameter DYN_DLY_EN = "FALSE";
-parameter ADAPT_EN = "FALSE";
+output DF0, DF1;
+input  SDTAP0, SDTAP1;
+input  VALUE0,VALUE1;
+input  [7:0] DLYSTEP0,DLYSTEP1;
+parameter C_STATIC_DLY_0 = 0; 
+parameter DYN_DLY_EN_0 = "FALSE";
+parameter ADAPT_EN_0 = "FALSE";
+parameter C_STATIC_DLY_1 = 0; 
+parameter DYN_DLY_EN_1 = "FALSE";
+parameter ADAPT_EN_1 = "FALSE";
+endmodule
+
+module OSIDES64 (...);
+output [63:0] Q;
+input D;
+input PCLK, FCLKP, FCLKN, FCLKQP, FCLKQN;
+input RESET;
+output DF0, DF1, DF2, DF3;
+input  SDTAP0, SDTAP1, SDTAP2, SDTAP3;
+input  VALUE0, VALUE1, VALUE2, VALUE3;
+input  [7:0] DLYSTEP0, DLYSTEP1, DLYSTEP2, DLYSTEP3;
+parameter C_STATIC_DLY_0 = 0; 
+parameter DYN_DLY_EN_0 = "FALSE";
+parameter ADAPT_EN_0 = "FALSE";
+parameter C_STATIC_DLY_1 = 0; 
+parameter DYN_DLY_EN_1 = "FALSE";
+parameter ADAPT_EN_1 = "FALSE";
+parameter C_STATIC_DLY_2 = 0; 
+parameter DYN_DLY_EN_2 = "FALSE";
+parameter ADAPT_EN_2 = "FALSE";
+parameter C_STATIC_DLY_3 = 0; 
+parameter DYN_DLY_EN_3 = "FALSE";
+parameter ADAPT_EN_3 = "FALSE";
 endmodule
 
 module DCE (...);
@@ -1132,6 +1194,17 @@ output OSCOUT;
 input OSCEN;
 endmodule
 
+module OSCB (...);
+parameter FREQ_MODE = "25"; 
+parameter FREQ_DIV = 10; 
+parameter DYN_TRIM_EN = "FALSE"; 
+output OSCOUT;
+output OSCREF;
+input OSCEN, FMODE;
+input [7:0] RTRIM;
+input [5:0] RTCTRIM; 
+endmodule
+
 module PLL (...);
 input CLKIN;
 input CLKFB;
@@ -1571,8 +1644,8 @@ input ADWSEL;
 endmodule
 
 module OTP (...);
-parameter MODE = 1'b0; 
-input READ, SHIFT;
+parameter MODE = 2'b01; 
+input CLK, READ, SHIFT;
 output DOUT;
 endmodule
 
@@ -1615,6 +1688,31 @@ input ERR0INJECT,ERR1INJECT;
 input [6:0] ERRINJ0LOC,ERRINJ1LOC;
 endmodule
 
+module CMSERB (...);
+output RUNNING;
+output CRCERR;
+output CRCDONE;
+output ECCCORR;
+output ECCUNCORR; 
+output [12:0] ERRLOC;
+output ECCDEC;
+output DSRRD;
+output DSRWR; 
+output ASRRESET;
+output ASRINC;
+output REFCLK;
+input CLK;
+input [2:0] SEREN;
+input ERR0INJECT,ERR1INJECT;
+input [6:0] ERRINJ0LOC,ERRINJ1LOC;
+endmodule
+
+module SAMBA (...);
+parameter MODE = 2'b00; 
+input SPIAD;
+input LOAD;
+endmodule
+
 module ADCLRC (...);
 endmodule
 
@@ -1624,6 +1722,12 @@ endmodule
 module ADC (...);
 endmodule
 
+module ADC_SAR (...);
+endmodule
+
+module LICD (...);
+endmodule
+
 module MIPI_DPHY (...);
 output RX_CLK_O, TX_CLK_O;
 output [15:0] D0LN_HSRXD, D1LN_HSRXD, D2LN_HSRXD, D3LN_HSRXD;
@@ -1632,6 +1736,7 @@ input  D0LN_HSRX_DREN, D1LN_HSRX_DREN,  D2LN_HSRX_DREN,  D3LN_HSRX_DREN;
 output  DI_LPRX0_N, DI_LPRX0_P, DI_LPRX1_N, DI_LPRX1_P, DI_LPRX2_N,  DI_LPRX2_P, DI_LPRX3_N, DI_LPRX3_P, DI_LPRXCK_N, DI_LPRXCK_P;
 inout  CK_N, CK_P, D0_N, D0_P, D1_N, D1_P, D2_N, D2_P, D3_N, D3_P;
 input HSRX_STOP, HSTXEN_LN0, HSTXEN_LN1, HSTXEN_LN2, HSTXEN_LN3, HSTXEN_LNCK,
+     LPTXEN_LN0, LPTXEN_LN1, LPTXEN_LN2, LPTXEN_LN3, LPTXEN_LNCK;
 input PWRON_RX, PWRON_TX, RESET, RX_CLK_1X, TX_CLK_1X;
 input TXDPEN_LN0, TXDPEN_LN1, TXDPEN_LN2, TXDPEN_LN3, TXDPEN_LNCK, TXHCLK_EN;
 input [15:0]  CKLN_HSTXD,D0LN_HSTXD,D1LN_HSTXD,D2LN_HSTXD,D3LN_HSTXD;
@@ -1639,6 +1744,8 @@ input HSTXD_VLD;
 input CK0, CK90, CK180, CK270;
 input DO_LPTX0_N, DO_LPTX1_N, DO_LPTX2_N, DO_LPTX3_N, DO_LPTXCK_N, DO_LPTX0_P, DO_LPTX1_P, DO_LPTX2_P, DO_LPTX3_P, DO_LPTXCK_P;
 input HSRX_EN_CK, HSRX_EN_D0, HSRX_EN_D1, HSRX_EN_D2, HSRX_EN_D3, HSRX_ODTEN_CK, 
+     HSRX_ODTEN_D0, HSRX_ODTEN_D1, HSRX_ODTEN_D2, HSRX_ODTEN_D3, LPRX_EN_CK,
+     LPRX_EN_D0, LPRX_EN_D1, LPRX_EN_D2, LPRX_EN_D3; 
 input RX_DRST_N, TX_DRST_N, WALIGN_DVLD;
 output [7:0] MRDATA;
 input MA_INC, MCLK;
@@ -1714,7 +1821,7 @@ parameter        RX_RD_START_DEPTH              = 5'b00001;
 parameter        RX_SYNC_MODE                   = 1'b0 ; 
 parameter        RX_WORD_ALIGN_BYPASS           = 1'b0 ; 
 parameter        RX_WORD_ALIGN_DATA_VLD_SRC_SEL = 1'b0 ; 
-parameter        RX_WORD_LITTLE_ENDIAN          = 1'b0 ; 
+parameter        RX_WORD_LITTLE_ENDIAN          = 1'b1 ; 
 parameter        TX_BYPASS_MODE                 = 1'b0 ; 
 parameter        TX_BYTECLK_SYNC_MODE           = 1'b0 ; 
 parameter        TX_OCLK_USE_CIBCLK             = 1'b0 ; 
@@ -1917,6 +2024,437 @@ parameter        TEST_P_IMP_LN3                 = 1'b0 ;
 parameter        TEST_P_IMP_LNCK                = 1'b0 ;   
 endmodule
 
+module MIPI_DPHYA (...);
+output RX_CLK_O, TX_CLK_O;
+output [15:0] D0LN_HSRXD, D1LN_HSRXD, D2LN_HSRXD, D3LN_HSRXD;
+output D0LN_HSRXD_VLD,D1LN_HSRXD_VLD,D2LN_HSRXD_VLD,D3LN_HSRXD_VLD;
+input  D0LN_HSRX_DREN, D1LN_HSRX_DREN,  D2LN_HSRX_DREN,  D3LN_HSRX_DREN;
+output  DI_LPRX0_N, DI_LPRX0_P, DI_LPRX1_N, DI_LPRX1_P, DI_LPRX2_N,  DI_LPRX2_P, DI_LPRX3_N, DI_LPRX3_P, DI_LPRXCK_N, DI_LPRXCK_P;
+inout  CK_N, CK_P, D0_N, D0_P, D1_N, D1_P, D2_N, D2_P, D3_N, D3_P;
+input HSRX_STOP, HSTXEN_LN0, HSTXEN_LN1, HSTXEN_LN2, HSTXEN_LN3, HSTXEN_LNCK,
+     LPTXEN_LN0, LPTXEN_LN1, LPTXEN_LN2, LPTXEN_LN3, LPTXEN_LNCK;
+input PWRON_RX, PWRON_TX, RESET, RX_CLK_1X, TX_CLK_1X;
+input TXDPEN_LN0, TXDPEN_LN1, TXDPEN_LN2, TXDPEN_LN3, TXDPEN_LNCK, TXHCLK_EN;
+input [15:0]  CKLN_HSTXD,D0LN_HSTXD,D1LN_HSTXD,D2LN_HSTXD,D3LN_HSTXD;
+input HSTXD_VLD;
+input CK0, CK90, CK180, CK270;
+input DO_LPTX0_N, DO_LPTX1_N, DO_LPTX2_N, DO_LPTX3_N, DO_LPTXCK_N, DO_LPTX0_P, DO_LPTX1_P, DO_LPTX2_P, DO_LPTX3_P, DO_LPTXCK_P;
+input HSRX_EN_CK, HSRX_EN_D0, HSRX_EN_D1, HSRX_EN_D2, HSRX_EN_D3, HSRX_ODTEN_CK, 
+     HSRX_ODTEN_D0, HSRX_ODTEN_D1, HSRX_ODTEN_D2, HSRX_ODTEN_D3, LPRX_EN_CK,
+     LPRX_EN_D0, LPRX_EN_D1, LPRX_EN_D2, LPRX_EN_D3; 
+input RX_DRST_N, TX_DRST_N, WALIGN_DVLD;
+output [7:0] MRDATA;
+input MA_INC, MCLK;
+input [1:0] MOPCODE;
+input [7:0] MWDATA;
+input SPLL_CKN, SPLL_CKP;
+output  ALPEDO_LANE0, ALPEDO_LANE1, ALPEDO_LANE2, ALPEDO_LANE3, ALPEDO_LANECK;
+output D1LN_DESKEW_DONE,D2LN_DESKEW_DONE,D3LN_DESKEW_DONE,D0LN_DESKEW_DONE;
+output D1LN_DESKEW_ERROR, D2LN_DESKEW_ERROR, D3LN_DESKEW_ERROR, D0LN_DESKEW_ERROR;
+input D0LN_DESKEW_REQ, D1LN_DESKEW_REQ, D2LN_DESKEW_REQ, D3LN_DESKEW_REQ;
+input HSRX_DLYDIR_LANE0, HSRX_DLYDIR_LANE1, HSRX_DLYDIR_LANE2, HSRX_DLYDIR_LANE3, HSRX_DLYDIR_LANECK;
+input HSRX_DLYLDN_LANE0, HSRX_DLYLDN_LANE1, HSRX_DLYLDN_LANE2, HSRX_DLYLDN_LANE3, HSRX_DLYLDN_LANECK;
+input HSRX_DLYMV_LANE0, HSRX_DLYMV_LANE1,  HSRX_DLYMV_LANE2, HSRX_DLYMV_LANE3, HSRX_DLYMV_LANECK;
+input  ALP_EDEN_LANE0, ALP_EDEN_LANE1, ALP_EDEN_LANE2, ALP_EDEN_LANE3, ALP_EDEN_LANECK, ALPEN_LN0, ALPEN_LN1, ALPEN_LN2, ALPEN_LN3, ALPEN_LNCK;
+parameter        TX_PLLCLK = "NONE"; 
+parameter        RX_ALIGN_BYTE                  = 8'b10111000 ; 
+parameter        RX_HS_8BIT_MODE                = 1'b0 ; 
+parameter        RX_LANE_ALIGN_EN               = 1'b0 ; 
+parameter        TX_HS_8BIT_MODE                = 1'b0 ; 
+parameter        HSREG_EN_LN0                   = 1'b0;  
+parameter        HSREG_EN_LN1                   = 1'b0;  
+parameter        HSREG_EN_LN2                   = 1'b0;  
+parameter        HSREG_EN_LN3                   = 1'b0;  
+parameter        HSREG_EN_LNCK                  = 1'b0;  
+parameter        LANE_DIV_SEL                   = 2'b00;  
+parameter        HSRX_EN                        = 1'b1 ;  
+parameter        HSRX_LANESEL                   = 4'b1111 ;   
+parameter        HSRX_LANESEL_CK                = 1'b1 ;   
+parameter        HSTX_EN_LN0                    = 1'b0 ;   
+parameter        HSTX_EN_LN1                    = 1'b0 ;   
+parameter        HSTX_EN_LN2                    = 1'b0 ;   
+parameter        HSTX_EN_LN3                    = 1'b0 ;   
+parameter        HSTX_EN_LNCK                   = 1'b0 ;   
+parameter        LPTX_EN_LN0                    = 1'b1 ;   
+parameter        LPTX_EN_LN1                    = 1'b1 ;   
+parameter        LPTX_EN_LN2                    = 1'b1 ;   
+parameter        LPTX_EN_LN3                    = 1'b1 ;   
+parameter        LPTX_EN_LNCK                   = 1'b1 ;   
+parameter        TXDP_EN_LN0                    = 1'b0 ;  
+parameter        TXDP_EN_LN1                    = 1'b0 ;   
+parameter        TXDP_EN_LN2                    = 1'b0 ;   
+parameter        TXDP_EN_LN3                    = 1'b0 ;   
+parameter        TXDP_EN_LNCK                   = 1'b0 ;
+parameter        SPLL_DIV_SEL                   = 2'b00;
+parameter        DPHY_CK_SEL                    = 2'b01;
+parameter        CKLN_DELAY_EN                  = 1'b0;  
+parameter        CKLN_DELAY_OVR_VAL             = 7'b0000000; 
+parameter        D0LN_DELAY_EN                  = 1'b0;  
+parameter        D0LN_DELAY_OVR_VAL             = 7'b0000000; 
+parameter        D0LN_DESKEW_BYPASS             = 1'b0;  
+parameter        D1LN_DELAY_EN                  = 1'b0;  
+parameter        D1LN_DELAY_OVR_VAL             = 7'b0000000; 
+parameter        D1LN_DESKEW_BYPASS             = 1'b0;  
+parameter        D2LN_DELAY_EN                  = 1'b0;  
+parameter        D2LN_DELAY_OVR_VAL             = 7'b0000000; 
+parameter        D2LN_DESKEW_BYPASS             = 1'b0;  
+parameter        D3LN_DELAY_EN                  = 1'b0;  
+parameter        D3LN_DELAY_OVR_VAL             = 7'b0000000; 
+parameter        D3LN_DESKEW_BYPASS             = 1'b0;  
+parameter        DESKEW_EN_LOW_DELAY            = 1'b0;  
+parameter        DESKEW_EN_ONE_EDGE             = 1'b0;  
+parameter        DESKEW_FAST_LOOP_TIME          = 4'b0000;  
+parameter        DESKEW_FAST_MODE               = 1'b0;  
+parameter        DESKEW_HALF_OPENING            = 6'b010110; 
+parameter        DESKEW_LSB_MODE                = 2'b00;  
+parameter        DESKEW_M                       = 3'b011;  
+parameter        DESKEW_M_TH                    = 13'b0000110100110; 
+parameter        DESKEW_MAX_SETTING           = 7'b0100001; 
+parameter        DESKEW_ONE_CLK_EDGE_EN       = 1'b0 ; 
+parameter        DESKEW_RST_BYPASS              = 1'b0 ; 
+parameter        RX_BYTE_LITTLE_ENDIAN          = 1'b1 ; 
+parameter        RX_CLK_1X_SYNC_SEL             = 1'b0 ; 
+parameter        RX_INVERT                      = 1'b0 ; 
+parameter        RX_ONE_BYTE0_MATCH             = 1'b0 ; 
+parameter        RX_RD_START_DEPTH              = 5'b00001; 
+parameter        RX_SYNC_MODE                   = 1'b0 ; 
+parameter        RX_WORD_ALIGN_BYPASS           = 1'b0 ; 
+parameter        RX_WORD_ALIGN_DATA_VLD_SRC_SEL = 1'b0 ; 
+parameter        RX_WORD_LITTLE_ENDIAN          = 1'b1 ; 
+parameter        TX_BYPASS_MODE                 = 1'b0 ; 
+parameter        TX_BYTECLK_SYNC_MODE           = 1'b0 ; 
+parameter        TX_OCLK_USE_CIBCLK             = 1'b0 ; 
+parameter        TX_RD_START_DEPTH              = 5'b00001; 
+parameter        TX_SYNC_MODE                   = 1'b0 ; 
+parameter        TX_WORD_LITTLE_ENDIAN          = 1'b1 ; 
+parameter        EQ_CS_LANE0                    = 3'b100;  
+parameter        EQ_CS_LANE1                    = 3'b100;  
+parameter        EQ_CS_LANE2                    = 3'b100;  
+parameter        EQ_CS_LANE3                    = 3'b100;  
+parameter        EQ_CS_LANECK                   = 3'b100;  
+parameter        EQ_RS_LANE0                    = 3'b100;  
+parameter        EQ_RS_LANE1                    = 3'b100;  
+parameter        EQ_RS_LANE2                    = 3'b100;  
+parameter        EQ_RS_LANE3                    = 3'b100;  
+parameter        EQ_RS_LANECK                   = 3'b100;  
+parameter        HSCLK_LANE_LN0                 = 1'b0;  
+parameter        HSCLK_LANE_LN1                 = 1'b0;  
+parameter        HSCLK_LANE_LN2                 = 1'b0;  
+parameter        HSCLK_LANE_LN3                 = 1'b0;  
+parameter        HSCLK_LANE_LNCK                = 1'b1;  
+parameter        ALP_ED_EN_LANE0                = 1'b1 ; 
+parameter        ALP_ED_EN_LANE1                = 1'b1 ;  
+parameter        ALP_ED_EN_LANE2                = 1'b1 ;  
+parameter        ALP_ED_EN_LANE3                = 1'b1 ;  
+parameter        ALP_ED_EN_LANECK               = 1'b1 ; 
+parameter        ALP_ED_TST_LANE0               = 1'b0 ;  
+parameter        ALP_ED_TST_LANE1               = 1'b0 ;  
+parameter        ALP_ED_TST_LANE2               = 1'b0 ;  
+parameter        ALP_ED_TST_LANE3               = 1'b0 ;  
+parameter        ALP_ED_TST_LANECK              = 1'b0 ;  
+parameter        ALP_EN_LN0                     = 1'b0 ; 
+parameter        ALP_EN_LN1                     = 1'b0 ;  
+parameter        ALP_EN_LN2                     = 1'b0 ;  
+parameter        ALP_EN_LN3                     = 1'b0 ; 
+parameter        ALP_EN_LNCK                    = 1'b0 ; 
+parameter        ALP_HYS_EN_LANE0               = 1'b1 ;  
+parameter        ALP_HYS_EN_LANE1               = 1'b1 ;  
+parameter        ALP_HYS_EN_LANE2               = 1'b1 ;  
+parameter        ALP_HYS_EN_LANE3               = 1'b1 ;  
+parameter        ALP_HYS_EN_LANECK              = 1'b1 ;  
+parameter        ALP_TH_LANE0                   = 4'b1000 ;   
+parameter        ALP_TH_LANE1                   = 4'b1000 ;   
+parameter        ALP_TH_LANE2                   = 4'b1000 ;   
+parameter        ALP_TH_LANE3                   = 4'b1000 ;   
+parameter        ALP_TH_LANECK                  = 4'b1000 ;   
+parameter        ANA_BYTECLK_PH                 = 2'b00 ;  
+parameter        BIT_REVERSE_LN0                = 1'b0 ;  
+parameter        BIT_REVERSE_LN1                = 1'b0 ;  
+parameter        BIT_REVERSE_LN2                = 1'b0 ;  
+parameter        BIT_REVERSE_LN3                = 1'b0 ;  
+parameter        BIT_REVERSE_LNCK               = 1'b0 ;  
+parameter        BYPASS_TXHCLKEN                = 1'b1 ;  
+parameter        BYPASS_TXHCLKEN_SYNC           = 1'b0 ;  
+parameter        BYTE_CLK_POLAR                 = 1'b0 ;  
+parameter        BYTE_REVERSE_LN0               = 1'b0 ;  
+parameter        BYTE_REVERSE_LN1               = 1'b0 ;  
+parameter        BYTE_REVERSE_LN2               = 1'b0 ;  
+parameter        BYTE_REVERSE_LN3               = 1'b0 ;  
+parameter        BYTE_REVERSE_LNCK              = 1'b0 ;  
+parameter        EN_CLKB1X                      = 1'b1 ;  
+parameter        EQ_PBIAS_LANE0                 = 4'b1000 ;   
+parameter        EQ_PBIAS_LANE1                 = 4'b1000 ;   
+parameter        EQ_PBIAS_LANE2                 = 4'b1000 ;   
+parameter        EQ_PBIAS_LANE3                 = 4'b1000 ;   
+parameter        EQ_PBIAS_LANECK                = 4'b1000 ;   
+parameter        EQ_ZLD_LANE0                   = 4'b1000 ;   
+parameter        EQ_ZLD_LANE1                   = 4'b1000 ;   
+parameter        EQ_ZLD_LANE2                   = 4'b1000 ;   
+parameter        EQ_ZLD_LANE3                   = 4'b1000 ;   
+parameter        EQ_ZLD_LANECK                  = 4'b1000 ;   
+parameter        HIGH_BW_LANE0                  = 1'b1 ;   
+parameter        HIGH_BW_LANE1                  = 1'b1 ;   
+parameter        HIGH_BW_LANE2                  = 1'b1 ;   
+parameter        HIGH_BW_LANE3                  = 1'b1 ;   
+parameter        HIGH_BW_LANECK                 = 1'b1 ;   
+parameter        HSREG_VREF_CTL                 = 3'b100 ;   
+parameter        HSREG_VREF_EN                  = 1'b1 ;  
+parameter        HSRX_DLY_CTL_CK                = 7'b0000000 ;   
+parameter        HSRX_DLY_CTL_LANE0             = 7'b0000000 ;   
+parameter        HSRX_DLY_CTL_LANE1             = 7'b0000000 ;   
+parameter        HSRX_DLY_CTL_LANE2             = 7'b0000000 ;   
+parameter        HSRX_DLY_CTL_LANE3             = 7'b0000000 ;   
+parameter        HSRX_DLY_SEL_LANE0             = 1'b0 ;  
+parameter        HSRX_DLY_SEL_LANE1             = 1'b0 ;   
+parameter        HSRX_DLY_SEL_LANE2             = 1'b0 ;   
+parameter        HSRX_DLY_SEL_LANE3             = 1'b0 ;   
+parameter        HSRX_DLY_SEL_LANECK            = 1'b0 ;   
+parameter        HSRX_DUTY_LANE0                = 4'b1000 ;  
+parameter        HSRX_DUTY_LANE1                = 4'b1000 ;  
+parameter        HSRX_DUTY_LANE2                = 4'b1000 ;  
+parameter        HSRX_DUTY_LANE3                = 4'b1000 ;  
+parameter        HSRX_DUTY_LANECK               = 4'b1000 ;  
+parameter        HSRX_EQ_EN_LANE0               = 1'b1 ;  
+parameter        HSRX_EQ_EN_LANE1               = 1'b1 ;  
+parameter        HSRX_EQ_EN_LANE2               = 1'b1 ;  
+parameter        HSRX_EQ_EN_LANE3               = 1'b1 ;  
+parameter        HSRX_EQ_EN_LANECK              = 1'b1 ;  
+parameter        HSRX_IBIAS                     = 4'b0011 ;   
+parameter        HSRX_IBIAS_TEST_EN             = 1'b0 ;   
+parameter        HSRX_IMARG_EN                  = 1'b0 ;   
+parameter        HSRX_ODT_EN                    = 1'b1 ;   
+parameter        HSRX_ODT_TST                   = 4'b0000 ;   
+parameter        HSRX_ODT_TST_CK                = 1'b0 ;   
+parameter        HSRX_SEL                       = 4'b0000 ;   
+parameter        HSRX_STOP_EN                   = 1'b0 ; 
+parameter        HSRX_TST                       = 4'b0000 ;   
+parameter        HSRX_TST_CK                    = 1'b0 ;   
+parameter        HSRX_WAIT4EDGE                 = 1'b1 ;   
+parameter        HYST_NCTL                      = 2'b01 ;  
+parameter        HYST_PCTL                      = 2'b01 ;  
+parameter        IBIAS_TEST_EN                  = 1'b0 ;   
+parameter        LB_CH_SEL                      = 1'b0 ;   
+parameter        LB_EN_LN0                      = 1'b0 ;   
+parameter        LB_EN_LN1                      = 1'b0 ;   
+parameter        LB_EN_LN2                      = 1'b0 ;   
+parameter        LB_EN_LN3                      = 1'b0 ;   
+parameter        LB_EN_LNCK                     = 1'b0 ;   
+parameter        LB_POLAR_LN0                   = 1'b0 ;   
+parameter        LB_POLAR_LN1                   = 1'b0 ;   
+parameter        LB_POLAR_LN2                   = 1'b0 ;   
+parameter        LB_POLAR_LN3                   = 1'b0 ;   
+parameter        LB_POLAR_LNCK                  = 1'b0 ;   
+parameter        LOW_LPRX_VTH                   = 1'b0 ;   
+parameter        LPBK_DATA2TO1                  = 4'b0000;  
+parameter        LPBK_DATA2TO1_CK               = 1'b0 ;   
+parameter        LPBK_EN                        = 1'b0 ;   
+parameter        LPBK_SEL                       = 4'b0000;  
+parameter        LPBKTST_EN                     = 4'b0000;  
+parameter        LPBKTST_EN_CK                  = 1'b0 ;   
+parameter        LPRX_EN                        = 1'b1 ;   
+parameter        LPRX_TST                       = 4'b0000;  
+parameter        LPRX_TST_CK                    = 1'b0 ;   
+parameter        LPTX_DAT_POLAR_LN0             = 1'b0 ;   
+parameter        LPTX_DAT_POLAR_LN1             = 1'b0 ;   
+parameter        LPTX_DAT_POLAR_LN2             = 1'b0 ;   
+parameter        LPTX_DAT_POLAR_LN3             = 1'b0 ;   
+parameter        LPTX_DAT_POLAR_LNCK            = 1'b0 ;   
+parameter        LPTX_NIMP_LN0                  = 3'b100 ; 
+parameter        LPTX_NIMP_LN1                  = 3'b100 ; 
+parameter        LPTX_NIMP_LN2                  = 3'b100 ; 
+parameter        LPTX_NIMP_LN3                  = 3'b100 ; 
+parameter        LPTX_NIMP_LNCK                 = 3'b100 ; 
+parameter        LPTX_PIMP_LN0                  = 3'b100 ; 
+parameter        LPTX_PIMP_LN1                  = 3'b100 ; 
+parameter        LPTX_PIMP_LN2                  = 3'b100 ; 
+parameter        LPTX_PIMP_LN3                  = 3'b100 ; 
+parameter        LPTX_PIMP_LNCK                 = 3'b100 ; 
+parameter        MIPI_PMA_DIS_N                 = 1'b1 ;   
+parameter        PGA_BIAS_LANE0                 = 4'b1000 ;   
+parameter        PGA_BIAS_LANE1                 = 4'b1000 ;   
+parameter        PGA_BIAS_LANE2                 = 4'b1000 ;   
+parameter        PGA_BIAS_LANE3                 = 4'b1000 ;   
+parameter        PGA_BIAS_LANECK                = 4'b1000 ;   
+parameter        PGA_GAIN_LANE0                 = 4'b1000 ;   
+parameter        PGA_GAIN_LANE1                 = 4'b1000 ;   
+parameter        PGA_GAIN_LANE2                 = 4'b1000 ;   
+parameter        PGA_GAIN_LANE3                 = 4'b1000 ;   
+parameter        PGA_GAIN_LANECK                = 4'b1000 ;   
+parameter        RX_ODT_TRIM_LANE0              = 4'b1000 ;   
+parameter        RX_ODT_TRIM_LANE1              = 4'b1000 ;   
+parameter        RX_ODT_TRIM_LANE2              = 4'b1000 ;   
+parameter        RX_ODT_TRIM_LANE3              = 4'b1000 ;   
+parameter        RX_ODT_TRIM_LANECK             = 4'b1000 ;   
+parameter        SLEWN_CTL_LN0                  = 4'b1111 ;  
+parameter        SLEWN_CTL_LN1                  = 4'b1111 ;   
+parameter        SLEWN_CTL_LN2                  = 4'b1111 ;   
+parameter        SLEWN_CTL_LN3                  = 4'b1111 ;   
+parameter        SLEWN_CTL_LNCK                 = 4'b1111 ;   
+parameter        SLEWP_CTL_LN0                  = 4'b1111 ;   
+parameter        SLEWP_CTL_LN1                  = 4'b1111 ;   
+parameter        SLEWP_CTL_LN2                  = 4'b1111 ;   
+parameter        SLEWP_CTL_LN3                  = 4'b1111 ;   
+parameter        SLEWP_CTL_LNCK                 = 4'b1111 ;   
+parameter        STP_UNIT                       = 2'b01 ;  
+parameter        TERMN_CTL_LN0                  = 4'b1000 ;   
+parameter        TERMN_CTL_LN1                  = 4'b1000 ;   
+parameter        TERMN_CTL_LN2                  = 4'b1000 ;   
+parameter        TERMN_CTL_LN3                  = 4'b1000 ;   
+parameter        TERMN_CTL_LNCK                 = 4'b1000 ;   
+parameter        TERMP_CTL_LN0                  = 4'b1000 ;   
+parameter        TERMP_CTL_LN1                  = 4'b1000 ;   
+parameter        TERMP_CTL_LN2                  = 4'b1000 ;   
+parameter        TERMP_CTL_LN3                  = 4'b1000 ;   
+parameter        TERMP_CTL_LNCK                 = 4'b1000 ;   
+parameter        TEST_EN_LN0                    = 1'b0 ;   
+parameter        TEST_EN_LN1                    = 1'b0 ;   
+parameter        TEST_EN_LN2                    = 1'b0 ;   
+parameter        TEST_EN_LN3                    = 1'b0 ;   
+parameter        TEST_EN_LNCK                   = 1'b0 ;   
+parameter        TEST_N_IMP_LN0                 = 1'b0 ;   
+parameter        TEST_N_IMP_LN1                 = 1'b0 ;   
+parameter        TEST_N_IMP_LN2                 = 1'b0 ;   
+parameter        TEST_N_IMP_LN3                 = 1'b0 ;   
+parameter        TEST_N_IMP_LNCK                = 1'b0 ;   
+parameter        TEST_P_IMP_LN0                 = 1'b0 ;   
+parameter        TEST_P_IMP_LN1                 = 1'b0 ;   
+parameter        TEST_P_IMP_LN2                 = 1'b0 ;   
+parameter        TEST_P_IMP_LN3                 = 1'b0 ;   
+parameter        TEST_P_IMP_LNCK                = 1'b0 ;   
+endmodule
+
+module MIPI_CPHY (...);
+output [41:0] D0LN_HSRXD, D1LN_HSRXD, D2LN_HSRXD;
+output D0LN_HSRXD_VLD, D1LN_HSRXD_VLD, D2LN_HSRXD_VLD;
+output [1:0] D0LN_HSRX_DEMAP_INVLD, D1LN_HSRX_DEMAP_INVLD, D2LN_HSRX_DEMAP_INVLD;
+output D0LN_HSRX_FIFO_RDE_ERR, D0LN_HSRX_FIFO_WRF_ERR, D1LN_HSRX_FIFO_RDE_ERR, D1LN_HSRX_FIFO_WRF_ERR, D2LN_HSRX_FIFO_RDE_ERR, D2LN_HSRX_FIFO_WRF_ERR;
+output [1:0] D0LN_HSRX_WA, D1LN_HSRX_WA, D2LN_HSRX_WA;
+output D0LN_RX_CLK_1X_O, D1LN_RX_CLK_1X_O, D2LN_RX_CLK_1X_O;   
+output HSTX_FIFO_AE, HSTX_FIFO_AF;
+output HSTX_FIFO_RDE_ERR, HSTX_FIFO_WRF_ERR;
+output RX_CLK_MUXED;
+output TX_CLK_1X_O;
+output DI_LPRX0_A, DI_LPRX0_B, DI_LPRX0_C, DI_LPRX1_A, DI_LPRX1_B, DI_LPRX1_C, DI_LPRX2_A, DI_LPRX2_B, DI_LPRX2_C;
+output [7:0] MDRP_RDATA; 
+inout  D0A, D0B, D0C, D1A, D1B, D1C, D2A, D2B, D2C;
+input  D0LN_HSRX_EN, D0LN_HSTX_EN, D1LN_HSRX_EN, D1LN_HSTX_EN, D2LN_HSRX_EN, D2LN_HSTX_EN;
+input  [41:0] D0LN_HSTX_DATA,D1LN_HSTX_DATA, D2LN_HSTX_DATA;
+input  D0LN_HSTX_DATA_VLD, D1LN_HSTX_DATA_VLD, D2LN_HSTX_DATA_VLD;
+input  [1:0] D0LN_HSTX_MAP_DIS, D1LN_HSTX_MAP_DIS, D2LN_HSTX_MAP_DIS;
+input  D0LN_RX_CLK_1X_I,D1LN_RX_CLK_1X_I, D2LN_RX_CLK_1X_I;
+input  D0LN_RX_DRST_N, D0LN_TX_DRST_N, D1LN_RX_DRST_N, D1LN_TX_DRST_N, D2LN_RX_DRST_N, D2LN_TX_DRST_N;
+input  HSTX_ENLN0, HSTX_ENLN1, HSTX_ENLN2, LPTX_ENLN0, LPTX_ENLN1, LPTX_ENLN2;
+input  [7:0] MDRP_A_D_I;
+input  MDRP_A_INC_I;
+input  MDRP_CLK_I;
+input  [1:0] MDRP_OPCODE_I;
+input  PWRON_RX_LN0, PWRON_RX_LN1, PWRON_RX_LN2, PWRON_TX;
+input  ARST_RXLN0, ARST_RXLN1, ARST_RXLN2; 
+input  ARSTN_TX;
+input  RX_CLK_EN_LN0, RX_CLK_EN_LN1, RX_CLK_EN_LN2; 
+input  TX_CLK_1X_I;
+input  TXDP_ENLN0, TXDP_ENLN1, TXDP_ENLN2; 
+input  TXHCLK_EN; 
+input  DO_LPTX_A_LN0, DO_LPTX_A_LN1, DO_LPTX_A_LN2, DO_LPTX_B_LN0, DO_LPTX_B_LN1, DO_LPTX_B_LN2, DO_LPTX_C_LN0, DO_LPTX_C_LN1, DO_LPTX_C_LN2;
+input  GPLL_CK0,GPLL_CK90, GPLL_CK180, GPLL_CK270;
+input  HSRX_EN_D0, HSRX_EN_D1, HSRX_EN_D2; 
+input  HSRX_ODT_EN_D0, HSRX_ODT_EN_D1, HSRX_ODT_EN_D2;
+input  LPRX_EN_D0, LPRX_EN_D1, LPRX_EN_D2; 
+input  SPLL0_CKN, SPLL0_CKP, SPLL1_CKN, SPLL1_CKP;
+parameter TX_PLLCLK = "NONE"; 
+parameter D0LN_HS_TX_EN = 1'b1; 
+parameter D1LN_HS_TX_EN = 1'b1;
+parameter D2LN_HS_TX_EN = 1'b1;
+parameter D0LN_HS_RX_EN = 1'b1; 
+parameter D1LN_HS_RX_EN = 1'b1;
+parameter D2LN_HS_RX_EN = 1'b1;
+parameter TX_HS_21BIT_MODE = 1'b0; 
+parameter RX_OUTCLK_SEL = 2'b00; 
+parameter TX_W_LENDIAN = 1'b1; 
+parameter CLK_SEL = 2'b00; 
+parameter LNDIV_RATIO = 4'b0000; 
+parameter LNDIV_EN = 1'b0; 
+parameter D0LN_TX_REASGN_A = 2'b00; 
+parameter D0LN_TX_REASGN_B = 2'b01; 
+parameter D0LN_TX_REASGN_C = 2'b10; 
+parameter D0LN_RX_HS_21BIT_MODE = 1'b0; 
+parameter D0LN_RX_WA_SYNC_PAT0_EN = 1'b1;  
+parameter D0LN_RX_WA_SYNC_PAT0_H = 7'b1001001;  
+parameter D0LN_RX_WA_SYNC_PAT0_L = 8'b00100100;  
+parameter D0LN_RX_WA_SYNC_PAT1_EN = 1'b1;  
+parameter D0LN_RX_WA_SYNC_PAT1_H = 7'b0101001;  
+parameter D0LN_RX_WA_SYNC_PAT1_L = 8'b00100100;  
+parameter D0LN_RX_WA_SYNC_PAT2_EN = 1'b1;  
+parameter D0LN_RX_WA_SYNC_PAT2_H = 7'b0011001;  
+parameter D0LN_RX_WA_SYNC_PAT2_L = 8'b00100100;  
+parameter D0LN_RX_WA_SYNC_PAT3_EN = 1'b0;  
+parameter D0LN_RX_WA_SYNC_PAT3_H = 7'b0001001;  
+parameter D0LN_RX_WA_SYNC_PAT3_L = 8'b00100100;  
+parameter D0LN_RX_W_LENDIAN = 1'b1;  
+parameter D0LN_RX_REASGN_A = 2'b00; 
+parameter D0LN_RX_REASGN_B = 2'b01; 
+parameter D0LN_RX_REASGN_C = 2'b10; 
+parameter HSRX_LNSEL = 3'b111; 
+parameter EQ_RS_LN0 = 3'b001; 
+parameter EQ_CS_LN0 = 3'b101; 
+parameter PGA_GAIN_LN0 = 4'b0110; 
+parameter PGA_BIAS_LN0 = 4'b1000; 
+parameter EQ_PBIAS_LN0 = 4'b0100; 
+parameter EQ_ZLD_LN0 = 4'b1000; 
+parameter D1LN_TX_REASGN_A = 2'b00; 
+parameter D1LN_TX_REASGN_B = 2'b01; 
+parameter D1LN_TX_REASGN_C = 2'b10; 
+parameter D1LN_RX_HS_21BIT_MODE = 1'b0; 
+parameter D1LN_RX_WA_SYNC_PAT0_EN = 1'b1;  
+parameter D1LN_RX_WA_SYNC_PAT0_H = 7'b1001001;  
+parameter D1LN_RX_WA_SYNC_PAT0_L = 8'b00100100;  
+parameter D1LN_RX_WA_SYNC_PAT1_EN = 1'b1;  
+parameter D1LN_RX_WA_SYNC_PAT1_H = 7'b0101001;  
+parameter D1LN_RX_WA_SYNC_PAT1_L = 8'b00100100;  
+parameter D1LN_RX_WA_SYNC_PAT2_EN = 1'b1;  
+parameter D1LN_RX_WA_SYNC_PAT2_H = 7'b0011001;  
+parameter D1LN_RX_WA_SYNC_PAT2_L = 8'b00100100;  
+parameter D1LN_RX_WA_SYNC_PAT3_EN = 1'b0;  
+parameter D1LN_RX_WA_SYNC_PAT3_H = 7'b0001001;  
+parameter D1LN_RX_WA_SYNC_PAT3_L = 8'b00100100;  
+parameter D1LN_RX_W_LENDIAN = 1'b1;  
+parameter D1LN_RX_REASGN_A = 2'b00; 
+parameter D1LN_RX_REASGN_B = 2'b01; 
+parameter D1LN_RX_REASGN_C = 2'b10; 
+parameter EQ_RS_LN1 = 3'b001; 
+parameter EQ_CS_LN1 = 3'b101; 
+parameter PGA_GAIN_LN1 = 4'b0110; 
+parameter PGA_BIAS_LN1 = 4'b1000; 
+parameter EQ_PBIAS_LN1 = 4'b0100; 
+parameter EQ_ZLD_LN1 = 4'b1000; 
+parameter D2LN_TX_REASGN_A = 2'b00; 
+parameter D2LN_TX_REASGN_B = 2'b01; 
+parameter D2LN_TX_REASGN_C = 2'b10; 
+parameter D2LN_RX_HS_21BIT_MODE = 1'b0; 
+parameter D2LN_RX_WA_SYNC_PAT0_EN = 1'b1;  
+parameter D2LN_RX_WA_SYNC_PAT0_H = 7'b1001001;  
+parameter D2LN_RX_WA_SYNC_PAT0_L = 8'b00100100;  
+parameter D2LN_RX_WA_SYNC_PAT1_EN = 1'b1;  
+parameter D2LN_RX_WA_SYNC_PAT1_H = 7'b0101001;  
+parameter D2LN_RX_WA_SYNC_PAT1_L = 8'b00100100;  
+parameter D2LN_RX_WA_SYNC_PAT2_EN = 1'b1;  
+parameter D2LN_RX_WA_SYNC_PAT2_H = 7'b0011001;  
+parameter D2LN_RX_WA_SYNC_PAT2_L = 8'b00100100;  
+parameter D2LN_RX_WA_SYNC_PAT3_EN = 1'b0;  
+parameter D2LN_RX_WA_SYNC_PAT3_H = 7'b0001001;  
+parameter D2LN_RX_WA_SYNC_PAT3_L = 8'b00100100;  
+parameter D2LN_RX_W_LENDIAN = 1'b1;  
+parameter D2LN_RX_REASGN_A = 2'b00; 
+parameter D2LN_RX_REASGN_B = 2'b01; 
+parameter D2LN_RX_REASGN_C = 2'b10; 
+parameter EQ_RS_LN2 = 3'b001; 
+parameter EQ_CS_LN2 = 3'b101; 
+parameter PGA_GAIN_LN2 = 4'b0110; 
+parameter PGA_BIAS_LN2 = 4'b1000; 
+parameter EQ_PBIAS_LN2 = 4'b0100; 
+parameter EQ_ZLD_LN2 = 4'b1000; 
+endmodule
+
 module GTR12_QUAD (...);
 endmodule
 
@@ -1926,6 +2464,18 @@ endmodule
 module GTR12_PMAC (...);
 endmodule
 
+module GTR12_QUADA (...);
+endmodule
+
+module GTR12_UPARA (...);
+endmodule
+
+module GTR12_PMACA (...);
+endmodule
+
+module GTR12_QUADB (...);
+endmodule
+
 module DQS (...);
 input DQSIN,PCLK,FCLK,RESET;
 input [3:0] READ;
@@ -1941,4 +2491,3 @@ parameter RD_PNTR = 3'b000;
 parameter DQS_MODE = "X1"; 
 parameter HWL = "false";   
 endmodule
-

From eed3bc243f1e17812604eacafbc02b111f64ceb3 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 2 Jul 2025 11:54:19 +0200
Subject: [PATCH 103/931] verific: enable replacing const exprs in static
 elaboration by default

---
 frontends/verific/verific.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index d12f8a5a5..d83db3410 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -3465,11 +3465,13 @@ struct VerificPass : public Pass {
 			RuntimeFlags::SetVar("veri_extract_dualport_rams", 0);
 			RuntimeFlags::SetVar("veri_extract_multiport_rams", 1);
 			RuntimeFlags::SetVar("veri_allow_any_ram_in_loop", 1);
+			RuntimeFlags::SetVar("veri_replace_const_exprs", 1);
 #endif
 #ifdef VERIFIC_VHDL_SUPPORT
 			RuntimeFlags::SetVar("vhdl_extract_dualport_rams", 0);
 			RuntimeFlags::SetVar("vhdl_extract_multiport_rams", 1);
 			RuntimeFlags::SetVar("vhdl_allow_any_ram_in_loop", 1);
+			RuntimeFlags::SetVar("vhdl_replace_const_exprs", 1);
 
 			RuntimeFlags::SetVar("vhdl_support_variable_slice", 1);
 			RuntimeFlags::SetVar("vhdl_ignore_assertion_statements", 0);

From 5feb1a1752a7469fd5a02ec8afdb68794e55ef8f Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Thu, 3 Jul 2025 20:51:12 -0600
Subject: [PATCH 104/931] verilog: add support for SystemVerilog string
 literals.

Differences are new escape sequences (including escaped newline
continuations and hex escapes) and triple-quoted literals.
---
 docs/source/yosys_internals/verilog.rst |   3 +
 frontends/verilog/verilog_lexer.l       | 168 ++++++++++++----
 tests/verilog/bug5160.v                 |   5 -
 tests/verilog/string-literals.ys        | 257 ++++++++++++++++++++++++
 4 files changed, 386 insertions(+), 47 deletions(-)
 delete mode 100644 tests/verilog/bug5160.v
 create mode 100644 tests/verilog/string-literals.ys

diff --git a/docs/source/yosys_internals/verilog.rst b/docs/source/yosys_internals/verilog.rst
index 0039aaab7..d67553aa9 100644
--- a/docs/source/yosys_internals/verilog.rst
+++ b/docs/source/yosys_internals/verilog.rst
@@ -381,3 +381,6 @@ from SystemVerilog:
   will process conditionals using these keywords by annotating their
   representation with the appropriate ``full_case`` and/or ``parallel_case``
   attributes, which are described above.)
+
+- SystemVerilog string literals are supported (triple-quoted strings and
+  escape sequences such as line continuations and hex escapes).
diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 40162b8d3..e2d7a2cd9 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -112,6 +112,129 @@ static bool isUserType(std::string &s)
 	return false;
 }
 
+static bool is_hex_dig(char c, int *val)
+{
+	if ('0' <= c && c <= '9') {
+		*val = c - '0';
+		return true;
+	} else if ('a' <= c && c <= 'f') {
+		*val = c - 'a' + 0xA;
+		return true;
+	} else if ('A' <= c && c <= 'F') {
+		*val = c - 'A' + 0xA;
+		return true;
+	} else if (c == 'x' || c == 'X' || c == 'z' || c == 'Z' || c == '?') {
+		log_file_warning(AST::current_filename.c_str(), frontend_verilog_yyget_lineno(), "'%c' not a valid digit in hex escape sequence.\n", c);
+		*val = 0; // not semantically valid in hex escape...
+		return true; // ...but still processed as part of hex token
+	}
+
+	return false;
+}
+
+static bool is_oct_dig(char c, int *val)
+{
+	if ('0' <= c && c <= '7') {
+		*val = c - '0';
+		return true;
+	} else if (c == 'x' || c == 'X' || c == 'z' || c == 'Z' || c == '?') {
+		log_file_warning(AST::current_filename.c_str(), frontend_verilog_yyget_lineno(), "'%c' not a valid digit in octal escape sequence.\n", c);
+		*val = 0; // not semantically valid in octal escape...
+		return true; // ...but still processed as part of octal token
+	}
+
+	return false;
+}
+
+static std::string *process_str(char *str, int len, bool triple)
+{
+	char *in, *out; // Overwrite input buffer: flex manual states "Actions
+		// are free to modify 'yytext' except for lengthening it".
+
+	for (in = str, out = str; in < str + len; in++)
+		switch (*in) {
+		case '\n':
+		case '\r':
+			if (in + 1 < str + len && (in[1] ^ *in) == ('\n' ^ '\r'))
+				in++;
+			if (!triple)
+				log_file_warning(AST::current_filename.c_str(), frontend_verilog_yyget_lineno(), "Multi-line string literals should be triple-quoted or escaped.\n");
+			*out++ = '\n';
+			break;
+		case '\\':
+			in++;
+			log_assert(in < str + len);
+			switch (*in) {
+			case 'a':
+				*out++ = '\a';
+				break;
+			case 'f':
+				*out++ = '\f';
+				break;
+			case 'n':
+				*out++ = '\n';
+				break;
+			case 'r': /* not part of IEEE-1800 2023, but seems
+				     like a good idea to support it anyway */
+				*out++ = '\r';
+				break;
+			case 't':
+				*out++ = '\t';
+				break;
+			case 'v':
+				*out++ = '\v';
+				break;
+			case 'x':
+				int val;
+				if (in + 1 < str + len && is_hex_dig(in[1], &val)) {
+					*out = val;
+					in++;
+					if (in + 1 < str + len && is_hex_dig(in[1], &val)) {
+						*out = *out * 0x10 + val;
+						in++;
+					}
+					out++;
+				} else
+					log_file_warning(AST::current_filename.c_str(), frontend_verilog_yyget_lineno(), "ignoring invalid hex escape.\n");
+				break;
+			case '\\':
+				*out++ = '\\';
+				break;
+			case '"':
+				*out++ = '"';
+				break;
+			case '\n':
+			case '\r':
+				if (in + 1 < str + len && (in[1] ^ *in) == ('\n' ^ '\r'))
+					in++;
+				break;
+			default:
+				if ('0' <= *in && *in <= '7') {
+					int val;
+
+					*out = *in - '0';
+					if (in + 1 < str + len && is_oct_dig(in[1], &val)) {
+						*out = *out * 010 + val;
+						in++;
+						if (in + 1 < str + len && is_oct_dig(in[1], &val)) {
+							if (*out >= 040)
+								log_file_warning(AST::current_filename.c_str(), frontend_verilog_yyget_lineno(), "octal escape exceeds \\377\n");
+							*out = *out * 010 + val;
+							in++;
+						}
+					}
+					out++;
+				} else
+					*out++ = *in;
+			}
+			break;
+		default:
+			*out++ = *in;
+		}
+
+	return new std::string(str, out - str);
+}
+
 %}
 
 %option yylineno
@@ -122,7 +245,6 @@ static bool isUserType(std::string &s)
 %option prefix="frontend_verilog_yy"
 
 %x COMMENT
-%x STRING
 %x SYNOPSYS_TRANSLATE_OFF
 %x SYNOPSYS_FLAGS
 %x IMPORT_DPI
@@ -335,47 +457,9 @@ TIME_SCALE_SUFFIX [munpf]?s
 	return TOK_REALVAL;
 }
 
-\"		{ BEGIN(STRING); }
-<STRING>([^\\"]|\\.)+	{ yymore(); real_location = old_location; }
-<STRING>\"	{
-	BEGIN(0);
-	char *yystr = strdup(yytext);
-	yystr[strlen(yytext) - 1] = 0;
-	int i = 0, j = 0;
-	while (yystr[i]) {
-		if (yystr[i] == '\\' && yystr[i + 1]) {
-			i++;
-			if (yystr[i] == 'a')
-				yystr[i] = '\a';
-			else if (yystr[i] == 'f')
-				yystr[i] = '\f';
-			else if (yystr[i] == 'n')
-				yystr[i] = '\n';
-			else if (yystr[i] == 'r')
-				yystr[i] = '\r';
-			else if (yystr[i] == 't')
-				yystr[i] = '\t';
-			else if (yystr[i] == 'v')
-				yystr[i] = '\v';
-			else if ('0' <= yystr[i] && yystr[i] <= '7') {
-				yystr[i] = yystr[i] - '0';
-				if ('0' <= yystr[i + 1] && yystr[i + 1] <= '7') {
-					yystr[i + 1] = yystr[i] * 8 + yystr[i + 1] - '0';
-					i++;
-				}
-				if ('0' <= yystr[i + 1] && yystr[i + 1] <= '7') {
-					yystr[i + 1] = yystr[i] * 8 + yystr[i + 1] - '0';
-					i++;
-				}
-			}
-		}
-		yystr[j++] = yystr[i++];
-	}
-	yystr[j] = 0;
-	yylval->string = new std::string(yystr, j);
-	free(yystr);
-	return TOK_STRING;
-}
+\"([^\\"]|\\.|\\\n)*\"			{ yylval->string = process_str(yytext + 1, yyleng - 2, false); return TOK_STRING; }
+
+\"{3}(\"{0,2}([^\\"]|\\.|\\\n))*\"{3}	{ yylval->string = process_str(yytext + 3, yyleng - 6, true); return TOK_STRING; }
 
 and|nand|or|nor|xor|xnor|not|buf|bufif0|bufif1|notif0|notif1 {
 	yylval->string = new std::string(yytext);
diff --git a/tests/verilog/bug5160.v b/tests/verilog/bug5160.v
deleted file mode 100644
index 5b141a360..000000000
--- a/tests/verilog/bug5160.v
+++ /dev/null
@@ -1,5 +0,0 @@
-// Regression test for bug mentioned in #5160:
-// https://github.com/YosysHQ/yosys/pull/5160#issuecomment-2983643084
-module top;
-    initial $display( "\\" );
-endmodule
diff --git a/tests/verilog/string-literals.ys b/tests/verilog/string-literals.ys
new file mode 100644
index 000000000..a0f0f0460
--- /dev/null
+++ b/tests/verilog/string-literals.ys
@@ -0,0 +1,257 @@
+# Test valid escape sequences yield correct results:
+logger -expect-no-warnings
+read_verilog << EOF
+module top;
+	wire[7:0] sp = "\ ";
+	wire[7:0] spval = 32;
+	wire[7:0] ex = "\!";
+	wire[7:0] exval = 33;
+	wire[7:0] dq = "\"";
+	wire[7:0] dqval = 34;
+	wire[7:0] ha = "\#";
+	wire[7:0] haval = 35;
+	wire[7:0] do = "\$";
+	wire[7:0] doval = 36;
+	wire[7:0] pc = "\%";
+	wire[7:0] pcval = 37;
+	wire[7:0] am = "\&";
+	wire[7:0] amval = 38;
+	wire[7:0] sq = "\'";
+	wire[7:0] sqval = 39;
+	wire[7:0] op = "\(";
+	wire[7:0] opval = 40;
+	wire[7:0] cp = "\)";
+	wire[7:0] cpval = 41;
+	wire[7:0] as = "\*";
+	wire[7:0] asval = 42;
+	wire[7:0] pl = "\+";
+	wire[7:0] plval = 43;
+	wire[7:0] co = "\,";
+	wire[7:0] coval = 44;
+	wire[7:0] mi = "\-";
+	wire[7:0] mival = 45;
+	wire[7:0] do = "\.";
+	wire[7:0] doval = 46;
+	wire[7:0] sl = "\/";
+	wire[7:0] slval = 47;
+
+	wire[7:0] dig0 = "\012";
+	wire[7:0] dig0val = 10;
+	wire[7:0] dig8 = "\8"; // not octal, a literal '8'
+	wire[7:0] dig8val = 56;
+	wire[7:0] dig9 = "\9"; // not octal, a literal '9'
+	wire[7:0] dig9val = 57;
+	
+	wire[7:0] cl = "\:";
+	wire[7:0] clval = 58;
+	wire[7:0] sc = "\;";
+	wire[7:0] scval = 59;
+	wire[7:0] lt = "\<";
+	wire[7:0] ltval = 60;
+	wire[7:0] eq = "\=";
+	wire[7:0] eqval = 61;
+	wire[7:0] gt = "\>";
+	wire[7:0] gtval = 62;
+	wire[7:0] qu = "\?";
+	wire[7:0] quval = 63;
+	wire[7:0] at = "\@";
+	wire[7:0] atval = 64;
+
+	wire[7:0] A = "\A";
+	wire[7:0] Aval = 65; // etc. etc.
+
+	wire[7:0] os = "\[";
+	wire[7:0] osval = 91;
+	wire[7:0] bs = "\\";
+	wire[7:0] bsval = 92;
+	wire[7:0] cs = "\]";
+	wire[7:0] csval = 93;
+	wire[7:0] ca = "\^";
+	wire[7:0] caval = 94;
+	wire[7:0] us = "\_";
+	wire[7:0] usval = 95;
+	wire[7:0] bq = "\`";
+	wire[7:0] bqval = 96;
+
+	wire[7:0] a = "\a"; // alert, ASCII BEL=7
+	wire[7:0] aval = 7;
+	wire[7:0] b = "\b";
+	wire[7:0] bval = 98;
+	wire[7:0] c = "\c";
+	wire[7:0] cval = 99;
+	wire[7:0] d = "\d";
+	wire[7:0] dval = 100;
+	wire[7:0] e = "\e";
+	wire[7:0] eval = 101;
+	wire[7:0] f = "\f"; // form feed, ASCII FF=12
+	wire[7:0] fval = 12;
+	wire[7:0] g = "\g";
+	wire[7:0] gval = 103;
+	wire[7:0] h = "\h";
+	wire[7:0] hval = 104;
+	wire[7:0] i = "\i";
+	wire[7:0] ival = 105;
+	wire[7:0] j = "\j";
+	wire[7:0] jval = 106;
+	wire[7:0] k = "\k";
+	wire[7:0] kval = 107;
+	wire[7:0] l = "\l";
+	wire[7:0] lval = 108;
+	wire[7:0] m = "\m";
+	wire[7:0] mval = 109;
+	wire[7:0] n = "\n"; // new line, ASCII LF=10
+	wire[7:0] nval = 10;
+	wire[7:0] o = "\o";
+	wire[7:0] oval = 111;
+	wire[7:0] p = "\p";
+	wire[7:0] pval = 112;
+	wire[7:0] q = "\q";
+	wire[7:0] qval = 113;
+	wire[7:0] r = "\r"; // carriage return, ASCII CR=13, not IEEE 1800-2023
+	wire[7:0] rval = 13;
+	wire[7:0] s = "\s";
+	wire[7:0] sval = 115;
+	wire[7:0] t = "\t"; // tab, ASCII HT=9
+	wire[7:0] tval = 9;
+	wire[7:0] u = "\u";
+	wire[7:0] uval = 117;
+	wire[7:0] v = "\v"; // vertical tab, ASCII VT=11
+	wire[7:0] vval = 11;
+	wire[7:0] w = "\w";
+	wire[7:0] wval = 119;
+	wire[7:0] x = "\x2A"; // hex escape
+	wire[7:0] xval = 42;
+	wire[7:0] y = "\y";
+	wire[7:0] yval = 121;
+	wire[7:0] z = "\z";
+	wire[7:0] zval = 122;
+
+	wire[7:0] ob = "\{";
+	wire[7:0] obval = 123;
+	wire[7:0] vb = "\|";
+	wire[7:0] vbval = 124;
+	wire[7:0] cb = "\}";
+	wire[7:0] cbval = 125;
+	wire[7:0] ti = "\~";
+	wire[7:0] tival = 126;
+endmodule
+EOF
+sat -prove sp spval -prove ex exval -prove dq dqval -prove ha haval -prove do doval -prove pc pcval -prove am amval -prove sq sqval -prove op opval -prove cp cpval -prove as asval -prove pl plval -prove co coval -prove mi mival -prove do doval -prove sl slval -verify
+sat -prove dig0 dig0val -prove dig8 dig8val -prove dig9 dig9val -verify
+sat -prove cl clval -prove sc scval -prove lt ltval -prove eq eqval -prove gt gtval -prove qu quval -prove at atval -prove A Aval -verify
+sat -prove os osval -prove bs bsval -prove cs csval -prove ca caval -prove us usval -prove bq bqval -verify
+sat -prove a aval -prove b bval -prove c cval -prove d dval -prove e eval -prove f fval -prove g gval -prove h hval -prove i ival -prove j jval -prove k kval -prove l lval -prove m mval -prove n nval -prove o oval -prove p pval -prove q qval -prove r rval -prove s sval -prove t tval -prove u uval -prove v vval -prove w wval -prove x xval -prove y yval -prove z zval -verify
+sat -prove ob obval -prove vb vbval -prove cb cbval -prove ti tival -verify
+logger -check-expected
+design -reset
+
+# Test octal escape out of range.
+logger -expect warning "octal escape exceeds \\377" 1
+read_verilog << EOF
+module top;
+	wire[7:0] x = "\400";
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test invalid octal digit.
+logger -expect warning "'\?' not a valid digit in octal escape sequence" 1
+read_verilog << EOF
+module top;
+	wire[7:0] x = "\0?";
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test invalid hex digit.
+logger -expect warning "'X' not a valid digit in hex escape sequence" 1
+read_verilog << EOF
+module top;
+	wire[7:0] x = "\x0X";
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test hex escape with no hex digits at all.
+logger -expect warning "ignoring invalid hex escape" 1
+read_verilog << EOF
+module top;
+	wire[7:0] x = "\xy";
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test hex escape interrupted by end of string.
+logger -expect warning "ignoring invalid hex escape" 1
+read_verilog << EOF
+module top;
+	wire[7:0] x = "\x";
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test multi-line string.
+logger -expect warning "Multi-line string literals should be triple-quoted or escaped" 1
+read_verilog << EOF
+module top;
+	wire[31:0] x = "A
+BC";
+	wire[31:0] xval = 32'h410A4243;
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test multi-line triple-quoted string.
+logger -expect-no-warnings
+read_verilog << EOF
+module top;
+	wire[31:0] x = """A
+BC""";
+	wire[31:0] xval = 32'h410A4243;
+endmodule
+EOF
+logger -check-expected
+sat -prove x xval -verify
+design -reset
+
+# Test escaped multi-line string.
+logger -expect-no-warnings
+read_verilog << EOF
+module top;
+	wire[31:0] x = "AB\
+CD";
+	wire[31:0] xval = 32'h41424344;
+endmodule
+EOF
+logger -check-expected
+sat -prove x xval -verify
+design -reset
+
+# Test octal escape with surrounding data.
+logger -expect-no-warnings
+read_verilog << EOF
+module top;
+	wire[31:0] x = "AB\234C";
+	wire[31:0] xval = 32'h41429C43;
+endmodule
+EOF
+logger -check-expected
+sat -prove x xval -verify
+design -reset
+
+# Test hex escape with surrounding data.
+logger -expect-no-warnings
+read_verilog << EOF
+module top;
+	wire[31:0] x = "A\xBCDE";
+	wire[31:0] xval = 32'h41BC4445;
+endmodule
+EOF
+logger -check-expected
+sat -prove x xval -verify

From 99f7d79abb6a4514c141366237f510b1c1ec6679 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 5 Jul 2025 00:23:55 +0000
Subject: [PATCH 105/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3c2bc11b6..26bc60be3 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.54+29
+YOSYS_VER := 0.54+37
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 22a44e4333e3495982e472794e105b355adf7721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Thu, 3 Jul 2025 11:23:30 +0200
Subject: [PATCH 106/931] Start `opt_hier`

---
 passes/opt/Makefile.inc      |   1 +
 passes/opt/opt.cc            |  11 +
 passes/opt/opt_hier.cc       | 470 +++++++++++++++++++++++++++++++++++
 techlibs/common/synth.cc     |  26 +-
 tests/opt/opt_hier.tcl       |  34 +++
 tests/opt/opt_hier_simple1.v |   8 +
 tests/opt/opt_hier_simple2.v |   7 +
 tests/opt/opt_hier_test1.v   |  22 ++
 tests/opt/run-test.sh        |   2 +-
 9 files changed, 575 insertions(+), 6 deletions(-)
 create mode 100644 passes/opt/opt_hier.cc
 create mode 100644 tests/opt/opt_hier.tcl
 create mode 100644 tests/opt/opt_hier_simple1.v
 create mode 100644 tests/opt/opt_hier_simple2.v
 create mode 100644 tests/opt/opt_hier_test1.v

diff --git a/passes/opt/Makefile.inc b/passes/opt/Makefile.inc
index 08d8191c7..426d9a79a 100644
--- a/passes/opt/Makefile.inc
+++ b/passes/opt/Makefile.inc
@@ -11,6 +11,7 @@ OBJS += passes/opt/opt_dff.o
 OBJS += passes/opt/opt_share.o
 OBJS += passes/opt/opt_clean.o
 OBJS += passes/opt/opt_expr.o
+OBJS += passes/opt/opt_hier.o
 
 ifneq ($(SMALL),1)
 OBJS += passes/opt/share.o
diff --git a/passes/opt/opt.cc b/passes/opt/opt.cc
index dc88563c2..146c21cce 100644
--- a/passes/opt/opt.cc
+++ b/passes/opt/opt.cc
@@ -46,6 +46,7 @@ struct OptPass : public Pass {
 		log("        opt_merge [-share_all]\n");
 		log("        opt_share  (-full only)\n");
 		log("        opt_dff [-nodffe] [-nosdff] [-keepdc] [-sat]  (except when called with -noff)\n");
+		log("        opt_hier (-hier only)\n");
 		log("        opt_clean [-purge]\n");
 		log("        opt_expr [-mux_undef] [-mux_bool] [-undriven] [-noclkinv] [-fine] [-full] [-keepdc]\n");
 		log("    while <changed design>\n");
@@ -56,6 +57,7 @@ struct OptPass : public Pass {
 		log("        opt_expr [-mux_undef] [-mux_bool] [-undriven] [-noclkinv] [-fine] [-full] [-keepdc]\n");
 		log("        opt_merge [-share_all]\n");
 		log("        opt_dff [-nodffe] [-nosdff] [-keepdc] [-sat]  (except when called with -noff)\n");
+		log("        opt_hier (-hier only)\n");
 		log("        opt_clean [-purge]\n");
 		log("    while <changed design in opt_dff>\n");
 		log("\n");
@@ -74,6 +76,7 @@ struct OptPass : public Pass {
 		bool opt_share = false;
 		bool fast_mode = false;
 		bool noff_mode = false;
+		bool hier_mode = false;
 
 		log_header(design, "Executing OPT pass (performing simple optimizations).\n");
 		log_push();
@@ -141,6 +144,10 @@ struct OptPass : public Pass {
 				noff_mode = true;
 				continue;
 			}
+			if (args[argidx] == "-hier") {
+				hier_mode = true;
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
@@ -155,6 +162,8 @@ struct OptPass : public Pass {
 					Pass::call(design, "opt_dff" + opt_dff_args);
 				if (design->scratchpad_get_bool("opt.did_something") == false)
 					break;
+				if (hier_mode)
+					Pass::call(design, "opt_hier");
 				Pass::call(design, "opt_clean" + opt_clean_args);
 				log_header(design, "Rerunning OPT passes. (Removed registers in this run.)\n");
 			}
@@ -173,6 +182,8 @@ struct OptPass : public Pass {
 					Pass::call(design, "opt_share");
 				if (!noff_mode)
 					Pass::call(design, "opt_dff" + opt_dff_args);
+				if (hier_mode)
+					Pass::call(design, "opt_hier");
 				Pass::call(design, "opt_clean" + opt_clean_args);
 				Pass::call(design, "opt_expr" + opt_expr_args);
 				if (design->scratchpad_get_bool("opt.did_something") == false)
diff --git a/passes/opt/opt_hier.cc b/passes/opt/opt_hier.cc
new file mode 100644
index 000000000..a8df78dc1
--- /dev/null
+++ b/passes/opt/opt_hier.cc
@@ -0,0 +1,470 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C)  Martin Povišer <povik@cutebit.org>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include "kernel/register.h"
+#include "kernel/rtlil.h"
+#include "kernel/sigtools.h"
+
+USING_YOSYS_NAMESPACE
+PRIVATE_NAMESPACE_BEGIN
+
+// Used to propagate information out of a module
+struct ModuleIndex {
+	Module *module;
+	SigMap sigmap;
+	SigPool used;
+	dict<SigBit, SigBit> constant_outputs;
+	std::vector<SigSpec> tie_together_outputs;
+
+	ModuleIndex(Module *module)
+		: module(module), sigmap(module)
+	{
+		if (module->get_blackbox_attribute()) {
+			for (auto wire : module->wires()) {
+				for (auto bit : SigSpec(wire))
+					used.add(sigmap(bit));
+			}
+			return;
+		}
+
+		auto count_usage = [&](const SigSpec &signal) {
+			for (auto bit : signal)
+				used.add(sigmap(bit));
+		};
+		for (auto wire : module->wires()) {
+			if (wire->port_output) {
+				SigSpec wire1 = wire;
+				count_usage(wire1);
+			}
+		}
+		for (auto [_, process] : module->processes)
+			process->rewrite_sigspecs(count_usage);
+		for (auto cell : module->cells()) {
+			bool known = cell->known();
+			for (auto &conn : cell->connections()) {
+				if (!known || cell->input(conn.first))
+					count_usage(conn.second);
+			}
+		}
+
+
+		dict<SigBit, SigSpec> classes;
+		for (auto &pair : module->connections_) {
+			for (int i = 0; i < pair.first.size(); i++) {
+				if (pair.first[i].wire
+						&& pair.first[i].wire->port_output
+						&& !pair.first[i].wire->port_input) {
+					if (!pair.second[i].wire) {
+						constant_outputs[pair.first[i]] = pair.second[i];
+					} else {
+						classes[pair.second[i]].append(pair.first[i]);
+					}
+				}	
+			}
+		}
+
+		for (auto [key, new_class] : classes) {
+			if (new_class.size() > 1) {
+				new_class.sort_and_unify();
+				tie_together_outputs.push_back(new_class);
+			}
+		}
+	}
+
+	bool apply_changes(ModuleIndex &parent, Cell *instantiation) {
+		log_assert(instantiation->module == parent.module);
+
+		if (module->get_blackbox_attribute()) {
+			// no propagating out of blackboxes
+			return false;
+		}
+
+		bool changed = false;
+		for (auto &[port_name, value] : instantiation->connections_) {
+			Wire *port = module->wire(port_name);
+			if (!port || (!port->port_input && !port->port_output) || port->width != value.size()) {
+				log_error("Port %s connected on instance %s not found in module %s"
+						  " or width is not matching\n",
+						  log_id(port_name), log_id(instantiation), log_id(module));
+			}
+
+			if (port->port_input && port->port_output) {
+				// ignore bidirectional: hard to come up with sound handling
+				continue;
+			}
+
+			int nunused = 0, nconstants = 0;
+			// disconnect unused inputs
+			if (port->port_input) {
+				for (int i = 0; i < port->width; i++) {
+					if (value[i].is_wire() && !used.check(sigmap(SigBit(port, i)))) {
+						value[i] = RTLIL::Sx;
+						nunused++;
+					}
+				}
+			}
+
+			// propagate constants
+			if (port->port_output) {
+				SigSpec port_new_const;
+
+				for (int i = 0; i < port->width; i++) {
+					SigBit port_bit(port, i);
+					if (value[i].is_wire() && constant_outputs.count(port_bit) && parent.used.check(value[i])) {
+						port_new_const.append(port_bit);
+						nconstants++;
+					}
+				}
+
+				for (auto chunk : port_new_const.chunks()) {
+					RTLIL::SigSpec rhs = chunk;
+					rhs.replace(constant_outputs);
+					log_assert(rhs.is_fully_const());
+					parent.module->connect(value.extract(chunk.offset, chunk.width), rhs);
+					SigSpec dummy = parent.module->addWire(NEW_ID_SUFFIX("const_output"), chunk.width);
+					for (int i = 0; i < chunk.width; i++)
+						value[chunk.offset + i] = dummy[i];
+				}
+			}
+
+			if (nunused > 0) {
+				log("Disconnected %d input bits of instance '%s' of '%s' in '%s'\n",
+					nunused, log_id(instantiation), log_id(instantiation->type), log_id(parent.module));
+				changed = true;
+			}
+			if (nconstants > 0) {
+				log("Substituting constant for %d output bits of instance '%s' of '%s' in '%s'\n",
+					nconstants, log_id(instantiation), log_id(instantiation->type), log_id(parent.module));
+				changed = true;
+			}
+		}
+
+		// propagate tie-togethers
+		int ntie_togethers = 0;
+		SigSpec severed_port_bits;
+		for (auto class_ : tie_together_outputs) {
+			// filtered class represented by bits on the two sides of boundary
+			SigSpec new_tie;
+
+			for (auto port_bit : class_) {
+				if (instantiation->connections_.count(port_bit.wire->name)) {
+					SigBit bit = instantiation->connections_.at(port_bit.wire->name)[port_bit.offset];
+					if (parent.used.check(bit)) {
+						if (!new_tie.empty()) {
+							severed_port_bits.append(port_bit);
+							ntie_togethers++;
+						}
+						new_tie.append(bit);
+					}
+				}
+			}
+
+			if (new_tie.size() > 1)
+				parent.module->connect(new_tie.extract_end(1), SigSpec(new_tie[0]).repeat(new_tie.size() - 1));
+		}
+
+		severed_port_bits.sort_and_unify();
+		for (auto chunk : severed_port_bits.chunks()) {
+			SigSpec &value = instantiation->connections_.at(chunk.wire->name);
+			SigSpec dummy = parent.module->addWire(NEW_ID_SUFFIX("tie_together"), chunk.width);
+			for (int i = 0; i < chunk.width; i++)
+				value[chunk.offset + i] = dummy[i];
+		}
+
+		if (ntie_togethers > 0) {
+			log("Replacing %d output bits with tie-togethers on instance '%s' of '%s' in '%s'\n",
+				ntie_togethers, log_id(instantiation), log_id(instantiation->type), log_id(parent.module));
+			changed = true;
+		}
+
+		return changed;
+	}
+};
+
+// Used to propagate information into a module
+struct UsageData {
+	Module *module;
+	SigPool used_outputs;
+	// Values are constant nets. We're not using `dict<SigBit, State>`
+	// since we want to use this with `SigSpec::replace()`
+	dict<SigBit, SigBit> constant_inputs;
+	std::vector<SigSpec> tie_together_inputs;
+
+	SigSpec all_inputs;
+	SigSpec all_outputs;
+
+	UsageData(Module *module)
+		: module(module)
+	{
+		SigSpec all_inputs;
+
+		for (auto port_name : module->ports) {
+			Wire *port = module->wire(port_name);
+			log_assert(port);
+			
+			if (port->port_input && port->port_output) {
+				// ignore bidirectional: hard to come up with sound handling
+				continue;
+			}
+
+			if (port->port_input) {
+				for (int i = 0; i < port->width; i++) {
+					constant_inputs[SigBit(port, i)] = RTLIL::Sx;
+				}
+				all_inputs.append(port);
+			} else {
+				all_outputs.append(port);
+			}
+		}
+
+		tie_together_inputs.push_back(all_inputs);
+	}
+
+	void refine_used_outputs(Wire *port, SigSpec connection, ModuleIndex &index) {
+		for (int i = 0; i < port->width; i++) {
+			if (connection[i].is_wire() && index.used.check(index.sigmap(connection[i]))) {
+				used_outputs.add(SigBit(port, i));
+			}
+		}
+	}
+
+	void refine_input_constants(Wire *port, SigSpec connection) {
+		for (int i = 0; i < port->width; i++) {
+			SigBit port_bit(port, i);
+			// is connnected constant incompatible with candidate constant?
+			if (connection[i] != RTLIL::Sx
+					&& constant_inputs.count(port_bit)
+					&& constant_inputs.at(port_bit) != connection[i]) {
+				// we can go Sx -> S1/S0, otherwise erase the candidate constant
+				if (constant_inputs.at(port_bit) == RTLIL::Sx && !connection[i].is_wire()) {
+					constant_inputs[port_bit] = connection[i];
+				} else {
+					constant_inputs.erase(port_bit);
+				}
+			}
+		}
+	}
+
+	void refine_tie_togethers(const dict<SigBit, SigBit> &inputs) {
+		std::vector<SigSpec> new_tie_togethers;
+
+		for (auto &class_ : tie_together_inputs) {
+			dict<SigBit, SigSpec> new_classes;
+
+			for (auto bit : class_) {
+				SigBit connected_bit = inputs.count(bit) ? inputs.at(bit) : RTLIL::Sx;
+				new_classes[connected_bit].append(bit);
+			}
+
+			for (auto [key, new_class] : new_classes) {
+				if (new_class.size() > 1)
+					new_tie_togethers.push_back(new_class);
+			}
+		}
+
+		new_tie_togethers.swap(tie_together_inputs);
+	}
+
+	// inspect the given instantiation and refine usage data accordingly
+	void refine(Cell *instance, ModuleIndex &index) {
+		dict<SigBit, SigBit> inputs;
+
+		for (auto &[port_name, value] : instance->connections_) {
+			Wire *port = module->wire(port_name);
+			if (!port || (!port->port_input && !port->port_output) || port->width != value.size()) {
+				log_error("Port %s connected on instance %s not found in module %s"
+						  " or width is not matching\n",
+						  log_id(port_name), log_id(instance), log_id(module));
+			}
+
+			if (port->port_input && port->port_output) {
+				// ignore bidirectional: hard to come up with sound handling
+				continue;
+			}
+
+			if (port->port_output) {
+				refine_used_outputs(port, value, index);
+			} else {
+				refine_input_constants(port, value);
+				for (int i = 0; i < port->width; i++)
+					inputs[SigBit(port, i)] = value[i];
+			}
+		}
+
+		refine_tie_togethers(inputs);
+	}
+
+	bool apply_changes() {
+		bool did_something = false;
+
+		if (module->get_blackbox_attribute()) {
+			// no propagating into blackboxes
+			return false;
+		}
+
+		// Disconnect unused outputs
+		for (auto &pair : module->connections_) {
+			for (int i = 0; i < pair.first.size(); i++) {
+				// If an output is constant there's no benefit to disconnecting
+				// so consider it "used"
+				if (pair.first[i].wire
+						&& pair.first[i].wire->port_output
+						&& !pair.second[i].wire)
+					used_outputs.add(pair.first[i]);
+			}
+		}
+
+		SigSpec disconnect_outputs;
+		for (auto bit : all_outputs) {
+			if (!used_outputs.check(bit))
+				disconnect_outputs.append(bit);
+		}
+
+		dict<SigBit, SigBit> replacement_map;
+		for (auto chunk : disconnect_outputs.chunks()) {
+			Wire *repl_wire = module->addWire(module->uniquify(std::string("$") + chunk.wire->name.str()), chunk.size());
+			for (int i = 0; i < repl_wire->width; i++)
+				replacement_map[SigSpec(chunk)[i]] = SigBit(repl_wire, i);
+		}
+		auto disconnect_rewrite = [&](SigSpec &signal) {
+			signal.replace(replacement_map);
+		};
+		module->rewrite_sigspecs(disconnect_rewrite);
+		for (auto chunk : disconnect_outputs.chunks()) {
+			log("Disconnected unused output terminal '%s' in module '%s'\n", log_signal(chunk), log_id(module));
+			did_something = true;
+			module->connect(chunk, SigSpec(RTLIL::Sx, chunk.size()));
+		}
+
+		// Connect constant inputs
+		SigPool applied_constants;
+		auto constant_rewrite = [&](SigSpec &signal) {
+			for (auto bit : signal) {
+				if (constant_inputs.count(bit))
+					applied_constants.add(bit);
+			}
+			signal.replace(constant_inputs);
+		};
+		module->rewrite_sigspecs(constant_rewrite);
+		SigSpec applied_constants2 = applied_constants.export_all();
+		applied_constants2.sort_and_unify();
+		for (auto chunk : applied_constants2.chunks()) {
+			SigSpec const_ = chunk;
+			const_.replace(constant_inputs);
+			log("Substituting constant %s for input terminal '%s' in module '%s'\n",
+				log_signal(const_), log_signal(chunk), log_id(module));
+		}
+
+		// Propagate tied-together inputs
+		dict<SigBit, SigBit> ties;
+		for (auto group : tie_together_inputs) {
+			for (int i = 1; i < group.size(); i++)
+				ties[group[i]] = group[0];
+		}
+		SigPool applied_ties;
+		auto ties_rewrite = [&](SigSpec &signal) {
+			for (auto bit : signal) {
+				if (ties.count(bit)) {
+					applied_ties.add(bit);
+				}
+			}
+			signal.replace(ties);
+		};
+		module->rewrite_sigspecs(ties_rewrite);
+		if (applied_ties.size()) {
+			log("Replacing %zu input terminal bits with tie-togethers in module '%s'\n",
+					applied_ties.size(), log_id(module));
+		}
+		return did_something;
+	}
+};
+
+struct OptHierPass : Pass {
+	OptHierPass() : Pass("opt_hier", "perform cross-boundary optimization") {}
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    opt_hier [selection]\n");
+		log("\n");
+		log("This pass considers the design hierarchy and propagates unused signals, constant\n");
+		log("signals, and tied-together signals across module boundaries to facilitate\n");
+		log("optimization. Only the selected modules are affected.\n");
+		log("\n");
+		log("Note this pass changes port semantics on modules which are not the top.\n");
+		log("\n");
+	}
+	void execute(std::vector<std::string> args, RTLIL::Design *d) override
+	{
+		log_header(d, "Executing OPT_HIER pass.\n");
+
+		size_t argidx;
+		for (argidx = 1; argidx < args.size(); argidx++) {
+			break;
+		}
+		extra_args(args, argidx, d);
+
+		if (!d->top_module())
+			log_cmd_error("Top module needs to be selected for opt_hier\n");
+
+		dict<IdString, ModuleIndex> indices;
+		for (auto module : d->modules()) {
+			log_debug("Building index for %s\n", log_id(module));
+			indices.emplace(module->name, ModuleIndex(module));
+		}
+
+		dict<IdString, UsageData> usage_datas;
+		for (auto module : d->selected_modules(RTLIL::SELECT_WHOLE_ONLY, RTLIL::SB_UNBOXED_CMDERR)) {
+			if (module->get_bool_attribute(ID::top))
+				continue;
+
+			log_debug("Starting usage data for %s\n", log_id(module));
+			usage_datas.emplace(module->name, UsageData(module));
+		}
+
+		for (auto module : d->modules()) {
+			for (auto cell : module->cells()) {
+				if (usage_datas.count(cell->type)) {
+					log_debug("Account for instance %s of %s in %s\n", log_id(cell), log_id(cell->type), log_id(module));
+					usage_datas.at(cell->type).refine(cell, indices.at(module->name));
+				}
+			}
+		}
+
+		bool did_something = false;
+		for (auto module : d->selected_modules(RTLIL::SELECT_WHOLE_ONLY, RTLIL::SB_UNBOXED_CMDERR)) {
+			if (usage_datas.count(module->name)) {
+				log_debug("Applying usage data changes to %s\n", log_id(module));
+				did_something |= usage_datas.at(module->name).apply_changes();
+			}
+
+			ModuleIndex &parent_index = indices.at(module->name);
+			for (auto cell : module->cells()) {
+				if (indices.count(cell->type)) {
+					log_debug("Applying changes to instance %s of %s in %s\n", log_id(cell), log_id(cell->type), log_id(module));
+					did_something |= indices.at(cell->type).apply_changes(parent_index, cell);
+				}
+			}
+		}
+		if (did_something)
+			d->scratchpad_set_bool("opt.did_something", true);
+	}
+} OptHierPass;
+
+PRIVATE_NAMESPACE_END
diff --git a/techlibs/common/synth.cc b/techlibs/common/synth.cc
index 74a484d59..e3a82ba48 100644
--- a/techlibs/common/synth.cc
+++ b/techlibs/common/synth.cc
@@ -47,6 +47,11 @@ struct SynthPass : public ScriptPass {
 		log("        flatten the design before synthesis. this will pass '-auto-top' to\n");
 		log("        'hierarchy' if no top module is specified.\n");
 		log("\n");
+		log("    -hieropt\n");
+		log("        enable hierarchical optimization. this option is useful when `-flatten'\n");
+		log("        is not used, or when selected modules are marked with 'keep_hierarchy'\n.");
+		log("        to prevent their dissolution (EXPERIMENTAL).\n");
+		log("\n");
 		log("    -encfile <file>\n");
 		log("        passed to 'fsm_recode' via 'fsm'\n");
 		log("\n");
@@ -99,7 +104,7 @@ struct SynthPass : public ScriptPass {
 	}
 
 	string top_module, fsm_opts, memory_opts, abc;
-	bool autotop, flatten, noalumacc, nofsm, noabc, noshare, flowmap, booth;
+	bool autotop, flatten, noalumacc, nofsm, noabc, noshare, flowmap, booth, hieropt;
 	int lut;
 	std::vector<std::string> techmap_maps;
 
@@ -118,6 +123,7 @@ struct SynthPass : public ScriptPass {
 		noshare = false;
 		flowmap = false;
 		booth = false;
+		hieropt = false;
 		abc = "abc";
 		techmap_maps.clear();
 	}
@@ -201,6 +207,10 @@ struct SynthPass : public ScriptPass {
 				techmap_maps.push_back(args[++argidx]);
 				continue;
 			}
+			if (args[argidx] == "-hieropt") {
+				hieropt = true;
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
@@ -223,6 +233,12 @@ struct SynthPass : public ScriptPass {
 
 	void script() override
 	{
+		std::string hieropt_flag;
+		if (help_mode)
+			hieropt_flag = " [-hier]";
+		else
+			hieropt_flag = hieropt ? " -hier" : "";
+
 		if (check_label("begin")) {
 			if (help_mode) {
 				run("hierarchy -check [-top <top> | -auto-top]");
@@ -247,7 +263,7 @@ struct SynthPass : public ScriptPass {
 			run("opt -nodffe -nosdff");
 			if (!nofsm || help_mode)
 				run("fsm" + fsm_opts, "      (unless -nofsm)");
-			run("opt");
+			run("opt" + hieropt_flag);
 			run("wreduce");
 			run("peepopt");
 			run("opt_clean");
@@ -261,13 +277,13 @@ struct SynthPass : public ScriptPass {
 				run("alumacc", "  (unless -noalumacc)");
 			if (!noshare)
 				run("share", "    (unless -noshare)");
-			run("opt");
+			run("opt" + hieropt_flag);
 			run("memory -nomap" + memory_opts);
 			run("opt_clean");
 		}
 
 		if (check_label("fine")) {
-			run("opt -fast -full");
+			run("opt -fast -full" + hieropt_flag);
 			run("memory_map");
 			run("opt -full");
 			if (help_mode) {
@@ -291,7 +307,7 @@ struct SynthPass : public ScriptPass {
 			} else if (flowmap) {
 				run(stringf("flowmap -maxlut %d", lut));
 			}
-			run("opt -fast");
+			run("opt -fast" + hieropt_flag);
 
 			if ((!noabc && !flowmap) || help_mode) {
 #ifdef YOSYS_ENABLE_ABC
diff --git a/tests/opt/opt_hier.tcl b/tests/opt/opt_hier.tcl
new file mode 100644
index 000000000..65d8f9809
--- /dev/null
+++ b/tests/opt/opt_hier.tcl
@@ -0,0 +1,34 @@
+yosys -import
+
+# per each opt_hier_*.v source file, confirm flattening and hieropt+flattening
+# are combinationally equivalent
+foreach fn [glob opt_hier_*.v] {
+	log -header "Test $fn"
+	log -push
+	design -reset
+
+	read_verilog $fn
+	hierarchy -auto-top
+	prep -top top
+	design -save start
+	flatten
+	design -save gold
+	design -load start
+	opt -hier
+	# check any instances marked `should_get_optimized_out` were
+	# indeed optimized out
+	select -assert-none a:should_get_optimized_out
+	dump
+	flatten
+	design -save gate
+
+	design -reset
+	design -copy-from gold -as gold A:top
+	design -copy-from gate -as gate A:top
+	yosys rename -hide
+	equiv_make gold gate equiv
+	equiv_induct equiv
+	equiv_status -assert equiv
+
+	log -pop
+}
diff --git a/tests/opt/opt_hier_simple1.v b/tests/opt/opt_hier_simple1.v
new file mode 100644
index 000000000..17935a960
--- /dev/null
+++ b/tests/opt/opt_hier_simple1.v
@@ -0,0 +1,8 @@
+module m(input a, output y1, output y2);
+	assign y1 = a;
+	assign y2 = a;
+endmodule
+
+module top(input a, output y2, output y1);
+	m inst(.a(a), .y1(y1), .y2(y2));
+endmodule
diff --git a/tests/opt/opt_hier_simple2.v b/tests/opt/opt_hier_simple2.v
new file mode 100644
index 000000000..9e724216b
--- /dev/null
+++ b/tests/opt/opt_hier_simple2.v
@@ -0,0 +1,7 @@
+module m(input [3:0] i, output [3:0] y);
+	assign y = i + 1;
+endmodule
+
+module top(output [3:0] y);
+	m inst(.i(4), .y(y));
+endmodule
diff --git a/tests/opt/opt_hier_test1.v b/tests/opt/opt_hier_test1.v
new file mode 100644
index 000000000..69de6b92f
--- /dev/null
+++ b/tests/opt/opt_hier_test1.v
@@ -0,0 +1,22 @@
+(* blackbox *)
+module bb(output y);
+endmodule
+
+// all instances of `m` tie together a[1], a[2]
+// this can be used to conclude y[0]=0
+module m(input [3:0] a, output [1:0] y, output x);
+	assign y[0] = a[1] != a[2];
+	assign x = a[0] ^ a[3];
+	(* should_get_optimized_out *)
+	bb bb1(.y(y[1]));
+endmodule
+
+module top(input j, output z, output [2:0] x);
+	wire [1:0] y1;
+	wire [1:0] y2;
+	wire [1:0] y3;
+	m inst1(.a(0), .y(y1), .x(x[0]));
+	m inst2(.a(15), .y(y2), .x(x[1]));
+	m inst3(.a({1'b1, j, j, 1'b0}), .y(y3), .x(x[2]));
+	assign z = (&y1) ^ (&y2) ^ (&y3);
+endmodule
diff --git a/tests/opt/run-test.sh b/tests/opt/run-test.sh
index 006c731e3..1d1d9b7a6 100755
--- a/tests/opt/run-test.sh
+++ b/tests/opt/run-test.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../gen-tests-makefile.sh
-generate_mk --yosys-scripts
+generate_mk --yosys-scripts --tcl-scripts

From 62067cd6cb6ddb1ba7d5aeed44160b27c909b5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Fri, 4 Jul 2025 17:57:00 +0200
Subject: [PATCH 107/931] Update docs after addition of new pass

---
 docs/source/code_examples/macro_commands/opt.ys | 1 +
 docs/source/using_yosys/synthesis/opt.rst       | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/docs/source/code_examples/macro_commands/opt.ys b/docs/source/code_examples/macro_commands/opt.ys
index cb883bc58..ebd938836 100644
--- a/docs/source/code_examples/macro_commands/opt.ys
+++ b/docs/source/code_examples/macro_commands/opt.ys
@@ -9,6 +9,7 @@ do
     opt_merge
     opt_share  (-full only)
     opt_dff  (except when called with -noff)
+    opt_hier (-hier only)
     opt_clean
     opt_expr
 while <changed design>
diff --git a/docs/source/using_yosys/synthesis/opt.rst b/docs/source/using_yosys/synthesis/opt.rst
index 743b24997..43b558739 100644
--- a/docs/source/using_yosys/synthesis/opt.rst
+++ b/docs/source/using_yosys/synthesis/opt.rst
@@ -192,6 +192,13 @@ control inputs.
 Called with ``-nodffe`` and ``-nosdff``, this pass is used to prepare a design
 for :doc:`/using_yosys/synthesis/fsm`.
 
+Hierarchical optimization - `opt_hier` pass
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This pass considers the design hierarchy and propagates unused signals, constant
+signals, and tied-together signals across module boundaries to facilitate
+optimization by other passes.
+
 Removing unused cells and wires - `opt_clean` pass
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

From 60f126cd00c94892782470192d6c9f7abebe7c05 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 7 Jul 2025 11:16:07 +0200
Subject: [PATCH 108/931] Release version 0.55

---
 CHANGELOG           | 6 +++++-
 Makefile            | 4 ++--
 docs/source/conf.py | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 537c5682d..b6b7c587b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,12 @@
 List of major changes and improvements between releases
 =======================================================
 
-Yosys 0.54 .. Yosys 0.55-dev
+Yosys 0.54 .. Yosys 0.55
 --------------------------
+ * Various
+    - read_verilog: Implemented SystemVerilog unique/priority if.
+    - "attrmap" pass is able to alter memory attributes.
+    - verific: Support SVA followed-by operator in cover mode.
 
 Yosys 0.53 .. Yosys 0.54
 --------------------------
diff --git a/Makefile b/Makefile
index 26bc60be3..074553918 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.54+37
+YOSYS_VER := 0.55
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -183,7 +183,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline db72ec3.. | wc -l`/;" Makefile
+#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline db72ec3.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 100605336..05dcb7d5f 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -6,7 +6,7 @@ import os
 project = 'YosysHQ Yosys'
 author = 'YosysHQ GmbH'
 copyright ='2025 YosysHQ GmbH'
-yosys_ver = "0.54"
+yosys_ver = "0.55"
 
 # select HTML theme
 html_theme = 'furo-ys'

From 8af60b7e17d2cf1d092b06ca180868146ca3dd03 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 7 Jul 2025 12:40:53 +0200
Subject: [PATCH 109/931] Next dev cycle

---
 CHANGELOG | 3 +++
 Makefile  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b6b7c587b..d8f2f8804 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 List of major changes and improvements between releases
 =======================================================
 
+Yosys 0.55 .. Yosys 0.56-dev
+--------------------------
+
 Yosys 0.54 .. Yosys 0.55
 --------------------------
  * Various
diff --git a/Makefile b/Makefile
index 074553918..b7928f33a 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55
+YOSYS_VER := 0.55+0
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -183,7 +183,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline db72ec3.. | wc -l`/;" Makefile
+	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 60f126c.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 

From 658c7dd424c5c93387415ed51e8d922a11df76c5 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 7 Jul 2025 16:16:57 +0200
Subject: [PATCH 110/931] rename: fix help

---
 passes/cmds/rename.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/cmds/rename.cc b/passes/cmds/rename.cc
index 02cab3221..e0586ec7e 100644
--- a/passes/cmds/rename.cc
+++ b/passes/cmds/rename.cc
@@ -276,7 +276,7 @@ struct RenamePass : public Pass {
 		log("\n");
 		log("    rename -unescape [selection]\n");
 		log("\n");
-		log("Rename all selected public wires and cells that have to be escaped.\n");
+		log("Rename all selected public wires and cells that have to be escaped in Verilog.\n");
 		log("Replaces characters with underscores or adds additional underscores and numbers.\n");
 		log("\n");
 	}

From e60cf3e2facf8a2d7e27068bc99775183356b8d0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 8 Jul 2025 00:25:06 +0000
Subject: [PATCH 111/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b7928f33a..e14be4ad2 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+0
+YOSYS_VER := 0.55+3
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From ad80e2bd39917eaae922fbeac2ed9aaab0180f94 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 8 Jul 2025 13:39:03 +0200
Subject: [PATCH 112/931] libparse: install headers for use in plugins

---
 Makefile                  | 1 +
 passes/techmap/libparse.h | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index e14be4ad2..0379adf57 100644
--- a/Makefile
+++ b/Makefile
@@ -627,6 +627,7 @@ endif
 $(eval $(call add_include_file,libs/sha1/sha1.h))
 $(eval $(call add_include_file,libs/json11/json11.hpp))
 $(eval $(call add_include_file,passes/fsm/fsmdata.h))
+$(eval $(call add_include_file,passes/techmap/libparse.h))
 $(eval $(call add_include_file,frontends/ast/ast.h))
 $(eval $(call add_include_file,frontends/ast/ast_binding.h))
 $(eval $(call add_include_file,frontends/blif/blifparse.h))
diff --git a/passes/techmap/libparse.h b/passes/techmap/libparse.h
index 949adbdcf..8a2ab22e0 100644
--- a/passes/techmap/libparse.h
+++ b/passes/techmap/libparse.h
@@ -26,6 +26,11 @@
 #include <vector>
 #include <set>
 
+/**
+ * This file is likely to change in the near future.
+ * Rely on it in your plugins at your own peril
+ */
+
 namespace Yosys
 {
 	struct LibertyAst

From 478b6a2b3fbab0fd4097b841914cbe8bb9f67268 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Mon, 16 Jun 2025 13:40:07 +0100
Subject: [PATCH 113/931] kernel: treat zero width constant as zero

---
 kernel/rtlil.cc | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 189db0648..8a0080dbf 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -384,7 +384,7 @@ bool RTLIL::Const::convertible_to_int(bool is_signed) const
 {
 	auto size = get_min_size(is_signed);
 
-	if (size <= 0)
+	if (size < 0)
 		return false;
 
 	// If it fits in 31 bits it is definitely convertible
@@ -5509,6 +5509,9 @@ bool RTLIL::SigSpec::convertible_to_int(bool is_signed) const
 	if (!is_fully_const())
 		return false;
 
+	if (empty())
+		return true;
+
 	return RTLIL::Const(chunks_[0].data).convertible_to_int(is_signed);
 }
 
@@ -5520,6 +5523,9 @@ std::optional<int> RTLIL::SigSpec::try_as_int(bool is_signed) const
 	if (!is_fully_const())
 		return std::nullopt;
 
+	if (empty())
+		return 0;
+
 	return RTLIL::Const(chunks_[0].data).try_as_int(is_signed);
 }
 
@@ -5529,7 +5535,10 @@ int RTLIL::SigSpec::as_int_saturating(bool is_signed) const
 
 	pack();
 	log_assert(is_fully_const() && GetSize(chunks_) <= 1);
-	log_assert(!empty());
+
+	if (empty())
+		return 0;
+
 	return RTLIL::Const(chunks_[0].data).as_int_saturating(is_signed);
 }
 

From 743df9f0f943c62835ebd21d31bea68a0395edac Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 8 Jul 2025 23:53:38 +0000
Subject: [PATCH 114/931] Fix space leak in `SatGen::importSigSpecWorker()` by
 avoiding `log_id()`.

Calling `log_id()` leaks a copy of the ID into `log_id_cache` until the
end of the pass, which causes exorbitant memory usage.

See issue #5210.
---
 kernel/satgen.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/satgen.h b/kernel/satgen.h
index 8a89ff9db..2c8cbda13 100644
--- a/kernel/satgen.h
+++ b/kernel/satgen.h
@@ -101,7 +101,9 @@ struct SatGen
 				else
 					vec.push_back(bit == (undef_mode ? RTLIL::State::Sx : RTLIL::State::S1) ? ez->CONST_TRUE : ez->CONST_FALSE);
 			} else {
-				std::string name = pf + (bit.wire->width == 1 ? stringf("%s", log_id(bit.wire)) : stringf("%s [%d]", log_id(bit.wire->name), bit.offset));
+				std::string wire_name = RTLIL::unescape_id(bit.wire->name);
+				std::string name = pf +
+					(bit.wire->width == 1 ? wire_name : stringf("%s [%d]", wire_name.c_str(), bit.offset));
 				vec.push_back(ez->frozen_literal(name));
 				imported_signals[pf][bit] = vec.back();
 			}

From 7566af4a4b588640ed54438aa571fa9e94870846 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 9 Jul 2025 00:25:57 +0000
Subject: [PATCH 115/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e14be4ad2..59becefac 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+3
+YOSYS_VER := 0.55+8
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From e47f5369fd897dab4c3c8da2143986dd7d040411 Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Wed, 9 Jul 2025 15:58:35 +0200
Subject: [PATCH 116/931] verificsva: check -L value is small enough for code
 to work

---
 frontends/verific/verific.cc    | 3 +++
 frontends/verific/verificsva.cc | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index d83db3410..241b2db30 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -4124,6 +4124,9 @@ struct VerificPass : public Pass {
 			if (argidx > GetSize(args) && args[argidx].compare(0, 1, "-") == 0)
 				cmd_error(args, argidx, "unknown option");
 
+			if ((unsigned long)verific_sva_fsm_limit >= sizeof(1ull)*8)
+				log_cmd_error("-L %d: limit too large; maximum allowed value is %zu.\n", verific_sva_fsm_limit, sizeof(1ull)*8-1);
+
 			std::set<std::string> top_mod_names;
 
 			if (mode_all)
diff --git a/frontends/verific/verificsva.cc b/frontends/verific/verificsva.cc
index 7652f8130..6e87bd267 100644
--- a/frontends/verific/verificsva.cc
+++ b/frontends/verific/verificsva.cc
@@ -479,14 +479,14 @@ struct SvaFsm
 					GetSize(dnode.ctrl), verific_sva_fsm_limit);
 		}
 
-		for (int i = 0; i < (1 << GetSize(dnode.ctrl)); i++)
+		for (unsigned long long i = 0; i < (1ull << GetSize(dnode.ctrl)); i++)
 		{
 			Const ctrl_val(i, GetSize(dnode.ctrl));
 			pool<SigBit> ctrl_bits;
 
-			for (int i = 0; i < GetSize(dnode.ctrl); i++)
-				if (ctrl_val[i] == State::S1)
-					ctrl_bits.insert(dnode.ctrl[i]);
+			for (int j = 0; j < GetSize(dnode.ctrl); j++)
+				if (ctrl_val[j] == State::S1)
+					ctrl_bits.insert(dnode.ctrl[j]);
 
 			vector<int> new_state;
 			bool accept = false, cond = false;

From f34c4f2e26f0e18df7eb3393ec755b5e6c288b00 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 9 Jul 2025 16:20:27 +0200
Subject: [PATCH 117/931] log: deduplicate unescape_id from log_id

---
 kernel/log.cc | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index fabbe09fd..679a55562 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -664,15 +664,9 @@ const char *log_const(const RTLIL::Const &value, bool autoint)
 
 const char *log_id(const RTLIL::IdString &str)
 {
-	log_id_cache.push_back(strdup(str.c_str()));
-	const char *p = log_id_cache.back();
-	if (p[0] != '\\')
-		return p;
-	if (p[1] == '$' || p[1] == '\\' || p[1] == 0)
-		return p;
-	if (p[1] >= '0' && p[1] <= '9')
-		return p;
-	return p+1;
+	std::string unescaped = RTLIL::unescape_id(str);
+	log_id_cache.push_back(strdup(unescaped.c_str()));
+	return log_id_cache.back();
 }
 
 const char *log_str(const char *str)

From 7fe817c52f51591eaeb780e3022fe8f2a4114abc Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 10 Jul 2025 18:54:43 +0200
Subject: [PATCH 118/931] dfflibmap: test negated state next_state with mixed
 polarities

---
 tests/techmap/dfflibmap.ys                 | 16 ++++++++++
 tests/techmap/dfflibmap_dffsr_mixedpol.lib | 35 ++++++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 tests/techmap/dfflibmap_dffsr_mixedpol.lib

diff --git a/tests/techmap/dfflibmap.ys b/tests/techmap/dfflibmap.ys
index 77488d60f..822d87a36 100644
--- a/tests/techmap/dfflibmap.ys
+++ b/tests/techmap/dfflibmap.ys
@@ -81,3 +81,19 @@ clean
 select -assert-count 0 t:dffn
 select -assert-count 5 t:dffsr
 select -assert-count 1 t:dffe
+
+design -load orig
+dfflibmap -liberty dfflibmap.lib -liberty dfflibmap_dffsr_mixedpol.lib -dont_use dffsr
+clean
+# We have one more _NOT_ than with the regular dffsr
+select -assert-count 6 t:$_NOT_
+select -assert-count 1 t:dffn
+select -assert-count 4 t:dffsr_mixedpol
+select -assert-count 1 t:dffe
+# The additional NOT is on ff2.
+# Originally, ff2.R is an active high "set".
+# dffsr_mixedpol has functionally swapped labels due to the next_state inversion,
+# so we use its CLEAR port for the "set",
+# but we have to invert it because the CLEAR pin is active low.
+# ff2.CLEAR = !R
+select -assert-count 1 c:ff2 %x:+[CLEAR] %ci t:$_NOT_ %i
diff --git a/tests/techmap/dfflibmap_dffsr_mixedpol.lib b/tests/techmap/dfflibmap_dffsr_mixedpol.lib
new file mode 100644
index 000000000..8c6a2f509
--- /dev/null
+++ b/tests/techmap/dfflibmap_dffsr_mixedpol.lib
@@ -0,0 +1,35 @@
+library(test) {
+  cell (dffsr_mixedpol) {
+    area : 6;
+    ff("IQ", "IQN") {
+      // look here
+      next_state : "!D";
+      clocked_on : "CLK";
+      // look here
+      clear      : "!CLEAR";
+      preset     : "PRESET";
+      clear_preset_var1 : L;
+      clear_preset_var2 : L;
+    }
+    pin(D) {
+      direction : input;
+    }
+    pin(CLK) {
+      direction : input;
+    }
+    pin(CLEAR) {
+      direction : input;
+    }
+    pin(PRESET) {
+      direction : input;
+    }
+    pin(Q) {
+      direction: output;
+      function : "IQ";
+    }
+    pin(QN) {
+      direction: output;
+      function : "IQN";
+    }
+  }
+}

From 6ee01308f22bdbbad3ab6717e98d78917b84c43a Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 11 Jul 2025 00:33:01 +0200
Subject: [PATCH 119/931] dfflibmap: show dffe inference is broken by space
 ANDs

---
 tests/techmap/dfflibmap.lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/techmap/dfflibmap.lib b/tests/techmap/dfflibmap.lib
index d0cd472c3..54a44a296 100644
--- a/tests/techmap/dfflibmap.lib
+++ b/tests/techmap/dfflibmap.lib
@@ -55,7 +55,7 @@ library(test) {
   cell (dffe) {
     area : 6;
     ff("IQ", "IQN") {
-      next_state : "(D&EN) | (IQ&!EN)";
+      next_state : "(D EN) | (IQ !EN)";
       clocked_on : "!CLK";
     }
     pin(D) {

From e57a2b944239eb5214c66e0fa897cae397c907dc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 11 Jul 2025 00:25:36 +0000
Subject: [PATCH 120/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3fbd8762a..d9f3b937c 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+8
+YOSYS_VER := 0.55+23
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 4b1a8a3b667d133fc583ba40e20192f3f4e520da Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 11 Jul 2025 18:27:19 +0200
Subject: [PATCH 121/931] libparse: add LibertyExpression::str for testing

---
 passes/techmap/dfflibmap.cc |  1 +
 passes/techmap/libparse.cc  | 41 +++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index f0b0ef20b..ae9498a9c 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -117,6 +117,7 @@ static bool parse_next_state(const LibertyAst *cell, const LibertyAst *attr, std
 	// the next_state variable isn't just a pin name; perhaps this is an enable?
 	auto helper = LibertyExpression::Lexer(expr);
 	auto tree = LibertyExpression::parse(helper);
+	log_debug("liberty expression:\n%s\n", tree.str().c_str());
 
 	if (tree.kind == LibertyExpression::Kind::EMPTY) {
 		if (!warned_cells.count(cell_name)) {
diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index 85ed35ea1..0df7af347 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -306,6 +306,47 @@ bool LibertyExpression::eval(dict<std::string, bool>& values) {
 	}
 	return false;
 }
+
+std::string LibertyExpression::str(int indent)
+{
+	std::string prefix;
+	prefix = std::string(indent, ' ');
+	switch (kind) {
+		case AND:
+			prefix += "(and ";
+			break;
+		case OR:
+			prefix += "(or ";
+			break;
+		case NOT:
+			prefix += "(not ";
+			break;
+		case XOR:
+			prefix += "(xor ";
+			break;
+		case PIN:
+			prefix += "(pin \"" + name + "\"";
+			break;
+		case EMPTY:
+			prefix += "(";
+			break;
+		default:
+			log_assert(false);
+	}
+	size_t add_indent = prefix.length();
+	bool first = true;
+	for (auto child : children) {
+		if (!first) {
+			prefix += "\n" + child.str(indent + add_indent);
+		} else {
+			prefix += child.str(0);
+		}
+		first = false;
+	}
+	prefix += ")";
+	return prefix;
+}
+
 #endif
 
 int LibertyParser::lexer(std::string &str)

From c6e1d461faa0e845fa2306ca9015aed0d37e83e6 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 11 Jul 2025 23:09:30 +0200
Subject: [PATCH 122/931] libparse: support space ANDs

---
 passes/techmap/dfflibmap.cc |  5 +----
 passes/techmap/libparse.cc  | 43 ++++++++++++++++++++++++-------------
 passes/techmap/libparse.h   |  3 +++
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index ae9498a9c..ade155791 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -92,9 +92,6 @@ static bool parse_next_state(const LibertyAst *cell, const LibertyAst *attr, std
 	auto expr = attr->value;
 	auto cell_name = cell->args[0];
 
-	for (size_t pos = expr.find_first_of("\" \t"); pos != std::string::npos; pos = expr.find_first_of("\" \t"))
-		expr.erase(pos, 1);
-
 	// if this isn't an enable flop, the next_state variable is usually just the input pin name.
 	if (expr[expr.size()-1] == '\'') {
 		data_name = expr.substr(0, expr.size()-1);
@@ -117,7 +114,7 @@ static bool parse_next_state(const LibertyAst *cell, const LibertyAst *attr, std
 	// the next_state variable isn't just a pin name; perhaps this is an enable?
 	auto helper = LibertyExpression::Lexer(expr);
 	auto tree = LibertyExpression::parse(helper);
-	log_debug("liberty expression:\n%s\n", tree.str().c_str());
+	// log_debug("liberty expression:\n%s\n", tree.str().c_str());
 
 	if (tree.kind == LibertyExpression::Kind::EMPTY) {
 		if (!warned_cells.count(cell_name)) {
diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index 0df7af347..957a529b9 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -163,6 +163,12 @@ void LibertyAst::dump(FILE *f, sieve &blacklist, sieve &whitelist, std::string i
 }
 
 #ifndef FILTERLIB
+
+// binary operators excluding ' '
+bool LibertyExpression::is_nice_binop(char c) {
+	return c == '*' || c == '&' || c == '^' || c == '+' || c == '|';
+}
+
 // https://matklad.github.io/2020/04/13/simple-but-powerful-pratt-parsing.html
 LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 	if (s.empty())
@@ -201,15 +207,8 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 	while (true) {
 		if (s.empty())
 			break;
-		
-		c = s.peek();
 
-		while (isspace(c)) {
-			if (s.empty())
-				return lhs;
-			s.next();
-			c = s.peek();
-		}
+		c = s.peek();
 
 		if (c == '\'') { // postfix NOT
 			if (min_prio > 7)
@@ -235,11 +234,27 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 			lhs = std::move(n);
 
 			continue;
-		} else if (c == '&' || c == '*') { // infix AND
-			// technically space should be considered infix AND. it seems rare in practice.
+		} else if (c == '&' || c == '*' || isspace(c)) { // infix AND
 			if (min_prio > 3)
 				break;
-			s.next();
+
+			if (isspace(c)) {
+				// Rewind past this space and any further spaces
+				while (isspace(c) && !s.empty()) {
+					if (s.empty())
+						return lhs;
+					s.next();
+					c = s.peek();
+				}
+				if (is_nice_binop(c)) {
+					// We found a real binop, so this space wasn't an AND
+					// and we just discard it as meaningless whitespace
+					continue;
+				}
+			} else {
+				// Rewind past this op
+				s.next();
+			}
 
 			auto rhs = parse(s, 4);
 			auto n = LibertyExpression{};
@@ -310,7 +325,6 @@ bool LibertyExpression::eval(dict<std::string, bool>& values) {
 std::string LibertyExpression::str(int indent)
 {
 	std::string prefix;
-	prefix = std::string(indent, ' ');
 	switch (kind) {
 		case AND:
 			prefix += "(and ";
@@ -337,10 +351,9 @@ std::string LibertyExpression::str(int indent)
 	bool first = true;
 	for (auto child : children) {
 		if (!first) {
-			prefix += "\n" + child.str(indent + add_indent);
-		} else {
-			prefix += child.str(0);
+			prefix += "\n" + std::string(indent + add_indent, ' ');
 		}
+		prefix += child.str(indent + add_indent);
 		first = false;
 	}
 	prefix += ")";
diff --git a/passes/techmap/libparse.h b/passes/techmap/libparse.h
index 8a2ab22e0..ee0f3db42 100644
--- a/passes/techmap/libparse.h
+++ b/passes/techmap/libparse.h
@@ -93,6 +93,9 @@ namespace Yosys
 		static LibertyExpression parse(Lexer &s, int min_prio = 0);
 		void get_pin_names(pool<std::string>& names);
 		bool eval(dict<std::string, bool>& values);
+		std::string str(int indent = 0);
+	private:
+		static bool is_nice_binop(char c);
 	};
 
 	class LibertyInputStream {

From bf1f236998954bbfd5d3695201c225e7a0ce6800 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 11 Jul 2025 23:12:58 +0200
Subject: [PATCH 123/931] dfflibmap: add back tab and quote filters for good
 vibes

---
 passes/techmap/dfflibmap.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index ade155791..409ac7865 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -92,6 +92,9 @@ static bool parse_next_state(const LibertyAst *cell, const LibertyAst *attr, std
 	auto expr = attr->value;
 	auto cell_name = cell->args[0];
 
+	for (size_t pos = expr.find_first_of("\"\t"); pos != std::string::npos; pos = expr.find_first_of("\"\t"))
+		expr.erase(pos, 1);
+
 	// if this isn't an enable flop, the next_state variable is usually just the input pin name.
 	if (expr[expr.size()-1] == '\'') {
 		data_name = expr.substr(0, expr.size()-1);

From 62c270a38b4ca22a8b93d0453df46472ebfe2035 Mon Sep 17 00:00:00 2001
From: Catherine <whitequark@whitequark.org>
Date: Tue, 15 Jul 2025 01:28:07 +0000
Subject: [PATCH 124/931] Allow installing headers and `yosys-config` without
 the rest.

This is useful to be able to build a plugin like `yosys-slang` without
having to build the entirety of Yosys, which can save a lot of time.
---
 Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d9f3b937c..e50d085a1 100644
--- a/Makefile
+++ b/Makefile
@@ -981,6 +981,12 @@ unit-test: libyosys.so
 clean-unit-test:
 	@$(MAKE) -C $(UNITESTPATH) clean
 
+install-dev: $(PROGRAM_PREFIX)yosys-config share
+	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(BINDIR)
+	$(INSTALL_SUDO) cp $(PROGRAM_PREFIX)yosys-config $(DESTDIR)$(BINDIR)
+	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(DATDIR)
+	$(INSTALL_SUDO) cp -r share/. $(DESTDIR)$(DATDIR)/.
+
 install: $(TARGETS) $(EXTRA_TARGETS)
 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(BINDIR)
 	$(INSTALL_SUDO) cp $(filter-out libyosys.so,$(TARGETS)) $(DESTDIR)$(BINDIR)
@@ -1223,5 +1229,5 @@ echo-cxx:
 
 FORCE:
 
-.PHONY: all top-all abc test install install-abc docs clean mrproper qtcreator coverage vcxsrc
+.PHONY: all top-all abc test install-dev install install-abc docs clean mrproper qtcreator coverage vcxsrc
 .PHONY: config-clean config-clang config-gcc config-gcc-static config-gprof config-sudo

From e960428587b65c56db60ac80c24aab684f5b475f Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 15 Jul 2025 12:21:01 +0200
Subject: [PATCH 125/931] unit tests: fix run failure detection

---
 tests/unit/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/Makefile b/tests/unit/Makefile
index 4c2848ea2..48635eb0d 100644
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
@@ -24,7 +24,7 @@ $(OBJTEST)/%.o: $(basename $(subst $(OBJTEST),.,%)).cc
 .PHONY: prepare run-tests clean
 
 run-tests: $(TESTS)
-	$(subst Test ,Test; ,$^)
+	$(subst Test ,Test&& ,$^)
 
 prepare:
 	mkdir -p $(addprefix $(BINTEST)/,$(TESTDIRS))

From 21e68ec9be2aa5d2827f5fe0a5ac4004fbf3f58e Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 15 Jul 2025 12:53:13 +0200
Subject: [PATCH 126/931] libparse: fix space ANDs

---
 passes/techmap/libparse.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index 957a529b9..c6f87b60b 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -240,7 +240,7 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 
 			if (isspace(c)) {
 				// Rewind past this space and any further spaces
-				while (isspace(c) && !s.empty()) {
+				while (isspace(c)) {
 					if (s.empty())
 						return lhs;
 					s.next();
@@ -257,6 +257,8 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 			}
 
 			auto rhs = parse(s, 4);
+			if (rhs.kind == EMPTY)
+				continue;
 			auto n = LibertyExpression{};
 			n.kind = Kind::AND;
 			n.children.push_back(lhs);

From c7a3abbcc4c09d4b6681f5b467dbe8cf62f6ebda Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 15 Jul 2025 12:53:30 +0200
Subject: [PATCH 127/931] libparse: LibertyExpression unit test

---
 tests/unit/techmap/libparseTest.cc | 88 ++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 tests/unit/techmap/libparseTest.cc

diff --git a/tests/unit/techmap/libparseTest.cc b/tests/unit/techmap/libparseTest.cc
new file mode 100644
index 000000000..b58e55bf2
--- /dev/null
+++ b/tests/unit/techmap/libparseTest.cc
@@ -0,0 +1,88 @@
+#include <gtest/gtest.h>
+#include "passes/techmap/libparse.h"
+
+YOSYS_NAMESPACE_BEGIN
+
+namespace RTLIL {
+
+	class TechmapLibparseTest : public testing::Test {
+	protected:
+		TechmapLibparseTest() {
+			if (log_files.empty()) log_files.emplace_back(stdout);
+		}
+		void checkAll(std::initializer_list<std::string> expressions, std::string expected) {
+			for (const auto& e : expressions) {
+				auto helper = LibertyExpression::Lexer(e);
+				auto tree_s = LibertyExpression::parse(helper).str();
+				EXPECT_EQ(tree_s, expected);
+			}
+		}
+	};
+	TEST_F(TechmapLibparseTest, LibertyExpressionSpace)
+	{
+		checkAll({
+			"x",
+			"x ",
+			" x",
+			" x ",
+			"  x ",
+		}, "(pin \"x\")");
+
+		checkAll({
+			"x y",
+			" x y ",
+			"x (y)",
+			" x (y) ",
+			"(x) y",
+			" (x) y ",
+
+			"x & y",
+			"x&y",
+			"x &y",
+			"x& y",
+			" x&y ",
+			"x & (y)",
+			"x&(y)",
+			"x &(y)",
+			"x& (y)",
+			" x&(y) ",
+			"(x) & y",
+			"(x)&y",
+			"(x) &y",
+			"(x)& y",
+			" (x)&y ",
+		}, "(and (pin \"x\")\n"
+		   "     (pin \"y\"))"
+		);
+
+		checkAll({
+			"x ^ y",
+			"x^y",
+			"x ^y",
+			"x^ y",
+			" x^y ",
+		}, "(xor (pin \"x\")\n"
+		   "     (pin \"y\"))"
+		);
+		checkAll({
+			"x !y",
+			" x !y ",
+			"x & !y",
+			"x&!y",
+			"x &!y",
+			"x& !y",
+			" x&!y ",
+			"x y'",
+			" x y' ",
+			"x & y'",
+			"x&y'",
+			"x &y'",
+			"x& y'",
+			" x&y' ",
+		}, "(and (pin \"x\")\n"
+		   "     (not (pin \"y\")))"
+		);
+	}
+}
+
+YOSYS_NAMESPACE_END

From 381381c997cc0f4a4a7986180aabd46d24e48086 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Tue, 15 Jul 2025 14:14:07 +0100
Subject: [PATCH 128/931] write_firrtl: clear used names cache each pass

---
 backends/firrtl/firrtl.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backends/firrtl/firrtl.cc b/backends/firrtl/firrtl.cc
index ceb805dcb..e4254f85a 100644
--- a/backends/firrtl/firrtl.cc
+++ b/backends/firrtl/firrtl.cc
@@ -1223,6 +1223,7 @@ struct FirrtlBackend : public Backend {
 		Pass::call(design, "demuxmap");
 		Pass::call(design, "bwmuxmap");
 
+		used_names.clear();
 		namecache.clear();
 		autoid_counter = 0;
 
@@ -1262,6 +1263,7 @@ struct FirrtlBackend : public Backend {
 			}
 		}
 
+		used_names.clear();
 		namecache.clear();
 		autoid_counter = 0;
 	}

From af0b263557c09133da695d752456f53c199fd968 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 16 Jul 2025 00:25:58 +0000
Subject: [PATCH 129/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e50d085a1..2c89b1f36 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+23
+YOSYS_VER := 0.55+36
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From a57c593c415c07a7849278e5809eeb9ace3c191b Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 16 Jul 2025 15:32:47 +1200
Subject: [PATCH 130/931] tests: Add equiv_assume.ys

---
 tests/various/equiv_assume.ys | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 tests/various/equiv_assume.ys

diff --git a/tests/various/equiv_assume.ys b/tests/various/equiv_assume.ys
new file mode 100644
index 000000000..cb7731c29
--- /dev/null
+++ b/tests/various/equiv_assume.ys
@@ -0,0 +1,26 @@
+read_verilog -sv <<EOT
+module gold (input D, output Q);
+assign Q = '0;
+endmodule
+
+module gate (input D, output Q);
+assume property (D == '0);
+assign Q = D;
+endmodule
+EOT
+
+chformal -lower
+async2sync
+design -stash input
+
+# using $assert cells in sat verifies
+design -load input
+equiv_make -make_assert gold gate equiv
+prep -top equiv
+sat -set-assumes -prove-asserts -verify
+
+# so should $equiv
+design -load input
+equiv_make gold gate equiv
+equiv_simple equiv
+equiv_status -assert equiv

From d30f934d0d2e6cbf5d31f1d6760ba1f79a672e8a Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 16 Jul 2025 21:04:41 +1200
Subject: [PATCH 131/931] equiv_simple: Add -set-assumes option

Based on existing code for input cone and the `sat` handling of `-set-assumes`.
Update `equiv_assume.ys` to use `-set-assumes` option.
---
 passes/equiv/equiv_simple.cc  | 79 ++++++++++++++++++++++++++++++++---
 tests/various/equiv_assume.ys |  4 +-
 2 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/passes/equiv/equiv_simple.cc b/passes/equiv/equiv_simple.cc
index 59974a1e6..bdb39172b 100644
--- a/passes/equiv/equiv_simple.cc
+++ b/passes/equiv/equiv_simple.cc
@@ -27,6 +27,7 @@ struct EquivSimpleWorker
 {
 	Module *module;
 	const vector<Cell*> &equiv_cells;
+	const vector<Cell*> &assume_cells;
 	Cell *equiv_cell;
 
 	SigMap &sigmap;
@@ -37,12 +38,13 @@ struct EquivSimpleWorker
 	int max_seq;
 	bool short_cones;
 	bool verbose;
+	bool set_assumes;
 
 	pool<pair<Cell*, int>> imported_cells_cache;
 
-	EquivSimpleWorker(const vector<Cell*> &equiv_cells, SigMap &sigmap, dict<SigBit, Cell*> &bit2driver, int max_seq, bool short_cones, bool verbose, bool model_undef) :
-			module(equiv_cells.front()->module), equiv_cells(equiv_cells), equiv_cell(nullptr),
-			sigmap(sigmap), bit2driver(bit2driver), satgen(ez.get(), &sigmap), max_seq(max_seq), short_cones(short_cones), verbose(verbose)
+	EquivSimpleWorker(const vector<Cell*> &equiv_cells, const vector<Cell*> &assume_cells, SigMap &sigmap, dict<SigBit, Cell*> &bit2driver, int max_seq, bool short_cones, bool verbose, bool model_undef, bool set_assumes) :
+			module(equiv_cells.front()->module), equiv_cells(equiv_cells), assume_cells(assume_cells), equiv_cell(nullptr),
+			sigmap(sigmap), bit2driver(bit2driver), satgen(ez.get(), &sigmap), max_seq(max_seq), short_cones(short_cones), verbose(verbose), set_assumes(set_assumes)
 	{
 		satgen.model_undef = model_undef;
 	}
@@ -182,6 +184,53 @@ struct EquivSimpleWorker
 			#endif
 			}
 
+			if (set_assumes) {
+				pool<Cell*> extra_problem_cells;
+				for (auto assume : assume_cells) {
+					pool<SigBit> assume_seed, next_assume_seed;
+					assume_seed.insert(sigmap(assume->getPort(ID::A)).as_bit());
+					assume_seed.insert(sigmap(assume->getPort(ID::EN)).as_bit());
+					pool<Cell*> assume_cells_cone;
+					pool<SigBit> assume_bits_cone;
+					pool<SigBit> overlap_bits;
+					for (auto bit_x : assume_seed) {
+						find_input_cone(next_assume_seed, assume_cells_cone, assume_bits_cone, short_cells_cone_a, short_bits_cone_a, &overlap_bits, bit_x);
+					}
+					if (GetSize(overlap_bits)) {
+						extra_problem_cells.insert(assume);
+						extra_problem_cells.insert(assume_cells_cone.begin(), assume_cells_cone.end());
+						overlap_bits.clear();
+					}
+					assume_cells_cone.clear();
+					assume_bits_cone.clear();
+					for (auto bit_x : assume_seed) {
+						find_input_cone(next_assume_seed, assume_cells_cone, assume_bits_cone, short_cells_cone_b, short_bits_cone_b, &overlap_bits, bit_x);
+					}
+					if (GetSize(overlap_bits)) {
+						extra_problem_cells.insert(assume);
+						extra_problem_cells.insert(assume_cells_cone.begin(), assume_cells_cone.end());
+						overlap_bits.clear();
+					}
+					assume_cells_cone.clear();
+					assume_bits_cone.clear();
+					next_assume_seed.clear();
+				}
+
+				if (GetSize(extra_problem_cells)) {
+					auto old_size = GetSize(problem_cells);
+					problem_cells.insert(extra_problem_cells.begin(), extra_problem_cells.end());
+					if (verbose) {
+						log("    Adding %d new cells to check assumptions (and reusing %d).\n",
+							GetSize(problem_cells) - old_size,
+							old_size - (GetSize(problem_cells) - GetSize(extra_problem_cells)));
+					#if 0
+						for (auto cell : extra_problem_cells)
+							log("      cell: %s\n", log_id(cell));
+					#endif
+					}
+				}
+			}
+
 			for (auto cell : problem_cells) {
 				auto key = pair<Cell*, int>(cell, step+1);
 				if (!imported_cells_cache.count(key) && !satgen.importCell(cell, step+1)) {
@@ -193,6 +242,14 @@ struct EquivSimpleWorker
 				imported_cells_cache.insert(key);
 			}
 
+			if (set_assumes) {
+				RTLIL::SigSpec assumes_a, assumes_en;
+				satgen.getAssumes(assumes_a, assumes_en, step+1);
+				for (int i = 0; i < GetSize(assumes_a); i++)
+					log("Import constraint from assume cell: %s when %s.\n", log_signal(assumes_a[i]), log_signal(assumes_en[i]));
+				ez->assume(satgen.importAssumes(step+1));
+			}
+
 			if (satgen.model_undef) {
 				for (auto bit : input_bits)
 					ez->assume(ez->NOT(satgen.importUndefSigBit(bit, step+1)));
@@ -301,10 +358,14 @@ struct EquivSimplePass : public Pass {
 		log("    -seq <N>\n");
 		log("        the max. number of time steps to be considered (default = 1)\n");
 		log("\n");
+		log("    -set-assumes\n");
+		log("        set all assumptions provided via $assume cells\n");
+		log("\n");
 	}
 	void execute(std::vector<std::string> args, Design *design) override
 	{
 		bool verbose = false, short_cones = false, model_undef = false, nogroup = false;
+		bool set_assumes = false;
 		int success_counter = 0;
 		int max_seq = 1;
 
@@ -332,6 +393,10 @@ struct EquivSimplePass : public Pass {
 				max_seq = atoi(args[++argidx].c_str());
 				continue;
 			}
+			if (args[argidx] == "-set-assumes") {
+				set_assumes = true;
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
@@ -347,9 +412,10 @@ struct EquivSimplePass : public Pass {
 			SigMap sigmap(module);
 			dict<SigBit, Cell*> bit2driver;
 			dict<SigBit, dict<SigBit, Cell*>> unproven_equiv_cells;
+			vector<Cell*> assumes;
 			int unproven_cells_counter = 0;
 
-			for (auto cell : module->selected_cells())
+			for (auto cell : module->selected_cells()) {
 				if (cell->type == ID($equiv) && cell->getPort(ID::A) != cell->getPort(ID::B)) {
 					auto bit = sigmap(cell->getPort(ID::Y).as_bit());
 					auto bit_group = bit;
@@ -357,7 +423,10 @@ struct EquivSimplePass : public Pass {
 						bit_group.offset = 0;
 					unproven_equiv_cells[bit_group][bit] = cell;
 					unproven_cells_counter++;
+				} else if (cell->type == ID($assume)) {
+					assumes.push_back(cell);
 				}
+			}
 
 			if (unproven_equiv_cells.empty())
 				continue;
@@ -383,7 +452,7 @@ struct EquivSimplePass : public Pass {
 				for (auto it2 : it.second)
 					cells.push_back(it2.second);
 
-				EquivSimpleWorker worker(cells, sigmap, bit2driver, max_seq, short_cones, verbose, model_undef);
+				EquivSimpleWorker worker(cells, assumes, sigmap, bit2driver, max_seq, short_cones, verbose, model_undef, set_assumes);
 				success_counter += worker.run();
 			}
 		}
diff --git a/tests/various/equiv_assume.ys b/tests/various/equiv_assume.ys
index cb7731c29..0033ac95c 100644
--- a/tests/various/equiv_assume.ys
+++ b/tests/various/equiv_assume.ys
@@ -18,9 +18,11 @@ design -load input
 equiv_make -make_assert gold gate equiv
 prep -top equiv
 sat -set-assumes -prove-asserts -verify
+# this fails
+# sat -prove-asserts -verify
 
 # so should $equiv
 design -load input
 equiv_make gold gate equiv
-equiv_simple equiv
+equiv_simple -set-assumes equiv
 equiv_status -assert equiv

From 5ec189a2f5023f72f897f7fa3842fd8cc2a94f25 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 16 Jul 2025 21:05:03 +1200
Subject: [PATCH 132/931] Tests: Extra equiv_assume tests

---
 tests/various/equiv_assume.ys | 88 +++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/tests/various/equiv_assume.ys b/tests/various/equiv_assume.ys
index 0033ac95c..7264e5a29 100644
--- a/tests/various/equiv_assume.ys
+++ b/tests/various/equiv_assume.ys
@@ -26,3 +26,91 @@ design -load input
 equiv_make gold gate equiv
 equiv_simple -set-assumes equiv
 equiv_status -assert equiv
+
+# and it works through cells
+design -reset
+read_verilog -sv <<EOT
+module gold (input [1:0] D, output [1:0] Q);
+assign Q = !D;
+endmodule
+
+module gate (input [1:0] D, output [1:0] Q);
+assume property (D == 2'b11);
+wire [1:0] G = ~D;
+assign Q = G;
+endmodule
+EOT
+
+chformal -lower
+async2sync
+design -stash input2
+
+design -load input2
+equiv_make -make_assert gold gate equiv
+prep -top equiv
+sat -set-assumes -prove-asserts -verify
+
+design -load input2
+equiv_make gold gate equiv
+equiv_simple -set-assumes equiv
+equiv_status -assert equiv
+
+# and registers
+design -reset
+read_verilog -sv <<EOT
+module gold (input clk, input [1:0] D, output [1:0] Q);
+assign Q = '0;
+endmodule
+
+module gate (input clk, input [1:0] D, output [1:0] Q);
+reg [1:0] Dreg;
+assume property (Dreg == 2'b11);
+always @(clk) begin
+    Dreg <= D;
+end
+assign Q = ~Dreg;
+endmodule
+EOT
+
+proc
+chformal -lower
+async2sync
+design -stash input3
+
+design -load input3
+equiv_make -make_assert gold gate equiv
+prep -top equiv
+sat -set-assumes -prove-asserts -verify
+
+design -load input3
+equiv_make gold gate equiv
+equiv_simple -set-assumes equiv
+equiv_status -assert equiv
+
+# so long as the assumption doesn't end up after the equiv
+design -reset
+read_verilog -sv <<EOT
+module gold (input [1:0] D, output [1:0] Q);
+assign Q = !D;
+endmodule
+
+module gate (input [1:0] D, output [1:0] Q);
+assume property (G == 2'b00);
+wire [1:0] G = ~D;
+assign Q = G;
+endmodule
+EOT
+
+chformal -lower
+async2sync
+design -stash input4
+
+design -load input4
+equiv_make -make_assert gold gate equiv
+prep -top equiv
+sat -set-assumes -prove-asserts
+
+design -load input4
+equiv_make gold gate equiv
+equiv_simple -set-assumes equiv
+equiv_status equiv

From fb6974dcd7883e6dbfddcb0e27d871db10d32933 Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Wed, 16 Jul 2025 13:40:07 +0200
Subject: [PATCH 133/931] print summary of line coverage to log

---
 passes/cmds/linecoverage.cc | 14 +++++++++-----
 tests/various/lcov.gold     |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/passes/cmds/linecoverage.cc b/passes/cmds/linecoverage.cc
index 01dc2973c..d00042026 100644
--- a/passes/cmds/linecoverage.cc
+++ b/passes/cmds/linecoverage.cc
@@ -36,7 +36,7 @@ struct CoveragePass : public Pass {
 		log("\n");
 		log("    linecoverage [options] [selection]\n");
 		log("\n");
-		log("This command writes coverage information on the design based on the current\n");
+		log("This command prints coverage information on the design based on the current\n");
 		log("selection, where items in the selection are considered covered and items not in\n");
 		log("the selection are considered uncovered. If the same source location is found\n");
 		log("both on items inside and out of the selection, it is considered uncovered.\n");
@@ -125,8 +125,12 @@ struct CoveragePass : public Pass {
 			log_debug("\n");
 		}
 
-		if(!ofile.empty()) {
-			for (const auto& file_entry : all_lines) {
+		for (const auto& file_entry : all_lines) {
+			int lines_found = file_entry.second.size();
+			int lines_hit = file_entry.second.size() - (uncovered_lines.count(file_entry.first) ? uncovered_lines[file_entry.first].size() : 0);
+			log("File %s: %d/%d lines covered\n", file_entry.first.c_str(), lines_hit, lines_found);
+
+			if(!ofile.empty()) {
 				fout << "SF:" << file_entry.first << "\n";
 				for (int l : file_entry.second) {
 					fout << "DA:" << l << ",";
@@ -136,8 +140,8 @@ struct CoveragePass : public Pass {
 						fout << "1";
 					fout << "\n";
 				}
-				fout << "LF:" << file_entry.second.size() << "\n";
-				fout << "LH:" << (uncovered_lines.count(file_entry.first) ? uncovered_lines[file_entry.first].size() : 0) << "\n";
+				fout << "LF:" << lines_found << "\n";
+				fout << "LH:" << lines_hit << "\n";
 				fout << "end_of_record\n";
 			}
 		}
diff --git a/tests/various/lcov.gold b/tests/various/lcov.gold
index 5b160fae8..b9a87ed94 100644
--- a/tests/various/lcov.gold
+++ b/tests/various/lcov.gold
@@ -40,5 +40,5 @@ DA:52,1
 DA:53,0
 DA:56,1
 LF:40
-LH:24
+LH:16
 end_of_record

From beb71a6c476400ace6dea0628b4e345150c62eee Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Wed, 16 Jul 2025 17:11:19 +0200
Subject: [PATCH 134/931] update short help

---
 passes/cmds/linecoverage.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/cmds/linecoverage.cc b/passes/cmds/linecoverage.cc
index d00042026..9a88dec7f 100644
--- a/passes/cmds/linecoverage.cc
+++ b/passes/cmds/linecoverage.cc
@@ -29,7 +29,7 @@ PRIVATE_NAMESPACE_BEGIN
 static const std::regex src_re("(.*):(\\d+)\\.(\\d+)-(\\d+)\\.(\\d+)");
 
 struct CoveragePass : public Pass {
-	CoveragePass() : Pass("linecoverage", "write coverage information to file") { }
+	CoveragePass() : Pass("linecoverage", "report coverage information") { }
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|

From 415b7d3f6510a492371fd9a171259db665949a81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Thu, 17 Jul 2025 12:02:44 +0200
Subject: [PATCH 135/931] Drop experimental label off `synth -hieropt`

---
 techlibs/common/synth.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/techlibs/common/synth.cc b/techlibs/common/synth.cc
index e3a82ba48..8b4561c34 100644
--- a/techlibs/common/synth.cc
+++ b/techlibs/common/synth.cc
@@ -50,7 +50,7 @@ struct SynthPass : public ScriptPass {
 		log("    -hieropt\n");
 		log("        enable hierarchical optimization. this option is useful when `-flatten'\n");
 		log("        is not used, or when selected modules are marked with 'keep_hierarchy'\n.");
-		log("        to prevent their dissolution (EXPERIMENTAL).\n");
+		log("        to prevent their dissolution.\n");
 		log("\n");
 		log("    -encfile <file>\n");
 		log("        passed to 'fsm_recode' via 'fsm'\n");

From cf9720ecabb75fabed3ae5db12e365312e10e13b Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 15 Jul 2025 02:55:45 +0000
Subject: [PATCH 136/931] Make const lookup methods take a lookup path that
 never rehashes the table.

This avoids the need to cast away `const` and makes these methods
thread-compatible.
---
 kernel/hashlib.h | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index 4144d701d..d56a10aa5 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -451,16 +451,21 @@ class dict {
 		return 1;
 	}
 
-	int do_lookup(const K &key, Hasher::hash_t &hash) const
+	int do_lookup(const K &key, Hasher::hash_t &hash)
 	{
 		if (hashtable.empty())
 			return -1;
 
 		if (entries.size() * hashtable_size_trigger > hashtable.size()) {
-			((dict*)this)->do_rehash();
+			do_rehash();
 			hash = do_hash(key);
 		}
 
+		return do_lookup_internal(key, hash);
+	}
+
+	int do_lookup_internal(const K &key, Hasher::hash_t hash) const
+	{
 		int index = hashtable[hash];
 
 		while (index >= 0 && !ops.cmp(entries[index].udata.first, key)) {
@@ -471,6 +476,14 @@ class dict {
 		return index;
 	}
 
+	int do_lookup_no_rehash(const K &key, Hasher::hash_t hash) const
+	{
+		if (hashtable.empty())
+			return -1;
+
+		return do_lookup_internal(key, hash);
+	}
+
 	int do_insert(const K &key, Hasher::hash_t &hash)
 	{
 		if (hashtable.empty()) {
@@ -694,14 +707,14 @@ public:
 	int count(const K &key) const
 	{
 		Hasher::hash_t hash = do_hash(key);
-		int i = do_lookup(key, hash);
+		int i = do_lookup_no_rehash(key, hash);
 		return i < 0 ? 0 : 1;
 	}
 
 	int count(const K &key, const_iterator it) const
 	{
 		Hasher::hash_t hash = do_hash(key);
-		int i = do_lookup(key, hash);
+		int i = do_lookup_no_rehash(key, hash);
 		return i < 0 || i > it.index ? 0 : 1;
 	}
 
@@ -717,7 +730,7 @@ public:
 	const_iterator find(const K &key) const
 	{
 		Hasher::hash_t hash = do_hash(key);
-		int i = do_lookup(key, hash);
+		int i = do_lookup_no_rehash(key, hash);
 		if (i < 0)
 			return end();
 		return const_iterator(this, i);
@@ -735,7 +748,7 @@ public:
 	const T& at(const K &key) const
 	{
 		Hasher::hash_t hash = do_hash(key);
-		int i = do_lookup(key, hash);
+		int i = do_lookup_no_rehash(key, hash);
 		if (i < 0)
 			throw std::out_of_range("dict::at()");
 		return entries[i].udata.second;
@@ -744,7 +757,7 @@ public:
 	const T& at(const K &key, const T &defval) const
 	{
 		Hasher::hash_t hash = do_hash(key);
-		int i = do_lookup(key, hash);
+		int i = do_lookup_no_rehash(key, hash);
 		if (i < 0)
 			return defval;
 		return entries[i].udata.second;

From 4bf7c23e2bfb63b4c93461a30dad08eab2cacb57 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 15 Jul 2025 03:02:35 +0000
Subject: [PATCH 137/931] Make `pool` const lookup methods take a lookup path
 that never rehashes the table.

This avoids the need to cast away `const` and makes these methods thread-compatible.
---
 kernel/hashlib.h | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index d56a10aa5..52ff96028 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -919,16 +919,21 @@ protected:
 		return 1;
 	}
 
-	int do_lookup(const K &key, Hasher::hash_t &hash) const
+	int do_lookup(const K &key, Hasher::hash_t &hash)
 	{
 		if (hashtable.empty())
 			return -1;
 
 		if (entries.size() * hashtable_size_trigger > hashtable.size()) {
-			((pool*)this)->do_rehash();
+			do_rehash();
 			hash = do_hash(key);
 		}
 
+		return do_lookup_internal(key, hash);
+	}
+
+	int do_lookup_internal(const K &key, Hasher::hash_t hash) const
+	{
 		int index = hashtable[hash];
 
 		while (index >= 0 && !ops.cmp(entries[index].udata, key)) {
@@ -939,6 +944,14 @@ protected:
 		return index;
 	}
 
+	int do_lookup_no_rehash(const K &key, Hasher::hash_t hash) const
+	{
+		if (hashtable.empty())
+			return -1;
+
+		return do_lookup_internal(key, hash);
+	}
+
 	int do_insert(const K &value, Hasher::hash_t &hash)
 	{
 		if (hashtable.empty()) {
@@ -1100,14 +1113,14 @@ public:
 	int count(const K &key) const
 	{
 		Hasher::hash_t hash = do_hash(key);
-		int i = do_lookup(key, hash);
+		int i = do_lookup_no_rehash(key, hash);
 		return i < 0 ? 0 : 1;
 	}
 
 	int count(const K &key, const_iterator it) const
 	{
 		Hasher::hash_t hash = do_hash(key);
-		int i = do_lookup(key, hash);
+		int i = do_lookup_no_rehash(key, hash);
 		return i < 0 || i > it.index ? 0 : 1;
 	}
 
@@ -1123,7 +1136,7 @@ public:
 	const_iterator find(const K &key) const
 	{
 		Hasher::hash_t hash = do_hash(key);
-		int i = do_lookup(key, hash);
+		int i = do_lookup_no_rehash(key, hash);
 		if (i < 0)
 			return end();
 		return const_iterator(this, i);
@@ -1235,7 +1248,7 @@ public:
 	int at(const K &key) const
 	{
 		Hasher::hash_t hash = database.do_hash(key);
-		int i = database.do_lookup(key, hash);
+		int i = database.do_lookup_no_rehash(key, hash);
 		if (i < 0)
 			throw std::out_of_range("idict::at()");
 		return i + offset;
@@ -1244,7 +1257,7 @@ public:
 	int at(const K &key, int defval) const
 	{
 		Hasher::hash_t hash = database.do_hash(key);
-		int i = database.do_lookup(key, hash);
+		int i = database.do_lookup_no_rehash(key, hash);
 		if (i < 0)
 			return defval;
 		return i + offset;
@@ -1253,7 +1266,7 @@ public:
 	int count(const K &key) const
 	{
 		Hasher::hash_t hash = database.do_hash(key);
-		int i = database.do_lookup(key, hash);
+		int i = database.do_lookup_no_rehash(key, hash);
 		return i < 0 ? 0 : 1;
 	}
 

From aa1daa702346a1e8907c587f36d4417d783aaabc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 18 Jul 2025 00:25:48 +0000
Subject: [PATCH 138/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2c89b1f36..b91d83737 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+36
+YOSYS_VER := 0.55+46
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From fe3adfd960d97ea7ef762efd082346494a9d8c35 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:32:09 +1200
Subject: [PATCH 139/931] Docs: Remove unused write_cell_rst function

The `help -write-rst-cells-manual` approach was made redundant by `help -dump-cells-json`.
---
 Makefile           |  6 ----
 kernel/register.cc | 74 ----------------------------------------------
 2 files changed, 80 deletions(-)

diff --git a/Makefile b/Makefile
index b91d83737..0959dbea9 100644
--- a/Makefile
+++ b/Makefile
@@ -1041,12 +1041,6 @@ docs/source/cmd/abc.rst: $(TARGETS) $(EXTRA_TARGETS)
 	$(Q) cd temp && ./../$(PROGRAM_PREFIX)yosys -p 'help -write-rst-command-reference-manual'
 	$(Q) $(RSYNC_CP) temp/docs/source/cmd docs/source
 	$(Q) rm -rf temp
-docs/source/cell/word_add.rst: $(TARGETS) $(EXTRA_TARGETS)
-	$(Q) mkdir -p docs/source/cell
-	$(Q) mkdir -p temp/docs/source/cell
-	$(Q) cd temp && ./../$(PROGRAM_PREFIX)yosys -p 'help -write-rst-cells-manual'
-	$(Q) $(RSYNC_CP) temp/docs/source/cell docs/source
-	$(Q) rm -rf temp
 
 docs/source/generated/cells.json: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
 	$(Q) ./$(PROGRAM_PREFIX)yosys -p 'help -dump-cells-json $@'
diff --git a/kernel/register.cc b/kernel/register.cc
index af1823b5b..b38f9f4b2 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -798,64 +798,6 @@ struct HelpPass : public Pass {
 		}
 		fclose(f);
 	}
-	void write_cell_rst(Yosys::SimHelper cell, Yosys::CellType ct)
-	{
-		// open
-		FILE *f = fopen(stringf("docs/source/cell/%s.rst", cell.filesafe_name().c_str()).c_str(), "wt");
-
-		// make header
-		string title_line;
-		if (cell.title.length())
-			title_line = stringf("%s - %s", cell.name.c_str(), cell.title.c_str());
-		else title_line = cell.name;
-		string underline = "\n";
-		underline.insert(0, title_line.length(), '=');
-		fprintf(f, "%s\n", title_line.c_str());
-		fprintf(f, "%s\n", underline.c_str());
-
-		// help text, with cell def for links
-		fprintf(f, ".. cell:def:: %s\n", cell.name.c_str());
-		if (cell.title.length())
-			fprintf(f, "   :title: %s\n\n", cell.title.c_str());
-		else
-			fprintf(f, "   :title: %s\n\n", cell.name.c_str());
-		std::stringstream ss;
-		ss << cell.desc;
-		for (std::string line; std::getline(ss, line, '\n');) {
-			fprintf(f, "   %s\n", line.c_str());
-		}
-
-		// properties
-		fprintf(f, "\nProperties");
-		fprintf(f, "\n----------\n\n");
-		dict<string, bool> prop_dict = {
-			{"is_evaluable", ct.is_evaluable},
-			{"is_combinatorial", ct.is_combinatorial},
-			{"is_synthesizable", ct.is_synthesizable},
-		};
-		for (auto &it : prop_dict) {
-			fprintf(f, "- %s: %s\n", it.first.c_str(), it.second ? "true" : "false");
-		}
-
-		// source code
-		fprintf(f, "\nSimulation model (Verilog)");
-		fprintf(f, "\n--------------------------\n\n");
-		fprintf(f, ".. code-block:: verilog\n");
-		fprintf(f, "   :caption: %s\n\n", cell.source.c_str());
-		std::stringstream ss2;
-		ss2 << cell.code;
-		for (std::string line; std::getline(ss2, line, '\n');) {
-			fprintf(f, "   %s\n", line.c_str());
-		}
-
-		// footer
-		fprintf(f, "\n.. note::\n\n");
-		fprintf(f, "   This page was auto-generated from the output of\n");
-		fprintf(f, "   ``help %s``.\n", cell.name.c_str());
-
-		// close
-		fclose(f);
-	}
 	bool dump_cells_json(PrettyJson &json) {
 		// init json
 		json.begin_object();
@@ -993,22 +935,6 @@ struct HelpPass : public Pass {
 					write_cmd_rst(it.first, it.second->short_help, buf.str());
 				}
 			}
-			// this option is also undocumented as it is for internal use only
-			else if (args[1] == "-write-rst-cells-manual") {
-				bool raise_error = false;
-				for (auto &it : yosys_celltypes.cell_types) {
-					auto name = it.first.str();
-					if (cell_help_messages.contains(name)) {
-						write_cell_rst(cell_help_messages.get(name), it.second);
-					} else {
-						log("ERROR: Missing cell help for cell '%s'.\n", name.c_str());
-						raise_error |= true;
-					}
-				}
-				if (raise_error) {
-					log_error("One or more cells defined in celltypes.h are missing help documentation.\n");
-				}
-			}
 			else if (pass_register.count(args[1])) {
 				pass_register.at(args[1])->help();
 				if (pass_register.at(args[1])->experimental_flag) {

From 2c79aeb7ade1bb7c5b7b174c35c5d7d4c4c41d17 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:32:09 +1200
Subject: [PATCH 140/931] json.h: Fix array template

Using `{begin|end}_object` inserts curly braces instead of square brackets, which can result in reordering (and may be syntactically incorrect?).
---
 kernel/json.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/json.h b/kernel/json.h
index c9aa0e045..e8905c8e1 100644
--- a/kernel/json.h
+++ b/kernel/json.h
@@ -90,10 +90,10 @@ public:
     template<typename T>
     void array(const T &&values)
     {
-        begin_object();
+        begin_array();
         for (auto &item : values)
             value(item);
-        end_object();
+        end_array();
     }
 };
 

From 28ecb910528290d56844aff769e02fcfb6857771 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:32:51 +1200
Subject: [PATCH 141/931] register: Add pass_usages and default help

Experimental new formatting for describing passes that can be rendered into the standard help format, as well as being more amenable to smarter formatting for web documentation.
---
 kernel/register.cc | 45 +++++++++++++++++++++++++++++++++++++++++----
 kernel/register.h  | 20 +++++++++++++++++++-
 2 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/kernel/register.cc b/kernel/register.cc
index b38f9f4b2..119204db3 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -29,6 +29,30 @@
 
 YOSYS_NAMESPACE_BEGIN
 
+#define MAX_LINE_LEN 80
+void log_pass_str(const std::string &pass_str, int indent=0, bool leading_newline=false) {
+	if (pass_str.empty())
+		return;
+	std::string indent_str(indent*4, ' ');
+	std::istringstream iss(pass_str);
+	if (leading_newline)
+		log("\n");
+	for (std::string line; std::getline(iss, line);) {
+		log("%s", indent_str.c_str());
+		auto curr_len = indent_str.length();
+		std::istringstream lss(line);
+		for (std::string word; std::getline(lss, word, ' ');) {
+			if (curr_len + word.length() >= MAX_LINE_LEN) {
+				curr_len = 0;
+				log("\n%s", indent_str.c_str());
+			}
+			log("%s ", word.c_str());
+			curr_len += word.length() + 1;
+		}
+		log("\n");
+	}
+}
+
 #define MAX_REG_COUNT 1000
 
 bool echo_mode = false;
@@ -41,7 +65,7 @@ std::map<std::string, Backend*> backend_register;
 
 std::vector<std::string> Frontend::next_args;
 
-Pass::Pass(std::string name, std::string short_help) : pass_name(name), short_help(short_help)
+Pass::Pass(std::string name, std::string short_help, const vector<PassUsageBlock> usages) : pass_name(name), short_help(short_help), pass_usages(usages)
 {
 	next_queued_pass = first_queued_pass;
 	first_queued_pass = this;
@@ -116,9 +140,22 @@ void Pass::post_execute(Pass::pre_post_exec_state_t state)
 
 void Pass::help()
 {
-	log("\n");
-	log("No help message for command `%s'.\n", pass_name.c_str());
-	log("\n");
+	if (HasUsages()) {
+		for (auto usage : pass_usages) {
+			log_pass_str(usage.signature, 1, true);
+			log_pass_str(usage.description, 0, true);
+			for (auto option : usage.options) {
+				log_pass_str(option.keyword, 1, true);
+				log_pass_str(option.description, 2, false);
+			}
+			log_pass_str(usage.postscript, 0, true);
+		}
+		log("\n");
+	} else {
+		log("\n");
+		log("No help message for command `%s'.\n", pass_name.c_str());
+		log("\n");
+	}
 }
 
 void Pass::clear_flags()
diff --git a/kernel/register.h b/kernel/register.h
index f4e2127e1..74c2a1e4a 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -25,10 +25,24 @@
 
 YOSYS_NAMESPACE_BEGIN
 
+struct PassOption {
+	string keyword;
+	string description;
+};
+
+struct PassUsageBlock {
+	string signature = "";
+	string description = "";
+	vector<PassOption> options = {};
+	string postscript = "";
+};
+
 struct Pass
 {
 	std::string pass_name, short_help;
-	Pass(std::string name, std::string short_help = "** document me **");
+	const vector<PassUsageBlock> pass_usages;
+	Pass(std::string name, std::string short_help = "** document me **",
+		const vector<PassUsageBlock> usages = {});
 	// Prefer overriding 'Pass::on_shutdown()' if possible
 	virtual ~Pass();
 
@@ -44,6 +58,10 @@ struct Pass
 		experimental_flag = true;
 	}
 
+	bool HasUsages() {
+		return !pass_usages.empty();
+	}
+
 	struct pre_post_exec_state_t {
 		Pass *parent_pass;
 		int64_t begin_ns;

From 804e18e0c67e0cc3913ebd7692c39135c916d890 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:32:51 +1200
Subject: [PATCH 142/931] Docs: WIP dump_cmds_json

---
 Makefile           |   3 +
 kernel/register.cc | 153 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 155 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0959dbea9..6dc16fdb2 100644
--- a/Makefile
+++ b/Makefile
@@ -1042,6 +1042,9 @@ docs/source/cmd/abc.rst: $(TARGETS) $(EXTRA_TARGETS)
 	$(Q) $(RSYNC_CP) temp/docs/source/cmd docs/source
 	$(Q) rm -rf temp
 
+docs/source/generated/cmds.json: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
+	$(Q) ./$(PROGRAM_PREFIX)yosys -p 'help -dump-cmds-json $@'
+
 docs/source/generated/cells.json: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
 	$(Q) ./$(PROGRAM_PREFIX)yosys -p 'help -dump-cells-json $@'
 
diff --git a/kernel/register.cc b/kernel/register.cc
index 119204db3..08c0b45a6 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -835,6 +835,145 @@ struct HelpPass : public Pass {
 		}
 		fclose(f);
 	}
+	bool dump_cmds_json(PrettyJson &json) {
+		// init json
+		json.begin_object();
+		json.entry("version", "Yosys command reference");
+		json.entry("generator", yosys_version_str);
+
+		bool raise_error = false;
+
+		json.name("cmds"); json.begin_object();
+		// iterate over commands
+		for (auto &it : pass_register) {
+			auto name = it.first;
+			auto pass = it.second;
+			auto title = pass->short_help;
+			vector<PassUsageBlock> usages;
+			auto experimental_flag = pass->experimental_flag;
+
+			if (pass->HasUsages()) {
+				for (auto usage : pass->pass_usages)
+					usages.push_back(usage);
+			} else {
+				enum PassUsageState {
+					PUState_signature,
+					PUState_description,
+					PUState_options,
+					PUState_postscript,
+				};
+
+				// dump command help
+				std::ostringstream buf;
+				log_streams.push_back(&buf);
+				pass->help();
+				log_streams.pop_back();
+				std::stringstream ss;
+				ss << buf.str();
+
+				// parse command help
+				int blank_count = 0;
+				size_t def_strip_count = 0;
+				auto current_state = PUState_postscript;
+				auto catch_verific = false;
+				for (string line; std::getline(ss, line, '\n');) {
+					// find position of first non space character
+					std::size_t first_pos = line.find_first_not_of(" \t");
+					std::size_t last_pos = line.find_last_not_of(" \t");
+					if (first_pos == std::string::npos) {
+						// skip empty lines
+						blank_count += 1;
+						continue;
+					}
+
+					// strip leading and trailing whitespace
+					std::string stripped_line = line.substr(first_pos, last_pos - first_pos +1);
+					bool IsDefinition = stripped_line[0] == '-';
+					IsDefinition &= stripped_line[1] != ' ' && stripped_line[1] != '>';
+					bool IsDedent = def_strip_count && first_pos < def_strip_count;
+					bool IsIndent = first_pos == 2 || first_pos == 4 || first_pos == 8;
+
+					// line looks like a signature
+					bool IsSignature = stripped_line.find(name) == 0;
+
+					// start new usage block if it's a signature and we left the current signature
+					// or if we are adding new options after we left the options
+					bool NewUsage = (IsSignature && current_state != PUState_signature)
+							|| (IsDefinition && current_state == PUState_postscript);
+
+					if (NewUsage) {
+						current_state = PUState_signature;
+						usages.push_back({});
+						def_strip_count = first_pos;
+						catch_verific = false;
+					} else if (IsDedent) {
+						def_strip_count = first_pos;
+						if (current_state == PUState_signature)
+							current_state = PUState_description;
+						else
+							current_state = PUState_postscript;
+					}
+
+					if (IsDefinition && IsIndent && !catch_verific) {
+						current_state = PUState_options;
+						usages.back().options.push_back(PassOption({stripped_line, ""}));
+						def_strip_count = first_pos;
+					} else {
+						string *desc_str;
+						if (current_state == PUState_signature) {
+							desc_str = &(usages.back().signature);
+							blank_count += 1;
+						} else if (current_state == PUState_description) {
+							desc_str = &(usages.back().description);
+						} else if (current_state == PUState_options) {
+							desc_str = &(usages.back().options.back().description);
+						} else if (current_state == PUState_postscript) {
+							desc_str = &(usages.back().postscript);
+						} else {
+							log_abort();
+						}
+						if (desc_str->empty())
+							*desc_str = stripped_line;
+						else if (catch_verific)
+							*desc_str += (IsIndent ? "\n" : " ") + stripped_line;
+						else
+							*desc_str += (blank_count > 0 ? "\n" : " ") + stripped_line;
+						if (stripped_line.compare("Command file parser supports following commands in file:") == 0)
+							catch_verific = true;
+					}
+
+					blank_count = 0;
+				}
+			}
+
+			// write to json
+			json.name(name.c_str()); json.begin_object();
+			json.entry("title", title);
+			json.name("usages"); json.begin_array();
+			for (auto usage : usages) {
+				json.begin_object();
+				json.entry("signature", usage.signature);
+				json.entry("description", usage.description);
+				json.name("options"); json.begin_array();
+				for (auto option : usage.options) {
+					json.begin_array();
+					json.value(option.keyword);
+					json.value(option.description);
+					json.end_array();
+				}
+				json.end_array();
+				json.entry("postscript", usage.postscript);
+				json.end_object();
+			}
+			json.end_array();
+			json.entry("experimental_flag", experimental_flag);
+			json.end_object();
+		}
+		json.end_object();
+
+		json.end_object();
+		return raise_error;
+	}
 	bool dump_cells_json(PrettyJson &json) {
 		// init json
 		json.begin_object();
@@ -1007,7 +1146,17 @@ struct HelpPass : public Pass {
 				log("No such command or cell type: %s\n", args[1].c_str());
 			return;
 		} else if (args.size() == 3) {
-			if (args[1] == "-dump-cells-json") {
+			// this option is undocumented as it is for internal use only
+			if (args[1] == "-dump-cmds-json") {
+				PrettyJson json;
+				if (!json.write_to_file(args[2]))
+					log_error("Can't open file `%s' for writing: %s\n", args[2].c_str(), strerror(errno));
+				if (dump_cmds_json(json)) {
+					log_abort();
+				}
+			}
+			// this option is undocumented as it is for internal use only
+			else if (args[1] == "-dump-cells-json") {
 				PrettyJson json;
 				if (!json.write_to_file(args[2]))
 					log_error("Can't open file `%s' for writing: %s\n", args[2].c_str(), strerror(errno));
@@ -1015,6 +1164,8 @@ struct HelpPass : public Pass {
 					log_error("One or more cells defined in celltypes.h are missing help documentation.\n");
 				}
 			}
+			else
+				log("Unknown help command: `%s %s'\n", args[1].c_str(), args[2].c_str());
 			return;
 		}
 

From 5ce097ed3d61669d329a9cf1a3c1a0607fdd41e3 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:33:31 +1200
Subject: [PATCH 143/931] Docs: Test new pass help with chformal

---
 passes/cmds/chformal.cc | 105 +++++++++++++++++++---------------------
 1 file changed, 51 insertions(+), 54 deletions(-)

diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index 572ed2153..c925f59bf 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -70,63 +70,60 @@ static bool is_triggered_check_cell(RTLIL::Cell * cell)
 }
 
 struct ChformalPass : public Pass {
-	ChformalPass() : Pass("chformal", "change formal constraints of the design") { }
-	void help() override
+	ChformalPass() : Pass("chformal", "change formal constraints of the design", {
 	{
-		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
-		log("\n");
-		log("    chformal [types] [mode] [options] [selection]\n");
-		log("\n");
-		log("Make changes to the formal constraints of the design. The [types] options\n");
-		log("the type of constraint to operate on. If none of the following options are\n");
-		log("given, the command will operate on all constraint types:\n");
-		log("\n");
-		log("    -assert       $assert cells, representing assert(...) constraints\n");
-		log("    -assume       $assume cells, representing assume(...) constraints\n");
-		log("    -live         $live cells, representing assert(s_eventually ...)\n");
-		log("    -fair         $fair cells, representing assume(s_eventually ...)\n");
-		log("    -cover        $cover cells, representing cover() statements\n");
-		log("\n");
-		log("    Additionally chformal will operate on $check cells corresponding to the\n");
-		log("    selected constraint types.\n");
-		log("\n");
-		log("Exactly one of the following modes must be specified:\n");
-		log("\n");
-		log("    -remove\n");
-		log("        remove the cells and thus constraints from the design\n");
-		log("\n");
-		log("    -early\n");
-		log("        bypass FFs that only delay the activation of a constraint. When inputs\n");
-		log("        of the bypassed FFs do not remain stable between clock edges, this may\n");
-		log("        result in unexpected behavior.\n");
-		log("\n");
-		log("    -delay <N>\n");
-		log("        delay activation of the constraint by <N> clock cycles\n");
-		log("\n");
-		log("    -skip <N>\n");
-		log("        ignore activation of the constraint in the first <N> clock cycles\n");
-		log("\n");
-		log("    -coverenable\n");
-		log("        add cover statements for the enable signals of the constraints\n");
-		log("\n");
+		.signature = "chformal [types] [mode] [options] [selection]",
+		.description = 	"Make changes to the formal constraints of the design. The [types] options the type of "
+				"constraint to operate on. If none of the following options are given, the command "
+				"will operate on all constraint types:",
+		.options = {
+			{"-assert       $assert cells, representing assert(...) constraints"
+			"\n-assume       $assume cells, representing assume(...) constraints"
+			"\n-live         $live cells, representing assert(s_eventually ...)"
+			"\n-fair         $fair cells, representing assume(s_eventually ...)"
+			"\n-cover        $cover cells, representing cover() statements", ""},
+			{"Additionally chformal will operate on $check cells corresponding to the selected constraint "
+			"types.", ""},
+		}
+	},
+	{
+		.description = "Exactly one of the following modes must be specified:",
+		.options = {
+			{"-remove",
+				"remove the cells and thus constraints from the design"},
+			{"-early",
+				"bypass FFs that only delay the activation of a constraint. When inputs "
+				"of the bypassed FFs do not remain stable between clock edges, this may "
+				"result in unexpected behavior."
+			},
+			{"-delay <N>",
+				"delay activation of the constraint by <N> clock cycles"
+			},
+			{"-skip <N>",
+				"ignore activation of the constraint in the first <N> clock cycles"
+			},
+			{"-coverenable",
+				"add cover statements for the enable signals of the constraints"
 #ifdef YOSYS_ENABLE_VERIFIC
-		log("        Note: For the Verific frontend it is currently not guaranteed that a\n");
-		log("        reachable SVA statement corresponds to an active enable signal.\n");
-		log("\n");
+				"\n\nNote: For the Verific frontend it is currently not guaranteed that a "
+				"reachable SVA statement corresponds to an active enable signal."
 #endif
-		log("    -assert2assume\n");
-		log("    -assert2cover\n");
-		log("    -assume2assert\n");
-		log("    -live2fair\n");
-		log("    -fair2live\n");
-		log("        change the roles of cells as indicated. these options can be combined\n");
-		log("\n");
-		log("    -lower\n");
-		log("        convert each $check cell into an $assert, $assume, $live, $fair or\n");
-		log("        $cover cell. If the $check cell contains a message, also produce a\n");
-		log("        $print cell.\n");
-		log("\n");
-	}
+			},
+			{"-assert2assume"
+			"\n-assert2cover"
+			"\n-assume2assert"
+			"\n-live2fair"
+			"\n-fair2live",
+				"change the roles of cells as indicated. these options can be combined"
+			},
+			{"-lower",
+				"convert each $check cell into an $assert, $assume, $live, $fair or "
+				"$cover cell. If the $check cell contains a message, also produce a "
+				"$print cell."
+			},
+		}
+	},
+	}) { }
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		bool assert2assume = false;

From 714790c70b4a918b8a3aa2fbb272c57fa2fd2706 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:33:31 +1200
Subject: [PATCH 144/931] Docs: Proto doc_string approach for cmd help

Add `doc_string` field to `Pass` constructor
Add `docs/util/newcmdref.py` to contain command domain
Update `docs/util/cmdref.py` with `cmd:usage` and `cmd:optiongroup` for describing commands.
Functional, but WIP.
---
 docs/source/conf.py    |   2 +
 docs/util/cmdref.py    | 131 ++++++++++++-
 docs/util/newcmdref.py | 427 +++++++++++++++++++++++++++++++++++++++++
 kernel/register.cc     | 112 +++++++----
 kernel/register.h      |   6 +
 5 files changed, 635 insertions(+), 43 deletions(-)
 create mode 100644 docs/util/newcmdref.py

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 05dcb7d5f..490fc523e 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -112,6 +112,8 @@ extensions.append('util.cmdref')
 extensions.append('sphinx.ext.autodoc')
 extensions.append('util.cellref')
 cells_json = Path(__file__).parent / 'generated' / 'cells.json'
+extensions.append('util.newcmdref')
+cmds_json = Path(__file__).parent / 'generated' / 'cmds.json'
 
 from sphinx.application import Sphinx
 def setup(app: Sphinx) -> None:
diff --git a/docs/util/cmdref.py b/docs/util/cmdref.py
index a31b08e0d..203d9369e 100644
--- a/docs/util/cmdref.py
+++ b/docs/util/cmdref.py
@@ -4,10 +4,12 @@ from __future__ import annotations
 
 import re
 from typing import cast
+import warnings
 
 from docutils import nodes
-from docutils.nodes import Node, Element, system_message
+from docutils.nodes import Node, Element
 from docutils.parsers.rst import directives
+from docutils.parsers.rst.roles import GenericRole
 from docutils.parsers.rst.states import Inliner
 from sphinx.application import Sphinx
 from sphinx.domains import Domain, Index
@@ -17,7 +19,7 @@ from sphinx.roles import XRefRole
 from sphinx.directives import ObjectDescription
 from sphinx.directives.code import container_wrapper
 from sphinx.util.nodes import make_refnode
-from sphinx.util.docfields import Field
+from sphinx.util.docfields import Field, GroupedField
 from sphinx import addnodes
 
 class TocNode(ObjectDescription):    
@@ -63,10 +65,15 @@ class CommandNode(TocNode):
     name = 'cmd'
     required_arguments = 1
 
-    option_spec = {
+    option_spec = TocNode.option_spec.copy()
+    option_spec.update({
         'title': directives.unchanged,
         'tags': directives.unchanged
-    }
+    })
+
+    doc_field_types = [
+        GroupedField('opts', label='Options', names=('option', 'options', 'opt', 'opts')),
+    ]
 
     def handle_signature(self, sig, signode: addnodes.desc_signature):
         signode['fullname'] = sig
@@ -93,6 +100,120 @@ class CommandNode(TocNode):
                          idx,
                          0))
 
+class CommandUsageNode(TocNode):
+    """A custom node that describes command usages"""
+
+    name = 'cmdusage'
+
+    option_spec = TocNode.option_spec
+    option_spec.update({
+        'usage': directives.unchanged,
+    })
+
+    doc_field_types = [
+        GroupedField('opts', label='Options', names=('option', 'options', 'opt', 'opts')),
+    ]
+
+    def handle_signature(self, sig: str, signode: addnodes.desc_signature):
+        try:
+            cmd, use = sig.split('::')
+        except ValueError:
+            cmd, use = sig, ''
+        signode['fullname'] = sig
+        usage = self.options.get('usage', use or sig)
+        if usage:
+            signode['tocname'] = usage
+            signode += addnodes.desc_name(text=usage)
+        return signode['fullname']
+
+    def add_target_and_index(
+        self,
+        name: str,
+        sig: str,
+        signode: addnodes.desc_signature
+    ) -> None:
+        idx = ".".join(name.split("::"))
+        signode['ids'].append(idx)
+        if 'noindex' not in self.options:
+            tocname: str = signode.get('tocname', name)
+            objs = self.env.domaindata[self.domain]['objects']
+            # (name, sig, typ, docname, anchor, prio)
+            objs.append((name,
+                         tocname,
+                         type(self).name,
+                         self.env.docname,
+                         idx,
+                         1))
+
+class CommandOptionGroupNode(TocNode):
+    """A custom node that describes a group of related options"""
+
+    name = 'cmdoptiongroup'
+
+    option_spec = TocNode.option_spec
+
+    doc_field_types = [
+        Field('opt', ('option',), label='', rolename='option')
+    ]
+
+    def handle_signature(self, sig: str, signode: addnodes.desc_signature):
+        try:
+            cmd, name = sig.split('::')
+        except ValueError:
+            cmd, name = '', sig
+        signode['fullname'] = sig
+        signode['tocname'] = name
+        signode += addnodes.desc_name(text=name)
+        return signode['fullname']
+
+    def add_target_and_index(
+        self,
+        name: str,
+        sig: str,
+        signode: addnodes.desc_signature
+    ) -> None:
+        idx = ".".join(name.split("::"))
+        signode['ids'].append(idx)
+        if 'noindex' not in self.options:
+            tocname: str = signode.get('tocname', name)
+            objs = self.env.domaindata[self.domain]['objects']
+            # (name, sig, typ, docname, anchor, prio)
+            objs.append((name,
+                         tocname,
+                         type(self).name,
+                         self.env.docname,
+                         idx,
+                         1))
+    
+    def transform_content(self, contentnode: addnodes.desc_content) -> None:
+        """hack `:option -thing: desc` into a proper option list"""
+        newchildren = []
+        for node in contentnode:
+            newnode = node
+            if isinstance(node, nodes.field_list):
+                newnode = nodes.option_list()
+                for field in node:
+                    is_option = False
+                    option_list_item = nodes.option_list_item()
+                    for child in field:
+                        if isinstance(child, nodes.field_name):
+                            option_group = nodes.option_group()
+                            option_list_item += option_group
+                            option = nodes.option()
+                            option_group += option
+                            name, text = child.rawsource.split(' ', 1)
+                            is_option = name == 'option'
+                            option += nodes.option_string(text=text)
+                            if not is_option: warnings.warn(f'unexpected option \'{name}\' in {field.source}')
+                        elif isinstance(child, nodes.field_body):
+                            description = nodes.description()
+                            description += child.children
+                            option_list_item += description
+                    if is_option:
+                        newnode += option_list_item
+            newchildren.append(newnode)
+        contentnode.children = newchildren
+
 class PropNode(TocNode):
     name = 'prop'
     fieldname = 'props'
@@ -517,6 +638,8 @@ class CommandDomain(Domain):
 
     directives = {
         'def': CommandNode,
+        'usage': CommandUsageNode,
+        'optiongroup': CommandOptionGroupNode,
     }
 
     indices = {
diff --git a/docs/util/newcmdref.py b/docs/util/newcmdref.py
new file mode 100644
index 000000000..4b5995065
--- /dev/null
+++ b/docs/util/newcmdref.py
@@ -0,0 +1,427 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from dataclasses import dataclass
+import json
+from pathlib import Path, PosixPath, WindowsPath
+import re
+
+from typing import Any
+from sphinx.application import Sphinx
+from sphinx.ext import autodoc
+from sphinx.ext.autodoc import Documenter
+from sphinx.util import logging
+
+logger = logging.getLogger(__name__)
+
+# cmd signature
+cmd_ext_sig_re = re.compile(
+    r'''^ ([\w$._]+?)            # module name
+          (?:\.([\w_]+))?        # optional: thing name
+          (::[\w_]+)?            #           attribute
+          \s* $                  # and nothing more
+          ''', re.VERBOSE)
+
+@dataclass
+class YosysCmdUsage:
+    signature: str
+    description: str
+    options: list[tuple[str,str]]
+    postscript: str
+
+class YosysCmd:
+    name: str
+    title: str
+    content: list[str]
+    usages: list[YosysCmdUsage]
+    experimental_flag: bool
+
+    def __init__(
+            self,
+            name:str = "", title:str = "",
+            content: list[str] = [],
+            usages: list[dict[str]] = [],
+            experimental_flag: bool = False
+    ) -> None:
+        self.name = name
+        self.title = title
+        self.content = content
+        self.usages = [YosysCmdUsage(**u) for u in usages]
+        self.experimental_flag = experimental_flag
+
+    @property
+    def source_file(self) -> str:
+        return ""
+
+    @property
+    def source_line(self) -> int:
+        return 0
+    
+class YosysCmdGroupDocumenter(Documenter):
+    objtype = 'cmdgroup'
+    priority = 10
+    object: tuple[str, list[str]]
+    lib_key = 'groups'
+
+    option_spec = {
+        'caption': autodoc.annotation_option,
+        'members': autodoc.members_option,
+        'source': autodoc.bool_option,
+        'linenos': autodoc.bool_option,
+    }
+
+    __cmd_lib: dict[str, list[str] | dict[str]] | None = None
+    @property
+    def cmd_lib(self) -> dict[str, list[str] | dict[str]]:
+        if not self.__cmd_lib:
+            self.__cmd_lib = {}
+            cmds_obj: dict[str, dict[str, list[str] | dict[str]]]
+            try:
+                with open(self.config.cmds_json, "r") as f:
+                    cmds_obj = json.loads(f.read())
+            except FileNotFoundError:
+                logger.warning(
+                    f"unable to find cmd lib at {self.config.cmds_json}",
+                    type = 'cmdref',
+                    subtype = 'cmd_lib'
+                )
+            else:
+                for (name, obj) in cmds_obj.get(self.lib_key, {}).items():
+                    self.__cmd_lib[name] = obj
+        return self.__cmd_lib
+    
+    @classmethod
+    def can_document_member(
+        cls,
+        member: Any,
+        membername: str,
+        isattr: bool,
+        parent: Any
+    ) -> bool:
+        return False
+
+    def parse_name(self) -> bool:
+        if not self.options.caption:
+            self.content_indent = ''
+        self.fullname = self.modname = self.name
+        return True
+    
+    def import_object(self, raiseerror: bool = False) -> bool:
+        # get cmd
+        try:
+            self.object = (self.modname, self.cmd_lib[self.modname])
+        except KeyError:
+            if raiseerror:
+                raise
+            return False
+
+        self.real_modname = self.modname
+        return True
+    
+    def get_sourcename(self) -> str:
+        return self.env.doc2path(self.env.docname)
+    
+    def format_name(self) -> str:
+        return self.options.caption or ''
+
+    def format_signature(self, **kwargs: Any) -> str:
+        return self.modname
+    
+    def add_directive_header(self, sig: str) -> None:
+        domain = getattr(self, 'domain', 'cmd')
+        directive = getattr(self, 'directivetype', 'group')
+        name = self.format_name()
+        sourcename = self.get_sourcename()
+        cmd_list = self.object
+
+        # cmd definition
+        self.add_line(f'.. {domain}:{directive}:: {sig}', sourcename)
+        self.add_line(f'   :caption: {name}', sourcename)
+
+        if self.options.noindex:
+            self.add_line('   :noindex:', sourcename)
+    
+    def add_content(self, more_content: Any | None) -> None:
+        # groups have no native content
+        # add additional content (e.g. from document), if present
+        if more_content:
+            for line, src in zip(more_content.data, more_content.items):
+                self.add_line(line, src[0], src[1])
+
+    def filter_members(
+        self,
+        members: list[tuple[str, Any]],
+        want_all: bool
+    ) -> list[tuple[str, Any, bool]]:
+        return [(x[0], x[1], False) for x in members]
+
+    def get_object_members(
+        self,
+        want_all: bool
+    ) -> tuple[bool, list[tuple[str, Any]]]:
+        ret: list[tuple[str, str]] = []
+
+        if want_all:
+            for member in self.object[1]:
+                ret.append((member, self.modname))
+        else:
+            memberlist = self.options.members or []
+            for name in memberlist:
+                if name in self.object:
+                    ret.append((name, self.modname))
+                else:
+                    logger.warning(('unknown module mentioned in :members: option: '
+                                    f'group {self.modname}, module {name}'),
+                                   type='cmdref')
+
+        return False, ret
+
+    def document_members(self, all_members: bool = False) -> None:
+        want_all = (all_members or
+                    self.options.inherited_members or
+                    self.options.members is autodoc.ALL)
+        # find out which members are documentable
+        members_check_module, members = self.get_object_members(want_all)
+
+        # document non-skipped members
+        memberdocumenters: list[tuple[Documenter, bool]] = []
+        for (mname, member, isattr) in self.filter_members(members, want_all):
+            classes = [cls for cls in self.documenters.values()
+                       if cls.can_document_member(member, mname, isattr, self)]
+            if not classes:
+                # don't know how to document this member
+                continue
+            # prefer the documenter with the highest priority
+            classes.sort(key=lambda cls: cls.priority)
+            # give explicitly separated module name, so that members
+            # of inner classes can be documented
+            full_mname = self.format_signature() + '::' + mname
+            documenter = classes[-1](self.directive, full_mname, self.indent)
+            memberdocumenters.append((documenter, isattr))
+
+        member_order = self.options.member_order or self.config.autodoc_member_order
+        memberdocumenters = self.sort_members(memberdocumenters, member_order)
+
+        for documenter, isattr in memberdocumenters:
+            documenter.generate(
+                all_members=True, real_modname=self.real_modname,
+                check_module=members_check_module and not isattr)
+
+    def generate(
+        self,
+        more_content: Any | None = None,
+        real_modname: str | None = None,
+        check_module: bool = False,
+        all_members: bool = False
+    ) -> None:
+        if not self.parse_name():
+            # need a cmd lib to import from
+            logger.warning(
+                f"don't know which cmd lib to import for autodocumenting {self.name}",
+                type = 'cmdref'
+            )
+            return
+
+        if not self.import_object():
+            logger.warning(
+                f"unable to load {self.name} with {type(self)}",
+                type = 'cmdref'
+            )
+            return
+
+        # check __module__ of object (for members not given explicitly)
+        # if check_module:
+        #     if not self.check_module():
+        #         return
+
+        sourcename = self.get_sourcename()
+        self.add_line('', sourcename)
+
+        # format the object's signature, if any
+        try:
+            sig = self.format_signature()
+        except Exception as exc:
+            logger.warning(('error while formatting signature for %s: %s'),
+                           self.fullname, exc, type='cmdref')
+            return
+
+        # generate the directive header and options, if applicable
+        self.add_directive_header(sig)
+        self.add_line('', sourcename)
+
+        # e.g. the module directive doesn't have content
+        self.indent += self.content_indent
+
+        # add all content (from docstrings, attribute docs etc.)
+        self.add_content(more_content)
+
+        # document members, if possible
+        self.document_members(all_members)
+
+class YosysCmdDocumenter(YosysCmdGroupDocumenter):
+    objtype = 'cmd'
+    priority = 15
+    object: YosysCmd
+    lib_key = 'cmds'
+
+    @classmethod
+    def can_document_member(
+        cls,
+        member: Any,
+        membername: str,
+        isattr: bool,
+        parent: Any
+    ) -> bool:
+        if membername.startswith('$'):
+            return False
+        return isinstance(parent, YosysCmdGroupDocumenter)
+
+    def parse_name(self) -> bool:
+        try:
+            matched = cmd_ext_sig_re.match(self.name)
+            modname, thing, attribute = matched.groups()
+        except AttributeError:
+            logger.warning(('invalid signature for auto%s (%r)') % (self.objtype, self.name),
+                           type='cmdref')
+            return False
+
+        self.modname = modname
+        self.attribute = attribute or ''
+        self.fullname = ((self.modname) + (thing or ''))
+
+        return True
+
+    def import_object(self, raiseerror: bool = False) -> bool:
+        if super().import_object(raiseerror):
+            self.object = YosysCmd(self.modname, **self.object[1])
+            return True
+        return False
+
+    def get_sourcename(self) -> str:
+        return self.object.source_file
+    
+    def format_name(self) -> str:
+        return self.object.name
+
+    def format_signature(self, **kwargs: Any) -> str:
+        return self.fullname + self.attribute
+
+    def add_directive_header(self, sig: str) -> None:
+        domain = getattr(self, 'domain', self.objtype)
+        directive = getattr(self, 'directivetype', 'def')
+        source_name = self.object.source_file
+        source_line = self.object.source_line
+
+        # cmd definition
+        self.add_line(f'.. {domain}:{directive}:: {sig}', source_name, source_line)
+
+        if self.options.noindex:
+            self.add_line('   :noindex:', source_name)
+    
+    def add_content(self, more_content: Any | None) -> None:
+        # set sourcename and add content from attribute documentation
+        domain = getattr(self, 'domain', self.objtype)
+        source_name = self.object.source_file
+
+        for usage in self.object.usages:
+            self.add_line('', source_name)
+            if usage.signature:
+                self.add_line(f'   .. {domain}:usage:: {self.name}::{usage.signature}', source_name)
+                self.add_line('', source_name)
+            for line in usage.description.splitlines():
+                self.add_line(f'   {line}', source_name)
+                self.add_line('', source_name)
+            if usage.options:
+                self.add_line(f'   .. {domain}:optiongroup:: {self.name}::something', source_name)
+                self.add_line('', source_name)
+                for opt, desc in usage.options:
+                    self.add_line(f'      :option {opt}: {desc}', source_name)
+                self.add_line('', source_name)
+            for line in usage.postscript.splitlines():
+                self.add_line(f'   {line}', source_name)
+                self.add_line('', source_name)
+
+        for line in self.object.content:
+            if line.startswith('..') and ':: ' in line:
+                line = line.replace(':: ', f':: {self.name}::', 1)
+            self.add_line(line, source_name)
+
+        # add additional content (e.g. from document), if present
+        if more_content:
+            for line, src in zip(more_content.data, more_content.items):
+                self.add_line(line, src[0], src[1])
+
+        # fields
+        self.add_line('\n', source_name)
+        field_attrs = ["properties", ]
+        for field in field_attrs:
+            attr = getattr(self.object, field, [])
+            for val in attr:
+                self.add_line(f':{field} {val}:', source_name)
+
+    def get_object_members(
+        self,
+        want_all: bool
+    ) -> tuple[bool, list[tuple[str, Any]]]:
+
+        return False, []
+
+class YosysCmdUsageDocumenter(YosysCmdDocumenter):
+    objtype = 'cmdusage'
+    priority = 20
+    object: YosysCmdUsage
+    parent: YosysCmd
+
+    def add_directive_header(self, sig: str) -> None:
+        domain = getattr(self, 'domain', 'cmd')
+        directive = getattr(self, 'directivetype', 'usage')
+        name = self.format_name()
+        sourcename = self.parent.source_file
+        cmd = self.parent
+
+        # cmd definition
+        self.add_line(f'.. {domain}:{directive}:: {sig}', sourcename)
+        if self.object.signature:
+            self.add_line(f'   :usage: {self.object.signature}', sourcename)
+        else:
+            self.add_line(f'   :noindex:', sourcename)
+        # for usage in self.object.signature.splitlines():
+        #     self.add_line(f'   :usage: {usage}', sourcename)
+
+        # if self.options.linenos:
+        #     self.add_line(f'   :source: {cmd.source.split(":")[0]}', sourcename)
+        # else:
+        #     self.add_line(f'   :source: {cmd.source}', sourcename)
+        # self.add_line(f'   :language: verilog', sourcename)
+
+        if self.options.noindex:
+            self.add_line('   :noindex:', sourcename)
+    
+    def add_content(self, more_content: Any | None) -> None:
+        # set sourcename and add content from attribute documentation
+        sourcename = self.parent.source_file
+        startline = self.parent.source_line
+
+        for line in self.object.description.splitlines():
+            self.add_line(line, sourcename)
+
+        # add additional content (e.g. from document), if present
+        if more_content:
+            for line, src in zip(more_content.data, more_content.items):
+                self.add_line(line, src[0], src[1])
+
+    def get_object_members(
+        self,
+        want_all: bool
+    ) -> tuple[bool, list[tuple[str, Any]]]:
+        return False, []
+
+def setup(app: Sphinx) -> dict[str, Any]:
+    app.add_config_value('cmds_json', False, 'html', [Path, PosixPath, WindowsPath])
+    app.setup_extension('sphinx.ext.autodoc')
+    app.add_autodocumenter(YosysCmdGroupDocumenter)
+    app.add_autodocumenter(YosysCmdDocumenter)
+    return {
+        'version': '1',
+        'parallel_read_safe': True,
+    }
diff --git a/kernel/register.cc b/kernel/register.cc
index 08c0b45a6..8e93e9b42 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -29,30 +29,6 @@
 
 YOSYS_NAMESPACE_BEGIN
 
-#define MAX_LINE_LEN 80
-void log_pass_str(const std::string &pass_str, int indent=0, bool leading_newline=false) {
-	if (pass_str.empty())
-		return;
-	std::string indent_str(indent*4, ' ');
-	std::istringstream iss(pass_str);
-	if (leading_newline)
-		log("\n");
-	for (std::string line; std::getline(iss, line);) {
-		log("%s", indent_str.c_str());
-		auto curr_len = indent_str.length();
-		std::istringstream lss(line);
-		for (std::string word; std::getline(lss, word, ' ');) {
-			if (curr_len + word.length() >= MAX_LINE_LEN) {
-				curr_len = 0;
-				log("\n%s", indent_str.c_str());
-			}
-			log("%s ", word.c_str());
-			curr_len += word.length() + 1;
-		}
-		log("\n");
-	}
-}
-
 #define MAX_REG_COUNT 1000
 
 bool echo_mode = false;
@@ -65,7 +41,7 @@ std::map<std::string, Backend*> backend_register;
 
 std::vector<std::string> Frontend::next_args;
 
-Pass::Pass(std::string name, std::string short_help, const vector<PassUsageBlock> usages) : pass_name(name), short_help(short_help), pass_usages(usages)
+Pass::Pass(std::string name, std::string short_help, const vector<std::string> doc_string, const vector<PassUsageBlock> usages) : pass_name(name), short_help(short_help), doc_string(doc_string), pass_usages(usages)
 {
 	next_queued_pass = first_queued_pass;
 	first_queued_pass = this;
@@ -138,6 +114,37 @@ void Pass::post_execute(Pass::pre_post_exec_state_t state)
 		current_pass->runtime_ns -= time_ns;
 }
 
+#define MAX_LINE_LEN 80
+void log_pass_str(const std::string &pass_str, std::string indent_str, bool leading_newline=false) {
+	if (pass_str.empty())
+		return;
+	std::istringstream iss(pass_str);
+	if (leading_newline)
+		log("\n");
+	for (std::string line; std::getline(iss, line);) {
+		log("%s", indent_str.c_str());
+		auto curr_len = indent_str.length();
+		std::istringstream lss(line);
+		for (std::string word; std::getline(lss, word, ' ');) {
+			while (word[0] == '`' && word.back() == '`')
+				word = word.substr(1, word.length()-2);
+			if (curr_len + word.length() >= MAX_LINE_LEN-1) {
+				curr_len = 0;
+				log("\n%s", indent_str.c_str());
+			}
+			if (word.length()) {
+				log("%s ", word.c_str());
+				curr_len += word.length() + 1;
+			}
+		}
+		log("\n");
+	}
+}
+void log_pass_str(const std::string &pass_str, int indent=0, bool leading_newline=false) {
+	std::string indent_str(indent*4, ' ');
+	log_pass_str(pass_str, indent_str, leading_newline);
+}
+
 void Pass::help()
 {
 	if (HasUsages()) {
@@ -151,6 +158,28 @@ void Pass::help()
 			log_pass_str(usage.postscript, 0, true);
 		}
 		log("\n");
+	} else if (HasDocstring()) {
+		log("\n");
+		auto print_empty = true;
+		for (auto doc_line : doc_string) {
+			if (doc_line.find("..") == 0 && doc_line.find(":: ") != std::string::npos) {
+				auto command_pos = doc_line.find(":: ");
+				auto command_str = doc_line.substr(0, command_pos);
+				if (command_str.compare(".. cmd:usage") == 0) {
+					log_pass_str(doc_line.substr(command_pos+3), 1);
+				} else {
+					print_empty = false;
+				}
+			} else if (doc_line.length()) {
+				std::size_t first_pos = doc_line.find_first_not_of(" \t");
+				auto indent_str = doc_line.substr(0, first_pos);
+				log_pass_str(doc_line, indent_str);
+				print_empty = true;
+			} else if (print_empty) {
+				log("\n");
+			}
+		}
+		log("\n");
 	} else {
 		log("\n");
 		log("No help message for command `%s'.\n", pass_name.c_str());
@@ -852,7 +881,7 @@ struct HelpPass : public Pass {
 			vector<PassUsageBlock> usages;
 			auto experimental_flag = pass->experimental_flag;
 
-			if (pass->HasUsages()) {
+			if (pass->HasUsages() || pass->HasDocstring()) {
 				for (auto usage : pass->pass_usages)
 					usages.push_back(usage);
 			} else {
@@ -949,23 +978,28 @@ struct HelpPass : public Pass {
 			// write to json
 			json.name(name.c_str()); json.begin_object();
 			json.entry("title", title);
-			json.name("usages"); json.begin_array();
-			for (auto usage : usages) {
-				json.begin_object();
-				json.entry("signature", usage.signature);
-				json.entry("description", usage.description);
-				json.name("options"); json.begin_array();
-				for (auto option : usage.options) {
-					json.begin_array();
-					json.value(option.keyword);
-					json.value(option.description);
+			if (pass->HasDocstring()) {
+				json.entry("content", pass->doc_string);
+			}
+			if (usages.size()) {
+				json.name("usages"); json.begin_array();
+				for (auto usage : usages) {
+					json.begin_object();
+					json.entry("signature", usage.signature);
+					json.entry("description", usage.description);
+					json.name("options"); json.begin_array();
+					for (auto option : usage.options) {
+						json.begin_array();
+						json.value(option.keyword);
+						json.value(option.description);
+						json.end_array();
+					}
 					json.end_array();
+					json.entry("postscript", usage.postscript);
+					json.end_object();
 				}
 				json.end_array();
-				json.entry("postscript", usage.postscript);
-				json.end_object();
 			}
-			json.end_array();
 			json.entry("experimental_flag", experimental_flag);
 			json.end_object();
 		}
diff --git a/kernel/register.h b/kernel/register.h
index 74c2a1e4a..e7d3250a3 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -40,8 +40,10 @@ struct PassUsageBlock {
 struct Pass
 {
 	std::string pass_name, short_help;
+	const vector<std::string> doc_string;
 	const vector<PassUsageBlock> pass_usages;
 	Pass(std::string name, std::string short_help = "** document me **",
+		const vector<std::string> doc_string = {},
 		const vector<PassUsageBlock> usages = {});
 	// Prefer overriding 'Pass::on_shutdown()' if possible
 	virtual ~Pass();
@@ -62,6 +64,10 @@ struct Pass
 		return !pass_usages.empty();
 	}
 
+	bool HasDocstring() {
+		return !doc_string.empty();
+	}
+
 	struct pre_post_exec_state_t {
 		Pass *parent_pass;
 		int64_t begin_ns;

From f5ace20bf6492fe0932a50b3a5c8537e83f69dac Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:33:31 +1200
Subject: [PATCH 145/931] Docs: Improve autoref

Fix `help $cell` type references, as well as actually implement the fallback to yoscrypt.
---
 docs/source/conf.py |  6 +++++-
 docs/util/cmdref.py | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 490fc523e..813befa47 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -43,8 +43,12 @@ html_static_path = ['_static', "_images"]
 # default to no highlight
 highlight_language = 'none'
 
-# default single quotes to attempt auto reference, or fallback to code
+# default single quotes to attempt auto reference, or fallback to yoscrypt
 default_role = 'autoref'
+rst_prolog = """
+.. role:: yoscrypt(code)
+   :language: yoscrypt
+"""
 
 extensions = ['sphinx.ext.autosectionlabel', 'sphinxcontrib.bibtex']
 
diff --git a/docs/util/cmdref.py b/docs/util/cmdref.py
index 203d9369e..da27860b3 100644
--- a/docs/util/cmdref.py
+++ b/docs/util/cmdref.py
@@ -715,10 +715,18 @@ class CellDomain(CommandDomain):
 
 def autoref(name, rawtext: str, text: str, lineno, inliner: Inliner,
             options=None, content=None):
-    role = 'cell:ref' if text[0] == '$' else 'cmd:ref'
-    if text.startswith("help ") and text.count(' ') == 1:
-        _, cmd = text.split(' ', 1)
-        text = f'{text} <{cmd}>'
+    words = text.split(' ')
+    if len(words) == 2 and words[0] == "help":
+        IsLinkable = True
+        thing = words[1]
+    else:
+        IsLinkable = len(words) == 1 and words[0][0] != '-'
+        thing = words[0]
+    if IsLinkable:
+        role = 'cell:ref' if thing[0] == '$' else 'cmd:ref'
+        text = f'{text} <{thing}>'
+    else:
+        role = 'yoscrypt'
     return inliner.interpreted(rawtext, text, role, lineno)
 
 def setup(app: Sphinx):

From 3718f916f3ec53e6a7a34e6729bad6ad91ba5b0f Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:33:31 +1200
Subject: [PATCH 146/931] Makefile: Add cmds.json to docs/prep

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6dc16fdb2..f8b8a0c91 100644
--- a/Makefile
+++ b/Makefile
@@ -1095,7 +1095,7 @@ docs/reqs:
 	$(Q) $(MAKE) -C docs reqs
 
 .PHONY: docs/prep
-docs/prep: docs/source/cmd/abc.rst docs/source/generated/cells.json docs/gen docs/usage docs/gen/functional_ir
+docs/prep: docs/source/cmd/abc.rst docs/source/generated/cells.json docs/source/generated/cmds.json docs/gen docs/usage docs/gen/functional_ir
 
 DOC_TARGET ?= html
 docs: docs/prep

From 3bef122a3f1830fdd88fadc48b2b568a94517cf5 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:11 +1200
Subject: [PATCH 147/931] WIP docs: Proto log_help

Define `PrettyHelp` class with methods for declaring different parts of help message.
Currently able to produce standard help messages as expected.
Updates chformal to use (only) the new help_v2.
Currently makes use of a global static to track the current help context, allowing register.h to live in blissful ignorance and instead rely on help_v2 implementations calling `auto *help = PrettyHelp::get_current();` and `return true;` to minimise impact on rebuilds (i.e. not requiring every source file to be recompiled).
---
 Makefile                |   1 +
 kernel/log_help.cc      | 116 +++++++++++++++++++++++++++++++++++++++
 kernel/log_help.h       |  51 +++++++++++++++++
 kernel/register.cc      | 118 +++++++---------------------------------
 kernel/register.h       |  27 +--------
 passes/cmds/chformal.cc | 105 +++++++++++++++++------------------
 6 files changed, 242 insertions(+), 176 deletions(-)
 create mode 100644 kernel/log_help.cc
 create mode 100644 kernel/log_help.h

diff --git a/Makefile b/Makefile
index f8b8a0c91..2120dbdea 100644
--- a/Makefile
+++ b/Makefile
@@ -634,6 +634,7 @@ $(eval $(call add_include_file,frontends/blif/blifparse.h))
 $(eval $(call add_include_file,backends/rtlil/rtlil_backend.h))
 
 OBJS += kernel/driver.o kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o kernel/yosys.o kernel/io.o kernel/gzip.o
+OBJS += kernel/log_help.o
 OBJS += kernel/binding.o kernel/tclapi.o
 OBJS += kernel/cellaigs.o kernel/celledges.o kernel/cost.o kernel/satgen.o kernel/scopeinfo.o kernel/qcsat.o kernel/mem.o kernel/ffmerge.o kernel/ff.o kernel/yw.o kernel/json.o kernel/fmt.o kernel/sexpr.o
 OBJS += kernel/drivertools.o kernel/functional.o
diff --git a/kernel/log_help.cc b/kernel/log_help.cc
new file mode 100644
index 000000000..fe9829af1
--- /dev/null
+++ b/kernel/log_help.cc
@@ -0,0 +1,116 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2025  Krystine Dawn <krystinedawn@yosyshq.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include "kernel/log_help.h"
+
+USING_YOSYS_NAMESPACE
+
+#define MAX_LINE_LEN 80
+void log_pass_str(const std::string &pass_str, std::string indent_str, bool leading_newline=false) {
+	if (pass_str.empty())
+		return;
+	std::istringstream iss(pass_str);
+	if (leading_newline)
+		log("\n");
+	for (std::string line; std::getline(iss, line);) {
+		log("%s", indent_str.c_str());
+		auto curr_len = indent_str.length();
+		std::istringstream lss(line);
+		for (std::string word; std::getline(lss, word, ' ');) {
+			while (word[0] == '`' && word.back() == '`')
+				word = word.substr(1, word.length()-2);
+			if (curr_len + word.length() >= MAX_LINE_LEN-1) {
+				curr_len = 0;
+				log("\n%s", indent_str.c_str());
+			}
+			if (word.length()) {
+				log("%s ", word.c_str());
+				curr_len += word.length() + 1;
+			}
+		}
+		log("\n");
+	}
+}
+void log_pass_str(const std::string &pass_str, int indent=0, bool leading_newline=false) {
+	std::string indent_str(indent*4, ' ');
+	log_pass_str(pass_str, indent_str, leading_newline);
+}
+
+PrettyHelp *current_help = nullptr;
+
+PrettyHelp::PrettyHelp()
+{
+	prior = current_help;
+	current_help = this;
+}
+
+PrettyHelp::~PrettyHelp()
+{
+	current_help = prior;
+}
+
+PrettyHelp *PrettyHelp::get_current()
+{
+	if (current_help != nullptr)
+		return current_help;
+	else
+		return new PrettyHelp();
+}
+
+bool PrettyHelp::has_content()
+{
+	return false;
+}
+
+void PrettyHelp::usage(const string &usage)
+{
+	log_pass_str(usage, current_indent+1, true);
+	log("\n");
+}
+
+void PrettyHelp::option(const string &option, const string &description)
+{
+	log_pass_str(option, current_indent);
+	if (description.length()) {
+		log_pass_str(description, current_indent+1);
+		log("\n");
+	}
+}
+
+void PrettyHelp::codeblock(const string &code, const string &)
+{
+	log("%s\n", code.c_str());
+}
+
+void PrettyHelp::paragraph(const string &text)
+{
+	log_pass_str(text, current_indent);
+	log("\n");
+}
+
+void PrettyHelp::optiongroup(const string &)
+{
+	current_indent += 1;
+}
+
+void PrettyHelp::endgroup()
+{
+	current_indent -= 1;
+	log_assert(current_indent >= 0);
+}
diff --git a/kernel/log_help.h b/kernel/log_help.h
new file mode 100644
index 000000000..bc62b20a6
--- /dev/null
+++ b/kernel/log_help.h
@@ -0,0 +1,51 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2025  Krystine Dawn <krystinedawn@yosyshq.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef LOG_HELP_H
+#define LOG_HELP_H
+
+#include "kernel/yosys_common.h"
+#include "kernel/json.h"
+
+YOSYS_NAMESPACE_BEGIN
+
+class PrettyHelp
+{
+	PrettyHelp *prior = nullptr;
+	int current_indent = 0;
+public:
+	PrettyHelp();
+	~PrettyHelp();
+
+	static PrettyHelp *get_current();
+
+	bool has_content();
+
+	void usage(const string &usage);
+	void option(const string &option, const string &description = "");
+	void codeblock(const string &code, const string &language = "none");
+	void paragraph(const string &text);
+
+	void optiongroup(const string &group = "");
+	void endgroup();
+};
+
+YOSYS_NAMESPACE_END
+
+#endif
diff --git a/kernel/register.cc b/kernel/register.cc
index 8e93e9b42..2f203fb6d 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -21,6 +21,7 @@
 #include "kernel/satgen.h"
 #include "kernel/json.h"
 #include "kernel/gzip.h"
+#include "kernel/log_help.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -41,7 +42,7 @@ std::map<std::string, Backend*> backend_register;
 
 std::vector<std::string> Frontend::next_args;
 
-Pass::Pass(std::string name, std::string short_help, const vector<std::string> doc_string, const vector<PassUsageBlock> usages) : pass_name(name), short_help(short_help), doc_string(doc_string), pass_usages(usages)
+Pass::Pass(std::string name, std::string short_help) : pass_name(name), short_help(short_help)
 {
 	next_queued_pass = first_queued_pass;
 	first_queued_pass = this;
@@ -114,79 +115,20 @@ void Pass::post_execute(Pass::pre_post_exec_state_t state)
 		current_pass->runtime_ns -= time_ns;
 }
 
-#define MAX_LINE_LEN 80
-void log_pass_str(const std::string &pass_str, std::string indent_str, bool leading_newline=false) {
-	if (pass_str.empty())
-		return;
-	std::istringstream iss(pass_str);
-	if (leading_newline)
-		log("\n");
-	for (std::string line; std::getline(iss, line);) {
-		log("%s", indent_str.c_str());
-		auto curr_len = indent_str.length();
-		std::istringstream lss(line);
-		for (std::string word; std::getline(lss, word, ' ');) {
-			while (word[0] == '`' && word.back() == '`')
-				word = word.substr(1, word.length()-2);
-			if (curr_len + word.length() >= MAX_LINE_LEN-1) {
-				curr_len = 0;
-				log("\n%s", indent_str.c_str());
-			}
-			if (word.length()) {
-				log("%s ", word.c_str());
-				curr_len += word.length() + 1;
-			}
-		}
-		log("\n");
-	}
-}
-void log_pass_str(const std::string &pass_str, int indent=0, bool leading_newline=false) {
-	std::string indent_str(indent*4, ' ');
-	log_pass_str(pass_str, indent_str, leading_newline);
-}
-
 void Pass::help()
 {
-	if (HasUsages()) {
-		for (auto usage : pass_usages) {
-			log_pass_str(usage.signature, 1, true);
-			log_pass_str(usage.description, 0, true);
-			for (auto option : usage.options) {
-				log_pass_str(option.keyword, 1, true);
-				log_pass_str(option.description, 2, false);
-			}
-			log_pass_str(usage.postscript, 0, true);
-		}
-		log("\n");
-	} else if (HasDocstring()) {
-		log("\n");
-		auto print_empty = true;
-		for (auto doc_line : doc_string) {
-			if (doc_line.find("..") == 0 && doc_line.find(":: ") != std::string::npos) {
-				auto command_pos = doc_line.find(":: ");
-				auto command_str = doc_line.substr(0, command_pos);
-				if (command_str.compare(".. cmd:usage") == 0) {
-					log_pass_str(doc_line.substr(command_pos+3), 1);
-				} else {
-					print_empty = false;
-				}
-			} else if (doc_line.length()) {
-				std::size_t first_pos = doc_line.find_first_not_of(" \t");
-				auto indent_str = doc_line.substr(0, first_pos);
-				log_pass_str(doc_line, indent_str);
-				print_empty = true;
-			} else if (print_empty) {
-				log("\n");
-			}
-		}
-		log("\n");
-	} else {
+	if (!help_v2()) {
 		log("\n");
 		log("No help message for command `%s'.\n", pass_name.c_str());
 		log("\n");
 	}
 }
 
+bool Pass::help_v2()
+{
+	return false;
+}
+
 void Pass::clear_flags()
 {
 }
@@ -878,13 +820,12 @@ struct HelpPass : public Pass {
 			auto name = it.first;
 			auto pass = it.second;
 			auto title = pass->short_help;
-			vector<PassUsageBlock> usages;
 			auto experimental_flag = pass->experimental_flag;
 
-			if (pass->HasUsages() || pass->HasDocstring()) {
-				for (auto usage : pass->pass_usages)
-					usages.push_back(usage);
-			} else {
+			auto cmd_help = PrettyHelp();
+			auto has_pretty_help = pass->help_v2();
+
+			if (!has_pretty_help) {
 				enum PassUsageState {
 					PUState_signature,
 					PUState_description,
@@ -932,7 +873,7 @@ struct HelpPass : public Pass {
 
 					if (NewUsage) {
 						current_state = PUState_signature;
-						usages.push_back({});
+						// usages.push_back({});
 						def_strip_count = first_pos;
 						catch_verific = false;
 					} else if (IsDedent) {
@@ -945,19 +886,19 @@ struct HelpPass : public Pass {
 
 					if (IsDefinition && IsIndent && !catch_verific) {
 						current_state = PUState_options;
-						usages.back().options.push_back(PassOption({stripped_line, ""}));
+						// usages.back().options.push_back(PassOption({stripped_line, ""}));
 						def_strip_count = first_pos;
 					} else {
 						string *desc_str;
 						if (current_state == PUState_signature) {
-							desc_str = &(usages.back().signature);
+							// desc_str = &(usages.back().signature);
 							blank_count += 1;
 						} else if (current_state == PUState_description) {
-							desc_str = &(usages.back().description);
+							// desc_str = &(usages.back().description);
 						} else if (current_state == PUState_options) {
-							desc_str = &(usages.back().options.back().description);
+							// desc_str = &(usages.back().options.back().description);
 						} else if (current_state == PUState_postscript) {
-							desc_str = &(usages.back().postscript);
+							// desc_str = &(usages.back().postscript);
 						} else {
 							log_abort();
 						}
@@ -978,28 +919,7 @@ struct HelpPass : public Pass {
 			// write to json
 			json.name(name.c_str()); json.begin_object();
 			json.entry("title", title);
-			if (pass->HasDocstring()) {
-				json.entry("content", pass->doc_string);
-			}
-			if (usages.size()) {
-				json.name("usages"); json.begin_array();
-				for (auto usage : usages) {
-					json.begin_object();
-					json.entry("signature", usage.signature);
-					json.entry("description", usage.description);
-					json.name("options"); json.begin_array();
-					for (auto option : usage.options) {
-						json.begin_array();
-						json.value(option.keyword);
-						json.value(option.description);
-						json.end_array();
-					}
-					json.end_array();
-					json.entry("postscript", usage.postscript);
-					json.end_object();
-				}
-				json.end_array();
-			}
+			// json.entry("content", cmd_help);
 			json.entry("experimental_flag", experimental_flag);
 			json.end_object();
 		}
diff --git a/kernel/register.h b/kernel/register.h
index e7d3250a3..fdd361ba6 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -25,30 +25,15 @@
 
 YOSYS_NAMESPACE_BEGIN
 
-struct PassOption {
-	string keyword;
-	string description;
-};
-
-struct PassUsageBlock {
-	string signature = "";
-	string description = "";
-	vector<PassOption> options = {};
-	string postscript = "";
-};
-
 struct Pass
 {
 	std::string pass_name, short_help;
-	const vector<std::string> doc_string;
-	const vector<PassUsageBlock> pass_usages;
-	Pass(std::string name, std::string short_help = "** document me **",
-		const vector<std::string> doc_string = {},
-		const vector<PassUsageBlock> usages = {});
+	Pass(std::string name, std::string short_help = "** document me **");
 	// Prefer overriding 'Pass::on_shutdown()' if possible
 	virtual ~Pass();
 
 	virtual void help();
+	virtual bool help_v2();
 	virtual void clear_flags();
 	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) = 0;
 
@@ -60,14 +45,6 @@ struct Pass
 		experimental_flag = true;
 	}
 
-	bool HasUsages() {
-		return !pass_usages.empty();
-	}
-
-	bool HasDocstring() {
-		return !doc_string.empty();
-	}
-
 	struct pre_post_exec_state_t {
 		Pass *parent_pass;
 		int64_t begin_ns;
diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index c925f59bf..9eb5b0048 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -19,6 +19,7 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -70,60 +71,60 @@ static bool is_triggered_check_cell(RTLIL::Cell * cell)
 }
 
 struct ChformalPass : public Pass {
-	ChformalPass() : Pass("chformal", "change formal constraints of the design", {
-	{
-		.signature = "chformal [types] [mode] [options] [selection]",
-		.description = 	"Make changes to the formal constraints of the design. The [types] options the type of "
-				"constraint to operate on. If none of the following options are given, the command "
-				"will operate on all constraint types:",
-		.options = {
-			{"-assert       $assert cells, representing assert(...) constraints"
-			"\n-assume       $assume cells, representing assume(...) constraints"
-			"\n-live         $live cells, representing assert(s_eventually ...)"
-			"\n-fair         $fair cells, representing assume(s_eventually ...)"
-			"\n-cover        $cover cells, representing cover() statements", ""},
-			{"Additionally chformal will operate on $check cells corresponding to the selected constraint "
-			"types.", ""},
-		}
-	},
-	{
-		.description = "Exactly one of the following modes must be specified:",
-		.options = {
-			{"-remove",
-				"remove the cells and thus constraints from the design"},
-			{"-early",
-				"bypass FFs that only delay the activation of a constraint. When inputs "
-				"of the bypassed FFs do not remain stable between clock edges, this may "
-				"result in unexpected behavior."
-			},
-			{"-delay <N>",
-				"delay activation of the constraint by <N> clock cycles"
-			},
-			{"-skip <N>",
-				"ignore activation of the constraint in the first <N> clock cycles"
-			},
-			{"-coverenable",
-				"add cover statements for the enable signals of the constraints"
+	ChformalPass() : Pass("chformal", "change formal constraints of the design") {}
+
+	bool help_v2() override {
+		auto *help = PrettyHelp::get_current();
+		help->usage("chformal [types] [mode] [options] [selection]");
+		help->paragraph(
+			"Make changes to the formal constraints of the design. The [types] options "
+			"the type of constraint to operate on. If none of the following options are "
+			"given, the command will operate on all constraint types:"
+		);
+
+		help->optiongroup("[types]");
+		help->option("-assert", "`$assert` cells, representing ``assert(...)`` constraints");
+		help->option("-assume", "`$assume` cells, representing ``assume(...)`` constraints");
+		help->option("-live", "`$live` cells, representing ``assert(s_eventually ...)``");
+		help->option("-fair", "`$fair` cells, representing ``assume(s_eventually ...)``");
+		help->option("-cover", "`$cover` cells, representing ``cover()`` statements");
+		help->paragraph(
+			"Additionally chformal will operate on `$check` cells corresponding to the "
+			"selected constraint types."
+		);
+		help->endgroup();
+
+		help->paragraph("Exactly one of the following modes must be specified:");
+
+		help->optiongroup("[mode]");
+		help->option("-remove", "remove the cells and thus constraints from the design");
+		help->option("-early",
+			"bypass FFs that only delay the activation of a constraint. When inputs "
+			"of the bypassed FFs do not remain stable between clock edges, this may "
+			"result in unexpected behavior."
+		);
+		help->option("-delay <N>", "delay activation of the constraint by <N> clock cycles");
+		help->option("-skip <N>", "ignore activation of the constraint in the first <N> clock cycles");
+		help->option("-coverenable", 
+			"add cover statements for the enable signals of the constraints"
 #ifdef YOSYS_ENABLE_VERIFIC
-				"\n\nNote: For the Verific frontend it is currently not guaranteed that a "
-				"reachable SVA statement corresponds to an active enable signal."
+			"\n\n"
+			"Note: For the Verific frontend it is currently not guaranteed that a "
+			"reachable SVA statement corresponds to an active enable signal."
 #endif
-			},
-			{"-assert2assume"
-			"\n-assert2cover"
-			"\n-assume2assert"
-			"\n-live2fair"
-			"\n-fair2live",
-				"change the roles of cells as indicated. these options can be combined"
-			},
-			{"-lower",
-				"convert each $check cell into an $assert, $assume, $live, $fair or "
-				"$cover cell. If the $check cell contains a message, also produce a "
-				"$print cell."
-			},
-		}
-	},
-	}) { }
+		);
+		help->option("-assert2assume");
+		help->option("-assert2cover");
+		help->option("-assume2assert");
+		help->option("-live2fair");
+		help->option("-fair2live", "change the roles of cells as indicated. these options can be combined");
+		help->option("-lower",
+			"convert each $check cell into an $assert, $assume, $live, $fair or "
+			"$cover cell. If the $check cell contains a message, also produce a "
+			"$print cell."
+		);
+		return true;
+	}
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		bool assert2assume = false;

From 10fea26fa9c37f594ca508312878a537c1601665 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:11 +1200
Subject: [PATCH 148/931] log_help: Options can have content

Refactor `PrettyHelp::endgroup()` -> `PrettyHelp::close(int levels = 1)`.
---
 kernel/log_help.cc      | 19 +++++++++++++------
 kernel/log_help.h       |  7 ++++---
 passes/cmds/chformal.cc | 16 ++++++++++------
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/kernel/log_help.cc b/kernel/log_help.cc
index fe9829af1..a6c6ad778 100644
--- a/kernel/log_help.cc
+++ b/kernel/log_help.cc
@@ -84,13 +84,14 @@ void PrettyHelp::usage(const string &usage)
 	log("\n");
 }
 
-void PrettyHelp::option(const string &option, const string &description)
+void PrettyHelp::option(const string &text, const string &description)
 {
-	log_pass_str(option, current_indent);
+	open_option(text);
 	if (description.length()) {
-		log_pass_str(description, current_indent+1);
+		log_pass_str(description, current_indent);
 		log("\n");
 	}
+	close(1);
 }
 
 void PrettyHelp::codeblock(const string &code, const string &)
@@ -104,13 +105,19 @@ void PrettyHelp::paragraph(const string &text)
 	log("\n");
 }
 
-void PrettyHelp::optiongroup(const string &)
+void PrettyHelp::open_optiongroup(const string &)
 {
 	current_indent += 1;
 }
 
-void PrettyHelp::endgroup()
+void PrettyHelp::open_option(const string &text)
 {
-	current_indent -= 1;
+	log_pass_str(text, current_indent);
+	current_indent += 1;
+}
+
+void PrettyHelp::close(int levels)
+{
+	current_indent -= levels;
 	log_assert(current_indent >= 0);
 }
diff --git a/kernel/log_help.h b/kernel/log_help.h
index bc62b20a6..850c1516d 100644
--- a/kernel/log_help.h
+++ b/kernel/log_help.h
@@ -38,12 +38,13 @@ public:
 	bool has_content();
 
 	void usage(const string &usage);
-	void option(const string &option, const string &description = "");
+	void option(const string &text, const string &description = "");
 	void codeblock(const string &code, const string &language = "none");
 	void paragraph(const string &text);
 
-	void optiongroup(const string &group = "");
-	void endgroup();
+	void open_optiongroup(const string &group = "");
+	void open_option(const string &text);
+	void close(int levels = 1);
 };
 
 YOSYS_NAMESPACE_END
diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index 9eb5b0048..1d44df51f 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -82,7 +82,7 @@ struct ChformalPass : public Pass {
 			"given, the command will operate on all constraint types:"
 		);
 
-		help->optiongroup("[types]");
+		help->open_optiongroup("[types]");
 		help->option("-assert", "`$assert` cells, representing ``assert(...)`` constraints");
 		help->option("-assume", "`$assume` cells, representing ``assume(...)`` constraints");
 		help->option("-live", "`$live` cells, representing ``assert(s_eventually ...)``");
@@ -92,11 +92,11 @@ struct ChformalPass : public Pass {
 			"Additionally chformal will operate on `$check` cells corresponding to the "
 			"selected constraint types."
 		);
-		help->endgroup();
+		help->close();
 
 		help->paragraph("Exactly one of the following modes must be specified:");
 
-		help->optiongroup("[mode]");
+		help->open_optiongroup("[mode]");
 		help->option("-remove", "remove the cells and thus constraints from the design");
 		help->option("-early",
 			"bypass FFs that only delay the activation of a constraint. When inputs "
@@ -105,14 +105,17 @@ struct ChformalPass : public Pass {
 		);
 		help->option("-delay <N>", "delay activation of the constraint by <N> clock cycles");
 		help->option("-skip <N>", "ignore activation of the constraint in the first <N> clock cycles");
-		help->option("-coverenable", 
+		help->open_option("-coverenable");
+		help->paragraph(
 			"add cover statements for the enable signals of the constraints"
+		);
 #ifdef YOSYS_ENABLE_VERIFIC
-			"\n\n"
+		help->paragraph(
 			"Note: For the Verific frontend it is currently not guaranteed that a "
 			"reachable SVA statement corresponds to an active enable signal."
-#endif
 		);
+#endif
+		help->close();
 		help->option("-assert2assume");
 		help->option("-assert2cover");
 		help->option("-assume2assert");
@@ -123,6 +126,7 @@ struct ChformalPass : public Pass {
 			"$cover cell. If the $check cell contains a message, also produce a "
 			"$print cell."
 		);
+		help->close();
 		return true;
 	}
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override

From ae3514adfdd5776cdd09b5056ee67468fb37e883 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:12 +1200
Subject: [PATCH 149/931] log_help: Include source_location

Use `std::experimental::source_location` because clang support is `??`
Add `ENABLE_SOURCE_LOCATION` make variable and corresponding `YOSYS_ENABLE_SOURCE_LOCATION` define.
Dummy out the struct if disabled and check for null instead of using `#ifdef` blocks everywhere.
---
 Makefile           |  3 +++
 kernel/log_help.cc | 18 ++++++++++++------
 kernel/log_help.h  | 45 +++++++++++++++++++++++++++++++++++++++------
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 2120dbdea..c4e62cdb4 100644
--- a/Makefile
+++ b/Makefile
@@ -532,6 +532,9 @@ LIBS_VERIFIC += -Wl,--whole-archive $(patsubst %,$(VERIFIC_DIR)/%/*-linux.a,$(VE
 endif
 endif
 
+ifeq ($(ENABLE_SOURCE_LOCATION),1)
+CXXFLAGS += -DYOSYS_ENABLE_SOURCE_LOCATION
+endif
 
 ifeq ($(ENABLE_COVER),1)
 CXXFLAGS += -DYOSYS_ENABLE_COVER
diff --git a/kernel/log_help.cc b/kernel/log_help.cc
index a6c6ad778..2b3fb5dfc 100644
--- a/kernel/log_help.cc
+++ b/kernel/log_help.cc
@@ -78,13 +78,15 @@ bool PrettyHelp::has_content()
 	return false;
 }
 
-void PrettyHelp::usage(const string &usage)
+void PrettyHelp::usage(const string &usage,
+	const source_location location)
 {
 	log_pass_str(usage, current_indent+1, true);
 	log("\n");
 }
 
-void PrettyHelp::option(const string &text, const string &description)
+void PrettyHelp::option(const string &text, const string &description,
+	const source_location location)
 {
 	open_option(text);
 	if (description.length()) {
@@ -94,23 +96,27 @@ void PrettyHelp::option(const string &text, const string &description)
 	close(1);
 }
 
-void PrettyHelp::codeblock(const string &code, const string &)
+void PrettyHelp::codeblock(const string &code, const string &,
+	const source_location location)
 {
 	log("%s\n", code.c_str());
 }
 
-void PrettyHelp::paragraph(const string &text)
+void PrettyHelp::paragraph(const string &text,
+	const source_location location)
 {
 	log_pass_str(text, current_indent);
 	log("\n");
 }
 
-void PrettyHelp::open_optiongroup(const string &)
+void PrettyHelp::open_optiongroup(const string &,
+	const source_location location)
 {
 	current_indent += 1;
 }
 
-void PrettyHelp::open_option(const string &text)
+void PrettyHelp::open_option(const string &text,
+	const source_location location)
 {
 	log_pass_str(text, current_indent);
 	current_indent += 1;
diff --git a/kernel/log_help.h b/kernel/log_help.h
index 850c1516d..ea88c72e0 100644
--- a/kernel/log_help.h
+++ b/kernel/log_help.h
@@ -23,6 +23,19 @@
 #include "kernel/yosys_common.h"
 #include "kernel/json.h"
 
+#ifdef YOSYS_ENABLE_SOURCE_LOCATION
+#include <experimental/source_location>
+using std::experimental::source_location;
+#else
+struct source_location { // dummy placeholder
+	int line() const { return 0; }
+	int column() const { return 0; }
+	const char* file_name() const { return nullptr; }
+	const char* function_name() const { return nullptr; }
+	static const source_location current(...) { return source_location(); }
+};
+#endif
+
 YOSYS_NAMESPACE_BEGIN
 
 class PrettyHelp
@@ -37,13 +50,33 @@ public:
 
 	bool has_content();
 
-	void usage(const string &usage);
-	void option(const string &text, const string &description = "");
-	void codeblock(const string &code, const string &language = "none");
-	void paragraph(const string &text);
+	void usage(
+		const string &usage,
+		const source_location location = source_location::current()
+	);
+	void option(
+		const string &text,
+		const string &description = "",
+		const source_location location = source_location::current()
+	);
+	void codeblock(
+		const string &code,
+		const string &language = "none",
+		const source_location location = source_location::current()
+	);
+	void paragraph(
+		const string &text,
+		const source_location location = source_location::current()
+	);
 
-	void open_optiongroup(const string &group = "");
-	void open_option(const string &text);
+	void open_optiongroup(
+		const string &group = "",
+		const source_location location = source_location::current()
+	);
+	void open_option(
+		const string &text,
+		const source_location location = source_location::current()
+	);
 	void close(int levels = 1);
 };
 

From d4498acea7ab9a467207ace291c40d9c3f540c2e Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:12 +1200
Subject: [PATCH 150/931] log_help: Json dumpable

Current modes are `LOG` and `LISTING`, which `log()` and store for conversion to json respectively.
Add `ContentListing` listing struct to (recursively) contain help data for conversion to a json object to be exported and used elsewhere (e.g. the docs).
Rather than formatting as rst we can just export with type information and do the conversion at the destination (i.e. in the python code which loads the domain for autodoc).
Implement `PrettyHelp::has_content()`.
Provide `PrettyHelp::get_content()` which returns a read-only list of the current content.
`PrettyHelp` constructor takes optional `Mode` enum to define format of help content.
Updates `PrettyHelp` methods to use a switch case for checking current mode, calling `log_abort()` in the default case (i.e. unsupported mode).
---
 kernel/log_help.cc | 136 +++++++++++++++++++++++++++++++++++++--------
 kernel/log_help.h  |  50 +++++++++++++++--
 kernel/register.cc |   7 ++-
 3 files changed, 164 insertions(+), 29 deletions(-)

diff --git a/kernel/log_help.cc b/kernel/log_help.cc
index 2b3fb5dfc..137a75a5e 100644
--- a/kernel/log_help.cc
+++ b/kernel/log_help.cc
@@ -21,6 +21,18 @@
 
 USING_YOSYS_NAMESPACE
 
+Json ContentListing::to_json() {
+	Json::object object;
+	object["type"] = type;
+	if (body.length()) object["body"] = body;
+	if (source_file != nullptr) object["source_file"] = source_file;
+	if (source_line != 0) object["source_line"] = source_line;
+	Json::array content_array;
+	for (auto child : content) content_array.push_back(child->to_json());
+	object["content"] = content_array;
+	return object;
+}
+
 #define MAX_LINE_LEN 80
 void log_pass_str(const std::string &pass_str, std::string indent_str, bool leading_newline=false) {
 	if (pass_str.empty())
@@ -54,15 +66,22 @@ void log_pass_str(const std::string &pass_str, int indent=0, bool leading_newlin
 
 PrettyHelp *current_help = nullptr;
 
-PrettyHelp::PrettyHelp()
+PrettyHelp::PrettyHelp(Mode mode)
 {
-	prior = current_help;
+	_prior = current_help;
+	_mode = mode;
+	_root_listing = ContentListing({
+		.type = "root"
+	});
+	_root_listing.type = "root";
+	_current_listing = &_root_listing;
+
 	current_help = this;
 }
 
 PrettyHelp::~PrettyHelp()
 {
-	current_help = prior;
+	current_help = _prior;
 }
 
 PrettyHelp *PrettyHelp::get_current()
@@ -73,16 +92,21 @@ PrettyHelp *PrettyHelp::get_current()
 		return new PrettyHelp();
 }
 
-bool PrettyHelp::has_content()
-{
-	return false;
-}
-
 void PrettyHelp::usage(const string &usage,
 	const source_location location)
 {
-	log_pass_str(usage, current_indent+1, true);
-	log("\n");
+	switch (_mode)
+	{
+	case LOG:
+		log_pass_str(usage, _current_indent+1, true);
+		log("\n");
+		break;
+	case LISTING:
+		_current_listing->add_content("usage", usage, location);
+		break;
+	default:
+		log_abort();
+	}
 }
 
 void PrettyHelp::option(const string &text, const string &description,
@@ -90,40 +114,108 @@ void PrettyHelp::option(const string &text, const string &description,
 {
 	open_option(text);
 	if (description.length()) {
-		log_pass_str(description, current_indent);
-		log("\n");
+		switch (_mode)
+		{
+		case LOG:
+			log_pass_str(description, _current_indent);
+			log("\n");
+			break;
+		case LISTING:
+			_current_listing->add_content("text", description, location);
+			break;
+		default:
+			log_abort();
+		}
 	}
 	close(1);
 }
 
-void PrettyHelp::codeblock(const string &code, const string &,
+void PrettyHelp::codeblock(const string &code, const string &language,
 	const source_location location)
 {
-	log("%s\n", code.c_str());
+	switch (_mode)
+	{
+	case LOG:
+		log("%s\n", code.c_str());
+		break;
+	case LISTING:
+		_current_listing->add_content("code", code, location);
+		break;
+	default:
+		log_abort();
+	}
 }
 
 void PrettyHelp::paragraph(const string &text,
 	const source_location location)
 {
-	log_pass_str(text, current_indent);
-	log("\n");
+	switch (_mode)
+	{
+	case LOG:
+		log_pass_str(text, _current_indent);
+		log("\n");
+		break;
+	case LISTING:
+		_current_listing->add_content("text", text, location);
+		break;
+	default:
+		log_abort();
+	}
 }
 
-void PrettyHelp::open_optiongroup(const string &,
+void PrettyHelp::open_optiongroup(const string &name,
 	const source_location location)
 {
-	current_indent += 1;
+	switch (_mode)
+	{
+	case LOG:
+		break;
+	case LISTING:
+		_current_listing->add_content("optiongroup", name, location);
+		_current_listing = _current_listing->content.back();
+		break;
+	default:
+		log_abort();
+	}
+	_current_indent += 1;
 }
 
 void PrettyHelp::open_option(const string &text,
 	const source_location location)
 {
-	log_pass_str(text, current_indent);
-	current_indent += 1;
+	switch (_mode)
+	{
+	case LOG:
+		log_pass_str(text, _current_indent);
+		break;
+	case LISTING:
+		_current_listing->add_content("option", text, location);
+		_current_listing = _current_listing->content.back();
+		break;
+	default:
+		log_abort();
+	}
+	_current_indent += 1;
 }
 
 void PrettyHelp::close(int levels)
 {
-	current_indent -= levels;
-	log_assert(current_indent >= 0);
+	
+	switch (_mode)
+	{
+	case LOG:
+		_current_indent -= levels;
+		log_assert(_current_indent >= 0);
+		break;
+	case LISTING:
+		for (int i=0; i<levels; i++) {
+			_current_indent--;
+			log_assert(_current_indent >= 0);
+			_current_listing = _current_listing->parent;
+			log_assert(_current_listing != nullptr);
+		}
+		break;
+	default:
+		log_abort();
+	}
 }
diff --git a/kernel/log_help.h b/kernel/log_help.h
index ea88c72e0..dd06e88e5 100644
--- a/kernel/log_help.h
+++ b/kernel/log_help.h
@@ -38,17 +38,57 @@ struct source_location { // dummy placeholder
 
 YOSYS_NAMESPACE_BEGIN
 
+struct ContentListing {
+	string type = "root";
+	string body = "";
+	const char* source_file = nullptr;
+	int source_line = 0;
+	vector<ContentListing *> content = {};
+	ContentListing *parent = nullptr;
+
+	void add_content(ContentListing *new_content) {
+		new_content->parent = this;
+		content.push_back(new_content);
+	}
+
+	void add_content(string type, string body, source_location location) {
+		auto new_content = new ContentListing();
+		new_content->type = type;
+		new_content->body = body;
+		new_content->source_file = location.file_name();
+		new_content->source_line = location.line();
+		add_content(new_content);
+	}
+
+	Json to_json();
+};
+
 class PrettyHelp
 {
-	PrettyHelp *prior = nullptr;
-	int current_indent = 0;
 public:
-	PrettyHelp();
+	enum Mode {
+		LOG,
+		LISTING,
+	};
+
+private:
+	PrettyHelp *_prior;
+	Mode _mode;
+
+	int _current_indent = 0;
+	ContentListing _root_listing;
+	ContentListing *_current_listing;
+public:
+	PrettyHelp(Mode mode = LOG);
 	~PrettyHelp();
 
 	static PrettyHelp *get_current();
 
-	bool has_content();
+	bool has_content() { return _root_listing.content.size();}
+	const vector<ContentListing *> get_content() {
+		const vector<ContentListing *> content = _root_listing.content;
+		return content;
+	}
 
 	void usage(
 		const string &usage,
@@ -70,7 +110,7 @@ public:
 	);
 
 	void open_optiongroup(
-		const string &group = "",
+		const string &name = "",
 		const source_location location = source_location::current()
 	);
 	void open_option(
diff --git a/kernel/register.cc b/kernel/register.cc
index 2f203fb6d..c9c98acc6 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -822,7 +822,7 @@ struct HelpPass : public Pass {
 			auto title = pass->short_help;
 			auto experimental_flag = pass->experimental_flag;
 
-			auto cmd_help = PrettyHelp();
+			auto cmd_help = PrettyHelp(PrettyHelp::Mode::LISTING);
 			auto has_pretty_help = pass->help_v2();
 
 			if (!has_pretty_help) {
@@ -919,7 +919,10 @@ struct HelpPass : public Pass {
 			// write to json
 			json.name(name.c_str()); json.begin_object();
 			json.entry("title", title);
-			// json.entry("content", cmd_help);
+			json.name("content"); json.begin_array();
+			for (auto content : cmd_help.get_content())
+				json.value(content->to_json());
+			json.end_array();
 			json.entry("experimental_flag", experimental_flag);
 			json.end_object();
 		}

From 7d0bcd8b4888ffdd2df0437a9200d9cbdbfe4a44 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:12 +1200
Subject: [PATCH 151/931] log_help: {add,push,pop}_content helpers

---
 kernel/log_help.cc | 17 +++++++----------
 kernel/log_help.h  | 12 ++++++++++++
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/kernel/log_help.cc b/kernel/log_help.cc
index 137a75a5e..7c9b88f06 100644
--- a/kernel/log_help.cc
+++ b/kernel/log_help.cc
@@ -102,7 +102,7 @@ void PrettyHelp::usage(const string &usage,
 		log("\n");
 		break;
 	case LISTING:
-		_current_listing->add_content("usage", usage, location);
+		add_content("usage", usage, location);
 		break;
 	default:
 		log_abort();
@@ -121,7 +121,7 @@ void PrettyHelp::option(const string &text, const string &description,
 			log("\n");
 			break;
 		case LISTING:
-			_current_listing->add_content("text", description, location);
+			add_content("text", description, location);
 			break;
 		default:
 			log_abort();
@@ -139,7 +139,7 @@ void PrettyHelp::codeblock(const string &code, const string &language,
 		log("%s\n", code.c_str());
 		break;
 	case LISTING:
-		_current_listing->add_content("code", code, location);
+		add_content("code", code, location);
 		break;
 	default:
 		log_abort();
@@ -156,7 +156,7 @@ void PrettyHelp::paragraph(const string &text,
 		log("\n");
 		break;
 	case LISTING:
-		_current_listing->add_content("text", text, location);
+		add_content("text", text, location);
 		break;
 	default:
 		log_abort();
@@ -171,8 +171,7 @@ void PrettyHelp::open_optiongroup(const string &name,
 	case LOG:
 		break;
 	case LISTING:
-		_current_listing->add_content("optiongroup", name, location);
-		_current_listing = _current_listing->content.back();
+		push_content("optiongroup", name, location);
 		break;
 	default:
 		log_abort();
@@ -189,8 +188,7 @@ void PrettyHelp::open_option(const string &text,
 		log_pass_str(text, _current_indent);
 		break;
 	case LISTING:
-		_current_listing->add_content("option", text, location);
-		_current_listing = _current_listing->content.back();
+		push_content("option", text, location);
 		break;
 	default:
 		log_abort();
@@ -211,8 +209,7 @@ void PrettyHelp::close(int levels)
 		for (int i=0; i<levels; i++) {
 			_current_indent--;
 			log_assert(_current_indent >= 0);
-			_current_listing = _current_listing->parent;
-			log_assert(_current_listing != nullptr);
+			pop_content();
 		}
 		break;
 	default:
diff --git a/kernel/log_help.h b/kernel/log_help.h
index dd06e88e5..e4ddc52d6 100644
--- a/kernel/log_help.h
+++ b/kernel/log_help.h
@@ -78,6 +78,18 @@ private:
 	int _current_indent = 0;
 	ContentListing _root_listing;
 	ContentListing *_current_listing;
+
+	void add_content(string type, string body, source_location location) {
+		_current_listing->add_content(type, body, location);
+	}
+	void push_content(string type, string body, source_location location) {
+		add_content(type, body, location);
+		_current_listing = _current_listing->content.back();
+	}
+	void pop_content() {
+		_current_listing = _current_listing->parent;
+		log_assert(_current_listing != nullptr);
+	}
 public:
 	PrettyHelp(Mode mode = LOG);
 	~PrettyHelp();

From fe2be07bc81a7b255ef3d87c9ddd78e5ba672746 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:12 +1200
Subject: [PATCH 152/931] Docs: Fix dump_cmds_json for PrettyHelp

---
 kernel/register.cc | 92 +++++++++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 37 deletions(-)

diff --git a/kernel/register.cc b/kernel/register.cc
index c9c98acc6..fff0a1e84 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -827,12 +827,16 @@ struct HelpPass : public Pass {
 
 			if (!has_pretty_help) {
 				enum PassUsageState {
+					PUState_none,
 					PUState_signature,
 					PUState_description,
 					PUState_options,
-					PUState_postscript,
+					PUState_optionbody,
 				};
 
+				source_location null_source;
+				string current_buffer = "";
+
 				// dump command help
 				std::ostringstream buf;
 				log_streams.push_back(&buf);
@@ -842,17 +846,31 @@ struct HelpPass : public Pass {
 				ss << buf.str();
 
 				// parse command help
-				int blank_count = 0;
 				size_t def_strip_count = 0;
-				auto current_state = PUState_postscript;
+				auto current_state = PUState_none;
 				auto catch_verific = false;
 				for (string line; std::getline(ss, line, '\n');) {
 					// find position of first non space character
 					std::size_t first_pos = line.find_first_not_of(" \t");
 					std::size_t last_pos = line.find_last_not_of(" \t");
 					if (first_pos == std::string::npos) {
+						switch (current_state)
+						{
+						case PUState_signature:
+							cmd_help.usage(current_buffer, null_source);
+							current_state = PUState_none;
+							break;
+						case PUState_none:
+							if (!current_buffer.empty()) cmd_help.codeblock(current_buffer, "none", null_source);
+							break;
+						case PUState_optionbody:
+							if (!current_buffer.empty()) cmd_help.codeblock(current_buffer, "none", null_source);
+							break;
+						default:
+							break;
+						}
 						// skip empty lines
-						blank_count += 1;
+						current_buffer = "";
 						continue;
 					}
 
@@ -861,58 +879,58 @@ struct HelpPass : public Pass {
 					bool IsDefinition = stripped_line[0] == '-';
 					IsDefinition &= stripped_line[1] != ' ' && stripped_line[1] != '>';
 					bool IsDedent = def_strip_count && first_pos < def_strip_count;
-					bool IsIndent = first_pos == 2 || first_pos == 4 || first_pos == 8;
+					bool IsIndent = def_strip_count < first_pos;
 
 					// line looks like a signature
 					bool IsSignature = stripped_line.find(name) == 0;
 
-					// start new usage block if it's a signature and we left the current signature
-					// or if we are adding new options after we left the options
-					bool NewUsage = (IsSignature && current_state != PUState_signature)
-							|| (IsDefinition && current_state == PUState_postscript);
-
-					if (NewUsage) {
+					if (IsSignature) {
+						if (current_state == PUState_options || current_state == PUState_optionbody) {
+							cmd_help.close(2);
+						}
+						if (current_state == PUState_signature) {
+							cmd_help.usage(current_buffer, null_source);
+							current_buffer = "";
+						}
 						current_state = PUState_signature;
-						// usages.push_back({});
 						def_strip_count = first_pos;
 						catch_verific = false;
 					} else if (IsDedent) {
 						def_strip_count = first_pos;
-						if (current_state == PUState_signature)
-							current_state = PUState_description;
+						if (current_state == PUState_optionbody) {
+							current_state = PUState_options;
+							if (!current_buffer.empty()) {
+								cmd_help.codeblock(current_buffer, "none", null_source);
+							}
+						}
 						else
-							current_state = PUState_postscript;
+							current_state = PUState_none;
 					}
 
-					if (IsDefinition && IsIndent && !catch_verific) {
+					if (IsDefinition && !catch_verific && current_state != PUState_signature) {
+						if (current_state == PUState_options || current_state == PUState_optionbody) {
+							cmd_help.close(1);
+						}  else {
+							cmd_help.open_optiongroup("", null_source);
+						}
 						current_state = PUState_options;
-						// usages.back().options.push_back(PassOption({stripped_line, ""}));
+						cmd_help.open_option(stripped_line, null_source);
 						def_strip_count = first_pos;
 					} else {
-						string *desc_str;
-						if (current_state == PUState_signature) {
-							// desc_str = &(usages.back().signature);
-							blank_count += 1;
-						} else if (current_state == PUState_description) {
-							// desc_str = &(usages.back().description);
-						} else if (current_state == PUState_options) {
-							// desc_str = &(usages.back().options.back().description);
-						} else if (current_state == PUState_postscript) {
-							// desc_str = &(usages.back().postscript);
-						} else {
-							log_abort();
+						if (current_state == PUState_options) {
+							current_state = PUState_optionbody;
 						}
-						if (desc_str->empty())
-							*desc_str = stripped_line;
-						else if (catch_verific)
-							*desc_str += (IsIndent ? "\n" : " ") + stripped_line;
-						else
-							*desc_str += (blank_count > 0 ? "\n" : " ") + stripped_line;
+						if (current_buffer.empty())
+							current_buffer = stripped_line;
+						else if (current_state == PUState_signature && IsIndent)
+							current_buffer += stripped_line;
+						else if (current_state == PUState_none) {
+							current_buffer += "\n" + line;
+						} else
+							current_buffer += "\n" + stripped_line;
 						if (stripped_line.compare("Command file parser supports following commands in file:") == 0)
 							catch_verific = true;
 					}
-
-					blank_count = 0;
 				}
 			}
 

From a19f0103ff634941758ca8acb37c198c02de8fec Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:12 +1200
Subject: [PATCH 153/931] Docs: Update cmdref domain

Compatible with `dump_cmds_json`.
---
 docs/util/cmdref.py    |   5 +-
 docs/util/newcmdref.py | 126 +++++++++++++++--------------------------
 2 files changed, 50 insertions(+), 81 deletions(-)

diff --git a/docs/util/cmdref.py b/docs/util/cmdref.py
index da27860b3..89982d75f 100644
--- a/docs/util/cmdref.py
+++ b/docs/util/cmdref.py
@@ -162,8 +162,9 @@ class CommandOptionGroupNode(TocNode):
         except ValueError:
             cmd, name = '', sig
         signode['fullname'] = sig
-        signode['tocname'] = name
-        signode += addnodes.desc_name(text=name)
+        if name:
+            signode['tocname'] = name
+            signode += addnodes.desc_name(text=name)
         return signode['fullname']
 
     def add_target_and_index(
diff --git a/docs/util/newcmdref.py b/docs/util/newcmdref.py
index 4b5995065..0a4874714 100644
--- a/docs/util/newcmdref.py
+++ b/docs/util/newcmdref.py
@@ -22,31 +22,42 @@ cmd_ext_sig_re = re.compile(
           \s* $                  # and nothing more
           ''', re.VERBOSE)
 
-@dataclass
-class YosysCmdUsage:
-    signature: str
-    description: str
-    options: list[tuple[str,str]]
-    postscript: str
+class YosysCmdContentListing:
+    type: str
+    body: str
+    source_file: str
+    source_line: int
+    content: list[YosysCmdContentListing]
+
+    def __init__(
+            self,
+            type: str = "",
+            body: str = "",
+            source_file: str = "unknown",
+            source_line: int = 0,
+            content: list[dict[str]] = [],
+    ):
+        self.type = type
+        self.body = body
+        self.source_file = source_file
+        self.source_line = source_line
+        self.content = [YosysCmdContentListing(**c) for c in content]
 
 class YosysCmd:
     name: str
     title: str
-    content: list[str]
-    usages: list[YosysCmdUsage]
+    content: list[YosysCmdContentListing]
     experimental_flag: bool
 
     def __init__(
             self,
             name:str = "", title:str = "",
-            content: list[str] = [],
-            usages: list[dict[str]] = [],
+            content: list[dict[str]] = [],
             experimental_flag: bool = False
     ) -> None:
         self.name = name
         self.title = title
-        self.content = content
-        self.usages = [YosysCmdUsage(**u) for u in usages]
+        self.content = [YosysCmdContentListing(**c) for c in content]
         self.experimental_flag = experimental_flag
 
     @property
@@ -314,6 +325,8 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
 
         # cmd definition
         self.add_line(f'.. {domain}:{directive}:: {sig}', source_name, source_line)
+        if self.object.title:
+            self.add_line(f'   :title: {self.object.title}', source_name, source_line)
 
         if self.options.noindex:
             self.add_line('   :noindex:', source_name)
@@ -323,28 +336,33 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
         domain = getattr(self, 'domain', self.objtype)
         source_name = self.object.source_file
 
-        for usage in self.object.usages:
-            self.add_line('', source_name)
-            if usage.signature:
-                self.add_line(f'   .. {domain}:usage:: {self.name}::{usage.signature}', source_name)
+        def render(content_list: YosysCmdContentListing, indent: int=0):
+            content_source = content_list.source_file or source_name
+            indent_str = '   '*indent
+            if content_list.type in ['usage', 'optiongroup']:
+                if content_list.body:
+                    self.add_line(f'{indent_str}.. {domain}:{content_list.type}:: {self.name}::{content_list.body}', content_source)
+                else:
+                    self.add_line(f'{indent_str}.. {domain}:{content_list.type}:: {self.name}::', content_source)
+                    self.add_line(f'{indent_str}   :noindex:', source_name)
                 self.add_line('', source_name)
-            for line in usage.description.splitlines():
-                self.add_line(f'   {line}', source_name)
+            elif content_list.type in ['option']:
+                self.add_line(f'{indent_str}:{content_list.type} {content_list.body}:', content_source)
+            elif content_list.type == 'text':
+                self.add_line(f'{indent_str}{content_list.body}', content_source)
                 self.add_line('', source_name)
-            if usage.options:
-                self.add_line(f'   .. {domain}:optiongroup:: {self.name}::something', source_name)
+            elif content_list.type == 'code':
+                self.add_line(f'{indent_str}::', source_name)
                 self.add_line('', source_name)
-                for opt, desc in usage.options:
-                    self.add_line(f'      :option {opt}: {desc}', source_name)
-                self.add_line('', source_name)
-            for line in usage.postscript.splitlines():
-                self.add_line(f'   {line}', source_name)
+                self.add_line(f'{indent_str}   {content_list.body}', content_source)
                 self.add_line('', source_name)
+            else:
+                logger.warning(f"unknown content type '{content_list.type}'")
+            for content in content_list.content:
+                render(content, indent+1)
 
-        for line in self.object.content:
-            if line.startswith('..') and ':: ' in line:
-                line = line.replace(':: ', f':: {self.name}::', 1)
-            self.add_line(line, source_name)
+        for content in self.object.content:
+            render(content)
 
         # add additional content (e.g. from document), if present
         if more_content:
@@ -366,56 +384,6 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
 
         return False, []
 
-class YosysCmdUsageDocumenter(YosysCmdDocumenter):
-    objtype = 'cmdusage'
-    priority = 20
-    object: YosysCmdUsage
-    parent: YosysCmd
-
-    def add_directive_header(self, sig: str) -> None:
-        domain = getattr(self, 'domain', 'cmd')
-        directive = getattr(self, 'directivetype', 'usage')
-        name = self.format_name()
-        sourcename = self.parent.source_file
-        cmd = self.parent
-
-        # cmd definition
-        self.add_line(f'.. {domain}:{directive}:: {sig}', sourcename)
-        if self.object.signature:
-            self.add_line(f'   :usage: {self.object.signature}', sourcename)
-        else:
-            self.add_line(f'   :noindex:', sourcename)
-        # for usage in self.object.signature.splitlines():
-        #     self.add_line(f'   :usage: {usage}', sourcename)
-
-        # if self.options.linenos:
-        #     self.add_line(f'   :source: {cmd.source.split(":")[0]}', sourcename)
-        # else:
-        #     self.add_line(f'   :source: {cmd.source}', sourcename)
-        # self.add_line(f'   :language: verilog', sourcename)
-
-        if self.options.noindex:
-            self.add_line('   :noindex:', sourcename)
-    
-    def add_content(self, more_content: Any | None) -> None:
-        # set sourcename and add content from attribute documentation
-        sourcename = self.parent.source_file
-        startline = self.parent.source_line
-
-        for line in self.object.description.splitlines():
-            self.add_line(line, sourcename)
-
-        # add additional content (e.g. from document), if present
-        if more_content:
-            for line, src in zip(more_content.data, more_content.items):
-                self.add_line(line, src[0], src[1])
-
-    def get_object_members(
-        self,
-        want_all: bool
-    ) -> tuple[bool, list[tuple[str, Any]]]:
-        return False, []
-
 def setup(app: Sphinx) -> dict[str, Any]:
     app.add_config_value('cmds_json', False, 'html', [Path, PosixPath, WindowsPath])
     app.setup_extension('sphinx.ext.autodoc')

From cb502e75057ab417dabadf02535038fc989c2302 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:12 +1200
Subject: [PATCH 154/931] cmdref: Combine consecutive code blocks

Formatting is nicer when there is only one code block instead of multiple in a row, especially in pdf.
---
 kernel/register.cc | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/kernel/register.cc b/kernel/register.cc
index fff0a1e84..ae52c12c9 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -829,7 +829,6 @@ struct HelpPass : public Pass {
 				enum PassUsageState {
 					PUState_none,
 					PUState_signature,
-					PUState_description,
 					PUState_options,
 					PUState_optionbody,
 				};
@@ -849,6 +848,7 @@ struct HelpPass : public Pass {
 				size_t def_strip_count = 0;
 				auto current_state = PUState_none;
 				auto catch_verific = false;
+				auto blank_lines = 0;
 				for (string line; std::getline(ss, line, '\n');) {
 					// find position of first non space character
 					std::size_t first_pos = line.find_first_not_of(" \t");
@@ -859,18 +859,16 @@ struct HelpPass : public Pass {
 						case PUState_signature:
 							cmd_help.usage(current_buffer, null_source);
 							current_state = PUState_none;
+							current_buffer = "";
 							break;
 						case PUState_none:
-							if (!current_buffer.empty()) cmd_help.codeblock(current_buffer, "none", null_source);
-							break;
 						case PUState_optionbody:
-							if (!current_buffer.empty()) cmd_help.codeblock(current_buffer, "none", null_source);
+							blank_lines += 1;
 							break;
 						default:
 							break;
 						}
 						// skip empty lines
-						current_buffer = "";
 						continue;
 					}
 
@@ -886,11 +884,15 @@ struct HelpPass : public Pass {
 
 					if (IsSignature) {
 						if (current_state == PUState_options || current_state == PUState_optionbody) {
+							cmd_help.codeblock(current_buffer, "none", null_source);
+							current_buffer = "";
 							cmd_help.close(2);
-						}
-						if (current_state == PUState_signature) {
+						} else if (current_state == PUState_signature) {
 							cmd_help.usage(current_buffer, null_source);
 							current_buffer = "";
+						} else if (current_state == PUState_none && !current_buffer.empty()) {
+							cmd_help.codeblock(current_buffer, "none", null_source);
+							current_buffer = "";
 						}
 						current_state = PUState_signature;
 						def_strip_count = first_pos;
@@ -901,6 +903,7 @@ struct HelpPass : public Pass {
 							current_state = PUState_options;
 							if (!current_buffer.empty()) {
 								cmd_help.codeblock(current_buffer, "none", null_source);
+								current_buffer = "";
 							}
 						}
 						else
@@ -908,6 +911,10 @@ struct HelpPass : public Pass {
 					}
 
 					if (IsDefinition && !catch_verific && current_state != PUState_signature) {
+						if (!current_buffer.empty()) {
+							cmd_help.codeblock(current_buffer, "none", null_source);
+							current_buffer = "";
+						}
 						if (current_state == PUState_options || current_state == PUState_optionbody) {
 							cmd_help.close(1);
 						}  else {
@@ -925,12 +932,13 @@ struct HelpPass : public Pass {
 						else if (current_state == PUState_signature && IsIndent)
 							current_buffer += stripped_line;
 						else if (current_state == PUState_none) {
-							current_buffer += "\n" + line;
+							current_buffer += (blank_lines > 0 ? "\n\n" : "\n") + line;
 						} else
-							current_buffer += "\n" + stripped_line;
+							current_buffer += (blank_lines > 0 ? "\n\n" : "\n") + stripped_line;
 						if (stripped_line.compare("Command file parser supports following commands in file:") == 0)
 							catch_verific = true;
 					}
+					blank_lines = 0;
 				}
 			}
 

From bab867f3477c921dc508e0b2311f8df157d98528 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:13 +1200
Subject: [PATCH 155/931] Makefile: Drop cmds rst from docs/prep

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c4e62cdb4..5690410a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1099,7 +1099,7 @@ docs/reqs:
 	$(Q) $(MAKE) -C docs reqs
 
 .PHONY: docs/prep
-docs/prep: docs/source/cmd/abc.rst docs/source/generated/cells.json docs/source/generated/cmds.json docs/gen docs/usage docs/gen/functional_ir
+docs/prep: docs/source/generated/cells.json docs/source/generated/cmds.json docs/gen docs/usage docs/gen/functional_ir
 
 DOC_TARGET ?= html
 docs: docs/prep

From 3691bb674caa2cc8c7dbdd441aa95a27b1e99e75 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:13 +1200
Subject: [PATCH 156/931] log_help: Better location tracking

Assign root location in call to `PrettyHelp::get_current()`.
Set default `source_file` to `"unknown"`, since that appears to be the default value rather than `nullptr`.
---
 kernel/log_help.cc | 13 +++++++------
 kernel/log_help.h  | 10 ++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/kernel/log_help.cc b/kernel/log_help.cc
index 7c9b88f06..ada51be60 100644
--- a/kernel/log_help.cc
+++ b/kernel/log_help.cc
@@ -25,7 +25,7 @@ Json ContentListing::to_json() {
 	Json::object object;
 	object["type"] = type;
 	if (body.length()) object["body"] = body;
-	if (source_file != nullptr) object["source_file"] = source_file;
+	if (strcmp(source_file, "unknown") != 0) object["source_file"] = source_file;
 	if (source_line != 0) object["source_line"] = source_line;
 	Json::array content_array;
 	for (auto child : content) content_array.push_back(child->to_json());
@@ -84,12 +84,13 @@ PrettyHelp::~PrettyHelp()
 	current_help = _prior;
 }
 
-PrettyHelp *PrettyHelp::get_current()
+PrettyHelp *PrettyHelp::get_current(source_location location)
 {
-	if (current_help != nullptr)
-		return current_help;
-	else
-		return new PrettyHelp();
+	if (current_help == nullptr)
+		new PrettyHelp();
+	current_help->_root_listing.source_file = location.file_name();
+	current_help->_root_listing.source_line = location.line();
+	return current_help;
 }
 
 void PrettyHelp::usage(const string &usage,
diff --git a/kernel/log_help.h b/kernel/log_help.h
index e4ddc52d6..fec888548 100644
--- a/kernel/log_help.h
+++ b/kernel/log_help.h
@@ -30,8 +30,8 @@ using std::experimental::source_location;
 struct source_location { // dummy placeholder
 	int line() const { return 0; }
 	int column() const { return 0; }
-	const char* file_name() const { return nullptr; }
-	const char* function_name() const { return nullptr; }
+	const char* file_name() const { return "unknown"; }
+	const char* function_name() const { return "unknown"; }
 	static const source_location current(...) { return source_location(); }
 };
 #endif
@@ -41,7 +41,7 @@ YOSYS_NAMESPACE_BEGIN
 struct ContentListing {
 	string type = "root";
 	string body = "";
-	const char* source_file = nullptr;
+	const char* source_file = "unknown";
 	int source_line = 0;
 	vector<ContentListing *> content = {};
 	ContentListing *parent = nullptr;
@@ -94,7 +94,7 @@ public:
 	PrettyHelp(Mode mode = LOG);
 	~PrettyHelp();
 
-	static PrettyHelp *get_current();
+	static PrettyHelp *get_current(source_location location = source_location::current());
 
 	bool has_content() { return _root_listing.content.size();}
 	const vector<ContentListing *> get_content() {
@@ -102,6 +102,8 @@ public:
 		return content;
 	}
 
+	const char* source_file() const { return _root_listing.source_file; }
+
 	void usage(
 		const string &usage,
 		const source_location location = source_location::current()

From 00b6d96aeeb983c3a72bb922d313d6853b2ede20 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:13 +1200
Subject: [PATCH 157/931] docs: Working cmdref groups

Also adds note on source location if available.
---
 docs/util/cmdref.py    | 45 +++++--------------------------
 docs/util/newcmdref.py | 61 +++++++++++++++++++-----------------------
 kernel/register.cc     |  1 +
 3 files changed, 35 insertions(+), 72 deletions(-)

diff --git a/docs/util/cmdref.py b/docs/util/cmdref.py
index 89982d75f..e471ea46d 100644
--- a/docs/util/cmdref.py
+++ b/docs/util/cmdref.py
@@ -115,12 +115,11 @@ class CommandUsageNode(TocNode):
     ]
 
     def handle_signature(self, sig: str, signode: addnodes.desc_signature):
-        try:
-            cmd, use = sig.split('::')
-        except ValueError:
-            cmd, use = sig, ''
-        signode['fullname'] = sig
-        usage = self.options.get('usage', use or sig)
+        parts = sig.split('::')
+        if len(parts) > 2: parts.pop(0)
+        use = parts[-1]
+        signode['fullname'] = '::'.join(parts)
+        usage = self.options.get('usage', use)
         if usage:
             signode['tocname'] = usage
             signode += addnodes.desc_name(text=usage)
@@ -145,46 +144,16 @@ class CommandUsageNode(TocNode):
                          idx,
                          1))
 
-class CommandOptionGroupNode(TocNode):
+class CommandOptionGroupNode(CommandUsageNode):
     """A custom node that describes a group of related options"""
 
     name = 'cmdoptiongroup'
 
-    option_spec = TocNode.option_spec
+    option_spec = CommandUsageNode.option_spec
 
     doc_field_types = [
         Field('opt', ('option',), label='', rolename='option')
     ]
-
-    def handle_signature(self, sig: str, signode: addnodes.desc_signature):
-        try:
-            cmd, name = sig.split('::')
-        except ValueError:
-            cmd, name = '', sig
-        signode['fullname'] = sig
-        if name:
-            signode['tocname'] = name
-            signode += addnodes.desc_name(text=name)
-        return signode['fullname']
-
-    def add_target_and_index(
-        self,
-        name: str,
-        sig: str,
-        signode: addnodes.desc_signature
-    ) -> None:
-        idx = ".".join(name.split("::"))
-        signode['ids'].append(idx)
-        if 'noindex' not in self.options:
-            tocname: str = signode.get('tocname', name)
-            objs = self.env.domaindata[self.domain]['objects']
-            # (name, sig, typ, docname, anchor, prio)
-            objs.append((name,
-                         tocname,
-                         type(self).name,
-                         self.env.docname,
-                         idx,
-                         1))
     
     def transform_content(self, contentnode: addnodes.desc_content) -> None:
         """hack `:option -thing: desc` into a proper option list"""
diff --git a/docs/util/newcmdref.py b/docs/util/newcmdref.py
index 0a4874714..d4b6aff82 100644
--- a/docs/util/newcmdref.py
+++ b/docs/util/newcmdref.py
@@ -16,7 +16,8 @@ logger = logging.getLogger(__name__)
 
 # cmd signature
 cmd_ext_sig_re = re.compile(
-    r'''^ ([\w$._]+?)            # module name
+    r'''^ ([\w/]+::)?            # optional group
+          ([\w$._]+?)            # module name
           (?:\.([\w_]+))?        # optional: thing name
           (::[\w_]+)?            #           attribute
           \s* $                  # and nothing more
@@ -47,23 +48,22 @@ class YosysCmd:
     name: str
     title: str
     content: list[YosysCmdContentListing]
+    source_file: str
     experimental_flag: bool
 
     def __init__(
             self,
             name:str = "", title:str = "",
             content: list[dict[str]] = [],
+            source_file:str = 'unknown',
             experimental_flag: bool = False
     ) -> None:
         self.name = name
         self.title = title
         self.content = [YosysCmdContentListing(**c) for c in content]
+        self.source_file = source_file
         self.experimental_flag = experimental_flag
 
-    @property
-    def source_file(self) -> str:
-        return ""
-
     @property
     def source_line(self) -> int:
         return 0
@@ -86,7 +86,7 @@ class YosysCmdGroupDocumenter(Documenter):
     def cmd_lib(self) -> dict[str, list[str] | dict[str]]:
         if not self.__cmd_lib:
             self.__cmd_lib = {}
-            cmds_obj: dict[str, dict[str, list[str] | dict[str]]]
+            cmds_obj: dict[str, dict[str, dict[str]]]
             try:
                 with open(self.config.cmds_json, "r") as f:
                     cmds_obj = json.loads(f.read())
@@ -96,8 +96,19 @@ class YosysCmdGroupDocumenter(Documenter):
                     type = 'cmdref',
                     subtype = 'cmd_lib'
                 )
-            else:
-                for (name, obj) in cmds_obj.get(self.lib_key, {}).items():
+                cmds_obj = {}
+            for (name, obj) in cmds_obj.get('cmds', {}).items():
+                if self.lib_key == 'groups':
+                    source_file: str = obj.get('source_file', 'unknown')
+                    if source_file == 'unknown':
+                        source_group = 'unknown'
+                    else:
+                        source_group = str(Path(source_file).parent)
+                    try:
+                        self.__cmd_lib[source_group].append(name)
+                    except KeyError:
+                        self.__cmd_lib[source_group] = [name,]
+                else:
                     self.__cmd_lib[name] = obj
         return self.__cmd_lib
     
@@ -139,25 +150,10 @@ class YosysCmdGroupDocumenter(Documenter):
         return self.modname
     
     def add_directive_header(self, sig: str) -> None:
-        domain = getattr(self, 'domain', 'cmd')
-        directive = getattr(self, 'directivetype', 'group')
-        name = self.format_name()
-        sourcename = self.get_sourcename()
-        cmd_list = self.object
-
-        # cmd definition
-        self.add_line(f'.. {domain}:{directive}:: {sig}', sourcename)
-        self.add_line(f'   :caption: {name}', sourcename)
-
-        if self.options.noindex:
-            self.add_line('   :noindex:', sourcename)
+        pass
     
     def add_content(self, more_content: Any | None) -> None:
-        # groups have no native content
-        # add additional content (e.g. from document), if present
-        if more_content:
-            for line, src in zip(more_content.data, more_content.items):
-                self.add_line(line, src[0], src[1])
+        pass
 
     def filter_members(
         self,
@@ -290,13 +286,14 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
     def parse_name(self) -> bool:
         try:
             matched = cmd_ext_sig_re.match(self.name)
-            modname, thing, attribute = matched.groups()
+            group, modname, thing, attribute = matched.groups()
         except AttributeError:
             logger.warning(('invalid signature for auto%s (%r)') % (self.objtype, self.name),
                            type='cmdref')
             return False
 
         self.modname = modname
+        self.groupname = group or ''
         self.attribute = attribute or ''
         self.fullname = ((self.modname) + (thing or ''))
 
@@ -364,19 +361,15 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
         for content in self.object.content:
             render(content)
 
+        if self.get_sourcename() != 'unknown':
+            self.add_line('\n', source_name)
+            self.add_line(f'.. note:: Help text automatically generated from :file:`{source_name}`', source_name)
+
         # add additional content (e.g. from document), if present
         if more_content:
             for line, src in zip(more_content.data, more_content.items):
                 self.add_line(line, src[0], src[1])
 
-        # fields
-        self.add_line('\n', source_name)
-        field_attrs = ["properties", ]
-        for field in field_attrs:
-            attr = getattr(self.object, field, [])
-            for val in attr:
-                self.add_line(f':{field} {val}:', source_name)
-
     def get_object_members(
         self,
         want_all: bool
diff --git a/kernel/register.cc b/kernel/register.cc
index ae52c12c9..e00678c81 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -949,6 +949,7 @@ struct HelpPass : public Pass {
 			for (auto content : cmd_help.get_content())
 				json.value(content->to_json());
 			json.end_array();
+			json.entry("source_file", cmd_help.source_file());
 			json.entry("experimental_flag", experimental_flag);
 			json.end_object();
 		}

From 8d1b9b1c1feecdb7d373e504d96be9d4bf7add55 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:13 +1200
Subject: [PATCH 158/931] dump_cmds_json: Fix auto formatting

- Command list for script passes
- Check buffer after loop
- Close options properly
- Ignore mismatched sigs e.g. `fsm_detect` on `fsm`
- Require double blank line before new signature
---
 kernel/register.cc | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/kernel/register.cc b/kernel/register.cc
index e00678c81..1f0768417 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -848,7 +848,7 @@ struct HelpPass : public Pass {
 				size_t def_strip_count = 0;
 				auto current_state = PUState_none;
 				auto catch_verific = false;
-				auto blank_lines = 0;
+				auto blank_lines = 2;
 				for (string line; std::getline(ss, line, '\n');) {
 					// find position of first non space character
 					std::size_t first_pos = line.find_first_not_of(" \t");
@@ -880,9 +880,9 @@ struct HelpPass : public Pass {
 					bool IsIndent = def_strip_count < first_pos;
 
 					// line looks like a signature
-					bool IsSignature = stripped_line.find(name) == 0;
+					bool IsSignature = stripped_line.find(name) == 0 && (stripped_line.length() == name.length() || stripped_line.at(name.size()) == ' ');
 
-					if (IsSignature) {
+					if (IsSignature && first_pos <= 4 && (blank_lines >= 2 || current_state == PUState_signature)) {
 						if (current_state == PUState_options || current_state == PUState_optionbody) {
 							cmd_help.codeblock(current_buffer, "none", null_source);
 							current_buffer = "";
@@ -900,14 +900,20 @@ struct HelpPass : public Pass {
 					} else if (IsDedent) {
 						def_strip_count = first_pos;
 						if (current_state == PUState_optionbody) {
-							current_state = PUState_options;
 							if (!current_buffer.empty()) {
 								cmd_help.codeblock(current_buffer, "none", null_source);
 								current_buffer = "";
 							}
-						}
-						else
+							if (IsIndent) {
+								current_state = PUState_options;
+								cmd_help.close(1);
+							} else {
+								current_state = PUState_none;
+								cmd_help.close(2);
+							}
+						} else {
 							current_state = PUState_none;
+						}
 					}
 
 					if (IsDefinition && !catch_verific && current_state != PUState_signature) {
@@ -940,6 +946,11 @@ struct HelpPass : public Pass {
 					}
 					blank_lines = 0;
 				}
+
+				if (!current_buffer.empty()) {
+					cmd_help.codeblock(current_buffer, "none", null_source);
+					current_buffer = "";
+				}
 			}
 
 			// write to json

From 929c437b264dd2b305176cd992a2467090fb9bf4 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:13 +1200
Subject: [PATCH 159/931] Docs: Group commands

Removes group parsing from command ref domain, instead relying on a 'groups' object in the cmds.json file.
`docs/source/cmd` is no longer ignored or cleaned.
---
 docs/.gitignore                            |  1 -
 docs/Makefile                              |  2 +-
 docs/source/cmd/index_backends.rst         |  5 ++++
 docs/source/cmd/index_formal.rst           |  5 ++++
 docs/source/cmd/index_frontends.rst        |  5 ++++
 docs/source/cmd/index_kernel.rst           |  5 ++++
 docs/source/cmd/index_other.rst            |  7 +++++
 docs/source/cmd/index_passes_cmds.rst      |  5 ++++
 docs/source/cmd/index_passes_equiv.rst     |  5 ++++
 docs/source/cmd/index_passes_fsm.rst       |  5 ++++
 docs/source/cmd/index_passes_hierarchy.rst |  5 ++++
 docs/source/cmd/index_passes_memory.rst    |  5 ++++
 docs/source/cmd/index_passes_opt.rst       |  5 ++++
 docs/source/cmd/index_passes_pmgen.rst     |  5 ++++
 docs/source/cmd/index_passes_proc.rst      |  5 ++++
 docs/source/cmd/index_passes_sat.rst       |  5 ++++
 docs/source/cmd/index_passes_techmap.rst   |  5 ++++
 docs/source/cmd/index_passes_tests.rst     |  5 ++++
 docs/source/cmd/index_techlibs.rst         |  5 ++++
 docs/source/cmd_ref.rst                    | 16 +++++++----
 docs/util/newcmdref.py                     | 33 +++++++++-------------
 21 files changed, 113 insertions(+), 26 deletions(-)
 create mode 100644 docs/source/cmd/index_backends.rst
 create mode 100644 docs/source/cmd/index_formal.rst
 create mode 100644 docs/source/cmd/index_frontends.rst
 create mode 100644 docs/source/cmd/index_kernel.rst
 create mode 100644 docs/source/cmd/index_other.rst
 create mode 100644 docs/source/cmd/index_passes_cmds.rst
 create mode 100644 docs/source/cmd/index_passes_equiv.rst
 create mode 100644 docs/source/cmd/index_passes_fsm.rst
 create mode 100644 docs/source/cmd/index_passes_hierarchy.rst
 create mode 100644 docs/source/cmd/index_passes_memory.rst
 create mode 100644 docs/source/cmd/index_passes_opt.rst
 create mode 100644 docs/source/cmd/index_passes_pmgen.rst
 create mode 100644 docs/source/cmd/index_passes_proc.rst
 create mode 100644 docs/source/cmd/index_passes_sat.rst
 create mode 100644 docs/source/cmd/index_passes_techmap.rst
 create mode 100644 docs/source/cmd/index_passes_tests.rst
 create mode 100644 docs/source/cmd/index_techlibs.rst

diff --git a/docs/.gitignore b/docs/.gitignore
index 65bbcdeae..09bb59048 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,5 +1,4 @@
 /build/
-/source/cmd
 /source/generated
 /source/_images/**/*.log
 /source/_images/**/*.aux
diff --git a/docs/Makefile b/docs/Makefile
index a8874bb83..fb3e03b79 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -47,7 +47,7 @@ help:
 .PHONY: clean
 clean: clean-examples
 	rm -rf $(BUILDDIR)/*
-	rm -rf source/cmd util/__pycache__
+	rm -rf util/__pycache__
 	rm -rf source/generated
 	$(MAKE) -C source/_images clean
 
diff --git a/docs/source/cmd/index_backends.rst b/docs/source/cmd/index_backends.rst
new file mode 100644
index 000000000..fada942d8
--- /dev/null
+++ b/docs/source/cmd/index_backends.rst
@@ -0,0 +1,5 @@
+backends
+------------------
+
+.. autocmdgroup:: backends
+   :members:
diff --git a/docs/source/cmd/index_formal.rst b/docs/source/cmd/index_formal.rst
new file mode 100644
index 000000000..53701a437
--- /dev/null
+++ b/docs/source/cmd/index_formal.rst
@@ -0,0 +1,5 @@
+formal
+------------------
+
+.. autocmdgroup:: formal
+   :members:
diff --git a/docs/source/cmd/index_frontends.rst b/docs/source/cmd/index_frontends.rst
new file mode 100644
index 000000000..cf046e2db
--- /dev/null
+++ b/docs/source/cmd/index_frontends.rst
@@ -0,0 +1,5 @@
+frontends
+------------------
+
+.. autocmdgroup:: frontends
+   :members:
diff --git a/docs/source/cmd/index_kernel.rst b/docs/source/cmd/index_kernel.rst
new file mode 100644
index 000000000..c3f323e16
--- /dev/null
+++ b/docs/source/cmd/index_kernel.rst
@@ -0,0 +1,5 @@
+kernel
+------------------
+
+.. autocmdgroup:: kernel
+   :members:
diff --git a/docs/source/cmd/index_other.rst b/docs/source/cmd/index_other.rst
new file mode 100644
index 000000000..abd41bcdc
--- /dev/null
+++ b/docs/source/cmd/index_other.rst
@@ -0,0 +1,7 @@
+Other commands
+==============
+
+Unknown source location
+
+.. autocmdgroup:: unknown
+   :members:
diff --git a/docs/source/cmd/index_passes_cmds.rst b/docs/source/cmd/index_passes_cmds.rst
new file mode 100644
index 000000000..6d2c5026d
--- /dev/null
+++ b/docs/source/cmd/index_passes_cmds.rst
@@ -0,0 +1,5 @@
+passes/cmds
+------------------
+
+.. autocmdgroup:: passes/cmds
+   :members:
diff --git a/docs/source/cmd/index_passes_equiv.rst b/docs/source/cmd/index_passes_equiv.rst
new file mode 100644
index 000000000..5b0bc2741
--- /dev/null
+++ b/docs/source/cmd/index_passes_equiv.rst
@@ -0,0 +1,5 @@
+passes/equiv
+------------------
+
+.. autocmdgroup:: passes/equiv
+   :members:
diff --git a/docs/source/cmd/index_passes_fsm.rst b/docs/source/cmd/index_passes_fsm.rst
new file mode 100644
index 000000000..ddb2a9168
--- /dev/null
+++ b/docs/source/cmd/index_passes_fsm.rst
@@ -0,0 +1,5 @@
+passes/fsm
+------------------
+
+.. autocmdgroup:: passes/fsm
+   :members:
diff --git a/docs/source/cmd/index_passes_hierarchy.rst b/docs/source/cmd/index_passes_hierarchy.rst
new file mode 100644
index 000000000..1d9f237c7
--- /dev/null
+++ b/docs/source/cmd/index_passes_hierarchy.rst
@@ -0,0 +1,5 @@
+passes/hierarchy
+------------------
+
+.. autocmdgroup:: passes/hierarchy
+   :members:
diff --git a/docs/source/cmd/index_passes_memory.rst b/docs/source/cmd/index_passes_memory.rst
new file mode 100644
index 000000000..74c044135
--- /dev/null
+++ b/docs/source/cmd/index_passes_memory.rst
@@ -0,0 +1,5 @@
+passes/memory
+------------------
+
+.. autocmdgroup:: passes/memory
+   :members:
diff --git a/docs/source/cmd/index_passes_opt.rst b/docs/source/cmd/index_passes_opt.rst
new file mode 100644
index 000000000..66d78b74a
--- /dev/null
+++ b/docs/source/cmd/index_passes_opt.rst
@@ -0,0 +1,5 @@
+passes/opt
+------------------
+
+.. autocmdgroup:: passes/opt
+   :members:
diff --git a/docs/source/cmd/index_passes_pmgen.rst b/docs/source/cmd/index_passes_pmgen.rst
new file mode 100644
index 000000000..aac8c1b47
--- /dev/null
+++ b/docs/source/cmd/index_passes_pmgen.rst
@@ -0,0 +1,5 @@
+passes/pmgen
+------------------
+
+.. autocmdgroup:: passes/pmgen
+   :members:
diff --git a/docs/source/cmd/index_passes_proc.rst b/docs/source/cmd/index_passes_proc.rst
new file mode 100644
index 000000000..05081f29a
--- /dev/null
+++ b/docs/source/cmd/index_passes_proc.rst
@@ -0,0 +1,5 @@
+passes/proc
+------------------
+
+.. autocmdgroup:: passes/proc
+   :members:
diff --git a/docs/source/cmd/index_passes_sat.rst b/docs/source/cmd/index_passes_sat.rst
new file mode 100644
index 000000000..af041b040
--- /dev/null
+++ b/docs/source/cmd/index_passes_sat.rst
@@ -0,0 +1,5 @@
+passes/sat
+------------------
+
+.. autocmdgroup:: passes/sat
+   :members:
diff --git a/docs/source/cmd/index_passes_techmap.rst b/docs/source/cmd/index_passes_techmap.rst
new file mode 100644
index 000000000..fa9b54575
--- /dev/null
+++ b/docs/source/cmd/index_passes_techmap.rst
@@ -0,0 +1,5 @@
+passes/techmap
+------------------
+
+.. autocmdgroup:: passes/techmap
+   :members:
diff --git a/docs/source/cmd/index_passes_tests.rst b/docs/source/cmd/index_passes_tests.rst
new file mode 100644
index 000000000..72453f55f
--- /dev/null
+++ b/docs/source/cmd/index_passes_tests.rst
@@ -0,0 +1,5 @@
+passes/tests
+------------------
+
+.. autocmdgroup:: passes/tests
+   :members:
diff --git a/docs/source/cmd/index_techlibs.rst b/docs/source/cmd/index_techlibs.rst
new file mode 100644
index 000000000..aeeb17c90
--- /dev/null
+++ b/docs/source/cmd/index_techlibs.rst
@@ -0,0 +1,5 @@
+techlibs
+------------------
+
+.. autocmdgroup:: techlibs
+   :members:
diff --git a/docs/source/cmd_ref.rst b/docs/source/cmd_ref.rst
index acf2d1d41..bc0707d67 100644
--- a/docs/source/cmd_ref.rst
+++ b/docs/source/cmd_ref.rst
@@ -8,9 +8,15 @@ Command line reference
     :start-at: Usage
 
 .. toctree::
-	:caption: Command reference
-	:maxdepth: 1
-	:glob:
+   :caption: Command reference
+   :maxdepth: 2
+   :glob:
 
-	/appendix/env_vars
-	/cmd/*
+   /appendix/env_vars
+   /cmd/index_backends
+   /cmd/index_frontends
+   /cmd/index_kernel
+   /cmd/index_formal
+   /cmd/index_passes*
+   /cmd/index_techlibs
+   /cmd/index_other
diff --git a/docs/util/newcmdref.py b/docs/util/newcmdref.py
index d4b6aff82..6db7493af 100644
--- a/docs/util/newcmdref.py
+++ b/docs/util/newcmdref.py
@@ -48,25 +48,30 @@ class YosysCmd:
     name: str
     title: str
     content: list[YosysCmdContentListing]
+    group: str
     source_file: str
+    source_line: int
+    source_func: str
     experimental_flag: bool
 
     def __init__(
             self,
             name:str = "", title:str = "",
             content: list[dict[str]] = [],
-            source_file:str = 'unknown',
+            group: str = 'unknown',
+            source_file: str = "",
+            source_line: int = 0,
+            source_func: str = "",
             experimental_flag: bool = False
     ) -> None:
         self.name = name
         self.title = title
         self.content = [YosysCmdContentListing(**c) for c in content]
+        self.group = group
         self.source_file = source_file
+        self.source_line = source_line
+        self.source_func = source_func
         self.experimental_flag = experimental_flag
-
-    @property
-    def source_line(self) -> int:
-        return 0
     
 class YosysCmdGroupDocumenter(Documenter):
     objtype = 'cmdgroup'
@@ -97,19 +102,8 @@ class YosysCmdGroupDocumenter(Documenter):
                     subtype = 'cmd_lib'
                 )
                 cmds_obj = {}
-            for (name, obj) in cmds_obj.get('cmds', {}).items():
-                if self.lib_key == 'groups':
-                    source_file: str = obj.get('source_file', 'unknown')
-                    if source_file == 'unknown':
-                        source_group = 'unknown'
-                    else:
-                        source_group = str(Path(source_file).parent)
-                    try:
-                        self.__cmd_lib[source_group].append(name)
-                    except KeyError:
-                        self.__cmd_lib[source_group] = [name,]
-                else:
-                    self.__cmd_lib[name] = obj
+            for (name, obj) in cmds_obj.get(self.lib_key, {}).items():
+                self.__cmd_lib[name] = obj
         return self.__cmd_lib
     
     @classmethod
@@ -332,6 +326,7 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
         # set sourcename and add content from attribute documentation
         domain = getattr(self, 'domain', self.objtype)
         source_name = self.object.source_file
+        source_line = self.object.source_line
 
         def render(content_list: YosysCmdContentListing, indent: int=0):
             content_source = content_list.source_file or source_name
@@ -363,7 +358,7 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
 
         if self.get_sourcename() != 'unknown':
             self.add_line('\n', source_name)
-            self.add_line(f'.. note:: Help text automatically generated from :file:`{source_name}`', source_name)
+            self.add_line(f'.. note:: Help text automatically generated from :file:`{source_name}:{source_line}`', source_name)
 
         # add additional content (e.g. from document), if present
         if more_content:

From 6fdefee35ba7b1a63ab3f83e891f6f317ccd0fc3 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:31 +1200
Subject: [PATCH 160/931] Move source_location to register.h

Revert `PrettyHelp::get_current()` for no args since we can use `Pass::location` instead.
---
 kernel/log_help.cc |  4 +---
 kernel/log_help.h  | 17 +----------------
 kernel/register.cc | 11 ++++++-----
 kernel/register.h  | 26 ++++++++++++++++++++++----
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/kernel/log_help.cc b/kernel/log_help.cc
index ada51be60..82967b0b6 100644
--- a/kernel/log_help.cc
+++ b/kernel/log_help.cc
@@ -84,12 +84,10 @@ PrettyHelp::~PrettyHelp()
 	current_help = _prior;
 }
 
-PrettyHelp *PrettyHelp::get_current(source_location location)
+PrettyHelp *PrettyHelp::get_current()
 {
 	if (current_help == nullptr)
 		new PrettyHelp();
-	current_help->_root_listing.source_file = location.file_name();
-	current_help->_root_listing.source_line = location.line();
 	return current_help;
 }
 
diff --git a/kernel/log_help.h b/kernel/log_help.h
index fec888548..b460bce62 100644
--- a/kernel/log_help.h
+++ b/kernel/log_help.h
@@ -23,19 +23,6 @@
 #include "kernel/yosys_common.h"
 #include "kernel/json.h"
 
-#ifdef YOSYS_ENABLE_SOURCE_LOCATION
-#include <experimental/source_location>
-using std::experimental::source_location;
-#else
-struct source_location { // dummy placeholder
-	int line() const { return 0; }
-	int column() const { return 0; }
-	const char* file_name() const { return "unknown"; }
-	const char* function_name() const { return "unknown"; }
-	static const source_location current(...) { return source_location(); }
-};
-#endif
-
 YOSYS_NAMESPACE_BEGIN
 
 struct ContentListing {
@@ -94,7 +81,7 @@ public:
 	PrettyHelp(Mode mode = LOG);
 	~PrettyHelp();
 
-	static PrettyHelp *get_current(source_location location = source_location::current());
+	static PrettyHelp *get_current();
 
 	bool has_content() { return _root_listing.content.size();}
 	const vector<ContentListing *> get_content() {
@@ -102,8 +89,6 @@ public:
 		return content;
 	}
 
-	const char* source_file() const { return _root_listing.source_file; }
-
 	void usage(
 		const string &usage,
 		const source_location location = source_location::current()
diff --git a/kernel/register.cc b/kernel/register.cc
index 1f0768417..cc4c87019 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -42,7 +42,8 @@ std::map<std::string, Backend*> backend_register;
 
 std::vector<std::string> Frontend::next_args;
 
-Pass::Pass(std::string name, std::string short_help) : pass_name(name), short_help(short_help)
+Pass::Pass(std::string name, std::string short_help, source_location location) : 
+	pass_name(name), short_help(short_help), location(location)
 {
 	next_queued_pass = first_queued_pass;
 	first_queued_pass = this;
@@ -389,8 +390,8 @@ void ScriptPass::help_script()
 	script();
 }
 
-Frontend::Frontend(std::string name, std::string short_help) :
-		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "read_" + name, short_help),
+Frontend::Frontend(std::string name, std::string short_help, source_location location) :
+		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "read_" + name, short_help, location),
 		frontend_name(name.rfind("=", 0) == 0 ? name.substr(1) : name)
 {
 }
@@ -535,8 +536,8 @@ void Frontend::frontend_call(RTLIL::Design *design, std::istream *f, std::string
 	}
 }
 
-Backend::Backend(std::string name, std::string short_help) :
-		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "write_" + name, short_help),
+Backend::Backend(std::string name, std::string short_help, source_location location) :
+		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "write_" + name, short_help, location),
 		backend_name(name.rfind("=", 0) == 0 ? name.substr(1) : name)
 {
 }
diff --git a/kernel/register.h b/kernel/register.h
index fdd361ba6..82ff98781 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -23,12 +23,27 @@
 #include "kernel/yosys_common.h"
 #include "kernel/yosys.h"
 
+#ifdef YOSYS_ENABLE_SOURCE_LOCATION
+#include <experimental/source_location>
+using std::experimental::source_location;
+#else
+struct source_location { // dummy placeholder
+	int line() const { return 0; }
+	int column() const { return 0; }
+	const char* file_name() const { return "unknown"; }
+	const char* function_name() const { return "unknown"; }
+	static const source_location current(...) { return source_location(); }
+};
+#endif
+
 YOSYS_NAMESPACE_BEGIN
 
 struct Pass
 {
 	std::string pass_name, short_help;
-	Pass(std::string name, std::string short_help = "** document me **");
+	source_location location;
+	Pass(std::string name, std::string short_help = "** document me **",
+		source_location location = source_location::current());
 	// Prefer overriding 'Pass::on_shutdown()' if possible
 	virtual ~Pass();
 
@@ -82,7 +97,8 @@ struct ScriptPass : Pass
 	RTLIL::Design *active_design;
 	std::string active_run_from, active_run_to;
 
-	ScriptPass(std::string name, std::string short_help = "** document me **") : Pass(name, short_help) { }
+	ScriptPass(std::string name, std::string short_help = "** document me **", source_location location = source_location::current()) : 
+		Pass(name, short_help, location) { }
 
 	virtual void script() = 0;
 
@@ -100,7 +116,8 @@ struct Frontend : Pass
 	static std::string last_here_document;
 
 	std::string frontend_name;
-	Frontend(std::string name, std::string short_help = "** document me **");
+	Frontend(std::string name, std::string short_help = "** document me **",
+		source_location location = source_location::current());
 	void run_register() override;
 	~Frontend() override;
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override final;
@@ -116,7 +133,8 @@ struct Frontend : Pass
 struct Backend : Pass
 {
 	std::string backend_name;
-	Backend(std::string name, std::string short_help = "** document me **");
+	Backend(std::string name, std::string short_help = "** document me **",
+		source_location location = source_location::current());
 	void run_register() override;
 	~Backend() override;
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override final;

From 1c627f4a1b421a4410d023fc84387aef4f71144c Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:31 +1200
Subject: [PATCH 161/931] log_help: Add manual group support

Sets `chformal` group to "formal" for testing purposes
---
 kernel/log_help.h       | 4 ++++
 passes/cmds/chformal.cc | 1 +
 2 files changed, 5 insertions(+)

diff --git a/kernel/log_help.h b/kernel/log_help.h
index b460bce62..730d20c27 100644
--- a/kernel/log_help.h
+++ b/kernel/log_help.h
@@ -53,6 +53,7 @@ struct ContentListing {
 class PrettyHelp
 {
 public:
+	string group = "unknown";
 	enum Mode {
 		LOG,
 		LISTING,
@@ -89,6 +90,9 @@ public:
 		return content;
 	}
 
+	void set_group(const string g) { group = g; }
+	bool has_group() { return group.compare("unknown") != 0; }
+
 	void usage(
 		const string &usage,
 		const source_location location = source_location::current()
diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index 1d44df51f..c233390cd 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -75,6 +75,7 @@ struct ChformalPass : public Pass {
 
 	bool help_v2() override {
 		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
 		help->usage("chformal [types] [mode] [options] [selection]");
 		help->paragraph(
 			"Make changes to the formal constraints of the design. The [types] options "

From 7b625591c871b7fc234d95f3e03f807659cad3db Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:32 +1200
Subject: [PATCH 162/931] dump_cmds_json: Output groups

Also output `pass->location.{file_name,line,function_name}()`.
If no group is given (i.e. it is "unknown"), attempt to automatically apply a group.
If we have source locations, this is based on path to the source file.
If we do not have source locations, try to match on the pass name instead.
---
 kernel/register.cc | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/kernel/register.cc b/kernel/register.cc
index cc4c87019..93107c21d 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
+#include <filesystem>
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -814,6 +815,7 @@ struct HelpPass : public Pass {
 		json.entry("generator", yosys_version_str);
 
 		bool raise_error = false;
+		std::map<string, vector<string>> groups;
 
 		json.name("cmds"); json.begin_object();
 		// iterate over commands
@@ -954,6 +956,42 @@ struct HelpPass : public Pass {
 				}
 			}
 
+			// attempt auto group
+			if (!cmd_help.has_group()) {
+				string source_file = pass->location.file_name();
+				bool has_source = source_file.compare("unknown") != 0;
+				if (source_file.find("backends/") == 0 || (!has_source && name.find("read_") == 0))
+					cmd_help.group = "backends";
+				else if (source_file.find("frontends/") == 0 || (!has_source && name.find("write_") == 0))
+					cmd_help.group = "frontends";
+				else if (source_file.find("techlibs/") == 0 || (!has_source && name.find("synth_") == 0))
+					cmd_help.group = "techlibs";
+				else if (has_source) {
+					auto p = std::filesystem::path(source_file);
+					if (p.has_parent_path()) {
+						cmd_help.group = string(p.parent_path());
+					}
+				}
+				// implicit !has_source
+				else if (name.find("equiv") == 0)
+					cmd_help.group = "passes/equiv";
+				else if (name.find("fsm") == 0)
+					cmd_help.group = "passes/fsm";
+				else if (name.find("memory") == 0)
+					cmd_help.group = "passes/memory";
+				else if (name.find("opt") == 0)
+					cmd_help.group = "passes/opt";
+				else if (name.find("proc") == 0)
+					cmd_help.group = "passes/proc";
+				else if (name.find("test") == 0)
+					cmd_help.group = "passes/tests";
+			}
+
+			if (groups.count(cmd_help.group) == 0) {
+				groups[cmd_help.group] = vector<string>();
+			}
+			groups[cmd_help.group].push_back(name);
+
 			// write to json
 			json.name(name.c_str()); json.begin_object();
 			json.entry("title", title);
@@ -961,12 +999,17 @@ struct HelpPass : public Pass {
 			for (auto content : cmd_help.get_content())
 				json.value(content->to_json());
 			json.end_array();
-			json.entry("source_file", cmd_help.source_file());
+			json.entry("group", cmd_help.group);
+			json.entry("source_file", pass->location.file_name());
+			json.entry("source_line", pass->location.line());
+			json.entry("source_func", pass->location.function_name());
 			json.entry("experimental_flag", experimental_flag);
 			json.end_object();
 		}
 		json.end_object();
 
+		json.entry("groups", groups);
+
 		json.end_object();
 		return raise_error;
 	}

From 6f0ee431521be8844fbbccf587774d44c971fbef Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:32 +1200
Subject: [PATCH 163/931] Docs: Downgrade missing cmdgroup warning

Log an info message, and put a warning for the content instead.
---
 docs/util/newcmdref.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/util/newcmdref.py b/docs/util/newcmdref.py
index 6db7493af..cd6f84da5 100644
--- a/docs/util/newcmdref.py
+++ b/docs/util/newcmdref.py
@@ -223,11 +223,17 @@ class YosysCmdGroupDocumenter(Documenter):
             )
             return
 
+        sourcename = self.get_sourcename()
+
         if not self.import_object():
-            logger.warning(
-                f"unable to load {self.name} with {type(self)}",
-                type = 'cmdref'
-            )
+            log_msg = f"unable to load {self.name} with {type(self)}"
+            if self.lib_key == 'groups':
+                logger.info(log_msg, type = 'cmdref')
+                self.add_line(f'.. warning:: No commands found for group {self.name!r}', sourcename)
+                self.add_line('', sourcename)
+                self.add_line('   Documentation may have been built without ``source_location`` support.', sourcename)
+            else:
+                logger.warning(log_msg, type = 'cmdref')
             return
 
         # check __module__ of object (for members not given explicitly)
@@ -235,7 +241,6 @@ class YosysCmdGroupDocumenter(Documenter):
         #     if not self.check_module():
         #         return
 
-        sourcename = self.get_sourcename()
         self.add_line('', sourcename)
 
         # format the object's signature, if any

From 7647d2c74120b3eb0d06d3c79ee1a423e52a010e Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:32 +1200
Subject: [PATCH 164/931] Docs: Fix warnings

Changes a bunch of :doc:`/cmd/*` to :cmd:ref:`*` with the intention of changing it later to something that replicates the previous effect of displaying the commands `short_help`.
---
 docs/source/appendix/auxlibs.rst              |  5 +-
 docs/source/cmd/index_techlibs.rst            |  4 ++
 .../code_examples/macro_commands/prep.ys      | 23 +++++++
 docs/source/getting_started/example_synth.rst | 61 +++++++++----------
 .../getting_started/scripting_intro.rst       |  4 +-
 .../interactive_investigation.rst             |  8 +--
 .../more_scripting/load_design.rst            | 10 +--
 .../using_yosys/more_scripting/selections.rst |  6 +-
 docs/source/using_yosys/synthesis/fsm.rst     |  2 +-
 docs/source/using_yosys/synthesis/memory.rst  |  2 +-
 docs/source/using_yosys/synthesis/opt.rst     |  8 +--
 docs/source/using_yosys/synthesis/proc.rst    |  2 +-
 docs/source/using_yosys/synthesis/synth.rst   | 33 ++--------
 .../using_yosys/synthesis/techmap_synth.rst   |  6 +-
 docs/util/newcmdref.py                        |  5 +-
 15 files changed, 90 insertions(+), 89 deletions(-)
 create mode 100644 docs/source/code_examples/macro_commands/prep.ys

diff --git a/docs/source/appendix/auxlibs.rst b/docs/source/appendix/auxlibs.rst
index 8c78ed6b3..192ac0944 100644
--- a/docs/source/appendix/auxlibs.rst
+++ b/docs/source/appendix/auxlibs.rst
@@ -29,8 +29,7 @@ ezSAT
 
 The files in ``libs/ezsat`` provide a library for simplifying generating CNF
 formulas for SAT solvers. It also contains bindings of MiniSAT. The ezSAT
-library is written by C. Wolf. It is used by the `sat` pass (see
-:doc:`/cmd/sat`).
+library is written by C. Wolf. It is used by the `sat` pass.
 
 fst
 ---
@@ -78,4 +77,4 @@ SubCircuit
 The files in ``libs/subcircuit`` provide a library for solving the subcircuit
 isomorphism problem. It is written by C. Wolf and based on the Ullmann Subgraph
 Isomorphism Algorithm :cite:p:`UllmannSubgraphIsomorphism`. It is used by the
-extract pass (see :doc:`../cmd/extract`).
+`extract` pass.
diff --git a/docs/source/cmd/index_techlibs.rst b/docs/source/cmd/index_techlibs.rst
index aeeb17c90..c80fccf5f 100644
--- a/docs/source/cmd/index_techlibs.rst
+++ b/docs/source/cmd/index_techlibs.rst
@@ -1,5 +1,9 @@
 techlibs
 ------------------
 
+.. TODO:: disambiguate `synth_intel` and `synth_intel_alm`
+
+   (MAX10, Cyclone IV) and (Cyclone V, Arria V, Cyclone 10 GX) respectively
+
 .. autocmdgroup:: techlibs
    :members:
diff --git a/docs/source/code_examples/macro_commands/prep.ys b/docs/source/code_examples/macro_commands/prep.ys
new file mode 100644
index 000000000..1bec907f6
--- /dev/null
+++ b/docs/source/code_examples/macro_commands/prep.ys
@@ -0,0 +1,23 @@
+#start:The following commands are executed by this synthesis command:
+#end:$
+begin:
+    hierarchy -check [-top <top> | -auto-top]
+
+coarse:
+    proc [-ifx]
+    flatten    (if -flatten)
+    future
+    opt_expr -keepdc
+    opt_clean
+    check
+    opt -noff -keepdc
+    wreduce -keepdc [-memx]
+    memory_dff    (if -rdff)
+    memory_memx    (if -memx)
+    opt_clean
+    memory_collect
+    opt -noff -keepdc -fast
+
+check:
+    stat
+    check
diff --git a/docs/source/getting_started/example_synth.rst b/docs/source/getting_started/example_synth.rst
index e215586cc..c12acb3dc 100644
--- a/docs/source/getting_started/example_synth.rst
+++ b/docs/source/getting_started/example_synth.rst
@@ -70,7 +70,7 @@ At the bottom of the `help` output for
 `synth_ice40` is the complete list of commands called by this script.
 Let's start with the section labeled ``begin``:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: begin:
    :end-before: flatten:
@@ -143,7 +143,7 @@ line refers to the line numbers of the start/end of the corresponding ``always
 @`` block.  In the case of an ``initial`` block, we instead see the ``PROC``
 referring to line 0.
 
-To handle these, let us now introduce the next command: :doc:`/cmd/proc`. `proc`
+To handle these, let us now introduce the next command: :cmd:ref:`proc`. `proc`
 is a macro command like `synth_ice40`.  Rather than modifying the design
 directly, it instead calls a series of other commands.  In the case of `proc`,
 these sub-commands work to convert the behavioral logic of processes into
@@ -188,7 +188,7 @@ opt_expr <adv_opt_expr>`.
 
 .. note::
 
-   :doc:`/cmd/clean` can also be called with two semicolons after any command,
+   :cmd:ref:`clean` can also be called with two semicolons after any command,
    for example we could have called :yoscrypt:`opt_expr;;` instead of
    :yoscrypt:`opt_expr; clean`.  You may notice some scripts will end each line
    with ``;;``.  It is beneficial to run `clean` before inspecting intermediate
@@ -215,8 +215,8 @@ Note that if we tried to run this command now then we would get an error.  This
 is because we already removed all of the modules other than ``addr_gen``.  We
 could restart our shell session, but instead let's use two new commands:
 
-- :doc:`/cmd/design`, and
-- :doc:`/cmd/read_verilog`.
+- :cmd:ref:`design`, and
+- :cmd:ref:`read_verilog`.
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -251,7 +251,7 @@ our design won't run into this issue, we can skip the ``-defer``.
 We can also run `proc` now to finish off the full :ref:`synth_begin`. Because
 the design schematic is quite large, we will be showing just the data path for
 the ``rdata`` output.  If you would like to see the entire design for yourself,
-you can do so with :doc:`/cmd/show`.  Note that the `show` command only works
+you can do so with :cmd:ref:`show`.  Note that the `show` command only works
 with a single module, so you may need to call it with :yoscrypt:`show fifo`.
 :ref:`show_intro` section in :doc:`/getting_started/scripting_intro` has more on
 how to use `show`.
@@ -283,7 +283,7 @@ Flattening
 At this stage of a synthesis flow there are a few other commands we could run.
 In `synth_ice40` we get these:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: flatten:
    :end-before: coarse:
@@ -355,7 +355,7 @@ Part 1
 
 In the iCE40 flow, we start with the following commands:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: coarse:
    :end-before: wreduce
@@ -371,7 +371,7 @@ wasting time on something we know is impossible.
 Next up is :yoscrypt:`opt -nodffe -nosdff` performing a set of simple
 optimizations on the design.  This command also ensures that only a specific
 subset of FF types are included, in preparation for the next command:
-:doc:`/cmd/fsm`.  Both `opt` and `fsm` are macro commands which are explored in
+:cmd:ref:`fsm`.  Both `opt` and `fsm` are macro commands which are explored in
 more detail in :doc:`/using_yosys/synthesis/opt` and
 :doc:`/using_yosys/synthesis/fsm` respectively.
 
@@ -403,7 +403,7 @@ Part 2
 
 The next group of commands performs a series of optimizations:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-at: wreduce
    :end-before: t:$mul
@@ -411,7 +411,7 @@ The next group of commands performs a series of optimizations:
    :caption: ``coarse`` section (part 2)
    :name: synth_coarse2
 
-First up is :doc:`/cmd/wreduce`.  If we run this we get the following:
+First up is :cmd:ref:`wreduce`.  If we run this we get the following:
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -432,7 +432,7 @@ the schematic and see the output of that cell has now changed.
 
    ``rdata`` output after `wreduce`
 
-The next two (new) commands are :doc:`/cmd/peepopt` and :doc:`/cmd/share`.
+The next two (new) commands are :cmd:ref:`peepopt` and :cmd:ref:`share`.
 Neither of these affect our design, and they're explored in more detail in
 :doc:`/using_yosys/synthesis/opt`, so let's skip over them.  :yoscrypt:`techmap
 -map +/cmp2lut.v -D LUT_WIDTH=4` optimizes certain comparison operators by
@@ -440,7 +440,7 @@ converting them to LUTs instead.  The usage of `techmap` is explored more in
 :doc:`/using_yosys/synthesis/techmap_synth`.
 
 Our next command to run is
-:doc:`/cmd/memory_dff`.
+:cmd:ref:`memory_dff`.
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -475,7 +475,7 @@ will only be performed if called with the ``-dsp`` flag: :yoscrypt:`synth_ice40
 -dsp`.  While our example has nothing that could be mapped to DSPs we can still
 take a quick look at the commands here and describe what they do.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-at: t:$mul
    :end-before: alumacc
@@ -514,7 +514,7 @@ Part 4
 
 That brings us to the fourth and final part for the iCE40 synthesis flow:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-at: alumacc
    :end-before: map_ram:
@@ -543,7 +543,7 @@ Once these cells have been inserted, the call to `opt` can combine cells which
 are now identical but may have been missed due to e.g. the difference between
 `$add` and `$sub`.
 
-The other new command in this part is :doc:`/cmd/memory`.  `memory` is another
+The other new command in this part is :cmd:ref:`memory`.  `memory` is another
 macro command which we examine in more detail in
 :doc:`/using_yosys/synthesis/memory`.  For this document, let us focus just on
 the step most relevant to our example: `memory_collect`. Up until this point,
@@ -594,7 +594,7 @@ Memory blocks
 Mapping to hard memory blocks uses a combination of `memory_libmap` and
 `techmap`.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_ram:
    :end-before: map_ffram:
@@ -636,7 +636,7 @@ into flip flops (the ``logic fallback``) with `memory_map`.
 .. |techlibs/ice40/brams_map.v| replace:: :file:`techlibs/ice40/brams_map.v`
 .. _techlibs/ice40/brams_map.v: https://github.com/YosysHQ/yosys/tree/main/techlibs/ice40/brams_map.v
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_ffram:
    :end-before: map_gates:
@@ -671,7 +671,7 @@ an explosion in cells as multi-bit `$mux` and `$adffe` are replaced with
 single-bit `$_MUX_` and `$_DFFE_PP0P_` cells, while the `$alu` is replaced with
 primitive `$_OR_` and `$_NOT_` gates and a `$lut` cell.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_gates:
    :end-before: map_ffs:
@@ -700,7 +700,7 @@ mapped to hardware into gate-level primitives.  This includes optimizing
 `$_MUX_` cells where one of the inputs is a constant ``1'0``, replacing it
 instead with an `$_AND_` cell.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_ffs:
    :end-before: map_luts:
@@ -725,7 +725,7 @@ LUTs
 `abc`. For more on what these do, and what the difference between these two
 commands are, refer to :doc:`/using_yosys/synthesis/abc`.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_luts:
    :end-before: map_cells:
@@ -742,7 +742,7 @@ commands are, refer to :doc:`/using_yosys/synthesis/abc`.
 Finally we use `techmap` to map the generic `$lut` cells to iCE40 ``SB_LUT4``
 cells.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_cells:
    :end-before: check:
@@ -784,19 +784,18 @@ Final steps
 The next section of the iCE40 synth flow performs some sanity checking and final
 tidy up:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: check:
-   :end-before: blif:
    :dedent:
    :name: check
    :caption: ``check`` section
 
 The new commands here are:
 
-- :doc:`/cmd/autoname`,
-- :doc:`/cmd/stat`, and
-- :doc:`/cmd/blackbox`.
+- :cmd:ref:`autoname`,
+- :cmd:ref:`stat`, and
+- :cmd:ref:`blackbox`.
 
 The output from `stat` is useful for checking resource utilization; providing a
 list of cells used in the design and the number of each, as well as the number
@@ -835,9 +834,9 @@ Synthesis output
 
 The iCE40 synthesis flow has the following output modes available:
 
-- :doc:`/cmd/write_blif`,
-- :doc:`/cmd/write_edif`, and
-- :doc:`/cmd/write_json`.
+- `write_blif`,
+- `write_edif`, and
+- `write_json`.
 
 As an example, if we called :yoscrypt:`synth_ice40 -top fifo -json fifo.json`,
 our synthesized ``fifo`` design will be output as :file:`fifo.json`.  We can
@@ -848,4 +847,4 @@ is beyond the scope of this documentation.
 
 .. _nextpnr: https://github.com/YosysHQ/nextpnr
 
-.. seealso:: :doc:`/cmd/synth_ice40`
+.. seealso:: :cmd:ref:`synth_ice40`
diff --git a/docs/source/getting_started/scripting_intro.rst b/docs/source/getting_started/scripting_intro.rst
index 01954c661..bc6782eaa 100644
--- a/docs/source/getting_started/scripting_intro.rst
+++ b/docs/source/getting_started/scripting_intro.rst
@@ -122,7 +122,7 @@ module.
 
 Detailed documentation of the select framework can be found under
 :doc:`/using_yosys/more_scripting/selections` or in the command reference at
-:doc:`/cmd/select`.
+:cmd:ref:`select`.
 
 .. _show_intro:
 
@@ -219,7 +219,7 @@ those used in options, must be a single expression instead.
 .. _GraphViz color docs: https://graphviz.org/doc/info/colors
 
 For all of the options available to `show`, check the command reference at
-:doc:`/cmd/show`.
+:cmd:ref:`show`.
 
 .. seealso:: :ref:`interactive_show` on the
    :doc:`/using_yosys/more_scripting/interactive_investigation` page.
diff --git a/docs/source/using_yosys/more_scripting/interactive_investigation.rst b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
index e9c9bc9ac..fa031f94e 100644
--- a/docs/source/using_yosys/more_scripting/interactive_investigation.rst
+++ b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
@@ -323,9 +323,9 @@ tools).
   design into an equivalent design that is easier to analyse.
 - Commands such as `eval` and `sat` can be used to investigate the behavior of
   the circuit.
-- :doc:`/cmd/show`.
-- :doc:`/cmd/dump`.
-- :doc:`/cmd/add` and :doc:`/cmd/delete` can be used to modify and reorganize a
+- :cmd:ref:`show`.
+- :cmd:ref:`dump`.
+- :cmd:ref:`add` and :cmd:ref:`delete` can be used to modify and reorganize a
   design dynamically.
   
 The code used is included in the Yosys code base under
@@ -358,7 +358,7 @@ reorganizing a module in Yosys and checking the resulting circuit.
 .. figure:: /_images/code_examples/scrambler/scrambler_p02.*
     :class: width-helper invert-helper
 
-Analyzing the resulting circuit with :doc:`/cmd/eval`:
+Analyzing the resulting circuit with :cmd:ref:`eval`:
 
 .. todo:: replace inline code
 
diff --git a/docs/source/using_yosys/more_scripting/load_design.rst b/docs/source/using_yosys/more_scripting/load_design.rst
index bbc55a36b..39e5711e6 100644
--- a/docs/source/using_yosys/more_scripting/load_design.rst
+++ b/docs/source/using_yosys/more_scripting/load_design.rst
@@ -1,9 +1,11 @@
 Loading a design
 ~~~~~~~~~~~~~~~~
 
+.. TODO:: fill out this page better
+
 keyword: Frontends
 
-- :doc:`/cmd/read_verilog`
+- :doc:`/cmd/index_frontends`
 
 .. todo:: include ``read_verilog <<EOF``, also other methods of loading designs
 
@@ -37,12 +39,6 @@ keyword: Frontends
 
 Others:
 
-- :doc:`/cmd/read`
 - `GHDL plugin`_ for VHDL
-- :doc:`/cmd/read_rtlil` (direct textual representation of Yosys internal state)
-- :doc:`/cmd/read_aiger`
-- :doc:`/cmd/read_blif`
-- :doc:`/cmd/read_json`
-- :doc:`/cmd/read_liberty`
 
 .. _GHDL plugin: https://github.com/ghdl/ghdl-yosys-plugin
diff --git a/docs/source/using_yosys/more_scripting/selections.rst b/docs/source/using_yosys/more_scripting/selections.rst
index e82f23497..0b1fdbcb3 100644
--- a/docs/source/using_yosys/more_scripting/selections.rst
+++ b/docs/source/using_yosys/more_scripting/selections.rst
@@ -93,7 +93,7 @@ Special patterns can be used to select by object property or type. For example:
   A:blabla`
 - select all `$add` cells from the module foo: :yoscrypt:`select foo/t:$add`
 
-A complete list of pattern expressions can be found in :doc:`/cmd/select`.
+A complete list of pattern expressions can be found in :cmd:ref:`select`.
 
 Operations on selections
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -141,7 +141,7 @@ Some of the special ``%``-codes:
 - ``%i``: intersection of top two elements on stack -- pop 2, push 1
 - ``%n``: inverse of top element on stack -- pop 1, push 1
 
-See :doc:`/cmd/select` for the full list.
+See :cmd:ref:`select` for the full list.
 
 Expanding selections
 ^^^^^^^^^^^^^^^^^^^^
@@ -354,7 +354,7 @@ boolean operations such as intersection (``%i``) and difference (``%d``) are
 powerful tools for extracting the relevant portions of the circuit under
 investigation.
 
-Again, see :doc:`/cmd/select` for full documentation of these expressions.
+Again, see :cmd:ref:`select` for full documentation of these expressions.
 
 Incremental selection
 ^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/source/using_yosys/synthesis/fsm.rst b/docs/source/using_yosys/synthesis/fsm.rst
index 6fad81d54..07a3cc9cc 100644
--- a/docs/source/using_yosys/synthesis/fsm.rst
+++ b/docs/source/using_yosys/synthesis/fsm.rst
@@ -10,7 +10,7 @@ other commands:
    :start-after: #end:
    :caption: Passes called by `fsm`
 
-See also :doc:`/cmd/fsm`.
+See also :doc:`/cmd/index_passes_fsm`.
 
 The algorithms used for FSM detection and extraction are influenced by a more
 general reported technique :cite:p:`fsmextract`.
diff --git a/docs/source/using_yosys/synthesis/memory.rst b/docs/source/using_yosys/synthesis/memory.rst
index a8f2280f7..9b81fb6dc 100644
--- a/docs/source/using_yosys/synthesis/memory.rst
+++ b/docs/source/using_yosys/synthesis/memory.rst
@@ -26,7 +26,7 @@ Some quick notes:
    decoder logic and registers.
 
 For more information about `memory`, such as disabling certain sub commands, see
-:doc:`/cmd/memory`.
+:doc:`/cmd/index_passes_memory`.
 
 Example
 -------
diff --git a/docs/source/using_yosys/synthesis/opt.rst b/docs/source/using_yosys/synthesis/opt.rst
index 43b558739..56330bc37 100644
--- a/docs/source/using_yosys/synthesis/opt.rst
+++ b/docs/source/using_yosys/synthesis/opt.rst
@@ -11,8 +11,8 @@ The `opt` macro command
 
 The Yosys pass `opt` runs a number of simple optimizations. This includes
 removing unused signals and cells and const folding. It is recommended to run
-this pass after each major step in the synthesis script.  As listed in
-:doc:`/cmd/opt`, this macro command calls the following ``opt_*`` commands:
+this pass after each major step in the synthesis script.  This macro command
+calls the following ``opt_*`` commands:
 
 .. literalinclude:: /code_examples/macro_commands/opt.ys
    :language: yoscrypt
@@ -233,7 +233,5 @@ Other optimizations
 
 .. todo:: more on the other optimizations
 
-- :doc:`/cmd/wreduce`
-- :doc:`/cmd/peepopt`
-- :doc:`/cmd/share`
+- Check :doc:`/cmd/index_passes_opt` for more.
 - `abc` and `abc9`, see also: :doc:`abc`.
diff --git a/docs/source/using_yosys/synthesis/proc.rst b/docs/source/using_yosys/synthesis/proc.rst
index b7cd348d7..c4ab0f0ea 100644
--- a/docs/source/using_yosys/synthesis/proc.rst
+++ b/docs/source/using_yosys/synthesis/proc.rst
@@ -17,7 +17,7 @@ commands in a sensible order:
 
 After all the ``proc_*`` commands, `opt_expr` is called. This can be disabled by
 calling :yoscrypt:`proc -noopt`.  For more information about `proc`, such as
-disabling certain sub commands, see :doc:`/cmd/proc`.
+disabling certain sub commands, see :doc:`/cmd/index_passes_proc`.
 
 Many commands can not operate on modules with "processess" in them. Usually a
 call to `proc` is the first command in the actual synthesis procedure after
diff --git a/docs/source/using_yosys/synthesis/synth.rst b/docs/source/using_yosys/synthesis/synth.rst
index e3d82931b..7a248ae29 100644
--- a/docs/source/using_yosys/synthesis/synth.rst
+++ b/docs/source/using_yosys/synthesis/synth.rst
@@ -6,44 +6,23 @@ Synth commands
 Packaged ``synth_*`` commands
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The following is a list of all synth commands included in Yosys for different
-platforms.  Each command runs a script of sub commands specific to the platform
-being targeted.  Note that not all of these scripts are actively maintained and
-may not be up-to-date.
-
-- :doc:`/cmd/synth_achronix`
-- :doc:`/cmd/synth_anlogic`
-- :doc:`/cmd/synth_coolrunner2`
-- :doc:`/cmd/synth_easic`
-- :doc:`/cmd/synth_ecp5`
-- :doc:`/cmd/synth_efinix`
-- :doc:`/cmd/synth_fabulous`
-- :doc:`/cmd/synth_gatemate`
-- :doc:`/cmd/synth_gowin`
-- :doc:`/cmd/synth_greenpak4`
-- :doc:`/cmd/synth_ice40`
-- :doc:`/cmd/synth_intel` (MAX10, Cyclone IV)
-- :doc:`/cmd/synth_intel_alm` (Cyclone V, Arria V, Cyclone 10 GX)
-- :doc:`/cmd/synth_lattice`
-- :doc:`/cmd/synth_nexus`
-- :doc:`/cmd/synth_quicklogic`
-- :doc:`/cmd/synth_sf2`
-- :doc:`/cmd/synth_xilinx`
+A list of all synth commands included in Yosys for different platforms can be
+found under :doc:`/cmd/index_techlibs`.  Each command runs a script of sub
+commands specific to the platform being targeted.  Note that not all of these
+scripts are actively maintained and may not be up-to-date.
 
 General synthesis
 ~~~~~~~~~~~~~~~~~
 
 In addition to the above hardware-specific synth commands, there is also
-:doc:`/cmd/prep`.  This command is limited to coarse-grain synthesis, without
+:cmd:ref:`prep`.  This command is limited to coarse-grain synthesis, without
 getting into any architecture-specific mappings or optimizations.  Among other
 things, this is useful for design verification.
 
 The following commands are executed by the `prep` command:
 
-.. literalinclude:: /cmd/prep.rst
+.. literalinclude:: /code_examples/macro_commands/prep.ys
    :start-at: begin:
-   :end-before: .. only:: latex
-   :dedent:
 
 :doc:`/getting_started/example_synth` covers most of these commands and what
 they do.
diff --git a/docs/source/using_yosys/synthesis/techmap_synth.rst b/docs/source/using_yosys/synthesis/techmap_synth.rst
index 9e9d42df5..54a715342 100644
--- a/docs/source/using_yosys/synthesis/techmap_synth.rst
+++ b/docs/source/using_yosys/synthesis/techmap_synth.rst
@@ -33,9 +33,9 @@ reader may find this map file as :file:`techlibs/common/techmap.v` in the Yosys
 source tree.
 
 Additional features have been added to techmap to allow for conditional mapping
-of cells (see :doc:`/cmd/techmap`). This can for example be useful if the target
-architecture supports hardware multipliers for certain bit-widths but not for
-others.
+of cells (see :doc:`/cmd/index_passes_techmap`). This can for example be useful
+if the target architecture supports hardware multipliers for certain bit-widths
+but not for others.
 
 A usual synthesis flow would first use the techmap pass to directly map some RTL
 cells to coarse-grain cells provided by the target architecture (if any) and
diff --git a/docs/util/newcmdref.py b/docs/util/newcmdref.py
index cd6f84da5..a00df3095 100644
--- a/docs/util/newcmdref.py
+++ b/docs/util/newcmdref.py
@@ -305,7 +305,10 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
         return False
 
     def get_sourcename(self) -> str:
-        return self.object.source_file
+        try:
+            return self.object.source_file
+        except AttributeError:
+            return super().get_sourcename()
     
     def format_name(self) -> str:
         return self.object.name

From 4722b074856b597277a73f9f4d142fefce04a636 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:54 +1200
Subject: [PATCH 165/931] Docs: docs/source/cmd is source only

i.e. we don't need to clean it, and we don't need to include it in the docs artifact
---
 .github/workflows/prepare-docs.yml | 1 -
 Makefile                           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/prepare-docs.yml b/.github/workflows/prepare-docs.yml
index fb1fab426..b47f5f3dd 100644
--- a/.github/workflows/prepare-docs.yml
+++ b/.github/workflows/prepare-docs.yml
@@ -59,7 +59,6 @@ jobs:
         with:
           name: cmd-ref-${{ github.sha }}
           path: |
-            docs/source/cmd
             docs/source/generated
             docs/source/_images
             docs/source/code_examples
diff --git a/Makefile b/Makefile
index 5690410a7..314daa05f 100644
--- a/Makefile
+++ b/Makefile
@@ -1123,7 +1123,7 @@ clean:
 	rm -f  tests/tools/cmp_tbdata
 	rm -f $(addsuffix /run-test.mk,$(MK_TEST_DIRS))
 	-$(MAKE) -C docs clean
-	rm -rf docs/source/cmd docs/util/__pycache__
+	rm -rf docs/util/__pycache__
 	rm -f *.whl
 	rm -f libyosys.so
 

From 534163cf4b38f2a235552ee9db5dff8b7a1da3ae Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:54 +1200
Subject: [PATCH 166/931] source_location: Auto detect library

Drop `ENABLE_SOURCE_LOCATION` flag.
---
 Makefile          |  4 ----
 kernel/register.h | 12 +++++++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 314daa05f..2673cff2a 100644
--- a/Makefile
+++ b/Makefile
@@ -532,10 +532,6 @@ LIBS_VERIFIC += -Wl,--whole-archive $(patsubst %,$(VERIFIC_DIR)/%/*-linux.a,$(VE
 endif
 endif
 
-ifeq ($(ENABLE_SOURCE_LOCATION),1)
-CXXFLAGS += -DYOSYS_ENABLE_SOURCE_LOCATION
-endif
-
 ifeq ($(ENABLE_COVER),1)
 CXXFLAGS += -DYOSYS_ENABLE_COVER
 endif
diff --git a/kernel/register.h b/kernel/register.h
index 82ff98781..07d6f09c1 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -23,10 +23,15 @@
 #include "kernel/yosys_common.h"
 #include "kernel/yosys.h"
 
-#ifdef YOSYS_ENABLE_SOURCE_LOCATION
-#include <experimental/source_location>
-using std::experimental::source_location;
+#include <version>
+#if __cpp_lib_source_location == 201907L
+  #include <source_location>
+  using std::source_location;
 #else
+  #include <experimental/source_location>
+#  ifdef __cpp_lib_experimental_source_location
+    using std::experimental::source_location;
+#  else
 struct source_location { // dummy placeholder
 	int line() const { return 0; }
 	int column() const { return 0; }
@@ -34,6 +39,7 @@ struct source_location { // dummy placeholder
 	const char* function_name() const { return "unknown"; }
 	static const source_location current(...) { return source_location(); }
 };
+#  endif
 #endif
 
 YOSYS_NAMESPACE_BEGIN

From 041f390a24bebc014d77157551cf9169146d823d Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:54 +1200
Subject: [PATCH 167/931] register: Remove <filesystem>

Use `string::find_last_of()` instead.
Not sure how this works on windows, but it was already using '/' so at least it's not any worse.
---
 kernel/register.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/register.cc b/kernel/register.cc
index 93107c21d..2a590a2dd 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <filesystem>
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -967,9 +966,10 @@ struct HelpPass : public Pass {
 				else if (source_file.find("techlibs/") == 0 || (!has_source && name.find("synth_") == 0))
 					cmd_help.group = "techlibs";
 				else if (has_source) {
-					auto p = std::filesystem::path(source_file);
-					if (p.has_parent_path()) {
-						cmd_help.group = string(p.parent_path());
+					auto last_slash = source_file.find_last_of('/');
+					if (last_slash != string::npos) {
+						auto parent_path = source_file.substr(0, last_slash);
+						cmd_help.group = parent_path;
 					}
 				}
 				// implicit !has_source

From 23a066f71f2c508c043e2fd2457c5e82326e3a38 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:54 +1200
Subject: [PATCH 168/931] source_location: Try use __has_include

---
 kernel/register.h | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/kernel/register.h b/kernel/register.h
index 07d6f09c1..5cdb62ebe 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -27,11 +27,18 @@
 #if __cpp_lib_source_location == 201907L
   #include <source_location>
   using std::source_location;
-#else
-  #include <experimental/source_location>
-#  ifdef __cpp_lib_experimental_source_location
+#elif defined(__has_include)
+#  if __has_include(<experimental/source_location>)
+    #include <experimental/source_location>
     using std::experimental::source_location;
 #  else
+    #define SOURCE_FALLBACK
+#  endif
+#else
+  #define SOURCE_FALLBACK
+#endif
+
+#ifdef SOURCE_FALLBACK
 struct source_location { // dummy placeholder
 	int line() const { return 0; }
 	int column() const { return 0; }
@@ -39,7 +46,6 @@ struct source_location { // dummy placeholder
 	const char* function_name() const { return "unknown"; }
 	static const source_location current(...) { return source_location(); }
 };
-#  endif
 #endif
 
 YOSYS_NAMESPACE_BEGIN

From 605f12c2ae9fb7e8dbc78fbb040adfe7a0c192a6 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:54 +1200
Subject: [PATCH 169/931] Rename help_v2 to formatted_help

Also add comments to `help()` and `formatted_help()` to clarify usage.
---
 kernel/register.cc      | 6 +++---
 kernel/register.h       | 4 +++-
 passes/cmds/chformal.cc | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/kernel/register.cc b/kernel/register.cc
index 2a590a2dd..2e68c3d85 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -118,14 +118,14 @@ void Pass::post_execute(Pass::pre_post_exec_state_t state)
 
 void Pass::help()
 {
-	if (!help_v2()) {
+	if (!formatted_help()) {
 		log("\n");
 		log("No help message for command `%s'.\n", pass_name.c_str());
 		log("\n");
 	}
 }
 
-bool Pass::help_v2()
+bool Pass::formatted_help()
 {
 	return false;
 }
@@ -825,7 +825,7 @@ struct HelpPass : public Pass {
 			auto experimental_flag = pass->experimental_flag;
 
 			auto cmd_help = PrettyHelp(PrettyHelp::Mode::LISTING);
-			auto has_pretty_help = pass->help_v2();
+			auto has_pretty_help = pass->formatted_help();
 
 			if (!has_pretty_help) {
 				enum PassUsageState {
diff --git a/kernel/register.h b/kernel/register.h
index 5cdb62ebe..537e1670d 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -59,8 +59,10 @@ struct Pass
 	// Prefer overriding 'Pass::on_shutdown()' if possible
 	virtual ~Pass();
 
+	// Makes calls to log() to generate help message
 	virtual void help();
-	virtual bool help_v2();
+	// Uses PrettyHelp::get_current() to produce a more portable formatted help message
+	virtual bool formatted_help();
 	virtual void clear_flags();
 	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) = 0;
 
diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index c233390cd..8194b7365 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -73,7 +73,7 @@ static bool is_triggered_check_cell(RTLIL::Cell * cell)
 struct ChformalPass : public Pass {
 	ChformalPass() : Pass("chformal", "change formal constraints of the design") {}
 
-	bool help_v2() override {
+	bool formatted_help() override {
 		auto *help = PrettyHelp::get_current();
 		help->set_group("formal");
 		help->usage("chformal [types] [mode] [options] [selection]");

From 33be9994883b84403c04da041005f70fb600af24 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:55 +1200
Subject: [PATCH 170/931] cmdref: Add cmd titles

Display subheadings for each command.
Remove now redundant toc entry for `yosys> help <cmd>` line.
---
 docs/util/cmdref.py    | 2 +-
 docs/util/newcmdref.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/util/cmdref.py b/docs/util/cmdref.py
index e471ea46d..1ef09dcf7 100644
--- a/docs/util/cmdref.py
+++ b/docs/util/cmdref.py
@@ -33,7 +33,7 @@ class TocNode(ObjectDescription):
         signode['ids'].append(idx)
 
     def _object_hierarchy_parts(self, sig_node: addnodes.desc_signature) -> tuple[str, ...]:
-        if 'fullname' not in sig_node:
+        if 'tocname' not in sig_node:
             return ()
 
         modname = sig_node.get('module')
diff --git a/docs/util/newcmdref.py b/docs/util/newcmdref.py
index a00df3095..e014c03e5 100644
--- a/docs/util/newcmdref.py
+++ b/docs/util/newcmdref.py
@@ -322,6 +322,10 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
         source_name = self.object.source_file
         source_line = self.object.source_line
 
+        title = f'{self.object.name} - {self.object.title}'
+        self.add_line(title, source_name, source_line)
+        self.add_line('#' * len(title), source_name, source_line)
+
         # cmd definition
         self.add_line(f'.. {domain}:{directive}:: {sig}', source_name, source_line)
         if self.object.title:

From c97b0084b78781446d293d240c8c691a3ce32104 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:34:55 +1200
Subject: [PATCH 171/931] Docs: Show warning on experimental cmds

---
 docs/util/newcmdref.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/util/newcmdref.py b/docs/util/newcmdref.py
index e014c03e5..07c93c0d1 100644
--- a/docs/util/newcmdref.py
+++ b/docs/util/newcmdref.py
@@ -340,6 +340,10 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
         source_name = self.object.source_file
         source_line = self.object.source_line
 
+        if self.object.experimental_flag:
+            self.add_line(f'.. warning:: This command is experimental', source_name, source_line)
+            self.add_line('\n', source_name)
+
         def render(content_list: YosysCmdContentListing, indent: int=0):
             content_source = content_list.source_file or source_name
             indent_str = '   '*indent

From 1529d991fd26f3efa326df8a4b02d5865e2dec8b Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:18 +1200
Subject: [PATCH 172/931] log_help: Refactor help content adding

Content is now added to the `ContentListing` rather than the `PrettyHelp`.
`open_*` methods return the `ContentListing` that was added instead of leaving a hanging continuation.
This allows for (e.g.) options to be added directly to optiongroups, instead of requiring that groups be closed before continuation.
This also means that all `PrettyHelp`s are a listing, with the actual log being called by the default `Pass::help()`; making the mode field redundant.
Added `PrettyHelp::log_help()` which replaces the `PrettyHelp::Mode::LOG` logic.
Added `ContentListing::back()` which just returns the last element of the underlying content vector.
Some of the content tracking was made redundant and removed, in particular `PrettyHelp::_current_listing` and `ContentListing::parent`.

Converted `ContentListing` to a class instead of a struct, adjusting constructors to match.
Added `ContentListing` constructor that accepts a `source_location`.

Update `HelpPass::dump_cmds_json()` for new log_help.
---
 kernel/log_help.cc      | 189 +++++++++++++---------------------------
 kernel/log_help.h       | 116 ++++++++++++------------
 kernel/register.cc      |  36 ++++----
 passes/cmds/chformal.cc |  54 ++++++------
 4 files changed, 167 insertions(+), 228 deletions(-)

diff --git a/kernel/log_help.cc b/kernel/log_help.cc
index 82967b0b6..7e103f83d 100644
--- a/kernel/log_help.cc
+++ b/kernel/log_help.cc
@@ -28,11 +28,56 @@ Json ContentListing::to_json() {
 	if (strcmp(source_file, "unknown") != 0) object["source_file"] = source_file;
 	if (source_line != 0) object["source_line"] = source_line;
 	Json::array content_array;
-	for (auto child : content) content_array.push_back(child->to_json());
+	for (auto child : _content) content_array.push_back(child->to_json());
 	object["content"] = content_array;
 	return object;
 }
 
+void ContentListing::usage(const string &usage,
+	const source_location location)
+{
+	log_assert(type.compare("root") == 0);
+	add_content("usage", usage, location);
+}
+
+void ContentListing::option(const string &text, const string &description,
+	const source_location location)
+{
+	auto option = open_option(text);
+	if (description.length())
+		option->add_content("text", description, location);
+}
+
+void ContentListing::codeblock(const string &code, const string &language,
+	const source_location location)
+{
+	add_content("code", code, location);
+}
+
+void ContentListing::paragraph(const string &text,
+	const source_location location)
+{
+	add_content("text", text, location);
+}
+
+ContentListing* ContentListing::open_optiongroup(const string &name,
+	const source_location location)
+{
+	log_assert(type.compare("root") == 0);
+	auto optiongroup = new ContentListing("optiongroup", name, location);
+	add_content(optiongroup);
+	return optiongroup;
+}
+
+ContentListing* ContentListing::open_option(const string &text,
+	const source_location location)
+{
+	log_assert(type.compare("optiongroup") == 0);
+	auto option = new ContentListing("option", text, location);
+	add_content(option);
+	return option;
+}
+
 #define MAX_LINE_LEN 80
 void log_pass_str(const std::string &pass_str, std::string indent_str, bool leading_newline=false) {
 	if (pass_str.empty())
@@ -66,15 +111,10 @@ void log_pass_str(const std::string &pass_str, int indent=0, bool leading_newlin
 
 PrettyHelp *current_help = nullptr;
 
-PrettyHelp::PrettyHelp(Mode mode)
+PrettyHelp::PrettyHelp()
 {
 	_prior = current_help;
-	_mode = mode;
-	_root_listing = ContentListing({
-		.type = "root"
-	});
-	_root_listing.type = "root";
-	_current_listing = &_root_listing;
+	_root_listing = ContentListing("root", "");
 
 	current_help = this;
 }
@@ -91,127 +131,22 @@ PrettyHelp *PrettyHelp::get_current()
 	return current_help;
 }
 
-void PrettyHelp::usage(const string &usage,
-	const source_location location)
+void PrettyHelp::log_help()
 {
-	switch (_mode)
-	{
-	case LOG:
-		log_pass_str(usage, _current_indent+1, true);
-		log("\n");
-		break;
-	case LISTING:
-		add_content("usage", usage, location);
-		break;
-	default:
-		log_abort();
-	}
-}
-
-void PrettyHelp::option(const string &text, const string &description,
-	const source_location location)
-{
-	open_option(text);
-	if (description.length()) {
-		switch (_mode)
-		{
-		case LOG:
-			log_pass_str(description, _current_indent);
+	for (auto content : _root_listing.get_content()) {
+		if (content->type.compare("usage") == 0) {
+			log_pass_str(content->body, 1, true);
+		} else if (content->type.compare("optiongroup") == 0) {
+			for (auto option : content->get_content()) {
+				log_pass_str(option->body, 1);
+				for (auto text : option->get_content()) {
+					log_pass_str(text->body, 2);
+					log("\n");
+				}
+			}
+		} else {
+			log_pass_str(content->body, 0, true);
 			log("\n");
-			break;
-		case LISTING:
-			add_content("text", description, location);
-			break;
-		default:
-			log_abort();
 		}
 	}
-	close(1);
-}
-
-void PrettyHelp::codeblock(const string &code, const string &language,
-	const source_location location)
-{
-	switch (_mode)
-	{
-	case LOG:
-		log("%s\n", code.c_str());
-		break;
-	case LISTING:
-		add_content("code", code, location);
-		break;
-	default:
-		log_abort();
-	}
-}
-
-void PrettyHelp::paragraph(const string &text,
-	const source_location location)
-{
-	switch (_mode)
-	{
-	case LOG:
-		log_pass_str(text, _current_indent);
-		log("\n");
-		break;
-	case LISTING:
-		add_content("text", text, location);
-		break;
-	default:
-		log_abort();
-	}
-}
-
-void PrettyHelp::open_optiongroup(const string &name,
-	const source_location location)
-{
-	switch (_mode)
-	{
-	case LOG:
-		break;
-	case LISTING:
-		push_content("optiongroup", name, location);
-		break;
-	default:
-		log_abort();
-	}
-	_current_indent += 1;
-}
-
-void PrettyHelp::open_option(const string &text,
-	const source_location location)
-{
-	switch (_mode)
-	{
-	case LOG:
-		log_pass_str(text, _current_indent);
-		break;
-	case LISTING:
-		push_content("option", text, location);
-		break;
-	default:
-		log_abort();
-	}
-	_current_indent += 1;
-}
-
-void PrettyHelp::close(int levels)
-{
-	
-	switch (_mode)
-	{
-	case LOG:
-		_current_indent -= levels;
-		log_assert(_current_indent >= 0);
-		break;
-	case LISTING:
-		for (int i=0; i<levels; i++) {
-			_current_indent--;
-			log_assert(_current_indent >= 0);
-			pop_content();
-		}
-		break;
-	default:
-		log_abort();
-	}
 }
diff --git a/kernel/log_help.h b/kernel/log_help.h
index 730d20c27..169b90ca2 100644
--- a/kernel/log_help.h
+++ b/kernel/log_help.h
@@ -25,73 +25,41 @@
 
 YOSYS_NAMESPACE_BEGIN
 
-struct ContentListing {
-	string type = "root";
-	string body = "";
-	const char* source_file = "unknown";
-	int source_line = 0;
-	vector<ContentListing *> content = {};
-	ContentListing *parent = nullptr;
+class ContentListing {
+	vector<ContentListing *> _content;
+public:
+	string type;
+	string body;
+	const char* source_file;
+	int source_line;
+
+	ContentListing(
+		string type = "root", string body = "",
+		const char* source_file = "unknown", int source_line = 0
+	) : type(type), body(body), source_file(source_file), source_line(source_line) {
+		_content = {};
+	}
+
+	ContentListing(string type, string body, source_location location) :
+		ContentListing(type, body, location.file_name(), location.line()) { }
 
 	void add_content(ContentListing *new_content) {
-		new_content->parent = this;
-		content.push_back(new_content);
+		_content.push_back(new_content);
 	}
 
 	void add_content(string type, string body, source_location location) {
-		auto new_content = new ContentListing();
-		new_content->type = type;
-		new_content->body = body;
-		new_content->source_file = location.file_name();
-		new_content->source_line = location.line();
+		auto new_content = new ContentListing(type, body, location);
 		add_content(new_content);
 	}
 
-	Json to_json();
-};
-
-class PrettyHelp
-{
-public:
-	string group = "unknown";
-	enum Mode {
-		LOG,
-		LISTING,
-	};
-
-private:
-	PrettyHelp *_prior;
-	Mode _mode;
-
-	int _current_indent = 0;
-	ContentListing _root_listing;
-	ContentListing *_current_listing;
-
-	void add_content(string type, string body, source_location location) {
-		_current_listing->add_content(type, body, location);
-	}
-	void push_content(string type, string body, source_location location) {
-		add_content(type, body, location);
-		_current_listing = _current_listing->content.back();
-	}
-	void pop_content() {
-		_current_listing = _current_listing->parent;
-		log_assert(_current_listing != nullptr);
-	}
-public:
-	PrettyHelp(Mode mode = LOG);
-	~PrettyHelp();
-
-	static PrettyHelp *get_current();
-
-	bool has_content() { return _root_listing.content.size();}
+	bool has_content() { return _content.size() != 0; }
 	const vector<ContentListing *> get_content() {
-		const vector<ContentListing *> content = _root_listing.content;
+		const vector<ContentListing *> content = _content;
 		return content;
 	}
-
-	void set_group(const string g) { group = g; }
-	bool has_group() { return group.compare("unknown") != 0; }
+	ContentListing* back() {
+		return _content.back();
+	}
 
 	void usage(
 		const string &usage,
@@ -112,15 +80,45 @@ public:
 		const source_location location = source_location::current()
 	);
 
-	void open_optiongroup(
+	ContentListing* open_optiongroup(
 		const string &name = "",
 		const source_location location = source_location::current()
 	);
-	void open_option(
+	ContentListing* open_option(
 		const string &text,
 		const source_location location = source_location::current()
 	);
-	void close(int levels = 1);
+
+	Json to_json();
+};
+
+class PrettyHelp
+{
+public:
+	string group = "unknown";
+
+private:
+	PrettyHelp *_prior;
+	ContentListing _root_listing;
+
+public:
+	PrettyHelp();
+	~PrettyHelp();
+
+	static PrettyHelp *get_current();
+
+	bool has_content() { return _root_listing.has_content(); }
+	const vector<ContentListing *> get_content() {
+		return _root_listing.get_content();
+	}
+	ContentListing* get_root() {
+		return &_root_listing;
+	}
+
+	void set_group(const string g) { group = g; }
+	bool has_group() { return group.compare("unknown") != 0; }
+
+	void log_help();
 };
 
 YOSYS_NAMESPACE_END
diff --git a/kernel/register.cc b/kernel/register.cc
index 2e68c3d85..cf8b9f638 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -118,7 +118,10 @@ void Pass::post_execute(Pass::pre_post_exec_state_t state)
 
 void Pass::help()
 {
-	if (!formatted_help()) {
+	auto prettyHelp = PrettyHelp();
+	if (formatted_help()) {
+		prettyHelp.log_help();
+	} else {
 		log("\n");
 		log("No help message for command `%s'.\n", pass_name.c_str());
 		log("\n");
@@ -824,7 +827,7 @@ struct HelpPass : public Pass {
 			auto title = pass->short_help;
 			auto experimental_flag = pass->experimental_flag;
 
-			auto cmd_help = PrettyHelp(PrettyHelp::Mode::LISTING);
+			auto cmd_help = PrettyHelp();
 			auto has_pretty_help = pass->formatted_help();
 
 			if (!has_pretty_help) {
@@ -837,6 +840,8 @@ struct HelpPass : public Pass {
 
 				source_location null_source;
 				string current_buffer = "";
+				auto root_listing = cmd_help.get_root();
+				auto current_listing = root_listing;
 
 				// dump command help
 				std::ostringstream buf;
@@ -859,7 +864,8 @@ struct HelpPass : public Pass {
 						switch (current_state)
 						{
 						case PUState_signature:
-							cmd_help.usage(current_buffer, null_source);
+							root_listing->usage(current_buffer, null_source);
+							current_listing = root_listing;
 							current_state = PUState_none;
 							current_buffer = "";
 							break;
@@ -886,16 +892,16 @@ struct HelpPass : public Pass {
 
 					if (IsSignature && first_pos <= 4 && (blank_lines >= 2 || current_state == PUState_signature)) {
 						if (current_state == PUState_options || current_state == PUState_optionbody) {
-							cmd_help.codeblock(current_buffer, "none", null_source);
+							current_listing->codeblock(current_buffer, "none", null_source);
 							current_buffer = "";
-							cmd_help.close(2);
 						} else if (current_state == PUState_signature) {
-							cmd_help.usage(current_buffer, null_source);
+							root_listing->usage(current_buffer, null_source);
 							current_buffer = "";
 						} else if (current_state == PUState_none && !current_buffer.empty()) {
-							cmd_help.codeblock(current_buffer, "none", null_source);
+							current_listing->codeblock(current_buffer, "none", null_source);
 							current_buffer = "";
 						}
+						current_listing = root_listing;
 						current_state = PUState_signature;
 						def_strip_count = first_pos;
 						catch_verific = false;
@@ -903,15 +909,15 @@ struct HelpPass : public Pass {
 						def_strip_count = first_pos;
 						if (current_state == PUState_optionbody) {
 							if (!current_buffer.empty()) {
-								cmd_help.codeblock(current_buffer, "none", null_source);
+								current_listing->codeblock(current_buffer, "none", null_source);
 								current_buffer = "";
 							}
 							if (IsIndent) {
 								current_state = PUState_options;
-								cmd_help.close(1);
+								current_listing = root_listing->back();
 							} else {
 								current_state = PUState_none;
-								cmd_help.close(2);
+								current_listing = root_listing;
 							}
 						} else {
 							current_state = PUState_none;
@@ -920,16 +926,16 @@ struct HelpPass : public Pass {
 
 					if (IsDefinition && !catch_verific && current_state != PUState_signature) {
 						if (!current_buffer.empty()) {
-							cmd_help.codeblock(current_buffer, "none", null_source);
+							current_listing->codeblock(current_buffer, "none", null_source);
 							current_buffer = "";
 						}
 						if (current_state == PUState_options || current_state == PUState_optionbody) {
-							cmd_help.close(1);
+							current_listing = root_listing->back();
 						}  else {
-							cmd_help.open_optiongroup("", null_source);
+							current_listing = root_listing->open_optiongroup("", null_source);
 						}
 						current_state = PUState_options;
-						cmd_help.open_option(stripped_line, null_source);
+						current_listing = current_listing->open_option(stripped_line, null_source);
 						def_strip_count = first_pos;
 					} else {
 						if (current_state == PUState_options) {
@@ -950,7 +956,7 @@ struct HelpPass : public Pass {
 				}
 
 				if (!current_buffer.empty()) {
-					cmd_help.codeblock(current_buffer, "none", null_source);
+					current_listing->codeblock(current_buffer, "none", null_source);
 					current_buffer = "";
 				}
 			}
diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index 8194b7365..53884b10f 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -76,58 +76,58 @@ struct ChformalPass : public Pass {
 	bool formatted_help() override {
 		auto *help = PrettyHelp::get_current();
 		help->set_group("formal");
-		help->usage("chformal [types] [mode] [options] [selection]");
-		help->paragraph(
+
+		auto content_root = help->get_root();
+
+		content_root->usage("chformal [types] [mode] [options] [selection]");
+		content_root->paragraph(
 			"Make changes to the formal constraints of the design. The [types] options "
 			"the type of constraint to operate on. If none of the following options are "
 			"given, the command will operate on all constraint types:"
 		);
 
-		help->open_optiongroup("[types]");
-		help->option("-assert", "`$assert` cells, representing ``assert(...)`` constraints");
-		help->option("-assume", "`$assume` cells, representing ``assume(...)`` constraints");
-		help->option("-live", "`$live` cells, representing ``assert(s_eventually ...)``");
-		help->option("-fair", "`$fair` cells, representing ``assume(s_eventually ...)``");
-		help->option("-cover", "`$cover` cells, representing ``cover()`` statements");
-		help->paragraph(
+		auto types_group = content_root->open_optiongroup("[types]");
+		types_group->option("-assert", "`$assert` cells, representing ``assert(...)`` constraints");
+		types_group->option("-assume", "`$assume` cells, representing ``assume(...)`` constraints");
+		types_group->option("-live", "`$live` cells, representing ``assert(s_eventually ...)``");
+		types_group->option("-fair", "`$fair` cells, representing ``assume(s_eventually ...)``");
+		types_group->option("-cover", "`$cover` cells, representing ``cover()`` statements");
+		types_group->paragraph(
 			"Additionally chformal will operate on `$check` cells corresponding to the "
 			"selected constraint types."
 		);
-		help->close();
 
-		help->paragraph("Exactly one of the following modes must be specified:");
+		content_root->paragraph("Exactly one of the following modes must be specified:");
 
-		help->open_optiongroup("[mode]");
-		help->option("-remove", "remove the cells and thus constraints from the design");
-		help->option("-early",
+		auto modes_group = content_root->open_optiongroup("[mode]");
+		modes_group->option("-remove", "remove the cells and thus constraints from the design");
+		modes_group->option("-early",
 			"bypass FFs that only delay the activation of a constraint. When inputs "
 			"of the bypassed FFs do not remain stable between clock edges, this may "
 			"result in unexpected behavior."
 		);
-		help->option("-delay <N>", "delay activation of the constraint by <N> clock cycles");
-		help->option("-skip <N>", "ignore activation of the constraint in the first <N> clock cycles");
-		help->open_option("-coverenable");
-		help->paragraph(
+		modes_group->option("-delay <N>", "delay activation of the constraint by <N> clock cycles");
+		modes_group->option("-skip <N>", "ignore activation of the constraint in the first <N> clock cycles");
+		auto cover_option = modes_group->open_option("-coverenable");
+		cover_option->paragraph(
 			"add cover statements for the enable signals of the constraints"
 		);
 #ifdef YOSYS_ENABLE_VERIFIC
-		help->paragraph(
+		cover_option->paragraph(
 			"Note: For the Verific frontend it is currently not guaranteed that a "
 			"reachable SVA statement corresponds to an active enable signal."
 		);
 #endif
-		help->close();
-		help->option("-assert2assume");
-		help->option("-assert2cover");
-		help->option("-assume2assert");
-		help->option("-live2fair");
-		help->option("-fair2live", "change the roles of cells as indicated. these options can be combined");
-		help->option("-lower",
+		modes_group->option("-assert2assume");
+		modes_group->option("-assert2cover");
+		modes_group->option("-assume2assert");
+		modes_group->option("-live2fair");
+		modes_group->option("-fair2live", "change the roles of cells as indicated. these options can be combined");
+		modes_group->option("-lower",
 			"convert each $check cell into an $assert, $assume, $live, $fair or "
 			"$cover cell. If the $check cell contains a message, also produce a "
 			"$print cell."
 		);
-		help->close();
 		return true;
 	}
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override

From d62a110dc80a2922dd7717420a23ff86f0fa3cbd Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:19 +1200
Subject: [PATCH 173/931] register.h: Add internal_flag to Pass

Update experimental pass warnings to use a shared function.  Reduces repetition, and also allows all of the warning flags to be combined (which at present is just experimental and the new internal).
Update `test_*` passes to call `internal()` in their constructors.
---
 backends/functional/test_generic.cc |  4 +++-
 kernel/register.cc                  | 35 ++++++++++++++++-------------
 kernel/register.h                   |  5 +++++
 passes/pmgen/test_pmgen.cc          |  4 +++-
 passes/tests/test_abcloop.cc        |  4 +++-
 passes/tests/test_autotb.cc         |  4 +++-
 passes/tests/test_cell.cc           |  4 +++-
 7 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/backends/functional/test_generic.cc b/backends/functional/test_generic.cc
index a9dfd0c70..42d6c2b95 100644
--- a/backends/functional/test_generic.cc
+++ b/backends/functional/test_generic.cc
@@ -116,7 +116,9 @@ struct MemContentsTest {
 
 struct FunctionalTestGeneric : public Pass
 {
-	FunctionalTestGeneric() : Pass("test_generic", "test the generic compute graph") {}
+	FunctionalTestGeneric() : Pass("test_generic", "test the generic compute graph") {
+		internal();
+	}
 
     void help() override
 	{
diff --git a/kernel/register.cc b/kernel/register.cc
index cf8b9f638..c3414f5db 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -693,6 +693,23 @@ static string get_cell_name(string name) {
 	return is_code_getter(name) ? name.substr(0, name.length()-1) : name;
 }
 
+static void log_warning_flags(Pass *pass) {
+	bool has_warnings = false;
+	const string name = pass->pass_name;
+	if (pass->experimental_flag) {
+		if (!has_warnings) log("\n");
+		has_warnings = true;
+		log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", name.c_str());
+	}
+	if (pass->internal_flag) {
+		if (!has_warnings) log("\n");
+		has_warnings = true;
+		log("WARNING: THE '%s' COMMAND IS INTENDED FOR INTERNAL DEVELOPER USE ONLY.\n", name.c_str());
+	}
+	if (has_warnings)
+		log("\n");
+}
+
 static struct CellHelpMessages {
 	dict<string, SimHelper> cell_help;
 	CellHelpMessages() {
@@ -1123,11 +1140,7 @@ struct HelpPass : public Pass {
 						log("=");
 					log("\n");
 					it.second->help();
-					if (it.second->experimental_flag) {
-						log("\n");
-						log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", it.first.c_str());
-						log("\n");
-					}
+					log_warning_flags(it.second);
 				}
 			}
 			else if (args[1] == "-cells") {
@@ -1147,22 +1160,14 @@ struct HelpPass : public Pass {
 					std::ostringstream buf;
 					log_streams.push_back(&buf);
 					it.second->help();
-					if (it.second->experimental_flag) {
-						log("\n");
-						log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", it.first.c_str());
-						log("\n");
-					}
+					log_warning_flags(it.second);
 					log_streams.pop_back();
 					write_cmd_rst(it.first, it.second->short_help, buf.str());
 				}
 			}
 			else if (pass_register.count(args[1])) {
 				pass_register.at(args[1])->help();
-				if (pass_register.at(args[1])->experimental_flag) {
-					log("\n");
-					log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", args[1].c_str());
-					log("\n");
-				}
+				log_warning_flags(pass_register.at(args[1]));
 			}
 			else if (cell_help_messages.contains(args[1])) {
 				auto help_cell = cell_help_messages.get(args[1]);
diff --git a/kernel/register.h b/kernel/register.h
index 537e1670d..e8c017c1d 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -69,11 +69,16 @@ struct Pass
 	int call_counter;
 	int64_t runtime_ns;
 	bool experimental_flag = false;
+	bool internal_flag = false;
 
 	void experimental() {
 		experimental_flag = true;
 	}
 
+	void internal() {
+		internal_flag = true;
+	}
+
 	struct pre_post_exec_state_t {
 		Pass *parent_pass;
 		int64_t begin_ns;
diff --git a/passes/pmgen/test_pmgen.cc b/passes/pmgen/test_pmgen.cc
index fc41848f7..892500850 100644
--- a/passes/pmgen/test_pmgen.cc
+++ b/passes/pmgen/test_pmgen.cc
@@ -117,7 +117,9 @@ void opt_eqpmux(test_pmgen_pm &pm)
 }
 
 struct TestPmgenPass : public Pass {
-	TestPmgenPass() : Pass("test_pmgen", "test pass for pmgen") { }
+	TestPmgenPass() : Pass("test_pmgen", "test pass for pmgen") {
+		internal();
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/tests/test_abcloop.cc b/passes/tests/test_abcloop.cc
index 9e7adaab1..ed54ce164 100644
--- a/passes/tests/test_abcloop.cc
+++ b/passes/tests/test_abcloop.cc
@@ -243,7 +243,9 @@ static void test_abcloop()
 }
 
 struct TestAbcloopPass : public Pass {
-	TestAbcloopPass() : Pass("test_abcloop", "automatically test handling of loops in abc command") { }
+	TestAbcloopPass() : Pass("test_abcloop", "automatically test handling of loops in abc command") {
+		internal();
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/tests/test_autotb.cc b/passes/tests/test_autotb.cc
index 404d1e48d..306e760ee 100644
--- a/passes/tests/test_autotb.cc
+++ b/passes/tests/test_autotb.cc
@@ -326,7 +326,9 @@ static void autotest(std::ostream &f, RTLIL::Design *design, int num_iter, int s
 }
 
 struct TestAutotbBackend : public Backend {
-	TestAutotbBackend() : Backend("=test_autotb", "generate simple test benches") { }
+	TestAutotbBackend() : Backend("=test_autotb", "generate simple test benches") {
+		internal();
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index a34eafc2f..b6385766c 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -705,7 +705,9 @@ static void run_eval_test(RTLIL::Design *design, bool verbose, bool nosat, std::
 }
 
 struct TestCellPass : public Pass {
-	TestCellPass() : Pass("test_cell", "automatically test the implementation of a cell type") { }
+	TestCellPass() : Pass("test_cell", "automatically test the implementation of a cell type") {
+		internal();
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|

From 14fdc9e76c09c08276544b8b2059cecadd814fc8 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:19 +1200
Subject: [PATCH 174/931] cmdref: Export internal_flag to json

Commands flagged as internal will display a warning, just like experimental commands.
Drop `passes/tests` group in favour of `internal` group, which is automatically assigned for any command without an assigned group which is flagged as internal.
---
 docs/source/cmd/index_internal.rst     |  5 +++++
 docs/source/cmd/index_passes_tests.rst |  5 -----
 docs/source/cmd_ref.rst                |  1 +
 docs/util/newcmdref.py                 |  9 ++++++++-
 kernel/register.cc                     | 10 +++++-----
 5 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 docs/source/cmd/index_internal.rst
 delete mode 100644 docs/source/cmd/index_passes_tests.rst

diff --git a/docs/source/cmd/index_internal.rst b/docs/source/cmd/index_internal.rst
new file mode 100644
index 000000000..c1b7f5eb8
--- /dev/null
+++ b/docs/source/cmd/index_internal.rst
@@ -0,0 +1,5 @@
+internal
+------------------
+
+.. autocmdgroup:: internal
+   :members:
diff --git a/docs/source/cmd/index_passes_tests.rst b/docs/source/cmd/index_passes_tests.rst
deleted file mode 100644
index 72453f55f..000000000
--- a/docs/source/cmd/index_passes_tests.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-passes/tests
-------------------
-
-.. autocmdgroup:: passes/tests
-   :members:
diff --git a/docs/source/cmd_ref.rst b/docs/source/cmd_ref.rst
index bc0707d67..37b6966ef 100644
--- a/docs/source/cmd_ref.rst
+++ b/docs/source/cmd_ref.rst
@@ -19,4 +19,5 @@ Command line reference
    /cmd/index_formal
    /cmd/index_passes*
    /cmd/index_techlibs
+   /cmd/index_internal
    /cmd/index_other
diff --git a/docs/util/newcmdref.py b/docs/util/newcmdref.py
index 07c93c0d1..61753fa57 100644
--- a/docs/util/newcmdref.py
+++ b/docs/util/newcmdref.py
@@ -53,6 +53,7 @@ class YosysCmd:
     source_line: int
     source_func: str
     experimental_flag: bool
+    internal_flag: bool
 
     def __init__(
             self,
@@ -62,7 +63,8 @@ class YosysCmd:
             source_file: str = "",
             source_line: int = 0,
             source_func: str = "",
-            experimental_flag: bool = False
+            experimental_flag: bool = False,
+            internal_flag: bool = False,
     ) -> None:
         self.name = name
         self.title = title
@@ -72,6 +74,7 @@ class YosysCmd:
         self.source_line = source_line
         self.source_func = source_func
         self.experimental_flag = experimental_flag
+        self.internal_flag = internal_flag
     
 class YosysCmdGroupDocumenter(Documenter):
     objtype = 'cmdgroup'
@@ -344,6 +347,10 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
             self.add_line(f'.. warning:: This command is experimental', source_name, source_line)
             self.add_line('\n', source_name)
 
+        if self.object.internal_flag:
+            self.add_line(f'.. warning:: This command is intended for internal developer use only', source_name, source_line)
+            self.add_line('\n', source_name)
+
         def render(content_list: YosysCmdContentListing, indent: int=0):
             content_source = content_list.source_file or source_name
             indent_str = '   '*indent
diff --git a/kernel/register.cc b/kernel/register.cc
index c3414f5db..b15b94411 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -842,7 +842,6 @@ struct HelpPass : public Pass {
 			auto name = it.first;
 			auto pass = it.second;
 			auto title = pass->short_help;
-			auto experimental_flag = pass->experimental_flag;
 
 			auto cmd_help = PrettyHelp();
 			auto has_pretty_help = pass->formatted_help();
@@ -982,7 +981,9 @@ struct HelpPass : public Pass {
 			if (!cmd_help.has_group()) {
 				string source_file = pass->location.file_name();
 				bool has_source = source_file.compare("unknown") != 0;
-				if (source_file.find("backends/") == 0 || (!has_source && name.find("read_") == 0))
+				if (pass->internal_flag)
+					cmd_help.group = "internal";
+				else if (source_file.find("backends/") == 0 || (!has_source && name.find("read_") == 0))
 					cmd_help.group = "backends";
 				else if (source_file.find("frontends/") == 0 || (!has_source && name.find("write_") == 0))
 					cmd_help.group = "frontends";
@@ -1006,8 +1007,6 @@ struct HelpPass : public Pass {
 					cmd_help.group = "passes/opt";
 				else if (name.find("proc") == 0)
 					cmd_help.group = "passes/proc";
-				else if (name.find("test") == 0)
-					cmd_help.group = "passes/tests";
 			}
 
 			if (groups.count(cmd_help.group) == 0) {
@@ -1026,7 +1025,8 @@ struct HelpPass : public Pass {
 			json.entry("source_file", pass->location.file_name());
 			json.entry("source_line", pass->location.line());
 			json.entry("source_func", pass->location.function_name());
-			json.entry("experimental_flag", experimental_flag);
+			json.entry("experimental_flag", pass->experimental_flag);
+			json.entry("internal_flag", pass->internal_flag);
 			json.end_object();
 		}
 		json.end_object();

From 0ec336ba238983c4072ab4a0f4bb5ba695fef2f7 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:19 +1200
Subject: [PATCH 175/931] Docs: Add :cmd:title: directive

Calling :cmd:title:`<cmd>` will generate a cross reference to `<cmd>`, but unlike :cmd:ref: which displays a literal block and puts the title (short_help) in the hovertext (the title field of an a-ref), :cmd:title: will display "<cmd> - <short_help>" as plain text.
Thus replacing the previous use case of referring to :doc:`cmd/<cmd>`.
Also refactor util py scripts to have more descriptive names.
---
 docs/source/conf.py                           |  6 ++--
 docs/source/getting_started/example_synth.rst | 30 +++++++++----------
 .../getting_started/scripting_intro.rst       |  4 +--
 .../interactive_investigation.rst             | 10 +++----
 .../more_scripting/load_design.rst            |  8 ++---
 .../using_yosys/more_scripting/selections.rst |  6 ++--
 docs/source/using_yosys/synthesis/synth.rst   |  2 +-
 docs/util/{cellref.py => cell_documenter.py}  |  0
 docs/util/{newcmdref.py => cmd_documenter.py} |  0
 docs/util/{cmdref.py => custom_directives.py} | 26 +++++++++++-----
 10 files changed, 52 insertions(+), 40 deletions(-)
 rename docs/util/{cellref.py => cell_documenter.py} (100%)
 rename docs/util/{newcmdref.py => cmd_documenter.py} (100%)
 rename docs/util/{cmdref.py => custom_directives.py} (97%)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 813befa47..725ac42bb 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -110,13 +110,13 @@ latex_elements = {
 
 # custom cmd-ref parsing/linking
 sys.path += [os.path.dirname(__file__) + "/../"]
-extensions.append('util.cmdref')
+extensions.append('util.custom_directives')
 
 # use autodocs
 extensions.append('sphinx.ext.autodoc')
-extensions.append('util.cellref')
+extensions.append('util.cell_documenter')
 cells_json = Path(__file__).parent / 'generated' / 'cells.json'
-extensions.append('util.newcmdref')
+extensions.append('util.cmd_documenter')
 cmds_json = Path(__file__).parent / 'generated' / 'cmds.json'
 
 from sphinx.application import Sphinx
diff --git a/docs/source/getting_started/example_synth.rst b/docs/source/getting_started/example_synth.rst
index c12acb3dc..ccf0d252b 100644
--- a/docs/source/getting_started/example_synth.rst
+++ b/docs/source/getting_started/example_synth.rst
@@ -143,8 +143,8 @@ line refers to the line numbers of the start/end of the corresponding ``always
 @`` block.  In the case of an ``initial`` block, we instead see the ``PROC``
 referring to line 0.
 
-To handle these, let us now introduce the next command: :cmd:ref:`proc`. `proc`
-is a macro command like `synth_ice40`.  Rather than modifying the design
+To handle these, let us now introduce the next command: :cmd:title:`proc`.
+`proc` is a macro command like `synth_ice40`.  Rather than modifying the design
 directly, it instead calls a series of other commands.  In the case of `proc`,
 these sub-commands work to convert the behavioral logic of processes into
 multiplexers and registers.  Let's see what happens when we run it.  For now, we
@@ -188,7 +188,7 @@ opt_expr <adv_opt_expr>`.
 
 .. note::
 
-   :cmd:ref:`clean` can also be called with two semicolons after any command,
+   :cmd:title:`clean` can also be called with two semicolons after any command,
    for example we could have called :yoscrypt:`opt_expr;;` instead of
    :yoscrypt:`opt_expr; clean`.  You may notice some scripts will end each line
    with ``;;``.  It is beneficial to run `clean` before inspecting intermediate
@@ -215,8 +215,8 @@ Note that if we tried to run this command now then we would get an error.  This
 is because we already removed all of the modules other than ``addr_gen``.  We
 could restart our shell session, but instead let's use two new commands:
 
-- :cmd:ref:`design`, and
-- :cmd:ref:`read_verilog`.
+- :cmd:title:`design`, and
+- :cmd:title:`read_verilog`.
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -251,7 +251,7 @@ our design won't run into this issue, we can skip the ``-defer``.
 We can also run `proc` now to finish off the full :ref:`synth_begin`. Because
 the design schematic is quite large, we will be showing just the data path for
 the ``rdata`` output.  If you would like to see the entire design for yourself,
-you can do so with :cmd:ref:`show`.  Note that the `show` command only works
+you can do so with :cmd:title:`show`.  Note that the `show` command only works
 with a single module, so you may need to call it with :yoscrypt:`show fifo`.
 :ref:`show_intro` section in :doc:`/getting_started/scripting_intro` has more on
 how to use `show`.
@@ -371,7 +371,7 @@ wasting time on something we know is impossible.
 Next up is :yoscrypt:`opt -nodffe -nosdff` performing a set of simple
 optimizations on the design.  This command also ensures that only a specific
 subset of FF types are included, in preparation for the next command:
-:cmd:ref:`fsm`.  Both `opt` and `fsm` are macro commands which are explored in
+:cmd:title:`fsm`.  Both `opt` and `fsm` are macro commands which are explored in
 more detail in :doc:`/using_yosys/synthesis/opt` and
 :doc:`/using_yosys/synthesis/fsm` respectively.
 
@@ -411,7 +411,7 @@ The next group of commands performs a series of optimizations:
    :caption: ``coarse`` section (part 2)
    :name: synth_coarse2
 
-First up is :cmd:ref:`wreduce`.  If we run this we get the following:
+First up is :cmd:title:`wreduce`.  If we run this we get the following:
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -432,7 +432,7 @@ the schematic and see the output of that cell has now changed.
 
    ``rdata`` output after `wreduce`
 
-The next two (new) commands are :cmd:ref:`peepopt` and :cmd:ref:`share`.
+The next two (new) commands are :cmd:title:`peepopt` and :cmd:title:`share`.
 Neither of these affect our design, and they're explored in more detail in
 :doc:`/using_yosys/synthesis/opt`, so let's skip over them.  :yoscrypt:`techmap
 -map +/cmp2lut.v -D LUT_WIDTH=4` optimizes certain comparison operators by
@@ -440,7 +440,7 @@ converting them to LUTs instead.  The usage of `techmap` is explored more in
 :doc:`/using_yosys/synthesis/techmap_synth`.
 
 Our next command to run is
-:cmd:ref:`memory_dff`.
+:cmd:title:`memory_dff`.
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -543,7 +543,7 @@ Once these cells have been inserted, the call to `opt` can combine cells which
 are now identical but may have been missed due to e.g. the difference between
 `$add` and `$sub`.
 
-The other new command in this part is :cmd:ref:`memory`.  `memory` is another
+The other new command in this part is :cmd:title:`memory`.  `memory` is another
 macro command which we examine in more detail in
 :doc:`/using_yosys/synthesis/memory`.  For this document, let us focus just on
 the step most relevant to our example: `memory_collect`. Up until this point,
@@ -793,9 +793,9 @@ tidy up:
 
 The new commands here are:
 
-- :cmd:ref:`autoname`,
-- :cmd:ref:`stat`, and
-- :cmd:ref:`blackbox`.
+- :cmd:title:`autoname`,
+- :cmd:title:`stat`, and
+- :cmd:title:`blackbox`.
 
 The output from `stat` is useful for checking resource utilization; providing a
 list of cells used in the design and the number of each, as well as the number
@@ -847,4 +847,4 @@ is beyond the scope of this documentation.
 
 .. _nextpnr: https://github.com/YosysHQ/nextpnr
 
-.. seealso:: :cmd:ref:`synth_ice40`
+.. seealso:: :cmd:title:`synth_ice40`
diff --git a/docs/source/getting_started/scripting_intro.rst b/docs/source/getting_started/scripting_intro.rst
index bc6782eaa..b9e2d395a 100644
--- a/docs/source/getting_started/scripting_intro.rst
+++ b/docs/source/getting_started/scripting_intro.rst
@@ -122,7 +122,7 @@ module.
 
 Detailed documentation of the select framework can be found under
 :doc:`/using_yosys/more_scripting/selections` or in the command reference at
-:cmd:ref:`select`.
+:cmd:title:`select`.
 
 .. _show_intro:
 
@@ -219,7 +219,7 @@ those used in options, must be a single expression instead.
 .. _GraphViz color docs: https://graphviz.org/doc/info/colors
 
 For all of the options available to `show`, check the command reference at
-:cmd:ref:`show`.
+:cmd:title:`show`.
 
 .. seealso:: :ref:`interactive_show` on the
    :doc:`/using_yosys/more_scripting/interactive_investigation` page.
diff --git a/docs/source/using_yosys/more_scripting/interactive_investigation.rst b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
index fa031f94e..5da8c04d4 100644
--- a/docs/source/using_yosys/more_scripting/interactive_investigation.rst
+++ b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
@@ -323,10 +323,10 @@ tools).
   design into an equivalent design that is easier to analyse.
 - Commands such as `eval` and `sat` can be used to investigate the behavior of
   the circuit.
-- :cmd:ref:`show`.
-- :cmd:ref:`dump`.
-- :cmd:ref:`add` and :cmd:ref:`delete` can be used to modify and reorganize a
-  design dynamically.
+- :cmd:title:`show`.
+- :cmd:title:`dump`.
+- :cmd:title:`add` and :cmd:title:`delete` can be used to modify and reorganize
+  a design dynamically.
   
 The code used is included in the Yosys code base under
 |code_examples/scrambler|_.
@@ -358,7 +358,7 @@ reorganizing a module in Yosys and checking the resulting circuit.
 .. figure:: /_images/code_examples/scrambler/scrambler_p02.*
     :class: width-helper invert-helper
 
-Analyzing the resulting circuit with :cmd:ref:`eval`:
+Analyzing the resulting circuit with :cmd:title:`eval`:
 
 .. todo:: replace inline code
 
diff --git a/docs/source/using_yosys/more_scripting/load_design.rst b/docs/source/using_yosys/more_scripting/load_design.rst
index 39e5711e6..d1e3e1cc0 100644
--- a/docs/source/using_yosys/more_scripting/load_design.rst
+++ b/docs/source/using_yosys/more_scripting/load_design.rst
@@ -31,10 +31,10 @@ keyword: Frontends
 
 .. note::
 
-   The Verific frontend for Yosys, which provides the :cmd:ref:`verific`
-   command, requires Yosys to be built with Verific.  For full functionality,
-   custom modifications to the Verific source code from YosysHQ are required,
-   but limited useability can be achieved with some stock Verific builds.  Check
+   The Verific frontend for Yosys, which provides the `verific` command,
+   requires Yosys to be built with Verific.  For full functionality, custom
+   modifications to the Verific source code from YosysHQ are required, but
+   limited useability can be achieved with some stock Verific builds.  Check
    :doc:`/yosys_internals/extending_yosys/build_verific` for more.
 
 Others:
diff --git a/docs/source/using_yosys/more_scripting/selections.rst b/docs/source/using_yosys/more_scripting/selections.rst
index 0b1fdbcb3..1f3912956 100644
--- a/docs/source/using_yosys/more_scripting/selections.rst
+++ b/docs/source/using_yosys/more_scripting/selections.rst
@@ -93,7 +93,7 @@ Special patterns can be used to select by object property or type. For example:
   A:blabla`
 - select all `$add` cells from the module foo: :yoscrypt:`select foo/t:$add`
 
-A complete list of pattern expressions can be found in :cmd:ref:`select`.
+A complete list of pattern expressions can be found in :cmd:title:`select`.
 
 Operations on selections
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -141,7 +141,7 @@ Some of the special ``%``-codes:
 - ``%i``: intersection of top two elements on stack -- pop 2, push 1
 - ``%n``: inverse of top element on stack -- pop 1, push 1
 
-See :cmd:ref:`select` for the full list.
+See :cmd:title:`select` for the full list.
 
 Expanding selections
 ^^^^^^^^^^^^^^^^^^^^
@@ -354,7 +354,7 @@ boolean operations such as intersection (``%i``) and difference (``%d``) are
 powerful tools for extracting the relevant portions of the circuit under
 investigation.
 
-Again, see :cmd:ref:`select` for full documentation of these expressions.
+Again, see :cmd:title:`select` for full documentation of these expressions.
 
 Incremental selection
 ^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/source/using_yosys/synthesis/synth.rst b/docs/source/using_yosys/synthesis/synth.rst
index 7a248ae29..db81d0790 100644
--- a/docs/source/using_yosys/synthesis/synth.rst
+++ b/docs/source/using_yosys/synthesis/synth.rst
@@ -15,7 +15,7 @@ General synthesis
 ~~~~~~~~~~~~~~~~~
 
 In addition to the above hardware-specific synth commands, there is also
-:cmd:ref:`prep`.  This command is limited to coarse-grain synthesis, without
+:cmd:title:`prep`.  This command is limited to coarse-grain synthesis, without
 getting into any architecture-specific mappings or optimizations.  Among other
 things, this is useful for design verification.
 
diff --git a/docs/util/cellref.py b/docs/util/cell_documenter.py
similarity index 100%
rename from docs/util/cellref.py
rename to docs/util/cell_documenter.py
diff --git a/docs/util/newcmdref.py b/docs/util/cmd_documenter.py
similarity index 100%
rename from docs/util/newcmdref.py
rename to docs/util/cmd_documenter.py
diff --git a/docs/util/cmdref.py b/docs/util/custom_directives.py
similarity index 97%
rename from docs/util/cmdref.py
rename to docs/util/custom_directives.py
index 1ef09dcf7..a263e06ab 100644
--- a/docs/util/cmdref.py
+++ b/docs/util/custom_directives.py
@@ -7,9 +7,8 @@ from typing import cast
 import warnings
 
 from docutils import nodes
-from docutils.nodes import Node, Element
+from docutils.nodes import Node, Element, Text
 from docutils.parsers.rst import directives
-from docutils.parsers.rst.roles import GenericRole
 from docutils.parsers.rst.states import Inliner
 from sphinx.application import Sphinx
 from sphinx.domains import Domain, Index
@@ -598,12 +597,17 @@ class PropIndex(TagIndex):
 
         return (ret, True)
 
+class TitleRefRole(XRefRole):
+    """XRefRole used which has the cmd title as the displayed text."""
+    pass
+
 class CommandDomain(Domain):
     name = 'cmd'
     label = 'Yosys commands'
 
     roles = {
-        'ref': XRefRole()
+        'ref': XRefRole(),
+        'title': TitleRefRole(),
     }
 
     directives = {
@@ -635,7 +639,7 @@ class CommandDomain(Domain):
 
     def resolve_xref(self, env, fromdocname, builder, typ,
                      target, node, contnode):
-        
+
         match = [(docname, anchor, name)
                  for name, sig, typ, docname, anchor, prio
                  in self.get_objects() if sig == target]
@@ -645,9 +649,17 @@ class CommandDomain(Domain):
             targ = match[0][1]
             qual_name = match[0][2]
             title = self.data['obj2title'].get(qual_name, targ)
-            
-            return make_refnode(builder,fromdocname,todocname,
-                                targ, contnode, title)
+
+            if typ == 'title':
+                # caller wants the title in the content of the node
+                cmd = contnode.astext()
+                contnode = Text(f'{cmd} - {title}')
+                return make_refnode(builder, fromdocname, todocname,
+                                    targ, contnode)
+            else:
+                # cmd title as hover text
+                return make_refnode(builder, fromdocname, todocname,
+                                    targ, contnode, title)
         else:
             print(f"Missing ref for {target} in {fromdocname} ")
             return None

From 37782cb92bb6181d95d60b4875630409b59abe9e Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:56 +1200
Subject: [PATCH 176/931] Docs: Grouping changes

Keep techlibs folder hierarchy.
techlibs/* and passes/* groups are now nested under index_techlibs and index_passes respectively, with most (all?) of the passes/* pages getting proper headings, as well as backends/frontends/kernel.  `index_passes_techmap` also references `index_techlibs`.
Split command reference toc in twain, one with maxdepth=2 and one with maxdepth=3, since passes and techlibs now have an extra level of nesting.
Move the `cmd_ref` link to the command reference, instead of top of the page.
Remove `index_internal` and `index_other` from the toc, and mark the pages as orphan. Internal commands get a note callout after the command reference toc (although this doesn't work for the pdf build), while other commands are linked in the warning for missing `source_location` (since that *should* be the only time when there are any commands in the "unknown" group).
Update autodoc extension versions, and mark the directives extension as not `parallel_read_safe` (it might be, but I'm not sure about how the xref lookups work if it is parallel so better to be safe).
---
 docs/source/cmd/index_backends.rst            |  4 +--
 docs/source/cmd/index_frontends.rst           |  4 +--
 docs/source/cmd/index_internal.rst            |  2 ++
 docs/source/cmd/index_kernel.rst              |  4 +--
 docs/source/cmd/index_other.rst               |  2 ++
 docs/source/cmd/index_passes.rst              | 14 ++++++++++
 docs/source/cmd/index_passes_cmds.rst         |  4 +--
 docs/source/cmd/index_passes_equiv.rst        |  4 +--
 docs/source/cmd/index_passes_fsm.rst          |  4 +--
 docs/source/cmd/index_passes_hierarchy.rst    |  2 +-
 docs/source/cmd/index_passes_memory.rst       |  4 +--
 docs/source/cmd/index_passes_opt.rst          |  4 +--
 docs/source/cmd/index_passes_proc.rst         |  4 +--
 docs/source/cmd/index_passes_sat.rst          |  2 +-
 docs/source/cmd/index_passes_techmap.rst      |  4 ++-
 docs/source/cmd/index_techlibs.rst            | 14 ++++++----
 docs/source/cmd/index_techlibs_achronix.rst   |  5 ++++
 docs/source/cmd/index_techlibs_anlogic.rst    |  5 ++++
 docs/source/cmd/index_techlibs_common.rst     |  5 ++++
 .../source/cmd/index_techlibs_coolrunner2.rst |  5 ++++
 docs/source/cmd/index_techlibs_easic.rst      |  5 ++++
 docs/source/cmd/index_techlibs_ecp5.rst       |  5 ++++
 docs/source/cmd/index_techlibs_fabulous.rst   |  5 ++++
 docs/source/cmd/index_techlibs_gatemate.rst   |  5 ++++
 docs/source/cmd/index_techlibs_gowin.rst      |  5 ++++
 docs/source/cmd/index_techlibs_greenpak4.rst  |  5 ++++
 docs/source/cmd/index_techlibs_ice40.rst      |  5 ++++
 docs/source/cmd/index_techlibs_intel.rst      |  5 ++++
 docs/source/cmd/index_techlibs_intel_alm.rst  |  5 ++++
 docs/source/cmd/index_techlibs_lattice.rst    |  5 ++++
 docs/source/cmd/index_techlibs_microchip.rst  |  5 ++++
 docs/source/cmd/index_techlibs_nanoxplore.rst |  5 ++++
 docs/source/cmd/index_techlibs_nexus.rst      |  5 ++++
 docs/source/cmd/index_techlibs_quicklogic.rst |  5 ++++
 docs/source/cmd/index_techlibs_sf2.rst        |  5 ++++
 docs/source/cmd/index_techlibs_xilinx.rst     |  5 ++++
 docs/source/cmd_ref.rst                       | 28 +++++++++++++------
 docs/source/index.rst                         |  2 +-
 docs/util/cmd_documenter.py                   | 11 ++++++--
 docs/util/custom_directives.py                |  5 +++-
 kernel/register.cc                            |  2 --
 41 files changed, 183 insertions(+), 41 deletions(-)
 create mode 100644 docs/source/cmd/index_passes.rst
 create mode 100644 docs/source/cmd/index_techlibs_achronix.rst
 create mode 100644 docs/source/cmd/index_techlibs_anlogic.rst
 create mode 100644 docs/source/cmd/index_techlibs_common.rst
 create mode 100644 docs/source/cmd/index_techlibs_coolrunner2.rst
 create mode 100644 docs/source/cmd/index_techlibs_easic.rst
 create mode 100644 docs/source/cmd/index_techlibs_ecp5.rst
 create mode 100644 docs/source/cmd/index_techlibs_fabulous.rst
 create mode 100644 docs/source/cmd/index_techlibs_gatemate.rst
 create mode 100644 docs/source/cmd/index_techlibs_gowin.rst
 create mode 100644 docs/source/cmd/index_techlibs_greenpak4.rst
 create mode 100644 docs/source/cmd/index_techlibs_ice40.rst
 create mode 100644 docs/source/cmd/index_techlibs_intel.rst
 create mode 100644 docs/source/cmd/index_techlibs_intel_alm.rst
 create mode 100644 docs/source/cmd/index_techlibs_lattice.rst
 create mode 100644 docs/source/cmd/index_techlibs_microchip.rst
 create mode 100644 docs/source/cmd/index_techlibs_nanoxplore.rst
 create mode 100644 docs/source/cmd/index_techlibs_nexus.rst
 create mode 100644 docs/source/cmd/index_techlibs_quicklogic.rst
 create mode 100644 docs/source/cmd/index_techlibs_sf2.rst
 create mode 100644 docs/source/cmd/index_techlibs_xilinx.rst

diff --git a/docs/source/cmd/index_backends.rst b/docs/source/cmd/index_backends.rst
index fada942d8..373c26def 100644
--- a/docs/source/cmd/index_backends.rst
+++ b/docs/source/cmd/index_backends.rst
@@ -1,5 +1,5 @@
-backends
-------------------
+Writing output files
+--------------------
 
 .. autocmdgroup:: backends
    :members:
diff --git a/docs/source/cmd/index_frontends.rst b/docs/source/cmd/index_frontends.rst
index cf046e2db..b64fdc9b9 100644
--- a/docs/source/cmd/index_frontends.rst
+++ b/docs/source/cmd/index_frontends.rst
@@ -1,5 +1,5 @@
-frontends
-------------------
+Reading input files
+-------------------
 
 .. autocmdgroup:: frontends
    :members:
diff --git a/docs/source/cmd/index_internal.rst b/docs/source/cmd/index_internal.rst
index c1b7f5eb8..127010980 100644
--- a/docs/source/cmd/index_internal.rst
+++ b/docs/source/cmd/index_internal.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 internal
 ------------------
 
diff --git a/docs/source/cmd/index_kernel.rst b/docs/source/cmd/index_kernel.rst
index c3f323e16..c6891b5e5 100644
--- a/docs/source/cmd/index_kernel.rst
+++ b/docs/source/cmd/index_kernel.rst
@@ -1,5 +1,5 @@
-kernel
-------------------
+Yosys kernel commands
+---------------------
 
 .. autocmdgroup:: kernel
    :members:
diff --git a/docs/source/cmd/index_other.rst b/docs/source/cmd/index_other.rst
index abd41bcdc..540cf9e49 100644
--- a/docs/source/cmd/index_other.rst
+++ b/docs/source/cmd/index_other.rst
@@ -1,3 +1,5 @@
+:orphan:
+
 Other commands
 ==============
 
diff --git a/docs/source/cmd/index_passes.rst b/docs/source/cmd/index_passes.rst
new file mode 100644
index 000000000..b652be004
--- /dev/null
+++ b/docs/source/cmd/index_passes.rst
@@ -0,0 +1,14 @@
+Passes
+------
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+
+   /cmd/index_passes_hierarchy
+   /cmd/index_passes_proc
+   /cmd/index_passes_fsm
+   /cmd/index_passes_memory
+   /cmd/index_passes_opt
+   /cmd/index_passes_techmap
+   /cmd/index_passes_*
diff --git a/docs/source/cmd/index_passes_cmds.rst b/docs/source/cmd/index_passes_cmds.rst
index 6d2c5026d..c7d9fa0a3 100644
--- a/docs/source/cmd/index_passes_cmds.rst
+++ b/docs/source/cmd/index_passes_cmds.rst
@@ -1,5 +1,5 @@
-passes/cmds
-------------------
+General passes
+--------------
 
 .. autocmdgroup:: passes/cmds
    :members:
diff --git a/docs/source/cmd/index_passes_equiv.rst b/docs/source/cmd/index_passes_equiv.rst
index 5b0bc2741..6ed2c3c18 100644
--- a/docs/source/cmd/index_passes_equiv.rst
+++ b/docs/source/cmd/index_passes_equiv.rst
@@ -1,5 +1,5 @@
-passes/equiv
-------------------
+Equivalence checking
+--------------------
 
 .. autocmdgroup:: passes/equiv
    :members:
diff --git a/docs/source/cmd/index_passes_fsm.rst b/docs/source/cmd/index_passes_fsm.rst
index ddb2a9168..43af5dce6 100644
--- a/docs/source/cmd/index_passes_fsm.rst
+++ b/docs/source/cmd/index_passes_fsm.rst
@@ -1,5 +1,5 @@
-passes/fsm
-------------------
+FSM handling
+------------
 
 .. autocmdgroup:: passes/fsm
    :members:
diff --git a/docs/source/cmd/index_passes_hierarchy.rst b/docs/source/cmd/index_passes_hierarchy.rst
index 1d9f237c7..2032be636 100644
--- a/docs/source/cmd/index_passes_hierarchy.rst
+++ b/docs/source/cmd/index_passes_hierarchy.rst
@@ -1,4 +1,4 @@
-passes/hierarchy
+hierarchy
 ------------------
 
 .. autocmdgroup:: passes/hierarchy
diff --git a/docs/source/cmd/index_passes_memory.rst b/docs/source/cmd/index_passes_memory.rst
index 74c044135..b4edb88e7 100644
--- a/docs/source/cmd/index_passes_memory.rst
+++ b/docs/source/cmd/index_passes_memory.rst
@@ -1,5 +1,5 @@
-passes/memory
-------------------
+Memory handling
+---------------
 
 .. autocmdgroup:: passes/memory
    :members:
diff --git a/docs/source/cmd/index_passes_opt.rst b/docs/source/cmd/index_passes_opt.rst
index 66d78b74a..ddeb5ce10 100644
--- a/docs/source/cmd/index_passes_opt.rst
+++ b/docs/source/cmd/index_passes_opt.rst
@@ -1,5 +1,5 @@
-passes/opt
-------------------
+Optimization passes
+-------------------
 
 .. autocmdgroup:: passes/opt
    :members:
diff --git a/docs/source/cmd/index_passes_proc.rst b/docs/source/cmd/index_passes_proc.rst
index 05081f29a..1ad8d85b4 100644
--- a/docs/source/cmd/index_passes_proc.rst
+++ b/docs/source/cmd/index_passes_proc.rst
@@ -1,5 +1,5 @@
-passes/proc
-------------------
+Converting process blocks
+-------------------------
 
 .. autocmdgroup:: passes/proc
    :members:
diff --git a/docs/source/cmd/index_passes_sat.rst b/docs/source/cmd/index_passes_sat.rst
index af041b040..1f2c6904d 100644
--- a/docs/source/cmd/index_passes_sat.rst
+++ b/docs/source/cmd/index_passes_sat.rst
@@ -1,4 +1,4 @@
-passes/sat
+sat
 ------------------
 
 .. autocmdgroup:: passes/sat
diff --git a/docs/source/cmd/index_passes_techmap.rst b/docs/source/cmd/index_passes_techmap.rst
index fa9b54575..1682cd181 100644
--- a/docs/source/cmd/index_passes_techmap.rst
+++ b/docs/source/cmd/index_passes_techmap.rst
@@ -1,5 +1,7 @@
-passes/techmap
+Technology mapping
 ------------------
 
+.. seealso:: :doc:`/cmd/index_techlibs`
+
 .. autocmdgroup:: passes/techmap
    :members:
diff --git a/docs/source/cmd/index_techlibs.rst b/docs/source/cmd/index_techlibs.rst
index c80fccf5f..043620a3b 100644
--- a/docs/source/cmd/index_techlibs.rst
+++ b/docs/source/cmd/index_techlibs.rst
@@ -1,9 +1,11 @@
-techlibs
-------------------
+Technology libraries
+====================
 
-.. TODO:: disambiguate `synth_intel` and `synth_intel_alm`
+Listed in alphabetical order.
 
-   (MAX10, Cyclone IV) and (Cyclone V, Arria V, Cyclone 10 GX) respectively
+.. toctree::
+   :maxdepth: 2
+   :glob:
 
-.. autocmdgroup:: techlibs
-   :members:
+   /cmd/index_techlibs_common
+   /cmd/index_techlibs_*
diff --git a/docs/source/cmd/index_techlibs_achronix.rst b/docs/source/cmd/index_techlibs_achronix.rst
new file mode 100644
index 000000000..babf4e979
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_achronix.rst
@@ -0,0 +1,5 @@
+achronix
+------------------
+
+.. autocmdgroup:: techlibs/achronix
+   :members:
diff --git a/docs/source/cmd/index_techlibs_anlogic.rst b/docs/source/cmd/index_techlibs_anlogic.rst
new file mode 100644
index 000000000..13ef12fc7
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_anlogic.rst
@@ -0,0 +1,5 @@
+anlogic
+------------------
+
+.. autocmdgroup:: techlibs/anlogic
+   :members:
diff --git a/docs/source/cmd/index_techlibs_common.rst b/docs/source/cmd/index_techlibs_common.rst
new file mode 100644
index 000000000..532f4291e
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_common.rst
@@ -0,0 +1,5 @@
+Generic
+------------------
+
+.. autocmdgroup:: techlibs/common
+   :members:
diff --git a/docs/source/cmd/index_techlibs_coolrunner2.rst b/docs/source/cmd/index_techlibs_coolrunner2.rst
new file mode 100644
index 000000000..23e87d03e
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_coolrunner2.rst
@@ -0,0 +1,5 @@
+coolrunner2
+------------------
+
+.. autocmdgroup:: techlibs/coolrunner2
+   :members:
diff --git a/docs/source/cmd/index_techlibs_easic.rst b/docs/source/cmd/index_techlibs_easic.rst
new file mode 100644
index 000000000..0cd375f11
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_easic.rst
@@ -0,0 +1,5 @@
+easic
+------------------
+
+.. autocmdgroup:: techlibs/easic
+   :members:
diff --git a/docs/source/cmd/index_techlibs_ecp5.rst b/docs/source/cmd/index_techlibs_ecp5.rst
new file mode 100644
index 000000000..42a12e8e9
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_ecp5.rst
@@ -0,0 +1,5 @@
+ecp5
+------------------
+
+.. autocmdgroup:: techlibs/ecp5
+   :members:
diff --git a/docs/source/cmd/index_techlibs_fabulous.rst b/docs/source/cmd/index_techlibs_fabulous.rst
new file mode 100644
index 000000000..ce075c025
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_fabulous.rst
@@ -0,0 +1,5 @@
+fabulous
+------------------
+
+.. autocmdgroup:: techlibs/fabulous
+   :members:
diff --git a/docs/source/cmd/index_techlibs_gatemate.rst b/docs/source/cmd/index_techlibs_gatemate.rst
new file mode 100644
index 000000000..5a362b0fe
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_gatemate.rst
@@ -0,0 +1,5 @@
+gatemate
+------------------
+
+.. autocmdgroup:: techlibs/gatemate
+   :members:
diff --git a/docs/source/cmd/index_techlibs_gowin.rst b/docs/source/cmd/index_techlibs_gowin.rst
new file mode 100644
index 000000000..379cb773e
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_gowin.rst
@@ -0,0 +1,5 @@
+gowin
+------------------
+
+.. autocmdgroup:: techlibs/gowin
+   :members:
diff --git a/docs/source/cmd/index_techlibs_greenpak4.rst b/docs/source/cmd/index_techlibs_greenpak4.rst
new file mode 100644
index 000000000..1f733488d
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_greenpak4.rst
@@ -0,0 +1,5 @@
+greenpak4
+------------------
+
+.. autocmdgroup:: techlibs/greenpak4
+   :members:
diff --git a/docs/source/cmd/index_techlibs_ice40.rst b/docs/source/cmd/index_techlibs_ice40.rst
new file mode 100644
index 000000000..3d04fee05
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_ice40.rst
@@ -0,0 +1,5 @@
+ice40
+------------------
+
+.. autocmdgroup:: techlibs/ice40
+   :members:
diff --git a/docs/source/cmd/index_techlibs_intel.rst b/docs/source/cmd/index_techlibs_intel.rst
new file mode 100644
index 000000000..6b3a26222
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_intel.rst
@@ -0,0 +1,5 @@
+Intel (MAX10, Cyclone IV)
+-------------------------
+
+.. autocmdgroup:: techlibs/intel
+   :members:
diff --git a/docs/source/cmd/index_techlibs_intel_alm.rst b/docs/source/cmd/index_techlibs_intel_alm.rst
new file mode 100644
index 000000000..afadfc13e
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_intel_alm.rst
@@ -0,0 +1,5 @@
+Intel ALM (Cyclone V, Arria V, Cyclone 10 GX)
+---------------------------------------------
+
+.. autocmdgroup:: techlibs/intel_alm
+   :members:
diff --git a/docs/source/cmd/index_techlibs_lattice.rst b/docs/source/cmd/index_techlibs_lattice.rst
new file mode 100644
index 000000000..55bed7afc
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_lattice.rst
@@ -0,0 +1,5 @@
+lattice
+------------------
+
+.. autocmdgroup:: techlibs/lattice
+   :members:
diff --git a/docs/source/cmd/index_techlibs_microchip.rst b/docs/source/cmd/index_techlibs_microchip.rst
new file mode 100644
index 000000000..79340febc
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_microchip.rst
@@ -0,0 +1,5 @@
+microchip
+------------------
+
+.. autocmdgroup:: techlibs/microchip
+   :members:
diff --git a/docs/source/cmd/index_techlibs_nanoxplore.rst b/docs/source/cmd/index_techlibs_nanoxplore.rst
new file mode 100644
index 000000000..c941c32ba
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_nanoxplore.rst
@@ -0,0 +1,5 @@
+nanoxplore
+------------------
+
+.. autocmdgroup:: techlibs/nanoxplore
+   :members:
diff --git a/docs/source/cmd/index_techlibs_nexus.rst b/docs/source/cmd/index_techlibs_nexus.rst
new file mode 100644
index 000000000..a0289a571
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_nexus.rst
@@ -0,0 +1,5 @@
+nexus
+------------------
+
+.. autocmdgroup:: techlibs/nexus
+   :members:
diff --git a/docs/source/cmd/index_techlibs_quicklogic.rst b/docs/source/cmd/index_techlibs_quicklogic.rst
new file mode 100644
index 000000000..d11d4faca
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_quicklogic.rst
@@ -0,0 +1,5 @@
+quicklogic
+------------------
+
+.. autocmdgroup:: techlibs/quicklogic
+   :members:
diff --git a/docs/source/cmd/index_techlibs_sf2.rst b/docs/source/cmd/index_techlibs_sf2.rst
new file mode 100644
index 000000000..b97f96c9d
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_sf2.rst
@@ -0,0 +1,5 @@
+sf2
+------------------
+
+.. autocmdgroup:: techlibs/sf2
+   :members:
diff --git a/docs/source/cmd/index_techlibs_xilinx.rst b/docs/source/cmd/index_techlibs_xilinx.rst
new file mode 100644
index 000000000..5ce3d115b
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_xilinx.rst
@@ -0,0 +1,5 @@
+xilinx
+------------------
+
+.. autocmdgroup:: techlibs/xilinx
+   :members:
diff --git a/docs/source/cmd_ref.rst b/docs/source/cmd_ref.rst
index 37b6966ef..73a383ad5 100644
--- a/docs/source/cmd_ref.rst
+++ b/docs/source/cmd_ref.rst
@@ -1,5 +1,3 @@
-.. _cmd_ref:
-
 ================================================================================
 Command line reference
 ================================================================================
@@ -7,17 +5,31 @@ Command line reference
 .. literalinclude:: /generated/yosys
     :start-at: Usage
 
+.. _cmd_ref:
+
+Command reference
+-----------------
+
+.. todo:: Can we warn on command groups that aren't included anywhere?
+
 .. toctree::
-   :caption: Command reference
    :maxdepth: 2
-   :glob:
 
    /appendix/env_vars
-   /cmd/index_backends
    /cmd/index_frontends
+   /cmd/index_backends
    /cmd/index_kernel
    /cmd/index_formal
-   /cmd/index_passes*
+
+.. toctree::
+   :maxdepth: 3
+
+   /cmd/index_passes
    /cmd/index_techlibs
-   /cmd/index_internal
-   /cmd/index_other
+
+.. TODO:: Fix index_internal not being included in pdf
+
+.. note::
+
+   Commands intended for internal developer use can also be found under
+   :doc:`/cmd/index_internal`
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 61dc114ef..403100093 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -5,7 +5,7 @@ Yosys Open SYnthesis Suite
 Yosys is an open source framework for RTL synthesis.  To learn more about Yosys,
 see :doc:`/introduction`.  For a quick guide on how to get started using Yosys,
 check out :doc:`/getting_started/index`.  For the complete list of commands
-available, go to :ref:`commandindex`.
+available, go to :ref:`cmd_ref`.
 
 .. todo:: look into command ref improvements
 
diff --git a/docs/util/cmd_documenter.py b/docs/util/cmd_documenter.py
index 61753fa57..52f3d2cf4 100644
--- a/docs/util/cmd_documenter.py
+++ b/docs/util/cmd_documenter.py
@@ -228,13 +228,20 @@ class YosysCmdGroupDocumenter(Documenter):
 
         sourcename = self.get_sourcename()
 
-        if not self.import_object():
+        imported_object = self.import_object();
+        if self.lib_key == 'groups' and self.name == 'unknown':
+            if imported_object:
+                logger.warning(f"Found commands assigned to group {self.name}: {[x[0] for x in self.object]}", type='cmdref')
+            else:
+                return
+        elif not imported_object:
             log_msg = f"unable to load {self.name} with {type(self)}"
             if self.lib_key == 'groups':
                 logger.info(log_msg, type = 'cmdref')
                 self.add_line(f'.. warning:: No commands found for group {self.name!r}', sourcename)
                 self.add_line('', sourcename)
                 self.add_line('   Documentation may have been built without ``source_location`` support.', sourcename)
+                self.add_line('   Try check :doc:`/cmd/index_other`.', sourcename)
             else:
                 logger.warning(log_msg, type = 'cmdref')
             return
@@ -401,6 +408,6 @@ def setup(app: Sphinx) -> dict[str, Any]:
     app.add_autodocumenter(YosysCmdGroupDocumenter)
     app.add_autodocumenter(YosysCmdDocumenter)
     return {
-        'version': '1',
+        'version': '2',
         'parallel_read_safe': True,
     }
diff --git a/docs/util/custom_directives.py b/docs/util/custom_directives.py
index a263e06ab..041472386 100644
--- a/docs/util/custom_directives.py
+++ b/docs/util/custom_directives.py
@@ -735,4 +735,7 @@ def setup(app: Sphinx):
 
     app.add_role('autoref', autoref)
     
-    return {'version': '0.2'}
+    return {
+        'version': '0.3',    
+        'parallel_read_safe': False,
+    }
diff --git a/kernel/register.cc b/kernel/register.cc
index b15b94411..a688146ed 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -987,8 +987,6 @@ struct HelpPass : public Pass {
 					cmd_help.group = "backends";
 				else if (source_file.find("frontends/") == 0 || (!has_source && name.find("write_") == 0))
 					cmd_help.group = "frontends";
-				else if (source_file.find("techlibs/") == 0 || (!has_source && name.find("synth_") == 0))
-					cmd_help.group = "techlibs";
 				else if (has_source) {
 					auto last_slash = source_file.find_last_of('/');
 					if (last_slash != string::npos) {

From 92ab1251134f4eba7df45843c20e8529a3e22653 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:56 +1200
Subject: [PATCH 177/931] cmdref: Assigning cmds to formal group

Give formal index a proper title.
Use `Pass::formatted_help()` to assign the group, but still return `false` because the help text still comes from `Pass::help()`.
Tidy up some of the affected files' includes to make use of the shared `yosys.h` includes.
---
 docs/source/cmd/index_formal.rst |  4 ++--
 passes/cmds/dft_tag.cc           |  6 ++++++
 passes/cmds/future.cc            |  6 ++++++
 passes/cmds/glift.cc             | 11 ++++++++---
 passes/cmds/xprop.cc             |  6 ++++++
 passes/sat/assertpmux.cc         |  6 ++++++
 passes/sat/async2sync.cc         |  6 ++++++
 passes/sat/clk2fflogic.cc        |  6 ++++++
 passes/sat/cutpoint.cc           |  6 ++++++
 passes/sat/fmcombine.cc          |  6 ++++++
 passes/sat/fminit.cc             |  6 ++++++
 passes/sat/formalff.cc           |  6 ++++++
 passes/sat/freduce.cc            | 14 +++++++-------
 passes/sat/miter.cc              | 10 +++++++---
 passes/sat/mutate.cc             |  6 ++++++
 passes/sat/qbfsat.cc             |  6 ++++++
 passes/sat/sat.cc                | 14 +++++++-------
 passes/sat/supercover.cc         |  6 ++++++
 passes/sat/synthprop.cc          |  8 ++++++++
 19 files changed, 117 insertions(+), 22 deletions(-)

diff --git a/docs/source/cmd/index_formal.rst b/docs/source/cmd/index_formal.rst
index 53701a437..b8b134c17 100644
--- a/docs/source/cmd/index_formal.rst
+++ b/docs/source/cmd/index_formal.rst
@@ -1,5 +1,5 @@
-formal
-------------------
+Formal verification
+-------------------
 
 .. autocmdgroup:: formal
    :members:
diff --git a/passes/cmds/dft_tag.cc b/passes/cmds/dft_tag.cc
index b6afe6f89..347c8efa4 100644
--- a/passes/cmds/dft_tag.cc
+++ b/passes/cmds/dft_tag.cc
@@ -22,6 +22,7 @@
 #include "kernel/modtools.h"
 #include "kernel/sigtools.h"
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -952,6 +953,11 @@ struct DftTagWorker {
 
 struct DftTagPass : public Pass {
 	DftTagPass() : Pass("dft_tag", "create tagging logic for data flow tracking") {}
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/future.cc b/passes/cmds/future.cc
index b03613c9b..5dcf46bcf 100644
--- a/passes/cmds/future.cc
+++ b/passes/cmds/future.cc
@@ -24,6 +24,7 @@
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -110,6 +111,11 @@ struct FutureWorker {
 
 struct FuturePass : public Pass {
 	FuturePass() : Pass("future", "resolve future sampled value functions") {}
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/glift.cc b/passes/cmds/glift.cc
index 6a7d070d7..0c321eba6 100644
--- a/passes/cmds/glift.cc
+++ b/passes/cmds/glift.cc
@@ -17,10 +17,9 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
 #include "kernel/utils.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -425,6 +424,12 @@ public:
 struct GliftPass : public Pass {
 	GliftPass() : Pass("glift", "create GLIFT models and optimization problems") {}
 
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
+
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/xprop.cc b/passes/cmds/xprop.cc
index dc5befc27..d2d0c4d8e 100644
--- a/passes/cmds/xprop.cc
+++ b/passes/cmds/xprop.cc
@@ -24,6 +24,7 @@
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -1100,6 +1101,11 @@ struct XpropWorker
 
 struct XpropPass : public Pass {
 	XpropPass() : Pass("xprop", "formal x propagation") {}
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/assertpmux.cc b/passes/sat/assertpmux.cc
index 991977ab9..7b3357f82 100644
--- a/passes/sat/assertpmux.cc
+++ b/passes/sat/assertpmux.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
 
@@ -182,6 +183,11 @@ struct AssertpmuxWorker
 
 struct AssertpmuxPass : public Pass {
 	AssertpmuxPass() : Pass("assertpmux", "adds asserts for parallel muxes") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/async2sync.cc b/passes/sat/async2sync.cc
index 93c7e96c8..e86a78d81 100644
--- a/passes/sat/async2sync.cc
+++ b/passes/sat/async2sync.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/ffinit.h"
 #include "kernel/ff.h"
@@ -27,6 +28,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct Async2syncPass : public Pass {
 	Async2syncPass() : Pass("async2sync", "convert async FF inputs to sync circuits") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/clk2fflogic.cc b/passes/sat/clk2fflogic.cc
index 348bab727..6b94cbe19 100644
--- a/passes/sat/clk2fflogic.cc
+++ b/passes/sat/clk2fflogic.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/ffinit.h"
 #include "kernel/ff.h"
@@ -33,6 +34,11 @@ struct SampledSig {
 
 struct Clk2fflogicPass : public Pass {
 	Clk2fflogicPass() : Pass("clk2fflogic", "convert clocked FFs to generic $ff cells") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/cutpoint.cc b/passes/sat/cutpoint.cc
index dcd399a57..485e44fd6 100644
--- a/passes/sat/cutpoint.cc
+++ b/passes/sat/cutpoint.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -25,6 +26,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct CutpointPass : public Pass {
 	CutpointPass() : Pass("cutpoint", "adds formal cut points to the design") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/fmcombine.cc b/passes/sat/fmcombine.cc
index 220cf5c52..575b2f40d 100644
--- a/passes/sat/fmcombine.cc
+++ b/passes/sat/fmcombine.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/celltypes.h"
 
@@ -237,6 +238,11 @@ struct FmcombineWorker
 
 struct FmcombinePass : public Pass {
 	FmcombinePass() : Pass("fmcombine", "combine two instances of a cell into one") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/fminit.cc b/passes/sat/fminit.cc
index 5f4ec0068..547082164 100644
--- a/passes/sat/fminit.cc
+++ b/passes/sat/fminit.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -25,6 +26,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct FminitPass : public Pass {
 	FminitPass() : Pass("fminit", "set init values/sequences for formal") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/formalff.cc b/passes/sat/formalff.cc
index 1d87fcc3b..286bf2976 100644
--- a/passes/sat/formalff.cc
+++ b/passes/sat/formalff.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/ffinit.h"
 #include "kernel/ff.h"
@@ -486,6 +487,11 @@ void HierarchyWorker::propagate()
 
 struct FormalFfPass : public Pass {
 	FormalFfPass() : Pass("formalff", "prepare FFs for formal") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/freduce.cc b/passes/sat/freduce.cc
index 52e80f667..6063c5ab9 100644
--- a/passes/sat/freduce.cc
+++ b/passes/sat/freduce.cc
@@ -17,17 +17,12 @@
  *
  */
 
-#include "kernel/register.h"
 #include "kernel/celltypes.h"
 #include "kernel/consteval.h"
 #include "kernel/sigtools.h"
-#include "kernel/log.h"
 #include "kernel/satgen.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <algorithm>
-#include <limits>
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -761,6 +756,11 @@ struct FreduceWorker
 
 struct FreducePass : public Pass {
 	FreducePass() : Pass("freduce", "perform functional reduction") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/miter.cc b/passes/sat/miter.cc
index 8f27c4c6f..9bcf25547 100644
--- a/passes/sat/miter.cc
+++ b/passes/sat/miter.cc
@@ -17,9 +17,8 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -395,6 +394,11 @@ void create_miter_assert(struct Pass *that, std::vector<std::string> args, RTLIL
 
 struct MiterPass : public Pass {
 	MiterPass() : Pass("miter", "automatically create a miter circuit") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/mutate.cc b/passes/sat/mutate.cc
index 3075ef3f0..43373ce0e 100644
--- a/passes/sat/mutate.cc
+++ b/passes/sat/mutate.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -728,6 +729,11 @@ void mutate_cnot(Design *design, const mutate_opts_t &opts, bool one)
 
 struct MutatePass : public Pass {
 	MutatePass() : Pass("mutate", "generate or apply design mutations") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/qbfsat.cc b/passes/sat/qbfsat.cc
index db6836ea1..7a7a31806 100644
--- a/passes/sat/qbfsat.cc
+++ b/passes/sat/qbfsat.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/consteval.h"
 #include "qbfsat.h"
 
@@ -504,6 +505,11 @@ QbfSolveOptions parse_args(const std::vector<std::string> &args) {
 
 struct QbfSatPass : public Pass {
 	QbfSatPass() : Pass("qbfsat", "solve a 2QBF-SAT problem in the circuit") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc
index 0c2143fc9..2f20880cb 100644
--- a/passes/sat/sat.cc
+++ b/passes/sat/sat.cc
@@ -21,17 +21,12 @@
 // Niklas Een and Niklas Sörensson (2003)
 // http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.8161
 
-#include "kernel/register.h"
 #include "kernel/celltypes.h"
 #include "kernel/consteval.h"
 #include "kernel/sigtools.h"
-#include "kernel/log.h"
 #include "kernel/satgen.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <algorithm>
-#include <errno.h>
-#include <string.h>
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -902,6 +897,11 @@ void print_qed()
 
 struct SatPass : public Pass {
 	SatPass() : Pass("sat", "solve a SAT problem in the circuit") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/supercover.cc b/passes/sat/supercover.cc
index 38dbd3cf9..f1b3ad09c 100644
--- a/passes/sat/supercover.cc
+++ b/passes/sat/supercover.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -25,6 +26,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct SupercoverPass : public Pass {
 	SupercoverPass() : Pass("supercover", "add hi/lo cover cells for each wire bit") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/synthprop.cc b/passes/sat/synthprop.cc
index 5553abec2..af69b1172 100644
--- a/passes/sat/synthprop.cc
+++ b/passes/sat/synthprop.cc
@@ -18,7 +18,9 @@
  *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -179,6 +181,12 @@ void SynthPropWorker::run()
 struct SyntProperties : public Pass {
 	SyntProperties() : Pass("synthprop", "synthesize SVA properties") { }
 
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
+
 	virtual void help()
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|

From 2e5b029ba5184872b50e8eb46f90e013aa407ffe Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:56 +1200
Subject: [PATCH 178/931] Docs: Option lists have yoscrypt highlights

---
 docs/source/_static/custom.css |  5 +++++
 docs/util/custom_directives.py | 14 +++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/docs/source/_static/custom.css b/docs/source/_static/custom.css
index b08194c05..60faf6812 100644
--- a/docs/source/_static/custom.css
+++ b/docs/source/_static/custom.css
@@ -18,3 +18,8 @@
 .literal-block-wrapper .code-block-caption .caption-number {
     padding-right: 0.5em
 }
+
+/* Don't double shrink text in a literal in an optionlist */
+kbd .option>.literal {
+    font-size: revert;
+}
diff --git a/docs/util/custom_directives.py b/docs/util/custom_directives.py
index 041472386..58e5b37fd 100644
--- a/docs/util/custom_directives.py
+++ b/docs/util/custom_directives.py
@@ -14,7 +14,7 @@ from sphinx.application import Sphinx
 from sphinx.domains import Domain, Index
 from sphinx.domains.std import StandardDomain
 from sphinx.environment import BuildEnvironment
-from sphinx.roles import XRefRole
+from sphinx.roles import XRefRole, SphinxRole
 from sphinx.directives import ObjectDescription
 from sphinx.directives.code import container_wrapper
 from sphinx.util.nodes import make_refnode
@@ -155,7 +155,7 @@ class CommandOptionGroupNode(CommandUsageNode):
     ]
     
     def transform_content(self, contentnode: addnodes.desc_content) -> None:
-        """hack `:option -thing: desc` into a proper option list"""
+        """hack `:option -thing: desc` into a proper option list with yoscrypt highlighting"""
         newchildren = []
         for node in contentnode:
             newnode = node
@@ -172,7 +172,10 @@ class CommandOptionGroupNode(CommandUsageNode):
                             option_group += option
                             name, text = child.rawsource.split(' ', 1)
                             is_option = name == 'option'
-                            option += nodes.option_string(text=text)
+                            literal = nodes.literal(text=text)
+                            literal['classes'] += ['code', 'highlight', 'yoscrypt']
+                            literal['language'] = 'yoscrypt'
+                            option += literal
                             if not is_option: warnings.warn(f'unexpected option \'{name}\' in {field.source}')
                         elif isinstance(child, nodes.field_body):
                             description = nodes.description()
@@ -601,6 +604,10 @@ class TitleRefRole(XRefRole):
     """XRefRole used which has the cmd title as the displayed text."""
     pass
 
+class OptionRole(SphinxRole):
+    def run(self) -> tuple[list[Node], list]:
+        return self.inliner.interpreted(self.rawtext, self.text, 'yoscrypt', self.lineno)
+
 class CommandDomain(Domain):
     name = 'cmd'
     label = 'Yosys commands'
@@ -608,6 +615,7 @@ class CommandDomain(Domain):
     roles = {
         'ref': XRefRole(),
         'title': TitleRefRole(),
+        'option': OptionRole(),
     }
 
     directives = {

From 726a30fe3730be0fc125ca8bcbec3446730c0c20 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:57 +1200
Subject: [PATCH 179/931] cmd_documenter: Fix option_spec

Need to copy parent class `option_spec` to retain default options (e.g. `:noindex:`).
---
 docs/util/cmd_documenter.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/util/cmd_documenter.py b/docs/util/cmd_documenter.py
index 52f3d2cf4..2b93772e8 100644
--- a/docs/util/cmd_documenter.py
+++ b/docs/util/cmd_documenter.py
@@ -82,12 +82,13 @@ class YosysCmdGroupDocumenter(Documenter):
     object: tuple[str, list[str]]
     lib_key = 'groups'
 
-    option_spec = {
+    option_spec = Documenter.option_spec.copy()
+    option_spec.update({
         'caption': autodoc.annotation_option,
         'members': autodoc.members_option,
         'source': autodoc.bool_option,
         'linenos': autodoc.bool_option,
-    }
+    })
 
     __cmd_lib: dict[str, list[str] | dict[str]] | None = None
     @property

From 06689f998b191ca7e99d0dce89a9476868daa4cf Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:57 +1200
Subject: [PATCH 180/931] autocmd_rst: autodoc for generated RST

Adds `autocmd_rst` directive, which effectively calls `autocmd` for the same command, but wraps it in a code-block in order to render the raw RST generated.
---
 docs/util/cmd_documenter.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/docs/util/cmd_documenter.py b/docs/util/cmd_documenter.py
index 2b93772e8..bf71a00ac 100644
--- a/docs/util/cmd_documenter.py
+++ b/docs/util/cmd_documenter.py
@@ -403,11 +403,35 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
 
         return False, []
 
+class YosysCmdRstDocumenter(YosysCmdDocumenter):
+    objtype = 'cmd_rst'
+    priority = 0
+
+    @classmethod
+    def can_document_member(cls, *args) -> bool:
+        return False
+
+    def add_directive_header(self, sig):
+        source_name = self.object.source_file
+        cmd = self.object.name
+        self.add_line(f'.. code-block:: rst', source_name)
+        self.add_line(f'   :caption: Generated rst for ``.. autocmd:: {cmd}``', source_name)
+
+    def add_content(self, more_content):
+        source_name = self.object.source_file
+        cmd = self.object.name
+        self.domain = 'cmd'
+        super().add_directive_header(cmd)
+        self.add_line('', source_name)
+        self.indent += self.content_indent
+        super().add_content(more_content)
+
 def setup(app: Sphinx) -> dict[str, Any]:
     app.add_config_value('cmds_json', False, 'html', [Path, PosixPath, WindowsPath])
     app.setup_extension('sphinx.ext.autodoc')
     app.add_autodocumenter(YosysCmdGroupDocumenter)
     app.add_autodocumenter(YosysCmdDocumenter)
+    app.add_autodocumenter(YosysCmdRstDocumenter)
     return {
         'version': '2',
         'parallel_read_safe': True,

From d88688781d5c216ec5371d1a72e1e9f34bb1ecc1 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:57 +1200
Subject: [PATCH 181/931] Docs: Skeleton documentation for writing command help

Use `chformal` as example, comparing the `autocmd` output with `ChformalPass::formal_help()`, the json dump from the `ContentListing`, the command line output, and the RST generated (using `autocmd_rst`).
Includes bullet points on each step for more information.
Should eventually end up in `yosys_internals/extending_yosys/contributing.rst`, but it currently lives in `cmd/index_internal.rst` to avoid merge conflicts since cell help documentation is still WIP.
Also exports chformal source and help output to `docs/source/generated` during `make docs/prep`.
---
 Makefile                           |  11 ++-
 docs/source/cmd/index_internal.rst | 147 +++++++++++++++++++++++++++++
 2 files changed, 157 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2673cff2a..3b6a3bfaf 100644
--- a/Makefile
+++ b/Makefile
@@ -1060,6 +1060,15 @@ docs/source/generated/functional/rosette.diff: backends/functional/smtlib.cc bac
 PHONY: docs/gen/functional_ir
 docs/gen/functional_ir: docs/source/generated/functional/smtlib.cc docs/source/generated/functional/rosette.diff
 
+docs/source/generated/%.log: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
+	$(Q) ./$(PROGRAM_PREFIX)yosys -qQT -h '$*' -l $@
+
+docs/source/generated/chformal.cc: passes/cmds/chformal.cc docs/source/generated
+	cp $^ $@
+
+PHONY: docs/gen/chformal
+docs/gen/chformal: docs/source/generated/chformal.log docs/source/generated/chformal.cc
+
 PHONY: docs/gen docs/usage docs/reqs
 docs/gen: $(TARGETS)
 	$(Q) $(MAKE) -C docs gen
@@ -1095,7 +1104,7 @@ docs/reqs:
 	$(Q) $(MAKE) -C docs reqs
 
 .PHONY: docs/prep
-docs/prep: docs/source/generated/cells.json docs/source/generated/cmds.json docs/gen docs/usage docs/gen/functional_ir
+docs/prep: docs/source/generated/cells.json docs/source/generated/cmds.json docs/gen docs/usage docs/gen/functional_ir docs/gen/chformal
 
 DOC_TARGET ?= html
 docs: docs/prep
diff --git a/docs/source/cmd/index_internal.rst b/docs/source/cmd/index_internal.rst
index 127010980..f992d27c4 100644
--- a/docs/source/cmd/index_internal.rst
+++ b/docs/source/cmd/index_internal.rst
@@ -5,3 +5,150 @@ internal
 
 .. autocmdgroup:: internal
    :members:
+
+Writing command help
+--------------------
+
+- use `chformal` as an example
+- generated help content below
+
+.. _chformal autocmd:
+
+.. autocmd:: chformal
+   :noindex:
+
+The ``formatted_help()`` method
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``PrettyHelp::get_current()``
+- ``PrettyHelp::set_group()``
+
+  + used with ``.. autocmdgroup:: <group>``
+  + can assign group and return false
+  + if no group is set, will try to use ``source_location`` and assign group
+    from path to source file
+
+- return value
+
+  + true means help content added to current ``PrettyHelp``
+  + false to use ``Pass::help()``
+
+- adding content
+
+  + help content is a list of ``ContentListing`` nodes, each one having a type,
+    body, and its own list of children ``ContentListing``\ s
+  + ``PrettyHelp::get_root()`` returns the root ``ContentListing`` (``type="root"``)
+  + ``ContentListing::{usage, option, codeblock, paragraph}`` each add a
+    ``ContentListing`` to the current node, with type the same as the method
+
+    * the first argument is the body of the new node
+    * ``usage`` shows how to call the command (i.e. its "signature")
+    * ``paragraph`` content is formatted as a paragraph of text with line breaks
+      added automatically
+    * ``codeblock`` content is displayed verbatim, use line breaks as desired;
+      takes an optional ``language`` argument for assigning the language in RST
+      output for code syntax highlighting (currently not implemented)
+    * ``option`` lists a single option for the command, usually starting with a
+      dash (``-``); takes an optional second argument which adds a paragraph
+      node as a means of description
+
+  + ``ContentListing::open_optiongroup``
+
+    * each option must be in an optiongroup
+    * optional name argument, which will be rendered in (RST) output
+
+  + ``ContentListing::open_option`` creates and returns a new option node, can
+    be used to e.g. add multiple paragraphs to an option's description
+  + paragraphs are treated as raw RST, allowing for inline formatting and
+    references as if it were written in the RST file itself
+
+.. todo:: Support ``ContentListing::codeblock`` language argument
+
+.. todo:: Support anonymous optiongroup
+
+   If an option is added to the root node it should add the option to the last
+   child of the root, making a new child if the last child is not an optiongroup
+
+.. literalinclude:: /generated/chformal.cc
+   :language: c++
+   :start-at: bool formatted_help()
+   :end-before: void execute
+   :caption: ``ChformalPass::formatted_help()`` from :file:`passes/cmds/chformal.cc`
+
+Dumping command help to json
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- `help -dump-cells-json cmds.json`
+
+  + generates a ``ContentListing`` for each command registered in Yosys
+  + tries to parse unformatted ``Pass::help()`` output if
+    ``Pass::formatted_help()`` is unimplemented or returns false
+
+    * if a line starts with four spaces followed by the name of the command then
+      a space, it is parsed as a signature (usage node)
+    * if a line is indented and starts with a dash (``-``), it is parsed as an
+      option
+    * anything else is parsed as a codeblock and added to either the root node
+      or the current option/optiongroup depending on the indentation
+
+  + dictionary of command name to ``ContentListing``
+
+    * uses ``ContentListing::to_json()`` recursively for each node in root
+    * root node used for source location of class definition
+    * includes flags set during pass constructor (e.g. ``experimental_flag`` set
+      by ``Pass::experimental()``)
+    * also title (``short_help`` argument in ``Pass::Pass``), group, and class
+      name
+   
+  + dictionary of group name to list of commands in that group
+
+- used by sphinx autodoc to generate help content
+
+.. literalinclude:: /generated/cmds.json
+   :language: json
+   :start-at: "chformal": {
+   :end-before: "chparam": {
+   :caption: `chformal` in generated :file:`cmds.json`
+
+Command line rendering
+~~~~~~~~~~~~~~~~~~~~~~
+
+- if ``Pass::formatted_help()`` returns true, will call
+  ``PrettyHelp::log_help()``
+
+  + traverse over the children of the root node and render as plain text 
+  + effectively the reverse of converting unformatted ``Pass::help()`` text
+  + lines are broken at 80 characters while maintaining indentation (controlled
+    by ``MAX_LINE_LEN`` in :file:`kernel/log_help.cc`)
+  + each line is broken into words separated by spaces, if a given word starts
+    and ends with backticks they will be stripped
+
+- if it returns false it will call ``Pass::help()`` which should call ``log()``
+  directly to print and format help text
+
+  + if ``Pass::help()`` is not overridden then a default message about missing
+    help will be displayed
+
+.. literalinclude:: /generated/chformal.log
+   :lines: 2-
+
+RST generated from autocmd
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- below is the raw RST output from ``autocmd`` (``YosysCmdDocumenter`` class in
+  :file:`docs/util/cmd_documenter.py`) for `chformal` command
+- heading will be rendered as a subheading of the most recent heading (see
+  `chformal autocmd`_ above rendered under `Writing command help`_)
+- ``.. cmd:def:: <cmd>`` line is indexed for cross references with ``:cmd:ref:``
+  directive (`chformal autocmd`_ above uses ``:noindex:`` option so that
+  `chformal` still links to the correct location)
+
+  + ``:title:`` option controls text that appears when hovering over the
+    `chformal` link
+
+- commands with warning flags (experimental or internal) add a ``.. warning``
+  block before any of the help content
+- if a command has no ``source_location`` the ``.. note`` at the bottom will
+  instead link to :doc:`/cmd/index_other`
+
+.. autocmd_rst:: chformal

From 862fe4cb5690e75c377810165015dfaf967e0cec Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:57 +1200
Subject: [PATCH 182/931] Docs: Title for index_internal

---
 docs/source/cmd/index_internal.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/cmd/index_internal.rst b/docs/source/cmd/index_internal.rst
index f992d27c4..55c99f05e 100644
--- a/docs/source/cmd/index_internal.rst
+++ b/docs/source/cmd/index_internal.rst
@@ -1,7 +1,7 @@
 :orphan:
 
-internal
-------------------
+Internal commands for developers
+--------------------------------
 
 .. autocmdgroup:: internal
    :members:

From f2ef17b5816b7df9930d2975c2d394b06edf4edf Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:57 +1200
Subject: [PATCH 183/931] cmdref: Assign rmports to greenpak group

Also tidy `#include`s.
---
 passes/opt/rmports.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/passes/opt/rmports.cc b/passes/opt/rmports.cc
index 9fa9f5c2d..0ac391790 100644
--- a/passes/opt/rmports.cc
+++ b/passes/opt/rmports.cc
@@ -17,17 +17,20 @@
  *
  */
 
-#include "kernel/register.h"
 #include "kernel/sigtools.h"
-#include "kernel/log.h"
-#include <stdlib.h>
-#include <stdio.h>
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct RmportsPassPass : public Pass {
 	RmportsPassPass() : Pass("rmports", "remove module ports with no connections") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("techlibs/greenpak4");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|

From 5d010789e23f500680be739d1f5530901064fa29 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:57 +1200
Subject: [PATCH 184/931] cmdref: Split passes/status from passes/cmds

Rename passes/cmds from "General passes" to "Design modification".
More `yosys.h` includes.

cmdref: Split passes/status from passes/cmds

Rename passes/cmds from "General passes" to "Design modification".
More `yosys.h` includes.
---
 docs/source/cmd/index_passes_cmds.rst   |  4 ++--
 docs/source/cmd/index_passes_status.rst |  5 +++++
 passes/cmds/check.cc                    |  6 ++++++
 passes/cmds/cover.cc                    | 14 +++++++++-----
 passes/cmds/edgetypes.cc                |  6 ++++++
 passes/cmds/example_dt.cc               |  8 +++++---
 passes/cmds/exec.cc                     |  9 +++++++--
 passes/cmds/internal_stats.cc           |  7 ++++---
 passes/cmds/logcmd.cc                   | 10 +++++++---
 passes/cmds/logger.cc                   |  9 +++++++--
 passes/cmds/ltp.cc                      |  6 ++++++
 passes/cmds/plugin.cc                   |  6 ++++++
 passes/cmds/portarcs.cc                 |  6 ++++++
 passes/cmds/portlist.cc                 |  6 ++++++
 passes/cmds/printattrs.cc               |  6 ++++++
 passes/cmds/scc.cc                      | 11 +++++++----
 passes/cmds/scratchpad.cc               | 10 +++++++---
 passes/cmds/select.cc                   | 18 ++++++++++++++++--
 passes/cmds/setenv.cc                   | 11 +++++++----
 passes/cmds/show.cc                     | 10 +++++++---
 passes/cmds/sta.cc                      |  6 ++++++
 passes/cmds/stat.cc                     |  6 ++++++
 passes/cmds/tee.cc                      | 10 +++++++---
 passes/cmds/torder.cc                   |  6 ++++++
 passes/cmds/trace.cc                    | 11 +++++++++++
 passes/cmds/viz.cc                      |  6 ++++++
 passes/cmds/write_file.cc               |  6 ++++++
 27 files changed, 180 insertions(+), 39 deletions(-)
 create mode 100644 docs/source/cmd/index_passes_status.rst

diff --git a/docs/source/cmd/index_passes_cmds.rst b/docs/source/cmd/index_passes_cmds.rst
index c7d9fa0a3..d7b448f07 100644
--- a/docs/source/cmd/index_passes_cmds.rst
+++ b/docs/source/cmd/index_passes_cmds.rst
@@ -1,5 +1,5 @@
-General passes
---------------
+Design modification
+-------------------
 
 .. autocmdgroup:: passes/cmds
    :members:
diff --git a/docs/source/cmd/index_passes_status.rst b/docs/source/cmd/index_passes_status.rst
new file mode 100644
index 000000000..a157ed840
--- /dev/null
+++ b/docs/source/cmd/index_passes_status.rst
@@ -0,0 +1,5 @@
+Design status
+-------------
+
+.. autocmdgroup:: passes/status
+   :members:
diff --git a/passes/cmds/check.cc b/passes/cmds/check.cc
index 83fe781a0..8bbcb8da0 100644
--- a/passes/cmds/check.cc
+++ b/passes/cmds/check.cc
@@ -22,12 +22,18 @@
 #include "kernel/celledges.h"
 #include "kernel/celltypes.h"
 #include "kernel/utils.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct CheckPass : public Pass {
 	CheckPass() : Pass("check", "check for obvious problems in the design") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/cover.cc b/passes/cmds/cover.cc
index 1db3e2ca0..47354f1d5 100644
--- a/passes/cmds/cover.cc
+++ b/passes/cmds/cover.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include <sys/types.h>
 
 #ifndef _WIN32
@@ -26,15 +27,18 @@
 #  include <io.h>
 #endif
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
-
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct CoverPass : public Pass {
-	CoverPass() : Pass("cover", "print code coverage counters") { }
+	CoverPass() : Pass("cover", "print code coverage counters") {
+		internal();
+	}
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/edgetypes.cc b/passes/cmds/edgetypes.cc
index 5b53f50cc..933bd457f 100644
--- a/passes/cmds/edgetypes.cc
+++ b/passes/cmds/edgetypes.cc
@@ -19,12 +19,18 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct EdgetypePass : public Pass {
 	EdgetypePass() : Pass("edgetypes", "list all types of edges in selection") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/example_dt.cc b/passes/cmds/example_dt.cc
index 2870e062b..b10f50502 100644
--- a/passes/cmds/example_dt.cc
+++ b/passes/cmds/example_dt.cc
@@ -21,15 +21,17 @@ struct ExampleWorker
 
 struct ExampleDtPass : public Pass
 {
-	ExampleDtPass() : Pass("example_dt", "drivertools example") {}
+	ExampleDtPass() : Pass("example_dt", "drivertools example") {
+		internal();
+	}
 
-    void help() override
+	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
 		log("TODO: add help message\n");
 		log("\n");
-    }
+	}
 
 
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
diff --git a/passes/cmds/exec.cc b/passes/cmds/exec.cc
index e9cc34b30..486fa1c2b 100644
--- a/passes/cmds/exec.cc
+++ b/passes/cmds/exec.cc
@@ -17,8 +17,8 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include <cstdio>
 
 #if defined(_WIN32)
@@ -38,6 +38,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct ExecPass : public Pass {
 	ExecPass() : Pass("exec", "execute commands in the operating system shell") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/internal_stats.cc b/passes/cmds/internal_stats.cc
index 28822f237..00456b8f9 100644
--- a/passes/cmds/internal_stats.cc
+++ b/passes/cmds/internal_stats.cc
@@ -18,8 +18,6 @@
  */
 
 #include <iterator>
-#include <optional>
-#include <stdint.h>
 
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
@@ -71,7 +69,10 @@ std::optional<uint64_t> current_mem_bytes() {
 }
 
 struct InternalStatsPass : public Pass {
-	InternalStatsPass() : Pass("internal_stats", "print internal statistics") { }
+	InternalStatsPass() : Pass("internal_stats", "print internal statistics") {
+		experimental();
+		internal();
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/logcmd.cc b/passes/cmds/logcmd.cc
index 3b82ac48c..0238627d1 100644
--- a/passes/cmds/logcmd.cc
+++ b/passes/cmds/logcmd.cc
@@ -18,15 +18,19 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct LogPass : public Pass {
 	LogPass() : Pass("log", "print text and log files") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc
index 241a8799f..276810201 100644
--- a/passes/cmds/logger.cc
+++ b/passes/cmds/logger.cc
@@ -17,14 +17,19 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct LoggerPass : public Pass {
 	LoggerPass() : Pass("logger", "set logger properties") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/ltp.cc b/passes/cmds/ltp.cc
index 22bdaab44..b3134b110 100644
--- a/passes/cmds/ltp.cc
+++ b/passes/cmds/ltp.cc
@@ -20,6 +20,7 @@
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -141,6 +142,11 @@ struct LtpWorker
 
 struct LtpPass : public Pass {
 	LtpPass() : Pass("ltp", "print longest topological path") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index 4ad7c165b..a653844b7 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 #ifdef YOSYS_ENABLE_PLUGINS
 #  include <dlfcn.h>
@@ -122,6 +123,11 @@ void load_plugin(std::string, std::vector<std::string>)
 
 struct PluginPass : public Pass {
 	PluginPass() : Pass("plugin", "load and list loaded plugins") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/portarcs.cc b/passes/cmds/portarcs.cc
index a6ed75de3..97682efbb 100644
--- a/passes/cmds/portarcs.cc
+++ b/passes/cmds/portarcs.cc
@@ -22,6 +22,7 @@
 #include "kernel/rtlil.h"
 #include "kernel/utils.h"
 #include "kernel/celltypes.h"
+#include "kernel/log_help.h"
 
 PRIVATE_NAMESPACE_BEGIN
 USING_YOSYS_NAMESPACE
@@ -38,6 +39,11 @@ static RTLIL::SigBit canonical_bit(RTLIL::SigBit bit)
 
 struct PortarcsPass : Pass {
 	PortarcsPass() : Pass("portarcs", "derive port arcs for propagation delay") {}
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 
 	void help() override
 	{
diff --git a/passes/cmds/portlist.cc b/passes/cmds/portlist.cc
index 03048422d..f78d9d3b6 100644
--- a/passes/cmds/portlist.cc
+++ b/passes/cmds/portlist.cc
@@ -19,12 +19,18 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct PortlistPass : public Pass {
 	PortlistPass() : Pass("portlist", "list (top-level) ports") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/printattrs.cc b/passes/cmds/printattrs.cc
index 2a5034c13..c8b0a1d1f 100644
--- a/passes/cmds/printattrs.cc
+++ b/passes/cmds/printattrs.cc
@@ -18,12 +18,18 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct PrintAttrsPass : public Pass {
 	PrintAttrsPass() : Pass("printattrs", "print attributes of selected objects") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/scc.cc b/passes/cmds/scc.cc
index 0f988e57a..e55e63828 100644
--- a/passes/cmds/scc.cc
+++ b/passes/cmds/scc.cc
@@ -21,12 +21,10 @@
 // Tarjan, R. E. (1972), "Depth-first search and linear graph algorithms", SIAM Journal on Computing 1 (2): 146-160, doi:10.1137/0201010
 // http://en.wikipedia.org/wiki/Tarjan's_strongly_connected_components_algorithm
 
-#include "kernel/register.h"
+#include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
-#include "kernel/log.h"
-#include <stdlib.h>
-#include <stdio.h>
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -252,6 +250,11 @@ struct SccWorker
 
 struct SccPass : public Pass {
 	SccPass() : Pass("scc", "detect strongly connected components (logic loops)") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/scratchpad.cc b/passes/cmds/scratchpad.cc
index aecc4c17d..4a63f2f60 100644
--- a/passes/cmds/scratchpad.cc
+++ b/passes/cmds/scratchpad.cc
@@ -18,15 +18,19 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct ScratchpadPass : public Pass {
 	ScratchpadPass() : Pass("scratchpad", "get/set values in the scratchpad") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc
index 1d75091af..901f923f8 100644
--- a/passes/cmds/select.cc
+++ b/passes/cmds/select.cc
@@ -20,8 +20,7 @@
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
-#include <string.h>
-#include <errno.h>
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -1085,6 +1084,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct SelectPass : public Pass {
 	SelectPass() : Pass("select", "modify and view the list of selected objects") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -1664,6 +1668,11 @@ struct SelectPass : public Pass {
 
 struct CdPass : public Pass {
 	CdPass() : Pass("cd", "a shortcut for 'select -module <name>'") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -1776,6 +1785,11 @@ static void log_matches(const char *title, Module *module, const T &list)
 
 struct LsPass : public Pass {
 	LsPass() : Pass("ls", "list modules or objects in modules") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/setenv.cc b/passes/cmds/setenv.cc
index 27f2eea28..850d7c961 100644
--- a/passes/cmds/setenv.cc
+++ b/passes/cmds/setenv.cc
@@ -17,15 +17,18 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
-#include <stdlib.h>
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 struct SetenvPass : public Pass {
 	SetenvPass() : Pass("setenv", "set an environment variable") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index 8a1bd58c4..4eb6569e6 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -17,10 +17,9 @@
  *
  */
 
-#include "kernel/register.h"
+#include "kernel/yosys.h"
 #include "kernel/celltypes.h"
-#include "kernel/log.h"
-#include <string.h>
+#include "kernel/log_help.h"
 
 #ifndef _WIN32
 #  include <dirent.h>
@@ -658,6 +657,11 @@ struct ShowWorker
 
 struct ShowPass : public Pass {
 	ShowPass() : Pass("show", "generate schematics using graphviz") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/sta.cc b/passes/cmds/sta.cc
index 4ad0e96be..5dfac1575 100644
--- a/passes/cmds/sta.cc
+++ b/passes/cmds/sta.cc
@@ -21,6 +21,7 @@
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
 #include "kernel/timinginfo.h"
+#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -275,6 +276,11 @@ struct StaWorker
 
 struct StaPass : public Pass {
 	StaPass() : Pass("sta", "perform static timing analysis") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 6b93621f1..af7023bdd 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -25,6 +25,7 @@
 #include "kernel/cost.h"
 #include "kernel/gzip.h"
 #include "libs/json11/json11.hpp"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -367,6 +368,11 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 
 struct StatPass : public Pass {
 	StatPass() : Pass("stat", "print some statistics") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/tee.cc b/passes/cmds/tee.cc
index 853f1bad3..fbd42e311 100644
--- a/passes/cmds/tee.cc
+++ b/passes/cmds/tee.cc
@@ -18,15 +18,19 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct TeePass : public Pass {
 	TeePass() : Pass("tee", "redirect command output to file") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/torder.cc b/passes/cmds/torder.cc
index 1620c0bca..537b6793d 100644
--- a/passes/cmds/torder.cc
+++ b/passes/cmds/torder.cc
@@ -21,12 +21,18 @@
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct TorderPass : public Pass {
 	TorderPass() : Pass("torder", "print cells in topological order") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/trace.cc b/passes/cmds/trace.cc
index 400542776..39ed8e60e 100644
--- a/passes/cmds/trace.cc
+++ b/passes/cmds/trace.cc
@@ -19,6 +19,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -60,6 +61,11 @@ struct TraceMonitor : public RTLIL::Monitor
 
 struct TracePass : public Pass {
 	TracePass() : Pass("trace", "redirect command output to file") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -96,6 +102,11 @@ struct TracePass : public Pass {
 
 struct DebugPass : public Pass {
 	DebugPass() : Pass("debug", "run command with debug log messages enabled") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/viz.cc b/passes/cmds/viz.cc
index 131e799ab..4c73b4d71 100644
--- a/passes/cmds/viz.cc
+++ b/passes/cmds/viz.cc
@@ -19,6 +19,7 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
+#include "kernel/log_help.h"
 
 #ifndef _WIN32
 #  include <dirent.h>
@@ -817,6 +818,11 @@ struct VizWorker
 
 struct VizPass : public Pass {
 	VizPass() : Pass("viz", "visualize data flow graph") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/write_file.cc b/passes/cmds/write_file.cc
index ea9b3f556..a22fdaf2a 100644
--- a/passes/cmds/write_file.cc
+++ b/passes/cmds/write_file.cc
@@ -19,12 +19,18 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct WriteFileFrontend : public Frontend {
 	WriteFileFrontend() : Frontend("=write_file", "write a text to a file") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|

From d344125a03b6dd7b3bb39a5e5e4fddd21766f21d Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:58 +1200
Subject: [PATCH 185/931] cmdref: Drop pmgen index

---
 docs/source/cmd/index_passes_pmgen.rst | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 docs/source/cmd/index_passes_pmgen.rst

diff --git a/docs/source/cmd/index_passes_pmgen.rst b/docs/source/cmd/index_passes_pmgen.rst
deleted file mode 100644
index aac8c1b47..000000000
--- a/docs/source/cmd/index_passes_pmgen.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-passes/pmgen
-------------------
-
-.. autocmdgroup:: passes/pmgen
-   :members:

From 5f771a965be3bd407d1cdfefcafe2871116a179b Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:58 +1200
Subject: [PATCH 186/931] cmdref: codeblock language now works

Add `options` map for setting `ContentListing` options with key:val pairs; currently only used with `ContentListing::codeblock()` language arg.
Fix generated codeblock rst to print each line of code with indentation, and change it to use explicit an `code-block` so we can set a language on it.
---
 docs/source/cmd/index_internal.rst | 5 ++---
 docs/util/cmd_documenter.py        | 9 +++++++--
 kernel/log_help.cc                 | 2 ++
 kernel/log_help.h                  | 6 ++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docs/source/cmd/index_internal.rst b/docs/source/cmd/index_internal.rst
index 55c99f05e..597d35639 100644
--- a/docs/source/cmd/index_internal.rst
+++ b/docs/source/cmd/index_internal.rst
@@ -47,7 +47,8 @@ The ``formatted_help()`` method
       added automatically
     * ``codeblock`` content is displayed verbatim, use line breaks as desired;
       takes an optional ``language`` argument for assigning the language in RST
-      output for code syntax highlighting (currently not implemented)
+      output for code syntax highlighting (use ``yoscrypt`` for yosys script
+      syntax highlighting)
     * ``option`` lists a single option for the command, usually starting with a
       dash (``-``); takes an optional second argument which adds a paragraph
       node as a means of description
@@ -62,8 +63,6 @@ The ``formatted_help()`` method
   + paragraphs are treated as raw RST, allowing for inline formatting and
     references as if it were written in the RST file itself
 
-.. todo:: Support ``ContentListing::codeblock`` language argument
-
 .. todo:: Support anonymous optiongroup
 
    If an option is added to the root node it should add the option to the last
diff --git a/docs/util/cmd_documenter.py b/docs/util/cmd_documenter.py
index bf71a00ac..39d86cc02 100644
--- a/docs/util/cmd_documenter.py
+++ b/docs/util/cmd_documenter.py
@@ -28,6 +28,7 @@ class YosysCmdContentListing:
     body: str
     source_file: str
     source_line: int
+    options: dict[str, str]
     content: list[YosysCmdContentListing]
 
     def __init__(
@@ -36,12 +37,14 @@ class YosysCmdContentListing:
             body: str = "",
             source_file: str = "unknown",
             source_line: int = 0,
+            options: dict[str, str] = {},
             content: list[dict[str]] = [],
     ):
         self.type = type
         self.body = body
         self.source_file = source_file
         self.source_line = source_line
+        self.options = options
         self.content = [YosysCmdContentListing(**c) for c in content]
 
 class YosysCmd:
@@ -375,9 +378,11 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
                 self.add_line(f'{indent_str}{content_list.body}', content_source)
                 self.add_line('', source_name)
             elif content_list.type == 'code':
-                self.add_line(f'{indent_str}::', source_name)
+                language_str = content_list.options.get('language', '')
+                self.add_line(f'{indent_str}.. code-block:: {language_str}', source_name)
                 self.add_line('', source_name)
-                self.add_line(f'{indent_str}   {content_list.body}', content_source)
+                for body_line in content_list.body.splitlines():
+                    self.add_line(f'{indent_str}   {body_line}', content_source)
                 self.add_line('', source_name)
             else:
                 logger.warning(f"unknown content type '{content_list.type}'")
diff --git a/kernel/log_help.cc b/kernel/log_help.cc
index 7e103f83d..9c1687910 100644
--- a/kernel/log_help.cc
+++ b/kernel/log_help.cc
@@ -27,6 +27,7 @@ Json ContentListing::to_json() {
 	if (body.length()) object["body"] = body;
 	if (strcmp(source_file, "unknown") != 0) object["source_file"] = source_file;
 	if (source_line != 0) object["source_line"] = source_line;
+	object["options"] = Json(options);
 	Json::array content_array;
 	for (auto child : _content) content_array.push_back(child->to_json());
 	object["content"] = content_array;
@@ -52,6 +53,7 @@ void ContentListing::codeblock(const string &code, const string &language,
 	const source_location location)
 {
 	add_content("code", code, location);
+	back()->set_option("language", language);
 }
 
 void ContentListing::paragraph(const string &text,
diff --git a/kernel/log_help.h b/kernel/log_help.h
index 169b90ca2..60f378e00 100644
--- a/kernel/log_help.h
+++ b/kernel/log_help.h
@@ -32,12 +32,14 @@ public:
 	string body;
 	const char* source_file;
 	int source_line;
+	std::map<string, string> options;
 
 	ContentListing(
 		string type = "root", string body = "",
 		const char* source_file = "unknown", int source_line = 0
 	) : type(type), body(body), source_file(source_file), source_line(source_line) {
 		_content = {};
+		options = {};
 	}
 
 	ContentListing(string type, string body, source_location location) :
@@ -61,6 +63,10 @@ public:
 		return _content.back();
 	}
 
+	void set_option(string key, string val = "") {
+		options[key] = val;
+	}
+
 	void usage(
 		const string &usage,
 		const source_location location = source_location::current()

From 7ebccd2dea54867ed2e4c89739a1856af6b85fe3 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:35:58 +1200
Subject: [PATCH 187/931] cmdref: Format help_script() output as yoscrypt

Or at least all of the synth commands, because they have the same preceding text.
Except `synth_fabulous`, because that has unconditional `read_verilog`s at the start.  Which seems like a bad idea and and not compatible with `-run`?
---
 kernel/register.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/kernel/register.cc b/kernel/register.cc
index a688146ed..f0db7f7af 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -972,7 +972,11 @@ struct HelpPass : public Pass {
 				}
 
 				if (!current_buffer.empty()) {
-					current_listing->codeblock(current_buffer, "none", null_source);
+					if (current_buffer.size() > 64 && current_buffer.substr(0, 64).compare("The following commands are executed by this synthesis command:\n\n") == 0) {
+						current_listing->paragraph(current_buffer.substr(0, 62), null_source);
+						current_listing->codeblock(current_buffer.substr(64), "yoscrypt", null_source);
+					} else
+						current_listing->codeblock(current_buffer, "none", null_source);
 					current_buffer = "";
 				}
 			}

From da9bf5d6104fe5e888eccf77ddfa66d18ae7d947 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:36:18 +1200
Subject: [PATCH 188/931] cmdref: Drop optiongroups

Linking to optiongroups doesn't add *that* much, and is kind of a pain; meanwhile having the optiongroups adds an extra level of indentation.
Instead of options needing to be in an option group, they instead go in either the root node or nested in a usage node.  Putting them in a usage node allows for more-or-less the previous behaviour but without making it the default.
---
 docs/source/cmd/index_internal.rst |  14 +--
 docs/util/cmd_documenter.py        |   4 +-
 docs/util/custom_directives.py     | 171 +++++++++++++----------------
 kernel/log_help.cc                 |  29 +++--
 kernel/log_help.h                  |   6 +-
 kernel/register.cc                 |   7 +-
 passes/cmds/chformal.cc            |  36 +++---
 7 files changed, 118 insertions(+), 149 deletions(-)

diff --git a/docs/source/cmd/index_internal.rst b/docs/source/cmd/index_internal.rst
index 597d35639..a077dc2a4 100644
--- a/docs/source/cmd/index_internal.rst
+++ b/docs/source/cmd/index_internal.rst
@@ -53,21 +53,13 @@ The ``formatted_help()`` method
       dash (``-``); takes an optional second argument which adds a paragraph
       node as a means of description
 
-  + ``ContentListing::open_optiongroup``
-
-    * each option must be in an optiongroup
-    * optional name argument, which will be rendered in (RST) output
-
+  + ``ContentListing::open_usage`` creates and returns a new usage node, can be
+    used to e.g. add text/options specific to a given usage of the command
   + ``ContentListing::open_option`` creates and returns a new option node, can
     be used to e.g. add multiple paragraphs to an option's description
   + paragraphs are treated as raw RST, allowing for inline formatting and
     references as if it were written in the RST file itself
 
-.. todo:: Support anonymous optiongroup
-
-   If an option is added to the root node it should add the option to the last
-   child of the root, making a new child if the last child is not an optiongroup
-
 .. literalinclude:: /generated/chformal.cc
    :language: c++
    :start-at: bool formatted_help()
@@ -88,7 +80,7 @@ Dumping command help to json
     * if a line is indented and starts with a dash (``-``), it is parsed as an
       option
     * anything else is parsed as a codeblock and added to either the root node
-      or the current option/optiongroup depending on the indentation
+      or the current option depending on the indentation
 
   + dictionary of command name to ``ContentListing``
 
diff --git a/docs/util/cmd_documenter.py b/docs/util/cmd_documenter.py
index 39d86cc02..9347d8ffd 100644
--- a/docs/util/cmd_documenter.py
+++ b/docs/util/cmd_documenter.py
@@ -365,14 +365,14 @@ class YosysCmdDocumenter(YosysCmdGroupDocumenter):
         def render(content_list: YosysCmdContentListing, indent: int=0):
             content_source = content_list.source_file or source_name
             indent_str = '   '*indent
-            if content_list.type in ['usage', 'optiongroup']:
+            if content_list.type == 'usage':
                 if content_list.body:
                     self.add_line(f'{indent_str}.. {domain}:{content_list.type}:: {self.name}::{content_list.body}', content_source)
                 else:
                     self.add_line(f'{indent_str}.. {domain}:{content_list.type}:: {self.name}::', content_source)
                     self.add_line(f'{indent_str}   :noindex:', source_name)
                 self.add_line('', source_name)
-            elif content_list.type in ['option']:
+            elif content_list.type == 'option':
                 self.add_line(f'{indent_str}:{content_list.type} {content_list.body}:', content_source)
             elif content_list.type == 'text':
                 self.add_line(f'{indent_str}{content_list.body}', content_source)
diff --git a/docs/util/custom_directives.py b/docs/util/custom_directives.py
index 58e5b37fd..e8c400047 100644
--- a/docs/util/custom_directives.py
+++ b/docs/util/custom_directives.py
@@ -58,101 +58,12 @@ class TocNode(ObjectDescription):
             return '.'.join(parents + [name])
         return ''
 
-class CommandNode(TocNode):
-    """A custom node that describes a command."""
-
-    name = 'cmd'
-    required_arguments = 1
-
-    option_spec = TocNode.option_spec.copy()
-    option_spec.update({
-        'title': directives.unchanged,
-        'tags': directives.unchanged
-    })
+class NodeWithOptions(TocNode):
+    """A custom node with options."""
 
     doc_field_types = [
         GroupedField('opts', label='Options', names=('option', 'options', 'opt', 'opts')),
     ]
-
-    def handle_signature(self, sig, signode: addnodes.desc_signature):
-        signode['fullname'] = sig
-        signode += addnodes.desc_addname(text="yosys> help ")
-        signode += addnodes.desc_name(text=sig)
-        return signode['fullname']
-
-    def add_target_and_index(self, name_cls, sig, signode):
-        idx = type(self).name + '-' + sig
-        signode['ids'].append(idx)
-        if 'noindex' not in self.options:
-            name = "{}.{}.{}".format(self.name, type(self).__name__, sig)
-            tagmap = self.env.domaindata[type(self).name]['obj2tag']
-            tagmap[name] = list(self.options.get('tags', '').split(' '))
-            title = self.options.get('title', sig)
-            titlemap = self.env.domaindata[type(self).name]['obj2title']
-            titlemap[name] = title
-            objs = self.env.domaindata[type(self).name]['objects']
-            # (name, sig, typ, docname, anchor, prio)
-            objs.append((name,
-                         sig,
-                         type(self).name,
-                         self.env.docname,
-                         idx,
-                         0))
-
-class CommandUsageNode(TocNode):
-    """A custom node that describes command usages"""
-
-    name = 'cmdusage'
-
-    option_spec = TocNode.option_spec
-    option_spec.update({
-        'usage': directives.unchanged,
-    })
-
-    doc_field_types = [
-        GroupedField('opts', label='Options', names=('option', 'options', 'opt', 'opts')),
-    ]
-
-    def handle_signature(self, sig: str, signode: addnodes.desc_signature):
-        parts = sig.split('::')
-        if len(parts) > 2: parts.pop(0)
-        use = parts[-1]
-        signode['fullname'] = '::'.join(parts)
-        usage = self.options.get('usage', use)
-        if usage:
-            signode['tocname'] = usage
-            signode += addnodes.desc_name(text=usage)
-        return signode['fullname']
-
-    def add_target_and_index(
-        self,
-        name: str,
-        sig: str,
-        signode: addnodes.desc_signature
-    ) -> None:
-        idx = ".".join(name.split("::"))
-        signode['ids'].append(idx)
-        if 'noindex' not in self.options:
-            tocname: str = signode.get('tocname', name)
-            objs = self.env.domaindata[self.domain]['objects']
-            # (name, sig, typ, docname, anchor, prio)
-            objs.append((name,
-                         tocname,
-                         type(self).name,
-                         self.env.docname,
-                         idx,
-                         1))
-
-class CommandOptionGroupNode(CommandUsageNode):
-    """A custom node that describes a group of related options"""
-
-    name = 'cmdoptiongroup'
-
-    option_spec = CommandUsageNode.option_spec
-
-    doc_field_types = [
-        Field('opt', ('option',), label='', rolename='option')
-    ]
     
     def transform_content(self, contentnode: addnodes.desc_content) -> None:
         """hack `:option -thing: desc` into a proper option list with yoscrypt highlighting"""
@@ -186,6 +97,83 @@ class CommandOptionGroupNode(CommandUsageNode):
             newchildren.append(newnode)
         contentnode.children = newchildren
 
+class CommandNode(NodeWithOptions):
+    """A custom node that describes a command."""
+
+    name = 'cmd'
+    required_arguments = 1
+
+    option_spec = NodeWithOptions.option_spec.copy()
+    option_spec.update({
+        'title': directives.unchanged,
+        'tags': directives.unchanged
+    })
+
+    def handle_signature(self, sig, signode: addnodes.desc_signature):
+        signode['fullname'] = sig
+        signode += addnodes.desc_addname(text="yosys> help ")
+        signode += addnodes.desc_name(text=sig)
+        return signode['fullname']
+
+    def add_target_and_index(self, name_cls, sig, signode):
+        idx = type(self).name + '-' + sig
+        signode['ids'].append(idx)
+        if 'noindex' not in self.options:
+            name = "{}.{}.{}".format(self.name, type(self).__name__, sig)
+            tagmap = self.env.domaindata[type(self).name]['obj2tag']
+            tagmap[name] = list(self.options.get('tags', '').split(' '))
+            title = self.options.get('title', sig)
+            titlemap = self.env.domaindata[type(self).name]['obj2title']
+            titlemap[name] = title
+            objs = self.env.domaindata[type(self).name]['objects']
+            # (name, sig, typ, docname, anchor, prio)
+            objs.append((name,
+                         sig,
+                         type(self).name,
+                         self.env.docname,
+                         idx,
+                         0))
+
+class CommandUsageNode(NodeWithOptions):
+    """A custom node that describes command usages"""
+
+    name = 'cmdusage'
+
+    option_spec = NodeWithOptions.option_spec
+    option_spec.update({
+        'usage': directives.unchanged,
+    })
+
+    def handle_signature(self, sig: str, signode: addnodes.desc_signature):
+        parts = sig.split('::')
+        if len(parts) > 2: parts.pop(0)
+        use = parts[-1]
+        signode['fullname'] = '::'.join(parts)
+        usage = self.options.get('usage', use)
+        if usage:
+            signode['tocname'] = usage
+            signode += addnodes.desc_name(text=usage)
+        return signode['fullname']
+
+    def add_target_and_index(
+        self,
+        name: str,
+        sig: str,
+        signode: addnodes.desc_signature
+    ) -> None:
+        idx = ".".join(name.split("::"))
+        signode['ids'].append(idx)
+        if 'noindex' not in self.options:
+            tocname: str = signode.get('tocname', name)
+            objs = self.env.domaindata[self.domain]['objects']
+            # (name, sig, typ, docname, anchor, prio)
+            objs.append((name,
+                         tocname,
+                         type(self).name,
+                         self.env.docname,
+                         idx,
+                         1))
+
 class PropNode(TocNode):
     name = 'prop'
     fieldname = 'props'
@@ -621,7 +609,6 @@ class CommandDomain(Domain):
     directives = {
         'def': CommandNode,
         'usage': CommandUsageNode,
-        'optiongroup': CommandOptionGroupNode,
     }
 
     indices = {
diff --git a/kernel/log_help.cc b/kernel/log_help.cc
index 9c1687910..45228b024 100644
--- a/kernel/log_help.cc
+++ b/kernel/log_help.cc
@@ -34,11 +34,11 @@ Json ContentListing::to_json() {
 	return object;
 }
 
-void ContentListing::usage(const string &usage,
+void ContentListing::usage(const string &text,
 	const source_location location)
 {
 	log_assert(type.compare("root") == 0);
-	add_content("usage", usage, location);
+	add_content("usage", text, location);
 }
 
 void ContentListing::option(const string &text, const string &description,
@@ -62,19 +62,17 @@ void ContentListing::paragraph(const string &text,
 	add_content("text", text, location);
 }
 
-ContentListing* ContentListing::open_optiongroup(const string &name,
+ContentListing* ContentListing::open_usage(const string &text,
 	const source_location location)
 {
-	log_assert(type.compare("root") == 0);
-	auto optiongroup = new ContentListing("optiongroup", name, location);
-	add_content(optiongroup);
-	return optiongroup;
+	usage(text, location);
+	return back();
 }
 
 ContentListing* ContentListing::open_option(const string &text,
 	const source_location location)
 {
-	log_assert(type.compare("optiongroup") == 0);
+	log_assert(type.compare("root") == 0 || type.compare("usage") == 0);
 	auto option = new ContentListing("option", text, location);
 	add_content(option);
 	return option;
@@ -138,16 +136,15 @@ void PrettyHelp::log_help()
 	for (auto content : _root_listing.get_content()) {
 		if (content->type.compare("usage") == 0) {
 			log_pass_str(content->body, 1, true);
-		} else if (content->type.compare("optiongroup") == 0) {
-			for (auto option : content->get_content()) {
-				log_pass_str(option->body, 1);
-				for (auto text : option->get_content()) {
-					log_pass_str(text->body, 2);
-					log("\n");
-				}
+			log("\n");
+		} else if (content->type.compare("option") == 0) {
+			log_pass_str(content->body, 1);
+			for (auto text : content->get_content()) {
+				log_pass_str(text->body, 2);
+				log("\n");
 			}
 		} else {
-			log_pass_str(content->body, 0, true);
+			log_pass_str(content->body, 0);
 			log("\n");
 		}
 	}
diff --git a/kernel/log_help.h b/kernel/log_help.h
index 60f378e00..0a40fc531 100644
--- a/kernel/log_help.h
+++ b/kernel/log_help.h
@@ -68,7 +68,7 @@ public:
 	}
 
 	void usage(
-		const string &usage,
+		const string &text,
 		const source_location location = source_location::current()
 	);
 	void option(
@@ -86,8 +86,8 @@ public:
 		const source_location location = source_location::current()
 	);
 
-	ContentListing* open_optiongroup(
-		const string &name = "",
+	ContentListing* open_usage(
+		const string &text,
 		const source_location location = source_location::current()
 	);
 	ContentListing* open_option(
diff --git a/kernel/register.cc b/kernel/register.cc
index f0db7f7af..54faa9a81 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -945,13 +945,8 @@ struct HelpPass : public Pass {
 							current_listing->codeblock(current_buffer, "none", null_source);
 							current_buffer = "";
 						}
-						if (current_state == PUState_options || current_state == PUState_optionbody) {
-							current_listing = root_listing->back();
-						}  else {
-							current_listing = root_listing->open_optiongroup("", null_source);
-						}
 						current_state = PUState_options;
-						current_listing = current_listing->open_option(stripped_line, null_source);
+						current_listing = root_listing->open_option(stripped_line, null_source);
 						def_strip_count = first_pos;
 					} else {
 						if (current_state == PUState_options) {
diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index 53884b10f..ccda023c0 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -86,29 +86,27 @@ struct ChformalPass : public Pass {
 			"given, the command will operate on all constraint types:"
 		);
 
-		auto types_group = content_root->open_optiongroup("[types]");
-		types_group->option("-assert", "`$assert` cells, representing ``assert(...)`` constraints");
-		types_group->option("-assume", "`$assume` cells, representing ``assume(...)`` constraints");
-		types_group->option("-live", "`$live` cells, representing ``assert(s_eventually ...)``");
-		types_group->option("-fair", "`$fair` cells, representing ``assume(s_eventually ...)``");
-		types_group->option("-cover", "`$cover` cells, representing ``cover()`` statements");
-		types_group->paragraph(
+		content_root->option("-assert", "`$assert` cells, representing ``assert(...)`` constraints");
+		content_root->option("-assume", "`$assume` cells, representing ``assume(...)`` constraints");
+		content_root->option("-live", "`$live` cells, representing ``assert(s_eventually ...)``");
+		content_root->option("-fair", "`$fair` cells, representing ``assume(s_eventually ...)``");
+		content_root->option("-cover", "`$cover` cells, representing ``cover()`` statements");
+		content_root->paragraph(
 			"Additionally chformal will operate on `$check` cells corresponding to the "
 			"selected constraint types."
 		);
 
 		content_root->paragraph("Exactly one of the following modes must be specified:");
 
-		auto modes_group = content_root->open_optiongroup("[mode]");
-		modes_group->option("-remove", "remove the cells and thus constraints from the design");
-		modes_group->option("-early",
+		content_root->option("-remove", "remove the cells and thus constraints from the design");
+		content_root->option("-early",
 			"bypass FFs that only delay the activation of a constraint. When inputs "
 			"of the bypassed FFs do not remain stable between clock edges, this may "
 			"result in unexpected behavior."
 		);
-		modes_group->option("-delay <N>", "delay activation of the constraint by <N> clock cycles");
-		modes_group->option("-skip <N>", "ignore activation of the constraint in the first <N> clock cycles");
-		auto cover_option = modes_group->open_option("-coverenable");
+		content_root->option("-delay <N>", "delay activation of the constraint by <N> clock cycles");
+		content_root->option("-skip <N>", "ignore activation of the constraint in the first <N> clock cycles");
+		auto cover_option = content_root->open_option("-coverenable");
 		cover_option->paragraph(
 			"add cover statements for the enable signals of the constraints"
 		);
@@ -118,12 +116,12 @@ struct ChformalPass : public Pass {
 			"reachable SVA statement corresponds to an active enable signal."
 		);
 #endif
-		modes_group->option("-assert2assume");
-		modes_group->option("-assert2cover");
-		modes_group->option("-assume2assert");
-		modes_group->option("-live2fair");
-		modes_group->option("-fair2live", "change the roles of cells as indicated. these options can be combined");
-		modes_group->option("-lower",
+		content_root->option("-assert2assume");
+		content_root->option("-assert2cover");
+		content_root->option("-assume2assert");
+		content_root->option("-live2fair");
+		content_root->option("-fair2live", "change the roles of cells as indicated. these options can be combined");
+		content_root->option("-lower",
 			"convert each $check cell into an $assert, $assume, $live, $fair or "
 			"$cover cell. If the $check cell contains a message, also produce a "
 			"$print cell."

From 87ec4869628d39ee2ba56c5ddb6e0b8349556aaf Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:36:18 +1200
Subject: [PATCH 189/931] docs/internal: Add note on synth_* script
 highlighting

---
 docs/source/cmd/index_internal.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/source/cmd/index_internal.rst b/docs/source/cmd/index_internal.rst
index a077dc2a4..dc9980171 100644
--- a/docs/source/cmd/index_internal.rst
+++ b/docs/source/cmd/index_internal.rst
@@ -101,6 +101,15 @@ Dumping command help to json
    :end-before: "chparam": {
    :caption: `chformal` in generated :file:`cmds.json`
 
+.. note:: Synthesis command scripts are special cased
+
+   If the final block of help output starts with the string `"The following
+   commands are executed by this synthesis command:\n"`, then the rest of the
+   code block is formatted as ``yoscrypt`` (e.g. `synth_ice40`).  The caveat
+   here is that if the ``script()`` calls ``run()`` on any commands *prior* to
+   the first ``check_label`` then the auto detection will break and revert to
+   unformatted code (e.g. `synth_fabulous`). 
+
 Command line rendering
 ~~~~~~~~~~~~~~~~~~~~~~
 

From af3c28f274e0f95dd3ffcc797dc5d31d4cb8f14c Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:36:18 +1200
Subject: [PATCH 190/931] synthprop: Use override keyword

`formatted_help()` introduced the override keyword, which means that the other two methods that were marked as virtual instead raised a warning about inconsistent use of override.  This fixes that by bringing the synthprop (more) in line with the rest of the code-base.
---
 passes/sat/synthprop.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/passes/sat/synthprop.cc b/passes/sat/synthprop.cc
index af69b1172..4703e4ad7 100644
--- a/passes/sat/synthprop.cc
+++ b/passes/sat/synthprop.cc
@@ -187,7 +187,7 @@ struct SyntProperties : public Pass {
 		return false;
 	}
 
-	virtual void help()
+	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
@@ -216,7 +216,7 @@ struct SyntProperties : public Pass {
 		log("\n");
 	}
 
-	virtual void execute(std::vector<std::string> args, RTLIL::Design* design)
+	void execute(std::vector<std::string> args, RTLIL::Design* design) override
 	{
 		log_header(design, "Executing SYNTHPROP pass.\n");
 		SynthPropWorker worker(design);

From d0ce6a3bd6db25bb3e32aa16fe2fd94c67815fe4 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:36:18 +1200
Subject: [PATCH 191/931] Docs: Include internal cmds in toctree

Also fixing some missing refs (using single backticks instead of double).
---
 docs/source/cmd/index_internal.rst      | 2 --
 docs/source/cmd_ref.rst                 | 8 +++-----
 docs/source/yosys_internals/hashing.rst | 2 +-
 docs/source/yosys_internals/verilog.rst | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/docs/source/cmd/index_internal.rst b/docs/source/cmd/index_internal.rst
index dc9980171..bfb369dde 100644
--- a/docs/source/cmd/index_internal.rst
+++ b/docs/source/cmd/index_internal.rst
@@ -1,5 +1,3 @@
-:orphan:
-
 Internal commands for developers
 --------------------------------
 
diff --git a/docs/source/cmd_ref.rst b/docs/source/cmd_ref.rst
index 73a383ad5..20915d6dc 100644
--- a/docs/source/cmd_ref.rst
+++ b/docs/source/cmd_ref.rst
@@ -27,9 +27,7 @@ Command reference
    /cmd/index_passes
    /cmd/index_techlibs
 
-.. TODO:: Fix index_internal not being included in pdf
+.. toctree::
+   :maxdepth: 2
 
-.. note::
-
-   Commands intended for internal developer use can also be found under
-   :doc:`/cmd/index_internal`
+   /cmd/index_internal
diff --git a/docs/source/yosys_internals/hashing.rst b/docs/source/yosys_internals/hashing.rst
index c6e22c0cf..b9608d99e 100644
--- a/docs/source/yosys_internals/hashing.rst
+++ b/docs/source/yosys_internals/hashing.rst
@@ -138,7 +138,7 @@ Previously, the interface to implement hashing on custom types was just
 independently and then ad-hoc combined with the hash function with some xorshift
 operations thrown in to mix bits together somewhat. A plugin can stay compatible
 with both versions prior and after the break by implementing both interfaces
-based on the existance and value of `YS_HASHING_VERSION`.
+based on the existance and value of ``YS_HASHING_VERSION``.
 
 .. code-block:: cpp
    :caption: Example hash compatibility wrapper
diff --git a/docs/source/yosys_internals/verilog.rst b/docs/source/yosys_internals/verilog.rst
index d67553aa9..fe31aecea 100644
--- a/docs/source/yosys_internals/verilog.rst
+++ b/docs/source/yosys_internals/verilog.rst
@@ -96,7 +96,7 @@ Verilog Attributes and non-standard features
 - The ``keep_hierarchy`` attribute on cells and modules keeps the `flatten`
   command from flattening the indicated cells and modules.
 
-- The `gate_cost_equivalent` attribute on a module can be used to specify
+- The ``gate_cost_equivalent`` attribute on a module can be used to specify
   the estimated cost of the module as a number of basic gate instances. See
   the help message of command `keep_hierarchy` which interprets this
   attribute.

From 4ba403829b8a460eca5c8032d7e7d2f1eec78ba1 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:36:19 +1200
Subject: [PATCH 192/931] cmdref: Groups and group names

---
 docs/source/cmd/index_passes_hierarchy.rst |  4 ++--
 docs/source/cmd/index_passes_sat.rst       |  4 ++--
 passes/sat/expose.cc                       | 10 +++++++---
 passes/sat/recover_names.cc                |  6 ++++++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/docs/source/cmd/index_passes_hierarchy.rst b/docs/source/cmd/index_passes_hierarchy.rst
index 2032be636..27a0faeb7 100644
--- a/docs/source/cmd/index_passes_hierarchy.rst
+++ b/docs/source/cmd/index_passes_hierarchy.rst
@@ -1,5 +1,5 @@
-hierarchy
-------------------
+Working with hierarchy
+----------------------
 
 .. autocmdgroup:: passes/hierarchy
    :members:
diff --git a/docs/source/cmd/index_passes_sat.rst b/docs/source/cmd/index_passes_sat.rst
index 1f2c6904d..a2571fedb 100644
--- a/docs/source/cmd/index_passes_sat.rst
+++ b/docs/source/cmd/index_passes_sat.rst
@@ -1,5 +1,5 @@
-sat
-------------------
+Simulating circuits
+-------------------
 
 .. autocmdgroup:: passes/sat
    :members:
diff --git a/passes/sat/expose.cc b/passes/sat/expose.cc
index 9afe00d5c..1e975db0f 100644
--- a/passes/sat/expose.cc
+++ b/passes/sat/expose.cc
@@ -17,11 +17,10 @@
  *
  */
 
-#include "kernel/register.h"
+#include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -217,6 +216,11 @@ RTLIL::Wire *add_new_wire(RTLIL::Module *module, RTLIL::IdString name, int width
 
 struct ExposePass : public Pass {
 	ExposePass() : Pass("expose", "convert internal signals to module ports") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/cmds");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/recover_names.cc b/passes/sat/recover_names.cc
index cddd8771c..7ed8b1304 100644
--- a/passes/sat/recover_names.cc
+++ b/passes/sat/recover_names.cc
@@ -23,6 +23,7 @@
 #include "kernel/celltypes.h"
 #include "kernel/utils.h"
 #include "kernel/satgen.h"
+#include "kernel/log_help.h"
 
 #include <algorithm>
 #include <queue>
@@ -690,6 +691,11 @@ struct RecoverNamesWorker {
 
 struct RecoverNamesPass : public Pass {
     RecoverNamesPass() : Pass("recover_names", "Execute a lossy mapping command and recover original netnames") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/opt");
+		return false;
+	}
     void help() override
     {
         //   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|

From 3804af35fcd33f16c613379049564c9f6a5dc8f7 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:36:19 +1200
Subject: [PATCH 193/931] Docs: Naming techlibs

---
 docs/source/cmd/index_techlibs_achronix.rst                  | 2 +-
 docs/source/cmd/index_techlibs_anlogic.rst                   | 2 +-
 docs/source/cmd/index_techlibs_coolrunner2.rst               | 2 +-
 docs/source/cmd/index_techlibs_easic.rst                     | 2 +-
 docs/source/cmd/index_techlibs_ecp5.rst                      | 2 +-
 docs/source/cmd/index_techlibs_fabulous.rst                  | 2 +-
 docs/source/cmd/index_techlibs_gatemate.rst                  | 2 +-
 docs/source/cmd/index_techlibs_gowin.rst                     | 2 +-
 docs/source/cmd/index_techlibs_greenpak4.rst                 | 2 +-
 docs/source/cmd/index_techlibs_ice40.rst                     | 2 +-
 docs/source/cmd/index_techlibs_lattice.rst                   | 2 +-
 ...x_techlibs_nexus.rst => index_techlibs_lattice_nexus.rst} | 2 +-
 docs/source/cmd/index_techlibs_microchip.rst                 | 2 +-
 docs/source/cmd/index_techlibs_microchip_sf2.rst             | 5 +++++
 docs/source/cmd/index_techlibs_nanoxplore.rst                | 2 +-
 docs/source/cmd/index_techlibs_quicklogic.rst                | 2 +-
 docs/source/cmd/index_techlibs_sf2.rst                       | 5 -----
 docs/source/cmd/index_techlibs_xilinx.rst                    | 2 +-
 18 files changed, 21 insertions(+), 21 deletions(-)
 rename docs/source/cmd/{index_techlibs_nexus.rst => index_techlibs_lattice_nexus.rst} (82%)
 create mode 100644 docs/source/cmd/index_techlibs_microchip_sf2.rst
 delete mode 100644 docs/source/cmd/index_techlibs_sf2.rst

diff --git a/docs/source/cmd/index_techlibs_achronix.rst b/docs/source/cmd/index_techlibs_achronix.rst
index babf4e979..d4d96d24a 100644
--- a/docs/source/cmd/index_techlibs_achronix.rst
+++ b/docs/source/cmd/index_techlibs_achronix.rst
@@ -1,4 +1,4 @@
-achronix
+Achronix
 ------------------
 
 .. autocmdgroup:: techlibs/achronix
diff --git a/docs/source/cmd/index_techlibs_anlogic.rst b/docs/source/cmd/index_techlibs_anlogic.rst
index 13ef12fc7..8a2e6b577 100644
--- a/docs/source/cmd/index_techlibs_anlogic.rst
+++ b/docs/source/cmd/index_techlibs_anlogic.rst
@@ -1,4 +1,4 @@
-anlogic
+Anlogic
 ------------------
 
 .. autocmdgroup:: techlibs/anlogic
diff --git a/docs/source/cmd/index_techlibs_coolrunner2.rst b/docs/source/cmd/index_techlibs_coolrunner2.rst
index 23e87d03e..23d91a500 100644
--- a/docs/source/cmd/index_techlibs_coolrunner2.rst
+++ b/docs/source/cmd/index_techlibs_coolrunner2.rst
@@ -1,4 +1,4 @@
-coolrunner2
+CoolRunner-II
 ------------------
 
 .. autocmdgroup:: techlibs/coolrunner2
diff --git a/docs/source/cmd/index_techlibs_easic.rst b/docs/source/cmd/index_techlibs_easic.rst
index 0cd375f11..c6398ddf3 100644
--- a/docs/source/cmd/index_techlibs_easic.rst
+++ b/docs/source/cmd/index_techlibs_easic.rst
@@ -1,4 +1,4 @@
-easic
+eASIC
 ------------------
 
 .. autocmdgroup:: techlibs/easic
diff --git a/docs/source/cmd/index_techlibs_ecp5.rst b/docs/source/cmd/index_techlibs_ecp5.rst
index 42a12e8e9..29fd309cf 100644
--- a/docs/source/cmd/index_techlibs_ecp5.rst
+++ b/docs/source/cmd/index_techlibs_ecp5.rst
@@ -1,4 +1,4 @@
-ecp5
+ECP5
 ------------------
 
 .. autocmdgroup:: techlibs/ecp5
diff --git a/docs/source/cmd/index_techlibs_fabulous.rst b/docs/source/cmd/index_techlibs_fabulous.rst
index ce075c025..96f04f40a 100644
--- a/docs/source/cmd/index_techlibs_fabulous.rst
+++ b/docs/source/cmd/index_techlibs_fabulous.rst
@@ -1,4 +1,4 @@
-fabulous
+FABulous
 ------------------
 
 .. autocmdgroup:: techlibs/fabulous
diff --git a/docs/source/cmd/index_techlibs_gatemate.rst b/docs/source/cmd/index_techlibs_gatemate.rst
index 5a362b0fe..951d0000b 100644
--- a/docs/source/cmd/index_techlibs_gatemate.rst
+++ b/docs/source/cmd/index_techlibs_gatemate.rst
@@ -1,4 +1,4 @@
-gatemate
+Gatemate
 ------------------
 
 .. autocmdgroup:: techlibs/gatemate
diff --git a/docs/source/cmd/index_techlibs_gowin.rst b/docs/source/cmd/index_techlibs_gowin.rst
index 379cb773e..cdcb1c2ee 100644
--- a/docs/source/cmd/index_techlibs_gowin.rst
+++ b/docs/source/cmd/index_techlibs_gowin.rst
@@ -1,4 +1,4 @@
-gowin
+Gowin
 ------------------
 
 .. autocmdgroup:: techlibs/gowin
diff --git a/docs/source/cmd/index_techlibs_greenpak4.rst b/docs/source/cmd/index_techlibs_greenpak4.rst
index 1f733488d..add1ab102 100644
--- a/docs/source/cmd/index_techlibs_greenpak4.rst
+++ b/docs/source/cmd/index_techlibs_greenpak4.rst
@@ -1,4 +1,4 @@
-greenpak4
+GreenPAK4
 ------------------
 
 .. autocmdgroup:: techlibs/greenpak4
diff --git a/docs/source/cmd/index_techlibs_ice40.rst b/docs/source/cmd/index_techlibs_ice40.rst
index 3d04fee05..1c4b2d07a 100644
--- a/docs/source/cmd/index_techlibs_ice40.rst
+++ b/docs/source/cmd/index_techlibs_ice40.rst
@@ -1,4 +1,4 @@
-ice40
+iCE40
 ------------------
 
 .. autocmdgroup:: techlibs/ice40
diff --git a/docs/source/cmd/index_techlibs_lattice.rst b/docs/source/cmd/index_techlibs_lattice.rst
index 55bed7afc..985bf0bbd 100644
--- a/docs/source/cmd/index_techlibs_lattice.rst
+++ b/docs/source/cmd/index_techlibs_lattice.rst
@@ -1,4 +1,4 @@
-lattice
+Lattice
 ------------------
 
 .. autocmdgroup:: techlibs/lattice
diff --git a/docs/source/cmd/index_techlibs_nexus.rst b/docs/source/cmd/index_techlibs_lattice_nexus.rst
similarity index 82%
rename from docs/source/cmd/index_techlibs_nexus.rst
rename to docs/source/cmd/index_techlibs_lattice_nexus.rst
index a0289a571..d5ac4184c 100644
--- a/docs/source/cmd/index_techlibs_nexus.rst
+++ b/docs/source/cmd/index_techlibs_lattice_nexus.rst
@@ -1,4 +1,4 @@
-nexus
+Lattice Nexus
 ------------------
 
 .. autocmdgroup:: techlibs/nexus
diff --git a/docs/source/cmd/index_techlibs_microchip.rst b/docs/source/cmd/index_techlibs_microchip.rst
index 79340febc..06613a59c 100644
--- a/docs/source/cmd/index_techlibs_microchip.rst
+++ b/docs/source/cmd/index_techlibs_microchip.rst
@@ -1,4 +1,4 @@
-microchip
+Microchip
 ------------------
 
 .. autocmdgroup:: techlibs/microchip
diff --git a/docs/source/cmd/index_techlibs_microchip_sf2.rst b/docs/source/cmd/index_techlibs_microchip_sf2.rst
new file mode 100644
index 000000000..4ebe47f33
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_microchip_sf2.rst
@@ -0,0 +1,5 @@
+Microchip - SmartFusion2/IGLOO2
+-----------------------------------
+
+.. autocmdgroup:: techlibs/sf2
+   :members:
diff --git a/docs/source/cmd/index_techlibs_nanoxplore.rst b/docs/source/cmd/index_techlibs_nanoxplore.rst
index c941c32ba..9eff4681c 100644
--- a/docs/source/cmd/index_techlibs_nanoxplore.rst
+++ b/docs/source/cmd/index_techlibs_nanoxplore.rst
@@ -1,4 +1,4 @@
-nanoxplore
+NanoXplore
 ------------------
 
 .. autocmdgroup:: techlibs/nanoxplore
diff --git a/docs/source/cmd/index_techlibs_quicklogic.rst b/docs/source/cmd/index_techlibs_quicklogic.rst
index d11d4faca..54d199eb0 100644
--- a/docs/source/cmd/index_techlibs_quicklogic.rst
+++ b/docs/source/cmd/index_techlibs_quicklogic.rst
@@ -1,4 +1,4 @@
-quicklogic
+QuickLogic
 ------------------
 
 .. autocmdgroup:: techlibs/quicklogic
diff --git a/docs/source/cmd/index_techlibs_sf2.rst b/docs/source/cmd/index_techlibs_sf2.rst
deleted file mode 100644
index b97f96c9d..000000000
--- a/docs/source/cmd/index_techlibs_sf2.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-sf2
-------------------
-
-.. autocmdgroup:: techlibs/sf2
-   :members:
diff --git a/docs/source/cmd/index_techlibs_xilinx.rst b/docs/source/cmd/index_techlibs_xilinx.rst
index 5ce3d115b..df5112b7e 100644
--- a/docs/source/cmd/index_techlibs_xilinx.rst
+++ b/docs/source/cmd/index_techlibs_xilinx.rst
@@ -1,4 +1,4 @@
-xilinx
+Xilinx
 ------------------
 
 .. autocmdgroup:: techlibs/xilinx

From 3eb7b35c29741c3c92d2732fd1e40f7ca77717dd Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:36:19 +1200
Subject: [PATCH 194/931] flatten: Move to hierarchy folder

---
 passes/hierarchy/Makefile.inc            | 1 +
 passes/{techmap => hierarchy}/flatten.cc | 0
 passes/techmap/Makefile.inc              | 1 -
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename passes/{techmap => hierarchy}/flatten.cc (100%)

diff --git a/passes/hierarchy/Makefile.inc b/passes/hierarchy/Makefile.inc
index 3cd1b6180..ff1a2fcc5 100644
--- a/passes/hierarchy/Makefile.inc
+++ b/passes/hierarchy/Makefile.inc
@@ -1,4 +1,5 @@
 
+OBJS += passes/hierarchy/flatten.o
 OBJS += passes/hierarchy/hierarchy.o
 OBJS += passes/hierarchy/uniquify.o
 OBJS += passes/hierarchy/submod.o
diff --git a/passes/techmap/flatten.cc b/passes/hierarchy/flatten.cc
similarity index 100%
rename from passes/techmap/flatten.cc
rename to passes/hierarchy/flatten.cc
diff --git a/passes/techmap/Makefile.inc b/passes/techmap/Makefile.inc
index c9fe98a74..91b3b563a 100644
--- a/passes/techmap/Makefile.inc
+++ b/passes/techmap/Makefile.inc
@@ -1,5 +1,4 @@
 
-OBJS += passes/techmap/flatten.o
 OBJS += passes/techmap/techmap.o
 OBJS += passes/techmap/simplemap.o
 OBJS += passes/techmap/dfflibmap.o

From c92f200491adcea39c375f092e7c25ed846efad1 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:37:30 +1200
Subject: [PATCH 195/931] Drop <cmd>.rst dump

---
 Makefile           |  14 ------
 kernel/register.cc | 103 ---------------------------------------------
 2 files changed, 117 deletions(-)

diff --git a/Makefile b/Makefile
index 3b6a3bfaf..0f0a53a07 100644
--- a/Makefile
+++ b/Makefile
@@ -115,12 +115,6 @@ BISON ?= bison
 STRIP ?= strip
 AWK ?= awk
 
-ifneq ($(shell :; command -v rsync),)
-RSYNC_CP ?= rsync -rc
-else
-RSYNC_CP ?= cp -ru
-endif
-
 ifeq ($(OS), Darwin)
 PLUGIN_LINKFLAGS += -undefined dynamic_lookup
 LINKFLAGS += -rdynamic
@@ -1034,14 +1028,6 @@ ifeq ($(ENABLE_PYOSYS),1)
 endif
 endif
 
-# also others, but so long as it doesn't fail this is enough to know we tried
-docs/source/cmd/abc.rst: $(TARGETS) $(EXTRA_TARGETS)
-	$(Q) mkdir -p docs/source/cmd
-	$(Q) mkdir -p temp/docs/source/cmd
-	$(Q) cd temp && ./../$(PROGRAM_PREFIX)yosys -p 'help -write-rst-command-reference-manual'
-	$(Q) $(RSYNC_CP) temp/docs/source/cmd docs/source
-	$(Q) rm -rf temp
-
 docs/source/generated/cmds.json: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
 	$(Q) ./$(PROGRAM_PREFIX)yosys -p 'help -dump-cmds-json $@'
 
diff --git a/kernel/register.cc b/kernel/register.cc
index 54faa9a81..ea2a2624f 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -735,98 +735,6 @@ struct HelpPass : public Pass {
 		log("    help <celltype>+  ....  print verilog code for given cell type\n");
 		log("\n");
 	}
-	void write_cmd_rst(std::string cmd, std::string title, std::string text)
-	{
-		FILE *f = fopen(stringf("docs/source/cmd/%s.rst", cmd.c_str()).c_str(), "wt");
-		// make header
-		size_t char_len = cmd.length() + 3 + title.length();
-		std::string title_line = "\n";
-		title_line.insert(0, char_len, '=');
-		fprintf(f, "%s", title_line.c_str());
-		fprintf(f, "%s - %s\n", cmd.c_str(), title.c_str());
-		fprintf(f, "%s\n", title_line.c_str());
-
-		// render html
-		fprintf(f, ".. cmd:def:: %s\n", cmd.c_str());
-		fprintf(f, "   :title: %s\n\n", title.c_str());
-		fprintf(f, "   .. only:: html\n\n");
-		std::stringstream ss;
-		std::string textcp = text;
-		ss << text;
-		bool IsUsage = true;
-		int blank_count = 0;
-		size_t def_strip_count = 0;
-		bool WasDefinition = false;
-		for (std::string line; std::getline(ss, line, '\n');) {
-			// find position of first non space character
-			std::size_t first_pos = line.find_first_not_of(" \t");
-			std::size_t last_pos = line.find_last_not_of(" \t");
-			if (first_pos == std::string::npos) {
-				// skip formatting empty lines
-				if (!WasDefinition)
-					fputc('\n', f);
-				blank_count += 1;
-				continue;
-			}
-
-			// strip leading and trailing whitespace
-			std::string stripped_line = line.substr(first_pos, last_pos - first_pos +1);
-			bool IsDefinition = stripped_line[0] == '-';
-			IsDefinition &= stripped_line[1] != ' ' && stripped_line[1] != '>';
-			bool IsDedent = def_strip_count && first_pos <= def_strip_count;
-			bool IsIndent = first_pos == 2 || first_pos == 4;
-			if (cmd.compare(0, 7, "verific") == 0)
-				// verific.cc has strange and different formatting from the rest
-				IsIndent = false;
-
-			// another usage block
-			bool NewUsage = stripped_line.find(cmd) == 0;
-
-			if (IsUsage) {
-				if (stripped_line.compare(0, 4, "See ") == 0) {
-					// description refers to another function
-					fprintf(f, "\n      %s\n", stripped_line.c_str());
-				} else {
-					// usage should be the first line of help output
-					fprintf(f, "\n      .. code:: yoscrypt\n\n         %s\n\n      ", stripped_line.c_str());
-					WasDefinition = true;
-				}
-				IsUsage = false;
-			} else if (IsIndent && NewUsage && (blank_count >= 2 || WasDefinition)) {
-				// another usage block
-				fprintf(f, "\n      .. code:: yoscrypt\n\n         %s\n\n      ", stripped_line.c_str());
-				WasDefinition = true;
-				def_strip_count = 0;
-			} else if (IsIndent && IsDefinition && (blank_count || WasDefinition)) {
-				// format definition term
-				fprintf(f, "\n\n      .. code:: yoscrypt\n\n         %s\n\n      ", stripped_line.c_str());
-				WasDefinition = true;
-				def_strip_count = first_pos;
-			} else {
-				if (IsDedent) {
-					fprintf(f, "\n\n      ::\n");
-					def_strip_count = first_pos;
-				} else if (WasDefinition) {
-					fprintf(f, "::\n");
-					WasDefinition = false;
-				}
-				fprintf(f, "\n         %s", line.substr(def_strip_count, std::string::npos).c_str());
-			}
-
-			blank_count = 0;
-		}
-		fputc('\n', f);
-
-		// render latex
-		fprintf(f, ".. only:: latex\n\n");
-		fprintf(f, "   ::\n\n");
-		std::stringstream ss2;
-		ss2 << textcp;
-		for (std::string line; std::getline(ss2, line, '\n');) {
-			fprintf(f, "      %s\n", line.c_str());
-		}
-		fclose(f);
-	}
 	bool dump_cmds_json(PrettyJson &json) {
 		// init json
 		json.begin_object();
@@ -1151,17 +1059,6 @@ struct HelpPass : public Pass {
 				log("\n");
 				return;
 			}
-			// this option is undocumented as it is for internal use only
-			else if (args[1] == "-write-rst-command-reference-manual") {
-				for (auto &it : pass_register) {
-					std::ostringstream buf;
-					log_streams.push_back(&buf);
-					it.second->help();
-					log_warning_flags(it.second);
-					log_streams.pop_back();
-					write_cmd_rst(it.first, it.second->short_help, buf.str());
-				}
-			}
 			else if (pass_register.count(args[1])) {
 				pass_register.at(args[1])->help();
 				log_warning_flags(pass_register.at(args[1]));

From 14a5cd6c4c6085d833f9231ad19ee111cab7049a Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 10:37:30 +1200
Subject: [PATCH 196/931] Makefile: Fix chformal.cc copy

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0f0a53a07..60643e912 100644
--- a/Makefile
+++ b/Makefile
@@ -1050,7 +1050,7 @@ docs/source/generated/%.log: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
 	$(Q) ./$(PROGRAM_PREFIX)yosys -qQT -h '$*' -l $@
 
 docs/source/generated/chformal.cc: passes/cmds/chformal.cc docs/source/generated
-	cp $^ $@
+	$(Q) cp $< $@
 
 PHONY: docs/gen/chformal
 docs/gen/chformal: docs/source/generated/chformal.log docs/source/generated/chformal.cc

From c770c1e39d43abca1856949de51360053236ea7c Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:47:50 +1200
Subject: [PATCH 197/931] Docs: Improve cmd index

Lists all commands with their short help.
Also link to it.
---
 docs/source/cmd_ref.rst        | 2 ++
 docs/util/custom_directives.py | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/source/cmd_ref.rst b/docs/source/cmd_ref.rst
index 20915d6dc..668516a0b 100644
--- a/docs/source/cmd_ref.rst
+++ b/docs/source/cmd_ref.rst
@@ -12,6 +12,8 @@ Command reference
 
 .. todo:: Can we warn on command groups that aren't included anywhere?
 
+:ref:`List of all commands<cmd-cmd>`
+
 .. toctree::
    :maxdepth: 2
 
diff --git a/docs/util/custom_directives.py b/docs/util/custom_directives.py
index e8c400047..b90584aa7 100644
--- a/docs/util/custom_directives.py
+++ b/docs/util/custom_directives.py
@@ -474,7 +474,7 @@ class TagIndex(Index):
                 lis.append((
                     dispname, 0, docname,
                     anchor,
-                    docname, '', typ
+                    '', '', ''
                 ))
         ret = [(k, v) for k, v in sorted(content.items())]
 
@@ -513,18 +513,19 @@ class CommandIndex(Index):
         Qualifier and description are not rendered e.g. in LaTeX output.
         """
 
-        content = {}
+        content: dict[str, list[tuple]] = {}
         items = ((name, dispname, typ, docname, anchor)
                  for name, dispname, typ, docname, anchor, prio
                  in self.domain.get_objects()
                  if typ == self.name)
         items = sorted(items, key=lambda item: item[0])
         for name, dispname, typ, docname, anchor in items:
+            title = self.domain.data['obj2title'].get(name)
             lis = content.setdefault(self.shortname, [])
             lis.append((
                 dispname, 0, docname,
                 anchor,
-                '', '', typ
+                '', '', title 
             ))
         ret = [(k, v) for k, v in sorted(content.items())]
 

From f25f8fe7c445e19a11835ccea87a16947b201c3e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 21 Jul 2025 05:32:31 +0000
Subject: [PATCH 198/931] In the Verilog backend, only sort modules that we're
 going to emit.

If you have a large design with a lot of modules and you use the Verilog
backend to emit modules one at a time to separate files, performance is
very low. The problem is that the Verilog backend calls `design->sort()`
every time, which sorts the contents of all modules, and this is slow
even when everything is already sorted.

We can easily fix this by only sorting the contents of modules that
we're actually going to emit.
---
 backends/verilog/verilog_backend.cc | 3 ++-
 kernel/rtlil.cc                     | 6 ++++++
 kernel/rtlil.h                      | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index 1cef7be60..144dad90c 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -2612,7 +2612,7 @@ struct VerilogBackend : public Backend {
 		Pass::call(design, "clean_zerowidth");
 		log_pop();
 
-		design->sort();
+               design->sort_modules();
 
 		*f << stringf("/* Generated by %s */\n", yosys_maybe_version());
 
@@ -2625,6 +2625,7 @@ struct VerilogBackend : public Backend {
 				continue;
 			}
 			log("Dumping module `%s'.\n", module->name.c_str());
+			module->sort();
 			dump_module(*f, "", module);
 		}
 
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 8a0080dbf..db954a7c3 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -1139,6 +1139,12 @@ void RTLIL::Design::sort()
 		it.second->sort();
 }
 
+void RTLIL::Design::sort_modules()
+{
+	scratchpad.sort();
+	modules_.sort(sort_by_id_str());
+}
+
 void RTLIL::Design::check()
 {
 #ifndef NDEBUG
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 504fa0062..cf3f24c81 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1368,6 +1368,7 @@ struct RTLIL::Design
 	std::string scratchpad_get_string(const std::string &varname, const std::string &default_value = std::string()) const;
 
 	void sort();
+	void sort_modules();
 	void check();
 	void optimize();
 

From ca8af1f8c89910b9b3c9112d8e5efd6e031f53ec Mon Sep 17 00:00:00 2001
From: Anhijkt <mihail.ershov.zp@gmail.com>
Date: Mon, 21 Jul 2025 14:15:26 +0300
Subject: [PATCH 199/931] opt_dff: implement simplify_patterns

---
 passes/opt/opt_dff.cc            | 60 ++++++++++++++++++++++++++++++--
 tests/arch/quicklogic/pp3/fsm.ys |  6 ++--
 2 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/passes/opt/opt_dff.cc b/passes/opt/opt_dff.cc
index 4ed4b0cb6..b24616928 100644
--- a/passes/opt/opt_dff.cc
+++ b/passes/opt/opt_dff.cc
@@ -170,9 +170,65 @@ struct OptDffWorker
 		return ret;
 	}
 
-	void simplify_patterns(patterns_t&)
+	void simplify_patterns(patterns_t& patterns)
 	{
-		// TBD
+		// remove complimentary patterns
+
+		auto new_patterns = patterns;
+		bool optimized;
+		do {
+			optimized = false;
+			for (auto i = patterns.begin(); i != patterns.end(); i++) {
+				for (auto j = std::next(i, 1); j != patterns.end(); j++) {
+					const auto& smaller = (GetSize(*j) <= GetSize(*i)) ? *j : *i;
+					const auto& larger = (GetSize(*i) < GetSize(*j)) ? *j : *i;
+					auto left = std::move(smaller);
+					auto right = std::move(larger);
+
+					std::optional<RTLIL::SigBit> complimentary_var;
+
+					for (const auto &pt : left)
+						if (right.count(pt.first) == 0)
+								goto next;
+						else if (right[pt.first] == pt.second)
+								continue;
+						else
+							if (complimentary_var)
+								goto next;
+							else
+								complimentary_var = pt.first;
+					if (complimentary_var) {
+						new_patterns.erase(right);
+						right.erase(complimentary_var.value());
+						new_patterns.insert(right);
+						optimized = true;
+					}
+					next:
+					continue;
+				}
+			}
+			patterns = new_patterns;
+		} while(optimized);
+
+		// remove redundant patterns
+
+		for (auto i = patterns.begin(); i != patterns.end(); ++i) {
+			for (auto j = std::next(i, 1); j != patterns.end(); ++j) { 
+				const auto& smaller = (GetSize(*j) <= GetSize(*i)) ? *j : *i;
+				const auto& larger = (GetSize(*i) < GetSize(*j)) ? *j : *i;
+				auto left = std::move(smaller);
+				auto right = std::move(larger);
+
+		            	bool redundant = true;
+
+				for (const auto& pt : left)
+					if (right.count(pt.first) == 0 || right[pt.first] != pt.second)
+						redundant = false;
+				if (redundant)
+					new_patterns.erase(right);
+			}
+		}
+		patterns = std::move(new_patterns)
 	}
 
 	ctrl_t make_patterns_logic(const patterns_t &patterns, const ctrls_t &ctrls, bool make_gates)
diff --git a/tests/arch/quicklogic/pp3/fsm.ys b/tests/arch/quicklogic/pp3/fsm.ys
index 418db8025..9679628e9 100644
--- a/tests/arch/quicklogic/pp3/fsm.ys
+++ b/tests/arch/quicklogic/pp3/fsm.ys
@@ -11,8 +11,8 @@ sat -verify -prove-asserts -show-public -set-at 1 in_reset 1 -seq 20 -prove-skip
 design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design)
 cd fsm # Constrain all select calls below inside the top module
 
-select -assert-count 1 t:LUT2
-select -assert-count 9 t:LUT3
+select -assert-count 2 t:LUT2
+select -assert-count 4 t:LUT3
 select -assert-count 4 t:dffepc
 select -assert-count 1 t:logic_0
 select -assert-count 1 t:logic_1
@@ -20,4 +20,4 @@ select -assert-count 3 t:inpad
 select -assert-count 2 t:outpad
 select -assert-count 1 t:ckpad
 
-select -assert-none t:LUT2 t:LUT3 t:dffepc t:logic_0 t:logic_1 t:inpad t:outpad t:ckpad %% t:* %D
+select -assert-none t:LUT2 t:LUT3 t:LUT4 t:dffepc t:logic_0 t:logic_1 t:inpad t:outpad t:ckpad %% t:* %D

From d9fc6dda9ec9354568f372f870af73ccffc6b652 Mon Sep 17 00:00:00 2001
From: Anhijkt <mihail.ershov.zp@gmail.com>
Date: Mon, 21 Jul 2025 14:42:52 +0300
Subject: [PATCH 200/931] typo

---
 passes/opt/opt_dff.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/opt/opt_dff.cc b/passes/opt/opt_dff.cc
index b24616928..def177133 100644
--- a/passes/opt/opt_dff.cc
+++ b/passes/opt/opt_dff.cc
@@ -228,7 +228,7 @@ struct OptDffWorker
 					new_patterns.erase(right);
 			}
 		}
-		patterns = std::move(new_patterns)
+		patterns = std::move(new_patterns);
 	}
 
 	ctrl_t make_patterns_logic(const patterns_t &patterns, const ctrls_t &ctrls, bool make_gates)

From 2223d7848be5a249b885c355904aa1142081ea23 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 00:26:35 +0000
Subject: [PATCH 201/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 60643e912..1443f3c4a 100644
--- a/Makefile
+++ b/Makefile
@@ -154,7 +154,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+46
+YOSYS_VER := 0.55+109
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 875e06833494c9386e701b8b1ee1b48c38890fe0 Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Tue, 22 Jul 2025 10:15:37 +0200
Subject: [PATCH 202/931] sort and comment .gitignore

---
 .gitignore | 69 +++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7b4a1fb1e..3b77edf1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,26 +1,19 @@
+## user config
+/Makefile.conf
+
+## build artifacts
+# compiler intermediate files
 *.o
 *.d
 *.dwo
-.*.swp
 *.gch
 *.gcda
 *.gcno
-*~
-__pycache__
-/.cache
-/.cproject
-/.project
-/.settings
-/qtcreator.files
-/qtcreator.includes
-/qtcreator.config
-/qtcreator.creator
-/qtcreator.creator.user
-/compile_commands.json
-/coverage.info
-/coverage_html
-/Makefile.conf
-/viz.js
+*.so.dSYM/
+
+# compiler output files
+/kernel/version_*.cc
+/share
 /yosys
 /yosys.exe
 /yosys.js
@@ -36,22 +29,50 @@ __pycache__
 /yosys-witness-script.py
 /yosys-filterlib
 /yosys-filterlib.exe
-/kernel/*.pyh
-/kernel/python_wrappers.cc
-/kernel/version_*.cc
-/share
 /yosys-win32-mxebin-*
 /yosys-win32-vcxsrc-*
 /yosysjs-*
 /libyosys.so
+
+# build directories
 /tests/unit/bintest/
 /tests/unit/objtest/
 /tests/ystests
+/build
 /result
 /dist
-/*.egg-info
-/build
-/venv
+
+# pyosys
+/kernel/*.pyh
+/kernel/python_wrappers.cc
 /boost
 /ffi
+/venv
 /*.whl
+/*.egg-info
+
+# yosysjs dependency
+/viz.js
+
+# other
+/coverage.info
+/coverage_html
+
+
+# these really belong in global gitignore since they're not specific to this project but rather to user tool choice
+# but too many people don't have a global gitignore configured:
+# https://docs.github.com/en/get-started/git-basics/ignoring-files#configuring-ignored-files-for-all-repositories-on-your-computer
+__pycache__
+*~
+.*.swp
+/.cache
+/.vscode
+/.cproject
+/.project
+/.settings
+/qtcreator.files
+/qtcreator.includes
+/qtcreator.config
+/qtcreator.creator
+/qtcreator.creator.user
+/compile_commands.json

From 8b75c061418f4b2efed215e49418e933796b8d02 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 22 Jul 2025 10:38:19 +0000
Subject: [PATCH 203/931] Add a general tests/.gitignore and remove redundant
 entries in subdirectory .gitignore files.

---
 techlibs/xilinx/tests/.gitignore | 1 -
 tests/{opt => }/.gitignore       | 2 ++
 tests/aiger/.gitignore           | 1 -
 tests/arch/anlogic/.gitignore    | 2 --
 tests/arch/ecp5/.gitignore       | 2 --
 tests/arch/efinix/.gitignore     | 3 ---
 tests/arch/fabulous/.gitignore   | 2 --
 tests/arch/gatemate/.gitignore   | 2 --
 tests/arch/gowin/.gitignore      | 3 ---
 tests/arch/ice40/.gitignore      | 2 --
 tests/arch/intel_alm/.gitignore  | 2 --
 tests/arch/machxo2/.gitignore    | 2 --
 tests/arch/microchip/.gitignore  | 2 --
 tests/arch/nanoxplore/.gitignore | 2 --
 tests/arch/nexus/.gitignore      | 2 --
 tests/arch/quicklogic/.gitignore | 2 --
 tests/arch/xilinx/.gitignore     | 2 --
 tests/asicworld/.gitignore       | 2 --
 tests/bind/.gitignore            | 2 --
 tests/blif/.gitignore            | 1 -
 tests/fmt/.gitignore             | 1 -
 tests/hana/.gitignore            | 2 --
 tests/liberty/.gitignore         | 1 -
 tests/lut/.gitignore             | 1 -
 tests/memlib/.gitignore          | 3 ---
 tests/memories/.gitignore        | 2 --
 tests/peepopt/.gitignore         | 1 -
 tests/proc/.gitignore            | 1 -
 tests/rpc/.gitignore             | 1 -
 tests/sat/.gitignore             | 2 --
 tests/select/.gitignore          | 1 -
 tests/sim/.gitignore             | 3 ---
 tests/simple/.gitignore          | 3 ---
 tests/simple_abc9/.gitignore     | 2 --
 tests/svtypes/.gitignore         | 3 ---
 tests/techmap/.gitignore         | 3 ---
 tests/various/.gitignore         | 3 ---
 tests/verific/.gitignore         | 3 ---
 tests/verilog/.gitignore         | 4 ----
 39 files changed, 2 insertions(+), 77 deletions(-)
 rename tests/{opt => }/.gitignore (60%)
 delete mode 100644 tests/arch/ecp5/.gitignore
 delete mode 100644 tests/arch/efinix/.gitignore
 delete mode 100644 tests/arch/gowin/.gitignore
 delete mode 100644 tests/arch/intel_alm/.gitignore
 delete mode 100644 tests/arch/machxo2/.gitignore
 delete mode 100644 tests/arch/nanoxplore/.gitignore
 delete mode 100644 tests/arch/nexus/.gitignore
 delete mode 100644 tests/asicworld/.gitignore
 delete mode 100644 tests/bind/.gitignore
 delete mode 100644 tests/blif/.gitignore
 delete mode 100644 tests/hana/.gitignore
 delete mode 100644 tests/lut/.gitignore
 delete mode 100644 tests/peepopt/.gitignore
 delete mode 100644 tests/proc/.gitignore
 delete mode 100644 tests/rpc/.gitignore
 delete mode 100644 tests/select/.gitignore
 delete mode 100644 tests/simple/.gitignore
 delete mode 100644 tests/svtypes/.gitignore
 delete mode 100644 tests/techmap/.gitignore
 delete mode 100644 tests/verific/.gitignore

diff --git a/techlibs/xilinx/tests/.gitignore b/techlibs/xilinx/tests/.gitignore
index 0d9c28fde..7cb771190 100644
--- a/techlibs/xilinx/tests/.gitignore
+++ b/techlibs/xilinx/tests/.gitignore
@@ -1,7 +1,6 @@
 bram1_cmp
 bram1.mk
 bram1_[0-9]*/
-bram2.log
 bram2_syn.v
 bram2_tb
 dsp_work*/
diff --git a/tests/opt/.gitignore b/tests/.gitignore
similarity index 60%
rename from tests/opt/.gitignore
rename to tests/.gitignore
index 8355de9dc..d8e01e026 100644
--- a/tests/opt/.gitignore
+++ b/tests/.gitignore
@@ -1,2 +1,4 @@
 *.log
+*.out
+*.err
 run-test.mk
diff --git a/tests/aiger/.gitignore b/tests/aiger/.gitignore
index 54b4a279b..4bb3e67f6 100644
--- a/tests/aiger/.gitignore
+++ b/tests/aiger/.gitignore
@@ -1,3 +1,2 @@
 /*_ref.v
-/*.log
 /neg.out/
diff --git a/tests/arch/anlogic/.gitignore b/tests/arch/anlogic/.gitignore
index 9a71dca69..d9f7e276c 100644
--- a/tests/arch/anlogic/.gitignore
+++ b/tests/arch/anlogic/.gitignore
@@ -1,4 +1,2 @@
-*.log
-/run-test.mk
 +*_synth.v
 +*_testbench
diff --git a/tests/arch/ecp5/.gitignore b/tests/arch/ecp5/.gitignore
deleted file mode 100644
index 1d329c933..000000000
--- a/tests/arch/ecp5/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.log
-/run-test.mk
diff --git a/tests/arch/efinix/.gitignore b/tests/arch/efinix/.gitignore
deleted file mode 100644
index b48f808a1..000000000
--- a/tests/arch/efinix/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*.log
-/*.out
-/run-test.mk
diff --git a/tests/arch/fabulous/.gitignore b/tests/arch/fabulous/.gitignore
index 9a71dca69..d9f7e276c 100644
--- a/tests/arch/fabulous/.gitignore
+++ b/tests/arch/fabulous/.gitignore
@@ -1,4 +1,2 @@
-*.log
-/run-test.mk
 +*_synth.v
 +*_testbench
diff --git a/tests/arch/gatemate/.gitignore b/tests/arch/gatemate/.gitignore
index 9a71dca69..d9f7e276c 100644
--- a/tests/arch/gatemate/.gitignore
+++ b/tests/arch/gatemate/.gitignore
@@ -1,4 +1,2 @@
-*.log
-/run-test.mk
 +*_synth.v
 +*_testbench
diff --git a/tests/arch/gowin/.gitignore b/tests/arch/gowin/.gitignore
deleted file mode 100644
index b48f808a1..000000000
--- a/tests/arch/gowin/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*.log
-/*.out
-/run-test.mk
diff --git a/tests/arch/ice40/.gitignore b/tests/arch/ice40/.gitignore
index 54f908bdb..a86b36792 100644
--- a/tests/arch/ice40/.gitignore
+++ b/tests/arch/ice40/.gitignore
@@ -1,5 +1,3 @@
-*.log
 *.json
-/run-test.mk
 +*_synth.v
 +*_testbench
diff --git a/tests/arch/intel_alm/.gitignore b/tests/arch/intel_alm/.gitignore
deleted file mode 100644
index ba42e1ee6..000000000
--- a/tests/arch/intel_alm/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.log
-/run-test.mk
diff --git a/tests/arch/machxo2/.gitignore b/tests/arch/machxo2/.gitignore
deleted file mode 100644
index 1d329c933..000000000
--- a/tests/arch/machxo2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.log
-/run-test.mk
diff --git a/tests/arch/microchip/.gitignore b/tests/arch/microchip/.gitignore
index 9c0a77944..aae26dc02 100644
--- a/tests/arch/microchip/.gitignore
+++ b/tests/arch/microchip/.gitignore
@@ -1,4 +1,2 @@
-*.log
-/run-test.mk
 *.vm
 
diff --git a/tests/arch/nanoxplore/.gitignore b/tests/arch/nanoxplore/.gitignore
deleted file mode 100644
index 1d329c933..000000000
--- a/tests/arch/nanoxplore/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.log
-/run-test.mk
diff --git a/tests/arch/nexus/.gitignore b/tests/arch/nexus/.gitignore
deleted file mode 100644
index ba42e1ee6..000000000
--- a/tests/arch/nexus/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/*.log
-/run-test.mk
diff --git a/tests/arch/quicklogic/.gitignore b/tests/arch/quicklogic/.gitignore
index ae20ed342..d9f7e276c 100644
--- a/tests/arch/quicklogic/.gitignore
+++ b/tests/arch/quicklogic/.gitignore
@@ -1,4 +1,2 @@
-*.log
-run-test.mk
 +*_synth.v
 +*_testbench
diff --git a/tests/arch/xilinx/.gitignore b/tests/arch/xilinx/.gitignore
index c99b79371..15a12d049 100644
--- a/tests/arch/xilinx/.gitignore
+++ b/tests/arch/xilinx/.gitignore
@@ -1,5 +1,3 @@
-/*.log
-/*.out
 /run-test.mk
 /*_uut.v
 /test_macc
diff --git a/tests/asicworld/.gitignore b/tests/asicworld/.gitignore
deleted file mode 100644
index 073f46157..000000000
--- a/tests/asicworld/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.log
-*.out
diff --git a/tests/bind/.gitignore b/tests/bind/.gitignore
deleted file mode 100644
index 8355de9dc..000000000
--- a/tests/bind/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.log
-run-test.mk
diff --git a/tests/blif/.gitignore b/tests/blif/.gitignore
deleted file mode 100644
index 397b4a762..000000000
--- a/tests/blif/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.log
diff --git a/tests/fmt/.gitignore b/tests/fmt/.gitignore
index a36a15ec4..e6ae0d879 100644
--- a/tests/fmt/.gitignore
+++ b/tests/fmt/.gitignore
@@ -1,3 +1,2 @@
-*.log
 iverilog-*
 yosys-*
diff --git a/tests/hana/.gitignore b/tests/hana/.gitignore
deleted file mode 100644
index 073f46157..000000000
--- a/tests/hana/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.log
-*.out
diff --git a/tests/liberty/.gitignore b/tests/liberty/.gitignore
index 2ee56e9d1..b312f8c50 100644
--- a/tests/liberty/.gitignore
+++ b/tests/liberty/.gitignore
@@ -1,3 +1,2 @@
-*.log
 /*.filtered
 *.verilogsim
diff --git a/tests/lut/.gitignore b/tests/lut/.gitignore
deleted file mode 100644
index 397b4a762..000000000
--- a/tests/lut/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.log
diff --git a/tests/memlib/.gitignore b/tests/memlib/.gitignore
index 03dbe82ae..bfa1a801e 100644
--- a/tests/memlib/.gitignore
+++ b/tests/memlib/.gitignore
@@ -1,5 +1,2 @@
-t_*.log
-t_*.out
 t_*.v
 t_*.ys
-run-test.mk
diff --git a/tests/memories/.gitignore b/tests/memories/.gitignore
index 90a0983a6..14e98cead 100644
--- a/tests/memories/.gitignore
+++ b/tests/memories/.gitignore
@@ -1,3 +1 @@
-*.log
-*.out
 *.dmp
diff --git a/tests/peepopt/.gitignore b/tests/peepopt/.gitignore
deleted file mode 100644
index 50e13221d..000000000
--- a/tests/peepopt/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.log
diff --git a/tests/proc/.gitignore b/tests/proc/.gitignore
deleted file mode 100644
index 397b4a762..000000000
--- a/tests/proc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.log
diff --git a/tests/rpc/.gitignore b/tests/rpc/.gitignore
deleted file mode 100644
index 397b4a762..000000000
--- a/tests/rpc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.log
diff --git a/tests/sat/.gitignore b/tests/sat/.gitignore
index 664425d73..3fa128fcc 100644
--- a/tests/sat/.gitignore
+++ b/tests/sat/.gitignore
@@ -1,4 +1,2 @@
-*.log
-run-test.mk
 *.vcd
 *.fst
diff --git a/tests/select/.gitignore b/tests/select/.gitignore
deleted file mode 100644
index 50e13221d..000000000
--- a/tests/select/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.log
diff --git a/tests/sim/.gitignore b/tests/sim/.gitignore
index 2c96b65f8..769b314cd 100644
--- a/tests/sim/.gitignore
+++ b/tests/sim/.gitignore
@@ -1,6 +1,3 @@
-*.log
-/run-test.mk
 +*_synth.v
 +*_testbench
-*.out
 *.fst
diff --git a/tests/simple/.gitignore b/tests/simple/.gitignore
deleted file mode 100644
index 5daaadbd7..000000000
--- a/tests/simple/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.log
-*.out
-*.err
diff --git a/tests/simple_abc9/.gitignore b/tests/simple_abc9/.gitignore
index fda60e577..e31b7dc7f 100644
--- a/tests/simple_abc9/.gitignore
+++ b/tests/simple_abc9/.gitignore
@@ -1,5 +1,3 @@
 *.v
 *.sv
-*.log
-*.out
 *.bak
diff --git a/tests/svtypes/.gitignore b/tests/svtypes/.gitignore
deleted file mode 100644
index b48f808a1..000000000
--- a/tests/svtypes/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*.log
-/*.out
-/run-test.mk
diff --git a/tests/techmap/.gitignore b/tests/techmap/.gitignore
deleted file mode 100644
index 56c9ba8f9..000000000
--- a/tests/techmap/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.log
-*.out
-/*.mk
diff --git a/tests/various/.gitignore b/tests/various/.gitignore
index 3dbd50843..879645f66 100644
--- a/tests/various/.gitignore
+++ b/tests/various/.gitignore
@@ -1,9 +1,6 @@
-/*.log
-/*.out
 /*.sel
 /write_gzip.v
 /write_gzip.v.gz
-/run-test.mk
 /plugin.so
 /plugin.so.dSYM
 /temp
diff --git a/tests/verific/.gitignore b/tests/verific/.gitignore
deleted file mode 100644
index b48f808a1..000000000
--- a/tests/verific/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*.log
-/*.out
-/run-test.mk
diff --git a/tests/verilog/.gitignore b/tests/verilog/.gitignore
index cfd72076e..3702f10cf 100644
--- a/tests/verilog/.gitignore
+++ b/tests/verilog/.gitignore
@@ -1,7 +1,3 @@
-/*.log
-/*.out
-/*.err
-/run-test.mk
 /const_arst.v
 /const_sr.v
 /doubleslash.v

From 81f87ce6ede480de2c976938921eef8b9e79f9db Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nakengelhardt@gmail.com>
Date: Wed, 23 Jul 2025 14:41:49 +0000
Subject: [PATCH 204/931] Revert "Add groups to command reference"

---
 .github/workflows/prepare-docs.yml            |   1 +
 Makefile                                      |  36 +-
 backends/functional/test_generic.cc           |   4 +-
 docs/.gitignore                               |   1 +
 docs/Makefile                                 |   2 +-
 docs/source/_static/custom.css                |   5 -
 docs/source/appendix/auxlibs.rst              |   5 +-
 docs/source/cmd/index_backends.rst            |   5 -
 docs/source/cmd/index_formal.rst              |   5 -
 docs/source/cmd/index_frontends.rst           |   5 -
 docs/source/cmd/index_internal.rst            | 152 ------
 docs/source/cmd/index_kernel.rst              |   5 -
 docs/source/cmd/index_other.rst               |   9 -
 docs/source/cmd/index_passes.rst              |  14 -
 docs/source/cmd/index_passes_cmds.rst         |   5 -
 docs/source/cmd/index_passes_equiv.rst        |   5 -
 docs/source/cmd/index_passes_fsm.rst          |   5 -
 docs/source/cmd/index_passes_hierarchy.rst    |   5 -
 docs/source/cmd/index_passes_memory.rst       |   5 -
 docs/source/cmd/index_passes_opt.rst          |   5 -
 docs/source/cmd/index_passes_proc.rst         |   5 -
 docs/source/cmd/index_passes_sat.rst          |   5 -
 docs/source/cmd/index_passes_status.rst       |   5 -
 docs/source/cmd/index_passes_techmap.rst      |   7 -
 docs/source/cmd/index_techlibs.rst            |  11 -
 docs/source/cmd/index_techlibs_achronix.rst   |   5 -
 docs/source/cmd/index_techlibs_anlogic.rst    |   5 -
 docs/source/cmd/index_techlibs_common.rst     |   5 -
 .../source/cmd/index_techlibs_coolrunner2.rst |   5 -
 docs/source/cmd/index_techlibs_easic.rst      |   5 -
 docs/source/cmd/index_techlibs_ecp5.rst       |   5 -
 docs/source/cmd/index_techlibs_fabulous.rst   |   5 -
 docs/source/cmd/index_techlibs_gatemate.rst   |   5 -
 docs/source/cmd/index_techlibs_gowin.rst      |   5 -
 docs/source/cmd/index_techlibs_greenpak4.rst  |   5 -
 docs/source/cmd/index_techlibs_ice40.rst      |   5 -
 docs/source/cmd/index_techlibs_intel.rst      |   5 -
 docs/source/cmd/index_techlibs_intel_alm.rst  |   5 -
 docs/source/cmd/index_techlibs_lattice.rst    |   5 -
 .../cmd/index_techlibs_lattice_nexus.rst      |   5 -
 docs/source/cmd/index_techlibs_microchip.rst  |   5 -
 .../cmd/index_techlibs_microchip_sf2.rst      |   5 -
 docs/source/cmd/index_techlibs_nanoxplore.rst |   5 -
 docs/source/cmd/index_techlibs_quicklogic.rst |   5 -
 docs/source/cmd/index_techlibs_xilinx.rst     |   5 -
 docs/source/cmd_ref.rst                       |  33 +-
 .../code_examples/macro_commands/prep.ys      |  23 -
 docs/source/conf.py                           |  12 +-
 docs/source/getting_started/example_synth.rst |  63 +--
 .../getting_started/scripting_intro.rst       |   4 +-
 docs/source/index.rst                         |   2 +-
 .../interactive_investigation.rst             |  10 +-
 .../more_scripting/load_design.rst            |  18 +-
 .../using_yosys/more_scripting/selections.rst |   6 +-
 docs/source/using_yosys/synthesis/fsm.rst     |   2 +-
 docs/source/using_yosys/synthesis/memory.rst  |   2 +-
 docs/source/using_yosys/synthesis/opt.rst     |   8 +-
 docs/source/using_yosys/synthesis/proc.rst    |   2 +-
 docs/source/using_yosys/synthesis/synth.rst   |  33 +-
 .../using_yosys/synthesis/techmap_synth.rst   |   6 +-
 docs/source/yosys_internals/hashing.rst       |   2 +-
 docs/source/yosys_internals/verilog.rst       |   2 +-
 docs/util/{cell_documenter.py => cellref.py}  |   0
 docs/util/cmd_documenter.py                   | 443 ------------------
 docs/util/{custom_directives.py => cmdref.py} | 152 +-----
 kernel/json.h                                 |   4 +-
 kernel/log_help.cc                            | 151 ------
 kernel/log_help.h                             | 132 ------
 kernel/register.cc                            | 438 ++++++++---------
 kernel/register.h                             |  46 +-
 passes/cmds/check.cc                          |   6 -
 passes/cmds/chformal.cc                       | 109 +++--
 passes/cmds/cover.cc                          |  14 +-
 passes/cmds/dft_tag.cc                        |   6 -
 passes/cmds/edgetypes.cc                      |   6 -
 passes/cmds/example_dt.cc                     |   8 +-
 passes/cmds/exec.cc                           |   9 +-
 passes/cmds/future.cc                         |   6 -
 passes/cmds/glift.cc                          |  11 +-
 passes/cmds/internal_stats.cc                 |   7 +-
 passes/cmds/logcmd.cc                         |  10 +-
 passes/cmds/logger.cc                         |   9 +-
 passes/cmds/ltp.cc                            |   6 -
 passes/cmds/plugin.cc                         |   6 -
 passes/cmds/portarcs.cc                       |   6 -
 passes/cmds/portlist.cc                       |   6 -
 passes/cmds/printattrs.cc                     |   6 -
 passes/cmds/scc.cc                            |  11 +-
 passes/cmds/scratchpad.cc                     |  10 +-
 passes/cmds/select.cc                         |  18 +-
 passes/cmds/setenv.cc                         |  11 +-
 passes/cmds/show.cc                           |  10 +-
 passes/cmds/sta.cc                            |   6 -
 passes/cmds/stat.cc                           |   6 -
 passes/cmds/tee.cc                            |  10 +-
 passes/cmds/torder.cc                         |   6 -
 passes/cmds/trace.cc                          |  11 -
 passes/cmds/viz.cc                            |   6 -
 passes/cmds/write_file.cc                     |   6 -
 passes/cmds/xprop.cc                          |   6 -
 passes/hierarchy/Makefile.inc                 |   1 -
 passes/opt/rmports.cc                         |  11 +-
 passes/pmgen/test_pmgen.cc                    |   4 +-
 passes/sat/assertpmux.cc                      |   6 -
 passes/sat/async2sync.cc                      |   6 -
 passes/sat/clk2fflogic.cc                     |   6 -
 passes/sat/cutpoint.cc                        |   6 -
 passes/sat/expose.cc                          |  10 +-
 passes/sat/fmcombine.cc                       |   6 -
 passes/sat/fminit.cc                          |   6 -
 passes/sat/formalff.cc                        |   6 -
 passes/sat/freduce.cc                         |  14 +-
 passes/sat/miter.cc                           |  10 +-
 passes/sat/mutate.cc                          |   6 -
 passes/sat/qbfsat.cc                          |   6 -
 passes/sat/recover_names.cc                   |   6 -
 passes/sat/sat.cc                             |  14 +-
 passes/sat/supercover.cc                      |   6 -
 passes/sat/synthprop.cc                       |  12 +-
 passes/techmap/Makefile.inc                   |   1 +
 passes/{hierarchy => techmap}/flatten.cc      |   0
 passes/tests/test_abcloop.cc                  |   4 +-
 passes/tests/test_autotb.cc                   |   4 +-
 passes/tests/test_cell.cc                     |   4 +-
 124 files changed, 474 insertions(+), 2035 deletions(-)
 delete mode 100644 docs/source/cmd/index_backends.rst
 delete mode 100644 docs/source/cmd/index_formal.rst
 delete mode 100644 docs/source/cmd/index_frontends.rst
 delete mode 100644 docs/source/cmd/index_internal.rst
 delete mode 100644 docs/source/cmd/index_kernel.rst
 delete mode 100644 docs/source/cmd/index_other.rst
 delete mode 100644 docs/source/cmd/index_passes.rst
 delete mode 100644 docs/source/cmd/index_passes_cmds.rst
 delete mode 100644 docs/source/cmd/index_passes_equiv.rst
 delete mode 100644 docs/source/cmd/index_passes_fsm.rst
 delete mode 100644 docs/source/cmd/index_passes_hierarchy.rst
 delete mode 100644 docs/source/cmd/index_passes_memory.rst
 delete mode 100644 docs/source/cmd/index_passes_opt.rst
 delete mode 100644 docs/source/cmd/index_passes_proc.rst
 delete mode 100644 docs/source/cmd/index_passes_sat.rst
 delete mode 100644 docs/source/cmd/index_passes_status.rst
 delete mode 100644 docs/source/cmd/index_passes_techmap.rst
 delete mode 100644 docs/source/cmd/index_techlibs.rst
 delete mode 100644 docs/source/cmd/index_techlibs_achronix.rst
 delete mode 100644 docs/source/cmd/index_techlibs_anlogic.rst
 delete mode 100644 docs/source/cmd/index_techlibs_common.rst
 delete mode 100644 docs/source/cmd/index_techlibs_coolrunner2.rst
 delete mode 100644 docs/source/cmd/index_techlibs_easic.rst
 delete mode 100644 docs/source/cmd/index_techlibs_ecp5.rst
 delete mode 100644 docs/source/cmd/index_techlibs_fabulous.rst
 delete mode 100644 docs/source/cmd/index_techlibs_gatemate.rst
 delete mode 100644 docs/source/cmd/index_techlibs_gowin.rst
 delete mode 100644 docs/source/cmd/index_techlibs_greenpak4.rst
 delete mode 100644 docs/source/cmd/index_techlibs_ice40.rst
 delete mode 100644 docs/source/cmd/index_techlibs_intel.rst
 delete mode 100644 docs/source/cmd/index_techlibs_intel_alm.rst
 delete mode 100644 docs/source/cmd/index_techlibs_lattice.rst
 delete mode 100644 docs/source/cmd/index_techlibs_lattice_nexus.rst
 delete mode 100644 docs/source/cmd/index_techlibs_microchip.rst
 delete mode 100644 docs/source/cmd/index_techlibs_microchip_sf2.rst
 delete mode 100644 docs/source/cmd/index_techlibs_nanoxplore.rst
 delete mode 100644 docs/source/cmd/index_techlibs_quicklogic.rst
 delete mode 100644 docs/source/cmd/index_techlibs_xilinx.rst
 delete mode 100644 docs/source/code_examples/macro_commands/prep.ys
 rename docs/util/{cell_documenter.py => cellref.py} (100%)
 delete mode 100644 docs/util/cmd_documenter.py
 rename docs/util/{custom_directives.py => cmdref.py} (81%)
 delete mode 100644 kernel/log_help.cc
 delete mode 100644 kernel/log_help.h
 rename passes/{hierarchy => techmap}/flatten.cc (100%)

diff --git a/.github/workflows/prepare-docs.yml b/.github/workflows/prepare-docs.yml
index b47f5f3dd..fb1fab426 100644
--- a/.github/workflows/prepare-docs.yml
+++ b/.github/workflows/prepare-docs.yml
@@ -59,6 +59,7 @@ jobs:
         with:
           name: cmd-ref-${{ github.sha }}
           path: |
+            docs/source/cmd
             docs/source/generated
             docs/source/_images
             docs/source/code_examples
diff --git a/Makefile b/Makefile
index 1443f3c4a..d7b38c80f 100644
--- a/Makefile
+++ b/Makefile
@@ -115,6 +115,12 @@ BISON ?= bison
 STRIP ?= strip
 AWK ?= awk
 
+ifneq ($(shell :; command -v rsync),)
+RSYNC_CP ?= rsync -rc
+else
+RSYNC_CP ?= cp -ru
+endif
+
 ifeq ($(OS), Darwin)
 PLUGIN_LINKFLAGS += -undefined dynamic_lookup
 LINKFLAGS += -rdynamic
@@ -526,6 +532,7 @@ LIBS_VERIFIC += -Wl,--whole-archive $(patsubst %,$(VERIFIC_DIR)/%/*-linux.a,$(VE
 endif
 endif
 
+
 ifeq ($(ENABLE_COVER),1)
 CXXFLAGS += -DYOSYS_ENABLE_COVER
 endif
@@ -627,7 +634,6 @@ $(eval $(call add_include_file,frontends/blif/blifparse.h))
 $(eval $(call add_include_file,backends/rtlil/rtlil_backend.h))
 
 OBJS += kernel/driver.o kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o kernel/yosys.o kernel/io.o kernel/gzip.o
-OBJS += kernel/log_help.o
 OBJS += kernel/binding.o kernel/tclapi.o
 OBJS += kernel/cellaigs.o kernel/celledges.o kernel/cost.o kernel/satgen.o kernel/scopeinfo.o kernel/qcsat.o kernel/mem.o kernel/ffmerge.o kernel/ff.o kernel/yw.o kernel/json.o kernel/fmt.o kernel/sexpr.o
 OBJS += kernel/drivertools.o kernel/functional.o
@@ -1028,8 +1034,19 @@ ifeq ($(ENABLE_PYOSYS),1)
 endif
 endif
 
-docs/source/generated/cmds.json: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
-	$(Q) ./$(PROGRAM_PREFIX)yosys -p 'help -dump-cmds-json $@'
+# also others, but so long as it doesn't fail this is enough to know we tried
+docs/source/cmd/abc.rst: $(TARGETS) $(EXTRA_TARGETS)
+	$(Q) mkdir -p docs/source/cmd
+	$(Q) mkdir -p temp/docs/source/cmd
+	$(Q) cd temp && ./../$(PROGRAM_PREFIX)yosys -p 'help -write-rst-command-reference-manual'
+	$(Q) $(RSYNC_CP) temp/docs/source/cmd docs/source
+	$(Q) rm -rf temp
+docs/source/cell/word_add.rst: $(TARGETS) $(EXTRA_TARGETS)
+	$(Q) mkdir -p docs/source/cell
+	$(Q) mkdir -p temp/docs/source/cell
+	$(Q) cd temp && ./../$(PROGRAM_PREFIX)yosys -p 'help -write-rst-cells-manual'
+	$(Q) $(RSYNC_CP) temp/docs/source/cell docs/source
+	$(Q) rm -rf temp
 
 docs/source/generated/cells.json: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
 	$(Q) ./$(PROGRAM_PREFIX)yosys -p 'help -dump-cells-json $@'
@@ -1046,15 +1063,6 @@ docs/source/generated/functional/rosette.diff: backends/functional/smtlib.cc bac
 PHONY: docs/gen/functional_ir
 docs/gen/functional_ir: docs/source/generated/functional/smtlib.cc docs/source/generated/functional/rosette.diff
 
-docs/source/generated/%.log: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
-	$(Q) ./$(PROGRAM_PREFIX)yosys -qQT -h '$*' -l $@
-
-docs/source/generated/chformal.cc: passes/cmds/chformal.cc docs/source/generated
-	$(Q) cp $< $@
-
-PHONY: docs/gen/chformal
-docs/gen/chformal: docs/source/generated/chformal.log docs/source/generated/chformal.cc
-
 PHONY: docs/gen docs/usage docs/reqs
 docs/gen: $(TARGETS)
 	$(Q) $(MAKE) -C docs gen
@@ -1090,7 +1098,7 @@ docs/reqs:
 	$(Q) $(MAKE) -C docs reqs
 
 .PHONY: docs/prep
-docs/prep: docs/source/generated/cells.json docs/source/generated/cmds.json docs/gen docs/usage docs/gen/functional_ir docs/gen/chformal
+docs/prep: docs/source/cmd/abc.rst docs/source/generated/cells.json docs/gen docs/usage docs/gen/functional_ir
 
 DOC_TARGET ?= html
 docs: docs/prep
@@ -1114,7 +1122,7 @@ clean:
 	rm -f  tests/tools/cmp_tbdata
 	rm -f $(addsuffix /run-test.mk,$(MK_TEST_DIRS))
 	-$(MAKE) -C docs clean
-	rm -rf docs/util/__pycache__
+	rm -rf docs/source/cmd docs/util/__pycache__
 	rm -f *.whl
 	rm -f libyosys.so
 
diff --git a/backends/functional/test_generic.cc b/backends/functional/test_generic.cc
index 42d6c2b95..a9dfd0c70 100644
--- a/backends/functional/test_generic.cc
+++ b/backends/functional/test_generic.cc
@@ -116,9 +116,7 @@ struct MemContentsTest {
 
 struct FunctionalTestGeneric : public Pass
 {
-	FunctionalTestGeneric() : Pass("test_generic", "test the generic compute graph") {
-		internal();
-	}
+	FunctionalTestGeneric() : Pass("test_generic", "test the generic compute graph") {}
 
     void help() override
 	{
diff --git a/docs/.gitignore b/docs/.gitignore
index 09bb59048..65bbcdeae 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,4 +1,5 @@
 /build/
+/source/cmd
 /source/generated
 /source/_images/**/*.log
 /source/_images/**/*.aux
diff --git a/docs/Makefile b/docs/Makefile
index fb3e03b79..a8874bb83 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -47,7 +47,7 @@ help:
 .PHONY: clean
 clean: clean-examples
 	rm -rf $(BUILDDIR)/*
-	rm -rf util/__pycache__
+	rm -rf source/cmd util/__pycache__
 	rm -rf source/generated
 	$(MAKE) -C source/_images clean
 
diff --git a/docs/source/_static/custom.css b/docs/source/_static/custom.css
index 60faf6812..b08194c05 100644
--- a/docs/source/_static/custom.css
+++ b/docs/source/_static/custom.css
@@ -18,8 +18,3 @@
 .literal-block-wrapper .code-block-caption .caption-number {
     padding-right: 0.5em
 }
-
-/* Don't double shrink text in a literal in an optionlist */
-kbd .option>.literal {
-    font-size: revert;
-}
diff --git a/docs/source/appendix/auxlibs.rst b/docs/source/appendix/auxlibs.rst
index 192ac0944..8c78ed6b3 100644
--- a/docs/source/appendix/auxlibs.rst
+++ b/docs/source/appendix/auxlibs.rst
@@ -29,7 +29,8 @@ ezSAT
 
 The files in ``libs/ezsat`` provide a library for simplifying generating CNF
 formulas for SAT solvers. It also contains bindings of MiniSAT. The ezSAT
-library is written by C. Wolf. It is used by the `sat` pass.
+library is written by C. Wolf. It is used by the `sat` pass (see
+:doc:`/cmd/sat`).
 
 fst
 ---
@@ -77,4 +78,4 @@ SubCircuit
 The files in ``libs/subcircuit`` provide a library for solving the subcircuit
 isomorphism problem. It is written by C. Wolf and based on the Ullmann Subgraph
 Isomorphism Algorithm :cite:p:`UllmannSubgraphIsomorphism`. It is used by the
-`extract` pass.
+extract pass (see :doc:`../cmd/extract`).
diff --git a/docs/source/cmd/index_backends.rst b/docs/source/cmd/index_backends.rst
deleted file mode 100644
index 373c26def..000000000
--- a/docs/source/cmd/index_backends.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Writing output files
---------------------
-
-.. autocmdgroup:: backends
-   :members:
diff --git a/docs/source/cmd/index_formal.rst b/docs/source/cmd/index_formal.rst
deleted file mode 100644
index b8b134c17..000000000
--- a/docs/source/cmd/index_formal.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Formal verification
--------------------
-
-.. autocmdgroup:: formal
-   :members:
diff --git a/docs/source/cmd/index_frontends.rst b/docs/source/cmd/index_frontends.rst
deleted file mode 100644
index b64fdc9b9..000000000
--- a/docs/source/cmd/index_frontends.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Reading input files
--------------------
-
-.. autocmdgroup:: frontends
-   :members:
diff --git a/docs/source/cmd/index_internal.rst b/docs/source/cmd/index_internal.rst
deleted file mode 100644
index bfb369dde..000000000
--- a/docs/source/cmd/index_internal.rst
+++ /dev/null
@@ -1,152 +0,0 @@
-Internal commands for developers
---------------------------------
-
-.. autocmdgroup:: internal
-   :members:
-
-Writing command help
---------------------
-
-- use `chformal` as an example
-- generated help content below
-
-.. _chformal autocmd:
-
-.. autocmd:: chformal
-   :noindex:
-
-The ``formatted_help()`` method
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-- ``PrettyHelp::get_current()``
-- ``PrettyHelp::set_group()``
-
-  + used with ``.. autocmdgroup:: <group>``
-  + can assign group and return false
-  + if no group is set, will try to use ``source_location`` and assign group
-    from path to source file
-
-- return value
-
-  + true means help content added to current ``PrettyHelp``
-  + false to use ``Pass::help()``
-
-- adding content
-
-  + help content is a list of ``ContentListing`` nodes, each one having a type,
-    body, and its own list of children ``ContentListing``\ s
-  + ``PrettyHelp::get_root()`` returns the root ``ContentListing`` (``type="root"``)
-  + ``ContentListing::{usage, option, codeblock, paragraph}`` each add a
-    ``ContentListing`` to the current node, with type the same as the method
-
-    * the first argument is the body of the new node
-    * ``usage`` shows how to call the command (i.e. its "signature")
-    * ``paragraph`` content is formatted as a paragraph of text with line breaks
-      added automatically
-    * ``codeblock`` content is displayed verbatim, use line breaks as desired;
-      takes an optional ``language`` argument for assigning the language in RST
-      output for code syntax highlighting (use ``yoscrypt`` for yosys script
-      syntax highlighting)
-    * ``option`` lists a single option for the command, usually starting with a
-      dash (``-``); takes an optional second argument which adds a paragraph
-      node as a means of description
-
-  + ``ContentListing::open_usage`` creates and returns a new usage node, can be
-    used to e.g. add text/options specific to a given usage of the command
-  + ``ContentListing::open_option`` creates and returns a new option node, can
-    be used to e.g. add multiple paragraphs to an option's description
-  + paragraphs are treated as raw RST, allowing for inline formatting and
-    references as if it were written in the RST file itself
-
-.. literalinclude:: /generated/chformal.cc
-   :language: c++
-   :start-at: bool formatted_help()
-   :end-before: void execute
-   :caption: ``ChformalPass::formatted_help()`` from :file:`passes/cmds/chformal.cc`
-
-Dumping command help to json
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-- `help -dump-cells-json cmds.json`
-
-  + generates a ``ContentListing`` for each command registered in Yosys
-  + tries to parse unformatted ``Pass::help()`` output if
-    ``Pass::formatted_help()`` is unimplemented or returns false
-
-    * if a line starts with four spaces followed by the name of the command then
-      a space, it is parsed as a signature (usage node)
-    * if a line is indented and starts with a dash (``-``), it is parsed as an
-      option
-    * anything else is parsed as a codeblock and added to either the root node
-      or the current option depending on the indentation
-
-  + dictionary of command name to ``ContentListing``
-
-    * uses ``ContentListing::to_json()`` recursively for each node in root
-    * root node used for source location of class definition
-    * includes flags set during pass constructor (e.g. ``experimental_flag`` set
-      by ``Pass::experimental()``)
-    * also title (``short_help`` argument in ``Pass::Pass``), group, and class
-      name
-   
-  + dictionary of group name to list of commands in that group
-
-- used by sphinx autodoc to generate help content
-
-.. literalinclude:: /generated/cmds.json
-   :language: json
-   :start-at: "chformal": {
-   :end-before: "chparam": {
-   :caption: `chformal` in generated :file:`cmds.json`
-
-.. note:: Synthesis command scripts are special cased
-
-   If the final block of help output starts with the string `"The following
-   commands are executed by this synthesis command:\n"`, then the rest of the
-   code block is formatted as ``yoscrypt`` (e.g. `synth_ice40`).  The caveat
-   here is that if the ``script()`` calls ``run()`` on any commands *prior* to
-   the first ``check_label`` then the auto detection will break and revert to
-   unformatted code (e.g. `synth_fabulous`). 
-
-Command line rendering
-~~~~~~~~~~~~~~~~~~~~~~
-
-- if ``Pass::formatted_help()`` returns true, will call
-  ``PrettyHelp::log_help()``
-
-  + traverse over the children of the root node and render as plain text 
-  + effectively the reverse of converting unformatted ``Pass::help()`` text
-  + lines are broken at 80 characters while maintaining indentation (controlled
-    by ``MAX_LINE_LEN`` in :file:`kernel/log_help.cc`)
-  + each line is broken into words separated by spaces, if a given word starts
-    and ends with backticks they will be stripped
-
-- if it returns false it will call ``Pass::help()`` which should call ``log()``
-  directly to print and format help text
-
-  + if ``Pass::help()`` is not overridden then a default message about missing
-    help will be displayed
-
-.. literalinclude:: /generated/chformal.log
-   :lines: 2-
-
-RST generated from autocmd
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-- below is the raw RST output from ``autocmd`` (``YosysCmdDocumenter`` class in
-  :file:`docs/util/cmd_documenter.py`) for `chformal` command
-- heading will be rendered as a subheading of the most recent heading (see
-  `chformal autocmd`_ above rendered under `Writing command help`_)
-- ``.. cmd:def:: <cmd>`` line is indexed for cross references with ``:cmd:ref:``
-  directive (`chformal autocmd`_ above uses ``:noindex:`` option so that
-  `chformal` still links to the correct location)
-
-  + ``:title:`` option controls text that appears when hovering over the
-    `chformal` link
-
-- commands with warning flags (experimental or internal) add a ``.. warning``
-  block before any of the help content
-- if a command has no ``source_location`` the ``.. note`` at the bottom will
-  instead link to :doc:`/cmd/index_other`
-
-.. autocmd_rst:: chformal
diff --git a/docs/source/cmd/index_kernel.rst b/docs/source/cmd/index_kernel.rst
deleted file mode 100644
index c6891b5e5..000000000
--- a/docs/source/cmd/index_kernel.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Yosys kernel commands
----------------------
-
-.. autocmdgroup:: kernel
-   :members:
diff --git a/docs/source/cmd/index_other.rst b/docs/source/cmd/index_other.rst
deleted file mode 100644
index 540cf9e49..000000000
--- a/docs/source/cmd/index_other.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-:orphan:
-
-Other commands
-==============
-
-Unknown source location
-
-.. autocmdgroup:: unknown
-   :members:
diff --git a/docs/source/cmd/index_passes.rst b/docs/source/cmd/index_passes.rst
deleted file mode 100644
index b652be004..000000000
--- a/docs/source/cmd/index_passes.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-Passes
-------
-
-.. toctree::
-   :maxdepth: 2
-   :glob:
-
-   /cmd/index_passes_hierarchy
-   /cmd/index_passes_proc
-   /cmd/index_passes_fsm
-   /cmd/index_passes_memory
-   /cmd/index_passes_opt
-   /cmd/index_passes_techmap
-   /cmd/index_passes_*
diff --git a/docs/source/cmd/index_passes_cmds.rst b/docs/source/cmd/index_passes_cmds.rst
deleted file mode 100644
index d7b448f07..000000000
--- a/docs/source/cmd/index_passes_cmds.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Design modification
--------------------
-
-.. autocmdgroup:: passes/cmds
-   :members:
diff --git a/docs/source/cmd/index_passes_equiv.rst b/docs/source/cmd/index_passes_equiv.rst
deleted file mode 100644
index 6ed2c3c18..000000000
--- a/docs/source/cmd/index_passes_equiv.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Equivalence checking
---------------------
-
-.. autocmdgroup:: passes/equiv
-   :members:
diff --git a/docs/source/cmd/index_passes_fsm.rst b/docs/source/cmd/index_passes_fsm.rst
deleted file mode 100644
index 43af5dce6..000000000
--- a/docs/source/cmd/index_passes_fsm.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FSM handling
-------------
-
-.. autocmdgroup:: passes/fsm
-   :members:
diff --git a/docs/source/cmd/index_passes_hierarchy.rst b/docs/source/cmd/index_passes_hierarchy.rst
deleted file mode 100644
index 27a0faeb7..000000000
--- a/docs/source/cmd/index_passes_hierarchy.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Working with hierarchy
-----------------------
-
-.. autocmdgroup:: passes/hierarchy
-   :members:
diff --git a/docs/source/cmd/index_passes_memory.rst b/docs/source/cmd/index_passes_memory.rst
deleted file mode 100644
index b4edb88e7..000000000
--- a/docs/source/cmd/index_passes_memory.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Memory handling
----------------
-
-.. autocmdgroup:: passes/memory
-   :members:
diff --git a/docs/source/cmd/index_passes_opt.rst b/docs/source/cmd/index_passes_opt.rst
deleted file mode 100644
index ddeb5ce10..000000000
--- a/docs/source/cmd/index_passes_opt.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Optimization passes
--------------------
-
-.. autocmdgroup:: passes/opt
-   :members:
diff --git a/docs/source/cmd/index_passes_proc.rst b/docs/source/cmd/index_passes_proc.rst
deleted file mode 100644
index 1ad8d85b4..000000000
--- a/docs/source/cmd/index_passes_proc.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Converting process blocks
--------------------------
-
-.. autocmdgroup:: passes/proc
-   :members:
diff --git a/docs/source/cmd/index_passes_sat.rst b/docs/source/cmd/index_passes_sat.rst
deleted file mode 100644
index a2571fedb..000000000
--- a/docs/source/cmd/index_passes_sat.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Simulating circuits
--------------------
-
-.. autocmdgroup:: passes/sat
-   :members:
diff --git a/docs/source/cmd/index_passes_status.rst b/docs/source/cmd/index_passes_status.rst
deleted file mode 100644
index a157ed840..000000000
--- a/docs/source/cmd/index_passes_status.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Design status
--------------
-
-.. autocmdgroup:: passes/status
-   :members:
diff --git a/docs/source/cmd/index_passes_techmap.rst b/docs/source/cmd/index_passes_techmap.rst
deleted file mode 100644
index 1682cd181..000000000
--- a/docs/source/cmd/index_passes_techmap.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Technology mapping
-------------------
-
-.. seealso:: :doc:`/cmd/index_techlibs`
-
-.. autocmdgroup:: passes/techmap
-   :members:
diff --git a/docs/source/cmd/index_techlibs.rst b/docs/source/cmd/index_techlibs.rst
deleted file mode 100644
index 043620a3b..000000000
--- a/docs/source/cmd/index_techlibs.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-Technology libraries
-====================
-
-Listed in alphabetical order.
-
-.. toctree::
-   :maxdepth: 2
-   :glob:
-
-   /cmd/index_techlibs_common
-   /cmd/index_techlibs_*
diff --git a/docs/source/cmd/index_techlibs_achronix.rst b/docs/source/cmd/index_techlibs_achronix.rst
deleted file mode 100644
index d4d96d24a..000000000
--- a/docs/source/cmd/index_techlibs_achronix.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Achronix
-------------------
-
-.. autocmdgroup:: techlibs/achronix
-   :members:
diff --git a/docs/source/cmd/index_techlibs_anlogic.rst b/docs/source/cmd/index_techlibs_anlogic.rst
deleted file mode 100644
index 8a2e6b577..000000000
--- a/docs/source/cmd/index_techlibs_anlogic.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Anlogic
-------------------
-
-.. autocmdgroup:: techlibs/anlogic
-   :members:
diff --git a/docs/source/cmd/index_techlibs_common.rst b/docs/source/cmd/index_techlibs_common.rst
deleted file mode 100644
index 532f4291e..000000000
--- a/docs/source/cmd/index_techlibs_common.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Generic
-------------------
-
-.. autocmdgroup:: techlibs/common
-   :members:
diff --git a/docs/source/cmd/index_techlibs_coolrunner2.rst b/docs/source/cmd/index_techlibs_coolrunner2.rst
deleted file mode 100644
index 23d91a500..000000000
--- a/docs/source/cmd/index_techlibs_coolrunner2.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-CoolRunner-II
-------------------
-
-.. autocmdgroup:: techlibs/coolrunner2
-   :members:
diff --git a/docs/source/cmd/index_techlibs_easic.rst b/docs/source/cmd/index_techlibs_easic.rst
deleted file mode 100644
index c6398ddf3..000000000
--- a/docs/source/cmd/index_techlibs_easic.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-eASIC
-------------------
-
-.. autocmdgroup:: techlibs/easic
-   :members:
diff --git a/docs/source/cmd/index_techlibs_ecp5.rst b/docs/source/cmd/index_techlibs_ecp5.rst
deleted file mode 100644
index 29fd309cf..000000000
--- a/docs/source/cmd/index_techlibs_ecp5.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-ECP5
-------------------
-
-.. autocmdgroup:: techlibs/ecp5
-   :members:
diff --git a/docs/source/cmd/index_techlibs_fabulous.rst b/docs/source/cmd/index_techlibs_fabulous.rst
deleted file mode 100644
index 96f04f40a..000000000
--- a/docs/source/cmd/index_techlibs_fabulous.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-FABulous
-------------------
-
-.. autocmdgroup:: techlibs/fabulous
-   :members:
diff --git a/docs/source/cmd/index_techlibs_gatemate.rst b/docs/source/cmd/index_techlibs_gatemate.rst
deleted file mode 100644
index 951d0000b..000000000
--- a/docs/source/cmd/index_techlibs_gatemate.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Gatemate
-------------------
-
-.. autocmdgroup:: techlibs/gatemate
-   :members:
diff --git a/docs/source/cmd/index_techlibs_gowin.rst b/docs/source/cmd/index_techlibs_gowin.rst
deleted file mode 100644
index cdcb1c2ee..000000000
--- a/docs/source/cmd/index_techlibs_gowin.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Gowin
-------------------
-
-.. autocmdgroup:: techlibs/gowin
-   :members:
diff --git a/docs/source/cmd/index_techlibs_greenpak4.rst b/docs/source/cmd/index_techlibs_greenpak4.rst
deleted file mode 100644
index add1ab102..000000000
--- a/docs/source/cmd/index_techlibs_greenpak4.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-GreenPAK4
-------------------
-
-.. autocmdgroup:: techlibs/greenpak4
-   :members:
diff --git a/docs/source/cmd/index_techlibs_ice40.rst b/docs/source/cmd/index_techlibs_ice40.rst
deleted file mode 100644
index 1c4b2d07a..000000000
--- a/docs/source/cmd/index_techlibs_ice40.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-iCE40
-------------------
-
-.. autocmdgroup:: techlibs/ice40
-   :members:
diff --git a/docs/source/cmd/index_techlibs_intel.rst b/docs/source/cmd/index_techlibs_intel.rst
deleted file mode 100644
index 6b3a26222..000000000
--- a/docs/source/cmd/index_techlibs_intel.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Intel (MAX10, Cyclone IV)
--------------------------
-
-.. autocmdgroup:: techlibs/intel
-   :members:
diff --git a/docs/source/cmd/index_techlibs_intel_alm.rst b/docs/source/cmd/index_techlibs_intel_alm.rst
deleted file mode 100644
index afadfc13e..000000000
--- a/docs/source/cmd/index_techlibs_intel_alm.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Intel ALM (Cyclone V, Arria V, Cyclone 10 GX)
----------------------------------------------
-
-.. autocmdgroup:: techlibs/intel_alm
-   :members:
diff --git a/docs/source/cmd/index_techlibs_lattice.rst b/docs/source/cmd/index_techlibs_lattice.rst
deleted file mode 100644
index 985bf0bbd..000000000
--- a/docs/source/cmd/index_techlibs_lattice.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Lattice
-------------------
-
-.. autocmdgroup:: techlibs/lattice
-   :members:
diff --git a/docs/source/cmd/index_techlibs_lattice_nexus.rst b/docs/source/cmd/index_techlibs_lattice_nexus.rst
deleted file mode 100644
index d5ac4184c..000000000
--- a/docs/source/cmd/index_techlibs_lattice_nexus.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Lattice Nexus
-------------------
-
-.. autocmdgroup:: techlibs/nexus
-   :members:
diff --git a/docs/source/cmd/index_techlibs_microchip.rst b/docs/source/cmd/index_techlibs_microchip.rst
deleted file mode 100644
index 06613a59c..000000000
--- a/docs/source/cmd/index_techlibs_microchip.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Microchip
-------------------
-
-.. autocmdgroup:: techlibs/microchip
-   :members:
diff --git a/docs/source/cmd/index_techlibs_microchip_sf2.rst b/docs/source/cmd/index_techlibs_microchip_sf2.rst
deleted file mode 100644
index 4ebe47f33..000000000
--- a/docs/source/cmd/index_techlibs_microchip_sf2.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Microchip - SmartFusion2/IGLOO2
------------------------------------
-
-.. autocmdgroup:: techlibs/sf2
-   :members:
diff --git a/docs/source/cmd/index_techlibs_nanoxplore.rst b/docs/source/cmd/index_techlibs_nanoxplore.rst
deleted file mode 100644
index 9eff4681c..000000000
--- a/docs/source/cmd/index_techlibs_nanoxplore.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-NanoXplore
-------------------
-
-.. autocmdgroup:: techlibs/nanoxplore
-   :members:
diff --git a/docs/source/cmd/index_techlibs_quicklogic.rst b/docs/source/cmd/index_techlibs_quicklogic.rst
deleted file mode 100644
index 54d199eb0..000000000
--- a/docs/source/cmd/index_techlibs_quicklogic.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-QuickLogic
-------------------
-
-.. autocmdgroup:: techlibs/quicklogic
-   :members:
diff --git a/docs/source/cmd/index_techlibs_xilinx.rst b/docs/source/cmd/index_techlibs_xilinx.rst
deleted file mode 100644
index df5112b7e..000000000
--- a/docs/source/cmd/index_techlibs_xilinx.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Xilinx
-------------------
-
-.. autocmdgroup:: techlibs/xilinx
-   :members:
diff --git a/docs/source/cmd_ref.rst b/docs/source/cmd_ref.rst
index 668516a0b..acf2d1d41 100644
--- a/docs/source/cmd_ref.rst
+++ b/docs/source/cmd_ref.rst
@@ -1,3 +1,5 @@
+.. _cmd_ref:
+
 ================================================================================
 Command line reference
 ================================================================================
@@ -5,31 +7,10 @@ Command line reference
 .. literalinclude:: /generated/yosys
     :start-at: Usage
 
-.. _cmd_ref:
-
-Command reference
------------------
-
-.. todo:: Can we warn on command groups that aren't included anywhere?
-
-:ref:`List of all commands<cmd-cmd>`
-
 .. toctree::
-   :maxdepth: 2
+	:caption: Command reference
+	:maxdepth: 1
+	:glob:
 
-   /appendix/env_vars
-   /cmd/index_frontends
-   /cmd/index_backends
-   /cmd/index_kernel
-   /cmd/index_formal
-
-.. toctree::
-   :maxdepth: 3
-
-   /cmd/index_passes
-   /cmd/index_techlibs
-
-.. toctree::
-   :maxdepth: 2
-
-   /cmd/index_internal
+	/appendix/env_vars
+	/cmd/*
diff --git a/docs/source/code_examples/macro_commands/prep.ys b/docs/source/code_examples/macro_commands/prep.ys
deleted file mode 100644
index 1bec907f6..000000000
--- a/docs/source/code_examples/macro_commands/prep.ys
+++ /dev/null
@@ -1,23 +0,0 @@
-#start:The following commands are executed by this synthesis command:
-#end:$
-begin:
-    hierarchy -check [-top <top> | -auto-top]
-
-coarse:
-    proc [-ifx]
-    flatten    (if -flatten)
-    future
-    opt_expr -keepdc
-    opt_clean
-    check
-    opt -noff -keepdc
-    wreduce -keepdc [-memx]
-    memory_dff    (if -rdff)
-    memory_memx    (if -memx)
-    opt_clean
-    memory_collect
-    opt -noff -keepdc -fast
-
-check:
-    stat
-    check
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 725ac42bb..05dcb7d5f 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -43,12 +43,8 @@ html_static_path = ['_static', "_images"]
 # default to no highlight
 highlight_language = 'none'
 
-# default single quotes to attempt auto reference, or fallback to yoscrypt
+# default single quotes to attempt auto reference, or fallback to code
 default_role = 'autoref'
-rst_prolog = """
-.. role:: yoscrypt(code)
-   :language: yoscrypt
-"""
 
 extensions = ['sphinx.ext.autosectionlabel', 'sphinxcontrib.bibtex']
 
@@ -110,14 +106,12 @@ latex_elements = {
 
 # custom cmd-ref parsing/linking
 sys.path += [os.path.dirname(__file__) + "/../"]
-extensions.append('util.custom_directives')
+extensions.append('util.cmdref')
 
 # use autodocs
 extensions.append('sphinx.ext.autodoc')
-extensions.append('util.cell_documenter')
+extensions.append('util.cellref')
 cells_json = Path(__file__).parent / 'generated' / 'cells.json'
-extensions.append('util.cmd_documenter')
-cmds_json = Path(__file__).parent / 'generated' / 'cmds.json'
 
 from sphinx.application import Sphinx
 def setup(app: Sphinx) -> None:
diff --git a/docs/source/getting_started/example_synth.rst b/docs/source/getting_started/example_synth.rst
index ccf0d252b..e215586cc 100644
--- a/docs/source/getting_started/example_synth.rst
+++ b/docs/source/getting_started/example_synth.rst
@@ -70,7 +70,7 @@ At the bottom of the `help` output for
 `synth_ice40` is the complete list of commands called by this script.
 Let's start with the section labeled ``begin``:
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-after: begin:
    :end-before: flatten:
@@ -143,8 +143,8 @@ line refers to the line numbers of the start/end of the corresponding ``always
 @`` block.  In the case of an ``initial`` block, we instead see the ``PROC``
 referring to line 0.
 
-To handle these, let us now introduce the next command: :cmd:title:`proc`.
-`proc` is a macro command like `synth_ice40`.  Rather than modifying the design
+To handle these, let us now introduce the next command: :doc:`/cmd/proc`. `proc`
+is a macro command like `synth_ice40`.  Rather than modifying the design
 directly, it instead calls a series of other commands.  In the case of `proc`,
 these sub-commands work to convert the behavioral logic of processes into
 multiplexers and registers.  Let's see what happens when we run it.  For now, we
@@ -188,7 +188,7 @@ opt_expr <adv_opt_expr>`.
 
 .. note::
 
-   :cmd:title:`clean` can also be called with two semicolons after any command,
+   :doc:`/cmd/clean` can also be called with two semicolons after any command,
    for example we could have called :yoscrypt:`opt_expr;;` instead of
    :yoscrypt:`opt_expr; clean`.  You may notice some scripts will end each line
    with ``;;``.  It is beneficial to run `clean` before inspecting intermediate
@@ -215,8 +215,8 @@ Note that if we tried to run this command now then we would get an error.  This
 is because we already removed all of the modules other than ``addr_gen``.  We
 could restart our shell session, but instead let's use two new commands:
 
-- :cmd:title:`design`, and
-- :cmd:title:`read_verilog`.
+- :doc:`/cmd/design`, and
+- :doc:`/cmd/read_verilog`.
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -251,7 +251,7 @@ our design won't run into this issue, we can skip the ``-defer``.
 We can also run `proc` now to finish off the full :ref:`synth_begin`. Because
 the design schematic is quite large, we will be showing just the data path for
 the ``rdata`` output.  If you would like to see the entire design for yourself,
-you can do so with :cmd:title:`show`.  Note that the `show` command only works
+you can do so with :doc:`/cmd/show`.  Note that the `show` command only works
 with a single module, so you may need to call it with :yoscrypt:`show fifo`.
 :ref:`show_intro` section in :doc:`/getting_started/scripting_intro` has more on
 how to use `show`.
@@ -283,7 +283,7 @@ Flattening
 At this stage of a synthesis flow there are a few other commands we could run.
 In `synth_ice40` we get these:
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-after: flatten:
    :end-before: coarse:
@@ -355,7 +355,7 @@ Part 1
 
 In the iCE40 flow, we start with the following commands:
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-after: coarse:
    :end-before: wreduce
@@ -371,7 +371,7 @@ wasting time on something we know is impossible.
 Next up is :yoscrypt:`opt -nodffe -nosdff` performing a set of simple
 optimizations on the design.  This command also ensures that only a specific
 subset of FF types are included, in preparation for the next command:
-:cmd:title:`fsm`.  Both `opt` and `fsm` are macro commands which are explored in
+:doc:`/cmd/fsm`.  Both `opt` and `fsm` are macro commands which are explored in
 more detail in :doc:`/using_yosys/synthesis/opt` and
 :doc:`/using_yosys/synthesis/fsm` respectively.
 
@@ -403,7 +403,7 @@ Part 2
 
 The next group of commands performs a series of optimizations:
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-at: wreduce
    :end-before: t:$mul
@@ -411,7 +411,7 @@ The next group of commands performs a series of optimizations:
    :caption: ``coarse`` section (part 2)
    :name: synth_coarse2
 
-First up is :cmd:title:`wreduce`.  If we run this we get the following:
+First up is :doc:`/cmd/wreduce`.  If we run this we get the following:
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -432,7 +432,7 @@ the schematic and see the output of that cell has now changed.
 
    ``rdata`` output after `wreduce`
 
-The next two (new) commands are :cmd:title:`peepopt` and :cmd:title:`share`.
+The next two (new) commands are :doc:`/cmd/peepopt` and :doc:`/cmd/share`.
 Neither of these affect our design, and they're explored in more detail in
 :doc:`/using_yosys/synthesis/opt`, so let's skip over them.  :yoscrypt:`techmap
 -map +/cmp2lut.v -D LUT_WIDTH=4` optimizes certain comparison operators by
@@ -440,7 +440,7 @@ converting them to LUTs instead.  The usage of `techmap` is explored more in
 :doc:`/using_yosys/synthesis/techmap_synth`.
 
 Our next command to run is
-:cmd:title:`memory_dff`.
+:doc:`/cmd/memory_dff`.
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -475,7 +475,7 @@ will only be performed if called with the ``-dsp`` flag: :yoscrypt:`synth_ice40
 -dsp`.  While our example has nothing that could be mapped to DSPs we can still
 take a quick look at the commands here and describe what they do.
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-at: t:$mul
    :end-before: alumacc
@@ -514,7 +514,7 @@ Part 4
 
 That brings us to the fourth and final part for the iCE40 synthesis flow:
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-at: alumacc
    :end-before: map_ram:
@@ -543,7 +543,7 @@ Once these cells have been inserted, the call to `opt` can combine cells which
 are now identical but may have been missed due to e.g. the difference between
 `$add` and `$sub`.
 
-The other new command in this part is :cmd:title:`memory`.  `memory` is another
+The other new command in this part is :doc:`/cmd/memory`.  `memory` is another
 macro command which we examine in more detail in
 :doc:`/using_yosys/synthesis/memory`.  For this document, let us focus just on
 the step most relevant to our example: `memory_collect`. Up until this point,
@@ -594,7 +594,7 @@ Memory blocks
 Mapping to hard memory blocks uses a combination of `memory_libmap` and
 `techmap`.
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-after: map_ram:
    :end-before: map_ffram:
@@ -636,7 +636,7 @@ into flip flops (the ``logic fallback``) with `memory_map`.
 .. |techlibs/ice40/brams_map.v| replace:: :file:`techlibs/ice40/brams_map.v`
 .. _techlibs/ice40/brams_map.v: https://github.com/YosysHQ/yosys/tree/main/techlibs/ice40/brams_map.v
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-after: map_ffram:
    :end-before: map_gates:
@@ -671,7 +671,7 @@ an explosion in cells as multi-bit `$mux` and `$adffe` are replaced with
 single-bit `$_MUX_` and `$_DFFE_PP0P_` cells, while the `$alu` is replaced with
 primitive `$_OR_` and `$_NOT_` gates and a `$lut` cell.
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-after: map_gates:
    :end-before: map_ffs:
@@ -700,7 +700,7 @@ mapped to hardware into gate-level primitives.  This includes optimizing
 `$_MUX_` cells where one of the inputs is a constant ``1'0``, replacing it
 instead with an `$_AND_` cell.
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-after: map_ffs:
    :end-before: map_luts:
@@ -725,7 +725,7 @@ LUTs
 `abc`. For more on what these do, and what the difference between these two
 commands are, refer to :doc:`/using_yosys/synthesis/abc`.
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-after: map_luts:
    :end-before: map_cells:
@@ -742,7 +742,7 @@ commands are, refer to :doc:`/using_yosys/synthesis/abc`.
 Finally we use `techmap` to map the generic `$lut` cells to iCE40 ``SB_LUT4``
 cells.
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-after: map_cells:
    :end-before: check:
@@ -784,18 +784,19 @@ Final steps
 The next section of the iCE40 synth flow performs some sanity checking and final
 tidy up:
 
-.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
+.. literalinclude:: /cmd/synth_ice40.rst
    :language: yoscrypt
    :start-after: check:
+   :end-before: blif:
    :dedent:
    :name: check
    :caption: ``check`` section
 
 The new commands here are:
 
-- :cmd:title:`autoname`,
-- :cmd:title:`stat`, and
-- :cmd:title:`blackbox`.
+- :doc:`/cmd/autoname`,
+- :doc:`/cmd/stat`, and
+- :doc:`/cmd/blackbox`.
 
 The output from `stat` is useful for checking resource utilization; providing a
 list of cells used in the design and the number of each, as well as the number
@@ -834,9 +835,9 @@ Synthesis output
 
 The iCE40 synthesis flow has the following output modes available:
 
-- `write_blif`,
-- `write_edif`, and
-- `write_json`.
+- :doc:`/cmd/write_blif`,
+- :doc:`/cmd/write_edif`, and
+- :doc:`/cmd/write_json`.
 
 As an example, if we called :yoscrypt:`synth_ice40 -top fifo -json fifo.json`,
 our synthesized ``fifo`` design will be output as :file:`fifo.json`.  We can
@@ -847,4 +848,4 @@ is beyond the scope of this documentation.
 
 .. _nextpnr: https://github.com/YosysHQ/nextpnr
 
-.. seealso:: :cmd:title:`synth_ice40`
+.. seealso:: :doc:`/cmd/synth_ice40`
diff --git a/docs/source/getting_started/scripting_intro.rst b/docs/source/getting_started/scripting_intro.rst
index b9e2d395a..01954c661 100644
--- a/docs/source/getting_started/scripting_intro.rst
+++ b/docs/source/getting_started/scripting_intro.rst
@@ -122,7 +122,7 @@ module.
 
 Detailed documentation of the select framework can be found under
 :doc:`/using_yosys/more_scripting/selections` or in the command reference at
-:cmd:title:`select`.
+:doc:`/cmd/select`.
 
 .. _show_intro:
 
@@ -219,7 +219,7 @@ those used in options, must be a single expression instead.
 .. _GraphViz color docs: https://graphviz.org/doc/info/colors
 
 For all of the options available to `show`, check the command reference at
-:cmd:title:`show`.
+:doc:`/cmd/show`.
 
 .. seealso:: :ref:`interactive_show` on the
    :doc:`/using_yosys/more_scripting/interactive_investigation` page.
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 403100093..61dc114ef 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -5,7 +5,7 @@ Yosys Open SYnthesis Suite
 Yosys is an open source framework for RTL synthesis.  To learn more about Yosys,
 see :doc:`/introduction`.  For a quick guide on how to get started using Yosys,
 check out :doc:`/getting_started/index`.  For the complete list of commands
-available, go to :ref:`cmd_ref`.
+available, go to :ref:`commandindex`.
 
 .. todo:: look into command ref improvements
 
diff --git a/docs/source/using_yosys/more_scripting/interactive_investigation.rst b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
index 5da8c04d4..e9c9bc9ac 100644
--- a/docs/source/using_yosys/more_scripting/interactive_investigation.rst
+++ b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
@@ -323,10 +323,10 @@ tools).
   design into an equivalent design that is easier to analyse.
 - Commands such as `eval` and `sat` can be used to investigate the behavior of
   the circuit.
-- :cmd:title:`show`.
-- :cmd:title:`dump`.
-- :cmd:title:`add` and :cmd:title:`delete` can be used to modify and reorganize
-  a design dynamically.
+- :doc:`/cmd/show`.
+- :doc:`/cmd/dump`.
+- :doc:`/cmd/add` and :doc:`/cmd/delete` can be used to modify and reorganize a
+  design dynamically.
   
 The code used is included in the Yosys code base under
 |code_examples/scrambler|_.
@@ -358,7 +358,7 @@ reorganizing a module in Yosys and checking the resulting circuit.
 .. figure:: /_images/code_examples/scrambler/scrambler_p02.*
     :class: width-helper invert-helper
 
-Analyzing the resulting circuit with :cmd:title:`eval`:
+Analyzing the resulting circuit with :doc:`/cmd/eval`:
 
 .. todo:: replace inline code
 
diff --git a/docs/source/using_yosys/more_scripting/load_design.rst b/docs/source/using_yosys/more_scripting/load_design.rst
index d1e3e1cc0..bbc55a36b 100644
--- a/docs/source/using_yosys/more_scripting/load_design.rst
+++ b/docs/source/using_yosys/more_scripting/load_design.rst
@@ -1,11 +1,9 @@
 Loading a design
 ~~~~~~~~~~~~~~~~
 
-.. TODO:: fill out this page better
-
 keyword: Frontends
 
-- :doc:`/cmd/index_frontends`
+- :doc:`/cmd/read_verilog`
 
 .. todo:: include ``read_verilog <<EOF``, also other methods of loading designs
 
@@ -31,14 +29,20 @@ keyword: Frontends
 
 .. note::
 
-   The Verific frontend for Yosys, which provides the `verific` command,
-   requires Yosys to be built with Verific.  For full functionality, custom
-   modifications to the Verific source code from YosysHQ are required, but
-   limited useability can be achieved with some stock Verific builds.  Check
+   The Verific frontend for Yosys, which provides the :cmd:ref:`verific`
+   command, requires Yosys to be built with Verific.  For full functionality,
+   custom modifications to the Verific source code from YosysHQ are required,
+   but limited useability can be achieved with some stock Verific builds.  Check
    :doc:`/yosys_internals/extending_yosys/build_verific` for more.
 
 Others:
 
+- :doc:`/cmd/read`
 - `GHDL plugin`_ for VHDL
+- :doc:`/cmd/read_rtlil` (direct textual representation of Yosys internal state)
+- :doc:`/cmd/read_aiger`
+- :doc:`/cmd/read_blif`
+- :doc:`/cmd/read_json`
+- :doc:`/cmd/read_liberty`
 
 .. _GHDL plugin: https://github.com/ghdl/ghdl-yosys-plugin
diff --git a/docs/source/using_yosys/more_scripting/selections.rst b/docs/source/using_yosys/more_scripting/selections.rst
index 1f3912956..e82f23497 100644
--- a/docs/source/using_yosys/more_scripting/selections.rst
+++ b/docs/source/using_yosys/more_scripting/selections.rst
@@ -93,7 +93,7 @@ Special patterns can be used to select by object property or type. For example:
   A:blabla`
 - select all `$add` cells from the module foo: :yoscrypt:`select foo/t:$add`
 
-A complete list of pattern expressions can be found in :cmd:title:`select`.
+A complete list of pattern expressions can be found in :doc:`/cmd/select`.
 
 Operations on selections
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -141,7 +141,7 @@ Some of the special ``%``-codes:
 - ``%i``: intersection of top two elements on stack -- pop 2, push 1
 - ``%n``: inverse of top element on stack -- pop 1, push 1
 
-See :cmd:title:`select` for the full list.
+See :doc:`/cmd/select` for the full list.
 
 Expanding selections
 ^^^^^^^^^^^^^^^^^^^^
@@ -354,7 +354,7 @@ boolean operations such as intersection (``%i``) and difference (``%d``) are
 powerful tools for extracting the relevant portions of the circuit under
 investigation.
 
-Again, see :cmd:title:`select` for full documentation of these expressions.
+Again, see :doc:`/cmd/select` for full documentation of these expressions.
 
 Incremental selection
 ^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/source/using_yosys/synthesis/fsm.rst b/docs/source/using_yosys/synthesis/fsm.rst
index 07a3cc9cc..6fad81d54 100644
--- a/docs/source/using_yosys/synthesis/fsm.rst
+++ b/docs/source/using_yosys/synthesis/fsm.rst
@@ -10,7 +10,7 @@ other commands:
    :start-after: #end:
    :caption: Passes called by `fsm`
 
-See also :doc:`/cmd/index_passes_fsm`.
+See also :doc:`/cmd/fsm`.
 
 The algorithms used for FSM detection and extraction are influenced by a more
 general reported technique :cite:p:`fsmextract`.
diff --git a/docs/source/using_yosys/synthesis/memory.rst b/docs/source/using_yosys/synthesis/memory.rst
index 9b81fb6dc..a8f2280f7 100644
--- a/docs/source/using_yosys/synthesis/memory.rst
+++ b/docs/source/using_yosys/synthesis/memory.rst
@@ -26,7 +26,7 @@ Some quick notes:
    decoder logic and registers.
 
 For more information about `memory`, such as disabling certain sub commands, see
-:doc:`/cmd/index_passes_memory`.
+:doc:`/cmd/memory`.
 
 Example
 -------
diff --git a/docs/source/using_yosys/synthesis/opt.rst b/docs/source/using_yosys/synthesis/opt.rst
index 56330bc37..43b558739 100644
--- a/docs/source/using_yosys/synthesis/opt.rst
+++ b/docs/source/using_yosys/synthesis/opt.rst
@@ -11,8 +11,8 @@ The `opt` macro command
 
 The Yosys pass `opt` runs a number of simple optimizations. This includes
 removing unused signals and cells and const folding. It is recommended to run
-this pass after each major step in the synthesis script.  This macro command
-calls the following ``opt_*`` commands:
+this pass after each major step in the synthesis script.  As listed in
+:doc:`/cmd/opt`, this macro command calls the following ``opt_*`` commands:
 
 .. literalinclude:: /code_examples/macro_commands/opt.ys
    :language: yoscrypt
@@ -233,5 +233,7 @@ Other optimizations
 
 .. todo:: more on the other optimizations
 
-- Check :doc:`/cmd/index_passes_opt` for more.
+- :doc:`/cmd/wreduce`
+- :doc:`/cmd/peepopt`
+- :doc:`/cmd/share`
 - `abc` and `abc9`, see also: :doc:`abc`.
diff --git a/docs/source/using_yosys/synthesis/proc.rst b/docs/source/using_yosys/synthesis/proc.rst
index c4ab0f0ea..b7cd348d7 100644
--- a/docs/source/using_yosys/synthesis/proc.rst
+++ b/docs/source/using_yosys/synthesis/proc.rst
@@ -17,7 +17,7 @@ commands in a sensible order:
 
 After all the ``proc_*`` commands, `opt_expr` is called. This can be disabled by
 calling :yoscrypt:`proc -noopt`.  For more information about `proc`, such as
-disabling certain sub commands, see :doc:`/cmd/index_passes_proc`.
+disabling certain sub commands, see :doc:`/cmd/proc`.
 
 Many commands can not operate on modules with "processess" in them. Usually a
 call to `proc` is the first command in the actual synthesis procedure after
diff --git a/docs/source/using_yosys/synthesis/synth.rst b/docs/source/using_yosys/synthesis/synth.rst
index db81d0790..e3d82931b 100644
--- a/docs/source/using_yosys/synthesis/synth.rst
+++ b/docs/source/using_yosys/synthesis/synth.rst
@@ -6,23 +6,44 @@ Synth commands
 Packaged ``synth_*`` commands
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A list of all synth commands included in Yosys for different platforms can be
-found under :doc:`/cmd/index_techlibs`.  Each command runs a script of sub
-commands specific to the platform being targeted.  Note that not all of these
-scripts are actively maintained and may not be up-to-date.
+The following is a list of all synth commands included in Yosys for different
+platforms.  Each command runs a script of sub commands specific to the platform
+being targeted.  Note that not all of these scripts are actively maintained and
+may not be up-to-date.
+
+- :doc:`/cmd/synth_achronix`
+- :doc:`/cmd/synth_anlogic`
+- :doc:`/cmd/synth_coolrunner2`
+- :doc:`/cmd/synth_easic`
+- :doc:`/cmd/synth_ecp5`
+- :doc:`/cmd/synth_efinix`
+- :doc:`/cmd/synth_fabulous`
+- :doc:`/cmd/synth_gatemate`
+- :doc:`/cmd/synth_gowin`
+- :doc:`/cmd/synth_greenpak4`
+- :doc:`/cmd/synth_ice40`
+- :doc:`/cmd/synth_intel` (MAX10, Cyclone IV)
+- :doc:`/cmd/synth_intel_alm` (Cyclone V, Arria V, Cyclone 10 GX)
+- :doc:`/cmd/synth_lattice`
+- :doc:`/cmd/synth_nexus`
+- :doc:`/cmd/synth_quicklogic`
+- :doc:`/cmd/synth_sf2`
+- :doc:`/cmd/synth_xilinx`
 
 General synthesis
 ~~~~~~~~~~~~~~~~~
 
 In addition to the above hardware-specific synth commands, there is also
-:cmd:title:`prep`.  This command is limited to coarse-grain synthesis, without
+:doc:`/cmd/prep`.  This command is limited to coarse-grain synthesis, without
 getting into any architecture-specific mappings or optimizations.  Among other
 things, this is useful for design verification.
 
 The following commands are executed by the `prep` command:
 
-.. literalinclude:: /code_examples/macro_commands/prep.ys
+.. literalinclude:: /cmd/prep.rst
    :start-at: begin:
+   :end-before: .. only:: latex
+   :dedent:
 
 :doc:`/getting_started/example_synth` covers most of these commands and what
 they do.
diff --git a/docs/source/using_yosys/synthesis/techmap_synth.rst b/docs/source/using_yosys/synthesis/techmap_synth.rst
index 54a715342..9e9d42df5 100644
--- a/docs/source/using_yosys/synthesis/techmap_synth.rst
+++ b/docs/source/using_yosys/synthesis/techmap_synth.rst
@@ -33,9 +33,9 @@ reader may find this map file as :file:`techlibs/common/techmap.v` in the Yosys
 source tree.
 
 Additional features have been added to techmap to allow for conditional mapping
-of cells (see :doc:`/cmd/index_passes_techmap`). This can for example be useful
-if the target architecture supports hardware multipliers for certain bit-widths
-but not for others.
+of cells (see :doc:`/cmd/techmap`). This can for example be useful if the target
+architecture supports hardware multipliers for certain bit-widths but not for
+others.
 
 A usual synthesis flow would first use the techmap pass to directly map some RTL
 cells to coarse-grain cells provided by the target architecture (if any) and
diff --git a/docs/source/yosys_internals/hashing.rst b/docs/source/yosys_internals/hashing.rst
index b9608d99e..c6e22c0cf 100644
--- a/docs/source/yosys_internals/hashing.rst
+++ b/docs/source/yosys_internals/hashing.rst
@@ -138,7 +138,7 @@ Previously, the interface to implement hashing on custom types was just
 independently and then ad-hoc combined with the hash function with some xorshift
 operations thrown in to mix bits together somewhat. A plugin can stay compatible
 with both versions prior and after the break by implementing both interfaces
-based on the existance and value of ``YS_HASHING_VERSION``.
+based on the existance and value of `YS_HASHING_VERSION`.
 
 .. code-block:: cpp
    :caption: Example hash compatibility wrapper
diff --git a/docs/source/yosys_internals/verilog.rst b/docs/source/yosys_internals/verilog.rst
index fe31aecea..d67553aa9 100644
--- a/docs/source/yosys_internals/verilog.rst
+++ b/docs/source/yosys_internals/verilog.rst
@@ -96,7 +96,7 @@ Verilog Attributes and non-standard features
 - The ``keep_hierarchy`` attribute on cells and modules keeps the `flatten`
   command from flattening the indicated cells and modules.
 
-- The ``gate_cost_equivalent`` attribute on a module can be used to specify
+- The `gate_cost_equivalent` attribute on a module can be used to specify
   the estimated cost of the module as a number of basic gate instances. See
   the help message of command `keep_hierarchy` which interprets this
   attribute.
diff --git a/docs/util/cell_documenter.py b/docs/util/cellref.py
similarity index 100%
rename from docs/util/cell_documenter.py
rename to docs/util/cellref.py
diff --git a/docs/util/cmd_documenter.py b/docs/util/cmd_documenter.py
deleted file mode 100644
index 9347d8ffd..000000000
--- a/docs/util/cmd_documenter.py
+++ /dev/null
@@ -1,443 +0,0 @@
-#!/usr/bin/env python3
-from __future__ import annotations
-
-from dataclasses import dataclass
-import json
-from pathlib import Path, PosixPath, WindowsPath
-import re
-
-from typing import Any
-from sphinx.application import Sphinx
-from sphinx.ext import autodoc
-from sphinx.ext.autodoc import Documenter
-from sphinx.util import logging
-
-logger = logging.getLogger(__name__)
-
-# cmd signature
-cmd_ext_sig_re = re.compile(
-    r'''^ ([\w/]+::)?            # optional group
-          ([\w$._]+?)            # module name
-          (?:\.([\w_]+))?        # optional: thing name
-          (::[\w_]+)?            #           attribute
-          \s* $                  # and nothing more
-          ''', re.VERBOSE)
-
-class YosysCmdContentListing:
-    type: str
-    body: str
-    source_file: str
-    source_line: int
-    options: dict[str, str]
-    content: list[YosysCmdContentListing]
-
-    def __init__(
-            self,
-            type: str = "",
-            body: str = "",
-            source_file: str = "unknown",
-            source_line: int = 0,
-            options: dict[str, str] = {},
-            content: list[dict[str]] = [],
-    ):
-        self.type = type
-        self.body = body
-        self.source_file = source_file
-        self.source_line = source_line
-        self.options = options
-        self.content = [YosysCmdContentListing(**c) for c in content]
-
-class YosysCmd:
-    name: str
-    title: str
-    content: list[YosysCmdContentListing]
-    group: str
-    source_file: str
-    source_line: int
-    source_func: str
-    experimental_flag: bool
-    internal_flag: bool
-
-    def __init__(
-            self,
-            name:str = "", title:str = "",
-            content: list[dict[str]] = [],
-            group: str = 'unknown',
-            source_file: str = "",
-            source_line: int = 0,
-            source_func: str = "",
-            experimental_flag: bool = False,
-            internal_flag: bool = False,
-    ) -> None:
-        self.name = name
-        self.title = title
-        self.content = [YosysCmdContentListing(**c) for c in content]
-        self.group = group
-        self.source_file = source_file
-        self.source_line = source_line
-        self.source_func = source_func
-        self.experimental_flag = experimental_flag
-        self.internal_flag = internal_flag
-    
-class YosysCmdGroupDocumenter(Documenter):
-    objtype = 'cmdgroup'
-    priority = 10
-    object: tuple[str, list[str]]
-    lib_key = 'groups'
-
-    option_spec = Documenter.option_spec.copy()
-    option_spec.update({
-        'caption': autodoc.annotation_option,
-        'members': autodoc.members_option,
-        'source': autodoc.bool_option,
-        'linenos': autodoc.bool_option,
-    })
-
-    __cmd_lib: dict[str, list[str] | dict[str]] | None = None
-    @property
-    def cmd_lib(self) -> dict[str, list[str] | dict[str]]:
-        if not self.__cmd_lib:
-            self.__cmd_lib = {}
-            cmds_obj: dict[str, dict[str, dict[str]]]
-            try:
-                with open(self.config.cmds_json, "r") as f:
-                    cmds_obj = json.loads(f.read())
-            except FileNotFoundError:
-                logger.warning(
-                    f"unable to find cmd lib at {self.config.cmds_json}",
-                    type = 'cmdref',
-                    subtype = 'cmd_lib'
-                )
-                cmds_obj = {}
-            for (name, obj) in cmds_obj.get(self.lib_key, {}).items():
-                self.__cmd_lib[name] = obj
-        return self.__cmd_lib
-    
-    @classmethod
-    def can_document_member(
-        cls,
-        member: Any,
-        membername: str,
-        isattr: bool,
-        parent: Any
-    ) -> bool:
-        return False
-
-    def parse_name(self) -> bool:
-        if not self.options.caption:
-            self.content_indent = ''
-        self.fullname = self.modname = self.name
-        return True
-    
-    def import_object(self, raiseerror: bool = False) -> bool:
-        # get cmd
-        try:
-            self.object = (self.modname, self.cmd_lib[self.modname])
-        except KeyError:
-            if raiseerror:
-                raise
-            return False
-
-        self.real_modname = self.modname
-        return True
-    
-    def get_sourcename(self) -> str:
-        return self.env.doc2path(self.env.docname)
-    
-    def format_name(self) -> str:
-        return self.options.caption or ''
-
-    def format_signature(self, **kwargs: Any) -> str:
-        return self.modname
-    
-    def add_directive_header(self, sig: str) -> None:
-        pass
-    
-    def add_content(self, more_content: Any | None) -> None:
-        pass
-
-    def filter_members(
-        self,
-        members: list[tuple[str, Any]],
-        want_all: bool
-    ) -> list[tuple[str, Any, bool]]:
-        return [(x[0], x[1], False) for x in members]
-
-    def get_object_members(
-        self,
-        want_all: bool
-    ) -> tuple[bool, list[tuple[str, Any]]]:
-        ret: list[tuple[str, str]] = []
-
-        if want_all:
-            for member in self.object[1]:
-                ret.append((member, self.modname))
-        else:
-            memberlist = self.options.members or []
-            for name in memberlist:
-                if name in self.object:
-                    ret.append((name, self.modname))
-                else:
-                    logger.warning(('unknown module mentioned in :members: option: '
-                                    f'group {self.modname}, module {name}'),
-                                   type='cmdref')
-
-        return False, ret
-
-    def document_members(self, all_members: bool = False) -> None:
-        want_all = (all_members or
-                    self.options.inherited_members or
-                    self.options.members is autodoc.ALL)
-        # find out which members are documentable
-        members_check_module, members = self.get_object_members(want_all)
-
-        # document non-skipped members
-        memberdocumenters: list[tuple[Documenter, bool]] = []
-        for (mname, member, isattr) in self.filter_members(members, want_all):
-            classes = [cls for cls in self.documenters.values()
-                       if cls.can_document_member(member, mname, isattr, self)]
-            if not classes:
-                # don't know how to document this member
-                continue
-            # prefer the documenter with the highest priority
-            classes.sort(key=lambda cls: cls.priority)
-            # give explicitly separated module name, so that members
-            # of inner classes can be documented
-            full_mname = self.format_signature() + '::' + mname
-            documenter = classes[-1](self.directive, full_mname, self.indent)
-            memberdocumenters.append((documenter, isattr))
-
-        member_order = self.options.member_order or self.config.autodoc_member_order
-        memberdocumenters = self.sort_members(memberdocumenters, member_order)
-
-        for documenter, isattr in memberdocumenters:
-            documenter.generate(
-                all_members=True, real_modname=self.real_modname,
-                check_module=members_check_module and not isattr)
-
-    def generate(
-        self,
-        more_content: Any | None = None,
-        real_modname: str | None = None,
-        check_module: bool = False,
-        all_members: bool = False
-    ) -> None:
-        if not self.parse_name():
-            # need a cmd lib to import from
-            logger.warning(
-                f"don't know which cmd lib to import for autodocumenting {self.name}",
-                type = 'cmdref'
-            )
-            return
-
-        sourcename = self.get_sourcename()
-
-        imported_object = self.import_object();
-        if self.lib_key == 'groups' and self.name == 'unknown':
-            if imported_object:
-                logger.warning(f"Found commands assigned to group {self.name}: {[x[0] for x in self.object]}", type='cmdref')
-            else:
-                return
-        elif not imported_object:
-            log_msg = f"unable to load {self.name} with {type(self)}"
-            if self.lib_key == 'groups':
-                logger.info(log_msg, type = 'cmdref')
-                self.add_line(f'.. warning:: No commands found for group {self.name!r}', sourcename)
-                self.add_line('', sourcename)
-                self.add_line('   Documentation may have been built without ``source_location`` support.', sourcename)
-                self.add_line('   Try check :doc:`/cmd/index_other`.', sourcename)
-            else:
-                logger.warning(log_msg, type = 'cmdref')
-            return
-
-        # check __module__ of object (for members not given explicitly)
-        # if check_module:
-        #     if not self.check_module():
-        #         return
-
-        self.add_line('', sourcename)
-
-        # format the object's signature, if any
-        try:
-            sig = self.format_signature()
-        except Exception as exc:
-            logger.warning(('error while formatting signature for %s: %s'),
-                           self.fullname, exc, type='cmdref')
-            return
-
-        # generate the directive header and options, if applicable
-        self.add_directive_header(sig)
-        self.add_line('', sourcename)
-
-        # e.g. the module directive doesn't have content
-        self.indent += self.content_indent
-
-        # add all content (from docstrings, attribute docs etc.)
-        self.add_content(more_content)
-
-        # document members, if possible
-        self.document_members(all_members)
-
-class YosysCmdDocumenter(YosysCmdGroupDocumenter):
-    objtype = 'cmd'
-    priority = 15
-    object: YosysCmd
-    lib_key = 'cmds'
-
-    @classmethod
-    def can_document_member(
-        cls,
-        member: Any,
-        membername: str,
-        isattr: bool,
-        parent: Any
-    ) -> bool:
-        if membername.startswith('$'):
-            return False
-        return isinstance(parent, YosysCmdGroupDocumenter)
-
-    def parse_name(self) -> bool:
-        try:
-            matched = cmd_ext_sig_re.match(self.name)
-            group, modname, thing, attribute = matched.groups()
-        except AttributeError:
-            logger.warning(('invalid signature for auto%s (%r)') % (self.objtype, self.name),
-                           type='cmdref')
-            return False
-
-        self.modname = modname
-        self.groupname = group or ''
-        self.attribute = attribute or ''
-        self.fullname = ((self.modname) + (thing or ''))
-
-        return True
-
-    def import_object(self, raiseerror: bool = False) -> bool:
-        if super().import_object(raiseerror):
-            self.object = YosysCmd(self.modname, **self.object[1])
-            return True
-        return False
-
-    def get_sourcename(self) -> str:
-        try:
-            return self.object.source_file
-        except AttributeError:
-            return super().get_sourcename()
-    
-    def format_name(self) -> str:
-        return self.object.name
-
-    def format_signature(self, **kwargs: Any) -> str:
-        return self.fullname + self.attribute
-
-    def add_directive_header(self, sig: str) -> None:
-        domain = getattr(self, 'domain', self.objtype)
-        directive = getattr(self, 'directivetype', 'def')
-        source_name = self.object.source_file
-        source_line = self.object.source_line
-
-        title = f'{self.object.name} - {self.object.title}'
-        self.add_line(title, source_name, source_line)
-        self.add_line('#' * len(title), source_name, source_line)
-
-        # cmd definition
-        self.add_line(f'.. {domain}:{directive}:: {sig}', source_name, source_line)
-        if self.object.title:
-            self.add_line(f'   :title: {self.object.title}', source_name, source_line)
-
-        if self.options.noindex:
-            self.add_line('   :noindex:', source_name)
-    
-    def add_content(self, more_content: Any | None) -> None:
-        # set sourcename and add content from attribute documentation
-        domain = getattr(self, 'domain', self.objtype)
-        source_name = self.object.source_file
-        source_line = self.object.source_line
-
-        if self.object.experimental_flag:
-            self.add_line(f'.. warning:: This command is experimental', source_name, source_line)
-            self.add_line('\n', source_name)
-
-        if self.object.internal_flag:
-            self.add_line(f'.. warning:: This command is intended for internal developer use only', source_name, source_line)
-            self.add_line('\n', source_name)
-
-        def render(content_list: YosysCmdContentListing, indent: int=0):
-            content_source = content_list.source_file or source_name
-            indent_str = '   '*indent
-            if content_list.type == 'usage':
-                if content_list.body:
-                    self.add_line(f'{indent_str}.. {domain}:{content_list.type}:: {self.name}::{content_list.body}', content_source)
-                else:
-                    self.add_line(f'{indent_str}.. {domain}:{content_list.type}:: {self.name}::', content_source)
-                    self.add_line(f'{indent_str}   :noindex:', source_name)
-                self.add_line('', source_name)
-            elif content_list.type == 'option':
-                self.add_line(f'{indent_str}:{content_list.type} {content_list.body}:', content_source)
-            elif content_list.type == 'text':
-                self.add_line(f'{indent_str}{content_list.body}', content_source)
-                self.add_line('', source_name)
-            elif content_list.type == 'code':
-                language_str = content_list.options.get('language', '')
-                self.add_line(f'{indent_str}.. code-block:: {language_str}', source_name)
-                self.add_line('', source_name)
-                for body_line in content_list.body.splitlines():
-                    self.add_line(f'{indent_str}   {body_line}', content_source)
-                self.add_line('', source_name)
-            else:
-                logger.warning(f"unknown content type '{content_list.type}'")
-            for content in content_list.content:
-                render(content, indent+1)
-
-        for content in self.object.content:
-            render(content)
-
-        if self.get_sourcename() != 'unknown':
-            self.add_line('\n', source_name)
-            self.add_line(f'.. note:: Help text automatically generated from :file:`{source_name}:{source_line}`', source_name)
-
-        # add additional content (e.g. from document), if present
-        if more_content:
-            for line, src in zip(more_content.data, more_content.items):
-                self.add_line(line, src[0], src[1])
-
-    def get_object_members(
-        self,
-        want_all: bool
-    ) -> tuple[bool, list[tuple[str, Any]]]:
-
-        return False, []
-
-class YosysCmdRstDocumenter(YosysCmdDocumenter):
-    objtype = 'cmd_rst'
-    priority = 0
-
-    @classmethod
-    def can_document_member(cls, *args) -> bool:
-        return False
-
-    def add_directive_header(self, sig):
-        source_name = self.object.source_file
-        cmd = self.object.name
-        self.add_line(f'.. code-block:: rst', source_name)
-        self.add_line(f'   :caption: Generated rst for ``.. autocmd:: {cmd}``', source_name)
-
-    def add_content(self, more_content):
-        source_name = self.object.source_file
-        cmd = self.object.name
-        self.domain = 'cmd'
-        super().add_directive_header(cmd)
-        self.add_line('', source_name)
-        self.indent += self.content_indent
-        super().add_content(more_content)
-
-def setup(app: Sphinx) -> dict[str, Any]:
-    app.add_config_value('cmds_json', False, 'html', [Path, PosixPath, WindowsPath])
-    app.setup_extension('sphinx.ext.autodoc')
-    app.add_autodocumenter(YosysCmdGroupDocumenter)
-    app.add_autodocumenter(YosysCmdDocumenter)
-    app.add_autodocumenter(YosysCmdRstDocumenter)
-    return {
-        'version': '2',
-        'parallel_read_safe': True,
-    }
diff --git a/docs/util/custom_directives.py b/docs/util/cmdref.py
similarity index 81%
rename from docs/util/custom_directives.py
rename to docs/util/cmdref.py
index b90584aa7..a31b08e0d 100644
--- a/docs/util/custom_directives.py
+++ b/docs/util/cmdref.py
@@ -4,21 +4,20 @@ from __future__ import annotations
 
 import re
 from typing import cast
-import warnings
 
 from docutils import nodes
-from docutils.nodes import Node, Element, Text
+from docutils.nodes import Node, Element, system_message
 from docutils.parsers.rst import directives
 from docutils.parsers.rst.states import Inliner
 from sphinx.application import Sphinx
 from sphinx.domains import Domain, Index
 from sphinx.domains.std import StandardDomain
 from sphinx.environment import BuildEnvironment
-from sphinx.roles import XRefRole, SphinxRole
+from sphinx.roles import XRefRole
 from sphinx.directives import ObjectDescription
 from sphinx.directives.code import container_wrapper
 from sphinx.util.nodes import make_refnode
-from sphinx.util.docfields import Field, GroupedField
+from sphinx.util.docfields import Field
 from sphinx import addnodes
 
 class TocNode(ObjectDescription):    
@@ -32,7 +31,7 @@ class TocNode(ObjectDescription):
         signode['ids'].append(idx)
 
     def _object_hierarchy_parts(self, sig_node: addnodes.desc_signature) -> tuple[str, ...]:
-        if 'tocname' not in sig_node:
+        if 'fullname' not in sig_node:
             return ()
 
         modname = sig_node.get('module')
@@ -58,56 +57,16 @@ class TocNode(ObjectDescription):
             return '.'.join(parents + [name])
         return ''
 
-class NodeWithOptions(TocNode):
-    """A custom node with options."""
-
-    doc_field_types = [
-        GroupedField('opts', label='Options', names=('option', 'options', 'opt', 'opts')),
-    ]
-    
-    def transform_content(self, contentnode: addnodes.desc_content) -> None:
-        """hack `:option -thing: desc` into a proper option list with yoscrypt highlighting"""
-        newchildren = []
-        for node in contentnode:
-            newnode = node
-            if isinstance(node, nodes.field_list):
-                newnode = nodes.option_list()
-                for field in node:
-                    is_option = False
-                    option_list_item = nodes.option_list_item()
-                    for child in field:
-                        if isinstance(child, nodes.field_name):
-                            option_group = nodes.option_group()
-                            option_list_item += option_group
-                            option = nodes.option()
-                            option_group += option
-                            name, text = child.rawsource.split(' ', 1)
-                            is_option = name == 'option'
-                            literal = nodes.literal(text=text)
-                            literal['classes'] += ['code', 'highlight', 'yoscrypt']
-                            literal['language'] = 'yoscrypt'
-                            option += literal
-                            if not is_option: warnings.warn(f'unexpected option \'{name}\' in {field.source}')
-                        elif isinstance(child, nodes.field_body):
-                            description = nodes.description()
-                            description += child.children
-                            option_list_item += description
-                    if is_option:
-                        newnode += option_list_item
-            newchildren.append(newnode)
-        contentnode.children = newchildren
-
-class CommandNode(NodeWithOptions):
+class CommandNode(TocNode):
     """A custom node that describes a command."""
 
     name = 'cmd'
     required_arguments = 1
 
-    option_spec = NodeWithOptions.option_spec.copy()
-    option_spec.update({
+    option_spec = {
         'title': directives.unchanged,
         'tags': directives.unchanged
-    })
+    }
 
     def handle_signature(self, sig, signode: addnodes.desc_signature):
         signode['fullname'] = sig
@@ -134,46 +93,6 @@ class CommandNode(NodeWithOptions):
                          idx,
                          0))
 
-class CommandUsageNode(NodeWithOptions):
-    """A custom node that describes command usages"""
-
-    name = 'cmdusage'
-
-    option_spec = NodeWithOptions.option_spec
-    option_spec.update({
-        'usage': directives.unchanged,
-    })
-
-    def handle_signature(self, sig: str, signode: addnodes.desc_signature):
-        parts = sig.split('::')
-        if len(parts) > 2: parts.pop(0)
-        use = parts[-1]
-        signode['fullname'] = '::'.join(parts)
-        usage = self.options.get('usage', use)
-        if usage:
-            signode['tocname'] = usage
-            signode += addnodes.desc_name(text=usage)
-        return signode['fullname']
-
-    def add_target_and_index(
-        self,
-        name: str,
-        sig: str,
-        signode: addnodes.desc_signature
-    ) -> None:
-        idx = ".".join(name.split("::"))
-        signode['ids'].append(idx)
-        if 'noindex' not in self.options:
-            tocname: str = signode.get('tocname', name)
-            objs = self.env.domaindata[self.domain]['objects']
-            # (name, sig, typ, docname, anchor, prio)
-            objs.append((name,
-                         tocname,
-                         type(self).name,
-                         self.env.docname,
-                         idx,
-                         1))
-
 class PropNode(TocNode):
     name = 'prop'
     fieldname = 'props'
@@ -474,7 +393,7 @@ class TagIndex(Index):
                 lis.append((
                     dispname, 0, docname,
                     anchor,
-                    '', '', ''
+                    docname, '', typ
                 ))
         ret = [(k, v) for k, v in sorted(content.items())]
 
@@ -513,19 +432,18 @@ class CommandIndex(Index):
         Qualifier and description are not rendered e.g. in LaTeX output.
         """
 
-        content: dict[str, list[tuple]] = {}
+        content = {}
         items = ((name, dispname, typ, docname, anchor)
                  for name, dispname, typ, docname, anchor, prio
                  in self.domain.get_objects()
                  if typ == self.name)
         items = sorted(items, key=lambda item: item[0])
         for name, dispname, typ, docname, anchor in items:
-            title = self.domain.data['obj2title'].get(name)
             lis = content.setdefault(self.shortname, [])
             lis.append((
                 dispname, 0, docname,
                 anchor,
-                '', '', title 
+                '', '', typ
             ))
         ret = [(k, v) for k, v in sorted(content.items())]
 
@@ -589,27 +507,16 @@ class PropIndex(TagIndex):
 
         return (ret, True)
 
-class TitleRefRole(XRefRole):
-    """XRefRole used which has the cmd title as the displayed text."""
-    pass
-
-class OptionRole(SphinxRole):
-    def run(self) -> tuple[list[Node], list]:
-        return self.inliner.interpreted(self.rawtext, self.text, 'yoscrypt', self.lineno)
-
 class CommandDomain(Domain):
     name = 'cmd'
     label = 'Yosys commands'
 
     roles = {
-        'ref': XRefRole(),
-        'title': TitleRefRole(),
-        'option': OptionRole(),
+        'ref': XRefRole()
     }
 
     directives = {
         'def': CommandNode,
-        'usage': CommandUsageNode,
     }
 
     indices = {
@@ -635,7 +542,7 @@ class CommandDomain(Domain):
 
     def resolve_xref(self, env, fromdocname, builder, typ,
                      target, node, contnode):
-
+        
         match = [(docname, anchor, name)
                  for name, sig, typ, docname, anchor, prio
                  in self.get_objects() if sig == target]
@@ -645,17 +552,9 @@ class CommandDomain(Domain):
             targ = match[0][1]
             qual_name = match[0][2]
             title = self.data['obj2title'].get(qual_name, targ)
-
-            if typ == 'title':
-                # caller wants the title in the content of the node
-                cmd = contnode.astext()
-                contnode = Text(f'{cmd} - {title}')
-                return make_refnode(builder, fromdocname, todocname,
-                                    targ, contnode)
-            else:
-                # cmd title as hover text
-                return make_refnode(builder, fromdocname, todocname,
-                                    targ, contnode, title)
+            
+            return make_refnode(builder,fromdocname,todocname,
+                                targ, contnode, title)
         else:
             print(f"Missing ref for {target} in {fromdocname} ")
             return None
@@ -693,18 +592,10 @@ class CellDomain(CommandDomain):
 
 def autoref(name, rawtext: str, text: str, lineno, inliner: Inliner,
             options=None, content=None):
-    words = text.split(' ')
-    if len(words) == 2 and words[0] == "help":
-        IsLinkable = True
-        thing = words[1]
-    else:
-        IsLinkable = len(words) == 1 and words[0][0] != '-'
-        thing = words[0]
-    if IsLinkable:
-        role = 'cell:ref' if thing[0] == '$' else 'cmd:ref'
-        text = f'{text} <{thing}>'
-    else:
-        role = 'yoscrypt'
+    role = 'cell:ref' if text[0] == '$' else 'cmd:ref'
+    if text.startswith("help ") and text.count(' ') == 1:
+        _, cmd = text.split(' ', 1)
+        text = f'{text} <{cmd}>'
     return inliner.interpreted(rawtext, text, role, lineno)
 
 def setup(app: Sphinx):
@@ -731,7 +622,4 @@ def setup(app: Sphinx):
 
     app.add_role('autoref', autoref)
     
-    return {
-        'version': '0.3',    
-        'parallel_read_safe': False,
-    }
+    return {'version': '0.2'}
diff --git a/kernel/json.h b/kernel/json.h
index e8905c8e1..c9aa0e045 100644
--- a/kernel/json.h
+++ b/kernel/json.h
@@ -90,10 +90,10 @@ public:
     template<typename T>
     void array(const T &&values)
     {
-        begin_array();
+        begin_object();
         for (auto &item : values)
             value(item);
-        end_array();
+        end_object();
     }
 };
 
diff --git a/kernel/log_help.cc b/kernel/log_help.cc
deleted file mode 100644
index 45228b024..000000000
--- a/kernel/log_help.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *  yosys -- Yosys Open SYnthesis Suite
- *
- *  Copyright (C) 2025  Krystine Dawn <krystinedawn@yosyshq.com>
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "kernel/log_help.h"
-
-USING_YOSYS_NAMESPACE
-
-Json ContentListing::to_json() {
-	Json::object object;
-	object["type"] = type;
-	if (body.length()) object["body"] = body;
-	if (strcmp(source_file, "unknown") != 0) object["source_file"] = source_file;
-	if (source_line != 0) object["source_line"] = source_line;
-	object["options"] = Json(options);
-	Json::array content_array;
-	for (auto child : _content) content_array.push_back(child->to_json());
-	object["content"] = content_array;
-	return object;
-}
-
-void ContentListing::usage(const string &text,
-	const source_location location)
-{
-	log_assert(type.compare("root") == 0);
-	add_content("usage", text, location);
-}
-
-void ContentListing::option(const string &text, const string &description,
-	const source_location location)
-{
-	auto option = open_option(text);
-	if (description.length())
-		option->add_content("text", description, location);
-}
-
-void ContentListing::codeblock(const string &code, const string &language,
-	const source_location location)
-{
-	add_content("code", code, location);
-	back()->set_option("language", language);
-}
-
-void ContentListing::paragraph(const string &text,
-	const source_location location)
-{
-	add_content("text", text, location);
-}
-
-ContentListing* ContentListing::open_usage(const string &text,
-	const source_location location)
-{
-	usage(text, location);
-	return back();
-}
-
-ContentListing* ContentListing::open_option(const string &text,
-	const source_location location)
-{
-	log_assert(type.compare("root") == 0 || type.compare("usage") == 0);
-	auto option = new ContentListing("option", text, location);
-	add_content(option);
-	return option;
-}
-
-#define MAX_LINE_LEN 80
-void log_pass_str(const std::string &pass_str, std::string indent_str, bool leading_newline=false) {
-	if (pass_str.empty())
-		return;
-	std::istringstream iss(pass_str);
-	if (leading_newline)
-		log("\n");
-	for (std::string line; std::getline(iss, line);) {
-		log("%s", indent_str.c_str());
-		auto curr_len = indent_str.length();
-		std::istringstream lss(line);
-		for (std::string word; std::getline(lss, word, ' ');) {
-			while (word[0] == '`' && word.back() == '`')
-				word = word.substr(1, word.length()-2);
-			if (curr_len + word.length() >= MAX_LINE_LEN-1) {
-				curr_len = 0;
-				log("\n%s", indent_str.c_str());
-			}
-			if (word.length()) {
-				log("%s ", word.c_str());
-				curr_len += word.length() + 1;
-			}
-		}
-		log("\n");
-	}
-}
-void log_pass_str(const std::string &pass_str, int indent=0, bool leading_newline=false) {
-	std::string indent_str(indent*4, ' ');
-	log_pass_str(pass_str, indent_str, leading_newline);
-}
-
-PrettyHelp *current_help = nullptr;
-
-PrettyHelp::PrettyHelp()
-{
-	_prior = current_help;
-	_root_listing = ContentListing("root", "");
-
-	current_help = this;
-}
-
-PrettyHelp::~PrettyHelp()
-{
-	current_help = _prior;
-}
-
-PrettyHelp *PrettyHelp::get_current()
-{
-	if (current_help == nullptr)
-		new PrettyHelp();
-	return current_help;
-}
-
-void PrettyHelp::log_help()
-{
-	for (auto content : _root_listing.get_content()) {
-		if (content->type.compare("usage") == 0) {
-			log_pass_str(content->body, 1, true);
-			log("\n");
-		} else if (content->type.compare("option") == 0) {
-			log_pass_str(content->body, 1);
-			for (auto text : content->get_content()) {
-				log_pass_str(text->body, 2);
-				log("\n");
-			}
-		} else {
-			log_pass_str(content->body, 0);
-			log("\n");
-		}
-	}
-}
diff --git a/kernel/log_help.h b/kernel/log_help.h
deleted file mode 100644
index 0a40fc531..000000000
--- a/kernel/log_help.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  yosys -- Yosys Open SYnthesis Suite
- *
- *  Copyright (C) 2025  Krystine Dawn <krystinedawn@yosyshq.com>
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#ifndef LOG_HELP_H
-#define LOG_HELP_H
-
-#include "kernel/yosys_common.h"
-#include "kernel/json.h"
-
-YOSYS_NAMESPACE_BEGIN
-
-class ContentListing {
-	vector<ContentListing *> _content;
-public:
-	string type;
-	string body;
-	const char* source_file;
-	int source_line;
-	std::map<string, string> options;
-
-	ContentListing(
-		string type = "root", string body = "",
-		const char* source_file = "unknown", int source_line = 0
-	) : type(type), body(body), source_file(source_file), source_line(source_line) {
-		_content = {};
-		options = {};
-	}
-
-	ContentListing(string type, string body, source_location location) :
-		ContentListing(type, body, location.file_name(), location.line()) { }
-
-	void add_content(ContentListing *new_content) {
-		_content.push_back(new_content);
-	}
-
-	void add_content(string type, string body, source_location location) {
-		auto new_content = new ContentListing(type, body, location);
-		add_content(new_content);
-	}
-
-	bool has_content() { return _content.size() != 0; }
-	const vector<ContentListing *> get_content() {
-		const vector<ContentListing *> content = _content;
-		return content;
-	}
-	ContentListing* back() {
-		return _content.back();
-	}
-
-	void set_option(string key, string val = "") {
-		options[key] = val;
-	}
-
-	void usage(
-		const string &text,
-		const source_location location = source_location::current()
-	);
-	void option(
-		const string &text,
-		const string &description = "",
-		const source_location location = source_location::current()
-	);
-	void codeblock(
-		const string &code,
-		const string &language = "none",
-		const source_location location = source_location::current()
-	);
-	void paragraph(
-		const string &text,
-		const source_location location = source_location::current()
-	);
-
-	ContentListing* open_usage(
-		const string &text,
-		const source_location location = source_location::current()
-	);
-	ContentListing* open_option(
-		const string &text,
-		const source_location location = source_location::current()
-	);
-
-	Json to_json();
-};
-
-class PrettyHelp
-{
-public:
-	string group = "unknown";
-
-private:
-	PrettyHelp *_prior;
-	ContentListing _root_listing;
-
-public:
-	PrettyHelp();
-	~PrettyHelp();
-
-	static PrettyHelp *get_current();
-
-	bool has_content() { return _root_listing.has_content(); }
-	const vector<ContentListing *> get_content() {
-		return _root_listing.get_content();
-	}
-	ContentListing* get_root() {
-		return &_root_listing;
-	}
-
-	void set_group(const string g) { group = g; }
-	bool has_group() { return group.compare("unknown") != 0; }
-
-	void log_help();
-};
-
-YOSYS_NAMESPACE_END
-
-#endif
diff --git a/kernel/register.cc b/kernel/register.cc
index ea2a2624f..af1823b5b 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -21,7 +21,6 @@
 #include "kernel/satgen.h"
 #include "kernel/json.h"
 #include "kernel/gzip.h"
-#include "kernel/log_help.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -42,8 +41,7 @@ std::map<std::string, Backend*> backend_register;
 
 std::vector<std::string> Frontend::next_args;
 
-Pass::Pass(std::string name, std::string short_help, source_location location) : 
-	pass_name(name), short_help(short_help), location(location)
+Pass::Pass(std::string name, std::string short_help) : pass_name(name), short_help(short_help)
 {
 	next_queued_pass = first_queued_pass;
 	first_queued_pass = this;
@@ -118,19 +116,9 @@ void Pass::post_execute(Pass::pre_post_exec_state_t state)
 
 void Pass::help()
 {
-	auto prettyHelp = PrettyHelp();
-	if (formatted_help()) {
-		prettyHelp.log_help();
-	} else {
-		log("\n");
-		log("No help message for command `%s'.\n", pass_name.c_str());
-		log("\n");
-	}
-}
-
-bool Pass::formatted_help()
-{
-	return false;
+	log("\n");
+	log("No help message for command `%s'.\n", pass_name.c_str());
+	log("\n");
 }
 
 void Pass::clear_flags()
@@ -393,8 +381,8 @@ void ScriptPass::help_script()
 	script();
 }
 
-Frontend::Frontend(std::string name, std::string short_help, source_location location) :
-		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "read_" + name, short_help, location),
+Frontend::Frontend(std::string name, std::string short_help) :
+		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "read_" + name, short_help),
 		frontend_name(name.rfind("=", 0) == 0 ? name.substr(1) : name)
 {
 }
@@ -539,8 +527,8 @@ void Frontend::frontend_call(RTLIL::Design *design, std::istream *f, std::string
 	}
 }
 
-Backend::Backend(std::string name, std::string short_help, source_location location) :
-		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "write_" + name, short_help, location),
+Backend::Backend(std::string name, std::string short_help) :
+		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "write_" + name, short_help),
 		backend_name(name.rfind("=", 0) == 0 ? name.substr(1) : name)
 {
 }
@@ -693,23 +681,6 @@ static string get_cell_name(string name) {
 	return is_code_getter(name) ? name.substr(0, name.length()-1) : name;
 }
 
-static void log_warning_flags(Pass *pass) {
-	bool has_warnings = false;
-	const string name = pass->pass_name;
-	if (pass->experimental_flag) {
-		if (!has_warnings) log("\n");
-		has_warnings = true;
-		log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", name.c_str());
-	}
-	if (pass->internal_flag) {
-		if (!has_warnings) log("\n");
-		has_warnings = true;
-		log("WARNING: THE '%s' COMMAND IS INTENDED FOR INTERNAL DEVELOPER USE ONLY.\n", name.c_str());
-	}
-	if (has_warnings)
-		log("\n");
-}
-
 static struct CellHelpMessages {
 	dict<string, SimHelper> cell_help;
 	CellHelpMessages() {
@@ -735,211 +706,155 @@ struct HelpPass : public Pass {
 		log("    help <celltype>+  ....  print verilog code for given cell type\n");
 		log("\n");
 	}
-	bool dump_cmds_json(PrettyJson &json) {
-		// init json
-		json.begin_object();
-		json.entry("version", "Yosys command reference");
-		json.entry("generator", yosys_version_str);
+	void write_cmd_rst(std::string cmd, std::string title, std::string text)
+	{
+		FILE *f = fopen(stringf("docs/source/cmd/%s.rst", cmd.c_str()).c_str(), "wt");
+		// make header
+		size_t char_len = cmd.length() + 3 + title.length();
+		std::string title_line = "\n";
+		title_line.insert(0, char_len, '=');
+		fprintf(f, "%s", title_line.c_str());
+		fprintf(f, "%s - %s\n", cmd.c_str(), title.c_str());
+		fprintf(f, "%s\n", title_line.c_str());
 
-		bool raise_error = false;
-		std::map<string, vector<string>> groups;
-
-		json.name("cmds"); json.begin_object();
-		// iterate over commands
-		for (auto &it : pass_register) {
-			auto name = it.first;
-			auto pass = it.second;
-			auto title = pass->short_help;
-
-			auto cmd_help = PrettyHelp();
-			auto has_pretty_help = pass->formatted_help();
-
-			if (!has_pretty_help) {
-				enum PassUsageState {
-					PUState_none,
-					PUState_signature,
-					PUState_options,
-					PUState_optionbody,
-				};
-
-				source_location null_source;
-				string current_buffer = "";
-				auto root_listing = cmd_help.get_root();
-				auto current_listing = root_listing;
-
-				// dump command help
-				std::ostringstream buf;
-				log_streams.push_back(&buf);
-				pass->help();
-				log_streams.pop_back();
-				std::stringstream ss;
-				ss << buf.str();
-
-				// parse command help
-				size_t def_strip_count = 0;
-				auto current_state = PUState_none;
-				auto catch_verific = false;
-				auto blank_lines = 2;
-				for (string line; std::getline(ss, line, '\n');) {
-					// find position of first non space character
-					std::size_t first_pos = line.find_first_not_of(" \t");
-					std::size_t last_pos = line.find_last_not_of(" \t");
-					if (first_pos == std::string::npos) {
-						switch (current_state)
-						{
-						case PUState_signature:
-							root_listing->usage(current_buffer, null_source);
-							current_listing = root_listing;
-							current_state = PUState_none;
-							current_buffer = "";
-							break;
-						case PUState_none:
-						case PUState_optionbody:
-							blank_lines += 1;
-							break;
-						default:
-							break;
-						}
-						// skip empty lines
-						continue;
-					}
-
-					// strip leading and trailing whitespace
-					std::string stripped_line = line.substr(first_pos, last_pos - first_pos +1);
-					bool IsDefinition = stripped_line[0] == '-';
-					IsDefinition &= stripped_line[1] != ' ' && stripped_line[1] != '>';
-					bool IsDedent = def_strip_count && first_pos < def_strip_count;
-					bool IsIndent = def_strip_count < first_pos;
-
-					// line looks like a signature
-					bool IsSignature = stripped_line.find(name) == 0 && (stripped_line.length() == name.length() || stripped_line.at(name.size()) == ' ');
-
-					if (IsSignature && first_pos <= 4 && (blank_lines >= 2 || current_state == PUState_signature)) {
-						if (current_state == PUState_options || current_state == PUState_optionbody) {
-							current_listing->codeblock(current_buffer, "none", null_source);
-							current_buffer = "";
-						} else if (current_state == PUState_signature) {
-							root_listing->usage(current_buffer, null_source);
-							current_buffer = "";
-						} else if (current_state == PUState_none && !current_buffer.empty()) {
-							current_listing->codeblock(current_buffer, "none", null_source);
-							current_buffer = "";
-						}
-						current_listing = root_listing;
-						current_state = PUState_signature;
-						def_strip_count = first_pos;
-						catch_verific = false;
-					} else if (IsDedent) {
-						def_strip_count = first_pos;
-						if (current_state == PUState_optionbody) {
-							if (!current_buffer.empty()) {
-								current_listing->codeblock(current_buffer, "none", null_source);
-								current_buffer = "";
-							}
-							if (IsIndent) {
-								current_state = PUState_options;
-								current_listing = root_listing->back();
-							} else {
-								current_state = PUState_none;
-								current_listing = root_listing;
-							}
-						} else {
-							current_state = PUState_none;
-						}
-					}
-
-					if (IsDefinition && !catch_verific && current_state != PUState_signature) {
-						if (!current_buffer.empty()) {
-							current_listing->codeblock(current_buffer, "none", null_source);
-							current_buffer = "";
-						}
-						current_state = PUState_options;
-						current_listing = root_listing->open_option(stripped_line, null_source);
-						def_strip_count = first_pos;
-					} else {
-						if (current_state == PUState_options) {
-							current_state = PUState_optionbody;
-						}
-						if (current_buffer.empty())
-							current_buffer = stripped_line;
-						else if (current_state == PUState_signature && IsIndent)
-							current_buffer += stripped_line;
-						else if (current_state == PUState_none) {
-							current_buffer += (blank_lines > 0 ? "\n\n" : "\n") + line;
-						} else
-							current_buffer += (blank_lines > 0 ? "\n\n" : "\n") + stripped_line;
-						if (stripped_line.compare("Command file parser supports following commands in file:") == 0)
-							catch_verific = true;
-					}
-					blank_lines = 0;
-				}
-
-				if (!current_buffer.empty()) {
-					if (current_buffer.size() > 64 && current_buffer.substr(0, 64).compare("The following commands are executed by this synthesis command:\n\n") == 0) {
-						current_listing->paragraph(current_buffer.substr(0, 62), null_source);
-						current_listing->codeblock(current_buffer.substr(64), "yoscrypt", null_source);
-					} else
-						current_listing->codeblock(current_buffer, "none", null_source);
-					current_buffer = "";
-				}
+		// render html
+		fprintf(f, ".. cmd:def:: %s\n", cmd.c_str());
+		fprintf(f, "   :title: %s\n\n", title.c_str());
+		fprintf(f, "   .. only:: html\n\n");
+		std::stringstream ss;
+		std::string textcp = text;
+		ss << text;
+		bool IsUsage = true;
+		int blank_count = 0;
+		size_t def_strip_count = 0;
+		bool WasDefinition = false;
+		for (std::string line; std::getline(ss, line, '\n');) {
+			// find position of first non space character
+			std::size_t first_pos = line.find_first_not_of(" \t");
+			std::size_t last_pos = line.find_last_not_of(" \t");
+			if (first_pos == std::string::npos) {
+				// skip formatting empty lines
+				if (!WasDefinition)
+					fputc('\n', f);
+				blank_count += 1;
+				continue;
 			}
 
-			// attempt auto group
-			if (!cmd_help.has_group()) {
-				string source_file = pass->location.file_name();
-				bool has_source = source_file.compare("unknown") != 0;
-				if (pass->internal_flag)
-					cmd_help.group = "internal";
-				else if (source_file.find("backends/") == 0 || (!has_source && name.find("read_") == 0))
-					cmd_help.group = "backends";
-				else if (source_file.find("frontends/") == 0 || (!has_source && name.find("write_") == 0))
-					cmd_help.group = "frontends";
-				else if (has_source) {
-					auto last_slash = source_file.find_last_of('/');
-					if (last_slash != string::npos) {
-						auto parent_path = source_file.substr(0, last_slash);
-						cmd_help.group = parent_path;
-					}
+			// strip leading and trailing whitespace
+			std::string stripped_line = line.substr(first_pos, last_pos - first_pos +1);
+			bool IsDefinition = stripped_line[0] == '-';
+			IsDefinition &= stripped_line[1] != ' ' && stripped_line[1] != '>';
+			bool IsDedent = def_strip_count && first_pos <= def_strip_count;
+			bool IsIndent = first_pos == 2 || first_pos == 4;
+			if (cmd.compare(0, 7, "verific") == 0)
+				// verific.cc has strange and different formatting from the rest
+				IsIndent = false;
+
+			// another usage block
+			bool NewUsage = stripped_line.find(cmd) == 0;
+
+			if (IsUsage) {
+				if (stripped_line.compare(0, 4, "See ") == 0) {
+					// description refers to another function
+					fprintf(f, "\n      %s\n", stripped_line.c_str());
+				} else {
+					// usage should be the first line of help output
+					fprintf(f, "\n      .. code:: yoscrypt\n\n         %s\n\n      ", stripped_line.c_str());
+					WasDefinition = true;
 				}
-				// implicit !has_source
-				else if (name.find("equiv") == 0)
-					cmd_help.group = "passes/equiv";
-				else if (name.find("fsm") == 0)
-					cmd_help.group = "passes/fsm";
-				else if (name.find("memory") == 0)
-					cmd_help.group = "passes/memory";
-				else if (name.find("opt") == 0)
-					cmd_help.group = "passes/opt";
-				else if (name.find("proc") == 0)
-					cmd_help.group = "passes/proc";
+				IsUsage = false;
+			} else if (IsIndent && NewUsage && (blank_count >= 2 || WasDefinition)) {
+				// another usage block
+				fprintf(f, "\n      .. code:: yoscrypt\n\n         %s\n\n      ", stripped_line.c_str());
+				WasDefinition = true;
+				def_strip_count = 0;
+			} else if (IsIndent && IsDefinition && (blank_count || WasDefinition)) {
+				// format definition term
+				fprintf(f, "\n\n      .. code:: yoscrypt\n\n         %s\n\n      ", stripped_line.c_str());
+				WasDefinition = true;
+				def_strip_count = first_pos;
+			} else {
+				if (IsDedent) {
+					fprintf(f, "\n\n      ::\n");
+					def_strip_count = first_pos;
+				} else if (WasDefinition) {
+					fprintf(f, "::\n");
+					WasDefinition = false;
+				}
+				fprintf(f, "\n         %s", line.substr(def_strip_count, std::string::npos).c_str());
 			}
 
-			if (groups.count(cmd_help.group) == 0) {
-				groups[cmd_help.group] = vector<string>();
-			}
-			groups[cmd_help.group].push_back(name);
-
-			// write to json
-			json.name(name.c_str()); json.begin_object();
-			json.entry("title", title);
-			json.name("content"); json.begin_array();
-			for (auto content : cmd_help.get_content())
-				json.value(content->to_json());
-			json.end_array();
-			json.entry("group", cmd_help.group);
-			json.entry("source_file", pass->location.file_name());
-			json.entry("source_line", pass->location.line());
-			json.entry("source_func", pass->location.function_name());
-			json.entry("experimental_flag", pass->experimental_flag);
-			json.entry("internal_flag", pass->internal_flag);
-			json.end_object();
+			blank_count = 0;
 		}
-		json.end_object();
+		fputc('\n', f);
 
-		json.entry("groups", groups);
+		// render latex
+		fprintf(f, ".. only:: latex\n\n");
+		fprintf(f, "   ::\n\n");
+		std::stringstream ss2;
+		ss2 << textcp;
+		for (std::string line; std::getline(ss2, line, '\n');) {
+			fprintf(f, "      %s\n", line.c_str());
+		}
+		fclose(f);
+	}
+	void write_cell_rst(Yosys::SimHelper cell, Yosys::CellType ct)
+	{
+		// open
+		FILE *f = fopen(stringf("docs/source/cell/%s.rst", cell.filesafe_name().c_str()).c_str(), "wt");
 
-		json.end_object();
-		return raise_error;
+		// make header
+		string title_line;
+		if (cell.title.length())
+			title_line = stringf("%s - %s", cell.name.c_str(), cell.title.c_str());
+		else title_line = cell.name;
+		string underline = "\n";
+		underline.insert(0, title_line.length(), '=');
+		fprintf(f, "%s\n", title_line.c_str());
+		fprintf(f, "%s\n", underline.c_str());
+
+		// help text, with cell def for links
+		fprintf(f, ".. cell:def:: %s\n", cell.name.c_str());
+		if (cell.title.length())
+			fprintf(f, "   :title: %s\n\n", cell.title.c_str());
+		else
+			fprintf(f, "   :title: %s\n\n", cell.name.c_str());
+		std::stringstream ss;
+		ss << cell.desc;
+		for (std::string line; std::getline(ss, line, '\n');) {
+			fprintf(f, "   %s\n", line.c_str());
+		}
+
+		// properties
+		fprintf(f, "\nProperties");
+		fprintf(f, "\n----------\n\n");
+		dict<string, bool> prop_dict = {
+			{"is_evaluable", ct.is_evaluable},
+			{"is_combinatorial", ct.is_combinatorial},
+			{"is_synthesizable", ct.is_synthesizable},
+		};
+		for (auto &it : prop_dict) {
+			fprintf(f, "- %s: %s\n", it.first.c_str(), it.second ? "true" : "false");
+		}
+
+		// source code
+		fprintf(f, "\nSimulation model (Verilog)");
+		fprintf(f, "\n--------------------------\n\n");
+		fprintf(f, ".. code-block:: verilog\n");
+		fprintf(f, "   :caption: %s\n\n", cell.source.c_str());
+		std::stringstream ss2;
+		ss2 << cell.code;
+		for (std::string line; std::getline(ss2, line, '\n');) {
+			fprintf(f, "   %s\n", line.c_str());
+		}
+
+		// footer
+		fprintf(f, "\n.. note::\n\n");
+		fprintf(f, "   This page was auto-generated from the output of\n");
+		fprintf(f, "   ``help %s``.\n", cell.name.c_str());
+
+		// close
+		fclose(f);
 	}
 	bool dump_cells_json(PrettyJson &json) {
 		// init json
@@ -1045,7 +960,11 @@ struct HelpPass : public Pass {
 						log("=");
 					log("\n");
 					it.second->help();
-					log_warning_flags(it.second);
+					if (it.second->experimental_flag) {
+						log("\n");
+						log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", it.first.c_str());
+						log("\n");
+					}
 				}
 			}
 			else if (args[1] == "-cells") {
@@ -1059,9 +978,44 @@ struct HelpPass : public Pass {
 				log("\n");
 				return;
 			}
+			// this option is undocumented as it is for internal use only
+			else if (args[1] == "-write-rst-command-reference-manual") {
+				for (auto &it : pass_register) {
+					std::ostringstream buf;
+					log_streams.push_back(&buf);
+					it.second->help();
+					if (it.second->experimental_flag) {
+						log("\n");
+						log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", it.first.c_str());
+						log("\n");
+					}
+					log_streams.pop_back();
+					write_cmd_rst(it.first, it.second->short_help, buf.str());
+				}
+			}
+			// this option is also undocumented as it is for internal use only
+			else if (args[1] == "-write-rst-cells-manual") {
+				bool raise_error = false;
+				for (auto &it : yosys_celltypes.cell_types) {
+					auto name = it.first.str();
+					if (cell_help_messages.contains(name)) {
+						write_cell_rst(cell_help_messages.get(name), it.second);
+					} else {
+						log("ERROR: Missing cell help for cell '%s'.\n", name.c_str());
+						raise_error |= true;
+					}
+				}
+				if (raise_error) {
+					log_error("One or more cells defined in celltypes.h are missing help documentation.\n");
+				}
+			}
 			else if (pass_register.count(args[1])) {
 				pass_register.at(args[1])->help();
-				log_warning_flags(pass_register.at(args[1]));
+				if (pass_register.at(args[1])->experimental_flag) {
+					log("\n");
+					log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", args[1].c_str());
+					log("\n");
+				}
 			}
 			else if (cell_help_messages.contains(args[1])) {
 				auto help_cell = cell_help_messages.get(args[1]);
@@ -1090,17 +1044,7 @@ struct HelpPass : public Pass {
 				log("No such command or cell type: %s\n", args[1].c_str());
 			return;
 		} else if (args.size() == 3) {
-			// this option is undocumented as it is for internal use only
-			if (args[1] == "-dump-cmds-json") {
-				PrettyJson json;
-				if (!json.write_to_file(args[2]))
-					log_error("Can't open file `%s' for writing: %s\n", args[2].c_str(), strerror(errno));
-				if (dump_cmds_json(json)) {
-					log_abort();
-				}
-			}
-			// this option is undocumented as it is for internal use only
-			else if (args[1] == "-dump-cells-json") {
+			if (args[1] == "-dump-cells-json") {
 				PrettyJson json;
 				if (!json.write_to_file(args[2]))
 					log_error("Can't open file `%s' for writing: %s\n", args[2].c_str(), strerror(errno));
@@ -1108,8 +1052,6 @@ struct HelpPass : public Pass {
 					log_error("One or more cells defined in celltypes.h are missing help documentation.\n");
 				}
 			}
-			else
-				log("Unknown help command: `%s %s'\n", args[1].c_str(), args[2].c_str());
 			return;
 		}
 
diff --git a/kernel/register.h b/kernel/register.h
index e8c017c1d..f4e2127e1 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -23,62 +23,27 @@
 #include "kernel/yosys_common.h"
 #include "kernel/yosys.h"
 
-#include <version>
-#if __cpp_lib_source_location == 201907L
-  #include <source_location>
-  using std::source_location;
-#elif defined(__has_include)
-#  if __has_include(<experimental/source_location>)
-    #include <experimental/source_location>
-    using std::experimental::source_location;
-#  else
-    #define SOURCE_FALLBACK
-#  endif
-#else
-  #define SOURCE_FALLBACK
-#endif
-
-#ifdef SOURCE_FALLBACK
-struct source_location { // dummy placeholder
-	int line() const { return 0; }
-	int column() const { return 0; }
-	const char* file_name() const { return "unknown"; }
-	const char* function_name() const { return "unknown"; }
-	static const source_location current(...) { return source_location(); }
-};
-#endif
-
 YOSYS_NAMESPACE_BEGIN
 
 struct Pass
 {
 	std::string pass_name, short_help;
-	source_location location;
-	Pass(std::string name, std::string short_help = "** document me **",
-		source_location location = source_location::current());
+	Pass(std::string name, std::string short_help = "** document me **");
 	// Prefer overriding 'Pass::on_shutdown()' if possible
 	virtual ~Pass();
 
-	// Makes calls to log() to generate help message
 	virtual void help();
-	// Uses PrettyHelp::get_current() to produce a more portable formatted help message
-	virtual bool formatted_help();
 	virtual void clear_flags();
 	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) = 0;
 
 	int call_counter;
 	int64_t runtime_ns;
 	bool experimental_flag = false;
-	bool internal_flag = false;
 
 	void experimental() {
 		experimental_flag = true;
 	}
 
-	void internal() {
-		internal_flag = true;
-	}
-
 	struct pre_post_exec_state_t {
 		Pass *parent_pass;
 		int64_t begin_ns;
@@ -116,8 +81,7 @@ struct ScriptPass : Pass
 	RTLIL::Design *active_design;
 	std::string active_run_from, active_run_to;
 
-	ScriptPass(std::string name, std::string short_help = "** document me **", source_location location = source_location::current()) : 
-		Pass(name, short_help, location) { }
+	ScriptPass(std::string name, std::string short_help = "** document me **") : Pass(name, short_help) { }
 
 	virtual void script() = 0;
 
@@ -135,8 +99,7 @@ struct Frontend : Pass
 	static std::string last_here_document;
 
 	std::string frontend_name;
-	Frontend(std::string name, std::string short_help = "** document me **",
-		source_location location = source_location::current());
+	Frontend(std::string name, std::string short_help = "** document me **");
 	void run_register() override;
 	~Frontend() override;
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override final;
@@ -152,8 +115,7 @@ struct Frontend : Pass
 struct Backend : Pass
 {
 	std::string backend_name;
-	Backend(std::string name, std::string short_help = "** document me **",
-		source_location location = source_location::current());
+	Backend(std::string name, std::string short_help = "** document me **");
 	void run_register() override;
 	~Backend() override;
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override final;
diff --git a/passes/cmds/check.cc b/passes/cmds/check.cc
index 8bbcb8da0..83fe781a0 100644
--- a/passes/cmds/check.cc
+++ b/passes/cmds/check.cc
@@ -22,18 +22,12 @@
 #include "kernel/celledges.h"
 #include "kernel/celltypes.h"
 #include "kernel/utils.h"
-#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct CheckPass : public Pass {
 	CheckPass() : Pass("check", "check for obvious problems in the design") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index ccda023c0..572ed2153 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -19,7 +19,6 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
-#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -71,62 +70,62 @@ static bool is_triggered_check_cell(RTLIL::Cell * cell)
 }
 
 struct ChformalPass : public Pass {
-	ChformalPass() : Pass("chformal", "change formal constraints of the design") {}
-
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-
-		auto content_root = help->get_root();
-
-		content_root->usage("chformal [types] [mode] [options] [selection]");
-		content_root->paragraph(
-			"Make changes to the formal constraints of the design. The [types] options "
-			"the type of constraint to operate on. If none of the following options are "
-			"given, the command will operate on all constraint types:"
-		);
-
-		content_root->option("-assert", "`$assert` cells, representing ``assert(...)`` constraints");
-		content_root->option("-assume", "`$assume` cells, representing ``assume(...)`` constraints");
-		content_root->option("-live", "`$live` cells, representing ``assert(s_eventually ...)``");
-		content_root->option("-fair", "`$fair` cells, representing ``assume(s_eventually ...)``");
-		content_root->option("-cover", "`$cover` cells, representing ``cover()`` statements");
-		content_root->paragraph(
-			"Additionally chformal will operate on `$check` cells corresponding to the "
-			"selected constraint types."
-		);
-
-		content_root->paragraph("Exactly one of the following modes must be specified:");
-
-		content_root->option("-remove", "remove the cells and thus constraints from the design");
-		content_root->option("-early",
-			"bypass FFs that only delay the activation of a constraint. When inputs "
-			"of the bypassed FFs do not remain stable between clock edges, this may "
-			"result in unexpected behavior."
-		);
-		content_root->option("-delay <N>", "delay activation of the constraint by <N> clock cycles");
-		content_root->option("-skip <N>", "ignore activation of the constraint in the first <N> clock cycles");
-		auto cover_option = content_root->open_option("-coverenable");
-		cover_option->paragraph(
-			"add cover statements for the enable signals of the constraints"
-		);
+	ChformalPass() : Pass("chformal", "change formal constraints of the design") { }
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    chformal [types] [mode] [options] [selection]\n");
+		log("\n");
+		log("Make changes to the formal constraints of the design. The [types] options\n");
+		log("the type of constraint to operate on. If none of the following options are\n");
+		log("given, the command will operate on all constraint types:\n");
+		log("\n");
+		log("    -assert       $assert cells, representing assert(...) constraints\n");
+		log("    -assume       $assume cells, representing assume(...) constraints\n");
+		log("    -live         $live cells, representing assert(s_eventually ...)\n");
+		log("    -fair         $fair cells, representing assume(s_eventually ...)\n");
+		log("    -cover        $cover cells, representing cover() statements\n");
+		log("\n");
+		log("    Additionally chformal will operate on $check cells corresponding to the\n");
+		log("    selected constraint types.\n");
+		log("\n");
+		log("Exactly one of the following modes must be specified:\n");
+		log("\n");
+		log("    -remove\n");
+		log("        remove the cells and thus constraints from the design\n");
+		log("\n");
+		log("    -early\n");
+		log("        bypass FFs that only delay the activation of a constraint. When inputs\n");
+		log("        of the bypassed FFs do not remain stable between clock edges, this may\n");
+		log("        result in unexpected behavior.\n");
+		log("\n");
+		log("    -delay <N>\n");
+		log("        delay activation of the constraint by <N> clock cycles\n");
+		log("\n");
+		log("    -skip <N>\n");
+		log("        ignore activation of the constraint in the first <N> clock cycles\n");
+		log("\n");
+		log("    -coverenable\n");
+		log("        add cover statements for the enable signals of the constraints\n");
+		log("\n");
 #ifdef YOSYS_ENABLE_VERIFIC
-		cover_option->paragraph(
-			"Note: For the Verific frontend it is currently not guaranteed that a "
-			"reachable SVA statement corresponds to an active enable signal."
-		);
+		log("        Note: For the Verific frontend it is currently not guaranteed that a\n");
+		log("        reachable SVA statement corresponds to an active enable signal.\n");
+		log("\n");
 #endif
-		content_root->option("-assert2assume");
-		content_root->option("-assert2cover");
-		content_root->option("-assume2assert");
-		content_root->option("-live2fair");
-		content_root->option("-fair2live", "change the roles of cells as indicated. these options can be combined");
-		content_root->option("-lower",
-			"convert each $check cell into an $assert, $assume, $live, $fair or "
-			"$cover cell. If the $check cell contains a message, also produce a "
-			"$print cell."
-		);
-		return true;
+		log("    -assert2assume\n");
+		log("    -assert2cover\n");
+		log("    -assume2assert\n");
+		log("    -live2fair\n");
+		log("    -fair2live\n");
+		log("        change the roles of cells as indicated. these options can be combined\n");
+		log("\n");
+		log("    -lower\n");
+		log("        convert each $check cell into an $assert, $assume, $live, $fair or\n");
+		log("        $cover cell. If the $check cell contains a message, also produce a\n");
+		log("        $print cell.\n");
+		log("\n");
 	}
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
diff --git a/passes/cmds/cover.cc b/passes/cmds/cover.cc
index 47354f1d5..1db3e2ca0 100644
--- a/passes/cmds/cover.cc
+++ b/passes/cmds/cover.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include <sys/types.h>
 
 #ifndef _WIN32
@@ -27,18 +26,15 @@
 #  include <io.h>
 #endif
 
+#include "kernel/register.h"
+#include "kernel/rtlil.h"
+#include "kernel/log.h"
+
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct CoverPass : public Pass {
-	CoverPass() : Pass("cover", "print code coverage counters") {
-		internal();
-	}
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
+	CoverPass() : Pass("cover", "print code coverage counters") { }
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/dft_tag.cc b/passes/cmds/dft_tag.cc
index 347c8efa4..b6afe6f89 100644
--- a/passes/cmds/dft_tag.cc
+++ b/passes/cmds/dft_tag.cc
@@ -22,7 +22,6 @@
 #include "kernel/modtools.h"
 #include "kernel/sigtools.h"
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -953,11 +952,6 @@ struct DftTagWorker {
 
 struct DftTagPass : public Pass {
 	DftTagPass() : Pass("dft_tag", "create tagging logic for data flow tracking") {}
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/edgetypes.cc b/passes/cmds/edgetypes.cc
index 933bd457f..5b53f50cc 100644
--- a/passes/cmds/edgetypes.cc
+++ b/passes/cmds/edgetypes.cc
@@ -19,18 +19,12 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
-#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct EdgetypePass : public Pass {
 	EdgetypePass() : Pass("edgetypes", "list all types of edges in selection") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/example_dt.cc b/passes/cmds/example_dt.cc
index b10f50502..2870e062b 100644
--- a/passes/cmds/example_dt.cc
+++ b/passes/cmds/example_dt.cc
@@ -21,17 +21,15 @@ struct ExampleWorker
 
 struct ExampleDtPass : public Pass
 {
-	ExampleDtPass() : Pass("example_dt", "drivertools example") {
-		internal();
-	}
+	ExampleDtPass() : Pass("example_dt", "drivertools example") {}
 
-	void help() override
+    void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
 		log("TODO: add help message\n");
 		log("\n");
-	}
+    }
 
 
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
diff --git a/passes/cmds/exec.cc b/passes/cmds/exec.cc
index 486fa1c2b..e9cc34b30 100644
--- a/passes/cmds/exec.cc
+++ b/passes/cmds/exec.cc
@@ -17,8 +17,8 @@
  *
  */
 
-#include "kernel/yosys.h"
-#include "kernel/log_help.h"
+#include "kernel/register.h"
+#include "kernel/log.h"
 #include <cstdio>
 
 #if defined(_WIN32)
@@ -38,11 +38,6 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct ExecPass : public Pass {
 	ExecPass() : Pass("exec", "execute commands in the operating system shell") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/future.cc b/passes/cmds/future.cc
index 5dcf46bcf..b03613c9b 100644
--- a/passes/cmds/future.cc
+++ b/passes/cmds/future.cc
@@ -24,7 +24,6 @@
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -111,11 +110,6 @@ struct FutureWorker {
 
 struct FuturePass : public Pass {
 	FuturePass() : Pass("future", "resolve future sampled value functions") {}
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/glift.cc b/passes/cmds/glift.cc
index 0c321eba6..6a7d070d7 100644
--- a/passes/cmds/glift.cc
+++ b/passes/cmds/glift.cc
@@ -17,9 +17,10 @@
  *
  */
 
+#include "kernel/register.h"
+#include "kernel/rtlil.h"
 #include "kernel/utils.h"
-#include "kernel/yosys.h"
-#include "kernel/log_help.h"
+#include "kernel/log.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -424,12 +425,6 @@ public:
 struct GliftPass : public Pass {
 	GliftPass() : Pass("glift", "create GLIFT models and optimization problems") {}
 
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
-
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/internal_stats.cc b/passes/cmds/internal_stats.cc
index 00456b8f9..28822f237 100644
--- a/passes/cmds/internal_stats.cc
+++ b/passes/cmds/internal_stats.cc
@@ -18,6 +18,8 @@
  */
 
 #include <iterator>
+#include <optional>
+#include <stdint.h>
 
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
@@ -69,10 +71,7 @@ std::optional<uint64_t> current_mem_bytes() {
 }
 
 struct InternalStatsPass : public Pass {
-	InternalStatsPass() : Pass("internal_stats", "print internal statistics") {
-		experimental();
-		internal();
-	}
+	InternalStatsPass() : Pass("internal_stats", "print internal statistics") { }
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/logcmd.cc b/passes/cmds/logcmd.cc
index 0238627d1..3b82ac48c 100644
--- a/passes/cmds/logcmd.cc
+++ b/passes/cmds/logcmd.cc
@@ -18,19 +18,15 @@
  *
  */
 
-#include "kernel/yosys.h"
-#include "kernel/log_help.h"
+#include "kernel/register.h"
+#include "kernel/rtlil.h"
+#include "kernel/log.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct LogPass : public Pass {
 	LogPass() : Pass("log", "print text and log files") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc
index 276810201..241a8799f 100644
--- a/passes/cmds/logger.cc
+++ b/passes/cmds/logger.cc
@@ -17,19 +17,14 @@
  *
  */
 
-#include "kernel/yosys.h"
-#include "kernel/log_help.h"
+#include "kernel/register.h"
+#include "kernel/log.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct LoggerPass : public Pass {
 	LoggerPass() : Pass("logger", "set logger properties") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/ltp.cc b/passes/cmds/ltp.cc
index b3134b110..22bdaab44 100644
--- a/passes/cmds/ltp.cc
+++ b/passes/cmds/ltp.cc
@@ -20,7 +20,6 @@
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
-#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -142,11 +141,6 @@ struct LtpWorker
 
 struct LtpPass : public Pass {
 	LtpPass() : Pass("ltp", "print longest topological path") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index a653844b7..4ad7c165b 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 
 #ifdef YOSYS_ENABLE_PLUGINS
 #  include <dlfcn.h>
@@ -123,11 +122,6 @@ void load_plugin(std::string, std::vector<std::string>)
 
 struct PluginPass : public Pass {
 	PluginPass() : Pass("plugin", "load and list loaded plugins") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/portarcs.cc b/passes/cmds/portarcs.cc
index 97682efbb..a6ed75de3 100644
--- a/passes/cmds/portarcs.cc
+++ b/passes/cmds/portarcs.cc
@@ -22,7 +22,6 @@
 #include "kernel/rtlil.h"
 #include "kernel/utils.h"
 #include "kernel/celltypes.h"
-#include "kernel/log_help.h"
 
 PRIVATE_NAMESPACE_BEGIN
 USING_YOSYS_NAMESPACE
@@ -39,11 +38,6 @@ static RTLIL::SigBit canonical_bit(RTLIL::SigBit bit)
 
 struct PortarcsPass : Pass {
 	PortarcsPass() : Pass("portarcs", "derive port arcs for propagation delay") {}
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 
 	void help() override
 	{
diff --git a/passes/cmds/portlist.cc b/passes/cmds/portlist.cc
index f78d9d3b6..03048422d 100644
--- a/passes/cmds/portlist.cc
+++ b/passes/cmds/portlist.cc
@@ -19,18 +19,12 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
-#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct PortlistPass : public Pass {
 	PortlistPass() : Pass("portlist", "list (top-level) ports") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/printattrs.cc b/passes/cmds/printattrs.cc
index c8b0a1d1f..2a5034c13 100644
--- a/passes/cmds/printattrs.cc
+++ b/passes/cmds/printattrs.cc
@@ -18,18 +18,12 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct PrintAttrsPass : public Pass {
 	PrintAttrsPass() : Pass("printattrs", "print attributes of selected objects") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/scc.cc b/passes/cmds/scc.cc
index e55e63828..0f988e57a 100644
--- a/passes/cmds/scc.cc
+++ b/passes/cmds/scc.cc
@@ -21,10 +21,12 @@
 // Tarjan, R. E. (1972), "Depth-first search and linear graph algorithms", SIAM Journal on Computing 1 (2): 146-160, doi:10.1137/0201010
 // http://en.wikipedia.org/wiki/Tarjan's_strongly_connected_components_algorithm
 
-#include "kernel/yosys.h"
+#include "kernel/register.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
-#include "kernel/log_help.h"
+#include "kernel/log.h"
+#include <stdlib.h>
+#include <stdio.h>
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -250,11 +252,6 @@ struct SccWorker
 
 struct SccPass : public Pass {
 	SccPass() : Pass("scc", "detect strongly connected components (logic loops)") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/scratchpad.cc b/passes/cmds/scratchpad.cc
index 4a63f2f60..aecc4c17d 100644
--- a/passes/cmds/scratchpad.cc
+++ b/passes/cmds/scratchpad.cc
@@ -18,19 +18,15 @@
  *
  */
 
-#include "kernel/yosys.h"
-#include "kernel/log_help.h"
+#include "kernel/register.h"
+#include "kernel/rtlil.h"
+#include "kernel/log.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct ScratchpadPass : public Pass {
 	ScratchpadPass() : Pass("scratchpad", "get/set values in the scratchpad") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc
index 901f923f8..1d75091af 100644
--- a/passes/cmds/select.cc
+++ b/passes/cmds/select.cc
@@ -20,7 +20,8 @@
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
-#include "kernel/log_help.h"
+#include <string.h>
+#include <errno.h>
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -1084,11 +1085,6 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct SelectPass : public Pass {
 	SelectPass() : Pass("select", "modify and view the list of selected objects") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -1668,11 +1664,6 @@ struct SelectPass : public Pass {
 
 struct CdPass : public Pass {
 	CdPass() : Pass("cd", "a shortcut for 'select -module <name>'") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -1785,11 +1776,6 @@ static void log_matches(const char *title, Module *module, const T &list)
 
 struct LsPass : public Pass {
 	LsPass() : Pass("ls", "list modules or objects in modules") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/setenv.cc b/passes/cmds/setenv.cc
index 850d7c961..27f2eea28 100644
--- a/passes/cmds/setenv.cc
+++ b/passes/cmds/setenv.cc
@@ -17,18 +17,15 @@
  *
  */
 
-#include "kernel/yosys.h"
-#include "kernel/log_help.h"
+#include "kernel/register.h"
+#include "kernel/rtlil.h"
+#include "kernel/log.h"
+#include <stdlib.h>
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 struct SetenvPass : public Pass {
 	SetenvPass() : Pass("setenv", "set an environment variable") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index 4eb6569e6..8a1bd58c4 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -17,9 +17,10 @@
  *
  */
 
-#include "kernel/yosys.h"
+#include "kernel/register.h"
 #include "kernel/celltypes.h"
-#include "kernel/log_help.h"
+#include "kernel/log.h"
+#include <string.h>
 
 #ifndef _WIN32
 #  include <dirent.h>
@@ -657,11 +658,6 @@ struct ShowWorker
 
 struct ShowPass : public Pass {
 	ShowPass() : Pass("show", "generate schematics using graphviz") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/sta.cc b/passes/cmds/sta.cc
index 5dfac1575..4ad0e96be 100644
--- a/passes/cmds/sta.cc
+++ b/passes/cmds/sta.cc
@@ -21,7 +21,6 @@
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
 #include "kernel/timinginfo.h"
-#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -276,11 +275,6 @@ struct StaWorker
 
 struct StaPass : public Pass {
 	StaPass() : Pass("sta", "perform static timing analysis") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index af7023bdd..6b93621f1 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -25,7 +25,6 @@
 #include "kernel/cost.h"
 #include "kernel/gzip.h"
 #include "libs/json11/json11.hpp"
-#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -368,11 +367,6 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 
 struct StatPass : public Pass {
 	StatPass() : Pass("stat", "print some statistics") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/tee.cc b/passes/cmds/tee.cc
index fbd42e311..853f1bad3 100644
--- a/passes/cmds/tee.cc
+++ b/passes/cmds/tee.cc
@@ -18,19 +18,15 @@
  *
  */
 
-#include "kernel/yosys.h"
-#include "kernel/log_help.h"
+#include "kernel/register.h"
+#include "kernel/rtlil.h"
+#include "kernel/log.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct TeePass : public Pass {
 	TeePass() : Pass("tee", "redirect command output to file") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/torder.cc b/passes/cmds/torder.cc
index 537b6793d..1620c0bca 100644
--- a/passes/cmds/torder.cc
+++ b/passes/cmds/torder.cc
@@ -21,18 +21,12 @@
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
-#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct TorderPass : public Pass {
 	TorderPass() : Pass("torder", "print cells in topological order") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/trace.cc b/passes/cmds/trace.cc
index 39ed8e60e..400542776 100644
--- a/passes/cmds/trace.cc
+++ b/passes/cmds/trace.cc
@@ -19,7 +19,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -61,11 +60,6 @@ struct TraceMonitor : public RTLIL::Monitor
 
 struct TracePass : public Pass {
 	TracePass() : Pass("trace", "redirect command output to file") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -102,11 +96,6 @@ struct TracePass : public Pass {
 
 struct DebugPass : public Pass {
 	DebugPass() : Pass("debug", "run command with debug log messages enabled") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/viz.cc b/passes/cmds/viz.cc
index 4c73b4d71..131e799ab 100644
--- a/passes/cmds/viz.cc
+++ b/passes/cmds/viz.cc
@@ -19,7 +19,6 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
-#include "kernel/log_help.h"
 
 #ifndef _WIN32
 #  include <dirent.h>
@@ -818,11 +817,6 @@ struct VizWorker
 
 struct VizPass : public Pass {
 	VizPass() : Pass("viz", "visualize data flow graph") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/write_file.cc b/passes/cmds/write_file.cc
index a22fdaf2a..ea9b3f556 100644
--- a/passes/cmds/write_file.cc
+++ b/passes/cmds/write_file.cc
@@ -19,18 +19,12 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct WriteFileFrontend : public Frontend {
 	WriteFileFrontend() : Frontend("=write_file", "write a text to a file") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/status");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/xprop.cc b/passes/cmds/xprop.cc
index d2d0c4d8e..dc5befc27 100644
--- a/passes/cmds/xprop.cc
+++ b/passes/cmds/xprop.cc
@@ -24,7 +24,6 @@
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -1101,11 +1100,6 @@ struct XpropWorker
 
 struct XpropPass : public Pass {
 	XpropPass() : Pass("xprop", "formal x propagation") {}
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/hierarchy/Makefile.inc b/passes/hierarchy/Makefile.inc
index ff1a2fcc5..3cd1b6180 100644
--- a/passes/hierarchy/Makefile.inc
+++ b/passes/hierarchy/Makefile.inc
@@ -1,5 +1,4 @@
 
-OBJS += passes/hierarchy/flatten.o
 OBJS += passes/hierarchy/hierarchy.o
 OBJS += passes/hierarchy/uniquify.o
 OBJS += passes/hierarchy/submod.o
diff --git a/passes/opt/rmports.cc b/passes/opt/rmports.cc
index 0ac391790..9fa9f5c2d 100644
--- a/passes/opt/rmports.cc
+++ b/passes/opt/rmports.cc
@@ -17,20 +17,17 @@
  *
  */
 
+#include "kernel/register.h"
 #include "kernel/sigtools.h"
-#include "kernel/yosys.h"
-#include "kernel/log_help.h"
+#include "kernel/log.h"
+#include <stdlib.h>
+#include <stdio.h>
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct RmportsPassPass : public Pass {
 	RmportsPassPass() : Pass("rmports", "remove module ports with no connections") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("techlibs/greenpak4");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/pmgen/test_pmgen.cc b/passes/pmgen/test_pmgen.cc
index 892500850..fc41848f7 100644
--- a/passes/pmgen/test_pmgen.cc
+++ b/passes/pmgen/test_pmgen.cc
@@ -117,9 +117,7 @@ void opt_eqpmux(test_pmgen_pm &pm)
 }
 
 struct TestPmgenPass : public Pass {
-	TestPmgenPass() : Pass("test_pmgen", "test pass for pmgen") {
-		internal();
-	}
+	TestPmgenPass() : Pass("test_pmgen", "test pass for pmgen") { }
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/assertpmux.cc b/passes/sat/assertpmux.cc
index 7b3357f82..991977ab9 100644
--- a/passes/sat/assertpmux.cc
+++ b/passes/sat/assertpmux.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
 
@@ -183,11 +182,6 @@ struct AssertpmuxWorker
 
 struct AssertpmuxPass : public Pass {
 	AssertpmuxPass() : Pass("assertpmux", "adds asserts for parallel muxes") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/async2sync.cc b/passes/sat/async2sync.cc
index e86a78d81..93c7e96c8 100644
--- a/passes/sat/async2sync.cc
+++ b/passes/sat/async2sync.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/ffinit.h"
 #include "kernel/ff.h"
@@ -28,11 +27,6 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct Async2syncPass : public Pass {
 	Async2syncPass() : Pass("async2sync", "convert async FF inputs to sync circuits") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/clk2fflogic.cc b/passes/sat/clk2fflogic.cc
index 6b94cbe19..348bab727 100644
--- a/passes/sat/clk2fflogic.cc
+++ b/passes/sat/clk2fflogic.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/ffinit.h"
 #include "kernel/ff.h"
@@ -34,11 +33,6 @@ struct SampledSig {
 
 struct Clk2fflogicPass : public Pass {
 	Clk2fflogicPass() : Pass("clk2fflogic", "convert clocked FFs to generic $ff cells") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/cutpoint.cc b/passes/sat/cutpoint.cc
index 485e44fd6..dcd399a57 100644
--- a/passes/sat/cutpoint.cc
+++ b/passes/sat/cutpoint.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -26,11 +25,6 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct CutpointPass : public Pass {
 	CutpointPass() : Pass("cutpoint", "adds formal cut points to the design") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/expose.cc b/passes/sat/expose.cc
index 1e975db0f..9afe00d5c 100644
--- a/passes/sat/expose.cc
+++ b/passes/sat/expose.cc
@@ -17,10 +17,11 @@
  *
  */
 
-#include "kernel/yosys.h"
+#include "kernel/register.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
-#include "kernel/log_help.h"
+#include "kernel/rtlil.h"
+#include "kernel/log.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -216,11 +217,6 @@ RTLIL::Wire *add_new_wire(RTLIL::Module *module, RTLIL::IdString name, int width
 
 struct ExposePass : public Pass {
 	ExposePass() : Pass("expose", "convert internal signals to module ports") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/cmds");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/fmcombine.cc b/passes/sat/fmcombine.cc
index 575b2f40d..220cf5c52 100644
--- a/passes/sat/fmcombine.cc
+++ b/passes/sat/fmcombine.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/celltypes.h"
 
@@ -238,11 +237,6 @@ struct FmcombineWorker
 
 struct FmcombinePass : public Pass {
 	FmcombinePass() : Pass("fmcombine", "combine two instances of a cell into one") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/fminit.cc b/passes/sat/fminit.cc
index 547082164..5f4ec0068 100644
--- a/passes/sat/fminit.cc
+++ b/passes/sat/fminit.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -26,11 +25,6 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct FminitPass : public Pass {
 	FminitPass() : Pass("fminit", "set init values/sequences for formal") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/formalff.cc b/passes/sat/formalff.cc
index 286bf2976..1d87fcc3b 100644
--- a/passes/sat/formalff.cc
+++ b/passes/sat/formalff.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/ffinit.h"
 #include "kernel/ff.h"
@@ -487,11 +486,6 @@ void HierarchyWorker::propagate()
 
 struct FormalFfPass : public Pass {
 	FormalFfPass() : Pass("formalff", "prepare FFs for formal") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/freduce.cc b/passes/sat/freduce.cc
index 6063c5ab9..52e80f667 100644
--- a/passes/sat/freduce.cc
+++ b/passes/sat/freduce.cc
@@ -17,12 +17,17 @@
  *
  */
 
+#include "kernel/register.h"
 #include "kernel/celltypes.h"
 #include "kernel/consteval.h"
 #include "kernel/sigtools.h"
+#include "kernel/log.h"
 #include "kernel/satgen.h"
-#include "kernel/yosys.h"
-#include "kernel/log_help.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <algorithm>
+#include <limits>
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -756,11 +761,6 @@ struct FreduceWorker
 
 struct FreducePass : public Pass {
 	FreducePass() : Pass("freduce", "perform functional reduction") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/miter.cc b/passes/sat/miter.cc
index 9bcf25547..8f27c4c6f 100644
--- a/passes/sat/miter.cc
+++ b/passes/sat/miter.cc
@@ -17,8 +17,9 @@
  *
  */
 
-#include "kernel/yosys.h"
-#include "kernel/log_help.h"
+#include "kernel/register.h"
+#include "kernel/rtlil.h"
+#include "kernel/log.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -394,11 +395,6 @@ void create_miter_assert(struct Pass *that, std::vector<std::string> args, RTLIL
 
 struct MiterPass : public Pass {
 	MiterPass() : Pass("miter", "automatically create a miter circuit") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/mutate.cc b/passes/sat/mutate.cc
index 43373ce0e..3075ef3f0 100644
--- a/passes/sat/mutate.cc
+++ b/passes/sat/mutate.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -729,11 +728,6 @@ void mutate_cnot(Design *design, const mutate_opts_t &opts, bool one)
 
 struct MutatePass : public Pass {
 	MutatePass() : Pass("mutate", "generate or apply design mutations") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/qbfsat.cc b/passes/sat/qbfsat.cc
index 7a7a31806..db6836ea1 100644
--- a/passes/sat/qbfsat.cc
+++ b/passes/sat/qbfsat.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include "kernel/consteval.h"
 #include "qbfsat.h"
 
@@ -505,11 +504,6 @@ QbfSolveOptions parse_args(const std::vector<std::string> &args) {
 
 struct QbfSatPass : public Pass {
 	QbfSatPass() : Pass("qbfsat", "solve a 2QBF-SAT problem in the circuit") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/recover_names.cc b/passes/sat/recover_names.cc
index 7ed8b1304..cddd8771c 100644
--- a/passes/sat/recover_names.cc
+++ b/passes/sat/recover_names.cc
@@ -23,7 +23,6 @@
 #include "kernel/celltypes.h"
 #include "kernel/utils.h"
 #include "kernel/satgen.h"
-#include "kernel/log_help.h"
 
 #include <algorithm>
 #include <queue>
@@ -691,11 +690,6 @@ struct RecoverNamesWorker {
 
 struct RecoverNamesPass : public Pass {
     RecoverNamesPass() : Pass("recover_names", "Execute a lossy mapping command and recover original netnames") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("passes/opt");
-		return false;
-	}
     void help() override
     {
         //   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc
index 2f20880cb..0c2143fc9 100644
--- a/passes/sat/sat.cc
+++ b/passes/sat/sat.cc
@@ -21,12 +21,17 @@
 // Niklas Een and Niklas Sörensson (2003)
 // http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.8161
 
+#include "kernel/register.h"
 #include "kernel/celltypes.h"
 #include "kernel/consteval.h"
 #include "kernel/sigtools.h"
+#include "kernel/log.h"
 #include "kernel/satgen.h"
-#include "kernel/yosys.h"
-#include "kernel/log_help.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <algorithm>
+#include <errno.h>
+#include <string.h>
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -897,11 +902,6 @@ void print_qed()
 
 struct SatPass : public Pass {
 	SatPass() : Pass("sat", "solve a SAT problem in the circuit") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/supercover.cc b/passes/sat/supercover.cc
index f1b3ad09c..38dbd3cf9 100644
--- a/passes/sat/supercover.cc
+++ b/passes/sat/supercover.cc
@@ -18,7 +18,6 @@
  */
 
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -26,11 +25,6 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct SupercoverPass : public Pass {
 	SupercoverPass() : Pass("supercover", "add hi/lo cover cells for each wire bit") { }
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/synthprop.cc b/passes/sat/synthprop.cc
index 4703e4ad7..5553abec2 100644
--- a/passes/sat/synthprop.cc
+++ b/passes/sat/synthprop.cc
@@ -18,9 +18,7 @@
  *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-
 #include "kernel/yosys.h"
-#include "kernel/log_help.h"
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -181,13 +179,7 @@ void SynthPropWorker::run()
 struct SyntProperties : public Pass {
 	SyntProperties() : Pass("synthprop", "synthesize SVA properties") { }
 
-	bool formatted_help() override {
-		auto *help = PrettyHelp::get_current();
-		help->set_group("formal");
-		return false;
-	}
-
-	void help() override
+	virtual void help()
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
@@ -216,7 +208,7 @@ struct SyntProperties : public Pass {
 		log("\n");
 	}
 
-	void execute(std::vector<std::string> args, RTLIL::Design* design) override
+	virtual void execute(std::vector<std::string> args, RTLIL::Design* design)
 	{
 		log_header(design, "Executing SYNTHPROP pass.\n");
 		SynthPropWorker worker(design);
diff --git a/passes/techmap/Makefile.inc b/passes/techmap/Makefile.inc
index 91b3b563a..c9fe98a74 100644
--- a/passes/techmap/Makefile.inc
+++ b/passes/techmap/Makefile.inc
@@ -1,4 +1,5 @@
 
+OBJS += passes/techmap/flatten.o
 OBJS += passes/techmap/techmap.o
 OBJS += passes/techmap/simplemap.o
 OBJS += passes/techmap/dfflibmap.o
diff --git a/passes/hierarchy/flatten.cc b/passes/techmap/flatten.cc
similarity index 100%
rename from passes/hierarchy/flatten.cc
rename to passes/techmap/flatten.cc
diff --git a/passes/tests/test_abcloop.cc b/passes/tests/test_abcloop.cc
index ed54ce164..9e7adaab1 100644
--- a/passes/tests/test_abcloop.cc
+++ b/passes/tests/test_abcloop.cc
@@ -243,9 +243,7 @@ static void test_abcloop()
 }
 
 struct TestAbcloopPass : public Pass {
-	TestAbcloopPass() : Pass("test_abcloop", "automatically test handling of loops in abc command") {
-		internal();
-	}
+	TestAbcloopPass() : Pass("test_abcloop", "automatically test handling of loops in abc command") { }
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/tests/test_autotb.cc b/passes/tests/test_autotb.cc
index 306e760ee..404d1e48d 100644
--- a/passes/tests/test_autotb.cc
+++ b/passes/tests/test_autotb.cc
@@ -326,9 +326,7 @@ static void autotest(std::ostream &f, RTLIL::Design *design, int num_iter, int s
 }
 
 struct TestAutotbBackend : public Backend {
-	TestAutotbBackend() : Backend("=test_autotb", "generate simple test benches") {
-		internal();
-	}
+	TestAutotbBackend() : Backend("=test_autotb", "generate simple test benches") { }
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index b6385766c..a34eafc2f 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -705,9 +705,7 @@ static void run_eval_test(RTLIL::Design *design, bool verbose, bool nosat, std::
 }
 
 struct TestCellPass : public Pass {
-	TestCellPass() : Pass("test_cell", "automatically test the implementation of a cell type") {
-		internal();
-	}
+	TestCellPass() : Pass("test_cell", "automatically test the implementation of a cell type") { }
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|

From bf9aaac0fe7220ff14290c8925980a6a97cfcc7f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 25 Jul 2025 00:26:42 +0000
Subject: [PATCH 205/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d7b38c80f..083805fbc 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+109
+YOSYS_VER := 0.55+112
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 0314db80eafcb81be0d04c5b92986bf748b020bf Mon Sep 17 00:00:00 2001
From: Mike Inouye <mikeinouye@google.com>
Date: Fri, 25 Jul 2025 19:15:01 +0000
Subject: [PATCH 206/931] Correctly reset Verific flags to Yosys defaults after
 -import and warn this has occurred.

Co-authored-by: Chris Pearce <chris@pearce.org.nz>
Signed-off-by: Mike Inouye <mikeinouye@google.com>
---
 frontends/verific/verific.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 241b2db30..cf8fad8b0 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -2978,6 +2978,9 @@ std::set<std::string> import_tops(const char* work, std::map<std::string,Netlist
 	return top_mod_names;
 }
 
+static bool set_verific_global_flags = true;
+static bool already_imported = false;
+
 void verific_cleanup()
 {
 #ifdef YOSYSHQ_VERIFIC_EXTENSIONS
@@ -3001,6 +3004,7 @@ void verific_cleanup()
 	Libset::Reset();
 	Message::Reset();
 	RuntimeFlags::DeleteAllFlags();
+	set_verific_global_flags = true;
 	LineFile::DeleteAllLineFiles();
 #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT
 	verific_incdirs.clear();
@@ -3432,7 +3436,6 @@ struct VerificPass : public Pass {
 
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
-		static bool set_verific_global_flags = true;
 
 		if (check_noverific_env())
 			log_cmd_error("This version of Yosys is built without Verific support.\n"
@@ -4127,6 +4130,9 @@ struct VerificPass : public Pass {
 			if ((unsigned long)verific_sva_fsm_limit >= sizeof(1ull)*8)
 				log_cmd_error("-L %d: limit too large; maximum allowed value is %zu.\n", verific_sva_fsm_limit, sizeof(1ull)*8-1);
 
+			if (already_imported)
+				log_warning("Note that all Verific flags were reset to defaults after last -import.\n");
+
 			std::set<std::string> top_mod_names;
 
 			if (mode_all)
@@ -4204,6 +4210,7 @@ struct VerificPass : public Pass {
 			}
 
 			verific_cleanup();
+			already_imported = true;
 			goto check_error;
 		}
 

From 902cbda4f92f3bfae19bd32b647a9cee6c6bf991 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:39:49 +1200
Subject: [PATCH 207/931] bugpoint: Document -wires flag

---
 passes/cmds/bugpoint.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index da06acedf..e1f3544b4 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -89,6 +89,10 @@ struct BugpointPass : public Pass {
 		log("    -updates\n");
 		log("        try to remove process updates from syncs.\n");
 		log("\n");
+		log("    -wires\n");
+		log("        try to remove wires. wires with a (* bugpoint_keep *) attribute will be\n");
+		log("        skipped.\n");
+		log("\n");
 		log("    -runner \"<prefix>\"\n");
 		log("        child process wrapping command, e.g., \"timeout 30\", or valgrind.\n");
 		log("\n");

From 8a732080e02e765f97c1a1dd8f4f3eff619f3a77 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:39:50 +1200
Subject: [PATCH 208/931] bugpoint: Add -expect-return

Allows checking return value from crashing design.  Makes it possible to only accept designs that crash with e.g. SEGFAULT.
Based on `exec -expect-return`.
---
 passes/cmds/bugpoint.cc | 62 +++++++++++++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 8 deletions(-)

diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index e1f3544b4..24c778fdb 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -50,6 +50,10 @@ struct BugpointPass : public Pass {
 		log("    -grep \"<string>\"\n");
 		log("        only consider crashes that place this string in the log file.\n");
 		log("\n");
+		log("    -expect-return <int>\n");
+		log("        only consider crashes that return the specified value. e.g. SEGFAULT\n");
+		log("        returns a value of 139.\n");
+		log("\n");
 		log("    -fast\n");
 		log("        run `proc_clean; clean -purge` after each minimization step. converges\n");
 		log("        faster, but produces larger testcases, and may fail to produce any\n");
@@ -98,7 +102,7 @@ struct BugpointPass : public Pass {
 		log("\n");
 	}
 
-	bool run_yosys(RTLIL::Design *design, string runner, string yosys_cmd, string yosys_arg)
+	int run_yosys(RTLIL::Design *design, string runner, string yosys_cmd, string yosys_arg)
 	{
 		design->sort();
 
@@ -107,7 +111,16 @@ struct BugpointPass : public Pass {
 		f.close();
 
 		string yosys_cmdline = stringf("%s %s -qq -L bugpoint-case.log %s bugpoint-case.il", runner.c_str(), yosys_cmd.c_str(), yosys_arg.c_str());
-		return run_command(yosys_cmdline) == 0;
+		auto status = run_command(yosys_cmdline);
+		// we're not processing lines, which means we're getting raw system() returns
+		if(WIFEXITED(status))
+			return WEXITSTATUS(status);
+		else if(WIFSIGNALED(status))
+			return WTERMSIG(status);
+		else if(WIFSTOPPED(status))
+			return WSTOPSIG(status);
+		else
+			return 0;
 	}
 
 	bool check_logfile(string grep)
@@ -404,6 +417,8 @@ struct BugpointPass : public Pass {
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		string yosys_cmd = "yosys", yosys_arg, grep, runner;
+		bool flag_expect_return = false, has_check = false;
+		int expect_return_value = 0;
 		bool fast = false, clean = false;
 		bool modules = false, ports = false, cells = false, connections = false, processes = false, assigns = false, updates = false, wires = false, has_part = false;
 
@@ -430,9 +445,19 @@ struct BugpointPass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-grep" && argidx + 1 < args.size()) {
+				has_check = true;
 				grep = args[++argidx];
 				continue;
 			}
+			if (args[argidx] == "-expect-return") {
+				flag_expect_return = true;
+				++argidx;
+				if (argidx >= args.size())
+					log_cmd_error("No expected return value specified.\n");
+
+				expect_return_value = atoi(args[argidx].c_str());
+				continue;
+			}
 			if (args[argidx] == "-fast") {
 				fast = true;
 				continue;
@@ -496,6 +521,9 @@ struct BugpointPass : public Pass {
 		if (yosys_arg.empty())
 			log_cmd_error("Missing -script or -command option.\n");
 
+		if (flag_expect_return && expect_return_value == 0 && !has_check)
+			log_cmd_error("Nothing to match on for -expect-return 0; change value or use -grep.\n");
+
 		if (!has_part)
 		{
 			modules = true;
@@ -512,7 +540,10 @@ struct BugpointPass : public Pass {
 			log_cmd_error("This command only operates on fully selected designs!\n");
 
 		RTLIL::Design *crashing_design = clean_design(design, clean);
-		if (run_yosys(crashing_design, runner, yosys_cmd, yosys_arg))
+		int retval = run_yosys(crashing_design, runner, yosys_cmd, yosys_arg);
+		if (flag_expect_return && retval != expect_return_value)
+			log_cmd_error("The provided script file or command and Yosys binary returned value %d instead of expected %d on this design!\n", retval, expect_return_value);
+		if (!flag_expect_return && retval == 0)
 			log_cmd_error("The provided script file or command and Yosys binary do not crash on this design!\n");
 		if (!check_logfile(grep))
 			log_cmd_error("The provided grep string is not found in the log file!\n");
@@ -525,21 +556,37 @@ struct BugpointPass : public Pass {
 			{
 				simplified = clean_design(simplified, fast, /*do_delete=*/true);
 
-				bool crashes;
 				if (clean)
 				{
 					RTLIL::Design *testcase = clean_design(simplified);
-					crashes = !run_yosys(testcase, runner, yosys_cmd, yosys_arg);
+					retval = run_yosys(testcase, runner, yosys_cmd, yosys_arg);
 					delete testcase;
 				}
 				else
 				{
-					crashes = !run_yosys(simplified, runner, yosys_cmd, yosys_arg);
+					retval = run_yosys(simplified, runner, yosys_cmd, yosys_arg);
 				}
 
-				if (crashes && check_logfile(grep))
+				bool crashes = false;
+				if (flag_expect_return && retval == expect_return_value && check_logfile(grep))
+				{
+					log("Testcase matches expected crash.\n");
+					crashes = true;
+				}
+				else if (!flag_expect_return && retval == 0)
+					log("Testcase does not crash.\n");
+				else if (!flag_expect_return && check_logfile(grep))
 				{
 					log("Testcase crashes.\n");
+					crashes = true;
+				}
+				else
+					// flag_expect_return && !(retval == expect_return_value && check_logfile(grep))
+					// !flag_expect_return && !(retval == 0 && check_logfile(grep))
+					log("Testcase does not match expected crash.\n");
+
+				if (crashes)
+				{
 					if (crashing_design != design)
 						delete crashing_design;
 					crashing_design = simplified;
@@ -547,7 +594,6 @@ struct BugpointPass : public Pass {
 				}
 				else
 				{
-					log("Testcase does not crash.\n");
 					delete simplified;
 					seed++;
 				}

From a7a926b24701faeb62e1e7e0b35bff5679def157 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:39:50 +1200
Subject: [PATCH 209/931] bugpoint.cc: WIN32 exit signals

---
 passes/cmds/bugpoint.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index 24c778fdb..06aae1885 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -20,6 +20,15 @@
 #include "kernel/yosys.h"
 #include "backends/rtlil/rtlil_backend.h"
 
+#if defined(_WIN32)
+#  define WIFEXITED(x) 1
+#  define WIFSIGNALED(x) 0
+#  define WIFSTOPPED(x) 0
+#  define WEXITSTATUS(x) ((x) & 0xff)
+#  define WTERMSIG(x) SIGTERM
+#  define WSTOPSIG(x) 0
+#endif
+
 USING_YOSYS_NAMESPACE
 using namespace RTLIL_BACKEND;
 PRIVATE_NAMESPACE_BEGIN

From 134da811f7f7c7688c3871ad93f7b480cc8c1274 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:39:50 +1200
Subject: [PATCH 210/931] Add raise_error pass

Raise errors from attributes for testing.
I want it for bugpoint tests but it could be useful elsewhere.
---
 kernel/constids.inc         |  1 +
 passes/tests/Makefile.inc   |  1 +
 passes/tests/raise_error.cc | 61 +++++++++++++++++++++++++++++++++++++
 tests/bugpoint/.gitignore   |  2 ++
 tests/bugpoint/err.ys       | 27 ++++++++++++++++
 5 files changed, 92 insertions(+)
 create mode 100644 passes/tests/raise_error.cc
 create mode 100644 tests/bugpoint/.gitignore
 create mode 100644 tests/bugpoint/err.ys

diff --git a/kernel/constids.inc b/kernel/constids.inc
index c77a25c01..29872d45e 100644
--- a/kernel/constids.inc
+++ b/kernel/constids.inc
@@ -286,3 +286,4 @@ X(A_WIDTHS)
 X(B_WIDTHS)
 X(C_WIDTHS)
 X(C_SIGNED)
+X(raise_error)
diff --git a/passes/tests/Makefile.inc b/passes/tests/Makefile.inc
index 531943d78..25e11967c 100644
--- a/passes/tests/Makefile.inc
+++ b/passes/tests/Makefile.inc
@@ -2,4 +2,5 @@
 OBJS += passes/tests/test_autotb.o
 OBJS += passes/tests/test_cell.o
 OBJS += passes/tests/test_abcloop.o
+OBJS += passes/tests/raise_error.o
 
diff --git a/passes/tests/raise_error.cc b/passes/tests/raise_error.cc
new file mode 100644
index 000000000..edc42de65
--- /dev/null
+++ b/passes/tests/raise_error.cc
@@ -0,0 +1,61 @@
+#include "kernel/yosys.h"
+
+USING_YOSYS_NAMESPACE
+PRIVATE_NAMESPACE_BEGIN
+
+struct RaiseErrorPass : public Pass {
+	RaiseErrorPass() : Pass("raise_error", "raise errors from attributes") { }
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    raise_error [selection]\n");
+		log("\n");
+		log("Test error handling by raising arbitrary errors. This pass iterates over the\n");
+		log("design (or selection of it) checking for objects with the 'raise_error'\n");
+		log("attribute set.\n");
+		log("\n");
+	}
+	void execute(vector<string> args, RTLIL::Design *design) override
+	{
+		log_header(design, "Executing RAISE_ERROR pass.\n");
+
+		extra_args(args, 1, design, true);
+
+		RTLIL::NamedObject *err_obj = nullptr;
+		
+		for (auto mod : design->all_selected_modules()) {
+			if (mod->has_attribute(ID::raise_error)) {
+				err_obj = mod->clone();
+				break;
+			}
+			for (auto memb : mod->selected_members()) {
+				if (memb->has_attribute(ID::raise_error)) {
+					err_obj = memb;
+					break;
+				}
+			}
+			if (err_obj != nullptr) break;
+		}
+
+		if (err_obj != nullptr) {
+			log("Raising error from '%s'.\n", log_id(err_obj));
+			auto err_no = err_obj->attributes[ID::raise_error].as_int();
+			if (err_no < 256) {
+				log_flush();
+			#if defined(_MSC_VER)
+				_exit(err_no);
+			#else
+				_Exit(err_no);
+			#endif
+			} else {
+				auto err_msg = err_obj->get_string_attribute(ID::raise_error);
+				log_error("%s\n", err_msg.c_str());
+			}
+		} else {
+			log("'raise_error' attribute not found\n");
+		}
+	}
+} RaiseErrorPass;
+
+PRIVATE_NAMESPACE_END
diff --git a/tests/bugpoint/.gitignore b/tests/bugpoint/.gitignore
new file mode 100644
index 000000000..072ed1097
--- /dev/null
+++ b/tests/bugpoint/.gitignore
@@ -0,0 +1,2 @@
+*.il
+*.log
\ No newline at end of file
diff --git a/tests/bugpoint/err.ys b/tests/bugpoint/err.ys
new file mode 100644
index 000000000..d6a152144
--- /dev/null
+++ b/tests/bugpoint/err.ys
@@ -0,0 +1,27 @@
+read_verilog -noblackbox << EOF
+(* raise_error=7 *)
+module top();
+endmodule
+
+(* raise_error="help me" *)
+module other();
+endmodule
+
+module zzy();
+endmodule
+EOF
+select -assert-mod-count 3 =*
+design -stash read
+
+# raise_error with int exits with status
+design -load read
+bugpoint -yosys ../../yosys -command raise_error -expect-return 7
+select -assert-mod-count 1 =*
+select -assert-mod-count 1 top
+
+# raise_error with string prints message
+design -load read
+rename top abc
+bugpoint -yosys ../../yosys -command raise_error -grep "help me"
+select -assert-mod-count 1 =*
+select -assert-mod-count 1 other

From 8d5dbae06e33fede98fd3041f2fdf3b04137bddc Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:39:50 +1200
Subject: [PATCH 211/931] raise_error.cc: Option for direct to stderr

Add more to help text to describe usage.
Add test for no value (should `exit(1)`).
---
 passes/tests/raise_error.cc | 40 ++++++++++++++++++++++++++++---------
 tests/bugpoint/err.ys       | 27 ++++++++++++++++++++++++-
 2 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/passes/tests/raise_error.cc b/passes/tests/raise_error.cc
index edc42de65..f9055e6d2 100644
--- a/passes/tests/raise_error.cc
+++ b/passes/tests/raise_error.cc
@@ -9,18 +9,35 @@ struct RaiseErrorPass : public Pass {
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
-		log("    raise_error [selection]\n");
+		log("    raise_error [options] [selection]\n");
 		log("\n");
 		log("Test error handling by raising arbitrary errors. This pass iterates over the\n");
 		log("design (or selection of it) checking for objects with the 'raise_error'\n");
-		log("attribute set.\n");
+		log("attribute set. Assigning 'raise_error' to a string more than one character long\n");
+		log("will log that string as an error message before exiting. Assigning 'raise_error'\n");
+		log("to an integer (less than 256) will exit with that value as the exit code.\n");
+		log("\n");
+		log("    -stderr\n");
+		log("        Log error messages directly to stderr instead of using 'log_error'.\n");
 		log("\n");
 	}
 	void execute(vector<string> args, RTLIL::Design *design) override
 	{
 		log_header(design, "Executing RAISE_ERROR pass.\n");
 
-		extra_args(args, 1, design, true);
+		bool use_stderr = false;
+
+		int argidx;
+		for (argidx = 1; argidx < GetSize(args); argidx++)
+		{
+			if (args[argidx] == "-stderr") {
+				use_stderr = true;
+				continue;
+			}
+			break;
+		}
+
+		extra_args(args, argidx, design, true);
 
 		RTLIL::NamedObject *err_obj = nullptr;
 		
@@ -43,15 +60,20 @@ struct RaiseErrorPass : public Pass {
 			auto err_no = err_obj->attributes[ID::raise_error].as_int();
 			if (err_no < 256) {
 				log_flush();
-			#if defined(_MSC_VER)
-				_exit(err_no);
-			#else
-				_Exit(err_no);
-			#endif
 			} else {
 				auto err_msg = err_obj->get_string_attribute(ID::raise_error);
-				log_error("%s\n", err_msg.c_str());
+				if (use_stderr) {
+					std::cerr << err_msg << std::endl;
+					err_no = 1;
+				} else {
+					log_error("%s\n", err_msg.c_str());
+				}
 			}
+		#if defined(_MSC_VER)
+			_exit(err_no);
+		#else
+			_Exit(err_no);
+		#endif
 		} else {
 			log("'raise_error' attribute not found\n");
 		}
diff --git a/tests/bugpoint/err.ys b/tests/bugpoint/err.ys
index d6a152144..7b2fbcc81 100644
--- a/tests/bugpoint/err.ys
+++ b/tests/bugpoint/err.ys
@@ -7,7 +7,8 @@ endmodule
 module other();
 endmodule
 
-module zzy();
+(* raise_error *)
+module def();
 endmodule
 EOF
 select -assert-mod-count 3 =*
@@ -25,3 +26,27 @@ rename top abc
 bugpoint -yosys ../../yosys -command raise_error -grep "help me"
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 other
+
+# raise_error with no value exits with 1
+design -load read
+rename def zzy
+bugpoint -yosys ../../yosys -command raise_error -expect-return 1
+select -assert-mod-count 1 =*
+select -assert-mod-count 1 zzy
+
+# raise_error -stderr exits with 1
+design -load read
+rename top abc
+delete def
+bugpoint -yosys ../../yosys -command "raise_error -stderr" -expect-return 1
+select -assert-mod-count 1 =*
+select -assert-mod-count 1 other
+
+#TODO
+# raise_error -stderr prints to stderr
+design -load read
+rename top abc
+delete def
+# bugpoint -yosys ../../yosys -command "raise_error -stderr" -grep "help me"
+# select -assert-mod-count 1 =*
+# select -assert-mod-count 1 other

From fb92eabdcd7d55ed371f49ffdf53a88bc05e69fe Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:39:51 +1200
Subject: [PATCH 212/931] bugpoint: Add -greperr option

`-greperr <string>` redirects stderr to 'bugpoint-case.err', and then searches that file for `<string>`.
Move `-runner` option up with the other options to reduce ambiguity (i.e. so it doesn't look like it's another design parts constraint).
Also some shuffling of `err.ys`.
---
 passes/cmds/bugpoint.cc   | 53 ++++++++++++++++++++++++++++-----------
 tests/bugpoint/.gitignore |  3 ++-
 tests/bugpoint/err.ys     | 19 ++++----------
 3 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index 06aae1885..11f6de35b 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -73,6 +73,13 @@ struct BugpointPass : public Pass {
 		log("        finishing. produces smaller and more useful testcases, but may fail to\n");
 		log("        produce any testcase at all if the crash is related to dangling wires.\n");
 		log("\n");
+		log("    -runner \"<prefix>\"\n");
+		log("        child process wrapping command, e.g., \"timeout 30\", or valgrind.\n");
+		log("\n");
+		log("    -greperr \"<string>\"\n");
+		log("        only consider crashes that print this string on stderr. useful for\n");
+		log("        errors outside of yosys.\n");
+		log("\n");
 		log("It is possible to constrain which parts of the design will be considered for\n");
 		log("removal. Unless one or more of the following options are specified, all parts\n");
 		log("will be considered.\n");
@@ -106,12 +113,9 @@ struct BugpointPass : public Pass {
 		log("        try to remove wires. wires with a (* bugpoint_keep *) attribute will be\n");
 		log("        skipped.\n");
 		log("\n");
-		log("    -runner \"<prefix>\"\n");
-		log("        child process wrapping command, e.g., \"timeout 30\", or valgrind.\n");
-		log("\n");
 	}
 
-	int run_yosys(RTLIL::Design *design, string runner, string yosys_cmd, string yosys_arg)
+	int run_yosys(RTLIL::Design *design, string runner, string yosys_cmd, string yosys_arg, bool catch_err)
 	{
 		design->sort();
 
@@ -120,6 +124,7 @@ struct BugpointPass : public Pass {
 		f.close();
 
 		string yosys_cmdline = stringf("%s %s -qq -L bugpoint-case.log %s bugpoint-case.il", runner.c_str(), yosys_cmd.c_str(), yosys_arg.c_str());
+		if (catch_err) yosys_cmdline += " 2>bugpoint-case.err";
 		auto status = run_command(yosys_cmdline);
 		// we're not processing lines, which means we're getting raw system() returns
 		if(WIFEXITED(status))
@@ -132,7 +137,7 @@ struct BugpointPass : public Pass {
 			return 0;
 	}
 
-	bool check_logfile(string grep)
+	bool check_logfile(string grep, bool err=false)
 	{
 		if (grep.empty())
 			return true;
@@ -140,7 +145,12 @@ struct BugpointPass : public Pass {
 		if (grep.size() > 2 && grep.front() == '"' && grep.back() == '"')
 			grep = grep.substr(1, grep.size() - 2);
 
-		std::ifstream f("bugpoint-case.log");
+		std::ifstream f;
+		if (err)
+			f = std::ifstream("bugpoint-case.err");
+		else
+			f = std::ifstream("bugpoint-case.log");
+
 		while (!f.eof())
 		{
 			string line;
@@ -151,6 +161,11 @@ struct BugpointPass : public Pass {
 		return false;
 	}
 
+	bool check_logfiles(string grep, string greperr)
+	{
+		return check_logfile(grep) && check_logfile(greperr, true);
+	}
+
 	RTLIL::Design *clean_design(RTLIL::Design *design, bool do_clean = true, bool do_delete = false)
 	{
 		if (!do_clean)
@@ -425,8 +440,8 @@ struct BugpointPass : public Pass {
 
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
-		string yosys_cmd = "yosys", yosys_arg, grep, runner;
-		bool flag_expect_return = false, has_check = false;
+		string yosys_cmd = "yosys", yosys_arg, grep, greperr, runner;
+		bool flag_expect_return = false, has_check = false, check_err = false;
 		int expect_return_value = 0;
 		bool fast = false, clean = false;
 		bool modules = false, ports = false, cells = false, connections = false, processes = false, assigns = false, updates = false, wires = false, has_part = false;
@@ -458,6 +473,12 @@ struct BugpointPass : public Pass {
 				grep = args[++argidx];
 				continue;
 			}
+			if (args[argidx] == "-greperr" && argidx + 1 < args.size()) {
+				has_check = true;
+				check_err = true;
+				greperr = args[++argidx];
+				continue;
+			}
 			if (args[argidx] == "-expect-return") {
 				flag_expect_return = true;
 				++argidx;
@@ -549,13 +570,15 @@ struct BugpointPass : public Pass {
 			log_cmd_error("This command only operates on fully selected designs!\n");
 
 		RTLIL::Design *crashing_design = clean_design(design, clean);
-		int retval = run_yosys(crashing_design, runner, yosys_cmd, yosys_arg);
+		int retval = run_yosys(crashing_design, runner, yosys_cmd, yosys_arg, check_err);
 		if (flag_expect_return && retval != expect_return_value)
 			log_cmd_error("The provided script file or command and Yosys binary returned value %d instead of expected %d on this design!\n", retval, expect_return_value);
 		if (!flag_expect_return && retval == 0)
 			log_cmd_error("The provided script file or command and Yosys binary do not crash on this design!\n");
 		if (!check_logfile(grep))
 			log_cmd_error("The provided grep string is not found in the log file!\n");
+		if (!check_logfile(greperr, true))
+			log_cmd_error("The provided grep string is not found in stderr log!\n");
 
 		int seed = 0;
 		bool found_something = false, stage2 = false;
@@ -568,30 +591,30 @@ struct BugpointPass : public Pass {
 				if (clean)
 				{
 					RTLIL::Design *testcase = clean_design(simplified);
-					retval = run_yosys(testcase, runner, yosys_cmd, yosys_arg);
+					retval = run_yosys(testcase, runner, yosys_cmd, yosys_arg, check_err);
 					delete testcase;
 				}
 				else
 				{
-					retval = run_yosys(simplified, runner, yosys_cmd, yosys_arg);
+					retval = run_yosys(simplified, runner, yosys_cmd, yosys_arg, check_err);
 				}
 
 				bool crashes = false;
-				if (flag_expect_return && retval == expect_return_value && check_logfile(grep))
+				if (flag_expect_return && retval == expect_return_value && check_logfiles(grep, greperr))
 				{
 					log("Testcase matches expected crash.\n");
 					crashes = true;
 				}
 				else if (!flag_expect_return && retval == 0)
 					log("Testcase does not crash.\n");
-				else if (!flag_expect_return && check_logfile(grep))
+				else if (!flag_expect_return && check_logfiles(grep, greperr))
 				{
 					log("Testcase crashes.\n");
 					crashes = true;
 				}
 				else
-					// flag_expect_return && !(retval == expect_return_value && check_logfile(grep))
-					// !flag_expect_return && !(retval == 0 && check_logfile(grep))
+					// flag_expect_return && !(retval == expect_return_value && check_logfiles(grep, greperr))
+					// !flag_expect_return && !(retval == 0 && check_logfiles(grep, greperr))
 					log("Testcase does not match expected crash.\n");
 
 				if (crashes)
diff --git a/tests/bugpoint/.gitignore b/tests/bugpoint/.gitignore
index 072ed1097..818575593 100644
--- a/tests/bugpoint/.gitignore
+++ b/tests/bugpoint/.gitignore
@@ -1,2 +1,3 @@
 *.il
-*.log
\ No newline at end of file
+*.log
+*.err
diff --git a/tests/bugpoint/err.ys b/tests/bugpoint/err.ys
index 7b2fbcc81..c74e34b19 100644
--- a/tests/bugpoint/err.ys
+++ b/tests/bugpoint/err.ys
@@ -20,33 +20,24 @@ bugpoint -yosys ../../yosys -command raise_error -expect-return 7
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 top
 
-# raise_error with string prints message
+# raise_error with string prints message and exits with 1
 design -load read
 rename top abc
-bugpoint -yosys ../../yosys -command raise_error -grep "help me"
+bugpoint -yosys ../../yosys -command raise_error -grep "help me" -expect-return 1
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 other
 
 # raise_error with no value exits with 1
 design -load read
 rename def zzy
+delete other
 bugpoint -yosys ../../yosys -command raise_error -expect-return 1
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 zzy
 
-# raise_error -stderr exits with 1
+# raise_error -stderr prints to stderr and exits with 1
 design -load read
 rename top abc
-delete def
-bugpoint -yosys ../../yosys -command "raise_error -stderr" -expect-return 1
+bugpoint -yosys ../../yosys -command "raise_error -stderr" -greperr "help me" -expect-return 1
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 other
-
-#TODO
-# raise_error -stderr prints to stderr
-design -load read
-rename top abc
-delete def
-# bugpoint -yosys ../../yosys -command "raise_error -stderr" -grep "help me"
-# select -assert-mod-count 1 =*
-# select -assert-mod-count 1 other

From 65147670a67e759d7e08c5bc4fb14520b5221398 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:39:51 +1200
Subject: [PATCH 213/931] bugpoint.cc: Include csignal for windows

---
 passes/cmds/bugpoint.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index 11f6de35b..101d82bd6 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -21,6 +21,7 @@
 #include "backends/rtlil/rtlil_backend.h"
 
 #if defined(_WIN32)
+#  include <csignal>
 #  define WIFEXITED(x) 1
 #  define WIFSIGNALED(x) 0
 #  define WIFSTOPPED(x) 0

From b5a13ae95b9b9350d726e1ec2ad5eec9cc544b0c Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:39:51 +1200
Subject: [PATCH 214/931] bugpoint.cc: Rename to -err_grep

---
 passes/cmds/bugpoint.cc | 22 +++++++++++-----------
 tests/bugpoint/err.ys   |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index 101d82bd6..f740c2bcd 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -77,7 +77,7 @@ struct BugpointPass : public Pass {
 		log("    -runner \"<prefix>\"\n");
 		log("        child process wrapping command, e.g., \"timeout 30\", or valgrind.\n");
 		log("\n");
-		log("    -greperr \"<string>\"\n");
+		log("    -err_grep \"<string>\"\n");
 		log("        only consider crashes that print this string on stderr. useful for\n");
 		log("        errors outside of yosys.\n");
 		log("\n");
@@ -162,9 +162,9 @@ struct BugpointPass : public Pass {
 		return false;
 	}
 
-	bool check_logfiles(string grep, string greperr)
+	bool check_logfiles(string grep, string err_grep)
 	{
-		return check_logfile(grep) && check_logfile(greperr, true);
+		return check_logfile(grep) && check_logfile(err_grep, true);
 	}
 
 	RTLIL::Design *clean_design(RTLIL::Design *design, bool do_clean = true, bool do_delete = false)
@@ -441,7 +441,7 @@ struct BugpointPass : public Pass {
 
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
-		string yosys_cmd = "yosys", yosys_arg, grep, greperr, runner;
+		string yosys_cmd = "yosys", yosys_arg, grep, err_grep, runner;
 		bool flag_expect_return = false, has_check = false, check_err = false;
 		int expect_return_value = 0;
 		bool fast = false, clean = false;
@@ -474,10 +474,10 @@ struct BugpointPass : public Pass {
 				grep = args[++argidx];
 				continue;
 			}
-			if (args[argidx] == "-greperr" && argidx + 1 < args.size()) {
+			if (args[argidx] == "-err_grep" && argidx + 1 < args.size()) {
 				has_check = true;
 				check_err = true;
-				greperr = args[++argidx];
+				err_grep = args[++argidx];
 				continue;
 			}
 			if (args[argidx] == "-expect-return") {
@@ -578,7 +578,7 @@ struct BugpointPass : public Pass {
 			log_cmd_error("The provided script file or command and Yosys binary do not crash on this design!\n");
 		if (!check_logfile(grep))
 			log_cmd_error("The provided grep string is not found in the log file!\n");
-		if (!check_logfile(greperr, true))
+		if (!check_logfile(err_grep, true))
 			log_cmd_error("The provided grep string is not found in stderr log!\n");
 
 		int seed = 0;
@@ -601,21 +601,21 @@ struct BugpointPass : public Pass {
 				}
 
 				bool crashes = false;
-				if (flag_expect_return && retval == expect_return_value && check_logfiles(grep, greperr))
+				if (flag_expect_return && retval == expect_return_value && check_logfiles(grep, err_grep))
 				{
 					log("Testcase matches expected crash.\n");
 					crashes = true;
 				}
 				else if (!flag_expect_return && retval == 0)
 					log("Testcase does not crash.\n");
-				else if (!flag_expect_return && check_logfiles(grep, greperr))
+				else if (!flag_expect_return && check_logfiles(grep, err_grep))
 				{
 					log("Testcase crashes.\n");
 					crashes = true;
 				}
 				else
-					// flag_expect_return && !(retval == expect_return_value && check_logfiles(grep, greperr))
-					// !flag_expect_return && !(retval == 0 && check_logfiles(grep, greperr))
+					// flag_expect_return && !(retval == expect_return_value && check_logfiles(grep, err_grep))
+					// !flag_expect_return && !(retval == 0 && check_logfiles(grep, err_grep))
 					log("Testcase does not match expected crash.\n");
 
 				if (crashes)
diff --git a/tests/bugpoint/err.ys b/tests/bugpoint/err.ys
index c74e34b19..08bf0a9c7 100644
--- a/tests/bugpoint/err.ys
+++ b/tests/bugpoint/err.ys
@@ -38,6 +38,6 @@ select -assert-mod-count 1 zzy
 # raise_error -stderr prints to stderr and exits with 1
 design -load read
 rename top abc
-bugpoint -yosys ../../yosys -command "raise_error -stderr" -greperr "help me" -expect-return 1
+bugpoint -yosys ../../yosys -command "raise_error -stderr" -err_grep "help me" -expect-return 1
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 other

From 93f7429f4fd9feaef054e61ddc4179a8756e5719 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:39:51 +1200
Subject: [PATCH 215/931] tests: Add bugpoint to MK_TEST_DIRS

Also change `-err_grep` to `-err-grep` for consistency with `-expect-return`.
---
 Makefile                   | 1 +
 passes/cmds/bugpoint.cc    | 4 ++--
 tests/bugpoint/err.ys      | 2 +-
 tests/bugpoint/run-test.sh | 4 ++++
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100755 tests/bugpoint/run-test.sh

diff --git a/Makefile b/Makefile
index 083805fbc..3f17d471c 100644
--- a/Makefile
+++ b/Makefile
@@ -868,6 +868,7 @@ MK_TEST_DIRS += tests/arch/nexus
 MK_TEST_DIRS += tests/arch/quicklogic/pp3
 MK_TEST_DIRS += tests/arch/quicklogic/qlf_k6n10f
 MK_TEST_DIRS += tests/arch/xilinx
+MK_TEST_DIRS += tests/bugpoint
 MK_TEST_DIRS += tests/opt
 MK_TEST_DIRS += tests/sat
 MK_TEST_DIRS += tests/sim
diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index f740c2bcd..683430372 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -77,7 +77,7 @@ struct BugpointPass : public Pass {
 		log("    -runner \"<prefix>\"\n");
 		log("        child process wrapping command, e.g., \"timeout 30\", or valgrind.\n");
 		log("\n");
-		log("    -err_grep \"<string>\"\n");
+		log("    -err-grep \"<string>\"\n");
 		log("        only consider crashes that print this string on stderr. useful for\n");
 		log("        errors outside of yosys.\n");
 		log("\n");
@@ -474,7 +474,7 @@ struct BugpointPass : public Pass {
 				grep = args[++argidx];
 				continue;
 			}
-			if (args[argidx] == "-err_grep" && argidx + 1 < args.size()) {
+			if (args[argidx] == "-err-grep" && argidx + 1 < args.size()) {
 				has_check = true;
 				check_err = true;
 				err_grep = args[++argidx];
diff --git a/tests/bugpoint/err.ys b/tests/bugpoint/err.ys
index 08bf0a9c7..42e84241c 100644
--- a/tests/bugpoint/err.ys
+++ b/tests/bugpoint/err.ys
@@ -38,6 +38,6 @@ select -assert-mod-count 1 zzy
 # raise_error -stderr prints to stderr and exits with 1
 design -load read
 rename top abc
-bugpoint -yosys ../../yosys -command "raise_error -stderr" -err_grep "help me" -expect-return 1
+bugpoint -yosys ../../yosys -command "raise_error -stderr" -err-grep "help me" -expect-return 1
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 other
diff --git a/tests/bugpoint/run-test.sh b/tests/bugpoint/run-test.sh
new file mode 100755
index 000000000..006c731e3
--- /dev/null
+++ b/tests/bugpoint/run-test.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -eu
+source ../gen-tests-makefile.sh
+generate_mk --yosys-scripts

From d3ff803b8176594be47ca2b83ab138b16c5a11fc Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:39:52 +1200
Subject: [PATCH 216/931] bugpoint: Add -suffix option

Allows for adding a suffix to the `bugpoint-case` file name so that multiple `bugpoint`s can run in the same directory, e.g. during a `make test -j4`.
---
 passes/cmds/bugpoint.cc | 61 ++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index 683430372..08dc76dda 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -81,6 +81,10 @@ struct BugpointPass : public Pass {
 		log("        only consider crashes that print this string on stderr. useful for\n");
 		log("        errors outside of yosys.\n");
 		log("\n");
+		log("    -suffix \"<string>\"\n");
+		log("        add suffix to generated file names. useful when running more than one\n");
+		log("        instance of bugpoint in the same directory. limited to 8 characters.\n");
+		log("\n");
 		log("It is possible to constrain which parts of the design will be considered for\n");
 		log("removal. Unless one or more of the following options are specified, all parts\n");
 		log("will be considered.\n");
@@ -116,16 +120,20 @@ struct BugpointPass : public Pass {
 		log("\n");
 	}
 
-	int run_yosys(RTLIL::Design *design, string runner, string yosys_cmd, string yosys_arg, bool catch_err)
+	int run_yosys(RTLIL::Design *design, string runner, string yosys_cmd, string yosys_arg, string suffix, bool catch_err)
 	{
 		design->sort();
 
-		std::ofstream f("bugpoint-case.il");
+		string bugpoint_file = "bugpoint-case";
+		if (suffix.size())
+			bugpoint_file += stringf(".%.8s", suffix.c_str());
+
+		std::ofstream f(bugpoint_file + ".il");
 		RTLIL_BACKEND::dump_design(f, design, /*only_selected=*/false, /*flag_m=*/true, /*flag_n=*/false);
 		f.close();
 
-		string yosys_cmdline = stringf("%s %s -qq -L bugpoint-case.log %s bugpoint-case.il", runner.c_str(), yosys_cmd.c_str(), yosys_arg.c_str());
-		if (catch_err) yosys_cmdline += " 2>bugpoint-case.err";
+		string yosys_cmdline = stringf("%s %s -qq -L %s.log %s %s.il", runner.c_str(), yosys_cmd.c_str(), bugpoint_file.c_str(), yosys_arg.c_str(), bugpoint_file.c_str());
+		if (catch_err) yosys_cmdline += stringf(" 2>%s.err", bugpoint_file.c_str());
 		auto status = run_command(yosys_cmdline);
 		// we're not processing lines, which means we're getting raw system() returns
 		if(WIFEXITED(status))
@@ -138,7 +146,7 @@ struct BugpointPass : public Pass {
 			return 0;
 	}
 
-	bool check_logfile(string grep, bool err=false)
+	bool check_logfile(string grep, string suffix, bool err=false)
 	{
 		if (grep.empty())
 			return true;
@@ -146,11 +154,12 @@ struct BugpointPass : public Pass {
 		if (grep.size() > 2 && grep.front() == '"' && grep.back() == '"')
 			grep = grep.substr(1, grep.size() - 2);
 
-		std::ifstream f;
-		if (err)
-			f = std::ifstream("bugpoint-case.err");
-		else
-			f = std::ifstream("bugpoint-case.log");
+		string bugpoint_file = "bugpoint-case";
+		if (suffix.size())
+			bugpoint_file += stringf(".%.8s", suffix.c_str());
+		bugpoint_file += err ? ".err" : ".log";
+
+		std::ifstream f(bugpoint_file);
 
 		while (!f.eof())
 		{
@@ -162,9 +171,9 @@ struct BugpointPass : public Pass {
 		return false;
 	}
 
-	bool check_logfiles(string grep, string err_grep)
+	bool check_logfiles(string grep, string err_grep, string suffix)
 	{
-		return check_logfile(grep) && check_logfile(err_grep, true);
+		return check_logfile(grep, suffix) && check_logfile(err_grep, suffix, true);
 	}
 
 	RTLIL::Design *clean_design(RTLIL::Design *design, bool do_clean = true, bool do_delete = false)
@@ -441,7 +450,7 @@ struct BugpointPass : public Pass {
 
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
-		string yosys_cmd = "yosys", yosys_arg, grep, err_grep, runner;
+		string yosys_cmd = "yosys", yosys_arg, grep, err_grep, runner, suffix;
 		bool flag_expect_return = false, has_check = false, check_err = false;
 		int expect_return_value = 0;
 		bool fast = false, clean = false;
@@ -545,6 +554,14 @@ struct BugpointPass : public Pass {
 				}
 				continue;
 			}
+			if (args[argidx] == "-suffix" && argidx + 1 < args.size()) {
+				suffix = args[++argidx];
+				if (suffix.size() && suffix.at(0) == '"') {
+					log_assert(suffix.back() == '"');
+					suffix = suffix.substr(1, suffix.size() - 2);
+				}
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
@@ -571,14 +588,14 @@ struct BugpointPass : public Pass {
 			log_cmd_error("This command only operates on fully selected designs!\n");
 
 		RTLIL::Design *crashing_design = clean_design(design, clean);
-		int retval = run_yosys(crashing_design, runner, yosys_cmd, yosys_arg, check_err);
+		int retval = run_yosys(crashing_design, runner, yosys_cmd, yosys_arg, suffix, check_err);
 		if (flag_expect_return && retval != expect_return_value)
 			log_cmd_error("The provided script file or command and Yosys binary returned value %d instead of expected %d on this design!\n", retval, expect_return_value);
 		if (!flag_expect_return && retval == 0)
 			log_cmd_error("The provided script file or command and Yosys binary do not crash on this design!\n");
-		if (!check_logfile(grep))
+		if (!check_logfile(grep, suffix))
 			log_cmd_error("The provided grep string is not found in the log file!\n");
-		if (!check_logfile(err_grep, true))
+		if (!check_logfile(err_grep, suffix, true))
 			log_cmd_error("The provided grep string is not found in stderr log!\n");
 
 		int seed = 0;
@@ -592,30 +609,30 @@ struct BugpointPass : public Pass {
 				if (clean)
 				{
 					RTLIL::Design *testcase = clean_design(simplified);
-					retval = run_yosys(testcase, runner, yosys_cmd, yosys_arg, check_err);
+					retval = run_yosys(testcase, runner, yosys_cmd, yosys_arg, suffix, check_err);
 					delete testcase;
 				}
 				else
 				{
-					retval = run_yosys(simplified, runner, yosys_cmd, yosys_arg, check_err);
+					retval = run_yosys(simplified, runner, yosys_cmd, yosys_arg, suffix, check_err);
 				}
 
 				bool crashes = false;
-				if (flag_expect_return && retval == expect_return_value && check_logfiles(grep, err_grep))
+				if (flag_expect_return && retval == expect_return_value && check_logfiles(grep, err_grep, suffix))
 				{
 					log("Testcase matches expected crash.\n");
 					crashes = true;
 				}
 				else if (!flag_expect_return && retval == 0)
 					log("Testcase does not crash.\n");
-				else if (!flag_expect_return && check_logfiles(grep, err_grep))
+				else if (!flag_expect_return && check_logfiles(grep, err_grep, suffix))
 				{
 					log("Testcase crashes.\n");
 					crashes = true;
 				}
 				else
-					// flag_expect_return && !(retval == expect_return_value && check_logfiles(grep, err_grep))
-					// !flag_expect_return && !(retval == 0 && check_logfiles(grep, err_grep))
+					// flag_expect_return && !(retval == expect_return_value && check_logfiles(grep, err_grep, suffix))
+					// !flag_expect_return && !(retval == 0 && check_logfiles(grep, err_grep, suffix))
 					log("Testcase does not match expected crash.\n");
 
 				if (crashes)

From fe07d390f1b5b80aaeeb295bd74978d617e4bbc0 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:39:52 +1200
Subject: [PATCH 217/931] tests/bugpoint: More tests

More coverage.
---
 tests/bugpoint/.gitignore                 |  4 +-
 tests/bugpoint/failures.ys                | 29 ++++++++
 tests/bugpoint/mod_constraints.ys         | 83 +++++++++++++++++++++++
 tests/bugpoint/mods.il                    | 38 +++++++++++
 tests/bugpoint/proc_constraints.ys        | 49 +++++++++++++
 tests/bugpoint/procs.il                   | 42 ++++++++++++
 tests/bugpoint/{err.ys => raise_error.ys} |  8 +--
 7 files changed, 248 insertions(+), 5 deletions(-)
 create mode 100644 tests/bugpoint/failures.ys
 create mode 100644 tests/bugpoint/mod_constraints.ys
 create mode 100644 tests/bugpoint/mods.il
 create mode 100644 tests/bugpoint/proc_constraints.ys
 create mode 100644 tests/bugpoint/procs.il
 rename tests/bugpoint/{err.ys => raise_error.ys} (71%)

diff --git a/tests/bugpoint/.gitignore b/tests/bugpoint/.gitignore
index 818575593..1012c66cc 100644
--- a/tests/bugpoint/.gitignore
+++ b/tests/bugpoint/.gitignore
@@ -1,3 +1,5 @@
-*.il
+bugpoint-case.*
 *.log
 *.err
+*.temp
+run-test.mk
diff --git a/tests/bugpoint/failures.ys b/tests/bugpoint/failures.ys
new file mode 100644
index 000000000..ce8daa8cc
--- /dev/null
+++ b/tests/bugpoint/failures.ys
@@ -0,0 +1,29 @@
+write_file fail.temp << EOF
+logger -expect error "Missing -script or -command option." 1
+bugpoint -suffix fail -yosys ../../yosys
+EOF
+exec -expect-return 0 -- ../../yosys -qq mods.il -s fail.temp
+
+write_file fail.temp << EOF
+logger -expect error "do not crash on this design" 1
+bugpoint -suffix fail -yosys ../../yosys -command "dump"
+EOF
+exec -expect-return 0 -- ../../yosys -qq mods.il -s fail.temp
+
+write_file fail.temp << EOF
+logger -expect error "returned value 3 instead of expected 7" 1
+bugpoint -suffix fail -yosys ../../yosys -command raise_error -expect-return 7
+EOF
+exec -expect-return 0 -- ../../yosys -qq mods.il -s fail.temp
+
+write_file fail.temp << EOF
+logger -expect error "not found in the log file!" 1
+bugpoint -suffix fail -yosys ../../yosys -command raise_error -grep "nope"
+EOF
+exec -expect-return 0 -- ../../yosys -qq mods.il -s fail.temp
+
+write_file fail.temp << EOF
+logger -expect error "not found in stderr log!" 1
+bugpoint -suffix fail -yosys ../../yosys -command raise_error -err-grep "nope"
+EOF
+exec -expect-return 0 -- ../../yosys -qq mods.il -s fail.temp
diff --git a/tests/bugpoint/mod_constraints.ys b/tests/bugpoint/mod_constraints.ys
new file mode 100644
index 000000000..f35095510
--- /dev/null
+++ b/tests/bugpoint/mod_constraints.ys
@@ -0,0 +1,83 @@
+read_rtlil mods.il
+select -assert-count 7 w:*
+select -assert-mod-count 3 =*
+select -assert-count 4 c:*
+design -stash base
+
+# everything is removed by default
+design -load base
+bugpoint -suffix mods -yosys ../../yosys -command raise_error -expect-return 3
+select -assert-count 1 w:*
+select -assert-mod-count 1 =*
+select -assert-none c:*
+
+# don't remove wires
+design -load base
+bugpoint -suffix mods -yosys ../../yosys -command raise_error -expect-return 3 -modules -cells
+select -assert-count 3 w:*
+select -assert-mod-count 1 =*
+select -assert-none c:*
+
+# don't remove cells or their connections
+design -load base
+bugpoint -suffix mods -yosys ../../yosys -command raise_error -expect-return 3 -wires -modules
+select -assert-count 5 w:*
+select -assert-mod-count 1 =*
+select -assert-count 4 c:*
+
+# don't remove cells but do remove their connections
+design -load base
+bugpoint -suffix mods -yosys ../../yosys -command raise_error -expect-return 3 -wires -modules -connections
+select -assert-count 1 w:*
+select -assert-mod-count 1 =*
+select -assert-count 4 c:*
+
+# don't remove modules
+design -load base
+bugpoint -suffix mods -yosys ../../yosys -command raise_error -expect-return 3 -wires -cells
+select -assert-count 1 w:*
+select -assert-mod-count 3 =*
+select -assert-none c:*
+
+# can keep wires
+design -load base
+setattr -set bugpoint_keep 1 w:w_b
+bugpoint -suffix mods -yosys ../../yosys -command raise_error -expect-return 3
+select -assert-count 2 w:*
+select -assert-mod-count 1 =*
+select -assert-none c:*
+
+# a wire with keep won't keep the cell/module containing it
+design -load base
+setattr -set bugpoint_keep 1 w:w_o
+bugpoint -suffix mods -yosys ../../yosys -command raise_error -expect-return 3
+select -assert-count 1 w:*
+select -assert-mod-count 1 =*
+select -assert-none c:*
+
+# can keep cells (and do it without the associated module)
+design -load base
+setattr -set bugpoint_keep 1 c:c_a
+bugpoint -suffix mods -yosys ../../yosys -command raise_error -expect-return 3
+select -assert-count 1 w:*
+select -assert-mod-count 1 =*
+select -assert-count 1 c:*
+
+# can keep modules
+design -load base
+setattr -mod -set bugpoint_keep 1 m_a
+bugpoint -suffix mods -yosys ../../yosys -command raise_error -expect-return 3
+select -assert-count 1 w:*
+select -assert-mod-count 2 =*
+select -assert-none c:*
+
+# minimize to just the path connecting w_a and w_c
+# which happens via w_b, w_i, w_o, m_a, c_a and c_b
+write_file script.temp << EOF
+select -assert-none w:w_a %co* w:w_c %ci* %i
+EOF
+design -load base
+bugpoint -suffix mods -yosys ../../yosys -script script.temp -grep "Assertion failed"
+select -assert-count 5 w:*
+select -assert-mod-count 2 =*
+select -assert-count 2 c:*
diff --git a/tests/bugpoint/mods.il b/tests/bugpoint/mods.il
new file mode 100644
index 000000000..fe3ce6522
--- /dev/null
+++ b/tests/bugpoint/mods.il
@@ -0,0 +1,38 @@
+module \m_a
+    wire input 1 \w_i
+    wire output 2 \w_o
+    connect \w_o \w_i
+end
+
+module \m_b
+    wire input 1 \w_i
+    wire output 2 \w_o
+end
+
+attribute \top 1
+module \top
+    attribute \raise_error 3
+    wire \w_a
+    wire \w_b
+    wire \w_c
+
+    cell \m_a \c_a
+        connect \w_i \w_a
+        connect \w_o \w_b
+    end
+
+    cell \m_a \c_b
+        connect \w_i \w_b
+        connect \w_o \w_c
+    end
+
+    cell \m_b \c_c
+        connect \w_i \w_c
+        connect \w_o \w_a
+    end
+
+    cell \m_b \c_d
+        connect \w_i 1'0
+        connect \w_o 1'1
+    end
+end
diff --git a/tests/bugpoint/proc_constraints.ys b/tests/bugpoint/proc_constraints.ys
new file mode 100644
index 000000000..22b8b3c60
--- /dev/null
+++ b/tests/bugpoint/proc_constraints.ys
@@ -0,0 +1,49 @@
+read_rtlil procs.il
+select -assert-count 2 p:*
+design -stash err_q
+
+# processes get removed by default
+design -load err_q
+bugpoint -suffix procs -yosys ../../yosys -command raise_error -expect-return 4
+select -assert-none p:*
+
+# individual processes can be kept
+design -load err_q
+setattr -set bugpoint_keep 1 p:proc_a
+bugpoint -suffix procs -yosys ../../yosys -command raise_error -expect-return 4
+select -assert-count 1 p:*
+
+# all processes can be kept
+design -load err_q
+bugpoint -suffix procs -yosys ../../yosys -command raise_error -expect-return 4 -wires
+select -assert-count 2 p:*
+
+# d and clock are connected after proc
+design -load err_q
+proc
+select -assert-count 3 w:d %co
+select -assert-count 3 w:clock %co
+
+# no assigns means no d
+design -load err_q
+bugpoint -suffix procs -yosys ../../yosys -command raise_error -expect-return 4 -assigns
+proc
+select -assert-count 1 w:d %co
+
+# no updates means no clock
+design -load err_q
+bugpoint -suffix procs -yosys ../../yosys -command raise_error -expect-return 4 -updates
+proc
+select -assert-count 1 w:clock %co
+
+# can remove ports
+design -load err_q
+select -assert-count 5 x:*
+bugpoint -suffix procs -yosys ../../yosys -command raise_error -expect-return 4 -ports
+select -assert-none x:*
+
+# can keep ports
+design -load err_q
+setattr -set bugpoint_keep 1 i:d o:q
+bugpoint -suffix procs -yosys ../../yosys -command raise_error -expect-return 4 -ports
+select -assert-count 2 x:*
diff --git a/tests/bugpoint/procs.il b/tests/bugpoint/procs.il
new file mode 100644
index 000000000..cb9f7c8dd
--- /dev/null
+++ b/tests/bugpoint/procs.il
@@ -0,0 +1,42 @@
+module \ff_with_en_and_sync_reset
+  wire $0\q[1:1]
+  wire $0\q[0:0]
+  attribute \raise_error 4
+  wire width 2 output 5 \q
+  wire width 2 input 4 \d
+  wire input 3 \enable
+  wire input 2 \reset
+  wire input 1 \clock
+
+  process \proc_a
+    assign $0\q[0:0] \q [0]
+    switch \reset
+      case 1'1
+        assign $0\q[0:0] 1'0
+      case 
+        switch \enable
+          case 1'1
+            assign $0\q[0:0] \d [0]
+          case 
+        end
+    end
+    sync posedge \clock
+      update \q [0] $0\q[0:0]
+  end
+
+  process \proc_b
+    assign $0\q[1:1] \q [1]
+    switch \reset
+      case 1'1
+        assign $0\q[1:1] 1'0
+      case 
+        switch \enable
+          case 1'1
+            assign $0\q[1:1] \d [1]
+          case 
+        end
+    end
+    sync posedge \clock
+      update \q [1] $0\q[1:1]
+  end
+end
diff --git a/tests/bugpoint/err.ys b/tests/bugpoint/raise_error.ys
similarity index 71%
rename from tests/bugpoint/err.ys
rename to tests/bugpoint/raise_error.ys
index 42e84241c..a0a03f447 100644
--- a/tests/bugpoint/err.ys
+++ b/tests/bugpoint/raise_error.ys
@@ -16,14 +16,14 @@ design -stash read
 
 # raise_error with int exits with status
 design -load read
-bugpoint -yosys ../../yosys -command raise_error -expect-return 7
+bugpoint -suffix error -yosys ../../yosys -command raise_error -expect-return 7
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 top
 
 # raise_error with string prints message and exits with 1
 design -load read
 rename top abc
-bugpoint -yosys ../../yosys -command raise_error -grep "help me" -expect-return 1
+bugpoint -suffix error -yosys ../../yosys -command raise_error -grep "help me" -expect-return 1
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 other
 
@@ -31,13 +31,13 @@ select -assert-mod-count 1 other
 design -load read
 rename def zzy
 delete other
-bugpoint -yosys ../../yosys -command raise_error -expect-return 1
+bugpoint -suffix error -yosys ../../yosys -command raise_error -expect-return 1
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 zzy
 
 # raise_error -stderr prints to stderr and exits with 1
 design -load read
 rename top abc
-bugpoint -yosys ../../yosys -command "raise_error -stderr" -err-grep "help me" -expect-return 1
+bugpoint -suffix error -yosys ../../yosys -command "raise_error -stderr" -err-grep "help me" -expect-return 1
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 other

From 8f6d7a3043d4ca89b1fab25d2b4f45a56b9e5efa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 29 Jul 2025 00:29:04 +0000
Subject: [PATCH 218/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 083805fbc..36b4d0491 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+112
+YOSYS_VER := 0.55+115
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 6ee3cd8ffdb636301b5600513f549e3e319f1ac6 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Wed, 9 Jul 2025 02:31:33 +0000
Subject: [PATCH 219/931] Replace `stringf()` with a templated function which
 does compile-time format string checking.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Checking only happens at compile time if -std=c++20 (or greater) is enabled. Otherwise
the checking happens at run time.

This requires the format string to be a compile-time constant (when compiling with
C++20), so fix a few places where that isn't true.

The format string behavior is a bit more lenient than C printf. For %d/%u
you can pass any integer type and it will be converted and output without
truncating bits, i.e. any length specifier is ignored and the conversion is
always treated as 'll'. Any truncation needs to be done by casting the argument itself.
For %f/%g you can pass anything that converts to double, including integers.

Performance results with clang 19 -O3 on Linux:
```
hyperfine './yosys -dp "read_rtlil /usr/local/google/home/rocallahan/Downloads/jpeg.synth.il; dump"'
```
C++17 before: Time (mean ± σ):     101.3 ms ±   0.8 ms    [User: 85.6 ms, System: 15.6 ms]
C++17 after:  Time (mean ± σ):      98.4 ms ±   1.2 ms    [User: 82.1 ms, System: 16.1 ms]
C++20 before: Time (mean ± σ):     100.9 ms ±   1.1 ms    [User: 87.0 ms, System: 13.8 ms]
C++20 after:  Time (mean ± σ):      97.8 ms ±   1.4 ms    [User: 83.1 ms, System: 14.7 ms]

The generated code is reasonably efficient. E.g. with clang 19, `stringf()` with a format
with no %% escapes and no other parameters (a weirdly common case) often compiles to a fully
inlined `std::string` construction. In general the format string parsing is often (not always)
compiled away.
---
 backends/verilog/verilog_backend.cc |  20 +-
 kernel/io.cc                        | 149 +++++++++++
 kernel/io.h                         | 392 +++++++++++++++++++++++++++-
 kernel/yosys_common.h               |   9 +
 4 files changed, 551 insertions(+), 19 deletions(-)

diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index 1cef7be60..44f8f05ea 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -1163,9 +1163,9 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ~((");
 		dump_cell_expr_port(f, cell, "A", false);
-		f << stringf(cell->type == ID($_AOI3_) ? " & " : " | ");
+		f << (cell->type == ID($_AOI3_) ? " & " : " | ");
 		dump_cell_expr_port(f, cell, "B", false);
-		f << stringf(cell->type == ID($_AOI3_) ? ") |" : ") &");
+		f << (cell->type == ID($_AOI3_) ? ") |" : ") &");
 		dump_attributes(f, "", cell->attributes, " ");
 		f << stringf(" ");
 		dump_cell_expr_port(f, cell, "C", false);
@@ -1178,13 +1178,13 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ~((");
 		dump_cell_expr_port(f, cell, "A", false);
-		f << stringf(cell->type == ID($_AOI4_) ? " & " : " | ");
+		f << (cell->type == ID($_AOI4_) ? " & " : " | ");
 		dump_cell_expr_port(f, cell, "B", false);
-		f << stringf(cell->type == ID($_AOI4_) ? ") |" : ") &");
+		f << (cell->type == ID($_AOI4_) ? ") |" : ") &");
 		dump_attributes(f, "", cell->attributes, " ");
 		f << stringf(" (");
 		dump_cell_expr_port(f, cell, "C", false);
-		f << stringf(cell->type == ID($_AOI4_) ? " & " : " | ");
+		f << (cell->type == ID($_AOI4_) ? " & " : " | ");
 		dump_cell_expr_port(f, cell, "D", false);
 		f << stringf("));\n");
 		return true;
@@ -1395,10 +1395,10 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		int s_width = cell->getPort(ID::S).size();
 		std::string func_name = cellname(cell);
 
-		f << stringf("%s" "function [%d:0] %s;\n", indent.c_str(), width-1, func_name.c_str());
-		f << stringf("%s" "  input [%d:0] a;\n", indent.c_str(), width-1);
-		f << stringf("%s" "  input [%d:0] b;\n", indent.c_str(), s_width*width-1);
-		f << stringf("%s" "  input [%d:0] s;\n", indent.c_str(), s_width-1);
+		f << stringf("%s" "function [%d:0] %s;\n", indent, width-1, func_name);
+		f << stringf("%s" "  input [%d:0] a;\n", indent, width-1);
+		f << stringf("%s" "  input [%d:0] b;\n", indent, s_width*width-1);
+		f << stringf("%s" "  input [%d:0] s;\n", indent, s_width-1);
 
 		dump_attributes(f, indent + "  ", cell->attributes);
 		if (noparallelcase)
@@ -1407,7 +1407,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 			if (!noattr)
 				f << stringf("%s" "  (* parallel_case *)\n", indent.c_str());
 			f << stringf("%s" "  casez (s)", indent.c_str());
-			f << stringf(noattr ? " // synopsys parallel_case\n" : "\n");
+			f << (noattr ? " // synopsys parallel_case\n" : "\n");
 		}
 
 		for (int i = 0; i < s_width; i++)
diff --git a/kernel/io.cc b/kernel/io.cc
index d7d126c4c..3deb54d86 100644
--- a/kernel/io.cc
+++ b/kernel/io.cc
@@ -384,4 +384,153 @@ std::string escape_filename_spaces(const std::string& filename)
 	return out;
 }
 
+void format_emit_unescaped(std::string &result, std::string_view fmt)
+{
+	result.reserve(result.size() + fmt.size());
+	for (size_t i = 0; i < fmt.size(); ++i) {
+		char ch = fmt[i];
+		result.push_back(ch);
+		if (ch == '%' && i + 1 < fmt.size() && fmt[i + 1] == '%') {
+			++i;
+		}
+	}
+}
+
+std::string unescape_format_string(std::string_view fmt)
+{
+	std::string result;
+	format_emit_unescaped(result, fmt);
+	return result;
+}
+
+static std::string string_view_stringf(std::string_view spec, ...)
+{
+	std::string fmt(spec);
+	char format_specifier = fmt[fmt.size() - 1];
+	switch (format_specifier) {
+	case 'd':
+	case 'i':
+	case 'o':
+	case 'u':
+	case 'x':
+	case 'X': {
+		// Strip any length modifier off `fmt`
+		std::string long_fmt;
+		for (size_t i = 0; i + 1 < fmt.size(); ++i) {
+			char ch = fmt[i];
+			if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) {
+				break;
+			}
+			long_fmt.push_back(ch);
+		}
+		// Add `lld` or whatever
+		long_fmt += "ll";
+		long_fmt.push_back(format_specifier);
+		fmt = long_fmt;
+		break;
+	}
+	default:
+		break;
+	}
+
+	va_list ap;
+	va_start(ap, spec);
+	std::string result = vstringf(fmt.c_str(), ap);
+	va_end(ap);
+	return result;
+}
+
+template <typename Arg>
+static void format_emit_stringf(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, Arg arg)
+{
+	// Delegate nontrivial formats to the C library.
+	switch (num_dynamic_ints) {
+	case DynamicIntCount::NONE:
+		result += string_view_stringf(spec, arg);
+		return;
+	case DynamicIntCount::ONE:
+		result += string_view_stringf(spec, dynamic_ints[0], arg);
+		return;
+	case DynamicIntCount::TWO:
+		result += string_view_stringf(spec, dynamic_ints[0], dynamic_ints[1], arg);
+		return;
+	}
+	YOSYS_ABORT("Internal error");
+}
+
+void format_emit_long_long(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, long long arg)
+{
+	if (spec == "%d") {
+		// Format checking will have guaranteed num_dynamic_ints == 0.
+		result += std::to_string(arg);
+		return;
+	}
+	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg);
+}
+
+void format_emit_unsigned_long_long(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, unsigned long long arg)
+{
+	if (spec == "%u") {
+		// Format checking will have guaranteed num_dynamic_ints == 0.
+		result += std::to_string(arg);
+		return;
+	}
+	if (spec == "%c") {
+		result += static_cast<char>(arg);
+		return;
+	}
+	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg);
+}
+
+void format_emit_double(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, double arg)
+{
+	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg);
+}
+
+void format_emit_char_ptr(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, const char *arg)
+{
+	if (spec == "%s") {
+		// Format checking will have guaranteed num_dynamic_ints == 0.
+		result += arg;
+		return;
+	}
+	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg);
+}
+
+void format_emit_string(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, const std::string &arg)
+{
+	if (spec == "%s") {
+		// Format checking will have guaranteed num_dynamic_ints == 0.
+		result += arg;
+		return;
+	}
+	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg.c_str());
+}
+
+void format_emit_string_view(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, std::string_view arg)
+{
+	if (spec == "%s") {
+		// Format checking will have guaranteed num_dynamic_ints == 0.
+		// We can output the string without creating a temporary copy.
+		result += arg;
+		return;
+	}
+	// Delegate nontrivial formats to the C library. We need to construct
+	// a temporary string to ensure null termination.
+	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, std::string(arg).c_str());
+}
+
+void format_emit_void_ptr(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, const void *arg)
+{
+	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg);
+}
+
 YOSYS_NAMESPACE_END
diff --git a/kernel/io.h b/kernel/io.h
index 91699d775..ea2499e43 100644
--- a/kernel/io.h
+++ b/kernel/io.h
@@ -1,5 +1,6 @@
 #include <string>
 #include <stdarg.h>
+#include <type_traits>
 #include "kernel/yosys_common.h"
 
 #ifndef YOSYS_IO_H
@@ -50,18 +51,391 @@ inline std::string vstringf(const char *fmt, va_list ap)
 #endif
 }
 
-std::string stringf(const char *fmt, ...) YS_ATTRIBUTE(format(printf, 1, 2));
-
-inline std::string stringf(const char *fmt, ...)
+enum ConversionSpecifier : uint8_t
 {
-	std::string string;
-	va_list ap;
+	CONVSPEC_NONE,
+	// Specifier not understood/supported
+	CONVSPEC_ERROR,
+	// Consumes a "long long"
+	CONVSPEC_SIGNED_INT,
+	// Consumes a "unsigned long long"
+	CONVSPEC_UNSIGNED_INT,
+	// Consumes a "double"
+	CONVSPEC_DOUBLE,
+	// Consumes a "const char*"
+	CONVSPEC_CHAR_PTR,
+	// Consumes a "void*"
+	CONVSPEC_VOID_PTR,
+};
 
-	va_start(ap, fmt);
-	string = vstringf(fmt, ap);
-	va_end(ap);
+constexpr ConversionSpecifier parse_conversion_specifier(char ch, char prev_ch)
+{
+	switch (ch) {
+	case 'd':
+	case 'i':
+		return CONVSPEC_SIGNED_INT;
+	case 'o':
+	case 'u':
+	case 'x':
+	case 'X':
+	case 'm':
+		return CONVSPEC_UNSIGNED_INT;
+	case 'c':
+		if (prev_ch == 'l' || prev_ch == 'q' || prev_ch == 'L') {
+			// wchar not supported
+			return CONVSPEC_ERROR;
+		}
+		return CONVSPEC_UNSIGNED_INT;
+	case 'e':
+	case 'E':
+	case 'f':
+	case 'F':
+	case 'g':
+	case 'G':
+	case 'a':
+	case 'A':
+		return CONVSPEC_DOUBLE;
+	case 's':
+		if (prev_ch == 'l' || prev_ch == 'q' || prev_ch == 'L') {
+			// wchar not supported
+			return CONVSPEC_ERROR;
+		}
+		return CONVSPEC_CHAR_PTR;
+	case 'p':
+		return CONVSPEC_VOID_PTR;
+	case '$': // positional parameters
+	case 'n':
+	case 'S':
+		return CONVSPEC_ERROR;
+	default:
+		return CONVSPEC_NONE;
+	}
+}
 
-	return string;
+enum class DynamicIntCount : uint8_t {
+	NONE = 0,
+	ONE = 1,
+	TWO = 2,
+};
+
+// Describes a printf-style format conversion specifier found in a format string.
+struct FoundFormatSpec
+{
+	// The start offset of the conversion spec in the format string.
+	int start;
+	// The end offset of the conversion spec in the format string.
+	int end;
+	ConversionSpecifier spec;
+	// Number of int args consumed by '*' dynamic width/precision args.
+	DynamicIntCount num_dynamic_ints;
+};
+
+// Ensure there is no format spec.
+constexpr void ensure_no_format_spec(std::string_view fmt, int index, bool *has_escapes)
+{
+	int fmt_size = static_cast<int>(fmt.size());
+	// A trailing '%' is not a format spec.
+	while (index + 1 < fmt_size) {
+		if (fmt[index] != '%') {
+			++index;
+			continue;
+		}
+		if (fmt[index + 1] != '%') {
+			YOSYS_ABORT("More format conversion specifiers than arguments");
+		}
+		*has_escapes = true;
+		index += 2;
+	}
+}
+
+// Returns the next format conversion specifier (starting with '%').
+// Returns CONVSPEC_NONE if there isn't a format conversion specifier.
+constexpr FoundFormatSpec find_next_format_spec(std::string_view fmt, int fmt_start, bool *has_escapes)
+{
+	int index = fmt_start;
+	int fmt_size = static_cast<int>(fmt.size());
+	while (index < fmt_size) {
+		if (fmt[index] != '%') {
+			++index;
+			continue;
+		}
+		int p = index + 1;
+		uint8_t num_dynamic_ints = 0;
+		while (true) {
+			if (p == fmt_size) {
+				return {0, 0, CONVSPEC_NONE, DynamicIntCount::NONE};
+			}
+			if (fmt[p] == '%') {
+				*has_escapes = true;
+				index = p + 1;
+				break;
+			}
+			if (fmt[p] == '*') {
+				if (num_dynamic_ints >= 2) {
+					return {0, 0, CONVSPEC_ERROR, DynamicIntCount::NONE};
+				}
+				++num_dynamic_ints;
+			}
+			ConversionSpecifier spec = parse_conversion_specifier(fmt[p], fmt[p - 1]);
+			if (spec != CONVSPEC_NONE) {
+				return {index, p + 1, spec, static_cast<DynamicIntCount>(num_dynamic_ints)};
+			}
+			++p;
+		}
+	}
+	return {0, 0, CONVSPEC_NONE, DynamicIntCount::NONE};
+}
+
+template <typename... Args>
+constexpr typename std::enable_if<sizeof...(Args) == 0>::type
+check_format(std::string_view fmt, int fmt_start, bool *has_escapes, FoundFormatSpec*, DynamicIntCount)
+{
+	ensure_no_format_spec(fmt, fmt_start, has_escapes);
+}
+
+// Check that the format string `fmt.substr(fmt_start)` is valid for the given type arguments.
+// Fills `specs` with the FoundFormatSpecs found in the format string.
+// `int_args_consumed` is the number of int arguments already consumed to satisfy the
+// dynamic width/precision args for the next format conversion specifier.
+template <typename Arg, typename... Args>
+constexpr void check_format(std::string_view fmt, int fmt_start, bool *has_escapes, FoundFormatSpec* specs,
+        DynamicIntCount int_args_consumed)
+{
+	FoundFormatSpec found = find_next_format_spec(fmt, fmt_start, has_escapes);
+	if (found.num_dynamic_ints > int_args_consumed) {
+		// We need to consume at least one more int for the dynamic
+		// width/precision of this format conversion specifier.
+		if constexpr (!std::is_convertible_v<Arg, int>) {
+			YOSYS_ABORT("Expected dynamic int argument");
+		}
+		check_format<Args...>(fmt, fmt_start, has_escapes, specs,
+			static_cast<DynamicIntCount>(static_cast<uint8_t>(int_args_consumed) + 1));
+		return;
+	}
+	switch (found.spec) {
+	case CONVSPEC_NONE:
+		YOSYS_ABORT("Expected format conversion specifier for argument");
+		break;
+	case CONVSPEC_ERROR:
+		YOSYS_ABORT("Found unsupported format conversion specifier");
+		break;
+	case CONVSPEC_SIGNED_INT:
+		if constexpr (!std::is_convertible_v<Arg, long long>) {
+			YOSYS_ABORT("Expected type convertible to signed integer");
+		}
+		*specs = found;
+		break;
+	case CONVSPEC_UNSIGNED_INT:
+		if constexpr (!std::is_convertible_v<Arg, unsigned long long>) {
+			YOSYS_ABORT("Expected type convertible to unsigned integer");
+		}
+		*specs = found;
+		break;
+	case CONVSPEC_DOUBLE:
+		if constexpr (!std::is_convertible_v<Arg, double>) {
+			YOSYS_ABORT("Expected type convertible to double");
+		}
+		*specs = found;
+		break;
+	case CONVSPEC_CHAR_PTR:
+		if constexpr (!std::is_convertible_v<Arg, const char *> &&
+		        !std::is_convertible_v<Arg, const std::string &> &&
+			!std::is_convertible_v<Arg, const std::string_view &>) {
+			YOSYS_ABORT("Expected type convertible to char *");
+		}
+		*specs = found;
+		break;
+	case CONVSPEC_VOID_PTR:
+		if constexpr (!std::is_convertible_v<Arg, const void *>) {
+			YOSYS_ABORT("Expected pointer type");
+		}
+		*specs = found;
+		break;
+	}
+	check_format<Args...>(fmt, found.end, has_escapes, specs + 1, DynamicIntCount::NONE);
+}
+
+// Emit the string representation of `arg` that has been converted to a `long long'.
+void format_emit_long_long(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, long long arg);
+
+// Emit the string representation of `arg` that has been converted to a `unsigned long long'.
+void format_emit_unsigned_long_long(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, unsigned long long arg);
+
+// Emit the string representation of `arg` that has been converted to a `double'.
+void format_emit_double(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, double arg);
+
+// Emit the string representation of `arg` that has been converted to a `const char*'.
+void format_emit_char_ptr(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, const char *arg);
+
+// Emit the string representation of `arg` that has been converted to a `std::string'.
+void format_emit_string(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, const std::string &arg);
+
+// Emit the string representation of `arg` that has been converted to a `std::string_view'.
+void format_emit_string_view(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, std::string_view arg);
+
+// Emit the string representation of `arg` that has been converted to a `double'.
+void format_emit_void_ptr(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, const void *arg);
+
+// Emit the string representation of `arg` according to the given `FoundFormatSpec`,
+// appending it to `result`.
+template <typename Arg>
+inline void format_emit_one(std::string &result, std::string_view fmt, const FoundFormatSpec &ffspec,
+	int *dynamic_ints, const Arg& arg)
+{
+	std::string_view spec = fmt.substr(ffspec.start, ffspec.end - ffspec.start);
+	DynamicIntCount num_dynamic_ints = ffspec.num_dynamic_ints;
+	switch (ffspec.spec) {
+	case CONVSPEC_SIGNED_INT:
+		if constexpr (std::is_convertible_v<Arg, long long>) {
+			long long s = arg;
+			format_emit_long_long(result, spec, dynamic_ints, num_dynamic_ints, s);
+			return;
+		}
+		break;
+	case CONVSPEC_UNSIGNED_INT:
+		if constexpr (std::is_convertible_v<Arg, unsigned long long>) {
+			unsigned long long s = arg;
+			format_emit_unsigned_long_long(result, spec, dynamic_ints, num_dynamic_ints, s);
+			return;
+		}
+		break;
+	case CONVSPEC_DOUBLE:
+		if constexpr (std::is_convertible_v<Arg, double>) {
+			double s = arg;
+			format_emit_double(result, spec, dynamic_ints, num_dynamic_ints, s);
+			return;
+		}
+		break;
+	case CONVSPEC_CHAR_PTR:
+		if constexpr (std::is_convertible_v<Arg, const char *>) {
+			const char *s = arg;
+			format_emit_char_ptr(result, spec, dynamic_ints, num_dynamic_ints, s);
+			return;
+		}
+		if constexpr (std::is_convertible_v<Arg, const std::string &>) {
+			const std::string &s = arg;
+			format_emit_string(result, spec, dynamic_ints, num_dynamic_ints, s);
+			return;
+		}
+		if constexpr (std::is_convertible_v<Arg, const std::string_view &>) {
+			const std::string_view &s = arg;
+			format_emit_string_view(result, spec, dynamic_ints, num_dynamic_ints, s);
+			return;
+		}
+		break;
+	case CONVSPEC_VOID_PTR:
+		if constexpr (std::is_convertible_v<Arg, const void *>) {
+			const void *s = arg;
+			format_emit_void_ptr(result, spec, dynamic_ints, num_dynamic_ints, s);
+			return;
+		}
+		break;
+	default:
+		break;
+	}
+	YOSYS_ABORT("Internal error");
+}
+
+// Append the format string `fmt` to `result`, assuming there are no format conversion
+// specifiers other than "%%" and therefore no arguments. Unescape "%%".
+void format_emit_unescaped(std::string &result, std::string_view fmt);
+std::string unescape_format_string(std::string_view fmt);
+
+inline void format_emit(std::string &result, std::string_view fmt, int fmt_start,
+	bool has_escapes, const FoundFormatSpec*, int*, DynamicIntCount)
+{
+	fmt = fmt.substr(fmt_start);
+	if (has_escapes) {
+		format_emit_unescaped(result, fmt);
+	} else {
+		result += fmt;
+	}
+}
+// Format `args` according to `fmt` (starting at `fmt_start`) and `specs` and append to `result`.
+// `num_dynamic_ints` in `dynamic_ints[]` have already been collected to provide as
+// dynamic width/precision args for the next format conversion specifier.
+template <typename Arg, typename... Args>
+inline void format_emit(std::string &result, std::string_view fmt, int fmt_start, bool has_escapes,
+	const FoundFormatSpec* specs, int *dynamic_ints, DynamicIntCount num_dynamic_ints,
+	const Arg &arg, const Args &... args)
+{
+	if (specs->num_dynamic_ints > num_dynamic_ints) {
+		// Collect another int for the dynamic width precision/args
+		// for the next format conversion specifier.
+		if constexpr (std::is_convertible_v<Arg, int>) {
+			dynamic_ints[static_cast<uint8_t>(num_dynamic_ints)] = arg;
+		} else {
+			YOSYS_ABORT("Internal error");
+		}
+		format_emit(result, fmt, fmt_start, has_escapes, specs, dynamic_ints,
+		            static_cast<DynamicIntCount>(static_cast<uint8_t>(num_dynamic_ints) + 1), args...);
+		return;
+	}
+	std::string_view str = fmt.substr(fmt_start, specs->start - fmt_start);
+	if (has_escapes) {
+		format_emit_unescaped(result, str);
+	} else {
+		result += str;
+	}
+	format_emit_one(result, fmt, *specs, dynamic_ints, arg);
+	format_emit(result, fmt, specs->end, has_escapes, specs + 1, dynamic_ints, DynamicIntCount::NONE, args...);
+}
+
+template <typename... Args>
+inline std::string format_emit_toplevel(std::string_view fmt, bool has_escapes, const FoundFormatSpec* specs, const Args &... args)
+{
+	std::string result;
+	int dynamic_ints[2] = { 0, 0 };
+	format_emit(result, fmt, 0, has_escapes, specs, dynamic_ints, DynamicIntCount::NONE, args...);
+	return result;
+}
+template <>
+inline std::string format_emit_toplevel(std::string_view fmt, bool has_escapes, const FoundFormatSpec*)
+{
+	if (!has_escapes) {
+		return std::string(fmt);
+	}
+	return unescape_format_string(fmt);
+}
+
+// This class parses format strings to build a list of `FoundFormatSpecs` in `specs`.
+// When the compiler supports `consteval` (C++20), this parsing happens at compile time and
+// type errors will be reported at compile time. Otherwise the parsing happens at
+// runtime and type errors will trigger an `abort()` at runtime.
+template <typename... Args>
+class FmtString
+{
+public:
+	// Implicit conversion from const char * means that users can pass
+	// C string constants which are automatically parsed.
+	YOSYS_CONSTEVAL FmtString(const char *p) : fmt(p)
+	{
+		check_format<Args...>(fmt, 0, &has_escapes, specs, DynamicIntCount::NONE);
+	}
+	std::string format(const Args &... args)
+	{
+		return format_emit_toplevel(fmt, has_escapes, specs, args...);
+	}
+private:
+	std::string_view fmt;
+	bool has_escapes = false;
+	FoundFormatSpec specs[sizeof...(Args)] = {};
+};
+
+template <typename T> struct WrapType { using type = T; };
+template <typename T> using TypeIdentity = typename WrapType<T>::type;
+
+template <typename... Args>
+inline std::string stringf(FmtString<TypeIdentity<Args>...> fmt, Args... args)
+{
+	return fmt.format(args...);
 }
 
 int readsome(std::istream &f, char *s, int n);
diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index e84676bc0..ecc8ce623 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -134,6 +134,15 @@
 #  define YS_COLD
 #endif
 
+#ifdef __cpp_consteval
+#define YOSYS_CONSTEVAL consteval
+#else
+// If we can't use consteval we can at least make it constexpr.
+#define YOSYS_CONSTEVAL constexpr
+#endif
+
+#define YOSYS_ABORT(s) abort()
+
 #include "kernel/io.h"
 
 YOSYS_NAMESPACE_BEGIN

From 2c8b4d7ad13e4817a36b3c20f20a47b658dd5b9e Mon Sep 17 00:00:00 2001
From: Drew Lewis <cannada@google.com>
Date: Tue, 22 Jul 2025 19:49:10 +0000
Subject: [PATCH 220/931] Use unordered_map instead of dict for IdString char*
 to index storage.

dict is pretty slow when you don't ever need to iterate the container in
order.  And the hashfunction for char* in dict hashes for every single
byte in the string, likely doing significantly more work than std::hash.
---
 kernel/rtlil.cc | 2 +-
 kernel/rtlil.h  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 8a0080dbf..d24ab4d1e 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -35,7 +35,7 @@ YOSYS_NAMESPACE_BEGIN
 bool RTLIL::IdString::destruct_guard_ok = false;
 RTLIL::IdString::destruct_guard_t RTLIL::IdString::destruct_guard;
 std::vector<char*> RTLIL::IdString::global_id_storage_;
-dict<char*, int> RTLIL::IdString::global_id_index_;
+std::unordered_map<std::string_view, int> RTLIL::IdString::global_id_index_;
 #ifndef YOSYS_NO_IDS_REFCNT
 std::vector<int> RTLIL::IdString::global_refcount_storage_;
 std::vector<int> RTLIL::IdString::global_free_idx_list_;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 504fa0062..745b8fcaf 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -23,6 +23,9 @@
 #include "kernel/yosys_common.h"
 #include "kernel/yosys.h"
 
+#include <string_view>
+#include <unordered_map>
+
 YOSYS_NAMESPACE_BEGIN
 
 namespace RTLIL
@@ -122,7 +125,7 @@ struct RTLIL::IdString
 	} destruct_guard;
 
 	static std::vector<char*> global_id_storage_;
-	static dict<char*, int> global_id_index_;
+	static std::unordered_map<std::string_view, int> global_id_index_;
 #ifndef YOSYS_NO_IDS_REFCNT
 	static std::vector<int> global_refcount_storage_;
 	static std::vector<int> global_free_idx_list_;

From d9b3a3f7bb6f054181d587298b9ca3f19fa816b1 Mon Sep 17 00:00:00 2001
From: Drew Lewis <cannada@google.com>
Date: Tue, 22 Jul 2025 15:38:02 +0000
Subject: [PATCH 221/931] Improve the performance of `concat_name` in the
 flattening pass

- Make IdString parameter pass by const ref to avoid IdString ref counting in the constructor
- Remove extra std::string allocation to remove prefix
- Avoid using `stringf` for concatenation
---
 passes/techmap/flatten.cc | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/passes/techmap/flatten.cc b/passes/techmap/flatten.cc
index 6363b3432..299b18006 100644
--- a/passes/techmap/flatten.cc
+++ b/passes/techmap/flatten.cc
@@ -24,20 +24,36 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <string_view>
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
-IdString concat_name(RTLIL::Cell *cell, IdString object_name, const std::string &separator = ".")
+template <typename... Args>
+[[nodiscard]] std::string concat_views(const Args&... views) {
+    static_assert((std::is_convertible_v<Args, std::string_view> && ...),
+                  "All arguments must be convertible to std::string_view.");
+    const std::size_t total_size = (std::string_view(views).size() + ... + 0);
+
+    std::string result;
+    result.reserve(total_size);
+
+    (result.append(views), ...);
+    return result;
+}
+
+IdString concat_name(RTLIL::Cell *cell, IdString const &object_name, const std::string &separator = ".")
 {
-	if (object_name[0] == '\\')
-		return stringf("%s%s%s", cell->name.c_str(), separator.c_str(), object_name.c_str() + 1);
-	else {
-		std::string object_name_str = object_name.str();
-		if (object_name_str.substr(0, 8) == "$flatten")
-			object_name_str.erase(0, 8);
-		return stringf("$flatten%s%s%s", cell->name.c_str(), separator.c_str(), object_name_str.c_str());
+	std::string_view object_name_view(object_name.c_str());
+	if (object_name_view[0] == '\\'){
+		return concat_views(cell->name.c_str(), separator, object_name_view.substr(1));
 	}
+
+	constexpr std::string_view prefix = "$flatten";
+	if (object_name_view.substr(0, prefix.size()) == prefix){
+		object_name_view.remove_prefix(prefix.size());
+	}
+	return concat_views(prefix, cell->name.c_str(), separator, object_name_view);
 }
 
 template<class T>

From 5392a42a9772c049a21efc0751bf3a65fd8841f3 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 29 Jul 2025 16:11:13 +0200
Subject: [PATCH 222/931] Update ABC to latest

---
 abc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abc b/abc
index e55d316cc..fcd8ac34d 160000
--- a/abc
+++ b/abc
@@ -1 +1 @@
-Subproject commit e55d316cc9a7f72a84a76eda555aa6ec083c9d0d
+Subproject commit fcd8ac34d6105b48f32dfaf31983b071c46fb7b9

From b64484795d0f0c304494e28c0b3b40344cb9f21d Mon Sep 17 00:00:00 2001
From: Fred Tombs <fred@zeroasic.com>
Date: Tue, 29 Jul 2025 15:27:59 -0400
Subject: [PATCH 223/931] Fix typos in memlib

---
 passes/memory/memlib.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/passes/memory/memlib.md b/passes/memory/memlib.md
index 855aa1345..f3c0dd937 100644
--- a/passes/memory/memlib.md
+++ b/passes/memory/memlib.md
@@ -148,7 +148,7 @@ The rules for this property are as follows:
 
 - for every available width, the width needs to be a multiple of the byte size,
   or the byte size needs to be larger than the width
-- if the byte size is larger than the width, the byte enable signel is assumed
+- if the byte size is larger than the width, the byte enable signal is assumed
   to be one bit wide and cover the whole port
 - otherwise, the byte enable signal has one bit for every `byte` bits of the
   data port
@@ -176,7 +176,7 @@ Eg. for the following properties:
 The cost of a given cell will be assumed to be `(8 - 7) + 7 * (used_bits / 14)`.
 
 If `widthscale` is used, The pass will attach a `BITS_USED` parameter to mapped
-calls, with a bitmask of which data bits of the memory are actually in use.
+cells, with a bitmask of which data bits of the memory are actually in use.
 The parameter width will be the widest width in the `widths` property, and
 the bit correspondence is defined accordingly.
 
@@ -193,7 +193,7 @@ one of the following values:
 - `zero`: the memory contents are zero, memories can be mapped to this cell iff
   their initialization value is entirely zero or undef
 - `any`: the memory contents can be arbitrarily selected, and the initialization
-  will be passes as the `INIT` parameter to the mapped cell
+  will be passed as the `INIT` parameter to the mapped cell
 - `no_undef`: like `any`, but only 0 and 1 bit values are supported (the pass will
   convert any x bits to 0)
 
@@ -234,7 +234,7 @@ Ports come in 5 kinds:
 - `ar`: asynchronous read port
 - `sr`: synchronous read port
 - `sw`: synchronous write port
-- `arsw`: simultanous synchronous write + asynchronous read with common address (commonly found in LUT RAMs)
+- `arsw`: simultaneous synchronous write + asynchronous read with common address (commonly found in LUT RAMs)
 - `srsw`: synchronous write + synchronous read with common address
 
 The port properties available are:
@@ -419,7 +419,7 @@ If not provided, `none` is assumed for all three properties.
 
 The `wrprio` property is only allowed on write ports and defines a priority relationship
 between port — when `wrprio "B";` is used in definition of port `"A"`, and both ports
-simultanously write to the same memory cell, the value written by port `"A"` will have
+simultaneously write to the same memory cell, the value written by port `"A"` will have
 precedence.
 
 This property is optional, and can be used multiple times as necessary.  If no relationship
@@ -493,7 +493,7 @@ will disallow combining the RAM option `ABC = 2` with port option `DEF = "GHI"`.
 
 ## Ifdefs
 
-To allow reusing a library for multiple FPGA families with slighly differing
+To allow reusing a library for multiple FPGA families with slightly differing
 capabilities, `ifdef` (and `ifndef`) blocks are provided:
 
     ifdef IS_FANCY_FPGA_WITH_CONFIGURABLE_ASYNC_RESET {

From 6440499e572d4d75ca5f857023c77b27ee1a69f8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 30 Jul 2025 00:26:56 +0000
Subject: [PATCH 224/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index bcb855940..2dcc7ed72 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+115
+YOSYS_VER := 0.55+144
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From f92a53ec31edb44e985546dcb4c8d6d8c275959c Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 30 Jul 2025 10:51:54 +0200
Subject: [PATCH 225/931] verific: handle nullptr for message_id

---
 frontends/verific/verific.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index cf8fad8b0..7284c7cd9 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -123,7 +123,7 @@ void msg_func(msg_type_t msg_type, const char *message_id, linefile_type linefil
 			msg_type == VERIFIC_IGNORE ? "IGNORE" :
 			msg_type == VERIFIC_INFO ? "INFO" :
 			msg_type == VERIFIC_COMMENT ? "COMMENT" :
-			msg_type == VERIFIC_PROGRAM_ERROR ? "PROGRAM_ERROR" : "UNKNOWN", message_id);
+			msg_type == VERIFIC_PROGRAM_ERROR ? "PROGRAM_ERROR" : "UNKNOWN", message_id ? message_id : "");
 
 	string message = linefile ? stringf("%s:%d: ", LineFile::GetFileName(linefile), LineFile::GetLineNo(linefile)) : "";
 	message += vstringf(msg, args);

From 206d2a455374c1ff25402a6efdcf7e4b47d6d093 Mon Sep 17 00:00:00 2001
From: Anhijkt <mihail.ershov.zp@gmail.com>
Date: Wed, 30 Jul 2025 21:31:34 +0300
Subject: [PATCH 226/931] opt_dff: refactor simplify_patterns

---
 passes/opt/opt_dff.cc | 53 ++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/passes/opt/opt_dff.cc b/passes/opt/opt_dff.cc
index def177133..036c1b917 100644
--- a/passes/opt/opt_dff.cc
+++ b/passes/opt/opt_dff.cc
@@ -172,60 +172,57 @@ struct OptDffWorker
 
 	void simplify_patterns(patterns_t& patterns)
 	{
-		// remove complimentary patterns
-
 		auto new_patterns = patterns;
+		auto find_comp = [](const auto& left, const auto& right) -> std::optional<RTLIL::SigBit> {
+			std::optional<RTLIL::SigBit> ret;
+			for (const auto &pt: left)
+				if (right.count(pt.first) == 0)
+					return {};
+				else if (right.at(pt.first) == pt.second)
+					continue;
+				else
+					if (ret)
+						return {};
+					else
+						ret = pt.first;
+			return ret;
+		};
+
+		// remove complimentary patterns
 		bool optimized;
 		do {
 			optimized = false;
 			for (auto i = patterns.begin(); i != patterns.end(); i++) {
 				for (auto j = std::next(i, 1); j != patterns.end(); j++) {
-					const auto& smaller = (GetSize(*j) <= GetSize(*i)) ? *j : *i;
-					const auto& larger = (GetSize(*i) < GetSize(*j)) ? *j : *i;
-					auto left = std::move(smaller);
-					auto right = std::move(larger);
+					const auto& left = (GetSize(*j) <= GetSize(*i)) ? *j : *i;
+					auto right = (GetSize(*i) < GetSize(*j)) ? *j : *i;
 
-					std::optional<RTLIL::SigBit> complimentary_var;
+					const auto complimentary_var = find_comp(left, right);
 
-					for (const auto &pt : left)
-						if (right.count(pt.first) == 0)
-								goto next;
-						else if (right[pt.first] == pt.second)
-								continue;
-						else
-							if (complimentary_var)
-								goto next;
-							else
-								complimentary_var = pt.first;
 					if (complimentary_var) {
 						new_patterns.erase(right);
 						right.erase(complimentary_var.value());
 						new_patterns.insert(right);
 						optimized = true;
 					}
-					next:
-					continue;
 				}
 			}
 			patterns = new_patterns;
 		} while(optimized);
 
 		// remove redundant patterns
-
 		for (auto i = patterns.begin(); i != patterns.end(); ++i) {
-			for (auto j = std::next(i, 1); j != patterns.end(); ++j) { 
-				const auto& smaller = (GetSize(*j) <= GetSize(*i)) ? *j : *i;
-				const auto& larger = (GetSize(*i) < GetSize(*j)) ? *j : *i;
-				auto left = std::move(smaller);
-				auto right = std::move(larger);
+			for (auto j = std::next(i, 1); j != patterns.end(); ++j) {
+				const auto& left = (GetSize(*j) <= GetSize(*i)) ? *j : *i;
+				const auto& right = (GetSize(*i) < GetSize(*j)) ? *j : *i;
 
 		            	bool redundant = true;
 
-				for (const auto& pt : left)
-					if (right.count(pt.first) == 0 || right[pt.first] != pt.second)
+				for (const auto& pt : smaller)
+					if (larger.count(pt.first) == 0 || larger[pt.first] != pt.second)
 						redundant = false;
 				if (redundant)
-					new_patterns.erase(right);
+					new_patterns.erase(larger);
 			}
 		}
 		patterns = std::move(new_patterns);

From bfff7a47f17033e2d61c75a779d0078bc0f8cfcf Mon Sep 17 00:00:00 2001
From: Anhijkt <mihail.ershov.zp@gmail.com>
Date: Wed, 30 Jul 2025 21:34:42 +0300
Subject: [PATCH 227/931] typo

---
 passes/opt/opt_dff.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/opt/opt_dff.cc b/passes/opt/opt_dff.cc
index 036c1b917..2a9d67dd6 100644
--- a/passes/opt/opt_dff.cc
+++ b/passes/opt/opt_dff.cc
@@ -222,7 +222,7 @@ struct OptDffWorker
 					if (larger.count(pt.first) == 0 || larger[pt.first] != pt.second)
 						redundant = false;
 				if (redundant)
-					new_patterns.erase(larger);
+					new_patterns.erase(right);
 			}
 		}
 		patterns = std::move(new_patterns);

From 85e0e8ca670333898e9cbbbd4f1bf94dc421ae9c Mon Sep 17 00:00:00 2001
From: Anhijkt <mihail.ershov.zp@gmail.com>
Date: Wed, 30 Jul 2025 21:40:20 +0300
Subject: [PATCH 228/931] typo

---
 passes/opt/opt_dff.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/passes/opt/opt_dff.cc b/passes/opt/opt_dff.cc
index 2a9d67dd6..210c4828f 100644
--- a/passes/opt/opt_dff.cc
+++ b/passes/opt/opt_dff.cc
@@ -218,8 +218,8 @@ struct OptDffWorker
 
 		            	bool redundant = true;
 
-				for (const auto& pt : smaller)
-					if (larger.count(pt.first) == 0 || larger[pt.first] != pt.second)
+				for (const auto& pt : left)
+					if (right.count(pt.first) == 0 || right.at(pt.first) != pt.second)
 						redundant = false;
 				if (redundant)
 					new_patterns.erase(right);

From 262b00d5e5fe6a1c60c047dcbabd522309e4d1ef Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 31 Jul 2025 00:26:33 +0000
Subject: [PATCH 229/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2dcc7ed72..d509b9234 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+144
+YOSYS_VER := 0.55+146
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From feabfd5703e2cba0ff29588e31b7902127d8d173 Mon Sep 17 00:00:00 2001
From: Matt Young <matt@mlyoung.cool>
Date: Thu, 31 Jul 2025 16:39:27 +1000
Subject: [PATCH 230/931] docs: mention Yosys Discourse group and blog

---
 README.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 71d47d76c..6c576f682 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,9 @@ Web Site and Other Resources
 More information and documentation can be found on the Yosys web site:
 - https://yosyshq.net/yosys/
 
+If you have any Yosys-related questions, please post them on the Discourse group:
+- https://yosyshq.discourse.group
+
 Documentation from this repository is automatically built and available on Read
 the Docs:
 - https://yosyshq.readthedocs.io/projects/yosys
@@ -34,6 +37,9 @@ verification front-end for Yosys, SBY:
 - https://yosyshq.readthedocs.io/projects/sby/
 - https://github.com/YosysHQ/sby
 
+The Yosys blog has news and articles from users:
+- https://blog.yosyshq.com
+
 
 Installation
 ============
@@ -242,7 +248,7 @@ Note that there is no need to build the manual if you just want to read it.
 Simply visit https://yosys.readthedocs.io/en/latest/ instead.
 
 In addition to those packages listed above for building Yosys from source, the
-following are used for building the website: 
+following are used for building the website:
 
 	$ sudo apt install pdf2svg faketime
 
@@ -258,7 +264,7 @@ build process for the website.  Or, run the following:
 Or for MacOS, using homebrew:
 
   $ brew install basictex
-  $ sudo tlmgr update --self   
+  $ sudo tlmgr update --self
   $ sudo tlmgr install collection-latexextra latexmk tex-gyre
 
 The Python package, Sphinx, is needed along with those listed in
@@ -268,5 +274,5 @@ The Python package, Sphinx, is needed along with those listed in
 
 From the root of the repository, run `make docs`.  This will build/rebuild yosys
 as necessary before generating the website documentation from the yosys help
-commands.  To build for pdf instead of html, call 
+commands.  To build for pdf instead of html, call
 `make docs DOC_TARGET=latexpdf`.

From ffd52a0d8e43aba34d8d87def77b073c9fd90a07 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 31 Jul 2025 10:19:44 +0000
Subject: [PATCH 231/931] Making `stringf()` use the format conversion specs
 as-is without widening them.

And make sure our fast-path for `%d` and `%u` narrows to `int` correctly.

Resolves #5260
---
 kernel/io.cc                | 34 ++----------------
 kernel/io.h                 |  2 +-
 tests/unit/kernel/ioTest.cc | 72 +++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 32 deletions(-)
 create mode 100644 tests/unit/kernel/ioTest.cc

diff --git a/kernel/io.cc b/kernel/io.cc
index 3deb54d86..9811919ba 100644
--- a/kernel/io.cc
+++ b/kernel/io.cc
@@ -405,37 +405,9 @@ std::string unescape_format_string(std::string_view fmt)
 
 static std::string string_view_stringf(std::string_view spec, ...)
 {
-	std::string fmt(spec);
-	char format_specifier = fmt[fmt.size() - 1];
-	switch (format_specifier) {
-	case 'd':
-	case 'i':
-	case 'o':
-	case 'u':
-	case 'x':
-	case 'X': {
-		// Strip any length modifier off `fmt`
-		std::string long_fmt;
-		for (size_t i = 0; i + 1 < fmt.size(); ++i) {
-			char ch = fmt[i];
-			if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')) {
-				break;
-			}
-			long_fmt.push_back(ch);
-		}
-		// Add `lld` or whatever
-		long_fmt += "ll";
-		long_fmt.push_back(format_specifier);
-		fmt = long_fmt;
-		break;
-	}
-	default:
-		break;
-	}
-
 	va_list ap;
 	va_start(ap, spec);
-	std::string result = vstringf(fmt.c_str(), ap);
+	std::string result = vstringf(std::string(spec).c_str(), ap);
 	va_end(ap);
 	return result;
 }
@@ -464,7 +436,7 @@ void format_emit_long_long(std::string &result, std::string_view spec, int *dyna
 {
 	if (spec == "%d") {
 		// Format checking will have guaranteed num_dynamic_ints == 0.
-		result += std::to_string(arg);
+		result += std::to_string(static_cast<int>(arg));
 		return;
 	}
 	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg);
@@ -475,7 +447,7 @@ void format_emit_unsigned_long_long(std::string &result, std::string_view spec,
 {
 	if (spec == "%u") {
 		// Format checking will have guaranteed num_dynamic_ints == 0.
-		result += std::to_string(arg);
+		result += std::to_string(static_cast<unsigned int>(arg));
 		return;
 	}
 	if (spec == "%c") {
diff --git a/kernel/io.h b/kernel/io.h
index ea2499e43..dafef8bfa 100644
--- a/kernel/io.h
+++ b/kernel/io.h
@@ -62,7 +62,7 @@ enum ConversionSpecifier : uint8_t
 	CONVSPEC_UNSIGNED_INT,
 	// Consumes a "double"
 	CONVSPEC_DOUBLE,
-	// Consumes a "const char*"
+	// Consumes a "const char*" or other string type
 	CONVSPEC_CHAR_PTR,
 	// Consumes a "void*"
 	CONVSPEC_VOID_PTR,
diff --git a/tests/unit/kernel/ioTest.cc b/tests/unit/kernel/ioTest.cc
new file mode 100644
index 000000000..7cb8498cb
--- /dev/null
+++ b/tests/unit/kernel/ioTest.cc
@@ -0,0 +1,72 @@
+#include <gtest/gtest.h>
+
+#include "kernel/io.h"
+
+YOSYS_NAMESPACE_BEGIN
+
+TEST(KernelStringfTest, integerTruncation)
+{
+	EXPECT_EQ(stringf("%d", 1LL << 32), "0");
+	EXPECT_EQ(stringf("%u", 1LL << 32), "0");
+	EXPECT_EQ(stringf("%x", 0xff12345678LL), "12345678");
+	EXPECT_EQ(stringf("%hu", 0xff12345678LL), "22136");
+}
+
+TEST(KernelStringfTest, charFormat)
+{
+        EXPECT_EQ(stringf("%c", 256), std::string_view("\0", 1));
+        EXPECT_EQ(stringf("%c", -1), "\377");
+}
+
+TEST(KernelStringfTest, floatFormat)
+{
+	EXPECT_EQ(stringf("%g", 1.0), "1");
+}
+
+TEST(KernelStringfTest, intToFloat)
+{
+        EXPECT_EQ(stringf("%g", 1), "1");
+}
+
+TEST(KernelStringfTest, floatToInt)
+{
+        EXPECT_EQ(stringf("%d", 1.0), "1");
+        EXPECT_EQ(stringf("%d", -1.6), "-1");
+}
+
+TEST(KernelStringfTest, stringParam)
+{
+        EXPECT_EQ(stringf("%s", std::string("hello")), "hello");
+}
+
+TEST(KernelStringfTest, stringViewParam)
+{
+        EXPECT_EQ(stringf("%s", std::string_view("hello")), "hello");
+}
+
+TEST(KernelStringfTest, escapePercent)
+{
+	EXPECT_EQ(stringf("%%"), "%");
+}
+
+TEST(KernelStringfTest, trailingPercent)
+{
+	EXPECT_EQ(stringf("%"), "%");
+}
+
+TEST(KernelStringfTest, dynamicWidth)
+{
+        EXPECT_EQ(stringf("%*s", 8, "hello"), "   hello");
+}
+
+TEST(KernelStringfTest, dynamicPrecision)
+{
+        EXPECT_EQ(stringf("%.*f", 4, 1.0), "1.0000");
+}
+
+TEST(KernelStringfTest, dynamicWidthAndPrecision)
+{
+        EXPECT_EQ(stringf("%*.*f", 8, 4, 1.0), "  1.0000");
+}
+
+YOSYS_NAMESPACE_END

From 555c08a98a6805e9752ab4b93439d28b73d1e2e3 Mon Sep 17 00:00:00 2001
From: Matt Young <matt@mlyoung.cool>
Date: Fri, 1 Aug 2025 11:30:42 +1000
Subject: [PATCH 232/931] docs: update issues template with Discourse link

---
 .github/ISSUE_TEMPLATE/config.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index bef410a3c..c758bf1f6 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,8 @@
 contact_links:
-  - name: Discussions
-    url: https://github.com/YosysHQ/yosys/discussions
-    about: "Have a question? Ask it on our discussions page!"
-  - name: Community Slack
-    url: https://join.slack.com/t/yosyshq/shared_invite/zt-1aopkns2q-EiQ97BeQDt_pwvE41sGSuA
-    about: "Yosys Community Slack"
+  - name: Discourse
+    url: https://yosyshq.discourse.group
+    about: "Have a question? Ask it on our Discourse group!"
   - name: IRC Channel
     url: https://web.libera.chat/#yosys
     about: "#yosys on irc.libera.chat"
- 
+

From 895dfd963f6597a5d4bd5fe352c94d71a032aa04 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 2 Aug 2025 14:47:52 +1200
Subject: [PATCH 233/931] raise_error: Add -always

---
 passes/tests/raise_error.cc   | 48 +++++++++++++++++++++++++----------
 tests/bugpoint/raise_error.ys | 11 ++++++++
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/passes/tests/raise_error.cc b/passes/tests/raise_error.cc
index f9055e6d2..588a40806 100644
--- a/passes/tests/raise_error.cc
+++ b/passes/tests/raise_error.cc
@@ -20,12 +20,15 @@ struct RaiseErrorPass : public Pass {
 		log("    -stderr\n");
 		log("        Log error messages directly to stderr instead of using 'log_error'.\n");
 		log("\n");
+		log("    -always\n");
+		log("        Raise an error even if the 'raise_error' attribute is missing.\n");
+		log("\n");
 	}
 	void execute(vector<string> args, RTLIL::Design *design) override
 	{
 		log_header(design, "Executing RAISE_ERROR pass.\n");
 
-		bool use_stderr = false;
+		bool use_stderr = false, always = false;
 
 		int argidx;
 		for (argidx = 1; argidx < GetSize(args); argidx++)
@@ -34,6 +37,10 @@ struct RaiseErrorPass : public Pass {
 				use_stderr = true;
 				continue;
 			}
+			if (args[argidx] == "-always") {
+				always = true;
+				continue;
+			}
 			break;
 		}
 
@@ -55,27 +62,40 @@ struct RaiseErrorPass : public Pass {
 			if (err_obj != nullptr) break;
 		}
 
+
+		if (err_obj == nullptr && !always) {
+			log("'raise_error' attribute not found\n");
+			return;
+		}
+
+		int err_no = 1;
+		string err_msg = "";
 		if (err_obj != nullptr) {
 			log("Raising error from '%s'.\n", log_id(err_obj));
-			auto err_no = err_obj->attributes[ID::raise_error].as_int();
-			if (err_no < 256) {
-				log_flush();
-			} else {
-				auto err_msg = err_obj->get_string_attribute(ID::raise_error);
-				if (use_stderr) {
-					std::cerr << err_msg << std::endl;
-					err_no = 1;
-				} else {
-					log_error("%s\n", err_msg.c_str());
-				}
+			err_no = err_obj->attributes[ID::raise_error].as_int();
+			if (err_no > 256) {
+				err_msg = err_obj->get_string_attribute(ID::raise_error);
+				err_no = 1;
 			}
+		} else {
+			err_msg = "No 'raise_error' attribute found";
+		}
+
+		if (err_msg.size() > 0) {
+			if (use_stderr) {
+				std::cerr << err_msg << std::endl;
+			} else {
+				log_error("%s\n", err_msg.c_str());
+			}
+		}
+
+		if (err_no < 256) {
+			log_flush();
 		#if defined(_MSC_VER)
 			_exit(err_no);
 		#else
 			_Exit(err_no);
 		#endif
-		} else {
-			log("'raise_error' attribute not found\n");
 		}
 	}
 } RaiseErrorPass;
diff --git a/tests/bugpoint/raise_error.ys b/tests/bugpoint/raise_error.ys
index a0a03f447..66db2916a 100644
--- a/tests/bugpoint/raise_error.ys
+++ b/tests/bugpoint/raise_error.ys
@@ -14,6 +14,12 @@ EOF
 select -assert-mod-count 3 =*
 design -stash read
 
+# empty design does not raise_error
+design -reset
+logger -expect log "'raise_error' attribute not found" 1
+raise_error
+logger -check-expected
+
 # raise_error with int exits with status
 design -load read
 bugpoint -suffix error -yosys ../../yosys -command raise_error -expect-return 7
@@ -41,3 +47,8 @@ rename top abc
 bugpoint -suffix error -yosys ../../yosys -command "raise_error -stderr" -err-grep "help me" -expect-return 1
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 other
+
+# empty design can raise_error -always
+design -reset
+bugpoint -suffix error -yosys ../../yosys -command "raise_error -always" -grep "ERROR: No 'raise_error' attribute found" -expect-return 1
+bugpoint -suffix error -yosys ../../yosys -command "raise_error -always -stderr" -err-grep "No 'raise_error' attribute found" -expect-return 1

From f78cd9d13ff50f25beebb056a8558413bfabf459 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 2 Aug 2025 14:54:32 +1200
Subject: [PATCH 234/931] raise_error: Extra test

---
 tests/bugpoint/raise_error.ys | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/bugpoint/raise_error.ys b/tests/bugpoint/raise_error.ys
index 66db2916a..8fb10eb96 100644
--- a/tests/bugpoint/raise_error.ys
+++ b/tests/bugpoint/raise_error.ys
@@ -26,6 +26,12 @@ bugpoint -suffix error -yosys ../../yosys -command raise_error -expect-return 7
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 top
 
+# raise_error -always still uses 'raise_error' attribute if possible
+design -load read
+bugpoint -suffix error -yosys ../../yosys -command "raise_error -always" -expect-return 7
+select -assert-mod-count 1 =*
+select -assert-mod-count 1 top
+
 # raise_error with string prints message and exits with 1
 design -load read
 rename top abc

From 15b4716d1856d03ee0fe1dddbcc24c67f6d32729 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 3 Aug 2025 00:29:54 +0000
Subject: [PATCH 235/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d509b9234..c828aa2d5 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+146
+YOSYS_VER := 0.55+150
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From b776283d79555ca7fdc3fa33b507a051ff2a085e Mon Sep 17 00:00:00 2001
From: Rahul Bhagwat <rahulmbme@gmail.com>
Date: Sun, 3 Aug 2025 23:31:54 -0400
Subject: [PATCH 236/931] implement package import

---
 frontends/ast/ast.cc               |  1 +
 frontends/ast/ast.h                |  1 +
 frontends/ast/genrtlil.cc          |  1 +
 frontends/ast/simplify.cc          | 36 ++++++++++++++++++++++++++++++
 frontends/verilog/verilog_lexer.l  |  1 +
 frontends/verilog/verilog_parser.y | 11 +++++++++
 6 files changed, 51 insertions(+)

diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 431f7b4f8..04f749845 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -174,6 +174,7 @@ std::string AST::type2str(AstNodeType type)
 	X(AST_MODPORT)
 	X(AST_MODPORTMEMBER)
 	X(AST_PACKAGE)
+	X(AST_IMPORT)
 	X(AST_WIRETYPE)
 	X(AST_TYPEDEF)
 	X(AST_STRUCT)
diff --git a/frontends/ast/ast.h b/frontends/ast/ast.h
index 2c2d408ce..776b5c833 100644
--- a/frontends/ast/ast.h
+++ b/frontends/ast/ast.h
@@ -153,6 +153,7 @@ namespace AST
 		AST_MODPORT,
 		AST_MODPORTMEMBER,
 		AST_PACKAGE,
+		AST_IMPORT,
 
 		AST_WIRETYPE,
 		AST_TYPEDEF,
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 26ed0e3e4..79e543376 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -1361,6 +1361,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 	case AST_GENIF:
 	case AST_GENCASE:
 	case AST_PACKAGE:
+	case AST_IMPORT:
 	case AST_ENUM:
 	case AST_MODPORT:
 	case AST_MODPORTMEMBER:
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 4d8c57ced..b524fadfd 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1103,6 +1103,42 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		int counter = 0;
 		label_genblks(existing, counter);
 		std::map<std::string, AstNode*> this_wire_scope;
+		
+		// Process package imports after clearing the scope but before processing module declarations
+		for (auto &child : children) {
+			if (child->type == AST_IMPORT) {
+				// Find the package in the design
+				AstNode *package_node = nullptr;
+				for (auto &design_child : current_ast->children) {
+					if (design_child->type == AST_PACKAGE && design_child->str == child->str) {
+						package_node = design_child;
+						break;
+					}
+				}
+				
+				if (package_node) {
+					// Import all names from the package into current scope
+					for (auto &pkg_child : package_node->children) {
+						if (pkg_child->type == AST_PARAMETER || pkg_child->type == AST_LOCALPARAM || 
+							pkg_child->type == AST_TYPEDEF || pkg_child->type == AST_FUNCTION || 
+							pkg_child->type == AST_TASK || pkg_child->type == AST_ENUM) {
+							current_scope[pkg_child->str] = pkg_child;
+						}
+						if (pkg_child->type == AST_ENUM) {
+							for (auto enode : pkg_child->children) {
+								log_assert(enode->type==AST_ENUM_ITEM);
+								if (current_scope.count(enode->str) == 0)
+									current_scope[enode->str] = enode;
+								else
+									input_error("enum item %s already exists in current scope\n", enode->str.c_str());
+							}
+						}
+					}
+				} else {
+					input_error("Package `%s' not found for import\n", child->str.c_str());
+				}
+			}
+		}
 		for (size_t i = 0; i < children.size(); i++) {
 			AstNode *node = children[i];
 
diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index e2d7a2cd9..19c0774af 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -334,6 +334,7 @@ TIME_SCALE_SUFFIX [munpf]?s
 "specparam"    { return TOK_SPECPARAM; }
 "package"      { SV_KEYWORD(TOK_PACKAGE); }
 "endpackage"   { SV_KEYWORD(TOK_ENDPACKAGE); }
+"import"       { SV_KEYWORD(TOK_IMPORT); }
 "interface"    { SV_KEYWORD(TOK_INTERFACE); }
 "endinterface" { SV_KEYWORD(TOK_ENDINTERFACE); }
 "modport"      { SV_KEYWORD(TOK_MODPORT); }
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 17edc357d..bd9f47034 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -418,6 +418,7 @@ static const AstNode *addAsgnBinopStmt(dict<IdString, AstNode*> *attr, AstNode *
 %token TOK_SUB_ASSIGN TOK_DIV_ASSIGN TOK_MOD_ASSIGN TOK_MUL_ASSIGN
 %token TOK_SHL_ASSIGN TOK_SHR_ASSIGN TOK_SSHL_ASSIGN TOK_SSHR_ASSIGN
 %token TOK_BIND TOK_TIME_SCALE
+%token TOK_IMPORT
 
 %type <ast> range range_or_multirange non_opt_range non_opt_multirange
 %type <ast> wire_type expr basic_expr concat_list rvalue lvalue lvalue_concat_list non_io_wire_type io_wire_type
@@ -484,6 +485,7 @@ design:
 	localparam_decl design |
 	typedef_decl design |
 	package design |
+	import_stmt design |
 	interface design |
 	bind_directive design |
 	%empty;
@@ -730,6 +732,15 @@ package_body:
 package_body_stmt:
 	typedef_decl | localparam_decl | param_decl | task_func_decl;
 
+import_stmt:
+	TOK_IMPORT hierarchical_id TOK_PACKAGESEP '*' ';' {
+		// Create an import node to track package imports
+		AstNode *import_node = new AstNode(AST_IMPORT);
+		import_node->str = *$2;
+		ast_stack.back()->children.push_back(import_node);
+		delete $2;
+	};
+
 interface:
 	TOK_INTERFACE {
 		enterTypeScope();

From 761015b23e1ce68b08b703f6a19f12362860d451 Mon Sep 17 00:00:00 2001
From: Rahul Bhagwat <rahulmbme@gmail.com>
Date: Sun, 3 Aug 2025 23:48:33 -0400
Subject: [PATCH 237/931] add separate module test

---
 frontends/ast/simplify.cc                     | 20 ++++++++++++++++---
 tests/verilog/package_import_separate.sv      | 13 ++++++++++++
 tests/verilog/package_import_separate.ys      |  5 +++++
 .../verilog/package_import_separate_module.sv | 19 ++++++++++++++++++
 4 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 tests/verilog/package_import_separate.sv
 create mode 100644 tests/verilog/package_import_separate.ys
 create mode 100644 tests/verilog/package_import_separate_module.sv

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index b524fadfd..8bb40cb6b 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1109,10 +1109,24 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			if (child->type == AST_IMPORT) {
 				// Find the package in the design
 				AstNode *package_node = nullptr;
+				
+				// First look in current_ast->children (for packages in same file)
 				for (auto &design_child : current_ast->children) {
-					if (design_child->type == AST_PACKAGE && design_child->str == child->str) {
-						package_node = design_child;
-						break;
+					if (design_child->type == AST_PACKAGE) {
+						if (design_child->str == child->str) {
+							package_node = design_child;
+							break;
+						}
+					}
+				}
+				
+				// If not found, look in design->verilog_packages (for packages from other files)
+				if (!package_node && simplify_design_context != nullptr) {
+					for (auto &design_package : simplify_design_context->verilog_packages) {
+						if (design_package->str == child->str) {
+							package_node = design_package;
+							break;
+						}
 					}
 				}
 				
diff --git a/tests/verilog/package_import_separate.sv b/tests/verilog/package_import_separate.sv
new file mode 100644
index 000000000..b2e5bb803
--- /dev/null
+++ b/tests/verilog/package_import_separate.sv
@@ -0,0 +1,13 @@
+package config_pkg;
+  localparam integer
+    DATA_WIDTH = 8,
+    ADDR_WIDTH = 4;
+    
+  localparam logic [2:0]
+    IDLE = 3'b000,
+    START = 3'b001,
+    DATA = 3'b010,
+    ODD_PARITY = 3'b011,
+    STOP = 3'b100,
+    DONE = 3'b101;
+endpackage 
\ No newline at end of file
diff --git a/tests/verilog/package_import_separate.ys b/tests/verilog/package_import_separate.ys
new file mode 100644
index 000000000..0dff75897
--- /dev/null
+++ b/tests/verilog/package_import_separate.ys
@@ -0,0 +1,5 @@
+read_verilog -sv package_import_separate.sv
+read_verilog -sv package_import_separate_module.sv
+hierarchy -check
+proc
+opt -full 
\ No newline at end of file
diff --git a/tests/verilog/package_import_separate_module.sv b/tests/verilog/package_import_separate_module.sv
new file mode 100644
index 000000000..f940553b3
--- /dev/null
+++ b/tests/verilog/package_import_separate_module.sv
@@ -0,0 +1,19 @@
+import config_pkg::*;
+
+module top;
+  logic [DATA_WIDTH-1:0] data;
+  logic [ADDR_WIDTH-1:0] addr;
+  logic [2:0] state;
+  
+  always_comb begin
+    case (state)
+      IDLE: data = 8'h00;
+      START: data = 8'h01;
+      DATA: data = 8'h02;
+      ODD_PARITY: data = 8'h03;
+      STOP: data = 8'h04;
+      DONE: data = 8'h05;
+      default: data = 8'hFF;
+    endcase
+  end
+endmodule 
\ No newline at end of file

From 75b62d01645bfb454a2e0452020938b598c0a02f Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Mon, 4 Aug 2025 15:38:19 +0200
Subject: [PATCH 238/931] verificsva: Fix typo in the cover only followed-by
 operator support

---
 frontends/verific/verificsva.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontends/verific/verificsva.cc b/frontends/verific/verificsva.cc
index 6e87bd267..60d8292b8 100644
--- a/frontends/verific/verificsva.cc
+++ b/frontends/verific/verificsva.cc
@@ -1616,7 +1616,7 @@ struct VerificSvaImporter
 				inst->Type() == PRIM_SVA_NON_OVERLAPPED_IMPLICATION ||
 				(mode_cover && (
 					inst->Type() == PRIM_SVA_OVERLAPPED_FOLLOWED_BY ||
-					inst->Type() == PRIM_SVA_NON_OVERLAPPED_IMPLICATION)))
+					inst->Type() == PRIM_SVA_NON_OVERLAPPED_FOLLOWED_BY)))
 		{
 			Net *antecedent_net = inst->GetInput1();
 			Net *consequent_net = inst->GetInput2();

From 86ef7f7edee18c075197ba80a4d03cb45c641003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miodrag=20Milanovi=C4=87?= <mmicko@gmail.com>
Date: Mon, 4 Aug 2025 17:43:03 +0200
Subject: [PATCH 239/931] Update wheels to Trusted Publisher

---
 .github/workflows/wheels.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b01ce6b3a..d81e340aa 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -119,6 +119,11 @@ jobs:
   upload_wheels:
     name: Upload Wheels
     runs-on: ubuntu-latest
+    # Specifying a GitHub environment is optional, but strongly encouraged
+    environment: pypi
+    permissions:
+      # IMPORTANT: this permission is mandatory for Trusted Publishing
+      id-token: write
     needs: build_wheels
     steps:
       - uses: actions/download-artifact@v4
@@ -132,6 +137,3 @@ jobs:
           mv *.whl ./dist
       - name: Publish
         uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_TOKEN }}
-          repository-url: ${{ vars.PYPI_INDEX || 'https://upload.pypi.org/legacy/' }}

From 074f5e7ea606564f782e78812d1e5f6a7ee45627 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:56 +1200
Subject: [PATCH 240/931] Docs: Initial outline of minimizing designs

How to guide for using bugpoint, minimizing yosys scripts, and minimizing verilog code.
AKA how to MVCE.
---
 docs/source/using_yosys/bugpoint.rst | 210 +++++++++++++++++++++++++++
 docs/source/using_yosys/index.rst    |   1 +
 2 files changed, 211 insertions(+)
 create mode 100644 docs/source/using_yosys/bugpoint.rst

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
new file mode 100644
index 000000000..8c685c35c
--- /dev/null
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -0,0 +1,210 @@
+Minimizing failing (or bugged) designs
+======================================
+
+- how to guide
+- assumes knowledge and familiarity with Yosys
+- something is wrong with your design OR something is wrong with Yosys
+
+  + how to work out which
+
+- *read* the error message
+- is it a Yosys error? (starts with ERROR:)
+
+  + does it give you a line number from your design
+
+- is it a runtime error, e.g. SEGFAULT
+- are you using the latest release of Yosys
+
+  + has your problem already been fixed
+
+- is your input design valid?
+
+  + if you're using Verilog, try load it with `iverilog`_ or `verilator`_
+
+.. _iverilog: https://steveicarus.github.io/iverilog/
+.. _verilator: https://www.veripool.org/verilator/
+
+- make sure to back up your code (design source and yosys script(s)) before
+  making any modifications
+
+  + even if the code itself isn't important, this can help avoid "losing" the
+    error while trying to debug it
+
+
+.. _minimize your RTLIL:
+
+Minimizing RTLIL designs with bugpoint
+--------------------------------------
+
+- `bugpoint`, only usable on platforms where Yosys can spawn executables
+
+  + unavailable on emscripten and wasm
+  + can test by running e.g. ``yosys -qqp '!echo test'``
+
+    * the ``-qq`` prevents Yosys from outputting non-error messages to the
+      console, so this will either display the text ``test``, or an error
+      message about ``Shell`` being unavailable
+    * be careful about using ``!`` in bash as it will perform a history
+      substitution if not escaped with single quotes (double quotes will not
+      escape it)
+    * ``!`` does not need to be escaped in *Yosys* scripts or when called within
+      the interactive Yosys shell, *only* when called on the command line with
+      ``-p``
+
+- single command (``yosys -p "<command>" design.il``)
+- *or* multiple commands in a separate script file
+
+  + script shouldn't load the design
+  + ``yosys -s <failure.ys> design.il``
+  + `minimize your script`_ to reduce the time needed by `bugpoint`
+
+- doesn't require design to be in RTLIL format
+
+  + can e.g. ``read_verilog <design.v>; prep -top <top>;`` before `bugpoint`
+  + this method may be more useful if you are trying to find a bug in your
+    design rather than Yosys
+  + but, `bugpoint` itself calls the command/script with an RTLIL dump, so if it
+    isn't reproducible from RTLIL then `bugpoint` won't work
+
+- follow `bugpoint` instructions
+
+   + output design after `bugpoint` with `write_rtlil`
+   + use ``-grep "<string>"`` to only accept a minimized design that crashes
+     with the ``<string>`` in the log file
+   + ``-modules``, ``-ports``, ``-cells``, and ``-processes`` will enable those
+     parts of the design to be removed
+
+     * use the ``bugpoint_keep`` attribute on objects you don't want to be
+       removed, usually because you already know they are related to the failure
+     * ``(* bugpoint_keep *)`` in Verilog, ``attribute \bugpoint_keep 1`` in
+       RTLIL, or ``setattr -set bugpoint_keep 1 [selection]`` from script
+
+   + ``-runner "<prefix>"`` can allow running ``yosys`` wrapped by another
+     command
+   + can also use `setenv` before `bugpoint` to set environment variables for
+     the spawned processes (e.g. ``setenv UBSAN_OPTIONS halt_on_error=1``)
+
+.. note::
+
+   Using `setenv` in this way **does not affect the current process**.  Only
+   child processes will respect the assigned ``halt_on_error``.
+
+
+.. _minimize your script:
+
+Minimizing scripts
+------------------
+
+- reminder to back up original code before modifying it
+- if you're using command line, convert it to a script
+- if you're using one of the :doc:`/using_yosys/synthesis/synth`, replace it
+  with its contents
+- remove everything *after* the error occurs
+- can use `log` command to print messages to help locate the failure point
+- `echo` can also help (``echo on``)
+- try ``write_rtlil <design.il>; design -reset; read_rtlil <design.il>;`` before
+  the failure point
+
+  + ideally you now have a single command that is producing an error and can
+    `minimize your RTLIL`_ with the ``<design.il>`` output
+  + if not, try to move the write/reset/read earlier in the script until you can
+    reproduce the error
+  + if you have no idea where exactly you should put the reset, the best way is
+    to use a "binary search" type approach, reducing the possible options by
+    half after each attempt
+
+    * for example, your script has 16 commands in it before failing on the 17th
+    * if resetting immediately before the 17th doesn't reproduce the error, try
+      between the 8th and 9th (8 is half of the total 16)
+    * if that produces the error then you can remove everything before the
+      `read_rtlil` and try reset again in the middle of what's left, making sure
+      to use a different name for the output file so that you don't overwrite
+      what you've already got
+    * if the error isn't produced then you need to go earlier still, so in this
+      case you would do between the 4th and 5th (4 is half of the previous 8)
+    * repeat this until you can't reduce the remaining commands any further
+
+.. TODO:: is it possible to dump scratchpad?
+
+   is there anything else in the yosys/design state that doesn't get included in
+   `write_rtlil`?
+
+- you can also try to remove or comment out commands prior to the failing
+  command; just because the first and last commands are needed doesn't mean that
+  every command between them is
+
+
+Minimizing Verilog designs
+--------------------------
+
+- manual process
+- made easier if the error message is able to identify the source line or name
+  of the object
+- reminder to back up original code before modifying it
+- if a specific module is causing the problem, try to set that as the top
+  module, you can then remove 
+
+  + if the problem is parameter specific you may be able to change the default
+    parameters so that they match the problematic configuration
+
+- as with `minimize your script`_, if you have no idea what is or is not
+  relevant, try to follow a "binary search" type approach where you remove (or
+  comment out) roughly half of what's left at a time
+- focusing on one type of object at a time simplifies the process, removing as
+  many as you can until the error disappears if any of the remaining objects are
+  removed
+- periodically check if anything is totally disconnected (ports, wires, etc), if
+  it is then it can be removed too
+- start by removing cells (instances of modules)
+
+  + if a module has no more instances, remove it entirely
+
+- then processes
+- try to remove or reduce assignments and operations
+
+  + are there any wires/registers which get read but never written?
+
+    * try removing the signal declaration and replacing references to it with
+      ``'0`` or ``'x``
+    * try this with constants too
+
+  + can you replace strings with numeric values?
+  + are you able to simplify any operations?  like replacing ``a & '0`` with
+    ``'0``
+  + if you have enable or reset logic, does the error still happen without that?
+  + can you reduce an ``if .. else`` to a single case?
+
+- if you're planning to share the minimized code:
+
+  + make sure there is no sensitive or proprietary data in the design
+  + instead of a long string of numbers and letters that had some meaning (or
+    were randomly or sequentially generated), can you give it a single character
+    name like ``a`` or ``x``
+  + please try to keep things in English, using the letters a-z and numbers 0-9
+    (unless the error is arising because of the names used)
+
+
+Creating an issue on GitHub
+---------------------------
+
+- "Reproduction Steps" is ideally a single code-block (starting and ending with
+  triple backquotes), containing the minimized yosys script file, which includes
+  the minimized design as a "here document" followed by the sequence of commands
+  which reproduce the error
+
+.. TODO:: https://tldp.org/LDP/abs/html/here-docs.html
+
+   Actually fill out :doc:`/using_yosys/more_scripting/load_design` with here
+   docs info and then link to it from here
+
+.. code-block:: markdown
+
+   ```
+   read_rtlil <<EOF
+   # minimized RTLIL design
+   EOF
+   # minimum sequence of commands to reproduce error
+   ```
+
+- any environment variables or command line options should also be mentioned in
+  the "Reproduction Steps"
diff --git a/docs/source/using_yosys/index.rst b/docs/source/using_yosys/index.rst
index 55bd5c291..0ea91fae7 100644
--- a/docs/source/using_yosys/index.rst
+++ b/docs/source/using_yosys/index.rst
@@ -15,3 +15,4 @@ ways Yosys can interact with designs for a deeper investigation.
 
    synthesis/index
    more_scripting/index
+   bugpoint

From 3a07020875169fa5aeb6608de3ffb7b413ce32ac Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:56 +1200
Subject: [PATCH 241/931] docs: Outline loading a design page

Talk about input files coming from command line, the `read` command, and features provided by `RTLIL::Frontend` (making note that `read_slang` is a subclass but `ghdl` isn't).
---
 .../more_scripting/load_design.rst            | 119 +++++++++++++++---
 1 file changed, 101 insertions(+), 18 deletions(-)

diff --git a/docs/source/using_yosys/more_scripting/load_design.rst b/docs/source/using_yosys/more_scripting/load_design.rst
index bbc55a36b..964e9a7df 100644
--- a/docs/source/using_yosys/more_scripting/load_design.rst
+++ b/docs/source/using_yosys/more_scripting/load_design.rst
@@ -1,11 +1,88 @@
 Loading a design
-~~~~~~~~~~~~~~~~
+----------------
 
-keyword: Frontends
+.. _input files:
+
+Input files on the command line
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- guesses frontend based on file extension
+
+  + ``.v`` -> ``read -vlog2k``
+  + ``.sv`` -> ``read -sv``
+  + ``.vhd`` and ``.vhdl`` -> ``read -vhdl``
+  + ``.blif`` and ``.eblif`` -> `read_blif`
+  + ``.json`` -> `read_json`
+  + ``.il`` -> `read_rtlil` (direct textual representation of Yosys internal
+    state)
+
+- command line also supports
+
+  + ``.ys`` -> `script`
+  + ``.tcl`` -> `tcl`
+  + ``-`` -> reads stdin and treats it as a script
+
+The `read` command
+~~~~~~~~~~~~~~~~~~
+
+- standard method of loading designs
+- also for defining macros and include directories
+- uses `verific` command if available
+
+  + ``-verific`` and ``-noverific`` options to enforce with/without Verific
+  + check ``help read`` for more about the options available and the filetypes
+    supported
+
+- fallback to `read_verilog`
+
+.. note::
+
+   The Verific frontend for Yosys, which provides the :cmd:ref:`verific`
+   command, requires Yosys to be built with Verific.  For full functionality,
+   custom modifications to the Verific source code from YosysHQ are required,
+   but limited useability can be achieved with some stock Verific builds.  Check
+   :doc:`/yosys_internals/extending_yosys/build_verific` for more.
+
+.. _Frontend:
+
+Yosys frontends
+~~~~~~~~~~~~~~~
+
+- typically start with ``read_``
+- built-in support for heredocs
+
+  + in-line code with ``<<EOT``
+  + can use any eot marker, but EOT (End-of-Transmission) and EOF
+    (End-of-File) are most common
+
+- built-in support for reading multiple files in the same command
+
+  + executed as multiple successive calls to the frontend
+
+- `verific` and `read` commands are technically not 'Frontends', but their
+  behaviour is kept in sync
+
+.. note::
+
+   'Frontend' here means that the command is implemented as a sub-class of
+   ``RTLIL::Frontend``, as opposed to the usual ``RTLIL::Pass``.
+
+.. todo:: link note to as-yet non-existent section on ``RTLIL::Pass`` under 
+          :doc:`/yosys_internals/extending_yosys/index`
+
+The `read_verilog` command
+""""""""""""""""""""""""""
 
 - :doc:`/cmd/read_verilog`
+- supports most of Verilog-2005
+- limited support for SystemVerilog
+- some non-standard features/extensions for enabling formal verification
+- please do not rely on `read_verilog` for syntax checking
 
-.. todo:: include ``read_verilog <<EOF``, also other methods of loading designs
+  + recommend using a simulator (for example Icarus Verilog) or linting with
+    another tool (such as verilator) first
+
+.. todo:: figure out this example code block
 
 .. code-block:: yoscrypt
 
@@ -24,25 +101,31 @@ keyword: Frontends
     read_verilog file6.v
     verilog_defaults -pop
 
-.. todo:: more info on other ``read_*`` commands, also is this the first time we
-   mention verific?
+Other built-in ``read_*`` commands
+""""""""""""""""""""""""""""""""""
 
-.. note::
-
-   The Verific frontend for Yosys, which provides the :cmd:ref:`verific`
-   command, requires Yosys to be built with Verific.  For full functionality,
-   custom modifications to the Verific source code from YosysHQ are required,
-   but limited useability can be achieved with some stock Verific builds.  Check
-   :doc:`/yosys_internals/extending_yosys/build_verific` for more.
-
-Others:
-
-- :doc:`/cmd/read`
-- `GHDL plugin`_ for VHDL
-- :doc:`/cmd/read_rtlil` (direct textual representation of Yosys internal state)
+- :doc:`/cmd/read_rtlil`
 - :doc:`/cmd/read_aiger`
 - :doc:`/cmd/read_blif`
 - :doc:`/cmd/read_json`
 - :doc:`/cmd/read_liberty`
+- :doc:`/cmd/read_xaiger2`
+
+.. TODO:: does `write_file` count?
+
+Externally maintained plugins
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- `GHDL plugin`_ for VHDL (check ``help ghdl``)
+- `yosys-slang plugin`_ for more comprehensive SystemVerilog support (check
+  ``help read_slang``)
+
+  + yosys-slang is implemented as a '`Frontend`_,' with all the built-in support
+    that entails
 
 .. _GHDL plugin: https://github.com/ghdl/ghdl-yosys-plugin
+.. _yosys-slang plugin: https://github.com/povik/yosys-slang
+
+- both plugins above are included in `OSS CAD Suite`_
+
+.. _OSS CAD Suite: https://github.com/YosysHQ/oss-cad-suite-build

From 3784f6b17fed17f4783e2ffdd470c423885eec19 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:57 +1200
Subject: [PATCH 242/931] Docs: Bugpoint fixups from JF

Also dropping the `autosectionlabel_maxdepth = 1` so that I can actually use the auto section labels.
Adds warning on bash substitution on scripting intro page when talking about `yosys -p`.
---
 docs/source/conf.py                           |  1 -
 .../getting_started/scripting_intro.rst       |  9 ++-
 docs/source/using_yosys/bugpoint.rst          | 79 ++++++++++++-------
 .../more_scripting/load_design.rst            | 18 ++++-
 4 files changed, 74 insertions(+), 33 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 05dcb7d5f..e587b8d31 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -64,7 +64,6 @@ if os.getenv("READTHEDOCS"):
 
 # Ensure that autosectionlabel will produce unique names
 autosectionlabel_prefix_document = True
-autosectionlabel_maxdepth = 1
 
 # include todos for previews
 extensions.append('sphinx.ext.todo')
diff --git a/docs/source/getting_started/scripting_intro.rst b/docs/source/getting_started/scripting_intro.rst
index 01954c661..6a6e4ff51 100644
--- a/docs/source/getting_started/scripting_intro.rst
+++ b/docs/source/getting_started/scripting_intro.rst
@@ -26,7 +26,7 @@ of the comment is a semicolon ``;`` or a new line.
 .. code-block::
    :caption: Using the ``-p`` option
 
-   $ yosys -p "read_verilog fifo.v; :this is a comment; prep"
+   $ yosys -p 'read_verilog fifo.v; :this is a comment; prep'
 
 .. warning::
 
@@ -42,6 +42,13 @@ will be raised by Yosys.  `exec` provides a much more flexible way of executing
 commands, allowing the output to be logged and more control over when to
 generate errors.
 
+.. warning::
+
+   Take care when using the ``yosys -p`` option.  Some shells such as bash will
+   perform substitution options inside of a double quoted string, such as ``!``
+   for history substitution and ``$`` for variable substitution; single quotes
+   should be used instead to pass the string to Yosys without substitution.
+
 The synthesis starter script
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 8c685c35c..9b402858e 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -44,14 +44,10 @@ Minimizing RTLIL designs with bugpoint
     * the ``-qq`` prevents Yosys from outputting non-error messages to the
       console, so this will either display the text ``test``, or an error
       message about ``Shell`` being unavailable
-    * be careful about using ``!`` in bash as it will perform a history
-      substitution if not escaped with single quotes (double quotes will not
-      escape it)
-    * ``!`` does not need to be escaped in *Yosys* scripts or when called within
-      the interactive Yosys shell, *only* when called on the command line with
-      ``-p``
+    * check :ref:`getting_started/scripting_intro:script parsing` for more about
+      the ``-p`` option and common pitfalls
 
-- single command (``yosys -p "<command>" design.il``)
+- single command (``yosys -p '<command>' design.il``)
 - *or* multiple commands in a separate script file
 
   + script shouldn't load the design
@@ -68,26 +64,30 @@ Minimizing RTLIL designs with bugpoint
 
 - follow `bugpoint` instructions
 
-   + output design after `bugpoint` with `write_rtlil`
-   + use ``-grep "<string>"`` to only accept a minimized design that crashes
-     with the ``<string>`` in the log file
-   + ``-modules``, ``-ports``, ``-cells``, and ``-processes`` will enable those
-     parts of the design to be removed
+  + output design after `bugpoint` with `write_rtlil`
+  + use ``-grep "<string>"`` to only accept a minimized design that crashes
+    with the ``<string>`` in the log file
+  + ``-modules``, ``-ports``, ``-cells``, and ``-processes`` will enable those
+    parts of the design to be removed
 
-     * use the ``bugpoint_keep`` attribute on objects you don't want to be
-       removed, usually because you already know they are related to the failure
-     * ``(* bugpoint_keep *)`` in Verilog, ``attribute \bugpoint_keep 1`` in
-       RTLIL, or ``setattr -set bugpoint_keep 1 [selection]`` from script
+    * use the ``bugpoint_keep`` attribute on objects you don't want to be
+      removed, usually because you already know they are related to the failure
+    * ``(* bugpoint_keep *)`` in Verilog, ``attribute \bugpoint_keep 1`` in
+      RTLIL, or ``setattr -set bugpoint_keep 1 [selection]`` from script
 
-   + ``-runner "<prefix>"`` can allow running ``yosys`` wrapped by another
-     command
-   + can also use `setenv` before `bugpoint` to set environment variables for
-     the spawned processes (e.g. ``setenv UBSAN_OPTIONS halt_on_error=1``)
+  + ``-runner "<prefix>"`` can allow running ``yosys`` wrapped by another
+    command
+  + can also use `setenv` before `bugpoint` to set environment variables for
+    the spawned processes (e.g. ``setenv UBSAN_OPTIONS halt_on_error=1``)
 
 .. note::
 
-   Using `setenv` in this way **does not affect the current process**.  Only
-   child processes will respect the assigned ``halt_on_error``.
+   Using `setenv` in this way may not affect the current process as some
+   environment variables are only read on start up.  For instance the
+   ``UBSAN_OPTIONS halt_on_error`` here only affects child processes, as does
+   the :doc:`Yosys environment variable</appendix/env_vars>` ``ABC``.  While
+   others such as ``YOSYS_NOVERIFIC`` and ``HOME`` are evaluated each time they
+   are used.
 
 
 .. _minimize your script:
@@ -187,15 +187,34 @@ Minimizing Verilog designs
 Creating an issue on GitHub
 ---------------------------
 
-- "Reproduction Steps" is ideally a single code-block (starting and ending with
-  triple backquotes), containing the minimized yosys script file, which includes
-  the minimized design as a "here document" followed by the sequence of commands
-  which reproduce the error
+- "Reproduction Steps" is ideally a code-block (starting and ending with triple
+  backquotes) containing the minimized design (Verilog or RTLIL), followed by a
+  code-block containing the minimized yosys script OR a command line call to
+  yosys with code-formatting (starting and ending with single backquotes)
 
-.. TODO:: https://tldp.org/LDP/abs/html/here-docs.html
+.. code-block:: markdown
 
-   Actually fill out :doc:`/using_yosys/more_scripting/load_design` with here
-   docs info and then link to it from here
+   min.v
+   ```verilog
+   // minimized Verilog design
+   ```
+
+   min.ys
+   ```
+   read_verilog min.v
+   # minimum sequence of commands to reproduce error
+   ```
+
+   OR
+
+   `yosys -p ': minimum sequence of commands;' min.v`
+
+
+- alternatively can provide a single code-block which includes the minimized
+  design as a "here document" followed by the sequence of commands which
+  reproduce the error
+
+  + see :doc:`/using_yosys/more_scripting/load_design` for more on heredocs.
 
 .. code-block:: markdown
 
@@ -203,7 +222,7 @@ Creating an issue on GitHub
    read_rtlil <<EOF
    # minimized RTLIL design
    EOF
-   # minimum sequence of commands to reproduce error
+   # minimum sequence of commands
    ```
 
 - any environment variables or command line options should also be mentioned in
diff --git a/docs/source/using_yosys/more_scripting/load_design.rst b/docs/source/using_yosys/more_scripting/load_design.rst
index 964e9a7df..1c597bdfc 100644
--- a/docs/source/using_yosys/more_scripting/load_design.rst
+++ b/docs/source/using_yosys/more_scripting/load_design.rst
@@ -32,8 +32,17 @@ The `read` command
   + ``-verific`` and ``-noverific`` options to enforce with/without Verific
   + check ``help read`` for more about the options available and the filetypes
     supported
+  + elaborate designs with ``verific -import [options] <top>`` (or use
+    `hierarchy`)
 
-- fallback to `read_verilog`
+- fallback to `read_verilog` with ``-defer`` option
+
+  + does not compile design until `hierarchy` command as discussed in
+    :doc:`/getting_started/example_synth`
+  + more similar to `verific` behaviour
+
+- ``read -define`` et al mapped to `verific` or `verilog_defines`
+- similarly, ``read -incdir`` et al mapped to `verific` or `verilog_defaults`
 
 .. note::
 
@@ -129,3 +138,10 @@ Externally maintained plugins
 - both plugins above are included in `OSS CAD Suite`_
 
 .. _OSS CAD Suite: https://github.com/YosysHQ/oss-cad-suite-build
+
+- `Synlig`_, which uses `Surelog`_ to provide SystemVerilog support
+
+  + also implemented as a '`Frontend`_'
+
+.. _Synlig: https://github.com/chipsalliance/synlig
+.. _Surelog: https://github.com/chipsalliance/Surelog

From db3dc45bc68f97b244d0732260dbcd31094b1fc2 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:57 +1200
Subject: [PATCH 243/931] Docs: Tidying

Fix error on duplicated heading.
Drop `cmd_ref`_ link (everything already uses :doc:`cmd_ref`).
---
 docs/source/cmd_ref.rst                                       | 2 --
 .../using_yosys/more_scripting/interactive_investigation.rst  | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/source/cmd_ref.rst b/docs/source/cmd_ref.rst
index acf2d1d41..d2d59ba54 100644
--- a/docs/source/cmd_ref.rst
+++ b/docs/source/cmd_ref.rst
@@ -1,5 +1,3 @@
-.. _cmd_ref:
-
 ================================================================================
 Command line reference
 ================================================================================
diff --git a/docs/source/using_yosys/more_scripting/interactive_investigation.rst b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
index e9c9bc9ac..ca4c76ee7 100644
--- a/docs/source/using_yosys/more_scripting/interactive_investigation.rst
+++ b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
@@ -311,8 +311,8 @@ cells, as the net-names are usually suppressed in the circuit diagram if they
 are auto-generated.  Note that the output is in the RTLIL representation,
 described in :doc:`/yosys_internals/formats/rtlil_rep`.
 
-Interactive Design Investigation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Design Investigation
+~~~~~~~~~~~~~~~~~~~~
 
 Yosys can also be used to investigate designs (or netlists created from other
 tools).

From 6e1cc9c0cd278f30c1593e5d4a021de8ab578a53 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:57 +1200
Subject: [PATCH 244/931] docs: Some extra bugpoint bullets

---
 docs/source/using_yosys/bugpoint.rst | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 9b402858e..d292c2d32 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -67,8 +67,11 @@ Minimizing RTLIL designs with bugpoint
   + output design after `bugpoint` with `write_rtlil`
   + use ``-grep "<string>"`` to only accept a minimized design that crashes
     with the ``<string>`` in the log file
+
+    * only checks log file, will not match runtime errors
+
   + ``-modules``, ``-ports``, ``-cells``, and ``-processes`` will enable those
-    parts of the design to be removed
+    parts of the design to be removed (default is allow removing all)
 
     * use the ``bugpoint_keep`` attribute on objects you don't want to be
       removed, usually because you already know they are related to the failure
@@ -89,6 +92,23 @@ Minimizing RTLIL designs with bugpoint
    others such as ``YOSYS_NOVERIFIC`` and ``HOME`` are evaluated each time they
    are used.
 
+- check minimized design still fails, especially if not using `write_rtlil`
+
+  + e.g. if you ran :ref:`bugpoint_script` below, then calling ``yosys -s
+    <failure.ys> min.v`` should still fail in the same way
+  + `write_rtlil` is more reliable since `bugpoint` will have run that exact
+    code through the failing script; other ``write_*`` commands convert from the
+    RTLIL and then back again during the ``read_*`` which can result in
+    differences which mean the design no longer fails
+
+.. code-block:: yoscrypt
+   :caption: example `bugpoint` minimizer
+   :name: bugpoint_script
+
+   read_verilog design.v
+   bugpoint -script <failure.ys>
+   write_verilog min.v
+
 
 .. _minimize your script:
 

From aefe3443aac9fbeb5549502893d12afdebc9f9a3 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:57 +1200
Subject: [PATCH 245/931] docs: Minimizing synth with -run bullets

---
 docs/source/using_yosys/bugpoint.rst | 35 ++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index d292c2d32..804787df8 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -119,9 +119,44 @@ Minimizing scripts
 - if you're using command line, convert it to a script
 - if you're using one of the :doc:`/using_yosys/synthesis/synth`, replace it
   with its contents
+
+  + can also do this piece-wise with the ``-run`` option
+  + e.g. replacing ``synth -top <top> -lut`` with :ref:`replace_synth`
+  + the options ``-top <top> -lut`` can be provided to each `synth` step, or
+    to just the step(s) where it is relevant, as done here
+
+.. code-block:: yoscrypt
+   :caption: example replacement script for `synth` command
+   :name: replace_synth
+
+   synth -top <top> -run :coarse
+   synth -lut -run coarse:fine
+   synth -lut -run fine:check
+   synth -run check:
+
 - remove everything *after* the error occurs
 - can use `log` command to print messages to help locate the failure point
 - `echo` can also help (``echo on``)
+
+  + if you used a ``-run`` option like in :ref:`replace_synth` above, you can
+    now replace the failing step with its contents and repeat the above if
+    needed
+  + checking the log should tell you the last command that ran which can make
+    this easier
+  + say we ran :ref:`replace_synth` and were able to remove the ``synth -run
+    check:`` and still got our error, then we check the log and we see the last
+    thing before the error was `7.2. Executing MEMORY_MAP pass (converting
+    memories to logic and flip-flops).`
+  + we can then update our script to the following:
+
+.. code-block:: yoscrypt
+   :caption: example replacement script for `synth` when `memory_map` is failing
+
+   synth -top <top> -run :fine
+   opt -fast -full
+   memory_map
+
+
 - try ``write_rtlil <design.il>; design -reset; read_rtlil <design.il>;`` before
   the failure point
 

From 8ec3e3a1025943b45772644b0a2387e1c3a1f238 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:58 +1200
Subject: [PATCH 246/931] docs: Bullets for identifying issues

Add a note on fuzzers, with a polite suggestion that if you're fuzzing you should put in the work of identifying the underlying issue so that you (and we) are confident you're not raising multiple issues for the same bug.
---
 docs/source/using_yosys/bugpoint.rst | 113 +++++++++++++++++++++------
 1 file changed, 89 insertions(+), 24 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 804787df8..abc6094a6 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -36,6 +36,11 @@ Minimizing failing (or bugged) designs
 Minimizing RTLIL designs with bugpoint
 --------------------------------------
 
+- what is `bugpoint`
+
+Can I use bugpoint?
+~~~~~~~~~~~~~~~~~~~
+
 - `bugpoint`, only usable on platforms where Yosys can spawn executables
 
   + unavailable on emscripten and wasm
@@ -62,26 +67,29 @@ Minimizing RTLIL designs with bugpoint
   + but, `bugpoint` itself calls the command/script with an RTLIL dump, so if it
     isn't reproducible from RTLIL then `bugpoint` won't work
 
+
+How do I use bugpoint?
+~~~~~~~~~~~~~~~~~~~~~~
+
 - follow `bugpoint` instructions
+- output design after `bugpoint` with `write_rtlil`
+- use ``-grep "<string>"`` to only accept a minimized design that crashes
+- with the ``<string>`` in the log file
 
-  + output design after `bugpoint` with `write_rtlil`
-  + use ``-grep "<string>"`` to only accept a minimized design that crashes
-    with the ``<string>`` in the log file
+  + only checks log file, will not match runtime errors
 
-    * only checks log file, will not match runtime errors
+- ``-modules``, ``-ports``, ``-cells``, and ``-processes`` will enable those
+- parts of the design to be removed (default is allow removing all)
 
-  + ``-modules``, ``-ports``, ``-cells``, and ``-processes`` will enable those
-    parts of the design to be removed (default is allow removing all)
+  + use the ``bugpoint_keep`` attribute on objects you don't want to be
+    removed, usually because you already know they are related to the failure
+  + ``(* bugpoint_keep *)`` in Verilog, ``attribute \bugpoint_keep 1`` in
+    RTLIL, or ``setattr -set bugpoint_keep 1 [selection]`` from script
 
-    * use the ``bugpoint_keep`` attribute on objects you don't want to be
-      removed, usually because you already know they are related to the failure
-    * ``(* bugpoint_keep *)`` in Verilog, ``attribute \bugpoint_keep 1`` in
-      RTLIL, or ``setattr -set bugpoint_keep 1 [selection]`` from script
-
-  + ``-runner "<prefix>"`` can allow running ``yosys`` wrapped by another
-    command
-  + can also use `setenv` before `bugpoint` to set environment variables for
-    the spawned processes (e.g. ``setenv UBSAN_OPTIONS halt_on_error=1``)
+- ``-runner "<prefix>"`` can allow running ``yosys`` wrapped by another
+- command
+- can also use `setenv` before `bugpoint` to set environment variables for
+- the spawned processes (e.g. ``setenv UBSAN_OPTIONS halt_on_error=1``)
 
 .. note::
 
@@ -92,14 +100,13 @@ Minimizing RTLIL designs with bugpoint
    others such as ``YOSYS_NOVERIFIC`` and ``HOME`` are evaluated each time they
    are used.
 
-- check minimized design still fails, especially if not using `write_rtlil`
 
-  + e.g. if you ran :ref:`bugpoint_script` below, then calling ``yosys -s
-    <failure.ys> min.v`` should still fail in the same way
-  + `write_rtlil` is more reliable since `bugpoint` will have run that exact
-    code through the failing script; other ``write_*`` commands convert from the
-    RTLIL and then back again during the ``read_*`` which can result in
-    differences which mean the design no longer fails
+What do I do with the minimized design?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- check minimized design still fails, especially if not using `write_rtlil`
+- e.g. if you ran :ref:`bugpoint_script` below, then calling ``yosys -s
+  <failure.ys> min.v`` should still fail in the same way
 
 .. code-block:: yoscrypt
    :caption: example `bugpoint` minimizer
@@ -109,6 +116,12 @@ Minimizing RTLIL designs with bugpoint
    bugpoint -script <failure.ys>
    write_verilog min.v
 
+- `write_rtlil` is more reliable since `bugpoint` will have run that exact
+  code through the failing script; other ``write_*`` commands convert from the
+  RTLIL and then back again during the ``read_*`` which can result in
+  differences which mean the design no longer fails
+- check out :ref:`using_yosys/bugpoint:identifying issues` for more on what to
+  do next
 
 .. _minimize your script:
 
@@ -145,8 +158,8 @@ Minimizing scripts
     this easier
   + say we ran :ref:`replace_synth` and were able to remove the ``synth -run
     check:`` and still got our error, then we check the log and we see the last
-    thing before the error was `7.2. Executing MEMORY_MAP pass (converting
-    memories to logic and flip-flops).`
+    thing before the error was ``7.2. Executing MEMORY_MAP pass (converting
+    memories to logic and flip-flops).``
   + we can then update our script to the following:
 
 .. code-block:: yoscrypt
@@ -239,6 +252,58 @@ Minimizing Verilog designs
     (unless the error is arising because of the names used)
 
 
+Identifying issues
+------------------
+
+- does the failing command indicate limited support, or does it mention some
+  other command that needs to be run first?
+- if you're able to, try to match the minimized design back to its original
+  context
+
+  + could you achieve the same thing a different way?
+  + and if so, does this other method have the same issue?
+
+- try to change the design in small ways and see what happens
+
+  + `bugpoint` can reduce and simplify a design, but it doesn't *change* much
+  + what happens if you change operators, for example a left shift (or `$shl`)
+    to a right shift (or `$shr`)?
+  + is the issue tied to specific parameters, widths, or values?
+
+- if you're familiar with C/C++ you might try to have a look at the source
+  code of the command that's failing
+
+  + even if you can't fix the problem yourself, it can be very helpful for
+    anyone else investigating if you're able to identify where exactly the
+    issue is
+  + if you're using a fuzzer to find issues in Yosys, you should be prepared to
+    do this step
+
+.. warning::
+
+   In the event that you are unable to identify the root cause of a fuzzer
+   generated issue, **do not** open more than one issue at a time.  You have no
+   way of being able to tell if multiple fuzzer generated issues are simply
+   different cases of the same problem, and opening multiple issues for the same
+   problem means more time is spent on triaging and diagnosing bug reports and
+   less on fixing the problem.  If you are found to be doing this, your issues
+   may be closed without further investigation.
+
+- search `the existing issues`_ and see if someone has already made a bug report
+
+  + this is where changing the design and finding the limits of what causes the
+    failure really comes in handy
+  + if you're more familiar with how the problem can arise, you may be able to
+    find a related issue more easily
+  + if an issue already exists for one case of the problem but you've found
+    other cases, you can comment on the issue and help get it solved
+
+.. _the existing issues: https://github.com/YosysHQ/yosys/issues
+
+- if there are no existing or related issues already, the check out the steps
+  for :ref:`using_yosys/bugpoint:creating an issue on github`
+
+
 Creating an issue on GitHub
 ---------------------------
 

From 385d58562d171f86884247a1ae1971666362df82 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:58 +1200
Subject: [PATCH 247/931] Docs: Move verilog.rst to using_yosys

Was previously in yosys_internals which is more developer focused, rather than user focused.
---
 docs/source/using_yosys/index.rst                        | 1 +
 docs/source/{yosys_internals => using_yosys}/verilog.rst | 2 --
 docs/source/yosys_internals/index.rst                    | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)
 rename docs/source/{yosys_internals => using_yosys}/verilog.rst (99%)

diff --git a/docs/source/using_yosys/index.rst b/docs/source/using_yosys/index.rst
index 0ea91fae7..b243d431e 100644
--- a/docs/source/using_yosys/index.rst
+++ b/docs/source/using_yosys/index.rst
@@ -16,3 +16,4 @@ ways Yosys can interact with designs for a deeper investigation.
    synthesis/index
    more_scripting/index
    bugpoint
+   verilog
diff --git a/docs/source/yosys_internals/verilog.rst b/docs/source/using_yosys/verilog.rst
similarity index 99%
rename from docs/source/yosys_internals/verilog.rst
rename to docs/source/using_yosys/verilog.rst
index d67553aa9..1701458f7 100644
--- a/docs/source/yosys_internals/verilog.rst
+++ b/docs/source/using_yosys/verilog.rst
@@ -1,8 +1,6 @@
 Notes on Verilog support in Yosys
 =================================
 
-.. TODO:: how much of this is specific to the read_verilog and should be in :doc:`/yosys_internals/flow/verilog_frontend`?
-
 Unsupported Verilog-2005 Features
 ---------------------------------
 
diff --git a/docs/source/yosys_internals/index.rst b/docs/source/yosys_internals/index.rst
index 3dd4224fa..483cc2bf8 100644
--- a/docs/source/yosys_internals/index.rst
+++ b/docs/source/yosys_internals/index.rst
@@ -38,5 +38,4 @@ as reference to implement a similar system in any language.
    formats/index
    extending_yosys/index
    techmap
-   verilog
    hashing

From be999219a2972acb6d1931c6c589d8dd5f02383a Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:58 +1200
Subject: [PATCH 248/931] docs: User-defined failures in bugpoint

Also some other tidy up and clarifications.
---
 docs/source/using_yosys/bugpoint.rst | 47 +++++++++++++++++++---------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index abc6094a6..a74693fa3 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -36,12 +36,16 @@ Minimizing failing (or bugged) designs
 Minimizing RTLIL designs with bugpoint
 --------------------------------------
 
-- what is `bugpoint`
+Yosys provides the `bugpoint` command for reducing a failing design to the
+smallest portion of that design which still results in failure.  While initially
+developed for Yosys crashes, `bugpoint` can also be used for designs that lead
+to non-fatal errors, or even failures in other tools that use the output of a
+Yosys script.
 
 Can I use bugpoint?
 ~~~~~~~~~~~~~~~~~~~
 
-- `bugpoint`, only usable on platforms where Yosys can spawn executables
+- only usable on platforms where Yosys can spawn executables
 
   + unavailable on emscripten and wasm
   + can test by running e.g. ``yosys -qqp '!echo test'``
@@ -67,6 +71,18 @@ Can I use bugpoint?
   + but, `bugpoint` itself calls the command/script with an RTLIL dump, so if it
     isn't reproducible from RTLIL then `bugpoint` won't work
 
+- works with user-defined failures in scripts
+
+  + e.g. `select` command with ``-assert-*`` option
+  + or `equiv_opt`
+  + can even call another tool with `exec`
+  
+    * useful for when Yosys is outputting an invalid design
+    * use the ``-expect-*`` options to ensure the script correctly returns the
+      failure state to `bugpoint`
+    * can call shell scripts with e.g. ``exec -expect-return 1 -- bash
+      <script.sh>``
+
 
 How do I use bugpoint?
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -74,31 +90,34 @@ How do I use bugpoint?
 - follow `bugpoint` instructions
 - output design after `bugpoint` with `write_rtlil`
 - use ``-grep "<string>"`` to only accept a minimized design that crashes
-- with the ``<string>`` in the log file
+  with the ``<string>`` in the log file
 
   + only checks log file, will not match runtime errors
+  + can be particularly important for scripts with multiple commands to avoid
+    unrelated failures
+  + call e.g. ``yosys -qqp '<command>' design.il`` or  ``yosys -qqs <failure.ys>
+    design.il`` to print only the error message(s) and use that (or a portion of
+    that) as the ``<string>`` to search for
 
 - ``-modules``, ``-ports``, ``-cells``, and ``-processes`` will enable those
-- parts of the design to be removed (default is allow removing all)
+  parts of the design to be removed (default is to allow removing all)
 
   + use the ``bugpoint_keep`` attribute on objects you don't want to be
     removed, usually because you already know they are related to the failure
   + ``(* bugpoint_keep *)`` in Verilog, ``attribute \bugpoint_keep 1`` in
     RTLIL, or ``setattr -set bugpoint_keep 1 [selection]`` from script
 
-- ``-runner "<prefix>"`` can allow running ``yosys`` wrapped by another
-- command
+- ``-runner "<prefix>"`` can allow running ``yosys`` wrapped by another command
 - can also use `setenv` before `bugpoint` to set environment variables for
-- the spawned processes (e.g. ``setenv UBSAN_OPTIONS halt_on_error=1``)
+  the spawned processes (e.g. ``setenv UBSAN_OPTIONS halt_on_error=1``)
 
 .. note::
 
-   Using `setenv` in this way may not affect the current process as some
-   environment variables are only read on start up.  For instance the
-   ``UBSAN_OPTIONS halt_on_error`` here only affects child processes, as does
-   the :doc:`Yosys environment variable</appendix/env_vars>` ``ABC``.  While
-   others such as ``YOSYS_NOVERIFIC`` and ``HOME`` are evaluated each time they
-   are used.
+   Using `setenv` in this way may or may not affect the current process.  For
+   instance the ``UBSAN_OPTIONS halt_on_error`` here only affects child
+   processes, as does the :doc:`Yosys environment variable</appendix/env_vars>`
+   ``ABC`` because they are only read on start-up.  While others, such as
+   ``YOSYS_NOVERIFIC`` and ``HOME``, are evaluated each time they are used.
 
 
 What do I do with the minimized design?
@@ -300,7 +319,7 @@ Identifying issues
 
 .. _the existing issues: https://github.com/YosysHQ/yosys/issues
 
-- if there are no existing or related issues already, the check out the steps
+- if there are no existing or related issues already, then check out the steps
   for :ref:`using_yosys/bugpoint:creating an issue on github`
 
 

From 47c89a61df5c85f60ff738e0340554e583597570 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:58 +1200
Subject: [PATCH 249/931] Docs: What is bugpoint in paragraphs

---
 docs/source/using_yosys/bugpoint.rst | 82 +++++++++++++++++-----------
 1 file changed, 51 insertions(+), 31 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index a74693fa3..ffefcb144 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -45,43 +45,64 @@ Yosys script.
 Can I use bugpoint?
 ~~~~~~~~~~~~~~~~~~~
 
-- only usable on platforms where Yosys can spawn executables
+The first thing to be aware of is that `bugpoint` is not available in every
+build of Yosys.  Because the command works by invoking external processes, it
+requires that Yosys can spawn executables.  Notably this means `bugpoint` is not
+able to be used in WebAssembly builds such as that available via YoWASP.  The
+easiest way to check your build of Yosys is by running ``yosys -qq -p '!echo
+test'``.  If this echoes ``test`` in the console, then `bugpoint` will work as
+expected.  If instead if it displays the text ``ERROR: Shell is not available.``
+then `bugpoint` will not work either.
 
-  + unavailable on emscripten and wasm
-  + can test by running e.g. ``yosys -qqp '!echo test'``
+.. note::
 
-    * the ``-qq`` prevents Yosys from outputting non-error messages to the
-      console, so this will either display the text ``test``, or an error
-      message about ``Shell`` being unavailable
-    * check :ref:`getting_started/scripting_intro:script parsing` for more about
-      the ``-p`` option and common pitfalls
+   The console command ``yosys -qq -p '!echo test'`` uses the ``-qq`` flag to
+   prevent Yosys from outputting non-error messages to the console.  The ``-p``
+   option executes ``!echo test`` as a Yosys command, attempting to pass ``echo
+   test`` to the shell for execution.  For more about the ``-p`` option and
+   common pitfalls, check out :ref:`getting_started/scripting_intro:script
+   parsing` in the :doc:`/getting_started/index` section.
 
-- single command (``yosys -p '<command>' design.il``)
-- *or* multiple commands in a separate script file
+.. TODO:: Add ``YOSYS_DISABLE_SPAWN`` check in ``bugpoint.cc``.
 
-  + script shouldn't load the design
-  + ``yosys -s <failure.ys> design.il``
-  + `minimize your script`_ to reduce the time needed by `bugpoint`
+   At least in the help text, so that ``yosys -h bugpoint`` will correctly
+   indicate if the command will work instead of this roundabout method.
 
-- doesn't require design to be in RTLIL format
+Next you need to separate loading the design from the failure point; you should
+be aiming to reproduce the failure by running ``yosys -s <load.ys> -s
+<failure.ys>``.  If the failure occurs while loading the design, such as during
+`read_verilog` you will instead have to minimize the input design yourself.
+Check out the instructions for :ref:`using_yosys/bugpoint:minimizing verilog
+designs` below.
 
-  + can e.g. ``read_verilog <design.v>; prep -top <top>;`` before `bugpoint`
-  + this method may be more useful if you are trying to find a bug in your
-    design rather than Yosys
-  + but, `bugpoint` itself calls the command/script with an RTLIL dump, so if it
-    isn't reproducible from RTLIL then `bugpoint` won't work
+The commands in ``<load.ys>`` only need to be run once, while those in
+``<failure.ys>`` will be run on each iteration of `bugpoint`.  If you haven't
+already, following the instructions for :ref:`using_yosys/bugpoint:minimizing
+scripts` will also help with identifying exactly which commands are needed to
+produce the failure and which can be safely moved to the loading script.
 
-- works with user-defined failures in scripts
+.. note::
 
-  + e.g. `select` command with ``-assert-*`` option
-  + or `equiv_opt`
-  + can even call another tool with `exec`
-  
-    * useful for when Yosys is outputting an invalid design
-    * use the ``-expect-*`` options to ensure the script correctly returns the
-      failure state to `bugpoint`
-    * can call shell scripts with e.g. ``exec -expect-return 1 -- bash
-      <script.sh>``
+   You should also be able to run the two scripts separately, calling first
+   ``yosys -s <load.ys> -p 'write_rtlil design.il'`` and then ``yosys -s
+   <failure.ys> design.il``.  If this doesn't work then it may mean that the
+   failure isn't reproducible from RTLIL and `bugpoint` won't work either.
+
+When we talk about failure points here, it doesn't just mean crashes or errors
+in Yosys.  The ``<failure.ys>`` script can also be a user-defined failure such
+as the `select` command with one of the ``-assert-*`` options; an example where
+this might be useful is when a pass is supposed to remove a certain kind of
+cell, but there is some edge case where the cell is not removed.  Another
+use-case would be minimizing a design which fails with the `equiv_opt` command,
+suggesting that the optimization in question alters the circuit in some way.
+
+It is even possible to use `bugpoint` with failures *external* to Yosys, by
+making use of the `exec` command in ``<failure.ys>``.  This is especially useful
+when Yosys is outputting an invalid design, or when some other tool is
+incompatible with the design.  Be sure to use the ``exec -expect-*`` options so
+that the pass/fail can be detected correctly.  Multiple calls to `exec` can be
+made, or even entire shell scripts (e.g. ``exec -expect-return 1 -- bash
+<script.sh>``).
 
 
 How do I use bugpoint?
@@ -142,6 +163,7 @@ What do I do with the minimized design?
 - check out :ref:`using_yosys/bugpoint:identifying issues` for more on what to
   do next
 
+
 .. _minimize your script:
 
 Minimizing scripts
@@ -188,7 +210,6 @@ Minimizing scripts
    opt -fast -full
    memory_map
 
-
 - try ``write_rtlil <design.il>; design -reset; read_rtlil <design.il>;`` before
   the failure point
 
@@ -348,7 +369,6 @@ Creating an issue on GitHub
 
    `yosys -p ': minimum sequence of commands;' min.v`
 
-
 - alternatively can provide a single code-block which includes the minimized
   design as a "here document" followed by the sequence of commands which
   reproduce the error

From 2c534c88282e6d04760b0a09a7b76b697d6530f4 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:59 +1200
Subject: [PATCH 250/931] Docs: How to use bugpoint paragraphs

---
 docs/source/using_yosys/bugpoint.rst | 98 ++++++++++++++++++++++------
 1 file changed, 79 insertions(+), 19 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index ffefcb144..7d38124bf 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -104,33 +104,75 @@ that the pass/fail can be detected correctly.  Multiple calls to `exec` can be
 made, or even entire shell scripts (e.g. ``exec -expect-return 1 -- bash
 <script.sh>``).
 
+Our final failure we can use with `bugpoint` is one returned by a wrapper
+process, such as ``valgrind`` or ``timeout``.  In this case you will be calling
+something like ``<wrapper> yosys -s <failure.ys> design.il``.  Here, Yosys is
+run under a wrapper process which checks for some failure state, like a memory
+leak or excessive runtime.  Note however that unlike the `exec` command, there
+is currently no way to check the return status or messages from the wrapper
+process; only a binary pass/fail.
+
 
 How do I use bugpoint?
 ~~~~~~~~~~~~~~~~~~~~~~
 
-- follow `bugpoint` instructions
-- output design after `bugpoint` with `write_rtlil`
-- use ``-grep "<string>"`` to only accept a minimized design that crashes
-  with the ``<string>`` in the log file
+At this point you should have:
 
-  + only checks log file, will not match runtime errors
-  + can be particularly important for scripts with multiple commands to avoid
-    unrelated failures
-  + call e.g. ``yosys -qqp '<command>' design.il`` or  ``yosys -qqs <failure.ys>
-    design.il`` to print only the error message(s) and use that (or a portion of
-    that) as the ``<string>`` to search for
+1. either an RTLIL file containing the design to minimize (referred to here as
+   ``design.il``), or a Yosys script, ``<load.ys>``, which loads it; and
+2. a Yosys script, ``<failure.ys>``, which produces the failure and returns a
+   non-zero return status.
 
-- ``-modules``, ``-ports``, ``-cells``, and ``-processes`` will enable those
-  parts of the design to be removed (default is to allow removing all)
+Now call ``yosys -qq -s <failure.ys> design.il`` and take note of the error(s)
+that get printed.  A template script, ``<bugpoint.ys>``, is provided here which
+you can use.  Make sure to configure it with the correct filenames and use only
+one of the methods to load the design.  Fill in the ``-grep`` option with the
+error message printed just before.  If you are using a wrapper process for your
+failure state, add the ``-runner "<wrapper>"`` option to the `bugpoint` call.
+For more about the options available, check ``help bugpoint`` or
+:doc:`/cmd/bugpoint`.
 
-  + use the ``bugpoint_keep`` attribute on objects you don't want to be
-    removed, usually because you already know they are related to the failure
-  + ``(* bugpoint_keep *)`` in Verilog, ``attribute \bugpoint_keep 1`` in
-    RTLIL, or ``setattr -set bugpoint_keep 1 [selection]`` from script
+.. code-block:: yoscrypt
+   :caption: ``<bugpoint.ys>`` template script
 
-- ``-runner "<prefix>"`` can allow running ``yosys`` wrapped by another command
-- can also use `setenv` before `bugpoint` to set environment variables for
-  the spawned processes (e.g. ``setenv UBSAN_OPTIONS halt_on_error=1``)
+   # Load design
+   read_rtlil design.il
+   ## OR
+   script <load.ys>
+
+   # Call bugpoint with failure
+   bugpoint -script <failure.ys> -grep "<string>"
+
+   # Save minimized design
+   write_rtlil min.il
+
+.. note::
+
+   Using ``-grep "<string>"`` with `bugpoint` is optional, but helps to ensure
+   that the minimized design is reproducing the right error, especially when
+   ``<failure.ys>`` contains more than one command.  Unfortunately this does not
+   work with runtime errors such as a ``SEGFAULT`` as it is only able to match
+   strings from the log file.
+
+.. TODO::  Consider checking ``run_command`` return value for runtime errors.
+
+   Currently ``BugpointPass::run_yosys`` returns ``run_command(yosys_cmdline) ==
+   0``, so it shouldn't be too hard to add an option for it.  Could also be
+   used with the ``-runner`` option, which might give it a bit more flexibility.
+
+By default, `bugpoint` is able to remove any part of the design.  In order to
+keep certain parts, for instance because you already know they are related to
+the failure, you can use the ``bugpoint_keep`` attribute.  This can be done with
+``(* bugpoint_keep *)`` in Verilog, ``attribute \bugpoint_keep 1`` in RTLIL, or
+``setattr -set bugpoint_keep 1 [selection]`` from a Yosys script.  It is also
+possible to limit `bugpoint` to only removing certain *kinds* of objects, such
+as only removing entire modules or cells (instances of modules).  For more about
+the options available, check ``help bugpoint`` or :doc:`/cmd/bugpoint`.
+
+In some situations, it may also be helpful to use `setenv` before `bugpoint` to
+set environment variables for the spawned processes.  An example of this is
+``setenv UBSAN_OPTIONS halt_on_error=1`` for where you are trying to raise an
+error on undefined behaviour but only want the child process to halt on error.
 
 .. note::
 
@@ -140,6 +182,24 @@ How do I use bugpoint?
    ``ABC`` because they are only read on start-up.  While others, such as
    ``YOSYS_NOVERIFIC`` and ``HOME``, are evaluated each time they are used.
 
+Once you have finished configuration, you can now run ``yosys <bugpoint.ys>``.
+The first thing `bugpoint` will do is test the input design fails.  If it
+doesn't, make sure you are using the right ``yosys`` executable; unless the
+``-yosys`` option is provided, it will use whatever the shell defaults to.  If
+you are using the ``-runner`` option, try replacing the `bugpoint` command with
+``write_rtlil test.il`` and then on a new line, ``!<wrapper> yosys -s
+<failure.ys> test.il`` to check it works as expected and returns a non-zero
+status.
+
+Depending on the size of your design, and the length of your ``<failure.ys>``,
+`bugpoint` may take some time; remember, it will run ``yosys -s <failure.ys>``
+on each iteration of the design.  The bigger the design, the more iterations.
+The longer the ``<failure.ys>``, the longer each iteration will take.  As the
+design shrinks and `bugpoint` converges, each iteration should take less and
+less time.  Once all simplifications are exhausted and there are no more objects
+that can be removed, the script will continue and the minimized design can be
+saved.
+
 
 What do I do with the minimized design?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

From 9fa1f76cf2b364a825d98a0b9ef672f059965a94 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:59 +1200
Subject: [PATCH 251/931] bugpoint.rst: Why context matters (bullets)

---
 docs/source/using_yosys/bugpoint.rst | 50 ++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 7d38124bf..54559de32 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -230,6 +230,10 @@ Minimizing scripts
 ------------------
 
 - reminder to back up original code before modifying it
+
+  + sometimes over-minimizing scripts can hide underlying issues, so maintaining
+    the original context is important
+
 - if you're using command line, convert it to a script
 - if you're using one of the :doc:`/using_yosys/synthesis/synth`, replace it
   with its contents
@@ -370,6 +374,18 @@ Identifying issues
     to a right shift (or `$shr`)?
   + is the issue tied to specific parameters, widths, or values?
 
+- if the failing command was part of a larger script, such as one of the
+  :doc:`/using_yosys/synthesis/synth`, you could try to follow the design
+  through the script
+
+  + sometimes when a command is raising an error, you're seeing a symptom rather
+    than the underlying issue
+  + an earlier command may be putting the design in an invalid state which isn't
+    picked up until the error is raised
+  + check out :ref:`using_yosys/bugpoint:Why context matters`
+  + if you're using a fuzzer to find issues in Yosys, you should be prepared to
+    do this step
+
 - if you're familiar with C/C++ you might try to have a look at the source
   code of the command that's failing
 
@@ -404,6 +420,40 @@ Identifying issues
   for :ref:`using_yosys/bugpoint:creating an issue on github`
 
 
+Why context matters
+-------------------
+
+- if you did `minimize your script`_, and removed commands prior to the failure
+  to get a smaller design, try to work backwards and find which commands may
+  have contributed to the design failing
+- especially important when the bug is happening inside of a ``synth_*`` script
+- example (#4590)
+  
+  + say you did all the minimization and found that the error occurs when a call
+    to ``techmap -map +/xilinx/cells_map.v`` with ``MIN_MUX_INPUTS`` defined
+    parses a `$_MUX16_` with all inputs set to ``1'x``
+  + step through the original script, calling `stat` after each step to find
+    when the `$_MUX16_` is added
+  + find that the `$_MUX16_` is introduced by a call to `muxcover`, but all the
+    inputs are defined, so calling `techmap` now works as expected
+
+    * and from running `bugpoint` with the failing techmap you know that the
+      cell with index ``2297`` will fail, so you can now call ``select
+      top/*$2297`` to limit to just that cell, and optionally call ``design
+      -save pre_bug`` or ``write_rtlil -selected pre_bug.il`` to save this state
+
+  + next you step through the remaining commands and call `dump` after each to
+    find when the inputs are disconnected
+  + find that ``opt -full`` has optimized away portions of the circuit, leading
+    to `opt_expr` setting the undriven mux inputs to ``x``, but failing to
+    remove the now unnecessary `$_MUX16_`
+
+- in this example, you might've stopped with the minimal reproducer, fixed the
+  bug in ``+/xilinx/cells_map.v``, and carried on
+- but by following the failure back you've managed to identify a problem with
+  `opt_expr` that could be causing other problems either now or in the future
+
+
 Creating an issue on GitHub
 ---------------------------
 

From e776f1dca20d406097e47b230e247a23b4d59ddf Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:59 +1200
Subject: [PATCH 252/931] bugpoint.rst: More paragraphs

What do I do with the minimized design and (the first half of) Minimizing scripts
---
 docs/source/using_yosys/bugpoint.rst | 107 ++++++++++++++++++---------
 1 file changed, 74 insertions(+), 33 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 54559de32..80694fd2d 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -204,9 +204,10 @@ saved.
 What do I do with the minimized design?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- check minimized design still fails, especially if not using `write_rtlil`
-- e.g. if you ran :ref:`bugpoint_script` below, then calling ``yosys -s
-  <failure.ys> min.v`` should still fail in the same way
+First off, check the minimized design still fails.  This is especially important
+if you're not using `write_rtlil` to output the minimized design.  For example,
+if you ran :ref:`bugpoint_script` below, then calling ``yosys -s <failure.ys>
+min.v`` should still fail in the same way.
 
 .. code-block:: yoscrypt
    :caption: example `bugpoint` minimizer
@@ -216,12 +217,21 @@ What do I do with the minimized design?
    bugpoint -script <failure.ys>
    write_verilog min.v
 
-- `write_rtlil` is more reliable since `bugpoint` will have run that exact
-  code through the failing script; other ``write_*`` commands convert from the
-  RTLIL and then back again during the ``read_*`` which can result in
-  differences which mean the design no longer fails
-- check out :ref:`using_yosys/bugpoint:identifying issues` for more on what to
-  do next
+The `write_rtlil` command is generally more reliable, since `bugpoint` will have
+run that exact code through the failing script.  Other ``write_*`` commands
+convert from the RTLIL and then back again during the ``read_*`` which can
+result in differences which mean the design no longer fails.
+
+.. note::
+
+   Simply calling Yosys with the output of ``write_*``, as in ``yosys -s
+   <failure.ys> min.v``, does not guarantee that the corresponding ``read_*``
+   will be used. For more about this, refer to
+   :doc:`/using_yosys/more_scripting/load_design`, or load the design explicitly
+   with ``yosys -p 'read_verilog min.v' -s <failure.ys>``.
+
+Once you've verified the failure still happens, check out
+:ref:`using_yosys/bugpoint:identifying issues` for more on what to do next.
 
 
 .. _minimize your script:
@@ -229,19 +239,43 @@ What do I do with the minimized design?
 Minimizing scripts
 ------------------
 
-- reminder to back up original code before modifying it
+If you're using a command line prompt, such as ``yosys -p 'synth_xilinx' -o
+design.json design.v``, consider converting it to a script.  It's generally much
+easier to iterate over changes to a script in a file rather than one on the
+command line, as well as being better for sharing with others.
 
-  + sometimes over-minimizing scripts can hide underlying issues, so maintaining
-    the original context is important
+.. code-block:: yoscrypt
+   :caption: example script, ``script.ys``, for prompt ``yosys -p 'synth_xilinx' -o design.json design.v``
 
-- if you're using command line, convert it to a script
-- if you're using one of the :doc:`/using_yosys/synthesis/synth`, replace it
-  with its contents
+   read_verilog design.v
+   synth_xilinx
+   write_json design.json
 
-  + can also do this piece-wise with the ``-run`` option
-  + e.g. replacing ``synth -top <top> -lut`` with :ref:`replace_synth`
-  + the options ``-top <top> -lut`` can be provided to each `synth` step, or
-    to just the step(s) where it is relevant, as done here
+Next up you want to remove everything *after* the error occurs.  Using the
+``-L`` flag can help here, allowing you to specify a file to log to, such as
+``yosys -L out.log -s script.ys``.  Most commands will print a header message
+when they begin; something like ``2.48. Executing HIERARCHY pass (managing
+design hierarchy).``  The last header message will usually be the failing
+command.  There are some commands which don't print a header message, so you may
+want to add ``echo on`` to the start of your script.  The `echo` command echoes
+each command executed, along with any arguments given to it.  For the
+`hierarchy` example above this might be ``yosys> hierarchy -check``.
+
+.. note::
+
+   It may also be helpful to use the `log` command to add messages which you can
+   then search for either in the terminal or the logfile.  This can be quite
+   useful if your script contains script-passes, like the
+   :doc:`/using_yosys/synthesis/synth`, which call many sub-commands and you're
+   not sure exactly which script-pass is calling the failing command.
+
+If your final command calls sub-commands, replace it with its contents and
+repeat the previous step.  In the case of the
+:doc:`/using_yosys/synthesis/synth`, as well as certain other script-passes, you
+can use the ``-run`` option to simplify this.  For example we can replace
+``synth -top <top> -lut`` with the :ref:`replace_synth`.  The options ``-top
+<top> -lut`` can be provided to each `synth` step, or to just the step(s) where
+it is relevant, as done here.
 
 .. code-block:: yoscrypt
    :caption: example replacement script for `synth` command
@@ -252,20 +286,12 @@ Minimizing scripts
    synth -lut -run fine:check
    synth -run check:
 
-- remove everything *after* the error occurs
-- can use `log` command to print messages to help locate the failure point
-- `echo` can also help (``echo on``)
-
-  + if you used a ``-run`` option like in :ref:`replace_synth` above, you can
-    now replace the failing step with its contents and repeat the above if
-    needed
-  + checking the log should tell you the last command that ran which can make
-    this easier
-  + say we ran :ref:`replace_synth` and were able to remove the ``synth -run
-    check:`` and still got our error, then we check the log and we see the last
-    thing before the error was ``7.2. Executing MEMORY_MAP pass (converting
-    memories to logic and flip-flops).``
-  + we can then update our script to the following:
+Say we ran :ref:`replace_synth` and were able to remove the ``synth -run
+check:`` and still got our error, then we check the log and we see the last
+thing before the error was ``7.2. Executing MEMORY_MAP pass (converting memories
+to logic and flip-flops)``. By checking the output of ``yosys -h synth`` (or the
+`synth` help page) we can see that the `memory_map` pass is called in the
+``fine`` step.  We can then update our script to the following:
 
 .. code-block:: yoscrypt
    :caption: example replacement script for `synth` when `memory_map` is failing
@@ -274,6 +300,21 @@ Minimizing scripts
    opt -fast -full
    memory_map
 
+By giving `synth` the option ``-run :fine``, we are telling it to run from the
+beginning of the script until the ``fine`` step, where we then give it the exact
+commands to run.  There are some cases where the commands given in the help
+output are not an exact match for what is being run, but are instead a
+simplification.  If you find that replacing the script-pass with its contents
+causes the error to disappear, or change, try calling the script-pass with
+``echo on`` to see exactly what commands are being called and what options are
+used.
+
+.. warning::
+
+   Before continuing further, *back up your code*.  The following steps can
+   remove context and lead to over-minimizing scripts, hiding underlying issues.
+   Check out :ref:`using_yosys/bugpoint:Why context matters` to learn more.
+
 - try ``write_rtlil <design.il>; design -reset; read_rtlil <design.il>;`` before
   the failure point
 

From c75b07820ffbd5f317a88c94e7bae77d2e4e63f4 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:53:59 +1200
Subject: [PATCH 253/931] Docs: More bugpoint bullets

More info for creating GitHub issues and the different sections.
Discuss additional details that can be included as comments on the issue.  Also mention Gists for large files (preferable to downloading a .txt).
Add a warning about external plugins/tools.
Also add a note to `load_design.rst` about `Frontend`s and `-f` command line option.
---
 docs/source/using_yosys/bugpoint.rst          | 102 ++++++++++++++++--
 .../more_scripting/load_design.rst            |   4 +
 2 files changed, 100 insertions(+), 6 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 80694fd2d..2316510cf 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -498,10 +498,27 @@ Why context matters
 Creating an issue on GitHub
 ---------------------------
 
-- "Reproduction Steps" is ideally a code-block (starting and ending with triple
-  backquotes) containing the minimized design (Verilog or RTLIL), followed by a
-  code-block containing the minimized yosys script OR a command line call to
-  yosys with code-formatting (starting and ending with single backquotes)
+- use the `bug report template`_
+
+.. _bug report template: https://github.com/YosysHQ/yosys/issues/new?template=bug_report.yml
+
+- short title briefly describing the issue, e.g.
+
+   techmap of wide mux with undefined inputs raises error during synth_xilinx
+
+   + tells us what's happening ("raises error")
+   + gives the command affected (`techmap`)
+   + an overview of the input design ("wide mux with undefined inputs")
+   + and some context where it was found ("during `synth_xilinx`")
+
+
+Reproduction Steps
+~~~~~~~~~~~~~~~~~~
+
+- ideally a code-block (starting and ending with triple backquotes) containing
+  the minimized design (Verilog or RTLIL), followed by a code-block containing
+  the minimized yosys script OR a command line call to yosys with
+  code-formatting (starting and ending with single backquotes)
 
 .. code-block:: markdown
 
@@ -535,5 +552,78 @@ Creating an issue on GitHub
    # minimum sequence of commands
    ```
 
-- any environment variables or command line options should also be mentioned in
-  the "Reproduction Steps"
+- any environment variables or command line options should also be mentioned
+- if the problem occurs for a range of values/designs, what is that range
+- if you're using an external tool, such as ``valgrind``, to detect the issue,
+  what version of that tool are you using and what options are you giving it
+
+.. warning::
+
+   Please try to avoid the use of any external plugins/tools in the reproduction
+   steps if they are not directly related to the issue being raised.  This
+   includes frontend plugins such as GHDL or slang; use `write_rtlil` on the
+   minimized design instead.  This also includes tools which provide a wrapper
+   around Yosys such as OpenLane; you should instead minimize your input and
+   reproduction steps to just the Yosys part.
+
+"Expected Behaviour"
+~~~~~~~~~~~~~~~~~~~~
+
+- if you have a similar design/script that doesn't give the error, include it
+  here as a reference
+- if the bug is that an error *should* be raised but isn't, are there any other
+  commands with similar error messages
+
+
+"Actual Behaviour"
+~~~~~~~~~~~~~~~~~~
+
+- any error messages go here
+- any details relevant to the crash that were found with ``--trace`` or
+  ``--debug`` flags
+- if you identified the point of failure in the source code, you could mention
+  it here, or as a comment below
+
+  + if possible, use a permalink to the source on GitHub
+  + you can browse the source repository for a certain commit with the failure
+    and open the source file, select the relevant lines (click on the line
+    number for the first relevant line, then while holding shift click on the
+    line number for the last relevant line), click on the `...` that appears and
+    select "Copy permalink"
+  + should look something like
+    ``https://github.com/YosysHQ/yosys/blob/<commit_hash>/path/to/file#L139-L147``
+  + clicking on "Preview" should reveal a code block containing the lines of
+    source specified, with a link to the source file at the given commit
+
+
+Additional details
+~~~~~~~~~~~~~~~~~~
+
+- once you have created the issue, any additional details can be added as a
+  comment on that issue
+- could include any additional context as to what you were doing when you first
+  encountered the bug
+- was this issue discovered through the use of a fuzzer
+- if you've minimized the script, consider including the `bugpoint` script you
+  used, or the original script, e.g.
+
+.. code-block:: markdown
+
+   Minimized with
+   ```
+   read_verilog design.v
+   # original sequence of commands prior to error
+   bugpoint -script <failure.ys> -grep "<string>"
+   write_rtlil min.il
+   ```
+
+   OR
+
+   Minimized from
+   `yosys -p ': original sequence of commands to produce error;' design.v`
+
+- if you're able to, it may also help to share the original un-minimized design
+
+  + if the design is too big for a comment, consider turning it into a `Gist`_
+
+.. _Gist: https://gist.github.com/
diff --git a/docs/source/using_yosys/more_scripting/load_design.rst b/docs/source/using_yosys/more_scripting/load_design.rst
index 1c597bdfc..7e417eff9 100644
--- a/docs/source/using_yosys/more_scripting/load_design.rst
+++ b/docs/source/using_yosys/more_scripting/load_design.rst
@@ -68,6 +68,10 @@ Yosys frontends
 
   + executed as multiple successive calls to the frontend
 
+- compatible with ``-f`` command line option, e.g. ``yosys -f verilog
+  design.txt`` will use the `read_verilog` frontend with the input file
+  ``design.txt``
+
 - `verific` and `read` commands are technically not 'Frontends', but their
   behaviour is kept in sync
 

From 113a6f6e525f3fc98bac64c8fd6b65ae08ff12dd Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:00 +1200
Subject: [PATCH 254/931] bugpoint.rst: yosys -h bugpoint does work

I just missed that it only gets included in the makefile if `DISABLE_SPAWN` is set, because I was looking for the C define `YOSYS_DISABLE_SPAWN`.
---
 docs/source/using_yosys/bugpoint.rst | 35 ++++++++++++----------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 2316510cf..e7bbfa665 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -49,24 +49,10 @@ The first thing to be aware of is that `bugpoint` is not available in every
 build of Yosys.  Because the command works by invoking external processes, it
 requires that Yosys can spawn executables.  Notably this means `bugpoint` is not
 able to be used in WebAssembly builds such as that available via YoWASP.  The
-easiest way to check your build of Yosys is by running ``yosys -qq -p '!echo
-test'``.  If this echoes ``test`` in the console, then `bugpoint` will work as
-expected.  If instead if it displays the text ``ERROR: Shell is not available.``
-then `bugpoint` will not work either.
-
-.. note::
-
-   The console command ``yosys -qq -p '!echo test'`` uses the ``-qq`` flag to
-   prevent Yosys from outputting non-error messages to the console.  The ``-p``
-   option executes ``!echo test`` as a Yosys command, attempting to pass ``echo
-   test`` to the shell for execution.  For more about the ``-p`` option and
-   common pitfalls, check out :ref:`getting_started/scripting_intro:script
-   parsing` in the :doc:`/getting_started/index` section.
-
-.. TODO:: Add ``YOSYS_DISABLE_SPAWN`` check in ``bugpoint.cc``.
-
-   At least in the help text, so that ``yosys -h bugpoint`` will correctly
-   indicate if the command will work instead of this roundabout method.
+easiest way to check your build of Yosys is by running ``yosys -h bugpoint``. If
+Yosys displays the help text for `bugpoint` then it is available for use, but if
+it instead prints "No such command or cell type: bugpoint", then `bugpoint` is
+not available.
 
 Next you need to separate loading the design from the failure point; you should
 be aiming to reproduce the failure by running ``yosys -s <load.ys> -s
@@ -315,6 +301,15 @@ used.
    remove context and lead to over-minimizing scripts, hiding underlying issues.
    Check out :ref:`using_yosys/bugpoint:Why context matters` to learn more.
 
+When a problem is occurring many steps into a script, minimizing the design at
+the start of the script isn't always enough to identify the cause of the issue.
+Each extra step of the script can lead to larger sections of the input design
+being needed for the specific problem to be preserved until it causes a crash.
+So to find the smallest possible reproducer it can sometimes be helpful to
+remove commands prior to the failure point.
+
+
+
 - try ``write_rtlil <design.il>; design -reset; read_rtlil <design.il>;`` before
   the failure point
 
@@ -588,8 +583,8 @@ Reproduction Steps
   + you can browse the source repository for a certain commit with the failure
     and open the source file, select the relevant lines (click on the line
     number for the first relevant line, then while holding shift click on the
-    line number for the last relevant line), click on the `...` that appears and
-    select "Copy permalink"
+    line number for the last relevant line), click on the ``...`` that appears
+    and select "Copy permalink"
   + should look something like
     ``https://github.com/YosysHQ/yosys/blob/<commit_hash>/path/to/file#L139-L147``
   + clicking on "Preview" should reveal a code block containing the lines of

From 20a573953cbb483aec74e4f66d0cabe3463679c3 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:00 +1200
Subject: [PATCH 255/931] bugpoint.rst: Minimizing scripts

part 2: electric boogaloo
---
 docs/source/using_yosys/bugpoint.rst | 66 ++++++++++++++++++----------
 1 file changed, 44 insertions(+), 22 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index e7bbfa665..ca54bc8f0 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -308,38 +308,60 @@ being needed for the specific problem to be preserved until it causes a crash.
 So to find the smallest possible reproducer it can sometimes be helpful to
 remove commands prior to the failure point.
 
+The simplest way to do this is by writing out the design, resetting the current
+state, and reading back the design:
 
+.. code-block:: yoscrypt
 
-- try ``write_rtlil <design.il>; design -reset; read_rtlil <design.il>;`` before
-  the failure point
+   write_rtlil <design.il>; design -reset; read_rtlil <design.il>;
 
-  + ideally you now have a single command that is producing an error and can
-    `minimize your RTLIL`_ with the ``<design.il>`` output
-  + if not, try to move the write/reset/read earlier in the script until you can
-    reproduce the error
-  + if you have no idea where exactly you should put the reset, the best way is
-    to use a "binary search" type approach, reducing the possible options by
-    half after each attempt
+In most cases, this can be inserted immediately before the failing command while
+still producing the error, allowing you to `minimize your RTLIL`_ with the
+``<design.il>`` output.  For our previous example with `memory_map`, if
+:ref:`map_reset` still gives the same error, then we should now be able to call
+``yosys design.il -p 'memory_map'`` to reproduce it.
 
-    * for example, your script has 16 commands in it before failing on the 17th
-    * if resetting immediately before the 17th doesn't reproduce the error, try
-      between the 8th and 9th (8 is half of the total 16)
-    * if that produces the error then you can remove everything before the
-      `read_rtlil` and try reset again in the middle of what's left, making sure
-      to use a different name for the output file so that you don't overwrite
-      what you've already got
-    * if the error isn't produced then you need to go earlier still, so in this
-      case you would do between the 4th and 5th (4 is half of the previous 8)
-    * repeat this until you can't reduce the remaining commands any further
+.. code-block:: yoscrypt
+   :caption: resetting the design immediately before failure
+   :name: map_reset
+
+   synth -top <top> -run :fine
+   opt -fast -full
+   write_rtlil design.il; design -reset; read_rtlil design.il;
+   memory_map
+
+If that doesn't give the error (or doesn't give the same error), then you should
+try to move the write/reset/read earlier in the script until it does.  If you
+have no idea where exactly you should put the reset, the best way is to use a
+"binary search" type approach, reducing the possible options by half after each
+attempt.
+
+   As an example, your script has 16 commands in it before failing on the 17th.
+   If resetting immediately before the 17th doesn't reproduce the error, try
+   between the 8th and 9th (8 is half of the total 16).  If that produces the
+   error then you can remove everything before the `read_rtlil` and try reset
+   again in the middle of what's left, making sure to use a different name for
+   the output file so that you don't overwrite what you've already got.  If the
+   error isn't produced then you need to go earlier still, so in this case you
+   would do between the 4th and 5th (4 is half of the previous 8).  Repeat this
+   until you can't reduce the remaining commands any further.
 
 .. TODO:: is it possible to dump scratchpad?
 
    is there anything else in the yosys/design state that doesn't get included in
    `write_rtlil`?
 
-- you can also try to remove or comment out commands prior to the failing
-  command; just because the first and last commands are needed doesn't mean that
-  every command between them is
+A more conservative, but more involved, method is to remove or comment out
+commands prior to the failing command.  Each command, or group of commands, can
+be disabled one at a time while checking if the error still occurs, eventually
+giving the smallest subset of commands needed to take the original input through
+to the error.  The difficulty with this method is that depending on your design,
+some commands may be necessary even if they aren't needed to reproduce the
+error.  For example, if your design includes ``process`` blocks, many commands
+will fail unless you run the `proc` command.  While this approach can do a
+better job of maintaining context, it is often easier to *recover* the context
+after the design has been minimized for producing the error.  For more on
+recovering context, checkout :ref:`using_yosys/bugpoint:Why context matters`.
 
 
 Minimizing Verilog designs

From f0b4f7012e689fcf98b991075e3cf67365504d5b Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:00 +1200
Subject: [PATCH 256/931] bugpoint.rst: Extra notes

Move `yosys -h bugpoint` failure into a code-block to break up text.  Same for the `exec -expect-return` example.
TODOs on #5068 being merged.
---
 docs/source/using_yosys/bugpoint.rst | 36 ++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index ca54bc8f0..6f58e3d5b 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -24,6 +24,13 @@ Minimizing failing (or bugged) designs
 .. _iverilog: https://steveicarus.github.io/iverilog/
 .. _verilator: https://www.veripool.org/verilator/
 
+- are there any warnings before the error (either immediately before or in an
+  earlier command) that could be related?
+- does calling `check` before the failure give any errors or warnings?
+- did you call `hierarchy` before the failure?
+
+  + can you call ``hierarchy -check``?
+
 - make sure to back up your code (design source and yosys script(s)) before
   making any modifications
 
@@ -50,9 +57,15 @@ build of Yosys.  Because the command works by invoking external processes, it
 requires that Yosys can spawn executables.  Notably this means `bugpoint` is not
 able to be used in WebAssembly builds such as that available via YoWASP.  The
 easiest way to check your build of Yosys is by running ``yosys -h bugpoint``. If
-Yosys displays the help text for `bugpoint` then it is available for use, but if
-it instead prints "No such command or cell type: bugpoint", then `bugpoint` is
-not available.
+Yosys displays the help text for `bugpoint` then it is available for use.
+
+.. code-block:: console
+   :caption: `bugpoint` is unavailable
+
+   $ yosys -h bugpoint
+
+   -- Running command `help bugpoint' --
+   No such command or cell type: bugpoint
 
 Next you need to separate loading the design from the failure point; you should
 be aiming to reproduce the failure by running ``yosys -s <load.ys> -s
@@ -87,8 +100,11 @@ making use of the `exec` command in ``<failure.ys>``.  This is especially useful
 when Yosys is outputting an invalid design, or when some other tool is
 incompatible with the design.  Be sure to use the ``exec -expect-*`` options so
 that the pass/fail can be detected correctly.  Multiple calls to `exec` can be
-made, or even entire shell scripts (e.g. ``exec -expect-return 1 -- bash
-<script.sh>``).
+made, or even entire shell scripts:
+
+.. code-block:: yoscrypt
+
+   exec -expect-return 1 --bash <script.sh>
 
 Our final failure we can use with `bugpoint` is one returned by a wrapper
 process, such as ``valgrind`` or ``timeout``.  In this case you will be calling
@@ -98,6 +114,8 @@ leak or excessive runtime.  Note however that unlike the `exec` command, there
 is currently no way to check the return status or messages from the wrapper
 process; only a binary pass/fail.
 
+.. TODO:: above note pending updated bugpoint #5068
+
 
 How do I use bugpoint?
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -140,11 +158,7 @@ For more about the options available, check ``help bugpoint`` or
    work with runtime errors such as a ``SEGFAULT`` as it is only able to match
    strings from the log file.
 
-.. TODO::  Consider checking ``run_command`` return value for runtime errors.
-
-   Currently ``BugpointPass::run_yosys`` returns ``run_command(yosys_cmdline) ==
-   0``, so it shouldn't be too hard to add an option for it.  Could also be
-   used with the ``-runner`` option, which might give it a bit more flexibility.
+.. TODO::  above note pending updated bugpoint #5068
 
 By default, `bugpoint` is able to remove any part of the design.  In order to
 keep certain parts, for instance because you already know they are related to
@@ -177,6 +191,8 @@ you are using the ``-runner`` option, try replacing the `bugpoint` command with
 <failure.ys> test.il`` to check it works as expected and returns a non-zero
 status.
 
+.. TODO:: note on ``!`` (link to :ref:`getting_started/scripting_intro:script parsing`)
+
 Depending on the size of your design, and the length of your ``<failure.ys>``,
 `bugpoint` may take some time; remember, it will run ``yosys -s <failure.ys>``
 on each iteration of the design.  The bigger the design, the more iterations.

From 65b75049aa5da7683e576a2c7165f30c1560e885 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:00 +1200
Subject: [PATCH 257/931] docs: Shuffling bug reporting guidelines

Move the "creating an issue" section from bugpoint.rst to "reporting bugs" in `contributing.rst`.
Fix link to `CONTRIBUTING.md`.
Update `CONTRIBUTING.md` to refer to the bugpoint guide instead of the stack overflow guide.
---
 CONTRIBUTING.md                               |  16 +--
 docs/source/using_yosys/bugpoint.rst          | 136 +-----------------
 .../extending_yosys/contributing.rst          | 136 +++++++++++++++++-
 3 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6c4376cc4..74f9ab10d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,14 +19,14 @@ much easier for someone to respond and help.
 
 ### Bug reports
 
-Before you submit an issue, please have a search of the existing issues in case
-one already exists.  Making sure that you have a minimal, complete and
-verifiable example (MVCE) is a great way to quickly check an existing issue
-against a new one.  Stack overflow has a guide on [how to create an
-MVCE](https://stackoverflow.com/help/minimal-reproducible-example).  The
-[`bugpoint`
-command](https://yosyshq.readthedocs.io/projects/yosys/en/latest/cmd/bugpoint.html)
-in Yosys can be helpful for this process.
+Before you submit an issue, please check out the [how-to guide for
+`bugpoint`](https://yosys.readthedocs.io/en/latest/using_yosys/bugpoint.html).
+This guide will take you through the process of using the [`bugpoint`
+command](https://yosys.readthedocs.io/en/latest/cmd/bugpoint.html) in Yosys to
+produce a [minimal, complete and verifiable
+example](https://stackoverflow.com/help/minimal-reproducible-example) (MVCE).
+Providing an MVCE with your bug report drastically increases the likelihood that
+someone will be able to help resolve your issue.
 
 
 # Using pull requests
diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 6f58e3d5b..89c58a8f4 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -491,7 +491,7 @@ Identifying issues
 .. _the existing issues: https://github.com/YosysHQ/yosys/issues
 
 - if there are no existing or related issues already, then check out the steps
-  for :ref:`using_yosys/bugpoint:creating an issue on github`
+  for :ref:`yosys_internals/extending_yosys/contributing:reporting bugs`
 
 
 Why context matters
@@ -526,137 +526,3 @@ Why context matters
   bug in ``+/xilinx/cells_map.v``, and carried on
 - but by following the failure back you've managed to identify a problem with
   `opt_expr` that could be causing other problems either now or in the future
-
-
-Creating an issue on GitHub
----------------------------
-
-- use the `bug report template`_
-
-.. _bug report template: https://github.com/YosysHQ/yosys/issues/new?template=bug_report.yml
-
-- short title briefly describing the issue, e.g.
-
-   techmap of wide mux with undefined inputs raises error during synth_xilinx
-
-   + tells us what's happening ("raises error")
-   + gives the command affected (`techmap`)
-   + an overview of the input design ("wide mux with undefined inputs")
-   + and some context where it was found ("during `synth_xilinx`")
-
-
-Reproduction Steps
-~~~~~~~~~~~~~~~~~~
-
-- ideally a code-block (starting and ending with triple backquotes) containing
-  the minimized design (Verilog or RTLIL), followed by a code-block containing
-  the minimized yosys script OR a command line call to yosys with
-  code-formatting (starting and ending with single backquotes)
-
-.. code-block:: markdown
-
-   min.v
-   ```verilog
-   // minimized Verilog design
-   ```
-
-   min.ys
-   ```
-   read_verilog min.v
-   # minimum sequence of commands to reproduce error
-   ```
-
-   OR
-
-   `yosys -p ': minimum sequence of commands;' min.v`
-
-- alternatively can provide a single code-block which includes the minimized
-  design as a "here document" followed by the sequence of commands which
-  reproduce the error
-
-  + see :doc:`/using_yosys/more_scripting/load_design` for more on heredocs.
-
-.. code-block:: markdown
-
-   ```
-   read_rtlil <<EOF
-   # minimized RTLIL design
-   EOF
-   # minimum sequence of commands
-   ```
-
-- any environment variables or command line options should also be mentioned
-- if the problem occurs for a range of values/designs, what is that range
-- if you're using an external tool, such as ``valgrind``, to detect the issue,
-  what version of that tool are you using and what options are you giving it
-
-.. warning::
-
-   Please try to avoid the use of any external plugins/tools in the reproduction
-   steps if they are not directly related to the issue being raised.  This
-   includes frontend plugins such as GHDL or slang; use `write_rtlil` on the
-   minimized design instead.  This also includes tools which provide a wrapper
-   around Yosys such as OpenLane; you should instead minimize your input and
-   reproduction steps to just the Yosys part.
-
-"Expected Behaviour"
-~~~~~~~~~~~~~~~~~~~~
-
-- if you have a similar design/script that doesn't give the error, include it
-  here as a reference
-- if the bug is that an error *should* be raised but isn't, are there any other
-  commands with similar error messages
-
-
-"Actual Behaviour"
-~~~~~~~~~~~~~~~~~~
-
-- any error messages go here
-- any details relevant to the crash that were found with ``--trace`` or
-  ``--debug`` flags
-- if you identified the point of failure in the source code, you could mention
-  it here, or as a comment below
-
-  + if possible, use a permalink to the source on GitHub
-  + you can browse the source repository for a certain commit with the failure
-    and open the source file, select the relevant lines (click on the line
-    number for the first relevant line, then while holding shift click on the
-    line number for the last relevant line), click on the ``...`` that appears
-    and select "Copy permalink"
-  + should look something like
-    ``https://github.com/YosysHQ/yosys/blob/<commit_hash>/path/to/file#L139-L147``
-  + clicking on "Preview" should reveal a code block containing the lines of
-    source specified, with a link to the source file at the given commit
-
-
-Additional details
-~~~~~~~~~~~~~~~~~~
-
-- once you have created the issue, any additional details can be added as a
-  comment on that issue
-- could include any additional context as to what you were doing when you first
-  encountered the bug
-- was this issue discovered through the use of a fuzzer
-- if you've minimized the script, consider including the `bugpoint` script you
-  used, or the original script, e.g.
-
-.. code-block:: markdown
-
-   Minimized with
-   ```
-   read_verilog design.v
-   # original sequence of commands prior to error
-   bugpoint -script <failure.ys> -grep "<string>"
-   write_rtlil min.il
-   ```
-
-   OR
-
-   Minimized from
-   `yosys -p ': original sequence of commands to produce error;' design.v`
-
-- if you're able to, it may also help to share the original un-minimized design
-
-  + if the design is too big for a comment, consider turning it into a `Gist`_
-
-.. _Gist: https://gist.github.com/
diff --git a/docs/source/yosys_internals/extending_yosys/contributing.rst b/docs/source/yosys_internals/extending_yosys/contributing.rst
index 69258aa5f..70170fc48 100644
--- a/docs/source/yosys_internals/extending_yosys/contributing.rst
+++ b/docs/source/yosys_internals/extending_yosys/contributing.rst
@@ -7,7 +7,7 @@ Contributing to Yosys
    |CONTRIBUTING|_ file.
 
 .. |CONTRIBUTING| replace:: :file:`CONTRIBUTING.md`
-.. _CONTRIBUTING: https://github.com/YosysHQ/yosys/CONTRIBUTING.md
+.. _CONTRIBUTING: https://github.com/YosysHQ/yosys/blob/main/CONTRIBUTING.md
 
 Coding Style
 ------------
@@ -42,3 +42,137 @@ for implicit type casts, always use ``GetSize(foobar)`` instead of
 ``foobar.size()``. (``GetSize()`` is defined in :file:`kernel/yosys.h`)
 
 Use range-based for loops whenever applicable.
+
+
+Reporting bugs
+--------------
+
+- use the `bug report template`_
+
+.. _bug report template: https://github.com/YosysHQ/yosys/issues/new?template=bug_report.yml
+
+- short title briefly describing the issue, e.g.
+
+   techmap of wide mux with undefined inputs raises error during synth_xilinx
+
+   + tells us what's happening ("raises error")
+   + gives the command affected (`techmap`)
+   + an overview of the input design ("wide mux with undefined inputs")
+   + and some context where it was found ("during `synth_xilinx`")
+
+
+Reproduction Steps
+~~~~~~~~~~~~~~~~~~
+
+- ideally a code-block (starting and ending with triple backquotes) containing
+  the minimized design (Verilog or RTLIL), followed by a code-block containing
+  the minimized yosys script OR a command line call to yosys with
+  code-formatting (starting and ending with single backquotes)
+
+.. code-block:: markdown
+
+   min.v
+   ```verilog
+   // minimized Verilog design
+   ```
+
+   min.ys
+   ```
+   read_verilog min.v
+   # minimum sequence of commands to reproduce error
+   ```
+
+   OR
+
+   `yosys -p ': minimum sequence of commands;' min.v`
+
+- alternatively can provide a single code-block which includes the minimized
+  design as a "here document" followed by the sequence of commands which
+  reproduce the error
+
+  + see :doc:`/using_yosys/more_scripting/load_design` for more on heredocs.
+
+.. code-block:: markdown
+
+   ```
+   read_rtlil <<EOF
+   # minimized RTLIL design
+   EOF
+   # minimum sequence of commands
+   ```
+
+- any environment variables or command line options should also be mentioned
+- if the problem occurs for a range of values/designs, what is that range
+- if you're using an external tool, such as ``valgrind``, to detect the issue,
+  what version of that tool are you using and what options are you giving it
+
+.. warning::
+
+   Please try to avoid the use of any external plugins/tools in the reproduction
+   steps if they are not directly related to the issue being raised.  This
+   includes frontend plugins such as GHDL or slang; use `write_rtlil` on the
+   minimized design instead.  This also includes tools which provide a wrapper
+   around Yosys such as OpenLane; you should instead minimize your input and
+   reproduction steps to just the Yosys part.
+
+"Expected Behaviour"
+~~~~~~~~~~~~~~~~~~~~
+
+- if you have a similar design/script that doesn't give the error, include it
+  here as a reference
+- if the bug is that an error *should* be raised but isn't, are there any other
+  commands with similar error messages
+
+
+"Actual Behaviour"
+~~~~~~~~~~~~~~~~~~
+
+- any error messages go here
+- any details relevant to the crash that were found with ``--trace`` or
+  ``--debug`` flags
+- if you identified the point of failure in the source code, you could mention
+  it here, or as a comment below
+
+  + if possible, use a permalink to the source on GitHub
+  + you can browse the source repository for a certain commit with the failure
+    and open the source file, select the relevant lines (click on the line
+    number for the first relevant line, then while holding shift click on the
+    line number for the last relevant line), click on the ``...`` that appears
+    and select "Copy permalink"
+  + should look something like
+    ``https://github.com/YosysHQ/yosys/blob/<commit_hash>/path/to/file#L139-L147``
+  + clicking on "Preview" should reveal a code block containing the lines of
+    source specified, with a link to the source file at the given commit
+
+
+Additional details
+~~~~~~~~~~~~~~~~~~
+
+- once you have created the issue, any additional details can be added as a
+  comment on that issue
+- could include any additional context as to what you were doing when you first
+  encountered the bug
+- was this issue discovered through the use of a fuzzer
+- if you've minimized the script, consider including the `bugpoint` script you
+  used, or the original script, e.g.
+
+.. code-block:: markdown
+
+   Minimized with
+   ```
+   read_verilog design.v
+   # original sequence of commands prior to error
+   bugpoint -script <failure.ys> -grep "<string>"
+   write_rtlil min.il
+   ```
+
+   OR
+
+   Minimized from
+   `yosys -p ': original sequence of commands to produce error;' design.v`
+
+- if you're able to, it may also help to share the original un-minimized design
+
+  + if the design is too big for a comment, consider turning it into a `Gist`_
+
+.. _Gist: https://gist.github.com/

From c47b533a3da6a6938ea735a19f6c2ba578f80a30 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:01 +1200
Subject: [PATCH 258/931] docs: Split bugpoint.rst into user/developer

Minimizing scripts (and more generally identifying root cause) isn't necessary for regular bug reports.  Rather, it can be useful for developers working on *fixing* bugs, and also for fuzzers to avoid spam.
Minor adjustments to `bugpoint.rst`.
Add note to `advanced_bugpoint.rst` about primitives when minimizing scripts.
---
 docs/source/using_yosys/bugpoint.rst          | 225 +-----------------
 .../extending_yosys/advanced_bugpoint.rst     | 208 ++++++++++++++++
 .../yosys_internals/extending_yosys/index.rst |   1 +
 3 files changed, 217 insertions(+), 217 deletions(-)
 create mode 100644 docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 89c58a8f4..82eab3cfa 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -38,8 +38,6 @@ Minimizing failing (or bugged) designs
     error while trying to debug it
 
 
-.. _minimize your RTLIL:
-
 Minimizing RTLIL designs with bugpoint
 --------------------------------------
 
@@ -74,12 +72,6 @@ be aiming to reproduce the failure by running ``yosys -s <load.ys> -s
 Check out the instructions for :ref:`using_yosys/bugpoint:minimizing verilog
 designs` below.
 
-The commands in ``<load.ys>`` only need to be run once, while those in
-``<failure.ys>`` will be run on each iteration of `bugpoint`.  If you haven't
-already, following the instructions for :ref:`using_yosys/bugpoint:minimizing
-scripts` will also help with identifying exactly which commands are needed to
-produce the failure and which can be safely moved to the loading script.
-
 .. note::
 
    You should also be able to run the two scripts separately, calling first
@@ -236,150 +228,6 @@ Once you've verified the failure still happens, check out
 :ref:`using_yosys/bugpoint:identifying issues` for more on what to do next.
 
 
-.. _minimize your script:
-
-Minimizing scripts
-------------------
-
-If you're using a command line prompt, such as ``yosys -p 'synth_xilinx' -o
-design.json design.v``, consider converting it to a script.  It's generally much
-easier to iterate over changes to a script in a file rather than one on the
-command line, as well as being better for sharing with others.
-
-.. code-block:: yoscrypt
-   :caption: example script, ``script.ys``, for prompt ``yosys -p 'synth_xilinx' -o design.json design.v``
-
-   read_verilog design.v
-   synth_xilinx
-   write_json design.json
-
-Next up you want to remove everything *after* the error occurs.  Using the
-``-L`` flag can help here, allowing you to specify a file to log to, such as
-``yosys -L out.log -s script.ys``.  Most commands will print a header message
-when they begin; something like ``2.48. Executing HIERARCHY pass (managing
-design hierarchy).``  The last header message will usually be the failing
-command.  There are some commands which don't print a header message, so you may
-want to add ``echo on`` to the start of your script.  The `echo` command echoes
-each command executed, along with any arguments given to it.  For the
-`hierarchy` example above this might be ``yosys> hierarchy -check``.
-
-.. note::
-
-   It may also be helpful to use the `log` command to add messages which you can
-   then search for either in the terminal or the logfile.  This can be quite
-   useful if your script contains script-passes, like the
-   :doc:`/using_yosys/synthesis/synth`, which call many sub-commands and you're
-   not sure exactly which script-pass is calling the failing command.
-
-If your final command calls sub-commands, replace it with its contents and
-repeat the previous step.  In the case of the
-:doc:`/using_yosys/synthesis/synth`, as well as certain other script-passes, you
-can use the ``-run`` option to simplify this.  For example we can replace
-``synth -top <top> -lut`` with the :ref:`replace_synth`.  The options ``-top
-<top> -lut`` can be provided to each `synth` step, or to just the step(s) where
-it is relevant, as done here.
-
-.. code-block:: yoscrypt
-   :caption: example replacement script for `synth` command
-   :name: replace_synth
-
-   synth -top <top> -run :coarse
-   synth -lut -run coarse:fine
-   synth -lut -run fine:check
-   synth -run check:
-
-Say we ran :ref:`replace_synth` and were able to remove the ``synth -run
-check:`` and still got our error, then we check the log and we see the last
-thing before the error was ``7.2. Executing MEMORY_MAP pass (converting memories
-to logic and flip-flops)``. By checking the output of ``yosys -h synth`` (or the
-`synth` help page) we can see that the `memory_map` pass is called in the
-``fine`` step.  We can then update our script to the following:
-
-.. code-block:: yoscrypt
-   :caption: example replacement script for `synth` when `memory_map` is failing
-
-   synth -top <top> -run :fine
-   opt -fast -full
-   memory_map
-
-By giving `synth` the option ``-run :fine``, we are telling it to run from the
-beginning of the script until the ``fine`` step, where we then give it the exact
-commands to run.  There are some cases where the commands given in the help
-output are not an exact match for what is being run, but are instead a
-simplification.  If you find that replacing the script-pass with its contents
-causes the error to disappear, or change, try calling the script-pass with
-``echo on`` to see exactly what commands are being called and what options are
-used.
-
-.. warning::
-
-   Before continuing further, *back up your code*.  The following steps can
-   remove context and lead to over-minimizing scripts, hiding underlying issues.
-   Check out :ref:`using_yosys/bugpoint:Why context matters` to learn more.
-
-When a problem is occurring many steps into a script, minimizing the design at
-the start of the script isn't always enough to identify the cause of the issue.
-Each extra step of the script can lead to larger sections of the input design
-being needed for the specific problem to be preserved until it causes a crash.
-So to find the smallest possible reproducer it can sometimes be helpful to
-remove commands prior to the failure point.
-
-The simplest way to do this is by writing out the design, resetting the current
-state, and reading back the design:
-
-.. code-block:: yoscrypt
-
-   write_rtlil <design.il>; design -reset; read_rtlil <design.il>;
-
-In most cases, this can be inserted immediately before the failing command while
-still producing the error, allowing you to `minimize your RTLIL`_ with the
-``<design.il>`` output.  For our previous example with `memory_map`, if
-:ref:`map_reset` still gives the same error, then we should now be able to call
-``yosys design.il -p 'memory_map'`` to reproduce it.
-
-.. code-block:: yoscrypt
-   :caption: resetting the design immediately before failure
-   :name: map_reset
-
-   synth -top <top> -run :fine
-   opt -fast -full
-   write_rtlil design.il; design -reset; read_rtlil design.il;
-   memory_map
-
-If that doesn't give the error (or doesn't give the same error), then you should
-try to move the write/reset/read earlier in the script until it does.  If you
-have no idea where exactly you should put the reset, the best way is to use a
-"binary search" type approach, reducing the possible options by half after each
-attempt.
-
-   As an example, your script has 16 commands in it before failing on the 17th.
-   If resetting immediately before the 17th doesn't reproduce the error, try
-   between the 8th and 9th (8 is half of the total 16).  If that produces the
-   error then you can remove everything before the `read_rtlil` and try reset
-   again in the middle of what's left, making sure to use a different name for
-   the output file so that you don't overwrite what you've already got.  If the
-   error isn't produced then you need to go earlier still, so in this case you
-   would do between the 4th and 5th (4 is half of the previous 8).  Repeat this
-   until you can't reduce the remaining commands any further.
-
-.. TODO:: is it possible to dump scratchpad?
-
-   is there anything else in the yosys/design state that doesn't get included in
-   `write_rtlil`?
-
-A more conservative, but more involved, method is to remove or comment out
-commands prior to the failing command.  Each command, or group of commands, can
-be disabled one at a time while checking if the error still occurs, eventually
-giving the smallest subset of commands needed to take the original input through
-to the error.  The difficulty with this method is that depending on your design,
-some commands may be necessary even if they aren't needed to reproduce the
-error.  For example, if your design includes ``process`` blocks, many commands
-will fail unless you run the `proc` command.  While this approach can do a
-better job of maintaining context, it is often easier to *recover* the context
-after the design has been minimized for producing the error.  For more on
-recovering context, checkout :ref:`using_yosys/bugpoint:Why context matters`.
-
-
 Minimizing Verilog designs
 --------------------------
 
@@ -393,9 +241,9 @@ Minimizing Verilog designs
   + if the problem is parameter specific you may be able to change the default
     parameters so that they match the problematic configuration
 
-- as with `minimize your script`_, if you have no idea what is or is not
-  relevant, try to follow a "binary search" type approach where you remove (or
-  comment out) roughly half of what's left at a time
+- if you have no idea what is or is not relevant, try to follow a "binary
+  search" type approach where you remove (or comment out) roughly half of what's
+  left at a time
 - focusing on one type of object at a time simplifies the process, removing as
   many as you can until the error disappears if any of the remaining objects are
   removed
@@ -448,36 +296,13 @@ Identifying issues
     to a right shift (or `$shr`)?
   + is the issue tied to specific parameters, widths, or values?
 
-- if the failing command was part of a larger script, such as one of the
-  :doc:`/using_yosys/synthesis/synth`, you could try to follow the design
-  through the script
-
-  + sometimes when a command is raising an error, you're seeing a symptom rather
-    than the underlying issue
-  + an earlier command may be putting the design in an invalid state which isn't
-    picked up until the error is raised
-  + check out :ref:`using_yosys/bugpoint:Why context matters`
-  + if you're using a fuzzer to find issues in Yosys, you should be prepared to
-    do this step
-
-- if you're familiar with C/C++ you might try to have a look at the source
-  code of the command that's failing
-
-  + even if you can't fix the problem yourself, it can be very helpful for
-    anyone else investigating if you're able to identify where exactly the
-    issue is
-  + if you're using a fuzzer to find issues in Yosys, you should be prepared to
-    do this step
-
 .. warning::
 
-   In the event that you are unable to identify the root cause of a fuzzer
-   generated issue, **do not** open more than one issue at a time.  You have no
-   way of being able to tell if multiple fuzzer generated issues are simply
-   different cases of the same problem, and opening multiple issues for the same
-   problem means more time is spent on triaging and diagnosing bug reports and
-   less on fixing the problem.  If you are found to be doing this, your issues
-   may be closed without further investigation.
+   If you are using a fuzzer to find bugs, follow the instructions for
+   :doc:`/yosys_internals/extending_yosys/advanced_bugpoint`.  **Do not** open
+   more than one fuzzer generated issue at a time if you can not identify the
+   root cause.  If you are found to be doing this, your issues may be closed
+   without further investigation.
 
 - search `the existing issues`_ and see if someone has already made a bug report
 
@@ -492,37 +317,3 @@ Identifying issues
 
 - if there are no existing or related issues already, then check out the steps
   for :ref:`yosys_internals/extending_yosys/contributing:reporting bugs`
-
-
-Why context matters
--------------------
-
-- if you did `minimize your script`_, and removed commands prior to the failure
-  to get a smaller design, try to work backwards and find which commands may
-  have contributed to the design failing
-- especially important when the bug is happening inside of a ``synth_*`` script
-- example (#4590)
-  
-  + say you did all the minimization and found that the error occurs when a call
-    to ``techmap -map +/xilinx/cells_map.v`` with ``MIN_MUX_INPUTS`` defined
-    parses a `$_MUX16_` with all inputs set to ``1'x``
-  + step through the original script, calling `stat` after each step to find
-    when the `$_MUX16_` is added
-  + find that the `$_MUX16_` is introduced by a call to `muxcover`, but all the
-    inputs are defined, so calling `techmap` now works as expected
-
-    * and from running `bugpoint` with the failing techmap you know that the
-      cell with index ``2297`` will fail, so you can now call ``select
-      top/*$2297`` to limit to just that cell, and optionally call ``design
-      -save pre_bug`` or ``write_rtlil -selected pre_bug.il`` to save this state
-
-  + next you step through the remaining commands and call `dump` after each to
-    find when the inputs are disconnected
-  + find that ``opt -full`` has optimized away portions of the circuit, leading
-    to `opt_expr` setting the undriven mux inputs to ``x``, but failing to
-    remove the now unnecessary `$_MUX16_`
-
-- in this example, you might've stopped with the minimal reproducer, fixed the
-  bug in ``+/xilinx/cells_map.v``, and carried on
-- but by following the failure back you've managed to identify a problem with
-  `opt_expr` that could be causing other problems either now or in the future
diff --git a/docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst b/docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst
new file mode 100644
index 000000000..32d334581
--- /dev/null
+++ b/docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst
@@ -0,0 +1,208 @@
+Identifying the root cause of bugs
+==================================
+
+This document references Yosys internals and is intended for people interested
+in solving or investigating Yosys bugs.  This also applies if you are using a
+fuzzing tool; fuzzers have a tendency to find many variations of the same bug,
+so identifying the root cause is important for avoiding issue spam.
+
+- if the failing command was part of a larger script, such as one of the
+  :doc:`/using_yosys/synthesis/synth`, you could try to follow the design
+  through the script
+
+  + sometimes when a command is raising an error, you're seeing a symptom rather
+    than the underlying issue
+  + an earlier command may be putting the design in an invalid state which isn't
+    picked up until the error is raised
+  + check out :ref:`yosys_internals/extending_yosys/advanced_bugpoint:why context matters`
+
+- if you're familiar with C/C++ you might try to have a look at the source
+  code of the command that's failing
+
+  + even if you can't fix the problem yourself, it can be very helpful for
+    anyone else investigating if you're able to identify where exactly the
+    issue is
+
+Minimizing scripts
+------------------
+
+.. TODO:: disclaimer this is intended as advanced usage, and generally not necessary for bug reports
+
+If you're using a command line prompt, such as ``yosys -p 'synth_xilinx' -o
+design.json design.v``, consider converting it to a script.  It's generally much
+easier to iterate over changes to a script in a file rather than one on the
+command line, as well as being better for sharing with others.
+
+.. code-block:: yoscrypt
+   :caption: example script, ``script.ys``, for prompt ``yosys -p 'synth_xilinx' -o design.json design.v``
+
+   read_verilog design.v
+   synth_xilinx
+   write_json design.json
+
+Next up you want to remove everything *after* the error occurs.  Using the
+``-L`` flag can help here, allowing you to specify a file to log to, such as
+``yosys -L out.log -s script.ys``.  Most commands will print a header message
+when they begin; something like ``2.48. Executing HIERARCHY pass (managing
+design hierarchy).``  The last header message will usually be the failing
+command.  There are some commands which don't print a header message, so you may
+want to add ``echo on`` to the start of your script.  The `echo` command echoes
+each command executed, along with any arguments given to it.  For the
+`hierarchy` example above this might be ``yosys> hierarchy -check``.
+
+.. note::
+
+   It may also be helpful to use the `log` command to add messages which you can
+   then search for either in the terminal or the logfile.  This can be quite
+   useful if your script contains script-passes, like the
+   :doc:`/using_yosys/synthesis/synth`, which call many sub-commands and you're
+   not sure exactly which script-pass is calling the failing command.
+
+If your final command calls sub-commands, replace it with its contents and
+repeat the previous step.  In the case of the
+:doc:`/using_yosys/synthesis/synth`, as well as certain other script-passes, you
+can use the ``-run`` option to simplify this.  For example we can replace
+``synth -top <top> -lut`` with the :ref:`replace_synth`.  The options ``-top
+<top> -lut`` can be provided to each `synth` step, or to just the step(s) where
+it is relevant, as done here.
+
+.. code-block:: yoscrypt
+   :caption: example replacement script for `synth` command
+   :name: replace_synth
+
+   synth -top <top> -run :coarse
+   synth -lut -run coarse:fine
+   synth -lut -run fine:check
+   synth -run check:
+
+Say we ran :ref:`replace_synth` and were able to remove the ``synth -run
+check:`` and still got our error, then we check the log and we see the last
+thing before the error was ``7.2. Executing MEMORY_MAP pass (converting memories
+to logic and flip-flops)``. By checking the output of ``yosys -h synth`` (or the
+`synth` help page) we can see that the `memory_map` pass is called in the
+``fine`` step.  We can then update our script to the following:
+
+.. code-block:: yoscrypt
+   :caption: example replacement script for `synth` when `memory_map` is failing
+
+   synth -top <top> -run :fine
+   opt -fast -full
+   memory_map
+
+By giving `synth` the option ``-run :fine``, we are telling it to run from the
+beginning of the script until the ``fine`` step, where we then give it the exact
+commands to run.  There are some cases where the commands given in the help
+output are not an exact match for what is being run, but are instead a
+simplification.  If you find that replacing the script-pass with its contents
+causes the error to disappear, or change, try calling the script-pass with
+``echo on`` to see exactly what commands are being called and what options are
+used.
+
+.. warning::
+
+   Before continuing further, *back up your code*.  The following steps can
+   remove context and lead to over-minimizing scripts, hiding underlying issues.
+   Check out :ref:`yosys_internals/extending_yosys/advanced_bugpoint:Why
+   context matters` to learn more.
+
+When a problem is occurring many steps into a script, minimizing the design at
+the start of the script isn't always enough to identify the cause of the issue.
+Each extra step of the script can lead to larger sections of the input design
+being needed for the specific problem to be preserved until it causes a crash.
+So to find the smallest possible reproducer it can sometimes be helpful to
+remove commands prior to the failure point.
+
+The simplest way to do this is by writing out the design, resetting the current
+state, and reading back the design:
+
+.. code-block:: yoscrypt
+
+   write_rtlil <design.il>; design -reset; read_rtlil <design.il>;
+
+In most cases, this can be inserted immediately before the failing command while
+still producing the error, allowing you to :ref:`minimize your
+RTLIL<using_yosys/bugpoint:minimizing rtlil designs with bugpoint>` with the
+``<design.il>`` output.  For our previous example with `memory_map`, if
+:ref:`map_reset` still gives the same error, then we should now be able to call
+``yosys design.il -p 'memory_map'`` to reproduce it.
+
+.. code-block:: yoscrypt
+   :caption: resetting the design immediately before failure
+   :name: map_reset
+
+   synth -top <top> -run :fine
+   opt -fast -full
+   write_rtlil design.il; design -reset; read_rtlil design.il;
+   memory_map
+
+If that doesn't give the error (or doesn't give the same error), then you should
+try to move the write/reset/read earlier in the script until it does.  If you
+have no idea where exactly you should put the reset, the best way is to use a
+"binary search" type approach, reducing the possible options by half after each
+attempt.
+
+.. note::
+
+   By default, `write_rtlil` doesn't include platform specific IP blocks and
+   other primitive cell models which are typically loaded with a ``read_verilog
+   -lib`` command at the start of the synthesis script.  You may have to
+   duplicate these commands *after* the call to ``design -reset``.  It is also
+   possible to write out *everything* with ``select =*; write_rtlil -selected
+   <design.il>``.
+
+As an example, your script has 16 commands in it before failing on the 17th. If
+resetting immediately before the 17th doesn't reproduce the error, try between
+the 8th and 9th (8 is half of the total 16).  If that produces the error then
+you can remove everything before the `read_rtlil` and try reset again in the
+middle of what's left, making sure to use a different name for the output file
+so that you don't overwrite what you've already got.  If the error isn't
+produced then you need to go earlier still, so in this case you would do between
+the 4th and 5th (4 is half of the previous 8).  Repeat this until you can't
+reduce the remaining commands any further.
+
+A more conservative, but more involved, method is to remove or comment out
+commands prior to the failing command.  Each command, or group of commands, can
+be disabled one at a time while checking if the error still occurs, eventually
+giving the smallest subset of commands needed to take the original input through
+to the error.  The difficulty with this method is that depending on your design,
+some commands may be necessary even if they aren't needed to reproduce the
+error.  For example, if your design includes ``process`` blocks, many commands
+will fail unless you run the `proc` command.  While this approach can do a
+better job of maintaining context, it is often easier to *recover* the context
+after the design has been minimized for producing the error.  For more on
+recovering context, checkout
+:ref:`yosys_internals/extending_yosys/advanced_bugpoint:Why context matters`.
+
+
+Why context matters
+-------------------
+
+- if you did minimized your script, and removed commands prior to the failure
+  to get a smaller design, try to work backwards and find which commands may
+  have contributed to the design failing
+- especially important when the bug is happening inside of a ``synth_*`` script
+- example (#4590)
+  
+  + say you did all the minimization and found that the error occurs when a call
+    to ``techmap -map +/xilinx/cells_map.v`` with ``MIN_MUX_INPUTS`` defined
+    parses a `$_MUX16_` with all inputs set to ``1'x``
+  + step through the original script, calling `stat` after each step to find
+    when the `$_MUX16_` is added
+  + find that the `$_MUX16_` is introduced by a call to `muxcover`, but all the
+    inputs are defined, so calling `techmap` now works as expected
+
+    * and from running `bugpoint` with the failing techmap you know that the
+      cell with index ``2297`` will fail, so you can now call ``select
+      top/*$2297`` to limit to just that cell, and optionally call ``design
+      -save pre_bug`` or ``write_rtlil -selected pre_bug.il`` to save this state
+
+  + next you step through the remaining commands and call `dump` after each to
+    find when the inputs are disconnected
+  + find that ``opt -full`` has optimized away portions of the circuit, leading
+    to `opt_expr` setting the undriven mux inputs to ``x``, but failing to
+    remove the now unnecessary `$_MUX16_`
+
+- in this example, you might've stopped with the minimal reproducer, fixed the
+  bug in ``+/xilinx/cells_map.v``, and carried on
+- but by following the failure back you've managed to identify a problem with
+  `opt_expr` that could be causing other problems either now or in the future
diff --git a/docs/source/yosys_internals/extending_yosys/index.rst b/docs/source/yosys_internals/extending_yosys/index.rst
index 4ee21517b..72843ecd6 100644
--- a/docs/source/yosys_internals/extending_yosys/index.rst
+++ b/docs/source/yosys_internals/extending_yosys/index.rst
@@ -11,6 +11,7 @@ of interest for developers looking to customise Yosys builds.
    extensions
    build_verific
    functional_ir
+   advanced_bugpoint
    contributing
    test_suites
 

From aa6c6fd2832bfb59acf84e7822aea919b2ac2440 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:01 +1200
Subject: [PATCH 259/931] bugpoint.rst: Some paragraphs on verilog

---
 docs/source/using_yosys/bugpoint.rst | 57 ++++++++++++++++++----------
 1 file changed, 38 insertions(+), 19 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 82eab3cfa..a2d0b901e 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -231,29 +231,47 @@ Once you've verified the failure still happens, check out
 Minimizing Verilog designs
 --------------------------
 
-- manual process
-- made easier if the error message is able to identify the source line or name
-  of the object
-- reminder to back up original code before modifying it
-- if a specific module is causing the problem, try to set that as the top
-  module, you can then remove 
+Unlike RTLIL designs where we can use `bugpoint`, minimizing Verilog designs is
+a much more manual, iterative process.  Be sure to check any errors or warnings
+for messages that might identify source lines or object names that might be
+causing the failure, and back up your source code before modifying it.  At any
+point in the process, you can check for anything that is unused or totally
+disconnected (ports, wires, etc) and remove them too.
 
-  + if the problem is parameter specific you may be able to change the default
-    parameters so that they match the problematic configuration
+.. note::
 
-- if you have no idea what is or is not relevant, try to follow a "binary
-  search" type approach where you remove (or comment out) roughly half of what's
-  left at a time
-- focusing on one type of object at a time simplifies the process, removing as
-  many as you can until the error disappears if any of the remaining objects are
-  removed
-- periodically check if anything is totally disconnected (ports, wires, etc), if
-  it is then it can be removed too
-- start by removing cells (instances of modules)
+   If a specific module is causing the problem, try to set that as the top
+   module instead.  Any parameters should have their default values changed to
+   match the failing usage.
 
-  + if a module has no more instances, remove it entirely
+As a rule of thumb, try to split things roughly in half at each step; similar to
+a "binary search".  If you have 10 cells (instances of modules) in your top
+module, and have no idea what is causing the issue, split them into two groups
+of 5 cells.  For each group of cells, try remove them and see if the failure
+still happens.  If the error still occurs with the first group removed, but
+disappears when the second group is removed, then the first group can be safely
+removed.  If a module has no more instances, remove it entirely.  Repeat this
+for each remaining group of cells until each group only has 1 cell in it and no
+more cells can be removed without making the error disappear.  You can also
+repeat this for each module still in your design.
+
+After minimizing the number of cells, do the same for the process blocks in your
+top module.  And again for any generate blocks and combinational blocks.
+Remember to check for any ports or signals which are no longer used and remove
+those too.  Any signals which are written but never read can also be removed.
+
+.. note::
+
+   Depending on where the design is failing, there are some commands which may
+   help in identifying unused objects in the design.  `hierarchy` will identify
+   which modules are used and which are not, but check for `$paramod` modules
+   before removing unused ones. ``debug clean`` will list all unused wires in
+   each module, as well as unused cells which were automatically generated
+   (giving the line number of the source that generated them).  Adding the
+   ``-purge`` flag will also include named wires that would normally be ignored
+   by `clean`.  Though when there are large numbers of unused wires it is often
+   easier to just delete sections of the code and see what happens.
 
-- then processes
 - try to remove or reduce assignments and operations
 
   + are there any wires/registers which get read but never written?
@@ -267,6 +285,7 @@ Minimizing Verilog designs
     ``'0``
   + if you have enable or reset logic, does the error still happen without that?
   + can you reduce an ``if .. else`` to a single case?
+  + can you remove states from a ``case`` block?
 
 - if you're planning to share the minimized code:
 

From 6b7756b67a3226cc84d7473add7167d771b3ad30 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:01 +1200
Subject: [PATCH 260/931] bugpoint.rst: Finish paragraphs

Update text to assume bugpoint PR changes.
---
 docs/source/using_yosys/bugpoint.rst | 221 ++++++++++++++++-----------
 1 file changed, 131 insertions(+), 90 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index a2d0b901e..38a978695 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -1,41 +1,62 @@
 Minimizing failing (or bugged) designs
 ======================================
 
-- how to guide
-- assumes knowledge and familiarity with Yosys
-- something is wrong with your design OR something is wrong with Yosys
+.. TODO:: pending merge of https://github.com/YosysHQ/yosys/pull/5068
 
-  + how to work out which
+This document is a how-to guide for reducing problematic designs to the bare
+minimum needed for reproducing the issue.  This is a Yosys specific alternative
+to the Stack Overflow article: `How to create a Minimal, Reproducible Example`_,
+and is intended to help when there's something wrong with your design, or with
+Yosys itself.
 
-- *read* the error message
-- is it a Yosys error? (starts with ERROR:)
+.. _How to create a Minimal, Reproducible Example: https://stackoverflow.com/help/minimal-reproducible-example
 
-  + does it give you a line number from your design
+.. note::
 
-- is it a runtime error, e.g. SEGFAULT
-- are you using the latest release of Yosys
+   This guide assumes a moderate degree of familiarity with Yosys and requires
+   some amount of problem solving ability.
 
-  + has your problem already been fixed
 
-- is your input design valid?
+Before you start
+----------------
 
-  + if you're using Verilog, try load it with `iverilog`_ or `verilator`_
+The first (and often overlooked) step, is to check for and *read* any error
+messages or warnings.  Passing the ``-q`` flag when running Yosys will make it
+so that only warnings and error messages are written to the console.  Don't just
+read the last message either, there may be warnings that indicate a problem
+before it happens.  While some things may only be regarded as warnings, such as
+multiple drivers for the same signal or logic loops, these can cause problems in
+some synthesis flows but not others.
+
+A Yosys error (one that starts with ``ERROR:``) may give you a line number from
+your design, or the name of the object causing issues.  If so, you may already
+have enough information to resolve the problem, or at least understand why it's
+happening.
+
+.. note::
+
+   If you're not already, try using the latest version from the `Yosys GitHub`_.
+   You may find that your issue has already been fixed!  And even if it isn't,
+   testing with two different versions is a good way to ensure reproducibility.
+
+.. _Yosys GitHub: https://github.com/YosysHQ/yosys
+
+Another thing to be aware of is that Yosys generally doesn't perform rigorous
+checking of input designs to ensure they are valid.  This is especially true for
+the `read_verilog` frontend.  It is instead recommended that you try load it
+with `iverilog`_ or `verilator`_ first, as an invalid design can often lead to
+unexpected issues.
 
 .. _iverilog: https://steveicarus.github.io/iverilog/
 .. _verilator: https://www.veripool.org/verilator/
 
-- are there any warnings before the error (either immediately before or in an
-  earlier command) that could be related?
-- does calling `check` before the failure give any errors or warnings?
-- did you call `hierarchy` before the failure?
-
-  + can you call ``hierarchy -check``?
-
-- make sure to back up your code (design source and yosys script(s)) before
-  making any modifications
-
-  + even if the code itself isn't important, this can help avoid "losing" the
-    error while trying to debug it
+If you're using a custom synthesis script, try take a bit of time to figure out
+which command is failing.  Calling ``echo on`` at the start of your script will
+`echo` each command executed; the last echo before the error should then be
+where the error has come from.  Check the help message for the failing command;
+does it indicate limited support, or mention some other command that needs to be
+run first?  You can also try to call `check` and/or ``hierarchy -check`` before
+the failure to see if they report and errors or warnings.
 
 
 Minimizing RTLIL designs with bugpoint
@@ -47,6 +68,12 @@ developed for Yosys crashes, `bugpoint` can also be used for designs that lead
 to non-fatal errors, or even failures in other tools that use the output of a
 Yosys script.
 
+.. note::
+
+   Make sure to back up your code (design source and yosys script(s)) before
+   making any modifications.  Even if the code itself isn't important, this can
+   help avoid "losing" the error while trying to debug it.
+
 Can I use bugpoint?
 ~~~~~~~~~~~~~~~~~~~
 
@@ -102,11 +129,7 @@ Our final failure we can use with `bugpoint` is one returned by a wrapper
 process, such as ``valgrind`` or ``timeout``.  In this case you will be calling
 something like ``<wrapper> yosys -s <failure.ys> design.il``.  Here, Yosys is
 run under a wrapper process which checks for some failure state, like a memory
-leak or excessive runtime.  Note however that unlike the `exec` command, there
-is currently no way to check the return status or messages from the wrapper
-process; only a binary pass/fail.
-
-.. TODO:: above note pending updated bugpoint #5068
+leak or excessive runtime.
 
 
 How do I use bugpoint?
@@ -125,8 +148,6 @@ you can use.  Make sure to configure it with the correct filenames and use only
 one of the methods to load the design.  Fill in the ``-grep`` option with the
 error message printed just before.  If you are using a wrapper process for your
 failure state, add the ``-runner "<wrapper>"`` option to the `bugpoint` call.
-For more about the options available, check ``help bugpoint`` or
-:doc:`/cmd/bugpoint`.
 
 .. code-block:: yoscrypt
    :caption: ``<bugpoint.ys>`` template script
@@ -142,15 +163,17 @@ For more about the options available, check ``help bugpoint`` or
    # Save minimized design
    write_rtlil min.il
 
+The ``-grep`` option is used to search the log file generated by the Yosys under
+test.  If the error message is generated by something else, such as a wrapper
+process or compiler sanitizer, then you should instead use ``-err_grep``.  For
+an OS error, like a SEGFAULT, you can also use ``-expect-return`` to check the
+error code returned.
+
 .. note::
 
-   Using ``-grep "<string>"`` with `bugpoint` is optional, but helps to ensure
-   that the minimized design is reproducing the right error, especially when
-   ``<failure.ys>`` contains more than one command.  Unfortunately this does not
-   work with runtime errors such as a ``SEGFAULT`` as it is only able to match
-   strings from the log file.
-
-.. TODO::  above note pending updated bugpoint #5068
+   Checking the error message or return status with is optional, but helps to
+   ensure that the minimized design is reproducing the right error, especially
+   when ``<failure.ys>`` contains more than one command.
 
 By default, `bugpoint` is able to remove any part of the design.  In order to
 keep certain parts, for instance because you already know they are related to
@@ -177,13 +200,16 @@ error on undefined behaviour but only want the child process to halt on error.
 Once you have finished configuration, you can now run ``yosys <bugpoint.ys>``.
 The first thing `bugpoint` will do is test the input design fails.  If it
 doesn't, make sure you are using the right ``yosys`` executable; unless the
-``-yosys`` option is provided, it will use whatever the shell defaults to.  If
-you are using the ``-runner`` option, try replacing the `bugpoint` command with
-``write_rtlil test.il`` and then on a new line, ``!<wrapper> yosys -s
-<failure.ys> test.il`` to check it works as expected and returns a non-zero
-status.
+``-yosys`` option is provided, it will use whatever the shell defaults to, *not*
+the current ``yosys``.  If you are using the ``-runner`` option, try replacing
+the `bugpoint` command with ``write_rtlil test.il`` and then on a new line,
+``!<wrapper> yosys -s <failure.ys> test.il`` to check it works as expected and
+returns a non-zero status.
 
-.. TODO:: note on ``!`` (link to :ref:`getting_started/scripting_intro:script parsing`)
+.. seealso::
+
+   For more on script parsing and the use of ``!``, check out
+   :ref:`getting_started/scripting_intro:script parsing`.
 
 Depending on the size of your design, and the length of your ``<failure.ys>``,
 `bugpoint` may take some time; remember, it will run ``yosys -s <failure.ys>``
@@ -231,12 +257,19 @@ Once you've verified the failure still happens, check out
 Minimizing Verilog designs
 --------------------------
 
+.. seealso::
+
+   This section is not specific to Yosys, so feel free to use another guide such
+   as Stack Overflow's `How to create a Minimal, Reproducible Example`_.
+
 Unlike RTLIL designs where we can use `bugpoint`, minimizing Verilog designs is
 a much more manual, iterative process.  Be sure to check any errors or warnings
 for messages that might identify source lines or object names that might be
 causing the failure, and back up your source code before modifying it.  At any
 point in the process, you can check for anything that is unused or totally
-disconnected (ports, wires, etc) and remove them too.
+disconnected (ports, wires, etc) and remove them too.  If you have multiple
+source files, try to reduce them down to a single file; either by removing files
+or combining them.
 
 .. note::
 
@@ -264,7 +297,7 @@ those too.  Any signals which are written but never read can also be removed.
 
    Depending on where the design is failing, there are some commands which may
    help in identifying unused objects in the design.  `hierarchy` will identify
-   which modules are used and which are not, but check for `$paramod` modules
+   which modules are used and which are not, but check for ``$paramod`` modules
    before removing unused ones. ``debug clean`` will list all unused wires in
    each module, as well as unused cells which were automatically generated
    (giving the line number of the source that generated them).  Adding the
@@ -272,48 +305,70 @@ those too.  Any signals which are written but never read can also be removed.
    by `clean`.  Though when there are large numbers of unused wires it is often
    easier to just delete sections of the code and see what happens.
 
-- try to remove or reduce assignments and operations
+Next, try to remove or reduce assignments (``a = b``) and operations (``a +
+b``).  A good place to start is by checking for any wires/registers which are
+read but never written.  Try removing the signal declaration and replacing
+references to it with ``'0`` or ``'x``.  Do this with any constants too.  Try to
+replace strings with numeric values, and wide signals with smaller ones, then
+see if the error persists.
 
-  + are there any wires/registers which get read but never written?
+Check if there are any operations that you can simplify, like replacing ``a &
+'0`` with ``'0``.  If you have enable or reset logic, try removing it and see if
+the error still occurs.  Try reducing ``if .. else`` and ``case`` blocks to a
+single case.  Even if that doesn't work, you may still be able to remove some
+paths; start with cases that appear to be unreachable and go from there.
 
-    * try removing the signal declaration and replacing references to it with
-      ``'0`` or ``'x``
-    * try this with constants too
+If you're planning to share the minimized code, remember to make sure there is
+no sensitive or proprietary data in the design.  Maybe rename that
+``ibex_prefetch_buffer`` module to ``buf``, and ``very_important_signal_name``
+could just as easily be ``sig``.  The point here isn't to make names as small as
+possible, but rather to remove the context that is no longer necessary.  Calling
+something ``multiplier_output_value`` doesn't mean as much if you no longer have
+the multiplier being referred to; but if the name does still make sense then
+it's fine to leave it as-is.
 
-  + can you replace strings with numeric values?
-  + are you able to simplify any operations?  like replacing ``a & '0`` with
-    ``'0``
-  + if you have enable or reset logic, does the error still happen without that?
-  + can you reduce an ``if .. else`` to a single case?
-  + can you remove states from a ``case`` block?
+.. note::
 
-- if you're planning to share the minimized code:
-
-  + make sure there is no sensitive or proprietary data in the design
-  + instead of a long string of numbers and letters that had some meaning (or
-    were randomly or sequentially generated), can you give it a single character
-    name like ``a`` or ``x``
-  + please try to keep things in English, using the letters a-z and numbers 0-9
-    (unless the error is arising because of the names used)
+   When sharing code on the `Yosys GitHub`_, please try to keep things in
+   English.  Declarations and strings should stick to the letters a-z and
+   numbers 0-9, unless the error is arising because of the names/characters
+   used.
 
 
 Identifying issues
 ------------------
 
-- does the failing command indicate limited support, or does it mention some
-  other command that needs to be run first?
-- if you're able to, try to match the minimized design back to its original
-  context
+When identifying issues, it is quite useful to understand the conditions under
+which the issue is occurring.  While there are occasionally bugs that affect a
+significant number of designs, Yosys changes are tested on a variety of designs
+and operating systems which typically catch any such issues before they make it
+into the main branch.  So what is is it about your situation that makes it
+unusual?
 
-  + could you achieve the same thing a different way?
-  + and if so, does this other method have the same issue?
+.. note::
 
-- try to change the design in small ways and see what happens
+   If you have access to a different platform you could also check if your issue
+   is reproducible there.  Some issues may be specific to the platform or build
+   of Yosys.
 
-  + `bugpoint` can reduce and simplify a design, but it doesn't *change* much
-  + what happens if you change operators, for example a left shift (or `$shl`)
-    to a right shift (or `$shr`)?
-  + is the issue tied to specific parameters, widths, or values?
+Try to match the minimized design back to its original context.  Could you
+achieve the same thing a different way, and if so, does this other method have
+the same issue?  Try to change the design in small ways and see what happens;
+while `bugpoint` can reduce and simplify a design, it doesn't *change* much.
+What happens if you change operators, for example a left shift (or `$shl`) to a
+right shift (or `$shr`)?  Try to see if the issue is tied to specific
+parameters, widths, or values.
+
+Search `the existing issues`_ and see if someone has already made a bug report.
+This is where changing the design and finding the limits of what causes the
+failure really comes in handy.  If you're more familiar with how the problem can
+arise, you may be able to find a related issue more easily.  If an issue already
+exists for one case of the problem but you've found other cases, you can comment
+on the issue and help get it solved.  If there are no existing or related issues
+already, then check out the steps for
+:ref:`yosys_internals/extending_yosys/contributing:reporting bugs`.
+
+.. _the existing issues: https://github.com/YosysHQ/yosys/issues
 
 .. warning::
 
@@ -322,17 +377,3 @@ Identifying issues
    more than one fuzzer generated issue at a time if you can not identify the
    root cause.  If you are found to be doing this, your issues may be closed
    without further investigation.
-
-- search `the existing issues`_ and see if someone has already made a bug report
-
-  + this is where changing the design and finding the limits of what causes the
-    failure really comes in handy
-  + if you're more familiar with how the problem can arise, you may be able to
-    find a related issue more easily
-  + if an issue already exists for one case of the problem but you've found
-    other cases, you can comment on the issue and help get it solved
-
-.. _the existing issues: https://github.com/YosysHQ/yosys/issues
-
-- if there are no existing or related issues already, then check out the steps
-  for :ref:`yosys_internals/extending_yosys/contributing:reporting bugs`

From c994b59ac6a0a87df33fe5ace0a162571329d2e2 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:01 +1200
Subject: [PATCH 261/931] advanced_bugpoint.rst: Paragraphing

---
 .../extending_yosys/advanced_bugpoint.rst     | 170 +++++++++++-------
 1 file changed, 109 insertions(+), 61 deletions(-)

diff --git a/docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst b/docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst
index 32d334581..570155c61 100644
--- a/docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst
+++ b/docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst
@@ -6,27 +6,40 @@ in solving or investigating Yosys bugs.  This also applies if you are using a
 fuzzing tool; fuzzers have a tendency to find many variations of the same bug,
 so identifying the root cause is important for avoiding issue spam.
 
-- if the failing command was part of a larger script, such as one of the
-  :doc:`/using_yosys/synthesis/synth`, you could try to follow the design
-  through the script
+If you're familiar with C/C++, you might try to have a look at the source code
+of the command that's failing.  Even if you can't fix the problem yourself, it
+can be very helpful for anyone else investigating if you're able to identify
+where the issue is arising.
 
-  + sometimes when a command is raising an error, you're seeing a symptom rather
-    than the underlying issue
-  + an earlier command may be putting the design in an invalid state which isn't
-    picked up until the error is raised
-  + check out :ref:`yosys_internals/extending_yosys/advanced_bugpoint:why context matters`
 
-- if you're familiar with C/C++ you might try to have a look at the source
-  code of the command that's failing
+Finding the failing command
+---------------------------
+
+Using the ``-L`` flag can help here, allowing you to specify a file to log to,
+such as ``yosys -L out.log -s script.ys``.  Most commands will print a header
+message when they begin; something like ``2.48. Executing HIERARCHY pass
+(managing design hierarchy).``  The last header message will usually be the
+failing command.  There are some commands which don't print a header message, so
+you may want to add ``echo on`` to the start of your script.  The `echo` command
+echoes each command executed, along with any arguments given to it.  For the
+`hierarchy` example above this might be ``yosys> hierarchy -check``.
+
+.. note::
+
+   It may also be helpful to use the `log` command to add messages which you can
+   then search for either in the terminal or the logfile.  This can be quite
+   useful if your script contains script-passes, like the
+   :doc:`/using_yosys/synthesis/synth`, which call many sub-commands and you're
+   not sure exactly which script-pass is calling the failing command.
 
-  + even if you can't fix the problem yourself, it can be very helpful for
-    anyone else investigating if you're able to identify where exactly the
-    issue is
 
 Minimizing scripts
 ------------------
 
-.. TODO:: disclaimer this is intended as advanced usage, and generally not necessary for bug reports
+.. warning::
+
+   This section is intended as **advanced usage**, and generally not necessary
+   for normal bug reports.
 
 If you're using a command line prompt, such as ``yosys -p 'synth_xilinx' -o
 design.json design.v``, consider converting it to a script.  It's generally much
@@ -40,28 +53,10 @@ command line, as well as being better for sharing with others.
    synth_xilinx
    write_json design.json
 
-Next up you want to remove everything *after* the error occurs.  Using the
-``-L`` flag can help here, allowing you to specify a file to log to, such as
-``yosys -L out.log -s script.ys``.  Most commands will print a header message
-when they begin; something like ``2.48. Executing HIERARCHY pass (managing
-design hierarchy).``  The last header message will usually be the failing
-command.  There are some commands which don't print a header message, so you may
-want to add ``echo on`` to the start of your script.  The `echo` command echoes
-each command executed, along with any arguments given to it.  For the
-`hierarchy` example above this might be ``yosys> hierarchy -check``.
-
-.. note::
-
-   It may also be helpful to use the `log` command to add messages which you can
-   then search for either in the terminal or the logfile.  This can be quite
-   useful if your script contains script-passes, like the
-   :doc:`/using_yosys/synthesis/synth`, which call many sub-commands and you're
-   not sure exactly which script-pass is calling the failing command.
-
-If your final command calls sub-commands, replace it with its contents and
-repeat the previous step.  In the case of the
-:doc:`/using_yosys/synthesis/synth`, as well as certain other script-passes, you
-can use the ``-run`` option to simplify this.  For example we can replace
+Next up you want to remove everything *after* the error occurs.  If your final
+command calls sub-commands, replace it with its contents first.  In the case of
+the :doc:`/using_yosys/synthesis/synth`, as well as certain other script-passes,
+you can use the ``-run`` option to simplify this. For example we can replace
 ``synth -top <top> -lut`` with the :ref:`replace_synth`.  The options ``-top
 <top> -lut`` can be provided to each `synth` step, or to just the step(s) where
 it is relevant, as done here.
@@ -177,32 +172,85 @@ recovering context, checkout
 Why context matters
 -------------------
 
-- if you did minimized your script, and removed commands prior to the failure
-  to get a smaller design, try to work backwards and find which commands may
-  have contributed to the design failing
-- especially important when the bug is happening inside of a ``synth_*`` script
-- example (#4590)
+Sometimes when a command is raising an error, you're seeing a symptom rather
+than the underlying issue.  It's possible that an earlier command may be putting
+the design in an invalid state, which isn't picked up until the error is raised.
+This is particularly true for the pre-packaged
+:doc:`/using_yosys/synthesis/synth`, which rely on a combination of generic and
+architecture specific passes.  As new features are added to Yosys and more
+designs are supported, the types of cells output by a pass can grow and change;
+and sometimes this leads to a mismatch in what a pass is intended to handle.
+
+If you minimized your script, and removed commands prior to the failure to get a
+smaller reproducer, try to work backwards and find which commands may have
+contributed to the design failing.  From the minimized design you should have
+some understanding of the cell or cells which are producing the error; but where
+did those cells come from?  The name and/or type of the cell can often point you
+in the right direction:
+
+.. code-block::
+
+   # internal cell types start with a $
+   # lowercase for word-level, uppercase for bit-level
+   $and
+   $_AND_
+
+   # cell types with $__ are typically intermediate cells used in techmapping
+   $__MUL16X16
+
+   # cell types without a $ are either user-defined or architecture specific
+   my_module
+   SB_MAC16
+
+   # object names might give you the name of the pass that created them
+   $procdff$1204
+   $memory\rom$rdmux[0][0][0]$a$1550
+
+   # or even the line number in the Yosys source
+   $auto$muxcover.cc:557:implement_best_cover$2152
+   $auto$alumacc.cc:495:replace_alu$1209
+
+Try running the unminimized script and search the log for the names of the
+objects in your minimized design.  In the case of cells you can also search for
+the type of the cell.  Remember that calling `stat` will list all the types of
+cells currently used in the design, and `select -list =*` will list the names of
+of all the current objects.  You can add these commands to your script, or use
+an interactive terminal to run each command individually.  Adding them to the
+script can be more repeatable, but if it takes a long time to run to the point
+you're interested in then an interactive shell session can give you more
+flexibility once you reach that point.  You can also add a call to the `shell`
+command at any point in a script to start an interactive session at a given
+point; allowing you to script any preparation steps, then come back once it's
+done.
+
+A worked example
+~~~~~~~~~~~~~~~~
   
-  + say you did all the minimization and found that the error occurs when a call
-    to ``techmap -map +/xilinx/cells_map.v`` with ``MIN_MUX_INPUTS`` defined
-    parses a `$_MUX16_` with all inputs set to ``1'x``
-  + step through the original script, calling `stat` after each step to find
-    when the `$_MUX16_` is added
-  + find that the `$_MUX16_` is introduced by a call to `muxcover`, but all the
-    inputs are defined, so calling `techmap` now works as expected
+Say you did all the minimization and found that an error in `synth_xilinx`
+occurs when a call to ``techmap -map +/xilinx/cells_map.v`` with
+``MIN_MUX_INPUTS`` defined parses a `$_MUX16_` with all inputs set to ``1'x``.
+You could fix the bug in ``+/xilinx/cells_map.v``, but that might only solve
+this one case while leaving other problems that haven't been found yet.  So you
+step through the original script, calling `stat` after each step to find when
+the `$_MUX16_` is added.
 
-    * and from running `bugpoint` with the failing techmap you know that the
-      cell with index ``2297`` will fail, so you can now call ``select
-      top/*$2297`` to limit to just that cell, and optionally call ``design
-      -save pre_bug`` or ``write_rtlil -selected pre_bug.il`` to save this state
+You find that the `$_MUX16_` is introduced by a call to `muxcover`, but all the
+inputs are defined, so calling `techmap` now works as expected.  From running
+`bugpoint` with the failing techmap you know that the cell with index ``2297``
+will fail, so you call ``select top/*$2297`` to limit to just that cell.  This
+can then be saved with ``design -save pre_bug`` or ``write_rtlil -selected
+pre_bug.il``, so that you don't have to re-run all the earlier steps to get back
+here.
 
-  + next you step through the remaining commands and call `dump` after each to
-    find when the inputs are disconnected
-  + find that ``opt -full`` has optimized away portions of the circuit, leading
-    to `opt_expr` setting the undriven mux inputs to ``x``, but failing to
-    remove the now unnecessary `$_MUX16_`
+Next you step through the remaining commands and call `dump` after each to find
+when the inputs are disconnected.  You find that ``opt -full`` has optimized
+away portions of the circuit, leading to `opt_expr` setting the undriven mux
+inputs to ``x``, but failing to remove the now unnecessary `$_MUX16_`.  Now
+you've identified a problem in `opt_expr` that affects all of the wide muxes,
+and could happen in any synthesis flow, not just `synth_xilinx`.
 
-- in this example, you might've stopped with the minimal reproducer, fixed the
-  bug in ``+/xilinx/cells_map.v``, and carried on
-- but by following the failure back you've managed to identify a problem with
-  `opt_expr` that could be causing other problems either now or in the future
+.. seealso::
+
+   This example is taken from `YosysHQ/yosys#4590
+   <https://github.com/YosysHQ/yosys/issues/4590>`_ and can be reproduced with a
+   version of Yosys between 0.45 and 0.51.

From 29d334186c8acc0329eb9b6cf06ac686d71e514e Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:01 +1200
Subject: [PATCH 262/931] bugpoint.rst: How to creduce

---
 docs/source/using_yosys/bugpoint.rst | 87 +++++++++++++++++++++-------
 1 file changed, 66 insertions(+), 21 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 38a978695..5c4bf3ae7 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -262,20 +262,74 @@ Minimizing Verilog designs
    This section is not specific to Yosys, so feel free to use another guide such
    as Stack Overflow's `How to create a Minimal, Reproducible Example`_.
 
-Unlike RTLIL designs where we can use `bugpoint`, minimizing Verilog designs is
-a much more manual, iterative process.  Be sure to check any errors or warnings
-for messages that might identify source lines or object names that might be
-causing the failure, and back up your source code before modifying it.  At any
-point in the process, you can check for anything that is unused or totally
-disconnected (ports, wires, etc) and remove them too.  If you have multiple
-source files, try to reduce them down to a single file; either by removing files
-or combining them.
+Be sure to check any errors or warnings for messages that might identify source
+lines or object names that might be causing the failure, and back up your source
+code before modifying it.  If you have multiple source files, you should start
+by reducing them down to a single file.  If a specific file is failing to read,
+try removing everything else and just focus on that one.  If your source uses
+the `include` directive, replace it with the contents of the file referenced.
 
-.. note::
+Unlike RTLIL designs where we can use `bugpoint`, Yosys does not provide any
+tools for minimizing Verilog designs.  Instead, you should use an external tool
+like `C-Reduce`_ (with the ``--not-c`` flag) or `sv-bugpoint`_.
 
-   If a specific module is causing the problem, try to set that as the top
-   module instead.  Any parameters should have their default values changed to
-   match the failing usage.
+.. _C-Reduce: https://github.com/csmith-project/creduce
+.. _sv-bugpoint: https://github.com/antmicro/sv-bugpoint
+
+C-Reduce
+~~~~~~~~
+
+As a very brief overview for using C-Reduce, you want your failing source design
+(``test.v``), and some shell script which checks for the error being
+investigated (``test.sh``).  Below is an :ref:`egtest` which uses `logger` and
+the ``-expect error "<string>" 1`` option to perform a similar role to
+``bugpoint -grep``, along with ``verilator`` to lint the code and make sure it
+is still valid.
+
+.. code-block:: bash
+   :caption: Example test.sh
+   :name: egtest
+
+   #!/bin/bash
+   verilator --lint-only test.v &&/
+   yosys -p 'logger -expect error "unsupported" 1; read_verilog test.v'
+
+.. code-block:: verilog
+   :caption: input test.v
+
+   module top(input clk, a, b, c, output x, y, z);
+      always @(posedge clk) begin
+         if (a == 1'b1)
+            $stop;
+      end
+      assign x = a;
+      assign y = a ^ b;
+      assign z = c;
+   endmodule
+
+In this example ``read_verilog test.v`` is giving an error message that contains
+the string "unsupported" because the ``$stop`` system task is only supported in
+``initial`` blocks.  By calling ``creduce ./test.sh test.v --not-c`` we can
+minimize the design to just the failing code, while still being valid Verilog.
+
+.. code-block:: verilog
+   :caption: output test.v
+
+   module a;
+   always begin $stop;
+   end endmodule
+
+
+Doing it manually
+~~~~~~~~~~~~~~~~~
+
+If for some reason you are unable to use a tool to minimize your code, you can
+still do it manually.  But it can be a time consuming process and requires a lot
+of iteration.  At any point in the process, you can check for anything that is
+unused or totally disconnected (ports, wires, etc) and remove them. If a
+specific module is causing the problem, try to set that as the top module
+instead.  Any parameters should have their default values changed to match the
+failing usage.
 
 As a rule of thumb, try to split things roughly in half at each step; similar to
 a "binary search".  If you have 10 cells (instances of modules) in your top
@@ -318,15 +372,6 @@ the error still occurs.  Try reducing ``if .. else`` and ``case`` blocks to a
 single case.  Even if that doesn't work, you may still be able to remove some
 paths; start with cases that appear to be unreachable and go from there.
 
-If you're planning to share the minimized code, remember to make sure there is
-no sensitive or proprietary data in the design.  Maybe rename that
-``ibex_prefetch_buffer`` module to ``buf``, and ``very_important_signal_name``
-could just as easily be ``sig``.  The point here isn't to make names as small as
-possible, but rather to remove the context that is no longer necessary.  Calling
-something ``multiplier_output_value`` doesn't mean as much if you no longer have
-the multiplier being referred to; but if the name does still make sense then
-it's fine to leave it as-is.
-
 .. note::
 
    When sharing code on the `Yosys GitHub`_, please try to keep things in

From 4924670325f0768cb71f5072e300a874d1bef02e Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:02 +1200
Subject: [PATCH 263/931] bugpoint.rst: How to sv-bugpoint

---
 docs/source/using_yosys/bugpoint.rst | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 5c4bf3ae7..41fc60cdb 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -287,7 +287,7 @@ the ``-expect error "<string>" 1`` option to perform a similar role to
 is still valid.
 
 .. code-block:: bash
-   :caption: Example test.sh
+   :caption: Example test.sh for C-Reduce
    :name: egtest
 
    #!/bin/bash
@@ -320,6 +320,25 @@ minimize the design to just the failing code, while still being valid Verilog.
    end endmodule
 
 
+sv-bugpoint
+~~~~~~~~~~~
+
+sv-bugpoint works quite similarly to C-Reduce, except it requires an output
+directory to be provided and the check script needs to accept the target file as
+an input argument: ``sv-bugpoint outDir/ test.sh test.v``
+
+.. code-block:: bash
+   :caption: Example test.sh for sv-bugpoint
+
+   #!/bin/bash
+   verilator --lint-only $1 &&/
+   yosys -p "logger -expect error \"unsupported\" 1; read_verilog $1"
+
+Notice that the commands for ``yosys -p`` are now in double quotes (``"``), and
+the quotes around the error string are escaped (``\"``).  This is necessary for
+the ``$1`` argument subsitution to work correctly.
+
+
 Doing it manually
 ~~~~~~~~~~~~~~~~~
 

From 96b072aeb31ae6e476d419b1eb814febf75b31c6 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:02 +1200
Subject: [PATCH 264/931] advanced_bugpoint.rst: --dump-design

Also fix missing double backtick.
---
 .../extending_yosys/advanced_bugpoint.rst     | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst b/docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst
index 570155c61..22e4b1b7a 100644
--- a/docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst
+++ b/docs/source/yosys_internals/extending_yosys/advanced_bugpoint.rst
@@ -213,16 +213,31 @@ in the right direction:
 Try running the unminimized script and search the log for the names of the
 objects in your minimized design.  In the case of cells you can also search for
 the type of the cell.  Remember that calling `stat` will list all the types of
-cells currently used in the design, and `select -list =*` will list the names of
-of all the current objects.  You can add these commands to your script, or use
-an interactive terminal to run each command individually.  Adding them to the
-script can be more repeatable, but if it takes a long time to run to the point
-you're interested in then an interactive shell session can give you more
+cells currently used in the design, and ``select -list =*`` will list the names
+of of all the current objects.  You can add these commands to your script, or
+use an interactive terminal to run each command individually.  Adding them to
+the script can be more repeatable, but if it takes a long time to run to the
+point you're interested in then an interactive shell session can give you more
 flexibility once you reach that point.  You can also add a call to the `shell`
 command at any point in a script to start an interactive session at a given
 point; allowing you to script any preparation steps, then come back once it's
 done.
 
+The ``--dump-design`` option
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Yosys provides the ``--dump-design`` option (or ``-P`` for short) for dumping
+the design at specific steps of the script based on the log header.  If the last
+step before an error is ``7.2. Executing MEMORY_MAP pass (converting memories to
+logic and flip-flops)``, then calling Yosys with ``--dump-design 7.2:bad.il``
+will save the design *before* this command runs, in the file ``bad.il``.
+
+It is also possible to use this option multiple times, e.g. ``-P2:hierarchy.il
+-P7 -P7.2:bad.il``, to get multiple dumps in the same run.  This can make it
+easier to follow the design through each step to find where certain cells or
+connections are coming from.  ``--dump-design ALL`` is also allowed, writing out
+the design at each log header.
+
 A worked example
 ~~~~~~~~~~~~~~~~
   

From bfe2418a67ea6f586c4b99a094c871f19c2a9871 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:02 +1200
Subject: [PATCH 265/931] bugpoint.rst: Expand note on checking errors

---
 docs/source/using_yosys/bugpoint.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 41fc60cdb..ce84fd285 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -171,9 +171,12 @@ error code returned.
 
 .. note::
 
-   Checking the error message or return status with is optional, but helps to
-   ensure that the minimized design is reproducing the right error, especially
-   when ``<failure.ys>`` contains more than one command.
+   Checking the error message or return status is optional, but highly
+   recommended.  `bugpoint` can quite easily introduce bugs by creating
+   malformed designs that commands were not intended to handle.  By having some
+   way to check the error, `bugpoint` can ensure that it is the *right* error
+   being reproduced.  This is even more important when ``<failure.ys>`` contains
+   more than one command.
 
 By default, `bugpoint` is able to remove any part of the design.  In order to
 keep certain parts, for instance because you already know they are related to

From 8750ca42d38883030c703d31213cfcaeacf28b82 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 09:54:02 +1200
Subject: [PATCH 266/931] docs: Fix formatting

---
 docs/source/using_yosys/bugpoint.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index ce84fd285..60cabd879 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -270,7 +270,7 @@ lines or object names that might be causing the failure, and back up your source
 code before modifying it.  If you have multiple source files, you should start
 by reducing them down to a single file.  If a specific file is failing to read,
 try removing everything else and just focus on that one.  If your source uses
-the `include` directive, replace it with the contents of the file referenced.
+the ``include`` directive, replace it with the contents of the file referenced.
 
 Unlike RTLIL designs where we can use `bugpoint`, Yosys does not provide any
 tools for minimizing Verilog designs.  Instead, you should use an external tool

From f22fe912379aee2a7263896d984a1cdc7fa0d5fa Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 5 Aug 2025 00:27:22 +0000
Subject: [PATCH 267/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c828aa2d5..e5f23a0fd 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+150
+YOSYS_VER := 0.55+158
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From fe59b6d3db1f13252b5a7cc308039558a8e41fdc Mon Sep 17 00:00:00 2001
From: Rahul Bhagwat <rahulmbme@gmail.com>
Date: Mon, 4 Aug 2025 20:57:43 -0400
Subject: [PATCH 268/931] add safety checks and better name matching

---
 frontends/ast/simplify.cc | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 8bb40cb6b..693e8098a 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1105,25 +1105,35 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		std::map<std::string, AstNode*> this_wire_scope;
 		
 		// Process package imports after clearing the scope but before processing module declarations
-		for (auto &child : children) {
+		for (size_t i = 0; i < children.size(); i++) {
+			AstNode *child = children[i];
 			if (child->type == AST_IMPORT) {
+				log_debug("Processing import for package: %s\n", child->str.c_str());
 				// Find the package in the design
 				AstNode *package_node = nullptr;
 				
 				// First look in current_ast->children (for packages in same file)
-				for (auto &design_child : current_ast->children) {
-					if (design_child->type == AST_PACKAGE) {
-						if (design_child->str == child->str) {
-							package_node = design_child;
-							break;
+				if (current_ast != nullptr) {
+					for (auto &design_child : current_ast->children) {
+						if (design_child->type == AST_PACKAGE) {
+							if (design_child->str == child->str) {
+								package_node = design_child;
+								break;
+							}
 						}
 					}
 				}
 				
 				// If not found, look in design->verilog_packages (for packages from other files)
 				if (!package_node && simplify_design_context != nullptr) {
+					log_debug("Looking for package in design context, found %zu packages\n", simplify_design_context->verilog_packages.size());
 					for (auto &design_package : simplify_design_context->verilog_packages) {
-						if (design_package->str == child->str) {
+						// Handle both with and without leading backslash
+						std::string package_name = design_package->str;
+						if (package_name[0] == '\\') {
+							package_name = package_name.substr(1);
+						}
+						if (package_name == child->str || design_package->str == child->str) {
 							package_node = design_package;
 							break;
 						}
@@ -1148,8 +1158,16 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 							}
 						}
 					}
+					// Remove the import node since it's been processed
+					delete child;
+					children.erase(children.begin() + i);
+					i--; // Adjust index since we removed an element
 				} else {
-					input_error("Package `%s' not found for import\n", child->str.c_str());
+					// If we can't find the package, just remove the import node to avoid errors later
+					log_warning("Package `%s' not found for import, removing import statement\n", child->str.c_str());
+					delete child;
+					children.erase(children.begin() + i);
+					i--; // Adjust index since we removed an element
 				}
 			}
 		}

From f769e6e24524ebde9fec4cf0fddcf6910a51170f Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 5 Aug 2025 12:27:10 +0200
Subject: [PATCH 269/931] Update ABC

---
 abc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abc b/abc
index fcd8ac34d..fa7fa163d 160000
--- a/abc
+++ b/abc
@@ -1 +1 @@
-Subproject commit fcd8ac34d6105b48f32dfaf31983b071c46fb7b9
+Subproject commit fa7fa163dacdf81bdcb72b2d2713fbe9984b62bb

From 2ad3532a557de0ee512b5a6ec6fe3b8fd8efca7d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 6 Aug 2025 00:27:13 +0000
Subject: [PATCH 270/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e5f23a0fd..283040755 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+158
+YOSYS_VER := 0.55+194
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 3959d19291c68a521b8d332c253d4f20356e3879 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 13:52:12 +1200
Subject: [PATCH 271/931] Reapply "Add groups to command reference"

This reverts commit 81f87ce6ede480de2c976938921eef8b9e79f9db.
---
 .github/workflows/prepare-docs.yml            |   1 -
 Makefile                                      |  36 +-
 backends/functional/test_generic.cc           |   4 +-
 docs/.gitignore                               |   1 -
 docs/Makefile                                 |   2 +-
 docs/source/_static/custom.css                |   5 +
 docs/source/appendix/auxlibs.rst              |   5 +-
 docs/source/cmd/index_backends.rst            |   5 +
 docs/source/cmd/index_formal.rst              |   5 +
 docs/source/cmd/index_frontends.rst           |   5 +
 docs/source/cmd/index_internal.rst            | 152 ++++++
 docs/source/cmd/index_kernel.rst              |   5 +
 docs/source/cmd/index_other.rst               |   9 +
 docs/source/cmd/index_passes.rst              |  14 +
 docs/source/cmd/index_passes_cmds.rst         |   5 +
 docs/source/cmd/index_passes_equiv.rst        |   5 +
 docs/source/cmd/index_passes_fsm.rst          |   5 +
 docs/source/cmd/index_passes_hierarchy.rst    |   5 +
 docs/source/cmd/index_passes_memory.rst       |   5 +
 docs/source/cmd/index_passes_opt.rst          |   5 +
 docs/source/cmd/index_passes_proc.rst         |   5 +
 docs/source/cmd/index_passes_sat.rst          |   5 +
 docs/source/cmd/index_passes_status.rst       |   5 +
 docs/source/cmd/index_passes_techmap.rst      |   7 +
 docs/source/cmd/index_techlibs.rst            |  11 +
 docs/source/cmd/index_techlibs_achronix.rst   |   5 +
 docs/source/cmd/index_techlibs_anlogic.rst    |   5 +
 docs/source/cmd/index_techlibs_common.rst     |   5 +
 .../source/cmd/index_techlibs_coolrunner2.rst |   5 +
 docs/source/cmd/index_techlibs_easic.rst      |   5 +
 docs/source/cmd/index_techlibs_ecp5.rst       |   5 +
 docs/source/cmd/index_techlibs_fabulous.rst   |   5 +
 docs/source/cmd/index_techlibs_gatemate.rst   |   5 +
 docs/source/cmd/index_techlibs_gowin.rst      |   5 +
 docs/source/cmd/index_techlibs_greenpak4.rst  |   5 +
 docs/source/cmd/index_techlibs_ice40.rst      |   5 +
 docs/source/cmd/index_techlibs_intel.rst      |   5 +
 docs/source/cmd/index_techlibs_intel_alm.rst  |   5 +
 docs/source/cmd/index_techlibs_lattice.rst    |   5 +
 .../cmd/index_techlibs_lattice_nexus.rst      |   5 +
 docs/source/cmd/index_techlibs_microchip.rst  |   5 +
 .../cmd/index_techlibs_microchip_sf2.rst      |   5 +
 docs/source/cmd/index_techlibs_nanoxplore.rst |   5 +
 docs/source/cmd/index_techlibs_quicklogic.rst |   5 +
 docs/source/cmd/index_techlibs_xilinx.rst     |   5 +
 docs/source/cmd_ref.rst                       |  33 +-
 .../code_examples/macro_commands/prep.ys      |  23 +
 docs/source/conf.py                           |  12 +-
 docs/source/getting_started/example_synth.rst |  63 ++-
 .../getting_started/scripting_intro.rst       |   4 +-
 docs/source/index.rst                         |   2 +-
 .../interactive_investigation.rst             |  10 +-
 .../more_scripting/load_design.rst            |   2 +-
 .../using_yosys/more_scripting/selections.rst |   6 +-
 docs/source/using_yosys/synthesis/fsm.rst     |   2 +-
 docs/source/using_yosys/synthesis/memory.rst  |   2 +-
 docs/source/using_yosys/synthesis/opt.rst     |   8 +-
 docs/source/using_yosys/synthesis/proc.rst    |   2 +-
 docs/source/using_yosys/synthesis/synth.rst   |  33 +-
 .../using_yosys/synthesis/techmap_synth.rst   |   6 +-
 docs/source/using_yosys/verilog.rst           |   2 +-
 docs/source/yosys_internals/hashing.rst       |   2 +-
 docs/util/{cellref.py => cell_documenter.py}  |   0
 docs/util/cmd_documenter.py                   | 443 ++++++++++++++++++
 docs/util/{cmdref.py => custom_directives.py} | 152 +++++-
 kernel/json.h                                 |   4 +-
 kernel/log_help.cc                            | 151 ++++++
 kernel/log_help.h                             | 132 ++++++
 kernel/register.cc                            | 438 +++++++++--------
 kernel/register.h                             |  46 +-
 passes/cmds/check.cc                          |   6 +
 passes/cmds/chformal.cc                       | 109 ++---
 passes/cmds/cover.cc                          |  14 +-
 passes/cmds/dft_tag.cc                        |   6 +
 passes/cmds/edgetypes.cc                      |   6 +
 passes/cmds/example_dt.cc                     |   8 +-
 passes/cmds/exec.cc                           |   9 +-
 passes/cmds/future.cc                         |   6 +
 passes/cmds/glift.cc                          |  11 +-
 passes/cmds/internal_stats.cc                 |   7 +-
 passes/cmds/logcmd.cc                         |  10 +-
 passes/cmds/logger.cc                         |   9 +-
 passes/cmds/ltp.cc                            |   6 +
 passes/cmds/plugin.cc                         |   6 +
 passes/cmds/portarcs.cc                       |   6 +
 passes/cmds/portlist.cc                       |   6 +
 passes/cmds/printattrs.cc                     |   6 +
 passes/cmds/scc.cc                            |  11 +-
 passes/cmds/scratchpad.cc                     |  10 +-
 passes/cmds/select.cc                         |  18 +-
 passes/cmds/setenv.cc                         |  11 +-
 passes/cmds/show.cc                           |  10 +-
 passes/cmds/sta.cc                            |   6 +
 passes/cmds/stat.cc                           |   6 +
 passes/cmds/tee.cc                            |  10 +-
 passes/cmds/torder.cc                         |   6 +
 passes/cmds/trace.cc                          |  11 +
 passes/cmds/viz.cc                            |   6 +
 passes/cmds/write_file.cc                     |   6 +
 passes/cmds/xprop.cc                          |   6 +
 passes/hierarchy/Makefile.inc                 |   1 +
 passes/{techmap => hierarchy}/flatten.cc      |   0
 passes/opt/rmports.cc                         |  11 +-
 passes/pmgen/test_pmgen.cc                    |   4 +-
 passes/sat/assertpmux.cc                      |   6 +
 passes/sat/async2sync.cc                      |   6 +
 passes/sat/clk2fflogic.cc                     |   6 +
 passes/sat/cutpoint.cc                        |   6 +
 passes/sat/expose.cc                          |  10 +-
 passes/sat/fmcombine.cc                       |   6 +
 passes/sat/fminit.cc                          |   6 +
 passes/sat/formalff.cc                        |   6 +
 passes/sat/freduce.cc                         |  14 +-
 passes/sat/miter.cc                           |  10 +-
 passes/sat/mutate.cc                          |   6 +
 passes/sat/qbfsat.cc                          |   6 +
 passes/sat/recover_names.cc                   |   6 +
 passes/sat/sat.cc                             |  14 +-
 passes/sat/supercover.cc                      |   6 +
 passes/sat/synthprop.cc                       |  12 +-
 passes/techmap/Makefile.inc                   |   1 -
 passes/tests/test_abcloop.cc                  |   4 +-
 passes/tests/test_autotb.cc                   |   4 +-
 passes/tests/test_cell.cc                     |   4 +-
 124 files changed, 2030 insertions(+), 463 deletions(-)
 create mode 100644 docs/source/cmd/index_backends.rst
 create mode 100644 docs/source/cmd/index_formal.rst
 create mode 100644 docs/source/cmd/index_frontends.rst
 create mode 100644 docs/source/cmd/index_internal.rst
 create mode 100644 docs/source/cmd/index_kernel.rst
 create mode 100644 docs/source/cmd/index_other.rst
 create mode 100644 docs/source/cmd/index_passes.rst
 create mode 100644 docs/source/cmd/index_passes_cmds.rst
 create mode 100644 docs/source/cmd/index_passes_equiv.rst
 create mode 100644 docs/source/cmd/index_passes_fsm.rst
 create mode 100644 docs/source/cmd/index_passes_hierarchy.rst
 create mode 100644 docs/source/cmd/index_passes_memory.rst
 create mode 100644 docs/source/cmd/index_passes_opt.rst
 create mode 100644 docs/source/cmd/index_passes_proc.rst
 create mode 100644 docs/source/cmd/index_passes_sat.rst
 create mode 100644 docs/source/cmd/index_passes_status.rst
 create mode 100644 docs/source/cmd/index_passes_techmap.rst
 create mode 100644 docs/source/cmd/index_techlibs.rst
 create mode 100644 docs/source/cmd/index_techlibs_achronix.rst
 create mode 100644 docs/source/cmd/index_techlibs_anlogic.rst
 create mode 100644 docs/source/cmd/index_techlibs_common.rst
 create mode 100644 docs/source/cmd/index_techlibs_coolrunner2.rst
 create mode 100644 docs/source/cmd/index_techlibs_easic.rst
 create mode 100644 docs/source/cmd/index_techlibs_ecp5.rst
 create mode 100644 docs/source/cmd/index_techlibs_fabulous.rst
 create mode 100644 docs/source/cmd/index_techlibs_gatemate.rst
 create mode 100644 docs/source/cmd/index_techlibs_gowin.rst
 create mode 100644 docs/source/cmd/index_techlibs_greenpak4.rst
 create mode 100644 docs/source/cmd/index_techlibs_ice40.rst
 create mode 100644 docs/source/cmd/index_techlibs_intel.rst
 create mode 100644 docs/source/cmd/index_techlibs_intel_alm.rst
 create mode 100644 docs/source/cmd/index_techlibs_lattice.rst
 create mode 100644 docs/source/cmd/index_techlibs_lattice_nexus.rst
 create mode 100644 docs/source/cmd/index_techlibs_microchip.rst
 create mode 100644 docs/source/cmd/index_techlibs_microchip_sf2.rst
 create mode 100644 docs/source/cmd/index_techlibs_nanoxplore.rst
 create mode 100644 docs/source/cmd/index_techlibs_quicklogic.rst
 create mode 100644 docs/source/cmd/index_techlibs_xilinx.rst
 create mode 100644 docs/source/code_examples/macro_commands/prep.ys
 rename docs/util/{cellref.py => cell_documenter.py} (100%)
 create mode 100644 docs/util/cmd_documenter.py
 rename docs/util/{cmdref.py => custom_directives.py} (81%)
 create mode 100644 kernel/log_help.cc
 create mode 100644 kernel/log_help.h
 rename passes/{techmap => hierarchy}/flatten.cc (100%)

diff --git a/.github/workflows/prepare-docs.yml b/.github/workflows/prepare-docs.yml
index fb1fab426..b47f5f3dd 100644
--- a/.github/workflows/prepare-docs.yml
+++ b/.github/workflows/prepare-docs.yml
@@ -59,7 +59,6 @@ jobs:
         with:
           name: cmd-ref-${{ github.sha }}
           path: |
-            docs/source/cmd
             docs/source/generated
             docs/source/_images
             docs/source/code_examples
diff --git a/Makefile b/Makefile
index 283040755..ce438f5db 100644
--- a/Makefile
+++ b/Makefile
@@ -115,12 +115,6 @@ BISON ?= bison
 STRIP ?= strip
 AWK ?= awk
 
-ifneq ($(shell :; command -v rsync),)
-RSYNC_CP ?= rsync -rc
-else
-RSYNC_CP ?= cp -ru
-endif
-
 ifeq ($(OS), Darwin)
 PLUGIN_LINKFLAGS += -undefined dynamic_lookup
 LINKFLAGS += -rdynamic
@@ -532,7 +526,6 @@ LIBS_VERIFIC += -Wl,--whole-archive $(patsubst %,$(VERIFIC_DIR)/%/*-linux.a,$(VE
 endif
 endif
 
-
 ifeq ($(ENABLE_COVER),1)
 CXXFLAGS += -DYOSYS_ENABLE_COVER
 endif
@@ -634,6 +627,7 @@ $(eval $(call add_include_file,frontends/blif/blifparse.h))
 $(eval $(call add_include_file,backends/rtlil/rtlil_backend.h))
 
 OBJS += kernel/driver.o kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o kernel/yosys.o kernel/io.o kernel/gzip.o
+OBJS += kernel/log_help.o
 OBJS += kernel/binding.o kernel/tclapi.o
 OBJS += kernel/cellaigs.o kernel/celledges.o kernel/cost.o kernel/satgen.o kernel/scopeinfo.o kernel/qcsat.o kernel/mem.o kernel/ffmerge.o kernel/ff.o kernel/yw.o kernel/json.o kernel/fmt.o kernel/sexpr.o
 OBJS += kernel/drivertools.o kernel/functional.o
@@ -1035,19 +1029,8 @@ ifeq ($(ENABLE_PYOSYS),1)
 endif
 endif
 
-# also others, but so long as it doesn't fail this is enough to know we tried
-docs/source/cmd/abc.rst: $(TARGETS) $(EXTRA_TARGETS)
-	$(Q) mkdir -p docs/source/cmd
-	$(Q) mkdir -p temp/docs/source/cmd
-	$(Q) cd temp && ./../$(PROGRAM_PREFIX)yosys -p 'help -write-rst-command-reference-manual'
-	$(Q) $(RSYNC_CP) temp/docs/source/cmd docs/source
-	$(Q) rm -rf temp
-docs/source/cell/word_add.rst: $(TARGETS) $(EXTRA_TARGETS)
-	$(Q) mkdir -p docs/source/cell
-	$(Q) mkdir -p temp/docs/source/cell
-	$(Q) cd temp && ./../$(PROGRAM_PREFIX)yosys -p 'help -write-rst-cells-manual'
-	$(Q) $(RSYNC_CP) temp/docs/source/cell docs/source
-	$(Q) rm -rf temp
+docs/source/generated/cmds.json: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
+	$(Q) ./$(PROGRAM_PREFIX)yosys -p 'help -dump-cmds-json $@'
 
 docs/source/generated/cells.json: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
 	$(Q) ./$(PROGRAM_PREFIX)yosys -p 'help -dump-cells-json $@'
@@ -1064,6 +1047,15 @@ docs/source/generated/functional/rosette.diff: backends/functional/smtlib.cc bac
 PHONY: docs/gen/functional_ir
 docs/gen/functional_ir: docs/source/generated/functional/smtlib.cc docs/source/generated/functional/rosette.diff
 
+docs/source/generated/%.log: docs/source/generated $(TARGETS) $(EXTRA_TARGETS)
+	$(Q) ./$(PROGRAM_PREFIX)yosys -qQT -h '$*' -l $@
+
+docs/source/generated/chformal.cc: passes/cmds/chformal.cc docs/source/generated
+	$(Q) cp $< $@
+
+PHONY: docs/gen/chformal
+docs/gen/chformal: docs/source/generated/chformal.log docs/source/generated/chformal.cc
+
 PHONY: docs/gen docs/usage docs/reqs
 docs/gen: $(TARGETS)
 	$(Q) $(MAKE) -C docs gen
@@ -1099,7 +1091,7 @@ docs/reqs:
 	$(Q) $(MAKE) -C docs reqs
 
 .PHONY: docs/prep
-docs/prep: docs/source/cmd/abc.rst docs/source/generated/cells.json docs/gen docs/usage docs/gen/functional_ir
+docs/prep: docs/source/generated/cells.json docs/source/generated/cmds.json docs/gen docs/usage docs/gen/functional_ir docs/gen/chformal
 
 DOC_TARGET ?= html
 docs: docs/prep
@@ -1123,7 +1115,7 @@ clean:
 	rm -f  tests/tools/cmp_tbdata
 	rm -f $(addsuffix /run-test.mk,$(MK_TEST_DIRS))
 	-$(MAKE) -C docs clean
-	rm -rf docs/source/cmd docs/util/__pycache__
+	rm -rf docs/util/__pycache__
 	rm -f *.whl
 	rm -f libyosys.so
 
diff --git a/backends/functional/test_generic.cc b/backends/functional/test_generic.cc
index a9dfd0c70..42d6c2b95 100644
--- a/backends/functional/test_generic.cc
+++ b/backends/functional/test_generic.cc
@@ -116,7 +116,9 @@ struct MemContentsTest {
 
 struct FunctionalTestGeneric : public Pass
 {
-	FunctionalTestGeneric() : Pass("test_generic", "test the generic compute graph") {}
+	FunctionalTestGeneric() : Pass("test_generic", "test the generic compute graph") {
+		internal();
+	}
 
     void help() override
 	{
diff --git a/docs/.gitignore b/docs/.gitignore
index 65bbcdeae..09bb59048 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -1,5 +1,4 @@
 /build/
-/source/cmd
 /source/generated
 /source/_images/**/*.log
 /source/_images/**/*.aux
diff --git a/docs/Makefile b/docs/Makefile
index a8874bb83..fb3e03b79 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -47,7 +47,7 @@ help:
 .PHONY: clean
 clean: clean-examples
 	rm -rf $(BUILDDIR)/*
-	rm -rf source/cmd util/__pycache__
+	rm -rf util/__pycache__
 	rm -rf source/generated
 	$(MAKE) -C source/_images clean
 
diff --git a/docs/source/_static/custom.css b/docs/source/_static/custom.css
index b08194c05..60faf6812 100644
--- a/docs/source/_static/custom.css
+++ b/docs/source/_static/custom.css
@@ -18,3 +18,8 @@
 .literal-block-wrapper .code-block-caption .caption-number {
     padding-right: 0.5em
 }
+
+/* Don't double shrink text in a literal in an optionlist */
+kbd .option>.literal {
+    font-size: revert;
+}
diff --git a/docs/source/appendix/auxlibs.rst b/docs/source/appendix/auxlibs.rst
index 8c78ed6b3..192ac0944 100644
--- a/docs/source/appendix/auxlibs.rst
+++ b/docs/source/appendix/auxlibs.rst
@@ -29,8 +29,7 @@ ezSAT
 
 The files in ``libs/ezsat`` provide a library for simplifying generating CNF
 formulas for SAT solvers. It also contains bindings of MiniSAT. The ezSAT
-library is written by C. Wolf. It is used by the `sat` pass (see
-:doc:`/cmd/sat`).
+library is written by C. Wolf. It is used by the `sat` pass.
 
 fst
 ---
@@ -78,4 +77,4 @@ SubCircuit
 The files in ``libs/subcircuit`` provide a library for solving the subcircuit
 isomorphism problem. It is written by C. Wolf and based on the Ullmann Subgraph
 Isomorphism Algorithm :cite:p:`UllmannSubgraphIsomorphism`. It is used by the
-extract pass (see :doc:`../cmd/extract`).
+`extract` pass.
diff --git a/docs/source/cmd/index_backends.rst b/docs/source/cmd/index_backends.rst
new file mode 100644
index 000000000..373c26def
--- /dev/null
+++ b/docs/source/cmd/index_backends.rst
@@ -0,0 +1,5 @@
+Writing output files
+--------------------
+
+.. autocmdgroup:: backends
+   :members:
diff --git a/docs/source/cmd/index_formal.rst b/docs/source/cmd/index_formal.rst
new file mode 100644
index 000000000..b8b134c17
--- /dev/null
+++ b/docs/source/cmd/index_formal.rst
@@ -0,0 +1,5 @@
+Formal verification
+-------------------
+
+.. autocmdgroup:: formal
+   :members:
diff --git a/docs/source/cmd/index_frontends.rst b/docs/source/cmd/index_frontends.rst
new file mode 100644
index 000000000..b64fdc9b9
--- /dev/null
+++ b/docs/source/cmd/index_frontends.rst
@@ -0,0 +1,5 @@
+Reading input files
+-------------------
+
+.. autocmdgroup:: frontends
+   :members:
diff --git a/docs/source/cmd/index_internal.rst b/docs/source/cmd/index_internal.rst
new file mode 100644
index 000000000..bfb369dde
--- /dev/null
+++ b/docs/source/cmd/index_internal.rst
@@ -0,0 +1,152 @@
+Internal commands for developers
+--------------------------------
+
+.. autocmdgroup:: internal
+   :members:
+
+Writing command help
+--------------------
+
+- use `chformal` as an example
+- generated help content below
+
+.. _chformal autocmd:
+
+.. autocmd:: chformal
+   :noindex:
+
+The ``formatted_help()`` method
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- ``PrettyHelp::get_current()``
+- ``PrettyHelp::set_group()``
+
+  + used with ``.. autocmdgroup:: <group>``
+  + can assign group and return false
+  + if no group is set, will try to use ``source_location`` and assign group
+    from path to source file
+
+- return value
+
+  + true means help content added to current ``PrettyHelp``
+  + false to use ``Pass::help()``
+
+- adding content
+
+  + help content is a list of ``ContentListing`` nodes, each one having a type,
+    body, and its own list of children ``ContentListing``\ s
+  + ``PrettyHelp::get_root()`` returns the root ``ContentListing`` (``type="root"``)
+  + ``ContentListing::{usage, option, codeblock, paragraph}`` each add a
+    ``ContentListing`` to the current node, with type the same as the method
+
+    * the first argument is the body of the new node
+    * ``usage`` shows how to call the command (i.e. its "signature")
+    * ``paragraph`` content is formatted as a paragraph of text with line breaks
+      added automatically
+    * ``codeblock`` content is displayed verbatim, use line breaks as desired;
+      takes an optional ``language`` argument for assigning the language in RST
+      output for code syntax highlighting (use ``yoscrypt`` for yosys script
+      syntax highlighting)
+    * ``option`` lists a single option for the command, usually starting with a
+      dash (``-``); takes an optional second argument which adds a paragraph
+      node as a means of description
+
+  + ``ContentListing::open_usage`` creates and returns a new usage node, can be
+    used to e.g. add text/options specific to a given usage of the command
+  + ``ContentListing::open_option`` creates and returns a new option node, can
+    be used to e.g. add multiple paragraphs to an option's description
+  + paragraphs are treated as raw RST, allowing for inline formatting and
+    references as if it were written in the RST file itself
+
+.. literalinclude:: /generated/chformal.cc
+   :language: c++
+   :start-at: bool formatted_help()
+   :end-before: void execute
+   :caption: ``ChformalPass::formatted_help()`` from :file:`passes/cmds/chformal.cc`
+
+Dumping command help to json
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- `help -dump-cells-json cmds.json`
+
+  + generates a ``ContentListing`` for each command registered in Yosys
+  + tries to parse unformatted ``Pass::help()`` output if
+    ``Pass::formatted_help()`` is unimplemented or returns false
+
+    * if a line starts with four spaces followed by the name of the command then
+      a space, it is parsed as a signature (usage node)
+    * if a line is indented and starts with a dash (``-``), it is parsed as an
+      option
+    * anything else is parsed as a codeblock and added to either the root node
+      or the current option depending on the indentation
+
+  + dictionary of command name to ``ContentListing``
+
+    * uses ``ContentListing::to_json()`` recursively for each node in root
+    * root node used for source location of class definition
+    * includes flags set during pass constructor (e.g. ``experimental_flag`` set
+      by ``Pass::experimental()``)
+    * also title (``short_help`` argument in ``Pass::Pass``), group, and class
+      name
+   
+  + dictionary of group name to list of commands in that group
+
+- used by sphinx autodoc to generate help content
+
+.. literalinclude:: /generated/cmds.json
+   :language: json
+   :start-at: "chformal": {
+   :end-before: "chparam": {
+   :caption: `chformal` in generated :file:`cmds.json`
+
+.. note:: Synthesis command scripts are special cased
+
+   If the final block of help output starts with the string `"The following
+   commands are executed by this synthesis command:\n"`, then the rest of the
+   code block is formatted as ``yoscrypt`` (e.g. `synth_ice40`).  The caveat
+   here is that if the ``script()`` calls ``run()`` on any commands *prior* to
+   the first ``check_label`` then the auto detection will break and revert to
+   unformatted code (e.g. `synth_fabulous`). 
+
+Command line rendering
+~~~~~~~~~~~~~~~~~~~~~~
+
+- if ``Pass::formatted_help()`` returns true, will call
+  ``PrettyHelp::log_help()``
+
+  + traverse over the children of the root node and render as plain text 
+  + effectively the reverse of converting unformatted ``Pass::help()`` text
+  + lines are broken at 80 characters while maintaining indentation (controlled
+    by ``MAX_LINE_LEN`` in :file:`kernel/log_help.cc`)
+  + each line is broken into words separated by spaces, if a given word starts
+    and ends with backticks they will be stripped
+
+- if it returns false it will call ``Pass::help()`` which should call ``log()``
+  directly to print and format help text
+
+  + if ``Pass::help()`` is not overridden then a default message about missing
+    help will be displayed
+
+.. literalinclude:: /generated/chformal.log
+   :lines: 2-
+
+RST generated from autocmd
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- below is the raw RST output from ``autocmd`` (``YosysCmdDocumenter`` class in
+  :file:`docs/util/cmd_documenter.py`) for `chformal` command
+- heading will be rendered as a subheading of the most recent heading (see
+  `chformal autocmd`_ above rendered under `Writing command help`_)
+- ``.. cmd:def:: <cmd>`` line is indexed for cross references with ``:cmd:ref:``
+  directive (`chformal autocmd`_ above uses ``:noindex:`` option so that
+  `chformal` still links to the correct location)
+
+  + ``:title:`` option controls text that appears when hovering over the
+    `chformal` link
+
+- commands with warning flags (experimental or internal) add a ``.. warning``
+  block before any of the help content
+- if a command has no ``source_location`` the ``.. note`` at the bottom will
+  instead link to :doc:`/cmd/index_other`
+
+.. autocmd_rst:: chformal
diff --git a/docs/source/cmd/index_kernel.rst b/docs/source/cmd/index_kernel.rst
new file mode 100644
index 000000000..c6891b5e5
--- /dev/null
+++ b/docs/source/cmd/index_kernel.rst
@@ -0,0 +1,5 @@
+Yosys kernel commands
+---------------------
+
+.. autocmdgroup:: kernel
+   :members:
diff --git a/docs/source/cmd/index_other.rst b/docs/source/cmd/index_other.rst
new file mode 100644
index 000000000..540cf9e49
--- /dev/null
+++ b/docs/source/cmd/index_other.rst
@@ -0,0 +1,9 @@
+:orphan:
+
+Other commands
+==============
+
+Unknown source location
+
+.. autocmdgroup:: unknown
+   :members:
diff --git a/docs/source/cmd/index_passes.rst b/docs/source/cmd/index_passes.rst
new file mode 100644
index 000000000..b652be004
--- /dev/null
+++ b/docs/source/cmd/index_passes.rst
@@ -0,0 +1,14 @@
+Passes
+------
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+
+   /cmd/index_passes_hierarchy
+   /cmd/index_passes_proc
+   /cmd/index_passes_fsm
+   /cmd/index_passes_memory
+   /cmd/index_passes_opt
+   /cmd/index_passes_techmap
+   /cmd/index_passes_*
diff --git a/docs/source/cmd/index_passes_cmds.rst b/docs/source/cmd/index_passes_cmds.rst
new file mode 100644
index 000000000..d7b448f07
--- /dev/null
+++ b/docs/source/cmd/index_passes_cmds.rst
@@ -0,0 +1,5 @@
+Design modification
+-------------------
+
+.. autocmdgroup:: passes/cmds
+   :members:
diff --git a/docs/source/cmd/index_passes_equiv.rst b/docs/source/cmd/index_passes_equiv.rst
new file mode 100644
index 000000000..6ed2c3c18
--- /dev/null
+++ b/docs/source/cmd/index_passes_equiv.rst
@@ -0,0 +1,5 @@
+Equivalence checking
+--------------------
+
+.. autocmdgroup:: passes/equiv
+   :members:
diff --git a/docs/source/cmd/index_passes_fsm.rst b/docs/source/cmd/index_passes_fsm.rst
new file mode 100644
index 000000000..43af5dce6
--- /dev/null
+++ b/docs/source/cmd/index_passes_fsm.rst
@@ -0,0 +1,5 @@
+FSM handling
+------------
+
+.. autocmdgroup:: passes/fsm
+   :members:
diff --git a/docs/source/cmd/index_passes_hierarchy.rst b/docs/source/cmd/index_passes_hierarchy.rst
new file mode 100644
index 000000000..27a0faeb7
--- /dev/null
+++ b/docs/source/cmd/index_passes_hierarchy.rst
@@ -0,0 +1,5 @@
+Working with hierarchy
+----------------------
+
+.. autocmdgroup:: passes/hierarchy
+   :members:
diff --git a/docs/source/cmd/index_passes_memory.rst b/docs/source/cmd/index_passes_memory.rst
new file mode 100644
index 000000000..b4edb88e7
--- /dev/null
+++ b/docs/source/cmd/index_passes_memory.rst
@@ -0,0 +1,5 @@
+Memory handling
+---------------
+
+.. autocmdgroup:: passes/memory
+   :members:
diff --git a/docs/source/cmd/index_passes_opt.rst b/docs/source/cmd/index_passes_opt.rst
new file mode 100644
index 000000000..ddeb5ce10
--- /dev/null
+++ b/docs/source/cmd/index_passes_opt.rst
@@ -0,0 +1,5 @@
+Optimization passes
+-------------------
+
+.. autocmdgroup:: passes/opt
+   :members:
diff --git a/docs/source/cmd/index_passes_proc.rst b/docs/source/cmd/index_passes_proc.rst
new file mode 100644
index 000000000..1ad8d85b4
--- /dev/null
+++ b/docs/source/cmd/index_passes_proc.rst
@@ -0,0 +1,5 @@
+Converting process blocks
+-------------------------
+
+.. autocmdgroup:: passes/proc
+   :members:
diff --git a/docs/source/cmd/index_passes_sat.rst b/docs/source/cmd/index_passes_sat.rst
new file mode 100644
index 000000000..a2571fedb
--- /dev/null
+++ b/docs/source/cmd/index_passes_sat.rst
@@ -0,0 +1,5 @@
+Simulating circuits
+-------------------
+
+.. autocmdgroup:: passes/sat
+   :members:
diff --git a/docs/source/cmd/index_passes_status.rst b/docs/source/cmd/index_passes_status.rst
new file mode 100644
index 000000000..a157ed840
--- /dev/null
+++ b/docs/source/cmd/index_passes_status.rst
@@ -0,0 +1,5 @@
+Design status
+-------------
+
+.. autocmdgroup:: passes/status
+   :members:
diff --git a/docs/source/cmd/index_passes_techmap.rst b/docs/source/cmd/index_passes_techmap.rst
new file mode 100644
index 000000000..1682cd181
--- /dev/null
+++ b/docs/source/cmd/index_passes_techmap.rst
@@ -0,0 +1,7 @@
+Technology mapping
+------------------
+
+.. seealso:: :doc:`/cmd/index_techlibs`
+
+.. autocmdgroup:: passes/techmap
+   :members:
diff --git a/docs/source/cmd/index_techlibs.rst b/docs/source/cmd/index_techlibs.rst
new file mode 100644
index 000000000..043620a3b
--- /dev/null
+++ b/docs/source/cmd/index_techlibs.rst
@@ -0,0 +1,11 @@
+Technology libraries
+====================
+
+Listed in alphabetical order.
+
+.. toctree::
+   :maxdepth: 2
+   :glob:
+
+   /cmd/index_techlibs_common
+   /cmd/index_techlibs_*
diff --git a/docs/source/cmd/index_techlibs_achronix.rst b/docs/source/cmd/index_techlibs_achronix.rst
new file mode 100644
index 000000000..d4d96d24a
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_achronix.rst
@@ -0,0 +1,5 @@
+Achronix
+------------------
+
+.. autocmdgroup:: techlibs/achronix
+   :members:
diff --git a/docs/source/cmd/index_techlibs_anlogic.rst b/docs/source/cmd/index_techlibs_anlogic.rst
new file mode 100644
index 000000000..8a2e6b577
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_anlogic.rst
@@ -0,0 +1,5 @@
+Anlogic
+------------------
+
+.. autocmdgroup:: techlibs/anlogic
+   :members:
diff --git a/docs/source/cmd/index_techlibs_common.rst b/docs/source/cmd/index_techlibs_common.rst
new file mode 100644
index 000000000..532f4291e
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_common.rst
@@ -0,0 +1,5 @@
+Generic
+------------------
+
+.. autocmdgroup:: techlibs/common
+   :members:
diff --git a/docs/source/cmd/index_techlibs_coolrunner2.rst b/docs/source/cmd/index_techlibs_coolrunner2.rst
new file mode 100644
index 000000000..23d91a500
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_coolrunner2.rst
@@ -0,0 +1,5 @@
+CoolRunner-II
+------------------
+
+.. autocmdgroup:: techlibs/coolrunner2
+   :members:
diff --git a/docs/source/cmd/index_techlibs_easic.rst b/docs/source/cmd/index_techlibs_easic.rst
new file mode 100644
index 000000000..c6398ddf3
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_easic.rst
@@ -0,0 +1,5 @@
+eASIC
+------------------
+
+.. autocmdgroup:: techlibs/easic
+   :members:
diff --git a/docs/source/cmd/index_techlibs_ecp5.rst b/docs/source/cmd/index_techlibs_ecp5.rst
new file mode 100644
index 000000000..29fd309cf
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_ecp5.rst
@@ -0,0 +1,5 @@
+ECP5
+------------------
+
+.. autocmdgroup:: techlibs/ecp5
+   :members:
diff --git a/docs/source/cmd/index_techlibs_fabulous.rst b/docs/source/cmd/index_techlibs_fabulous.rst
new file mode 100644
index 000000000..96f04f40a
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_fabulous.rst
@@ -0,0 +1,5 @@
+FABulous
+------------------
+
+.. autocmdgroup:: techlibs/fabulous
+   :members:
diff --git a/docs/source/cmd/index_techlibs_gatemate.rst b/docs/source/cmd/index_techlibs_gatemate.rst
new file mode 100644
index 000000000..951d0000b
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_gatemate.rst
@@ -0,0 +1,5 @@
+Gatemate
+------------------
+
+.. autocmdgroup:: techlibs/gatemate
+   :members:
diff --git a/docs/source/cmd/index_techlibs_gowin.rst b/docs/source/cmd/index_techlibs_gowin.rst
new file mode 100644
index 000000000..cdcb1c2ee
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_gowin.rst
@@ -0,0 +1,5 @@
+Gowin
+------------------
+
+.. autocmdgroup:: techlibs/gowin
+   :members:
diff --git a/docs/source/cmd/index_techlibs_greenpak4.rst b/docs/source/cmd/index_techlibs_greenpak4.rst
new file mode 100644
index 000000000..add1ab102
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_greenpak4.rst
@@ -0,0 +1,5 @@
+GreenPAK4
+------------------
+
+.. autocmdgroup:: techlibs/greenpak4
+   :members:
diff --git a/docs/source/cmd/index_techlibs_ice40.rst b/docs/source/cmd/index_techlibs_ice40.rst
new file mode 100644
index 000000000..1c4b2d07a
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_ice40.rst
@@ -0,0 +1,5 @@
+iCE40
+------------------
+
+.. autocmdgroup:: techlibs/ice40
+   :members:
diff --git a/docs/source/cmd/index_techlibs_intel.rst b/docs/source/cmd/index_techlibs_intel.rst
new file mode 100644
index 000000000..6b3a26222
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_intel.rst
@@ -0,0 +1,5 @@
+Intel (MAX10, Cyclone IV)
+-------------------------
+
+.. autocmdgroup:: techlibs/intel
+   :members:
diff --git a/docs/source/cmd/index_techlibs_intel_alm.rst b/docs/source/cmd/index_techlibs_intel_alm.rst
new file mode 100644
index 000000000..afadfc13e
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_intel_alm.rst
@@ -0,0 +1,5 @@
+Intel ALM (Cyclone V, Arria V, Cyclone 10 GX)
+---------------------------------------------
+
+.. autocmdgroup:: techlibs/intel_alm
+   :members:
diff --git a/docs/source/cmd/index_techlibs_lattice.rst b/docs/source/cmd/index_techlibs_lattice.rst
new file mode 100644
index 000000000..985bf0bbd
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_lattice.rst
@@ -0,0 +1,5 @@
+Lattice
+------------------
+
+.. autocmdgroup:: techlibs/lattice
+   :members:
diff --git a/docs/source/cmd/index_techlibs_lattice_nexus.rst b/docs/source/cmd/index_techlibs_lattice_nexus.rst
new file mode 100644
index 000000000..d5ac4184c
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_lattice_nexus.rst
@@ -0,0 +1,5 @@
+Lattice Nexus
+------------------
+
+.. autocmdgroup:: techlibs/nexus
+   :members:
diff --git a/docs/source/cmd/index_techlibs_microchip.rst b/docs/source/cmd/index_techlibs_microchip.rst
new file mode 100644
index 000000000..06613a59c
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_microchip.rst
@@ -0,0 +1,5 @@
+Microchip
+------------------
+
+.. autocmdgroup:: techlibs/microchip
+   :members:
diff --git a/docs/source/cmd/index_techlibs_microchip_sf2.rst b/docs/source/cmd/index_techlibs_microchip_sf2.rst
new file mode 100644
index 000000000..4ebe47f33
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_microchip_sf2.rst
@@ -0,0 +1,5 @@
+Microchip - SmartFusion2/IGLOO2
+-----------------------------------
+
+.. autocmdgroup:: techlibs/sf2
+   :members:
diff --git a/docs/source/cmd/index_techlibs_nanoxplore.rst b/docs/source/cmd/index_techlibs_nanoxplore.rst
new file mode 100644
index 000000000..9eff4681c
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_nanoxplore.rst
@@ -0,0 +1,5 @@
+NanoXplore
+------------------
+
+.. autocmdgroup:: techlibs/nanoxplore
+   :members:
diff --git a/docs/source/cmd/index_techlibs_quicklogic.rst b/docs/source/cmd/index_techlibs_quicklogic.rst
new file mode 100644
index 000000000..54d199eb0
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_quicklogic.rst
@@ -0,0 +1,5 @@
+QuickLogic
+------------------
+
+.. autocmdgroup:: techlibs/quicklogic
+   :members:
diff --git a/docs/source/cmd/index_techlibs_xilinx.rst b/docs/source/cmd/index_techlibs_xilinx.rst
new file mode 100644
index 000000000..df5112b7e
--- /dev/null
+++ b/docs/source/cmd/index_techlibs_xilinx.rst
@@ -0,0 +1,5 @@
+Xilinx
+------------------
+
+.. autocmdgroup:: techlibs/xilinx
+   :members:
diff --git a/docs/source/cmd_ref.rst b/docs/source/cmd_ref.rst
index d2d59ba54..668516a0b 100644
--- a/docs/source/cmd_ref.rst
+++ b/docs/source/cmd_ref.rst
@@ -5,10 +5,31 @@ Command line reference
 .. literalinclude:: /generated/yosys
     :start-at: Usage
 
-.. toctree::
-	:caption: Command reference
-	:maxdepth: 1
-	:glob:
+.. _cmd_ref:
 
-	/appendix/env_vars
-	/cmd/*
+Command reference
+-----------------
+
+.. todo:: Can we warn on command groups that aren't included anywhere?
+
+:ref:`List of all commands<cmd-cmd>`
+
+.. toctree::
+   :maxdepth: 2
+
+   /appendix/env_vars
+   /cmd/index_frontends
+   /cmd/index_backends
+   /cmd/index_kernel
+   /cmd/index_formal
+
+.. toctree::
+   :maxdepth: 3
+
+   /cmd/index_passes
+   /cmd/index_techlibs
+
+.. toctree::
+   :maxdepth: 2
+
+   /cmd/index_internal
diff --git a/docs/source/code_examples/macro_commands/prep.ys b/docs/source/code_examples/macro_commands/prep.ys
new file mode 100644
index 000000000..1bec907f6
--- /dev/null
+++ b/docs/source/code_examples/macro_commands/prep.ys
@@ -0,0 +1,23 @@
+#start:The following commands are executed by this synthesis command:
+#end:$
+begin:
+    hierarchy -check [-top <top> | -auto-top]
+
+coarse:
+    proc [-ifx]
+    flatten    (if -flatten)
+    future
+    opt_expr -keepdc
+    opt_clean
+    check
+    opt -noff -keepdc
+    wreduce -keepdc [-memx]
+    memory_dff    (if -rdff)
+    memory_memx    (if -memx)
+    opt_clean
+    memory_collect
+    opt -noff -keepdc -fast
+
+check:
+    stat
+    check
diff --git a/docs/source/conf.py b/docs/source/conf.py
index e587b8d31..7cdea5df1 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -43,8 +43,12 @@ html_static_path = ['_static', "_images"]
 # default to no highlight
 highlight_language = 'none'
 
-# default single quotes to attempt auto reference, or fallback to code
+# default single quotes to attempt auto reference, or fallback to yoscrypt
 default_role = 'autoref'
+rst_prolog = """
+.. role:: yoscrypt(code)
+   :language: yoscrypt
+"""
 
 extensions = ['sphinx.ext.autosectionlabel', 'sphinxcontrib.bibtex']
 
@@ -105,12 +109,14 @@ latex_elements = {
 
 # custom cmd-ref parsing/linking
 sys.path += [os.path.dirname(__file__) + "/../"]
-extensions.append('util.cmdref')
+extensions.append('util.custom_directives')
 
 # use autodocs
 extensions.append('sphinx.ext.autodoc')
-extensions.append('util.cellref')
+extensions.append('util.cell_documenter')
 cells_json = Path(__file__).parent / 'generated' / 'cells.json'
+extensions.append('util.cmd_documenter')
+cmds_json = Path(__file__).parent / 'generated' / 'cmds.json'
 
 from sphinx.application import Sphinx
 def setup(app: Sphinx) -> None:
diff --git a/docs/source/getting_started/example_synth.rst b/docs/source/getting_started/example_synth.rst
index e215586cc..ccf0d252b 100644
--- a/docs/source/getting_started/example_synth.rst
+++ b/docs/source/getting_started/example_synth.rst
@@ -70,7 +70,7 @@ At the bottom of the `help` output for
 `synth_ice40` is the complete list of commands called by this script.
 Let's start with the section labeled ``begin``:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: begin:
    :end-before: flatten:
@@ -143,8 +143,8 @@ line refers to the line numbers of the start/end of the corresponding ``always
 @`` block.  In the case of an ``initial`` block, we instead see the ``PROC``
 referring to line 0.
 
-To handle these, let us now introduce the next command: :doc:`/cmd/proc`. `proc`
-is a macro command like `synth_ice40`.  Rather than modifying the design
+To handle these, let us now introduce the next command: :cmd:title:`proc`.
+`proc` is a macro command like `synth_ice40`.  Rather than modifying the design
 directly, it instead calls a series of other commands.  In the case of `proc`,
 these sub-commands work to convert the behavioral logic of processes into
 multiplexers and registers.  Let's see what happens when we run it.  For now, we
@@ -188,7 +188,7 @@ opt_expr <adv_opt_expr>`.
 
 .. note::
 
-   :doc:`/cmd/clean` can also be called with two semicolons after any command,
+   :cmd:title:`clean` can also be called with two semicolons after any command,
    for example we could have called :yoscrypt:`opt_expr;;` instead of
    :yoscrypt:`opt_expr; clean`.  You may notice some scripts will end each line
    with ``;;``.  It is beneficial to run `clean` before inspecting intermediate
@@ -215,8 +215,8 @@ Note that if we tried to run this command now then we would get an error.  This
 is because we already removed all of the modules other than ``addr_gen``.  We
 could restart our shell session, but instead let's use two new commands:
 
-- :doc:`/cmd/design`, and
-- :doc:`/cmd/read_verilog`.
+- :cmd:title:`design`, and
+- :cmd:title:`read_verilog`.
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -251,7 +251,7 @@ our design won't run into this issue, we can skip the ``-defer``.
 We can also run `proc` now to finish off the full :ref:`synth_begin`. Because
 the design schematic is quite large, we will be showing just the data path for
 the ``rdata`` output.  If you would like to see the entire design for yourself,
-you can do so with :doc:`/cmd/show`.  Note that the `show` command only works
+you can do so with :cmd:title:`show`.  Note that the `show` command only works
 with a single module, so you may need to call it with :yoscrypt:`show fifo`.
 :ref:`show_intro` section in :doc:`/getting_started/scripting_intro` has more on
 how to use `show`.
@@ -283,7 +283,7 @@ Flattening
 At this stage of a synthesis flow there are a few other commands we could run.
 In `synth_ice40` we get these:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: flatten:
    :end-before: coarse:
@@ -355,7 +355,7 @@ Part 1
 
 In the iCE40 flow, we start with the following commands:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: coarse:
    :end-before: wreduce
@@ -371,7 +371,7 @@ wasting time on something we know is impossible.
 Next up is :yoscrypt:`opt -nodffe -nosdff` performing a set of simple
 optimizations on the design.  This command also ensures that only a specific
 subset of FF types are included, in preparation for the next command:
-:doc:`/cmd/fsm`.  Both `opt` and `fsm` are macro commands which are explored in
+:cmd:title:`fsm`.  Both `opt` and `fsm` are macro commands which are explored in
 more detail in :doc:`/using_yosys/synthesis/opt` and
 :doc:`/using_yosys/synthesis/fsm` respectively.
 
@@ -403,7 +403,7 @@ Part 2
 
 The next group of commands performs a series of optimizations:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-at: wreduce
    :end-before: t:$mul
@@ -411,7 +411,7 @@ The next group of commands performs a series of optimizations:
    :caption: ``coarse`` section (part 2)
    :name: synth_coarse2
 
-First up is :doc:`/cmd/wreduce`.  If we run this we get the following:
+First up is :cmd:title:`wreduce`.  If we run this we get the following:
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -432,7 +432,7 @@ the schematic and see the output of that cell has now changed.
 
    ``rdata`` output after `wreduce`
 
-The next two (new) commands are :doc:`/cmd/peepopt` and :doc:`/cmd/share`.
+The next two (new) commands are :cmd:title:`peepopt` and :cmd:title:`share`.
 Neither of these affect our design, and they're explored in more detail in
 :doc:`/using_yosys/synthesis/opt`, so let's skip over them.  :yoscrypt:`techmap
 -map +/cmp2lut.v -D LUT_WIDTH=4` optimizes certain comparison operators by
@@ -440,7 +440,7 @@ converting them to LUTs instead.  The usage of `techmap` is explored more in
 :doc:`/using_yosys/synthesis/techmap_synth`.
 
 Our next command to run is
-:doc:`/cmd/memory_dff`.
+:cmd:title:`memory_dff`.
 
 .. literalinclude:: /code_examples/fifo/fifo.out
    :language: doscon
@@ -475,7 +475,7 @@ will only be performed if called with the ``-dsp`` flag: :yoscrypt:`synth_ice40
 -dsp`.  While our example has nothing that could be mapped to DSPs we can still
 take a quick look at the commands here and describe what they do.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-at: t:$mul
    :end-before: alumacc
@@ -514,7 +514,7 @@ Part 4
 
 That brings us to the fourth and final part for the iCE40 synthesis flow:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-at: alumacc
    :end-before: map_ram:
@@ -543,7 +543,7 @@ Once these cells have been inserted, the call to `opt` can combine cells which
 are now identical but may have been missed due to e.g. the difference between
 `$add` and `$sub`.
 
-The other new command in this part is :doc:`/cmd/memory`.  `memory` is another
+The other new command in this part is :cmd:title:`memory`.  `memory` is another
 macro command which we examine in more detail in
 :doc:`/using_yosys/synthesis/memory`.  For this document, let us focus just on
 the step most relevant to our example: `memory_collect`. Up until this point,
@@ -594,7 +594,7 @@ Memory blocks
 Mapping to hard memory blocks uses a combination of `memory_libmap` and
 `techmap`.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_ram:
    :end-before: map_ffram:
@@ -636,7 +636,7 @@ into flip flops (the ``logic fallback``) with `memory_map`.
 .. |techlibs/ice40/brams_map.v| replace:: :file:`techlibs/ice40/brams_map.v`
 .. _techlibs/ice40/brams_map.v: https://github.com/YosysHQ/yosys/tree/main/techlibs/ice40/brams_map.v
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_ffram:
    :end-before: map_gates:
@@ -671,7 +671,7 @@ an explosion in cells as multi-bit `$mux` and `$adffe` are replaced with
 single-bit `$_MUX_` and `$_DFFE_PP0P_` cells, while the `$alu` is replaced with
 primitive `$_OR_` and `$_NOT_` gates and a `$lut` cell.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_gates:
    :end-before: map_ffs:
@@ -700,7 +700,7 @@ mapped to hardware into gate-level primitives.  This includes optimizing
 `$_MUX_` cells where one of the inputs is a constant ``1'0``, replacing it
 instead with an `$_AND_` cell.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_ffs:
    :end-before: map_luts:
@@ -725,7 +725,7 @@ LUTs
 `abc`. For more on what these do, and what the difference between these two
 commands are, refer to :doc:`/using_yosys/synthesis/abc`.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_luts:
    :end-before: map_cells:
@@ -742,7 +742,7 @@ commands are, refer to :doc:`/using_yosys/synthesis/abc`.
 Finally we use `techmap` to map the generic `$lut` cells to iCE40 ``SB_LUT4``
 cells.
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: map_cells:
    :end-before: check:
@@ -784,19 +784,18 @@ Final steps
 The next section of the iCE40 synth flow performs some sanity checking and final
 tidy up:
 
-.. literalinclude:: /cmd/synth_ice40.rst
+.. literalinclude:: /code_examples/macro_commands/synth_ice40.ys
    :language: yoscrypt
    :start-after: check:
-   :end-before: blif:
    :dedent:
    :name: check
    :caption: ``check`` section
 
 The new commands here are:
 
-- :doc:`/cmd/autoname`,
-- :doc:`/cmd/stat`, and
-- :doc:`/cmd/blackbox`.
+- :cmd:title:`autoname`,
+- :cmd:title:`stat`, and
+- :cmd:title:`blackbox`.
 
 The output from `stat` is useful for checking resource utilization; providing a
 list of cells used in the design and the number of each, as well as the number
@@ -835,9 +834,9 @@ Synthesis output
 
 The iCE40 synthesis flow has the following output modes available:
 
-- :doc:`/cmd/write_blif`,
-- :doc:`/cmd/write_edif`, and
-- :doc:`/cmd/write_json`.
+- `write_blif`,
+- `write_edif`, and
+- `write_json`.
 
 As an example, if we called :yoscrypt:`synth_ice40 -top fifo -json fifo.json`,
 our synthesized ``fifo`` design will be output as :file:`fifo.json`.  We can
@@ -848,4 +847,4 @@ is beyond the scope of this documentation.
 
 .. _nextpnr: https://github.com/YosysHQ/nextpnr
 
-.. seealso:: :doc:`/cmd/synth_ice40`
+.. seealso:: :cmd:title:`synth_ice40`
diff --git a/docs/source/getting_started/scripting_intro.rst b/docs/source/getting_started/scripting_intro.rst
index 6a6e4ff51..c44ce82a8 100644
--- a/docs/source/getting_started/scripting_intro.rst
+++ b/docs/source/getting_started/scripting_intro.rst
@@ -129,7 +129,7 @@ module.
 
 Detailed documentation of the select framework can be found under
 :doc:`/using_yosys/more_scripting/selections` or in the command reference at
-:doc:`/cmd/select`.
+:cmd:title:`select`.
 
 .. _show_intro:
 
@@ -226,7 +226,7 @@ those used in options, must be a single expression instead.
 .. _GraphViz color docs: https://graphviz.org/doc/info/colors
 
 For all of the options available to `show`, check the command reference at
-:doc:`/cmd/show`.
+:cmd:title:`show`.
 
 .. seealso:: :ref:`interactive_show` on the
    :doc:`/using_yosys/more_scripting/interactive_investigation` page.
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 61dc114ef..403100093 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -5,7 +5,7 @@ Yosys Open SYnthesis Suite
 Yosys is an open source framework for RTL synthesis.  To learn more about Yosys,
 see :doc:`/introduction`.  For a quick guide on how to get started using Yosys,
 check out :doc:`/getting_started/index`.  For the complete list of commands
-available, go to :ref:`commandindex`.
+available, go to :ref:`cmd_ref`.
 
 .. todo:: look into command ref improvements
 
diff --git a/docs/source/using_yosys/more_scripting/interactive_investigation.rst b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
index ca4c76ee7..0d1a17503 100644
--- a/docs/source/using_yosys/more_scripting/interactive_investigation.rst
+++ b/docs/source/using_yosys/more_scripting/interactive_investigation.rst
@@ -323,10 +323,10 @@ tools).
   design into an equivalent design that is easier to analyse.
 - Commands such as `eval` and `sat` can be used to investigate the behavior of
   the circuit.
-- :doc:`/cmd/show`.
-- :doc:`/cmd/dump`.
-- :doc:`/cmd/add` and :doc:`/cmd/delete` can be used to modify and reorganize a
-  design dynamically.
+- :cmd:title:`show`.
+- :cmd:title:`dump`.
+- :cmd:title:`add` and :cmd:title:`delete` can be used to modify and reorganize
+  a design dynamically.
   
 The code used is included in the Yosys code base under
 |code_examples/scrambler|_.
@@ -358,7 +358,7 @@ reorganizing a module in Yosys and checking the resulting circuit.
 .. figure:: /_images/code_examples/scrambler/scrambler_p02.*
     :class: width-helper invert-helper
 
-Analyzing the resulting circuit with :doc:`/cmd/eval`:
+Analyzing the resulting circuit with :cmd:title:`eval`:
 
 .. todo:: replace inline code
 
diff --git a/docs/source/using_yosys/more_scripting/load_design.rst b/docs/source/using_yosys/more_scripting/load_design.rst
index 7e417eff9..e5006c16e 100644
--- a/docs/source/using_yosys/more_scripting/load_design.rst
+++ b/docs/source/using_yosys/more_scripting/load_design.rst
@@ -86,7 +86,7 @@ Yosys frontends
 The `read_verilog` command
 """"""""""""""""""""""""""
 
-- :doc:`/cmd/read_verilog`
+- :doc:`/cmd/index_frontends`
 - supports most of Verilog-2005
 - limited support for SystemVerilog
 - some non-standard features/extensions for enabling formal verification
diff --git a/docs/source/using_yosys/more_scripting/selections.rst b/docs/source/using_yosys/more_scripting/selections.rst
index e82f23497..1f3912956 100644
--- a/docs/source/using_yosys/more_scripting/selections.rst
+++ b/docs/source/using_yosys/more_scripting/selections.rst
@@ -93,7 +93,7 @@ Special patterns can be used to select by object property or type. For example:
   A:blabla`
 - select all `$add` cells from the module foo: :yoscrypt:`select foo/t:$add`
 
-A complete list of pattern expressions can be found in :doc:`/cmd/select`.
+A complete list of pattern expressions can be found in :cmd:title:`select`.
 
 Operations on selections
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -141,7 +141,7 @@ Some of the special ``%``-codes:
 - ``%i``: intersection of top two elements on stack -- pop 2, push 1
 - ``%n``: inverse of top element on stack -- pop 1, push 1
 
-See :doc:`/cmd/select` for the full list.
+See :cmd:title:`select` for the full list.
 
 Expanding selections
 ^^^^^^^^^^^^^^^^^^^^
@@ -354,7 +354,7 @@ boolean operations such as intersection (``%i``) and difference (``%d``) are
 powerful tools for extracting the relevant portions of the circuit under
 investigation.
 
-Again, see :doc:`/cmd/select` for full documentation of these expressions.
+Again, see :cmd:title:`select` for full documentation of these expressions.
 
 Incremental selection
 ^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/source/using_yosys/synthesis/fsm.rst b/docs/source/using_yosys/synthesis/fsm.rst
index 6fad81d54..07a3cc9cc 100644
--- a/docs/source/using_yosys/synthesis/fsm.rst
+++ b/docs/source/using_yosys/synthesis/fsm.rst
@@ -10,7 +10,7 @@ other commands:
    :start-after: #end:
    :caption: Passes called by `fsm`
 
-See also :doc:`/cmd/fsm`.
+See also :doc:`/cmd/index_passes_fsm`.
 
 The algorithms used for FSM detection and extraction are influenced by a more
 general reported technique :cite:p:`fsmextract`.
diff --git a/docs/source/using_yosys/synthesis/memory.rst b/docs/source/using_yosys/synthesis/memory.rst
index a8f2280f7..9b81fb6dc 100644
--- a/docs/source/using_yosys/synthesis/memory.rst
+++ b/docs/source/using_yosys/synthesis/memory.rst
@@ -26,7 +26,7 @@ Some quick notes:
    decoder logic and registers.
 
 For more information about `memory`, such as disabling certain sub commands, see
-:doc:`/cmd/memory`.
+:doc:`/cmd/index_passes_memory`.
 
 Example
 -------
diff --git a/docs/source/using_yosys/synthesis/opt.rst b/docs/source/using_yosys/synthesis/opt.rst
index 43b558739..56330bc37 100644
--- a/docs/source/using_yosys/synthesis/opt.rst
+++ b/docs/source/using_yosys/synthesis/opt.rst
@@ -11,8 +11,8 @@ The `opt` macro command
 
 The Yosys pass `opt` runs a number of simple optimizations. This includes
 removing unused signals and cells and const folding. It is recommended to run
-this pass after each major step in the synthesis script.  As listed in
-:doc:`/cmd/opt`, this macro command calls the following ``opt_*`` commands:
+this pass after each major step in the synthesis script.  This macro command
+calls the following ``opt_*`` commands:
 
 .. literalinclude:: /code_examples/macro_commands/opt.ys
    :language: yoscrypt
@@ -233,7 +233,5 @@ Other optimizations
 
 .. todo:: more on the other optimizations
 
-- :doc:`/cmd/wreduce`
-- :doc:`/cmd/peepopt`
-- :doc:`/cmd/share`
+- Check :doc:`/cmd/index_passes_opt` for more.
 - `abc` and `abc9`, see also: :doc:`abc`.
diff --git a/docs/source/using_yosys/synthesis/proc.rst b/docs/source/using_yosys/synthesis/proc.rst
index b7cd348d7..c4ab0f0ea 100644
--- a/docs/source/using_yosys/synthesis/proc.rst
+++ b/docs/source/using_yosys/synthesis/proc.rst
@@ -17,7 +17,7 @@ commands in a sensible order:
 
 After all the ``proc_*`` commands, `opt_expr` is called. This can be disabled by
 calling :yoscrypt:`proc -noopt`.  For more information about `proc`, such as
-disabling certain sub commands, see :doc:`/cmd/proc`.
+disabling certain sub commands, see :doc:`/cmd/index_passes_proc`.
 
 Many commands can not operate on modules with "processess" in them. Usually a
 call to `proc` is the first command in the actual synthesis procedure after
diff --git a/docs/source/using_yosys/synthesis/synth.rst b/docs/source/using_yosys/synthesis/synth.rst
index e3d82931b..db81d0790 100644
--- a/docs/source/using_yosys/synthesis/synth.rst
+++ b/docs/source/using_yosys/synthesis/synth.rst
@@ -6,44 +6,23 @@ Synth commands
 Packaged ``synth_*`` commands
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The following is a list of all synth commands included in Yosys for different
-platforms.  Each command runs a script of sub commands specific to the platform
-being targeted.  Note that not all of these scripts are actively maintained and
-may not be up-to-date.
-
-- :doc:`/cmd/synth_achronix`
-- :doc:`/cmd/synth_anlogic`
-- :doc:`/cmd/synth_coolrunner2`
-- :doc:`/cmd/synth_easic`
-- :doc:`/cmd/synth_ecp5`
-- :doc:`/cmd/synth_efinix`
-- :doc:`/cmd/synth_fabulous`
-- :doc:`/cmd/synth_gatemate`
-- :doc:`/cmd/synth_gowin`
-- :doc:`/cmd/synth_greenpak4`
-- :doc:`/cmd/synth_ice40`
-- :doc:`/cmd/synth_intel` (MAX10, Cyclone IV)
-- :doc:`/cmd/synth_intel_alm` (Cyclone V, Arria V, Cyclone 10 GX)
-- :doc:`/cmd/synth_lattice`
-- :doc:`/cmd/synth_nexus`
-- :doc:`/cmd/synth_quicklogic`
-- :doc:`/cmd/synth_sf2`
-- :doc:`/cmd/synth_xilinx`
+A list of all synth commands included in Yosys for different platforms can be
+found under :doc:`/cmd/index_techlibs`.  Each command runs a script of sub
+commands specific to the platform being targeted.  Note that not all of these
+scripts are actively maintained and may not be up-to-date.
 
 General synthesis
 ~~~~~~~~~~~~~~~~~
 
 In addition to the above hardware-specific synth commands, there is also
-:doc:`/cmd/prep`.  This command is limited to coarse-grain synthesis, without
+:cmd:title:`prep`.  This command is limited to coarse-grain synthesis, without
 getting into any architecture-specific mappings or optimizations.  Among other
 things, this is useful for design verification.
 
 The following commands are executed by the `prep` command:
 
-.. literalinclude:: /cmd/prep.rst
+.. literalinclude:: /code_examples/macro_commands/prep.ys
    :start-at: begin:
-   :end-before: .. only:: latex
-   :dedent:
 
 :doc:`/getting_started/example_synth` covers most of these commands and what
 they do.
diff --git a/docs/source/using_yosys/synthesis/techmap_synth.rst b/docs/source/using_yosys/synthesis/techmap_synth.rst
index 9e9d42df5..54a715342 100644
--- a/docs/source/using_yosys/synthesis/techmap_synth.rst
+++ b/docs/source/using_yosys/synthesis/techmap_synth.rst
@@ -33,9 +33,9 @@ reader may find this map file as :file:`techlibs/common/techmap.v` in the Yosys
 source tree.
 
 Additional features have been added to techmap to allow for conditional mapping
-of cells (see :doc:`/cmd/techmap`). This can for example be useful if the target
-architecture supports hardware multipliers for certain bit-widths but not for
-others.
+of cells (see :doc:`/cmd/index_passes_techmap`). This can for example be useful
+if the target architecture supports hardware multipliers for certain bit-widths
+but not for others.
 
 A usual synthesis flow would first use the techmap pass to directly map some RTL
 cells to coarse-grain cells provided by the target architecture (if any) and
diff --git a/docs/source/using_yosys/verilog.rst b/docs/source/using_yosys/verilog.rst
index 1701458f7..92f223e49 100644
--- a/docs/source/using_yosys/verilog.rst
+++ b/docs/source/using_yosys/verilog.rst
@@ -94,7 +94,7 @@ Verilog Attributes and non-standard features
 - The ``keep_hierarchy`` attribute on cells and modules keeps the `flatten`
   command from flattening the indicated cells and modules.
 
-- The `gate_cost_equivalent` attribute on a module can be used to specify
+- The ``gate_cost_equivalent`` attribute on a module can be used to specify
   the estimated cost of the module as a number of basic gate instances. See
   the help message of command `keep_hierarchy` which interprets this
   attribute.
diff --git a/docs/source/yosys_internals/hashing.rst b/docs/source/yosys_internals/hashing.rst
index c6e22c0cf..b9608d99e 100644
--- a/docs/source/yosys_internals/hashing.rst
+++ b/docs/source/yosys_internals/hashing.rst
@@ -138,7 +138,7 @@ Previously, the interface to implement hashing on custom types was just
 independently and then ad-hoc combined with the hash function with some xorshift
 operations thrown in to mix bits together somewhat. A plugin can stay compatible
 with both versions prior and after the break by implementing both interfaces
-based on the existance and value of `YS_HASHING_VERSION`.
+based on the existance and value of ``YS_HASHING_VERSION``.
 
 .. code-block:: cpp
    :caption: Example hash compatibility wrapper
diff --git a/docs/util/cellref.py b/docs/util/cell_documenter.py
similarity index 100%
rename from docs/util/cellref.py
rename to docs/util/cell_documenter.py
diff --git a/docs/util/cmd_documenter.py b/docs/util/cmd_documenter.py
new file mode 100644
index 000000000..9347d8ffd
--- /dev/null
+++ b/docs/util/cmd_documenter.py
@@ -0,0 +1,443 @@
+#!/usr/bin/env python3
+from __future__ import annotations
+
+from dataclasses import dataclass
+import json
+from pathlib import Path, PosixPath, WindowsPath
+import re
+
+from typing import Any
+from sphinx.application import Sphinx
+from sphinx.ext import autodoc
+from sphinx.ext.autodoc import Documenter
+from sphinx.util import logging
+
+logger = logging.getLogger(__name__)
+
+# cmd signature
+cmd_ext_sig_re = re.compile(
+    r'''^ ([\w/]+::)?            # optional group
+          ([\w$._]+?)            # module name
+          (?:\.([\w_]+))?        # optional: thing name
+          (::[\w_]+)?            #           attribute
+          \s* $                  # and nothing more
+          ''', re.VERBOSE)
+
+class YosysCmdContentListing:
+    type: str
+    body: str
+    source_file: str
+    source_line: int
+    options: dict[str, str]
+    content: list[YosysCmdContentListing]
+
+    def __init__(
+            self,
+            type: str = "",
+            body: str = "",
+            source_file: str = "unknown",
+            source_line: int = 0,
+            options: dict[str, str] = {},
+            content: list[dict[str]] = [],
+    ):
+        self.type = type
+        self.body = body
+        self.source_file = source_file
+        self.source_line = source_line
+        self.options = options
+        self.content = [YosysCmdContentListing(**c) for c in content]
+
+class YosysCmd:
+    name: str
+    title: str
+    content: list[YosysCmdContentListing]
+    group: str
+    source_file: str
+    source_line: int
+    source_func: str
+    experimental_flag: bool
+    internal_flag: bool
+
+    def __init__(
+            self,
+            name:str = "", title:str = "",
+            content: list[dict[str]] = [],
+            group: str = 'unknown',
+            source_file: str = "",
+            source_line: int = 0,
+            source_func: str = "",
+            experimental_flag: bool = False,
+            internal_flag: bool = False,
+    ) -> None:
+        self.name = name
+        self.title = title
+        self.content = [YosysCmdContentListing(**c) for c in content]
+        self.group = group
+        self.source_file = source_file
+        self.source_line = source_line
+        self.source_func = source_func
+        self.experimental_flag = experimental_flag
+        self.internal_flag = internal_flag
+    
+class YosysCmdGroupDocumenter(Documenter):
+    objtype = 'cmdgroup'
+    priority = 10
+    object: tuple[str, list[str]]
+    lib_key = 'groups'
+
+    option_spec = Documenter.option_spec.copy()
+    option_spec.update({
+        'caption': autodoc.annotation_option,
+        'members': autodoc.members_option,
+        'source': autodoc.bool_option,
+        'linenos': autodoc.bool_option,
+    })
+
+    __cmd_lib: dict[str, list[str] | dict[str]] | None = None
+    @property
+    def cmd_lib(self) -> dict[str, list[str] | dict[str]]:
+        if not self.__cmd_lib:
+            self.__cmd_lib = {}
+            cmds_obj: dict[str, dict[str, dict[str]]]
+            try:
+                with open(self.config.cmds_json, "r") as f:
+                    cmds_obj = json.loads(f.read())
+            except FileNotFoundError:
+                logger.warning(
+                    f"unable to find cmd lib at {self.config.cmds_json}",
+                    type = 'cmdref',
+                    subtype = 'cmd_lib'
+                )
+                cmds_obj = {}
+            for (name, obj) in cmds_obj.get(self.lib_key, {}).items():
+                self.__cmd_lib[name] = obj
+        return self.__cmd_lib
+    
+    @classmethod
+    def can_document_member(
+        cls,
+        member: Any,
+        membername: str,
+        isattr: bool,
+        parent: Any
+    ) -> bool:
+        return False
+
+    def parse_name(self) -> bool:
+        if not self.options.caption:
+            self.content_indent = ''
+        self.fullname = self.modname = self.name
+        return True
+    
+    def import_object(self, raiseerror: bool = False) -> bool:
+        # get cmd
+        try:
+            self.object = (self.modname, self.cmd_lib[self.modname])
+        except KeyError:
+            if raiseerror:
+                raise
+            return False
+
+        self.real_modname = self.modname
+        return True
+    
+    def get_sourcename(self) -> str:
+        return self.env.doc2path(self.env.docname)
+    
+    def format_name(self) -> str:
+        return self.options.caption or ''
+
+    def format_signature(self, **kwargs: Any) -> str:
+        return self.modname
+    
+    def add_directive_header(self, sig: str) -> None:
+        pass
+    
+    def add_content(self, more_content: Any | None) -> None:
+        pass
+
+    def filter_members(
+        self,
+        members: list[tuple[str, Any]],
+        want_all: bool
+    ) -> list[tuple[str, Any, bool]]:
+        return [(x[0], x[1], False) for x in members]
+
+    def get_object_members(
+        self,
+        want_all: bool
+    ) -> tuple[bool, list[tuple[str, Any]]]:
+        ret: list[tuple[str, str]] = []
+
+        if want_all:
+            for member in self.object[1]:
+                ret.append((member, self.modname))
+        else:
+            memberlist = self.options.members or []
+            for name in memberlist:
+                if name in self.object:
+                    ret.append((name, self.modname))
+                else:
+                    logger.warning(('unknown module mentioned in :members: option: '
+                                    f'group {self.modname}, module {name}'),
+                                   type='cmdref')
+
+        return False, ret
+
+    def document_members(self, all_members: bool = False) -> None:
+        want_all = (all_members or
+                    self.options.inherited_members or
+                    self.options.members is autodoc.ALL)
+        # find out which members are documentable
+        members_check_module, members = self.get_object_members(want_all)
+
+        # document non-skipped members
+        memberdocumenters: list[tuple[Documenter, bool]] = []
+        for (mname, member, isattr) in self.filter_members(members, want_all):
+            classes = [cls for cls in self.documenters.values()
+                       if cls.can_document_member(member, mname, isattr, self)]
+            if not classes:
+                # don't know how to document this member
+                continue
+            # prefer the documenter with the highest priority
+            classes.sort(key=lambda cls: cls.priority)
+            # give explicitly separated module name, so that members
+            # of inner classes can be documented
+            full_mname = self.format_signature() + '::' + mname
+            documenter = classes[-1](self.directive, full_mname, self.indent)
+            memberdocumenters.append((documenter, isattr))
+
+        member_order = self.options.member_order or self.config.autodoc_member_order
+        memberdocumenters = self.sort_members(memberdocumenters, member_order)
+
+        for documenter, isattr in memberdocumenters:
+            documenter.generate(
+                all_members=True, real_modname=self.real_modname,
+                check_module=members_check_module and not isattr)
+
+    def generate(
+        self,
+        more_content: Any | None = None,
+        real_modname: str | None = None,
+        check_module: bool = False,
+        all_members: bool = False
+    ) -> None:
+        if not self.parse_name():
+            # need a cmd lib to import from
+            logger.warning(
+                f"don't know which cmd lib to import for autodocumenting {self.name}",
+                type = 'cmdref'
+            )
+            return
+
+        sourcename = self.get_sourcename()
+
+        imported_object = self.import_object();
+        if self.lib_key == 'groups' and self.name == 'unknown':
+            if imported_object:
+                logger.warning(f"Found commands assigned to group {self.name}: {[x[0] for x in self.object]}", type='cmdref')
+            else:
+                return
+        elif not imported_object:
+            log_msg = f"unable to load {self.name} with {type(self)}"
+            if self.lib_key == 'groups':
+                logger.info(log_msg, type = 'cmdref')
+                self.add_line(f'.. warning:: No commands found for group {self.name!r}', sourcename)
+                self.add_line('', sourcename)
+                self.add_line('   Documentation may have been built without ``source_location`` support.', sourcename)
+                self.add_line('   Try check :doc:`/cmd/index_other`.', sourcename)
+            else:
+                logger.warning(log_msg, type = 'cmdref')
+            return
+
+        # check __module__ of object (for members not given explicitly)
+        # if check_module:
+        #     if not self.check_module():
+        #         return
+
+        self.add_line('', sourcename)
+
+        # format the object's signature, if any
+        try:
+            sig = self.format_signature()
+        except Exception as exc:
+            logger.warning(('error while formatting signature for %s: %s'),
+                           self.fullname, exc, type='cmdref')
+            return
+
+        # generate the directive header and options, if applicable
+        self.add_directive_header(sig)
+        self.add_line('', sourcename)
+
+        # e.g. the module directive doesn't have content
+        self.indent += self.content_indent
+
+        # add all content (from docstrings, attribute docs etc.)
+        self.add_content(more_content)
+
+        # document members, if possible
+        self.document_members(all_members)
+
+class YosysCmdDocumenter(YosysCmdGroupDocumenter):
+    objtype = 'cmd'
+    priority = 15
+    object: YosysCmd
+    lib_key = 'cmds'
+
+    @classmethod
+    def can_document_member(
+        cls,
+        member: Any,
+        membername: str,
+        isattr: bool,
+        parent: Any
+    ) -> bool:
+        if membername.startswith('$'):
+            return False
+        return isinstance(parent, YosysCmdGroupDocumenter)
+
+    def parse_name(self) -> bool:
+        try:
+            matched = cmd_ext_sig_re.match(self.name)
+            group, modname, thing, attribute = matched.groups()
+        except AttributeError:
+            logger.warning(('invalid signature for auto%s (%r)') % (self.objtype, self.name),
+                           type='cmdref')
+            return False
+
+        self.modname = modname
+        self.groupname = group or ''
+        self.attribute = attribute or ''
+        self.fullname = ((self.modname) + (thing or ''))
+
+        return True
+
+    def import_object(self, raiseerror: bool = False) -> bool:
+        if super().import_object(raiseerror):
+            self.object = YosysCmd(self.modname, **self.object[1])
+            return True
+        return False
+
+    def get_sourcename(self) -> str:
+        try:
+            return self.object.source_file
+        except AttributeError:
+            return super().get_sourcename()
+    
+    def format_name(self) -> str:
+        return self.object.name
+
+    def format_signature(self, **kwargs: Any) -> str:
+        return self.fullname + self.attribute
+
+    def add_directive_header(self, sig: str) -> None:
+        domain = getattr(self, 'domain', self.objtype)
+        directive = getattr(self, 'directivetype', 'def')
+        source_name = self.object.source_file
+        source_line = self.object.source_line
+
+        title = f'{self.object.name} - {self.object.title}'
+        self.add_line(title, source_name, source_line)
+        self.add_line('#' * len(title), source_name, source_line)
+
+        # cmd definition
+        self.add_line(f'.. {domain}:{directive}:: {sig}', source_name, source_line)
+        if self.object.title:
+            self.add_line(f'   :title: {self.object.title}', source_name, source_line)
+
+        if self.options.noindex:
+            self.add_line('   :noindex:', source_name)
+    
+    def add_content(self, more_content: Any | None) -> None:
+        # set sourcename and add content from attribute documentation
+        domain = getattr(self, 'domain', self.objtype)
+        source_name = self.object.source_file
+        source_line = self.object.source_line
+
+        if self.object.experimental_flag:
+            self.add_line(f'.. warning:: This command is experimental', source_name, source_line)
+            self.add_line('\n', source_name)
+
+        if self.object.internal_flag:
+            self.add_line(f'.. warning:: This command is intended for internal developer use only', source_name, source_line)
+            self.add_line('\n', source_name)
+
+        def render(content_list: YosysCmdContentListing, indent: int=0):
+            content_source = content_list.source_file or source_name
+            indent_str = '   '*indent
+            if content_list.type == 'usage':
+                if content_list.body:
+                    self.add_line(f'{indent_str}.. {domain}:{content_list.type}:: {self.name}::{content_list.body}', content_source)
+                else:
+                    self.add_line(f'{indent_str}.. {domain}:{content_list.type}:: {self.name}::', content_source)
+                    self.add_line(f'{indent_str}   :noindex:', source_name)
+                self.add_line('', source_name)
+            elif content_list.type == 'option':
+                self.add_line(f'{indent_str}:{content_list.type} {content_list.body}:', content_source)
+            elif content_list.type == 'text':
+                self.add_line(f'{indent_str}{content_list.body}', content_source)
+                self.add_line('', source_name)
+            elif content_list.type == 'code':
+                language_str = content_list.options.get('language', '')
+                self.add_line(f'{indent_str}.. code-block:: {language_str}', source_name)
+                self.add_line('', source_name)
+                for body_line in content_list.body.splitlines():
+                    self.add_line(f'{indent_str}   {body_line}', content_source)
+                self.add_line('', source_name)
+            else:
+                logger.warning(f"unknown content type '{content_list.type}'")
+            for content in content_list.content:
+                render(content, indent+1)
+
+        for content in self.object.content:
+            render(content)
+
+        if self.get_sourcename() != 'unknown':
+            self.add_line('\n', source_name)
+            self.add_line(f'.. note:: Help text automatically generated from :file:`{source_name}:{source_line}`', source_name)
+
+        # add additional content (e.g. from document), if present
+        if more_content:
+            for line, src in zip(more_content.data, more_content.items):
+                self.add_line(line, src[0], src[1])
+
+    def get_object_members(
+        self,
+        want_all: bool
+    ) -> tuple[bool, list[tuple[str, Any]]]:
+
+        return False, []
+
+class YosysCmdRstDocumenter(YosysCmdDocumenter):
+    objtype = 'cmd_rst'
+    priority = 0
+
+    @classmethod
+    def can_document_member(cls, *args) -> bool:
+        return False
+
+    def add_directive_header(self, sig):
+        source_name = self.object.source_file
+        cmd = self.object.name
+        self.add_line(f'.. code-block:: rst', source_name)
+        self.add_line(f'   :caption: Generated rst for ``.. autocmd:: {cmd}``', source_name)
+
+    def add_content(self, more_content):
+        source_name = self.object.source_file
+        cmd = self.object.name
+        self.domain = 'cmd'
+        super().add_directive_header(cmd)
+        self.add_line('', source_name)
+        self.indent += self.content_indent
+        super().add_content(more_content)
+
+def setup(app: Sphinx) -> dict[str, Any]:
+    app.add_config_value('cmds_json', False, 'html', [Path, PosixPath, WindowsPath])
+    app.setup_extension('sphinx.ext.autodoc')
+    app.add_autodocumenter(YosysCmdGroupDocumenter)
+    app.add_autodocumenter(YosysCmdDocumenter)
+    app.add_autodocumenter(YosysCmdRstDocumenter)
+    return {
+        'version': '2',
+        'parallel_read_safe': True,
+    }
diff --git a/docs/util/cmdref.py b/docs/util/custom_directives.py
similarity index 81%
rename from docs/util/cmdref.py
rename to docs/util/custom_directives.py
index a31b08e0d..b90584aa7 100644
--- a/docs/util/cmdref.py
+++ b/docs/util/custom_directives.py
@@ -4,20 +4,21 @@ from __future__ import annotations
 
 import re
 from typing import cast
+import warnings
 
 from docutils import nodes
-from docutils.nodes import Node, Element, system_message
+from docutils.nodes import Node, Element, Text
 from docutils.parsers.rst import directives
 from docutils.parsers.rst.states import Inliner
 from sphinx.application import Sphinx
 from sphinx.domains import Domain, Index
 from sphinx.domains.std import StandardDomain
 from sphinx.environment import BuildEnvironment
-from sphinx.roles import XRefRole
+from sphinx.roles import XRefRole, SphinxRole
 from sphinx.directives import ObjectDescription
 from sphinx.directives.code import container_wrapper
 from sphinx.util.nodes import make_refnode
-from sphinx.util.docfields import Field
+from sphinx.util.docfields import Field, GroupedField
 from sphinx import addnodes
 
 class TocNode(ObjectDescription):    
@@ -31,7 +32,7 @@ class TocNode(ObjectDescription):
         signode['ids'].append(idx)
 
     def _object_hierarchy_parts(self, sig_node: addnodes.desc_signature) -> tuple[str, ...]:
-        if 'fullname' not in sig_node:
+        if 'tocname' not in sig_node:
             return ()
 
         modname = sig_node.get('module')
@@ -57,16 +58,56 @@ class TocNode(ObjectDescription):
             return '.'.join(parents + [name])
         return ''
 
-class CommandNode(TocNode):
+class NodeWithOptions(TocNode):
+    """A custom node with options."""
+
+    doc_field_types = [
+        GroupedField('opts', label='Options', names=('option', 'options', 'opt', 'opts')),
+    ]
+    
+    def transform_content(self, contentnode: addnodes.desc_content) -> None:
+        """hack `:option -thing: desc` into a proper option list with yoscrypt highlighting"""
+        newchildren = []
+        for node in contentnode:
+            newnode = node
+            if isinstance(node, nodes.field_list):
+                newnode = nodes.option_list()
+                for field in node:
+                    is_option = False
+                    option_list_item = nodes.option_list_item()
+                    for child in field:
+                        if isinstance(child, nodes.field_name):
+                            option_group = nodes.option_group()
+                            option_list_item += option_group
+                            option = nodes.option()
+                            option_group += option
+                            name, text = child.rawsource.split(' ', 1)
+                            is_option = name == 'option'
+                            literal = nodes.literal(text=text)
+                            literal['classes'] += ['code', 'highlight', 'yoscrypt']
+                            literal['language'] = 'yoscrypt'
+                            option += literal
+                            if not is_option: warnings.warn(f'unexpected option \'{name}\' in {field.source}')
+                        elif isinstance(child, nodes.field_body):
+                            description = nodes.description()
+                            description += child.children
+                            option_list_item += description
+                    if is_option:
+                        newnode += option_list_item
+            newchildren.append(newnode)
+        contentnode.children = newchildren
+
+class CommandNode(NodeWithOptions):
     """A custom node that describes a command."""
 
     name = 'cmd'
     required_arguments = 1
 
-    option_spec = {
+    option_spec = NodeWithOptions.option_spec.copy()
+    option_spec.update({
         'title': directives.unchanged,
         'tags': directives.unchanged
-    }
+    })
 
     def handle_signature(self, sig, signode: addnodes.desc_signature):
         signode['fullname'] = sig
@@ -93,6 +134,46 @@ class CommandNode(TocNode):
                          idx,
                          0))
 
+class CommandUsageNode(NodeWithOptions):
+    """A custom node that describes command usages"""
+
+    name = 'cmdusage'
+
+    option_spec = NodeWithOptions.option_spec
+    option_spec.update({
+        'usage': directives.unchanged,
+    })
+
+    def handle_signature(self, sig: str, signode: addnodes.desc_signature):
+        parts = sig.split('::')
+        if len(parts) > 2: parts.pop(0)
+        use = parts[-1]
+        signode['fullname'] = '::'.join(parts)
+        usage = self.options.get('usage', use)
+        if usage:
+            signode['tocname'] = usage
+            signode += addnodes.desc_name(text=usage)
+        return signode['fullname']
+
+    def add_target_and_index(
+        self,
+        name: str,
+        sig: str,
+        signode: addnodes.desc_signature
+    ) -> None:
+        idx = ".".join(name.split("::"))
+        signode['ids'].append(idx)
+        if 'noindex' not in self.options:
+            tocname: str = signode.get('tocname', name)
+            objs = self.env.domaindata[self.domain]['objects']
+            # (name, sig, typ, docname, anchor, prio)
+            objs.append((name,
+                         tocname,
+                         type(self).name,
+                         self.env.docname,
+                         idx,
+                         1))
+
 class PropNode(TocNode):
     name = 'prop'
     fieldname = 'props'
@@ -393,7 +474,7 @@ class TagIndex(Index):
                 lis.append((
                     dispname, 0, docname,
                     anchor,
-                    docname, '', typ
+                    '', '', ''
                 ))
         ret = [(k, v) for k, v in sorted(content.items())]
 
@@ -432,18 +513,19 @@ class CommandIndex(Index):
         Qualifier and description are not rendered e.g. in LaTeX output.
         """
 
-        content = {}
+        content: dict[str, list[tuple]] = {}
         items = ((name, dispname, typ, docname, anchor)
                  for name, dispname, typ, docname, anchor, prio
                  in self.domain.get_objects()
                  if typ == self.name)
         items = sorted(items, key=lambda item: item[0])
         for name, dispname, typ, docname, anchor in items:
+            title = self.domain.data['obj2title'].get(name)
             lis = content.setdefault(self.shortname, [])
             lis.append((
                 dispname, 0, docname,
                 anchor,
-                '', '', typ
+                '', '', title 
             ))
         ret = [(k, v) for k, v in sorted(content.items())]
 
@@ -507,16 +589,27 @@ class PropIndex(TagIndex):
 
         return (ret, True)
 
+class TitleRefRole(XRefRole):
+    """XRefRole used which has the cmd title as the displayed text."""
+    pass
+
+class OptionRole(SphinxRole):
+    def run(self) -> tuple[list[Node], list]:
+        return self.inliner.interpreted(self.rawtext, self.text, 'yoscrypt', self.lineno)
+
 class CommandDomain(Domain):
     name = 'cmd'
     label = 'Yosys commands'
 
     roles = {
-        'ref': XRefRole()
+        'ref': XRefRole(),
+        'title': TitleRefRole(),
+        'option': OptionRole(),
     }
 
     directives = {
         'def': CommandNode,
+        'usage': CommandUsageNode,
     }
 
     indices = {
@@ -542,7 +635,7 @@ class CommandDomain(Domain):
 
     def resolve_xref(self, env, fromdocname, builder, typ,
                      target, node, contnode):
-        
+
         match = [(docname, anchor, name)
                  for name, sig, typ, docname, anchor, prio
                  in self.get_objects() if sig == target]
@@ -552,9 +645,17 @@ class CommandDomain(Domain):
             targ = match[0][1]
             qual_name = match[0][2]
             title = self.data['obj2title'].get(qual_name, targ)
-            
-            return make_refnode(builder,fromdocname,todocname,
-                                targ, contnode, title)
+
+            if typ == 'title':
+                # caller wants the title in the content of the node
+                cmd = contnode.astext()
+                contnode = Text(f'{cmd} - {title}')
+                return make_refnode(builder, fromdocname, todocname,
+                                    targ, contnode)
+            else:
+                # cmd title as hover text
+                return make_refnode(builder, fromdocname, todocname,
+                                    targ, contnode, title)
         else:
             print(f"Missing ref for {target} in {fromdocname} ")
             return None
@@ -592,10 +693,18 @@ class CellDomain(CommandDomain):
 
 def autoref(name, rawtext: str, text: str, lineno, inliner: Inliner,
             options=None, content=None):
-    role = 'cell:ref' if text[0] == '$' else 'cmd:ref'
-    if text.startswith("help ") and text.count(' ') == 1:
-        _, cmd = text.split(' ', 1)
-        text = f'{text} <{cmd}>'
+    words = text.split(' ')
+    if len(words) == 2 and words[0] == "help":
+        IsLinkable = True
+        thing = words[1]
+    else:
+        IsLinkable = len(words) == 1 and words[0][0] != '-'
+        thing = words[0]
+    if IsLinkable:
+        role = 'cell:ref' if thing[0] == '$' else 'cmd:ref'
+        text = f'{text} <{thing}>'
+    else:
+        role = 'yoscrypt'
     return inliner.interpreted(rawtext, text, role, lineno)
 
 def setup(app: Sphinx):
@@ -622,4 +731,7 @@ def setup(app: Sphinx):
 
     app.add_role('autoref', autoref)
     
-    return {'version': '0.2'}
+    return {
+        'version': '0.3',    
+        'parallel_read_safe': False,
+    }
diff --git a/kernel/json.h b/kernel/json.h
index c9aa0e045..e8905c8e1 100644
--- a/kernel/json.h
+++ b/kernel/json.h
@@ -90,10 +90,10 @@ public:
     template<typename T>
     void array(const T &&values)
     {
-        begin_object();
+        begin_array();
         for (auto &item : values)
             value(item);
-        end_object();
+        end_array();
     }
 };
 
diff --git a/kernel/log_help.cc b/kernel/log_help.cc
new file mode 100644
index 000000000..45228b024
--- /dev/null
+++ b/kernel/log_help.cc
@@ -0,0 +1,151 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2025  Krystine Dawn <krystinedawn@yosyshq.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include "kernel/log_help.h"
+
+USING_YOSYS_NAMESPACE
+
+Json ContentListing::to_json() {
+	Json::object object;
+	object["type"] = type;
+	if (body.length()) object["body"] = body;
+	if (strcmp(source_file, "unknown") != 0) object["source_file"] = source_file;
+	if (source_line != 0) object["source_line"] = source_line;
+	object["options"] = Json(options);
+	Json::array content_array;
+	for (auto child : _content) content_array.push_back(child->to_json());
+	object["content"] = content_array;
+	return object;
+}
+
+void ContentListing::usage(const string &text,
+	const source_location location)
+{
+	log_assert(type.compare("root") == 0);
+	add_content("usage", text, location);
+}
+
+void ContentListing::option(const string &text, const string &description,
+	const source_location location)
+{
+	auto option = open_option(text);
+	if (description.length())
+		option->add_content("text", description, location);
+}
+
+void ContentListing::codeblock(const string &code, const string &language,
+	const source_location location)
+{
+	add_content("code", code, location);
+	back()->set_option("language", language);
+}
+
+void ContentListing::paragraph(const string &text,
+	const source_location location)
+{
+	add_content("text", text, location);
+}
+
+ContentListing* ContentListing::open_usage(const string &text,
+	const source_location location)
+{
+	usage(text, location);
+	return back();
+}
+
+ContentListing* ContentListing::open_option(const string &text,
+	const source_location location)
+{
+	log_assert(type.compare("root") == 0 || type.compare("usage") == 0);
+	auto option = new ContentListing("option", text, location);
+	add_content(option);
+	return option;
+}
+
+#define MAX_LINE_LEN 80
+void log_pass_str(const std::string &pass_str, std::string indent_str, bool leading_newline=false) {
+	if (pass_str.empty())
+		return;
+	std::istringstream iss(pass_str);
+	if (leading_newline)
+		log("\n");
+	for (std::string line; std::getline(iss, line);) {
+		log("%s", indent_str.c_str());
+		auto curr_len = indent_str.length();
+		std::istringstream lss(line);
+		for (std::string word; std::getline(lss, word, ' ');) {
+			while (word[0] == '`' && word.back() == '`')
+				word = word.substr(1, word.length()-2);
+			if (curr_len + word.length() >= MAX_LINE_LEN-1) {
+				curr_len = 0;
+				log("\n%s", indent_str.c_str());
+			}
+			if (word.length()) {
+				log("%s ", word.c_str());
+				curr_len += word.length() + 1;
+			}
+		}
+		log("\n");
+	}
+}
+void log_pass_str(const std::string &pass_str, int indent=0, bool leading_newline=false) {
+	std::string indent_str(indent*4, ' ');
+	log_pass_str(pass_str, indent_str, leading_newline);
+}
+
+PrettyHelp *current_help = nullptr;
+
+PrettyHelp::PrettyHelp()
+{
+	_prior = current_help;
+	_root_listing = ContentListing("root", "");
+
+	current_help = this;
+}
+
+PrettyHelp::~PrettyHelp()
+{
+	current_help = _prior;
+}
+
+PrettyHelp *PrettyHelp::get_current()
+{
+	if (current_help == nullptr)
+		new PrettyHelp();
+	return current_help;
+}
+
+void PrettyHelp::log_help()
+{
+	for (auto content : _root_listing.get_content()) {
+		if (content->type.compare("usage") == 0) {
+			log_pass_str(content->body, 1, true);
+			log("\n");
+		} else if (content->type.compare("option") == 0) {
+			log_pass_str(content->body, 1);
+			for (auto text : content->get_content()) {
+				log_pass_str(text->body, 2);
+				log("\n");
+			}
+		} else {
+			log_pass_str(content->body, 0);
+			log("\n");
+		}
+	}
+}
diff --git a/kernel/log_help.h b/kernel/log_help.h
new file mode 100644
index 000000000..0a40fc531
--- /dev/null
+++ b/kernel/log_help.h
@@ -0,0 +1,132 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2025  Krystine Dawn <krystinedawn@yosyshq.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef LOG_HELP_H
+#define LOG_HELP_H
+
+#include "kernel/yosys_common.h"
+#include "kernel/json.h"
+
+YOSYS_NAMESPACE_BEGIN
+
+class ContentListing {
+	vector<ContentListing *> _content;
+public:
+	string type;
+	string body;
+	const char* source_file;
+	int source_line;
+	std::map<string, string> options;
+
+	ContentListing(
+		string type = "root", string body = "",
+		const char* source_file = "unknown", int source_line = 0
+	) : type(type), body(body), source_file(source_file), source_line(source_line) {
+		_content = {};
+		options = {};
+	}
+
+	ContentListing(string type, string body, source_location location) :
+		ContentListing(type, body, location.file_name(), location.line()) { }
+
+	void add_content(ContentListing *new_content) {
+		_content.push_back(new_content);
+	}
+
+	void add_content(string type, string body, source_location location) {
+		auto new_content = new ContentListing(type, body, location);
+		add_content(new_content);
+	}
+
+	bool has_content() { return _content.size() != 0; }
+	const vector<ContentListing *> get_content() {
+		const vector<ContentListing *> content = _content;
+		return content;
+	}
+	ContentListing* back() {
+		return _content.back();
+	}
+
+	void set_option(string key, string val = "") {
+		options[key] = val;
+	}
+
+	void usage(
+		const string &text,
+		const source_location location = source_location::current()
+	);
+	void option(
+		const string &text,
+		const string &description = "",
+		const source_location location = source_location::current()
+	);
+	void codeblock(
+		const string &code,
+		const string &language = "none",
+		const source_location location = source_location::current()
+	);
+	void paragraph(
+		const string &text,
+		const source_location location = source_location::current()
+	);
+
+	ContentListing* open_usage(
+		const string &text,
+		const source_location location = source_location::current()
+	);
+	ContentListing* open_option(
+		const string &text,
+		const source_location location = source_location::current()
+	);
+
+	Json to_json();
+};
+
+class PrettyHelp
+{
+public:
+	string group = "unknown";
+
+private:
+	PrettyHelp *_prior;
+	ContentListing _root_listing;
+
+public:
+	PrettyHelp();
+	~PrettyHelp();
+
+	static PrettyHelp *get_current();
+
+	bool has_content() { return _root_listing.has_content(); }
+	const vector<ContentListing *> get_content() {
+		return _root_listing.get_content();
+	}
+	ContentListing* get_root() {
+		return &_root_listing;
+	}
+
+	void set_group(const string g) { group = g; }
+	bool has_group() { return group.compare("unknown") != 0; }
+
+	void log_help();
+};
+
+YOSYS_NAMESPACE_END
+
+#endif
diff --git a/kernel/register.cc b/kernel/register.cc
index af1823b5b..ea2a2624f 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -21,6 +21,7 @@
 #include "kernel/satgen.h"
 #include "kernel/json.h"
 #include "kernel/gzip.h"
+#include "kernel/log_help.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -41,7 +42,8 @@ std::map<std::string, Backend*> backend_register;
 
 std::vector<std::string> Frontend::next_args;
 
-Pass::Pass(std::string name, std::string short_help) : pass_name(name), short_help(short_help)
+Pass::Pass(std::string name, std::string short_help, source_location location) : 
+	pass_name(name), short_help(short_help), location(location)
 {
 	next_queued_pass = first_queued_pass;
 	first_queued_pass = this;
@@ -116,9 +118,19 @@ void Pass::post_execute(Pass::pre_post_exec_state_t state)
 
 void Pass::help()
 {
-	log("\n");
-	log("No help message for command `%s'.\n", pass_name.c_str());
-	log("\n");
+	auto prettyHelp = PrettyHelp();
+	if (formatted_help()) {
+		prettyHelp.log_help();
+	} else {
+		log("\n");
+		log("No help message for command `%s'.\n", pass_name.c_str());
+		log("\n");
+	}
+}
+
+bool Pass::formatted_help()
+{
+	return false;
 }
 
 void Pass::clear_flags()
@@ -381,8 +393,8 @@ void ScriptPass::help_script()
 	script();
 }
 
-Frontend::Frontend(std::string name, std::string short_help) :
-		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "read_" + name, short_help),
+Frontend::Frontend(std::string name, std::string short_help, source_location location) :
+		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "read_" + name, short_help, location),
 		frontend_name(name.rfind("=", 0) == 0 ? name.substr(1) : name)
 {
 }
@@ -527,8 +539,8 @@ void Frontend::frontend_call(RTLIL::Design *design, std::istream *f, std::string
 	}
 }
 
-Backend::Backend(std::string name, std::string short_help) :
-		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "write_" + name, short_help),
+Backend::Backend(std::string name, std::string short_help, source_location location) :
+		Pass(name.rfind("=", 0) == 0 ? name.substr(1) : "write_" + name, short_help, location),
 		backend_name(name.rfind("=", 0) == 0 ? name.substr(1) : name)
 {
 }
@@ -681,6 +693,23 @@ static string get_cell_name(string name) {
 	return is_code_getter(name) ? name.substr(0, name.length()-1) : name;
 }
 
+static void log_warning_flags(Pass *pass) {
+	bool has_warnings = false;
+	const string name = pass->pass_name;
+	if (pass->experimental_flag) {
+		if (!has_warnings) log("\n");
+		has_warnings = true;
+		log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", name.c_str());
+	}
+	if (pass->internal_flag) {
+		if (!has_warnings) log("\n");
+		has_warnings = true;
+		log("WARNING: THE '%s' COMMAND IS INTENDED FOR INTERNAL DEVELOPER USE ONLY.\n", name.c_str());
+	}
+	if (has_warnings)
+		log("\n");
+}
+
 static struct CellHelpMessages {
 	dict<string, SimHelper> cell_help;
 	CellHelpMessages() {
@@ -706,155 +735,211 @@ struct HelpPass : public Pass {
 		log("    help <celltype>+  ....  print verilog code for given cell type\n");
 		log("\n");
 	}
-	void write_cmd_rst(std::string cmd, std::string title, std::string text)
-	{
-		FILE *f = fopen(stringf("docs/source/cmd/%s.rst", cmd.c_str()).c_str(), "wt");
-		// make header
-		size_t char_len = cmd.length() + 3 + title.length();
-		std::string title_line = "\n";
-		title_line.insert(0, char_len, '=');
-		fprintf(f, "%s", title_line.c_str());
-		fprintf(f, "%s - %s\n", cmd.c_str(), title.c_str());
-		fprintf(f, "%s\n", title_line.c_str());
+	bool dump_cmds_json(PrettyJson &json) {
+		// init json
+		json.begin_object();
+		json.entry("version", "Yosys command reference");
+		json.entry("generator", yosys_version_str);
 
-		// render html
-		fprintf(f, ".. cmd:def:: %s\n", cmd.c_str());
-		fprintf(f, "   :title: %s\n\n", title.c_str());
-		fprintf(f, "   .. only:: html\n\n");
-		std::stringstream ss;
-		std::string textcp = text;
-		ss << text;
-		bool IsUsage = true;
-		int blank_count = 0;
-		size_t def_strip_count = 0;
-		bool WasDefinition = false;
-		for (std::string line; std::getline(ss, line, '\n');) {
-			// find position of first non space character
-			std::size_t first_pos = line.find_first_not_of(" \t");
-			std::size_t last_pos = line.find_last_not_of(" \t");
-			if (first_pos == std::string::npos) {
-				// skip formatting empty lines
-				if (!WasDefinition)
-					fputc('\n', f);
-				blank_count += 1;
-				continue;
+		bool raise_error = false;
+		std::map<string, vector<string>> groups;
+
+		json.name("cmds"); json.begin_object();
+		// iterate over commands
+		for (auto &it : pass_register) {
+			auto name = it.first;
+			auto pass = it.second;
+			auto title = pass->short_help;
+
+			auto cmd_help = PrettyHelp();
+			auto has_pretty_help = pass->formatted_help();
+
+			if (!has_pretty_help) {
+				enum PassUsageState {
+					PUState_none,
+					PUState_signature,
+					PUState_options,
+					PUState_optionbody,
+				};
+
+				source_location null_source;
+				string current_buffer = "";
+				auto root_listing = cmd_help.get_root();
+				auto current_listing = root_listing;
+
+				// dump command help
+				std::ostringstream buf;
+				log_streams.push_back(&buf);
+				pass->help();
+				log_streams.pop_back();
+				std::stringstream ss;
+				ss << buf.str();
+
+				// parse command help
+				size_t def_strip_count = 0;
+				auto current_state = PUState_none;
+				auto catch_verific = false;
+				auto blank_lines = 2;
+				for (string line; std::getline(ss, line, '\n');) {
+					// find position of first non space character
+					std::size_t first_pos = line.find_first_not_of(" \t");
+					std::size_t last_pos = line.find_last_not_of(" \t");
+					if (first_pos == std::string::npos) {
+						switch (current_state)
+						{
+						case PUState_signature:
+							root_listing->usage(current_buffer, null_source);
+							current_listing = root_listing;
+							current_state = PUState_none;
+							current_buffer = "";
+							break;
+						case PUState_none:
+						case PUState_optionbody:
+							blank_lines += 1;
+							break;
+						default:
+							break;
+						}
+						// skip empty lines
+						continue;
+					}
+
+					// strip leading and trailing whitespace
+					std::string stripped_line = line.substr(first_pos, last_pos - first_pos +1);
+					bool IsDefinition = stripped_line[0] == '-';
+					IsDefinition &= stripped_line[1] != ' ' && stripped_line[1] != '>';
+					bool IsDedent = def_strip_count && first_pos < def_strip_count;
+					bool IsIndent = def_strip_count < first_pos;
+
+					// line looks like a signature
+					bool IsSignature = stripped_line.find(name) == 0 && (stripped_line.length() == name.length() || stripped_line.at(name.size()) == ' ');
+
+					if (IsSignature && first_pos <= 4 && (blank_lines >= 2 || current_state == PUState_signature)) {
+						if (current_state == PUState_options || current_state == PUState_optionbody) {
+							current_listing->codeblock(current_buffer, "none", null_source);
+							current_buffer = "";
+						} else if (current_state == PUState_signature) {
+							root_listing->usage(current_buffer, null_source);
+							current_buffer = "";
+						} else if (current_state == PUState_none && !current_buffer.empty()) {
+							current_listing->codeblock(current_buffer, "none", null_source);
+							current_buffer = "";
+						}
+						current_listing = root_listing;
+						current_state = PUState_signature;
+						def_strip_count = first_pos;
+						catch_verific = false;
+					} else if (IsDedent) {
+						def_strip_count = first_pos;
+						if (current_state == PUState_optionbody) {
+							if (!current_buffer.empty()) {
+								current_listing->codeblock(current_buffer, "none", null_source);
+								current_buffer = "";
+							}
+							if (IsIndent) {
+								current_state = PUState_options;
+								current_listing = root_listing->back();
+							} else {
+								current_state = PUState_none;
+								current_listing = root_listing;
+							}
+						} else {
+							current_state = PUState_none;
+						}
+					}
+
+					if (IsDefinition && !catch_verific && current_state != PUState_signature) {
+						if (!current_buffer.empty()) {
+							current_listing->codeblock(current_buffer, "none", null_source);
+							current_buffer = "";
+						}
+						current_state = PUState_options;
+						current_listing = root_listing->open_option(stripped_line, null_source);
+						def_strip_count = first_pos;
+					} else {
+						if (current_state == PUState_options) {
+							current_state = PUState_optionbody;
+						}
+						if (current_buffer.empty())
+							current_buffer = stripped_line;
+						else if (current_state == PUState_signature && IsIndent)
+							current_buffer += stripped_line;
+						else if (current_state == PUState_none) {
+							current_buffer += (blank_lines > 0 ? "\n\n" : "\n") + line;
+						} else
+							current_buffer += (blank_lines > 0 ? "\n\n" : "\n") + stripped_line;
+						if (stripped_line.compare("Command file parser supports following commands in file:") == 0)
+							catch_verific = true;
+					}
+					blank_lines = 0;
+				}
+
+				if (!current_buffer.empty()) {
+					if (current_buffer.size() > 64 && current_buffer.substr(0, 64).compare("The following commands are executed by this synthesis command:\n\n") == 0) {
+						current_listing->paragraph(current_buffer.substr(0, 62), null_source);
+						current_listing->codeblock(current_buffer.substr(64), "yoscrypt", null_source);
+					} else
+						current_listing->codeblock(current_buffer, "none", null_source);
+					current_buffer = "";
+				}
 			}
 
-			// strip leading and trailing whitespace
-			std::string stripped_line = line.substr(first_pos, last_pos - first_pos +1);
-			bool IsDefinition = stripped_line[0] == '-';
-			IsDefinition &= stripped_line[1] != ' ' && stripped_line[1] != '>';
-			bool IsDedent = def_strip_count && first_pos <= def_strip_count;
-			bool IsIndent = first_pos == 2 || first_pos == 4;
-			if (cmd.compare(0, 7, "verific") == 0)
-				// verific.cc has strange and different formatting from the rest
-				IsIndent = false;
-
-			// another usage block
-			bool NewUsage = stripped_line.find(cmd) == 0;
-
-			if (IsUsage) {
-				if (stripped_line.compare(0, 4, "See ") == 0) {
-					// description refers to another function
-					fprintf(f, "\n      %s\n", stripped_line.c_str());
-				} else {
-					// usage should be the first line of help output
-					fprintf(f, "\n      .. code:: yoscrypt\n\n         %s\n\n      ", stripped_line.c_str());
-					WasDefinition = true;
+			// attempt auto group
+			if (!cmd_help.has_group()) {
+				string source_file = pass->location.file_name();
+				bool has_source = source_file.compare("unknown") != 0;
+				if (pass->internal_flag)
+					cmd_help.group = "internal";
+				else if (source_file.find("backends/") == 0 || (!has_source && name.find("read_") == 0))
+					cmd_help.group = "backends";
+				else if (source_file.find("frontends/") == 0 || (!has_source && name.find("write_") == 0))
+					cmd_help.group = "frontends";
+				else if (has_source) {
+					auto last_slash = source_file.find_last_of('/');
+					if (last_slash != string::npos) {
+						auto parent_path = source_file.substr(0, last_slash);
+						cmd_help.group = parent_path;
+					}
 				}
-				IsUsage = false;
-			} else if (IsIndent && NewUsage && (blank_count >= 2 || WasDefinition)) {
-				// another usage block
-				fprintf(f, "\n      .. code:: yoscrypt\n\n         %s\n\n      ", stripped_line.c_str());
-				WasDefinition = true;
-				def_strip_count = 0;
-			} else if (IsIndent && IsDefinition && (blank_count || WasDefinition)) {
-				// format definition term
-				fprintf(f, "\n\n      .. code:: yoscrypt\n\n         %s\n\n      ", stripped_line.c_str());
-				WasDefinition = true;
-				def_strip_count = first_pos;
-			} else {
-				if (IsDedent) {
-					fprintf(f, "\n\n      ::\n");
-					def_strip_count = first_pos;
-				} else if (WasDefinition) {
-					fprintf(f, "::\n");
-					WasDefinition = false;
-				}
-				fprintf(f, "\n         %s", line.substr(def_strip_count, std::string::npos).c_str());
+				// implicit !has_source
+				else if (name.find("equiv") == 0)
+					cmd_help.group = "passes/equiv";
+				else if (name.find("fsm") == 0)
+					cmd_help.group = "passes/fsm";
+				else if (name.find("memory") == 0)
+					cmd_help.group = "passes/memory";
+				else if (name.find("opt") == 0)
+					cmd_help.group = "passes/opt";
+				else if (name.find("proc") == 0)
+					cmd_help.group = "passes/proc";
 			}
 
-			blank_count = 0;
+			if (groups.count(cmd_help.group) == 0) {
+				groups[cmd_help.group] = vector<string>();
+			}
+			groups[cmd_help.group].push_back(name);
+
+			// write to json
+			json.name(name.c_str()); json.begin_object();
+			json.entry("title", title);
+			json.name("content"); json.begin_array();
+			for (auto content : cmd_help.get_content())
+				json.value(content->to_json());
+			json.end_array();
+			json.entry("group", cmd_help.group);
+			json.entry("source_file", pass->location.file_name());
+			json.entry("source_line", pass->location.line());
+			json.entry("source_func", pass->location.function_name());
+			json.entry("experimental_flag", pass->experimental_flag);
+			json.entry("internal_flag", pass->internal_flag);
+			json.end_object();
 		}
-		fputc('\n', f);
+		json.end_object();
 
-		// render latex
-		fprintf(f, ".. only:: latex\n\n");
-		fprintf(f, "   ::\n\n");
-		std::stringstream ss2;
-		ss2 << textcp;
-		for (std::string line; std::getline(ss2, line, '\n');) {
-			fprintf(f, "      %s\n", line.c_str());
-		}
-		fclose(f);
-	}
-	void write_cell_rst(Yosys::SimHelper cell, Yosys::CellType ct)
-	{
-		// open
-		FILE *f = fopen(stringf("docs/source/cell/%s.rst", cell.filesafe_name().c_str()).c_str(), "wt");
+		json.entry("groups", groups);
 
-		// make header
-		string title_line;
-		if (cell.title.length())
-			title_line = stringf("%s - %s", cell.name.c_str(), cell.title.c_str());
-		else title_line = cell.name;
-		string underline = "\n";
-		underline.insert(0, title_line.length(), '=');
-		fprintf(f, "%s\n", title_line.c_str());
-		fprintf(f, "%s\n", underline.c_str());
-
-		// help text, with cell def for links
-		fprintf(f, ".. cell:def:: %s\n", cell.name.c_str());
-		if (cell.title.length())
-			fprintf(f, "   :title: %s\n\n", cell.title.c_str());
-		else
-			fprintf(f, "   :title: %s\n\n", cell.name.c_str());
-		std::stringstream ss;
-		ss << cell.desc;
-		for (std::string line; std::getline(ss, line, '\n');) {
-			fprintf(f, "   %s\n", line.c_str());
-		}
-
-		// properties
-		fprintf(f, "\nProperties");
-		fprintf(f, "\n----------\n\n");
-		dict<string, bool> prop_dict = {
-			{"is_evaluable", ct.is_evaluable},
-			{"is_combinatorial", ct.is_combinatorial},
-			{"is_synthesizable", ct.is_synthesizable},
-		};
-		for (auto &it : prop_dict) {
-			fprintf(f, "- %s: %s\n", it.first.c_str(), it.second ? "true" : "false");
-		}
-
-		// source code
-		fprintf(f, "\nSimulation model (Verilog)");
-		fprintf(f, "\n--------------------------\n\n");
-		fprintf(f, ".. code-block:: verilog\n");
-		fprintf(f, "   :caption: %s\n\n", cell.source.c_str());
-		std::stringstream ss2;
-		ss2 << cell.code;
-		for (std::string line; std::getline(ss2, line, '\n');) {
-			fprintf(f, "   %s\n", line.c_str());
-		}
-
-		// footer
-		fprintf(f, "\n.. note::\n\n");
-		fprintf(f, "   This page was auto-generated from the output of\n");
-		fprintf(f, "   ``help %s``.\n", cell.name.c_str());
-
-		// close
-		fclose(f);
+		json.end_object();
+		return raise_error;
 	}
 	bool dump_cells_json(PrettyJson &json) {
 		// init json
@@ -960,11 +1045,7 @@ struct HelpPass : public Pass {
 						log("=");
 					log("\n");
 					it.second->help();
-					if (it.second->experimental_flag) {
-						log("\n");
-						log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", it.first.c_str());
-						log("\n");
-					}
+					log_warning_flags(it.second);
 				}
 			}
 			else if (args[1] == "-cells") {
@@ -978,44 +1059,9 @@ struct HelpPass : public Pass {
 				log("\n");
 				return;
 			}
-			// this option is undocumented as it is for internal use only
-			else if (args[1] == "-write-rst-command-reference-manual") {
-				for (auto &it : pass_register) {
-					std::ostringstream buf;
-					log_streams.push_back(&buf);
-					it.second->help();
-					if (it.second->experimental_flag) {
-						log("\n");
-						log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", it.first.c_str());
-						log("\n");
-					}
-					log_streams.pop_back();
-					write_cmd_rst(it.first, it.second->short_help, buf.str());
-				}
-			}
-			// this option is also undocumented as it is for internal use only
-			else if (args[1] == "-write-rst-cells-manual") {
-				bool raise_error = false;
-				for (auto &it : yosys_celltypes.cell_types) {
-					auto name = it.first.str();
-					if (cell_help_messages.contains(name)) {
-						write_cell_rst(cell_help_messages.get(name), it.second);
-					} else {
-						log("ERROR: Missing cell help for cell '%s'.\n", name.c_str());
-						raise_error |= true;
-					}
-				}
-				if (raise_error) {
-					log_error("One or more cells defined in celltypes.h are missing help documentation.\n");
-				}
-			}
 			else if (pass_register.count(args[1])) {
 				pass_register.at(args[1])->help();
-				if (pass_register.at(args[1])->experimental_flag) {
-					log("\n");
-					log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", args[1].c_str());
-					log("\n");
-				}
+				log_warning_flags(pass_register.at(args[1]));
 			}
 			else if (cell_help_messages.contains(args[1])) {
 				auto help_cell = cell_help_messages.get(args[1]);
@@ -1044,7 +1090,17 @@ struct HelpPass : public Pass {
 				log("No such command or cell type: %s\n", args[1].c_str());
 			return;
 		} else if (args.size() == 3) {
-			if (args[1] == "-dump-cells-json") {
+			// this option is undocumented as it is for internal use only
+			if (args[1] == "-dump-cmds-json") {
+				PrettyJson json;
+				if (!json.write_to_file(args[2]))
+					log_error("Can't open file `%s' for writing: %s\n", args[2].c_str(), strerror(errno));
+				if (dump_cmds_json(json)) {
+					log_abort();
+				}
+			}
+			// this option is undocumented as it is for internal use only
+			else if (args[1] == "-dump-cells-json") {
 				PrettyJson json;
 				if (!json.write_to_file(args[2]))
 					log_error("Can't open file `%s' for writing: %s\n", args[2].c_str(), strerror(errno));
@@ -1052,6 +1108,8 @@ struct HelpPass : public Pass {
 					log_error("One or more cells defined in celltypes.h are missing help documentation.\n");
 				}
 			}
+			else
+				log("Unknown help command: `%s %s'\n", args[1].c_str(), args[2].c_str());
 			return;
 		}
 
diff --git a/kernel/register.h b/kernel/register.h
index f4e2127e1..e8c017c1d 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -23,27 +23,62 @@
 #include "kernel/yosys_common.h"
 #include "kernel/yosys.h"
 
+#include <version>
+#if __cpp_lib_source_location == 201907L
+  #include <source_location>
+  using std::source_location;
+#elif defined(__has_include)
+#  if __has_include(<experimental/source_location>)
+    #include <experimental/source_location>
+    using std::experimental::source_location;
+#  else
+    #define SOURCE_FALLBACK
+#  endif
+#else
+  #define SOURCE_FALLBACK
+#endif
+
+#ifdef SOURCE_FALLBACK
+struct source_location { // dummy placeholder
+	int line() const { return 0; }
+	int column() const { return 0; }
+	const char* file_name() const { return "unknown"; }
+	const char* function_name() const { return "unknown"; }
+	static const source_location current(...) { return source_location(); }
+};
+#endif
+
 YOSYS_NAMESPACE_BEGIN
 
 struct Pass
 {
 	std::string pass_name, short_help;
-	Pass(std::string name, std::string short_help = "** document me **");
+	source_location location;
+	Pass(std::string name, std::string short_help = "** document me **",
+		source_location location = source_location::current());
 	// Prefer overriding 'Pass::on_shutdown()' if possible
 	virtual ~Pass();
 
+	// Makes calls to log() to generate help message
 	virtual void help();
+	// Uses PrettyHelp::get_current() to produce a more portable formatted help message
+	virtual bool formatted_help();
 	virtual void clear_flags();
 	virtual void execute(std::vector<std::string> args, RTLIL::Design *design) = 0;
 
 	int call_counter;
 	int64_t runtime_ns;
 	bool experimental_flag = false;
+	bool internal_flag = false;
 
 	void experimental() {
 		experimental_flag = true;
 	}
 
+	void internal() {
+		internal_flag = true;
+	}
+
 	struct pre_post_exec_state_t {
 		Pass *parent_pass;
 		int64_t begin_ns;
@@ -81,7 +116,8 @@ struct ScriptPass : Pass
 	RTLIL::Design *active_design;
 	std::string active_run_from, active_run_to;
 
-	ScriptPass(std::string name, std::string short_help = "** document me **") : Pass(name, short_help) { }
+	ScriptPass(std::string name, std::string short_help = "** document me **", source_location location = source_location::current()) : 
+		Pass(name, short_help, location) { }
 
 	virtual void script() = 0;
 
@@ -99,7 +135,8 @@ struct Frontend : Pass
 	static std::string last_here_document;
 
 	std::string frontend_name;
-	Frontend(std::string name, std::string short_help = "** document me **");
+	Frontend(std::string name, std::string short_help = "** document me **",
+		source_location location = source_location::current());
 	void run_register() override;
 	~Frontend() override;
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override final;
@@ -115,7 +152,8 @@ struct Frontend : Pass
 struct Backend : Pass
 {
 	std::string backend_name;
-	Backend(std::string name, std::string short_help = "** document me **");
+	Backend(std::string name, std::string short_help = "** document me **",
+		source_location location = source_location::current());
 	void run_register() override;
 	~Backend() override;
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override final;
diff --git a/passes/cmds/check.cc b/passes/cmds/check.cc
index 83fe781a0..8bbcb8da0 100644
--- a/passes/cmds/check.cc
+++ b/passes/cmds/check.cc
@@ -22,12 +22,18 @@
 #include "kernel/celledges.h"
 #include "kernel/celltypes.h"
 #include "kernel/utils.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct CheckPass : public Pass {
 	CheckPass() : Pass("check", "check for obvious problems in the design") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/chformal.cc b/passes/cmds/chformal.cc
index 572ed2153..ccda023c0 100644
--- a/passes/cmds/chformal.cc
+++ b/passes/cmds/chformal.cc
@@ -19,6 +19,7 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -70,62 +71,62 @@ static bool is_triggered_check_cell(RTLIL::Cell * cell)
 }
 
 struct ChformalPass : public Pass {
-	ChformalPass() : Pass("chformal", "change formal constraints of the design") { }
-	void help() override
-	{
-		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
-		log("\n");
-		log("    chformal [types] [mode] [options] [selection]\n");
-		log("\n");
-		log("Make changes to the formal constraints of the design. The [types] options\n");
-		log("the type of constraint to operate on. If none of the following options are\n");
-		log("given, the command will operate on all constraint types:\n");
-		log("\n");
-		log("    -assert       $assert cells, representing assert(...) constraints\n");
-		log("    -assume       $assume cells, representing assume(...) constraints\n");
-		log("    -live         $live cells, representing assert(s_eventually ...)\n");
-		log("    -fair         $fair cells, representing assume(s_eventually ...)\n");
-		log("    -cover        $cover cells, representing cover() statements\n");
-		log("\n");
-		log("    Additionally chformal will operate on $check cells corresponding to the\n");
-		log("    selected constraint types.\n");
-		log("\n");
-		log("Exactly one of the following modes must be specified:\n");
-		log("\n");
-		log("    -remove\n");
-		log("        remove the cells and thus constraints from the design\n");
-		log("\n");
-		log("    -early\n");
-		log("        bypass FFs that only delay the activation of a constraint. When inputs\n");
-		log("        of the bypassed FFs do not remain stable between clock edges, this may\n");
-		log("        result in unexpected behavior.\n");
-		log("\n");
-		log("    -delay <N>\n");
-		log("        delay activation of the constraint by <N> clock cycles\n");
-		log("\n");
-		log("    -skip <N>\n");
-		log("        ignore activation of the constraint in the first <N> clock cycles\n");
-		log("\n");
-		log("    -coverenable\n");
-		log("        add cover statements for the enable signals of the constraints\n");
-		log("\n");
+	ChformalPass() : Pass("chformal", "change formal constraints of the design") {}
+
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+
+		auto content_root = help->get_root();
+
+		content_root->usage("chformal [types] [mode] [options] [selection]");
+		content_root->paragraph(
+			"Make changes to the formal constraints of the design. The [types] options "
+			"the type of constraint to operate on. If none of the following options are "
+			"given, the command will operate on all constraint types:"
+		);
+
+		content_root->option("-assert", "`$assert` cells, representing ``assert(...)`` constraints");
+		content_root->option("-assume", "`$assume` cells, representing ``assume(...)`` constraints");
+		content_root->option("-live", "`$live` cells, representing ``assert(s_eventually ...)``");
+		content_root->option("-fair", "`$fair` cells, representing ``assume(s_eventually ...)``");
+		content_root->option("-cover", "`$cover` cells, representing ``cover()`` statements");
+		content_root->paragraph(
+			"Additionally chformal will operate on `$check` cells corresponding to the "
+			"selected constraint types."
+		);
+
+		content_root->paragraph("Exactly one of the following modes must be specified:");
+
+		content_root->option("-remove", "remove the cells and thus constraints from the design");
+		content_root->option("-early",
+			"bypass FFs that only delay the activation of a constraint. When inputs "
+			"of the bypassed FFs do not remain stable between clock edges, this may "
+			"result in unexpected behavior."
+		);
+		content_root->option("-delay <N>", "delay activation of the constraint by <N> clock cycles");
+		content_root->option("-skip <N>", "ignore activation of the constraint in the first <N> clock cycles");
+		auto cover_option = content_root->open_option("-coverenable");
+		cover_option->paragraph(
+			"add cover statements for the enable signals of the constraints"
+		);
 #ifdef YOSYS_ENABLE_VERIFIC
-		log("        Note: For the Verific frontend it is currently not guaranteed that a\n");
-		log("        reachable SVA statement corresponds to an active enable signal.\n");
-		log("\n");
+		cover_option->paragraph(
+			"Note: For the Verific frontend it is currently not guaranteed that a "
+			"reachable SVA statement corresponds to an active enable signal."
+		);
 #endif
-		log("    -assert2assume\n");
-		log("    -assert2cover\n");
-		log("    -assume2assert\n");
-		log("    -live2fair\n");
-		log("    -fair2live\n");
-		log("        change the roles of cells as indicated. these options can be combined\n");
-		log("\n");
-		log("    -lower\n");
-		log("        convert each $check cell into an $assert, $assume, $live, $fair or\n");
-		log("        $cover cell. If the $check cell contains a message, also produce a\n");
-		log("        $print cell.\n");
-		log("\n");
+		content_root->option("-assert2assume");
+		content_root->option("-assert2cover");
+		content_root->option("-assume2assert");
+		content_root->option("-live2fair");
+		content_root->option("-fair2live", "change the roles of cells as indicated. these options can be combined");
+		content_root->option("-lower",
+			"convert each $check cell into an $assert, $assume, $live, $fair or "
+			"$cover cell. If the $check cell contains a message, also produce a "
+			"$print cell."
+		);
+		return true;
 	}
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
diff --git a/passes/cmds/cover.cc b/passes/cmds/cover.cc
index 1db3e2ca0..47354f1d5 100644
--- a/passes/cmds/cover.cc
+++ b/passes/cmds/cover.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include <sys/types.h>
 
 #ifndef _WIN32
@@ -26,15 +27,18 @@
 #  include <io.h>
 #endif
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
-
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct CoverPass : public Pass {
-	CoverPass() : Pass("cover", "print code coverage counters") { }
+	CoverPass() : Pass("cover", "print code coverage counters") {
+		internal();
+	}
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/dft_tag.cc b/passes/cmds/dft_tag.cc
index b6afe6f89..347c8efa4 100644
--- a/passes/cmds/dft_tag.cc
+++ b/passes/cmds/dft_tag.cc
@@ -22,6 +22,7 @@
 #include "kernel/modtools.h"
 #include "kernel/sigtools.h"
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -952,6 +953,11 @@ struct DftTagWorker {
 
 struct DftTagPass : public Pass {
 	DftTagPass() : Pass("dft_tag", "create tagging logic for data flow tracking") {}
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/edgetypes.cc b/passes/cmds/edgetypes.cc
index 5b53f50cc..933bd457f 100644
--- a/passes/cmds/edgetypes.cc
+++ b/passes/cmds/edgetypes.cc
@@ -19,12 +19,18 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct EdgetypePass : public Pass {
 	EdgetypePass() : Pass("edgetypes", "list all types of edges in selection") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/example_dt.cc b/passes/cmds/example_dt.cc
index 2870e062b..b10f50502 100644
--- a/passes/cmds/example_dt.cc
+++ b/passes/cmds/example_dt.cc
@@ -21,15 +21,17 @@ struct ExampleWorker
 
 struct ExampleDtPass : public Pass
 {
-	ExampleDtPass() : Pass("example_dt", "drivertools example") {}
+	ExampleDtPass() : Pass("example_dt", "drivertools example") {
+		internal();
+	}
 
-    void help() override
+	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
 		log("TODO: add help message\n");
 		log("\n");
-    }
+	}
 
 
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
diff --git a/passes/cmds/exec.cc b/passes/cmds/exec.cc
index e9cc34b30..486fa1c2b 100644
--- a/passes/cmds/exec.cc
+++ b/passes/cmds/exec.cc
@@ -17,8 +17,8 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include <cstdio>
 
 #if defined(_WIN32)
@@ -38,6 +38,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct ExecPass : public Pass {
 	ExecPass() : Pass("exec", "execute commands in the operating system shell") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/future.cc b/passes/cmds/future.cc
index b03613c9b..5dcf46bcf 100644
--- a/passes/cmds/future.cc
+++ b/passes/cmds/future.cc
@@ -24,6 +24,7 @@
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -110,6 +111,11 @@ struct FutureWorker {
 
 struct FuturePass : public Pass {
 	FuturePass() : Pass("future", "resolve future sampled value functions") {}
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/glift.cc b/passes/cmds/glift.cc
index 6a7d070d7..0c321eba6 100644
--- a/passes/cmds/glift.cc
+++ b/passes/cmds/glift.cc
@@ -17,10 +17,9 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
 #include "kernel/utils.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -425,6 +424,12 @@ public:
 struct GliftPass : public Pass {
 	GliftPass() : Pass("glift", "create GLIFT models and optimization problems") {}
 
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
+
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/internal_stats.cc b/passes/cmds/internal_stats.cc
index 28822f237..00456b8f9 100644
--- a/passes/cmds/internal_stats.cc
+++ b/passes/cmds/internal_stats.cc
@@ -18,8 +18,6 @@
  */
 
 #include <iterator>
-#include <optional>
-#include <stdint.h>
 
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
@@ -71,7 +69,10 @@ std::optional<uint64_t> current_mem_bytes() {
 }
 
 struct InternalStatsPass : public Pass {
-	InternalStatsPass() : Pass("internal_stats", "print internal statistics") { }
+	InternalStatsPass() : Pass("internal_stats", "print internal statistics") {
+		experimental();
+		internal();
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/logcmd.cc b/passes/cmds/logcmd.cc
index 3b82ac48c..0238627d1 100644
--- a/passes/cmds/logcmd.cc
+++ b/passes/cmds/logcmd.cc
@@ -18,15 +18,19 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct LogPass : public Pass {
 	LogPass() : Pass("log", "print text and log files") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc
index 241a8799f..276810201 100644
--- a/passes/cmds/logger.cc
+++ b/passes/cmds/logger.cc
@@ -17,14 +17,19 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct LoggerPass : public Pass {
 	LoggerPass() : Pass("logger", "set logger properties") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/ltp.cc b/passes/cmds/ltp.cc
index 22bdaab44..b3134b110 100644
--- a/passes/cmds/ltp.cc
+++ b/passes/cmds/ltp.cc
@@ -20,6 +20,7 @@
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -141,6 +142,11 @@ struct LtpWorker
 
 struct LtpPass : public Pass {
 	LtpPass() : Pass("ltp", "print longest topological path") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index 4ad7c165b..a653844b7 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 #ifdef YOSYS_ENABLE_PLUGINS
 #  include <dlfcn.h>
@@ -122,6 +123,11 @@ void load_plugin(std::string, std::vector<std::string>)
 
 struct PluginPass : public Pass {
 	PluginPass() : Pass("plugin", "load and list loaded plugins") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/portarcs.cc b/passes/cmds/portarcs.cc
index a6ed75de3..97682efbb 100644
--- a/passes/cmds/portarcs.cc
+++ b/passes/cmds/portarcs.cc
@@ -22,6 +22,7 @@
 #include "kernel/rtlil.h"
 #include "kernel/utils.h"
 #include "kernel/celltypes.h"
+#include "kernel/log_help.h"
 
 PRIVATE_NAMESPACE_BEGIN
 USING_YOSYS_NAMESPACE
@@ -38,6 +39,11 @@ static RTLIL::SigBit canonical_bit(RTLIL::SigBit bit)
 
 struct PortarcsPass : Pass {
 	PortarcsPass() : Pass("portarcs", "derive port arcs for propagation delay") {}
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 
 	void help() override
 	{
diff --git a/passes/cmds/portlist.cc b/passes/cmds/portlist.cc
index 03048422d..f78d9d3b6 100644
--- a/passes/cmds/portlist.cc
+++ b/passes/cmds/portlist.cc
@@ -19,12 +19,18 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct PortlistPass : public Pass {
 	PortlistPass() : Pass("portlist", "list (top-level) ports") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/printattrs.cc b/passes/cmds/printattrs.cc
index 2a5034c13..c8b0a1d1f 100644
--- a/passes/cmds/printattrs.cc
+++ b/passes/cmds/printattrs.cc
@@ -18,12 +18,18 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct PrintAttrsPass : public Pass {
 	PrintAttrsPass() : Pass("printattrs", "print attributes of selected objects") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/scc.cc b/passes/cmds/scc.cc
index 0f988e57a..e55e63828 100644
--- a/passes/cmds/scc.cc
+++ b/passes/cmds/scc.cc
@@ -21,12 +21,10 @@
 // Tarjan, R. E. (1972), "Depth-first search and linear graph algorithms", SIAM Journal on Computing 1 (2): 146-160, doi:10.1137/0201010
 // http://en.wikipedia.org/wiki/Tarjan's_strongly_connected_components_algorithm
 
-#include "kernel/register.h"
+#include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
-#include "kernel/log.h"
-#include <stdlib.h>
-#include <stdio.h>
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -252,6 +250,11 @@ struct SccWorker
 
 struct SccPass : public Pass {
 	SccPass() : Pass("scc", "detect strongly connected components (logic loops)") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/scratchpad.cc b/passes/cmds/scratchpad.cc
index aecc4c17d..4a63f2f60 100644
--- a/passes/cmds/scratchpad.cc
+++ b/passes/cmds/scratchpad.cc
@@ -18,15 +18,19 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct ScratchpadPass : public Pass {
 	ScratchpadPass() : Pass("scratchpad", "get/set values in the scratchpad") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc
index 1d75091af..901f923f8 100644
--- a/passes/cmds/select.cc
+++ b/passes/cmds/select.cc
@@ -20,8 +20,7 @@
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
-#include <string.h>
-#include <errno.h>
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -1085,6 +1084,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct SelectPass : public Pass {
 	SelectPass() : Pass("select", "modify and view the list of selected objects") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -1664,6 +1668,11 @@ struct SelectPass : public Pass {
 
 struct CdPass : public Pass {
 	CdPass() : Pass("cd", "a shortcut for 'select -module <name>'") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -1776,6 +1785,11 @@ static void log_matches(const char *title, Module *module, const T &list)
 
 struct LsPass : public Pass {
 	LsPass() : Pass("ls", "list modules or objects in modules") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/setenv.cc b/passes/cmds/setenv.cc
index 27f2eea28..850d7c961 100644
--- a/passes/cmds/setenv.cc
+++ b/passes/cmds/setenv.cc
@@ -17,15 +17,18 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
-#include <stdlib.h>
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 struct SetenvPass : public Pass {
 	SetenvPass() : Pass("setenv", "set an environment variable") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index 8a1bd58c4..4eb6569e6 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -17,10 +17,9 @@
  *
  */
 
-#include "kernel/register.h"
+#include "kernel/yosys.h"
 #include "kernel/celltypes.h"
-#include "kernel/log.h"
-#include <string.h>
+#include "kernel/log_help.h"
 
 #ifndef _WIN32
 #  include <dirent.h>
@@ -658,6 +657,11 @@ struct ShowWorker
 
 struct ShowPass : public Pass {
 	ShowPass() : Pass("show", "generate schematics using graphviz") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/sta.cc b/passes/cmds/sta.cc
index 4ad0e96be..5dfac1575 100644
--- a/passes/cmds/sta.cc
+++ b/passes/cmds/sta.cc
@@ -21,6 +21,7 @@
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
 #include "kernel/timinginfo.h"
+#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -275,6 +276,11 @@ struct StaWorker
 
 struct StaPass : public Pass {
 	StaPass() : Pass("sta", "perform static timing analysis") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 6b93621f1..af7023bdd 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -25,6 +25,7 @@
 #include "kernel/cost.h"
 #include "kernel/gzip.h"
 #include "libs/json11/json11.hpp"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -367,6 +368,11 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 
 struct StatPass : public Pass {
 	StatPass() : Pass("stat", "print some statistics") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/tee.cc b/passes/cmds/tee.cc
index 853f1bad3..fbd42e311 100644
--- a/passes/cmds/tee.cc
+++ b/passes/cmds/tee.cc
@@ -18,15 +18,19 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct TeePass : public Pass {
 	TeePass() : Pass("tee", "redirect command output to file") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/torder.cc b/passes/cmds/torder.cc
index 1620c0bca..537b6793d 100644
--- a/passes/cmds/torder.cc
+++ b/passes/cmds/torder.cc
@@ -21,12 +21,18 @@
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct TorderPass : public Pass {
 	TorderPass() : Pass("torder", "print cells in topological order") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/trace.cc b/passes/cmds/trace.cc
index 400542776..39ed8e60e 100644
--- a/passes/cmds/trace.cc
+++ b/passes/cmds/trace.cc
@@ -19,6 +19,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -60,6 +61,11 @@ struct TraceMonitor : public RTLIL::Monitor
 
 struct TracePass : public Pass {
 	TracePass() : Pass("trace", "redirect command output to file") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -96,6 +102,11 @@ struct TracePass : public Pass {
 
 struct DebugPass : public Pass {
 	DebugPass() : Pass("debug", "run command with debug log messages enabled") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/viz.cc b/passes/cmds/viz.cc
index 131e799ab..4c73b4d71 100644
--- a/passes/cmds/viz.cc
+++ b/passes/cmds/viz.cc
@@ -19,6 +19,7 @@
 
 #include "kernel/yosys.h"
 #include "kernel/sigtools.h"
+#include "kernel/log_help.h"
 
 #ifndef _WIN32
 #  include <dirent.h>
@@ -817,6 +818,11 @@ struct VizWorker
 
 struct VizPass : public Pass {
 	VizPass() : Pass("viz", "visualize data flow graph") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/write_file.cc b/passes/cmds/write_file.cc
index ea9b3f556..a22fdaf2a 100644
--- a/passes/cmds/write_file.cc
+++ b/passes/cmds/write_file.cc
@@ -19,12 +19,18 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct WriteFileFrontend : public Frontend {
 	WriteFileFrontend() : Frontend("=write_file", "write a text to a file") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/status");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/cmds/xprop.cc b/passes/cmds/xprop.cc
index dc5befc27..d2d0c4d8e 100644
--- a/passes/cmds/xprop.cc
+++ b/passes/cmds/xprop.cc
@@ -24,6 +24,7 @@
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include <deque>
 
 USING_YOSYS_NAMESPACE
@@ -1100,6 +1101,11 @@ struct XpropWorker
 
 struct XpropPass : public Pass {
 	XpropPass() : Pass("xprop", "formal x propagation") {}
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/hierarchy/Makefile.inc b/passes/hierarchy/Makefile.inc
index 3cd1b6180..ff1a2fcc5 100644
--- a/passes/hierarchy/Makefile.inc
+++ b/passes/hierarchy/Makefile.inc
@@ -1,4 +1,5 @@
 
+OBJS += passes/hierarchy/flatten.o
 OBJS += passes/hierarchy/hierarchy.o
 OBJS += passes/hierarchy/uniquify.o
 OBJS += passes/hierarchy/submod.o
diff --git a/passes/techmap/flatten.cc b/passes/hierarchy/flatten.cc
similarity index 100%
rename from passes/techmap/flatten.cc
rename to passes/hierarchy/flatten.cc
diff --git a/passes/opt/rmports.cc b/passes/opt/rmports.cc
index 9fa9f5c2d..0ac391790 100644
--- a/passes/opt/rmports.cc
+++ b/passes/opt/rmports.cc
@@ -17,17 +17,20 @@
  *
  */
 
-#include "kernel/register.h"
 #include "kernel/sigtools.h"
-#include "kernel/log.h"
-#include <stdlib.h>
-#include <stdio.h>
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct RmportsPassPass : public Pass {
 	RmportsPassPass() : Pass("rmports", "remove module ports with no connections") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("techlibs/greenpak4");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/pmgen/test_pmgen.cc b/passes/pmgen/test_pmgen.cc
index fc41848f7..892500850 100644
--- a/passes/pmgen/test_pmgen.cc
+++ b/passes/pmgen/test_pmgen.cc
@@ -117,7 +117,9 @@ void opt_eqpmux(test_pmgen_pm &pm)
 }
 
 struct TestPmgenPass : public Pass {
-	TestPmgenPass() : Pass("test_pmgen", "test pass for pmgen") { }
+	TestPmgenPass() : Pass("test_pmgen", "test pass for pmgen") {
+		internal();
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/assertpmux.cc b/passes/sat/assertpmux.cc
index 991977ab9..7b3357f82 100644
--- a/passes/sat/assertpmux.cc
+++ b/passes/sat/assertpmux.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/utils.h"
 
@@ -182,6 +183,11 @@ struct AssertpmuxWorker
 
 struct AssertpmuxPass : public Pass {
 	AssertpmuxPass() : Pass("assertpmux", "adds asserts for parallel muxes") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/async2sync.cc b/passes/sat/async2sync.cc
index 93c7e96c8..e86a78d81 100644
--- a/passes/sat/async2sync.cc
+++ b/passes/sat/async2sync.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/ffinit.h"
 #include "kernel/ff.h"
@@ -27,6 +28,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct Async2syncPass : public Pass {
 	Async2syncPass() : Pass("async2sync", "convert async FF inputs to sync circuits") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/clk2fflogic.cc b/passes/sat/clk2fflogic.cc
index 348bab727..6b94cbe19 100644
--- a/passes/sat/clk2fflogic.cc
+++ b/passes/sat/clk2fflogic.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/ffinit.h"
 #include "kernel/ff.h"
@@ -33,6 +34,11 @@ struct SampledSig {
 
 struct Clk2fflogicPass : public Pass {
 	Clk2fflogicPass() : Pass("clk2fflogic", "convert clocked FFs to generic $ff cells") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/cutpoint.cc b/passes/sat/cutpoint.cc
index dcd399a57..485e44fd6 100644
--- a/passes/sat/cutpoint.cc
+++ b/passes/sat/cutpoint.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -25,6 +26,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct CutpointPass : public Pass {
 	CutpointPass() : Pass("cutpoint", "adds formal cut points to the design") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/expose.cc b/passes/sat/expose.cc
index 9afe00d5c..1e975db0f 100644
--- a/passes/sat/expose.cc
+++ b/passes/sat/expose.cc
@@ -17,11 +17,10 @@
  *
  */
 
-#include "kernel/register.h"
+#include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/sigtools.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -217,6 +216,11 @@ RTLIL::Wire *add_new_wire(RTLIL::Module *module, RTLIL::IdString name, int width
 
 struct ExposePass : public Pass {
 	ExposePass() : Pass("expose", "convert internal signals to module ports") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/cmds");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/fmcombine.cc b/passes/sat/fmcombine.cc
index 220cf5c52..575b2f40d 100644
--- a/passes/sat/fmcombine.cc
+++ b/passes/sat/fmcombine.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/celltypes.h"
 
@@ -237,6 +238,11 @@ struct FmcombineWorker
 
 struct FmcombinePass : public Pass {
 	FmcombinePass() : Pass("fmcombine", "combine two instances of a cell into one") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/fminit.cc b/passes/sat/fminit.cc
index 5f4ec0068..547082164 100644
--- a/passes/sat/fminit.cc
+++ b/passes/sat/fminit.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -25,6 +26,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct FminitPass : public Pass {
 	FminitPass() : Pass("fminit", "set init values/sequences for formal") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/formalff.cc b/passes/sat/formalff.cc
index 1d87fcc3b..286bf2976 100644
--- a/passes/sat/formalff.cc
+++ b/passes/sat/formalff.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 #include "kernel/ffinit.h"
 #include "kernel/ff.h"
@@ -486,6 +487,11 @@ void HierarchyWorker::propagate()
 
 struct FormalFfPass : public Pass {
 	FormalFfPass() : Pass("formalff", "prepare FFs for formal") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/freduce.cc b/passes/sat/freduce.cc
index 52e80f667..6063c5ab9 100644
--- a/passes/sat/freduce.cc
+++ b/passes/sat/freduce.cc
@@ -17,17 +17,12 @@
  *
  */
 
-#include "kernel/register.h"
 #include "kernel/celltypes.h"
 #include "kernel/consteval.h"
 #include "kernel/sigtools.h"
-#include "kernel/log.h"
 #include "kernel/satgen.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <algorithm>
-#include <limits>
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -761,6 +756,11 @@ struct FreduceWorker
 
 struct FreducePass : public Pass {
 	FreducePass() : Pass("freduce", "perform functional reduction") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/miter.cc b/passes/sat/miter.cc
index 8f27c4c6f..9bcf25547 100644
--- a/passes/sat/miter.cc
+++ b/passes/sat/miter.cc
@@ -17,9 +17,8 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -395,6 +394,11 @@ void create_miter_assert(struct Pass *that, std::vector<std::string> args, RTLIL
 
 struct MiterPass : public Pass {
 	MiterPass() : Pass("miter", "automatically create a miter circuit") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/mutate.cc b/passes/sat/mutate.cc
index 3075ef3f0..43373ce0e 100644
--- a/passes/sat/mutate.cc
+++ b/passes/sat/mutate.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -728,6 +729,11 @@ void mutate_cnot(Design *design, const mutate_opts_t &opts, bool one)
 
 struct MutatePass : public Pass {
 	MutatePass() : Pass("mutate", "generate or apply design mutations") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/qbfsat.cc b/passes/sat/qbfsat.cc
index db6836ea1..7a7a31806 100644
--- a/passes/sat/qbfsat.cc
+++ b/passes/sat/qbfsat.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/consteval.h"
 #include "qbfsat.h"
 
@@ -504,6 +505,11 @@ QbfSolveOptions parse_args(const std::vector<std::string> &args) {
 
 struct QbfSatPass : public Pass {
 	QbfSatPass() : Pass("qbfsat", "solve a 2QBF-SAT problem in the circuit") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/recover_names.cc b/passes/sat/recover_names.cc
index cddd8771c..7ed8b1304 100644
--- a/passes/sat/recover_names.cc
+++ b/passes/sat/recover_names.cc
@@ -23,6 +23,7 @@
 #include "kernel/celltypes.h"
 #include "kernel/utils.h"
 #include "kernel/satgen.h"
+#include "kernel/log_help.h"
 
 #include <algorithm>
 #include <queue>
@@ -690,6 +691,11 @@ struct RecoverNamesWorker {
 
 struct RecoverNamesPass : public Pass {
     RecoverNamesPass() : Pass("recover_names", "Execute a lossy mapping command and recover original netnames") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("passes/opt");
+		return false;
+	}
     void help() override
     {
         //   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc
index 0c2143fc9..2f20880cb 100644
--- a/passes/sat/sat.cc
+++ b/passes/sat/sat.cc
@@ -21,17 +21,12 @@
 // Niklas Een and Niklas Sörensson (2003)
 // http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.8161
 
-#include "kernel/register.h"
 #include "kernel/celltypes.h"
 #include "kernel/consteval.h"
 #include "kernel/sigtools.h"
-#include "kernel/log.h"
 #include "kernel/satgen.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <algorithm>
-#include <errno.h>
-#include <string.h>
+#include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -902,6 +897,11 @@ void print_qed()
 
 struct SatPass : public Pass {
 	SatPass() : Pass("sat", "solve a SAT problem in the circuit") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/supercover.cc b/passes/sat/supercover.cc
index 38dbd3cf9..f1b3ad09c 100644
--- a/passes/sat/supercover.cc
+++ b/passes/sat/supercover.cc
@@ -18,6 +18,7 @@
  */
 
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 #include "kernel/sigtools.h"
 
 USING_YOSYS_NAMESPACE
@@ -25,6 +26,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct SupercoverPass : public Pass {
 	SupercoverPass() : Pass("supercover", "add hi/lo cover cells for each wire bit") { }
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/sat/synthprop.cc b/passes/sat/synthprop.cc
index 5553abec2..4703e4ad7 100644
--- a/passes/sat/synthprop.cc
+++ b/passes/sat/synthprop.cc
@@ -18,7 +18,9 @@
  *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+
 #include "kernel/yosys.h"
+#include "kernel/log_help.h"
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -179,7 +181,13 @@ void SynthPropWorker::run()
 struct SyntProperties : public Pass {
 	SyntProperties() : Pass("synthprop", "synthesize SVA properties") { }
 
-	virtual void help()
+	bool formatted_help() override {
+		auto *help = PrettyHelp::get_current();
+		help->set_group("formal");
+		return false;
+	}
+
+	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
@@ -208,7 +216,7 @@ struct SyntProperties : public Pass {
 		log("\n");
 	}
 
-	virtual void execute(std::vector<std::string> args, RTLIL::Design* design)
+	void execute(std::vector<std::string> args, RTLIL::Design* design) override
 	{
 		log_header(design, "Executing SYNTHPROP pass.\n");
 		SynthPropWorker worker(design);
diff --git a/passes/techmap/Makefile.inc b/passes/techmap/Makefile.inc
index c9fe98a74..91b3b563a 100644
--- a/passes/techmap/Makefile.inc
+++ b/passes/techmap/Makefile.inc
@@ -1,5 +1,4 @@
 
-OBJS += passes/techmap/flatten.o
 OBJS += passes/techmap/techmap.o
 OBJS += passes/techmap/simplemap.o
 OBJS += passes/techmap/dfflibmap.o
diff --git a/passes/tests/test_abcloop.cc b/passes/tests/test_abcloop.cc
index 9e7adaab1..ed54ce164 100644
--- a/passes/tests/test_abcloop.cc
+++ b/passes/tests/test_abcloop.cc
@@ -243,7 +243,9 @@ static void test_abcloop()
 }
 
 struct TestAbcloopPass : public Pass {
-	TestAbcloopPass() : Pass("test_abcloop", "automatically test handling of loops in abc command") { }
+	TestAbcloopPass() : Pass("test_abcloop", "automatically test handling of loops in abc command") {
+		internal();
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/tests/test_autotb.cc b/passes/tests/test_autotb.cc
index 404d1e48d..306e760ee 100644
--- a/passes/tests/test_autotb.cc
+++ b/passes/tests/test_autotb.cc
@@ -326,7 +326,9 @@ static void autotest(std::ostream &f, RTLIL::Design *design, int num_iter, int s
 }
 
 struct TestAutotbBackend : public Backend {
-	TestAutotbBackend() : Backend("=test_autotb", "generate simple test benches") { }
+	TestAutotbBackend() : Backend("=test_autotb", "generate simple test benches") {
+		internal();
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index a34eafc2f..b6385766c 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -705,7 +705,9 @@ static void run_eval_test(RTLIL::Design *design, bool verbose, bool nosat, std::
 }
 
 struct TestCellPass : public Pass {
-	TestCellPass() : Pass("test_cell", "automatically test the implementation of a cell type") { }
+	TestCellPass() : Pass("test_cell", "automatically test the implementation of a cell type") {
+		internal();
+	}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|

From 7fe4ae45fd8f60dddb6c4a48eb8844c44ced9351 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 13:52:12 +1200
Subject: [PATCH 272/931] log_help: Fix mem leaks

`_content` vector owns elements so that when the `ContentListing` is deleted so is the content.
Remove `get_content()` method in favour of `begin()` and `end()` const iterators.
More `const` in general, and iterations over `ContentListing` use `&content` to avoid copying data.
---
 kernel/log_help.cc | 27 +++++++++++++--------------
 kernel/log_help.h  | 36 ++++++++++++++++--------------------
 kernel/register.cc |  4 ++--
 3 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/kernel/log_help.cc b/kernel/log_help.cc
index 45228b024..30c06a7c3 100644
--- a/kernel/log_help.cc
+++ b/kernel/log_help.cc
@@ -21,7 +21,7 @@
 
 USING_YOSYS_NAMESPACE
 
-Json ContentListing::to_json() {
+Json ContentListing::to_json() const {
 	Json::object object;
 	object["type"] = type;
 	if (body.length()) object["body"] = body;
@@ -29,7 +29,7 @@ Json ContentListing::to_json() {
 	if (source_line != 0) object["source_line"] = source_line;
 	object["options"] = Json(options);
 	Json::array content_array;
-	for (auto child : _content) content_array.push_back(child->to_json());
+	for (auto child : _content) content_array.push_back(child.to_json());
 	object["content"] = content_array;
 	return object;
 }
@@ -73,9 +73,8 @@ ContentListing* ContentListing::open_option(const string &text,
 	const source_location location)
 {
 	log_assert(type.compare("root") == 0 || type.compare("usage") == 0);
-	auto option = new ContentListing("option", text, location);
-	add_content(option);
-	return option;
+	add_content("option", text, location);
+	return back();
 }
 
 #define MAX_LINE_LEN 80
@@ -131,20 +130,20 @@ PrettyHelp *PrettyHelp::get_current()
 	return current_help;
 }
 
-void PrettyHelp::log_help()
+void PrettyHelp::log_help() const
 {
-	for (auto content : _root_listing.get_content()) {
-		if (content->type.compare("usage") == 0) {
-			log_pass_str(content->body, 1, true);
+	for (auto &content : _root_listing) {
+		if (content.type.compare("usage") == 0) {
+			log_pass_str(content.body, 1, true);
 			log("\n");
-		} else if (content->type.compare("option") == 0) {
-			log_pass_str(content->body, 1);
-			for (auto text : content->get_content()) {
-				log_pass_str(text->body, 2);
+		} else if (content.type.compare("option") == 0) {
+			log_pass_str(content.body, 1);
+			for (auto text : content) {
+				log_pass_str(text.body, 2);
 				log("\n");
 			}
 		} else {
-			log_pass_str(content->body, 0);
+			log_pass_str(content.body, 0);
 			log("\n");
 		}
 	}
diff --git a/kernel/log_help.h b/kernel/log_help.h
index 0a40fc531..3ce0ac7aa 100644
--- a/kernel/log_help.h
+++ b/kernel/log_help.h
@@ -26,7 +26,7 @@
 YOSYS_NAMESPACE_BEGIN
 
 class ContentListing {
-	vector<ContentListing *> _content;
+	vector<ContentListing> _content;
 public:
 	string type;
 	string body;
@@ -45,22 +45,17 @@ public:
 	ContentListing(string type, string body, source_location location) :
 		ContentListing(type, body, location.file_name(), location.line()) { }
 
-	void add_content(ContentListing *new_content) {
-		_content.push_back(new_content);
-	}
-
 	void add_content(string type, string body, source_location location) {
-		auto new_content = new ContentListing(type, body, location);
-		add_content(new_content);
+		_content.push_back({type, body, location});
 	}
 
-	bool has_content() { return _content.size() != 0; }
-	const vector<ContentListing *> get_content() {
-		const vector<ContentListing *> content = _content;
-		return content;
-	}
+	bool has_content() const { return _content.size() != 0; }
+
+	vector<ContentListing>::const_iterator begin() const { return _content.cbegin(); }
+	vector<ContentListing>::const_iterator end() const { return _content.cend(); }
+
 	ContentListing* back() {
-		return _content.back();
+		return &_content.back();
 	}
 
 	void set_option(string key, string val = "") {
@@ -95,7 +90,7 @@ public:
 		const source_location location = source_location::current()
 	);
 
-	Json to_json();
+	Json to_json() const;
 };
 
 class PrettyHelp
@@ -113,18 +108,19 @@ public:
 
 	static PrettyHelp *get_current();
 
-	bool has_content() { return _root_listing.has_content(); }
-	const vector<ContentListing *> get_content() {
-		return _root_listing.get_content();
-	}
+	bool has_content() const { return _root_listing.has_content(); }
+
+	vector<ContentListing>::const_iterator begin() const { return _root_listing.begin(); }
+	vector<ContentListing>::const_iterator end() const { return _root_listing.end(); }
+
 	ContentListing* get_root() {
 		return &_root_listing;
 	}
 
 	void set_group(const string g) { group = g; }
-	bool has_group() { return group.compare("unknown") != 0; }
+	bool has_group() const { return group.compare("unknown") != 0; }
 
-	void log_help();
+	void log_help() const;
 };
 
 YOSYS_NAMESPACE_END
diff --git a/kernel/register.cc b/kernel/register.cc
index ea2a2624f..0b02a6aa5 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -923,8 +923,8 @@ struct HelpPass : public Pass {
 			json.name(name.c_str()); json.begin_object();
 			json.entry("title", title);
 			json.name("content"); json.begin_array();
-			for (auto content : cmd_help.get_content())
-				json.value(content->to_json());
+			for (auto &content : cmd_help)
+				json.value(content.to_json());
 			json.end_array();
 			json.entry("group", cmd_help.group);
 			json.entry("source_file", pass->location.file_name());

From 891a907a3005fdb0f154f93d79943e563d8454c6 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 13:52:13 +1200
Subject: [PATCH 273/931] Add and use ENABLE_HELP_SOURCE

Conditionally include help source tracking to preserve ABI.
Docs builds can (and should) use `ENABLE_HELP_SOURCE` so that the generated sphinx docs can perform default grouping and link to source files.
Regular user-builds don't need the source tracking.
---
 .github/workflows/prepare-docs.yml |  1 +
 Makefile                           |  5 +++++
 README.md                          |  6 ++++++
 kernel/register.h                  | 28 ++++++++++++++--------------
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/prepare-docs.yml b/.github/workflows/prepare-docs.yml
index b47f5f3dd..a02febb3b 100644
--- a/.github/workflows/prepare-docs.yml
+++ b/.github/workflows/prepare-docs.yml
@@ -47,6 +47,7 @@ jobs:
           echo "ENABLE_VERIFIC_LIBERTY := 1" >> Makefile.conf
           echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 1" >> Makefile.conf
           echo "ENABLE_CCACHE := 1" >> Makefile.conf
+          echo "ENABLE_HELP_SOURCE := 1" >> Makefile.conf
           make -j$procs ENABLE_LTO=1
 
       - name: Prepare docs
diff --git a/Makefile b/Makefile
index ce438f5db..1463055bd 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ ENABLE_VERIFIC_LIBERTY := 0
 ENABLE_COVER := 1
 ENABLE_LIBYOSYS := 0
 ENABLE_ZLIB := 1
+ENABLE_HELP_SOURCE := 0
 
 # python wrappers
 ENABLE_PYOSYS := 0
@@ -109,6 +110,10 @@ PLUGIN_LINKFLAGS += -L"$(LIBDIR)"
 PLUGIN_LIBS := -lyosys_exe
 endif
 
+ifeq ($(ENABLE_HELP_SOURCE),1)
+CXXFLAGS += -DYOSYS_ENABLE_HELP_SOURCE
+endif
+
 PKG_CONFIG ?= pkg-config
 SED ?= sed
 BISON ?= bison
diff --git a/README.md b/README.md
index 6c576f682..78b8bfc51 100644
--- a/README.md
+++ b/README.md
@@ -276,3 +276,9 @@ From the root of the repository, run `make docs`.  This will build/rebuild yosys
 as necessary before generating the website documentation from the yosys help
 commands.  To build for pdf instead of html, call
 `make docs DOC_TARGET=latexpdf`.
+
+It is recommended to use the `ENABLE_HELP_SOURCE` make option for Yosys builds
+that will be used to build the documentation.  This option enables source
+location tracking for passes and improves the command reference through grouping
+related commands and allowing for the documentation to link to the corresponding
+source files.
diff --git a/kernel/register.h b/kernel/register.h
index e8c017c1d..fba72538f 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -23,22 +23,22 @@
 #include "kernel/yosys_common.h"
 #include "kernel/yosys.h"
 
-#include <version>
-#if __cpp_lib_source_location == 201907L
-  #include <source_location>
-  using std::source_location;
-#elif defined(__has_include)
-#  if __has_include(<experimental/source_location>)
-    #include <experimental/source_location>
-    using std::experimental::source_location;
-#  else
-    #define SOURCE_FALLBACK
-#  endif
-#else
-  #define SOURCE_FALLBACK
+#ifdef YOSYS_ENABLE_HELP_SOURCE
+	#include <version>
+#	if __cpp_lib_source_location == 201907L
+		#include <source_location>
+		using std::source_location;
+		#define HAS_SOURCE_LOCATION
+#	elif defined(__has_include)
+#		if __has_include(<experimental/source_location>)
+			#include <experimental/source_location>
+			using std::experimental::source_location;
+			#define HAS_SOURCE_LOCATION
+#		endif
+#	endif
 #endif
 
-#ifdef SOURCE_FALLBACK
+#ifndef HAS_SOURCE_LOCATION
 struct source_location { // dummy placeholder
 	int line() const { return 0; }
 	int column() const { return 0; }

From ab403635e317619c23606b0aa31befe819c19fdb Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 13:52:13 +1200
Subject: [PATCH 274/931] CI: Enable source tracking for reusable build

The `test-docs-build` jobs require source tracking enabled to prevent warnings-as-errors.
Also add an extra note to the readme in case users run into the same.
---
 .github/workflows/test-build.yml | 1 +
 README.md                        | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 22d3a94f8..bdd290189 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -225,6 +225,7 @@ jobs:
         run: |
           make config-clang
           echo "ENABLE_CCACHE := 1" >> Makefile.conf
+          echo "ENABLE_HELP_SOURCE := 1" >> Makefile.conf
           make -j$procs
 
       - name: Install doc prereqs
diff --git a/README.md b/README.md
index 78b8bfc51..e5b8d1072 100644
--- a/README.md
+++ b/README.md
@@ -281,4 +281,6 @@ It is recommended to use the `ENABLE_HELP_SOURCE` make option for Yosys builds
 that will be used to build the documentation.  This option enables source
 location tracking for passes and improves the command reference through grouping
 related commands and allowing for the documentation to link to the corresponding
-source files.
+source files.  Without this, a warning will be raised during the Sphinx build
+about `Found commands assigned to group unknown` and `make docs` is configured
+to fail on warnings by default.

From 20a51742f4bdbf4f6c70950f41e91b2e1fd95710 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 13:52:13 +1200
Subject: [PATCH 275/931] Docs: Fix cmd links from bugpoint docs

---
 docs/source/using_yosys/bugpoint.rst          |  2 +-
 .../more_scripting/load_design.rst            | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docs/source/using_yosys/bugpoint.rst b/docs/source/using_yosys/bugpoint.rst
index 60cabd879..c524470af 100644
--- a/docs/source/using_yosys/bugpoint.rst
+++ b/docs/source/using_yosys/bugpoint.rst
@@ -185,7 +185,7 @@ the failure, you can use the ``bugpoint_keep`` attribute.  This can be done with
 ``setattr -set bugpoint_keep 1 [selection]`` from a Yosys script.  It is also
 possible to limit `bugpoint` to only removing certain *kinds* of objects, such
 as only removing entire modules or cells (instances of modules).  For more about
-the options available, check ``help bugpoint`` or :doc:`/cmd/bugpoint`.
+the options available, check ``help bugpoint`` or :cmd:title:`bugpoint`.
 
 In some situations, it may also be helpful to use `setenv` before `bugpoint` to
 set environment variables for the spawned processes.  An example of this is
diff --git a/docs/source/using_yosys/more_scripting/load_design.rst b/docs/source/using_yosys/more_scripting/load_design.rst
index e5006c16e..9aa028418 100644
--- a/docs/source/using_yosys/more_scripting/load_design.rst
+++ b/docs/source/using_yosys/more_scripting/load_design.rst
@@ -57,6 +57,7 @@ The `read` command
 Yosys frontends
 ~~~~~~~~~~~~~~~
 
+- :doc:`/cmd/index_frontends`
 - typically start with ``read_``
 - built-in support for heredocs
 
@@ -86,7 +87,12 @@ Yosys frontends
 The `read_verilog` command
 """"""""""""""""""""""""""
 
-- :doc:`/cmd/index_frontends`
+- :cmd:title:`read_verilog`; also
+
+  + :cmd:title:`verilog_defaults`,
+  + :cmd:title:`verilog_defines`, and
+  + :cmd:title:`read_verilog_file_list`
+
 - supports most of Verilog-2005
 - limited support for SystemVerilog
 - some non-standard features/extensions for enabling formal verification
@@ -117,12 +123,12 @@ The `read_verilog` command
 Other built-in ``read_*`` commands
 """"""""""""""""""""""""""""""""""
 
-- :doc:`/cmd/read_rtlil`
-- :doc:`/cmd/read_aiger`
-- :doc:`/cmd/read_blif`
-- :doc:`/cmd/read_json`
-- :doc:`/cmd/read_liberty`
-- :doc:`/cmd/read_xaiger2`
+- :cmd:title:`read_rtlil`
+- :cmd:title:`read_aiger`
+- :cmd:title:`read_blif`
+- :cmd:title:`read_json`
+- :cmd:title:`read_liberty`
+- :cmd:title:`read_xaiger2`
 
 .. TODO:: does `write_file` count?
 

From 93b39ad9b3bf16d96268a7fb6cc9e9765f0a2d0e Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 15:12:48 +1200
Subject: [PATCH 276/931] equiv_induct: Add -set-assumes option

Uses mostly the same code as equiv_simple, but the assumes are already being imported so long as they're in the selection, so it's even easier.
---
 passes/equiv/equiv_induct.cc | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/passes/equiv/equiv_induct.cc b/passes/equiv/equiv_induct.cc
index 8d882ae83..b39d7a785 100644
--- a/passes/equiv/equiv_induct.cc
+++ b/passes/equiv/equiv_induct.cc
@@ -37,14 +37,15 @@ struct EquivInductWorker
 
 	int max_seq;
 	int success_counter;
+	bool set_assumes;
 
 	dict<int, int> ez_step_is_consistent;
 	pool<Cell*> cell_warn_cache;
 	SigPool undriven_signals;
 
-	EquivInductWorker(Module *module, const pool<Cell*> &unproven_equiv_cells, bool model_undef, int max_seq) : module(module), sigmap(module),
+	EquivInductWorker(Module *module, const pool<Cell*> &unproven_equiv_cells, bool model_undef, int max_seq, bool set_assumes) : module(module), sigmap(module),
 			cells(module->selected_cells()), workset(unproven_equiv_cells),
-			satgen(ez.get(), &sigmap), max_seq(max_seq), success_counter(0)
+			satgen(ez.get(), &sigmap), max_seq(max_seq), success_counter(0), set_assumes(set_assumes)
 	{
 		satgen.model_undef = model_undef;
 	}
@@ -77,6 +78,14 @@ struct EquivInductWorker
 			}
 		}
 
+		if (set_assumes) {
+			RTLIL::SigSpec assumes_a, assumes_en;
+			satgen.getAssumes(assumes_a, assumes_en, step);
+			for (int i = 0; i < GetSize(assumes_a); i++)
+				log("Import constraint from assume cell: %s when %s.\n", log_signal(assumes_a[i]), log_signal(assumes_en[i]));
+			ez->assume(satgen.importAssumes(step));
+		}
+
 		if (satgen.model_undef) {
 			for (auto bit : undriven_signals.export_all())
 				ez->assume(ez->NOT(satgen.importUndefSigBit(bit, step)));
@@ -184,6 +193,9 @@ struct EquivInductPass : public Pass {
 		log("    -seq <N>\n");
 		log("        the max. number of time steps to be considered (default = 4)\n");
 		log("\n");
+		log("    -set-assumes\n");
+		log("        set all assumptions provided via $assume cells\n");
+		log("\n");
 		log("This command is very effective in proving complex sequential circuits, when\n");
 		log("the internal state of the circuit quickly propagates to $equiv cells.\n");
 		log("\n");
@@ -200,7 +212,7 @@ struct EquivInductPass : public Pass {
 	void execute(std::vector<std::string> args, Design *design) override
 	{
 		int success_counter = 0;
-		bool model_undef = false;
+		bool model_undef = false, set_assumes = false;
 		int max_seq = 4;
 
 		log_header(design, "Executing EQUIV_INDUCT pass.\n");
@@ -215,6 +227,10 @@ struct EquivInductPass : public Pass {
 				max_seq = atoi(args[++argidx].c_str());
 				continue;
 			}
+			if (args[argidx] == "-set-assumes") {
+				set_assumes = true;
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
@@ -222,6 +238,7 @@ struct EquivInductPass : public Pass {
 		for (auto module : design->selected_modules())
 		{
 			pool<Cell*> unproven_equiv_cells;
+			vector<Cell*> assume_cells;
 
 			for (auto cell : module->selected_cells())
 				if (cell->type == ID($equiv)) {
@@ -234,7 +251,7 @@ struct EquivInductPass : public Pass {
 				continue;
 			}
 
-			EquivInductWorker worker(module, unproven_equiv_cells, model_undef, max_seq);
+			EquivInductWorker worker(module, unproven_equiv_cells, model_undef, max_seq, set_assumes);
 			worker.run();
 			success_counter += worker.success_counter;
 		}

From f9e8127e2b90b0607d85e6dd6aea1bffd8dd251a Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 15:13:04 +1200
Subject: [PATCH 277/931] tests: Add equiv_induct to equiv_assume.ys

---
 tests/various/equiv_assume.ys | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/various/equiv_assume.ys b/tests/various/equiv_assume.ys
index 7264e5a29..7ca572c8c 100644
--- a/tests/various/equiv_assume.ys
+++ b/tests/various/equiv_assume.ys
@@ -22,11 +22,18 @@ sat -set-assumes -prove-asserts -verify
 # sat -prove-asserts -verify
 
 # so should $equiv
+## in equiv_simple
 design -load input
 equiv_make gold gate equiv
 equiv_simple -set-assumes equiv
 equiv_status -assert equiv
 
+## and equiv_induct
+delete equiv
+equiv_make gold gate equiv
+equiv_induct -set-assumes equiv
+equiv_status -assert equiv
+
 # and it works through cells
 design -reset
 read_verilog -sv <<EOT
@@ -55,6 +62,11 @@ equiv_make gold gate equiv
 equiv_simple -set-assumes equiv
 equiv_status -assert equiv
 
+delete equiv
+equiv_make gold gate equiv
+equiv_induct -set-assumes equiv
+equiv_status -assert equiv
+
 # and registers
 design -reset
 read_verilog -sv <<EOT
@@ -87,6 +99,11 @@ equiv_make gold gate equiv
 equiv_simple -set-assumes equiv
 equiv_status -assert equiv
 
+delete equiv
+equiv_make gold gate equiv
+equiv_induct -set-assumes equiv
+equiv_status -assert equiv
+
 # so long as the assumption doesn't end up after the equiv
 design -reset
 read_verilog -sv <<EOT
@@ -105,6 +122,9 @@ chformal -lower
 async2sync
 design -stash input4
 
+logger -expect log "model found: FAIL!" 1
+logger -expect log "Found a total of 2 unproven .equiv cells." 2
+
 design -load input4
 equiv_make -make_assert gold gate equiv
 prep -top equiv
@@ -114,3 +134,8 @@ design -load input4
 equiv_make gold gate equiv
 equiv_simple -set-assumes equiv
 equiv_status equiv
+
+delete equiv
+equiv_make gold gate equiv
+equiv_induct -set-assumes equiv
+equiv_status equiv

From b1eeb7de3d1fbe7648ffb9819f16b9b6f552af93 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 15:21:10 +1200
Subject: [PATCH 278/931] Less verbose equiv assumes

both only print on the first step, and equiv_simple only prints if also verbose
---
 passes/equiv/equiv_induct.cc | 10 ++++++----
 passes/equiv/equiv_simple.cc | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/passes/equiv/equiv_induct.cc b/passes/equiv/equiv_induct.cc
index b39d7a785..1995be3cd 100644
--- a/passes/equiv/equiv_induct.cc
+++ b/passes/equiv/equiv_induct.cc
@@ -79,10 +79,12 @@ struct EquivInductWorker
 		}
 
 		if (set_assumes) {
-			RTLIL::SigSpec assumes_a, assumes_en;
-			satgen.getAssumes(assumes_a, assumes_en, step);
-			for (int i = 0; i < GetSize(assumes_a); i++)
-				log("Import constraint from assume cell: %s when %s.\n", log_signal(assumes_a[i]), log_signal(assumes_en[i]));
+			if (step == 1) {
+				RTLIL::SigSpec assumes_a, assumes_en;
+				satgen.getAssumes(assumes_a, assumes_en, step);
+				for (int i = 0; i < GetSize(assumes_a); i++)
+					log("Import constraint from assume cell: %s when %s.\n", log_signal(assumes_a[i]), log_signal(assumes_en[i]));
+			}
 			ez->assume(satgen.importAssumes(step));
 		}
 
diff --git a/passes/equiv/equiv_simple.cc b/passes/equiv/equiv_simple.cc
index bdb39172b..1bebf5454 100644
--- a/passes/equiv/equiv_simple.cc
+++ b/passes/equiv/equiv_simple.cc
@@ -243,10 +243,12 @@ struct EquivSimpleWorker
 			}
 
 			if (set_assumes) {
-				RTLIL::SigSpec assumes_a, assumes_en;
-				satgen.getAssumes(assumes_a, assumes_en, step+1);
-				for (int i = 0; i < GetSize(assumes_a); i++)
-					log("Import constraint from assume cell: %s when %s.\n", log_signal(assumes_a[i]), log_signal(assumes_en[i]));
+				if (verbose && step == max_seq) {
+					RTLIL::SigSpec assumes_a, assumes_en;
+					satgen.getAssumes(assumes_a, assumes_en, step+1);
+					for (int i = 0; i < GetSize(assumes_a); i++)
+						log("    Import constraint from assume cell: %s when %s (%d).\n", log_signal(assumes_a[i]), log_signal(assumes_en[i]), step);
+				}
 				ez->assume(satgen.importAssumes(step+1));
 			}
 

From 1bf9530fcc0a83938c69ef95b8f960c2c930f74c Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 16:51:14 +1200
Subject: [PATCH 279/931] cutpoint_blackbox.ys: Add verific-style unknown
 module

---
 tests/various/cutpoint_blackbox.ys | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/various/cutpoint_blackbox.ys b/tests/various/cutpoint_blackbox.ys
index ee479b968..61001d6b6 100644
--- a/tests/various/cutpoint_blackbox.ys
+++ b/tests/various/cutpoint_blackbox.ys
@@ -70,3 +70,20 @@ design -load gold
 select -read cutpoint.gate.sel
 # nothing in gold but not gate
 select -assert-none % %n
+
+# replacing the blackbox with a verific-style unknown module should work too
+# (note this specific example loses the values of SOME_PARAM which would
+#  normally be retained by verific)
+design -load hier
+delete =bb
+read_rtlil << EOT
+attribute \blackbox 1
+module \bb
+    parameter \SOME_PARAM 0
+    wire inout 3 \o
+    wire inout 2 \b
+    wire inout 1 \a
+end
+EOT
+cutpoint -blackbox
+check -assert

From 4ac100fe137e79baf50363e94aa088854c21838f Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 18:11:05 +1200
Subject: [PATCH 280/931] cutpoint: Track wire drivers

Necessary to avoid multiple drivers being inserted when a blackbox has inout ports (like when importing an unknown module with `verific`).
If any bits of an inout port have a known driver, treat the port as an input.
If there are no bits with a known driver, treat the port as an output, and mark each bit as having a driver.
---
 passes/sat/cutpoint.cc | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/passes/sat/cutpoint.cc b/passes/sat/cutpoint.cc
index 485e44fd6..41fa9fac4 100644
--- a/passes/sat/cutpoint.cc
+++ b/passes/sat/cutpoint.cc
@@ -109,13 +109,43 @@ struct CutpointPass : public Pass {
 			SigMap sigmap(module);
 			pool<SigBit> cutpoint_bits;
 
+			pool<SigBit> wire_drivers;
+			for (auto cell : module->cells())
+				for (auto &conn : cell->connections())
+					if (cell->output(conn.first) && !cell->input(conn.first))
+						for (auto bit : sigmap(conn.second))
+							if (bit.wire)
+								wire_drivers.insert(bit);
+			
+			for (auto wire : module->wires())
+				if (wire->port_input)
+					for (auto bit : sigmap(wire))
+						wire_drivers.insert(bit);
+
 			for (auto cell : module->selected_cells()) {
 				if (cell->type == ID($anyseq))
 					continue;
 				log("Removing cell %s.%s, making all cell outputs cutpoints.\n", log_id(module), log_id(cell));
 				for (auto &conn : cell->connections()) {
-					if (cell->output(conn.first))
-						module->connect(conn.second, flag_undef ? Const(State::Sx, GetSize(conn.second)) : module->Anyseq(NEW_ID, GetSize(conn.second)));
+					if (cell->output(conn.first)) {
+						bool do_cut = true;
+						if (cell->input(conn.first))
+							for (auto bit : sigmap(conn.second))
+								if (wire_drivers.count(bit)) {
+									log_debug("  Treating inout port '%s' as input.\n", id2cstr(conn.first));
+									do_cut = false;
+									break;
+								}
+
+						if (do_cut) {
+							module->connect(conn.second, flag_undef ? Const(State::Sx, GetSize(conn.second)) : module->Anyseq(NEW_ID, GetSize(conn.second)));
+							if (cell->input(conn.first)) {
+								log_debug("  Treating inout port '%s' as output.\n", id2cstr(conn.first));
+								for (auto bit : sigmap(conn.second))
+									wire_drivers.insert(bit);
+							}
+						}
+					}
 				}
 
 				RTLIL::Cell *scopeinfo = nullptr;

From af7d1d3f4f44c82986e70d7188f7fe24e85b5154 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 6 Aug 2025 18:11:35 +1200
Subject: [PATCH 281/931] cutpoint_blackbox.ys: Extra edge case

---
 tests/various/cutpoint_blackbox.ys | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/various/cutpoint_blackbox.ys b/tests/various/cutpoint_blackbox.ys
index 61001d6b6..1ba9a95df 100644
--- a/tests/various/cutpoint_blackbox.ys
+++ b/tests/various/cutpoint_blackbox.ys
@@ -87,3 +87,27 @@ end
 EOT
 cutpoint -blackbox
 check -assert
+
+# also concatenated signals, and signals between two inout ports
+design -load hier
+delete top =bb
+read_verilog << EOT
+module top(input [1:0] a, b, output [1:0] o);
+    wire [1:0] c, d, e;
+    bb #(.SOME_PARAM(1)) bb1 (.a ({a[0], e[1]}), .b (b), .o (c));
+    bb #(.SOME_PARAM(2)) bb2 (.a ({c[1], a[0]}), .b (c), .o (d));
+    wb wb1 (.a (a), .b (b), .o (e));
+    some_mod some_inst (.a (c), .b (d), .c (e), .o (o));
+endmodule
+EOT
+read_rtlil << EOT
+attribute \blackbox 1
+module \bb
+    parameter \SOME_PARAM 0
+    wire inout 3 width 2 \o
+    wire inout 2 width 2 \b
+    wire inout 1 width 2 \a
+end
+EOT
+cutpoint -blackbox
+check -assert

From 7e0157ba2bee52f194af93f669aadff5fb67b59b Mon Sep 17 00:00:00 2001
From: Rahul Bhagwat <rahulmbme@gmail.com>
Date: Wed, 6 Aug 2025 15:32:36 -0400
Subject: [PATCH 282/931] fix whitespace issues

---
 frontends/ast/simplify.cc                | 12 ++++++------
 tests/verilog/package_import_separate.sv |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 693e8098a..9c0abc327 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1103,7 +1103,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		int counter = 0;
 		label_genblks(existing, counter);
 		std::map<std::string, AstNode*> this_wire_scope;
-		
+
 		// Process package imports after clearing the scope but before processing module declarations
 		for (size_t i = 0; i < children.size(); i++) {
 			AstNode *child = children[i];
@@ -1111,7 +1111,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				log_debug("Processing import for package: %s\n", child->str.c_str());
 				// Find the package in the design
 				AstNode *package_node = nullptr;
-				
+
 				// First look in current_ast->children (for packages in same file)
 				if (current_ast != nullptr) {
 					for (auto &design_child : current_ast->children) {
@@ -1123,7 +1123,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 						}
 					}
 				}
-				
+
 				// If not found, look in design->verilog_packages (for packages from other files)
 				if (!package_node && simplify_design_context != nullptr) {
 					log_debug("Looking for package in design context, found %zu packages\n", simplify_design_context->verilog_packages.size());
@@ -1139,12 +1139,12 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 						}
 					}
 				}
-				
+
 				if (package_node) {
 					// Import all names from the package into current scope
 					for (auto &pkg_child : package_node->children) {
-						if (pkg_child->type == AST_PARAMETER || pkg_child->type == AST_LOCALPARAM || 
-							pkg_child->type == AST_TYPEDEF || pkg_child->type == AST_FUNCTION || 
+						if (pkg_child->type == AST_PARAMETER || pkg_child->type == AST_LOCALPARAM ||
+							pkg_child->type == AST_TYPEDEF || pkg_child->type == AST_FUNCTION ||
 							pkg_child->type == AST_TASK || pkg_child->type == AST_ENUM) {
 							current_scope[pkg_child->str] = pkg_child;
 						}
diff --git a/tests/verilog/package_import_separate.sv b/tests/verilog/package_import_separate.sv
index b2e5bb803..eddde709b 100644
--- a/tests/verilog/package_import_separate.sv
+++ b/tests/verilog/package_import_separate.sv
@@ -2,7 +2,7 @@ package config_pkg;
   localparam integer
     DATA_WIDTH = 8,
     ADDR_WIDTH = 4;
-    
+
   localparam logic [2:0]
     IDLE = 3'b000,
     START = 3'b001,
@@ -10,4 +10,4 @@ package config_pkg;
     ODD_PARITY = 3'b011,
     STOP = 3'b100,
     DONE = 3'b101;
-endpackage 
\ No newline at end of file
+endpackage

From d3c8e6c14c5249fe0de59be176a7bc8b76caaf7f Mon Sep 17 00:00:00 2001
From: Rahul Bhagwat <rahulmbme@gmail.com>
Date: Wed, 6 Aug 2025 15:39:30 -0400
Subject: [PATCH 283/931] use more standard naming conventions

---
 tests/verilog/package_import_separate.sv        | 17 +++++++++--------
 tests/verilog/package_import_separate_module.sv | 14 +++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/tests/verilog/package_import_separate.sv b/tests/verilog/package_import_separate.sv
index eddde709b..2337e4bce 100644
--- a/tests/verilog/package_import_separate.sv
+++ b/tests/verilog/package_import_separate.sv
@@ -1,13 +1,14 @@
-package config_pkg;
+package package_import_separate;
+
   localparam integer
-    DATA_WIDTH = 8,
-    ADDR_WIDTH = 4;
+    DATAWIDTH = 8,
+    ADDRWIDTH = 4;
 
   localparam logic [2:0]
-    IDLE = 3'b000,
+    IDLE  = 3'b000,
     START = 3'b001,
-    DATA = 3'b010,
-    ODD_PARITY = 3'b011,
-    STOP = 3'b100,
-    DONE = 3'b101;
+    DATA  = 3'b010,
+    STOP  = 3'b100,
+    DONE  = 3'b101;
+
 endpackage
diff --git a/tests/verilog/package_import_separate_module.sv b/tests/verilog/package_import_separate_module.sv
index f940553b3..b58d3b814 100644
--- a/tests/verilog/package_import_separate_module.sv
+++ b/tests/verilog/package_import_separate_module.sv
@@ -1,19 +1,19 @@
-import config_pkg::*;
+import package_import_separate::*;
 
-module top;
-  logic [DATA_WIDTH-1:0] data;
-  logic [ADDR_WIDTH-1:0] addr;
+module package_import_separate_module;
+  logic [DATAWIDTH-1:0] data;
+  logic [ADDRWIDTH-1:0] addr;
   logic [2:0] state;
-  
+
   always_comb begin
     case (state)
       IDLE: data = 8'h00;
       START: data = 8'h01;
       DATA: data = 8'h02;
-      ODD_PARITY: data = 8'h03;
       STOP: data = 8'h04;
       DONE: data = 8'h05;
       default: data = 8'hFF;
     endcase
   end
-endmodule 
\ No newline at end of file
+
+endmodule

From f12055d3e0bdac503ce01db8a35ea07d2c52ace9 Mon Sep 17 00:00:00 2001
From: Rahul Bhagwat <rahulmbme@gmail.com>
Date: Wed, 6 Aug 2025 15:39:36 -0400
Subject: [PATCH 284/931] rm debug logs

---
 frontends/ast/simplify.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 9c0abc327..05cc57ba1 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1108,7 +1108,6 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		for (size_t i = 0; i < children.size(); i++) {
 			AstNode *child = children[i];
 			if (child->type == AST_IMPORT) {
-				log_debug("Processing import for package: %s\n", child->str.c_str());
 				// Find the package in the design
 				AstNode *package_node = nullptr;
 
@@ -1126,7 +1125,6 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 				// If not found, look in design->verilog_packages (for packages from other files)
 				if (!package_node && simplify_design_context != nullptr) {
-					log_debug("Looking for package in design context, found %zu packages\n", simplify_design_context->verilog_packages.size());
 					for (auto &design_package : simplify_design_context->verilog_packages) {
 						// Handle both with and without leading backslash
 						std::string package_name = design_package->str;

From 96108ad8b42ddd002fa43ecf25673998fc95eaf9 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Wed, 6 Aug 2025 21:34:37 +0100
Subject: [PATCH 285/931] kernel/register.h: whitespace

---
 kernel/register.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/register.h b/kernel/register.h
index fba72538f..534cfbc28 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -116,7 +116,7 @@ struct ScriptPass : Pass
 	RTLIL::Design *active_design;
 	std::string active_run_from, active_run_to;
 
-	ScriptPass(std::string name, std::string short_help = "** document me **", source_location location = source_location::current()) : 
+	ScriptPass(std::string name, std::string short_help = "** document me **", source_location location = source_location::current()) :
 		Pass(name, short_help, location) { }
 
 	virtual void script() = 0;

From b610afbc1bbbd73d4d4cdd7eb2d873c58b97445f Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Wed, 6 Aug 2025 21:37:28 +0100
Subject: [PATCH 286/931] py_wrap_generator.py: whitespace

---
 misc/py_wrap_generator.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/misc/py_wrap_generator.py b/misc/py_wrap_generator.py
index 4857a9dc3..b9af5fe70 100644
--- a/misc/py_wrap_generator.py
+++ b/misc/py_wrap_generator.py
@@ -200,7 +200,7 @@ class WType:
 
 			t.cont = candidate
 			if(t.name not in known_containers):
-				return None	
+				return None
 			return t
 
 		prefix = ""
@@ -447,7 +447,7 @@ class PythonDictTranslator(Translator):
 			if types[0].attr_type != attr_types.star:
 				text += "*"
 			text += key_tmp_name + "->get_cpp_obj()"
-		
+
 		text += ", "
 		if types[1].name not in classnames:
 			text += val_tmp_name
@@ -457,7 +457,7 @@ class PythonDictTranslator(Translator):
 			text += val_tmp_name + "->get_cpp_obj()"
 		text += "));\n" + prefix + "}"
 		return text
-	
+
 	#Generate c++ code to translate to a boost::python::dict
 	@classmethod
 	def translate_cpp(c, varname, types, prefix, ref):
@@ -498,7 +498,7 @@ class DictTranslator(PythonDictTranslator):
 #Sub_type for std::map
 class MapTranslator(PythonDictTranslator):
 	insert_name = "insert"
-	orig_name = "std::map"	
+	orig_name = "std::map"
 
 #Translator for std::pair. Derived from PythonDictTranslator because the
 #gen_type function is the same (because both have two template parameters)
@@ -684,7 +684,7 @@ class Attribute:
 		if self.wtype.name in known_containers:
 			return known_containers[self.wtype.name].typename
 		return prefix + self.wtype.name
-		
+
 	#Generate Translation code for the attribute
 	def gen_translation(self):
 		if self.wtype.name in known_containers:
@@ -948,7 +948,7 @@ class WClass:
 			text = "\n\t\tclass_<" + self.name + base_info + ">(\"" + self.name + "\""
 			text += body
 		return text
-	
+
 
 	def contains_default_constr(self):
 		for c in self.found_constrs:
@@ -1773,7 +1773,7 @@ class WMember:
 		if self.wtype.name in classnames:
 			text += ")"
 		text += ";"
-		
+
 		if self.wtype.name in classnames:
 			text += "\n\t\treturn *ret_;"
 		elif self.wtype.name in known_containers:
@@ -1795,12 +1795,12 @@ class WMember:
 		text += "\n\t{"
 		text += ret.gen_translation()
 		text += "\n\t\tthis->get_cpp_obj()->" + self.name + " = " + ret.gen_call() + ";"
-		text += "\n\t}\n"		
+		text += "\n\t}\n"
 
 		return text;
 
 	def gen_boost_py(self):
-		text = "\n\t\t\t.add_property(\"" + self.name + "\", &" + self.member_of.name + "::get_var_py_" + self.name 
+		text = "\n\t\t\t.add_property(\"" + self.name + "\", &" + self.member_of.name + "::get_var_py_" + self.name
 		if not self.is_const:
 			text += ", &" + self.member_of.name + "::set_var_py_" + self.name
 		text += ")"
@@ -1926,7 +1926,7 @@ class WGlobal:
 		if self.wtype.name in classnames:
 			text += ")"
 		text += ";"
-		
+
 		if self.wtype.name in classnames:
 			text += "\n\t\treturn *ret_;"
 		elif self.wtype.name in known_containers:
@@ -1948,12 +1948,12 @@ class WGlobal:
 		text += "\n\t{"
 		text += ret.gen_translation()
 		text += "\n\t\t" + self.namespace + "::" + self.name + " = " + ret.gen_call() + ";"
-		text += "\n\t}\n"		
+		text += "\n\t}\n"
 
 		return text;
 
 	def gen_boost_py(self):
-		text = "\n\t\t\t.add_static_property(\"" + self.name + "\", &" + "YOSYS_PYTHON::get_var_py_" + self.name 
+		text = "\n\t\t\t.add_static_property(\"" + self.name + "\", &" + "YOSYS_PYTHON::get_var_py_" + self.name
 		if not self.is_const:
 			text += ", &YOSYS_PYTHON::set_var_py_" + self.name
 		text += ")"

From 46a711d56695d7468e209f4bd104d0c1c271312a Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Wed, 6 Aug 2025 21:38:03 +0100
Subject: [PATCH 287/931] py_wrap_generator.py: support srd::source_location as
 trailing default argument

---
 misc/py_wrap_generator.py | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/misc/py_wrap_generator.py b/misc/py_wrap_generator.py
index b9af5fe70..9de34e74e 100644
--- a/misc/py_wrap_generator.py
+++ b/misc/py_wrap_generator.py
@@ -71,7 +71,7 @@ keyword_aliases = {
 
 #These can be used without any explicit conversion
 primitive_types = ["void", "bool", "int", "double", "size_t", "std::string",
-		"string", "State", "char_p"]
+		"string", "State", "char_p", "std::source_location", "source_location"]
 
 from enum import Enum
 
@@ -1137,10 +1137,18 @@ class WConstructor:
 		str_def = str_def[0:found].strip()
 		if len(str_def) == 0:
 			return con
-		for arg in split_list(str_def, ","):
+		args = split_list(str_def, ",")
+		for i, arg in enumerate(args):
 			parsed = Attribute.from_string(arg.strip(), containing_file, line_number)
 			if parsed == None:
 				return None
+			# Only allow std::source_location as defaulted last argument, and
+			# don't append so it takes default value
+			if parsed.wtype.name in ["std::source_location", "source_location"]:
+				if parsed.default_value is None or i != len(args) - 1:
+					debug("std::source_location not defaulted last arg of " + class_.name + " is unsupported", 2)
+					return None
+				continue
 			con.args.append(parsed)
 		return con
 
@@ -1379,12 +1387,20 @@ class WFunction:
 		str_def = str_def[:found].strip()
 		if(len(str_def) == 0):
 			return func
-		for arg in split_list(str_def, ","):
+		args = split_list(str_def, ",")
+		for i, arg in enumerate(args):
 			if arg.strip() == "...":
 				continue
 			parsed = Attribute.from_string(arg.strip(), containing_file, line_number)
 			if parsed == None:
 				return None
+			# Only allow std::source_location as defaulted last argument, and
+			# don't append so it takes default value
+			if parsed.wtype.name in ["std::source_location", "source_location"]:
+				if parsed.default_value is None or i != len(args) - 1:
+					debug("std::source_location not defaulted last arg of " + func.name + " is unsupported", 2)
+					return None
+				continue
 			func.args.append(parsed)
 		return func
 

From 5cc1365b32df363c410ecd3890cd4d9445620d75 Mon Sep 17 00:00:00 2001
From: Rahul Bhagwat <rahulmbme@gmail.com>
Date: Wed, 6 Aug 2025 19:00:11 -0400
Subject: [PATCH 288/931] add newline - whitespace

---
 tests/verilog/package_import_separate.ys | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/verilog/package_import_separate.ys b/tests/verilog/package_import_separate.ys
index 0dff75897..cbfcaa898 100644
--- a/tests/verilog/package_import_separate.ys
+++ b/tests/verilog/package_import_separate.ys
@@ -2,4 +2,4 @@ read_verilog -sv package_import_separate.sv
 read_verilog -sv package_import_separate_module.sv
 hierarchy -check
 proc
-opt -full 
\ No newline at end of file
+opt -full

From ab66d8b814edd60dc3f4fa51819889d84023411d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 7 Aug 2025 00:27:08 +0000
Subject: [PATCH 289/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1463055bd..506f6a99c 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+194
+YOSYS_VER := 0.55+209
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 3cbbb9456d57943495a67bcb79a3ab1b8c9e18ea Mon Sep 17 00:00:00 2001
From: Hongce Zhang <zhanghongce@126.com>
Date: Thu, 7 Aug 2025 11:37:23 +0800
Subject: [PATCH 290/931] reorder verilog backend port wires

---
 backends/verilog/verilog_backend.cc | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index 070df1543..b49927513 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -2358,12 +2358,16 @@ void dump_module(std::ostream &f, std::string indent, RTLIL::Module *module)
 	dump_attributes(f, indent, module->attributes, "\n", /*modattr=*/true);
 	f << stringf("%s" "module %s(", indent.c_str(), id(module->name, false).c_str());
 	int cnt = 0;
+	
+	std::vector<Wire *> port_ordered;
+
 	for (auto port : module->ports) {
 		Wire *wire = module->wire(port);
 		if (wire) {
 			if (port != module->ports[0])
 				f << stringf(", ");
 			f << stringf("%s", id(wire->name).c_str());
+			port_ordered.push_back(wire);
 			if (cnt==20) { f << stringf("\n"); cnt = 0; } else cnt++;
 			continue;
 		}
@@ -2374,8 +2378,16 @@ void dump_module(std::ostream &f, std::string indent, RTLIL::Module *module)
 		f << indent + "  " << "reg " << id(initial_id) << " = 0;\n";
 	}
 
-	for (auto w : module->wires())
+	// first dump input / output according to port_ordered;
+	for (auto w : port_ordered)
 		dump_wire(f, indent + "  ", w);
+	
+	for (auto w : module->wires()) {
+		// avoid duplication
+		if (std::find(port_ordered.begin(), port_ordered.end(), w) != port_ordered.end())
+			continue;
+		dump_wire(f, indent + "  ", w);
+	}
 
 	for (auto &mem : Mem::get_all_memories(module))
 		dump_memory(f, indent + "  ", mem);

From 9c447ad9d4b1ea589369364eea38b4d70da2c599 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 7 Aug 2025 07:59:29 +0200
Subject: [PATCH 291/931] Release version 0.56

---
 CHANGELOG           | 16 +++++++++++++++-
 Makefile            |  4 ++--
 docs/source/conf.py |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d8f2f8804..4678f78e4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,22 @@
 List of major changes and improvements between releases
 =======================================================
 
-Yosys 0.55 .. Yosys 0.56-dev
+Yosys 0.55 .. Yosys 0.56
 --------------------------
+ * New commands and options
+    - Added "-unescape" option to "rename" pass.
+    - Added "-assert2cover" option to "chformal" pass.
+    - Added "linecoverage" pass to generate lcov report from selection.
+    - Added "opt_hier" pass to enable hierarchical optimization.
+    - Added "-hieropt" option to "synth" pass.
+    - Added "-expect-return", "-err-grep" and "-suffix" options
+      to "bugpoint" pass.
+    - Added "raise_error" dev pass.
+
+ * Various
+    - Added groups to command reference documentation.
+    - Added bugpoint guide to documentation.
+    - verific: correctly reset Verific flags after import.
 
 Yosys 0.54 .. Yosys 0.55
 --------------------------
diff --git a/Makefile b/Makefile
index 506f6a99c..8de1e54eb 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.55+209
+YOSYS_VER := 0.56
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -182,7 +182,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 60f126c.. | wc -l`/;" Makefile
+#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 60f126c.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 7cdea5df1..ebec6915e 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -6,7 +6,7 @@ import os
 project = 'YosysHQ Yosys'
 author = 'YosysHQ GmbH'
 copyright ='2025 YosysHQ GmbH'
-yosys_ver = "0.55"
+yosys_ver = "0.56"
 
 # select HTML theme
 html_theme = 'furo-ys'

From e6059d042df45f6eb28b858e9a27d277438b0eae Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 7 Aug 2025 09:20:45 +0200
Subject: [PATCH 292/931] Next dev cycle

---
 CHANGELOG | 3 +++
 Makefile  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4678f78e4..6365a24e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 List of major changes and improvements between releases
 =======================================================
 
+Yosys 0.56 .. Yosys 0.57-dev
+--------------------------
+
 Yosys 0.55 .. Yosys 0.56
 --------------------------
  * New commands and options
diff --git a/Makefile b/Makefile
index 8de1e54eb..b27a45424 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56
+YOSYS_VER := 0.56+0
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -182,7 +182,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 60f126c.. | wc -l`/;" Makefile
+	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 9c447ad.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 

From fcd9f982459f353b8b0b2250111886e32252c664 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 7 Aug 2025 23:18:57 +0200
Subject: [PATCH 293/931] equiv_simple: refactor

---
 kernel/satgen.h              |   6 +-
 passes/equiv/equiv_simple.cc | 469 ++++++++++++++++++++---------------
 2 files changed, 272 insertions(+), 203 deletions(-)

diff --git a/kernel/satgen.h b/kernel/satgen.h
index 2c8cbda13..996eaf9fb 100644
--- a/kernel/satgen.h
+++ b/kernel/satgen.h
@@ -64,7 +64,7 @@ struct ezSatPtr : public std::unique_ptr<ezSAT> {
 struct SatGen
 {
 	ezSAT *ez;
-	SigMap *sigmap;
+	const SigMap *sigmap;
 	std::string prefix;
 	SigPool initial_state;
 	std::map<std::string, RTLIL::SigSpec> asserts_a, asserts_en;
@@ -75,12 +75,12 @@ struct SatGen
 	bool model_undef;
 	bool def_formal = false;
 
-	SatGen(ezSAT *ez, SigMap *sigmap, std::string prefix = std::string()) :
+	SatGen(ezSAT *ez, const SigMap *sigmap, std::string prefix = std::string()) :
 			ez(ez), sigmap(sigmap), prefix(prefix), ignore_div_by_zero(false), model_undef(false)
 	{
 	}
 
-	void setContext(SigMap *sigmap, std::string prefix = std::string())
+	void setContext(const SigMap *sigmap, std::string prefix = std::string())
 	{
 		this->sigmap = sigmap;
 		this->prefix = prefix;
diff --git a/passes/equiv/equiv_simple.cc b/passes/equiv/equiv_simple.cc
index 1bebf5454..f0c1b517c 100644
--- a/passes/equiv/equiv_simple.cc
+++ b/passes/equiv/equiv_simple.cc
@@ -28,273 +28,344 @@ struct EquivSimpleWorker
 	Module *module;
 	const vector<Cell*> &equiv_cells;
 	const vector<Cell*> &assume_cells;
-	Cell *equiv_cell;
+	struct Cone {
+		pool<Cell*> cells;
+		pool<SigBit> bits;
+		void clear() {
+			cells.clear();
+			bits.clear();
+		}
+	};
 
-	SigMap &sigmap;
-	dict<SigBit, Cell*> &bit2driver;
+	struct DesignModel {
+		const SigMap &sigmap;
+		dict<SigBit, Cell*> &bit2driver;
+	};
+	DesignModel model;
 
 	ezSatPtr ez;
 	SatGen satgen;
-	int max_seq;
-	bool short_cones;
-	bool verbose;
-	bool set_assumes;
+
+	struct Config {
+		bool verbose = false;
+		bool short_cones = false;
+		bool model_undef = false;
+		bool nogroup = false;
+		bool set_assumes = false;
+		int max_seq = 1;
+	};
+	Config cfg;
 
 	pool<pair<Cell*, int>> imported_cells_cache;
 
-	EquivSimpleWorker(const vector<Cell*> &equiv_cells, const vector<Cell*> &assume_cells, SigMap &sigmap, dict<SigBit, Cell*> &bit2driver, int max_seq, bool short_cones, bool verbose, bool model_undef, bool set_assumes) :
-			module(equiv_cells.front()->module), equiv_cells(equiv_cells), assume_cells(assume_cells), equiv_cell(nullptr),
-			sigmap(sigmap), bit2driver(bit2driver), satgen(ez.get(), &sigmap), max_seq(max_seq), short_cones(short_cones), verbose(verbose), set_assumes(set_assumes)
+	EquivSimpleWorker(const vector<Cell*> &equiv_cells, const vector<Cell*> &assume_cells, DesignModel model, Config cfg) :
+			module(equiv_cells.front()->module), equiv_cells(equiv_cells), assume_cells(assume_cells),
+			model(model), satgen(ez.get(), &model.sigmap), cfg(cfg)
 	{
-		satgen.model_undef = model_undef;
+		satgen.model_undef = cfg.model_undef;
 	}
 
-	bool find_input_cone(pool<SigBit> &next_seed, pool<Cell*> &cells_cone, pool<SigBit> &bits_cone, const pool<Cell*> &cells_stop, const pool<SigBit> &bits_stop, pool<SigBit> *input_bits, Cell *cell)
-	{
-		if (cells_cone.count(cell))
+	struct ConeFinder {
+		DesignModel model;
+		// Bits we should also analyze in a later iteration (flop inputs)
+		pool<SigBit> &next_seed;
+		// Cells and bits we've seen so far while traversing
+		Cone& cone;
+		// We're not allowed to traverse past cells and bits in `stop`
+		const Cone& stop;
+		// Input bits are bits that no longer can be traversed
+		// Tracking these is optional
+		pool<SigBit>* input_bits;
+
+		// Recursively traverses backwards from a cell to find all cells in its input cone
+		// Adds cell to cone.cells, stops at cells in 'stop' set
+		// Returns true if stopped on a stop cell
+		bool find_input_cone(Cell *cell)
+		{
+			if (cone.cells.count(cell))
+				return false;
+
+			cone.cells.insert(cell);
+
+			if (stop.cells.count(cell))
+				return true;
+
+			for (auto &conn : cell->connections())
+				if (yosys_celltypes.cell_input(cell->type, conn.first))
+					for (auto bit : model.sigmap(conn.second)) {
+						if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+							if (!conn.first.in(ID::CLK, ID::C))
+								next_seed.insert(bit);
+						} else
+							find_input_cone(bit);
+					}
 			return false;
+		}
+		void find_input_cone(SigBit bit)
+		{
+			if (cone.bits.count(bit))
+				return;
 
-		cells_cone.insert(cell);
+			cone.bits.insert(bit);
 
-		if (cells_stop.count(cell))
-			return true;
+			if (stop.bits.count(bit)) {
+				if (input_bits != nullptr) input_bits->insert(bit);
+				return;
+			}
 
-		for (auto &conn : cell->connections())
-			if (yosys_celltypes.cell_input(cell->type, conn.first))
-				for (auto bit : sigmap(conn.second)) {
-					if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
-						if (!conn.first.in(ID::CLK, ID::C))
-							next_seed.insert(bit);
-					} else
-						find_input_cone(next_seed, cells_cone, bits_cone, cells_stop, bits_stop, input_bits, bit);
-				}
-		return false;
-	}
+			if (!model.bit2driver.count(bit))
+				return;
 
-	void find_input_cone(pool<SigBit> &next_seed, pool<Cell*> &cells_cone, pool<SigBit> &bits_cone, const pool<Cell*> &cells_stop, const pool<SigBit> &bits_stop, pool<SigBit> *input_bits, SigBit bit)
+			// If the input cone of the driver cell reaches a stop bit,
+			// then `bit` is an "input bit"
+			if (find_input_cone(model.bit2driver.at(bit)))
+				if (input_bits != nullptr) input_bits->insert(bit);
+		}
+		void find_input_cone(pool<SigBit> bits)
+		{
+			for (auto bit : bits)
+				find_input_cone(bit);
+		}
+	};
+
+	// Builds (full or short) input cones from the seeds
+	// Creates full cones (no stops) and optionally short cones (stop at other side's cone)
+	// Updates seed_a/seed_b with next iteration's FF inputs
+	// Returns input bits and cone structures for SAT problem construction
+	std::tuple<pool<SigBit>, Cone, Cone> init_iter(pool<SigBit>& seed_a, pool<SigBit>& seed_b) const
 	{
-		if (bits_cone.count(bit))
-			return;
+		// Empty, never inserted to, to traverse full cones
+		const Cone no_stop;
+		Cone full_cone_a, full_cone_b;
 
-		bits_cone.insert(bit);
+		// Values of seed_* for the next iteration
+		pool<SigBit> next_seed_a, next_seed_b;
 
-		if (bits_stop.count(bit)) {
-			if (input_bits != nullptr) input_bits->insert(bit);
-			return;
+		{
+			ConeFinder finder_a {model, next_seed_a, full_cone_a, no_stop, nullptr};
+			finder_a.find_input_cone(seed_a);
+
+			ConeFinder finder_b {model, next_seed_b, full_cone_b, no_stop, nullptr};
+			finder_b.find_input_cone(seed_b);
 		}
 
-		if (!bit2driver.count(bit))
-			return;
+		Cone short_cone_a, short_cone_b;
+		pool<SigBit> input_bits;
 
-		if (find_input_cone(next_seed, cells_cone, bits_cone, cells_stop, bits_stop, input_bits, bit2driver.at(bit)))
-			if (input_bits != nullptr) input_bits->insert(bit);
+		if (cfg.short_cones)
+		{
+			// Rebuild cones with the knowledge of the full cones.
+			// Avoids stuffing overlaps in input cones into the solver
+			// e.g. for A by using the full B cone as stops
+			next_seed_a.clear();
+			ConeFinder short_finder_a = {model, next_seed_a, short_cone_a, short_cone_b, &input_bits};
+			short_finder_a.find_input_cone(seed_a);
+			next_seed_a.swap(seed_a);
+
+			next_seed_b.clear();
+			ConeFinder short_finder_b = {model, next_seed_b, short_cone_b, short_cone_a, &input_bits};
+			short_finder_b.find_input_cone(seed_b);
+			next_seed_b.swap(seed_b);
+		}
+		else
+		{
+			short_cone_a = full_cone_a;
+			next_seed_a.swap(seed_a);
+
+			short_cone_b = full_cone_b;
+			next_seed_b.swap(seed_b);
+		}
+		return std::make_tuple(input_bits, short_cone_a, short_cone_b);
 	}
 
-	bool run_cell()
+	void report_new_cells(const pool<Cell*>& cells, const Cone& cone_a, const Cone& cone_b) const
 	{
-		SigBit bit_a = sigmap(equiv_cell->getPort(ID::A)).as_bit();
-		SigBit bit_b = sigmap(equiv_cell->getPort(ID::B)).as_bit();
-		int ez_context = ez->frozen_literal();
+		log("    Adding %d new cells to the problem (%d A, %d B, %d shared).\n",
+					GetSize(cells), GetSize(cone_a.cells), GetSize(cone_b.cells),
+					(GetSize(cone_a.cells) + GetSize(cone_b.cells)) - GetSize(cells));
+		#if 0
+			for (auto cell : short_cells_cone_a)
+				log("      A-side cell: %s\n", log_id(cell));
 
+			for (auto cell : short_cells_cone_b)
+				log("      B-side cell: %s\n", log_id(cell));
+		#endif
+	}
+	void report_new_assume_cells(const pool<Cell*>& extra_problem_cells, int old_size, const pool<Cell*>& problem_cells) const
+	{
+		if (cfg.verbose) {
+			log("    Adding %d new cells to check assumptions (and reusing %d).\n",
+				GetSize(problem_cells) - old_size,
+				old_size - (GetSize(problem_cells) - GetSize(extra_problem_cells)));
+		#if 0
+			for (auto cell : extra_problem_cells)
+				log("      cell: %s\n", log_id(cell));
+		#endif
+		}
+	}
+
+	// Ensure the input cones of $assume cells get modelled by the problem
+	pool<Cell*> add_assumes_to_problem(const Cone& cone_a, const Cone& cone_b) const
+	{
+		pool<Cell*> extra_problem_cells;
+		for (auto assume : assume_cells) {
+			pool<SigBit> assume_seed, dummy_next_seed, overlap_bits;
+			assume_seed.insert(model.sigmap(assume->getPort(ID::A)).as_bit());
+			assume_seed.insert(model.sigmap(assume->getPort(ID::EN)).as_bit());
+
+			for (auto& cone : std::array{cone_a, cone_b}) {
+				Cone assume_cone;
+				ConeFinder{model, dummy_next_seed, assume_cone, cone, &overlap_bits}
+					.find_input_cone(assume_seed);
+				if (GetSize(overlap_bits)) {
+					extra_problem_cells.insert(assume);
+					extra_problem_cells.insert(assume_cone.cells.begin(), assume_cone.cells.end());
+					overlap_bits.clear();
+				}
+				assume_cone.clear();
+				dummy_next_seed.clear();
+			}
+		}
+		return extra_problem_cells;
+	}
+
+	static void report_missing_model(Cell* cell)
+	{
+		if (RTLIL::builtin_ff_cell_types().count(cell->type))
+			log_cmd_error("No SAT model available for async FF cell %s (%s).  Consider running `async2sync` or `clk2fflogic` first.\n", log_id(cell), log_id(cell->type));
+		else
+			log_cmd_error("No SAT model available for cell %s (%s).\n", log_id(cell), log_id(cell->type));
+	}
+
+	void prepare_ezsat(int ez_context, SigBit bit_a, SigBit bit_b)
+	{
 		if (satgen.model_undef)
 		{
-			int ez_a = satgen.importSigBit(bit_a, max_seq+1);
-			int ez_b = satgen.importDefSigBit(bit_b, max_seq+1);
-			int ez_undef_a = satgen.importUndefSigBit(bit_a, max_seq+1);
+			int ez_a = satgen.importSigBit(bit_a, cfg.max_seq+1);
+			int ez_b = satgen.importDefSigBit(bit_b, cfg.max_seq+1);
+			int ez_undef_a = satgen.importUndefSigBit(bit_a, cfg.max_seq+1);
 
 			ez->assume(ez->XOR(ez_a, ez_b), ez_context);
 			ez->assume(ez->NOT(ez_undef_a), ez_context);
 		}
 		else
 		{
-			int ez_a = satgen.importSigBit(bit_a, max_seq+1);
-			int ez_b = satgen.importSigBit(bit_b, max_seq+1);
+			int ez_a = satgen.importSigBit(bit_a, cfg.max_seq+1);
+			int ez_b = satgen.importSigBit(bit_b, cfg.max_seq+1);
 			ez->assume(ez->XOR(ez_a, ez_b), ez_context);
 		}
+	}
+	void construct_ezsat(const pool<SigBit>& input_bits, int step)
+	{
+		if (cfg.set_assumes) {
+			if (cfg.verbose && step == cfg.max_seq) {
+				RTLIL::SigSpec assumes_a, assumes_en;
+				satgen.getAssumes(assumes_a, assumes_en, step+1);
+				for (int i = 0; i < GetSize(assumes_a); i++)
+					log("    Import constraint from assume cell: %s when %s (%d).\n", log_signal(assumes_a[i]), log_signal(assumes_en[i]), step);
+			}
+			ez->assume(satgen.importAssumes(step+1));
+		}
 
+		if (satgen.model_undef) {
+			for (auto bit : input_bits)
+				ez->assume(ez->NOT(satgen.importUndefSigBit(bit, step+1)));
+		}
+
+		if (cfg.verbose)
+			log("    Problem size at t=%d: %d literals, %d clauses\n", step, ez->numCnfVariables(), ez->numCnfClauses());
+	}
+
+	bool prove_equiv_cell(Cell* cell)
+	{
+		SigBit bit_a = model.sigmap(cell->getPort(ID::A)).as_bit();
+		SigBit bit_b = model.sigmap(cell->getPort(ID::B)).as_bit();
+		int ez_context = ez->frozen_literal();
+
+		prepare_ezsat(ez_context, bit_a, bit_b);
+
+		// Two bits, bit_a, and bit_b, have been marked equivalent in the design
+		// We will be traversing the input cones for each of them
+		// In the first iteration, we will using those as starting points
 		pool<SigBit> seed_a = { bit_a };
 		pool<SigBit> seed_b = { bit_b };
 
-		if (verbose) {
-			log("  Trying to prove $equiv cell %s:\n", log_id(equiv_cell));
-			log("    A = %s, B = %s, Y = %s\n", log_signal(bit_a), log_signal(bit_b), log_signal(equiv_cell->getPort(ID::Y)));
+		if (cfg.verbose) {
+			log("  Trying to prove $equiv cell %s:\n", log_id(cell));
+			log("    A = %s, B = %s, Y = %s\n", log_signal(bit_a), log_signal(bit_b), log_signal(cell->getPort(ID::Y)));
 		} else {
-			log("  Trying to prove $equiv for %s:", log_signal(equiv_cell->getPort(ID::Y)));
+			log("  Trying to prove $equiv for %s:", log_signal(cell->getPort(ID::Y)));
 		}
 
-		int step = max_seq;
+		int step = cfg.max_seq;
 		while (1)
 		{
-			pool<Cell*> no_stop_cells;
-			pool<SigBit> no_stop_bits;
-
-			pool<Cell*> full_cells_cone_a, full_cells_cone_b;
-			pool<SigBit> full_bits_cone_a, full_bits_cone_b;
-
-			pool<SigBit> next_seed_a, next_seed_b;
-
-			for (auto bit_a : seed_a)
-				find_input_cone(next_seed_a, full_cells_cone_a, full_bits_cone_a, no_stop_cells, no_stop_bits, nullptr, bit_a);
-
-			for (auto bit_b : seed_b)
-				find_input_cone(next_seed_b, full_cells_cone_b, full_bits_cone_b, no_stop_cells, no_stop_bits, nullptr, bit_b);
-
-			pool<Cell*> short_cells_cone_a, short_cells_cone_b;
-			pool<SigBit> short_bits_cone_a, short_bits_cone_b;
-			pool<SigBit> input_bits;
-
-			if (short_cones)
-			{
-				next_seed_a.clear();
-				for (auto bit_a : seed_a)
-					find_input_cone(next_seed_a, short_cells_cone_a, short_bits_cone_a, full_cells_cone_b, full_bits_cone_b, &input_bits, bit_a);
-				next_seed_a.swap(seed_a);
-
-				next_seed_b.clear();
-				for (auto bit_b : seed_b)
-					find_input_cone(next_seed_b, short_cells_cone_b, short_bits_cone_b, full_cells_cone_a, full_bits_cone_a, &input_bits, bit_b);
-				next_seed_b.swap(seed_b);
-			}
-			else
-			{
-				short_cells_cone_a = full_cells_cone_a;
-				short_bits_cone_a = full_bits_cone_a;
-				next_seed_a.swap(seed_a);
-
-				short_cells_cone_b = full_cells_cone_b;
-				short_bits_cone_b = full_bits_cone_b;
-				next_seed_b.swap(seed_b);
-			}
+			// Traverse input cones of seed_a and seed_b, potentially finding new seeds
+			auto [input_bits, cone_a, cone_b] = init_iter(seed_a, seed_b);
 
+			// Cells to model in SAT solver
 			pool<Cell*> problem_cells;
-			problem_cells.insert(short_cells_cone_a.begin(), short_cells_cone_a.end());
-			problem_cells.insert(short_cells_cone_b.begin(), short_cells_cone_b.end());
+			problem_cells.insert(cone_a.cells.begin(), cone_a.cells.end());
+			problem_cells.insert(cone_b.cells.begin(), cone_b.cells.end());
 
-			if (verbose)
-			{
-				log("    Adding %d new cells to the problem (%d A, %d B, %d shared).\n",
-						GetSize(problem_cells), GetSize(short_cells_cone_a), GetSize(short_cells_cone_b),
-						(GetSize(short_cells_cone_a) + GetSize(short_cells_cone_b)) - GetSize(problem_cells));
-			#if 0
-				for (auto cell : short_cells_cone_a)
-					log("      A-side cell: %s\n", log_id(cell));
+			if (cfg.verbose)
+				report_new_cells(problem_cells, cone_a, cone_b);
 
-				for (auto cell : short_cells_cone_b)
-					log("      B-side cell: %s\n", log_id(cell));
-			#endif
-			}
-
-			if (set_assumes) {
-				pool<Cell*> extra_problem_cells;
-				for (auto assume : assume_cells) {
-					pool<SigBit> assume_seed, next_assume_seed;
-					assume_seed.insert(sigmap(assume->getPort(ID::A)).as_bit());
-					assume_seed.insert(sigmap(assume->getPort(ID::EN)).as_bit());
-					pool<Cell*> assume_cells_cone;
-					pool<SigBit> assume_bits_cone;
-					pool<SigBit> overlap_bits;
-					for (auto bit_x : assume_seed) {
-						find_input_cone(next_assume_seed, assume_cells_cone, assume_bits_cone, short_cells_cone_a, short_bits_cone_a, &overlap_bits, bit_x);
-					}
-					if (GetSize(overlap_bits)) {
-						extra_problem_cells.insert(assume);
-						extra_problem_cells.insert(assume_cells_cone.begin(), assume_cells_cone.end());
-						overlap_bits.clear();
-					}
-					assume_cells_cone.clear();
-					assume_bits_cone.clear();
-					for (auto bit_x : assume_seed) {
-						find_input_cone(next_assume_seed, assume_cells_cone, assume_bits_cone, short_cells_cone_b, short_bits_cone_b, &overlap_bits, bit_x);
-					}
-					if (GetSize(overlap_bits)) {
-						extra_problem_cells.insert(assume);
-						extra_problem_cells.insert(assume_cells_cone.begin(), assume_cells_cone.end());
-						overlap_bits.clear();
-					}
-					assume_cells_cone.clear();
-					assume_bits_cone.clear();
-					next_assume_seed.clear();
-				}
-
-				if (GetSize(extra_problem_cells)) {
+			if (cfg.set_assumes) {
+				auto extras = add_assumes_to_problem(cone_a, cone_b);
+				if (GetSize(extras)) {
 					auto old_size = GetSize(problem_cells);
-					problem_cells.insert(extra_problem_cells.begin(), extra_problem_cells.end());
-					if (verbose) {
-						log("    Adding %d new cells to check assumptions (and reusing %d).\n",
-							GetSize(problem_cells) - old_size,
-							old_size - (GetSize(problem_cells) - GetSize(extra_problem_cells)));
-					#if 0
-						for (auto cell : extra_problem_cells)
-							log("      cell: %s\n", log_id(cell));
-					#endif
-					}
+					problem_cells.insert(extras.begin(), extras.end());
+					report_new_assume_cells(extras, old_size, problem_cells);
 				}
 			}
 
 			for (auto cell : problem_cells) {
 				auto key = pair<Cell*, int>(cell, step+1);
 				if (!imported_cells_cache.count(key) && !satgen.importCell(cell, step+1)) {
-					if (RTLIL::builtin_ff_cell_types().count(cell->type))
-						log_cmd_error("No SAT model available for async FF cell %s (%s).  Consider running `async2sync` or `clk2fflogic` first.\n", log_id(cell), log_id(cell->type));
-					else
-						log_cmd_error("No SAT model available for cell %s (%s).\n", log_id(cell), log_id(cell->type));
+					report_missing_model(cell);
 				}
 				imported_cells_cache.insert(key);
 			}
 
-			if (set_assumes) {
-				if (verbose && step == max_seq) {
-					RTLIL::SigSpec assumes_a, assumes_en;
-					satgen.getAssumes(assumes_a, assumes_en, step+1);
-					for (int i = 0; i < GetSize(assumes_a); i++)
-						log("    Import constraint from assume cell: %s when %s (%d).\n", log_signal(assumes_a[i]), log_signal(assumes_en[i]), step);
-				}
-				ez->assume(satgen.importAssumes(step+1));
-			}
-
-			if (satgen.model_undef) {
-				for (auto bit : input_bits)
-					ez->assume(ez->NOT(satgen.importUndefSigBit(bit, step+1)));
-			}
-
-			if (verbose)
-				log("    Problem size at t=%d: %d literals, %d clauses\n", step, ez->numCnfVariables(), ez->numCnfClauses());
+			construct_ezsat(input_bits, step);
 
 			if (!ez->solve(ez_context)) {
-				log(verbose ? "    Proved equivalence! Marking $equiv cell as proven.\n" : " success!\n");
-				equiv_cell->setPort(ID::B, equiv_cell->getPort(ID::A));
+				log(cfg.verbose ? "    Proved equivalence! Marking $equiv cell as proven.\n" : " success!\n");
+				// Replace $equiv cell with a short
+				cell->setPort(ID::B, cell->getPort(ID::A));
 				ez->assume(ez->NOT(ez_context));
 				return true;
 			}
 
-			if (verbose)
-				log("    Failed to prove equivalence with sequence length %d.\n", max_seq - step);
+			if (cfg.verbose)
+				log("    Failed to prove equivalence with sequence length %d.\n", cfg.max_seq - step);
 
 			if (--step < 0) {
-				if (verbose)
+				if (cfg.verbose)
 					log("    Reached sequence limit.\n");
 				break;
 			}
 
 			if (seed_a.empty() && seed_b.empty()) {
-				if (verbose)
+				if (cfg.verbose)
 					log("    No nets to continue in previous time step.\n");
 				break;
 			}
 
 			if (seed_a.empty()) {
-				if (verbose)
+				if (cfg.verbose)
 					log("    No nets on A-side to continue in previous time step.\n");
 				break;
 			}
 
 			if (seed_b.empty()) {
-				if (verbose)
+				if (cfg.verbose)
 					log("    No nets on B-side to continue in previous time step.\n");
 				break;
 			}
 
-			if (verbose) {
+			if (cfg.verbose) {
 			#if 0
 				log("    Continuing analysis in previous time step with the following nets:\n");
 				for (auto bit : seed_a)
@@ -307,7 +378,7 @@ struct EquivSimpleWorker
 			}
 		}
 
-		if (!verbose)
+		if (!cfg.verbose)
 			log(" failed.\n");
 
 		ez->assume(ez->NOT(ez_context));
@@ -319,14 +390,13 @@ struct EquivSimpleWorker
 		if (GetSize(equiv_cells) > 1) {
 			SigSpec sig;
 			for (auto c : equiv_cells)
-				sig.append(sigmap(c->getPort(ID::Y)));
+				sig.append(model.sigmap(c->getPort(ID::Y)));
 			log(" Grouping SAT models for %s:\n", log_signal(sig));
 		}
 
 		int counter = 0;
 		for (auto c : equiv_cells) {
-			equiv_cell = c;
-			if (run_cell())
+			if (prove_equiv_cell(c))
 				counter++;
 		}
 		return counter;
@@ -366,37 +436,35 @@ struct EquivSimplePass : public Pass {
 	}
 	void execute(std::vector<std::string> args, Design *design) override
 	{
-		bool verbose = false, short_cones = false, model_undef = false, nogroup = false;
-		bool set_assumes = false;
+		EquivSimpleWorker::Config cfg = {};
 		int success_counter = 0;
-		int max_seq = 1;
 
 		log_header(design, "Executing EQUIV_SIMPLE pass.\n");
 
 		size_t argidx;
 		for (argidx = 1; argidx < args.size(); argidx++) {
 			if (args[argidx] == "-v") {
-				verbose = true;
+				cfg.verbose = true;
 				continue;
 			}
 			if (args[argidx] == "-short") {
-				short_cones = true;
+				cfg.short_cones = true;
 				continue;
 			}
 			if (args[argidx] == "-undef") {
-				model_undef = true;
+				cfg.model_undef = true;
 				continue;
 			}
 			if (args[argidx] == "-nogroup") {
-				nogroup = true;
+				cfg.nogroup = true;
 				continue;
 			}
 			if (args[argidx] == "-seq" && argidx+1 < args.size()) {
-				max_seq = atoi(args[++argidx].c_str());
+				cfg.max_seq = atoi(args[++argidx].c_str());
 				continue;
 			}
 			if (args[argidx] == "-set-assumes") {
-				set_assumes = true;
+				cfg.set_assumes = true;
 				continue;
 			}
 			break;
@@ -421,7 +489,7 @@ struct EquivSimplePass : public Pass {
 				if (cell->type == ID($equiv) && cell->getPort(ID::A) != cell->getPort(ID::B)) {
 					auto bit = sigmap(cell->getPort(ID::Y).as_bit());
 					auto bit_group = bit;
-					if (!nogroup && bit_group.wire)
+					if (!cfg.nogroup && bit_group.wire)
 						bit_group.offset = 0;
 					unproven_equiv_cells[bit_group][bit] = cell;
 					unproven_cells_counter++;
@@ -446,15 +514,16 @@ struct EquivSimplePass : public Pass {
 			}
 
 			unproven_equiv_cells.sort();
-			for (auto it : unproven_equiv_cells)
+			for (auto [_, d] : unproven_equiv_cells)
 			{
-				it.second.sort();
+				d.sort();
 
 				vector<Cell*> cells;
-				for (auto it2 : it.second)
-					cells.push_back(it2.second);
+				for (auto [_, cell] : d)
+					cells.push_back(cell);
 
-				EquivSimpleWorker worker(cells, assumes, sigmap, bit2driver, max_seq, short_cones, verbose, model_undef, set_assumes);
+				EquivSimpleWorker::DesignModel model {sigmap, bit2driver};
+				EquivSimpleWorker worker(cells, assumes, model, cfg);
 				success_counter += worker.run();
 			}
 		}

From c9558b3d4f808e67b38628e39798ab5fc930f841 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 8 Aug 2025 00:26:50 +0000
Subject: [PATCH 294/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b27a45424..cbc1e9cea 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+0
+YOSYS_VER := 0.56+15
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From e02f4469c0e035d17e80eea1501371edb99199d4 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 8 Aug 2025 12:22:07 +1200
Subject: [PATCH 295/931] equiv_simple: Avoid std::array

VS build currently failing with `error C2641: cannot deduce template arguments for 'std::array'`.
Changing to `std::array<Cone, 2>` gives `error C2027: use of undefined type` instead.
---
 passes/equiv/equiv_simple.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/equiv/equiv_simple.cc b/passes/equiv/equiv_simple.cc
index f0c1b517c..8ba42595e 100644
--- a/passes/equiv/equiv_simple.cc
+++ b/passes/equiv/equiv_simple.cc
@@ -213,7 +213,7 @@ struct EquivSimpleWorker
 			assume_seed.insert(model.sigmap(assume->getPort(ID::A)).as_bit());
 			assume_seed.insert(model.sigmap(assume->getPort(ID::EN)).as_bit());
 
-			for (auto& cone : std::array{cone_a, cone_b}) {
+			for (auto& cone : {cone_a, cone_b}) {
 				Cone assume_cone;
 				ConeFinder{model, dummy_next_seed, assume_cone, cone, &overlap_bits}
 					.find_input_cone(assume_seed);

From 76e507f3078396c0b331f71eb953db4df8e78aea Mon Sep 17 00:00:00 2001
From: Hongce Zhang <zhanghongce@126.com>
Date: Fri, 8 Aug 2025 16:17:37 +0800
Subject: [PATCH 296/931] update verilog_backend according to Github comments

---
 backends/verilog/verilog_backend.cc | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index b49927513..525ab5bcf 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -2358,16 +2358,12 @@ void dump_module(std::ostream &f, std::string indent, RTLIL::Module *module)
 	dump_attributes(f, indent, module->attributes, "\n", /*modattr=*/true);
 	f << stringf("%s" "module %s(", indent.c_str(), id(module->name, false).c_str());
 	int cnt = 0;
-	
-	std::vector<Wire *> port_ordered;
-
 	for (auto port : module->ports) {
 		Wire *wire = module->wire(port);
 		if (wire) {
 			if (port != module->ports[0])
 				f << stringf(", ");
 			f << stringf("%s", id(wire->name).c_str());
-			port_ordered.push_back(wire);
 			if (cnt==20) { f << stringf("\n"); cnt = 0; } else cnt++;
 			continue;
 		}
@@ -2378,13 +2374,13 @@ void dump_module(std::ostream &f, std::string indent, RTLIL::Module *module)
 		f << indent + "  " << "reg " << id(initial_id) << " = 0;\n";
 	}
 
-	// first dump input / output according to port_ordered;
-	for (auto w : port_ordered)
-		dump_wire(f, indent + "  ", w);
-	
+	// first dump input / output according to their order in module->ports
+	for (auto port : module->ports)
+		dump_wire(f, indent + "  ", module->wire(port));
+
 	for (auto w : module->wires()) {
 		// avoid duplication
-		if (std::find(port_ordered.begin(), port_ordered.end(), w) != port_ordered.end())
+		if (w->port_id)
 			continue;
 		dump_wire(f, indent + "  ", w);
 	}

From 6c84c4a4fc151f525865f3cca8d763e67e4fbdca Mon Sep 17 00:00:00 2001
From: KrystalDelusion <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 9 Aug 2025 11:19:24 +1200
Subject: [PATCH 297/931] extra-builds.yml: Bump nix

---
 .github/workflows/extra-builds.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index d7ceb3fe3..8d64b2e0e 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -98,7 +98,7 @@ jobs:
         with:
           submodules: true
           persist-credentials: false
-      - uses: cachix/install-nix-action@v26
+      - uses: cachix/install-nix-action@v31
         with:
-          install_url: https://releases.nixos.org/nix/nix-2.18.1/install
+          install_url: https://releases.nixos.org/nix/nix-2.30.0/install
       - run: nix build .?submodules=1 -L

From 0d4585dd5fa59efe8fa9c499cbe9dcc33e302e14 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 9 Aug 2025 00:24:43 +0000
Subject: [PATCH 298/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index cbc1e9cea..512c1410d 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+15
+YOSYS_VER := 0.56+30
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 98b3316f55e24dbd91f2b4551f1a2e277fc1f2e0 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 10 Jul 2025 21:13:28 +0200
Subject: [PATCH 299/931] Revert "verilog: fix parser "if" memory errors."

This reverts commit 34a2abeddb5054df29140baf1c6d5af02a9aac63.
---
 frontends/verilog/verilog_parser.y | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index bd9f47034..3cd582378 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -2885,7 +2885,6 @@ behavioral_stmt:
 	} |
 	if_attr TOK_IF '(' expr ')' {
 		AstNode *node = 0;
-		AstNode *block = new AstNode(AST_BLOCK);
 		AstNode *context = ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if)) {
 			AstNode *outer = ast_stack[ast_stack.size() - 2];
@@ -2894,10 +2893,8 @@ behavioral_stmt:
 				// parallel "else if": append condition to outer "if"
 				node = outer;
 				log_assert (node->children.size());
-				ast_stack.pop_back();
 				delete node->children.back();
 				node->children.pop_back();
-				ast_stack.push_back(block);
 			} else if (outer->get_bool_attribute(ID::full_case))
 				(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
 		}
@@ -2908,8 +2905,8 @@ behavioral_stmt:
 			append_attr(node, $1);
 			ast_stack.back()->children.push_back(node);
 			node->children.push_back(node->get_bool_attribute(ID::parallel_case) ? AstNode::mkconst_int(1, false, 1) : expr);
-		} else
-			free_attr($1);
+		}
+		AstNode *block = new AstNode(AST_BLOCK);
 		AstNode *cond = new AstNode(AST_COND, node->get_bool_attribute(ID::parallel_case) ? expr : AstNode::mkconst_int(1, false, 1), block);
 		SET_AST_NODE_LOC(cond, @4, @4);
 		node->children.push_back(cond);

From 36491569d2da316f316c290a97d857385179c14f Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 10 Jul 2025 21:14:38 +0200
Subject: [PATCH 300/931] Revert "verilog: add support for SystemVerilog string
 literals."

This reverts commit 5feb1a1752a7469fd5a02ec8afdb68794e55ef8f.
---
 docs/source/using_yosys/verilog.rst |   3 -
 frontends/verilog/verilog_lexer.l   | 168 +++++-------------
 tests/verilog/bug5160.v             |   5 +
 tests/verilog/string-literals.ys    | 257 ----------------------------
 4 files changed, 47 insertions(+), 386 deletions(-)
 create mode 100644 tests/verilog/bug5160.v
 delete mode 100644 tests/verilog/string-literals.ys

diff --git a/docs/source/using_yosys/verilog.rst b/docs/source/using_yosys/verilog.rst
index 92f223e49..eb18cb699 100644
--- a/docs/source/using_yosys/verilog.rst
+++ b/docs/source/using_yosys/verilog.rst
@@ -379,6 +379,3 @@ from SystemVerilog:
   will process conditionals using these keywords by annotating their
   representation with the appropriate ``full_case`` and/or ``parallel_case``
   attributes, which are described above.)
-
-- SystemVerilog string literals are supported (triple-quoted strings and
-  escape sequences such as line continuations and hex escapes).
diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 19c0774af..c3ff981be 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -112,129 +112,6 @@ static bool isUserType(std::string &s)
 	return false;
 }
 
-static bool is_hex_dig(char c, int *val)
-{
-	if ('0' <= c && c <= '9') {
-		*val = c - '0';
-		return true;
-	} else if ('a' <= c && c <= 'f') {
-		*val = c - 'a' + 0xA;
-		return true;
-	} else if ('A' <= c && c <= 'F') {
-		*val = c - 'A' + 0xA;
-		return true;
-	} else if (c == 'x' || c == 'X' || c == 'z' || c == 'Z' || c == '?') {
-		log_file_warning(AST::current_filename.c_str(), frontend_verilog_yyget_lineno(), "'%c' not a valid digit in hex escape sequence.\n", c);
-		*val = 0; // not semantically valid in hex escape...
-		return true; // ...but still processed as part of hex token
-	}
-
-	return false;
-}
-
-static bool is_oct_dig(char c, int *val)
-{
-	if ('0' <= c && c <= '7') {
-		*val = c - '0';
-		return true;
-	} else if (c == 'x' || c == 'X' || c == 'z' || c == 'Z' || c == '?') {
-		log_file_warning(AST::current_filename.c_str(), frontend_verilog_yyget_lineno(), "'%c' not a valid digit in octal escape sequence.\n", c);
-		*val = 0; // not semantically valid in octal escape...
-		return true; // ...but still processed as part of octal token
-	}
-
-	return false;
-}
-
-static std::string *process_str(char *str, int len, bool triple)
-{
-	char *in, *out; // Overwrite input buffer: flex manual states "Actions
-		// are free to modify 'yytext' except for lengthening it".
-
-	for (in = str, out = str; in < str + len; in++)
-		switch (*in) {
-		case '\n':
-		case '\r':
-			if (in + 1 < str + len && (in[1] ^ *in) == ('\n' ^ '\r'))
-				in++;
-			if (!triple)
-				log_file_warning(AST::current_filename.c_str(), frontend_verilog_yyget_lineno(), "Multi-line string literals should be triple-quoted or escaped.\n");
-			*out++ = '\n';
-			break;
-		case '\\':
-			in++;
-			log_assert(in < str + len);
-			switch (*in) {
-			case 'a':
-				*out++ = '\a';
-				break;
-			case 'f':
-				*out++ = '\f';
-				break;
-			case 'n':
-				*out++ = '\n';
-				break;
-			case 'r': /* not part of IEEE-1800 2023, but seems
-				     like a good idea to support it anyway */
-				*out++ = '\r';
-				break;
-			case 't':
-				*out++ = '\t';
-				break;
-			case 'v':
-				*out++ = '\v';
-				break;
-			case 'x':
-				int val;
-				if (in + 1 < str + len && is_hex_dig(in[1], &val)) {
-					*out = val;
-					in++;
-					if (in + 1 < str + len && is_hex_dig(in[1], &val)) {
-						*out = *out * 0x10 + val;
-						in++;
-					}
-					out++;
-				} else
-					log_file_warning(AST::current_filename.c_str(), frontend_verilog_yyget_lineno(), "ignoring invalid hex escape.\n");
-				break;
-			case '\\':
-				*out++ = '\\';
-				break;
-			case '"':
-				*out++ = '"';
-				break;
-			case '\n':
-			case '\r':
-				if (in + 1 < str + len && (in[1] ^ *in) == ('\n' ^ '\r'))
-					in++;
-				break;
-			default:
-				if ('0' <= *in && *in <= '7') {
-					int val;
-
-					*out = *in - '0';
-					if (in + 1 < str + len && is_oct_dig(in[1], &val)) {
-						*out = *out * 010 + val;
-						in++;
-						if (in + 1 < str + len && is_oct_dig(in[1], &val)) {
-							if (*out >= 040)
-								log_file_warning(AST::current_filename.c_str(), frontend_verilog_yyget_lineno(), "octal escape exceeds \\377\n");
-							*out = *out * 010 + val;
-							in++;
-						}
-					}
-					out++;
-				} else
-					*out++ = *in;
-			}
-			break;
-		default:
-			*out++ = *in;
-		}
-
-	return new std::string(str, out - str);
-}
-
 %}
 
 %option yylineno
@@ -245,6 +122,7 @@ static std::string *process_str(char *str, int len, bool triple)
 %option prefix="frontend_verilog_yy"
 
 %x COMMENT
+%x STRING
 %x SYNOPSYS_TRANSLATE_OFF
 %x SYNOPSYS_FLAGS
 %x IMPORT_DPI
@@ -458,9 +336,47 @@ TIME_SCALE_SUFFIX [munpf]?s
 	return TOK_REALVAL;
 }
 
-\"([^\\"]|\\.|\\\n)*\"			{ yylval->string = process_str(yytext + 1, yyleng - 2, false); return TOK_STRING; }
-
-\"{3}(\"{0,2}([^\\"]|\\.|\\\n))*\"{3}	{ yylval->string = process_str(yytext + 3, yyleng - 6, true); return TOK_STRING; }
+\"		{ BEGIN(STRING); }
+<STRING>([^\\"]|\\.)+	{ yymore(); real_location = old_location; }
+<STRING>\"	{
+	BEGIN(0);
+	char *yystr = strdup(yytext);
+	yystr[strlen(yytext) - 1] = 0;
+	int i = 0, j = 0;
+	while (yystr[i]) {
+		if (yystr[i] == '\\' && yystr[i + 1]) {
+			i++;
+			if (yystr[i] == 'a')
+				yystr[i] = '\a';
+			else if (yystr[i] == 'f')
+				yystr[i] = '\f';
+			else if (yystr[i] == 'n')
+				yystr[i] = '\n';
+			else if (yystr[i] == 'r')
+				yystr[i] = '\r';
+			else if (yystr[i] == 't')
+				yystr[i] = '\t';
+			else if (yystr[i] == 'v')
+				yystr[i] = '\v';
+			else if ('0' <= yystr[i] && yystr[i] <= '7') {
+				yystr[i] = yystr[i] - '0';
+				if ('0' <= yystr[i + 1] && yystr[i + 1] <= '7') {
+					yystr[i + 1] = yystr[i] * 8 + yystr[i + 1] - '0';
+					i++;
+				}
+				if ('0' <= yystr[i + 1] && yystr[i + 1] <= '7') {
+					yystr[i + 1] = yystr[i] * 8 + yystr[i + 1] - '0';
+					i++;
+				}
+			}
+		}
+		yystr[j++] = yystr[i++];
+	}
+	yystr[j] = 0;
+	yylval->string = new std::string(yystr, j);
+	free(yystr);
+	return TOK_STRING;
+}
 
 and|nand|or|nor|xor|xnor|not|buf|bufif0|bufif1|notif0|notif1 {
 	yylval->string = new std::string(yytext);
diff --git a/tests/verilog/bug5160.v b/tests/verilog/bug5160.v
new file mode 100644
index 000000000..5b141a360
--- /dev/null
+++ b/tests/verilog/bug5160.v
@@ -0,0 +1,5 @@
+// Regression test for bug mentioned in #5160:
+// https://github.com/YosysHQ/yosys/pull/5160#issuecomment-2983643084
+module top;
+    initial $display( "\\" );
+endmodule
diff --git a/tests/verilog/string-literals.ys b/tests/verilog/string-literals.ys
deleted file mode 100644
index a0f0f0460..000000000
--- a/tests/verilog/string-literals.ys
+++ /dev/null
@@ -1,257 +0,0 @@
-# Test valid escape sequences yield correct results:
-logger -expect-no-warnings
-read_verilog << EOF
-module top;
-	wire[7:0] sp = "\ ";
-	wire[7:0] spval = 32;
-	wire[7:0] ex = "\!";
-	wire[7:0] exval = 33;
-	wire[7:0] dq = "\"";
-	wire[7:0] dqval = 34;
-	wire[7:0] ha = "\#";
-	wire[7:0] haval = 35;
-	wire[7:0] do = "\$";
-	wire[7:0] doval = 36;
-	wire[7:0] pc = "\%";
-	wire[7:0] pcval = 37;
-	wire[7:0] am = "\&";
-	wire[7:0] amval = 38;
-	wire[7:0] sq = "\'";
-	wire[7:0] sqval = 39;
-	wire[7:0] op = "\(";
-	wire[7:0] opval = 40;
-	wire[7:0] cp = "\)";
-	wire[7:0] cpval = 41;
-	wire[7:0] as = "\*";
-	wire[7:0] asval = 42;
-	wire[7:0] pl = "\+";
-	wire[7:0] plval = 43;
-	wire[7:0] co = "\,";
-	wire[7:0] coval = 44;
-	wire[7:0] mi = "\-";
-	wire[7:0] mival = 45;
-	wire[7:0] do = "\.";
-	wire[7:0] doval = 46;
-	wire[7:0] sl = "\/";
-	wire[7:0] slval = 47;
-
-	wire[7:0] dig0 = "\012";
-	wire[7:0] dig0val = 10;
-	wire[7:0] dig8 = "\8"; // not octal, a literal '8'
-	wire[7:0] dig8val = 56;
-	wire[7:0] dig9 = "\9"; // not octal, a literal '9'
-	wire[7:0] dig9val = 57;
-	
-	wire[7:0] cl = "\:";
-	wire[7:0] clval = 58;
-	wire[7:0] sc = "\;";
-	wire[7:0] scval = 59;
-	wire[7:0] lt = "\<";
-	wire[7:0] ltval = 60;
-	wire[7:0] eq = "\=";
-	wire[7:0] eqval = 61;
-	wire[7:0] gt = "\>";
-	wire[7:0] gtval = 62;
-	wire[7:0] qu = "\?";
-	wire[7:0] quval = 63;
-	wire[7:0] at = "\@";
-	wire[7:0] atval = 64;
-
-	wire[7:0] A = "\A";
-	wire[7:0] Aval = 65; // etc. etc.
-
-	wire[7:0] os = "\[";
-	wire[7:0] osval = 91;
-	wire[7:0] bs = "\\";
-	wire[7:0] bsval = 92;
-	wire[7:0] cs = "\]";
-	wire[7:0] csval = 93;
-	wire[7:0] ca = "\^";
-	wire[7:0] caval = 94;
-	wire[7:0] us = "\_";
-	wire[7:0] usval = 95;
-	wire[7:0] bq = "\`";
-	wire[7:0] bqval = 96;
-
-	wire[7:0] a = "\a"; // alert, ASCII BEL=7
-	wire[7:0] aval = 7;
-	wire[7:0] b = "\b";
-	wire[7:0] bval = 98;
-	wire[7:0] c = "\c";
-	wire[7:0] cval = 99;
-	wire[7:0] d = "\d";
-	wire[7:0] dval = 100;
-	wire[7:0] e = "\e";
-	wire[7:0] eval = 101;
-	wire[7:0] f = "\f"; // form feed, ASCII FF=12
-	wire[7:0] fval = 12;
-	wire[7:0] g = "\g";
-	wire[7:0] gval = 103;
-	wire[7:0] h = "\h";
-	wire[7:0] hval = 104;
-	wire[7:0] i = "\i";
-	wire[7:0] ival = 105;
-	wire[7:0] j = "\j";
-	wire[7:0] jval = 106;
-	wire[7:0] k = "\k";
-	wire[7:0] kval = 107;
-	wire[7:0] l = "\l";
-	wire[7:0] lval = 108;
-	wire[7:0] m = "\m";
-	wire[7:0] mval = 109;
-	wire[7:0] n = "\n"; // new line, ASCII LF=10
-	wire[7:0] nval = 10;
-	wire[7:0] o = "\o";
-	wire[7:0] oval = 111;
-	wire[7:0] p = "\p";
-	wire[7:0] pval = 112;
-	wire[7:0] q = "\q";
-	wire[7:0] qval = 113;
-	wire[7:0] r = "\r"; // carriage return, ASCII CR=13, not IEEE 1800-2023
-	wire[7:0] rval = 13;
-	wire[7:0] s = "\s";
-	wire[7:0] sval = 115;
-	wire[7:0] t = "\t"; // tab, ASCII HT=9
-	wire[7:0] tval = 9;
-	wire[7:0] u = "\u";
-	wire[7:0] uval = 117;
-	wire[7:0] v = "\v"; // vertical tab, ASCII VT=11
-	wire[7:0] vval = 11;
-	wire[7:0] w = "\w";
-	wire[7:0] wval = 119;
-	wire[7:0] x = "\x2A"; // hex escape
-	wire[7:0] xval = 42;
-	wire[7:0] y = "\y";
-	wire[7:0] yval = 121;
-	wire[7:0] z = "\z";
-	wire[7:0] zval = 122;
-
-	wire[7:0] ob = "\{";
-	wire[7:0] obval = 123;
-	wire[7:0] vb = "\|";
-	wire[7:0] vbval = 124;
-	wire[7:0] cb = "\}";
-	wire[7:0] cbval = 125;
-	wire[7:0] ti = "\~";
-	wire[7:0] tival = 126;
-endmodule
-EOF
-sat -prove sp spval -prove ex exval -prove dq dqval -prove ha haval -prove do doval -prove pc pcval -prove am amval -prove sq sqval -prove op opval -prove cp cpval -prove as asval -prove pl plval -prove co coval -prove mi mival -prove do doval -prove sl slval -verify
-sat -prove dig0 dig0val -prove dig8 dig8val -prove dig9 dig9val -verify
-sat -prove cl clval -prove sc scval -prove lt ltval -prove eq eqval -prove gt gtval -prove qu quval -prove at atval -prove A Aval -verify
-sat -prove os osval -prove bs bsval -prove cs csval -prove ca caval -prove us usval -prove bq bqval -verify
-sat -prove a aval -prove b bval -prove c cval -prove d dval -prove e eval -prove f fval -prove g gval -prove h hval -prove i ival -prove j jval -prove k kval -prove l lval -prove m mval -prove n nval -prove o oval -prove p pval -prove q qval -prove r rval -prove s sval -prove t tval -prove u uval -prove v vval -prove w wval -prove x xval -prove y yval -prove z zval -verify
-sat -prove ob obval -prove vb vbval -prove cb cbval -prove ti tival -verify
-logger -check-expected
-design -reset
-
-# Test octal escape out of range.
-logger -expect warning "octal escape exceeds \\377" 1
-read_verilog << EOF
-module top;
-	wire[7:0] x = "\400";
-endmodule
-EOF
-logger -check-expected
-design -reset
-
-# Test invalid octal digit.
-logger -expect warning "'\?' not a valid digit in octal escape sequence" 1
-read_verilog << EOF
-module top;
-	wire[7:0] x = "\0?";
-endmodule
-EOF
-logger -check-expected
-design -reset
-
-# Test invalid hex digit.
-logger -expect warning "'X' not a valid digit in hex escape sequence" 1
-read_verilog << EOF
-module top;
-	wire[7:0] x = "\x0X";
-endmodule
-EOF
-logger -check-expected
-design -reset
-
-# Test hex escape with no hex digits at all.
-logger -expect warning "ignoring invalid hex escape" 1
-read_verilog << EOF
-module top;
-	wire[7:0] x = "\xy";
-endmodule
-EOF
-logger -check-expected
-design -reset
-
-# Test hex escape interrupted by end of string.
-logger -expect warning "ignoring invalid hex escape" 1
-read_verilog << EOF
-module top;
-	wire[7:0] x = "\x";
-endmodule
-EOF
-logger -check-expected
-design -reset
-
-# Test multi-line string.
-logger -expect warning "Multi-line string literals should be triple-quoted or escaped" 1
-read_verilog << EOF
-module top;
-	wire[31:0] x = "A
-BC";
-	wire[31:0] xval = 32'h410A4243;
-endmodule
-EOF
-logger -check-expected
-design -reset
-
-# Test multi-line triple-quoted string.
-logger -expect-no-warnings
-read_verilog << EOF
-module top;
-	wire[31:0] x = """A
-BC""";
-	wire[31:0] xval = 32'h410A4243;
-endmodule
-EOF
-logger -check-expected
-sat -prove x xval -verify
-design -reset
-
-# Test escaped multi-line string.
-logger -expect-no-warnings
-read_verilog << EOF
-module top;
-	wire[31:0] x = "AB\
-CD";
-	wire[31:0] xval = 32'h41424344;
-endmodule
-EOF
-logger -check-expected
-sat -prove x xval -verify
-design -reset
-
-# Test octal escape with surrounding data.
-logger -expect-no-warnings
-read_verilog << EOF
-module top;
-	wire[31:0] x = "AB\234C";
-	wire[31:0] xval = 32'h41429C43;
-endmodule
-EOF
-logger -check-expected
-sat -prove x xval -verify
-design -reset
-
-# Test hex escape with surrounding data.
-logger -expect-no-warnings
-read_verilog << EOF
-module top;
-	wire[31:0] x = "A\xBCDE";
-	wire[31:0] xval = 32'h41BC4445;
-endmodule
-EOF
-logger -check-expected
-sat -prove x xval -verify

From f27309136f063f4bcab96b56fc145cc62db3937e Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 10 Jul 2025 21:15:38 +0200
Subject: [PATCH 301/931] Revert "verilog: fix string literal regular
 expression (#5187)"

This reverts commit 834a7294b7c790612e9d1a686b374130b43d814e.
---
 frontends/verilog/verilog_lexer.l | 2 +-
 tests/verilog/bug5160.v           | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 tests/verilog/bug5160.v

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index c3ff981be..362288f29 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -337,7 +337,7 @@ TIME_SCALE_SUFFIX [munpf]?s
 }
 
 \"		{ BEGIN(STRING); }
-<STRING>([^\\"]|\\.)+	{ yymore(); real_location = old_location; }
+<STRING>([^\"]|\\.)+	{ yymore(); real_location = old_location; }
 <STRING>\"	{
 	BEGIN(0);
 	char *yystr = strdup(yytext);
diff --git a/tests/verilog/bug5160.v b/tests/verilog/bug5160.v
deleted file mode 100644
index 5b141a360..000000000
--- a/tests/verilog/bug5160.v
+++ /dev/null
@@ -1,5 +0,0 @@
-// Regression test for bug mentioned in #5160:
-// https://github.com/YosysHQ/yosys/pull/5160#issuecomment-2983643084
-module top;
-    initial $display( "\\" );
-endmodule

From c8e0ac0c616732aac82f02da01413154c7bba843 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 16 Jun 2025 22:55:24 +0200
Subject: [PATCH 302/931] ast, read_verilog: ownership in AST, use C++ styles
 for parser and lexer

---
 frontends/ast/ast.cc                  |  340 ++-
 frontends/ast/ast.h                   |   61 +-
 frontends/ast/dpicall.cc              |    8 +-
 frontends/ast/genrtlil.cc             |  206 +-
 frontends/ast/simplify.cc             | 1433 +++++-----
 frontends/verilog/.gitignore          |    3 +
 frontends/verilog/Makefile.inc        |    1 +
 frontends/verilog/const2ast.cc        |   52 +-
 frontends/verilog/preproc.cc          |    9 +-
 frontends/verilog/preproc.h           |    9 +-
 frontends/verilog/verilog_frontend.cc |  171 +-
 frontends/verilog/verilog_frontend.h  |   86 +-
 frontends/verilog/verilog_lexer.h     |   48 +
 frontends/verilog/verilog_lexer.l     |  561 ++--
 frontends/verilog/verilog_parser.y    | 3595 ++++++++++++-------------
 kernel/rtlil.cc                       |   16 +-
 kernel/rtlil.h                        |    2 +-
 passes/cmds/design.cc                 |    6 -
 passes/memory/memlib.h                |    2 +-
 19 files changed, 3296 insertions(+), 3313 deletions(-)
 create mode 100644 frontends/verilog/verilog_lexer.h

diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 04f749845..877c41283 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -39,8 +39,7 @@ using namespace AST_INTERNAL;
 // instantiate global variables (public API)
 namespace AST {
 	std::string current_filename;
-	void (*set_line_num)(int) = NULL;
-	int (*get_line_num)() = NULL;
+	bool sv_mode;
 	unsigned long long astnodes = 0;
 	unsigned long long astnode_count() { return astnodes; }
 }
@@ -193,16 +192,16 @@ bool AstNode::get_bool_attribute(RTLIL::IdString id)
 	if (attributes.count(id) == 0)
 		return false;
 
-	AstNode *attr = attributes.at(id);
-	if (attr->type != AST_CONSTANT)
-		attr->input_error("Attribute `%s' with non-constant value!\n", id.c_str());
+	AstNode& attr = *(attributes.at(id));
+	if (attr.type != AST_CONSTANT)
+		attr.input_error("Attribute `%s' with non-constant value!\n", id.c_str());
 
-	return attr->integer != 0;
+	return attr.integer != 0;
 }
 
 // create new node (AstNode constructor)
 // (the optional child arguments make it easier to create AST trees)
-AstNode::AstNode(AstNodeType type, AstNode *child1, AstNode *child2, AstNode *child3, AstNode *child4)
+AstNode::AstNode(AstNodeType type, std::unique_ptr<AstNode> child1, std::unique_ptr<AstNode> child2, std::unique_ptr<AstNode> child3, std::unique_ptr<AstNode> child4)
 {
 	static unsigned int hashidx_count = 123456789;
 	hashidx_count = mkhash_xorshift(hashidx_count);
@@ -240,56 +239,74 @@ AstNode::AstNode(AstNodeType type, AstNode *child1, AstNode *child2, AstNode *ch
 	in_param = false;
 
 	if (child1)
-		children.push_back(child1);
+		children.push_back(std::move(child1));
 	if (child2)
-		children.push_back(child2);
+		children.push_back(std::move(child2));
 	if (child3)
-		children.push_back(child3);
+		children.push_back(std::move(child3));
 	if (child4)
-		children.push_back(child4);
+		children.push_back(std::move(child4));
 
 	fixup_hierarchy_flags();
 }
 
 // create a (deep recursive) copy of a node
-AstNode *AstNode::clone() const
+std::unique_ptr<AstNode> AstNode::clone() const
 {
-	AstNode *that = new AstNode;
-	*that = *this;
-	for (auto &it : that->children)
-		it = it->clone();
-	for (auto &it : that->attributes)
-		it.second = it.second->clone();
-
-	that->set_in_lvalue_flag(false);
-	that->set_in_param_flag(false);
-	that->fixup_hierarchy_flags(); // fixup to set flags on cloned children
+	auto that = std::make_unique<AstNode>(this->type);
+	cloneInto(*that.get());
 	return that;
 }
 
 // create a (deep recursive) copy of a node use 'other' as target root node
-void AstNode::cloneInto(AstNode *other) const
+void AstNode::cloneInto(AstNode &other) const
 {
-	AstNode *tmp = clone();
-	tmp->in_lvalue_from_above = other->in_lvalue_from_above;
-	tmp->in_param_from_above = other->in_param_from_above;
-	other->delete_children();
-	*other = *tmp;
-	tmp->children.clear();
-	tmp->attributes.clear();
-	other->fixup_hierarchy_flags();
-	delete tmp;
+	other.type = type;
+	other.str = str;
+	other.bits = bits;
+	other.is_input = is_input;
+	other.is_output = is_output;
+	other.is_reg = is_reg;
+	other.is_logic = is_logic;
+	other.is_signed = is_signed;
+	other.is_string = is_string;
+	other.is_wand = is_wand;
+	other.is_wor = is_wor;
+	other.range_valid = range_valid;
+	other.range_swapped = range_swapped;
+	other.was_checked = was_checked;
+	other.is_unsized = is_unsized;
+	other.is_custom_type = is_custom_type;
+	other.port_id = port_id,
+	other.range_left = range_left,
+	other.range_right = range_right;
+	other.integer = integer;
+	other.realvalue = realvalue;
+	other.is_enum = is_enum;
+	other.dimensions = dimensions;
+	other.unpacked_dimensions = unpacked_dimensions;
+	other.id2ast = id2ast;
+	other.basic_prep = basic_prep;
+	other.lookahead = lookahead;
+	other.filename = filename;
+	other.location = location;
+	other.in_lvalue = in_lvalue;
+	other.in_param = in_param;
+	// Keep in_lvalue_from_above and in_param_from_above untouched
+
+	other.delete_children();
+	for (auto& child : this->children)
+		other.children.push_back(child->clone());
+	for (auto& [key, val] : this->attributes)
+		other.attributes[key] = (val->clone());
+	 // fixup to set flags on cloned children
+	other.fixup_hierarchy_flags();
 }
 
 // delete all children in this node
 void AstNode::delete_children()
 {
-	for (auto &it : children)
-		delete it;
 	children.clear();
-
-	for (auto &it : attributes)
-		delete it.second;
 	attributes.clear();
 }
 
@@ -424,18 +441,18 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 	{
 	case AST_MODULE:
 		fprintf(f, "%s" "module %s(", indent.c_str(), id2vl(str).c_str());
-		for (auto child : children)
+		for (const auto& child : children)
 			if (child->type == AST_WIRE && (child->is_input || child->is_output)) {
 				fprintf(f, "%s%s", first ? "" : ", ", id2vl(child->str).c_str());
 				first = false;
 			}
 		fprintf(f, ");\n");
 
-		for (auto child : children)
+		for (const auto& child : children)
 			if (child->type == AST_PARAMETER || child->type == AST_LOCALPARAM || child->type == AST_DEFPARAM)
 				child->dumpVlog(f, indent + "  ");
 			else
-				rem_children1.push_back(child);
+				rem_children1.push_back(child.get());
 
 		for (auto child : rem_children1)
 			if (child->type == AST_WIRE || child->type == AST_AUTOWIRE || child->type == AST_MEMORY)
@@ -471,7 +488,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 			fprintf(f, "%s" "reg", (is_input || is_output) ? " " : indent.c_str());
 		if (is_signed)
 			fprintf(f, " signed");
-		for (auto child : children) {
+		for (const auto& child : children) {
 			fprintf(f, " ");
 			child->dumpVlog(f, "");
 		}
@@ -487,7 +504,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 		fprintf(f, "%s" "memory", indent.c_str());
 		if (is_signed)
 			fprintf(f, " signed");
-		for (auto child : children) {
+		for (const auto& child : children) {
 			fprintf(f, " ");
 			child->dumpVlog(f, "");
 			if (first)
@@ -501,7 +518,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 	if (0) { case AST_MEMINIT: txt = "@meminit@";  }
 	if (0) { case AST_MEMWR:   txt = "@memwr@";  }
 		fprintf(f, "%s%s", indent.c_str(), txt.c_str());
-		for (auto child : children) {
+		for (const auto& child : children) {
 			fprintf(f, first ? "(" : ", ");
 			child->dumpVlog(f, "");
 			first = false;
@@ -518,7 +535,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 			else
 				fprintf(f, "[%d:%d]", range_left, range_right);
 		} else {
-			for (auto child : children) {
+			for (const auto& child : children) {
 				fprintf(f, "%c", first ? '[' : ':');
 				child->dumpVlog(f, "");
 				first = false;
@@ -528,13 +545,13 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 		break;
 
 	case AST_MULTIRANGE:
-		for (auto child : children)
+		for (const auto& child : children)
 			child->dumpVlog(f, "");
 		break;
 
 	case AST_ALWAYS:
 		fprintf(f, "%s" "always @", indent.c_str());
-		for (auto child : children) {
+		for (const auto& child : children) {
 			if (child->type != AST_POSEDGE && child->type != AST_NEGEDGE && child->type != AST_EDGE)
 				continue;
 			fprintf(f, first ? "(" : ", ");
@@ -542,7 +559,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 			first = false;
 		}
 		fprintf(f, first ? "*\n" : ")\n");
-		for (auto child : children) {
+		for (const auto& child : children) {
 			if (child->type != AST_POSEDGE && child->type != AST_NEGEDGE && child->type != AST_EDGE)
 				child->dumpVlog(f, indent + "  ");
 		}
@@ -550,7 +567,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 
 	case AST_INITIAL:
 		fprintf(f, "%s" "initial\n", indent.c_str());
-		for (auto child : children) {
+		for (const auto& child : children) {
 			if (child->type != AST_POSEDGE && child->type != AST_NEGEDGE && child->type != AST_EDGE)
 				child->dumpVlog(f, indent + "  ");
 		}
@@ -563,7 +580,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 			fprintf(f, "posedge ");
 		if (type == AST_NEGEDGE)
 			fprintf(f, "negedge ");
-		for (auto child : children)
+		for (const auto& child : children)
 			child->dumpVlog(f, "");
 		break;
 
@@ -575,7 +592,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 			else
 				fprintf(f, "%s", id2vl(str).c_str());
 		}
-		for (auto child : children)
+		for (const auto& child : children)
 			child->dumpVlog(f, "");
 		break;
 
@@ -603,7 +620,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 			children[0]->dumpVlog(f, indent);
 		} else {
 			fprintf(f, "%s" "begin\n", indent.c_str());
-			for (auto child : children)
+			for (const auto& child : children)
 				child->dumpVlog(f, indent + "  ");
 			fprintf(f, "%s" "end\n", indent.c_str());
 		}
@@ -619,7 +636,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 		children[0]->dumpVlog(f, "");
 		fprintf(f, ")\n");
 		for (size_t i = 1; i < children.size(); i++) {
-			AstNode *child = children[i];
+			const auto& child = children[i];
 			child->dumpVlog(f, indent + "  ");
 		}
 		fprintf(f, "%s" "endcase\n", indent.c_str());
@@ -628,7 +645,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 	case AST_COND:
 	case AST_CONDX:
 	case AST_CONDZ:
-		for (auto child : children) {
+		for (const auto& child : children) {
 			if (child->type == AST_BLOCK) {
 				fprintf(f, ":\n");
 				child->dumpVlog(f, indent + "  ");
@@ -664,7 +681,7 @@ void AstNode::dumpVlog(FILE *f, std::string indent) const
 	case AST_CONCAT:
 		fprintf(f, "{");
 		for (int i = GetSize(children)-1; i >= 0; i--) {
-			auto child = children[i];
+			const auto& child = children[i];
 			if (!first)
 				fprintf(f, ", ");
 			child->dumpVlog(f, "");
@@ -819,16 +836,16 @@ bool AstNode::contains(const AstNode *other) const
 {
 	if (this == other)
 		return true;
-	for (auto child : children)
+	for (const auto& child : children)
 		if (child->contains(other))
 			return true;
 	return false;
 }
 
 // create an AST node for a constant (using a 32 bit int as value)
-AstNode *AstNode::mkconst_int(uint32_t v, bool is_signed, int width)
+std::unique_ptr<AstNode> AstNode::mkconst_int(uint32_t v, bool is_signed, int width)
 {
-	AstNode *node = new AstNode(AST_CONSTANT);
+	auto node = std::make_unique<AstNode>(AST_CONSTANT);
 	node->integer = v;
 	node->is_signed = is_signed;
 	for (int i = 0; i < width; i++) {
@@ -842,9 +859,9 @@ AstNode *AstNode::mkconst_int(uint32_t v, bool is_signed, int width)
 }
 
 // create an AST node for a constant (using a bit vector as value)
-AstNode *AstNode::mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed, bool is_unsized)
+std::unique_ptr<AstNode> AstNode::mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed, bool is_unsized)
 {
-	AstNode *node = new AstNode(AST_CONSTANT);
+	auto node = std::make_unique<AstNode>(AST_CONSTANT);
 	node->is_signed = is_signed;
 	node->bits = v;
 	for (size_t i = 0; i < 32; i++) {
@@ -860,15 +877,15 @@ AstNode *AstNode::mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signe
 	return node;
 }
 
-AstNode *AstNode::mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed)
+std::unique_ptr<AstNode> AstNode::mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed)
 {
 	return mkconst_bits(v, is_signed, false);
 }
 
 // create an AST node for a constant (using a string in bit vector form as value)
-AstNode *AstNode::mkconst_str(const std::vector<RTLIL::State> &v)
+std::unique_ptr<AstNode> AstNode::mkconst_str(const std::vector<RTLIL::State> &v)
 {
-	AstNode *node = mkconst_str(RTLIL::Const(v).decode_string());
+	auto node = mkconst_str(RTLIL::Const(v).decode_string());
 	while (GetSize(node->bits) < GetSize(v))
 		node->bits.push_back(RTLIL::State::S0);
 	log_assert(node->bits == v);
@@ -876,9 +893,9 @@ AstNode *AstNode::mkconst_str(const std::vector<RTLIL::State> &v)
 }
 
 // create an AST node for a constant (using a string as value)
-AstNode *AstNode::mkconst_str(const std::string &str)
+std::unique_ptr<AstNode> AstNode::mkconst_str(const std::string &str)
 {
-	AstNode *node;
+	std::unique_ptr<AstNode> node;
 
 	// LRM 1364-2005 5.2.3.3 The empty string literal ("") shall be considered
 	// equivalent to the ASCII NUL ("\0")
@@ -903,18 +920,19 @@ AstNode *AstNode::mkconst_str(const std::string &str)
 }
 
 // create a temporary register
-AstNode *AstNode::mktemp_logic(const std::string &name, AstNode *mod, bool nosync, int range_left, int range_right, bool is_signed)
+std::unique_ptr<AstNode> AstNode::mktemp_logic(const std::string &name, AstNode *mod, bool nosync, int range_left, int range_right, bool is_signed)
 {
-	AstNode *wire = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(range_left, true), mkconst_int(range_right, true)));
+	auto wire_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(range_left, true), mkconst_int(range_right, true)));
+	auto* wire = wire_owned.get();
 	wire->str = stringf("%s%s:%d$%d", name.c_str(), RTLIL::encode_filename(filename).c_str(), location.first_line, autoidx++);
 	if (nosync)
 		wire->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
 	wire->is_signed = is_signed;
 	wire->is_logic = true;
-	mod->children.push_back(wire);
+	mod->children.push_back(std::move(wire_owned));
 	while (wire->simplify(true, 1, -1, false)) { }
 
-	AstNode *ident = new AstNode(AST_IDENTIFIER);
+	auto ident = std::make_unique<AstNode>(AST_IDENTIFIER);
 	ident->str = wire->str;
 	ident->id2ast = wire;
 
@@ -968,10 +986,9 @@ RTLIL::Const AstNode::asParaConst() const
 {
 	if (type == AST_REALVALUE)
 	{
-		AstNode *strnode = AstNode::mkconst_str(stringf("%f", realvalue));
+		auto strnode = AstNode::mkconst_str(stringf("%f", realvalue));
 		RTLIL::Const val = strnode->asAttrConst();
 		val.flags |= RTLIL::CONST_FLAG_REAL;
-		delete strnode;
 		return val;
 	}
 
@@ -1079,7 +1096,7 @@ void AST::set_src_attr(RTLIL::AttrObject *obj, const AstNode *ast)
 	obj->attributes[ID::src] = ast->loc_string();
 }
 
-static bool param_has_no_default(const AstNode *param) {
+static bool param_has_no_default(const std::unique_ptr<AstNode> &param) {
 	const auto &children = param->children;
 	log_assert(param->type == AST_PARAMETER);
 	log_assert(children.size() <= 2);
@@ -1087,7 +1104,7 @@ static bool param_has_no_default(const AstNode *param) {
 		(children.size() == 1 && children[0]->type == AST_RANGE);
 }
 
-static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool defer, AstNode *original_ast = NULL, bool quiet = false)
+static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool defer, std::unique_ptr<AstNode> original_ast = NULL, bool quiet = false)
 {
 	log_assert(current_scope.empty());
 	log_assert(ast->type == AST_MODULE || ast->type == AST_INTERFACE);
@@ -1101,15 +1118,15 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 	AstModule *module = new AstModule;
 	current_module = module;
 
-	module->ast = NULL;
+	module->ast = nullptr;
 	module->name = ast->str;
 	set_src_attr(module, ast);
 	module->set_bool_attribute(ID::cells_not_processed);
 
 	current_ast_mod = ast;
-	AstNode *ast_before_simplify;
+	std::unique_ptr<AstNode> ast_before_simplify;
 	if (original_ast != NULL)
-		ast_before_simplify = original_ast;
+		ast_before_simplify = std::move(original_ast);
 	else
 		ast_before_simplify = ast->clone();
 
@@ -1126,7 +1143,7 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 
 	if (!defer)
 	{
-		for (const AstNode *node : ast->children)
+		for (auto& node : ast->children)
 			if (node->type == AST_PARAMETER && param_has_no_default(node))
 				node->input_error("Parameter `%s' has no default value and has not been overridden!\n", node->str.c_str());
 
@@ -1134,7 +1151,7 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 
 		if (!blackbox_module && !flag_noblackbox) {
 			blackbox_module = true;
-			for (auto child : ast->children) {
+			for (const auto& child : ast->children) {
 				if (child->type == AST_WIRE && (child->is_input || child->is_output))
 					continue;
 				if (child->type == AST_PARAMETER || child->type == AST_LOCALPARAM)
@@ -1164,36 +1181,33 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 			ast->dumpVlog(NULL, "    ");
 			log("--- END OF AST DUMP ---\n");
 		}
-
+		for (auto &attr: ast->attributes)
+			log_assert((bool)attr.second.get());
 		if (flag_nowb && ast->attributes.count(ID::whitebox)) {
-			delete ast->attributes.at(ID::whitebox);
 			ast->attributes.erase(ID::whitebox);
 		}
-
+		for (auto &attr: ast->attributes)
+			log_assert((bool)attr.second.get());
 		if (ast->attributes.count(ID::lib_whitebox)) {
-			if (!flag_lib || flag_nowb) {
-				delete ast->attributes.at(ID::lib_whitebox);
-				ast->attributes.erase(ID::lib_whitebox);
-			} else {
-				if (ast->attributes.count(ID::whitebox)) {
-					delete ast->attributes.at(ID::whitebox);
-					ast->attributes.erase(ID::whitebox);
-				}
-				AstNode *n = ast->attributes.at(ID::lib_whitebox);
-				ast->set_attribute(ID::whitebox, n);
-				ast->attributes.erase(ID::lib_whitebox);
+			if (flag_lib && !flag_nowb) {
+				ast->attributes[ID::whitebox] = std::move(
+					ast->attributes[ID::lib_whitebox]
+				);
 			}
+			ast->attributes.erase(ID::lib_whitebox);
 		}
+		for (auto &attr: ast->attributes)
+			log_assert((bool)attr.second.get());
 
 		if (!blackbox_module && ast->attributes.count(ID::blackbox)) {
-			AstNode *n = ast->attributes.at(ID::blackbox);
+			auto& n = ast->attributes.at(ID::blackbox);
 			if (n->type != AST_CONSTANT)
 				ast->input_error("Got blackbox attribute with non-constant value!\n");
 			blackbox_module = n->asBool();
 		}
 
 		if (blackbox_module && ast->attributes.count(ID::whitebox)) {
-			AstNode *n = ast->attributes.at(ID::whitebox);
+			auto& n = ast->attributes.at(ID::whitebox);
 			if (n->type != AST_CONSTANT)
 				ast->input_error("Got whitebox attribute with non-constant value!\n");
 			blackbox_module = !n->asBool();
@@ -1201,38 +1215,34 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 
 		if (ast->attributes.count(ID::noblackbox)) {
 			if (blackbox_module) {
-				AstNode *n = ast->attributes.at(ID::noblackbox);
+				auto& n = ast->attributes.at(ID::noblackbox);
 				if (n->type != AST_CONSTANT)
 					ast->input_error("Got noblackbox attribute with non-constant value!\n");
 				blackbox_module = !n->asBool();
 			}
-			delete ast->attributes.at(ID::noblackbox);
 			ast->attributes.erase(ID::noblackbox);
 		}
-
+		for (auto &attr: ast->attributes)
+			log_assert((bool)attr.second.get());
 		if (blackbox_module)
 		{
 			if (ast->attributes.count(ID::whitebox)) {
-				delete ast->attributes.at(ID::whitebox);
 				ast->attributes.erase(ID::whitebox);
 			}
 
 			if (ast->attributes.count(ID::lib_whitebox)) {
-				delete ast->attributes.at(ID::lib_whitebox);
 				ast->attributes.erase(ID::lib_whitebox);
 			}
 
-			std::vector<AstNode*> new_children;
-			for (auto child : ast->children) {
+			std::vector<std::unique_ptr<AstNode>> new_children;
+			for (auto& child : ast->children) {
 				if (child->type == AST_WIRE && (child->is_input || child->is_output)) {
-					new_children.push_back(child);
+					new_children.push_back(std::move(child));
 				} else if (child->type == AST_PARAMETER) {
-					new_children.push_back(child);
+					new_children.push_back(std::move(child));
 				} else if (child->type == AST_CELL && child->children.size() > 0 && child->children[0]->type == AST_CELLTYPE &&
 						(child->children[0]->str == "$specify2" || child->children[0]->str == "$specify3" || child->children[0]->str == "$specrule")) {
-					new_children.push_back(child);
-				} else {
-					delete child;
+					new_children.push_back(std::move(child));
 				}
 			}
 
@@ -1246,17 +1256,18 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 		ignoreThisSignalsInInitial = RTLIL::SigSpec();
 
 		for (auto &attr : ast->attributes) {
+			log_assert((bool)attr.second.get());
 			if (attr.second->type != AST_CONSTANT)
 				ast->input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
 			module->attributes[attr.first] = attr.second->asAttrConst();
 		}
 		for (size_t i = 0; i < ast->children.size(); i++) {
-			AstNode *node = ast->children[i];
+			const auto& node = ast->children[i];
 			if (node->type == AST_WIRE || node->type == AST_MEMORY)
 				node->genRTLIL();
 		}
 		for (size_t i = 0; i < ast->children.size(); i++) {
-			AstNode *node = ast->children[i];
+			const auto& node = ast->children[i];
 			if (node->type != AST_WIRE && node->type != AST_MEMORY && node->type != AST_INITIAL)
 				node->genRTLIL();
 		}
@@ -1264,7 +1275,7 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 		ignoreThisSignalsInInitial.sort_and_unify();
 
 		for (size_t i = 0; i < ast->children.size(); i++) {
-			AstNode *node = ast->children[i];
+			const auto& node = ast->children[i];
 			if (node->type == AST_INITIAL)
 				node->genRTLIL();
 		}
@@ -1278,14 +1289,14 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 				continue;
 			module->attributes[attr.first] = attr.second->asAttrConst();
 		}
-		for (const AstNode *node : ast->children)
+		for (const auto& node : ast->children)
 			if (node->type == AST_PARAMETER)
 				current_module->avail_parameters(node->str);
 	}
 
 	if (ast->type == AST_INTERFACE)
 		module->set_bool_attribute(ID::is_interface);
-	module->ast = ast_before_simplify;
+	module->ast = std::move(ast_before_simplify);
 	module->nolatches = flag_nolatches;
 	module->nomeminit = flag_nomeminit;
 	module->nomem2reg = flag_nomem2reg;
@@ -1312,8 +1323,8 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 RTLIL::Module *
 AST_INTERNAL::process_and_replace_module(RTLIL::Design *design,
                                          RTLIL::Module *old_module,
-                                         AstNode *new_ast,
-                                         AstNode *original_ast)
+                                         AST::AstNode *new_ast,
+                                         std::unique_ptr<AstNode> original_ast)
 {
 	// The old module will be deleted. Rename and mark for deletion, using
 	// a static counter to make sure we get a unique name.
@@ -1336,7 +1347,7 @@ AST_INTERNAL::process_and_replace_module(RTLIL::Design *design,
 	}
 
 	// Generate RTLIL from AST for the new module and add to the design:
-	RTLIL::Module* new_module = process_module(design, new_ast, false, original_ast);
+	RTLIL::Module* new_module = process_module(design, new_ast, false, std::move(original_ast));
 
 	if (is_top)
 		new_module->set_bool_attribute(ID::top);
@@ -1348,17 +1359,17 @@ AST_INTERNAL::process_and_replace_module(RTLIL::Design *design,
 static void rename_in_package_stmts(AstNode *pkg)
 {
 	std::unordered_set<std::string> idents;
-	for (AstNode *item : pkg->children)
+	for (auto& item : pkg->children)
 		idents.insert(item->str);
-	std::function<void(AstNode*)> rename =
-		[&rename, &idents, pkg](AstNode *node) {
-			for (AstNode *child : node->children) {
+	std::function<void(std::unique_ptr<AstNode>&)> rename =
+		[&rename, &idents, pkg](std::unique_ptr<AstNode>& node) {
+			for (auto& child : node->children) {
 				if (idents.count(child->str))
 					child->str = pkg->str + "::" + child->str.substr(1);
 				rename(child);
 			}
 	};
-	for (AstNode *item : pkg->children)
+	for (auto& item : pkg->children)
 		if (item->type == AST_FUNCTION || item->type == AST_TASK)
 			rename(item);
 }
@@ -1391,17 +1402,17 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool nodisplay, bool dump
 	ast->fixup_hierarchy_flags(true);
 
 	log_assert(current_ast->type == AST_DESIGN);
-	for (AstNode *child : current_ast->children)
+	for (const auto& child : current_ast->children)
 	{
 		if (child->type == AST_MODULE || child->type == AST_INTERFACE)
 		{
-			for (auto n : design->verilog_globals)
+			for (auto& n : design->verilog_globals)
 				child->children.push_back(n->clone());
 
 			// append nodes from previous packages using package-qualified names
-			for (auto &n : design->verilog_packages) {
+			for (auto& n : design->verilog_packages) {
 				for (auto &o : n->children) {
-					AstNode *cloned_node = o->clone();
+					auto cloned_node = o->clone();
 					// log("cloned node %s\n", type2str(cloned_node->type).c_str());
 					if (cloned_node->type == AST_ENUM) {
 						for (auto &e : cloned_node->children) {
@@ -1411,7 +1422,7 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool nodisplay, bool dump
 					} else {
 						cloned_node->str = n->str + std::string("::") + cloned_node->str.substr(1);
 					}
-					child->children.push_back(cloned_node);
+					child->children.push_back(std::move(cloned_node));
 				}
 			}
 
@@ -1420,7 +1431,7 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool nodisplay, bool dump
 
 			bool defer_local = defer;
 			if (!defer_local)
-				for (const AstNode *node : child->children)
+				for (const auto& node : child->children)
 					if (node->type == AST_PARAMETER && param_has_no_default(node))
 					{
 						log("Deferring `%s' because it contains parameter(s) without defaults.\n", child->str.c_str());
@@ -1448,13 +1459,13 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool nodisplay, bool dump
 				}
 			}
 
-			process_module(design, child, defer_local);
+			process_module(design, child.get(), defer_local);
 			current_ast_mod = nullptr;
 		}
 		else if (child->type == AST_PACKAGE) {
 			// process enum/other declarations
 			child->simplify(true, 1, -1, false);
-			rename_in_package_stmts(child);
+			rename_in_package_stmts(child.get());
 			design->verilog_packages.push_back(child->clone());
 			current_scope.clear();
 		}
@@ -1471,16 +1482,9 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool nodisplay, bool dump
 			current_scope.clear();
 		}
 	}
-}
 
-// AstModule destructor
-AstModule::~AstModule()
-{
-	if (ast != NULL)
-		delete ast;
 }
 
-
 // An interface port with modport is specified like this:
 //    <interface_name>.<modport_name>
 // This function splits the interface_name from the modport_name, and fails if it is not a valid combination
@@ -1517,7 +1521,7 @@ AstNode * AST::find_modport(AstNode *intf, std::string name)
 	for (auto &ch : intf->children)
 		if (ch->type == AST_MODPORT)
 			if (ch->str == name) // Modport found
-				return ch;
+				return ch.get();
 	return NULL;
 }
 
@@ -1525,7 +1529,7 @@ AstNode * AST::find_modport(AstNode *intf, std::string name)
 void AST::explode_interface_port(AstNode *module_ast, RTLIL::Module * intfmodule, std::string intfname, AstNode *modport)
 {
 	for (auto w : intfmodule->wires()){
-		AstNode *wire = new AstNode(AST_WIRE, new AstNode(AST_RANGE, AstNode::mkconst_int(w->width -1, true), AstNode::mkconst_int(0, true)));
+		auto wire = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(w->width -1, true), AstNode::mkconst_int(0, true)));
 		std::string origname = log_id(w->name);
 		std::string newname = intfname + "." + origname;
 		wire->str = newname;
@@ -1544,16 +1548,13 @@ void AST::explode_interface_port(AstNode *module_ast, RTLIL::Module * intfmodule
 				}
 			}
 			if (found_in_modport) {
-				module_ast->children.push_back(wire);
-			}
-			else { // If not found in modport, do not create port
-				delete wire;
+				module_ast->children.push_back(std::move(wire));
 			}
 		}
 		else { // If no modport, set inout
 			wire->is_input = true;
 			wire->is_output = true;
-			module_ast->children.push_back(wire);
+			module_ast->children.push_back(std::move(wire));
 		}
 	}
 }
@@ -1571,7 +1572,7 @@ bool AstModule::reprocess_if_necessary(RTLIL::Design *design)
 			log("Reprocessing module %s because instantiated module %s has become available.\n",
 					log_id(name), log_id(modname));
 			loadconfig();
-			process_and_replace_module(design, this, ast, NULL);
+			process_and_replace_module(design, this, ast.get(), NULL);
 			return true;
 		}
 	}
@@ -1584,32 +1585,32 @@ void AstModule::expand_interfaces(RTLIL::Design *design, const dict<RTLIL::IdStr
 {
 	loadconfig();
 
-	AstNode *new_ast = ast->clone();
+	auto new_ast = ast->clone();
 	for (auto &intf : local_interfaces) {
 		std::string intfname = intf.first.str();
 		RTLIL::Module *intfmodule = intf.second;
 		for (auto w : intfmodule->wires()){
-			AstNode *wire = new AstNode(AST_WIRE, new AstNode(AST_RANGE, AstNode::mkconst_int(w->width -1, true), AstNode::mkconst_int(0, true)));
+			auto wire = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(w->width -1, true), AstNode::mkconst_int(0, true)));
 			std::string newname = log_id(w->name);
 			newname = intfname + "." + newname;
 			wire->str = newname;
-			new_ast->children.push_back(wire);
+			new_ast->children.push_back(std::move(wire));
 		}
 	}
 
-	AstNode *ast_before_replacing_interface_ports = new_ast->clone();
+	auto ast_before_replacing_interface_ports = new_ast->clone();
 
 	// Explode all interface ports. Note this will only have an effect on 'top
 	// level' modules. Other sub-modules will have their interface ports
 	// exploded via the derive(..) function
 	for (size_t i =0; i<new_ast->children.size(); i++)
 	{
-		AstNode *ch2 = new_ast->children[i];
+		const auto& ch2 = new_ast->children[i];
 		if (ch2->type == AST_INTERFACEPORT) { // Is an interface port
 			std::string name_port = ch2->str; // Name of the interface port
 			if (ch2->children.size() > 0) {
 				for(size_t j=0; j<ch2->children.size();j++) {
-					AstNode *ch = ch2->children[j];
+					const auto& ch = ch2->children[j];
 					if(ch->type == AST_INTERFACEPORTTYPE) { // Found the AST node containing the type of the interface
 						std::pair<std::string,std::string> res = split_modport_from_type(ch->str);
 						std::string interface_type = res.first;
@@ -1617,11 +1618,11 @@ void AstModule::expand_interfaces(RTLIL::Design *design, const dict<RTLIL::IdStr
 						if (design->module(interface_type) != nullptr) {
 							// Add a cell to the module corresponding to the interface port such that
 							// it can further propagated down if needed:
-							AstNode *celltype_for_intf = new AstNode(AST_CELLTYPE);
+							auto celltype_for_intf = std::make_unique<AstNode>(AST_CELLTYPE);
 							celltype_for_intf->str = interface_type;
-							AstNode *cell_for_intf = new AstNode(AST_CELL, celltype_for_intf);
+							auto cell_for_intf = std::make_unique<AstNode>(AST_CELL, std::move(celltype_for_intf));
 							cell_for_intf->str = name_port + "_inst_from_top_dummy";
-							new_ast->children.push_back(cell_for_intf);
+							new_ast->children.push_back(std::move(cell_for_intf));
 
 							// Get all members of this non-overridden dummy interface instance:
 							RTLIL::Module *intfmodule = design->module(interface_type); // All interfaces should at this point in time (assuming
@@ -1629,9 +1630,9 @@ void AstModule::expand_interfaces(RTLIL::Design *design, const dict<RTLIL::IdStr
 							                                                              // present in design->modules_
 							AstModule *ast_module_of_interface = (AstModule*)intfmodule;
 							std::string interface_modport_compare_str = "\\" + interface_modport;
-							AstNode *modport = find_modport(ast_module_of_interface->ast, interface_modport_compare_str); // modport == NULL if no modport
+							AstNode *modport = find_modport(ast_module_of_interface->ast.get(), interface_modport_compare_str); // modport == NULL if no modport
 							// Iterate over all wires in the interface and add them to the module:
-							explode_interface_port(new_ast, intfmodule, name_port, modport);
+							explode_interface_port(new_ast.get(), intfmodule, name_port, modport);
 						}
 						break;
 					}
@@ -1643,9 +1644,7 @@ void AstModule::expand_interfaces(RTLIL::Design *design, const dict<RTLIL::IdStr
 	// Generate RTLIL from AST for the new module and add to the design,
 	// renaming this module to move it out of the way.
 	RTLIL::Module* new_module =
-		process_and_replace_module(design, this, new_ast, ast_before_replacing_interface_ports);
-
-	delete new_ast;
+		process_and_replace_module(design, this, new_ast.get(), std::move(ast_before_replacing_interface_ports));
 
 	// Set the attribute "interfaces_replaced_in_module" so that it does not happen again.
 	new_module->set_bool_attribute(ID::interfaces_replaced_in_module);
@@ -1655,7 +1654,7 @@ void AstModule::expand_interfaces(RTLIL::Design *design, const dict<RTLIL::IdStr
 // This method is used to explode the interface when the interface is a port of the module (not instantiated inside)
 RTLIL::IdString AstModule::derive(RTLIL::Design *design, const dict<RTLIL::IdString, RTLIL::Const> &parameters, const dict<RTLIL::IdString, RTLIL::Module*> &interfaces, const dict<RTLIL::IdString, RTLIL::IdString> &modports, bool /*mayfail*/)
 {
-	AstNode *new_ast = NULL;
+	std::unique_ptr<AstNode> new_ast = NULL;
 	std::string modname = derive_common(design, parameters, &new_ast);
 
 	// Since interfaces themselves may be instantiated with different parameters,
@@ -1691,14 +1690,14 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, const dict<RTLIL::IdStr
 			if (modports.count(intfname) > 0) {
 				std::string interface_modport = modports.at(intfname).str();
 				AstModule *ast_module_of_interface = (AstModule*)intfmodule;
-				AstNode *ast_node_of_interface = ast_module_of_interface->ast;
+				AstNode *ast_node_of_interface = ast_module_of_interface->ast.get();
 				modport = find_modport(ast_node_of_interface, interface_modport);
 			}
 			// Iterate over all wires in the interface and add them to the module:
-			explode_interface_port(new_ast, intfmodule, intfname, modport);
+			explode_interface_port(new_ast.get(), intfmodule, intfname, modport);
 		}
 
-		process_module(design, new_ast, false);
+		process_module(design, new_ast.get(), false);
 		design->module(modname)->check();
 
 		RTLIL::Module* mod = design->module(modname);
@@ -1735,7 +1734,6 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, const dict<RTLIL::IdStr
 		log("Found cached RTLIL representation for module `%s'.\n", modname.c_str());
 	}
 
-	delete new_ast;
 	return modname;
 }
 
@@ -1744,18 +1742,17 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, const dict<RTLIL::IdStr
 {
 	bool quiet = lib || attributes.count(ID::blackbox) || attributes.count(ID::whitebox);
 
-	AstNode *new_ast = NULL;
+	std::unique_ptr<AstNode> new_ast = NULL;
 	std::string modname = derive_common(design, parameters, &new_ast, quiet);
 
 	if (!design->has(modname) && new_ast) {
 		new_ast->str = modname;
-		process_module(design, new_ast, false, NULL, quiet);
+		process_module(design, new_ast.get(), false, NULL, quiet);
 		design->module(modname)->check();
 	} else if (!quiet) {
 		log("Found cached RTLIL representation for module `%s'.\n", modname.c_str());
 	}
 
-	delete new_ast;
 	return modname;
 }
 
@@ -1785,7 +1782,7 @@ std::string AST::derived_module_name(std::string stripped_name, const std::vecto
 }
 
 // create a new parametric module (when needed) and return the name of the generated module
-std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::IdString, RTLIL::Const> &parameters, AstNode **new_ast_out, bool quiet)
+std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::IdString, RTLIL::Const> &parameters, std::unique_ptr<AstNode>* new_ast_out, bool quiet)
 {
 	std::string stripped_name = name.str();
 	(*new_ast_out) = nullptr;
@@ -1795,7 +1792,7 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 
 	int para_counter = 0;
 	std::vector<std::pair<RTLIL::IdString, RTLIL::Const>> named_parameters;
-	for (const auto child : ast->children) {
+	for (const auto& child : ast->children) {
 		if (child->type != AST_PARAMETER)
 			continue;
 		para_counter++;
@@ -1829,12 +1826,12 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 	pool<IdString> rewritten;
 	rewritten.reserve(GetSize(parameters));
 
-	AstNode *new_ast = ast->clone();
+	auto new_ast = ast->clone();
 	if (!new_ast->attributes.count(ID::hdlname))
 		new_ast->set_attribute(ID::hdlname, AstNode::mkconst_str(stripped_name.substr(1)));
 
 	para_counter = 0;
-	for (auto child : new_ast->children) {
+	for (auto& child : new_ast->children) {
 		if (child->type != AST_PARAMETER)
 			continue;
 		para_counter++;
@@ -1854,9 +1851,8 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 	rewrite_parameter:
 		if (param_has_no_default(child))
 			child->children.insert(child->children.begin(), nullptr);
-		delete child->children.at(0);
 		if ((it->second.flags & RTLIL::CONST_FLAG_REAL) != 0) {
-			child->children[0] = new AstNode(AST_REALVALUE);
+			child->children[0] = std::make_unique<AstNode>(AST_REALVALUE);
 			child->children[0]->realvalue = std::stod(it->second.decode_string());
 		} else if ((it->second.flags & RTLIL::CONST_FLAG_STRING) != 0)
 			child->children[0] = AstNode::mkconst_str(it->second.decode_string());
@@ -1869,17 +1865,17 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 		for (const auto &param : parameters) {
 			if (rewritten.count(param.first))
 				continue;
-			AstNode *defparam = new AstNode(AST_DEFPARAM, new AstNode(AST_IDENTIFIER));
+			auto defparam = std::make_unique<AstNode>(AST_DEFPARAM, std::make_unique<AstNode>(AST_IDENTIFIER));
 			defparam->children[0]->str = param.first.str();
 			if ((param.second.flags & RTLIL::CONST_FLAG_STRING) != 0)
 				defparam->children.push_back(AstNode::mkconst_str(param.second.decode_string()));
 			else
 				defparam->children.push_back(AstNode::mkconst_bits(param.second.to_bits(), (param.second.flags & RTLIL::CONST_FLAG_SIGNED) != 0));
-			new_ast->children.push_back(defparam);
+			new_ast->children.push_back(std::move(defparam));
 		}
 
 	new_ast->fixup_hierarchy_flags(true);
-	(*new_ast_out) = new_ast;
+	new_ast_out->reset(new_ast.release());
 	return modname;
 }
 
diff --git a/frontends/ast/ast.h b/frontends/ast/ast.h
index 776b5c833..72dddab67 100644
--- a/frontends/ast/ast.h
+++ b/frontends/ast/ast.h
@@ -184,10 +184,10 @@ namespace AST
 		AstNodeType type;
 
 		// the list of child nodes for this node
-		std::vector<AstNode*> children;
+		std::vector<std::unique_ptr<AstNode>> children;
 
 		// the list of attributes assigned to this node
-		std::map<RTLIL::IdString, AstNode*> attributes;
+		std::map<RTLIL::IdString, std::unique_ptr<AstNode>> attributes;
 		bool get_bool_attribute(RTLIL::IdString id);
 
 		// node content - most of it is unused in most node types
@@ -213,7 +213,7 @@ namespace AST
 		int unpacked_dimensions;
 
 		// this is set by simplify and used during RTLIL generation
-		AstNode *id2ast;
+		AstNode* id2ast;
 
 		// this is used by simplify to detect if basic analysis has been performed already on the node
 		bool basic_prep;
@@ -235,9 +235,9 @@ namespace AST
 		bool in_param_from_above;
 
 		// creating and deleting nodes
-		AstNode(AstNodeType type = AST_NONE, AstNode *child1 = nullptr, AstNode *child2 = nullptr, AstNode *child3 = nullptr, AstNode *child4 = nullptr);
-		AstNode *clone() const;
-		void cloneInto(AstNode *other) const;
+		AstNode(AstNodeType type = AST_NONE, std::unique_ptr<AstNode> child1 = nullptr, std::unique_ptr<AstNode> child2 = nullptr, std::unique_ptr<AstNode> child3 = nullptr, std::unique_ptr<AstNode> child4 = nullptr);
+		std::unique_ptr<AstNode> clone() const;
+		void cloneInto(AstNode &other) const;
 		void delete_children();
 		~AstNode();
 
@@ -265,15 +265,16 @@ namespace AST
 		// simplify() creates a simpler AST by unrolling for-loops, expanding generate blocks, etc.
 		// it also sets the id2ast pointers so that identifier lookups are fast in genRTLIL()
 		bool simplify(bool const_fold, int stage, int width_hint, bool sign_hint);
+		void null_check();
 		void replace_result_wire_name_in_function(const std::string &from, const std::string &to);
-		AstNode *readmem(bool is_readmemh, std::string mem_filename, AstNode *memory, int start_addr, int finish_addr, bool unconditional_init);
+		std::unique_ptr<AstNode> readmem(bool is_readmemh, std::string mem_filename, AstNode *memory, int start_addr, int finish_addr, bool unconditional_init);
 		void expand_genblock(const std::string &prefix);
 		void label_genblks(std::set<std::string>& existing, int &counter);
 		void mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg_places,
 				dict<AstNode*, uint32_t> &mem2reg_flags, dict<AstNode*, uint32_t> &proc_flags, uint32_t &status_flags);
-		bool mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod, AstNode *block, AstNode *&async_block);
+		bool mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod, AstNode *block, AstNode* async_block);
 		bool mem2reg_check(pool<AstNode*> &mem2reg_set);
-		void mem2reg_remove(pool<AstNode*> &mem2reg_set, vector<AstNode*> &delnodes);
+		void mem2reg_remove(pool<AstNode*> &mem2reg_set);
 		void meminfo(int &mem_width, int &mem_size, int &addr_bits);
 		bool detect_latch(const std::string &var);
 		const RTLIL::Module* lookup_cell_module();
@@ -289,7 +290,7 @@ namespace AST
 		};
 		bool has_const_only_constructs();
 		bool replace_variables(std::map<std::string, varinfo_t> &variables, AstNode *fcall, bool must_succeed);
-		AstNode *eval_const_function(AstNode *fcall, bool must_succeed);
+		std::unique_ptr<AstNode> eval_const_function(AstNode *fcall, bool must_succeed);
 		bool is_simple_const_expr();
 
 		// helper for parsing format strings
@@ -306,29 +307,30 @@ namespace AST
 		std::vector<RTLIL::Binding *> genBindings() const;
 
 		// used by genRTLIL() for detecting expression width and sign
-		void detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *found_real = NULL);
-		void detectSignWidth(int &width_hint, bool &sign_hint, bool *found_real = NULL);
+		void detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *found_real = nullptr);
+		void detectSignWidth(int &width_hint, bool &sign_hint, bool *found_real = nullptr);
 
 		// create RTLIL code for this AST node
 		// for expressions the resulting signal vector is returned
 		// all generated cell instances, etc. are written to the RTLIL::Module pointed to by AST_INTERNAL::current_module
 		RTLIL::SigSpec genRTLIL(int width_hint = -1, bool sign_hint = false);
-		RTLIL::SigSpec genWidthRTLIL(int width, bool sgn, const dict<RTLIL::SigBit, RTLIL::SigBit> *new_subst_ptr = NULL);
+		RTLIL::SigSpec genWidthRTLIL(int width, bool sgn, const dict<RTLIL::SigBit, RTLIL::SigBit> *new_subst_ptr = nullptr);
 
 		// compare AST nodes
 		bool operator==(const AstNode &other) const;
 		bool operator!=(const AstNode &other) const;
 		bool contains(const AstNode *other) const;
+		AstNode operator=(AstNode) = delete;
 
 		// helper functions for creating AST nodes for constants
-		static AstNode *mkconst_int(uint32_t v, bool is_signed, int width = 32);
-		static AstNode *mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed, bool is_unsized);
-		static AstNode *mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed);
-		static AstNode *mkconst_str(const std::vector<RTLIL::State> &v);
-		static AstNode *mkconst_str(const std::string &str);
+		static std::unique_ptr<AstNode> mkconst_int(uint32_t v, bool is_signed, int width = 32);
+		static std::unique_ptr<AstNode> mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed, bool is_unsized);
+		static std::unique_ptr<AstNode> mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed);
+		static std::unique_ptr<AstNode> mkconst_str(const std::vector<RTLIL::State> &v);
+		static std::unique_ptr<AstNode> mkconst_str(const std::string &str);
 
 		// helper function to create an AST node for a temporary register
-		AstNode *mktemp_logic(const std::string &name, AstNode *mod, bool nosync, int range_left, int range_right, bool is_signed);
+		std::unique_ptr<AstNode> mktemp_logic(const std::string &name, AstNode *mod, bool nosync, int range_left, int range_right, bool is_signed);
 
 		// helper function for creating sign-extended const objects
 		RTLIL::Const bitsAsConst(int width, bool is_signed);
@@ -357,12 +359,12 @@ namespace AST
 
 		// helper to clone the node with some of its subexpressions replaced with zero (this is used
 		// to evaluate widths of dynamic ranges)
-		AstNode *clone_at_zero();
+		std::unique_ptr<AstNode> clone_at_zero();
 
-		void set_attribute(RTLIL::IdString key, AstNode *node)
+		void set_attribute(RTLIL::IdString key, std::unique_ptr<AstNode> node)
 		{
-			attributes[key] = node;
 			node->set_in_param_flag(true);
+			attributes[key] = std::move(node);
 		}
 
 		// helper to set in_lvalue/in_param flags from the hierarchy context (the actual flag
@@ -378,7 +380,7 @@ namespace AST
 		void fixup_hierarchy_flags(bool force_descend = false);
 
 		// helpers for indexing
-		AstNode *make_index_range(AstNode *node, bool unpacked_range = false);
+		std::unique_ptr<AstNode> make_index_range(AstNode *node, bool unpacked_range = false);
 		AstNode *get_struct_member() const;
 
 		// helper to print errors from simplify/genrtlil code
@@ -392,12 +394,11 @@ namespace AST
 	// parametric modules are supported directly by the AST library
 	// therefore we need our own derivate of RTLIL::Module with overloaded virtual functions
 	struct AstModule : RTLIL::Module {
-		AstNode *ast;
+		std::unique_ptr<AstNode> ast;
 		bool nolatches, nomeminit, nomem2reg, mem2reg, noblackbox, lib, nowb, noopt, icells, pwires, autowire;
-		~AstModule() override;
 		RTLIL::IdString derive(RTLIL::Design *design, const dict<RTLIL::IdString, RTLIL::Const> &parameters, bool mayfail) override;
 		RTLIL::IdString derive(RTLIL::Design *design, const dict<RTLIL::IdString, RTLIL::Const> &parameters, const dict<RTLIL::IdString, RTLIL::Module*> &interfaces, const dict<RTLIL::IdString, RTLIL::IdString> &modports, bool mayfail) override;
-		std::string derive_common(RTLIL::Design *design, const dict<RTLIL::IdString, RTLIL::Const> &parameters, AstNode **new_ast_out, bool quiet = false);
+		std::string derive_common(RTLIL::Design *design, const dict<RTLIL::IdString, RTLIL::Const> &parameters, std::unique_ptr<AstNode>* new_ast_out, bool quiet = false);
 		void expand_interfaces(RTLIL::Design *design, const dict<RTLIL::IdString, RTLIL::Module *> &local_interfaces) override;
 		bool reprocess_if_necessary(RTLIL::Design *design) override;
 		RTLIL::Module *clone() const override;
@@ -408,8 +409,8 @@ namespace AST
 	// the AstNode constructor then uses current_filename and get_line_num()
 	// to initialize the filename and linenum properties of new nodes
 	extern std::string current_filename;
-	extern void (*set_line_num)(int);
-	extern int (*get_line_num)();
+	// also set by the language frontend to control some AST processing
+	extern bool sv_mode;
 
 	// for stats
 	unsigned long long astnode_count();
@@ -419,7 +420,7 @@ namespace AST
 	void use_internal_line_num();
 
 	// call a DPI function
-	AstNode *dpi_call(const std::string &rtype, const std::string &fname, const std::vector<std::string> &argtypes, const std::vector<AstNode*> &args);
+	std::unique_ptr<AstNode> dpi_call(const std::string &rtype, const std::string &fname, const std::vector<std::string> &argtypes, const std::vector<std::unique_ptr<AstNode>> &args);
 
 	// Helper functions related to handling SystemVerilog interfaces
 	std::pair<std::string,std::string> split_modport_from_type(std::string name_type);
@@ -465,7 +466,7 @@ namespace AST_INTERNAL
 	process_and_replace_module(RTLIL::Design *design,
 	                           RTLIL::Module *old_module,
 	                           AST::AstNode *new_ast,
-	                           AST::AstNode *original_ast = nullptr);
+	                           std::unique_ptr<AST::AstNode> original_ast = nullptr);
 }
 
 YOSYS_NAMESPACE_END
diff --git a/frontends/ast/dpicall.cc b/frontends/ast/dpicall.cc
index d6fcc26bd..4fa375df7 100644
--- a/frontends/ast/dpicall.cc
+++ b/frontends/ast/dpicall.cc
@@ -64,9 +64,9 @@ static ffi_fptr resolve_fn (std::string symbol_name)
 	log_error("unable to resolve '%s'.\n", symbol_name.c_str());
 }
 
-AST::AstNode *AST::dpi_call(const std::string &rtype, const std::string &fname, const std::vector<std::string> &argtypes, const std::vector<AstNode*> &args)
+std::unique_ptr<AST::AstNode> AST::dpi_call(const std::string &rtype, const std::string &fname, const std::vector<std::string> &argtypes, const std::vector<std::unique_ptr<AST::AstNode>> &args)
 {
-	AST::AstNode *newNode = nullptr;
+	std::unique_ptr<AST::AstNode> newNode = nullptr;
 	union value { double f64; float f32; int32_t i32; void *ptr; };
 	std::vector<value> value_store(args.size() + 1);
 	std::vector<ffi_type *> types(args.size() + 1);
@@ -125,11 +125,11 @@ AST::AstNode *AST::dpi_call(const std::string &rtype, const std::string &fname,
         ffi_call(&cif, resolve_fn(fname.c_str()), values[args.size()], values.data());
 
 	if (rtype == "real") {
-		newNode = new AstNode(AST_REALVALUE);
+		newNode = std::make_unique<AstNode>(AST_REALVALUE);
 		newNode->realvalue = value_store[args.size()].f64;
 		log("  return realvalue: %g\n", newNode->asReal(true));
 	} else if (rtype == "shortreal") {
-		newNode = new AstNode(AST_REALVALUE);
+		newNode = std::make_unique<AstNode>(AST_REALVALUE);
 		newNode->realvalue = value_store[args.size()].f32;
 		log("  return realvalue: %g\n", newNode->asReal(true));
 	} else if (rtype == "chandle") {
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 79e543376..5139aade2 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -85,7 +85,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
 	set_src_attr(wire, that);
 	wire->is_signed = that->is_signed;
 
-	if (that != NULL)
+	if (that != nullptr)
 		for (auto &attr : that->attributes) {
 			if (attr.second->type != AST_CONSTANT)
 				that->input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
@@ -195,22 +195,22 @@ struct AST_INTERNAL::LookaheadRewriter
 		if (node->lookahead) {
 			log_assert(node->type == AST_IDENTIFIER);
 			if (!lookaheadids.count(node->str)) {
-				AstNode *wire = new AstNode(AST_WIRE);
-				for (auto c : node->id2ast->children)
+				auto wire = std::make_unique<AstNode>(AST_WIRE);
+				for (auto& c : node->id2ast->children)
 					wire->children.push_back(c->clone());
 				wire->fixup_hierarchy_flags();
 				wire->str = stringf("$lookahead%s$%d", node->str.c_str(), autoidx++);
 				wire->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
 				wire->is_logic = true;
 				while (wire->simplify(true, 1, -1, false)) { }
-				current_ast_mod->children.push_back(wire);
-				lookaheadids[node->str] = make_pair(node->id2ast, wire);
+				lookaheadids[node->str] = make_pair(node->id2ast, wire.get());
 				wire->genRTLIL();
+				current_ast_mod->children.push_back(std::move(wire));
 			}
 		}
 
-		for (auto child : node->children)
-			collect_lookaheadids(child);
+		for (auto& child : node->children)
+			collect_lookaheadids(child.get());
 	}
 
 	bool has_lookaheadids(AstNode *node)
@@ -218,8 +218,8 @@ struct AST_INTERNAL::LookaheadRewriter
 		if (node->type == AST_IDENTIFIER && lookaheadids.count(node->str) != 0)
 			return true;
 
-		for (auto child : node->children)
-			if (has_lookaheadids(child))
+		for (auto& child : node->children)
+			if (has_lookaheadids(child.get()))
 				return true;
 
 		return false;
@@ -230,8 +230,8 @@ struct AST_INTERNAL::LookaheadRewriter
 		if (node->type == AST_IDENTIFIER && lookaheadids.count(node->str) == 0)
 			return true;
 
-		for (auto child : node->children)
-			if (has_nonlookaheadids(child))
+		for (auto& child : node->children)
+			if (has_nonlookaheadids(child.get()))
 				return true;
 
 		return false;
@@ -241,16 +241,16 @@ struct AST_INTERNAL::LookaheadRewriter
 	{
 		if (node->type == AST_ASSIGN_LE)
 		{
-			if (has_lookaheadids(node->children[0]))
+			if (has_lookaheadids(node->children[0].get()))
 			{
-				if (has_nonlookaheadids(node->children[0]))
+				if (has_nonlookaheadids(node->children[0].get()))
 					log_error("incompatible mix of lookahead and non-lookahead IDs in LHS expression.\n");
 
-				rewrite_lookaheadids(node->children[0], true);
+				rewrite_lookaheadids(node->children[0].get(), true);
 				node->type = AST_ASSIGN_EQ;
 			}
 
-			rewrite_lookaheadids(node->children[1], lhs);
+			rewrite_lookaheadids(node->children[1].get(), lhs);
 			return;
 		}
 
@@ -261,21 +261,21 @@ struct AST_INTERNAL::LookaheadRewriter
 			lhs = false;
 		}
 
-		for (auto child : node->children)
-			rewrite_lookaheadids(child, lhs);
+		for (auto& child : node->children)
+			rewrite_lookaheadids(child.get(), lhs);
 	}
 
 	LookaheadRewriter(AstNode *top)
 	{
-		// top->dumpAst(NULL, "REWRITE-BEFORE> ");
-		// top->dumpVlog(NULL, "REWRITE-BEFORE> ");
+		// top->dumpAst(nullptr, "REWRITE-BEFORE> ");
+		// top->dumpVlog(nullptr, "REWRITE-BEFORE> ");
 
 		AstNode *block = nullptr;
 
-		for (auto c : top->children)
+		for (auto& c : top->children)
 			if (c->type == AST_BLOCK) {
 				log_assert(block == nullptr);
-				block = c;
+				block = c.get();
 			}
 		log_assert(block != nullptr);
 
@@ -284,25 +284,25 @@ struct AST_INTERNAL::LookaheadRewriter
 
 		for (auto it : lookaheadids)
 		{
-			AstNode *ref_orig = new AstNode(AST_IDENTIFIER);
+			auto ref_orig = std::make_unique<AstNode>(AST_IDENTIFIER);
 			ref_orig->str = it.second.first->str;
 			ref_orig->id2ast = it.second.first;
 			ref_orig->was_checked = true;
 
-			AstNode *ref_temp = new AstNode(AST_IDENTIFIER);
+			auto ref_temp = std::make_unique<AstNode>(AST_IDENTIFIER);
 			ref_temp->str = it.second.second->str;
 			ref_temp->id2ast = it.second.second;
 			ref_temp->was_checked = true;
 
-			AstNode *init_assign = new AstNode(AST_ASSIGN_EQ, ref_temp->clone(), ref_orig->clone());
-			AstNode *final_assign = new AstNode(AST_ASSIGN_LE, ref_orig, ref_temp);
+			auto init_assign = std::make_unique<AstNode>(AST_ASSIGN_EQ, ref_temp->clone(), ref_orig->clone());
+			auto final_assign = std::make_unique<AstNode>(AST_ASSIGN_LE, std::move(ref_orig), std::move(ref_temp));
 
-			block->children.insert(block->children.begin(), init_assign);
-			block->children.push_back(final_assign);
+			block->children.insert(block->children.begin(), std::move(init_assign));
+			block->children.push_back(std::move(final_assign));
 		}
 
-		// top->dumpAst(NULL, "REWRITE-AFTER> ");
-		// top->dumpVlog(NULL, "REWRITE-AFTER> ");
+		// top->dumpAst(nullptr, "REWRITE-AFTER> ");
+		// top->dumpVlog(nullptr, "REWRITE-AFTER> ");
 	}
 };
 
@@ -310,7 +310,7 @@ struct AST_INTERNAL::LookaheadRewriter
 struct AST_INTERNAL::ProcessGenerator
 {
 	// input and output structures
-	AstNode *always;
+	std::unique_ptr<AstNode> always;
 	RTLIL::SigSpec initSyncSignals;
 	RTLIL::Process *proc;
 	RTLIL::SigSpec outputSignals;
@@ -341,14 +341,14 @@ struct AST_INTERNAL::ProcessGenerator
 	// The most recently assigned $print or $check cell \PRIORITY.
 	int last_effect_priority;
 
-	ProcessGenerator(AstNode *always, RTLIL::SigSpec initSyncSignalsArg = RTLIL::SigSpec()) : always(always), initSyncSignals(initSyncSignalsArg), last_effect_priority(0)
+	ProcessGenerator(std::unique_ptr<AstNode> a, RTLIL::SigSpec initSyncSignalsArg = RTLIL::SigSpec()) : always(std::move(a)), initSyncSignals(initSyncSignalsArg), last_effect_priority(0)
 	{
 		// rewrite lookahead references
-		LookaheadRewriter la_rewriter(always);
+		LookaheadRewriter la_rewriter(always.get());
 
 		// generate process and simple root case
 		proc = current_module->addProcess(stringf("$proc$%s:%d$%d", RTLIL::encode_filename(always->filename).c_str(), always->location.first_line, autoidx++));
-		set_src_attr(proc, always);
+		set_src_attr(proc, always.get());
 		for (auto &attr : always->attributes) {
 			if (attr.second->type != AST_CONSTANT)
 				always->input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
@@ -358,13 +358,13 @@ struct AST_INTERNAL::ProcessGenerator
 
 		// create initial temporary signal for all output registers
 		RTLIL::SigSpec subst_lvalue_from, subst_lvalue_to;
-		collect_lvalues(subst_lvalue_from, always, true, true);
+		collect_lvalues(subst_lvalue_from, always.get(), true, true);
 		subst_lvalue_to = new_temp_signal(subst_lvalue_from);
 		subst_lvalue_map = subst_lvalue_from.to_sigbit_map(subst_lvalue_to);
 
 		bool found_global_syncs = false;
 		bool found_anyedge_syncs = false;
-		for (auto child : always->children)
+		for (auto& child : always->children)
 		{
 			if ((child->type == AST_POSEDGE || child->type == AST_NEGEDGE) && GetSize(child->children) == 1 && child->children.at(0)->type == AST_IDENTIFIER &&
 					child->children.at(0)->id2ast && child->children.at(0)->id2ast->type == AST_WIRE && child->children.at(0)->id2ast->get_bool_attribute(ID::gclk)) {
@@ -388,7 +388,7 @@ struct AST_INTERNAL::ProcessGenerator
 
 		// create syncs for the process
 		bool found_clocked_sync = false;
-		for (auto child : always->children)
+		for (auto& child : always->children)
 			if (child->type == AST_POSEDGE || child->type == AST_NEGEDGE) {
 				if (GetSize(child->children) == 1 && child->children.at(0)->type == AST_IDENTIFIER && child->children.at(0)->id2ast &&
 						child->children.at(0)->id2ast->type == AST_WIRE && child->children.at(0)->id2ast->get_bool_attribute(ID::gclk))
@@ -420,9 +420,9 @@ struct AST_INTERNAL::ProcessGenerator
 		}
 
 		// process the AST
-		for (auto child : always->children)
+		for (auto& child : always->children)
 			if (child->type == AST_BLOCK)
-				processAst(child);
+				processAst(child.get());
 
 		for (auto sync: proc->syncs)
 			processMemWrites(sync);
@@ -472,7 +472,7 @@ struct AST_INTERNAL::ProcessGenerator
 		for (int i = 0; i < GetSize(chunks); i++)
 		{
 			RTLIL::SigChunk &chunk = chunks[i];
-			if (chunk.wire == NULL)
+			if (chunk.wire == nullptr)
 				continue;
 
 			std::string wire_name;
@@ -484,7 +484,7 @@ struct AST_INTERNAL::ProcessGenerator
 			} while (current_module->wires_.count(wire_name) > 0);
 
 			RTLIL::Wire *wire = current_module->addWire(wire_name, chunk.width);
-			set_src_attr(wire, always);
+			set_src_attr(wire, always.get());
 
 			chunk.wire = wire;
 			chunk.offset = 0;
@@ -499,10 +499,10 @@ struct AST_INTERNAL::ProcessGenerator
 		switch (ast->type)
 		{
 		case AST_CASE:
-			for (auto child : ast->children)
+			for (auto& child : ast->children)
 				if (child != ast->children[0]) {
 					log_assert(child->type == AST_COND || child->type == AST_CONDX || child->type == AST_CONDZ);
-					collect_lvalues(reg, child, type_eq, type_le, false);
+					collect_lvalues(reg, child.get(), type_eq, type_le, false);
 				}
 			break;
 
@@ -511,19 +511,19 @@ struct AST_INTERNAL::ProcessGenerator
 		case AST_CONDZ:
 		case AST_ALWAYS:
 		case AST_INITIAL:
-			for (auto child : ast->children)
+			for (auto& child : ast->children)
 				if (child->type == AST_BLOCK)
-					collect_lvalues(reg, child, type_eq, type_le, false);
+					collect_lvalues(reg, child.get(), type_eq, type_le, false);
 			break;
 
 		case AST_BLOCK:
-			for (auto child : ast->children) {
+			for (auto& child : ast->children) {
 				if (child->type == AST_ASSIGN_EQ && type_eq)
 					reg.append(child->children[0]->genRTLIL());
 				if (child->type == AST_ASSIGN_LE && type_le)
 					reg.append(child->children[0]->genRTLIL());
 				if (child->type == AST_CASE || child->type == AST_BLOCK)
-					collect_lvalues(reg, child, type_eq, type_le, false);
+					collect_lvalues(reg, child.get(), type_eq, type_le, false);
 			}
 			break;
 
@@ -583,8 +583,8 @@ struct AST_INTERNAL::ProcessGenerator
 		switch (ast->type)
 		{
 		case AST_BLOCK:
-			for (auto child : ast->children)
-				processAst(child);
+			for (auto& child : ast->children)
+				processAst(child.get());
 			break;
 
 		case AST_ASSIGN_EQ:
@@ -641,9 +641,9 @@ struct AST_INTERNAL::ProcessGenerator
 				RTLIL::SigSpec this_case_eq_rvalue = this_case_eq_lvalue;
 				this_case_eq_rvalue.replace(subst_rvalue_map.stdmap());
 
-				RTLIL::CaseRule *default_case = NULL;
-				RTLIL::CaseRule *last_generated_case = NULL;
-				for (auto child : ast->children)
+				RTLIL::CaseRule *default_case = nullptr;
+				RTLIL::CaseRule *last_generated_case = nullptr;
+				for (auto& child : ast->children)
 				{
 					if (child == ast->children[0])
 						continue;
@@ -657,14 +657,14 @@ struct AST_INTERNAL::ProcessGenerator
 
 					RTLIL::CaseRule *backup_case = current_case;
 					current_case = new RTLIL::CaseRule;
-					set_src_attr(current_case, child);
+					set_src_attr(current_case, child.get());
 					last_generated_case = current_case;
 					addChunkActions(current_case->actions, this_case_eq_ltemp, this_case_eq_rvalue);
-					for (auto node : child->children) {
+					for (auto& node : child->children) {
 						if (node->type == AST_DEFAULT)
 							default_case = current_case;
 						else if (node->type == AST_BLOCK)
-							processAst(node);
+							processAst(node.get());
 						else
 							current_case->compare.push_back(node->genWidthRTLIL(width_hint, sign_hint, &subst_rvalue_map.stdmap()));
 					}
@@ -678,7 +678,7 @@ struct AST_INTERNAL::ProcessGenerator
 					subst_rvalue_map.restore();
 				}
 
-				if (last_generated_case != NULL && ast->get_bool_attribute(ID::full_case) && default_case == NULL) {
+				if (last_generated_case != nullptr && ast->get_bool_attribute(ID::full_case) && default_case == nullptr) {
 			#if 0
 					// this is a valid transformation, but as optimization it is premature.
 					// better: add a default case that assigns 'x' to everything, and let later
@@ -690,7 +690,7 @@ struct AST_INTERNAL::ProcessGenerator
 					sw->cases.push_back(default_case);
 			#endif
 				} else {
-					if (default_case == NULL) {
+					if (default_case == nullptr) {
 						default_case = new RTLIL::CaseRule;
 						addChunkActions(default_case->actions, this_case_eq_ltemp, this_case_eq_rvalue);
 					}
@@ -760,7 +760,7 @@ struct AST_INTERNAL::ProcessGenerator
 					default_base = 16;
 
 				std::vector<VerilogFmtArg> args;
-				for (auto node : ast->children) {
+				for (auto& node : ast->children) {
 					int width;
 					bool is_signed;
 					node->detectSignWidth(width, is_signed, nullptr);
@@ -866,8 +866,8 @@ struct AST_INTERNAL::ProcessGenerator
 			break;
 
 		default:
-			// ast->dumpAst(NULL, "ast> ");
-			// current_ast_mod->dumpAst(NULL, "mod> ");
+			// ast->dumpAst(nullptr, "ast> ");
+			// current_ast_mod->dumpAst(nullptr, "mod> ");
 			log_abort();
 		}
 	}
@@ -876,14 +876,14 @@ struct AST_INTERNAL::ProcessGenerator
 	{
 		// Maps per-memid AST_MEMWR IDs to indices in the mem_write_actions array.
 		dict<std::pair<std::string, int>, int> port_map;
-		for (auto child : always->children)
+		for (auto& child : always->children)
 			if (child->type == AST_MEMWR)
 			{
 				std::string memid = child->str;
 				int portid = child->children[3]->asInt(false);
 				int cur_idx = GetSize(sync->mem_write_actions);
 				RTLIL::MemWriteAction action;
-				set_src_attr(&action, child);
+				set_src_attr(&action, child.get());
 				action.memid = memid;
 				action.address = child->children[0]->genWidthRTLIL(-1, true, &subst_rvalue_map.stdmap());
 				action.data = child->children[1]->genWidthRTLIL(current_module->memories[memid]->width, true, &subst_rvalue_map.stdmap());
@@ -971,11 +971,11 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 	bool sub_sign_hint = true;
 	int sub_width_hint = -1;
 	int this_width = 0;
-	AstNode *range = NULL;
-	AstNode *id_ast = NULL;
+	AstNode *range = nullptr;
+	AstNode *id_ast = nullptr;
 
 	bool local_found_real = false;
-	if (found_real == NULL)
+	if (found_real == nullptr)
 		found_real = &local_found_real;
 
 	switch (type)
@@ -1019,22 +1019,22 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 					input_error("Failed to detect width for parameter %s!\n", str.c_str());
 			}
 			if (children.size() != 0)
-				range = children[0];
+				range = children[0].get();
 		} else if (id_ast->type == AST_WIRE || id_ast->type == AST_AUTOWIRE) {
 			if (!id_ast->range_valid) {
 				if (id_ast->type == AST_AUTOWIRE)
 					this_width = 1;
 				else {
-					// current_ast_mod->dumpAst(NULL, "mod> ");
+					// current_ast_mod->dumpAst(nullptr, "mod> ");
 					// log("---\n");
-					// id_ast->dumpAst(NULL, "decl> ");
-					// dumpAst(NULL, "ref> ");
+					// id_ast->dumpAst(nullptr, "decl> ");
+					// dumpAst(nullptr, "ref> ");
 					input_error("Failed to detect width of signal access `%s'!\n", str.c_str());
 				}
 			} else {
 				this_width = id_ast->range_left - id_ast->range_right + 1;
 				if (children.size() != 0)
-					range = children[0];
+					range = children[0].get();
 			}
 		} else if (id_ast->type == AST_GENVAR) {
 			this_width = 32;
@@ -1043,26 +1043,23 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 				input_error("Failed to detect width of memory access `%s'!\n", str.c_str());
 			this_width = id_ast->children[0]->range_left - id_ast->children[0]->range_right + 1;
 			if (children.size() > 1)
-				range = children[1];
+				range = children[1].get();
 		} else if (id_ast->type == AST_STRUCT_ITEM || id_ast->type == AST_STRUCT || id_ast->type == AST_UNION) {
-			AstNode *tmp_range = make_index_range(id_ast);
+			auto tmp_range = make_index_range(id_ast);
 			this_width = tmp_range->range_left - tmp_range->range_right + 1;
-			delete tmp_range;
 		} else
 			input_error("Failed to detect width for identifier %s!\n", str.c_str());
 		if (range) {
 			if (range->children.size() == 1)
 				this_width = 1;
 			else if (!range->range_valid) {
-				AstNode *left_at_zero_ast = children[0]->children[0]->clone_at_zero();
-				AstNode *right_at_zero_ast = children[0]->children.size() >= 2 ? children[0]->children[1]->clone_at_zero() : left_at_zero_ast->clone();
+				auto left_at_zero_ast = children[0]->children[0]->clone_at_zero();
+				auto right_at_zero_ast = children[0]->children.size() >= 2 ? children[0]->children[1]->clone_at_zero() : left_at_zero_ast->clone();
 				while (left_at_zero_ast->simplify(true, 1, -1, false)) { }
 				while (right_at_zero_ast->simplify(true, 1, -1, false)) { }
 				if (left_at_zero_ast->type != AST_CONSTANT || right_at_zero_ast->type != AST_CONSTANT)
 					input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str.c_str());
 				this_width = abs(int(left_at_zero_ast->integer - right_at_zero_ast->integer)) + 1;
-				delete left_at_zero_ast;
-				delete right_at_zero_ast;
 			} else
 				this_width = range->range_left - range->range_right + 1;
 			sign_hint = false;
@@ -1106,7 +1103,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 		break;
 
 	case AST_CONCAT:
-		for (auto child : children) {
+		for (auto& child : children) {
 			sub_width_hint = 0;
 			sub_sign_hint = true;
 			child->detectSignWidthWorker(sub_width_hint, sub_sign_hint);
@@ -1135,7 +1132,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 	case AST_BIT_OR:
 	case AST_BIT_XOR:
 	case AST_BIT_XNOR:
-		for (auto child : children)
+		for (auto& child : children)
 			child->detectSignWidthWorker(width_hint, sign_hint, found_real);
 		break;
 
@@ -1175,7 +1172,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 	case AST_MUL:
 	case AST_DIV:
 	case AST_MOD:
-		for (auto child : children)
+		for (auto& child : children)
 			child->detectSignWidthWorker(width_hint, sign_hint, found_real);
 		break;
 
@@ -1216,12 +1213,13 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 			width_hint = max(width_hint, sub_width_hint);
 			sign_hint &= sub_sign_hint;
 		};
-		visit_case_expr(children[0]);
+		visit_case_expr(children[0].get());
 		for (size_t i = 1; i < children.size(); i++) {
-			AstNode *child = children[i];
-			for (AstNode *v : child->children)
+			AstNode *child = children[i].get();
+			for (auto& v : child->children) {
 				if (v->type != AST_DEFAULT && v->type != AST_BLOCK)
-					visit_case_expr(v);
+					visit_case_expr(v.get());
+			}
 		}
 		break;
 	}
@@ -1269,9 +1267,9 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 			if (func->type != AST_FUNCTION)
 				input_error("Function call to %s resolved to something that isn't a function!\n", RTLIL::unescape_id(str).c_str());
 			const AstNode *wire = nullptr;
-			for (const AstNode *child : func->children)
+			for (const auto& child : func->children)
 				if (child->str == func->str) {
-					wire = child;
+					wire = child.get();
 					break;
 				}
 			log_assert(wire && wire->type == AST_WIRE);
@@ -1280,10 +1278,10 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 			if (!wire->children.empty())
 			{
 				log_assert(wire->children.size() == 1);
-				const AstNode *range = wire->children.at(0);
+				const AstNode *range = wire->children.at(0).get();
 				log_assert(range->type == AST_RANGE && range->children.size() == 2);
-				AstNode *left = range->children.at(0)->clone();
-				AstNode *right = range->children.at(1)->clone();
+				auto left = range->children.at(0)->clone();
+				auto right = range->children.at(1)->clone();
 				left->set_in_param_flag(true);
 				right->set_in_param_flag(true);
 				while (left->simplify(true, 1, -1, false)) { }
@@ -1292,8 +1290,6 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 					input_error("Function %s has non-constant width!",
 							RTLIL::unescape_id(str).c_str());
 				result_width = abs(int(left->asInt(true) - right->asInt(true)));
-				delete left;
-				delete right;
 			}
 			width_hint = max(width_hint, result_width);
 			break;
@@ -1306,6 +1302,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 		for (auto f : log_files)
 			current_scope_ast->dumpAst(f, "verilog-ast> ");
 		input_error("Don't know how to detect sign and width for %s node!\n", type2str(type).c_str());
+
 	}
 
 	if (*found_real)
@@ -1518,11 +1515,11 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 	// shifter cell is created and the output signal of this cell is returned
 	case AST_IDENTIFIER:
 		{
-			RTLIL::Wire *wire = NULL;
+			RTLIL::Wire *wire = nullptr;
 			RTLIL::SigChunk chunk;
 			bool is_interface = false;
 
-			AST::AstNode *member_node = NULL;
+			AST::AstNode *member_node = nullptr;
 			int add_undef_bits_msb = 0;
 			int add_undef_bits_lsb = 0;
 
@@ -1609,14 +1606,14 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				}
 
 				if (!children[0]->range_valid) {
-					AstNode *left_at_zero_ast = children[0]->children[0]->clone_at_zero();
-					AstNode *right_at_zero_ast = children[0]->children.size() >= 2 ? children[0]->children[1]->clone_at_zero() : left_at_zero_ast->clone();
+					auto left_at_zero_ast = children[0]->children[0]->clone_at_zero();
+					auto right_at_zero_ast = children[0]->children.size() >= 2 ? children[0]->children[1]->clone_at_zero() : left_at_zero_ast->clone();
 					while (left_at_zero_ast->simplify(true, 1, -1, false)) { }
 					while (right_at_zero_ast->simplify(true, 1, -1, false)) { }
 					if (left_at_zero_ast->type != AST_CONSTANT || right_at_zero_ast->type != AST_CONSTANT)
 						input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str.c_str());
 					int width = abs(int(left_at_zero_ast->integer - right_at_zero_ast->integer)) + 1;
-					AstNode *fake_ast = new AstNode(AST_NONE, clone(), children[0]->children.size() >= 2 ?
+					auto fake_ast = new AstNode(AST_NONE, clone(), children[0]->children.size() >= 2 ?
 							children[0]->children[1]->clone() : children[0]->children[0]->clone());
 					fake_ast->children[0]->delete_children();
 					if (member_node)
@@ -1638,9 +1635,6 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 					if (GetSize(shift_val) >= 32)
 						fake_ast->children[1]->is_signed = true;
 					RTLIL::SigSpec sig = binop2rtlil(fake_ast, ID($shiftx), width, fake_ast->children[0]->genRTLIL(), shift_val);
-					delete left_at_zero_ast;
-					delete right_at_zero_ast;
-					delete fake_ast;
 					return sig;
 				} else {
 					chunk.width = children[0]->range_left - children[0]->range_right + 1;
@@ -2093,7 +2087,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			cell->set_bool_attribute(ID::module_not_derived);
 
 			for (auto it = children.begin(); it != children.end(); it++) {
-				AstNode *child = *it;
+				AstNode *child = it->get();
 				if (child->type == AST_CELLTYPE) {
 					cell->type = child->str;
 					if (flag_icells && cell->type.begins_with("\\$"))
@@ -2102,7 +2096,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				}
 				if (child->type == AST_PARASET) {
 					IdString paraname = child->str.empty() ? stringf("$%d", ++para_counter) : child->str;
-					const AstNode *value = child->children[0];
+					const AstNode *value = child->children[0].get();
 					if (value->type == AST_REALVALUE)
 						log_file_warning(filename, location.first_line, "Replacing floating point parameter %s.%s = %f with string.\n",
 								log_id(cell), log_id(paraname), value->realvalue);
@@ -2115,7 +2109,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				if (child->type == AST_ARGUMENT) {
 					RTLIL::SigSpec sig;
 					if (child->children.size() > 0) {
-						AstNode *arg = child->children[0];
+						AstNode *arg = child->children[0].get();
 						int local_width_hint = -1;
 						bool local_sign_hint = false;
 						// don't inadvertently attempt to detect the width of interfaces
@@ -2187,16 +2181,14 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 
 	// use ProcessGenerator for always blocks
 	case AST_ALWAYS: {
-			AstNode *always = this->clone();
-			ProcessGenerator generator(always);
+			auto always = this->clone();
+			ProcessGenerator generator(std::move(always));
 			ignoreThisSignalsInInitial.append(generator.outputSignals);
-			delete always;
 		} break;
 
 	case AST_INITIAL: {
-			AstNode *always = this->clone();
-			ProcessGenerator generator(always, ignoreThisSignalsInInitial);
-			delete always;
+			auto always = this->clone();
+			ProcessGenerator generator(std::move(always), ignoreThisSignalsInInitial);
 		} break;
 
 	case AST_TECALL: {
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 05cc57ba1..3f7176b20 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -35,6 +35,7 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <math.h>
+#include <optional>
 // For std::gcd in C++17
 // #include <numeric>
 
@@ -87,7 +88,7 @@ void AstNode::fixup_hierarchy_flags(bool force_descend)
 	case AST_PARASET:
 	case AST_PREFIX:
 		in_param = true;
-		for (auto child : children)
+		for (auto& child : children)
 			child->set_in_param_flag(true, force_descend);
 		break;
 
@@ -95,7 +96,7 @@ void AstNode::fixup_hierarchy_flags(bool force_descend)
 	case AST_WIRE:
 	case AST_GENIF:
 	case AST_GENCASE:
-		for (auto child : children)
+		for (auto& child : children)
 			child->set_in_param_flag(in_param, force_descend);
 		if (children.size() >= 1)
 			children[0]->set_in_param_flag(true, force_descend);
@@ -103,19 +104,21 @@ void AstNode::fixup_hierarchy_flags(bool force_descend)
 
 	case AST_GENFOR:
 	case AST_FOR:
-		for (auto child : children)
+		for (auto& child : children) {
+			log_assert((bool)child);
 			child->set_in_param_flag(in_param, force_descend);
+		}
 		if (children.size() >= 2)
 			children[1]->set_in_param_flag(true, force_descend);
 		break;
 
 	default:
 		in_param = in_param_from_above;
-		for (auto child : children)
+		for (auto& child : children)
 			child->set_in_param_flag(in_param, force_descend);
 	}
 
-	for (auto attr : attributes)
+	for (auto& attr : attributes)
 		attr.second->set_in_param_flag(true, force_descend);
 
 	in_lvalue = in_lvalue_from_above;
@@ -131,14 +134,14 @@ void AstNode::fixup_hierarchy_flags(bool force_descend)
 		break;
 
 	default:
-		for (auto child : children)
+		for (auto& child : children)
 			child->set_in_lvalue_flag(in_lvalue, force_descend);
 	}
 
 	if (force_descend) {
-		for (auto child : children)
+		for (auto& child : children)
 			child->fixup_hierarchy_flags(true);
-		for (auto attr : attributes)
+		for (auto& attr : attributes)
 			attr.second->fixup_hierarchy_flags(true);
 	}
 }
@@ -148,7 +151,7 @@ void AstNode::fixup_hierarchy_flags(bool force_descend)
 Fmt AstNode::processFormat(int stage, bool sformat_like, int default_base, size_t first_arg_at, bool may_fail) {
 	std::vector<VerilogFmtArg> args;
 	for (size_t index = first_arg_at; index < children.size(); index++) {
-		AstNode *node_arg = children[index];
+		AstNode *node_arg = children[index].get();
 		while (node_arg->simplify(true, stage, -1, false)) { }
 
 		VerilogFmtArg arg = {};
@@ -199,7 +202,7 @@ void AstNode::annotateTypedEnums(AstNode *template_node)
 		while (enum_node->simplify(true, 1, -1, false)) { }
 		//get width from 1st enum item:
 		log_assert(enum_node->children.size() >= 1);
-		AstNode *enum_item0 = enum_node->children[0];
+		AstNode *enum_item0 = enum_node->children[0].get();
 		log_assert(enum_item0->type == AST_ENUM_ITEM);
 		int width;
 		if (!enum_item0->range_valid)
@@ -210,7 +213,7 @@ void AstNode::annotateTypedEnums(AstNode *template_node)
 			width = enum_item0->range_left - enum_item0->range_right + 1;
 		log_assert(width > 0);
 		//add declared enum items:
-		for (auto enum_item : enum_node->children){
+		for (auto& enum_item : enum_node->children){
 			log_assert(enum_item->type == AST_ENUM_ITEM);
 			//get is_signed
 			bool is_signed;
@@ -242,10 +245,10 @@ void AstNode::annotateTypedEnums(AstNode *template_node)
 	}
 }
 
-static AstNode *make_range(int left, int right, bool is_signed = false)
+static std::unique_ptr<AstNode> make_range(int left, int right, bool is_signed = false)
 {
 	// generate a pre-validated range node for a fixed signal range.
-	auto range = new AstNode(AST_RANGE);
+	auto range = std::make_unique<AstNode>(AST_RANGE);
 	range->range_left = left;
 	range->range_right = right;
 	range->range_valid = true;
@@ -287,7 +290,7 @@ static int size_packed_struct(AstNode *snode, int base_offset)
 	int packed_width = -1;
 	// examine members from last to first
 	for (auto it = snode->children.rbegin(); it != snode->children.rend(); ++it) {
-		auto node = *it;
+		auto node = it->get();
 		int width;
 		if (node->type == AST_STRUCT || node->type == AST_UNION) {
 			// embedded struct or union
@@ -297,14 +300,14 @@ static int size_packed_struct(AstNode *snode, int base_offset)
 			log_assert(node->type == AST_STRUCT_ITEM);
 			if (node->children.size() > 0 && node->children[0]->type == AST_RANGE) {
 				// member width e.g. bit [7:0] a
-				width = range_width(node, node->children[0]);
+				width = range_width(node, node->children[0].get());
 				if (node->children.size() == 2) {
 					// Unpacked array. Note that this is a Yosys extension; only packed data types
 					// and integer data types are allowed in packed structs / unions in SystemVerilog.
 					if (node->children[1]->type == AST_RANGE) {
 						// Unpacked array, e.g. bit [63:0] a [0:3]
 						// Pretend it's declared as a packed array, e.g. bit [0:3][63:0] a
-						auto rnode = node->children[1];
+						auto rnode = node->children[1].get();
 						if (rnode->children.size() == 1) {
 							// C-style array size, e.g. bit [63:0] a [4]
 							node->dimensions.push_back({ 0, rnode->range_left, true });
@@ -312,7 +315,7 @@ static int size_packed_struct(AstNode *snode, int base_offset)
 						} else {
 							width *= add_dimension(node, rnode);
 						}
-						add_dimension(node, node->children[0]);
+						add_dimension(node, node->children[0].get());
 					}
 					else {
 						// The Yosys extension for unpacked arrays in packed structs / unions
@@ -321,11 +324,9 @@ static int size_packed_struct(AstNode *snode, int base_offset)
 					}
 				} else {
 					// Vector
-					add_dimension(node, node->children[0]);
+					add_dimension(node, node->children[0].get());
 				}
 				// range nodes are now redundant
-				for (AstNode *child : node->children)
-					delete child;
 				node->children.clear();
 			}
 			else if (node->children.size() > 0 && node->children[0]->type == AST_MULTIRANGE) {
@@ -336,12 +337,10 @@ static int size_packed_struct(AstNode *snode, int base_offset)
 					struct_array_packing_error(node);
 				}
 				width = 1;
-				for (auto rnode : node->children[0]->children) {
-					width *= add_dimension(node, rnode);
+				for (auto& rnode : node->children[0]->children) {
+					width *= add_dimension(node, rnode.get());
 				}
 				// range nodes are now redundant
-				for (AstNode *child : node->children)
-					delete child;
 				node->children.clear();
 			}
 			else if (node->range_left < 0) {
@@ -389,49 +388,49 @@ static int size_packed_struct(AstNode *snode, int base_offset)
 	return width;
 }
 
-static AstNode *node_int(int ival)
+static std::unique_ptr<AstNode> node_int(int ival)
 {
 	return AstNode::mkconst_int(ival, true);
 }
 
-static AstNode *multiply_by_const(AstNode *expr_node, int stride)
+static std::unique_ptr<AstNode> multiply_by_const(std::unique_ptr<AstNode> expr_node, int stride)
 {
-	return new AstNode(AST_MUL, expr_node, node_int(stride));
+	return std::make_unique<AstNode>(AST_MUL, std::move(expr_node), node_int(stride));
 }
 
-static AstNode *normalize_index(AstNode *expr, AstNode *decl_node, int dimension)
+static std::unique_ptr<AstNode> normalize_index(AstNode *expr, AstNode *decl_node, int dimension)
 {
-	expr = expr->clone();
+	auto new_expr = expr->clone();
 
 	int offset = decl_node->dimensions[dimension].range_right;
 	if (offset) {
-		expr = new AstNode(AST_SUB, expr, node_int(offset));
+		new_expr = std::make_unique<AstNode>(AST_SUB, std::move(new_expr), node_int(offset));
 	}
 
 	// Packed dimensions are normally indexed by lsb, while unpacked dimensions are normally indexed by msb.
 	if ((dimension < decl_node->unpacked_dimensions) ^ decl_node->dimensions[dimension].range_swapped) {
 		// Swap the index if the dimension is declared the "wrong" way.
 		int left = decl_node->dimensions[dimension].range_width - 1;
-		expr = new AstNode(AST_SUB, node_int(left), expr);
+		new_expr = std::make_unique<AstNode>(AST_SUB, node_int(left), std::move(new_expr));
 	}
 
-	return expr;
+	return new_expr;
 }
 
-static AstNode *index_offset(AstNode *offset, AstNode *rnode, AstNode *decl_node, int dimension, int &stride)
+static std::unique_ptr<AstNode> index_offset(std::unique_ptr<AstNode> offset, AstNode *rnode, AstNode *decl_node, int dimension, int &stride)
 {
 	stride /= decl_node->dimensions[dimension].range_width;
-	auto right = normalize_index(rnode->children.back(), decl_node, dimension);
-	auto add_offset = stride > 1 ? multiply_by_const(right, stride) : right;
-	return offset ? new AstNode(AST_ADD, offset, add_offset) : add_offset;
+	auto right = normalize_index(rnode->children.back().get(), decl_node, dimension);
+	auto add_offset = stride > 1 ? multiply_by_const(std::move(right), stride) : std::move(right);
+	return offset ? std::make_unique<AstNode>(AST_ADD, std::move(offset), std::move(add_offset)) : std::move(add_offset);
 }
 
-static AstNode *index_msb_offset(AstNode *lsb_offset, AstNode *rnode, AstNode *decl_node, int dimension, int stride)
+static std::unique_ptr<AstNode> index_msb_offset(std::unique_ptr<AstNode> lsb_offset, AstNode *rnode, AstNode *decl_node, int dimension, int stride)
 {
 	log_assert(rnode->children.size() <= 2);
 
 	// Offset to add to LSB
-	AstNode *add_offset;
+	std::unique_ptr<AstNode> add_offset;
 	if (rnode->children.size() == 1) {
 		// Index, e.g. s.a[i]
 		add_offset = node_int(stride - 1);
@@ -439,21 +438,21 @@ static AstNode *index_msb_offset(AstNode *lsb_offset, AstNode *rnode, AstNode *d
 	else {
 		// rnode->children.size() == 2
 		// Slice, e.g. s.a[i:j]
-		auto left = normalize_index(rnode->children[0], decl_node, dimension);
-		auto right = normalize_index(rnode->children[1], decl_node, dimension);
-		add_offset = new AstNode(AST_SUB, left, right);
+		auto left = normalize_index(rnode->children[0].get(), decl_node, dimension);
+		auto right = normalize_index(rnode->children[1].get(), decl_node, dimension);
+		add_offset = std::make_unique<AstNode>(AST_SUB, std::move(left), std::move(right));
 		if (stride > 1) {
 			// offset = (msb - lsb + 1)*stride - 1
-			auto slice_width = new AstNode(AST_ADD, add_offset, node_int(1));
-			add_offset = new AstNode(AST_SUB, multiply_by_const(slice_width, stride), node_int(1));
+			auto slice_width = std::make_unique<AstNode>(AST_ADD, std::move(add_offset), node_int(1));
+			add_offset = std::make_unique<AstNode>(AST_SUB, multiply_by_const(std::move(slice_width), stride), node_int(1));
 		}
 	}
 
-	return new AstNode(AST_ADD, lsb_offset, add_offset);
+	return std::make_unique<AstNode>(AST_ADD, std::move(lsb_offset), std::move(add_offset));
 }
 
 
-AstNode *AstNode::make_index_range(AstNode *decl_node, bool unpacked_range)
+std::unique_ptr<AstNode> AstNode::make_index_range(AstNode *decl_node, bool unpacked_range)
 {
 	// Work out the range in the packed array that corresponds to a struct member
 	// taking into account any range operations applicable to the current node
@@ -466,8 +465,8 @@ AstNode *AstNode::make_index_range(AstNode *decl_node, bool unpacked_range)
 	log_assert(children.size() == 1);
 
 	// Range operations
-	AstNode *rnode = children[0];
-	AstNode *offset = NULL;
+	AstNode *rnode = children[0].get();
+	std::unique_ptr<AstNode> offset = nullptr;
 	int dim = unpacked_range ? 0 : decl_node->unpacked_dimensions;
 	int max_dim = unpacked_range ? decl_node->unpacked_dimensions : GetSize(decl_node->dimensions);
 
@@ -478,15 +477,15 @@ AstNode *AstNode::make_index_range(AstNode *decl_node, bool unpacked_range)
 
 	// Calculate LSB offset for the final index / slice
 	if (rnode->type == AST_RANGE) {
-		offset = index_offset(offset, rnode, decl_node, dim, stride);
+		offset = index_offset(std::move(offset), rnode, decl_node, dim, stride);
 	}
 	else if (rnode->type == AST_MULTIRANGE) {
 		// Add offset for each dimension
 		AstNode *mrnode = rnode;
 		int stop_dim = std::min(GetSize(mrnode->children), max_dim);
 		for (; dim < stop_dim; dim++) {
-			rnode = mrnode->children[dim];
-			offset = index_offset(offset, rnode, decl_node, dim, stride);
+			rnode = mrnode->children[dim].get();
+			offset = index_offset(std::move(offset), rnode, decl_node, dim, stride);
 		}
 		dim--;  // Step back to the final index / slice
 	}
@@ -494,15 +493,15 @@ AstNode *AstNode::make_index_range(AstNode *decl_node, bool unpacked_range)
 		input_error("Unsupported range operation for %s\n", str.c_str());
 	}
 
-	AstNode *index_range = new AstNode(AST_RANGE);
+	std::unique_ptr<AstNode>index_range = std::make_unique<AstNode>(AST_RANGE);
 
 	if (!unpacked_range && (stride > 1 || GetSize(rnode->children) == 2)) {
 		// Calculate MSB offset for the final index / slice of packed dimensions.
-		AstNode *msb_offset = index_msb_offset(offset->clone(), rnode, decl_node, dim, stride);
-		index_range->children.push_back(msb_offset);
+		std::unique_ptr<AstNode>msb_offset = index_msb_offset(offset->clone(), rnode, decl_node, dim, stride);
+		index_range->children.push_back(std::move(msb_offset));
 	}
 
-	index_range->children.push_back(offset);
+	index_range->children.push_back(std::move(offset));
 
 	return index_range;
 }
@@ -510,8 +509,8 @@ AstNode *AstNode::make_index_range(AstNode *decl_node, bool unpacked_range)
 AstNode *AstNode::get_struct_member() const
 {
 	AstNode *member_node;
-	if (attributes.count(ID::wiretype) && (member_node = attributes.at(ID::wiretype)) &&
-	    (member_node->type == AST_STRUCT_ITEM || member_node->type == AST_STRUCT || member_node->type == AST_UNION))
+	if (attributes.count(ID::wiretype) && (member_node = attributes.at(ID::wiretype).get()) &&
+		(member_node->type == AST_STRUCT_ITEM || member_node->type == AST_STRUCT || member_node->type == AST_UNION))
 	{
 		return member_node;
 	}
@@ -523,20 +522,20 @@ static void add_members_to_scope(AstNode *snode, std::string name)
 	// add all the members in a struct or union to local scope
 	// in case later referenced in assignments
 	log_assert(snode->type==AST_STRUCT || snode->type==AST_UNION);
-	for (auto *node : snode->children) {
+	for (auto &node : snode->children) {
 		auto member_name = name + "." + node->str;
-		current_scope[member_name] = node;
+		current_scope[member_name] = node.get();
 		if (node->type != AST_STRUCT_ITEM) {
 			// embedded struct or union
-			add_members_to_scope(node, name + "." + node->str);
+			add_members_to_scope(node.get(), name + "." + node->str);
 		}
 	}
 }
 
-static AstNode *make_packed_struct(AstNode *template_node, std::string &name, decltype(AstNode::attributes) &attributes)
+std::unique_ptr<AstNode> make_packed_struct(AstNode *template_node, std::string &name, decltype(AstNode::attributes) &attributes)
 {
 	// create a wire for the packed struct
-	auto wnode = new AstNode(AST_WIRE, make_range(template_node->range_left, 0));
+	auto wnode = std::make_unique<AstNode>(AST_WIRE, make_range(template_node->range_left, 0));
 	wnode->str = name;
 	wnode->is_logic = true;
 	wnode->range_valid = true;
@@ -547,24 +546,24 @@ static AstNode *make_packed_struct(AstNode *template_node, std::string &name, de
 	// resolve packed dimension
 	while (wnode->simplify(true, 1, -1, false)) {}
 	// make sure this node is the one in scope for this name
-	current_scope[name] = wnode;
+	current_scope[name] = wnode.get();
 	// add all the struct members to scope under the wire's name
 	add_members_to_scope(template_node, name);
 	return wnode;
 }
 
-static void prepend_ranges(AstNode *&range, AstNode *range_add)
+static void prepend_ranges(std::unique_ptr<AstNode> &range, AstNode *range_add)
 {
 	// Convert range to multirange.
 	if (range->type == AST_RANGE)
-		range = new AstNode(AST_MULTIRANGE, range);
+		range = std::make_unique<AstNode>(AST_MULTIRANGE, std::move(range));
 
 	// Add range or ranges.
 	if (range_add->type == AST_RANGE)
 		range->children.insert(range->children.begin(), range_add->clone());
 	else {
 		int i = 0;
-		for (auto child : range_add->children)
+		for (auto& child : range_add->children)
 			range->children.insert(range->children.begin() + i++, child->clone());
 	}
 }
@@ -575,16 +574,16 @@ static bool node_contains_assignment_to(const AstNode* node, const AstNode* var)
 	if (node->type == AST_ASSIGN_EQ || node->type == AST_ASSIGN_LE) {
 		// current node is iteslf an assignment
 		log_assert(node->children.size() >= 2);
-		const AstNode* lhs = node->children[0];
+		const AstNode* lhs = node->children[0].get();
 		if (lhs->type == AST_IDENTIFIER && lhs->str == var->str)
 			return false;
 	}
-	for (const AstNode* child : node->children) {
+	for (auto& child : node->children) {
 		// if this child shadows the given variable
-		if (child != var && child->str == var->str && child->type == AST_WIRE)
+		if (child.get() != var && child->str == var->str && child->type == AST_WIRE)
 			break; // skip the remainder of this block/scope
 		// depth-first short circuit
-		if (!node_contains_assignment_to(child, var))
+		if (!node_contains_assignment_to(child.get(), var))
 			return false;
 	}
 	return true;
@@ -625,9 +624,9 @@ const RTLIL::Module* AstNode::lookup_cell_module()
 	};
 
 	const AstNode *celltype = nullptr;
-	for (const AstNode *child : children)
+	for (auto& child : children)
 		if (child->type == AST_CELLTYPE) {
-			celltype = child;
+			celltype = child.get();
 			break;
 		}
 	log_assert(celltype != nullptr);
@@ -644,7 +643,7 @@ const RTLIL::Module* AstNode::lookup_cell_module()
 	// build a mapping from true param name to param value
 	size_t para_counter = 0;
 	dict<RTLIL::IdString, RTLIL::Const> cell_params_map;
-	for (AstNode *child : children) {
+	for (auto& child : children) {
 		if (child->type != AST_PARASET)
 			continue;
 
@@ -652,7 +651,7 @@ const RTLIL::Module* AstNode::lookup_cell_module()
 			return nullptr; // let hierarchy handle this error
 		IdString paraname = child->str.empty() ? module->avail_parameters[para_counter++] : child->str;
 
-		const AstNode *value = child->children[0];
+		const AstNode *value = child->children[0].get();
 		if (value->type != AST_REALVALUE && value->type != AST_CONSTANT)
 			return nullptr; // let genrtlil handle this error
 		cell_params_map[paraname] = value->asParaConst();
@@ -684,8 +683,8 @@ static bool contains_unbased_unsized(const AstNode *node)
 {
 	if (node->type == AST_CONSTANT)
 		return node->is_unsized;
-	for (const AstNode *child : node->children)
-		if (contains_unbased_unsized(child))
+	for (auto& child : node->children)
+		if (contains_unbased_unsized(child.get()))
 			return true;
 	return false;
 }
@@ -694,19 +693,19 @@ static bool contains_unbased_unsized(const AstNode *node)
 // dimensions of the given wire reference
 void add_wire_for_ref(const RTLIL::Wire *ref, const std::string &str)
 {
-	AstNode *left = AstNode::mkconst_int(ref->width - 1 + ref->start_offset, true);
-	AstNode *right = AstNode::mkconst_int(ref->start_offset, true);
+	std::unique_ptr<AstNode> left = AstNode::mkconst_int(ref->width - 1 + ref->start_offset, true);
+	std::unique_ptr<AstNode> right = AstNode::mkconst_int(ref->start_offset, true);
 	if (ref->upto)
 		std::swap(left, right);
-	AstNode *range = new AstNode(AST_RANGE, left, right);
+	std::unique_ptr<AstNode> range = std::make_unique<AstNode>(AST_RANGE, std::move(left), std::move(right));
 
-	AstNode *wire = new AstNode(AST_WIRE, range);
+	std::unique_ptr<AstNode> wire = std::make_unique<AstNode>(AST_WIRE, std::move(range));
 	wire->is_signed = ref->is_signed;
 	wire->is_logic = true;
 	wire->str = str;
 
-	current_ast_mod->children.push_back(wire);
-	current_scope[str] = wire;
+	current_scope[str] = wire.get();
+	current_ast_mod->children.push_back(std::move(wire));
 }
 
 enum class IdentUsage {
@@ -733,10 +732,10 @@ static IdentUsage always_asgn_before_use(const AstNode *node, const std::string
 		bool all_defined = true;
 		bool any_used = false;
 		bool has_default = false;
-		for (const AstNode *child : node->children) {
+		for (auto& child : node->children) {
 			if (child->type == AST_COND && child->children.at(0)->type == AST_DEFAULT)
 				has_default = true;
-			IdentUsage nested = always_asgn_before_use(child, target);
+			IdentUsage nested = always_asgn_before_use(child.get(), target);
 			if (nested != IdentUsage::Assigned && child->type == AST_COND)
 				all_defined = false;
 			if (nested == IdentUsage::SyncRequired)
@@ -753,20 +752,20 @@ static IdentUsage always_asgn_before_use(const AstNode *node, const std::string
 	// Check if this is an assignment to the target variable. For simplicity, we
 	// don't analyze sub-ranges of the variable.
 	if (node->type == AST_ASSIGN_EQ) {
-		const AstNode *ident = node->children.at(0);
+		auto& ident = node->children.at(0);
 		if (ident->type == AST_IDENTIFIER && ident->str == target)
 			return IdentUsage::Assigned;
 	}
 
-	for (const AstNode *child : node->children) {
-		IdentUsage nested = always_asgn_before_use(child, target);
+	for (auto& child : node->children) {
+		IdentUsage nested = always_asgn_before_use(child.get(), target);
 		if (nested != IdentUsage::NotReferenced)
 			return nested;
 	}
 	return IdentUsage::NotReferenced;
 }
 
-AstNode *AstNode::clone_at_zero()
+std::unique_ptr<AstNode> AstNode::clone_at_zero()
 {
 	int width_hint;
 	bool sign_hint;
@@ -795,8 +794,7 @@ AstNode *AstNode::clone_at_zero()
 		break;
 	}
 
-	AstNode *that = new AstNode;
-	*that = *this;
+	auto that = clone();
 	for (auto &it : that->children)
 		it = it->clone_at_zero();
 	for (auto &it : that->attributes)
@@ -818,8 +816,8 @@ static bool try_determine_range_width(AstNode *range, int &result_width)
 		return true;
 	}
 
-	AstNode *left_at_zero_ast = range->children[0]->clone_at_zero();
-	AstNode *right_at_zero_ast = range->children[1]->clone_at_zero();
+	std::unique_ptr<AstNode> left_at_zero_ast = range->children[0]->clone_at_zero();
+	std::unique_ptr<AstNode> right_at_zero_ast = range->children[1]->clone_at_zero();
 
 	while (left_at_zero_ast->simplify(true, 1, -1, false)) {}
 	while (right_at_zero_ast->simplify(true, 1, -1, false)) {}
@@ -831,8 +829,6 @@ static bool try_determine_range_width(AstNode *range, int &result_width)
 		result_width = abs(int(left_at_zero_ast->integer - right_at_zero_ast->integer)) + 1;
 	}
 
-	delete left_at_zero_ast;
-	delete right_at_zero_ast;
 	return ok;
 }
 
@@ -891,13 +887,22 @@ static void check_auto_nosync(AstNode *node)
 	// remove the attributes we've "consumed"
 	for (const RTLIL::IdString &str : attrs_to_drop) {
 		auto it = node->attributes.find(str);
-		delete it->second;
 		node->attributes.erase(it);
 	}
 
 	// check local variables in any nested blocks
-	for (AstNode *child : node->children)
-		check_auto_nosync(child);
+	for (auto& child : node->children)
+		check_auto_nosync(child.get());
+}
+
+void AstNode::null_check()
+{
+	for (auto& child : children) {
+		// if (!child)
+		// 	VALGRIND_PRINTF_BACKTRACE("null child");
+		log_assert((bool) child);
+		child->null_check();
+	}
 }
 
 // convert the AST into a simpler AST that has all parameters substituted by their
@@ -908,6 +913,7 @@ static void check_auto_nosync(AstNode *node)
 // nodes that link to a different node using names and lexical scoping.
 bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hint)
 {
+	// null_check();
 	static int recursion_counter = 0;
 	static bool deep_recursion_warning = false;
 
@@ -918,7 +924,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 	static bool unevaluated_tern_branch = false;
 
-	AstNode *newNode = NULL;
+	std::unique_ptr<AstNode> newNode = nullptr;
 	bool did_something = false;
 
 #if 0
@@ -926,7 +932,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	log("AST simplify[%d] depth %d at %s:%d on %s %p:\n", stage, recursion_counter, filename.c_str(), location.first_line, type2str(type).c_str(), this);
 	log("const_fold=%d, stage=%d, width_hint=%d, sign_hint=%d\n",
 			int(const_fold), int(stage), int(width_hint), int(sign_hint));
-	// dumpAst(NULL, "> ");
+	// dumpAst(nullptr, "> ");
 #endif
 
 	if (stage == 0)
@@ -1006,7 +1012,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					std::swap(data_range_left, data_range_right);
 
 				for (int i = 0; i < mem_size; i++) {
-					AstNode *reg = new AstNode(AST_WIRE, new AstNode(AST_RANGE,
+					auto reg = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE,
 							mkconst_int(data_range_left, true), mkconst_int(data_range_right, true)));
 					reg->str = stringf("%s[%d]", node->str.c_str(), i);
 					reg->is_reg = true;
@@ -1016,19 +1022,15 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 							reg->set_attribute(it.first, it.second->clone());
 					reg->filename = node->filename;
 					reg->location = node->location;
-					children.push_back(reg);
 					while (reg->simplify(true, 1, -1, false)) { }
+					children.push_back(std::move(reg));
 				}
 			}
 
-			AstNode *async_block = NULL;
-			while (mem2reg_as_needed_pass2(mem2reg_set, this, NULL, async_block)) { }
+			AstNode* async_block = nullptr;
+			while (mem2reg_as_needed_pass2(mem2reg_set, this, nullptr, async_block)) { }
 
-			vector<AstNode*> delnodes;
-			mem2reg_remove(mem2reg_set, delnodes);
-
-			for (auto node : delnodes)
-				delete node;
+			mem2reg_remove(mem2reg_set);
 		}
 
 		while (simplify(const_fold, 2, width_hint, sign_hint)) { }
@@ -1055,8 +1057,8 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	}
 
 	if ((type == AST_TCALL) &&
-	    (str == "$display" || str == "$displayb" || str == "$displayh" || str == "$displayo" ||
-	     str == "$write"   || str == "$writeb"   || str == "$writeh"   || str == "$writeo"))
+		(str == "$display" || str == "$displayb" || str == "$displayh" || str == "$displayo" ||
+		 str == "$write"   || str == "$writeb"   || str == "$writeh"   || str == "$writeo"))
 	{
 		if (!current_always) {
 			log_file_warning(filename, location.first_line, "System task `%s' outside initial or always block is unsupported.\n", str.c_str());
@@ -1064,7 +1066,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			str = std::string();
 		} else {
 			// simplify the expressions and convert them to a special cell later in genrtlil
-			for (auto node : children)
+			for (auto& node : children)
 				while (node->simplify(true, stage, -1, false)) {}
 
 			if (current_always->type == AST_INITIAL && !flag_nodisplay && stage == 2) {
@@ -1170,16 +1172,13 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			}
 		}
 		for (size_t i = 0; i < children.size(); i++) {
-			AstNode *node = children[i];
+			AstNode* node = children[i].get();
 
 			if (node->type == AST_WIRE) {
 				if (node->children.size() == 1 && node->children[0]->type == AST_RANGE) {
-					for (auto c : node->children[0]->children) {
-						if (!c->is_simple_const_expr()) {
-							if (attributes.count(ID::dynports))
-								delete attributes.at(ID::dynports);
+					for (auto& c : node->children[0]->children) {
+						if (!c->is_simple_const_expr())
 							set_attribute(ID::dynports, AstNode::mkconst_int(1, true));
-						}
 					}
 				}
 				if (this_wire_scope.count(node->str) > 0) {
@@ -1189,16 +1188,15 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					if (!node->is_input && !node->is_output && node->is_reg && node->children.size() == 0)
 						goto wires_are_compatible;
 					if (first_node->children.size() == 0 && node->children.size() == 1 && node->children[0]->type == AST_RANGE) {
-						AstNode *r = node->children[0];
+						AstNode* r = node->children[0].get();
 						if (r->range_valid && r->range_left == 0 && r->range_right == 0) {
-							delete r;
 							node->children.pop_back();
 						}
 					}
 					if (first_node->children.size() != node->children.size())
 						goto wires_are_incompatible;
 					for (size_t j = 0; j < node->children.size(); j++) {
-						AstNode *n1 = first_node->children[j], *n2 = node->children[j];
+						auto &n1 = first_node->children[j], &n2 = node->children[j];
 						if (n1->type == AST_RANGE && n2->type == AST_RANGE && n1->range_valid && n2->range_valid) {
 							if (n1->range_left != n2->range_left)
 								goto wires_are_incompatible;
@@ -1225,13 +1223,10 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					if (node->is_signed)
 						first_node->is_signed = true;
 					for (auto &it : node->attributes) {
-						if (first_node->attributes.count(it.first) > 0)
-							delete first_node->attributes[it.first];
 						first_node->set_attribute(it.first, it.second->clone());
 					}
 					children.erase(children.begin()+(i--));
 					did_something = true;
-					delete node;
 					continue;
 				wires_are_incompatible:
 					if (stage > 1)
@@ -1249,22 +1244,22 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			}
 			if (node->type == AST_ENUM) {
 				current_scope[node->str] = node;
-				for (auto enode : node->children) {
+				for (auto& enode : node->children) {
 					log_assert(enode->type==AST_ENUM_ITEM);
 					if (current_scope.count(enode->str) == 0)
-						current_scope[enode->str] = enode;
+						current_scope[enode->str] = enode.get();
 					else
 						input_error("enum item %s already exists\n", enode->str.c_str());
 				}
 			}
 		}
 		for (size_t i = 0; i < children.size(); i++) {
-			AstNode *node = children[i];
+			auto& node = children[i];
 			if (node->type == AST_PARAMETER || node->type == AST_LOCALPARAM || node->type == AST_WIRE || node->type == AST_AUTOWIRE || node->type == AST_MEMORY || node->type == AST_TYPEDEF)
 				while (node->simplify(true, 1, -1, false))
 					did_something = true;
 			if (node->type == AST_ENUM) {
-				for (auto enode : node->children){
+				for (auto& enode : node->children){
 					log_assert(enode->type==AST_ENUM_ITEM);
 					while (node->simplify(true, 1, -1, false))
 						did_something = true;
@@ -1272,27 +1267,27 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			}
 		}
 
-		for (AstNode *child : children)
+		for (auto& child : children)
 			if (child->type == AST_ALWAYS &&
 					child->attributes.count(ID::always_comb))
-				check_auto_nosync(child);
+				check_auto_nosync(child.get());
 	}
 
 	// create name resolution entries for all objects with names
 	if (type == AST_PACKAGE) {
 		//add names to package scope
 		for (size_t i = 0; i < children.size(); i++) {
-			AstNode *node = children[i];
+			auto& node = children[i];
 			// these nodes appear at the top level in a package and can define names
 			if (node->type == AST_PARAMETER || node->type == AST_LOCALPARAM || node->type == AST_TYPEDEF || node->type == AST_FUNCTION || node->type == AST_TASK) {
-				current_scope[node->str] = node;
+				current_scope[node->str] = node.get();
 			}
 			if (node->type == AST_ENUM) {
-				current_scope[node->str] = node;
-				for (auto enode : node->children) {
+				current_scope[node->str] = node.get();
+				for (auto& enode : node->children) {
 					log_assert(enode->type==AST_ENUM_ITEM);
 					if (current_scope.count(enode->str) == 0)
-						current_scope[enode->str] = enode;
+						current_scope[enode->str] = enode.get();
 					else
 						input_error("enum item %s already exists in package\n", enode->str.c_str());
 				}
@@ -1316,7 +1311,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		current_always_clocked = false;
 
 		if (type == AST_ALWAYS)
-			for (auto child : children) {
+			for (auto& child : children) {
 				if (child->type == AST_POSEDGE || child->type == AST_NEGEDGE)
 					current_always_clocked = true;
 				if (child->type == AST_EDGE && GetSize(child->children) == 1 &&
@@ -1328,7 +1323,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	if (type == AST_CELL) {
 		bool lookup_suggested = false;
 
-		for (AstNode *child : children) {
+		for (auto& child : children) {
 			// simplify any parameters to constants
 			if (child->type == AST_PARASET)
 				while (child->simplify(true, 1, -1, false)) { }
@@ -1338,7 +1333,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			if (child->type == AST_ARGUMENT) {
 				if (child->children.size() != 1)
 					continue;
-				const AstNode *value = child->children[0];
+				const auto& value = child->children[0];
 				if (value->type == AST_IDENTIFIER) {
 					const AstNode *elem = value->id2ast;
 					if (elem == nullptr) {
@@ -1355,7 +1350,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 						// to be indirected to produce an unsigned connection
 						lookup_suggested = true;
 				}
-				else if (contains_unbased_unsized(value))
+				else if (contains_unbased_unsized(value.get()))
 					// unbased unsized literals extend to width of the context
 					lookup_suggested = true;
 			}
@@ -1366,7 +1361,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			module = lookup_cell_module();
 		if (module) {
 			size_t port_counter = 0;
-			for (AstNode *child : children) {
+			for (auto& child : children) {
 				if (child->type != AST_ARGUMENT)
 					continue;
 
@@ -1390,17 +1385,21 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				log_assert(child->children.size() <= 1);
 				if (child->children.empty())
 					continue;
-				AstNode *arg = child->children[0];
 
-				// plain identifiers never need indirection; this also prevents
-				// adding infinite levels of indirection
-				if (arg->type == AST_IDENTIFIER && arg->children.empty())
-					continue;
+				{
+					auto arg_check = child->children[0].get();
 
-				// only add indirection for standard inputs or outputs
-				if (ref->port_input == ref->port_output)
-					continue;
+					// plain identifiers never need indirection; this also prevents
+					// adding infinite levels of indirection
+					if (arg_check->type == AST_IDENTIFIER && arg_check->children.empty())
+						continue;
 
+					// only add indirection for standard inputs or outputs
+					if (ref->port_input == ref->port_output)
+						continue;
+				}
+
+				auto arg = std::move(child->children[0]);
 				did_something = true;
 
 				// create the indirection wire
@@ -1409,20 +1408,21 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				std::string tmp_str = sstr.str();
 				add_wire_for_ref(ref, tmp_str);
 
-				AstNode *asgn = new AstNode(AST_ASSIGN);
-				current_ast_mod->children.push_back(asgn);
+				auto asgn_owned = std::make_unique<AstNode>(AST_ASSIGN);
+				auto* asgn = asgn_owned.get();
+				current_ast_mod->children.push_back(std::move(asgn_owned));
 
-				AstNode *ident = new AstNode(AST_IDENTIFIER);
+				auto ident = std::make_unique<AstNode>(AST_IDENTIFIER);
 				ident->str = tmp_str;
 				child->children[0] = ident->clone();
 
 				if (ref->port_input && !ref->port_output) {
-					asgn->children.push_back(ident);
-					asgn->children.push_back(arg);
+					asgn->children.push_back(std::move(ident));
+					asgn->children.push_back(std::move(arg));
 				} else {
 					log_assert(!ref->port_input && ref->port_output);
-					asgn->children.push_back(arg);
-					asgn->children.push_back(ident);
+					asgn->children.push_back(std::move(arg));
+					asgn->children.push_back(std::move(ident));
 				}
 				asgn->fixup_hierarchy_flags();
 			}
@@ -1482,7 +1482,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	case AST_STRUCT:
 	case AST_UNION:
 		if (!basic_prep) {
-			for (auto *node : children) {
+			for (auto& node : children) {
 				// resolve any ranges
 				while (!node->basic_prep && node->simplify(true, stage, -1, false)) {
 					did_something = true;
@@ -1496,7 +1496,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				// instance so add a wire for the packed structure
 				auto wnode = make_packed_struct(this, str, attributes);
 				log_assert(current_ast_mod);
-				current_ast_mod->children.push_back(wnode);
+				current_ast_mod->children.push_back(std::move(wnode));
 			}
 			basic_prep = true;
 			is_custom_type = false;
@@ -1522,7 +1522,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	case AST_ENUM:
 		//log("\nENUM %s: %d child %d\n", str.c_str(), basic_prep, children[0]->basic_prep);
 		if (!basic_prep) {
-			for (auto item_node : children) {
+			for (auto& item_node : children) {
 				while (!item_node->basic_prep && item_node->simplify(false, stage, -1, false))
 					did_something = true;
 			}
@@ -1539,8 +1539,8 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			auto item_node = current_scope[children[0]->str];
 			if (item_node->type == AST_STRUCT || item_node->type == AST_UNION) {
 				set_attribute(ID::wiretype, item_node->clone());
-				size_packed_struct(attributes[ID::wiretype], 0);
-				add_members_to_scope(attributes[ID::wiretype], str);
+				size_packed_struct(attributes[ID::wiretype].get(), 0);
+				add_members_to_scope(attributes[ID::wiretype].get(), str);
 			}
 		}
 		while (!children[0]->basic_prep && children[0]->simplify(false, stage, -1, false) == true)
@@ -1568,11 +1568,10 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		break;
 
 	case AST_CAST_SIZE: {
-		int width = 1;
-		AstNode *node;
-		AstNode *child = children[0];
-
-		if (child->type == AST_WIRE) {
+		if (children[0]->type == AST_WIRE) {
+			int width = 1;
+			std::unique_ptr<AstNode> node;
+			AstNode* child = children[0].release();
 			if (child->children.size() == 0) {
 				// Base type (e.g., int)
 				width = child->range_left - child->range_right +1;
@@ -1588,7 +1587,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				if (resolved_type_node->type != AST_TYPEDEF)
 					input_error("`%s' does not name a type\n", type_name.c_str());
 				log_assert(resolved_type_node->children.size() == 1);
-				AstNode *template_node = resolved_type_node->children[0];
+				AstNode *template_node = resolved_type_node->children[0].get();
 
 				// Ensure typedef itself is fully simplified
 				while (template_node->simplify(const_fold, stage, width_hint, sign_hint)) {};
@@ -1597,7 +1596,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				{
 				case AST_WIRE: {
 					if (template_node->children.size() > 0 && template_node->children[0]->type == AST_RANGE)
-						width = range_width(this, template_node->children[0]);
+						width = range_width(this, template_node->children[0].get());
 					child->delete_children();
 					node = mkconst_int(width, true);
 					break;
@@ -1616,9 +1615,8 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				}
 			}
 
-			delete child;
 			children.erase(children.begin());
-			children.insert(children.begin(), node);
+			children.insert(children.begin(), std::move(node));
 		}
 
 		detect_width_simple = true;
@@ -1675,7 +1673,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	case AST_GT:
 		width_hint = -1;
 		sign_hint = true;
-		for (auto child : children) {
+		for (auto& child : children) {
 			while (!child->basic_prep && child->simplify(false, stage, -1, false) == true)
 				did_something = true;
 			child->detectSignWidthWorker(width_hint, sign_hint);
@@ -1713,7 +1711,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (type == AST_REPLICATE)
 			while (children[0]->simplify(true, stage, -1, false) == true)
 				did_something = true;
-		for (auto child : children)
+		for (auto& child : children)
 			while (!child->basic_prep && child->simplify(false, stage, -1, false) == true)
 				did_something = true;
 		detectSignWidth(width_hint, sign_hint);
@@ -1730,11 +1728,11 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			bool backup_unevaluated_tern_branch = unevaluated_tern_branch;
 			AstNode *chosen = get_tern_choice().first;
 
-			unevaluated_tern_branch = backup_unevaluated_tern_branch || chosen == children[2];
+			unevaluated_tern_branch = backup_unevaluated_tern_branch || chosen == children[2].get();
 			while (!children[1]->basic_prep && children[1]->simplify(false, stage, -1, false))
 				did_something = true;
 
-			unevaluated_tern_branch = backup_unevaluated_tern_branch || chosen == children[1];
+			unevaluated_tern_branch = backup_unevaluated_tern_branch || chosen == children[1].get();
 			while (!children[2]->basic_prep && children[2]->simplify(false, stage, -1, false))
 				did_something = true;
 
@@ -1771,12 +1769,12 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (children[0]->type == AST_CONSTANT && children[0]->bits_only_01()) {
 			children[0]->is_signed = sign_hint;
 			RTLIL::Const case_expr = children[0]->bitsAsConst(width_hint, sign_hint);
-			std::vector<AstNode*> new_children;
-			new_children.push_back(children[0]);
+			std::vector<std::unique_ptr<AstNode>> new_children;
+			new_children.push_back(std::move(children[0]));
 			for (int i = 1; i < GetSize(children); i++) {
-				AstNode *child = children[i];
+				auto& child = children[i];
 				log_assert(child->type == AST_COND || child->type == AST_CONDX || child->type == AST_CONDZ);
-				for (auto v : child->children) {
+				for (auto& v : child->children) {
 					if (v->type == AST_DEFAULT)
 						goto keep_const_cond;
 					if (v->type == AST_BLOCK)
@@ -1787,8 +1785,8 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 						RTLIL::Const match = const_eq(case_expr, case_item_expr, sign_hint, sign_hint, 1);
 						log_assert(match.size() == 1);
 						if (match.front() == RTLIL::State::S1) {
-							while (i+1 < GetSize(children))
-								delete children[++i];
+							// This is the only reachable case. Skip to the end
+							i = GetSize(children);
 							goto keep_const_cond;
 						}
 						continue;
@@ -1797,9 +1795,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				}
 				if (0)
 			keep_const_cond:
-					new_children.push_back(child);
-				else
-					delete child;
+					new_children.push_back(std::move(child));
 			}
 			new_children.swap(children);
 		}
@@ -1835,7 +1831,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			flag_autowire = true;
 		if (type == AST_TERNARY && i > 0 && !unevaluated_tern_branch) {
 			AstNode *chosen = get_tern_choice().first;
-			unevaluated_tern_branch = chosen && chosen != children[i];
+			unevaluated_tern_branch = chosen && chosen != children[i].get();
 		}
 		while (did_something_here && i < children.size()) {
 			bool const_fold_here = const_fold;
@@ -1847,10 +1843,10 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				const_fold_here = true;
 			if (type == AST_BLOCK) {
 				current_block = this;
-				current_block_child = children[i];
+				current_block_child = children[i].get();
 			}
 			if ((type == AST_ALWAYS || type == AST_INITIAL) && children[i]->type == AST_BLOCK)
-				current_top_block = children[i];
+				current_top_block = children[i].get();
 			if (i == 0 && child_0_is_self_determined)
 				width_hint_here = -1, sign_hint_here = false;
 			if (i == 1 && child_1_is_self_determined)
@@ -1864,7 +1860,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				did_something = true;
 		}
 		if (stage == 2 && children[i]->type == AST_INITIAL && current_ast_mod != this) {
-			current_ast_mod->children.push_back(children[i]);
+			current_ast_mod->children.push_back(std::move(children[i]));
 			children.erase(children.begin() + (i--));
 			did_something = true;
 		}
@@ -1904,7 +1900,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	current_always_clocked = backup_current_always_clocked;
 
 	for (auto it = backup_scope.begin(); it != backup_scope.end(); it++) {
-		if (it->second == NULL)
+		if (it->second == nullptr)
 			current_scope.erase(it->first);
 		else
 			current_scope[it->first] = it->second;
@@ -1944,18 +1940,18 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			input_error("Defparam argument `%s . %s` does not match a cell!\n",
 					RTLIL::unescape_id(modname).c_str(), RTLIL::unescape_id(paramname).c_str());
 
-		AstNode *paraset = new AstNode(AST_PARASET, children[1]->clone(), GetSize(children) > 2 ? children[2]->clone() : NULL);
+		auto paraset = std::make_unique<AstNode>(AST_PARASET, children[1]->clone(), GetSize(children) > 2 ? children[2]->clone() : nullptr);
 		paraset->str = paramname;
 
 		AstNode *cell = current_scope.at(modname);
-		cell->children.insert(cell->children.begin() + 1, paraset);
+		cell->children.insert(cell->children.begin() + 1, std::move(paraset));
 		delete_children();
 	}
 
 	// resolve typedefs
 	if (type == AST_TYPEDEF) {
 		log_assert(children.size() == 1);
-		auto type_node = children[0];
+		auto& type_node = children[0];
 		log_assert(type_node->type == AST_WIRE || type_node->type == AST_MEMORY || type_node->type == AST_STRUCT || type_node->type == AST_UNION);
 		while (type_node->simplify(const_fold, stage, width_hint, sign_hint)) {
 			did_something = true;
@@ -1976,7 +1972,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			if (resolved_type_node->type != AST_TYPEDEF)
 				input_error("`%s' does not name a type\n", type_name.c_str());
 			log_assert(resolved_type_node->children.size() == 1);
-			AstNode *template_node = resolved_type_node->children[0];
+			auto& template_node = resolved_type_node->children[0];
 
 			// Resolve the typedef from the bottom up, recursing within the current
 			// block of code. Defer further simplification until the complete type is
@@ -1985,9 +1981,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 			if (!str.empty() && str[0] == '\\' && (template_node->type == AST_STRUCT || template_node->type == AST_UNION)) {
 				// replace instance with wire representing the packed structure
-				newNode = make_packed_struct(template_node, str, attributes);
-				if (newNode->attributes.count(ID::wiretype))
-					delete newNode->attributes[ID::wiretype];
+				newNode = make_packed_struct(template_node.get(), str, attributes);
 				newNode->set_attribute(ID::wiretype, mkconst_str(resolved_type_node->str));
 				// add original input/output attribute to resolved wire
 				newNode->is_input = this->is_input;
@@ -1999,8 +1993,6 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			// Prepare replacement node.
 			newNode = template_node->clone();
 			newNode->str = str;
-			if (newNode->attributes.count(ID::wiretype))
-				delete newNode->attributes[ID::wiretype];
 			newNode->set_attribute(ID::wiretype, mkconst_str(resolved_type_node->str));
 			newNode->is_input = is_input;
 			newNode->is_output = is_output;
@@ -2010,7 +2002,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				newNode->set_attribute(pair.first, pair.second->clone());
 
 			// if an enum then add attributes to support simulator tracing
-			newNode->annotateTypedEnums(template_node);
+			newNode->annotateTypedEnums(template_node.get());
 
 			bool add_packed_dimensions = (type == AST_WIRE && GetSize(children) > 1) || (type == AST_MEMORY && GetSize(children) > 2);
 
@@ -2020,20 +2012,20 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 			// Add packed dimensions.
 			if (add_packed_dimensions) {
-				AstNode *packed = children[1];
+				auto& packed = children[1];
 				if (newNode->children.empty())
 					newNode->children.insert(newNode->children.begin(), packed->clone());
 				else
-					prepend_ranges(newNode->children[0], packed);
+					prepend_ranges(newNode->children[0], packed.get());
 			}
 
 			// Add unpacked dimensions.
 			if (type == AST_MEMORY) {
-				AstNode *unpacked = children.back();
+				auto& unpacked = children.back();
 				if (GetSize(newNode->children) < 2)
 					newNode->children.push_back(unpacked->clone());
 				else
-					prepend_ranges(newNode->children[1], unpacked);
+					prepend_ranges(newNode->children[1], unpacked.get());
 				newNode->type = type;
 			}
 
@@ -2054,11 +2046,11 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			// Pretend it's just a wire in order to resolve the type in the code block above.
 			AstNodeType param_type = type;
 			type = AST_WIRE;
-			AstNode *expr = children[0];
+			std::unique_ptr<AstNode> expr = std::move(children.front());
 			children.erase(children.begin());
 			while (is_custom_type && simplify(const_fold, stage, width_hint, sign_hint)) {};
 			type = param_type;
-			children.insert(children.begin(), expr);
+			children.insert(children.begin(), std::move(expr));
 
 			if (children[1]->type == AST_MEMORY)
 				input_error("unpacked array type `%s' cannot be used for a parameter\n", children[1]->str.c_str());
@@ -2071,7 +2063,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	// resolve constant prefixes
 	if (type == AST_PREFIX) {
 		if (children[0]->type != AST_CONSTANT) {
-			// dumpAst(NULL, ">   ");
+			// dumpAst(nullptr, ">   ");
 			input_error("Index in generate block prefix syntax is not constant!\n");
 		}
 		if (children[1]->type == AST_PREFIX)
@@ -2136,13 +2128,13 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				range_right = children[0]->range_right;
 				bool force_upto = false, force_downto = false;
 				if (attributes.count(ID::force_upto)) {
-					AstNode *val = attributes[ID::force_upto];
+					AstNode *val = attributes[ID::force_upto].get();
 					if (val->type != AST_CONSTANT)
 						input_error("Attribute `force_upto' with non-constant value!\n");
 					force_upto = val->asAttrConst().as_bool();
 				}
 				if (attributes.count(ID::force_downto)) {
-					AstNode *val = attributes[ID::force_downto];
+					AstNode *val = attributes[ID::force_downto].get();
 					if (val->type != AST_CONSTANT)
 						input_error("Attribute `force_downto' with non-constant value!\n");
 					force_downto = val->asAttrConst().as_bool();
@@ -2163,10 +2155,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			range_swapped = false;
 			range_left = 0;
 			range_right = 0;
-			if (attributes.count(ID::single_bit_vector)) {
-				delete attributes[ID::single_bit_vector];
-				attributes.erase(ID::single_bit_vector);
-			}
+			attributes.erase(ID::single_bit_vector);
 		}
 	}
 
@@ -2177,19 +2166,18 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			for (int i = std::min(GetSize(children), 2) - 1; i >= 0; i--) {
 				if (children[i]->type == AST_MULTIRANGE) {
 					int width = 1;
-					for (auto range : children[i]->children) {
-						width *= add_dimension(this, range);
+					for (auto& range : children[i]->children) {
+						width *= add_dimension(this, range.get());
 						if (i) unpacked_dimensions++;
 					}
-					delete children[i];
 					int left = width - 1, right = 0;
 					if (i)
 						std::swap(left, right);
-					children[i] = new AstNode(AST_RANGE, mkconst_int(left, true), mkconst_int(right, true));
+					children[i] = std::make_unique<AstNode>(AST_RANGE, mkconst_int(left, true), mkconst_int(right, true));
 					fixup_hierarchy_flags();
 					did_something = true;
 				} else if (children[i]->type == AST_RANGE) {
-					add_dimension(this, children[i]);
+					add_dimension(this, children[i].get());
 					if (i) unpacked_dimensions++;
 				}
 			}
@@ -2201,15 +2189,15 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 	// Resolve multidimensional array access.
 	if (type == AST_IDENTIFIER && !basic_prep && id2ast && (id2ast->type == AST_WIRE || id2ast->type == AST_MEMORY) &&
-	    children.size() > 0 && (children[0]->type == AST_RANGE || children[0]->type == AST_MULTIRANGE))
+		children.size() > 0 && (children[0]->type == AST_RANGE || children[0]->type == AST_MULTIRANGE))
 	{
 		int dims_sel = children[0]->type == AST_MULTIRANGE ? children[0]->children.size() : 1;
 		// Save original number of dimensions for $size() etc.
 		integer = dims_sel;
 
 		// Split access into unpacked and packed parts.
-		AstNode *unpacked_range = nullptr;
-		AstNode *packed_range = nullptr;
+		std::unique_ptr<AstNode> unpacked_range = nullptr;
+		std::unique_ptr<AstNode> packed_range = nullptr;
 
 		if (id2ast->unpacked_dimensions) {
 			if (id2ast->unpacked_dimensions > 1) {
@@ -2217,8 +2205,8 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				unpacked_range = make_index_range(id2ast, true);
 			} else {
 				// Index into one-dimensional unpacked part; unlink simple range node.
-				AstNode *&range = children[0]->type == AST_MULTIRANGE ? children[0]->children[0] : children[0];
-				unpacked_range = range;
+				auto& range = children[0]->type == AST_MULTIRANGE ? children[0]->children[0] : children[0];
+				unpacked_range = std::move(range);
 				range = nullptr;
 			}
 		}
@@ -2229,21 +2217,19 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				packed_range = make_index_range(id2ast, false);
 			} else {
 				// Index into one-dimensional packed part; unlink simple range node.
-				AstNode *&range = children[0]->type == AST_MULTIRANGE ? children[0]->children[dims_sel - 1] : children[0];
-				packed_range = range;
+				auto& range = children[0]->type == AST_MULTIRANGE ? children[0]->children[dims_sel - 1] : children[0];
+				packed_range = std::move(range);
 				range = nullptr;
 			}
 		}
 
-		for (auto &it : children)
-			delete it;
 		children.clear();
 
 		if (unpacked_range)
-			children.push_back(unpacked_range);
+			children.push_back(std::move(unpacked_range));
 
 		if (packed_range)
-			children.push_back(packed_range);
+			children.push_back(std::move(packed_range));
 
 		fixup_hierarchy_flags();
 		basic_prep = true;
@@ -2260,7 +2246,6 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				RTLIL::Const constvalue = children[0]->realAsConst(width);
 				log_file_warning(filename, location.first_line, "converting real value %e to binary %s.\n",
 						children[0]->realvalue, log_signal(constvalue));
-				delete children[0];
 				children[0] = mkconst_bits(constvalue.to_bits(), sign_hint);
 				fixup_hierarchy_flags();
 				did_something = true;
@@ -2269,9 +2254,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				if (width != int(children[0]->bits.size())) {
 					RTLIL::SigSpec sig(children[0]->bits);
 					sig.extend_u0(width, children[0]->is_signed);
-					AstNode *old_child_0 = children[0];
 					children[0] = mkconst_bits(sig.as_const().to_bits(), is_signed);
-					delete old_child_0;
 					fixup_hierarchy_flags();
 				}
 				children[0]->is_signed = is_signed;
@@ -2283,8 +2266,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		} else
 		if (children.size() > 1 && children[1]->type == AST_REALVALUE && children[0]->type == AST_CONSTANT) {
 			double as_realvalue = children[0]->asReal(sign_hint);
-			delete children[0];
-			children[0] = new AstNode(AST_REALVALUE);
+			children[0] = std::make_unique<AstNode>(AST_REALVALUE);
 			children[0]->realvalue = as_realvalue;
 			fixup_hierarchy_flags();
 			did_something = true;
@@ -2313,7 +2295,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				if (found_sname) {
 					// structure member, rewrite this node to reference the packed struct wire
 					auto range = make_index_range(item_node);
-					newNode = new AstNode(AST_IDENTIFIER, range);
+					newNode = std::make_unique<AstNode>(AST_IDENTIFIER, std::move(range));
 					newNode->str = sname;
 					// save type and original number of dimensions for $size() etc.
 					newNode->set_attribute(ID::wiretype, item_node->clone());
@@ -2325,7 +2307,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					}
 					newNode->basic_prep = true;
 					if (item_node->is_signed)
-						newNode = new AstNode(AST_TO_SIGNED, newNode);
+						newNode = std::make_unique<AstNode>(AST_TO_SIGNED, std::move(newNode));
 					goto apply_newNode;
 				}
 			}
@@ -2336,7 +2318,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (current_scope.count(str) == 0) {
 			AstNode *current_scope_ast = (current_ast_mod == nullptr) ? current_ast : current_ast_mod;
 			str = try_pop_module_prefix();
-			for (auto node : current_scope_ast->children) {
+			for (auto& node : current_scope_ast->children) {
 				//log("looking at mod scope child %s\n", type2str(node->type).c_str());
 				switch (node->type) {
 				case AST_PARAMETER:
@@ -2351,16 +2333,16 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					//log("found child %s, %s\n", type2str(node->type).c_str(), node->str.c_str());
 					if (str == node->str) {
 						//log("add %s, type %s to scope\n", str.c_str(), type2str(node->type).c_str());
-						current_scope[node->str] = node;
+						current_scope[node->str] = node.get();
 					}
 					break;
 				case AST_ENUM:
-					current_scope[node->str] = node;
-					for (auto enum_node : node->children) {
+					current_scope[node->str] = node.get();
+					for (auto& enum_node : node->children) {
 						log_assert(enum_node->type==AST_ENUM_ITEM);
 						if (str == enum_node->str) {
 							//log("\nadding enum item %s to scope\n", str.c_str());
-							current_scope[str] = enum_node;
+							current_scope[str] = enum_node.get();
 						}
 					}
 					break;
@@ -2373,10 +2355,10 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			if (current_ast_mod == nullptr) {
 				input_error("Identifier `%s' is implicitly declared outside of a module.\n", str.c_str());
 			} else if (flag_autowire || str == "\\$global_clock") {
-				AstNode *auto_wire = new AstNode(AST_AUTOWIRE);
+				auto auto_wire = std::make_unique<AstNode>(AST_AUTOWIRE);
 				auto_wire->str = str;
-				current_ast_mod->children.push_back(auto_wire);
-				current_scope[str] = auto_wire;
+				current_scope[str] = auto_wire.get();
+				current_ast_mod->children.push_back(std::move(auto_wire));
 				did_something = true;
 			} else {
 				input_error("Identifier `%s' is implicitly declared and `default_nettype is set to none.\n", str.c_str());
@@ -2391,7 +2373,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	// split memory access with bit select to individual statements
 	if (type == AST_IDENTIFIER && children.size() == 2 && children[0]->type == AST_RANGE && children[1]->type == AST_RANGE && !in_lvalue && stage == 2)
 	{
-		if (id2ast == NULL || id2ast->type != AST_MEMORY || children[0]->children.size() != 1)
+		if (id2ast == nullptr || id2ast->type != AST_MEMORY || children[0]->children.size() != 1)
 			input_error("Invalid bit-select on memory access!\n");
 
 		int mem_width, mem_size, addr_bits;
@@ -2407,38 +2389,38 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		sstr << "$mem2bits$" << str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
 		std::string wire_id = sstr.str();
 
-		AstNode *wire = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(data_range_left, true), mkconst_int(data_range_right, true)));
+		auto wire_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(data_range_left, true), mkconst_int(data_range_right, true)));
+		auto* wire = wire_owned.get();
+		current_ast_mod->children.push_back(std::move(wire_owned));
 		wire->str = wire_id;
 		if (current_block)
 			wire->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
-		current_ast_mod->children.push_back(wire);
 		while (wire->simplify(true, 1, -1, false)) { }
 
-		AstNode *data = clone();
-		delete data->children[1];
+		auto data = clone();
 		data->children.pop_back();
 
-		AstNode *assign = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), data);
+		auto assign = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), std::move(data));
 		assign->children[0]->str = wire_id;
 		assign->children[0]->was_checked = true;
 
 		if (current_block)
 		{
 			size_t assign_idx = 0;
-			while (assign_idx < current_block->children.size() && current_block->children[assign_idx] != current_block_child)
+			while (assign_idx < current_block->children.size() && current_block->children[assign_idx].get() != current_block_child)
 				assign_idx++;
 			log_assert(assign_idx < current_block->children.size());
-			current_block->children.insert(current_block->children.begin()+assign_idx, assign);
+			current_block->children.insert(current_block->children.begin()+assign_idx, std::move(assign));
 			wire->is_reg = true;
 		}
 		else
 		{
-			AstNode *proc = new AstNode(AST_ALWAYS, new AstNode(AST_BLOCK));
-			proc->children[0]->children.push_back(assign);
-			current_ast_mod->children.push_back(proc);
+			auto proc = std::make_unique<AstNode>(AST_ALWAYS, std::make_unique<AstNode>(AST_BLOCK));
+			proc->children[0]->children.push_back(std::move(assign));
+			current_ast_mod->children.push_back(std::move(proc));
 		}
 
-		newNode = new AstNode(AST_IDENTIFIER, children[1]->clone());
+		newNode = std::make_unique<AstNode>(AST_IDENTIFIER, children[1]->clone());
 		newNode->str = wire_id;
 		newNode->integer = integer; // save original number of dimensions for $size() etc.
 		newNode->id2ast = wire;
@@ -2450,8 +2432,8 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 	if (type == AST_REPEAT)
 	{
-		AstNode *count = children[0];
-		AstNode *body = children[1];
+		auto count = std::move(children[0]);
+		auto body = std::move(children[1]);
 
 		// eval count expression
 		while (count->simplify(true, stage, 32, true)) { }
@@ -2465,22 +2447,20 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		for (int i = 0; i < count->bitsAsConst().as_int(); i++)
 			children.insert(children.begin(), body->clone());
 
-		delete count;
-		delete body;
 		did_something = true;
 	}
 
 	// unroll for loops and generate-for blocks
 	if ((type == AST_GENFOR || type == AST_FOR) && children.size() != 0)
 	{
-		AstNode *init_ast = children[0];
-		AstNode *while_ast = children[1];
-		AstNode *next_ast = children[2];
-		AstNode *body_ast = children[3];
+		auto& init_ast = children[0];
+		auto& while_ast = children[1];
+		auto& next_ast = children[2];
+		auto* body_ast = children[3].get();
 
 		while (body_ast->type == AST_GENBLOCK && body_ast->str.empty() &&
 				body_ast->children.size() == 1 && body_ast->children.at(0)->type == AST_GENBLOCK)
-			body_ast = body_ast->children.at(0);
+			body_ast = body_ast->children.at(0).get();
 
 		const char* loop_type_str = "procedural";
 		const char* var_type_str = "register";
@@ -2496,16 +2476,16 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (next_ast->type != AST_ASSIGN_EQ)
 			input_error("Unsupported 3rd expression of %s for-loop!\n", loop_type_str);
 
-		if (init_ast->children[0]->id2ast == NULL || init_ast->children[0]->id2ast->type != var_type)
+		if (init_ast->children[0]->id2ast == nullptr || init_ast->children[0]->id2ast->type != var_type)
 			input_error("Left hand side of 1st expression of %s for-loop is not a %s!\n", loop_type_str, var_type_str);
-		if (next_ast->children[0]->id2ast == NULL || next_ast->children[0]->id2ast->type != var_type)
+		if (next_ast->children[0]->id2ast == nullptr || next_ast->children[0]->id2ast->type != var_type)
 			input_error("Left hand side of 3rd expression of %s for-loop is not a %s!\n", loop_type_str, var_type_str);
 
 		if (init_ast->children[0]->id2ast != next_ast->children[0]->id2ast)
 			input_error("Incompatible left-hand sides in 1st and 3rd expression of %s for-loop!\n", loop_type_str);
 
 		// eval 1st expression
-		AstNode *varbuf = init_ast->children[1]->clone();
+		auto varbuf = init_ast->children[1]->clone();
 		{
 			int expr_width_hint = -1;
 			bool expr_sign_hint = true;
@@ -2530,23 +2510,23 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			}
 		}
 
-		varbuf = new AstNode(AST_LOCALPARAM, varbuf);
+		varbuf = std::make_unique<AstNode>(AST_LOCALPARAM, std::move(varbuf));
 		varbuf->str = init_ast->children[0]->str;
 
 		AstNode *backup_scope_varbuf = current_scope[varbuf->str];
-		current_scope[varbuf->str] = varbuf;
+		current_scope[varbuf->str] = varbuf.get();
 
 		size_t current_block_idx = 0;
 		if (type == AST_FOR) {
 			while (current_block_idx < current_block->children.size() &&
-					current_block->children[current_block_idx] != current_block_child)
+					current_block->children[current_block_idx].get() != current_block_child)
 				current_block_idx++;
 		}
 
 		while (1)
 		{
 			// eval 2nd expression
-			AstNode *buf = while_ast->clone();
+			auto buf = while_ast->clone();
 			{
 				int expr_width_hint = -1;
 				bool expr_sign_hint = true;
@@ -2558,10 +2538,8 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				input_error("2nd expression of %s for-loop is not constant!\n", loop_type_str);
 
 			if (buf->integer == 0) {
-				delete buf;
 				break;
 			}
-			delete buf;
 
 			// expand body
 			int index = varbuf->children[0]->integer;
@@ -2574,27 +2552,26 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			std::string prefix = sstr.str();
 
 			// create a scoped localparam for the current value of the loop variable
-			AstNode *local_index = varbuf->clone();
+			auto local_index = varbuf->clone();
 			size_t pos = local_index->str.rfind('.');
 			if (pos != std::string::npos) // remove outer prefix
 				local_index->str = "\\" + local_index->str.substr(pos + 1);
 			local_index->str = prefix_id(prefix, local_index->str);
-			current_scope[local_index->str] = local_index;
-			current_ast_mod->children.push_back(local_index);
+			current_scope[local_index->str] = local_index.get();
+			current_ast_mod->children.push_back(std::move(local_index));
 
 			buf->expand_genblock(prefix);
 
 			if (type == AST_GENFOR) {
 				for (size_t i = 0; i < buf->children.size(); i++) {
 					buf->children[i]->simplify(const_fold, stage, -1, false);
-					current_ast_mod->children.push_back(buf->children[i]);
+					current_ast_mod->children.push_back(std::move(buf->children[i]));
 				}
 			} else {
 				for (size_t i = 0; i < buf->children.size(); i++)
-					current_block->children.insert(current_block->children.begin() + current_block_idx++, buf->children[i]);
+					current_block->children.insert(current_block->children.begin() + current_block_idx++, std::move(buf->children[i]));
 			}
 			buf->children.clear();
-			delete buf;
 
 			// eval 3rd expression
 			buf = next_ast->children[1]->clone();
@@ -2609,19 +2586,16 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			if (buf->type != AST_CONSTANT)
 				input_error("Right hand side of 3rd expression of %s for-loop is not constant (%s)!\n", loop_type_str, type2str(buf->type).c_str());
 
-			delete varbuf->children[0];
-			varbuf->children[0] = buf;
+			varbuf->children[0] = std::move(buf);
 		}
 
 		if (type == AST_FOR) {
-			AstNode *buf = next_ast->clone();
-			delete buf->children[1];
+			auto buf = next_ast->clone();
 			buf->children[1] = varbuf->children[0]->clone();
-			current_block->children.insert(current_block->children.begin() + current_block_idx++, buf);
+			current_block->children.insert(current_block->children.begin() + current_block_idx++, std::move(buf));
 		}
 
 		current_scope[varbuf->str] = backup_scope_varbuf;
-		delete varbuf;
 		delete_children();
 		did_something = true;
 	}
@@ -2632,7 +2606,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		for (size_t i = 0; i < children.size(); i++)
 			if (children[i]->type == AST_WIRE || children[i]->type == AST_MEMORY || children[i]->type == AST_PARAMETER || children[i]->type == AST_LOCALPARAM || children[i]->type == AST_TYPEDEF)
 			{
-				log_assert(!VERILOG_FRONTEND::sv_mode);
+				log_assert(!sv_mode);
 				children[i]->input_error("Local declaration in unnamed block is only supported in SystemVerilog mode!\n");
 			}
 	}
@@ -2647,19 +2621,19 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				&& is_autonamed_block(str))
 			// track local variables in this block so we can consider adding
 			// nosync once the block has been fully elaborated
-			for (AstNode *child : children)
+			for (auto& child : children)
 				if (child->type == AST_WIRE &&
 						!child->attributes.count(ID::nosync))
-					mark_auto_nosync(this, child);
+					mark_auto_nosync(this, child.get());
 
-		std::vector<AstNode*> new_children;
+		std::vector<std::unique_ptr<AstNode>> new_children;
 		for (size_t i = 0; i < children.size(); i++)
 			if (children[i]->type == AST_WIRE || children[i]->type == AST_MEMORY || children[i]->type == AST_PARAMETER || children[i]->type == AST_LOCALPARAM || children[i]->type == AST_TYPEDEF) {
 				children[i]->simplify(false, stage, -1, false);
-				current_ast_mod->children.push_back(children[i]);
-				current_scope[children[i]->str] = children[i];
+				current_scope[children[i]->str] = children[i].get();
+				current_ast_mod->children.push_back(std::move(children[i]));
 			} else
-				new_children.push_back(children[i]);
+				new_children.push_back(std::move(children[i]));
 
 		children.swap(new_children);
 		did_something = true;
@@ -2675,7 +2649,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 		for (size_t i = 0; i < children.size(); i++) {
 			children[i]->simplify(const_fold, stage, -1, false);
-			current_ast_mod->children.push_back(children[i]);
+			current_ast_mod->children.push_back(std::move(children[i]));
 		}
 
 		children.clear();
@@ -2685,7 +2659,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	// simplify generate-if blocks
 	if (type == AST_GENIF && children.size() != 0)
 	{
-		AstNode *buf = children[0]->clone();
+		auto buf = children[0]->clone();
 		while (buf->simplify(true, stage, width_hint, sign_hint)) { }
 		if (buf->type != AST_CONSTANT) {
 			// for (auto f : log_files)
@@ -2693,17 +2667,15 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			input_error("Condition for generate if is not constant!\n");
 		}
 		if (buf->asBool() != 0) {
-			delete buf;
 			buf = children[1]->clone();
 		} else {
-			delete buf;
-			buf = children.size() > 2 ? children[2]->clone() : NULL;
+			buf = children.size() > 2 ? children[2]->clone() : nullptr;
 		}
 
 		if (buf)
 		{
 			if (buf->type != AST_GENBLOCK)
-				buf = new AstNode(AST_GENBLOCK, buf);
+				buf = std::make_unique<AstNode>(AST_GENBLOCK, std::move(buf));
 
 			if (!buf->str.empty()) {
 				buf->expand_genblock(buf->str + ".");
@@ -2711,11 +2683,10 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 			for (size_t i = 0; i < buf->children.size(); i++) {
 				buf->children[i]->simplify(const_fold, stage, -1, false);
-				current_ast_mod->children.push_back(buf->children[i]);
+				current_ast_mod->children.push_back(std::move(buf->children[i]));
 			}
 
 			buf->children.clear();
-			delete buf;
 		}
 
 		delete_children();
@@ -2725,7 +2696,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	// simplify generate-case blocks
 	if (type == AST_GENCASE && children.size() != 0)
 	{
-		AstNode *buf = children[0]->clone();
+		auto buf = children[0]->clone();
 		while (buf->simplify(true, stage, width_hint, sign_hint)) { }
 		if (buf->type != AST_CONSTANT) {
 			// for (auto f : log_files)
@@ -2735,24 +2706,23 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 		bool ref_signed = buf->is_signed;
 		RTLIL::Const ref_value = buf->bitsAsConst();
-		delete buf;
 
-		AstNode *selected_case = NULL;
+		AstNode *selected_case = nullptr;
 		for (size_t i = 1; i < children.size(); i++)
 		{
 			log_assert(children.at(i)->type == AST_COND || children.at(i)->type == AST_CONDX || children.at(i)->type == AST_CONDZ);
 
-			AstNode *this_genblock = NULL;
-			for (auto child : children.at(i)->children) {
-				log_assert(this_genblock == NULL);
+			AstNode *this_genblock = nullptr;
+			for (auto& child : children.at(i)->children) {
+				log_assert(this_genblock == nullptr);
 				if (child->type == AST_GENBLOCK)
-					this_genblock = child;
+					this_genblock = child.get();
 			}
 
-			for (auto child : children.at(i)->children)
+			for (auto& child : children.at(i)->children)
 			{
 				if (child->type == AST_DEFAULT) {
-					if (selected_case == NULL)
+					if (selected_case == nullptr)
 						selected_case = this_genblock;
 					continue;
 				}
@@ -2769,7 +2739,6 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				}
 
 				bool is_selected = RTLIL::const_eq(ref_value, buf->bitsAsConst(), ref_signed && buf->is_signed, ref_signed && buf->is_signed, 1).as_bool();
-				delete buf;
 
 				if (is_selected) {
 					selected_case = this_genblock;
@@ -2779,7 +2748,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			}
 		}
 
-		if (selected_case != NULL)
+		if (selected_case != nullptr)
 		{
 			log_assert(selected_case->type == AST_GENBLOCK);
 			buf = selected_case->clone();
@@ -2790,11 +2759,10 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 			for (size_t i = 0; i < buf->children.size(); i++) {
 				buf->children[i]->simplify(const_fold, stage, -1, false);
-				current_ast_mod->children.push_back(buf->children[i]);
+				current_ast_mod->children.push_back(std::move(buf->children[i]));
 			}
 
 			buf->children.clear();
-			delete buf;
 		}
 
 		delete_children();
@@ -2807,13 +2775,14 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (!children.at(0)->range_valid)
 			input_error("Non-constant array range on cell array.\n");
 
-		newNode = new AstNode(AST_GENBLOCK);
+		newNode = std::make_unique<AstNode>(AST_GENBLOCK);
 		int num = max(children.at(0)->range_left, children.at(0)->range_right) - min(children.at(0)->range_left, children.at(0)->range_right) + 1;
 
 		for (int i = 0; i < num; i++) {
 			int idx = children.at(0)->range_left > children.at(0)->range_right ? children.at(0)->range_right + i : children.at(0)->range_right - i;
-			AstNode *new_cell = children.at(1)->clone();
-			newNode->children.push_back(new_cell);
+			auto new_cell_owned = children.at(1)->clone();
+			auto* new_cell = new_cell_owned.get();
+			newNode->children.push_back(std::move(new_cell_owned));
 			new_cell->str += stringf("[%d]", idx);
 			if (new_cell->type == AST_PRIMITIVE) {
 				input_error("Cell arrays of primitives are currently not supported.\n");
@@ -2833,13 +2802,12 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (children.size() < 2)
 			input_error("Insufficient number of arguments for primitive `%s'!\n", str.c_str());
 
-		std::vector<AstNode*> children_list;
-		for (auto child : children) {
+		std::vector<std::unique_ptr<AstNode>> children_list;
+		for (auto& child : children) {
 			log_assert(child->type == AST_ARGUMENT);
 			log_assert(child->children.size() == 1);
-			children_list.push_back(child->children[0]);
+			children_list.push_back(std::move(child->children[0]));
 			child->children.clear();
-			delete child;
 		}
 		children.clear();
 
@@ -2850,39 +2818,38 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 			std::vector<RTLIL::State> z_const(1, RTLIL::State::Sz);
 
-			AstNode *mux_input = children_list.at(1);
+			auto& mux_input = children_list.at(1);
 			if (str == "notif0" || str == "notif1") {
-				mux_input = new AstNode(AST_BIT_NOT, mux_input);
+				mux_input = std::make_unique<AstNode>(AST_BIT_NOT, std::move(mux_input));
 			}
-			AstNode *node = new AstNode(AST_TERNARY, children_list.at(2));
+			auto node = std::make_unique<AstNode>(AST_TERNARY, std::move(children_list.at(2)));
 			if (str == "bufif0") {
 				node->children.push_back(AstNode::mkconst_bits(z_const, false));
-				node->children.push_back(mux_input);
+				node->children.push_back(std::move(mux_input));
 			} else {
-				node->children.push_back(mux_input);
+				node->children.push_back(std::move(mux_input));
 				node->children.push_back(AstNode::mkconst_bits(z_const, false));
 			}
 
 			str.clear();
 			type = AST_ASSIGN;
-			children.push_back(children_list.at(0));
+			children.push_back(std::move(children_list.at(0)));
 			children.back()->was_checked = true;
-			children.push_back(node);
+			children.push_back(std::move(node));
 			fixup_hierarchy_flags();
 			did_something = true;
 		}
 		else if (str == "buf" || str == "not")
 		{
-			AstNode *input = children_list.back();
+			auto& input = children_list.back();
 			if (str == "not")
-				input = new AstNode(AST_BIT_NOT, input);
+				input = std::make_unique<AstNode>(AST_BIT_NOT, std::move(input));
 
-			newNode = new AstNode(AST_GENBLOCK);
+			newNode = std::make_unique<AstNode>(AST_GENBLOCK);
 			for (auto it = children_list.begin(); it != std::prev(children_list.end()); it++) {
-				newNode->children.push_back(new AstNode(AST_ASSIGN, *it, input->clone()));
+				newNode->children.push_back(std::make_unique<AstNode>(AST_ASSIGN, std::move(*it), input->clone()));
 				newNode->children.back()->was_checked = true;
 			}
-			delete input;
 
 			did_something = true;
 		}
@@ -2905,20 +2872,20 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				op_type = AST_BIT_XOR, invert_results = true;
 			log_assert(op_type != AST_NONE);
 
-			AstNode *node = children_list[1];
+			auto& node = children_list[1];
 			if (op_type != AST_POS)
 				for (size_t i = 2; i < children_list.size(); i++) {
-					node = new AstNode(op_type, node, children_list[i]);
+					node = std::make_unique<AstNode>(op_type, std::move(node), std::move(children_list[i]));
 					node->location = location;
 				}
 			if (invert_results)
-				node = new AstNode(AST_BIT_NOT, node);
+				node = std::make_unique<AstNode>(AST_BIT_NOT, std::move(node));
 
 			str.clear();
 			type = AST_ASSIGN;
-			children.push_back(children_list[0]);
+			children.push_back(std::move(children_list[0]));
 			children.back()->was_checked = true;
-			children.push_back(node);
+			children.push_back(std::move(node));
 			fixup_hierarchy_flags();
 			did_something = true;
 		}
@@ -2933,7 +2900,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			goto skip_dynamic_range_lvalue_expansion;
 		if (children[0]->children[0]->range_valid || did_something)
 			goto skip_dynamic_range_lvalue_expansion;
-		if (children[0]->id2ast == NULL || children[0]->id2ast->type != AST_WIRE)
+		if (children[0]->id2ast == nullptr || children[0]->id2ast->type != AST_WIRE)
 			goto skip_dynamic_range_lvalue_expansion;
 		if (!children[0]->id2ast->range_valid)
 			goto skip_dynamic_range_lvalue_expansion;
@@ -2945,10 +2912,10 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		int wire_offset = children[0]->id2ast->range_right;
 		int result_width = 1;
 
-		AstNode *shift_expr = NULL;
-		AstNode *range = children[0]->children[0];
+		std::unique_ptr<AstNode> shift_expr = nullptr;
+		auto& range = children[0]->children[0];
 
-		if (!try_determine_range_width(range, result_width))
+		if (!try_determine_range_width(range.get(), result_width))
 			input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str.c_str());
 
 		if (range->children.size() >= 2)
@@ -2992,14 +2959,14 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				AstNode *lsb_expr =
 					shift_expr->type == AST_ADD && shift_expr->children[0]->type == AST_SELFSZ &&
 					shift_expr->children[1]->type == AST_CONSTANT && shift_expr->children[1]->integer == 0 ?
-					shift_expr->children[0]->children[0] :
-					shift_expr;
+					shift_expr->children[0]->children[0].get() :
+					shift_expr.get();
 
 				// Extract stride from indexing of two-dimensional packed arrays and
 				// variable slices on the form dst[i*stride +: width] = src.
 				if (lsb_expr->type == AST_MUL &&
-				    (lsb_expr->children[0]->type == AST_CONSTANT ||
-				     lsb_expr->children[1]->type == AST_CONSTANT))
+					(lsb_expr->children[0]->type == AST_CONSTANT ||
+					 lsb_expr->children[1]->type == AST_CONSTANT))
 				{
 					int stride_ix = lsb_expr->children[1]->type == AST_CONSTANT;
 					stride = (int)lsb_expr->children[stride_ix]->integer;
@@ -3047,11 +3014,14 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			int rvalue_width;
 			bool rvalue_sign;
 			children[1]->detectSignWidth(rvalue_width, rvalue_sign);
-			AstNode *rvalue = mktemp_logic("$bitselwrite$rvalue$", current_ast_mod, true, rvalue_width - 1, 0, rvalue_sign);
-			AstNode *caseNode = new AstNode(AST_CASE, shift_expr);
-			newNode = new AstNode(AST_BLOCK,
-					      new AstNode(AST_ASSIGN_EQ, rvalue, children[1]->clone()),
-					      caseNode);
+			auto rvalue = mktemp_logic("$bitselwrite$rvalue$", current_ast_mod, true, rvalue_width - 1, 0, rvalue_sign);
+			auto* rvalue_leaky = rvalue.get();
+			log("make 1\n");
+			auto case_node_owned = std::make_unique<AstNode>(AST_CASE, std::move(shift_expr));
+			auto* case_node = case_node_owned.get();
+			newNode = std::make_unique<AstNode>(AST_BLOCK,
+						  std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(rvalue), children[1]->clone()),
+						  std::move(case_node_owned));
 
 			did_something = true;
 			for (int i = 1 - result_width; i < wire_width; i++) {
@@ -3064,26 +3034,26 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				if (start_bit%bitno_div != 0 || (stride == 0 && start_bit != 0))
 					continue;
 
-				AstNode *cond = new AstNode(AST_COND, mkconst_int(start_bit, case_sign_hint, max_width));
-				AstNode *lvalue = children[0]->clone();
+				auto cond = std::make_unique<AstNode>(AST_COND, mkconst_int(start_bit, case_sign_hint, max_width));
+				auto lvalue = children[0]->clone();
 				lvalue->delete_children();
 				if (member_node)
 					lvalue->set_attribute(ID::wiretype, member_node->clone());
-				lvalue->children.push_back(new AstNode(AST_RANGE,
+				lvalue->children.push_back(std::make_unique<AstNode>(AST_RANGE,
 						mkconst_int(end_bit, true), mkconst_int(start_bit, true)));
-				cond->children.push_back(new AstNode(AST_BLOCK, new AstNode(type, lvalue, rvalue->clone())));
-				caseNode->children.push_back(cond);
+				cond->children.push_back(std::make_unique<AstNode>(AST_BLOCK, std::make_unique<AstNode>(std::move(type), std::move(lvalue), rvalue_leaky->clone())));
+				case_node->children.push_back(std::move(cond));
 			}
 		} else {
 			// mask and shift operations
 			// dst = (dst & ~(width'1 << lsb)) | unsigned'(width'(src)) << lsb)
 
-			AstNode *lvalue = children[0]->clone();
+			auto lvalue = children[0]->clone();
 			lvalue->delete_children();
 			if (member_node)
 				lvalue->set_attribute(ID::wiretype, member_node->clone());
 
-			AstNode *old_data = lvalue->clone();
+			auto old_data = lvalue->clone();
 			if (type == AST_ASSIGN_LE)
 				old_data->lookahead = true;
 
@@ -3092,51 +3062,52 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			shift_expr->detectSignWidth(shift_width_hint, shift_sign_hint);
 
 			// All operations are carried out in a new block.
-			newNode = new AstNode(AST_BLOCK);
+			newNode = std::make_unique<AstNode>(AST_BLOCK);
 
 			// Temporary register holding the result of the bit- or part-select position expression.
-			AstNode *pos = mktemp_logic("$bitselwrite$pos$", current_ast_mod, true, shift_width_hint - 1, 0, shift_sign_hint);
-			newNode->children.push_back(new AstNode(AST_ASSIGN_EQ, pos, shift_expr));
-
+			auto pos = mktemp_logic("$bitselwrite$pos$", current_ast_mod, true, shift_width_hint - 1, 0, shift_sign_hint);
 			// Calculate lsb from position.
-			AstNode *shift_val = pos->clone();
+			auto shift_val = pos->clone();
+
+			newNode->children.push_back(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(pos), std::move(shift_expr)));
 
 			// If the expression is signed, we must add an extra bit for possible negation of the most negative number.
 			// If the expression is unsigned, we must add an extra bit for sign.
-			shift_val = new AstNode(AST_CAST_SIZE, mkconst_int(shift_width_hint + 1, true), shift_val);
+			shift_val = std::make_unique<AstNode>(AST_CAST_SIZE, mkconst_int(shift_width_hint + 1, true), std::move(shift_val));
 			if (!shift_sign_hint)
-				shift_val = new AstNode(AST_TO_SIGNED, shift_val);
+				shift_val = std::make_unique<AstNode>(AST_TO_SIGNED, std::move(shift_val));
 
 			// offset the shift amount by the lower bound of the dimension
 			if (wire_offset != 0)
-				shift_val = new AstNode(AST_SUB, shift_val, mkconst_int(wire_offset, true));
+				shift_val = std::make_unique<AstNode>(AST_SUB, std::move(shift_val), mkconst_int(wire_offset, true));
 
 			// reflect the shift amount if the dimension is swapped
 			if (children[0]->id2ast->range_swapped)
-				shift_val = new AstNode(AST_SUB, mkconst_int(wire_width - result_width, true), shift_val);
+				shift_val = std::make_unique<AstNode>(AST_SUB, mkconst_int(wire_width - result_width, true), std::move(shift_val));
 
 			// AST_SHIFT uses negative amounts for shifting left
-			shift_val = new AstNode(AST_NEG, shift_val);
+			shift_val = std::make_unique<AstNode>(AST_NEG, std::move(shift_val));
+			auto also_shift_val = shift_val->clone();
 
 			// dst = (dst & ~(width'1 << lsb)) | unsigned'(width'(src)) << lsb)
 			did_something = true;
-			AstNode *bitmask = mkconst_bits(std::vector<RTLIL::State>(result_width, State::S1), false);
+			auto bitmask = mkconst_bits(std::vector<RTLIL::State>(result_width, State::S1), false);
 			newNode->children.push_back(
-				new AstNode(type,
-					    lvalue,
-					    new AstNode(AST_BIT_OR,
-							new AstNode(AST_BIT_AND,
-								    old_data,
-								    new AstNode(AST_BIT_NOT,
-										new AstNode(AST_SHIFT,
-											    bitmask,
-											    shift_val->clone()))),
-							new AstNode(AST_SHIFT,
-								    new AstNode(AST_TO_UNSIGNED,
-										new AstNode(AST_CAST_SIZE,
-											    mkconst_int(result_width, true),
-											    children[1]->clone())),
-								    shift_val))));
+				std::make_unique<AstNode>(std::move(type),
+						std::move(lvalue),
+						std::make_unique<AstNode>(AST_BIT_OR,
+							std::make_unique<AstNode>(AST_BIT_AND,
+									std::move(old_data),
+									std::make_unique<AstNode>(AST_BIT_NOT,
+										std::make_unique<AstNode>(AST_SHIFT,
+												std::move(bitmask),
+												std::move(shift_val)))),
+							std::make_unique<AstNode>(AST_SHIFT,
+									std::make_unique<AstNode>(AST_TO_UNSIGNED,
+										std::make_unique<AstNode>(AST_CAST_SIZE,
+												mkconst_int(result_width, true),
+												children[1]->clone())),
+									std::move(also_shift_val)))));
 
 			newNode->fixup_hierarchy_flags(true);
 		}
@@ -3146,11 +3117,11 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 skip_dynamic_range_lvalue_expansion:;
 
 	// found right-hand side identifier for memory -> replace with memory read port
-	if (stage > 1 && type == AST_IDENTIFIER && id2ast != NULL && id2ast->type == AST_MEMORY && !in_lvalue &&
+	if (stage > 1 && type == AST_IDENTIFIER && id2ast != nullptr && id2ast->type == AST_MEMORY && !in_lvalue &&
 			children.size() == 1 && children[0]->type == AST_RANGE && children[0]->children.size() == 1) {
 		if (integer < (unsigned)id2ast->unpacked_dimensions)
 			input_error("Insufficient number of array indices for %s.\n", log_id(str));
-		newNode = new AstNode(AST_MEMRD, children[0]->children[0]->clone());
+		newNode = std::make_unique<AstNode>(AST_MEMRD, children[0]->children[0]->clone());
 		newNode->str = str;
 		newNode->id2ast = id2ast;
 		goto apply_newNode;
@@ -3161,39 +3132,41 @@ skip_dynamic_range_lvalue_expansion:;
 	{
 		bool found_nontrivial_member = false;
 
-		for (auto child : children[0]->children) {
-			if (child->type == AST_IDENTIFIER && child->id2ast != NULL && child->id2ast->type == AST_MEMORY)
+		for (auto& child : children[0]->children) {
+			if (child->type == AST_IDENTIFIER && child->id2ast != nullptr && child->id2ast->type == AST_MEMORY)
 				found_nontrivial_member = true;
 		}
 
 		if (found_nontrivial_member)
 		{
-			newNode = new AstNode(AST_BLOCK);
+			newNode = std::make_unique<AstNode>(AST_BLOCK);
 
-			AstNode *wire_tmp = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(width_hint-1, true), mkconst_int(0, true)));
+			auto wire_tmp_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(width_hint-1, true), mkconst_int(0, true)));
+			auto wire_tmp = wire_tmp_owned.get();
 			wire_tmp->str = stringf("$splitcmplxassign$%s:%d$%d", RTLIL::encode_filename(filename).c_str(), location.first_line, autoidx++);
-			current_ast_mod->children.push_back(wire_tmp);
 			current_scope[wire_tmp->str] = wire_tmp;
+			current_ast_mod->children.push_back(std::move(wire_tmp_owned));
 			wire_tmp->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
 			while (wire_tmp->simplify(true, 1, -1, false)) { }
 			wire_tmp->is_logic = true;
 
-			AstNode *wire_tmp_id = new AstNode(AST_IDENTIFIER);
+			auto wire_tmp_id_owned = std::make_unique<AstNode>(AST_IDENTIFIER);
+			auto* wire_tmp_id = wire_tmp_id_owned.get();
 			wire_tmp_id->str = wire_tmp->str;
 
-			newNode->children.push_back(new AstNode(AST_ASSIGN_EQ, wire_tmp_id, children[1]->clone()));
+			newNode->children.push_back(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(wire_tmp_id_owned), children[1]->clone()));
 			newNode->children.back()->was_checked = true;
 
 			int cursor = 0;
-			for (auto child : children[0]->children)
+			for (auto& child : children[0]->children)
 			{
 				int child_width_hint = -1;
 				bool child_sign_hint = true;
 				child->detectSignWidth(child_width_hint, child_sign_hint);
 
-				AstNode *rhs = wire_tmp_id->clone();
-				rhs->children.push_back(new AstNode(AST_RANGE, AstNode::mkconst_int(cursor+child_width_hint-1, true), AstNode::mkconst_int(cursor, true)));
-				newNode->children.push_back(new AstNode(type, child->clone(), rhs));
+				auto rhs = wire_tmp_id->clone();
+				rhs->children.push_back(std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(cursor+child_width_hint-1, true), AstNode::mkconst_int(cursor, true)));
+				newNode->children.push_back(std::make_unique<AstNode>(type, child->clone(), std::move(rhs)));
 
 				cursor += child_width_hint;
 			}
@@ -3219,8 +3192,8 @@ skip_dynamic_range_lvalue_expansion:;
 		bool mem_signed = children[0]->id2ast->is_signed;
 		children[0]->id2ast->meminfo(mem_width, mem_size, addr_bits);
 
-		newNode = new AstNode(AST_BLOCK);
-		AstNode *defNode = new AstNode(AST_BLOCK);
+		newNode = std::make_unique<AstNode>(AST_BLOCK);
+		auto defNode = std::make_unique<AstNode>(AST_BLOCK);
 
 		int data_range_left = children[0]->id2ast->children[0]->range_left;
 		int data_range_right = children[0]->id2ast->children[0]->range_right;
@@ -3239,74 +3212,75 @@ skip_dynamic_range_lvalue_expansion:;
 		for (int i = 0; i < mem_width; i++)
 			set_bits_en.push_back(RTLIL::State::S1);
 
-		AstNode *node_addr = nullptr;
+		std::unique_ptr<AstNode> node_addr = nullptr;
 		if (children[0]->children[0]->children[0]->isConst()) {
 			node_addr = children[0]->children[0]->children[0]->clone();
 		} else {
-			AstNode *wire_addr = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(addr_bits-1, true), mkconst_int(0, true)));
+			auto wire_addr_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(addr_bits-1, true), mkconst_int(0, true)));
+			auto* wire_addr = wire_addr_owned.get();
 			wire_addr->str = id_addr;
 			wire_addr->was_checked = true;
-			current_ast_mod->children.push_back(wire_addr);
+			current_ast_mod->children.push_back(std::move(wire_addr_owned));
 			current_scope[wire_addr->str] = wire_addr;
 			while (wire_addr->simplify(true, 1, -1, false)) { }
 
-			AstNode *assign_addr = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), mkconst_bits(x_bits_addr, false));
+			auto assign_addr = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), mkconst_bits(x_bits_addr, false));
 			assign_addr->children[0]->str = id_addr;
 			assign_addr->children[0]->was_checked = true;
-			defNode->children.push_back(assign_addr);
+			defNode->children.push_back(std::move(assign_addr));
 
-			assign_addr = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), children[0]->children[0]->children[0]->clone());
+			assign_addr = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), children[0]->children[0]->children[0]->clone());
 			assign_addr->children[0]->str = id_addr;
 			assign_addr->children[0]->was_checked = true;
-			newNode->children.push_back(assign_addr);
+			newNode->children.push_back(std::move(assign_addr));
 
-			node_addr = new AstNode(AST_IDENTIFIER);
+			node_addr = std::make_unique<AstNode>(AST_IDENTIFIER);
 			node_addr->str = id_addr;
 		}
 
-		AstNode *node_data = nullptr;
+		std::unique_ptr<AstNode> node_data = nullptr;
 		if (children[0]->children.size() == 1 && children[1]->isConst()) {
 			node_data = children[1]->clone();
 		} else {
-			AstNode *wire_data = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
+			auto wire_data_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
+			auto* wire_data = wire_data_owned.get();
 			wire_data->str = id_data;
 			wire_data->was_checked = true;
 			wire_data->is_signed = mem_signed;
-			current_ast_mod->children.push_back(wire_data);
 			current_scope[wire_data->str] = wire_data;
+			current_ast_mod->children.push_back(std::move(wire_data_owned));
 			while (wire_data->simplify(true, 1, -1, false)) { }
 
-			AstNode *assign_data = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), mkconst_bits(x_bits_data, false));
+			auto assign_data = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), mkconst_bits(x_bits_data, false));
 			assign_data->children[0]->str = id_data;
 			assign_data->children[0]->was_checked = true;
-			defNode->children.push_back(assign_data);
+			defNode->children.push_back(std::move(assign_data));
 
-			node_data = new AstNode(AST_IDENTIFIER);
+			node_data = std::make_unique<AstNode>(AST_IDENTIFIER);
 			node_data->str = id_data;
 		}
 
-		AstNode *wire_en = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
+		auto wire_en_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
+		auto* wire_en = wire_en_owned.get();
 		wire_en->str = id_en;
 		wire_en->was_checked = true;
-		current_ast_mod->children.push_back(wire_en);
 		current_scope[wire_en->str] = wire_en;
+		current_ast_mod->children.push_back(std::move(wire_en_owned));
 		while (wire_en->simplify(true, 1, -1, false)) { }
 
-		AstNode *assign_en_first = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), mkconst_int(0, false, mem_width));
+		auto assign_en_first = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), mkconst_int(0, false, mem_width));
 		assign_en_first->children[0]->str = id_en;
 		assign_en_first->children[0]->was_checked = true;
-		defNode->children.push_back(assign_en_first);
+		defNode->children.push_back(std::move(assign_en_first));
 
-		AstNode *node_en = new AstNode(AST_IDENTIFIER);
+		auto node_en = std::make_unique<AstNode>(AST_IDENTIFIER);
 		node_en->str = id_en;
 
 		if (!defNode->children.empty())
-			current_top_block->children.insert(current_top_block->children.begin(), defNode);
-		else
-			delete defNode;
+			current_top_block->children.insert(current_top_block->children.begin(), std::move(defNode));
 
-		AstNode *assign_data = nullptr;
-		AstNode *assign_en = nullptr;
+		std::unique_ptr<AstNode> assign_data = nullptr;
+		std::unique_ptr<AstNode> assign_en = nullptr;
 		if (children[0]->children.size() == 2)
 		{
 			if (children[0]->children[1]->range_valid)
@@ -3317,24 +3291,24 @@ skip_dynamic_range_lvalue_expansion:;
 
 				std::vector<RTLIL::State> padding_x(offset, RTLIL::State::Sx);
 
-				assign_data = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER),
-						new AstNode(AST_CONCAT, mkconst_bits(padding_x, false), children[1]->clone()));
+				assign_data = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER),
+						std::make_unique<AstNode>(AST_CONCAT, mkconst_bits(padding_x, false), children[1]->clone()));
 				assign_data->children[0]->str = id_data;
 				assign_data->children[0]->was_checked = true;
 
 				for (int i = 0; i < mem_width; i++)
 					set_bits_en[i] = offset <= i && i < offset+width ? RTLIL::State::S1 : RTLIL::State::S0;
-				assign_en = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), mkconst_bits(set_bits_en, false));
+				assign_en = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), mkconst_bits(set_bits_en, false));
 				assign_en->children[0]->str = id_en;
 				assign_en->children[0]->was_checked = true;
 			}
 			else
 			{
-				AstNode *the_range = children[0]->children[1];
-				AstNode *offset_ast;
+				std::unique_ptr<AstNode>& the_range = children[0]->children[1];
+				std::unique_ptr<AstNode> offset_ast;
 				int width;
 
-				if (!try_determine_range_width(the_range, width))
+				if (!try_determine_range_width(the_range.get(), width))
 					input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str.c_str());
 
 				if (the_range->children.size() >= 2)
@@ -3343,44 +3317,43 @@ skip_dynamic_range_lvalue_expansion:;
 					offset_ast = the_range->children[0]->clone();
 
 				if (mem_data_range_offset)
-					offset_ast = new AstNode(AST_SUB, offset_ast, mkconst_int(mem_data_range_offset, true));
+					offset_ast = std::make_unique<AstNode>(AST_SUB, std::move(offset_ast), mkconst_int(mem_data_range_offset, true));
 
-				assign_data = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER),
-						new AstNode(AST_SHIFT_LEFT, children[1]->clone(), offset_ast->clone()));
+				assign_data = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER),
+						std::make_unique<AstNode>(AST_SHIFT_LEFT, children[1]->clone(), offset_ast->clone()));
 				assign_data->children[0]->str = id_data;
 				assign_data->children[0]->was_checked = true;
 
 				for (int i = 0; i < mem_width; i++)
 					set_bits_en[i] = i < width ? RTLIL::State::S1 : RTLIL::State::S0;
-				assign_en = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER),
-						new AstNode(AST_SHIFT_LEFT, mkconst_bits(set_bits_en, false), offset_ast->clone()));
+				assign_en = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER),
+						std::make_unique<AstNode>(AST_SHIFT_LEFT, mkconst_bits(set_bits_en, false), offset_ast->clone()));
 				assign_en->children[0]->str = id_en;
 				assign_en->children[0]->was_checked = true;
-				delete offset_ast;
 			}
 		}
 		else
 		{
 			if (!(children[0]->children.size() == 1 && children[1]->isConst())) {
-				assign_data = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), children[1]->clone());
+				assign_data = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), children[1]->clone());
 				assign_data->children[0]->str = id_data;
 				assign_data->children[0]->was_checked = true;
 			}
 
-			assign_en = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), mkconst_bits(set_bits_en, false));
+			assign_en = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), mkconst_bits(set_bits_en, false));
 			assign_en->children[0]->str = id_en;
 			assign_en->children[0]->was_checked = true;
 		}
 		if (assign_data)
-			newNode->children.push_back(assign_data);
+			newNode->children.push_back(std::move(assign_data));
 		if (assign_en)
-			newNode->children.push_back(assign_en);
+			newNode->children.push_back(std::move(assign_en));
 
-		AstNode *wrnode;
+		std::unique_ptr<AstNode> wrnode;
 		if (current_always->type == AST_INITIAL)
-			wrnode = new AstNode(AST_MEMINIT, node_addr, node_data, node_en, mkconst_int(1, false));
+			wrnode = std::make_unique<AstNode>(AST_MEMINIT, std::move(node_addr), std::move(node_data), std::move(node_en), mkconst_int(1, false));
 		else
-			wrnode = new AstNode(AST_MEMWR, node_addr, node_data, node_en);
+			wrnode = std::make_unique<AstNode>(AST_MEMWR, std::move(node_addr), std::move(node_data), std::move(node_en));
 		wrnode->str = children[0]->str;
 		wrnode->id2ast = children[0]->id2ast;
 		wrnode->location = location;
@@ -3394,14 +3367,13 @@ skip_dynamic_range_lvalue_expansion:;
 			}
 			wrnode->children.push_back(mkconst_bits(priority_mask, false));
 			current_memwr_visible[wrnode->str].insert(portid);
-			current_always->children.push_back(wrnode);
+			current_always->children.push_back(std::move(wrnode));
 		} else {
-			current_ast_mod->children.push_back(wrnode);
+			current_ast_mod->children.push_back(std::move(wrnode));
 		}
 
 		if (newNode->children.empty()) {
-			delete newNode;
-			newNode = new AstNode();
+			newNode = std::make_unique<AstNode>();
 		}
 		goto apply_newNode;
 	}
@@ -3415,21 +3387,22 @@ skip_dynamic_range_lvalue_expansion:;
 			{
 				int myidx = autoidx++;
 
-				AstNode *wire = new AstNode(AST_WIRE);
+				auto wire_owned = std::make_unique<AstNode>(AST_WIRE);
+				auto* wire = wire_owned.get();
+				current_ast_mod->children.push_back(std::move(wire_owned));
 				wire->str = stringf("$initstate$%d_wire", myidx);
-				current_ast_mod->children.push_back(wire);
 				while (wire->simplify(true, 1, -1, false)) { }
 
-				AstNode *cell = new AstNode(AST_CELL, new AstNode(AST_CELLTYPE), new AstNode(AST_ARGUMENT, new AstNode(AST_IDENTIFIER)));
+				auto cell = std::make_unique<AstNode>(AST_CELL, std::make_unique<AstNode>(AST_CELLTYPE), std::make_unique<AstNode>(AST_ARGUMENT, std::make_unique<AstNode>(AST_IDENTIFIER)));
 				cell->str = stringf("$initstate$%d", myidx);
 				cell->children[0]->str = "$initstate";
 				cell->children[1]->str = "\\Y";
 				cell->children[1]->children[0]->str = wire->str;
 				cell->children[1]->children[0]->id2ast = wire;
-				current_ast_mod->children.push_back(cell);
+				current_ast_mod->children.push_back(std::move(cell));
 				while (cell->simplify(true, 1, -1, false)) { }
 
-				newNode = new AstNode(AST_IDENTIFIER);
+				newNode = std::make_unique<AstNode>(AST_IDENTIFIER);
 				newNode->str = wire->str;
 				newNode->id2ast = wire;
 				goto apply_newNode;
@@ -3452,20 +3425,19 @@ skip_dynamic_range_lvalue_expansion:;
 
 				if (GetSize(children) == 2)
 				{
-					AstNode *buf = children[1]->clone();
+					auto buf = children[1]->clone();
 					while (buf->simplify(true, stage, -1, false)) { }
 					if (buf->type != AST_CONSTANT)
 						input_error("Failed to evaluate system function `%s' with non-constant value.\n", str.c_str());
 
 					num_steps = buf->asInt(true);
-					delete buf;
 				}
 
 				AstNode *block = nullptr;
 
-				for (auto child : current_always->children)
+				for (auto& child : current_always->children)
 					if (child->type == AST_BLOCK)
-						block = child;
+						block = child.get();
 
 				log_assert(block != nullptr);
 
@@ -3475,41 +3447,42 @@ skip_dynamic_range_lvalue_expansion:;
 				}
 
 				int myidx = autoidx++;
-				AstNode *outreg = nullptr;
+				AstNode* outreg = nullptr;
 
 				for (int i = 0; i < num_steps; i++)
 				{
-					AstNode *reg = new AstNode(AST_WIRE, new AstNode(AST_RANGE,
+					auto reg_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE,
 							mkconst_int(width_hint-1, true), mkconst_int(0, true)));
+					auto* reg = reg_owned.get();
+					current_ast_mod->children.push_back(std::move(reg_owned));
 
 					reg->str = stringf("$past$%s:%d$%d$%d", RTLIL::encode_filename(filename).c_str(), location.first_line, myidx, i);
 					reg->is_reg = true;
 					reg->is_signed = sign_hint;
 
-					current_ast_mod->children.push_back(reg);
 
 					while (reg->simplify(true, 1, -1, false)) { }
 
-					AstNode *regid = new AstNode(AST_IDENTIFIER);
+					auto regid = std::make_unique<AstNode>(AST_IDENTIFIER);
 					regid->str = reg->str;
 					regid->id2ast = reg;
 					regid->was_checked = true;
 
-					AstNode *rhs = nullptr;
+					std::unique_ptr<AstNode> rhs = nullptr;
 
 					if (outreg == nullptr) {
 						rhs = children.at(0)->clone();
 					} else {
-						rhs = new AstNode(AST_IDENTIFIER);
+						rhs = std::make_unique<AstNode>(AST_IDENTIFIER);
 						rhs->str = outreg->str;
 						rhs->id2ast = outreg;
 					}
 
-					block->children.push_back(new AstNode(AST_ASSIGN_LE, regid, rhs));
+					block->children.push_back(std::make_unique<AstNode>(AST_ASSIGN_LE, std::move(regid), std::move(rhs)));
 					outreg = reg;
 				}
 
-				newNode = new AstNode(AST_IDENTIFIER);
+				newNode = std::make_unique<AstNode>(AST_IDENTIFIER);
 				newNode->str = outreg->str;
 				newNode->id2ast = outreg;
 				goto apply_newNode;
@@ -3525,25 +3498,25 @@ skip_dynamic_range_lvalue_expansion:;
 					input_error("System function %s is only allowed in clocked blocks.\n",
 							RTLIL::unescape_id(str).c_str());
 
-				AstNode *present = children.at(0)->clone();
-				AstNode *past = clone();
+				auto present = children.at(0)->clone();
+				auto past = clone();
 				past->str = "\\$past";
 
 				if (str == "\\$stable")
-					newNode = new AstNode(AST_EQ, past, present);
+					newNode = std::make_unique<AstNode>(AST_EQ, std::move(past), std::move(present));
 
 				else if (str == "\\$changed")
-					newNode = new AstNode(AST_NE, past, present);
+					newNode = std::make_unique<AstNode>(AST_NE, std::move(past), std::move(present));
 
 				else if (str == "\\$rose")
-					newNode = new AstNode(AST_LOGIC_AND,
-							new AstNode(AST_LOGIC_NOT, new AstNode(AST_BIT_AND, past, mkconst_int(1,false))),
-							new AstNode(AST_BIT_AND, present, mkconst_int(1,false)));
+					newNode = std::make_unique<AstNode>(AST_LOGIC_AND,
+							std::make_unique<AstNode>(AST_LOGIC_NOT, std::make_unique<AstNode>(AST_BIT_AND, std::move(past), mkconst_int(1,false))),
+							std::make_unique<AstNode>(AST_BIT_AND, std::move(present), mkconst_int(1,false)));
 
 				else if (str == "\\$fell")
-					newNode = new AstNode(AST_LOGIC_AND,
-							new AstNode(AST_BIT_AND, past, mkconst_int(1,false)),
-							new AstNode(AST_LOGIC_NOT, new AstNode(AST_BIT_AND, present, mkconst_int(1,false))));
+					newNode = std::make_unique<AstNode>(AST_LOGIC_AND,
+							std::make_unique<AstNode>(AST_BIT_AND, std::move(past), mkconst_int(1,false)),
+							std::make_unique<AstNode>(AST_LOGIC_NOT, std::make_unique<AstNode>(AST_BIT_AND, std::move(present), mkconst_int(1,false))));
 
 				else
 					log_abort();
@@ -3563,7 +3536,7 @@ skip_dynamic_range_lvalue_expansion:;
 					input_error("System function %s got %d arguments, expected 1.\n",
 							RTLIL::unescape_id(str).c_str(), int(children.size()));
 
-				AstNode *buf = children[0]->clone();
+				auto buf = children[0]->clone();
 				while (buf->simplify(true, stage, width_hint, sign_hint)) { }
 				if (buf->type != AST_CONSTANT)
 					input_error("Failed to evaluate system function `%s' with non-constant value.\n", str.c_str());
@@ -3571,7 +3544,6 @@ skip_dynamic_range_lvalue_expansion:;
 				RTLIL::Const arg_value = buf->bitsAsConst();
 				if (arg_value.as_bool())
 					arg_value = const_sub(arg_value, 1, false, false, GetSize(arg_value));
-				delete buf;
 
 				uint32_t result = 0;
 				for (auto i = 0; i < arg_value.size(); i++)
@@ -3583,7 +3555,7 @@ skip_dynamic_range_lvalue_expansion:;
 			}
 
 			if (str == "\\$dimensions" || str == "\\$unpacked_dimensions" ||
-			    str == "\\$increment" || str == "\\$size" || str == "\\$bits" || str == "\\$high" || str == "\\$low" || str == "\\$left" || str == "\\$right")
+				str == "\\$increment" || str == "\\$size" || str == "\\$bits" || str == "\\$high" || str == "\\$low" || str == "\\$left" || str == "\\$right")
 			{
 				int dim = 1;
 				if (str == "\\$dimensions" || str == "\\$unpacked_dimensions" || str == "\\$bits") {
@@ -3595,24 +3567,23 @@ skip_dynamic_range_lvalue_expansion:;
 						input_error("System function %s got %d arguments, expected 1 or 2.\n",
 							RTLIL::unescape_id(str).c_str(), int(children.size()));
 					if (children.size() == 2) {
-						AstNode *buf = children[1]->clone();
+						auto buf = children[1]->clone();
 						// Evaluate constant expression
 						while (buf->simplify(true, stage, width_hint, sign_hint)) { }
 						dim = buf->asInt(false);
-						delete buf;
 					}
 				}
-				AstNode *buf = children[0]->clone();
+				auto buf = children[0]->clone();
 				int mem_depth = 1;
 				int result, high = 0, low = 0, left = 0, right = 0, width = 1; // defaults for a simple wire
 				int expr_dimensions = 0, expr_unpacked_dimensions = 0;
-				AstNode *id_ast = NULL;
+				AstNode *id_ast = nullptr;
 
 				buf->detectSignWidth(width_hint, sign_hint);
 
 				if (buf->type == AST_IDENTIFIER) {
 					id_ast = buf->id2ast;
-					if (id_ast == NULL && current_scope.count(buf->str))
+					if (id_ast == nullptr && current_scope.count(buf->str))
 						id_ast = current_scope.at(buf->str);
 					if (!id_ast)
 						input_error("Failed to resolve identifier %s for width detection!\n", buf->str.c_str());
@@ -3651,7 +3622,6 @@ skip_dynamic_range_lvalue_expansion:;
 					left  = high = width - 1;
 					expr_dimensions = 1;
 				}
-				delete buf;
 				if (str == "\\$dimensions")
 					result = expr_dimensions;
 				else if (str == "\\$unpacked_dimensions")
@@ -3719,8 +3689,8 @@ skip_dynamic_range_lvalue_expansion:;
 				if (str == "\\$rtoi") {
 					newNode = AstNode::mkconst_int(x, true);
 				} else {
-					newNode = new AstNode(AST_REALVALUE);
-					if (str == "\\$ln")         newNode->realvalue = ::log(x);
+					newNode = std::make_unique<AstNode>(AST_REALVALUE);
+					if (str == "\\$ln")		 newNode->realvalue = ::log(x);
 					else if (str == "\\$log10") newNode->realvalue = ::log10(x);
 					else if (str == "\\$exp")   newNode->realvalue = ::exp(x);
 					else if (str == "\\$sqrt")  newNode->realvalue = ::sqrt(x);
@@ -3762,7 +3732,7 @@ skip_dynamic_range_lvalue_expansion:;
 
 				// Determine which bits to count
 				for (size_t i = 1; i < children.size(); i++) {
-					AstNode *node = children[i];
+					auto& node = children[i];
 					while (node->simplify(true, stage, -1, false)) { }
 					if (node->type != AST_CONSTANT)
 						input_error("Failed to evaluate system function `%s' with non-constant control bit argument.\n", str.c_str());
@@ -3774,39 +3744,37 @@ skip_dynamic_range_lvalue_expansion:;
 				// Detect width of exp (first argument of $countbits)
 				int  exp_width = -1;
 				bool exp_sign  = false;
-				AstNode *exp = children[0];
-				exp->detectSignWidth(exp_width, exp_sign, NULL);
+				auto& exp = children[0];
+				exp->detectSignWidth(exp_width, exp_sign, nullptr);
 
 				newNode = mkconst_int(0, false);
 
 				for (int i = 0; i < exp_width; i++) {
 					// Generate nodes for:  exp << i >> ($size(exp) - 1)
-					//                          ^^   ^^
-					AstNode *lsh_node = new AstNode(AST_SHIFT_LEFT, exp->clone(), mkconst_int(i, false));
-					AstNode *rsh_node = new AstNode(AST_SHIFT_RIGHT, lsh_node, mkconst_int(exp_width - 1, false));
+					//						  ^^   ^^
+					auto lsh_node = std::make_unique<AstNode>(AST_SHIFT_LEFT, exp->clone(), mkconst_int(i, false));
+					auto rsh_node = std::make_unique<AstNode>(AST_SHIFT_RIGHT, std::move(lsh_node), mkconst_int(exp_width - 1, false));
 
-					AstNode *or_node = nullptr;
+					std::unique_ptr<AstNode> or_node = nullptr;
 
 					for (RTLIL::State control_bit : control_bits) {
 						// Generate node for:  (exp << i >> ($size(exp) - 1)) === control_bit
-						//                                                    ^^^
-						AstNode *eq_node = new AstNode(AST_EQX, rsh_node->clone(), mkconst_bits({control_bit}, false));
+						//													^^^
+						auto eq_node = std::make_unique<AstNode>(AST_EQX, rsh_node->clone(), mkconst_bits({control_bit}, false));
 
 						// Or the result for each checked bit value
 						if (or_node)
-							or_node = new AstNode(AST_LOGIC_OR, or_node, eq_node);
+							or_node = std::make_unique<AstNode>(AST_LOGIC_OR, std::move(or_node), std::move(eq_node));
 						else
-							or_node = eq_node;
+							or_node = std::move(eq_node);
 					}
 
 					// We should have at least one element in control_bits,
 					// because we checked for the number of arguments above
 					log_assert(or_node != nullptr);
 
-					delete rsh_node;
-
 					// Generate node for adding with result of previous bit
-					newNode = new AstNode(AST_ADD, newNode, or_node);
+					newNode = std::make_unique<AstNode>(AST_ADD, std::move(newNode), std::move(or_node));
 				}
 
 				goto apply_newNode;
@@ -3817,22 +3785,22 @@ skip_dynamic_range_lvalue_expansion:;
 					input_error("System function %s got %d arguments, expected 1.\n",
 							RTLIL::unescape_id(str).c_str(), int(children.size()));
 
-				AstNode *countbits = clone();
+				auto countbits = clone();
 				countbits->str = "\\$countbits";
 
 				if (str == "\\$countones") {
 					countbits->children.push_back(mkconst_bits({RTLIL::State::S1}, false));
-					newNode = countbits;
+					newNode = std::move(countbits);
 				} else if (str == "\\$isunknown") {
 					countbits->children.push_back(mkconst_bits({RTLIL::Sx}, false));
 					countbits->children.push_back(mkconst_bits({RTLIL::Sz}, false));
-					newNode = new AstNode(AST_GT, countbits, mkconst_int(0, false));
+					newNode = std::make_unique<AstNode>(AST_GT, std::move(countbits), mkconst_int(0, false));
 				} else if (str == "\\$onehot") {
 					countbits->children.push_back(mkconst_bits({RTLIL::State::S1}, false));
-					newNode = new AstNode(AST_EQ, countbits, mkconst_int(1, false));
+					newNode = std::make_unique<AstNode>(AST_EQ, std::move(countbits), mkconst_int(1, false));
 				} else if (str == "\\$onehot0") {
 					countbits->children.push_back(mkconst_bits({RTLIL::State::S1}, false));
-					newNode = new AstNode(AST_LE, countbits, mkconst_int(1, false));
+					newNode = std::make_unique<AstNode>(AST_LE, std::move(countbits), mkconst_int(1, false));
 				} else {
 					log_abort();
 				}
@@ -3846,7 +3814,7 @@ skip_dynamic_range_lvalue_expansion:;
 
 				std::string rtype, fname;
 				std::vector<std::string> argtypes;
-				std::vector<AstNode*> args;
+				std::vector<std::unique_ptr<AstNode>> args;
 
 				rtype = RTLIL::unescape_id(dpi_decl->children.at(0)->str);
 				fname = RTLIL::unescape_id(dpi_decl->children.at(1)->str);
@@ -3866,9 +3834,6 @@ skip_dynamic_range_lvalue_expansion:;
 
 				newNode = dpi_call(rtype, fname, argtypes, args);
 
-				for (auto arg : args)
-					delete arg;
-
 				goto apply_newNode;
 			}
 
@@ -3894,12 +3859,12 @@ skip_dynamic_range_lvalue_expansion:;
 					input_error("System function %s got %d arguments, expected 2-4.\n",
 							RTLIL::unescape_id(str).c_str(), int(children.size()));
 
-				AstNode *node_filename = children[0]->clone();
+				auto node_filename = children[0]->clone();
 				while (node_filename->simplify(true, stage, width_hint, sign_hint)) { }
 				if (node_filename->type != AST_CONSTANT)
 					input_error("Failed to evaluate system function `%s' with non-constant 1st argument.\n", str.c_str());
 
-				AstNode *node_memory = children[1]->clone();
+				auto node_memory = children[1]->clone();
 				while (node_memory->simplify(true, stage, width_hint, sign_hint)) { }
 				if (node_memory->type != AST_IDENTIFIER || node_memory->id2ast == nullptr || node_memory->id2ast->type != AST_MEMORY)
 					input_error("Failed to evaluate system function `%s' with non-memory 2nd argument.\n", str.c_str());
@@ -3907,7 +3872,7 @@ skip_dynamic_range_lvalue_expansion:;
 				int start_addr = -1, finish_addr = -1;
 
 				if (GetSize(children) > 2) {
-					AstNode *node_addr = children[2]->clone();
+					auto node_addr = children[2]->clone();
 					while (node_addr->simplify(true, stage, width_hint, sign_hint)) { }
 					if (node_addr->type != AST_CONSTANT)
 						input_error("Failed to evaluate system function `%s' with non-constant 3rd argument.\n", str.c_str());
@@ -3915,7 +3880,7 @@ skip_dynamic_range_lvalue_expansion:;
 				}
 
 				if (GetSize(children) > 3) {
-					AstNode *node_addr = children[3]->clone();
+					auto node_addr = children[3]->clone();
 					while (node_addr->simplify(true, stage, width_hint, sign_hint)) { }
 					if (node_addr->type != AST_CONSTANT)
 						input_error("Failed to evaluate system function `%s' with non-constant 4th argument.\n", str.c_str());
@@ -3926,22 +3891,20 @@ skip_dynamic_range_lvalue_expansion:;
 				if (current_always->type == AST_INITIAL) {
 					pool<AstNode*> queue;
 					log_assert(current_always->children[0]->type == AST_BLOCK);
-					queue.insert(current_always->children[0]);
+					queue.insert(current_always->children[0].get());
 					while (!unconditional_init && !queue.empty()) {
 						pool<AstNode*> next_queue;
-						for (auto n : queue)
-						for (auto c : n->children) {
-							if (c == this)
+						for (auto& n : queue)
+						for (auto& c : n->children) {
+							if (c.get() == this)
 								unconditional_init = true;
-							next_queue.insert(c);
+							next_queue.insert(c.get());
 						}
 						next_queue.swap(queue);
 					}
 				}
 
 				newNode = readmem(str == "\\$readmemh", node_filename->bitsAsConst().decode_string(), node_memory->id2ast, start_addr, finish_addr, unconditional_init);
-				delete node_filename;
-				delete node_memory;
 				goto apply_newNode;
 			}
 
@@ -3956,10 +3919,11 @@ skip_dynamic_range_lvalue_expansion:;
 		sstr << str << "$func$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++) << '.';
 		std::string prefix = sstr.str();
 
-		AstNode *decl = current_scope[str];
+		auto* decl = current_scope[str];
 		if (unevaluated_tern_branch && decl->is_recursive_function())
 			goto replace_fcall_later;
-		decl = decl->clone();
+		auto decl_clone = decl->clone();
+		decl = decl_clone.get(); // sketchy?
 		decl->replace_result_wire_name_in_function(str, "$result"); // enables recursion
 		decl->expand_genblock(prefix);
 
@@ -3967,20 +3931,19 @@ skip_dynamic_range_lvalue_expansion:;
 		{
 			bool require_const_eval = decl->has_const_only_constructs();
 			bool all_args_const = true;
-			for (auto child : children) {
+			for (auto& child : children) {
 				while (child->simplify(true, 1, -1, false)) { }
 				if (child->type != AST_CONSTANT && child->type != AST_REALVALUE)
 					all_args_const = false;
 			}
 
 			if (all_args_const) {
-				AstNode *func_workspace = decl->clone();
+				auto func_workspace = decl->clone();
 				func_workspace->set_in_param_flag(true);
 				func_workspace->str = prefix_id(prefix, "$result");
+				// func_workspace->dumpAst(stdout, "func_workspace ");
 				newNode = func_workspace->eval_const_function(this, in_param || require_const_eval);
-				delete func_workspace;
 				if (newNode) {
-					delete decl;
 					goto apply_newNode;
 				}
 			}
@@ -3993,36 +3956,37 @@ skip_dynamic_range_lvalue_expansion:;
 
 		size_t arg_count = 0;
 		dict<std::string, AstNode*> wire_cache;
-		vector<AstNode*> new_stmts;
-		vector<AstNode*> output_assignments;
+		vector<std::unique_ptr<AstNode>> new_stmts;
+		vector<std::unique_ptr<AstNode>> output_assignments;
 
-		if (current_block == NULL)
+		if (current_block == nullptr)
 		{
 			log_assert(type == AST_FCALL);
 
-			AstNode *wire = NULL;
+			std::unique_ptr<AstNode> wire = nullptr;
 			std::string res_name = prefix_id(prefix, "$result");
-			for (auto child : decl->children)
+			for (auto& child : decl->children)
 				if (child->type == AST_WIRE && child->str == res_name)
 					wire = child->clone();
-			log_assert(wire != NULL);
+			log_assert(wire != nullptr);
 
 			wire->port_id = 0;
 			wire->is_input = false;
 			wire->is_output = false;
 
-			current_scope[wire->str] = wire;
-			current_ast_mod->children.push_back(wire);
-			while (wire->simplify(true, 1, -1, false)) { }
+			auto* wire_leaky = wire.get();
+			current_scope[wire->str] = wire_leaky;
+			current_ast_mod->children.push_back(std::move(wire));
+			while (wire_leaky->simplify(true, 1, -1, false)) { }
 
-			AstNode *lvalue = new AstNode(AST_IDENTIFIER);
-			lvalue->str = wire->str;
+			auto lvalue = std::make_unique<AstNode>(AST_IDENTIFIER);
+			lvalue->str = wire_leaky->str;
 
-			AstNode *always = new AstNode(AST_ALWAYS, new AstNode(AST_BLOCK,
-					new AstNode(AST_ASSIGN_EQ, lvalue, clone())));
+			auto always = std::make_unique<AstNode>(AST_ALWAYS, std::make_unique<AstNode>(AST_BLOCK,
+					std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(lvalue), clone())));
 			always->children[0]->children[0]->was_checked = true;
 
-			current_ast_mod->children.push_back(always);
+			current_ast_mod->children.push_back(std::move(always));
 
 			goto replace_fcall_with_id;
 		}
@@ -4039,57 +4003,57 @@ skip_dynamic_range_lvalue_expansion:;
 			} else
 				celltype = RTLIL::escape_id(celltype);
 
-			AstNode *cell = new AstNode(AST_CELL, new AstNode(AST_CELLTYPE));
+			auto cell = std::make_unique<AstNode>(AST_CELL, std::make_unique<AstNode>(AST_CELLTYPE));
 			cell->str = prefix.substr(0, GetSize(prefix)-1);
 			cell->children[0]->str = celltype;
 
-			for (auto attr : decl->attributes)
+			for (auto& attr : decl->attributes)
 				if (attr.first.str().rfind("\\via_celltype_defparam_", 0) == 0)
 				{
-					AstNode *cell_arg = new AstNode(AST_PARASET, attr.second->clone());
+					auto cell_arg = std::make_unique<AstNode>(AST_PARASET, attr.second->clone());
 					cell_arg->str = RTLIL::escape_id(attr.first.substr(strlen("\\via_celltype_defparam_")));
-					cell->children.push_back(cell_arg);
+					cell->children.push_back(std::move(cell_arg));
 				}
 
-			for (auto child : decl->children)
+			for (auto& child : decl->children)
 				if (child->type == AST_WIRE && (child->is_input || child->is_output || (type == AST_FCALL && child->str == str)))
 				{
-					AstNode *wire = child->clone();
+					auto wire = child->clone();
 					wire->port_id = 0;
 					wire->is_input = false;
 					wire->is_output = false;
-					current_ast_mod->children.push_back(wire);
+					current_ast_mod->children.push_back(std::move(wire));
 					while (wire->simplify(true, 1, -1, false)) { }
 
-					AstNode *wire_id = new AstNode(AST_IDENTIFIER);
+					auto wire_id = std::make_unique<AstNode>(AST_IDENTIFIER);
 					wire_id->str = wire->str;
 
 					if ((child->is_input || child->is_output) && arg_count < children.size())
 					{
-						AstNode *arg = children[arg_count++]->clone();
-						AstNode *assign = child->is_input ?
-								new AstNode(AST_ASSIGN_EQ, wire_id->clone(), arg) :
-								new AstNode(AST_ASSIGN_EQ, arg, wire_id->clone());
+						auto arg = children[arg_count++]->clone();
+						auto assign = child->is_input ?
+								std::make_unique<AstNode>(AST_ASSIGN_EQ, wire_id->clone(), std::move(arg)) :
+								std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(arg), wire_id->clone());
 						assign->children[0]->was_checked = true;
 
 						for (auto it = current_block->children.begin(); it != current_block->children.end(); it++) {
-							if (*it != current_block_child)
+							if (it->get() != current_block_child)
 								continue;
-							current_block->children.insert(it, assign);
+							current_block->children.insert(it, std::move(assign));
 							break;
 						}
 					}
 
-					AstNode *cell_arg = new AstNode(AST_ARGUMENT, wire_id);
+					auto cell_arg = std::make_unique<AstNode>(AST_ARGUMENT, std::move(wire_id));
 					cell_arg->str = child->str == str ? outport : child->str;
-					cell->children.push_back(cell_arg);
+					cell->children.push_back(std::move(cell_arg));
 				}
 
-			current_ast_mod->children.push_back(cell);
+			current_ast_mod->children.push_back(std::move(cell));
 			goto replace_fcall_with_id;
 		}
 
-		for (auto child : decl->children)
+		for (auto& child : decl->children)
 			if (child->type == AST_WIRE || child->type == AST_MEMORY || child->type == AST_PARAMETER || child->type == AST_LOCALPARAM || child->type == AST_ENUM_ITEM)
 			{
 				AstNode *wire = nullptr;
@@ -4099,7 +4063,7 @@ skip_dynamic_range_lvalue_expansion:;
 					wire = wire_cache.at(child->str);
 					bool contains_value = wire->type == AST_LOCALPARAM;
 					if (wire->children.size() == contains_value) {
-						for (auto c : child->children)
+						for (auto& c : child->children)
 							wire->children.push_back(c->clone());
 					} else if (!child->children.empty()) {
 						while (child->simplify(true, stage, -1, false)) { }
@@ -4115,38 +4079,36 @@ skip_dynamic_range_lvalue_expansion:;
 				}
 				else
 				{
-					wire = child->clone();
+					current_ast_mod->children.push_back(child->clone());
+					wire = current_ast_mod->children.back().get();
 					wire->port_id = 0;
 					wire->is_input = false;
 					wire->is_output = false;
 					wire->is_reg = true;
 					wire->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
 					if (child->type == AST_ENUM_ITEM)
-						wire->set_attribute(ID::enum_base_type, child->attributes[ID::enum_base_type]);
+						wire->set_attribute(ID::enum_base_type, std::move(child->attributes[ID::enum_base_type]));
 
 					wire_cache[child->str] = wire;
 
 					current_scope[wire->str] = wire;
-					current_ast_mod->children.push_back(wire);
 				}
 
 				while (wire->simplify(true, 1, -1, false)) { }
 
 				if ((child->is_input || child->is_output) && arg_count < children.size())
 				{
-					AstNode *arg = children[arg_count++]->clone();
+					auto arg = children[arg_count++]->clone();
 					// convert purely constant arguments into localparams
-					if (child->is_input && child->type == AST_WIRE && arg->type == AST_CONSTANT && node_contains_assignment_to(decl, child)) {
+					if (child->is_input && child->type == AST_WIRE && arg->type == AST_CONSTANT && node_contains_assignment_to(decl, child.get())) {
 						wire->type = AST_LOCALPARAM;
-						if (wire->attributes.count(ID::nosync))
-							delete wire->attributes.at(ID::nosync);
 						wire->attributes.erase(ID::nosync);
 						wire->children.insert(wire->children.begin(), arg->clone());
 						// args without a range implicitly have width 1
 						if (wire->children.back()->type != AST_RANGE) {
 							// check if this wire is redeclared with an explicit size
 							bool uses_explicit_size = false;
-							for (const AstNode *other_child : decl->children)
+							for (auto& other_child : decl->children)
 								if (other_child->type == AST_WIRE && child->str == other_child->str
 										&& !other_child->children.empty()
 										&& other_child->children.back()->type == AST_RANGE) {
@@ -4154,56 +4116,53 @@ skip_dynamic_range_lvalue_expansion:;
 									break;
 								}
 							if (!uses_explicit_size) {
-								AstNode* range = new AstNode();
+								auto range = std::make_unique<AstNode>();
 								range->type = AST_RANGE;
-								wire->children.push_back(range);
 								range->children.push_back(mkconst_int(0, true));
 								range->children.push_back(mkconst_int(0, true));
+								wire->children.push_back(std::move(range));
 							}
 						}
 						wire->fixup_hierarchy_flags();
 						// updates the sizing
 						while (wire->simplify(true, 1, -1, false)) { }
-						delete arg;
 						continue;
 					}
 
-					AstNode *wire_id = new AstNode(AST_IDENTIFIER);
+					auto wire_id = std::make_unique<AstNode>(AST_IDENTIFIER);
 					wire_id->str = wire->str;
-
 					if (child->is_input) {
-						AstNode *assign = new AstNode(AST_ASSIGN_EQ, wire_id->clone(), arg->clone());
+						auto assign = std::make_unique<AstNode>(AST_ASSIGN_EQ, wire_id->clone(), arg->clone());
 						assign->children[0]->was_checked = true;
-						new_stmts.push_back(assign);
+						new_stmts.push_back(std::move(assign));
 					}
 
 					if (child->is_output) {
-						AstNode *assign = new AstNode(AST_ASSIGN_EQ, arg->clone(), wire_id->clone());
+						auto assign = std::make_unique<AstNode>(AST_ASSIGN_EQ, arg->clone(), wire_id->clone());
 						assign->children[0]->was_checked = true;
-						output_assignments.push_back(assign);
+						output_assignments.push_back(std::move(assign));
 					}
-
-					delete arg;
-					delete wire_id;
 				}
 			}
 
-		for (auto child : decl->children)
+		for (auto& child : decl->children)
 			if (child->type != AST_WIRE && child->type != AST_MEMORY && child->type != AST_PARAMETER && child->type != AST_LOCALPARAM)
 				new_stmts.push_back(child->clone());
 
-		new_stmts.insert(new_stmts.end(), output_assignments.begin(), output_assignments.end());
+		new_stmts.reserve(new_stmts.size() + output_assignments.size());
+		std::move(output_assignments.begin(), output_assignments.end(), std::back_inserter(new_stmts));
 
 		for (auto it = current_block->children.begin(); ; it++) {
 			log_assert(it != current_block->children.end());
-			if (*it == current_block_child) {
-				current_block->children.insert(it, new_stmts.begin(), new_stmts.end());
+			if (it->get() == current_block_child) {
+				current_block->children.insert(it,
+					std::make_move_iterator(new_stmts.begin()),
+					std::make_move_iterator(new_stmts.end()));
 				break;
 			}
 		}
 
 	replace_fcall_with_id:
-		delete decl;
 		if (type == AST_FCALL) {
 			delete_children();
 			type = AST_IDENTIFIER;
@@ -4319,14 +4278,14 @@ replace_fcall_later:;
 		if (0) { case AST_SHIFT_RIGHT:  const_func = RTLIL::const_shr;  }
 		if (0) { case AST_SHIFT_SLEFT:  const_func = RTLIL::const_sshl; }
 		if (0) { case AST_SHIFT_SRIGHT: const_func = RTLIL::const_sshr; }
-		if (0) { case AST_POW:          const_func = RTLIL::const_pow; }
+		if (0) { case AST_POW:		  const_func = RTLIL::const_pow; }
 			if (children[0]->type == AST_CONSTANT && children[1]->type == AST_CONSTANT) {
 				RTLIL::Const y = const_func(children[0]->bitsAsConst(width_hint, sign_hint),
 						RTLIL::Const(children[1]->bits), sign_hint, type == AST_POW ? children[1]->is_signed : false, width_hint);
 				newNode = mkconst_bits(y.to_bits(), sign_hint);
 			} else
 			if (type == AST_POW && children[0]->isConst() && children[1]->isConst()) {
-				newNode = new AstNode(AST_REALVALUE);
+				newNode = std::make_unique<AstNode>(AST_REALVALUE);
 				newNode->realvalue = pow(children[0]->asReal(sign_hint), children[1]->asReal(sign_hint));
 			}
 			break;
@@ -4371,7 +4330,7 @@ replace_fcall_later:;
 				newNode = mkconst_bits(y.to_bits(), sign_hint);
 			} else
 			if (children[0]->isConst() && children[1]->isConst()) {
-				newNode = new AstNode(AST_REALVALUE);
+				newNode = std::make_unique<AstNode>(AST_REALVALUE);
 				switch (type) {
 				case AST_ADD: newNode->realvalue = children[0]->asReal(sign_hint) + children[1]->asReal(sign_hint); break;
 				case AST_SUB: newNode->realvalue = children[0]->asReal(sign_hint) - children[1]->asReal(sign_hint); break;
@@ -4390,7 +4349,7 @@ replace_fcall_later:;
 				newNode = mkconst_bits(y.to_bits(), sign_hint);
 			} else
 			if (children[0]->isConst()) {
-				newNode = new AstNode(AST_REALVALUE);
+				newNode = std::make_unique<AstNode>(AST_REALVALUE);
 				if (type == AST_NEG)
 					newNode->realvalue = -children[0]->asReal(sign_hint);
 				else
@@ -4404,13 +4363,13 @@ replace_fcall_later:;
 				AstNode *choice = pair.first;
 				AstNode *not_choice = pair.second;
 
-				if (choice != NULL) {
+				if (choice != nullptr) {
 					if (choice->type == AST_CONSTANT) {
 						int other_width_hint = width_hint;
 						bool other_sign_hint = sign_hint, other_real = false;
 						not_choice->detectSignWidth(other_width_hint, other_sign_hint, &other_real);
 						if (other_real) {
-							newNode = new AstNode(AST_REALVALUE);
+							newNode = std::make_unique<AstNode>(AST_REALVALUE);
 							choice->detectSignWidth(width_hint, sign_hint);
 							newNode->realvalue = choice->asReal(sign_hint);
 						} else {
@@ -4433,7 +4392,7 @@ replace_fcall_later:;
 							a.bits()[i] = RTLIL::State::Sx;
 					newNode = mkconst_bits(a.to_bits(), sign_hint);
 				} else if (children[1]->isConst() && children[2]->isConst()) {
-					newNode = new AstNode(AST_REALVALUE);
+					newNode = std::make_unique<AstNode>(AST_REALVALUE);
 					if (children[1]->asReal(sign_hint) == children[2]->asReal(sign_hint))
 						newNode->realvalue = children[1]->asReal(sign_hint);
 					else
@@ -4485,12 +4444,12 @@ apply_newNode:
 		// fprintf(stderr, "----\n");
 		// dumpAst(stderr, "- ");
 		// newNode->dumpAst(stderr, "+ ");
-		log_assert(newNode != NULL);
+		log_assert(newNode != nullptr);
+		// newNode->null_check();
 		newNode->filename = filename;
 		newNode->location = location;
-		newNode->cloneInto(this);
+		newNode->cloneInto(*this);
 		fixup_hierarchy_flags();
-		delete newNode;
 		did_something = true;
 	}
 
@@ -4503,21 +4462,21 @@ apply_newNode:
 
 void AstNode::replace_result_wire_name_in_function(const std::string &from, const std::string &to)
 {
-	for (AstNode *child : children)
+	for (auto& child : children)
 		child->replace_result_wire_name_in_function(from, to);
 	if (str == from && type != AST_FCALL && type != AST_TCALL)
 		str = to;
 }
 
 // replace a readmem[bh] TCALL ast node with a block of memory assignments
-AstNode *AstNode::readmem(bool is_readmemh, std::string mem_filename, AstNode *memory, int start_addr, int finish_addr, bool unconditional_init)
+std::unique_ptr<AstNode> AstNode::readmem(bool is_readmemh, std::string mem_filename, AstNode *memory, int start_addr, int finish_addr, bool unconditional_init)
 {
 	int mem_width, mem_size, addr_bits;
 	memory->meminfo(mem_width, mem_size, addr_bits);
 
-	AstNode *block = new AstNode(AST_BLOCK);
+	auto block = std::make_unique<AstNode>(AST_BLOCK);
 
-	AstNode *meminit = nullptr;
+	AstNode* meminit = nullptr;
 	int next_meminit_cursor=0;
 	vector<State> meminit_bits;
 	vector<State> en_bits;
@@ -4591,7 +4550,8 @@ AstNode *AstNode::readmem(bool is_readmemh, std::string mem_filename, AstNode *m
 				continue;
 			}
 
-			AstNode *value = VERILOG_FRONTEND::const2ast(stringf("%d'%c", mem_width, is_readmemh ? 'h' : 'b') + token);
+			VERILOG_FRONTEND::ConstParser p{mem_filename, std::nullopt};
+			auto value = p.const2ast(stringf("%d'%c", mem_width, is_readmemh ? 'h' : 'b') + token);
 
 			if (unconditional_init)
 			{
@@ -4602,7 +4562,8 @@ AstNode *AstNode::readmem(bool is_readmemh, std::string mem_filename, AstNode *m
 						meminit->children[3] = AstNode::mkconst_int(meminit_size, false);
 					}
 
-					meminit = new AstNode(AST_MEMINIT);
+					auto meminit_owned = std::make_unique<AstNode>(AST_MEMINIT);
+					meminit = meminit_owned.get();
 					meminit->children.push_back(AstNode::mkconst_int(cursor, false));
 					meminit->children.push_back(nullptr);
 					meminit->children.push_back(AstNode::mkconst_bits(en_bits, false));
@@ -4612,18 +4573,17 @@ AstNode *AstNode::readmem(bool is_readmemh, std::string mem_filename, AstNode *m
 					meminit_bits.clear();
 					meminit_size = 0;
 
-					current_ast_mod->children.push_back(meminit);
+					current_ast_mod->children.push_back(std::move(meminit_owned));
 					next_meminit_cursor = cursor;
 				}
 
 				meminit_size++;
 				next_meminit_cursor++;
 				meminit_bits.insert(meminit_bits.end(), value->bits.begin(), value->bits.end());
-				delete value;
 			}
 			else
 			{
-				block->children.push_back(new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER, new AstNode(AST_RANGE, AstNode::mkconst_int(cursor, false))), value));
+				block->children.push_back(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER, std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(cursor, false))), std::move(value)));
 				block->children.back()->children[0]->str = memory->str;
 				block->children.back()->children[0]->id2ast = memory;
 				block->children.back()->children[0]->was_checked = true;
@@ -4700,7 +4660,7 @@ void AstNode::expand_genblock(const std::string &prefix)
 	};
 
 	for (size_t i = 0; i < children.size(); i++) {
-		AstNode *child = children[i];
+		auto* child = children[i].get();
 
 		switch (child->type) {
 		case AST_WIRE:
@@ -4726,9 +4686,9 @@ void AstNode::expand_genblock(const std::string &prefix)
 
 		case AST_ENUM:
 			current_scope[child->str] = child;
-			for (auto enode : child->children){
+			for (auto& enode : child->children){
 				log_assert(enode->type == AST_ENUM_ITEM);
-				prefix_node(enode);
+				prefix_node(enode.get());
 			}
 			break;
 
@@ -4738,7 +4698,7 @@ void AstNode::expand_genblock(const std::string &prefix)
 	}
 
 	for (size_t i = 0; i < children.size(); i++) {
-		AstNode *child = children[i];
+		auto& child = children[i];
 		// AST_PREFIX member names should not be prefixed; we recurse into them
 		// as normal to ensure indices and ranges are properly resolved, and
 		// then restore the previous string
@@ -4770,7 +4730,7 @@ void AstNode::label_genblks(std::set<std::string>& existing, int &counter)
 		// seeing a proper generate control flow construct increments the
 		// counter once
 		++counter;
-		for (AstNode *child : children)
+		for (auto& child : children)
 			child->label_genblks(existing, counter);
 		break;
 
@@ -4787,7 +4747,7 @@ void AstNode::label_genblks(std::set<std::string>& existing, int &counter)
 		// within a genblk, the counter starts fresh
 		std::set<std::string> existing_local = existing;
 		int counter_local = 0;
-		for (AstNode *child : children)
+		for (auto& child : children)
 			child->label_genblks(existing_local, counter_local);
 		break;
 	}
@@ -4796,7 +4756,7 @@ void AstNode::label_genblks(std::set<std::string>& existing, int &counter)
 		// track names which could conflict with implicit genblk names
 		if (str.rfind("\\genblk", 0) == 0)
 			existing.insert(str);
-		for (AstNode *child : children)
+		for (auto& child : children)
 			child->label_genblks(existing, counter);
 		break;
 	}
@@ -4807,7 +4767,7 @@ static void mark_memories_assign_lhs_complex(dict<AstNode*, pool<std::string>> &
 		dict<AstNode*, uint32_t> &mem2reg_candidates, AstNode *that)
 {
 	for (auto &child : that->children)
-		mark_memories_assign_lhs_complex(mem2reg_places, mem2reg_candidates, child);
+		mark_memories_assign_lhs_complex(mem2reg_places, mem2reg_candidates, child.get());
 
 	if (that->type == AST_IDENTIFIER && that->id2ast && that->id2ast->type == AST_MEMORY) {
 		AstNode *mem = that->id2ast;
@@ -4831,7 +4791,7 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 	{
 		// mark all memories that are used in a complex expression on the left side of an assignment
 		for (auto &lhs_child : children[0]->children)
-			mark_memories_assign_lhs_complex(mem2reg_places, mem2reg_candidates, lhs_child);
+			mark_memories_assign_lhs_complex(mem2reg_places, mem2reg_candidates, lhs_child.get());
 
 		if (children[0]->type == AST_IDENTIFIER && children[0]->id2ast && children[0]->id2ast->type == AST_MEMORY)
 		{
@@ -4897,11 +4857,11 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 	if ((type == AST_MODULE || type == AST_INTERFACE) && get_bool_attribute(ID::mem2reg))
 		children_flags |= AstNode::MEM2REG_FL_ALL;
 
-	dict<AstNode*, uint32_t> *proc_flags_p = NULL;
+	dict<AstNode*, uint32_t> *proc_flags_p = nullptr;
 
 	if (type == AST_ALWAYS) {
 		int count_edge_events = 0;
-		for (auto child : children)
+		for (auto& child : children)
 			if (child->type == AST_POSEDGE || child->type == AST_NEGEDGE)
 				count_edge_events++;
 		if (count_edge_events != 1)
@@ -4917,12 +4877,12 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 	flags |= children_flags;
 	log_assert((flags & ~0x000000ff) == 0);
 
-	for (auto child : children)
+	for (auto& child : children)
 	{
 		if (lhs_children_counter > 0) {
 			lhs_children_counter--;
 			if (child->children.size() && child->children[0]->type == AST_RANGE && child->children[0]->children.size()) {
-				for (auto c : child->children[0]->children) {
+				for (auto& c : child->children[0]->children) {
 					if (proc_flags_p)
 						c->mem2reg_as_needed_pass1(mem2reg_places, mem2reg_candidates, *proc_flags_p, flags);
 					else
@@ -4958,7 +4918,7 @@ bool AstNode::mem2reg_check(pool<AstNode*> &mem2reg_set)
 	return true;
 }
 
-void AstNode::mem2reg_remove(pool<AstNode*> &mem2reg_set, vector<AstNode*> &delnodes)
+void AstNode::mem2reg_remove(pool<AstNode*> &mem2reg_set)
 {
 	log_assert(mem2reg_set.count(this) == 0);
 
@@ -4966,17 +4926,16 @@ void AstNode::mem2reg_remove(pool<AstNode*> &mem2reg_set, vector<AstNode*> &deln
 		id2ast = nullptr;
 
 	for (size_t i = 0; i < children.size(); i++) {
-		if (mem2reg_set.count(children[i]) > 0) {
-			delnodes.push_back(children[i]);
+		if (mem2reg_set.count(children[i].get()) > 0) {
 			children.erase(children.begin() + (i--));
 		} else {
-			children[i]->mem2reg_remove(mem2reg_set, delnodes);
+			children[i]->mem2reg_remove(mem2reg_set);
 		}
 	}
 }
 
 // actually replace memories with registers
-bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod, AstNode *block, AstNode *&async_block)
+bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod, AstNode *block, AstNode* async_block)
 {
 	bool did_something = false;
 
@@ -5003,9 +4962,10 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 
 		if (length != 0)
 		{
-			AstNode *block = new AstNode(AST_INITIAL, new AstNode(AST_BLOCK));
-			mod->children.push_back(block);
-			block = block->children[0];
+			auto block_owned = std::make_unique<AstNode>(AST_INITIAL, std::make_unique<AstNode>(AST_BLOCK));
+			auto block = block_owned.get();
+			mod->children.push_back(std::move(block_owned));
+			block = block->children[0].get();
 
 			int wordsz = GetSize(data) / length;
 
@@ -5019,11 +4979,11 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 						while (epos < wordsz && en[epos] == State::S1)
 							epos++;
 						int clen = epos - pos;
-						AstNode *range = new AstNode(AST_RANGE, AstNode::mkconst_int(cursor+i, false));
+						auto range = std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(cursor+i, false));
 						if (pos != 0 || epos != wordsz) {
 							int left;
 							int right;
-							AstNode *mrange = id2ast->children[0];
+							auto& mrange = id2ast->children[0];
 							if (mrange->range_left < mrange->range_right) {
 								right = mrange->range_right - pos;
 								left = mrange->range_right - epos + 1;
@@ -5031,42 +4991,39 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 								right = mrange->range_right + pos;
 								left = mrange->range_right + epos - 1;
 							}
-							range = new AstNode(AST_MULTIRANGE, range, new AstNode(AST_RANGE, AstNode::mkconst_int(left, true), AstNode::mkconst_int(right, true)));
+							range = std::make_unique<AstNode>(AST_MULTIRANGE, std::move(range), std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(left, true), AstNode::mkconst_int(right, true)));
 						}
-						AstNode *target = new AstNode(AST_IDENTIFIER, range);
+						auto target = std::make_unique<AstNode>(AST_IDENTIFIER, std::move(range));
 						target->str = str;
 						target->id2ast = id2ast;
 						target->was_checked = true;
-						block->children.push_back(new AstNode(AST_ASSIGN_EQ, target, mkconst_bits(data.extract(i*wordsz + pos, clen).to_bits(), false)));
+						block->children.push_back(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(target), mkconst_bits(data.extract(i*wordsz + pos, clen).to_bits(), false)));
 						pos = epos;
 					}
 				}
 			}
 		}
 
-		AstNode *newNode = new AstNode(AST_NONE);
-		newNode->cloneInto(this);
-		delete newNode;
-
+		auto newNode = std::make_unique<AstNode>(AST_NONE);
+		newNode->cloneInto(*this);
 		did_something = true;
 	}
 
-	if (type == AST_ASSIGN && block == NULL && children[0]->mem2reg_check(mem2reg_set))
+	if (type == AST_ASSIGN && block == nullptr && children[0]->mem2reg_check(mem2reg_set))
 	{
-		if (async_block == NULL) {
-			async_block = new AstNode(AST_ALWAYS, new AstNode(AST_BLOCK));
-			mod->children.push_back(async_block);
+		if (async_block == nullptr) {
+			auto async_block_owned = std::make_unique<AstNode>(AST_ALWAYS, std::make_unique<AstNode>(AST_BLOCK));
+			async_block = async_block_owned.get();
+			mod->children.push_back(std::move(async_block_owned));
 		}
 
-		AstNode *newNode = clone();
+		auto newNode = clone();
 		newNode->type = AST_ASSIGN_EQ;
 		newNode->children[0]->was_checked = true;
-		async_block->children[0]->children.push_back(newNode);
-
-		newNode = new AstNode(AST_NONE);
-		newNode->cloneInto(this);
-		delete newNode;
+		async_block->children[0]->children.push_back(std::move(newNode));
 
+		newNode = std::make_unique<AstNode>(AST_NONE);
+		newNode->cloneInto(*this);
 		did_something = true;
 	}
 
@@ -5081,57 +5038,57 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 		bool mem_signed = children[0]->id2ast->is_signed;
 		children[0]->id2ast->meminfo(mem_width, mem_size, addr_bits);
 
-		AstNode *wire_addr = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(addr_bits-1, true), mkconst_int(0, true)));
+		auto wire_addr = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(addr_bits-1, true), mkconst_int(0, true)));
 		wire_addr->str = id_addr;
 		wire_addr->is_reg = true;
 		wire_addr->was_checked = true;
 		wire_addr->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
-		mod->children.push_back(wire_addr);
 		while (wire_addr->simplify(true, 1, -1, false)) { }
+		mod->children.push_back(std::move(wire_addr));
 
-		AstNode *wire_data = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
+		auto wire_data = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
 		wire_data->str = id_data;
 		wire_data->is_reg = true;
 		wire_data->was_checked = true;
 		wire_data->is_signed = mem_signed;
 		wire_data->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
-		mod->children.push_back(wire_data);
 		while (wire_data->simplify(true, 1, -1, false)) { }
+		mod->children.push_back(std::move(wire_data));
 
-		log_assert(block != NULL);
+		log_assert(block != nullptr);
 		size_t assign_idx = 0;
-		while (assign_idx < block->children.size() && block->children[assign_idx] != this)
+		while (assign_idx < block->children.size() && block->children[assign_idx].get() != this)
 			assign_idx++;
 		log_assert(assign_idx < block->children.size());
 
-		AstNode *assign_addr = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), children[0]->children[0]->children[0]->clone());
+		auto assign_addr = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), children[0]->children[0]->children[0]->clone());
 		assign_addr->children[0]->str = id_addr;
 		assign_addr->children[0]->was_checked = true;
-		block->children.insert(block->children.begin()+assign_idx+1, assign_addr);
+		block->children.insert(block->children.begin()+assign_idx+1, std::move(assign_addr));
 
-		AstNode *case_node = new AstNode(AST_CASE, new AstNode(AST_IDENTIFIER));
+		auto case_node = std::make_unique<AstNode>(AST_CASE, std::make_unique<AstNode>(AST_IDENTIFIER));
 		case_node->children[0]->str = id_addr;
 		for (int i = 0; i < mem_size; i++) {
 			if (children[0]->children[0]->children[0]->type == AST_CONSTANT && int(children[0]->children[0]->children[0]->integer) != i)
 				continue;
-			AstNode *cond_node = new AstNode(AST_COND, AstNode::mkconst_int(i, false, addr_bits), new AstNode(AST_BLOCK));
-			AstNode *assign_reg = new AstNode(type, new AstNode(AST_IDENTIFIER), new AstNode(AST_IDENTIFIER));
+			auto cond_node = std::make_unique<AstNode>(AST_COND, AstNode::mkconst_int(i, false, addr_bits), std::make_unique<AstNode>(AST_BLOCK));
+			auto assign_reg = std::make_unique<AstNode>(type, std::make_unique<AstNode>(AST_IDENTIFIER), std::make_unique<AstNode>(AST_IDENTIFIER));
 			if (children[0]->children.size() == 2)
 				assign_reg->children[0]->children.push_back(children[0]->children[1]->clone());
 			assign_reg->children[0]->str = stringf("%s[%d]", children[0]->str.c_str(), i);
 			assign_reg->children[1]->str = id_data;
-			cond_node->children[1]->children.push_back(assign_reg);
-			case_node->children.push_back(cond_node);
+			cond_node->children[1]->children.push_back(std::move(assign_reg));
+			case_node->children.push_back(std::move(cond_node));
 		}
 
 		// fixup on the full hierarchy below case_node
 		case_node->fixup_hierarchy_flags(true);
 
-		block->children.insert(block->children.begin()+assign_idx+2, case_node);
+		block->children.insert(block->children.begin()+assign_idx+2, std::move(case_node));
 
 		children[0]->delete_children();
 		children[0]->range_valid = false;
-		children[0]->id2ast = NULL;
+		children[0]->id2ast = nullptr;
 		children[0]->str = id_data;
 		type = AST_ASSIGN_EQ;
 		children[0]->was_checked = true;
@@ -5142,7 +5099,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 
 	if (mem2reg_check(mem2reg_set))
 	{
-		AstNode *bit_part_sel = NULL;
+		std::unique_ptr<AstNode> bit_part_sel = nullptr;
 		if (children.size() == 2)
 			bit_part_sel = children[1]->clone();
 
@@ -5159,7 +5116,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 				str = stringf("%s[%d]", str.c_str(), id);
 				delete_children();
 				range_valid = false;
-				id2ast = NULL;
+				id2ast = nullptr;
 			}
 			else
 			{
@@ -5172,7 +5129,6 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 					else
 						width = bit_part_sel->children[0]->integer -
 							bit_part_sel->children[1]->integer;
-					delete bit_part_sel;
 					bit_part_sel = nullptr;
 				}
 				else
@@ -5187,9 +5143,8 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 				std::vector<RTLIL::State> x_bits;
 				for (int i = 0; i < width; i++)
 					x_bits.push_back(RTLIL::State::Sx);
-				AstNode *constant = AstNode::mkconst_bits(x_bits, false);
-				constant->cloneInto(this);
-				delete constant;
+				std::unique_ptr<AstNode> constant = AstNode::mkconst_bits(x_bits, false);
+				constant->cloneInto(*this);
 			}
 		}
 		else
@@ -5202,54 +5157,54 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 			bool mem_signed = id2ast->is_signed;
 			id2ast->meminfo(mem_width, mem_size, addr_bits);
 
-			AstNode *wire_addr = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(addr_bits-1, true), mkconst_int(0, true)));
+			auto wire_addr = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(addr_bits-1, true), mkconst_int(0, true)));
 			wire_addr->str = id_addr;
 			wire_addr->is_reg = true;
 			wire_addr->was_checked = true;
 			if (block)
 				wire_addr->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
-			mod->children.push_back(wire_addr);
 			while (wire_addr->simplify(true, 1, -1, false)) { }
+			mod->children.push_back(std::move(wire_addr));
 
-			AstNode *wire_data = new AstNode(AST_WIRE, new AstNode(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
+			auto wire_data = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
 			wire_data->str = id_data;
 			wire_data->is_reg = true;
 			wire_data->was_checked = true;
 			wire_data->is_signed = mem_signed;
 			if (block)
 				wire_data->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
-			mod->children.push_back(wire_data);
 			while (wire_data->simplify(true, 1, -1, false)) { }
+			mod->children.push_back(std::move(wire_data));
 
-			AstNode *assign_addr = new AstNode(block ? AST_ASSIGN_EQ : AST_ASSIGN, new AstNode(AST_IDENTIFIER), children[0]->children[0]->clone());
+			auto assign_addr = std::make_unique<AstNode>(block ? AST_ASSIGN_EQ : AST_ASSIGN, std::make_unique<AstNode>(AST_IDENTIFIER), children[0]->children[0]->clone());
 			assign_addr->children[0]->str = id_addr;
 			assign_addr->children[0]->was_checked = true;
 
-			AstNode *case_node = new AstNode(AST_CASE, new AstNode(AST_IDENTIFIER));
+			auto case_node = std::make_unique<AstNode>(AST_CASE, std::make_unique<AstNode>(AST_IDENTIFIER));
 			case_node->children[0]->str = id_addr;
 
 			for (int i = 0; i < mem_size; i++) {
 				if (children[0]->children[0]->type == AST_CONSTANT && int(children[0]->children[0]->integer) != i)
 					continue;
-				AstNode *cond_node = new AstNode(AST_COND, AstNode::mkconst_int(i, false, addr_bits), new AstNode(AST_BLOCK));
-				AstNode *assign_reg = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), new AstNode(AST_IDENTIFIER));
+				auto cond_node = std::make_unique<AstNode>(AST_COND, AstNode::mkconst_int(i, false, addr_bits), std::make_unique<AstNode>(AST_BLOCK));
+				auto assign_reg = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), std::make_unique<AstNode>(AST_IDENTIFIER));
 				assign_reg->children[0]->str = id_data;
 				assign_reg->children[0]->was_checked = true;
 				assign_reg->children[1]->str = stringf("%s[%d]", str.c_str(), i);
-				cond_node->children[1]->children.push_back(assign_reg);
-				case_node->children.push_back(cond_node);
+				cond_node->children[1]->children.push_back(std::move(assign_reg));
+				case_node->children.push_back(std::move(cond_node));
 			}
 
 			std::vector<RTLIL::State> x_bits;
 			for (int i = 0; i < mem_width; i++)
 				x_bits.push_back(RTLIL::State::Sx);
 
-			AstNode *cond_node = new AstNode(AST_COND, new AstNode(AST_DEFAULT), new AstNode(AST_BLOCK));
-			AstNode *assign_reg = new AstNode(AST_ASSIGN_EQ, new AstNode(AST_IDENTIFIER), AstNode::mkconst_bits(x_bits, false));
+			auto cond_node = std::make_unique<AstNode>(AST_COND, std::make_unique<AstNode>(AST_DEFAULT), std::make_unique<AstNode>(AST_BLOCK));
+			auto assign_reg = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), AstNode::mkconst_bits(x_bits, false));
 			assign_reg->children[0]->str = id_data;
 			assign_reg->children[0]->was_checked = true;
-			cond_node->children[1]->children.push_back(assign_reg);
-			case_node->children.push_back(cond_node);
+			cond_node->children[1]->children.push_back(std::move(assign_reg));
+			case_node->children.push_back(std::move(cond_node));
 
 			// fixup on the full hierarchy below case_node
 			case_node->fixup_hierarchy_flags(true);
@@ -5260,34 +5215,37 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 				while (assign_idx < block->children.size() && !block->children[assign_idx]->contains(this))
 					assign_idx++;
 				log_assert(assign_idx < block->children.size());
-				block->children.insert(block->children.begin()+assign_idx, case_node);
-				block->children.insert(block->children.begin()+assign_idx, assign_addr);
+				block->children.insert(block->children.begin()+assign_idx, std::move(case_node));
+				block->children.insert(block->children.begin()+assign_idx, std::move(assign_addr));
 			}
 			else
 			{
-				AstNode *proc = new AstNode(AST_ALWAYS, new AstNode(AST_BLOCK, case_node));
-				mod->children.push_back(proc);
-				mod->children.push_back(assign_addr);
+				auto proc = std::make_unique<AstNode>(AST_ALWAYS, std::make_unique<AstNode>(AST_BLOCK, std::move(case_node)));
+				mod->children.push_back(std::move(proc));
+				mod->children.push_back(std::move(assign_addr));
 				mod->fixup_hierarchy_flags();
 			}
 
 			delete_children();
 			range_valid = false;
-			id2ast = NULL;
+			id2ast = nullptr;
 			str = id_data;
 		}
 
 		if (bit_part_sel) {
-			children.push_back(bit_part_sel);
+			children.push_back(std::move(bit_part_sel));
 			fixup_hierarchy_flags();
 		}
 
 		did_something = true;
 	}
 
-	log_assert(id2ast == NULL || mem2reg_set.count(id2ast) == 0);
+	log_assert(id2ast == nullptr || mem2reg_set.count(id2ast) == 0);
+
+	std::vector<AstNode*> children_list;
+	for (auto& child : children)
+		children_list.push_back(child.get());
 
-	auto children_list = children;
 	for (size_t i = 0; i < children_list.size(); i++)
 		if (children_list[i]->mem2reg_as_needed_pass2(mem2reg_set, mod, block, async_block))
 			did_something = true;
@@ -5372,7 +5330,7 @@ bool AstNode::has_const_only_constructs()
 {
 	if (type == AST_WHILE || type == AST_REPEAT)
 		return true;
-	for (auto child : children)
+	for (auto& child : children)
 		if (child->has_const_only_constructs())
 			return true;
 	return false;
@@ -5382,7 +5340,7 @@ bool AstNode::is_simple_const_expr()
 {
 	if (type == AST_IDENTIFIER)
 		return false;
-	for (auto child : children)
+	for (auto& child : children)
 		if (!child->is_simple_const_expr())
 			return false;
 	return true;
@@ -5417,9 +5375,8 @@ bool AstNode::replace_variables(std::map<std::string, AstNode::varinfo_t> &varia
 			offset = -offset;
 		std::vector<RTLIL::State> &var_bits = variables.at(str).val.bits();
 		std::vector<RTLIL::State> new_bits(var_bits.begin() + offset, var_bits.begin() + offset + width);
-		AstNode *newNode = mkconst_bits(new_bits, variables.at(str).is_signed);
-		newNode->cloneInto(this);
-		delete newNode;
+		auto newNode = mkconst_bits(new_bits, variables.at(str).is_signed);
+		newNode->cloneInto(*this);
 		return true;
 	}
 
@@ -5430,32 +5387,34 @@ bool AstNode::replace_variables(std::map<std::string, AstNode::varinfo_t> &varia
 }
 
 // attempt to statically evaluate a functions with all-const arguments
-AstNode *AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
+std::unique_ptr<AstNode> AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
 {
 	std::map<std::string, AstNode*> backup_scope = current_scope;
 	std::map<std::string, AstNode::varinfo_t> variables;
-	std::vector<AstNode*> to_delete;
-	AstNode *block = new AstNode(AST_BLOCK);
-	AstNode *result = nullptr;
+	auto block = std::make_unique<AstNode>(AST_BLOCK);
+	std::unique_ptr<AstNode> result = nullptr;
 
 	size_t argidx = 0;
-	for (auto child : children)
+	for (auto& child : children)
 	{
 		block->children.push_back(child->clone());
 	}
 	block->set_in_param_flag(true);
+	std::vector<std::unique_ptr<AstNode>> temporary_nodes;
 
 	while (!block->children.empty())
 	{
-		AstNode *stmt = block->children.front();
+		// log("%zu left in block %p\n", block->children.size(), block.get());
+		std::unique_ptr<AstNode>& stmt = block->children.front();
 
 #if 0
 		log("-----------------------------------\n");
 		for (auto &it : variables)
 			log("%20s %40s\n", it.first.c_str(), log_signal(it.second.val));
-		stmt->dumpAst(NULL, "stmt> ");
+		stmt->dumpAst(nullptr, "stmt> ");
 #endif
-
+		// log("A\n");
+		// log("%s\n", type2str(stmt->type).c_str());
 		if (stmt->type == AST_WIRE)
 		{
 			while (stmt->simplify(true, 1, -1, false)) { }
@@ -5480,7 +5439,7 @@ AstNode *AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
 				stmt->children.back()->type == AST_RANGE;
 			// identify the argument corresponding to this wire, if applicable
 			if (stmt->is_input && argidx < fcall->children.size()) {
-				variable.arg = fcall->children.at(argidx++);
+				variable.arg = fcall->children.at(argidx++).get();
 			}
 			// load the constant arg's value into this variable
 			if (variable.arg) {
@@ -5491,10 +5450,10 @@ AstNode *AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
 					variable.val = variable.arg->realAsConst(width);
 				}
 			}
-			current_scope[stmt->str] = stmt;
+			current_scope[stmt->str] = stmt.get();
+			temporary_nodes.push_back(std::move(stmt));
 
 			block->children.erase(block->children.begin());
-			to_delete.push_back(stmt);
 			continue;
 		}
 
@@ -5504,10 +5463,10 @@ AstNode *AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
 		{
 			while (stmt->simplify(true, 1, -1, false)) { }
 
-			current_scope[stmt->str] = stmt;
+			current_scope[stmt->str] = stmt.get();
+			temporary_nodes.push_back(std::move(stmt));
 
 			block->children.erase(block->children.begin());
-			to_delete.push_back(stmt);
 			continue;
 		}
 
@@ -5548,7 +5507,7 @@ AstNode *AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
 			if (stmt->children.at(0)->children.empty()) {
 				variables[stmt->children.at(0)->str].val = stmt->children.at(1)->bitsAsConst(variables[stmt->children.at(0)->str].val.size());
 			} else {
-				AstNode *range = stmt->children.at(0)->children.at(0);
+				AstNode *range = stmt->children.at(0)->children.at(0).get();
 				if (!range->range_valid) {
 					if (!must_succeed)
 						goto finished;
@@ -5566,24 +5525,28 @@ AstNode *AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
 				}
 			}
 
-			delete block->children.front();
 			block->children.erase(block->children.begin());
 			continue;
 		}
 
 		if (stmt->type == AST_FOR)
 		{
-			block->children.insert(block->children.begin(), stmt->children.at(0));
-			stmt->children.at(3)->children.push_back(stmt->children.at(2));
+			stmt->type = AST_WHILE;
+			log_assert(stmt->children.size() > 2);
+			auto yoink0 = std::move(stmt->children.at(0));
+			log_assert(stmt->children.size() > 2);
+			auto yoink2 = std::move(stmt->children.at(2));
+			stmt->children.at(3)->children.push_back(std::move(yoink2));
 			stmt->children.erase(stmt->children.begin() + 2);
 			stmt->children.erase(stmt->children.begin());
-			stmt->type = AST_WHILE;
+			block->children.insert(block->children.begin(), std::move(yoink0));
+			log_assert(stmt->children.size() == 2);
 			continue;
 		}
 
 		if (stmt->type == AST_WHILE)
 		{
-			AstNode *cond = stmt->children.at(0)->clone();
+			auto cond = stmt->children.at(0)->clone();
 			if (!cond->replace_variables(variables, fcall, must_succeed))
 				goto finished;
 			cond->set_in_param_flag(true);
@@ -5599,17 +5562,14 @@ AstNode *AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
 			if (cond->asBool()) {
 				block->children.insert(block->children.begin(), stmt->children.at(1)->clone());
 			} else {
-				delete block->children.front();
 				block->children.erase(block->children.begin());
 			}
-
-			delete cond;
 			continue;
 		}
 
 		if (stmt->type == AST_REPEAT)
 		{
-			AstNode *num = stmt->children.at(0)->clone();
+			auto num = stmt->children.at(0)->clone();
 			if (!num->replace_variables(variables, fcall, must_succeed))
 				goto finished;
 			num->set_in_param_flag(true);
@@ -5622,41 +5582,41 @@ AstNode *AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
 						fcall->loc_string().c_str());
 			}
 
+			temporary_nodes.push_back(std::move(stmt));
 			block->children.erase(block->children.begin());
 			for (int i = 0; i < num->bitsAsConst().as_int(); i++)
-				block->children.insert(block->children.begin(), stmt->children.at(1)->clone());
+				block->children.insert(block->children.begin(), temporary_nodes.back()->children.at(1)->clone());
 
-			delete stmt;
-			delete num;
 			continue;
 		}
 
 		if (stmt->type == AST_CASE)
 		{
-			AstNode *expr = stmt->children.at(0)->clone();
+			auto expr = stmt->children.at(0)->clone();
 			if (!expr->replace_variables(variables, fcall, must_succeed))
 				goto finished;
 			expr->set_in_param_flag(true);
 			while (expr->simplify(true, 1, -1, false)) { }
 
-			AstNode *sel_case = NULL;
+			AstNode *sel_case = nullptr;
+			std::unique_ptr<AstNode> sel_case_copy = nullptr;
 			for (size_t i = 1; i < stmt->children.size(); i++)
 			{
 				bool found_match = false;
 				log_assert(stmt->children.at(i)->type == AST_COND || stmt->children.at(i)->type == AST_CONDX || stmt->children.at(i)->type == AST_CONDZ);
 
 				if (stmt->children.at(i)->children.front()->type == AST_DEFAULT) {
-					sel_case = stmt->children.at(i)->children.back();
+					sel_case = stmt->children.at(i)->children.back().get();
 					continue;
 				}
 
 				for (size_t j = 0; j+1 < stmt->children.at(i)->children.size() && !found_match; j++)
 				{
-					AstNode *cond = stmt->children.at(i)->children.at(j)->clone();
+					auto cond = stmt->children.at(i)->children.at(j)->clone();
 					if (!cond->replace_variables(variables, fcall, must_succeed))
 						goto finished;
 
-					cond = new AstNode(AST_EQ, expr->clone(), cond);
+					cond = std::make_unique<AstNode>(AST_EQ, expr->clone(), std::move(cond));
 					cond->set_in_param_flag(true);
 					while (cond->simplify(true, 1, -1, false)) { }
 
@@ -5668,20 +5628,19 @@ AstNode *AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
 					}
 
 					found_match = cond->asBool();
-					delete cond;
 				}
 
 				if (found_match) {
-					sel_case = stmt->children.at(i)->children.back();
+					sel_case = stmt->children.at(i)->children.back().get();
 					break;
 				}
 			}
+			if (sel_case)
+				sel_case_copy = sel_case->clone();
 
 			block->children.erase(block->children.begin());
-			if (sel_case)
-				block->children.insert(block->children.begin(), sel_case->clone());
-			delete stmt;
-			delete expr;
+			if (sel_case_copy)
+				block->children.insert(block->children.begin(), std::move(sel_case_copy));
 			continue;
 		}
 
@@ -5689,15 +5648,19 @@ AstNode *AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
 		{
 			if (!stmt->str.empty())
 				stmt->expand_genblock(stmt->str + ".");
-
+			auto* stmt_leaky = stmt.get();
+			temporary_nodes.push_back(std::move(stmt));
 			block->children.erase(block->children.begin());
-			block->children.insert(block->children.begin(), stmt->children.begin(), stmt->children.end());
-			stmt->children.clear();
+			block->children.reserve(block->children.size() + stmt_leaky->children.size());
+			block->children.insert(block->children.begin(),
+				std::make_move_iterator(stmt_leaky->children.begin()),
+				std::make_move_iterator(stmt_leaky->children.end()));
+			stmt_leaky->children.clear();
 			block->fixup_hierarchy_flags();
-			delete stmt;
 			continue;
 		}
 
+		// log("C\n");
 		if (!must_succeed)
 			goto finished;
 		stmt->input_error("Unsupported language construct in constant function\n%s: ... called from here.\n",
@@ -5708,14 +5671,7 @@ AstNode *AstNode::eval_const_function(AstNode *fcall, bool must_succeed)
 	result = AstNode::mkconst_bits(variables.at(str).val.to_bits(), variables.at(str).is_signed);
 
 finished:
-	delete block;
 	current_scope = backup_scope;
-
-	for (auto it : to_delete) {
-		delete it;
-	}
-	to_delete.clear();
-
 	return result;
 }
 
@@ -5726,14 +5682,13 @@ void AstNode::allocateDefaultEnumValues()
 	if (children.front()->attributes.count(ID::enum_base_type))
 		return; // already elaborated
 	int last_enum_int = -1;
-	for (auto node : children) {
+	for (auto& node : children) {
 		log_assert(node->type==AST_ENUM_ITEM);
 		node->set_attribute(ID::enum_base_type, mkconst_str(str));
 		for (size_t i = 0; i < node->children.size(); i++) {
 			switch (node->children[i]->type) {
 			case AST_NONE:
 				// replace with auto-incremented constant
-				delete node->children[i];
 				node->children[i] = AstNode::mkconst_int(++last_enum_int, true);
 				break;
 			case AST_CONSTANT:
@@ -5762,8 +5717,8 @@ bool AstNode::is_recursive_function() const
 			if (it != current_scope.end() && visit(it->second))
 				return true;
 		}
-		for (const AstNode *child : node->children) {
-			if (visit(child))
+		for (auto& child : node->children) {
+			if (visit(child.get()))
 				return true;
 		}
 		return false;
@@ -5793,9 +5748,9 @@ std::pair<AstNode*, AstNode*> AstNode::get_tern_choice()
 
 	AstNode *choice = nullptr, *not_choice = nullptr;
 	if (found_sure_true)
-		choice = children[1], not_choice = children[2];
+		choice = children[1].get(), not_choice = children[2].get();
 	else if (!found_maybe_true)
-		choice = children[2], not_choice = children[1];
+		choice = children[2].get(), not_choice = children[1].get();
 
 	return {choice, not_choice};
 }
diff --git a/frontends/verilog/.gitignore b/frontends/verilog/.gitignore
index aadbcdcdd..a6d4c8b86 100644
--- a/frontends/verilog/.gitignore
+++ b/frontends/verilog/.gitignore
@@ -2,3 +2,6 @@ verilog_lexer.cc
 verilog_parser.output
 verilog_parser.tab.cc
 verilog_parser.tab.hh
+position.hh
+location.hh
+stack.hh
diff --git a/frontends/verilog/Makefile.inc b/frontends/verilog/Makefile.inc
index 2c923f0b7..2d26f1930 100644
--- a/frontends/verilog/Makefile.inc
+++ b/frontends/verilog/Makefile.inc
@@ -9,6 +9,7 @@ frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y
 	$(P) $(BISON) -Wall -Werror -o $@ -d -r all -b frontends/verilog/verilog_parser $<
 
 frontends/verilog/verilog_parser.tab.hh: frontends/verilog/verilog_parser.tab.cc
+frontends/verilog/verilog_frontend.h: frontends/verilog/verilog_parser.tab.hh
 
 frontends/verilog/verilog_lexer.cc: frontends/verilog/verilog_lexer.l frontends/verilog/verilog_parser.tab.cc
 	$(Q) mkdir -p $(dir $@)
diff --git a/frontends/verilog/const2ast.cc b/frontends/verilog/const2ast.cc
index a4dfbc7ec..9c4a2e76c 100644
--- a/frontends/verilog/const2ast.cc
+++ b/frontends/verilog/const2ast.cc
@@ -42,14 +42,35 @@
 YOSYS_NAMESPACE_BEGIN
 
 using namespace AST;
+using namespace VERILOG_FRONTEND;
+
+std::string ConstParser::fmt_maybe_loc(std::string msg) {
+	std::string s;
+	s += filename.value_or("INTERNAL");
+
+	if (loc)
+		s += stringf("%d", loc->first_line);
+	s += ": ";
+
+	s += msg;
+	return s;
+}
+
+void ConstParser::log_maybe_loc_error(std::string msg) {
+	log_error("%s", fmt_maybe_loc(msg).c_str());
+}
+
+void ConstParser::log_maybe_loc_warn(std::string msg) {
+	log_warning("%s", fmt_maybe_loc(msg).c_str());
+}
 
 // divide an arbitrary length decimal number by two and return the rest
-static int my_decimal_div_by_two(std::vector<uint8_t> &digits)
+int ConstParser::my_decimal_div_by_two(std::vector<uint8_t> &digits)
 {
 	int carry = 0;
 	for (size_t i = 0; i < digits.size(); i++) {
 		if (digits[i] >= 10)
-			log_file_error(current_filename, get_line_num(), "Invalid use of [a-fxz?] in decimal constant.\n");
+			log_maybe_loc_error("Invalid use of [a-fxz?] in decimal constant.\n");
 		digits[i] += carry * 10;
 		carry = digits[i] % 2;
 		digits[i] /= 2;
@@ -60,7 +81,7 @@ static int my_decimal_div_by_two(std::vector<uint8_t> &digits)
 }
 
 // find the number of significant bits in a binary number (not including the sign bit)
-static int my_ilog2(int x)
+int ConstParser::my_ilog2(int x)
 {
 	int ret = 0;
 	while (x != 0 && x != -1) {
@@ -71,7 +92,7 @@ static int my_ilog2(int x)
 }
 
 // parse a binary, decimal, hexadecimal or octal number with support for special bits ('x', 'z' and '?')
-static void my_strtobin(std::vector<RTLIL::State> &data, const char *str, int len_in_bits, int base, char case_type, bool is_unsized)
+void ConstParser::my_strtobin(std::vector<RTLIL::State> &data, const char *str, int len_in_bits, int base, char case_type, bool is_unsized)
 {
 	// all digits in string (MSB at index 0)
 	std::vector<uint8_t> digits;
@@ -102,8 +123,8 @@ static void my_strtobin(std::vector<RTLIL::State> &data, const char *str, int le
 		int bits_per_digit = my_ilog2(base-1);
 		for (auto it = digits.rbegin(), e = digits.rend(); it != e; it++) {
 			if (*it > (base-1) && *it < 0xf0)
-				log_file_error(current_filename, get_line_num(), "Digit larger than %d used in in base-%d constant.\n",
-					       base-1, base);
+				log_maybe_loc_error(stringf("Digit larger than %d used in in base-%d constant.\n",
+							base-1, base));
 			for (int i = 0; i < bits_per_digit; i++) {
 				int bitmask = 1 << i;
 				if (*it == 0xf0)
@@ -126,7 +147,7 @@ static void my_strtobin(std::vector<RTLIL::State> &data, const char *str, int le
 	}
 
 	if (is_unsized && (len > len_in_bits))
-		log_file_error(current_filename, get_line_num(), "Unsized constant must have width of 1 bit, but have %d bits!\n", len);
+		log_maybe_loc_error(stringf("Unsized constant must have width of 1 bit, but have %d bits!\n", len));
 
 	for (len = len - 1; len >= 0; len--)
 		if (data[len] == State::S1)
@@ -140,21 +161,19 @@ static void my_strtobin(std::vector<RTLIL::State> &data, const char *str, int le
 	}
 
 	if (len_in_bits == 0)
-		log_file_error(current_filename, get_line_num(), "Illegal integer constant size of zero (IEEE 1800-2012, 5.7).\n");
+		log_maybe_loc_error("Illegal integer constant size of zero (IEEE 1800-2012, 5.7).\n");
 
 	if (len > len_in_bits)
-		log_warning("Literal has a width of %d bit, but value requires %d bit. (%s:%d)\n",
-			len_in_bits, len, current_filename.c_str(), get_line_num());
+		log_maybe_loc_warn(stringf("Literal has a width of %d bit, but value requires %d bit.\n",
+			len_in_bits, len));
 }
-
 // convert the Verilog code for a constant to an AST node
-AstNode *VERILOG_FRONTEND::const2ast(std::string code, char case_type, bool warn_z)
+std::unique_ptr<AstNode> ConstParser::const2ast(std::string code, char case_type, bool warn_z)
 {
 	if (warn_z) {
-		AstNode *ret = const2ast(code, case_type);
+		auto ret = const2ast(code, case_type);
 		if (ret != nullptr && std::find(ret->bits.begin(), ret->bits.end(), RTLIL::State::Sz) != ret->bits.end())
-			log_warning("Yosys has only limited support for tri-state logic at the moment. (%s:%d)\n",
-				current_filename.c_str(), get_line_num());
+			log_maybe_loc_warn("Yosys has only limited support for tri-state logic at the moment.\n");
 		return ret;
 	}
 
@@ -172,7 +191,7 @@ AstNode *VERILOG_FRONTEND::const2ast(std::string code, char case_type, bool warn
 				ch = ch >> 1;
 			}
 		}
-		AstNode *ast = AstNode::mkconst_bits(data, false);
+		auto ast = AstNode::mkconst_bits(data, false);
 		ast->str = code;
 		return ast;
 	}
@@ -245,4 +264,5 @@ AstNode *VERILOG_FRONTEND::const2ast(std::string code, char case_type, bool warn
 	return NULL;
 }
 
+
 YOSYS_NAMESPACE_END
diff --git a/frontends/verilog/preproc.cc b/frontends/verilog/preproc.cc
index e33b0a2c3..d07e39189 100644
--- a/frontends/verilog/preproc.cc
+++ b/frontends/verilog/preproc.cc
@@ -34,6 +34,7 @@
 
 #include "preproc.h"
 #include "verilog_frontend.h"
+#include "verilog_parser.tab.hh"
 #include "kernel/log.h"
 #include <assert.h>
 #include <stack>
@@ -749,7 +750,9 @@ frontend_verilog_preproc(std::istream                 &f,
                          std::string                   filename,
                          const define_map_t           &pre_defines,
                          define_map_t                 &global_defines_cache,
-                         const std::list<std::string> &include_dirs)
+                         const std::list<std::string> &include_dirs,
+						 ParseState                   &parse_state,
+						 ParseMode                    &parse_mode)
 {
 	define_map_t defines;
 	defines.merge(pre_defines);
@@ -961,11 +964,11 @@ frontend_verilog_preproc(std::istream                 &f,
 		}
 
 		if (tok == "`resetall") {
-			default_nettype_wire = true;
+			parse_state.default_nettype_wire = true;
 			continue;
 		}
 
-		if (tok == "`undefineall" && sv_mode) {
+		if (tok == "`undefineall" && parse_mode.sv) {
 			defines.clear();
 			global_defines_cache.clear();
 			continue;
diff --git a/frontends/verilog/preproc.h b/frontends/verilog/preproc.h
index 330855a92..51562787a 100644
--- a/frontends/verilog/preproc.h
+++ b/frontends/verilog/preproc.h
@@ -35,6 +35,11 @@ YOSYS_NAMESPACE_BEGIN
 struct define_body_t;
 struct arg_map_t;
 
+namespace VERILOG_FRONTEND {
+	struct ParseState;
+	struct ParseMode;
+};
+
 struct define_map_t
 {
 	define_map_t();
@@ -71,7 +76,9 @@ frontend_verilog_preproc(std::istream                 &f,
                          std::string                   filename,
                          const define_map_t           &pre_defines,
                          define_map_t                 &global_defines_cache,
-                         const std::list<std::string> &include_dirs);
+                         const std::list<std::string> &include_dirs,
+						 VERILOG_FRONTEND::ParseState &parse_state,
+						 VERILOG_FRONTEND::ParseMode  &parse_mode);
 
 YOSYS_NAMESPACE_END
 
diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index 1f272ca4f..f2a341f54 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -31,6 +31,7 @@
 #endif
 
 #include "verilog_frontend.h"
+#include "verilog_lexer.h"
 #include "preproc.h"
 #include "kernel/yosys.h"
 #include "libs/sha1/sha1.h"
@@ -48,11 +49,11 @@ static void error_on_dpi_function(AST::AstNode *node)
 {
 	if (node->type == AST::AST_DPI_FUNCTION)
 		log_file_error(node->filename, node->location.first_line, "Found DPI function %s.\n", node->str.c_str());
-	for (auto child : node->children)
-		error_on_dpi_function(child);
+	for (auto& child : node->children)
+		error_on_dpi_function(child.get());
 }
 
-static void add_package_types(dict<std::string, AST::AstNode *> &user_types, std::vector<AST::AstNode *> &package_list)
+static void add_package_types(dict<std::string, AST::AstNode *> &user_types, std::vector<std::unique_ptr<AST::AstNode>> &package_list)
 {
 	// prime the parser's user type lookup table with the package qualified names
 	// of typedefed names in the packages seen so far.
@@ -61,14 +62,22 @@ static void add_package_types(dict<std::string, AST::AstNode *> &user_types, std
 		for (const auto &node: pkg->children) {
 			if (node->type == AST::AST_TYPEDEF) {
 				std::string s = pkg->str + "::" + node->str.substr(1);
-				user_types[s] = node;
+				user_types[s] = node.get();
 			}
 		}
 	}
 }
 
 struct VerilogFrontend : public Frontend {
-	VerilogFrontend() : Frontend("verilog", "read modules from Verilog file") { }
+	ParseMode parse_mode;
+	ParseState parse_state;
+	VerilogLexer lexer;
+	frontend_verilog_yy::parser parser;
+	VerilogFrontend() : Frontend("verilog", "read modules from Verilog file"),
+						parse_mode(),
+						parse_state(),
+						lexer(&parse_state, &parse_mode),
+						parser(&lexer, &parse_state, &parse_mode) { }
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -266,22 +275,24 @@ struct VerilogFrontend : public Frontend {
 		bool flag_noblackbox = false;
 		bool flag_nowb = false;
 		bool flag_nosynthesis = false;
+		bool flag_yydebug = false;
 		define_map_t defines_map;
 
 		std::list<std::string> include_dirs;
 		std::list<std::string> attributes;
 
-		frontend_verilog_yydebug = false;
-		sv_mode = false;
-		formal_mode = false;
-		noassert_mode = false;
-		noassume_mode = false;
-		norestrict_mode = false;
-		assume_asserts_mode = false;
-		assert_assumes_mode = false;
-		lib_mode = false;
-		specify_mode = false;
-		default_nettype_wire = true;
+		lexer.set_debug(false);
+		parser.set_debug_level(0);
+		parse_mode.sv = false;
+		parse_mode.formal = false;
+		parse_mode.noassert = false;
+		parse_mode.noassume = false;
+		parse_mode.norestrict = false;
+		parse_mode.assume_asserts = false;
+		parse_mode.assert_assumes = false;
+		parse_mode.lib = false;
+		parse_mode.specify = false;
+		parse_state.default_nettype_wire = true;
 
 		args.insert(args.begin()+1, verilog_defaults.begin(), verilog_defaults.end());
 
@@ -289,11 +300,11 @@ struct VerilogFrontend : public Frontend {
 		for (argidx = 1; argidx < args.size(); argidx++) {
 			std::string arg = args[argidx];
 			if (arg == "-sv") {
-				sv_mode = true;
+				parse_mode.sv = true;
 				continue;
 			}
 			if (arg == "-formal") {
-				formal_mode = true;
+				parse_mode.formal = true;
 				continue;
 			}
 			if (arg == "-nosynthesis") {
@@ -301,23 +312,23 @@ struct VerilogFrontend : public Frontend {
 				continue;
 			}
 			if (arg == "-noassert") {
-				noassert_mode = true;
+				parse_mode.noassert = true;
 				continue;
 			}
 			if (arg == "-noassume") {
-				noassume_mode = true;
+				parse_mode.noassume = true;
 				continue;
 			}
 			if (arg == "-norestrict") {
-				norestrict_mode = true;
+				parse_mode.norestrict = true;
 				continue;
 			}
 			if (arg == "-assume-asserts") {
-				assume_asserts_mode = true;
+				parse_mode.assume_asserts = true;
 				continue;
 			}
 			if (arg == "-assert-assumes") {
-				assert_assumes_mode = true;
+				parse_mode.assert_assumes = true;
 				continue;
 			}
 			if (arg == "-nodisplay") {
@@ -329,7 +340,8 @@ struct VerilogFrontend : public Frontend {
 				flag_dump_ast2 = true;
 				flag_dump_vlog1 = true;
 				flag_dump_vlog2 = true;
-				frontend_verilog_yydebug = true;
+				lexer.set_debug(true);
+				parser.set_debug_level(1);
 				continue;
 			}
 			if (arg == "-dump_ast1") {
@@ -357,7 +369,7 @@ struct VerilogFrontend : public Frontend {
 				continue;
 			}
 			if (arg == "-yydebug") {
-				frontend_verilog_yydebug = true;
+				flag_yydebug = true;
 				continue;
 			}
 			if (arg == "-nolatches") {
@@ -393,7 +405,7 @@ struct VerilogFrontend : public Frontend {
 				continue;
 			}
 			if (arg == "-lib") {
-				lib_mode = true;
+				parse_mode.lib = true;
 				defines_map.add("BLACKBOX", "");
 				continue;
 			}
@@ -402,7 +414,7 @@ struct VerilogFrontend : public Frontend {
 				continue;
 			}
 			if (arg == "-specify") {
-				specify_mode = true;
+				parse_mode.specify = true;
 				continue;
 			}
 			if (arg == "-noopt") {
@@ -432,7 +444,7 @@ struct VerilogFrontend : public Frontend {
 				continue;
 			}
 			if (arg == "-noautowire") {
-				default_nettype_wire = false;
+				parse_state.default_nettype_wire = false;
 				continue;
 			}
 			if (arg == "-setattr" && argidx+1 < args.size()) {
@@ -469,54 +481,59 @@ struct VerilogFrontend : public Frontend {
 			break;
 		}
 
-		if (formal_mode || !flag_nosynthesis)
-			defines_map.add(formal_mode ? "FORMAL" : "SYNTHESIS", "1");
+		if (parse_mode.formal || !flag_nosynthesis)
+			defines_map.add(parse_mode.formal ? "FORMAL" : "SYNTHESIS", "1");
 
 		extra_args(f, filename, args, argidx);
 
 		log_header(design, "Executing Verilog-2005 frontend: %s\n", filename.c_str());
 
 		log("Parsing %s%s input from `%s' to AST representation.\n",
-				formal_mode ? "formal " : "", sv_mode ? "SystemVerilog" : "Verilog", filename.c_str());
+				parse_mode.formal ? "formal " : "", parse_mode.sv ? "SystemVerilog" : "Verilog", filename.c_str());
 
 		AST::current_filename = filename;
-		AST::set_line_num = &frontend_verilog_yyset_lineno;
-		AST::get_line_num = &frontend_verilog_yyget_lineno;
+		AST::sv_mode = parse_mode.sv;
 
-		current_ast = new AST::AstNode(AST::AST_DESIGN);
+		parse_state.current_ast = new AST::AstNode(AST::AST_DESIGN);
 
-		lexin = f;
+		parse_state.lexin = f;
 		std::string code_after_preproc;
 
 		if (!flag_nopp) {
-			code_after_preproc = frontend_verilog_preproc(*f, filename, defines_map, *design->verilog_defines, include_dirs);
+			code_after_preproc = frontend_verilog_preproc(*f, filename, defines_map, *design->verilog_defines, include_dirs, parse_state, parse_mode);
 			if (flag_ppdump)
 				log("-- Verilog code after preprocessor --\n%s-- END OF DUMP --\n", code_after_preproc.c_str());
-			lexin = new std::istringstream(code_after_preproc);
+			parse_state.lexin = new std::istringstream(code_after_preproc);
 		}
 
 		// make package typedefs available to parser
-		add_package_types(pkg_user_types, design->verilog_packages);
+		add_package_types(parse_state.pkg_user_types, design->verilog_packages);
 
 		UserTypeMap global_types_map;
-		for (auto def : design->verilog_globals) {
+		for (auto& def : design->verilog_globals) {
 			if (def->type == AST::AST_TYPEDEF) {
-				global_types_map[def->str] = def;
+				global_types_map[def->str] = def.get();
 			}
 		}
 
-		log_assert(user_type_stack.empty());
+		log_assert(parse_state.user_type_stack.empty());
 		// use previous global typedefs as bottom level of user type stack
-		user_type_stack.push_back(std::move(global_types_map));
+		parse_state.user_type_stack.push_back(std::move(global_types_map));
 		// add a new empty type map to allow overriding existing global definitions
-		user_type_stack.push_back(UserTypeMap());
+		parse_state.user_type_stack.push_back(UserTypeMap());
 
-		frontend_verilog_yyset_lineno(1);
-		frontend_verilog_yyrestart(NULL);
-		frontend_verilog_yyparse();
-		frontend_verilog_yylex_destroy();
+		parser.~parser();
+		lexer.~VerilogLexer();
+		new (&lexer) VerilogLexer(&parse_state, &parse_mode);
+		new (&parser) frontend_verilog_yy::parser(&lexer, &parse_state, &parse_mode);
+		if (flag_yydebug) {
+			lexer.set_debug(true);
+			parser.set_debug_level(1);
+		}
+		parser.parse();
+		// frontend_verilog_yyset_lineno(1);
 
-		for (auto &child : current_ast->children) {
+		for (auto &child : parse_state.current_ast->children) {
 			if (child->type == AST::AST_MODULE)
 				for (auto &attr : attributes)
 					if (child->attributes.count(attr) == 0)
@@ -524,21 +541,21 @@ struct VerilogFrontend : public Frontend {
 		}
 
 		if (flag_nodpi)
-			error_on_dpi_function(current_ast);
+			error_on_dpi_function(parse_state.current_ast);
 
-		AST::process(design, current_ast, flag_nodisplay, flag_dump_ast1, flag_dump_ast2, flag_no_dump_ptr, flag_dump_vlog1, flag_dump_vlog2, flag_dump_rtlil, flag_nolatches,
-				flag_nomeminit, flag_nomem2reg, flag_mem2reg, flag_noblackbox, lib_mode, flag_nowb, flag_noopt, flag_icells, flag_pwires, flag_nooverwrite, flag_overwrite, flag_defer, default_nettype_wire);
+		AST::process(design, parse_state.current_ast, flag_nodisplay, flag_dump_ast1, flag_dump_ast2, flag_no_dump_ptr, flag_dump_vlog1, flag_dump_vlog2, flag_dump_rtlil, flag_nolatches,
+				flag_nomeminit, flag_nomem2reg, flag_mem2reg, flag_noblackbox, parse_mode.lib, flag_nowb, flag_noopt, flag_icells, flag_pwires, flag_nooverwrite, flag_overwrite, flag_defer, parse_state.default_nettype_wire);
 
 
 		if (!flag_nopp)
-			delete lexin;
+			delete parse_state.lexin;
 
 		// only the previous and new global type maps remain
-		log_assert(user_type_stack.size() == 2);
-		user_type_stack.clear();
+		log_assert(parse_state.user_type_stack.size() == 2);
+		parse_state.user_type_stack.clear();
 
-		delete current_ast;
-		current_ast = NULL;
+		delete parse_state.current_ast;
+		parse_state.current_ast = NULL;
 
 		log("Successfully finished Verilog frontend.\n");
 	}
@@ -759,19 +776,33 @@ struct VerilogFileList : public Pass {
 
 #endif
 
-YOSYS_NAMESPACE_END
-
-// the yyerror function used by bison to report parser errors
-void frontend_verilog_yyerror(char const *fmt, ...)
+[[noreturn]]
+void VERILOG_FRONTEND::verr_at(std::string filename, int begin_line, char const *fmt, va_list ap)
 {
-	va_list ap;
-	char buffer[1024];
-	char *p = buffer;
-	va_start(ap, fmt);
-	p += vsnprintf(p, buffer + sizeof(buffer) - p, fmt, ap);
-	va_end(ap);
-	p += snprintf(p, buffer + sizeof(buffer) - p, "\n");
-	YOSYS_NAMESPACE_PREFIX log_file_error(YOSYS_NAMESPACE_PREFIX AST::current_filename, frontend_verilog_yyget_lineno(),
-					      "%s", buffer);
-	exit(1);
+    char buffer[1024];
+    char *p = buffer;
+    p += vsnprintf(p, buffer + sizeof(buffer) - p, fmt, ap);
+    p += snprintf(p, buffer + sizeof(buffer) - p, "\n");
+    YOSYS_NAMESPACE_PREFIX log_file_error(filename, begin_line, "%s", buffer);
+    exit(1);
 }
+
+[[noreturn]]
+void VERILOG_FRONTEND::err_at_loc(parser::location_type loc, char const *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	verr_at(AST::current_filename, loc.begin.line, fmt, args);
+	va_end(args);
+}
+
+[[noreturn]]
+void VERILOG_FRONTEND::err_at_ast(AstSrcLocType loc, char const *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	verr_at(AST::current_filename, loc.first_line, fmt, args);
+	va_end(args);
+}
+
+YOSYS_NAMESPACE_END
diff --git a/frontends/verilog/verilog_frontend.h b/frontends/verilog/verilog_frontend.h
index 8454e7999..6426f57d8 100644
--- a/frontends/verilog/verilog_frontend.h
+++ b/frontends/verilog/verilog_frontend.h
@@ -31,6 +31,13 @@
 
 #include "kernel/yosys.h"
 #include "frontends/ast/ast.h"
+#include "frontends/verilog/location.hh"
+
+#if ! defined(yyFlexLexerOnce)
+#define yyFlexLexer frontend_verilog_yyFlexLexer
+#include <FlexLexer.h>
+#endif
+
 #include <stdio.h>
 #include <stdint.h>
 #include <list>
@@ -39,62 +46,33 @@ YOSYS_NAMESPACE_BEGIN
 
 namespace VERILOG_FRONTEND
 {
-	// this variable is set to a new AST_DESIGN node and then filled with the AST by the bison parser
-	extern struct AST::AstNode *current_ast;
+	/* Ephemeral context class */
+	struct ConstParser {
+		std::optional<std::string> filename;
+		std::optional<AST::AstSrcLocType> loc;
+	private:
+		std::string fmt_maybe_loc(std::string msg);
+		void log_maybe_loc_error(std::string msg);
+		void log_maybe_loc_warn(std::string msg);
+		// divide an arbitrary length decimal number by two and return the rest
+		int my_decimal_div_by_two(std::vector<uint8_t> &digits);
+		// find the number of significant bits in a binary number (not including the sign bit)
+		int my_ilog2(int x);
+		// parse a binary, decimal, hexadecimal or octal number with support for special bits ('x', 'z' and '?')
+		void my_strtobin(std::vector<RTLIL::State> &data, const char *str, int len_in_bits, int base, char case_type, bool is_unsized);
+	public:
+		// convert the Verilog code for a constant to an AST node
+		std::unique_ptr<AST::AstNode> const2ast(std::string code, char case_type = 0, bool warn_z = false);
 
-	// this function converts a Verilog constant to an AST_CONSTANT node
-	AST::AstNode *const2ast(std::string code, char case_type = 0, bool warn_z = false);
-
-	// names of locally typedef'ed types in a stack
-	typedef std::map<std::string, AST::AstNode*> UserTypeMap;
-	extern std::vector<UserTypeMap> user_type_stack;
-
-	// names of package typedef'ed types
-	extern dict<std::string, AST::AstNode*> pkg_user_types;
-
-	// state of `default_nettype
-	extern bool default_nettype_wire;
-
-	// running in SystemVerilog mode
-	extern bool sv_mode;
-
-	// running in -formal mode
-	extern bool formal_mode;
-
-	// running in -noassert mode
-	extern bool noassert_mode;
-
-	// running in -noassume mode
-	extern bool noassume_mode;
-
-	// running in -norestrict mode
-	extern bool norestrict_mode;
-
-	// running in -assume-asserts mode
-	extern bool assume_asserts_mode;
-
-	// running in -assert-assumes mode
-	extern bool assert_assumes_mode;
-
-	// running in -lib mode
-	extern bool lib_mode;
-
-	// running in -specify mode
-	extern bool specify_mode;
-
-	// lexer input stream
-	extern std::istream *lexin;
-}
+	};
+	[[noreturn]]
+	extern void verr_at(std::string filename, int begin_line, char const *fmt, va_list ap);
+	[[noreturn]]
+	extern void err_at_loc(frontend_verilog_yy::location loc, char const *fmt, ...);
+	[[noreturn]]
+	extern void err_at_ast(AST::AstSrcLocType loc, char const *fmt, ...);
+};
 
 YOSYS_NAMESPACE_END
 
-// the usual bison/flex stuff
-extern int frontend_verilog_yydebug;
-void frontend_verilog_yyerror(char const *fmt, ...);
-void frontend_verilog_yyrestart(FILE *f);
-int frontend_verilog_yyparse(void);
-int frontend_verilog_yylex_destroy(void);
-int frontend_verilog_yyget_lineno(void);
-void frontend_verilog_yyset_lineno (int);
-
 #endif
diff --git a/frontends/verilog/verilog_lexer.h b/frontends/verilog/verilog_lexer.h
new file mode 100644
index 000000000..7d73ae193
--- /dev/null
+++ b/frontends/verilog/verilog_lexer.h
@@ -0,0 +1,48 @@
+#ifndef VERILOG_LEXER_H
+#define VERILOG_LEXER_H
+
+#include "kernel/yosys.h"
+#include "frontends/ast/ast.h"
+#include "frontends/verilog/verilog_parser.tab.hh"
+
+YOSYS_NAMESPACE_BEGIN
+
+namespace VERILOG_FRONTEND {
+    // lexer input stream
+	using parser = frontend_verilog_yy::parser;
+	class VerilogLexer : public frontend_verilog_yyFlexLexer {
+		ParseState* extra;
+		ParseMode* mode;
+	public:
+		VerilogLexer(ParseState* e, ParseMode* m) : frontend_verilog_yyFlexLexer(e->lexin), extra(e), mode(m) {}
+		~VerilogLexer() override {}
+		// autogenerated body due to YY_DECL
+		parser::symbol_type nextToken();
+		// get rid of override virtual function warning
+		using FlexLexer::yylex;
+		parser::symbol_type terminate() {
+			return parser::make_FRONTEND_VERILOG_YYEOF(out_loc);
+		}
+		parser::location_type out_loc;
+		[[noreturn]]
+		void err(char const *fmt, ...)
+		{
+			va_list args;
+			va_start(args, fmt);
+			verr_at(AST::current_filename, yylineno, fmt, args);
+		}
+	private:
+		std::vector<std::string> fn_stack;
+		std::vector<int> ln_stack;
+		parser::location_type real_loc;
+		parser::location_type old_loc;
+		int LexerInput(char* buf, int max_size) override {
+			return readsome(*extra->lexin, buf, max_size);
+		}
+	};
+
+};
+
+YOSYS_NAMESPACE_END
+
+#endif
diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 362288f29..0bc192327 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -32,6 +32,13 @@
  *
  */
 
+%option c++
+%option yyclass="VerilogLexer"
+%option noyywrap
+%option nounput
+%option yylineno
+%option prefix="frontend_verilog_yy"
+
 %{
 
 #ifdef __clang__
@@ -41,85 +48,112 @@
 #pragma clang diagnostic ignored "-Wmisleading-indentation"
 #endif
 
-#include "kernel/log.h"
-#include "frontends/verilog/verilog_frontend.h"
+#include "frontends/verilog/verilog_lexer.h"
 #include "frontends/ast/ast.h"
-#include "verilog_parser.tab.hh"
+#include "kernel/log.h"
+#include <vector>
 
 USING_YOSYS_NAMESPACE
 using namespace AST;
 using namespace VERILOG_FRONTEND;
-
-#define YYSTYPE FRONTEND_VERILOG_YYSTYPE
-#define YYLTYPE FRONTEND_VERILOG_YYLTYPE
+using parser = frontend_verilog_yy::parser;
+//#define YYSTYPE FRONTEND_VERILOG_YYSTYPE
+//#define YYLTYPE FRONTEND_VERILOG_YYLTYPE
 
 YOSYS_NAMESPACE_BEGIN
-namespace VERILOG_FRONTEND {
-	std::vector<std::string> fn_stack;
-	std::vector<int> ln_stack;
-	YYLTYPE real_location;
-	YYLTYPE old_location;
-}
+#undef YY_DECL
+#define YY_DECL parser::symbol_type VerilogLexer::nextToken()
+
+#undef yyterminate
+#define yyterminate() terminate()
+
 YOSYS_NAMESPACE_END
 
 #define SV_KEYWORD(_tok) \
-	if (sv_mode) return _tok; \
+	if (mode->sv) return _tok; \
 	log("Lexer warning: The SystemVerilog keyword `%s' (at %s:%d) is not "\
-			"recognized unless read_verilog is called with -sv!\n", yytext, \
-			AST::current_filename.c_str(), frontend_verilog_yyget_lineno()); \
-	yylval->string = new std::string(std::string("\\") + yytext); \
-	return TOK_ID;
+			"recognized unless read_verilog is called with -sv!\n", YYText(), \
+			AST::current_filename.c_str(), yylineno); \
+	string_t val = new std::string(std::string("\\") + YYText()); \
+	return parser::make_TOK_ID(val, out_loc);
 
 #define NON_KEYWORD() \
-	yylval->string = new std::string(std::string("\\") + yytext); \
-	return TOK_ID;
+	string_t val = new std::string(std::string("\\") + YYText()); \
+	return parser::make_TOK_ID(val, out_loc);
 
-#define YY_INPUT(buf,result,max_size) \
-	result = readsome(*VERILOG_FRONTEND::lexin, buf, max_size)
+// #define YY_INPUT(buf,result,max_size) \
+// 	result = readsome(*extra->lexin, buf, max_size)
 
 #define YY_USER_ACTION \
-       old_location = real_location; \
-       real_location.first_line = real_location.last_line; \
-       real_location.first_column = real_location.last_column; \
-       for(int i = 0; yytext[i] != '\0'; ++i){ \
-               if(yytext[i] == '\n') { \
-                       real_location.last_line++; \
-                       real_location.last_column = 1; \
-               } \
-               else { \
-                       real_location.last_column++; \
-               } \
-       } \
-    (*yylloc) = real_location;
+		real_loc.begin = real_loc.end; \
+		for(int i = 0; YYText()[i] != '\0'; ++i){ \
+				if(YYText()[i] == '\n') { \
+						real_loc.end.line++; \
+						real_loc.end.column = 1; \
+				} \
+				else { \
+						real_loc.end.column++; \
+				} \
+		} \
+		out_loc = real_loc;
 
 #define YY_BREAK \
-    (*yylloc) = old_location; \
     break;
 
 #undef YY_BUF_SIZE
 #define YY_BUF_SIZE 65536
 
-extern int frontend_verilog_yylex(YYSTYPE *yylval_param, YYLTYPE *yyloc_param);
-
-static bool isUserType(std::string &s)
+static bool isUserType(ParseState* extra, std::string &s)
 {
 	// check current scope then outer scopes for a name
-	for (auto it = user_type_stack.rbegin(); it != user_type_stack.rend(); ++it) {
+	for (auto it = extra->user_type_stack.rbegin(); it != extra->user_type_stack.rend(); ++it) {
 		if (it->count(s) > 0) {
-			return true;
+				return true;
 		}
 	}
 	return false;
 }
 
-%}
+parser::symbol_type char_tok(char c, parser::location_type loc) {
+	switch (c) {
+		case '!': return parser::make_TOK_EXCL(loc);
+		case '#': return parser::make_TOK_HASH(loc);
+		case '%': return parser::make_TOK_PERC(loc);
+		case '&': return parser::make_TOK_AMP(loc);
+		case '(': return parser::make_TOK_LPAREN(loc);
+		case ')': return parser::make_TOK_RPAREN(loc);
+		case '*': return parser::make_TOK_ASTER(loc);
+		case '+': return parser::make_TOK_PLUS(loc);
+		case ',': return parser::make_TOK_COMMA(loc);
+		case '-': return parser::make_TOK_MINUS(loc);
+		case '.': return parser::make_TOK_DOT(loc);
+		case '/': return parser::make_TOK_SLASH(loc);
+		case ':': return parser::make_TOK_COL(loc);
+		case ';': return parser::make_TOK_SEMICOL(loc);
+		case '<': return parser::make_TOK_LT(loc);
+		case '=': return parser::make_TOK_EQ(loc);
+		case '>': return parser::make_TOK_GT(loc);
+		case '?': return parser::make_TOK_QUE(loc);
+		case '@': return parser::make_TOK_AT(loc);
+		case '[': return parser::make_TOK_LBRA(loc);
+		case ']': return parser::make_TOK_RBRA(loc);
+		case '^': return parser::make_TOK_CARET(loc);
+		case '_': return parser::make_TOK_UNDER(loc);
+		case '{': return parser::make_TOK_LCURL(loc);
+		case '|': return parser::make_TOK_PIPE(loc);
+		case '}': return parser::make_TOK_RCURL(loc);
+		case '~': return parser::make_TOK_TILDE(loc);
+		case 'n': return parser::make_TOK_n(loc);
+		case 'p': return parser::make_TOK_p(loc);
+		case 'x': return parser::make_TOK_x(loc);
+		case 'z': return parser::make_TOK_z(loc);
+		case 0: return parser::make_FRONTEND_VERILOG_YYEOF(loc);
+		default:
+			return parser::make_ch_t(c, loc);
+	}
+}
 
-%option yylineno
-%option noyywrap
-%option nounput
-%option bison-locations
-%option bison-bridge
-%option prefix="frontend_verilog_yy"
+%}
 
 %x COMMENT
 %x STRING
@@ -134,47 +168,48 @@ FIXED_POINT_NUMBER_NO_DEC [0-9][0-9_]*[eE][-+]?[0-9_]+
 TIME_SCALE_SUFFIX [munpf]?s
 
 %%
+
 	// Initialise comment_caller to something to avoid a "maybe undefined"
 	// warning from GCC.
 	int comment_caller = INITIAL;
 
 <INITIAL,SYNOPSYS_TRANSLATE_OFF>"`file_push "[^\n]* {
 	fn_stack.push_back(current_filename);
-	ln_stack.push_back(frontend_verilog_yyget_lineno());
-	current_filename = yytext+11;
+	ln_stack.push_back(yylineno);
+	current_filename = YYText()+11;
 	if (!current_filename.empty() && current_filename.front() == '"')
 		current_filename = current_filename.substr(1);
 	if (!current_filename.empty() && current_filename.back() == '"')
 		current_filename = current_filename.substr(0, current_filename.size()-1);
-	frontend_verilog_yyset_lineno(0);
-	yylloc->first_line = yylloc->last_line = 0;
-	real_location.first_line = real_location.last_line = 0;
+	yylineno = (0);
+	out_loc.begin.line = out_loc.end.line = 0;
+	real_loc.begin.line = real_loc.end.line = 0;
 }
 
 <INITIAL,SYNOPSYS_TRANSLATE_OFF>"`file_pop"[^\n]*\n {
 	current_filename = fn_stack.back();
 	fn_stack.pop_back();
-	frontend_verilog_yyset_lineno(ln_stack.back());
-	yylloc->first_line = yylloc->last_line = ln_stack.back();
-	real_location.first_line = real_location.last_line = ln_stack.back();
+	yylineno = (ln_stack.back());
+	out_loc.begin.line = out_loc.end.line = ln_stack.back();
+	real_loc.begin.line = real_loc.end.line = ln_stack.back();
 	ln_stack.pop_back();
 }
 
 <INITIAL,SYNOPSYS_TRANSLATE_OFF>"`line"[ \t]+[^ \t\r\n]+[ \t]+\"[^ \r\n]+\"[^\r\n]*\n {
-	char *p = yytext + 5;
+	const char *p = YYText() + 5;
 	while (*p == ' ' || *p == '\t') p++;
-	frontend_verilog_yyset_lineno(atoi(p));
-	yylloc->first_line = yylloc->last_line = atoi(p);
-	real_location.first_line = real_location.last_line = atoi(p);
+	yylineno = (atoi(p));
+	out_loc.begin.line = out_loc.end.line = atoi(p);
+	real_loc.begin.line = real_loc.end.line = atoi(p);
 	while (*p && *p != ' ' && *p != '\t') p++;
 	while (*p == ' ' || *p == '\t') p++;
-	char *q = *p ? p + 1 : p;
+	const char *q = *p ? p + 1 : p;
 	while (*q && *q != '"') q++;
 	current_filename = std::string(p).substr(1, q-p-1);
 }
 
 "`file_notfound "[^\n]* {
-	log_error("Can't open include file `%s'!\n", yytext + 15);
+	log_error("Can't open include file `%s'!\n", YYText() + 15);
 }
 
 "`timescale"[ \t]+[^ \t\r\n/]+[ \t]*"/"[ \t]*[^ \t\r\n]* /* ignore timescale directive */
@@ -183,165 +218,165 @@ TIME_SCALE_SUFFIX [munpf]?s
 "`endcelldefine"[^\n]* /* ignore `endcelldefine */
 
 "`default_nettype"[ \t]+[^ \t\r\n/]+ {
-	char *p = yytext;
+	const char *p = YYText();
 	while (*p != 0 && *p != ' ' && *p != '\t') p++;
 	while (*p == ' ' || *p == '\t') p++;
 	if (!strcmp(p, "none"))
-		VERILOG_FRONTEND::default_nettype_wire = false;
+		extra->default_nettype_wire = false;
 	else if (!strcmp(p, "wire"))
-		VERILOG_FRONTEND::default_nettype_wire = true;
+		extra->default_nettype_wire = true;
 	else
-		frontend_verilog_yyerror("Unsupported default nettype: %s", p);
+		err("Unsupported default nettype: %s", p);
 }
 
 "`protect"[^\n]* /* ignore `protect*/
 "`endprotect"[^\n]* /* ignore `endprotect*/
 
 "`"[a-zA-Z_$][a-zA-Z0-9_$]* {
-	frontend_verilog_yyerror("Unimplemented compiler directive or undefined macro %s.", yytext);
+	err("Unimplemented compiler directive or undefined macro %s.", YYText());
 }
 
-"module"       { return TOK_MODULE; }
-"endmodule"    { return TOK_ENDMODULE; }
-"function"     { return TOK_FUNCTION; }
-"endfunction"  { return TOK_ENDFUNCTION; }
-"task"         { return TOK_TASK; }
-"endtask"      { return TOK_ENDTASK; }
-"specify"      { return specify_mode ? TOK_SPECIFY : TOK_IGNORED_SPECIFY; }
-"endspecify"   { return TOK_ENDSPECIFY; }
-"specparam"    { return TOK_SPECPARAM; }
-"package"      { SV_KEYWORD(TOK_PACKAGE); }
-"endpackage"   { SV_KEYWORD(TOK_ENDPACKAGE); }
-"import"       { SV_KEYWORD(TOK_IMPORT); }
-"interface"    { SV_KEYWORD(TOK_INTERFACE); }
-"endinterface" { SV_KEYWORD(TOK_ENDINTERFACE); }
-"modport"      { SV_KEYWORD(TOK_MODPORT); }
-"parameter"    { return TOK_PARAMETER; }
-"localparam"   { return TOK_LOCALPARAM; }
-"defparam"     { return TOK_DEFPARAM; }
-"assign"       { return TOK_ASSIGN; }
-"always"       { return TOK_ALWAYS; }
-"initial"      { return TOK_INITIAL; }
-"begin"	       { return TOK_BEGIN; }
-"end"          { return TOK_END; }
-"if"           { return TOK_IF; }
-"else"         { return TOK_ELSE; }
-"for"          { return TOK_FOR; }
-"posedge"      { return TOK_POSEDGE; }
-"negedge"      { return TOK_NEGEDGE; }
-"or"           { return TOK_OR; }
-"case"         { return TOK_CASE; }
-"casex"        { return TOK_CASEX; }
-"casez"        { return TOK_CASEZ; }
-"endcase"      { return TOK_ENDCASE; }
-"default"      { return TOK_DEFAULT; }
-"generate"     { return TOK_GENERATE; }
-"endgenerate"  { return TOK_ENDGENERATE; }
-"while"        { return TOK_WHILE; }
-"repeat"       { return TOK_REPEAT; }
-"automatic"    { return TOK_AUTOMATIC; }
+"module"       { return parser::make_TOK_MODULE(out_loc); }
+"endmodule"    { return parser::make_TOK_ENDMODULE(out_loc); }
+"function"     { return parser::make_TOK_FUNCTION(out_loc); }
+"endfunction"  { return parser::make_TOK_ENDFUNCTION(out_loc); }
+"task"         { return parser::make_TOK_TASK(out_loc); }
+"endtask"      { return parser::make_TOK_ENDTASK(out_loc); }
+"specify"      { return mode->specify ? parser::make_TOK_SPECIFY(out_loc) : parser::make_TOK_IGNORED_SPECIFY(out_loc); }
+"endspecify"   { return parser::make_TOK_ENDSPECIFY(out_loc); }
+"specparam"    { return parser::make_TOK_SPECPARAM(out_loc); }
+"package"      { SV_KEYWORD(parser::make_TOK_PACKAGE(out_loc)); }
+"endpackage"   { SV_KEYWORD(parser::make_TOK_ENDPACKAGE(out_loc)); }
+"import"       { SV_KEYWORD(parser::make_TOK_IMPORT(out_loc)); }
+"interface"    { SV_KEYWORD(parser::make_TOK_INTERFACE(out_loc)); }
+"endinterface" { SV_KEYWORD(parser::make_TOK_ENDINTERFACE(out_loc)); }
+"modport"      { SV_KEYWORD(parser::make_TOK_MODPORT(out_loc)); }
+"parameter"    { return parser::make_TOK_PARAMETER(out_loc); }
+"localparam"   { return parser::make_TOK_LOCALPARAM(out_loc); }
+"defparam"     { return parser::make_TOK_DEFPARAM(out_loc); }
+"assign"       { return parser::make_TOK_ASSIGN(out_loc); }
+"always"       { return parser::make_TOK_ALWAYS(out_loc); }
+"initial"      { return parser::make_TOK_INITIAL(out_loc); }
+"begin"	       { return parser::make_TOK_BEGIN(out_loc); }
+"end"          { return parser::make_TOK_END(out_loc); }
+"if"           { return parser::make_TOK_IF(out_loc); }
+"else"         { return parser::make_TOK_ELSE(out_loc); }
+"for"          { return parser::make_TOK_FOR(out_loc); }
+"posedge"      { return parser::make_TOK_POSEDGE(out_loc); }
+"negedge"      { return parser::make_TOK_NEGEDGE(out_loc); }
+"or"           { return parser::make_TOK_OR(out_loc); }
+"case"         { return parser::make_TOK_CASE(out_loc); }
+"casex"        { return parser::make_TOK_CASEX(out_loc); }
+"casez"        { return parser::make_TOK_CASEZ(out_loc); }
+"endcase"      { return parser::make_TOK_ENDCASE(out_loc); }
+"default"      { return parser::make_TOK_DEFAULT(out_loc); }
+"generate"     { return parser::make_TOK_GENERATE(out_loc); }
+"endgenerate"  { return parser::make_TOK_ENDGENERATE(out_loc); }
+"while"        { return parser::make_TOK_WHILE(out_loc); }
+"repeat"       { return parser::make_TOK_REPEAT(out_loc); }
+"automatic"    { return parser::make_TOK_AUTOMATIC(out_loc); }
 
-"unique"       { SV_KEYWORD(TOK_UNIQUE); }
-"unique0"      { SV_KEYWORD(TOK_UNIQUE0); }
-"priority"     { SV_KEYWORD(TOK_PRIORITY); }
+"unique"       { SV_KEYWORD(parser::make_TOK_UNIQUE(out_loc)); }
+"unique0"      { SV_KEYWORD(parser::make_TOK_UNIQUE0(out_loc)); }
+"priority"     { SV_KEYWORD(parser::make_TOK_PRIORITY(out_loc)); }
 
-"always_comb"  { SV_KEYWORD(TOK_ALWAYS_COMB); }
-"always_ff"    { SV_KEYWORD(TOK_ALWAYS_FF); }
-"always_latch" { SV_KEYWORD(TOK_ALWAYS_LATCH); }
+"always_comb"  { SV_KEYWORD(parser::make_TOK_ALWAYS_COMB(out_loc)); }
+"always_ff"    { SV_KEYWORD(parser::make_TOK_ALWAYS_FF(out_loc)); }
+"always_latch" { SV_KEYWORD(parser::make_TOK_ALWAYS_LATCH(out_loc)); }
 
  /* use special token for labels on assert, assume, cover, and restrict because it's insanley complex
     to fix parsing of cells otherwise. (the current cell parser forces a reduce very early to update some
     global state.. its a mess) */
 [a-zA-Z_$][a-zA-Z0-9_$]*/[ \t\r\n]*:[ \t\r\n]*(assert|assume|cover|restrict)[^a-zA-Z0-9_$\.] {
-	if (!strcmp(yytext, "default"))
-		return TOK_DEFAULT;
-	yylval->string = new std::string(std::string("\\") + yytext);
-	return TOK_SVA_LABEL;
+	if (!strcmp(YYText(), "default"))
+		return parser::make_TOK_DEFAULT(out_loc);
+	string_t val = new std::string(std::string("\\") + YYText());
+	return parser::make_TOK_SVA_LABEL(val, out_loc);
 }
 
-"assert"     { if (formal_mode) return TOK_ASSERT; SV_KEYWORD(TOK_ASSERT); }
-"assume"     { if (formal_mode) return TOK_ASSUME; SV_KEYWORD(TOK_ASSUME); }
-"cover"      { if (formal_mode) return TOK_COVER; SV_KEYWORD(TOK_COVER); }
-"restrict"   { if (formal_mode) return TOK_RESTRICT; SV_KEYWORD(TOK_RESTRICT); }
-"property"   { if (formal_mode) return TOK_PROPERTY; SV_KEYWORD(TOK_PROPERTY); }
-"rand"       { if (formal_mode) return TOK_RAND; SV_KEYWORD(TOK_RAND); }
-"const"      { if (formal_mode) return TOK_CONST; SV_KEYWORD(TOK_CONST); }
-"checker"    { if (formal_mode) return TOK_CHECKER; SV_KEYWORD(TOK_CHECKER); }
-"endchecker" { if (formal_mode) return TOK_ENDCHECKER; SV_KEYWORD(TOK_ENDCHECKER); }
-"bind"       { if (formal_mode) return TOK_BIND; SV_KEYWORD(TOK_BIND); }
-"final"      { SV_KEYWORD(TOK_FINAL); }
-"logic"      { SV_KEYWORD(TOK_LOGIC); }
-"var"        { SV_KEYWORD(TOK_VAR); }
-"bit"        { SV_KEYWORD(TOK_LOGIC); }
-"int"        { SV_KEYWORD(TOK_INT); }
-"byte"       { SV_KEYWORD(TOK_BYTE); }
-"shortint"   { SV_KEYWORD(TOK_SHORTINT); }
-"longint"    { SV_KEYWORD(TOK_LONGINT); }
-"void"       { SV_KEYWORD(TOK_VOID); }
+"assert"     { if (mode->formal) return parser::make_TOK_ASSERT(out_loc); SV_KEYWORD(parser::make_TOK_ASSERT(out_loc)); }
+"assume"     { if (mode->formal) return parser::make_TOK_ASSUME(out_loc); SV_KEYWORD(parser::make_TOK_ASSUME(out_loc)); }
+"cover"      { if (mode->formal) return parser::make_TOK_COVER(out_loc); SV_KEYWORD(parser::make_TOK_COVER(out_loc)); }
+"restrict"   { if (mode->formal) return parser::make_TOK_RESTRICT(out_loc); SV_KEYWORD(parser::make_TOK_RESTRICT(out_loc)); }
+"property"   { if (mode->formal) return parser::make_TOK_PROPERTY(out_loc); SV_KEYWORD(parser::make_TOK_PROPERTY(out_loc)); }
+"rand"       { if (mode->formal) return parser::make_TOK_RAND(out_loc); SV_KEYWORD(parser::make_TOK_RAND(out_loc)); }
+"const"      { if (mode->formal) return parser::make_TOK_CONST(out_loc); SV_KEYWORD(parser::make_TOK_CONST(out_loc)); }
+"checker"    { if (mode->formal) return parser::make_TOK_CHECKER(out_loc); SV_KEYWORD(parser::make_TOK_CHECKER(out_loc)); }
+"endchecker" { if (mode->formal) return parser::make_TOK_ENDCHECKER(out_loc); SV_KEYWORD(parser::make_TOK_ENDCHECKER(out_loc)); }
+"bind"       { if (mode->formal) return parser::make_TOK_BIND(out_loc); SV_KEYWORD(parser::make_TOK_BIND(out_loc)); }
+"final"      { SV_KEYWORD(parser::make_TOK_FINAL(out_loc)); }
+"logic"      { SV_KEYWORD(parser::make_TOK_LOGIC(out_loc)); }
+"var"        { SV_KEYWORD(parser::make_TOK_VAR(out_loc)); }
+"bit"        { SV_KEYWORD(parser::make_TOK_LOGIC(out_loc)); }
+"int"        { SV_KEYWORD(parser::make_TOK_INT(out_loc)); }
+"byte"       { SV_KEYWORD(parser::make_TOK_BYTE(out_loc)); }
+"shortint"   { SV_KEYWORD(parser::make_TOK_SHORTINT(out_loc)); }
+"longint"    { SV_KEYWORD(parser::make_TOK_LONGINT(out_loc)); }
+"void"       { SV_KEYWORD(parser::make_TOK_VOID(out_loc)); }
 
-"eventually"   { if (formal_mode) return TOK_EVENTUALLY; SV_KEYWORD(TOK_EVENTUALLY); }
-"s_eventually" { if (formal_mode) return TOK_EVENTUALLY; SV_KEYWORD(TOK_EVENTUALLY); }
+"eventually"   { if (mode->formal) return parser::make_TOK_EVENTUALLY(out_loc); SV_KEYWORD(parser::make_TOK_EVENTUALLY(out_loc)); }
+"s_eventually" { if (mode->formal) return parser::make_TOK_EVENTUALLY(out_loc); SV_KEYWORD(parser::make_TOK_EVENTUALLY(out_loc)); }
 
-"input"   { return TOK_INPUT; }
-"output"  { return TOK_OUTPUT; }
-"inout"   { return TOK_INOUT; }
-"wire"    { return TOK_WIRE; }
-"tri"     { return TOK_WIRE; }
-"wor"     { return TOK_WOR; }
-"trior"   { return TOK_WOR; }
-"wand"    { return TOK_WAND; }
-"triand"  { return TOK_WAND; }
-"reg"     { return TOK_REG; }
-"integer" { return TOK_INTEGER; }
-"signed"  { return TOK_SIGNED; }
-"unsigned" { SV_KEYWORD(TOK_UNSIGNED); }
-"genvar"  { return TOK_GENVAR; }
-"real"    { return TOK_REAL; }
+"input"   { return parser::make_TOK_INPUT(out_loc); }
+"output"  { return parser::make_TOK_OUTPUT(out_loc); }
+"inout"   { return parser::make_TOK_INOUT(out_loc); }
+"wire"    { return parser::make_TOK_WIRE(out_loc); }
+"tri"     { return parser::make_TOK_WIRE(out_loc); }
+"wor"     { return parser::make_TOK_WOR(out_loc); }
+"trior"   { return parser::make_TOK_WOR(out_loc); }
+"wand"    { return parser::make_TOK_WAND(out_loc); }
+"triand"  { return parser::make_TOK_WAND(out_loc); }
+"reg"     { return parser::make_TOK_REG(out_loc); }
+"integer" { return parser::make_TOK_INTEGER(out_loc); }
+"signed"  { return parser::make_TOK_SIGNED(out_loc); }
+"unsigned" { SV_KEYWORD(parser::make_TOK_UNSIGNED(out_loc)); }
+"genvar"  { return parser::make_TOK_GENVAR(out_loc); }
+"real"    { return parser::make_TOK_REAL(out_loc); }
 
-"enum"    { SV_KEYWORD(TOK_ENUM); }
-"typedef" { SV_KEYWORD(TOK_TYPEDEF); }
-"struct"  { SV_KEYWORD(TOK_STRUCT); }
-"union"   { SV_KEYWORD(TOK_UNION); }
-"packed"  { SV_KEYWORD(TOK_PACKED); }
+"enum"    { SV_KEYWORD(parser::make_TOK_ENUM(out_loc)); }
+"typedef" { SV_KEYWORD(parser::make_TOK_TYPEDEF(out_loc)); }
+"struct"  { SV_KEYWORD(parser::make_TOK_STRUCT(out_loc)); }
+"union"   { SV_KEYWORD(parser::make_TOK_UNION(out_loc)); }
+"packed"  { SV_KEYWORD(parser::make_TOK_PACKED(out_loc)); }
 
 {UNSIGNED_NUMBER} {
-	yylval->string = new std::string(yytext);
-	return TOK_CONSTVAL;
+	string_t val = new std::string(YYText());
+	return parser::make_TOK_CONSTVAL(val, out_loc);
 }
 
 \'[01zxZX] {
-	yylval->string = new std::string(yytext);
-	return TOK_UNBASED_UNSIZED_CONSTVAL;
+	string_t val = new std::string(YYText());
+	return parser::make_TOK_UNBASED_UNSIZED_CONSTVAL(val, out_loc);
 }
 
 \'[sS]?[bodhBODH] {
 	BEGIN(BASED_CONST);
-	yylval->string = new std::string(yytext);
-	return TOK_BASE;
+	string_t val = new std::string(YYText());
+	return parser::make_TOK_BASE(val, out_loc);
 }
 
 <BASED_CONST>[0-9a-fA-FzxZX?][0-9a-fA-FzxZX?_]* {
 	BEGIN(0);
-	yylval->string = new std::string(yytext);
-	return TOK_BASED_CONSTVAL;
+	string_t val = new std::string(YYText());
+	return parser::make_TOK_BASED_CONSTVAL(val, out_loc);
 }
 
 {FIXED_POINT_NUMBER_DEC} {
-	yylval->string = new std::string(yytext);
-	return TOK_REALVAL;
+	string_t val = new std::string(YYText());
+	return parser::make_TOK_REALVAL(val, out_loc);
 }
 
 {FIXED_POINT_NUMBER_NO_DEC} {
-	yylval->string = new std::string(yytext);
-	return TOK_REALVAL;
+	string_t val = new std::string(YYText());
+	return parser::make_TOK_REALVAL(val, out_loc);
 }
 
 \"		{ BEGIN(STRING); }
-<STRING>([^\"]|\\.)+	{ yymore(); real_location = old_location; }
+<STRING>([^\"]|\\.)+	{ yymore(); }
 <STRING>\"	{
 	BEGIN(0);
-	char *yystr = strdup(yytext);
-	yystr[strlen(yytext) - 1] = 0;
+	char *yystr = strdup(YYText());
+	yystr[strlen(YYText()) - 1] = 0;
 	int i = 0, j = 0;
 	while (yystr[i]) {
 		if (yystr[i] == '\\' && yystr[i + 1]) {
@@ -373,71 +408,71 @@ TIME_SCALE_SUFFIX [munpf]?s
 		yystr[j++] = yystr[i++];
 	}
 	yystr[j] = 0;
-	yylval->string = new std::string(yystr, j);
+	string_t val = new std::string(yystr, j);
 	free(yystr);
-	return TOK_STRING;
+	return parser::make_TOK_STRING(val, out_loc);
 }
 
 and|nand|or|nor|xor|xnor|not|buf|bufif0|bufif1|notif0|notif1 {
-	yylval->string = new std::string(yytext);
-	return TOK_PRIMITIVE;
+	auto val = new std::string(YYText());
+	return parser::make_TOK_PRIMITIVE(val, out_loc);
 }
 
-supply0 { return TOK_SUPPLY0; }
-supply1 { return TOK_SUPPLY1; }
+supply0 { return parser::make_TOK_SUPPLY0(out_loc); }
+supply1 { return parser::make_TOK_SUPPLY1(out_loc); }
 
 "$"(display[bho]?|write[bho]?|strobe|monitor|time|realtime|stop|finish|dumpfile|dumpvars|dumpon|dumpoff|dumpall) {
-	yylval->string = new std::string(yytext);
-	return TOK_ID;
+	auto val = new std::string(YYText());
+	return parser::make_TOK_ID(val, out_loc);
 }
 
 "$"(setup|hold|setuphold|removal|recovery|recrem|skew|timeskew|fullskew|nochange) {
-	if (!specify_mode) REJECT;
-	yylval->string = new std::string(yytext);
-	return TOK_ID;
+	if (!mode->specify) REJECT;
+	auto val = new std::string(YYText());
+	return parser::make_TOK_ID(val, out_loc);
 }
 
 "$"(info|warning|error|fatal) {
-	yylval->string = new std::string(yytext);
-	return TOK_MSG_TASKS;
+	auto val = new std::string(YYText());
+	return parser::make_TOK_MSG_TASKS(val, out_loc);
 }
 
-"$signed"   { return TOK_TO_SIGNED; }
-"$unsigned" { return TOK_TO_UNSIGNED; }
+"$signed"   { return parser::make_TOK_TO_SIGNED(out_loc); }
+"$unsigned" { return parser::make_TOK_TO_UNSIGNED(out_loc); }
 
 [a-zA-Z_][a-zA-Z0-9_]*::[a-zA-Z_$][a-zA-Z0-9_$]* {
 	// package qualifier
-	auto s = std::string("\\") + yytext;
-	if (pkg_user_types.count(s) > 0) {
+	auto s = std::string("\\") + YYText();
+	if (extra->pkg_user_types.count(s) > 0) {
 		// package qualified typedefed name
-		yylval->string = new std::string(s);
-		return TOK_PKG_USER_TYPE;
+		auto val = new std::string(s);
+		return parser::make_TOK_PKG_USER_TYPE(val, out_loc);
 	}
 	else {
 		// backup before :: just return first part
-		size_t len = strchr(yytext, ':') - yytext;
+		size_t len = strchr(YYText(), ':') - YYText();
 		yyless(len);
-		yylval->string = new std::string(std::string("\\") + yytext);
-		return TOK_ID;
+		auto val = new std::string(std::string("\\") + YYText());
+		return parser::make_TOK_ID(val, out_loc);
 	}
 }
 
 [a-zA-Z_$][a-zA-Z0-9_$]* {
-	auto s = std::string("\\") + yytext;
-	if (isUserType(s)) {
+	auto s = std::string("\\") + YYText();
+	if (isUserType(extra, s)) {
 		// previously typedefed name
-		yylval->string = new std::string(s);
-		return TOK_USER_TYPE;
+		auto val = new std::string(s);
+		return parser::make_TOK_USER_TYPE(val, out_loc);
 	}
 	else {
-		yylval->string = new std::string(std::string("\\") + yytext);
-		return TOK_ID;
+		auto val = new std::string(std::string("\\") + YYText());
+		return parser::make_TOK_ID(val, out_loc);
 	}
 }
 
 [a-zA-Z_$][a-zA-Z0-9_$\.]* {
-	yylval->string = new std::string(std::string("\\") + yytext);
-	return TOK_ID;
+	auto val = new std::string(std::string("\\") + YYText());
+	return parser::make_TOK_ID(val, out_loc);
 }
 
 "/*"[ \t]*(synopsys|synthesis)[ \t]*translate_off[ \t]*"*/" {
@@ -473,7 +508,7 @@ supply1 { return TOK_SUPPLY1; }
 		);
 		printed_warning = true;
 	}
-	return TOK_SYNOPSYS_FULL_CASE;
+	return parser::make_TOK_SYNOPSYS_FULL_CASE(out_loc);
 }
 <SYNOPSYS_FLAGS>parallel_case {
 	static bool printed_warning = false;
@@ -487,119 +522,115 @@ supply1 { return TOK_SUPPLY1; }
 		);
 		printed_warning = true;
 	}
-	return TOK_SYNOPSYS_PARALLEL_CASE;
+	return parser::make_TOK_SYNOPSYS_PARALLEL_CASE(out_loc);
 }
 <SYNOPSYS_FLAGS>. /* ignore everything else */
 <SYNOPSYS_FLAGS>"*/" { BEGIN(0); }
 
 import[ \t\r\n]+\"(DPI|DPI-C)\"[ \t\r\n]+function[ \t\r\n]+ {
 	BEGIN(IMPORT_DPI);
-	return TOK_DPI_FUNCTION;
+	return parser::make_TOK_DPI_FUNCTION(out_loc);
 }
 
 <IMPORT_DPI>[a-zA-Z_$][a-zA-Z0-9_$]* {
-	yylval->string = new std::string(std::string("\\") + yytext);
-	return TOK_ID;
+	auto val = new std::string(std::string("\\") + YYText());
+	return parser::make_TOK_ID(val, out_loc);
 }
 
 <IMPORT_DPI>[ \t\r\n] /* ignore whitespaces */
 
 <IMPORT_DPI>";" {
 	BEGIN(0);
-	return *yytext;
+	return char_tok(*YYText(), out_loc);
 }
 
 <IMPORT_DPI>. {
-	return *yytext;
+	return char_tok(*YYText(), out_loc);
 }
 
 "\\"[^ \t\r\n]+ {
-	yylval->string = new std::string(yytext);
-	return TOK_ID;
+	auto val = new std::string(YYText());
+	return parser::make_TOK_ID(val, out_loc);
 }
 
-"(*" { return ATTR_BEGIN; }
-"*)" { return ATTR_END; }
+"(*" { return parser::make_ATTR_BEGIN(out_loc); }
+"*)" { return parser::make_ATTR_END(out_loc); }
 
-"{*"  { return DEFATTR_BEGIN; }
-"*}"  { return DEFATTR_END; }
+"{*"  { return parser::make_DEFATTR_BEGIN(out_loc); }
+"*}"  { return parser::make_DEFATTR_END(out_loc); }
 
-"**" { return OP_POW; }
-"||" { return OP_LOR; }
-"&&" { return OP_LAND; }
-"==" { return OP_EQ; }
-"!=" { return OP_NE; }
-"<=" { return OP_LE; }
-">=" { return OP_GE; }
+"**" { return parser::make_OP_POW(out_loc); }
+"||" { return parser::make_OP_LOR(out_loc); }
+"&&" { return parser::make_OP_LAND(out_loc); }
+"==" { return parser::make_OP_EQ(out_loc); }
+"!=" { return parser::make_OP_NE(out_loc); }
+"<=" { return parser::make_OP_LE(out_loc); }
+">=" { return parser::make_OP_GE(out_loc); }
 
-"===" { return OP_EQX; }
-"!==" { return OP_NEX; }
+"===" { return parser::make_OP_EQX(out_loc); }
+"!==" { return parser::make_OP_NEX(out_loc); }
 
-"~&" { return OP_NAND; }
-"~|" { return OP_NOR;  }
-"~^" { return OP_XNOR; }
-"^~" { return OP_XNOR; }
+"~&" { return parser::make_OP_NAND(out_loc); }
+"~|" { return parser::make_OP_NOR(out_loc);  }
+"~^" { return parser::make_OP_XNOR(out_loc); }
+"^~" { return parser::make_OP_XNOR(out_loc); }
 
-"<<"  { return OP_SHL; }
-">>"  { return OP_SHR; }
-"<<<" { return OP_SSHL; }
-">>>" { return OP_SSHR; }
+"<<"  { return parser::make_OP_SHL(out_loc); }
+">>"  { return parser::make_OP_SHR(out_loc); }
+"<<<" { return parser::make_OP_SSHL(out_loc); }
+">>>" { return parser::make_OP_SSHR(out_loc); }
 
-"'" { return OP_CAST; }
+"'" { return parser::make_OP_CAST(out_loc); }
 
-"::"  { return TOK_PACKAGESEP; }
-"++"  { return TOK_INCREMENT; }
-"--"  { return TOK_DECREMENT; }
+"::"  { return parser::make_TOK_PACKAGESEP(out_loc); }
+"++"  { return parser::make_TOK_INCREMENT(out_loc); }
+"--"  { return parser::make_TOK_DECREMENT(out_loc); }
 
-"+:" { return TOK_POS_INDEXED; }
-"-:" { return TOK_NEG_INDEXED; }
+"+:" { return parser::make_TOK_POS_INDEXED(out_loc); }
+"-:" { return parser::make_TOK_NEG_INDEXED(out_loc); }
 
-".*" { return TOK_WILDCARD_CONNECT; }
+".*" { return parser::make_TOK_WILDCARD_CONNECT(out_loc); }
 
-"|=" { SV_KEYWORD(TOK_BIT_OR_ASSIGN); }
-"&=" { SV_KEYWORD(TOK_BIT_AND_ASSIGN); }
-"+=" { SV_KEYWORD(TOK_ADD_ASSIGN); }
-"-=" { SV_KEYWORD(TOK_SUB_ASSIGN); }
-"^=" { SV_KEYWORD(TOK_BIT_XOR_ASSIGN); }
-"/=" { SV_KEYWORD(TOK_DIV_ASSIGN); }
-"%=" { SV_KEYWORD(TOK_MOD_ASSIGN); }
-"*=" { SV_KEYWORD(TOK_MUL_ASSIGN); }
-"<<=" { SV_KEYWORD(TOK_SHL_ASSIGN); }
-">>=" { SV_KEYWORD(TOK_SHR_ASSIGN); }
-"<<<=" { SV_KEYWORD(TOK_SSHL_ASSIGN); }
-">>>=" { SV_KEYWORD(TOK_SSHR_ASSIGN); }
+"|=" { SV_KEYWORD(parser::make_TOK_BIT_OR_ASSIGN(out_loc)); }
+"&=" { SV_KEYWORD(parser::make_TOK_BIT_AND_ASSIGN(out_loc)); }
+"+=" { SV_KEYWORD(parser::make_TOK_ADD_ASSIGN(out_loc)); }
+"-=" { SV_KEYWORD(parser::make_TOK_SUB_ASSIGN(out_loc)); }
+"^=" { SV_KEYWORD(parser::make_TOK_BIT_XOR_ASSIGN(out_loc)); }
+"/=" { SV_KEYWORD(parser::make_TOK_DIV_ASSIGN(out_loc)); }
+"%=" { SV_KEYWORD(parser::make_TOK_MOD_ASSIGN(out_loc)); }
+"*=" { SV_KEYWORD(parser::make_TOK_MUL_ASSIGN(out_loc)); }
+"<<=" { SV_KEYWORD(parser::make_TOK_SHL_ASSIGN(out_loc)); }
+">>=" { SV_KEYWORD(parser::make_TOK_SHR_ASSIGN(out_loc)); }
+"<<<=" { SV_KEYWORD(parser::make_TOK_SSHL_ASSIGN(out_loc)); }
+">>>=" { SV_KEYWORD(parser::make_TOK_SSHR_ASSIGN(out_loc)); }
 
 [-+]?[=*]> {
-	if (!specify_mode) REJECT;
-	yylval->string = new std::string(yytext);
-	return TOK_SPECIFY_OPER;
+	if (!mode->specify) REJECT;
+	auto val = new std::string(YYText());
+	return parser::make_TOK_SPECIFY_OPER(val, out_loc);
 }
 
 "&&&" {
-	if (!specify_mode) return TOK_IGNORED_SPECIFY_AND;
-	return TOK_SPECIFY_AND;
+	if (!mode->specify) return parser::make_TOK_IGNORED_SPECIFY_AND(out_loc);
+	return parser::make_TOK_SPECIFY_AND(out_loc);
 }
 
-{UNSIGNED_NUMBER}{TIME_SCALE_SUFFIX} { return TOK_TIME_SCALE; }
-{FIXED_POINT_NUMBER_DEC}{TIME_SCALE_SUFFIX} { return TOK_TIME_SCALE; }
-{FIXED_POINT_NUMBER_NO_DEC}{TIME_SCALE_SUFFIX} { return TOK_TIME_SCALE; }
+{UNSIGNED_NUMBER}{TIME_SCALE_SUFFIX} { return parser::make_TOK_TIME_SCALE(out_loc); }
+{FIXED_POINT_NUMBER_DEC}{TIME_SCALE_SUFFIX} { return parser::make_TOK_TIME_SCALE(out_loc); }
+{FIXED_POINT_NUMBER_NO_DEC}{TIME_SCALE_SUFFIX} { return parser::make_TOK_TIME_SCALE(out_loc); }
 
 <INITIAL,BASED_CONST>"/*" { comment_caller=YY_START; BEGIN(COMMENT); }
 <COMMENT>.    /* ignore comment body */
 <COMMENT>\n   /* ignore comment body */
 <COMMENT>"*/" { BEGIN(comment_caller); }
 
+
 <INITIAL,BASED_CONST>[ \t\r\n]		/* ignore whitespaces */
 <INITIAL,BASED_CONST>\\[\r\n]		/* ignore continuation sequence */
 <INITIAL,BASED_CONST>"//"[^\r\n]*	/* ignore one-line comments */
 
-<INITIAL>. { return *yytext; }
-<*>. { BEGIN(0); return *yytext; }
+<INITIAL>. { return char_tok(*YYText(), out_loc); }
+<*>. { BEGIN(0); return char_tok(*YYText(), out_loc); }
 
 %%
 
-// this is a hack to avoid the 'yyinput defined but not used' error msgs
-void *frontend_verilog_avoid_input_warnings() {
-	return (void*)&yyinput;
-}
-
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 3cd582378..14ea0d615 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -34,366 +34,479 @@
  */
 
 %require "3.0"
+%language "c++"
+%define api.value.type variant
+%define api.prefix {frontend_verilog_yy}
+%define api.token.constructor
 
-%{
-#include <list>
-#include <stack>
-#include <string.h>
-#include "frontends/verilog/verilog_frontend.h"
-#include "frontends/verilog/verilog_parser.tab.hh"
-#include "kernel/log.h"
+%param { YOSYS_NAMESPACE_PREFIX VERILOG_FRONTEND::VerilogLexer* lexer }
+%parse-param { YOSYS_NAMESPACE_PREFIX VERILOG_FRONTEND::ParseState* extra }
+%parse-param { YOSYS_NAMESPACE_PREFIX VERILOG_FRONTEND::ParseMode* mode }
 
-#define YYLEX_PARAM &yylval, &yylloc
-
-USING_YOSYS_NAMESPACE
-using namespace AST;
-using namespace VERILOG_FRONTEND;
-
-YOSYS_NAMESPACE_BEGIN
-namespace VERILOG_FRONTEND {
-	int port_counter;
-	dict<std::string, int> port_stubs;
-	dict<IdString, AstNode*> *attr_list, default_attr_list;
-	std::stack<dict<IdString, AstNode*> *> attr_list_stack;
-	dict<IdString, AstNode*> *albuf;
-	std::vector<UserTypeMap> user_type_stack;
-	dict<std::string, AstNode*> pkg_user_types;
-	std::vector<AstNode*> ast_stack;
-	struct AstNode *astbuf1, *astbuf2, *astbuf3;
-	struct AstNode *current_function_or_task;
-	struct AstNode *current_ast, *current_ast_mod;
-	int current_function_or_task_port_id;
-	std::vector<char> case_type_stack;
-	bool do_not_require_port_stubs;
-	bool default_nettype_wire;
-	bool sv_mode, formal_mode, lib_mode, specify_mode;
-	bool noassert_mode, noassume_mode, norestrict_mode;
-	bool assume_asserts_mode, assert_assumes_mode;
-	bool current_wire_rand, current_wire_const;
-	bool current_modport_input, current_modport_output;
-	std::istream *lexin;
+%code requires {
+	#include "kernel/yosys_common.h"
+	// #include "frontends/verilog/verilog_lexer.h"
+	// start requires
+	YOSYS_NAMESPACE_BEGIN
+	namespace VERILOG_FRONTEND {
+		struct ParseState;
+		struct ParseMode;
+		class VerilogLexer;
+	};
+	YOSYS_NAMESPACE_END
+	// end requires
 }
-YOSYS_NAMESPACE_END
 
-#define SET_AST_NODE_LOC(WHICH, BEGIN, END) \
-    do { (WHICH)->location.first_line = (BEGIN).first_line; \
-    (WHICH)->location.first_column = (BEGIN).first_column; \
-    (WHICH)->location.last_line = (END).last_line; \
-    (WHICH)->location.last_column = (END).last_column; } while(0)
+%code provides {
+	// start provides
+	USING_YOSYS_NAMESPACE;
+	using namespace AST;
+	using namespace VERILOG_FRONTEND;
+	using parser = frontend_verilog_yy::parser;
+	YOSYS_NAMESPACE_BEGIN
+	namespace VERILOG_FRONTEND {
+		typedef std::map<std::string, AST::AstNode*> UserTypeMap;
+		struct ParseState {
+			// TODO initialization?
+			int port_counter;
+			dict<std::string, int> port_stubs;
+			dict<IdString, std::unique_ptr<AstNode>> *attr_list, default_attr_list;
+			std::stack<dict<IdString, std::unique_ptr<AstNode>> *> attr_list_stack;
+			dict<IdString, std::unique_ptr<AstNode>> *albuf;
+			std::vector<UserTypeMap> user_type_stack;
+			dict<std::string, AstNode*> pkg_user_types;
+			std::vector<AstNode*> ast_stack;
+			std::unique_ptr<AstNode> astbuf1, astbuf2, astbuf3;
+			AstNode* cell_hack;
+			AstNode* member_hack;
+			struct AstNode *current_function_or_task;
+			struct AstNode *current_ast, *current_ast_mod;
+			int current_function_or_task_port_id;
+			std::vector<char> case_type_stack;
+			bool do_not_require_port_stubs;
+			bool current_wire_rand, current_wire_const;
+			bool current_modport_input, current_modport_output;
+			bool default_nettype_wire = true;
+			std::istream* lexin;
 
-#define SET_RULE_LOC(LHS, BEGIN, END) \
-    do { (LHS).first_line = (BEGIN).first_line; \
-    (LHS).first_column = (BEGIN).first_column; \
-    (LHS).last_line = (END).last_line; \
-    (LHS).last_column = (END).last_column; } while(0)
+			AstNode* saveChild(std::unique_ptr<AstNode> child);
+			AstNode* pushChild(std::unique_ptr<AstNode> child);
+			void addWiretypeNode(std::string *name, AstNode* node);
+			void addTypedefNode(std::string *name, std::unique_ptr<AstNode> node);
+			void enterTypeScope();
+			void exitTypeScope();
+			bool isInLocalScope(const std::string *name);
+			void rewriteGenForDeclInit(AstNode *loop);
+			void ensureAsgnExprAllowed(const parser::location_type loc, bool sv_mode);
+			const AstNode *addIncOrDecStmt(dict<IdString, std::unique_ptr<AstNode>> *stmt_attr,
+									std::unique_ptr<AstNode> lhs,
+									dict<IdString, std::unique_ptr<AstNode>> *op_attr, AST::AstNodeType op,
+									parser::location_type begin, parser::location_type end);
+			std::unique_ptr<AstNode> addIncOrDecExpr(std::unique_ptr<AstNode> lhs, dict<IdString, std::unique_ptr<AstNode>> *attr, AST::AstNodeType op, parser::location_type begin, parser::location_type end, bool undo, bool sv_mode);
+			// add a binary operator assignment statement, e.g., a += b
+			std::unique_ptr<AstNode> addAsgnBinopStmt(dict<IdString, std::unique_ptr<AstNode>> *attr, std::unique_ptr<AstNode> eq_lhs, AST::AstNodeType op, std::unique_ptr<AstNode> rhs, parser::location_type begin, parser::location_type end);
+		};
+		struct ParseMode {
+			bool noassert = false;
+			bool noassume = false;
+			bool norestrict = false;
+			bool sv = false;
+			bool formal = false;
+			bool lib = false;
+			bool specify = false;
+			bool assume_asserts = false;
+			bool assert_assumes = false;
+		};
+	};
+	YOSYS_NAMESPACE_END
+	// end provides
+}
 
-int frontend_verilog_yylex(YYSTYPE *yylval_param, YYLTYPE *yyloc_param);
+%code {
+	// start unqual
+	#include <list>
+	#include <stack>
+	#include <memory>
+	#include <string.h>
+	#include "kernel/log.h"
+	#include "frontends/verilog/verilog_lexer.h"
 
-static void append_attr(AstNode *ast, dict<IdString, AstNode*> *al)
-{
-	for (auto &it : *al) {
-		if (ast->attributes.count(it.first) > 0)
-			delete ast->attributes[it.first];
-		ast->attributes[it.first] = it.second;
+	USING_YOSYS_NAMESPACE
+	using namespace AST;
+	using namespace VERILOG_FRONTEND;
+
+	// Silly little C adapter between C++ bison and C++ flex
+	auto frontend_verilog_yylex(YOSYS_NAMESPACE_PREFIX VERILOG_FRONTEND::VerilogLexer* lexer) {
+		return lexer->nextToken();
 	}
-	delete al;
-}
 
-static void append_attr_clone(AstNode *ast, dict<IdString, AstNode*> *al)
-{
-	for (auto &it : *al) {
-		if (ast->attributes.count(it.first) > 0)
-			delete ast->attributes[it.first];
-		ast->attributes[it.first] = it.second->clone();
-	}
-}
+	#define SET_LOC(WHICH, BEGIN, END) \
+		do { WHICH.first_line = (BEGIN).begin.line; \
+		WHICH.first_column = (BEGIN).begin.column; \
+		WHICH.last_line = (END).end.line; \
+		WHICH.last_column = (END).end.column; } while(0)
 
-static void free_attr(dict<IdString, AstNode*> *al)
-{
-	for (auto &it : *al)
-		delete it.second;
-	delete al;
-}
+	#define SET_AST_NODE_LOC(WHICH, BEGIN, END) SET_LOC((WHICH)->location, BEGIN, END)
 
-struct specify_target {
-	char polarity_op;
-	AstNode *dst, *dat;
-};
+	#define SET_RULE_LOC(LHS, BEGIN, END) \
+		do { (LHS).begin = BEGIN.begin; \
+		(LHS).end = (END).end; } while(0)
 
-struct specify_triple {
-	AstNode *t_min, *t_avg, *t_max;
-};
-
-struct specify_rise_fall {
-	specify_triple rise;
-	specify_triple fall;
-};
-
-static void addWiretypeNode(std::string *name, AstNode *node)
-{
-	log_assert(node);
-	node->is_custom_type = true;
-	node->children.push_back(new AstNode(AST_WIRETYPE));
-	node->children.back()->str = *name;
-	delete name;
-}
-
-static void addTypedefNode(std::string *name, AstNode *node)
-{
-	log_assert(node);
-	auto *tnode = new AstNode(AST_TYPEDEF, node);
-	tnode->str = *name;
-	auto &user_types = user_type_stack.back();
-	user_types[*name] = tnode;
-	if (current_ast_mod && current_ast_mod->type == AST_PACKAGE) {
-		// typedef inside a package so we need the qualified name
-		auto qname = current_ast_mod->str + "::" + (*name).substr(1);
-		pkg_user_types[qname] = tnode;
-	}
-	delete name;
-	ast_stack.back()->children.push_back(tnode);
-}
-
-static void enterTypeScope()
-{
-	user_type_stack.push_back(UserTypeMap());
-}
-
-static void exitTypeScope()
-{
-	user_type_stack.pop_back();
-}
-
-static bool isInLocalScope(const std::string *name)
-{
-	// tests if a name was declared in the current block scope
-	auto &user_types = user_type_stack.back();
-	return (user_types.count(*name) > 0);
-}
-
-static AstNode *makeRange(int msb = 31, int lsb = 0, bool isSigned = true)
-{
-	auto range = new AstNode(AST_RANGE);
-	range->children.push_back(AstNode::mkconst_int(msb, true));
-	range->children.push_back(AstNode::mkconst_int(lsb, true));
-	range->is_signed = isSigned;
-	return range;
-}
-
-static void addRange(AstNode *parent, int msb = 31, int lsb = 0, bool isSigned = true)
-{
-	auto range = makeRange(msb, lsb, isSigned);
-	parent->children.push_back(range);
-}
-
-static AstNode *checkRange(AstNode *type_node, AstNode *range_node)
-{
-	if (type_node->range_left >= 0 && type_node->range_right >= 0) {
-		// type already restricts the range
-		if (range_node) {
-			frontend_verilog_yyerror("integer/genvar types cannot have packed dimensions.");
+	YOSYS_NAMESPACE_BEGIN
+	namespace VERILOG_FRONTEND {
+		static ConstParser make_ConstParser_here(parser::location_type flex_loc) {
+			AstSrcLocType loc;
+			SET_LOC(loc, flex_loc, flex_loc);
+			std::optional<std::string> filename = flex_loc.begin.filename ? std::make_optional(*(flex_loc.begin.filename)) : std::nullopt;
+			ConstParser p{filename, loc};
+			return p;
 		}
-		else {
-			range_node = makeRange(type_node->range_left, type_node->range_right, false);
+		static void append_attr(AstNode *ast, dict<IdString, std::unique_ptr<AstNode>> *al)
+		{
+			for (auto &it : *al) {
+				ast->attributes[it.first] = std::move(it.second);
+			}
+			delete al;
 		}
-	}
 
-	if (range_node) {
-		bool valid = true;
-		if (range_node->type == AST_RANGE) {
-			valid = range_node->children.size() == 2;
-		} else {  // AST_MULTIRANGE
-			for (auto child : range_node->children) {
-				valid = valid && child->children.size() == 2;
+		static void append_attr_clone(AstNode *ast, dict<IdString, std::unique_ptr<AstNode>> *al)
+		{
+			for (auto &it : *al) {
+				ast->attributes[it.first] = it.second->clone();
 			}
 		}
-		if (!valid)
-			frontend_verilog_yyerror("wire/reg/logic packed dimension must be of the form [<expr>:<expr>]");
-	}
 
-	return range_node;
-}
+		static void free_attr(dict<IdString, std::unique_ptr<AstNode>> *al)
+		{
+			delete al;
+		}
 
-static void rewriteRange(AstNode *rangeNode)
-{
-	if (rangeNode->type == AST_RANGE && rangeNode->children.size() == 1) {
-		// SV array size [n], rewrite as [0:n-1]
-		rangeNode->children.push_back(new AstNode(AST_SUB, rangeNode->children[0], AstNode::mkconst_int(1, true)));
-		rangeNode->children[0] = AstNode::mkconst_int(0, false);
-	}
-}
+		static std::unique_ptr<AstNode> makeRange(int msb = 31, int lsb = 0, bool isSigned = true)
+		{
+			auto range = std::make_unique<AstNode>(AST_RANGE);
+			range->children.push_back(AstNode::mkconst_int(msb, true));
+			range->children.push_back(AstNode::mkconst_int(lsb, true));
+			range->is_signed = isSigned;
+			return range;
+		}
 
-static void rewriteAsMemoryNode(AstNode *node, AstNode *rangeNode)
-{
-	node->type = AST_MEMORY;
-	if (rangeNode->type == AST_MULTIRANGE) {
-		for (auto *itr : rangeNode->children)
-			rewriteRange(itr);
-	} else
-		rewriteRange(rangeNode);
-	node->children.push_back(rangeNode);
-}
+		static void addRange(AstNode *parent, int msb = 31, int lsb = 0, bool isSigned = true)
+		{
+			auto range = makeRange(msb, lsb, isSigned);
+			parent->children.push_back(std::move(range));
+		}
 
-static void checkLabelsMatch(const char *element, const std::string *before, const std::string *after)
-{
-	if (!before && after)
-		frontend_verilog_yyerror("%s missing where end label (%s) was given.",
-			element, after->c_str() + 1);
-	if (before && after && *before != *after)
-		frontend_verilog_yyerror("%s (%s) and end label (%s) don't match.",
-			element, before->c_str() + 1, after->c_str() + 1);
-}
+		static std::unique_ptr<AstNode> checkRange(AstNode *type_node, std::unique_ptr<AstNode> range_node)
+		{
+			if (type_node->range_left >= 0 && type_node->range_right >= 0) {
+				// type already restricts the range
+				if (range_node) {
+					err_at_ast(type_node->location, "integer/genvar types cannot have packed dimensions.");
+				}
+				else {
+					range_node = makeRange(type_node->range_left, type_node->range_right, false);
+				}
+			}
 
-// This transforms a loop like
-//   for (genvar i = 0; i < 10; i++) begin : blk
-// to
-//   genvar _i;
-//   for (_i = 0; _i < 10; _i++) begin : blk
-//     localparam i = _i;
-// where `_i` is actually some auto-generated name.
-static void rewriteGenForDeclInit(AstNode *loop)
-{
-	// check if this generate for loop contains an inline declaration
-	log_assert(loop->type == AST_GENFOR);
-	AstNode *decl = loop->children[0];
-	if (decl->type == AST_ASSIGN_EQ)
-		return;
-	log_assert(decl->type == AST_GENVAR);
-	log_assert(loop->children.size() == 5);
+			if (range_node) {
+				bool valid = true;
+				if (range_node->type == AST_RANGE) {
+					valid = range_node->children.size() == 2;
+				} else {  // AST_MULTIRANGE
+					for (auto& child : range_node->children) {
+						valid = valid && child->children.size() == 2;
+					}
+				}
+				if (!valid)
+					err_at_ast(type_node->location, "wire/reg/logic packed dimension must be of the form [<expr>:<expr>]");
+			}
 
-	// identify each component of the loop
-	AstNode *init = loop->children[1];
-	AstNode *cond = loop->children[2];
-	AstNode *incr = loop->children[3];
-	AstNode *body = loop->children[4];
-	log_assert(init->type == AST_ASSIGN_EQ);
-	log_assert(incr->type == AST_ASSIGN_EQ);
-	log_assert(body->type == AST_GENBLOCK);
+			return range_node;
+		}
 
-	// create a unique name for the genvar
-	std::string old_str = decl->str;
-	std::string new_str = stringf("$genfordecl$%d$%s", autoidx++, old_str.c_str());
+		static void rewriteRange(AstNode *rangeNode)
+		{
+			if (rangeNode->type == AST_RANGE && rangeNode->children.size() == 1) {
+				// SV array size [n], rewrite as [0:n-1]
+				rangeNode->children.push_back(std::make_unique<AstNode>(AST_SUB, std::move(rangeNode->children[0]), AstNode::mkconst_int(1, true)));
+				rangeNode->children[0] = AstNode::mkconst_int(0, false);
+			}
+		}
 
-	// rename and move the genvar declaration to the containing description
-	decl->str = new_str;
-	loop->children.erase(loop->children.begin());
-	log_assert(current_ast_mod != nullptr);
-	current_ast_mod->children.push_back(decl);
+		static void rewriteAsMemoryNode(AstNode *node, std::unique_ptr<AstNode> rangeNode)
+		{
+			node->type = AST_MEMORY;
+			if (rangeNode->type == AST_MULTIRANGE) {
+				for (auto& child : rangeNode->children)
+					rewriteRange(child.get());
+			} else
+				rewriteRange(rangeNode.get());
+			node->children.push_back(std::move(rangeNode));
+		}
 
-	// create a new localparam with old name so that the items in the loop
-	// can simply use the old name and shadow it as necessary
-	AstNode *indirect = new AstNode(AST_LOCALPARAM);
-	indirect->str = old_str;
-	AstNode *ident = new AstNode(AST_IDENTIFIER);
-	ident->str = new_str;
-	indirect->children.push_back(ident);
+		static void checkLabelsMatch(const frontend_verilog_yy::parser::location_type& loc, const char *element, const std::string *before, const std::string *after)
+		{
+			if (!before && after)
+				err_at_loc(loc, "%s missing where end label (%s) was given.",
+					element, after->c_str() + 1);
+			if (before && after && *before != *after)
+				err_at_loc(loc, "%s (%s) and end label (%s) don't match.",
+					element, before->c_str() + 1, after->c_str() + 1);
+		}
 
-	body->children.insert(body->children.begin(), indirect);
+		AstNode* ParseState::saveChild(std::unique_ptr<AstNode> child) {
+			auto* child_leaky = child.get();
+			ast_stack.back()->children.push_back(std::move(child));
+			return child_leaky;
+		}
+		AstNode* ParseState::pushChild(std::unique_ptr<AstNode> child) {
+			auto* child_leaky = saveChild(std::move(child));
+			ast_stack.push_back(child_leaky);
+			return child_leaky;
+		}
 
-	// only perform the renaming for the initialization, guard, and
-	// incrementation to enable proper shadowing of the synthetic localparam
-	std::function<void(AstNode*)> substitute = [&](AstNode *node) {
-		if (node->type == AST_IDENTIFIER && node->str == old_str)
-			node->str = new_str;
-		for (AstNode *child : node->children)
-			substitute(child);
+		void ParseState::addWiretypeNode(std::string *name, AstNode* node)
+		{
+			log_assert(node);
+			node->is_custom_type = true;
+			node->children.push_back(std::make_unique<AstNode>(AST_WIRETYPE));
+			node->children.back()->str = *name;
+			delete name;
+		}
+
+		void ParseState::addTypedefNode(std::string *name, std::unique_ptr<AstNode> node)
+		{
+			log_assert((bool)node);
+			AstNode* tnode = saveChild(std::make_unique<AstNode>(AST_TYPEDEF, std::move(node)));
+			log_assert((bool)name);
+			tnode->str = *name;
+			auto &user_types = user_type_stack.back();
+			user_types[*name] = tnode;
+			if (current_ast_mod && current_ast_mod->type == AST_PACKAGE) {
+				// typedef inside a package so we need the qualified name
+				auto qname = current_ast_mod->str + "::" + (*name).substr(1);
+				pkg_user_types[qname] = tnode;
+			}
+			delete name;
+		}
+
+		void ParseState::enterTypeScope()
+		{
+			user_type_stack.push_back(UserTypeMap());
+		}
+
+		void ParseState::exitTypeScope()
+		{
+			user_type_stack.pop_back();
+		}
+
+		bool ParseState::isInLocalScope(const std::string *name)
+		{
+			// tests if a name was declared in the current block scope
+			auto &user_types = user_type_stack.back();
+			return (user_types.count(*name) > 0);
+		}
+
+		// This transforms a loop like
+		//   for (genvar i = 0; i < 10; i++) begin : blk
+		// to
+		//   genvar _i;
+		//   for (_i = 0; _i < 10; _i++) begin : blk
+		//     localparam i = _i;
+		// where `_i` is actually some auto-generated name.
+		void ParseState::rewriteGenForDeclInit(AstNode *loop)
+		{
+			// check if this generate for loop contains an inline declaration
+			log_assert(loop->type == AST_GENFOR);
+			auto& decl = loop->children[0];
+			if (decl->type == AST_ASSIGN_EQ)
+				return;
+
+			log_assert(decl->type == AST_GENVAR);
+			log_assert(loop->children.size() == 5);
+
+			// identify each component of the loop
+			AstNode *init = loop->children[1].get();
+			AstNode *cond = loop->children[2].get();
+			AstNode *incr = loop->children[3].get();
+			AstNode *body = loop->children[4].get();
+			log_assert(init->type == AST_ASSIGN_EQ);
+			log_assert(incr->type == AST_ASSIGN_EQ);
+			log_assert(body->type == AST_GENBLOCK);
+
+			// create a unique name for the genvar
+			std::string old_str = decl->str;
+			std::string new_str = stringf("$genfordecl$%d$%s", autoidx++, old_str.c_str());
+
+			// rename and move the genvar declaration to the containing description
+			decl->str = new_str;
+			log_assert(current_ast_mod != nullptr);
+			current_ast_mod->children.push_back(std::move(decl));
+
+			// create a new localparam with old name so that the items in the loop
+			// can simply use the old name and shadow it as necessary
+			auto indirect = std::make_unique<AstNode>(AST_LOCALPARAM);
+			indirect->str = old_str;
+			auto ident = std::make_unique<AstNode>(AST_IDENTIFIER);
+			ident->str = new_str;
+			indirect->children.push_back(std::move(ident));
+
+			body->children.insert(body->children.begin(), std::move(indirect));
+
+			// only perform the renaming for the initialization, guard, and
+			// incrementation to enable proper shadowing of the synthetic localparam
+			std::function<void(AstNode*)> substitute = [&](AstNode *node) {
+				if (node->type == AST_IDENTIFIER && node->str == old_str)
+					node->str = new_str;
+				for (auto& child : node->children)
+					substitute(child.get());
+			};
+			substitute(init);
+			substitute(cond);
+			substitute(incr);
+			loop->children.erase(loop->children.begin());
+		}
+
+		void ParseState::ensureAsgnExprAllowed(const parser::location_type loc, bool sv_mode)
+		{
+			if (!sv_mode)
+				err_at_loc(loc, "Assignments within expressions are only supported in SystemVerilog mode.");
+			if (ast_stack.back()->type != AST_BLOCK)
+				err_at_loc(loc, "Assignments within expressions are only permitted within procedures.");
+		}
+
+		// add a pre/post-increment/decrement statement
+		const AstNode *ParseState::addIncOrDecStmt(dict<IdString, std::unique_ptr<AstNode>> *stmt_attr,
+							std::unique_ptr<AstNode> lhs,
+							dict<IdString, std::unique_ptr<AstNode>> *op_attr, AST::AstNodeType op,
+							frontend_verilog_yy::location begin, frontend_verilog_yy::location end)
+		{
+			auto one = AstNode::mkconst_int(1, true);
+			auto rhs = std::make_unique<AstNode>(op, lhs->clone(), std::move(one));
+			if (op_attr != nullptr)
+				append_attr(rhs.get(), op_attr);
+			auto stmt_owned = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(lhs), std::move(rhs));
+			auto* stmt = stmt_owned.get();
+			ast_stack.back()->children.push_back(std::move(stmt_owned));
+			SET_AST_NODE_LOC(stmt, begin, end);
+			if (stmt_attr != nullptr)
+				append_attr(stmt, stmt_attr);
+			return stmt;
+		}
+
+		// create a pre/post-increment/decrement expression, and add the corresponding statement
+		std::unique_ptr<AstNode> ParseState::addIncOrDecExpr(std::unique_ptr<AstNode> lhs, dict<IdString, std::unique_ptr<AstNode>> *attr, AST::AstNodeType op, frontend_verilog_yy::location begin, frontend_verilog_yy::location end, bool undo, bool sv_mode)
+		{
+			ensureAsgnExprAllowed(begin, sv_mode);
+			const AstNode *stmt = addIncOrDecStmt(nullptr, std::move(lhs), attr, op, begin, end);
+			log_assert(stmt->type == AST_ASSIGN_EQ);
+			auto expr = stmt->children[0]->clone();
+			if (undo) {
+				auto one = AstNode::mkconst_int(1, false, 1);
+				auto minus_one = std::make_unique<AstNode>(AST_NEG, std::move(one));
+				expr = std::make_unique<AstNode>(op, std::move(expr), std::move(minus_one));
+			}
+			SET_AST_NODE_LOC(expr.get(), begin, end);
+			return expr;
+		}
+
+		// add a binary operator assignment statement, e.g., a += b
+		std::unique_ptr<AstNode> ParseState::addAsgnBinopStmt(dict<IdString, std::unique_ptr<AstNode>> *attr, std::unique_ptr<AstNode> eq_lhs, AST::AstNodeType op, std::unique_ptr<AstNode> rhs, frontend_verilog_yy::location begin, frontend_verilog_yy::location end)
+		{
+			SET_AST_NODE_LOC(rhs.get(), end, end);
+			if (op == AST_SHIFT_LEFT || op == AST_SHIFT_RIGHT ||
+				op == AST_SHIFT_SLEFT || op == AST_SHIFT_SRIGHT) {
+				rhs = std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move(rhs));
+				SET_AST_NODE_LOC(rhs.get(), end, end);
+			}
+			auto binop_lhs = eq_lhs->clone();
+			auto eq_rhs_owned = std::make_unique<AstNode>(op, std::move(binop_lhs), std::move(rhs));
+			auto* eq_rhs = eq_rhs_owned.get();
+			auto ret_lhs = eq_lhs->clone();
+			auto stmt_owned = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(eq_lhs), std::move(eq_rhs_owned));
+			auto* stmt = stmt_owned.get();
+			SET_AST_NODE_LOC(eq_rhs, begin, end);
+			SET_AST_NODE_LOC(stmt, begin, end);
+			ast_stack.back()->children.push_back(std::move(stmt_owned));
+			if (attr != nullptr)
+				append_attr(stmt, attr);
+			return ret_lhs;
+		}
 	};
-	substitute(init);
-	substitute(cond);
-	substitute(incr);
-}
+	YOSYS_NAMESPACE_END
 
-static void ensureAsgnExprAllowed()
-{
-	if (!sv_mode)
-		frontend_verilog_yyerror("Assignments within expressions are only supported in SystemVerilog mode.");
-	if (ast_stack.back()->type != AST_BLOCK)
-		frontend_verilog_yyerror("Assignments within expressions are only permitted within procedures.");
-}
-
-// add a pre/post-increment/decrement statement
-static const AstNode *addIncOrDecStmt(dict<IdString, AstNode*> *stmt_attr, AstNode *lhs,
-				      dict<IdString, AstNode*> *op_attr, AST::AstNodeType op,
-				      YYLTYPE begin, YYLTYPE end)
-{
-	AstNode *one = AstNode::mkconst_int(1, true);
-	AstNode *rhs = new AstNode(op, lhs->clone(), one);
-	if (op_attr != nullptr)
-		append_attr(rhs, op_attr);
-	AstNode *stmt = new AstNode(AST_ASSIGN_EQ, lhs, rhs);
-	SET_AST_NODE_LOC(stmt, begin, end);
-	if (stmt_attr != nullptr)
-		append_attr(stmt, stmt_attr);
-	ast_stack.back()->children.push_back(stmt);
-	return stmt;
-}
-
-// create a pre/post-increment/decrement expression, and add the corresponding statement
-static AstNode *addIncOrDecExpr(AstNode *lhs, dict<IdString, AstNode*> *attr, AST::AstNodeType op, YYLTYPE begin, YYLTYPE end, bool undo)
-{
-	ensureAsgnExprAllowed();
-	const AstNode *stmt = addIncOrDecStmt(nullptr, lhs, attr, op, begin, end);
-	log_assert(stmt->type == AST_ASSIGN_EQ);
-	AstNode *expr = stmt->children[0]->clone();
-	if (undo) {
-		AstNode *one = AstNode::mkconst_int(1, false, 1);
-		AstNode *minus_one = new AstNode(AST_NEG, one);
-		expr = new AstNode(op, expr, minus_one);
+	void frontend_verilog_yy::parser::error(const frontend_verilog_yy::parser::location_type& loc, const std::string& msg)
+	{
+		err_at_loc(loc, "%s", msg.c_str());
 	}
-	SET_AST_NODE_LOC(expr, begin, end);
-	return expr;
+	// end unqual
 }
 
-// add a binary operator assignment statement, e.g., a += b
-static const AstNode *addAsgnBinopStmt(dict<IdString, AstNode*> *attr, AstNode *lhs, AST::AstNodeType op, AstNode *rhs, YYLTYPE begin, YYLTYPE end)
-{
-	SET_AST_NODE_LOC(rhs, end, end);
-	if (op == AST_SHIFT_LEFT || op == AST_SHIFT_RIGHT ||
-		op == AST_SHIFT_SLEFT || op == AST_SHIFT_SRIGHT) {
-		rhs = new AstNode(AST_TO_UNSIGNED, rhs);
-		SET_AST_NODE_LOC(rhs, end, end);
-	}
-	rhs = new AstNode(op, lhs->clone(), rhs);
-	AstNode *stmt = new AstNode(AST_ASSIGN_EQ, lhs, rhs);
-	SET_AST_NODE_LOC(rhs, begin, end);
-	SET_AST_NODE_LOC(stmt, begin, end);
-	ast_stack.back()->children.push_back(stmt);
-	if (attr != nullptr)
-		append_attr(stmt, attr);
-	return lhs;
-}
-
-%}
-
-%define api.prefix {frontend_verilog_yy}
-%define api.pure
-
-/* The union is defined in the header, so we need to provide all the
- * includes it requires
- */
 %code requires {
-#include <map>
-#include <string>
-#include "frontends/verilog/verilog_frontend.h"
+	// start requires
+	#include <map>
+	#include <string>
+	#include <memory>
+	#include "frontends/verilog/verilog_frontend.h"
+
+	struct specify_target {
+		char polarity_op;
+		std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode> dst, dat;
+		specify_target& operator=(specify_target&& other) noexcept {
+			if (this != &other) {
+				dst = std::move(other.dst);
+				dat = std::move(other.dat);
+				polarity_op = other.polarity_op;
+			}
+			return *this;
+		}
+	};
+
+	struct specify_triple {
+		std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode> t_min, t_avg, t_max;
+		specify_triple& operator=(specify_triple&& other) noexcept {
+			if (this != &other) {
+				t_min = std::move(other.t_min);
+				t_avg = std::move(other.t_avg);
+				t_max = std::move(other.t_max);
+			}
+			return *this;
+		}
+	};
+
+	struct specify_rise_fall {
+		specify_triple rise;
+		specify_triple fall;
+	};
+
+	using string_t = std::string *;
+	using ast_t = std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode>;
+	using al_t = YOSYS_NAMESPACE_PREFIX dict<YOSYS_NAMESPACE_PREFIX RTLIL::IdString, std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode>>*;
+	using specify_target_ptr_t = std::unique_ptr<struct specify_target>;
+	using specify_triple_ptr_t = std::unique_ptr<struct specify_triple>;
+	using specify_rise_fall_ptr_t = std::unique_ptr<struct specify_rise_fall>;
+	using boolean_t = bool;
+	using ch_t = char;
+	using integer_t = int;
+	using ast_node_type_t = YOSYS_NAMESPACE_PREFIX AST::AstNodeType;
+	// end requires
 }
 
-%union {
-	std::string *string;
-	struct YOSYS_NAMESPACE_PREFIX AST::AstNode *ast;
-	YOSYS_NAMESPACE_PREFIX dict<YOSYS_NAMESPACE_PREFIX RTLIL::IdString, YOSYS_NAMESPACE_PREFIX AST::AstNode*> *al;
-	struct specify_target *specify_target_ptr;
-	struct specify_triple *specify_triple_ptr;
-	struct specify_rise_fall *specify_rise_fall_ptr;
-	bool boolean;
-	char ch;
-	int integer;
-	YOSYS_NAMESPACE_PREFIX AST::AstNodeType ast_node_type;
-}
+%token <string_t> string_t "string"
+%token <ast_t> ast_t
+%token <al_t> al_t
+%token <specify_target_ptr_t> specify_target_ptr_t "specify target"
+%token <specify_triple_ptr_t> specify_triple_ptr_t "specify triple"
+%token <specify_rise_fall_ptr_t> specify_rise_fall_ptr_t "specify rise and fall"
+%token <boolean_t> boolean_t "boolean"
+%token <ch_t> ch_t "invalid token"
+%token <integer_t> integer_t "integer"
+%token <ast_node_type_t> ast_node_type_t
 
-%token <string> TOK_STRING TOK_ID TOK_CONSTVAL TOK_REALVAL TOK_PRIMITIVE
-%token <string> TOK_SVA_LABEL TOK_SPECIFY_OPER TOK_MSG_TASKS
-%token <string> TOK_BASE TOK_BASED_CONSTVAL TOK_UNBASED_UNSIZED_CONSTVAL
-%token <string> TOK_USER_TYPE TOK_PKG_USER_TYPE
+%token <string_t> TOK_STRING TOK_ID TOK_CONSTVAL TOK_REALVAL TOK_PRIMITIVE
+%token <string_t> TOK_SVA_LABEL TOK_SPECIFY_OPER TOK_MSG_TASKS
+%token <string_t> TOK_BASE TOK_BASED_CONSTVAL TOK_UNBASED_UNSIZED_CONSTVAL
+%token <string_t> TOK_USER_TYPE TOK_PKG_USER_TYPE
 %token TOK_ASSERT TOK_ASSUME TOK_RESTRICT TOK_COVER TOK_FINAL
 %token ATTR_BEGIN ATTR_END DEFATTR_BEGIN DEFATTR_END
 %token TOK_MODULE TOK_ENDMODULE TOK_PARAMETER TOK_LOCALPARAM TOK_DEFPARAM
@@ -420,41 +533,73 @@ static const AstNode *addAsgnBinopStmt(dict<IdString, AstNode*> *attr, AstNode *
 %token TOK_BIND TOK_TIME_SCALE
 %token TOK_IMPORT
 
-%type <ast> range range_or_multirange non_opt_range non_opt_multirange
-%type <ast> wire_type expr basic_expr concat_list rvalue lvalue lvalue_concat_list non_io_wire_type io_wire_type
-%type <string> opt_label opt_sva_label tok_prim_wrapper hierarchical_id hierarchical_type_id integral_number
-%type <string> type_name
-%type <ast> opt_enum_init enum_type struct_type enum_struct_type func_return_type typedef_base_type
-%type <boolean> opt_property always_comb_or_latch always_or_always_ff
-%type <boolean> opt_signedness_default_signed opt_signedness_default_unsigned
-%type <integer> integer_atom_type integer_vector_type
-%type <al> attr if_attr case_attr
-%type <ast> struct_union
-%type <ast_node_type> asgn_binop inc_or_dec_op
-%type <ast> genvar_identifier
+%token TOK_EXCL "'!'"
+%token TOK_HASH "'#'"
+%token TOK_PERC "'%'"
+%token TOK_AMP "'&'"
+%token TOK_LPAREN "'('"
+%token TOK_RPAREN "')'"
+%token TOK_ASTER "'*'"
+%token TOK_PLUS "'+'"
+%token TOK_COMMA "','"
+%token TOK_MINUS "'-'"
+%token TOK_DOT "'.'"
+%token TOK_SLASH "'/'"
+%token TOK_COL "':'"
+%token TOK_SEMICOL "';'"
+%token TOK_LT "'<'"
+%token TOK_EQ "'='"
+%token TOK_GT "'>'"
+%token TOK_QUE "'?'"
+%token TOK_AT "'@'"
+%token TOK_LBRA "'['"
+%token TOK_RBRA "']'"
+%token TOK_CARET "'^'"
+%token TOK_UNDER "'_'"
+%token TOK_LCURL "'{'"
+%token TOK_PIPE "'|'"
+%token TOK_RCURL "'}'"
+%token TOK_TILDE "'~'"
+%token TOK_n "'n'"
+%token TOK_p "'p'"
+%token TOK_x "'x'"
+%token TOK_z "'z'"
 
-%type <specify_target_ptr> specify_target
-%type <specify_triple_ptr> specify_triple specify_opt_triple
-%type <specify_rise_fall_ptr> specify_rise_fall
-%type <ast> specify_if specify_condition
-%type <ch> specify_edge
+%type <ast_t> range range_or_multirange non_opt_range non_opt_multirange
+%type <ast_t> wire_type expr basic_expr concat_list rvalue lvalue lvalue_concat_list non_io_wire_type io_wire_type
+%type <string_t> opt_label opt_sva_label tok_prim_wrapper hierarchical_id hierarchical_type_id integral_number
+%type <string_t> type_name
+%type <ast_t> opt_enum_init enum_type struct_type enum_struct_type func_return_type typedef_base_type
+%type <boolean_t> opt_property always_comb_or_latch always_or_always_ff
+%type <boolean_t> opt_signedness_default_signed opt_signedness_default_unsigned
+%type <integer_t> integer_atom_type integer_vector_type
+%type <al_t> attr if_attr case_attr
+%type <ast_t> struct_union
+%type <ast_node_type_t> asgn_binop inc_or_dec_op
+%type <ast_t> genvar_identifier
+
+%type <specify_target_ptr_t> specify_target
+%type <specify_triple_ptr_t> specify_triple specify_opt_triple
+%type <specify_rise_fall_ptr_t> specify_rise_fall
+%type <ast_t> specify_if specify_condition
+%type <ch_t> specify_edge
 
 // operator precedence from low to high
 %left OP_LOR
 %left OP_LAND
-%left '|' OP_NOR
-%left '^' OP_XNOR
-%left '&' OP_NAND
+%left TOK_PIPE OP_NOR
+%left TOK_CARET OP_XNOR
+%left TOK_AMP OP_NAND
 %left OP_EQ OP_NE OP_EQX OP_NEX
-%left '<' OP_LE OP_GE '>'
+%left TOK_LT OP_LE OP_GE TOK_GT
 %left OP_SHL OP_SHR OP_SSHL OP_SSHR
-%left '+' '-'
-%left '*' '/' '%'
+%left TOK_PLUS TOK_MINUS
+%left TOK_ASTER TOK_SLASH TOK_PERC
 %left OP_POW
 %precedence OP_CAST
 %precedence UNARY_OPS
 
-%define parse.error verbose
+%define parse.error detailed
 %define parse.lac full
 
 %precedence FAKE_THEN
@@ -466,15 +611,13 @@ static const AstNode *addAsgnBinopStmt(dict<IdString, AstNode*> *attr, AstNode *
 %%
 
 input: {
-	(void)frontend_verilog_yynerrs;
-	ast_stack.clear();
-	ast_stack.push_back(current_ast);
+	(void)yynerrs_;
+	extra->ast_stack.clear();
+	extra->ast_stack.push_back(extra->current_ast);
 } design {
-	ast_stack.pop_back();
-	log_assert(GetSize(ast_stack) == 0);
-	for (auto &it : default_attr_list)
-		delete it.second;
-	default_attr_list.clear();
+	extra->ast_stack.pop_back();
+	log_assert(GetSize(extra->ast_stack) == 0);
+	extra->default_attr_list.clear();
 };
 
 design:
@@ -492,18 +635,18 @@ design:
 
 attr:
 	{
-		if (attr_list != nullptr)
-			attr_list_stack.push(attr_list);
-		attr_list = new dict<IdString, AstNode*>;
-		for (auto &it : default_attr_list)
-			(*attr_list)[it.first] = it.second->clone();
+		if (extra->attr_list != nullptr)
+			extra->attr_list_stack.push(extra->attr_list);
+		extra->attr_list = new dict<IdString, std::unique_ptr<AstNode>>;
+		for (auto &it : extra->default_attr_list)
+			(*extra->attr_list)[it.first] = it.second->clone();
 	} attr_opt {
-		$$ = attr_list;
-		if (!attr_list_stack.empty()) {
-			attr_list = attr_list_stack.top();
-			attr_list_stack.pop();
+		$$ = extra->attr_list;
+		if (!extra->attr_list_stack.empty()) {
+			extra->attr_list = extra->attr_list_stack.top();
+			extra->attr_list_stack.pop();
 		} else
-			attr_list = nullptr;
+			extra->attr_list = nullptr;
 	};
 
 attr_opt:
@@ -514,20 +657,18 @@ attr_opt:
 
 defattr:
 	DEFATTR_BEGIN {
-		if (attr_list != nullptr)
-			attr_list_stack.push(attr_list);
-		attr_list = new dict<IdString, AstNode*>;
-		for (auto &it : default_attr_list)
-			delete it.second;
-		default_attr_list.clear();
+		if (extra->attr_list != nullptr)
+			extra->attr_list_stack.push(extra->attr_list);
+		extra->attr_list = new dict<IdString, std::unique_ptr<AstNode>>;
+		extra->default_attr_list.clear();
 	} opt_attr_list {
-		attr_list->swap(default_attr_list);
-		delete attr_list;
-		if (!attr_list_stack.empty()) {
-			attr_list = attr_list_stack.top();
-			attr_list_stack.pop();
+		extra->attr_list->swap(extra->default_attr_list);
+		delete extra->attr_list;
+		if (!extra->attr_list_stack.empty()) {
+			extra->attr_list = extra->attr_list_stack.top();
+			extra->attr_list_stack.pop();
 		} else
-			attr_list = nullptr;
+			extra->attr_list = nullptr;
 	} DEFATTR_END;
 
 opt_attr_list:
@@ -535,20 +676,14 @@ opt_attr_list:
 
 attr_list:
 	attr_assign |
-	attr_list ',' attr_assign;
+	attr_list TOK_COMMA attr_assign;
 
 attr_assign:
 	hierarchical_id {
-		if (attr_list->count(*$1) != 0)
-			delete (*attr_list)[*$1];
-		(*attr_list)[*$1] = AstNode::mkconst_int(1, false);
-		delete $1;
+		(*extra->attr_list)[*$1] = AstNode::mkconst_int(1, false);
 	} |
-	hierarchical_id '=' expr {
-		if (attr_list->count(*$1) != 0)
-			delete (*attr_list)[*$1];
-		(*attr_list)[*$1] = $3;
-		delete $1;
+	hierarchical_id TOK_EQ expr {
+		(*extra->attr_list)[*$1] = std::move($3);
 	};
 
 hierarchical_id:
@@ -560,170 +695,151 @@ hierarchical_id:
 			*$1 += "::" + $3->substr(1);
 		else
 			*$1 += "::" + *$3;
-		delete $3;
 		$$ = $1;
 	} |
-	hierarchical_id '.' TOK_ID {
+	hierarchical_id TOK_DOT TOK_ID {
 		if ($3->compare(0, 1, "\\") == 0)
 			*$1 += "." + $3->substr(1);
 		else
 			*$1 += "." + *$3;
-		delete $3;
 		$$ = $1;
 	};
 
 hierarchical_type_id:
 	TOK_USER_TYPE
 	| TOK_PKG_USER_TYPE				// package qualified type name
-	| '(' TOK_USER_TYPE ')'	{ $$ = $2; }		// non-standard grammar
+	| TOK_LPAREN TOK_USER_TYPE TOK_RPAREN	{ $$ = $2; }		// non-standard grammar
 	;
 
 module:
 	attr TOK_MODULE {
-		enterTypeScope();
+		extra->enterTypeScope();
 	} TOK_ID {
-		do_not_require_port_stubs = false;
-		AstNode *mod = new AstNode(AST_MODULE);
-		ast_stack.back()->children.push_back(mod);
-		ast_stack.push_back(mod);
-		current_ast_mod = mod;
-		port_stubs.clear();
-		port_counter = 0;
+		extra->do_not_require_port_stubs = false;
+		AstNode* mod = extra->pushChild(std::make_unique<AstNode>(AST_MODULE));
+		extra->current_ast_mod = mod;
+		extra->port_stubs.clear();
+		extra->port_counter = 0;
 		mod->str = *$4;
 		append_attr(mod, $1);
-	} module_para_opt module_args_opt ';' module_body TOK_ENDMODULE opt_label {
-		if (port_stubs.size() != 0)
-			frontend_verilog_yyerror("Missing details for module port `%s'.",
-					port_stubs.begin()->first.c_str());
-		SET_AST_NODE_LOC(ast_stack.back(), @2, @$);
-		ast_stack.pop_back();
-		log_assert(ast_stack.size() == 1);
-		checkLabelsMatch("Module name", $4, $11);
-		current_ast_mod = NULL;
-		delete $4;
-		delete $11;
-		exitTypeScope();
+	} module_para_opt module_args_opt TOK_SEMICOL module_body TOK_ENDMODULE opt_label {
+		if (extra->port_stubs.size() != 0)
+			lexer->err("Missing details for module port `%s'.",
+					extra->port_stubs.begin()->first.c_str());
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @$);
+		extra->ast_stack.pop_back();
+		log_assert(extra->ast_stack.size() == 1);
+		checkLabelsMatch(@11, "Module name", $4, $11);
+		extra->current_ast_mod = nullptr;
+		extra->exitTypeScope();
 	};
 
 module_para_opt:
-	'#' '(' { astbuf1 = nullptr; } module_para_list { if (astbuf1) delete astbuf1; } ')' | %empty;
+	TOK_HASH TOK_LPAREN module_para_list TOK_RPAREN | %empty;
 
 module_para_list:
-	single_module_para | module_para_list ',' single_module_para;
+	single_module_para | module_para_list TOK_COMMA single_module_para;
 
 single_module_para:
 	%empty |
 	attr TOK_PARAMETER {
-		if (astbuf1) delete astbuf1;
-		astbuf1 = new AstNode(AST_PARAMETER);
-		astbuf1->children.push_back(AstNode::mkconst_int(0, true));
-		append_attr(astbuf1, $1);
+		extra->astbuf1 = std::make_unique<AstNode>(AST_PARAMETER);
+		extra->astbuf1->children.push_back(AstNode::mkconst_int(0, true));
+		append_attr(extra->astbuf1.get(), $1);
 	} param_type single_param_decl |
 	attr TOK_LOCALPARAM {
-		if (astbuf1) delete astbuf1;
-		astbuf1 = new AstNode(AST_LOCALPARAM);
-		astbuf1->children.push_back(AstNode::mkconst_int(0, true));
-		append_attr(astbuf1, $1);
+		extra->astbuf1 = std::make_unique<AstNode>(AST_LOCALPARAM);
+		extra->astbuf1->children.push_back(AstNode::mkconst_int(0, true));
+		append_attr(extra->astbuf1.get(), $1);
 	} param_type single_param_decl |
 	single_param_decl;
 
 module_args_opt:
-	'(' ')' | %empty | '(' module_args optional_comma ')';
+	TOK_LPAREN TOK_RPAREN | %empty | TOK_LPAREN module_args optional_comma TOK_RPAREN;
 
 module_args:
-	module_arg | module_args ',' module_arg;
+	module_arg | module_args TOK_COMMA module_arg;
 
 optional_comma:
-	',' | %empty;
+	TOK_COMMA | %empty;
 
 module_arg_opt_assignment:
-	'=' expr {
-		if (ast_stack.back()->children.size() > 0 && ast_stack.back()->children.back()->type == AST_WIRE) {
-			if (ast_stack.back()->children.back()->is_input) {
-				AstNode *n = ast_stack.back()->children.back();
-				if (n->attributes.count(ID::defaultvalue))
-					delete n->attributes.at(ID::defaultvalue);
-				n->attributes[ID::defaultvalue] = $2;
+	TOK_EQ expr {
+		if (extra->ast_stack.back()->children.size() > 0 && extra->ast_stack.back()->children.back()->type == AST_WIRE) {
+			if (extra->ast_stack.back()->children.back()->is_input) {
+				auto& n = extra->ast_stack.back()->children.back();
+				n->attributes[ID::defaultvalue] = std::move($2);
 			} else {
-				AstNode *wire = new AstNode(AST_IDENTIFIER);
-				wire->str = ast_stack.back()->children.back()->str;
-				if (ast_stack.back()->children.back()->is_reg || ast_stack.back()->children.back()->is_logic)
-					ast_stack.back()->children.push_back(new AstNode(AST_INITIAL, new AstNode(AST_BLOCK, new AstNode(AST_ASSIGN_LE, wire, $2))));
+				auto wire = std::make_unique<AstNode>(AST_IDENTIFIER);
+				wire->str = extra->ast_stack.back()->children.back()->str;
+				if (extra->ast_stack.back()->children.back()->is_reg || extra->ast_stack.back()->children.back()->is_logic)
+					extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_INITIAL, std::make_unique<AstNode>(AST_BLOCK, std::make_unique<AstNode>(AST_ASSIGN_LE, std::move(wire), std::move($2)))));
 				else
-					ast_stack.back()->children.push_back(new AstNode(AST_ASSIGN, wire, $2));
+					extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_ASSIGN, std::move(wire), std::move($2)));
 			}
 		} else
-			frontend_verilog_yyerror("SystemVerilog interface in module port list cannot have a default value.");
+			lexer->err("SystemVerilog interface in module port list cannot have a default value.");
 	} |
 	%empty;
 
 module_arg:
 	TOK_ID {
-		if (ast_stack.back()->children.size() > 0 && ast_stack.back()->children.back()->type == AST_WIRE) {
-			AstNode *node = ast_stack.back()->children.back()->clone();
+		if (extra->ast_stack.back()->children.size() > 0 && extra->ast_stack.back()->children.back()->type == AST_WIRE) {
+			auto node = extra->ast_stack.back()->children.back()->clone();
 			node->str = *$1;
-			node->port_id = ++port_counter;
-			ast_stack.back()->children.push_back(node);
-			SET_AST_NODE_LOC(node, @1, @1);
+			node->port_id = ++extra->port_counter;
+			SET_AST_NODE_LOC(node.get(), @1, @1);
+			extra->ast_stack.back()->children.push_back(std::move(node));
 		} else {
-			if (port_stubs.count(*$1) != 0)
-				frontend_verilog_yyerror("Duplicate module port `%s'.", $1->c_str());
-			port_stubs[*$1] = ++port_counter;
+			if (extra->port_stubs.count(*$1) != 0)
+				lexer->err("Duplicate module port `%s'.", $1->c_str());
+			extra->port_stubs[*$1] = ++extra->port_counter;
 		}
-		delete $1;
 	} module_arg_opt_assignment |
 	TOK_ID {
-		astbuf1 = new AstNode(AST_INTERFACEPORT);
-		astbuf1->children.push_back(new AstNode(AST_INTERFACEPORTTYPE));
-		astbuf1->children[0]->str = *$1;
-		delete $1;
+		extra->astbuf1 = std::make_unique<AstNode>(AST_INTERFACEPORT);
+		extra->astbuf1->children.push_back(std::make_unique<AstNode>(AST_INTERFACEPORTTYPE));
+		extra->astbuf1->children[0]->str = *$1;
 	} TOK_ID {  /* SV interfaces */
-		if (!sv_mode)
-			frontend_verilog_yyerror("Interface found in port list (%s). This is not supported unless read_verilog is called with -sv!", $3->c_str());
-		astbuf2 = astbuf1->clone(); // really only needed if multiple instances of same type.
-		astbuf2->str = *$3;
-		delete $3;
-		astbuf2->port_id = ++port_counter;
-		ast_stack.back()->children.push_back(astbuf2);
-		delete astbuf1; // really only needed if multiple instances of same type.
+		if (!mode->sv)
+			lexer->err("Interface found in port list (%s). This is not supported unless read_verilog is called with -sv!", $3->c_str());
+		extra->astbuf2 = extra->astbuf1->clone(); // really only needed if multiple instances of same type.
+		extra->astbuf2->str = *$3;
+		extra->astbuf2->port_id = ++extra->port_counter;
+		extra->ast_stack.back()->children.push_back(std::move(extra->astbuf2));
 	} module_arg_opt_assignment |
 	attr wire_type range_or_multirange TOK_ID {
-		AstNode *node = $2;
+		auto node = std::move($2);
 		node->str = *$4;
-		SET_AST_NODE_LOC(node, @4, @4);
-		node->port_id = ++port_counter;
-		AstNode *range = checkRange(node, $3);
-		if (range != NULL)
-			node->children.push_back(range);
+		SET_AST_NODE_LOC(node.get(), @4, @4);
+		node->port_id = ++extra->port_counter;
+		auto range = checkRange(node.get(), std::move($3));
+		if (range != nullptr)
+			node->children.push_back(std::move(range));
 		if (!node->is_input && !node->is_output)
-			frontend_verilog_yyerror("Module port `%s' is neither input nor output.", $4->c_str());
-		if (node->is_reg && node->is_input && !node->is_output && !sv_mode)
-			frontend_verilog_yyerror("Input port `%s' is declared as register.", $4->c_str());
-		ast_stack.back()->children.push_back(node);
-		append_attr(node, $1);
-		delete $4;
+			lexer->err("Module port `%s' is neither input nor output.", $4->c_str());
+		if (node->is_reg && node->is_input && !node->is_output && !mode->sv)
+			lexer->err("Input port `%s' is declared as register.", $4->c_str());
+		append_attr(node.get(), $1);
+		extra->ast_stack.back()->children.push_back(std::move(node));
 	} module_arg_opt_assignment |
-	'.' '.' '.' {
-		do_not_require_port_stubs = true;
+	TOK_DOT TOK_DOT TOK_DOT {
+		extra->do_not_require_port_stubs = true;
 	};
 
 package:
 	attr TOK_PACKAGE {
-		enterTypeScope();
+		extra->enterTypeScope();
 	} TOK_ID {
-		AstNode *mod = new AstNode(AST_PACKAGE);
-		ast_stack.back()->children.push_back(mod);
-		ast_stack.push_back(mod);
-		current_ast_mod = mod;
+		AstNode* mod = extra->pushChild(std::make_unique<AstNode>(AST_PACKAGE));
+		extra->current_ast_mod = mod;
 		mod->str = *$4;
 		append_attr(mod, $1);
-	} ';' package_body TOK_ENDPACKAGE opt_label {
-		ast_stack.pop_back();
-		checkLabelsMatch("Package name", $4, $9);
-		current_ast_mod = NULL;
-		delete $4;
-		delete $9;
-		exitTypeScope();
+	} TOK_SEMICOL package_body TOK_ENDPACKAGE opt_label {
+		extra->ast_stack.pop_back();
+		checkLabelsMatch(@9, "Package name", $4, $9);
+		extra->current_ast_mod = nullptr;
+		extra->exitTypeScope();
 	};
 
 package_body:
@@ -743,25 +859,22 @@ import_stmt:
 
 interface:
 	TOK_INTERFACE {
-		enterTypeScope();
+		extra->enterTypeScope();
 	} TOK_ID {
-		do_not_require_port_stubs = false;
-		AstNode *intf = new AstNode(AST_INTERFACE);
-		ast_stack.back()->children.push_back(intf);
-		ast_stack.push_back(intf);
-		current_ast_mod = intf;
-		port_stubs.clear();
-		port_counter = 0;
+		extra->do_not_require_port_stubs = false;
+		AstNode* intf = extra->pushChild(std::make_unique<AstNode>(AST_INTERFACE));
+		extra->current_ast_mod = intf;
+		extra->port_stubs.clear();
+		extra->port_counter = 0;
 		intf->str = *$3;
-		delete $3;
-	} module_para_opt module_args_opt ';' interface_body TOK_ENDINTERFACE {
-		if (port_stubs.size() != 0)
-			frontend_verilog_yyerror("Missing details for module port `%s'.",
-				port_stubs.begin()->first.c_str());
-		ast_stack.pop_back();
-		log_assert(ast_stack.size() == 1);
-		current_ast_mod = NULL;
-		exitTypeScope();
+	} module_para_opt module_args_opt TOK_SEMICOL interface_body TOK_ENDINTERFACE {
+		if (extra->port_stubs.size() != 0)
+			lexer->err("Missing details for module port `%s'.",
+				extra->port_stubs.begin()->first.c_str());
+		extra->ast_stack.pop_back();
+		log_assert(extra->ast_stack.size() == 1);
+		extra->current_ast_mod = nullptr;
+		extra->exitTypeScope();
 	};
 
 interface_body:
@@ -773,27 +886,24 @@ interface_body_stmt:
 
 bind_directive:
 	TOK_BIND {
-		AstNode *bnode = new AstNode(AST_BIND);
-		ast_stack.back()->children.push_back(bnode);
-		ast_stack.push_back(bnode);
+		(void)extra->pushChild(std::make_unique<AstNode>(AST_BIND));
 	}
 	bind_target {
 		// bind_target should have added at least one child
-		log_assert(ast_stack.back()->children.size() >= 1);
+		log_assert(extra->ast_stack.back()->children.size() >= 1);
 	}
 	TOK_ID {
-		// The single_cell parser in cell_list_no_array uses astbuf1 as
+		// The single_cell parser in cell_list_no_array uses extra->astbuf1 as
 		// a sort of template for constructing cells.
-		astbuf1 = new AstNode(AST_CELL);
-		astbuf1->children.push_back(new AstNode(AST_CELLTYPE));
-		astbuf1->children[0]->str = *$5;
-		delete $5;
+		extra->astbuf1 = std::make_unique<AstNode>(AST_CELL);
+		extra->astbuf1->children.push_back(std::make_unique<AstNode>(AST_CELLTYPE));
+		extra->astbuf1->children[0]->str = *$5;
 	}
-	cell_parameter_list_opt cell_list_no_array ';' {
+	cell_parameter_list_opt cell_list_no_array TOK_SEMICOL {
 		// cell_list should have added at least one more child
-		log_assert(ast_stack.back()->children.size() >= 2);
-		delete astbuf1;
-		ast_stack.pop_back();
+		log_assert(extra->ast_stack.back()->children.size() >= 2);
+		(void)extra->astbuf1.reset();
+		extra->ast_stack.pop_back();
 	};
 
 // bind_target matches the target of the bind (everything before
@@ -802,7 +912,7 @@ bind_directive:
 // We can't use the BNF from the spec directly because it's ambiguous:
 // something like "bind foo bar_i (.*)" can either be interpreted with "foo" as
 // a module or interface identifier (matching bind_target_scope in the spec) or
-// by considering foo as a degenerate hierarchical identifier with no '.'
+// by considering foo as a degenerate hierarchical identifier with no TOK_DOT
 // characters, followed by no bit select (which matches bind_target_instance in
 // the spec).
 //
@@ -814,82 +924,81 @@ bind_target:
 // An optional list of target instances for a bind statement, introduced by a
 // colon.
 opt_bind_target_instance_list:
-	':' bind_target_instance_list |
+	TOK_COL bind_target_instance_list |
 	%empty;
 
 bind_target_instance_list:
 	bind_target_instance |
-	bind_target_instance_list ',' bind_target_instance;
+	bind_target_instance_list TOK_COMMA bind_target_instance;
 
-// A single target instance for a bind statement. The top of ast_stack will be
+// A single target instance for a bind statement. The top of extra->ast_stack will be
 // the bind node where we should add it.
 bind_target_instance:
 	hierarchical_id {
-		auto *node = new AstNode(AST_IDENTIFIER);
+		auto node = std::make_unique<AstNode>(AST_IDENTIFIER);
 		node->str = *$1;
-		delete $1;
-		ast_stack.back()->children.push_back(node);
+		extra->ast_stack.back()->children.push_back(std::move(node));
 	};
 
 mintypmax_expr:
-	expr { delete $1; } |
-	expr ':' expr ':' expr { delete $1; delete $3; delete $5; };
+	expr { } |
+	expr TOK_COL expr TOK_COL expr { };
 
 non_opt_delay:
-	'#' TOK_ID { delete $2; } |
-	'#' TOK_CONSTVAL { delete $2; } |
-	'#' TOK_REALVAL { delete $2; } |
+	TOK_HASH TOK_ID { } |
+	TOK_HASH TOK_CONSTVAL { } |
+	TOK_HASH TOK_REALVAL { } |
 	// our `expr` doesn't have time_scale, so we need the parenthesized variant
-	'#' TOK_TIME_SCALE |
-	'#' '(' TOK_TIME_SCALE ')' |
-	'#' '(' mintypmax_expr ')' |
-	'#' '(' mintypmax_expr ',' mintypmax_expr ')' |
-	'#' '(' mintypmax_expr ',' mintypmax_expr ',' mintypmax_expr ')';
+	TOK_HASH TOK_TIME_SCALE |
+	TOK_HASH TOK_LPAREN TOK_TIME_SCALE TOK_RPAREN |
+	TOK_HASH TOK_LPAREN mintypmax_expr TOK_RPAREN |
+	TOK_HASH TOK_LPAREN mintypmax_expr TOK_COMMA mintypmax_expr TOK_RPAREN |
+	TOK_HASH TOK_LPAREN mintypmax_expr TOK_COMMA mintypmax_expr TOK_COMMA mintypmax_expr TOK_RPAREN;
 
 delay:
 	non_opt_delay | %empty;
 
 io_wire_type:
-	{ astbuf3 = new AstNode(AST_WIRE); current_wire_rand = false; current_wire_const = false; }
+	{ extra->astbuf3 = std::make_unique<AstNode>(AST_WIRE); extra->current_wire_rand = false; extra->current_wire_const = false; }
 	wire_type_token_io wire_type_const_rand opt_wire_type_token wire_type_signedness
-	{ $$ = astbuf3; SET_RULE_LOC(@$, @2, @$); };
+	{ $$ = std::move(extra->astbuf3); SET_RULE_LOC(@$, @2, @$); };
 
 non_io_wire_type:
-	{ astbuf3 = new AstNode(AST_WIRE); current_wire_rand = false; current_wire_const = false; }
+	{ extra->astbuf3 = std::make_unique<AstNode>(AST_WIRE); extra->current_wire_rand = false; extra->current_wire_const = false; }
 	wire_type_const_rand wire_type_token wire_type_signedness
-	{ $$ = astbuf3; SET_RULE_LOC(@$, @2, @$); };
+	{ $$ = std::move(extra->astbuf3); SET_RULE_LOC(@$, @2, @$); };
 
 wire_type:
-	io_wire_type  |
-	non_io_wire_type;
+	io_wire_type { $$ = std::move($1); }  |
+	non_io_wire_type { $$ = std::move($1); };
 
 wire_type_token_io:
 	TOK_INPUT {
-		astbuf3->is_input = true;
+		extra->astbuf3->is_input = true;
 	} |
 	TOK_OUTPUT {
-		astbuf3->is_output = true;
+		extra->astbuf3->is_output = true;
 	} |
 	TOK_INOUT {
-		astbuf3->is_input = true;
-		astbuf3->is_output = true;
+		extra->astbuf3->is_input = true;
+		extra->astbuf3->is_output = true;
 	};
 
 wire_type_signedness:
-	TOK_SIGNED   { astbuf3->is_signed = true;  } |
-	TOK_UNSIGNED { astbuf3->is_signed = false; } |
+	TOK_SIGNED   { extra->astbuf3->is_signed = true;  } |
+	TOK_UNSIGNED { extra->astbuf3->is_signed = false; } |
 	%empty;
 
 wire_type_const_rand:
 	TOK_RAND TOK_CONST {
-	    current_wire_rand = true;
-	    current_wire_const = true;
+	    extra->current_wire_rand = true;
+	    extra->current_wire_const = true;
 	} |
 	TOK_CONST {
-	    current_wire_const = true;
+	    extra->current_wire_const = true;
 	} |
 	TOK_RAND {
-	    current_wire_rand = true;
+	    extra->current_wire_rand = true;
 	} |
 	%empty;
 
@@ -904,35 +1013,35 @@ wire_type_token:
 	} |
 	// regs
 	TOK_REG {
-		astbuf3->is_reg = true;
+		extra->astbuf3->is_reg = true;
 	} |
 	TOK_VAR TOK_REG {
-		astbuf3->is_reg = true;
+		extra->astbuf3->is_reg = true;
 	} |
 	// logics
 	TOK_VAR {
-		astbuf3->is_logic = true;
+		extra->astbuf3->is_logic = true;
 	} |
 	TOK_VAR logic_type {
-		astbuf3->is_logic = true;
+		extra->astbuf3->is_logic = true;
 	} |
 	logic_type {
-		astbuf3->is_logic = true;
+		extra->astbuf3->is_logic = true;
 	} |
 	TOK_GENVAR {
-		astbuf3->type = AST_GENVAR;
-		astbuf3->is_reg = true;
-		astbuf3->is_signed = true;
-		astbuf3->range_left = 31;
-		astbuf3->range_right = 0;
+		extra->astbuf3->type = AST_GENVAR;
+		extra->astbuf3->is_reg = true;
+		extra->astbuf3->is_signed = true;
+		extra->astbuf3->range_left = 31;
+		extra->astbuf3->range_right = 0;
 	};
 
 net_type:
 	TOK_WOR {
-		astbuf3->is_wor = true;
+		extra->astbuf3->is_wor = true;
 	} |
 	TOK_WAND {
-		astbuf3->is_wand = true;
+		extra->astbuf3->is_wand = true;
 	} |
 	TOK_WIRE;
 
@@ -940,12 +1049,12 @@ logic_type:
 	TOK_LOGIC {
 	} |
 	integer_atom_type {
-		astbuf3->range_left = $1 - 1;
-		astbuf3->range_right = 0;
-		astbuf3->is_signed = true;
+		extra->astbuf3->range_left = $1 - 1;
+		extra->astbuf3->range_right = 0;
+		extra->astbuf3->is_signed = true;
 	} |
 	hierarchical_type_id {
-		addWiretypeNode($1, astbuf3);
+		extra->addWiretypeNode($1, extra->astbuf3.get());
 	};
 
 integer_atom_type:
@@ -956,59 +1065,59 @@ integer_atom_type:
 	TOK_BYTE	{ $$ =  8; } ;
 
 integer_vector_type:
-	TOK_LOGIC { $$ = TOK_LOGIC; } |
-	TOK_REG   { $$ = TOK_REG; } ;
+	TOK_LOGIC { $$ = token::TOK_LOGIC; } |
+	TOK_REG   { $$ = token::TOK_REG; } ;
 
 non_opt_range:
-	'[' expr ':' expr ']' {
-		$$ = new AstNode(AST_RANGE);
-		$$->children.push_back($2);
-		$$->children.push_back($4);
+	TOK_LBRA expr TOK_COL expr TOK_RBRA {
+		$$ = std::make_unique<AstNode>(AST_RANGE);
+		$$->children.push_back(std::move($2));
+		$$->children.push_back(std::move($4));
 	} |
-	'[' expr TOK_POS_INDEXED expr ']' {
-		$$ = new AstNode(AST_RANGE);
-		AstNode *expr = new AstNode(AST_SELFSZ, $2);
-		$$->children.push_back(new AstNode(AST_SUB, new AstNode(AST_ADD, expr->clone(), $4), AstNode::mkconst_int(1, true)));
-		$$->children.push_back(new AstNode(AST_ADD, expr, AstNode::mkconst_int(0, true)));
+	TOK_LBRA expr TOK_POS_INDEXED expr TOK_RBRA {
+		$$ = std::make_unique<AstNode>(AST_RANGE);
+		auto expr = std::make_unique<AstNode>(AST_SELFSZ, std::move($2));
+		$$->children.push_back(std::make_unique<AstNode>(AST_SUB, std::make_unique<AstNode>(AST_ADD, expr->clone(), std::move($4)), AstNode::mkconst_int(1, true)));
+		$$->children.push_back(std::make_unique<AstNode>(AST_ADD, std::move(expr), AstNode::mkconst_int(0, true)));
 	} |
-	'[' expr TOK_NEG_INDEXED expr ']' {
-		$$ = new AstNode(AST_RANGE);
-		AstNode *expr = new AstNode(AST_SELFSZ, $2);
-		$$->children.push_back(new AstNode(AST_ADD, expr, AstNode::mkconst_int(0, true)));
-		$$->children.push_back(new AstNode(AST_SUB, new AstNode(AST_ADD, expr->clone(), AstNode::mkconst_int(1, true)), $4));
+	TOK_LBRA expr TOK_NEG_INDEXED expr TOK_RBRA {
+		$$ = std::make_unique<AstNode>(AST_RANGE);
+		auto expr = std::make_unique<AstNode>(AST_SELFSZ, std::move($2));
+		$$->children.push_back(std::make_unique<AstNode>(AST_ADD, expr->clone(), AstNode::mkconst_int(0, true)));
+		$$->children.push_back(std::make_unique<AstNode>(AST_SUB, std::make_unique<AstNode>(AST_ADD, std::move(expr), AstNode::mkconst_int(1, true)), std::move($4)));
 	} |
-	'[' expr ']' {
-		$$ = new AstNode(AST_RANGE);
-		$$->children.push_back($2);
+	TOK_LBRA expr TOK_RBRA {
+		$$ = std::make_unique<AstNode>(AST_RANGE);
+		$$->children.push_back(std::move($2));
 	};
 
 non_opt_multirange:
 	non_opt_range non_opt_range {
-		$$ = new AstNode(AST_MULTIRANGE, $1, $2);
+		$$ = std::make_unique<AstNode>(AST_MULTIRANGE, std::move($1), std::move($2));
 	} |
 	non_opt_multirange non_opt_range {
-		$$ = $1;
-		$$->children.push_back($2);
+		$$ = std::move($1);
+		$$->children.push_back(std::move($2));
 	};
 
 range:
 	non_opt_range {
-		$$ = $1;
+		$$ = std::move($1);
 	} |
 	%empty {
-		$$ = NULL;
+		$$ = nullptr;
 	};
 
 range_or_multirange:
-	range { $$ = $1; } |
-	non_opt_multirange { $$ = $1; };
+	range { $$ = std::move($1); } |
+	non_opt_multirange { $$ = std::move($1); };
 
 module_body:
 	module_body module_body_stmt |
 	/* the following line makes the generate..endgenrate keywords optional */
 	module_body gen_stmt |
 	module_body gen_block |
-	module_body ';' |
+	module_body TOK_SEMICOL |
 	%empty;
 
 module_body_stmt:
@@ -1017,61 +1126,43 @@ module_body_stmt:
 	always_stmt | TOK_GENERATE module_gen_body TOK_ENDGENERATE | defattr | assert_property | checker_decl | ignored_specify_block;
 
 checker_decl:
-	TOK_CHECKER TOK_ID ';' {
-		AstNode *node = new AstNode(AST_GENBLOCK);
+	TOK_CHECKER TOK_ID TOK_SEMICOL {
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_GENBLOCK));
 		node->str = *$2;
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
 	} module_body TOK_ENDCHECKER {
-		delete $2;
-		ast_stack.pop_back();
+		extra->ast_stack.pop_back();
 	};
 
 task_func_decl:
 	attr TOK_DPI_FUNCTION TOK_ID TOK_ID {
-		current_function_or_task = new AstNode(AST_DPI_FUNCTION, AstNode::mkconst_str(*$3), AstNode::mkconst_str(*$4));
-		current_function_or_task->str = *$4;
-		append_attr(current_function_or_task, $1);
-		ast_stack.back()->children.push_back(current_function_or_task);
-		delete $3;
-		delete $4;
-	} opt_dpi_function_args ';' {
-		current_function_or_task = NULL;
+		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(AST_DPI_FUNCTION, AstNode::mkconst_str(*$3), AstNode::mkconst_str(*$4)));
+		extra->current_function_or_task->str = *$4;
+		append_attr(extra->current_function_or_task, $1);
+	} opt_dpi_function_args TOK_SEMICOL {
+		extra->current_function_or_task = nullptr;
 	} |
-	attr TOK_DPI_FUNCTION TOK_ID '=' TOK_ID TOK_ID {
-		current_function_or_task = new AstNode(AST_DPI_FUNCTION, AstNode::mkconst_str(*$5), AstNode::mkconst_str(*$3));
-		current_function_or_task->str = *$6;
-		append_attr(current_function_or_task, $1);
-		ast_stack.back()->children.push_back(current_function_or_task);
-		delete $3;
-		delete $5;
-		delete $6;
-	} opt_dpi_function_args ';' {
-		current_function_or_task = NULL;
+	attr TOK_DPI_FUNCTION TOK_ID TOK_EQ TOK_ID TOK_ID {
+		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(AST_DPI_FUNCTION, AstNode::mkconst_str(*$5), AstNode::mkconst_str(*$3)));
+		extra->current_function_or_task->str = *$6;
+		append_attr(extra->current_function_or_task, $1);
+	} opt_dpi_function_args TOK_SEMICOL {
+		extra->current_function_or_task = nullptr;
 	} |
-	attr TOK_DPI_FUNCTION TOK_ID ':' TOK_ID '=' TOK_ID TOK_ID {
-		current_function_or_task = new AstNode(AST_DPI_FUNCTION, AstNode::mkconst_str(*$7), AstNode::mkconst_str(*$3 + ":" + RTLIL::unescape_id(*$5)));
-		current_function_or_task->str = *$8;
-		append_attr(current_function_or_task, $1);
-		ast_stack.back()->children.push_back(current_function_or_task);
-		delete $3;
-		delete $5;
-		delete $7;
-		delete $8;
-	} opt_dpi_function_args ';' {
-		current_function_or_task = NULL;
+	attr TOK_DPI_FUNCTION TOK_ID TOK_COL TOK_ID TOK_EQ TOK_ID TOK_ID {
+		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(AST_DPI_FUNCTION, AstNode::mkconst_str(*$7), AstNode::mkconst_str(*$3 + ":" + RTLIL::unescape_id(*$5))));
+		extra->current_function_or_task->str = *$8;
+		append_attr(extra->current_function_or_task, $1);
+	} opt_dpi_function_args TOK_SEMICOL {
+		extra->current_function_or_task = nullptr;
 	} |
 	attr TOK_TASK opt_automatic TOK_ID {
-		current_function_or_task = new AstNode(AST_TASK);
-		current_function_or_task->str = *$4;
-		append_attr(current_function_or_task, $1);
-		ast_stack.back()->children.push_back(current_function_or_task);
-		ast_stack.push_back(current_function_or_task);
-		current_function_or_task_port_id = 1;
-		delete $4;
-	} task_func_args_opt ';' task_func_body TOK_ENDTASK {
-		current_function_or_task = NULL;
-		ast_stack.pop_back();
+		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(AST_TASK));
+		extra->current_function_or_task->str = *$4;
+		append_attr(extra->current_function_or_task, $1);
+		extra->current_function_or_task_port_id = 1;
+	} task_func_args_opt TOK_SEMICOL task_func_body TOK_ENDTASK {
+		extra->current_function_or_task = nullptr;
+		extra->ast_stack.pop_back();
 	} |
 	attr TOK_FUNCTION opt_automatic TOK_VOID TOK_ID {
 		// The difference between void functions and tasks is that
@@ -1079,52 +1170,45 @@ task_func_decl:
 		// inlined, but ignores signals read only in tasks. This only matters
 		// for event based simulation, and for synthesis we can treat a void
 		// function like a task.
-		current_function_or_task = new AstNode(AST_TASK);
-		current_function_or_task->str = *$5;
-		append_attr(current_function_or_task, $1);
-		ast_stack.back()->children.push_back(current_function_or_task);
-		ast_stack.push_back(current_function_or_task);
-		current_function_or_task_port_id = 1;
-		delete $5;
-	} task_func_args_opt ';' task_func_body TOK_ENDFUNCTION {
-		current_function_or_task = NULL;
-		ast_stack.pop_back();
+		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(AST_TASK));
+		extra->current_function_or_task->str = *$5;
+		append_attr(extra->current_function_or_task, $1);
+		extra->current_function_or_task_port_id = 1;
+	} task_func_args_opt TOK_SEMICOL task_func_body TOK_ENDFUNCTION {
+		extra->current_function_or_task = nullptr;
+		extra->ast_stack.pop_back();
 	} |
 	attr TOK_FUNCTION opt_automatic func_return_type TOK_ID {
-		current_function_or_task = new AstNode(AST_FUNCTION);
-		current_function_or_task->str = *$5;
-		append_attr(current_function_or_task, $1);
-		ast_stack.back()->children.push_back(current_function_or_task);
-		ast_stack.push_back(current_function_or_task);
-		AstNode *outreg = new AstNode(AST_WIRE);
+		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(AST_FUNCTION));
+		extra->current_function_or_task->str = *$5;
+		append_attr(extra->current_function_or_task, $1);
+		auto outreg = std::make_unique<AstNode>(AST_WIRE);
 		outreg->str = *$5;
 		outreg->is_signed = false;
 		outreg->is_reg = true;
-		if ($4 != NULL) {
-			outreg->children.push_back($4);
+		if ($4 != nullptr) {
 			outreg->is_signed = $4->is_signed;
 			$4->is_signed = false;
 			outreg->is_custom_type = $4->type == AST_WIRETYPE;
+			outreg->children.push_back(std::move($4));
 		}
-		current_function_or_task->children.push_back(outreg);
-		current_function_or_task_port_id = 1;
-		delete $5;
-	} task_func_args_opt ';' task_func_body TOK_ENDFUNCTION {
-		current_function_or_task = NULL;
-		ast_stack.pop_back();
+		extra->current_function_or_task->children.push_back(std::move(outreg));
+		extra->current_function_or_task_port_id = 1;
+	} task_func_args_opt TOK_SEMICOL task_func_body TOK_ENDFUNCTION {
+		extra->current_function_or_task = nullptr;
+		extra->ast_stack.pop_back();
 	};
 
 func_return_type:
 	hierarchical_type_id {
-		$$ = new AstNode(AST_WIRETYPE);
+		$$ = std::make_unique<AstNode>(AST_WIRETYPE);
 		$$->str = *$1;
-		delete $1;
 	} |
 	opt_type_vec opt_signedness_default_unsigned {
 		$$ = makeRange(0, 0, $2);
 	} |
 	opt_type_vec opt_signedness_default_unsigned non_opt_range {
-		$$ = $3;
+		$$ = std::move($3);
 		$$->is_signed = $2;
 	} |
 	integer_atom_type opt_signedness_default_signed {
@@ -1150,22 +1234,19 @@ opt_signedness_default_unsigned:
 
 dpi_function_arg:
 	TOK_ID TOK_ID {
-		current_function_or_task->children.push_back(AstNode::mkconst_str(*$1));
-		delete $1;
-		delete $2;
+		extra->current_function_or_task->children.push_back(AstNode::mkconst_str(*$1));
 	} |
 	TOK_ID {
-		current_function_or_task->children.push_back(AstNode::mkconst_str(*$1));
-		delete $1;
+		extra->current_function_or_task->children.push_back(AstNode::mkconst_str(*$1));
 	};
 
 opt_dpi_function_args:
-	'(' dpi_function_args ')' |
+	TOK_LPAREN dpi_function_args TOK_RPAREN |
 	%empty;
 
 dpi_function_args:
-	dpi_function_args ',' dpi_function_arg |
-	dpi_function_args ',' |
+	dpi_function_args TOK_COMMA dpi_function_arg |
+	dpi_function_args TOK_COMMA |
 	dpi_function_arg |
 	%empty;
 
@@ -1174,52 +1255,52 @@ opt_automatic:
 	%empty;
 
 task_func_args_opt:
-	'(' ')' | %empty | '(' {
-		albuf = nullptr;
-		astbuf1 = nullptr;
-		astbuf2 = nullptr;
+	TOK_LPAREN TOK_RPAREN | %empty | TOK_LPAREN {
+		extra->albuf = nullptr;
+		extra->astbuf1 = nullptr;
+		extra->astbuf2 = nullptr;
 	} task_func_args optional_comma {
-		delete astbuf1;
-		if (astbuf2 != NULL)
-			delete astbuf2;
-		free_attr(albuf);
-	} ')';
+		(void)extra->astbuf1.reset();
+		if (extra->astbuf2 != nullptr)
+			(void)extra->astbuf2.reset();
+		free_attr(extra->albuf);
+	} TOK_RPAREN;
 
 task_func_args:
-	task_func_port | task_func_args ',' task_func_port;
+	task_func_port | task_func_args TOK_COMMA task_func_port;
 
 task_func_port:
 	attr wire_type range_or_multirange {
 		bool prev_was_input = true;
 		bool prev_was_output = false;
-		if (albuf) {
-			prev_was_input = astbuf1->is_input;
-			prev_was_output = astbuf1->is_output;
-			delete astbuf1;
-			if (astbuf2 != NULL)
-				delete astbuf2;
-			free_attr(albuf);
+		if (extra->albuf) {
+			prev_was_input = extra->astbuf1->is_input;
+			prev_was_output = extra->astbuf1->is_output;
+			(void)extra->astbuf1.reset();
+			if (extra->astbuf2 != nullptr)
+				(void)extra->astbuf2.reset();
+			free_attr(extra->albuf);
 		}
-		albuf = $1;
-		astbuf1 = $2;
-		astbuf2 = checkRange(astbuf1, $3);
-		if (!astbuf1->is_input && !astbuf1->is_output) {
-			if (!sv_mode)
-				frontend_verilog_yyerror("task/function argument direction missing");
-			astbuf1->is_input = prev_was_input;
-			astbuf1->is_output = prev_was_output;
+		extra->albuf = $1;
+		extra->astbuf1 = std::move($2);
+		extra->astbuf2 = checkRange(extra->astbuf1.get(), std::move($3));
+		if (!extra->astbuf1->is_input && !extra->astbuf1->is_output) {
+			if (!mode->sv)
+				lexer->err("task/function argument direction missing");
+			extra->astbuf1->is_input = prev_was_input;
+			extra->astbuf1->is_output = prev_was_output;
 		}
 	} wire_name |
 	{
-		if (!astbuf1) {
-			if (!sv_mode)
-				frontend_verilog_yyerror("task/function argument direction missing");
-			albuf = new dict<IdString, AstNode*>;
-			astbuf1 = new AstNode(AST_WIRE);
-			current_wire_rand = false;
-			current_wire_const = false;
-			astbuf1->is_input = true;
-			astbuf2 = NULL;
+		if (!extra->astbuf1) {
+			if (!mode->sv)
+				lexer->err("task/function argument direction missing");
+			extra->albuf = new dict<IdString, std::unique_ptr<AstNode>>;
+			extra->astbuf1 = std::make_unique<AstNode>(AST_WIRE);
+			extra->current_wire_rand = false;
+			extra->current_wire_const = false;
+			extra->astbuf1->is_input = true;
+			extra->astbuf2 = nullptr;
 		}
 	} wire_name;
 
@@ -1237,23 +1318,24 @@ specify_item_list:
 	%empty;
 
 specify_item:
-	specify_if '(' specify_edge expr TOK_SPECIFY_OPER specify_target ')' '=' specify_rise_fall ';' {
-		AstNode *en_expr = $1;
+	specify_if TOK_LPAREN specify_edge expr TOK_SPECIFY_OPER specify_target TOK_RPAREN TOK_EQ specify_rise_fall TOK_SEMICOL {
+		auto en_expr = std::move($1);
 		char specify_edge = $3;
-		AstNode *src_expr = $4;
+		auto src_expr = std::move($4);
 		string *oper = $5;
-		specify_target *target = $6;
-		specify_rise_fall *timing = $9;
+		specify_target_ptr_t target = std::move($6);
+		specify_rise_fall_ptr_t timing = std::move($9);
 
 		if (specify_edge != 0 && target->dat == nullptr)
-			frontend_verilog_yyerror("Found specify edge but no data spec.\n");
+			lexer->err("Found specify edge but no data spec.\n");
 
-		AstNode *cell = new AstNode(AST_CELL);
-		ast_stack.back()->children.push_back(cell);
+		auto cell_owned = std::make_unique<AstNode>(AST_CELL);
+		auto cell = cell_owned.get();
+		extra->ast_stack.back()->children.push_back(std::move(cell_owned));
 		cell->str = stringf("$specify$%d", autoidx++);
-		cell->children.push_back(new AstNode(AST_CELLTYPE));
+		cell->children.push_back(std::make_unique<AstNode>(AST_CELLTYPE));
 		cell->children.back()->str = target->dat ? "$specify3" : "$specify2";
-		SET_AST_NODE_LOC(cell, en_expr ? @1 : @2, @10);
+		SET_AST_NODE_LOC(cell, en_expr.get() ? @1 : @2, @10);
 
 		char oper_polarity = 0;
 		char oper_type = oper->at(0);
@@ -1263,148 +1345,143 @@ specify_item:
 			oper_type = oper->at(1);
 		}
 
-		cell->children.push_back(new AstNode(AST_PARASET, AstNode::mkconst_int(oper_type == '*', false, 1)));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(oper_type == '*', false, 1)));
 		cell->children.back()->str = "\\FULL";
 
-		cell->children.push_back(new AstNode(AST_PARASET, AstNode::mkconst_int(oper_polarity != 0, false, 1)));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(oper_polarity != 0, false, 1)));
 		cell->children.back()->str = "\\SRC_DST_PEN";
 
-		cell->children.push_back(new AstNode(AST_PARASET, AstNode::mkconst_int(oper_polarity == '+', false, 1)));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(oper_polarity == '+', false, 1)));
 		cell->children.back()->str = "\\SRC_DST_POL";
 
-		cell->children.push_back(new AstNode(AST_PARASET, timing->rise.t_min));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->rise.t_min)));
 		cell->children.back()->str = "\\T_RISE_MIN";
 
-		cell->children.push_back(new AstNode(AST_PARASET, timing->rise.t_avg));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->rise.t_avg)));
 		cell->children.back()->str = "\\T_RISE_TYP";
 
-		cell->children.push_back(new AstNode(AST_PARASET, timing->rise.t_max));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->rise.t_max)));
 		cell->children.back()->str = "\\T_RISE_MAX";
 
-		cell->children.push_back(new AstNode(AST_PARASET, timing->fall.t_min));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->fall.t_min)));
 		cell->children.back()->str = "\\T_FALL_MIN";
 
-		cell->children.push_back(new AstNode(AST_PARASET, timing->fall.t_avg));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->fall.t_avg)));
 		cell->children.back()->str = "\\T_FALL_TYP";
 
-		cell->children.push_back(new AstNode(AST_PARASET, timing->fall.t_max));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->fall.t_max)));
 		cell->children.back()->str = "\\T_FALL_MAX";
 
-		cell->children.push_back(new AstNode(AST_ARGUMENT, en_expr ? en_expr : AstNode::mkconst_int(1, false, 1)));
+		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, en_expr ? std::move(en_expr) : AstNode::mkconst_int(1, false, 1)));
 		cell->children.back()->str = "\\EN";
 
-		cell->children.push_back(new AstNode(AST_ARGUMENT, src_expr));
+		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(src_expr)));
 		cell->children.back()->str = "\\SRC";
 
-		cell->children.push_back(new AstNode(AST_ARGUMENT, target->dst));
+		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(target->dst)));
 		cell->children.back()->str = "\\DST";
 
 		if (target->dat)
 		{
-			cell->children.push_back(new AstNode(AST_PARASET, AstNode::mkconst_int(specify_edge != 0, false, 1)));
+			cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(specify_edge != 0, false, 1)));
 			cell->children.back()->str = "\\EDGE_EN";
 
-			cell->children.push_back(new AstNode(AST_PARASET, AstNode::mkconst_int(specify_edge == 'p', false, 1)));
+			cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(specify_edge == 'p', false, 1)));
 			cell->children.back()->str = "\\EDGE_POL";
 
-			cell->children.push_back(new AstNode(AST_PARASET, AstNode::mkconst_int(target->polarity_op != 0, false, 1)));
+			cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(target->polarity_op != 0, false, 1)));
 			cell->children.back()->str = "\\DAT_DST_PEN";
 
-			cell->children.push_back(new AstNode(AST_PARASET, AstNode::mkconst_int(target->polarity_op == '+', false, 1)));
+			cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(target->polarity_op == '+', false, 1)));
 			cell->children.back()->str = "\\DAT_DST_POL";
 
-			cell->children.push_back(new AstNode(AST_ARGUMENT, target->dat));
+			cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(target->dat)));
 			cell->children.back()->str = "\\DAT";
 		}
 
 		delete oper;
-		delete target;
-		delete timing;
 	} |
-	TOK_ID '(' specify_edge expr specify_condition ',' specify_edge expr specify_condition ',' specify_triple specify_opt_triple ')' ';' {
+	TOK_ID TOK_LPAREN specify_edge expr specify_condition TOK_COMMA specify_edge expr specify_condition TOK_COMMA specify_triple specify_opt_triple TOK_RPAREN TOK_SEMICOL {
 		if (*$1 != "$setup" && *$1 != "$hold" && *$1 != "$setuphold" && *$1 != "$removal" && *$1 != "$recovery" &&
 				*$1 != "$recrem" && *$1 != "$skew" && *$1 != "$timeskew" && *$1 != "$fullskew" && *$1 != "$nochange")
-			frontend_verilog_yyerror("Unsupported specify rule type: %s\n", $1->c_str());
+			lexer->err("Unsupported specify rule type: %s\n", $1->c_str());
 
-		AstNode *src_pen = AstNode::mkconst_int($3 != 0, false, 1);
-		AstNode *src_pol = AstNode::mkconst_int($3 == 'p', false, 1);
-		AstNode *src_expr = $4, *src_en = $5 ? $5 : AstNode::mkconst_int(1, false, 1);
+		auto src_pen = AstNode::mkconst_int($3 != 0, false, 1);
+		auto src_pol = AstNode::mkconst_int($3 == 'p', false, 1);
+		auto src_expr = std::move($4), src_en = $5 ? std::move($5) : AstNode::mkconst_int(1, false, 1);
 
-		AstNode *dst_pen = AstNode::mkconst_int($7 != 0, false, 1);
-		AstNode *dst_pol = AstNode::mkconst_int($7 == 'p', false, 1);
-		AstNode *dst_expr = $8, *dst_en = $9 ? $9 : AstNode::mkconst_int(1, false, 1);
+		auto dst_pen = AstNode::mkconst_int($7 != 0, false, 1);
+		auto dst_pol = AstNode::mkconst_int($7 == 'p', false, 1);
+		auto dst_expr = std::move($8), dst_en = $9 ? std::move($9) : AstNode::mkconst_int(1, false, 1);
 
-		specify_triple *limit = $11;
-		specify_triple *limit2 = $12;
+		specify_triple_ptr_t limit = std::move($11);
+		specify_triple_ptr_t limit2 = std::move($12);
 
-		AstNode *cell = new AstNode(AST_CELL);
-		ast_stack.back()->children.push_back(cell);
+		auto cell_owned = std::make_unique<AstNode>(AST_CELL);
+		auto cell = cell_owned.get();
+		extra->ast_stack.back()->children.push_back(std::move(cell_owned));
 		cell->str = stringf("$specify$%d", autoidx++);
-		cell->children.push_back(new AstNode(AST_CELLTYPE));
+		cell->children.push_back(std::make_unique<AstNode>(AST_CELLTYPE));
 		cell->children.back()->str = "$specrule";
 		SET_AST_NODE_LOC(cell, @1, @14);
 
-		cell->children.push_back(new AstNode(AST_PARASET, AstNode::mkconst_str(*$1)));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_str(*$1)));
 		cell->children.back()->str = "\\TYPE";
 
-		cell->children.push_back(new AstNode(AST_PARASET, limit->t_min));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(limit->t_min)));
 		cell->children.back()->str = "\\T_LIMIT_MIN";
 
-		cell->children.push_back(new AstNode(AST_PARASET, limit->t_avg));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(limit->t_avg)));
 		cell->children.back()->str = "\\T_LIMIT_TYP";
 
-		cell->children.push_back(new AstNode(AST_PARASET, limit->t_max));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(limit->t_max)));
 		cell->children.back()->str = "\\T_LIMIT_MAX";
 
-		cell->children.push_back(new AstNode(AST_PARASET, limit2 ? limit2->t_min : AstNode::mkconst_int(0, true)));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, limit2 ? std::move(limit2->t_min) : AstNode::mkconst_int(0, true)));
 		cell->children.back()->str = "\\T_LIMIT2_MIN";
 
-		cell->children.push_back(new AstNode(AST_PARASET, limit2 ? limit2->t_avg : AstNode::mkconst_int(0, true)));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, limit2 ? std::move(limit2->t_avg) : AstNode::mkconst_int(0, true)));
 		cell->children.back()->str = "\\T_LIMIT2_TYP";
 
-		cell->children.push_back(new AstNode(AST_PARASET, limit2 ? limit2->t_max : AstNode::mkconst_int(0, true)));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, limit2 ? std::move(limit2->t_max) : AstNode::mkconst_int(0, true)));
 		cell->children.back()->str = "\\T_LIMIT2_MAX";
 
-		cell->children.push_back(new AstNode(AST_PARASET, src_pen));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(src_pen)));
 		cell->children.back()->str = "\\SRC_PEN";
 
-		cell->children.push_back(new AstNode(AST_PARASET, src_pol));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(src_pol)));
 		cell->children.back()->str = "\\SRC_POL";
 
-		cell->children.push_back(new AstNode(AST_PARASET, dst_pen));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(dst_pen)));
 		cell->children.back()->str = "\\DST_PEN";
 
-		cell->children.push_back(new AstNode(AST_PARASET, dst_pol));
+		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(dst_pol)));
 		cell->children.back()->str = "\\DST_POL";
 
-		cell->children.push_back(new AstNode(AST_ARGUMENT, src_en));
+		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(src_en)));
 		cell->children.back()->str = "\\SRC_EN";
 
-		cell->children.push_back(new AstNode(AST_ARGUMENT, src_expr));
+		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(src_expr)));
 		cell->children.back()->str = "\\SRC";
 
-		cell->children.push_back(new AstNode(AST_ARGUMENT, dst_en));
+		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(dst_en)));
 		cell->children.back()->str = "\\DST_EN";
 
-		cell->children.push_back(new AstNode(AST_ARGUMENT, dst_expr));
+		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(dst_expr)));
 		cell->children.back()->str = "\\DST";
-
-		delete $1;
-		delete limit;
-		delete limit2;
 	};
 
 specify_opt_triple:
-	',' specify_triple {
-		$$ = $2;
+	TOK_COMMA specify_triple {
+		$$ = std::move($2);
 	} |
 	%empty {
 		$$ = nullptr;
 	};
 
 specify_if:
-	TOK_IF '(' expr ')' {
-		$$ = $3;
+	TOK_IF TOK_LPAREN expr TOK_RPAREN {
+		$$ = std::move($3);
 	} |
 	%empty {
 		$$ = nullptr;
@@ -1412,7 +1489,7 @@ specify_if:
 
 specify_condition:
 	TOK_SPECIFY_AND expr {
-		$$ = $2;
+		$$ = std::move($2);
 	} |
 	%empty {
 		$$ = nullptr;
@@ -1420,28 +1497,28 @@ specify_condition:
 
 specify_target:
 	expr {
-		$$ = new specify_target;
+		$$ = std::make_unique<struct specify_target>();
 		$$->polarity_op = 0;
-		$$->dst = $1;
+		$$->dst = std::move($1);
 		$$->dat = nullptr;
 	} |
-	'(' expr ':' expr ')'{
-		$$ = new specify_target;
+	TOK_LPAREN expr TOK_COL expr TOK_RPAREN{
+		$$ = std::make_unique<struct specify_target>();
 		$$->polarity_op = 0;
-		$$->dst = $2;
-		$$->dat = $4;
+		$$->dst = std::move($2);
+		$$->dat = std::move($4);
 	} |
-	'(' expr TOK_NEG_INDEXED expr ')'{
-		$$ = new specify_target;
+	TOK_LPAREN expr TOK_NEG_INDEXED expr TOK_RPAREN{
+		$$ = std::make_unique<struct specify_target>();
 		$$->polarity_op = '-';
-		$$->dst = $2;
-		$$->dat = $4;
+		$$->dst = std::move($2);
+		$$->dat = std::move($4);
 	} |
-	'(' expr TOK_POS_INDEXED expr ')'{
-		$$ = new specify_target;
+	TOK_LPAREN expr TOK_POS_INDEXED expr TOK_RPAREN{
+		$$ = std::make_unique<struct specify_target>();
 		$$->polarity_op = '+';
-		$$->dst = $2;
-		$$->dat = $4;
+		$$->dst = std::move($2);
+		$$->dat = std::move($4);
 	};
 
 specify_edge:
@@ -1451,72 +1528,48 @@ specify_edge:
 
 specify_rise_fall:
 	specify_triple {
-		$$ = new specify_rise_fall;
-		$$->rise = *$1;
+		$$ = std::make_unique<struct specify_rise_fall>();
 		$$->fall.t_min = $1->t_min->clone();
 		$$->fall.t_avg = $1->t_avg->clone();
 		$$->fall.t_max = $1->t_max->clone();
-		delete $1;
+		$$->rise = std::move(*$1);
 	} |
-	'(' specify_triple ',' specify_triple ')' {
-		$$ = new specify_rise_fall;
-		$$->rise = *$2;
-		$$->fall = *$4;
-		delete $2;
-		delete $4;
+	TOK_LPAREN specify_triple TOK_COMMA specify_triple TOK_RPAREN {
+		$$ = std::make_unique<struct specify_rise_fall>();
+		$$->rise = std::move(*$2);
+		$$->fall = std::move(*$4);
 	} |
-	'(' specify_triple ',' specify_triple ',' specify_triple ')' {
-		$$ = new specify_rise_fall;
-		$$->rise = *$2;
-		$$->fall = *$4;
-		delete $2;
-		delete $4;
-		delete $6;
-		log_file_warning(current_filename, get_line_num(), "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
+	TOK_LPAREN specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_RPAREN {
+		$$ = std::make_unique<struct specify_rise_fall>();
+		$$->rise = std::move(*$2);
+		$$->fall = std::move(*$4);
+		log_file_warning(current_filename, @$.begin.line, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
 	} |
-	'(' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ')' {
-		$$ = new specify_rise_fall;
-		$$->rise = *$2;
-		$$->fall = *$4;
-		delete $2;
-		delete $4;
-		delete $6;
-		delete $8;
-		delete $10;
-		delete $12;
-		log_file_warning(current_filename, get_line_num(), "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
+	TOK_LPAREN specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_RPAREN {
+		$$ = std::make_unique<struct specify_rise_fall>();
+		$$->rise = std::move(*$2);
+		$$->fall = std::move(*$4);
+		log_file_warning(current_filename, @$.begin.line, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
 	} |
-	'(' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ',' specify_triple ')' {
-		$$ = new specify_rise_fall;
-		$$->rise = *$2;
-		$$->fall = *$4;
-		delete $2;
-		delete $4;
-		delete $6;
-		delete $8;
-		delete $10;
-		delete $12;
-		delete $14;
-		delete $16;
-		delete $18;
-		delete $20;
-		delete $22;
-		delete $24;
-		log_file_warning(current_filename, get_line_num(), "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
+	TOK_LPAREN specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_RPAREN {
+		$$ = std::make_unique<struct specify_rise_fall>();
+		$$->rise = std::move(*$2);
+		$$->fall = std::move(*$4);
+		log_file_warning(current_filename, @$.begin.line, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
 	}
 
 specify_triple:
 	expr {
-		$$ = new specify_triple;
-		$$->t_min = $1;
+		$$ = std::make_unique<struct specify_triple>();
 		$$->t_avg = $1->clone();
 		$$->t_max = $1->clone();
+		$$->t_min = std::move($1);
 	} |
-	expr ':' expr ':' expr {
-		$$ = new specify_triple;
-		$$->t_min = $1;
-		$$->t_avg = $3;
-		$$->t_max = $5;
+	expr TOK_COL expr TOK_COL expr {
+		$$ = std::make_unique<struct specify_triple>();
+		$$->t_min = std::move($1);
+		$$->t_avg = std::move($3);
+		$$->t_max = std::move($5);
 	};
 
 /******************** ignored specify parser **************************/
@@ -1538,58 +1591,58 @@ ignored_specify_item:
 	;
 
 specparam_declaration:
-	TOK_SPECPARAM list_of_specparam_assignments ';' |
-	TOK_SPECPARAM specparam_range list_of_specparam_assignments ';' ;
+	TOK_SPECPARAM list_of_specparam_assignments TOK_SEMICOL |
+	TOK_SPECPARAM specparam_range list_of_specparam_assignments TOK_SEMICOL ;
 
 // IEEE 1364-2005 calls this sinmply 'range' but the current 'range' rule allows empty match
 // and the 'non_opt_range' rule allows index ranges not allowed by 1364-2005
 // exxxxtending this for SV specparam would change this anyhow
 specparam_range:
-	'[' ignspec_constant_expression ':' ignspec_constant_expression ']' ;
+	TOK_LBRA ignspec_constant_expression TOK_COL ignspec_constant_expression TOK_RBRA ;
 
 list_of_specparam_assignments:
-	specparam_assignment | list_of_specparam_assignments ',' specparam_assignment;
+	specparam_assignment | list_of_specparam_assignments TOK_COMMA specparam_assignment;
 
 specparam_assignment:
-	ignspec_id '=' ignspec_expr ;
+	ignspec_id TOK_EQ ignspec_expr ;
 
 ignspec_opt_cond:
-	TOK_IF '(' ignspec_expr ')' | %empty;
+	TOK_IF TOK_LPAREN ignspec_expr TOK_RPAREN | %empty;
 
 path_declaration :
-	simple_path_declaration ';'
+	simple_path_declaration TOK_SEMICOL
 	// | edge_sensitive_path_declaration
 	// | state_dependent_path_declaration
 	;
 
 simple_path_declaration :
-	ignspec_opt_cond parallel_path_description '=' path_delay_value |
-	ignspec_opt_cond full_path_description '=' path_delay_value
+	ignspec_opt_cond parallel_path_description TOK_EQ path_delay_value |
+	ignspec_opt_cond full_path_description TOK_EQ path_delay_value
 	;
 
 path_delay_value :
-	'(' ignspec_expr list_of_path_delay_extra_expressions ')'
+	TOK_LPAREN ignspec_expr list_of_path_delay_extra_expressions TOK_RPAREN
 	|     ignspec_expr
 	|     ignspec_expr list_of_path_delay_extra_expressions
 	;
 
 list_of_path_delay_extra_expressions :
-	',' ignspec_expr
-	| ',' ignspec_expr list_of_path_delay_extra_expressions
+	TOK_COMMA ignspec_expr
+	| TOK_COMMA ignspec_expr list_of_path_delay_extra_expressions
 	;
 
 specify_edge_identifier :
 	TOK_POSEDGE | TOK_NEGEDGE ;
 
 parallel_path_description :
-	'(' specify_input_terminal_descriptor opt_polarity_operator '=' '>' specify_output_terminal_descriptor ')' |
-	'(' specify_edge_identifier specify_input_terminal_descriptor '=' '>' '(' specify_output_terminal_descriptor opt_polarity_operator ':' ignspec_expr ')' ')' |
-	'(' specify_edge_identifier specify_input_terminal_descriptor '=' '>' '(' specify_output_terminal_descriptor TOK_POS_INDEXED ignspec_expr ')' ')' ;
+	TOK_LPAREN specify_input_terminal_descriptor opt_polarity_operator TOK_EQ TOK_GT specify_output_terminal_descriptor TOK_RPAREN |
+	TOK_LPAREN specify_edge_identifier specify_input_terminal_descriptor TOK_EQ TOK_GT TOK_LPAREN specify_output_terminal_descriptor opt_polarity_operator TOK_COL ignspec_expr TOK_RPAREN TOK_RPAREN |
+	TOK_LPAREN specify_edge_identifier specify_input_terminal_descriptor TOK_EQ TOK_GT TOK_LPAREN specify_output_terminal_descriptor TOK_POS_INDEXED ignspec_expr TOK_RPAREN TOK_RPAREN ;
 
 full_path_description :
-	'(' list_of_path_inputs '*' '>' list_of_path_outputs ')' |
-	'(' specify_edge_identifier list_of_path_inputs '*' '>' '(' list_of_path_outputs opt_polarity_operator ':' ignspec_expr ')' ')' |
-	'(' specify_edge_identifier list_of_path_inputs '*' '>' '(' list_of_path_outputs TOK_POS_INDEXED ignspec_expr ')' ')' ;
+	TOK_LPAREN list_of_path_inputs TOK_ASTER TOK_GT list_of_path_outputs TOK_RPAREN |
+	TOK_LPAREN specify_edge_identifier list_of_path_inputs TOK_ASTER TOK_GT TOK_LPAREN list_of_path_outputs opt_polarity_operator TOK_COL ignspec_expr TOK_RPAREN TOK_RPAREN |
+	TOK_LPAREN specify_edge_identifier list_of_path_inputs TOK_ASTER TOK_GT TOK_LPAREN list_of_path_outputs TOK_POS_INDEXED ignspec_expr TOK_RPAREN TOK_RPAREN ;
 
 // This was broken into 2 rules to solve shift/reduce conflicts
 list_of_path_inputs :
@@ -1597,15 +1650,15 @@ list_of_path_inputs :
 	specify_input_terminal_descriptor more_path_inputs opt_polarity_operator ;
 
 more_path_inputs :
-    ',' specify_input_terminal_descriptor |
-    more_path_inputs ',' specify_input_terminal_descriptor ;
+    TOK_COMMA specify_input_terminal_descriptor |
+    more_path_inputs TOK_COMMA specify_input_terminal_descriptor ;
 
 list_of_path_outputs :
 	specify_output_terminal_descriptor |
-	list_of_path_outputs ',' specify_output_terminal_descriptor ;
+	list_of_path_outputs TOK_COMMA specify_output_terminal_descriptor ;
 
 opt_polarity_operator :
-	'+' | '-' | %empty;
+	TOK_PLUS | TOK_MINUS | %empty;
 
 // Good enough for the time being
 specify_input_terminal_descriptor :
@@ -1616,7 +1669,7 @@ specify_output_terminal_descriptor :
 	ignspec_id ;
 
 system_timing_declaration :
-	ignspec_id '(' system_timing_args ')' ';' ;
+	ignspec_id TOK_LPAREN system_timing_args TOK_RPAREN TOK_SEMICOL ;
 
 system_timing_arg :
 	TOK_POSEDGE ignspec_id |
@@ -1626,140 +1679,135 @@ system_timing_arg :
 system_timing_args :
 	system_timing_arg |
 	system_timing_args TOK_IGNORED_SPECIFY_AND system_timing_arg |
-	system_timing_args ',' system_timing_arg ;
+	system_timing_args TOK_COMMA system_timing_arg ;
 
 // for the time being this is OK, but we may write our own expr here.
 // as I'm not sure it is legal to use a full expr here (probably not)
 // On the other hand, other rules requiring constant expressions also use 'expr'
 // (such as param assignment), so we may leave this as-is, perhaps adding runtime checks for constant-ness
 ignspec_constant_expression:
-	expr { delete $1; };
+	expr {  };
 
 ignspec_expr:
-	expr { delete $1; } |
-	expr ':' expr ':' expr {
-		delete $1;
-		delete $3;
-		delete $5;
+	expr {  } |
+	expr TOK_COL expr TOK_COL expr {
 	};
 
 ignspec_id:
-	TOK_ID { delete $1; }
-	range_or_multirange { delete $3; };
+	TOK_ID {  }
+	range_or_multirange {  };
 
 /**********************************************************************/
 
 param_signed:
 	TOK_SIGNED {
-		astbuf1->is_signed = true;
+		extra->astbuf1->is_signed = true;
 	} | TOK_UNSIGNED {
-		astbuf1->is_signed = false;
+		extra->astbuf1->is_signed = false;
 	} | %empty;
 
 param_integer:
 	type_atom {
-		astbuf1->is_reg = false;
+		extra->astbuf1->is_reg = false;
 	};
 
 param_real:
 	TOK_REAL {
-		astbuf1->children.push_back(new AstNode(AST_REALVALUE));
+		extra->astbuf1->children.push_back(std::make_unique<AstNode>(AST_REALVALUE));
 	};
 
 param_range:
 	range {
-		if ($1 != NULL) {
-			astbuf1->children.push_back($1);
+		if ($1 != nullptr) {
+			extra->astbuf1->children.push_back(std::move($1));
 		}
 	};
 
 param_integer_type: param_integer param_signed;
 param_range_type:
 	type_vec param_signed {
-		addRange(astbuf1, 0, 0);
+		addRange(extra->astbuf1.get(), 0, 0);
 	} |
 	type_vec param_signed non_opt_range {
-		astbuf1->children.push_back($3);
+		extra->astbuf1->children.push_back(std::move($3));
 	};
 param_implicit_type: param_signed param_range;
 
 param_type:
 	param_integer_type | param_real | param_range_type | param_implicit_type |
 	hierarchical_type_id {
-		addWiretypeNode($1, astbuf1);
+		extra->addWiretypeNode($1, extra->astbuf1.get());
 	};
 
 param_decl:
 	attr TOK_PARAMETER {
-		astbuf1 = new AstNode(AST_PARAMETER);
-		astbuf1->children.push_back(AstNode::mkconst_int(0, true));
-		append_attr(astbuf1, $1);
-	} param_type param_decl_list ';' {
-		delete astbuf1;
+		extra->astbuf1 = std::make_unique<AstNode>(AST_PARAMETER);
+		extra->astbuf1->children.push_back(AstNode::mkconst_int(0, true));
+		append_attr(extra->astbuf1.get(), $1);
+	} param_type param_decl_list TOK_SEMICOL {
+		(void)extra->astbuf1.reset();
 	};
 
 localparam_decl:
 	attr TOK_LOCALPARAM {
-		astbuf1 = new AstNode(AST_LOCALPARAM);
-		astbuf1->children.push_back(AstNode::mkconst_int(0, true));
-		append_attr(astbuf1, $1);
-	} param_type param_decl_list ';' {
-		delete astbuf1;
+		extra->astbuf1 = std::make_unique<AstNode>(AST_LOCALPARAM);
+		extra->astbuf1->children.push_back(AstNode::mkconst_int(0, true));
+		append_attr(extra->astbuf1.get(), $1);
+	} param_type param_decl_list TOK_SEMICOL {
+		(void)extra->astbuf1.reset();
 	};
 
 param_decl_list:
-	single_param_decl | param_decl_list ',' single_param_decl;
+	single_param_decl | param_decl_list TOK_COMMA single_param_decl;
 
 single_param_decl:
-	single_param_decl_ident '=' expr {
-		AstNode *decl = ast_stack.back()->children.back();
+	single_param_decl_ident TOK_EQ expr {
+		AstNode *decl = extra->ast_stack.back()->children.back().get();
 		log_assert(decl->type == AST_PARAMETER || decl->type == AST_LOCALPARAM);
-		delete decl->children[0];
-		decl->children[0] = $3;
+		decl->children[0] = std::move($3);
 	} |
 	single_param_decl_ident {
-		AstNode *decl = ast_stack.back()->children.back();
+		AstNode *decl = extra->ast_stack.back()->children.back().get();
 		if (decl->type != AST_PARAMETER) {
 			log_assert(decl->type == AST_LOCALPARAM);
-			frontend_verilog_yyerror("localparam initialization is missing!");
+			lexer->err("localparam initialization is missing!");
 		}
-		if (!sv_mode)
-			frontend_verilog_yyerror("Parameter defaults can only be omitted in SystemVerilog mode!");
-		delete decl->children[0];
+		if (!mode->sv)
+			lexer->err("Parameter defaults can only be omitted in SystemVerilog mode!");
 		decl->children.erase(decl->children.begin());
 	};
 
 single_param_decl_ident:
 	TOK_ID {
-		AstNode *node;
-		if (astbuf1 == nullptr) {
-			if (!sv_mode)
-				frontend_verilog_yyerror("In pure Verilog (not SystemVerilog), parameter/localparam with an initializer must use the parameter/localparam keyword");
-			node = new AstNode(AST_PARAMETER);
-			node->children.push_back(AstNode::mkconst_int(0, true));
+		std::unique_ptr<AstNode> node_owned;
+		if (extra->astbuf1 == nullptr) {
+			if (!mode->sv)
+				lexer->err("In pure Verilog (not SystemVerilog), parameter/localparam with an initializer must use the parameter/localparam keyword");
+			node_owned = std::make_unique<AstNode>(AST_PARAMETER);
+			node_owned->children.push_back(AstNode::mkconst_int(0, true));
 		} else {
-			node = astbuf1->clone();
+			node_owned = extra->astbuf1->clone();
 		}
-		node->str = *$1;
-		ast_stack.back()->children.push_back(node);
-		delete $1;
+		node_owned->str = *$1;
+		auto node = node_owned.get();
+		extra->ast_stack.back()->children.push_back(std::move(node_owned));
 		SET_AST_NODE_LOC(node, @1, @1);
 	};
 
 defparam_decl:
-	TOK_DEFPARAM defparam_decl_list ';';
+	TOK_DEFPARAM defparam_decl_list TOK_SEMICOL;
 
 defparam_decl_list:
-	single_defparam_decl | defparam_decl_list ',' single_defparam_decl;
+	single_defparam_decl | defparam_decl_list TOK_COMMA single_defparam_decl;
 
 single_defparam_decl:
-	range rvalue '=' expr {
-		AstNode *node = new AstNode(AST_DEFPARAM);
-		node->children.push_back($2);
-		node->children.push_back($4);
-		if ($1 != NULL)
-			node->children.push_back($1);
-		ast_stack.back()->children.push_back(node);
+	range rvalue TOK_EQ expr {
+		auto node = std::make_unique<AstNode>(AST_DEFPARAM);
+		node->children.push_back(std::move($2));
+		node->children.push_back(std::move($4));
+		if ($1 != nullptr)
+			node->children.push_back(std::move($1));
+		extra->ast_stack.back()->children.push_back(std::move(node));
 	};
 
 /////////
@@ -1769,90 +1817,89 @@ single_defparam_decl:
 enum_type: TOK_ENUM {
 		static int enum_count;
 		// create parent node for the enum
-		astbuf2 = new AstNode(AST_ENUM);
-		ast_stack.back()->children.push_back(astbuf2);
-		astbuf2->str = std::string("$enum");
-		astbuf2->str += std::to_string(enum_count++);
+		extra->astbuf2 = std::make_unique<AstNode>(AST_ENUM);
+		extra->astbuf2->str = std::string("$enum");
+		extra->astbuf2->str += std::to_string(enum_count++);
+		log_assert(!extra->cell_hack);
+		extra->cell_hack = extra->astbuf2.get();
+		extra->ast_stack.back()->children.push_back(std::move(extra->astbuf2));
 		// create the template for the names
-		astbuf1 = new AstNode(AST_ENUM_ITEM);
-		astbuf1->children.push_back(AstNode::mkconst_int(0, true));
-	} enum_base_type '{' enum_name_list optional_comma '}' {
+		extra->astbuf1 = std::make_unique<AstNode>(AST_ENUM_ITEM);
+		extra->astbuf1->children.push_back(AstNode::mkconst_int(0, true));
+	} enum_base_type TOK_LCURL enum_name_list optional_comma TOK_RCURL {
 		// create template for the enum vars
-		auto tnode = astbuf1->clone();
-		delete astbuf1;
-		astbuf1 = tnode;
+		log_assert(extra->cell_hack);
+		auto tnode_owned = extra->astbuf1->clone();
+		auto* tnode = tnode_owned.get();
+		extra->astbuf1 = std::move(tnode_owned);
 		tnode->type = AST_WIRE;
-		tnode->attributes[ID::enum_type] = AstNode::mkconst_str(astbuf2->str);
+		tnode->attributes[ID::enum_type] = AstNode::mkconst_str(extra->cell_hack->str);
+		extra->cell_hack = nullptr;
 		// drop constant but keep any range
-		delete tnode->children[0];
 		tnode->children.erase(tnode->children.begin());
-		$$ = astbuf1;
+		$$ = extra->astbuf1->clone();
 	};
 
 enum_base_type: type_atom type_signing
-	| type_vec type_signing range	{ if ($3) astbuf1->children.push_back($3); }
-	| %empty			{ astbuf1->is_reg = true; addRange(astbuf1); }
+	| type_vec type_signing range	{ if ($3) extra->astbuf1->children.push_back(std::move($3)); }
+	| %empty			{ extra->astbuf1->is_reg = true; addRange(extra->astbuf1.get()); }
 	;
 
 type_atom:
 	integer_atom_type {
-		astbuf1->is_reg = true;
-		astbuf1->is_signed = true;
-		addRange(astbuf1, $1 - 1, 0);
+		extra->astbuf1->is_reg = true;
+		extra->astbuf1->is_signed = true;
+		addRange(extra->astbuf1.get(), $1 - 1, 0);
 	};
 
-type_vec: TOK_REG		{ astbuf1->is_reg   = true; }		// unsigned
-	| TOK_LOGIC		{ astbuf1->is_logic = true; }		// unsigned
+type_vec: TOK_REG		{ extra->astbuf1->is_reg   = true; }		// unsigned
+	| TOK_LOGIC		{ extra->astbuf1->is_logic = true; }		// unsigned
 	;
 
 type_signing:
-	  TOK_SIGNED		{ astbuf1->is_signed = true; }
-	| TOK_UNSIGNED		{ astbuf1->is_signed = false; }
+	  TOK_SIGNED		{ extra->astbuf1->is_signed = true; }
+	| TOK_UNSIGNED		{ extra->astbuf1->is_signed = false; }
 	| %empty
 	;
 
 enum_name_list: enum_name_decl
-	| enum_name_list ',' enum_name_decl
+	| enum_name_list TOK_COMMA enum_name_decl
 	;
 
 enum_name_decl:
 	TOK_ID opt_enum_init {
 		// put in fn
-		log_assert(astbuf1);
-		log_assert(astbuf2);
-		auto node = astbuf1->clone();
+		log_assert((bool)extra->astbuf1);
+		log_assert((bool)extra->cell_hack);
+		auto node = extra->astbuf1->clone();
 		node->str = *$1;
-		delete $1;
-		SET_AST_NODE_LOC(node, @1, @1);
-		delete node->children[0];
-		node->children[0] = $2 ? $2 : new AstNode(AST_NONE);
-		astbuf2->children.push_back(node);
+		SET_AST_NODE_LOC(node.get(), @1, @1);
+		node->children[0] = $2 ? std::move($2) : std::make_unique<AstNode>(AST_NONE);
+		extra->cell_hack->children.push_back(std::move(node));
 	}
 	;
 
 opt_enum_init:
-	'=' basic_expr		{ $$ = $2; }	// TODO: restrict this
-	| %empty		{ $$ = NULL; }
+	TOK_EQ basic_expr		{ $$ = std::move($2); }	// TODO: restrict this
+	| %empty		{ $$ = nullptr; }
 	;
 
 enum_var_list:
 	enum_var
-	| enum_var_list ',' enum_var
+	| enum_var_list TOK_COMMA enum_var
 	;
 
 enum_var: TOK_ID {
-		log_assert(astbuf1);
-		log_assert(astbuf2);
-		auto node = astbuf1->clone();
-		ast_stack.back()->children.push_back(node);
+		log_assert((bool)extra->astbuf1);
+		auto node = extra->astbuf1->clone();
 		node->str = *$1;
-		delete $1;
-		SET_AST_NODE_LOC(node, @1, @1);
+		SET_AST_NODE_LOC(node.get(), @1, @1);
 		node->is_enum = true;
+		extra->ast_stack.back()->children.push_back(std::move(node));
 	}
 	;
 
-enum_decl: enum_type enum_var_list ';'		{ delete $1; }
+enum_decl: enum_type enum_var_list TOK_SEMICOL		{  }
 	;
 
 //////////////////
@@ -1861,30 +1908,36 @@ enum_decl: enum_type enum_var_list ';'		{ delete $1; }
 
 struct_decl:
 	attr struct_type {
-		append_attr($2, $1);
-	} struct_var_list ';' {
-		delete astbuf2;
+		append_attr(extra->astbuf2.get(), $1);
+	} struct_var_list TOK_SEMICOL {
+		(void)extra->astbuf2.reset();
 	}
 	;
 
-struct_type: struct_union { astbuf2 = $1; astbuf2->is_custom_type = true; } struct_body { $$ = astbuf2; }
+struct_type:
+	struct_union {
+		extra->astbuf2 = std::move($1);
+		extra->astbuf2->is_custom_type = true;
+	} struct_body {
+		$$ = extra->astbuf2->clone();
+	}
 	;
 
 struct_union:
-	  TOK_STRUCT		{ $$ = new AstNode(AST_STRUCT); }
-	| TOK_UNION		{ $$ = new AstNode(AST_UNION); }
+	  TOK_STRUCT		{ $$ = std::make_unique<AstNode>(AST_STRUCT); }
+	| TOK_UNION		{ $$ = std::make_unique<AstNode>(AST_UNION); }
 	;
 
-struct_body: opt_packed '{' struct_member_list '}'
+struct_body: opt_packed TOK_LCURL struct_member_list TOK_RCURL
 	;
 
 opt_packed:
 	TOK_PACKED opt_signed_struct |
-	%empty { frontend_verilog_yyerror("Only PACKED supported at this time"); };
+	%empty { lexer->err("Only PACKED supported at this time"); };
 
 opt_signed_struct:
-	  TOK_SIGNED		{ astbuf2->is_signed = true; }
-	| TOK_UNSIGNED		{ astbuf2->is_signed = false; }
+	  TOK_SIGNED		{ extra->astbuf2->is_signed = true; }
+	| TOK_UNSIGNED		{ extra->astbuf2->is_signed = false; }
 	| %empty // default is unsigned
 	;
 
@@ -1892,62 +1945,68 @@ struct_member_list: struct_member
 	| struct_member_list struct_member
 	;
 
-struct_member: struct_member_type member_name_list ';'		{ delete astbuf1; }
+struct_member: struct_member_type member_name_list TOK_SEMICOL		{ (void)extra->astbuf1.reset(); }
 	;
 
 member_name_list:
 	  member_name
-	| member_name_list ',' member_name
+	| member_name_list TOK_COMMA member_name
 	;
 
 member_name: TOK_ID {
-			astbuf1->str = $1->substr(1);
-			delete $1;
-			astbuf3 = astbuf1->clone();
-			SET_AST_NODE_LOC(astbuf3, @1, @1);
-			astbuf2->children.push_back(astbuf3);
-		} range { if ($3) astbuf3->children.push_back($3); }
+		extra->astbuf1->str = $1->substr(1);
+		extra->astbuf3 = extra->astbuf1->clone();
+		log_assert(!extra->member_hack);
+		extra->member_hack = extra->astbuf3.get();
+		SET_AST_NODE_LOC(extra->member_hack, @1, @1);
+		extra->astbuf2->children.push_back(std::move(extra->astbuf3));
+	} range {
+		log_assert((bool)extra->member_hack);
+		if ($3) extra->member_hack->children.push_back(std::move($3));
+		extra->member_hack = nullptr;
+	}
 	;
 
-struct_member_type: { astbuf1 = new AstNode(AST_STRUCT_ITEM); } member_type_token
+struct_member_type: { extra->astbuf1 = std::make_unique<AstNode>(AST_STRUCT_ITEM); } member_type_token
 	;
 
 member_type_token:
 	member_type range_or_multirange {
-		AstNode *range = checkRange(astbuf1, $2);
+		auto range = checkRange(extra->astbuf1.get(), std::move($2));
 		if (range)
-			astbuf1->children.push_back(range);
+			extra->astbuf1->children.push_back(std::move(range));
 	}
 	| {
-		delete astbuf1;
+		(void)extra->astbuf1.reset();
 	} struct_union {
-			// stash state on ast_stack
-			ast_stack.push_back(astbuf2);
-			astbuf2 = $2;
+			// stash state on extra->ast_stack
+			// sketchy!
+			extra->ast_stack.push_back(extra->astbuf2.release());
+			extra->astbuf2 = std::move($2);
 		} struct_body  {
-		        astbuf1 = astbuf2;
+			extra->astbuf1 = std::move(extra->astbuf2);
 			// recover state
-			astbuf2 = ast_stack.back();
-			ast_stack.pop_back();
+			extra->astbuf2.reset(extra->ast_stack.back());
+			extra->ast_stack.pop_back();
 		}
 	;
 
 member_type: type_atom type_signing
 	| type_vec type_signing
-	| hierarchical_type_id { addWiretypeNode($1, astbuf1); }
+	| hierarchical_type_id { extra->addWiretypeNode($1, extra->astbuf1.get()); }
 	;
 
 struct_var_list: struct_var
-	| struct_var_list ',' struct_var
+	| struct_var_list TOK_COMMA struct_var
 	;
 
-struct_var: TOK_ID	{	auto *var_node = astbuf2->clone();
-				var_node->str = *$1;
-				delete $1;
-				SET_AST_NODE_LOC(var_node, @1, @1);
-				ast_stack.back()->children.push_back(var_node);
-			}
-	;
+struct_var:
+	TOK_ID	{
+		auto var_node = extra->astbuf2->clone();
+		var_node->str = *$1;
+		SET_AST_NODE_LOC(var_node.get(), @1, @1);
+		extra->ast_stack.back()->children.push_back(std::move(var_node));
+	};
 
 /////////
 // wire
@@ -1955,46 +2014,43 @@ struct_var: TOK_ID	{	auto *var_node = astbuf2->clone();
 
 wire_decl:
 	attr wire_type range_or_multirange {
-		albuf = $1;
-		astbuf1 = $2;
-		astbuf2 = checkRange(astbuf1, $3);
+		extra->albuf = $1;
+		extra->astbuf1 = std::move($2);
+		extra->astbuf2 = checkRange(extra->astbuf1.get(), std::move($3));
 	} delay wire_name_list {
-		delete astbuf1;
-		if (astbuf2 != NULL)
-			delete astbuf2;
-		free_attr(albuf);
-	} ';' |
+		(void)extra->astbuf1.reset();
+		if (extra->astbuf2 != nullptr)
+			(void)extra->astbuf2.reset();
+		free_attr(extra->albuf);
+	} TOK_SEMICOL |
 	attr TOK_SUPPLY0 TOK_ID {
-		ast_stack.back()->children.push_back(new AstNode(AST_WIRE));
-		ast_stack.back()->children.back()->str = *$3;
-		append_attr(ast_stack.back()->children.back(), $1);
-		ast_stack.back()->children.push_back(new AstNode(AST_ASSIGN, new AstNode(AST_IDENTIFIER), AstNode::mkconst_int(0, false, 1)));
-		ast_stack.back()->children.back()->children[0]->str = *$3;
-		delete $3;
-	} opt_supply_wires ';' |
+		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_WIRE));
+		extra->ast_stack.back()->children.back()->str = *$3;
+		append_attr(extra->ast_stack.back()->children.back().get(), $1);
+		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_ASSIGN, std::make_unique<AstNode>(AST_IDENTIFIER), AstNode::mkconst_int(0, false, 1)));
+		extra->ast_stack.back()->children.back()->children[0]->str = *$3;
+	} opt_supply_wires TOK_SEMICOL |
 	attr TOK_SUPPLY1 TOK_ID {
-		ast_stack.back()->children.push_back(new AstNode(AST_WIRE));
-		ast_stack.back()->children.back()->str = *$3;
-		append_attr(ast_stack.back()->children.back(), $1);
-		ast_stack.back()->children.push_back(new AstNode(AST_ASSIGN, new AstNode(AST_IDENTIFIER), AstNode::mkconst_int(1, false, 1)));
-		ast_stack.back()->children.back()->children[0]->str = *$3;
-		delete $3;
-	} opt_supply_wires ';';
+		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_WIRE));
+		extra->ast_stack.back()->children.back()->str = *$3;
+		append_attr(extra->ast_stack.back()->children.back().get(), $1);
+		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_ASSIGN, std::make_unique<AstNode>(AST_IDENTIFIER), AstNode::mkconst_int(1, false, 1)));
+		extra->ast_stack.back()->children.back()->children[0]->str = *$3;
+	} opt_supply_wires TOK_SEMICOL;
 
 opt_supply_wires:
 	%empty |
-	opt_supply_wires ',' TOK_ID {
-		AstNode *wire_node = ast_stack.back()->children.at(GetSize(ast_stack.back()->children)-2)->clone();
-		AstNode *assign_node = ast_stack.back()->children.at(GetSize(ast_stack.back()->children)-1)->clone();
+	opt_supply_wires TOK_COMMA TOK_ID {
+		auto wire_node = extra->ast_stack.back()->children.at(GetSize(extra->ast_stack.back()->children)-2)->clone();
+		auto assign_node = extra->ast_stack.back()->children.at(GetSize(extra->ast_stack.back()->children)-1)->clone();
 		wire_node->str = *$3;
 		assign_node->children[0]->str = *$3;
-		ast_stack.back()->children.push_back(wire_node);
-		ast_stack.back()->children.push_back(assign_node);
-		delete $3;
+		extra->ast_stack.back()->children.push_back(std::move(wire_node));
+		extra->ast_stack.back()->children.push_back(std::move(assign_node));
 	};
 
 wire_name_list:
-	wire_name_and_opt_assign | wire_name_list ',' wire_name_and_opt_assign;
+	wire_name_and_opt_assign | wire_name_list TOK_COMMA wire_name_and_opt_assign;
 
 wire_name_and_opt_assign:
 	wire_name {
@@ -2002,31 +2058,27 @@ wire_name_and_opt_assign:
 		bool attr_anyseq = false;
 		bool attr_allconst = false;
 		bool attr_allseq = false;
-		if (ast_stack.back()->children.back()->get_bool_attribute(ID::anyconst)) {
-			delete ast_stack.back()->children.back()->attributes.at(ID::anyconst);
-			ast_stack.back()->children.back()->attributes.erase(ID::anyconst);
+		if (extra->ast_stack.back()->children.back()->get_bool_attribute(ID::anyconst)) {
+			extra->ast_stack.back()->children.back()->attributes.erase(ID::anyconst);
 			attr_anyconst = true;
 		}
-		if (ast_stack.back()->children.back()->get_bool_attribute(ID::anyseq)) {
-			delete ast_stack.back()->children.back()->attributes.at(ID::anyseq);
-			ast_stack.back()->children.back()->attributes.erase(ID::anyseq);
+		if (extra->ast_stack.back()->children.back()->get_bool_attribute(ID::anyseq)) {
+			extra->ast_stack.back()->children.back()->attributes.erase(ID::anyseq);
 			attr_anyseq = true;
 		}
-		if (ast_stack.back()->children.back()->get_bool_attribute(ID::allconst)) {
-			delete ast_stack.back()->children.back()->attributes.at(ID::allconst);
-			ast_stack.back()->children.back()->attributes.erase(ID::allconst);
+		if (extra->ast_stack.back()->children.back()->get_bool_attribute(ID::allconst)) {
+			extra->ast_stack.back()->children.back()->attributes.erase(ID::allconst);
 			attr_allconst = true;
 		}
-		if (ast_stack.back()->children.back()->get_bool_attribute(ID::allseq)) {
-			delete ast_stack.back()->children.back()->attributes.at(ID::allseq);
-			ast_stack.back()->children.back()->attributes.erase(ID::allseq);
+		if (extra->ast_stack.back()->children.back()->get_bool_attribute(ID::allseq)) {
+			extra->ast_stack.back()->children.back()->attributes.erase(ID::allseq);
 			attr_allseq = true;
 		}
-		if (current_wire_rand || attr_anyconst || attr_anyseq || attr_allconst || attr_allseq) {
-			AstNode *wire = new AstNode(AST_IDENTIFIER);
-			AstNode *fcall = new AstNode(AST_FCALL);
-			wire->str = ast_stack.back()->children.back()->str;
-			fcall->str = current_wire_const ? "\\$anyconst" : "\\$anyseq";
+		if (extra->current_wire_rand || attr_anyconst || attr_anyseq || attr_allconst || attr_allseq) {
+			auto wire = std::make_unique<AstNode>(AST_IDENTIFIER);
+			auto fcall = std::make_unique<AstNode>(AST_FCALL);
+			wire->str = extra->ast_stack.back()->children.back()->str;
+			fcall->str = extra->current_wire_const ? "\\$anyconst" : "\\$anyseq";
 			if (attr_anyconst)
 				fcall->str = "\\$anyconst";
 			if (attr_anyseq)
@@ -2036,125 +2088,122 @@ wire_name_and_opt_assign:
 			if (attr_allseq)
 				fcall->str = "\\$allseq";
 			fcall->attributes[ID::reg] = AstNode::mkconst_str(RTLIL::unescape_id(wire->str));
-			ast_stack.back()->children.push_back(new AstNode(AST_ASSIGN, wire, fcall));
+			extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_ASSIGN, std::move(wire), std::move(fcall)));
 		}
 	} |
-	wire_name '=' expr {
-		AstNode *wire = new AstNode(AST_IDENTIFIER);
-		wire->str = ast_stack.back()->children.back()->str;
-		if (astbuf1->is_input) {
-			if (astbuf1->attributes.count(ID::defaultvalue))
-				delete astbuf1->attributes.at(ID::defaultvalue);
-			astbuf1->attributes[ID::defaultvalue] = $3;
+	wire_name TOK_EQ expr {
+		auto wire = std::make_unique<AstNode>(AST_IDENTIFIER);
+		wire->str = extra->ast_stack.back()->children.back()->str;
+		if (extra->astbuf1->is_input) {
+			extra->astbuf1->attributes[ID::defaultvalue] = std::move($3);
 		}
-		else if (astbuf1->is_reg || astbuf1->is_logic){
-			AstNode *assign = new AstNode(AST_ASSIGN_LE, wire, $3);
-			AstNode *block = new AstNode(AST_BLOCK, assign);
-			AstNode *init = new AstNode(AST_INITIAL, block);
+		else if (extra->astbuf1->is_reg || extra->astbuf1->is_logic){
+			auto assign = std::make_unique<AstNode>(AST_ASSIGN_LE, std::move(wire), std::move($3));
+			SET_AST_NODE_LOC(assign.get(), @1, @3);
+			auto block = std::make_unique<AstNode>(AST_BLOCK, std::move(assign));
+			SET_AST_NODE_LOC(block.get(), @1, @3);
+			auto init = std::make_unique<AstNode>(AST_INITIAL, std::move(block));
+			SET_AST_NODE_LOC(init.get(), @1, @3);
 
-			SET_AST_NODE_LOC(assign, @1, @3);
-			SET_AST_NODE_LOC(block, @1, @3);
-			SET_AST_NODE_LOC(init, @1, @3);
-
-			ast_stack.back()->children.push_back(init);
+			extra->ast_stack.back()->children.push_back(std::move(init));
 		}
 		else {
-			AstNode *assign = new AstNode(AST_ASSIGN, wire, $3);
-			SET_AST_NODE_LOC(assign, @1, @3);
-			ast_stack.back()->children.push_back(assign);
+			auto assign = std::make_unique<AstNode>(AST_ASSIGN, std::move(wire), std::move($3));
+			SET_AST_NODE_LOC(assign.get(), @1, @3);
+			extra->ast_stack.back()->children.push_back(std::move(assign));
 		}
 
 	};
 
 wire_name:
 	TOK_ID range_or_multirange {
-		if (astbuf1 == nullptr)
-			frontend_verilog_yyerror("Internal error - should not happen - no AST_WIRE node.");
-		AstNode *node = astbuf1->clone();
+		if (extra->astbuf1 == nullptr)
+			lexer->err("Internal error - should not happen - no AST_WIRE node.");
+		auto node = extra->astbuf1->clone();
 		node->str = *$1;
-		append_attr_clone(node, albuf);
-		if (astbuf2 != NULL)
-			node->children.push_back(astbuf2->clone());
-		if ($2 != NULL) {
+		append_attr_clone(node.get(), extra->albuf);
+		if (extra->astbuf2 != nullptr)
+			node->children.push_back(extra->astbuf2->clone());
+		if ($2 != nullptr) {
 			if (node->is_input || node->is_output)
-				frontend_verilog_yyerror("input/output/inout ports cannot have unpacked dimensions.");
-			if (!astbuf2 && !node->is_custom_type) {
-				addRange(node, 0, 0, false);
+				lexer->err("input/output/inout ports cannot have unpacked dimensions.");
+			if (!extra->astbuf2 && !node->is_custom_type) {
+				addRange(node.get(), 0, 0, false);
 			}
-			rewriteAsMemoryNode(node, $2);
+			rewriteAsMemoryNode(node.get(), std::move($2));
 		}
-		if (current_function_or_task) {
+		if (extra->current_function_or_task) {
 			if (node->is_input || node->is_output)
-				node->port_id = current_function_or_task_port_id++;
-		} else if (ast_stack.back()->type == AST_GENBLOCK) {
+				node->port_id = extra->current_function_or_task_port_id++;
+		} else if (extra->ast_stack.back()->type == AST_GENBLOCK) {
 			if (node->is_input || node->is_output)
-				frontend_verilog_yyerror("Cannot declare module port `%s' within a generate block.", $1->c_str());
+				lexer->err("Cannot declare module port `%s' within a generate block.", $1->c_str());
 		} else {
-			if (do_not_require_port_stubs && (node->is_input || node->is_output) && port_stubs.count(*$1) == 0) {
-				port_stubs[*$1] = ++port_counter;
+			if (extra->do_not_require_port_stubs && (node->is_input || node->is_output) && extra->port_stubs.count(*$1) == 0) {
+				extra->port_stubs[*$1] = ++extra->port_counter;
 			}
-			if (port_stubs.count(*$1) != 0) {
+			if (extra->port_stubs.count(*$1) != 0) {
 				if (!node->is_input && !node->is_output)
-					frontend_verilog_yyerror("Module port `%s' is neither input nor output.", $1->c_str());
-				if (node->is_reg && node->is_input && !node->is_output && !sv_mode)
-					frontend_verilog_yyerror("Input port `%s' is declared as register.", $1->c_str());
-				node->port_id = port_stubs[*$1];
-				port_stubs.erase(*$1);
+					lexer->err("Module port `%s' is neither input nor output.", $1->c_str());
+				if (node->is_reg && node->is_input && !node->is_output && !mode->sv)
+					lexer->err("Input port `%s' is declared as register.", $1->c_str());
+				node->port_id = extra->port_stubs[*$1];
+				extra->port_stubs.erase(*$1);
 			} else {
 				if (node->is_input || node->is_output)
-					frontend_verilog_yyerror("Module port `%s' is not declared in module header.", $1->c_str());
+					lexer->err("Module port `%s' is not declared in module header.", $1->c_str());
 			}
 		}
 		//FIXME: for some reason, TOK_ID has a location which always points to one column *after* the real last column...
-		SET_AST_NODE_LOC(node, @1, @1);
-		ast_stack.back()->children.push_back(node);
+		SET_AST_NODE_LOC(node.get(), @1, @1);
+		extra->ast_stack.back()->children.push_back(std::move(node));
 
-		delete $1;
 	};
 
 assign_stmt:
-	TOK_ASSIGN delay assign_expr_list ';';
+	TOK_ASSIGN delay assign_expr_list TOK_SEMICOL;
 
 assign_expr_list:
-	assign_expr | assign_expr_list ',' assign_expr;
+	assign_expr | assign_expr_list TOK_COMMA assign_expr;
 
 assign_expr:
-	lvalue '=' expr {
-		AstNode *node = new AstNode(AST_ASSIGN, $1, $3);
+	lvalue TOK_EQ expr {
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSIGN, std::move($1), std::move($3)));
 		SET_AST_NODE_LOC(node, @$, @$);
-		ast_stack.back()->children.push_back(node);
 	};
 
 type_name: TOK_ID		// first time seen
-	 | TOK_USER_TYPE	{ if (isInLocalScope($1)) frontend_verilog_yyerror("Duplicate declaration of TYPEDEF '%s'", $1->c_str()+1); }
+	 | TOK_USER_TYPE	{ if (extra->isInLocalScope($1)) lexer->err("Duplicate declaration of TYPEDEF '%s'", $1->c_str()+1); $$ = std::move($1); }
 	 ;
 
 typedef_decl:
-	TOK_TYPEDEF typedef_base_type range_or_multirange type_name range_or_multirange ';' {
-		astbuf1 = $2;
-		astbuf2 = checkRange(astbuf1, $3);
-		if (astbuf2)
-			astbuf1->children.push_back(astbuf2);
-
-		if ($5 != NULL) {
-			if (!astbuf2 && !astbuf1->is_custom_type) {
-				addRange(astbuf1, 0, 0, false);
-			}
-			rewriteAsMemoryNode(astbuf1, $5);
+	TOK_TYPEDEF typedef_base_type range_or_multirange type_name range_or_multirange TOK_SEMICOL {
+		extra->astbuf1 = std::move($2);
+		extra->astbuf2 = checkRange(extra->astbuf1.get(), std::move($3));
+		bool has_a_range = (bool)extra->astbuf2;
+		if (extra->astbuf2) {
+			extra->astbuf1->children.push_back(std::move(extra->astbuf2));
 		}
-		addTypedefNode($4, astbuf1); }
-	| TOK_TYPEDEF enum_struct_type type_name ';'   { addTypedefNode($3, $2); }
+
+		if ($5 != nullptr) {
+			if (!has_a_range && !extra->astbuf1->is_custom_type) {
+				addRange(extra->astbuf1.get(), 0, 0, false);
+			}
+			rewriteAsMemoryNode(extra->astbuf1.get(), std::move($5));
+		}
+		extra->addTypedefNode($4, std::move(extra->astbuf1)); }
+	| TOK_TYPEDEF enum_struct_type type_name TOK_SEMICOL   { extra->addTypedefNode($3, std::move($2)); }
 	;
 
 typedef_base_type:
 	hierarchical_type_id {
-		$$ = new AstNode(AST_WIRE);
+		$$ = std::make_unique<AstNode>(AST_WIRE);
 		$$->is_logic = true;
-		addWiretypeNode($1, $$);
+		extra->addWiretypeNode($1, $$.get());
 	} |
 	integer_vector_type opt_signedness_default_unsigned {
-		$$ = new AstNode(AST_WIRE);
-		if ($1 == TOK_REG) {
+		$$ = std::make_unique<AstNode>(AST_WIRE);
+		if ($1 == token::TOK_REG) {
 			$$->is_reg = true;
 		} else {
 			$$->is_logic = true;
@@ -2162,7 +2211,7 @@ typedef_base_type:
 		$$->is_signed = $2;
 	} |
 	integer_atom_type opt_signedness_default_signed {
-		$$ = new AstNode(AST_WIRE);
+		$$ = std::make_unique<AstNode>(AST_WIRE);
 		$$->is_logic = true;
 		$$->is_signed = $2;
 		$$->range_left = $1 - 1;
@@ -2170,27 +2219,25 @@ typedef_base_type:
 	};
 
 enum_struct_type:
-	  enum_type
-	| struct_type
+	  enum_type { $$ = std::move($1); }
+	| struct_type { $$ = std::move($1); }
 	;
 
 cell_stmt:
 	attr TOK_ID {
-		astbuf1 = new AstNode(AST_CELL);
-		append_attr(astbuf1, $1);
-		astbuf1->children.push_back(new AstNode(AST_CELLTYPE));
-		astbuf1->children[0]->str = *$2;
-		delete $2;
-	} cell_parameter_list_opt cell_list ';' {
-		delete astbuf1;
+		extra->astbuf1 = std::make_unique<AstNode>(AST_CELL);
+		append_attr(extra->astbuf1.get(), $1);
+		extra->astbuf1->children.push_back(std::make_unique<AstNode>(AST_CELLTYPE));
+		extra->astbuf1->children[0]->str = *$2;
+	} cell_parameter_list_opt cell_list TOK_SEMICOL {
+		(void)extra->astbuf1.reset();
 	} |
 	attr tok_prim_wrapper delay {
-		astbuf1 = new AstNode(AST_PRIMITIVE);
-		astbuf1->str = *$2;
-		append_attr(astbuf1, $1);
-		delete $2;
-	} prim_list ';' {
-		delete astbuf1;
+		extra->astbuf1 = std::make_unique<AstNode>(AST_PRIMITIVE);
+		extra->astbuf1->str = *$2;
+		append_attr(extra->astbuf1.get(), $1);
+	} prim_list TOK_SEMICOL {
+		(void)extra->astbuf1.reset();
 	};
 
 tok_prim_wrapper:
@@ -2203,91 +2250,99 @@ tok_prim_wrapper:
 
 cell_list:
 	single_cell |
-	cell_list ',' single_cell;
+	cell_list TOK_COMMA single_cell;
 
 single_cell:
 	single_cell_no_array | single_cell_arraylist;
 
 single_cell_no_array:
 	TOK_ID {
-		astbuf2 = astbuf1->clone();
-		if (astbuf2->type != AST_PRIMITIVE)
-			astbuf2->str = *$1;
-		delete $1;
-		ast_stack.back()->children.push_back(astbuf2);
-	} '(' cell_port_list ')' {
-		SET_AST_NODE_LOC(astbuf2, @1, @$);
+		extra->astbuf2 = extra->astbuf1->clone();
+		if (extra->astbuf2->type != AST_PRIMITIVE)
+			extra->astbuf2->str = *$1;
+		// TODO optimize again
+		extra->cell_hack = extra->astbuf2.get();
+		extra->ast_stack.back()->children.push_back(std::move(extra->astbuf2));
+	} TOK_LPAREN cell_port_list TOK_RPAREN {
+		log_assert(extra->cell_hack);
+		SET_AST_NODE_LOC(extra->cell_hack, @1, @$);
+		extra->cell_hack = nullptr;
 	}
 
 single_cell_arraylist:
 	TOK_ID non_opt_range {
-		astbuf2 = astbuf1->clone();
-		if (astbuf2->type != AST_PRIMITIVE)
-			astbuf2->str = *$1;
-		delete $1;
-		ast_stack.back()->children.push_back(new AstNode(AST_CELLARRAY, $2, astbuf2));
-	} '(' cell_port_list ')'{
-		SET_AST_NODE_LOC(astbuf2, @1, @$);
+		extra->astbuf2 = extra->astbuf1->clone();
+		if (extra->astbuf2->type != AST_PRIMITIVE)
+			extra->astbuf2->str = *$1;
+		// TODO optimize again
+		extra->cell_hack = extra->astbuf2.get();
+		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_CELLARRAY, std::move($2), std::move(extra->astbuf2)));
+	} TOK_LPAREN cell_port_list TOK_RPAREN{
+		log_assert(extra->cell_hack);
+		SET_AST_NODE_LOC(extra->cell_hack, @1, @$);
+		extra->cell_hack = nullptr;
 	};
 
 cell_list_no_array:
 	single_cell_no_array |
-	cell_list_no_array ',' single_cell_no_array;
+	cell_list_no_array TOK_COMMA single_cell_no_array;
 
 prim_list:
 	single_prim |
-	prim_list ',' single_prim;
+	prim_list TOK_COMMA single_prim;
 
 single_prim:
 	single_cell |
 	/* no name */ {
-		astbuf2 = astbuf1->clone();
-		ast_stack.back()->children.push_back(astbuf2);
-	} '(' cell_port_list ')' {
-		SET_AST_NODE_LOC(astbuf2, @1, @$);
+		extra->astbuf2 = extra->astbuf1->clone();
+		log_assert(!extra->cell_hack);
+		extra->cell_hack = extra->astbuf2.get();
+		// TODO optimize again
+		extra->ast_stack.back()->children.push_back(std::move(extra->astbuf2));
+	} TOK_LPAREN cell_port_list TOK_RPAREN {
+		log_assert(extra->cell_hack);
+		SET_AST_NODE_LOC(extra->cell_hack, @1, @$);
+		extra->cell_hack = nullptr;
 	}
 
 cell_parameter_list_opt:
-	'#' '(' cell_parameter_list ')' | %empty;
+	TOK_HASH TOK_LPAREN cell_parameter_list TOK_RPAREN | %empty;
 
 cell_parameter_list:
-	cell_parameter | cell_parameter_list ',' cell_parameter;
+	cell_parameter | cell_parameter_list TOK_COMMA cell_parameter;
 
 cell_parameter:
 	%empty |
 	expr {
-		AstNode *node = new AstNode(AST_PARASET);
-		astbuf1->children.push_back(node);
-		node->children.push_back($1);
+		auto node = std::make_unique<AstNode>(AST_PARASET);
+		node->children.push_back(std::move($1));
+		extra->astbuf1->children.push_back(std::move(node));
 	} |
-	'.' TOK_ID '(' ')' {
-		// delete unused TOK_ID
-		delete $2;
+	TOK_DOT TOK_ID TOK_LPAREN TOK_RPAREN {
+		// just ignore empty parameters
 	} |
-	'.' TOK_ID '(' expr ')' {
-		AstNode *node = new AstNode(AST_PARASET);
+	TOK_DOT TOK_ID TOK_LPAREN expr TOK_RPAREN {
+		auto node = std::make_unique<AstNode>(AST_PARASET);
 		node->str = *$2;
-		astbuf1->children.push_back(node);
-		node->children.push_back($4);
-		delete $2;
+		node->children.push_back(std::move($4));
+		extra->astbuf1->children.push_back(std::move(node));
 	};
 
 cell_port_list:
 	cell_port_list_rules {
 		// remove empty args from end of list
-		while (!astbuf2->children.empty()) {
-			AstNode *node = astbuf2->children.back();
+		while (!extra->cell_hack->children.empty()) {
+			auto& node = extra->cell_hack->children.back();
 			if (node->type != AST_ARGUMENT) break;
 			if (!node->children.empty()) break;
 			if (!node->str.empty()) break;
-			astbuf2->children.pop_back();
-			delete node;
+			extra->cell_hack->children.pop_back();
 		}
 
 		// check port types
 		bool has_positional_args = false;
 		bool has_named_args = false;
-		for (auto node : astbuf2->children) {
+		for (auto& node : extra->cell_hack->children) {
 			if (node->type != AST_ARGUMENT) continue;
 			if (node->str.empty())
 				has_positional_args = true;
@@ -2296,52 +2351,49 @@ cell_port_list:
 		}
 
 		if (has_positional_args && has_named_args)
-			frontend_verilog_yyerror("Mix of positional and named cell ports.");
+			lexer->err("Mix of positional and named cell ports.");
 	};
 
 cell_port_list_rules:
-	cell_port | cell_port_list_rules ',' cell_port;
+	cell_port | cell_port_list_rules TOK_COMMA cell_port;
 
 cell_port:
 	attr {
-		AstNode *node = new AstNode(AST_ARGUMENT);
-		astbuf2->children.push_back(node);
+		auto node = std::make_unique<AstNode>(AST_ARGUMENT);
+		extra->cell_hack->children.push_back(std::move(node));
 		free_attr($1);
 	} |
 	attr expr {
-		AstNode *node = new AstNode(AST_ARGUMENT);
-		astbuf2->children.push_back(node);
-		node->children.push_back($2);
+		auto node = std::make_unique<AstNode>(AST_ARGUMENT);
+		node->children.push_back(std::move($2));
+		extra->cell_hack->children.push_back(std::move(node));
 		free_attr($1);
 	} |
-	attr '.' TOK_ID '(' expr ')' {
-		AstNode *node = new AstNode(AST_ARGUMENT);
+	attr TOK_DOT TOK_ID TOK_LPAREN expr TOK_RPAREN {
+		auto node = std::make_unique<AstNode>(AST_ARGUMENT);
 		node->str = *$3;
-		astbuf2->children.push_back(node);
-		node->children.push_back($5);
-		delete $3;
+		node->children.push_back(std::move($5));
+		extra->cell_hack->children.push_back(std::move(node));
 		free_attr($1);
 	} |
-	attr '.' TOK_ID '(' ')' {
-		AstNode *node = new AstNode(AST_ARGUMENT);
+	attr TOK_DOT TOK_ID TOK_LPAREN TOK_RPAREN {
+		auto node = std::make_unique<AstNode>(AST_ARGUMENT);
 		node->str = *$3;
-		astbuf2->children.push_back(node);
-		delete $3;
+		extra->cell_hack->children.push_back(std::move(node));
 		free_attr($1);
 	} |
-	attr '.' TOK_ID {
-		AstNode *node = new AstNode(AST_ARGUMENT);
+	attr TOK_DOT TOK_ID {
+		auto node = std::make_unique<AstNode>(AST_ARGUMENT);
 		node->str = *$3;
-		astbuf2->children.push_back(node);
-		node->children.push_back(new AstNode(AST_IDENTIFIER));
+		node->children.push_back(std::make_unique<AstNode>(AST_IDENTIFIER));
 		node->children.back()->str = *$3;
-		delete $3;
+		extra->cell_hack->children.push_back(std::move(node));
 		free_attr($1);
 	} |
 	attr TOK_WILDCARD_CONNECT {
-		if (!sv_mode)
-			frontend_verilog_yyerror("Wildcard port connections are only supported in SystemVerilog mode.");
-		astbuf2->attributes[ID::wildcard_port_conns] = AstNode::mkconst_int(1, false);
+		if (!mode->sv)
+			lexer->err("Wildcard port connections are only supported in SystemVerilog mode.");
+		extra->cell_hack->attributes[ID::wildcard_port_conns] = AstNode::mkconst_int(1, false);
 		free_attr($1);
 	};
 
@@ -2363,100 +2415,88 @@ always_or_always_ff:
 
 always_stmt:
 	attr always_or_always_ff {
-		AstNode *node = new AstNode(AST_ALWAYS);
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_ALWAYS));
 		append_attr(node, $1);
 		if ($2)
 			node->attributes[ID::always_ff] = AstNode::mkconst_int(1, false);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
 	} always_cond {
-		AstNode *block = new AstNode(AST_BLOCK);
-		ast_stack.back()->children.push_back(block);
-		ast_stack.push_back(block);
+		(void)extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
 	} behavioral_stmt {
-		SET_AST_NODE_LOC(ast_stack.back(), @6, @6);
-		ast_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @6, @6);
+		extra->ast_stack.pop_back();
 
-		SET_AST_NODE_LOC(ast_stack.back(), @2, @$);
-		ast_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @$);
+		extra->ast_stack.pop_back();
 
 		SET_RULE_LOC(@$, @2, @$);
 	} |
 	attr always_comb_or_latch {
-		AstNode *node = new AstNode(AST_ALWAYS);
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_ALWAYS));
 		append_attr(node, $1);
 		if ($2)
 			node->attributes[ID::always_latch] = AstNode::mkconst_int(1, false);
 		else
 			node->attributes[ID::always_comb] = AstNode::mkconst_int(1, false);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
-		AstNode *block = new AstNode(AST_BLOCK);
-		ast_stack.back()->children.push_back(block);
-		ast_stack.push_back(block);
+		(void)extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
 	} behavioral_stmt {
-		ast_stack.pop_back();
-		ast_stack.pop_back();
+		extra->ast_stack.pop_back();
+		extra->ast_stack.pop_back();
 	} |
 	attr TOK_INITIAL {
-		AstNode *node = new AstNode(AST_INITIAL);
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_INITIAL));
 		append_attr(node, $1);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
-		AstNode *block = new AstNode(AST_BLOCK);
-		ast_stack.back()->children.push_back(block);
-		ast_stack.push_back(block);
+		(void)extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
 	} behavioral_stmt {
-		ast_stack.pop_back();
-		ast_stack.pop_back();
+		extra->ast_stack.pop_back();
+		extra->ast_stack.pop_back();
 	};
 
 always_cond:
-	'@' '(' always_events ')' |
-	'@' '(' '*' ')' |
-	'@' ATTR_BEGIN ')' |
-	'@' '(' ATTR_END |
-	'@' '*' |
+	TOK_AT TOK_LPAREN always_events TOK_RPAREN |
+	TOK_AT TOK_LPAREN TOK_ASTER TOK_RPAREN |
+	TOK_AT ATTR_BEGIN TOK_RPAREN |
+	TOK_AT TOK_LPAREN ATTR_END |
+	TOK_AT TOK_ASTER |
 	%empty;
 
 always_events:
 	always_event |
 	always_events TOK_OR always_event |
-	always_events ',' always_event;
+	always_events TOK_COMMA always_event;
 
 always_event:
 	TOK_POSEDGE expr {
-		AstNode *node = new AstNode(AST_POSEDGE);
-		SET_AST_NODE_LOC(node, @1, @1);
-		ast_stack.back()->children.push_back(node);
-		node->children.push_back($2);
+		auto node = std::make_unique<AstNode>(AST_POSEDGE);
+		SET_AST_NODE_LOC(node.get(), @1, @1);
+		node->children.push_back(std::move($2));
+		extra->ast_stack.back()->children.push_back(std::move(node));
 	} |
 	TOK_NEGEDGE expr {
-		AstNode *node = new AstNode(AST_NEGEDGE);
-		SET_AST_NODE_LOC(node, @1, @1);
-		ast_stack.back()->children.push_back(node);
-		node->children.push_back($2);
+		auto node = std::make_unique<AstNode>(AST_NEGEDGE);
+		SET_AST_NODE_LOC(node.get(), @1, @1);
+		node->children.push_back(std::move($2));
+		extra->ast_stack.back()->children.push_back(std::move(node));
 	} |
 	expr {
-		AstNode *node = new AstNode(AST_EDGE);
-		ast_stack.back()->children.push_back(node);
-		node->children.push_back($1);
+		auto node = std::make_unique<AstNode>(AST_EDGE);
+		node->children.push_back(std::move($1));
+		extra->ast_stack.back()->children.push_back(std::move(node));
 	};
 
 opt_label:
-	':' TOK_ID {
+	TOK_COL TOK_ID {
 		$$ = $2;
 	} |
 	%empty {
-		$$ = NULL;
+		$$ = nullptr;
 	};
 
 opt_sva_label:
-	TOK_SVA_LABEL ':' {
+	TOK_SVA_LABEL TOK_COL {
 		$$ = $1;
 	} |
 	%empty {
-		$$ = NULL;
+		$$ = nullptr;
 	};
 
 opt_property:
@@ -2472,21 +2512,19 @@ opt_property:
 
 modport_stmt:
     TOK_MODPORT TOK_ID {
-        AstNode *modport = new AstNode(AST_MODPORT);
-        ast_stack.back()->children.push_back(modport);
-        ast_stack.push_back(modport);
+		AstNode* modport = extra->pushChild(std::make_unique<AstNode>(AST_MODPORT));
         modport->str = *$2;
-        delete $2;
+
     }  modport_args_opt {
-        ast_stack.pop_back();
-        log_assert(ast_stack.size() == 2);
-    } ';'
+        extra->ast_stack.pop_back();
+        log_assert(extra->ast_stack.size() == 2);
+    } TOK_SEMICOL
 
 modport_args_opt:
-    '(' ')' | '(' modport_args optional_comma ')';
+    TOK_LPAREN TOK_RPAREN | TOK_LPAREN modport_args optional_comma TOK_RPAREN;
 
 modport_args:
-    modport_arg | modport_args ',' modport_arg;
+    modport_arg | modport_args TOK_COMMA modport_arg;
 
 modport_arg:
     modport_type_token modport_member |
@@ -2494,222 +2532,174 @@ modport_arg:
 
 modport_member:
     TOK_ID {
-        AstNode *modport_member = new AstNode(AST_MODPORTMEMBER);
-        ast_stack.back()->children.push_back(modport_member);
+		AstNode* modport_member = extra->saveChild(std::make_unique<AstNode>(AST_MODPORTMEMBER));
         modport_member->str = *$1;
-        modport_member->is_input = current_modport_input;
-        modport_member->is_output = current_modport_output;
-        delete $1;
+        modport_member->is_input = extra->current_modport_input;
+        modport_member->is_output = extra->current_modport_output;
+
     }
 
 modport_type_token:
-    TOK_INPUT {current_modport_input = 1; current_modport_output = 0;} | TOK_OUTPUT {current_modport_input = 0; current_modport_output = 1;}
+    TOK_INPUT {extra->current_modport_input = 1; extra->current_modport_output = 0;} | TOK_OUTPUT {extra->current_modport_input = 0; extra->current_modport_output = 1;}
 
 assert:
-	opt_sva_label TOK_ASSERT opt_property '(' expr ')' ';' {
-		if (noassert_mode) {
-			delete $5;
+	opt_sva_label TOK_ASSERT opt_property TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
+		if (mode->noassert) {
+
 		} else {
-			AstNode *node = new AstNode(assume_asserts_mode ? AST_ASSUME : AST_ASSERT, $5);
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assume_asserts ? AST_ASSUME : AST_ASSERT, std::move($5)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @6);
 			if ($1 != nullptr)
 				node->str = *$1;
-			ast_stack.back()->children.push_back(node);
 		}
-		if ($1 != nullptr)
-			delete $1;
 	} |
-	opt_sva_label TOK_ASSUME opt_property '(' expr ')' ';' {
-		if (noassume_mode) {
-			delete $5;
+	opt_sva_label TOK_ASSUME opt_property TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
+		if (mode->noassume) {
 		} else {
-			AstNode *node = new AstNode(assert_assumes_mode ? AST_ASSERT : AST_ASSUME, $5);
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assert_assumes ? AST_ASSERT : AST_ASSUME, std::move($5)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @6);
 			if ($1 != nullptr)
 				node->str = *$1;
-			ast_stack.back()->children.push_back(node);
 		}
-		if ($1 != nullptr)
-			delete $1;
 	} |
-	opt_sva_label TOK_ASSERT opt_property '(' TOK_EVENTUALLY expr ')' ';' {
-		if (noassert_mode) {
-			delete $6;
+	opt_sva_label TOK_ASSERT opt_property TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
+		if (mode->noassert) {
 		} else {
-			AstNode *node = new AstNode(assume_asserts_mode ? AST_FAIR : AST_LIVE, $6);
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assume_asserts ? AST_FAIR : AST_LIVE, std::move($6)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @7);
 			if ($1 != nullptr)
 				node->str = *$1;
-			ast_stack.back()->children.push_back(node);
 		}
-		if ($1 != nullptr)
-			delete $1;
 	} |
-	opt_sva_label TOK_ASSUME opt_property '(' TOK_EVENTUALLY expr ')' ';' {
-		if (noassume_mode) {
-			delete $6;
+	opt_sva_label TOK_ASSUME opt_property TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
+		if (mode->noassume) {
 		} else {
-			AstNode *node = new AstNode(assert_assumes_mode ? AST_LIVE : AST_FAIR, $6);
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assert_assumes ? AST_LIVE : AST_FAIR, std::move($6)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @7);
 			if ($1 != nullptr)
 				node->str = *$1;
-			ast_stack.back()->children.push_back(node);
 		}
-		if ($1 != nullptr)
-			delete $1;
 	} |
-	opt_sva_label TOK_COVER opt_property '(' expr ')' ';' {
-		AstNode *node = new AstNode(AST_COVER, $5);
+	opt_sva_label TOK_COVER opt_property TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_COVER, std::move($5)));
 		SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @6);
 		if ($1 != nullptr) {
 			node->str = *$1;
-			delete $1;
 		}
-		ast_stack.back()->children.push_back(node);
 	} |
-	opt_sva_label TOK_COVER opt_property '(' ')' ';' {
-		AstNode *node = new AstNode(AST_COVER, AstNode::mkconst_int(1, false));
+	opt_sva_label TOK_COVER opt_property TOK_LPAREN TOK_RPAREN TOK_SEMICOL {
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_COVER, AstNode::mkconst_int(1, false)));
 		SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @5);
 		if ($1 != nullptr) {
 			node->str = *$1;
-			delete $1;
 		}
-		ast_stack.back()->children.push_back(node);
 	} |
-	opt_sva_label TOK_COVER ';' {
-		AstNode *node = new AstNode(AST_COVER, AstNode::mkconst_int(1, false));
+	opt_sva_label TOK_COVER TOK_SEMICOL {
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_COVER, AstNode::mkconst_int(1, false)));
 		SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @2);
 		if ($1 != nullptr) {
 			node->str = *$1;
-			delete $1;
 		}
-		ast_stack.back()->children.push_back(node);
 	} |
-	opt_sva_label TOK_RESTRICT opt_property '(' expr ')' ';' {
-		if (norestrict_mode) {
-			delete $5;
+	opt_sva_label TOK_RESTRICT opt_property TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
+		if (mode->norestrict) {
 		} else {
-			AstNode *node = new AstNode(AST_ASSUME, $5);
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSUME, std::move($5)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @6);
 			if ($1 != nullptr)
 				node->str = *$1;
-			ast_stack.back()->children.push_back(node);
 		}
 		if (!$3)
-			log_file_warning(current_filename, get_line_num(), "SystemVerilog does not allow \"restrict\" without \"property\".\n");
-		if ($1 != nullptr)
-			delete $1;
+			log_file_warning(current_filename, @$.begin.line, "SystemVerilog does not allow \"restrict\" without \"property\".\n");
 	} |
-	opt_sva_label TOK_RESTRICT opt_property '(' TOK_EVENTUALLY expr ')' ';' {
-		if (norestrict_mode) {
-			delete $6;
+	opt_sva_label TOK_RESTRICT opt_property TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
+		if (mode->norestrict) {
 		} else {
-			AstNode *node = new AstNode(AST_FAIR, $6);
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_FAIR, std::move($6)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @7);
 			if ($1 != nullptr)
 				node->str = *$1;
-			ast_stack.back()->children.push_back(node);
 		}
 		if (!$3)
-			log_file_warning(current_filename, get_line_num(), "SystemVerilog does not allow \"restrict\" without \"property\".\n");
-		if ($1 != nullptr)
-			delete $1;
+			log_file_warning(current_filename, @$.begin.line, "SystemVerilog does not allow \"restrict\" without \"property\".\n");
 	};
 
 assert_property:
-	opt_sva_label TOK_ASSERT TOK_PROPERTY '(' expr ')' ';' {
-		AstNode *node = new AstNode(assume_asserts_mode ? AST_ASSUME : AST_ASSERT, $5);
+	opt_sva_label TOK_ASSERT TOK_PROPERTY TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assume_asserts ? AST_ASSUME : AST_ASSERT, std::move($5)));
 		SET_AST_NODE_LOC(node, @1, @6);
-		ast_stack.back()->children.push_back(node);
 		if ($1 != nullptr) {
-			ast_stack.back()->children.back()->str = *$1;
-			delete $1;
+			extra->ast_stack.back()->children.back()->str = *$1;
 		}
 	} |
-	opt_sva_label TOK_ASSUME TOK_PROPERTY '(' expr ')' ';' {
-		AstNode *node = new AstNode(AST_ASSUME, $5);
+	opt_sva_label TOK_ASSUME TOK_PROPERTY TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSUME, std::move($5)));
 		SET_AST_NODE_LOC(node, @1, @6);
-		ast_stack.back()->children.push_back(node);
 		if ($1 != nullptr) {
-			ast_stack.back()->children.back()->str = *$1;
-			delete $1;
+			extra->ast_stack.back()->children.back()->str = *$1;
 		}
 	} |
-	opt_sva_label TOK_ASSERT TOK_PROPERTY '(' TOK_EVENTUALLY expr ')' ';' {
-		AstNode *node = new AstNode(assume_asserts_mode ? AST_FAIR : AST_LIVE, $6);
+	opt_sva_label TOK_ASSERT TOK_PROPERTY TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assume_asserts ? AST_FAIR : AST_LIVE, std::move($6)));
 		SET_AST_NODE_LOC(node, @1, @7);
-		ast_stack.back()->children.push_back(node);
 		if ($1 != nullptr) {
-			ast_stack.back()->children.back()->str = *$1;
-			delete $1;
+			extra->ast_stack.back()->children.back()->str = *$1;
 		}
 	} |
-	opt_sva_label TOK_ASSUME TOK_PROPERTY '(' TOK_EVENTUALLY expr ')' ';' {
-		AstNode *node = new AstNode(AST_FAIR, $6);
+	opt_sva_label TOK_ASSUME TOK_PROPERTY TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_FAIR, std::move($6)));
 		SET_AST_NODE_LOC(node, @1, @7);
-		ast_stack.back()->children.push_back(node);
 		if ($1 != nullptr) {
-			ast_stack.back()->children.back()->str = *$1;
-			delete $1;
+			extra->ast_stack.back()->children.back()->str = *$1;
 		}
 	} |
-	opt_sva_label TOK_COVER TOK_PROPERTY '(' expr ')' ';' {
-		AstNode *node = new AstNode(AST_COVER, $5);
+	opt_sva_label TOK_COVER TOK_PROPERTY TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_COVER, std::move($5)));
 		SET_AST_NODE_LOC(node, @1, @6);
-		ast_stack.back()->children.push_back(node);
 		if ($1 != nullptr) {
-			ast_stack.back()->children.back()->str = *$1;
-			delete $1;
+			extra->ast_stack.back()->children.back()->str = *$1;
 		}
 	} |
-	opt_sva_label TOK_RESTRICT TOK_PROPERTY '(' expr ')' ';' {
-		if (norestrict_mode) {
-			delete $5;
+	opt_sva_label TOK_RESTRICT TOK_PROPERTY TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
+		if (mode->norestrict) {
 		} else {
-			AstNode *node = new AstNode(AST_ASSUME, $5);
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSUME, std::move($5)));
 			SET_AST_NODE_LOC(node, @1, @6);
-			ast_stack.back()->children.push_back(node);
 			if ($1 != nullptr) {
-				ast_stack.back()->children.back()->str = *$1;
-				delete $1;
+				extra->ast_stack.back()->children.back()->str = *$1;
 			}
 		}
 	} |
-	opt_sva_label TOK_RESTRICT TOK_PROPERTY '(' TOK_EVENTUALLY expr ')' ';' {
-		if (norestrict_mode) {
-			delete $6;
+	opt_sva_label TOK_RESTRICT TOK_PROPERTY TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
+		if (mode->norestrict) {
 		} else {
-			AstNode *node = new AstNode(AST_FAIR, $6);
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_FAIR, std::move($6)));
 			SET_AST_NODE_LOC(node, @1, @7);
-			ast_stack.back()->children.push_back(node);
 			if ($1 != nullptr) {
-				ast_stack.back()->children.back()->str = *$1;
-				delete $1;
+				extra->ast_stack.back()->children.back()->str = *$1;
 			}
 		}
 	};
 
 simple_behavioral_stmt:
-	attr lvalue '=' delay expr {
-		AstNode *node = new AstNode(AST_ASSIGN_EQ, $2, $5);
-		ast_stack.back()->children.push_back(node);
+	attr lvalue TOK_EQ delay expr {
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move($2), std::move($5)));
 		SET_AST_NODE_LOC(node, @2, @5);
 		append_attr(node, $1);
 	} |
 	attr lvalue attr inc_or_dec_op {
-		addIncOrDecStmt($1, $2, $3, $4, @1, @4);
+		extra->addIncOrDecStmt($1, std::move($2), $3, $4, @1, @4);
 	} |
 	attr inc_or_dec_op attr lvalue {
-		addIncOrDecStmt($1, $4, $3, $2, @1, @4);
+		extra->addIncOrDecStmt($1, std::move($4), $3, $2, @1, @4);
 	} |
 	attr lvalue OP_LE delay expr {
-		AstNode *node = new AstNode(AST_ASSIGN_LE, $2, $5);
-		ast_stack.back()->children.push_back(node);
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSIGN_LE, std::move($2), std::move($5)));
 		SET_AST_NODE_LOC(node, @2, @5);
 		append_attr(node, $1);
 	} |
 	attr lvalue asgn_binop delay expr {
-		addAsgnBinopStmt($1, $2, $3, $5, @2, @5);
+		(void)extra->addAsgnBinopStmt($1, std::move($2), $3, std::move($5), @2, @5);
 	};
 
 asgn_binop:
@@ -2733,202 +2723,184 @@ inc_or_dec_op:
 	TOK_DECREMENT { $$ = AST_SUB; } ;
 
 for_initialization:
-	TOK_ID '=' expr {
-		AstNode *ident = new AstNode(AST_IDENTIFIER);
+	TOK_ID TOK_EQ expr {
+		auto ident = std::make_unique<AstNode>(AST_IDENTIFIER);
 		ident->str = *$1;
-		AstNode *node = new AstNode(AST_ASSIGN_EQ, ident, $3);
-		ast_stack.back()->children.push_back(node);
-		SET_AST_NODE_LOC(node, @1, @3);
-		delete $1;
+		auto node = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(ident), std::move($3));
+		SET_AST_NODE_LOC(node.get(), @1, @3);
+		extra->ast_stack.back()->children.push_back(std::move(node));
 	} |
 	non_io_wire_type range TOK_ID {
-		frontend_verilog_yyerror("For loop variable declaration is missing initialization!");
+		lexer->err("For loop variable declaration is missing initialization!");
 	} |
-	non_io_wire_type range TOK_ID '=' expr {
-		if (!sv_mode)
-			frontend_verilog_yyerror("For loop inline variable declaration is only supported in SystemVerilog mode!");
+	non_io_wire_type range TOK_ID TOK_EQ expr {
+		if (!mode->sv)
+			lexer->err("For loop inline variable declaration is only supported in SystemVerilog mode!");
 
 		// loop variable declaration
-		AstNode *wire = $1;
-		AstNode *range = checkRange(wire, $2);
+		auto wire = std::move($1);
+		auto range = checkRange(wire.get(), std::move($2));
+		SET_AST_NODE_LOC(wire.get(), @1, @3);
+		SET_AST_NODE_LOC(range.get(), @2, @2);
 		if (range != nullptr)
-			wire->children.push_back(range);
-		SET_AST_NODE_LOC(wire, @1, @3);
-		SET_AST_NODE_LOC(range, @2, @2);
+			wire->children.push_back(std::move(range));
 
-		AstNode *ident = new AstNode(AST_IDENTIFIER);
+		auto ident = std::make_unique<AstNode>(AST_IDENTIFIER);
 		ident->str = *$3;
 		wire->str = *$3;
-		delete $3;
 
-		AstNode *loop = ast_stack.back();
-		AstNode *parent = ast_stack.at(ast_stack.size() - 2);
-		log_assert(parent->children.back() == loop);
+		AstNode *parent = extra->ast_stack.at(extra->ast_stack.size() - 2);
+		auto& loop = parent->children.back();
+		log_assert(extra->ast_stack.back() == loop.get());
 
 		// loop variable initialization
-		AstNode *asgn = new AstNode(AST_ASSIGN_EQ, ident, $5);
-		loop->children.push_back(asgn);
-		SET_AST_NODE_LOC(asgn, @3, @5);
-		SET_AST_NODE_LOC(ident, @3, @3);
+		SET_AST_NODE_LOC(ident.get(), @3, @3);
+		auto asgn = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(ident), std::move($5));
+		SET_AST_NODE_LOC(asgn.get(), @3, @5);
+		loop->children.push_back(std::move(asgn));
 
 		// inject a wrapping block to declare the loop variable and
 		// contain the current loop
-		AstNode *wrapper = new AstNode(AST_BLOCK);
+		auto wrapper = std::make_unique<AstNode>(AST_BLOCK);
 		wrapper->str = "$fordecl_block$" + std::to_string(autoidx++);
-		wrapper->children.push_back(wire);
-		wrapper->children.push_back(loop);
-		parent->children.back() = wrapper; // replaces `loop`
+		wrapper->children.push_back(std::move(wire));
+		wrapper->children.push_back(std::move(loop));
+		parent->children.back() = std::move(wrapper);
 	};
 
 // this production creates the obligatory if-else shift/reduce conflict
 behavioral_stmt:
 	defattr | assert | wire_decl | param_decl | localparam_decl | typedef_decl |
 	non_opt_delay behavioral_stmt |
-	simple_behavioral_stmt ';' |
-	attr ';' {
+	simple_behavioral_stmt TOK_SEMICOL |
+	attr TOK_SEMICOL {
 		free_attr($1);
 	} |
 	attr hierarchical_id {
-		AstNode *node = new AstNode(AST_TCALL);
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_TCALL));
 		node->str = *$2;
-		delete $2;
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
 		append_attr(node, $1);
-	} opt_arg_list ';'{
-		SET_AST_NODE_LOC(ast_stack.back(), @2, @5);
-		ast_stack.pop_back();
+	} opt_arg_list TOK_SEMICOL{
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @5);
+		extra->ast_stack.pop_back();
 	} |
 	attr TOK_MSG_TASKS {
-		AstNode *node = new AstNode(AST_TCALL);
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_TCALL));
 		node->str = *$2;
-		delete $2;
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
 		append_attr(node, $1);
-	} opt_arg_list ';'{
-		SET_AST_NODE_LOC(ast_stack.back(), @2, @5);
-		ast_stack.pop_back();
+	} opt_arg_list TOK_SEMICOL{
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @5);
+		extra->ast_stack.pop_back();
 	} |
 	attr TOK_BEGIN {
-		enterTypeScope();
+		extra->enterTypeScope();
 	} opt_label {
-		AstNode *node = new AstNode(AST_BLOCK);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
 		append_attr(node, $1);
-		if ($4 != NULL)
+		if ($4 != nullptr)
 			node->str = *$4;
 	} behavioral_stmt_list TOK_END opt_label {
-		exitTypeScope();
-		checkLabelsMatch("Begin label", $4, $8);
-		AstNode *node = ast_stack.back();
+		extra->exitTypeScope();
+		checkLabelsMatch(@8, "Begin label", $4, $8);
+		AstNode *node = extra->ast_stack.back();
 		// In SystemVerilog, unnamed blocks with block item declarations
 		// create an implicit hierarchy scope
-		if (sv_mode && node->str.empty())
-		    for (const AstNode* child : node->children)
+		if (mode->sv && node->str.empty())
+		    for (auto& child : node->children)
 			if (child->type == AST_WIRE || child->type == AST_MEMORY || child->type == AST_PARAMETER
 				|| child->type == AST_LOCALPARAM || child->type == AST_TYPEDEF) {
 			    node->str = "$unnamed_block$" + std::to_string(autoidx++);
 			    break;
 			}
-		SET_AST_NODE_LOC(ast_stack.back(), @2, @8);
-		delete $4;
-		delete $8;
-		ast_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @8);
+		extra->ast_stack.pop_back();
 	} |
-	attr TOK_FOR '(' {
-		AstNode *node = new AstNode(AST_FOR);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
+	attr TOK_FOR TOK_LPAREN {
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_FOR));
 		append_attr(node, $1);
-	} for_initialization ';' expr {
-		ast_stack.back()->children.push_back($7);
-	} ';' simple_behavioral_stmt ')' {
-		AstNode *block = new AstNode(AST_BLOCK);
+	} for_initialization TOK_SEMICOL expr {
+		extra->ast_stack.back()->children.push_back(std::move($7));
+	} TOK_SEMICOL simple_behavioral_stmt TOK_RPAREN {
+		AstNode* block = extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
 		block->str = "$for_loop$" + std::to_string(autoidx++);
-		ast_stack.back()->children.push_back(block);
-		ast_stack.push_back(block);
 	} behavioral_stmt {
-		SET_AST_NODE_LOC(ast_stack.back(), @13, @13);
-		ast_stack.pop_back();
-		SET_AST_NODE_LOC(ast_stack.back(), @2, @13);
-		ast_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @13, @13);
+		extra->ast_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @13);
+		extra->ast_stack.pop_back();
 	} |
-	attr TOK_WHILE '(' expr ')' {
-		AstNode *node = new AstNode(AST_WHILE);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
+	attr TOK_WHILE TOK_LPAREN expr TOK_RPAREN {
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_WHILE));
 		append_attr(node, $1);
-		AstNode *block = new AstNode(AST_BLOCK);
-		ast_stack.back()->children.push_back($4);
-		ast_stack.back()->children.push_back(block);
-		ast_stack.push_back(block);
+		auto block_owned = std::make_unique<AstNode>(AST_BLOCK);
+		auto* block = block_owned.get();
+		extra->ast_stack.back()->children.push_back(std::move($4));
+		extra->ast_stack.back()->children.push_back(std::move(block_owned));
+		extra->ast_stack.push_back(block);
 	} behavioral_stmt {
-		SET_AST_NODE_LOC(ast_stack.back(), @7, @7);
-		ast_stack.pop_back();
-		ast_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @7, @7);
+		extra->ast_stack.pop_back();
+		extra->ast_stack.pop_back();
 	} |
-	attr TOK_REPEAT '(' expr ')' {
-		AstNode *node = new AstNode(AST_REPEAT);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
+	attr TOK_REPEAT TOK_LPAREN expr TOK_RPAREN {
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_REPEAT));
 		append_attr(node, $1);
-		AstNode *block = new AstNode(AST_BLOCK);
-		ast_stack.back()->children.push_back($4);
-		ast_stack.back()->children.push_back(block);
-		ast_stack.push_back(block);
+		auto block_owned = std::make_unique<AstNode>(AST_BLOCK);
+		auto* block = block_owned.get();
+		extra->ast_stack.back()->children.push_back(std::move($4));
+		extra->ast_stack.back()->children.push_back(std::move(block_owned));
+		extra->ast_stack.push_back(block);
 	} behavioral_stmt {
-		SET_AST_NODE_LOC(ast_stack.back(), @7, @7);
-		ast_stack.pop_back();
-		ast_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @7, @7);
+		extra->ast_stack.pop_back();
+		extra->ast_stack.pop_back();
 	} |
-	if_attr TOK_IF '(' expr ')' {
-		AstNode *node = 0;
-		AstNode *context = ast_stack.back();
+	if_attr TOK_IF TOK_LPAREN expr TOK_RPAREN {
+		std::unique_ptr<AstNode> node_owned;
+		AstNode* node = nullptr;
+		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if)) {
-			AstNode *outer = ast_stack[ast_stack.size() - 2];
+			AstNode *outer = extra->ast_stack[extra->ast_stack.size() - 2];
 			log_assert (outer && outer->type == AST_CASE);
 			if (outer->get_bool_attribute(ID::parallel_case)) {
 				// parallel "else if": append condition to outer "if"
 				node = outer;
 				log_assert (node->children.size());
-				delete node->children.back();
 				node->children.pop_back();
 			} else if (outer->get_bool_attribute(ID::full_case))
 				(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
 		}
-		AstNode *expr = new AstNode(AST_REDUCE_BOOL, $4);
+		auto expr = std::make_unique<AstNode>(AST_REDUCE_BOOL, std::move($4));
 		if (!node) {
 			// not parallel "else if": begin new construction
-			node = new AstNode(AST_CASE);
+			node_owned = std::make_unique<AstNode>(AST_CASE);
+			node = node_owned.get();
 			append_attr(node, $1);
-			ast_stack.back()->children.push_back(node);
-			node->children.push_back(node->get_bool_attribute(ID::parallel_case) ? AstNode::mkconst_int(1, false, 1) : expr);
+			node->children.push_back(node->get_bool_attribute(ID::parallel_case) ? AstNode::mkconst_int(1, false, 1) : expr->clone());
+			extra->ast_stack.back()->children.push_back(std::move(node_owned));
 		}
-		AstNode *block = new AstNode(AST_BLOCK);
-		AstNode *cond = new AstNode(AST_COND, node->get_bool_attribute(ID::parallel_case) ? expr : AstNode::mkconst_int(1, false, 1), block);
-		SET_AST_NODE_LOC(cond, @4, @4);
-		node->children.push_back(cond);
-		ast_stack.push_back(node);
-		ast_stack.push_back(block);
+		auto block_owned = std::make_unique<AstNode>(AST_BLOCK);
+		auto* block = block_owned.get();
+		auto cond_owned = std::make_unique<AstNode>(AST_COND, node->get_bool_attribute(ID::parallel_case) ? std::move(expr) : AstNode::mkconst_int(1, false, 1), std::move(block_owned));
+		SET_AST_NODE_LOC(cond_owned.get(), @4, @4);
+		node->children.push_back(std::move(cond_owned));
+		extra->ast_stack.push_back(node);
+		extra->ast_stack.push_back(block);
 	} behavioral_stmt {
-		SET_AST_NODE_LOC(ast_stack.back(), @7, @7);
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @7, @7);
 	} optional_else {
-		ast_stack.pop_back();
-		SET_AST_NODE_LOC(ast_stack.back(), @2, @9);
-		ast_stack.pop_back();
+		extra->ast_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @9);
+		extra->ast_stack.pop_back();
 	} |
-	case_attr case_type '(' expr ')' {
-		AstNode *node = new AstNode(AST_CASE, $4);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
+	case_attr case_type TOK_LPAREN expr TOK_RPAREN {
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_CASE, std::move($4)));
 		append_attr(node, $1);
-		SET_AST_NODE_LOC(ast_stack.back(), @4, @4);
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @4, @4);
 	} opt_synopsys_attr case_body TOK_ENDCASE {
-		SET_AST_NODE_LOC(ast_stack.back(), @2, @9);
-		case_type_stack.pop_back();
-		ast_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @9);
+		extra->case_type_stack.pop_back();
+		extra->ast_stack.pop_back();
 	};
 
 if_attr:
@@ -2936,23 +2908,23 @@ if_attr:
 		$$ = $1;
 	} |
 	attr TOK_UNIQUE0 {
-		AstNode *context = ast_stack.back();
+		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
-			frontend_verilog_yyerror("unique0 keyword cannot be used for 'else if' branch.");
+			lexer->err("unique0 keyword cannot be used for 'else if' branch.");
 		(*$1)[ID::parallel_case] = AstNode::mkconst_int(1, false);
 		$$ = $1;
 	} |
 	attr TOK_PRIORITY {
-		AstNode *context = ast_stack.back();
+		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
-			frontend_verilog_yyerror("priority keyword cannot be used for 'else if' branch.");
+			lexer->err("priority keyword cannot be used for 'else if' branch.");
 		(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
 		$$ = $1;
 	} |
 	attr TOK_UNIQUE {
-		AstNode *context = ast_stack.back();
+		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
-			frontend_verilog_yyerror("unique keyword cannot be used for 'else if' branch.");
+			lexer->err("unique keyword cannot be used for 'else if' branch.");
 		(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
 		(*$1)[ID::parallel_case] = AstNode::mkconst_int(1, false);
 		$$ = $1;
@@ -2978,23 +2950,23 @@ case_attr:
 
 case_type:
 	TOK_CASE {
-		case_type_stack.push_back(0);
+		extra->case_type_stack.push_back(0);
 	} |
 	TOK_CASEX {
-		case_type_stack.push_back('x');
+		extra->case_type_stack.push_back('x');
 	} |
 	TOK_CASEZ {
-		case_type_stack.push_back('z');
+		extra->case_type_stack.push_back('z');
 	};
 
 opt_synopsys_attr:
 	opt_synopsys_attr TOK_SYNOPSYS_FULL_CASE {
-		if (ast_stack.back()->attributes.count(ID::full_case) == 0)
-			ast_stack.back()->attributes[ID::full_case] = AstNode::mkconst_int(1, false);
+		if (extra->ast_stack.back()->attributes.count(ID::full_case) == 0)
+			extra->ast_stack.back()->attributes[ID::full_case] = AstNode::mkconst_int(1, false);
 	} |
 	opt_synopsys_attr TOK_SYNOPSYS_PARALLEL_CASE {
-		if (ast_stack.back()->attributes.count(ID::parallel_case) == 0)
-			ast_stack.back()->attributes[ID::parallel_case] = AstNode::mkconst_int(1, false);
+		if (extra->ast_stack.back()->attributes.count(ID::parallel_case) == 0)
+			extra->ast_stack.back()->attributes[ID::parallel_case] = AstNode::mkconst_int(1, false);
 	} |
 	%empty;
 
@@ -3004,16 +2976,18 @@ behavioral_stmt_list:
 
 optional_else:
 	TOK_ELSE {
-		AstNode *block = new AstNode(AST_BLOCK);
-		block->attributes[ID::promoted_if] = AstNode::mkconst_int(1, false );
-		AstNode *cond = new AstNode(AST_COND, new AstNode(AST_DEFAULT), block);
+		extra->ast_stack.pop_back();
+		auto block_owned = std::make_unique<AstNode>(AST_BLOCK);
+		auto* block = block_owned.get();
+		block->attributes[ID::promoted_if] = AstNode::mkconst_int(1, false);
+		AstNode* cond = extra->saveChild(
+			std::make_unique<AstNode>(AST_COND,
+				std::make_unique<AstNode>(AST_DEFAULT),
+				std::move(block_owned)));
+		extra->ast_stack.push_back(block);
 		SET_AST_NODE_LOC(cond, @1, @1);
-
-		ast_stack.pop_back();
-		ast_stack.back()->children.push_back(cond);
-		ast_stack.push_back(block);
 	} behavioral_stmt {
-		SET_AST_NODE_LOC(ast_stack.back(), @3, @3);
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @3, @3);
 	} |
 	%empty %prec FAKE_THEN;
 
@@ -3023,21 +2997,17 @@ case_body:
 
 case_item:
 	{
-		AstNode *node = new AstNode(
-				case_type_stack.size() && case_type_stack.back() == 'x' ? AST_CONDX :
-				case_type_stack.size() && case_type_stack.back() == 'z' ? AST_CONDZ : AST_COND);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
+		(void)extra->pushChild(std::make_unique<AstNode>(
+				extra->case_type_stack.size() && extra->case_type_stack.back() == 'x' ? AST_CONDX :
+				extra->case_type_stack.size() && extra->case_type_stack.back() == 'z' ? AST_CONDZ : AST_COND));
 	} case_select {
-		AstNode *block = new AstNode(AST_BLOCK);
-		ast_stack.back()->children.push_back(block);
-		ast_stack.push_back(block);
-		case_type_stack.push_back(0);
+		(void)extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
+		extra->case_type_stack.push_back(0);
 	} behavioral_stmt {
-		case_type_stack.pop_back();
-		SET_AST_NODE_LOC(ast_stack.back(), @4, @4);
-		ast_stack.pop_back();
-		ast_stack.pop_back();
+		extra->case_type_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @4, @4);
+		extra->ast_stack.pop_back();
+		extra->ast_stack.pop_back();
 	};
 
 gen_case_body:
@@ -3046,87 +3016,78 @@ gen_case_body:
 
 gen_case_item:
 	{
-		AstNode *node = new AstNode(
-				case_type_stack.size() && case_type_stack.back() == 'x' ? AST_CONDX :
-				case_type_stack.size() && case_type_stack.back() == 'z' ? AST_CONDZ : AST_COND);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
+		(void)extra->pushChild(std::make_unique<AstNode>(
+				extra->case_type_stack.size() && extra->case_type_stack.back() == 'x' ? AST_CONDX :
+				extra->case_type_stack.size() && extra->case_type_stack.back() == 'z' ? AST_CONDZ : AST_COND));
 	} case_select {
-		case_type_stack.push_back(0);
-		SET_AST_NODE_LOC(ast_stack.back(), @2, @2);
+		extra->case_type_stack.push_back(0);
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @2);
 	} gen_stmt_block {
-		case_type_stack.pop_back();
-		ast_stack.pop_back();
+		extra->case_type_stack.pop_back();
+		extra->ast_stack.pop_back();
 	};
 
 case_select:
-	case_expr_list ':' |
+	case_expr_list TOK_COL |
 	TOK_DEFAULT;
 
 case_expr_list:
 	TOK_DEFAULT {
-		AstNode *node = new AstNode(AST_DEFAULT);
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_DEFAULT));
 		SET_AST_NODE_LOC(node, @1, @1);
-		ast_stack.back()->children.push_back(node);
 	} |
 	TOK_SVA_LABEL {
-		AstNode *node = new AstNode(AST_IDENTIFIER);
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_IDENTIFIER));
 		SET_AST_NODE_LOC(node, @1, @1);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.back()->children.back()->str = *$1;
-		delete $1;
 	} |
 	expr {
-		ast_stack.back()->children.push_back($1);
+		extra->ast_stack.back()->children.push_back(std::move($1));
 	} |
-	case_expr_list ',' expr {
-		ast_stack.back()->children.push_back($3);
+	case_expr_list TOK_COMMA expr {
+		extra->ast_stack.back()->children.push_back(std::move($3));
 	};
 
 rvalue:
-	hierarchical_id '[' expr ']' '.' rvalue {
-		$$ = new AstNode(AST_PREFIX, $3, $6);
+	hierarchical_id TOK_LBRA expr TOK_RBRA TOK_DOT rvalue {
+		$$ = std::make_unique<AstNode>(AST_PREFIX, std::move($3), std::move($6));
 		$$->str = *$1;
-		SET_AST_NODE_LOC($$, @1, @6);
-		delete $1;
+		SET_AST_NODE_LOC($$.get(), @1, @6);
 	} |
 	hierarchical_id range {
-		$$ = new AstNode(AST_IDENTIFIER, $2);
+		$$ = std::make_unique<AstNode>(AST_IDENTIFIER, std::move($2));
 		$$->str = *$1;
-		SET_AST_NODE_LOC($$, @1, @1);
-		delete $1;
+		SET_AST_NODE_LOC($$.get(), @1, @1);
 		if ($2 == nullptr && ($$->str == "\\$initstate" ||
 				$$->str == "\\$anyconst" || $$->str == "\\$anyseq" ||
 				$$->str == "\\$allconst" || $$->str == "\\$allseq"))
 			$$->type = AST_FCALL;
 	} |
 	hierarchical_id non_opt_multirange {
-		$$ = new AstNode(AST_IDENTIFIER, $2);
+		$$ = std::make_unique<AstNode>(AST_IDENTIFIER, std::move($2));
 		$$->str = *$1;
-		SET_AST_NODE_LOC($$, @1, @1);
-		delete $1;
+		SET_AST_NODE_LOC($$.get(), @1, @1);
 	};
 
 lvalue:
 	rvalue {
-		$$ = $1;
+		$$ = std::move($1);
 	} |
-	'{' lvalue_concat_list '}' {
-		$$ = $2;
+	TOK_LCURL lvalue_concat_list TOK_RCURL {
+		$$ = std::move($2);
 	};
 
 lvalue_concat_list:
 	expr {
-		$$ = new AstNode(AST_CONCAT);
-		$$->children.push_back($1);
+		$$ = std::make_unique<AstNode>(AST_CONCAT);
+		$$->children.push_back(std::move($1));
 	} |
-	expr ',' lvalue_concat_list {
-		$$ = $3;
-		$$->children.push_back($1);
+	expr TOK_COMMA lvalue_concat_list {
+		$$ = std::move($3);
+		$$->children.push_back(std::move($1));
 	};
 
 opt_arg_list:
-	'(' arg_list optional_comma ')' |
+	TOK_LPAREN arg_list optional_comma TOK_RPAREN |
 	%empty;
 
 arg_list:
@@ -3135,11 +3096,11 @@ arg_list:
 
 arg_list2:
 	single_arg |
-	arg_list ',' single_arg;
+	arg_list TOK_COMMA single_arg;
 
 single_arg:
 	expr {
-		ast_stack.back()->children.push_back($1);
+		extra->ast_stack.back()->children.push_back(std::move($1));
 	};
 
 module_gen_body:
@@ -3149,111 +3110,92 @@ module_gen_body:
 
 gen_stmt_or_module_body_stmt:
 	gen_stmt | module_body_stmt |
-	attr ';' {
+	attr TOK_SEMICOL {
 		free_attr($1);
 	};
 
 genvar_identifier:
 	TOK_ID {
-		$$ = new AstNode(AST_IDENTIFIER);
+		$$ = std::make_unique<AstNode>(AST_IDENTIFIER);
 		$$->str = *$1;
-		delete $1;
 	};
 
 genvar_initialization:
 	TOK_GENVAR genvar_identifier {
-		frontend_verilog_yyerror("Generate for loop variable declaration is missing initialization!");
+		lexer->err("Generate for loop variable declaration is missing initialization!");
 	} |
-	TOK_GENVAR genvar_identifier '=' expr {
-		if (!sv_mode)
-			frontend_verilog_yyerror("Generate for loop inline variable declaration is only supported in SystemVerilog mode!");
-		AstNode *node = new AstNode(AST_GENVAR);
+	TOK_GENVAR genvar_identifier TOK_EQ expr {
+		if (!mode->sv)
+			lexer->err("Generate for loop inline variable declaration is only supported in SystemVerilog mode!");
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_GENVAR));
 		node->is_reg = true;
 		node->is_signed = true;
 		node->range_left = 31;
 		node->range_right = 0;
 		node->str = $2->str;
 		node->children.push_back(checkRange(node, nullptr));
-		ast_stack.back()->children.push_back(node);
 		SET_AST_NODE_LOC(node, @1, @4);
-		node = new AstNode(AST_ASSIGN_EQ, $2, $4);
-		ast_stack.back()->children.push_back(node);
+		node = extra->saveChild(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move($2), std::move($4)));
 		SET_AST_NODE_LOC(node, @1, @4);
 	} |
-	genvar_identifier '=' expr {
-		AstNode *node = new AstNode(AST_ASSIGN_EQ, $1, $3);
-		ast_stack.back()->children.push_back(node);
+	genvar_identifier TOK_EQ expr {
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move($1), std::move($3)));
 		SET_AST_NODE_LOC(node, @1, @3);
 	};
 
 // this production creates the obligatory if-else shift/reduce conflict
 gen_stmt:
-	TOK_FOR '(' {
-		AstNode *node = new AstNode(AST_GENFOR);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
-	} genvar_initialization ';' expr {
-		ast_stack.back()->children.push_back($6);
-	} ';' simple_behavioral_stmt ')' gen_stmt_block {
-		SET_AST_NODE_LOC(ast_stack.back(), @1, @11);
-		rewriteGenForDeclInit(ast_stack.back());
-		ast_stack.pop_back();
+	TOK_FOR TOK_LPAREN {
+		(void)extra->pushChild(std::make_unique<AstNode>(AST_GENFOR));
+	} genvar_initialization TOK_SEMICOL expr {
+		extra->ast_stack.back()->children.push_back(std::move($6));
+	} TOK_SEMICOL simple_behavioral_stmt TOK_RPAREN gen_stmt_block {
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @1, @11);
+		extra->rewriteGenForDeclInit(extra->ast_stack.back());
+		extra->ast_stack.pop_back();
 	} |
-	TOK_IF '(' expr ')' {
-		AstNode *node = new AstNode(AST_GENIF);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
-		ast_stack.back()->children.push_back($3);
+	TOK_IF TOK_LPAREN expr TOK_RPAREN {
+		(void)extra->pushChild(std::make_unique<AstNode>(AST_GENIF));
+		extra->ast_stack.back()->children.push_back(std::move($3));
 	} gen_stmt_block opt_gen_else {
-		SET_AST_NODE_LOC(ast_stack.back(), @1, @7);
-		ast_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @1, @7);
+		extra->ast_stack.pop_back();
 	} |
-	case_type '(' expr ')' {
-		AstNode *node = new AstNode(AST_GENCASE, $3);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
+	case_type TOK_LPAREN expr TOK_RPAREN {
+		(void)extra->pushChild(std::make_unique<AstNode>(AST_GENCASE, std::move($3)));
 	} gen_case_body TOK_ENDCASE {
-		case_type_stack.pop_back();
-		SET_AST_NODE_LOC(ast_stack.back(), @1, @7);
-		ast_stack.pop_back();
+		extra->case_type_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @1, @7);
+		extra->ast_stack.pop_back();
 	} |
 	TOK_MSG_TASKS {
-		AstNode *node = new AstNode(AST_TECALL);
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_TECALL));
 		node->str = *$1;
-		delete $1;
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
-	} opt_arg_list ';'{
-		SET_AST_NODE_LOC(ast_stack.back(), @1, @3);
-		ast_stack.pop_back();
+	} opt_arg_list TOK_SEMICOL{
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @1, @3);
+		extra->ast_stack.pop_back();
 	};
 
 gen_block:
 	TOK_BEGIN {
-		enterTypeScope();
+		extra->enterTypeScope();
 	} opt_label {
-		AstNode *node = new AstNode(AST_GENBLOCK);
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_GENBLOCK));
 		node->str = $3 ? *$3 : std::string();
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
 	} module_gen_body TOK_END opt_label {
-		exitTypeScope();
-		checkLabelsMatch("Begin label", $3, $7);
-		delete $3;
-		delete $7;
-		SET_AST_NODE_LOC(ast_stack.back(), @1, @7);
-		ast_stack.pop_back();
+		extra->exitTypeScope();
+		checkLabelsMatch(@7, "Begin label", $3, $7);
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @1, @7);
+		extra->ast_stack.pop_back();
 	};
 
 // result is wrapped in a genblock only if necessary
 gen_stmt_block:
 	{
-		AstNode *node = new AstNode(AST_GENBLOCK);
-		ast_stack.back()->children.push_back(node);
-		ast_stack.push_back(node);
+		(void)extra->pushChild(std::make_unique<AstNode>(AST_GENBLOCK));
 	} gen_stmt_or_module_body_stmt {
-		SET_AST_NODE_LOC(ast_stack.back(), @2, @2);
-		ast_stack.pop_back();
+		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @2);
+		extra->ast_stack.pop_back();
 	} | gen_block;
 
 opt_gen_else:
@@ -3261,336 +3203,330 @@ opt_gen_else:
 
 expr:
 	basic_expr {
-		$$ = $1;
+		$$ = std::move($1);
 	} |
-	basic_expr '?' attr expr ':' expr {
-		$$ = new AstNode(AST_TERNARY);
-		$$->children.push_back($1);
-		$$->children.push_back($4);
-		$$->children.push_back($6);
-		SET_AST_NODE_LOC($$, @1, @$);
-		append_attr($$, $3);
+	basic_expr TOK_QUE attr expr TOK_COL expr {
+		$$ = std::make_unique<AstNode>(AST_TERNARY);
+		$$->children.push_back(std::move($1));
+		$$->children.push_back(std::move($4));
+		$$->children.push_back(std::move($6));
+		SET_AST_NODE_LOC($$.get(), @1, @$);
+		append_attr($$.get(), $3);
 	} |
 	inc_or_dec_op attr rvalue {
-		$$ = addIncOrDecExpr($3, $2, $1, @1, @3, false);
+		$$ = extra->addIncOrDecExpr(std::move($3), $2, $1, @1, @3, false, mode->sv);
 	} |
 	// TODO: Attributes are allowed in the middle here, but they create some
 	// non-trivial conflicts that don't seem worth solving for now.
 	rvalue inc_or_dec_op {
-		$$ = addIncOrDecExpr($1, nullptr, $2, @1, @2, true);
+		$$ = extra->addIncOrDecExpr(std::move($1), nullptr, $2, @1, @2, true, mode->sv);
 	};
 
 basic_expr:
 	rvalue {
-		$$ = $1;
+		$$ = std::move($1);
 	} |
-	'(' expr ')' integral_number {
+	TOK_LPAREN expr TOK_RPAREN integral_number {
 		if ($4->compare(0, 1, "'") != 0)
-			frontend_verilog_yyerror("Cast operation must be applied on sized constants e.g. (<expr>)<constval> , while %s is not a sized constant.", $4->c_str());
-		AstNode *bits = $2;
-		AstNode *val = const2ast(*$4, case_type_stack.size() == 0 ? 0 : case_type_stack.back(), !lib_mode);
-		if (val == NULL)
+			lexer->err("Cast operation must be applied on sized constants e.g. (<expr>)<constval> , while %s is not a sized constant.", $4->c_str());
+		auto p = make_ConstParser_here(@4);
+		auto val = p.const2ast(*$4, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
+		if (val == nullptr)
 			log_error("Value conversion failed: `%s'\n", $4->c_str());
-		$$ = new AstNode(AST_TO_BITS, bits, val);
-		delete $4;
+		$$ = std::make_unique<AstNode>(AST_TO_BITS, std::move($2), std::move(val));
 	} |
 	hierarchical_id integral_number {
 		if ($2->compare(0, 1, "'") != 0)
-			frontend_verilog_yyerror("Cast operation must be applied on sized constants, e.g. <ID>\'d0, while %s is not a sized constant.", $2->c_str());
-		AstNode *bits = new AstNode(AST_IDENTIFIER);
+			lexer->err("Cast operation must be applied on sized constants, e.g. <ID>\'d0, while %s is not a sized constant.", $2->c_str());
+		auto bits = std::make_unique<AstNode>(AST_IDENTIFIER);
 		bits->str = *$1;
-		SET_AST_NODE_LOC(bits, @1, @1);
-		AstNode *val = const2ast(*$2, case_type_stack.size() == 0 ? 0 : case_type_stack.back(), !lib_mode);
-		SET_AST_NODE_LOC(val, @2, @2);
-		if (val == NULL)
+		SET_AST_NODE_LOC(bits.get(), @1, @1);
+		auto p = make_ConstParser_here(@2);
+		auto val = p.const2ast(*$2, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
+		SET_AST_NODE_LOC(val.get(), @2, @2);
+		if (val == nullptr)
 			log_error("Value conversion failed: `%s'\n", $2->c_str());
-		$$ = new AstNode(AST_TO_BITS, bits, val);
-		delete $1;
-		delete $2;
+		$$ = std::make_unique<AstNode>(AST_TO_BITS, std::move(bits), std::move(val));
 	} |
 	integral_number {
-		$$ = const2ast(*$1, case_type_stack.size() == 0 ? 0 : case_type_stack.back(), !lib_mode);
-		SET_AST_NODE_LOC($$, @1, @1);
-		if ($$ == NULL)
+		auto p = make_ConstParser_here(@1);
+		$$ = p.const2ast(*$1, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
+		SET_AST_NODE_LOC($$.get(), @1, @1);
+		if ($$ == nullptr)
 			log_error("Value conversion failed: `%s'\n", $1->c_str());
-		delete $1;
 	} |
 	TOK_REALVAL {
-		$$ = new AstNode(AST_REALVALUE);
+		$$ = std::make_unique<AstNode>(AST_REALVALUE);
 		char *p = (char*)malloc(GetSize(*$1) + 1), *q;
 		for (int i = 0, j = 0; j < GetSize(*$1); j++)
 			if ((*$1)[j] != '_')
 				p[i++] = (*$1)[j], p[i] = 0;
 		$$->realvalue = strtod(p, &q);
-		SET_AST_NODE_LOC($$, @1, @1);
+		SET_AST_NODE_LOC($$.get(), @1, @1);
 		log_assert(*q == 0);
-		delete $1;
 		free(p);
 	} |
 	TOK_STRING {
 		$$ = AstNode::mkconst_str(*$1);
-		SET_AST_NODE_LOC($$, @1, @1);
-		delete $1;
+		SET_AST_NODE_LOC($$.get(), @1, @1);
 	} |
 	hierarchical_id attr {
+		// super sketchy! Orphaned pointer in non-owning extra->ast_stack
 		AstNode *node = new AstNode(AST_FCALL);
 		node->str = *$1;
-		delete $1;
-		ast_stack.push_back(node);
+		extra->ast_stack.push_back(node);
 		SET_AST_NODE_LOC(node, @1, @1);
 		append_attr(node, $2);
-	} '(' arg_list optional_comma ')' {
-		$$ = ast_stack.back();
-		ast_stack.pop_back();
+	} TOK_LPAREN arg_list optional_comma TOK_RPAREN {
+		$$.reset(extra->ast_stack.back());
+		extra->ast_stack.pop_back();
 	} |
-	TOK_TO_SIGNED attr '(' expr ')' {
-		$$ = new AstNode(AST_TO_SIGNED, $4);
-		append_attr($$, $2);
+	TOK_TO_SIGNED attr TOK_LPAREN expr TOK_RPAREN {
+		$$ = std::make_unique<AstNode>(AST_TO_SIGNED, std::move($4));
+		append_attr($$.get(), $2);
 	} |
-	TOK_TO_UNSIGNED attr '(' expr ')' {
-		$$ = new AstNode(AST_TO_UNSIGNED, $4);
-		append_attr($$, $2);
+	TOK_TO_UNSIGNED attr TOK_LPAREN expr TOK_RPAREN {
+		$$ = std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4));
+		append_attr($$.get(), $2);
 	} |
-	'(' expr ')' {
-		$$ = $2;
+	TOK_LPAREN expr TOK_RPAREN {
+		$$ = std::move($2);
 	} |
-	'(' expr ':' expr ':' expr ')' {
-		delete $2;
-		$$ = $4;
-		delete $6;
+	TOK_LPAREN expr TOK_COL expr TOK_COL expr TOK_RPAREN {
+		$$ = std::move($4);
 	} |
-	'{' concat_list '}' {
-		$$ = $2;
+	TOK_LCURL concat_list TOK_RCURL {
+		$$ = std::move($2);
 	} |
-	'{' expr '{' concat_list '}' '}' {
-		$$ = new AstNode(AST_REPLICATE, $2, $4);
+	TOK_LCURL expr TOK_LCURL concat_list TOK_RCURL TOK_RCURL {
+		$$ = std::make_unique<AstNode>(AST_REPLICATE, std::move($2), std::move($4));
 	} |
-	'~' attr basic_expr %prec UNARY_OPS {
-		$$ = new AstNode(AST_BIT_NOT, $3);
-		SET_AST_NODE_LOC($$, @1, @3);
-		append_attr($$, $2);
+	TOK_TILDE attr basic_expr %prec UNARY_OPS {
+		$$ = std::make_unique<AstNode>(AST_BIT_NOT, std::move($3));
+		SET_AST_NODE_LOC($$.get(), @1, @3);
+		append_attr($$.get(), $2);
 	} |
-	basic_expr '&' attr basic_expr {
-		$$ = new AstNode(AST_BIT_AND, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+	basic_expr TOK_AMP attr basic_expr {
+		$$ = std::make_unique<AstNode>(AST_BIT_AND, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_NAND attr basic_expr {
-		$$ = new AstNode(AST_BIT_NOT, new AstNode(AST_BIT_AND, $1, $4));
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_BIT_NOT, std::make_unique<AstNode>(AST_BIT_AND, std::move($1), std::move($4)));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	basic_expr '|' attr basic_expr {
-		$$ = new AstNode(AST_BIT_OR, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+	basic_expr TOK_PIPE attr basic_expr {
+		$$ = std::make_unique<AstNode>(AST_BIT_OR, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_NOR attr basic_expr {
-		$$ = new AstNode(AST_BIT_NOT, new AstNode(AST_BIT_OR, $1, $4));
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_BIT_NOT, std::make_unique<AstNode>(AST_BIT_OR, std::move($1), std::move($4)));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	basic_expr '^' attr basic_expr {
-		$$ = new AstNode(AST_BIT_XOR, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+	basic_expr TOK_CARET attr basic_expr {
+		$$ = std::make_unique<AstNode>(AST_BIT_XOR, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_XNOR attr basic_expr {
-		$$ = new AstNode(AST_BIT_XNOR, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_BIT_XNOR, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	'&' attr basic_expr %prec UNARY_OPS {
-		$$ = new AstNode(AST_REDUCE_AND, $3);
-		SET_AST_NODE_LOC($$, @1, @3);
-		append_attr($$, $2);
+	TOK_AMP attr basic_expr %prec UNARY_OPS {
+		$$ = std::make_unique<AstNode>(AST_REDUCE_AND, std::move($3));
+		SET_AST_NODE_LOC($$.get(), @1, @3);
+		append_attr($$.get(), $2);
 	} |
 	OP_NAND attr basic_expr %prec UNARY_OPS {
-		$$ = new AstNode(AST_REDUCE_AND, $3);
-		SET_AST_NODE_LOC($$, @1, @3);
-		append_attr($$, $2);
-		$$ = new AstNode(AST_LOGIC_NOT, $$);
+		$$ = std::make_unique<AstNode>(AST_REDUCE_AND, std::move($3));
+		SET_AST_NODE_LOC($$.get(), @1, @3);
+		append_attr($$.get(), $2);
+		$$ = std::make_unique<AstNode>(AST_LOGIC_NOT, std::move($$));
 	} |
-	'|' attr basic_expr %prec UNARY_OPS {
-		$$ = new AstNode(AST_REDUCE_OR, $3);
-		SET_AST_NODE_LOC($$, @1, @3);
-		append_attr($$, $2);
+	TOK_PIPE attr basic_expr %prec UNARY_OPS {
+		$$ = std::make_unique<AstNode>(AST_REDUCE_OR, std::move($3));
+		SET_AST_NODE_LOC($$.get(), @1, @3);
+		append_attr($$.get(), std::move($2));
 	} |
 	OP_NOR attr basic_expr %prec UNARY_OPS {
-		$$ = new AstNode(AST_REDUCE_OR, $3);
-		SET_AST_NODE_LOC($$, @1, @3);
-		append_attr($$, $2);
-		$$ = new AstNode(AST_LOGIC_NOT, $$);
-		SET_AST_NODE_LOC($$, @1, @3);
+		$$ = std::make_unique<AstNode>(AST_REDUCE_OR, std::move($3));
+		SET_AST_NODE_LOC($$.get(), @1, @3);
+		append_attr($$.get(), $2);
+		$$ = std::make_unique<AstNode>(AST_LOGIC_NOT, std::move($$));
+		SET_AST_NODE_LOC($$.get(), @1, @3);
 	} |
-	'^' attr basic_expr %prec UNARY_OPS {
-		$$ = new AstNode(AST_REDUCE_XOR, $3);
-		SET_AST_NODE_LOC($$, @1, @3);
-		append_attr($$, $2);
+	TOK_CARET attr basic_expr %prec UNARY_OPS {
+		$$ = std::make_unique<AstNode>(AST_REDUCE_XOR, std::move($3));
+		SET_AST_NODE_LOC($$.get(), @1, @3);
+		append_attr($$.get(), $2);
 	} |
 	OP_XNOR attr basic_expr %prec UNARY_OPS {
-		$$ = new AstNode(AST_REDUCE_XNOR, $3);
-		SET_AST_NODE_LOC($$, @1, @3);
-		append_attr($$, $2);
+		$$ = std::make_unique<AstNode>(AST_REDUCE_XNOR, std::move($3));
+		SET_AST_NODE_LOC($$.get(), @1, @3);
+		append_attr($$.get(), $2);
 	} |
 	basic_expr OP_SHL attr basic_expr {
-		$$ = new AstNode(AST_SHIFT_LEFT, $1, new AstNode(AST_TO_UNSIGNED, $4));
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_SHIFT_LEFT, std::move($1), std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4)));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_SHR attr basic_expr {
-		$$ = new AstNode(AST_SHIFT_RIGHT, $1, new AstNode(AST_TO_UNSIGNED, $4));
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_SHIFT_RIGHT, std::move($1), std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4)));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_SSHL attr basic_expr {
-		$$ = new AstNode(AST_SHIFT_SLEFT, $1, new AstNode(AST_TO_UNSIGNED, $4));
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_SHIFT_SLEFT, std::move($1), std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4)));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_SSHR attr basic_expr {
-		$$ = new AstNode(AST_SHIFT_SRIGHT, $1, new AstNode(AST_TO_UNSIGNED, $4));
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_SHIFT_SRIGHT, std::move($1), std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4)));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	basic_expr '<' attr basic_expr {
-		$$ = new AstNode(AST_LT, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+	basic_expr TOK_LT attr basic_expr {
+		$$ = std::make_unique<AstNode>(AST_LT, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_LE attr basic_expr {
-		$$ = new AstNode(AST_LE, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_LE, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_EQ attr basic_expr {
-		$$ = new AstNode(AST_EQ, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_EQ, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_NE attr basic_expr {
-		$$ = new AstNode(AST_NE, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_NE, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_EQX attr basic_expr {
-		$$ = new AstNode(AST_EQX, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_EQX, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_NEX attr basic_expr {
-		$$ = new AstNode(AST_NEX, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_NEX, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_GE attr basic_expr {
-		$$ = new AstNode(AST_GE, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_GE, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	basic_expr '>' attr basic_expr {
-		$$ = new AstNode(AST_GT, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+	basic_expr TOK_GT attr basic_expr {
+		$$ = std::make_unique<AstNode>(AST_GT, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	basic_expr '+' attr basic_expr {
-		$$ = new AstNode(AST_ADD, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+	basic_expr TOK_PLUS attr basic_expr {
+		$$ = std::make_unique<AstNode>(AST_ADD, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	basic_expr '-' attr basic_expr {
-		$$ = new AstNode(AST_SUB, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+	basic_expr TOK_MINUS attr basic_expr {
+		$$ = std::make_unique<AstNode>(AST_SUB, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	basic_expr '*' attr basic_expr {
-		$$ = new AstNode(AST_MUL, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+	basic_expr TOK_ASTER attr basic_expr {
+		$$ = std::make_unique<AstNode>(AST_MUL, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	basic_expr '/' attr basic_expr {
-		$$ = new AstNode(AST_DIV, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+	basic_expr TOK_SLASH attr basic_expr {
+		$$ = std::make_unique<AstNode>(AST_DIV, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	basic_expr '%' attr basic_expr {
-		$$ = new AstNode(AST_MOD, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+	basic_expr TOK_PERC attr basic_expr {
+		$$ = std::make_unique<AstNode>(AST_MOD, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_POW attr basic_expr {
-		$$ = new AstNode(AST_POW, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_POW, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	'+' attr basic_expr %prec UNARY_OPS {
-		$$ = new AstNode(AST_POS, $3);
-		SET_AST_NODE_LOC($$, @1, @3);
-		append_attr($$, $2);
+	TOK_PLUS attr basic_expr %prec UNARY_OPS {
+		$$ = std::make_unique<AstNode>(AST_POS, std::move($3));
+		SET_AST_NODE_LOC($$.get(), @1, @3);
+		append_attr($$.get(), $2);
 	} |
-	'-' attr basic_expr %prec UNARY_OPS {
-		$$ = new AstNode(AST_NEG, $3);
-		SET_AST_NODE_LOC($$, @1, @3);
-		append_attr($$, $2);
+	TOK_MINUS attr basic_expr %prec UNARY_OPS {
+		$$ = std::make_unique<AstNode>(AST_NEG, std::move($3));
+		SET_AST_NODE_LOC($$.get(), @1, @3);
+		append_attr($$.get(), $2);
 	} |
 	basic_expr OP_LAND attr basic_expr {
-		$$ = new AstNode(AST_LOGIC_AND, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_LOGIC_AND, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_LOR attr basic_expr {
-		$$ = new AstNode(AST_LOGIC_OR, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
-		append_attr($$, $3);
+		$$ = std::make_unique<AstNode>(AST_LOGIC_OR, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
+		append_attr($$.get(), $3);
 	} |
-	'!' attr basic_expr %prec UNARY_OPS {
-		$$ = new AstNode(AST_LOGIC_NOT, $3);
-		SET_AST_NODE_LOC($$, @1, @3);
-		append_attr($$, $2);
+	TOK_EXCL attr basic_expr %prec UNARY_OPS {
+		$$ = std::make_unique<AstNode>(AST_LOGIC_NOT, std::move($3));
+		SET_AST_NODE_LOC($$.get(), @1, @3);
+		append_attr($$.get(), $2);
 	} |
-	TOK_SIGNED OP_CAST '(' expr ')' {
-		if (!sv_mode)
-			frontend_verilog_yyerror("Static cast is only supported in SystemVerilog mode.");
-		$$ = new AstNode(AST_TO_SIGNED, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
+	TOK_SIGNED OP_CAST TOK_LPAREN expr TOK_RPAREN {
+		if (!mode->sv)
+			lexer->err("Static cast is only supported in SystemVerilog mode.");
+		$$ = std::make_unique<AstNode>(AST_TO_SIGNED, std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |
-	TOK_UNSIGNED OP_CAST '(' expr ')' {
-		if (!sv_mode)
-			frontend_verilog_yyerror("Static cast is only supported in SystemVerilog mode.");
-		$$ = new AstNode(AST_TO_UNSIGNED, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
+	TOK_UNSIGNED OP_CAST TOK_LPAREN expr TOK_RPAREN {
+		if (!mode->sv)
+			lexer->err("Static cast is only supported in SystemVerilog mode.");
+		$$ = std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |
-	basic_expr OP_CAST '(' expr ')' {
-		if (!sv_mode)
-			frontend_verilog_yyerror("Static cast is only supported in SystemVerilog mode.");
-		$$ = new AstNode(AST_CAST_SIZE, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
+	basic_expr OP_CAST TOK_LPAREN expr TOK_RPAREN {
+		if (!mode->sv)
+			lexer->err("Static cast is only supported in SystemVerilog mode.");
+		$$ = std::make_unique<AstNode>(AST_CAST_SIZE, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |
-	typedef_base_type OP_CAST '(' expr ')' {
-		if (!sv_mode)
-			frontend_verilog_yyerror("Static cast is only supported in SystemVerilog mode.");
-		$$ = new AstNode(AST_CAST_SIZE, $1, $4);
-		SET_AST_NODE_LOC($$, @1, @4);
+	typedef_base_type OP_CAST TOK_LPAREN expr TOK_RPAREN {
+		if (!mode->sv)
+			lexer->err("Static cast is only supported in SystemVerilog mode.");
+		$$ = std::make_unique<AstNode>(AST_CAST_SIZE, std::move($1), std::move($4));
+		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |
-	'(' expr '=' expr ')' {
-		ensureAsgnExprAllowed();
-		AstNode *node = new AstNode(AST_ASSIGN_EQ, $2, $4);
-		ast_stack.back()->children.push_back(node);
-		SET_AST_NODE_LOC(node, @2, @4);
+	TOK_LPAREN expr TOK_EQ expr TOK_RPAREN {
+		extra->ensureAsgnExprAllowed(@3, mode->sv);
 		$$ = $2->clone();
+		auto node = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move($2), std::move($4));
+		SET_AST_NODE_LOC(node.get(), @2, @4);
+		extra->ast_stack.back()->children.push_back(std::move(node));
 	} |
-	'(' expr asgn_binop expr ')' {
-		ensureAsgnExprAllowed();
-		$$ = addAsgnBinopStmt(nullptr, $2, $3, $4, @2, @4)-> clone();
+	TOK_LPAREN expr asgn_binop expr TOK_RPAREN {
+		extra->ensureAsgnExprAllowed(@3, mode->sv);
+		$$ = extra->addAsgnBinopStmt(nullptr, std::move($2), $3, std::move($4), @2, @4)-> clone();
 	};
 
 concat_list:
 	expr {
-		$$ = new AstNode(AST_CONCAT, $1);
+		$$ = std::make_unique<AstNode>(AST_CONCAT, std::move($1));
 	} |
-	expr ',' concat_list {
-		$$ = $3;
-		$$->children.push_back($1);
+	expr TOK_COMMA concat_list {
+		$$ = std::move($3);
+		$$->children.push_back(std::move($1));
 	};
 
 integral_number:
@@ -3598,12 +3534,9 @@ integral_number:
 	TOK_UNBASED_UNSIZED_CONSTVAL { $$ = $1; } |
 	TOK_BASE TOK_BASED_CONSTVAL {
 		$1->append(*$2);
-		$$ = $1;
-		delete $2;
+		$$ = std::move($1);
 	} |
 	TOK_CONSTVAL TOK_BASE TOK_BASED_CONSTVAL {
 		$1->append(*$2).append(*$3);
-		$$ = $1;
-		delete $2;
-		delete $3;
+		$$ = std::move($1);
 	};
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 646ffcb35..941a7ba3a 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -952,10 +952,6 @@ RTLIL::Design::~Design()
 		delete pr.second;
 	for (auto n : bindings_)
 		delete n;
-	for (auto n : verilog_packages)
-		delete n;
-	for (auto n : verilog_globals)
-		delete n;
 #ifdef WITH_PYTHON
 	RTLIL::Design::get_all_designs()->erase(hashidx_);
 #endif
@@ -5710,11 +5706,6 @@ static void sigspec_parse_split(std::vector<std::string> &tokens, const std::str
 	tokens.push_back(text.substr(start));
 }
 
-static int sigspec_parse_get_dummy_line_num()
-{
-	return 0;
-}
-
 bool RTLIL::SigSpec::parse(RTLIL::SigSpec &sig, RTLIL::Module *module, std::string str)
 {
 	cover("kernel.rtlil.sigspec.parse");
@@ -5735,12 +5726,11 @@ bool RTLIL::SigSpec::parse(RTLIL::SigSpec &sig, RTLIL::Module *module, std::stri
 
 		if (('0' <= netname[0] && netname[0] <= '9') || netname[0] == '\'') {
 			cover("kernel.rtlil.sigspec.parse.const");
-			AST::get_line_num = sigspec_parse_get_dummy_line_num;
-			AST::AstNode *ast = VERILOG_FRONTEND::const2ast(netname);
-			if (ast == NULL)
+			VERILOG_FRONTEND::ConstParser p;
+			auto ast = p.const2ast(netname);
+			if (ast == nullptr)
 				return false;
 			sig.append(RTLIL::Const(ast->bits));
-			delete ast;
 			continue;
 		}
 
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index d53bb3129..e0de79ea9 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1334,7 +1334,7 @@ struct RTLIL::Design
 	dict<RTLIL::IdString, RTLIL::Module*> modules_;
 	std::vector<RTLIL::Binding*> bindings_;
 
-	std::vector<AST::AstNode*> verilog_packages, verilog_globals;
+	std::vector<std::unique_ptr<AST::AstNode>> verilog_packages, verilog_globals;
 	std::unique_ptr<define_map_t> verilog_defines;
 
 	std::vector<RTLIL::Selection> selection_stack;
diff --git a/passes/cmds/design.cc b/passes/cmds/design.cc
index a2ae45ef3..59cd39c98 100644
--- a/passes/cmds/design.cc
+++ b/passes/cmds/design.cc
@@ -368,14 +368,8 @@ struct DesignPass : public Pass {
 
 		if (reset_mode || reset_vlog_mode || !load_name.empty() || push_mode || pop_mode)
 		{
-			for (auto node : design->verilog_packages)
-				delete node;
 			design->verilog_packages.clear();
-
-			for (auto node : design->verilog_globals)
-				delete node;
 			design->verilog_globals.clear();
-
 			design->verilog_defines->clear();
 		}
 
diff --git a/passes/memory/memlib.h b/passes/memory/memlib.h
index c3f7728f1..43dec7386 100644
--- a/passes/memory/memlib.h
+++ b/passes/memory/memlib.h
@@ -100,7 +100,7 @@ enum class WrTransKind {
 
 struct WrTransDef {
 	WrTransTargetKind target_kind;
-	int target_group;
+	int target_group = 0;
 	WrTransKind kind;
 };
 

From 4a001694526d5d40a42a3fabd12904b27efbcf5f Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 17 Jun 2025 01:57:51 +0200
Subject: [PATCH 303/931] ast: ownership for string values

---
 frontends/verilog/verilog_lexer.l  | 88 +++++++++++++++---------------
 frontends/verilog/verilog_parser.y | 58 +++++++++-----------
 2 files changed, 71 insertions(+), 75 deletions(-)

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 0bc192327..24e842691 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -74,12 +74,12 @@ YOSYS_NAMESPACE_END
 	log("Lexer warning: The SystemVerilog keyword `%s' (at %s:%d) is not "\
 			"recognized unless read_verilog is called with -sv!\n", YYText(), \
 			AST::current_filename.c_str(), yylineno); \
-	string_t val = new std::string(std::string("\\") + YYText()); \
-	return parser::make_TOK_ID(val, out_loc);
+	string_t val = std::make_unique<std::string>(std::string("\\") + YYText()); \
+	return parser::make_TOK_ID(std::move(val), out_loc);
 
 #define NON_KEYWORD() \
-	string_t val = new std::string(std::string("\\") + YYText()); \
-	return parser::make_TOK_ID(val, out_loc);
+	string_t val = std::make_unique<std::string>(std::string("\\") + YYText()); \
+	return parser::make_TOK_ID(std::move(val), out_loc);
 
 // #define YY_INPUT(buf,result,max_size) \
 // 	result = readsome(*extra->lexin, buf, max_size)
@@ -290,8 +290,8 @@ TIME_SCALE_SUFFIX [munpf]?s
 [a-zA-Z_$][a-zA-Z0-9_$]*/[ \t\r\n]*:[ \t\r\n]*(assert|assume|cover|restrict)[^a-zA-Z0-9_$\.] {
 	if (!strcmp(YYText(), "default"))
 		return parser::make_TOK_DEFAULT(out_loc);
-	string_t val = new std::string(std::string("\\") + YYText());
-	return parser::make_TOK_SVA_LABEL(val, out_loc);
+	string_t val = std::make_unique<std::string>(std::string("\\") + YYText());
+	return parser::make_TOK_SVA_LABEL(std::move(val), out_loc);
 }
 
 "assert"     { if (mode->formal) return parser::make_TOK_ASSERT(out_loc); SV_KEYWORD(parser::make_TOK_ASSERT(out_loc)); }
@@ -340,35 +340,35 @@ TIME_SCALE_SUFFIX [munpf]?s
 "packed"  { SV_KEYWORD(parser::make_TOK_PACKED(out_loc)); }
 
 {UNSIGNED_NUMBER} {
-	string_t val = new std::string(YYText());
-	return parser::make_TOK_CONSTVAL(val, out_loc);
+	string_t val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_CONSTVAL(std::move(val), out_loc);
 }
 
 \'[01zxZX] {
-	string_t val = new std::string(YYText());
-	return parser::make_TOK_UNBASED_UNSIZED_CONSTVAL(val, out_loc);
+	string_t val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_UNBASED_UNSIZED_CONSTVAL(std::move(val), out_loc);
 }
 
 \'[sS]?[bodhBODH] {
 	BEGIN(BASED_CONST);
-	string_t val = new std::string(YYText());
-	return parser::make_TOK_BASE(val, out_loc);
+	string_t val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_BASE(std::move(val), out_loc);
 }
 
 <BASED_CONST>[0-9a-fA-FzxZX?][0-9a-fA-FzxZX?_]* {
 	BEGIN(0);
-	string_t val = new std::string(YYText());
-	return parser::make_TOK_BASED_CONSTVAL(val, out_loc);
+	string_t val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_BASED_CONSTVAL(std::move(val), out_loc);
 }
 
 {FIXED_POINT_NUMBER_DEC} {
-	string_t val = new std::string(YYText());
-	return parser::make_TOK_REALVAL(val, out_loc);
+	string_t val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_REALVAL(std::move(val), out_loc);
 }
 
 {FIXED_POINT_NUMBER_NO_DEC} {
-	string_t val = new std::string(YYText());
-	return parser::make_TOK_REALVAL(val, out_loc);
+	string_t val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_REALVAL(std::move(val), out_loc);
 }
 
 \"		{ BEGIN(STRING); }
@@ -408,33 +408,33 @@ TIME_SCALE_SUFFIX [munpf]?s
 		yystr[j++] = yystr[i++];
 	}
 	yystr[j] = 0;
-	string_t val = new std::string(yystr, j);
+	string_t val = std::make_unique<std::string>(yystr, j);
 	free(yystr);
-	return parser::make_TOK_STRING(val, out_loc);
+	return parser::make_TOK_STRING(std::move(val), out_loc);
 }
 
 and|nand|or|nor|xor|xnor|not|buf|bufif0|bufif1|notif0|notif1 {
-	auto val = new std::string(YYText());
-	return parser::make_TOK_PRIMITIVE(val, out_loc);
+	auto val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_PRIMITIVE(std::move(val), out_loc);
 }
 
 supply0 { return parser::make_TOK_SUPPLY0(out_loc); }
 supply1 { return parser::make_TOK_SUPPLY1(out_loc); }
 
 "$"(display[bho]?|write[bho]?|strobe|monitor|time|realtime|stop|finish|dumpfile|dumpvars|dumpon|dumpoff|dumpall) {
-	auto val = new std::string(YYText());
-	return parser::make_TOK_ID(val, out_loc);
+	auto val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_ID(std::move(val), out_loc);
 }
 
 "$"(setup|hold|setuphold|removal|recovery|recrem|skew|timeskew|fullskew|nochange) {
 	if (!mode->specify) REJECT;
-	auto val = new std::string(YYText());
-	return parser::make_TOK_ID(val, out_loc);
+	auto val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_ID(std::move(val), out_loc);
 }
 
 "$"(info|warning|error|fatal) {
-	auto val = new std::string(YYText());
-	return parser::make_TOK_MSG_TASKS(val, out_loc);
+	auto val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_MSG_TASKS(std::move(val), out_loc);
 }
 
 "$signed"   { return parser::make_TOK_TO_SIGNED(out_loc); }
@@ -445,15 +445,15 @@ supply1 { return parser::make_TOK_SUPPLY1(out_loc); }
 	auto s = std::string("\\") + YYText();
 	if (extra->pkg_user_types.count(s) > 0) {
 		// package qualified typedefed name
-		auto val = new std::string(s);
-		return parser::make_TOK_PKG_USER_TYPE(val, out_loc);
+		auto val = std::make_unique<std::string>(s);
+		return parser::make_TOK_PKG_USER_TYPE(std::move(val), out_loc);
 	}
 	else {
 		// backup before :: just return first part
 		size_t len = strchr(YYText(), ':') - YYText();
 		yyless(len);
-		auto val = new std::string(std::string("\\") + YYText());
-		return parser::make_TOK_ID(val, out_loc);
+		auto val = std::make_unique<std::string>(std::string("\\") + YYText());
+		return parser::make_TOK_ID(std::move(val), out_loc);
 	}
 }
 
@@ -461,18 +461,18 @@ supply1 { return parser::make_TOK_SUPPLY1(out_loc); }
 	auto s = std::string("\\") + YYText();
 	if (isUserType(extra, s)) {
 		// previously typedefed name
-		auto val = new std::string(s);
-		return parser::make_TOK_USER_TYPE(val, out_loc);
+		auto val = std::make_unique<std::string>(s);
+		return parser::make_TOK_USER_TYPE(std::move(val), out_loc);
 	}
 	else {
-		auto val = new std::string(std::string("\\") + YYText());
-		return parser::make_TOK_ID(val, out_loc);
+		auto val = std::make_unique<std::string>(std::string("\\") + YYText());
+		return parser::make_TOK_ID(std::move(val), out_loc);
 	}
 }
 
 [a-zA-Z_$][a-zA-Z0-9_$\.]* {
-	auto val = new std::string(std::string("\\") + YYText());
-	return parser::make_TOK_ID(val, out_loc);
+	auto val = std::make_unique<std::string>(std::string("\\") + YYText());
+	return parser::make_TOK_ID(std::move(val), out_loc);
 }
 
 "/*"[ \t]*(synopsys|synthesis)[ \t]*translate_off[ \t]*"*/" {
@@ -533,8 +533,8 @@ import[ \t\r\n]+\"(DPI|DPI-C)\"[ \t\r\n]+function[ \t\r\n]+ {
 }
 
 <IMPORT_DPI>[a-zA-Z_$][a-zA-Z0-9_$]* {
-	auto val = new std::string(std::string("\\") + YYText());
-	return parser::make_TOK_ID(val, out_loc);
+	auto val = std::make_unique<std::string>(std::string("\\") + YYText());
+	return parser::make_TOK_ID(std::move(val), out_loc);
 }
 
 <IMPORT_DPI>[ \t\r\n] /* ignore whitespaces */
@@ -549,8 +549,8 @@ import[ \t\r\n]+\"(DPI|DPI-C)\"[ \t\r\n]+function[ \t\r\n]+ {
 }
 
 "\\"[^ \t\r\n]+ {
-	auto val = new std::string(YYText());
-	return parser::make_TOK_ID(val, out_loc);
+	auto val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_ID(std::move(val), out_loc);
 }
 
 "(*" { return parser::make_ATTR_BEGIN(out_loc); }
@@ -606,8 +606,8 @@ import[ \t\r\n]+\"(DPI|DPI-C)\"[ \t\r\n]+function[ \t\r\n]+ {
 
 [-+]?[=*]> {
 	if (!mode->specify) REJECT;
-	auto val = new std::string(YYText());
-	return parser::make_TOK_SPECIFY_OPER(val, out_loc);
+	auto val = std::make_unique<std::string>(YYText());
+	return parser::make_TOK_SPECIFY_OPER(std::move(val), out_loc);
 }
 
 "&&&" {
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 14ea0d615..5ef249a60 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -244,7 +244,7 @@
 			node->children.push_back(std::move(rangeNode));
 		}
 
-		static void checkLabelsMatch(const frontend_verilog_yy::parser::location_type& loc, const char *element, const std::string *before, const std::string *after)
+		static void checkLabelsMatch(const frontend_verilog_yy::parser::location_type& loc, const char *element, const std::string* before, const std::string *after)
 		{
 			if (!before && after)
 				err_at_loc(loc, "%s missing where end label (%s) was given.",
@@ -271,7 +271,6 @@
 			node->is_custom_type = true;
 			node->children.push_back(std::make_unique<AstNode>(AST_WIRETYPE));
 			node->children.back()->str = *name;
-			delete name;
 		}
 
 		void ParseState::addTypedefNode(std::string *name, std::unique_ptr<AstNode> node)
@@ -287,7 +286,6 @@
 				auto qname = current_ast_mod->str + "::" + (*name).substr(1);
 				pkg_user_types[qname] = tnode;
 			}
-			delete name;
 		}
 
 		void ParseState::enterTypeScope()
@@ -479,7 +477,7 @@
 		specify_triple fall;
 	};
 
-	using string_t = std::string *;
+	using string_t = std::unique_ptr<std::string>;
 	using ast_t = std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode>;
 	using al_t = YOSYS_NAMESPACE_PREFIX dict<YOSYS_NAMESPACE_PREFIX RTLIL::IdString, std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode>>*;
 	using specify_target_ptr_t = std::unique_ptr<struct specify_target>;
@@ -688,27 +686,27 @@ attr_assign:
 
 hierarchical_id:
 	TOK_ID {
-		$$ = $1;
+		$$ = std::move($1);
 	} |
 	hierarchical_id TOK_PACKAGESEP TOK_ID {
 		if ($3->compare(0, 1, "\\") == 0)
 			*$1 += "::" + $3->substr(1);
 		else
 			*$1 += "::" + *$3;
-		$$ = $1;
+		$$ = std::move($1);
 	} |
 	hierarchical_id TOK_DOT TOK_ID {
 		if ($3->compare(0, 1, "\\") == 0)
 			*$1 += "." + $3->substr(1);
 		else
 			*$1 += "." + *$3;
-		$$ = $1;
+		$$ = std::move($1);
 	};
 
 hierarchical_type_id:
-	TOK_USER_TYPE
-	| TOK_PKG_USER_TYPE				// package qualified type name
-	| TOK_LPAREN TOK_USER_TYPE TOK_RPAREN	{ $$ = $2; }		// non-standard grammar
+	TOK_USER_TYPE {$$ = std::move($1); }
+	| TOK_PKG_USER_TYPE {$$ = std::move($1); } // package qualified type name
+	| TOK_LPAREN TOK_USER_TYPE TOK_RPAREN	{ $$ = std::move($2); }		// non-standard grammar
 	;
 
 module:
@@ -729,7 +727,7 @@ module:
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @$);
 		extra->ast_stack.pop_back();
 		log_assert(extra->ast_stack.size() == 1);
-		checkLabelsMatch(@11, "Module name", $4, $11);
+		checkLabelsMatch(@11, "Module name", $4.get(), $11.get());
 		extra->current_ast_mod = nullptr;
 		extra->exitTypeScope();
 	};
@@ -837,7 +835,7 @@ package:
 		append_attr(mod, $1);
 	} TOK_SEMICOL package_body TOK_ENDPACKAGE opt_label {
 		extra->ast_stack.pop_back();
-		checkLabelsMatch(@9, "Package name", $4, $9);
+		checkLabelsMatch(@9, "Package name", $4.get(), $9.get());
 		extra->current_ast_mod = nullptr;
 		extra->exitTypeScope();
 	};
@@ -1054,7 +1052,7 @@ logic_type:
 		extra->astbuf3->is_signed = true;
 	} |
 	hierarchical_type_id {
-		extra->addWiretypeNode($1, extra->astbuf3.get());
+		extra->addWiretypeNode($1.get(), extra->astbuf3.get());
 	};
 
 integer_atom_type:
@@ -1322,7 +1320,7 @@ specify_item:
 		auto en_expr = std::move($1);
 		char specify_edge = $3;
 		auto src_expr = std::move($4);
-		string *oper = $5;
+		string *oper = $5.get();
 		specify_target_ptr_t target = std::move($6);
 		specify_rise_fall_ptr_t timing = std::move($9);
 
@@ -1398,8 +1396,6 @@ specify_item:
 			cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(target->dat)));
 			cell->children.back()->str = "\\DAT";
 		}
-
-		delete oper;
 	} |
 	TOK_ID TOK_LPAREN specify_edge expr specify_condition TOK_COMMA specify_edge expr specify_condition TOK_COMMA specify_triple specify_opt_triple TOK_RPAREN TOK_SEMICOL {
 		if (*$1 != "$setup" && *$1 != "$hold" && *$1 != "$setuphold" && *$1 != "$removal" && *$1 != "$recovery" &&
@@ -1736,7 +1732,7 @@ param_implicit_type: param_signed param_range;
 param_type:
 	param_integer_type | param_real | param_range_type | param_implicit_type |
 	hierarchical_type_id {
-		extra->addWiretypeNode($1, extra->astbuf1.get());
+		extra->addWiretypeNode($1.get(), extra->astbuf1.get());
 	};
 
 param_decl:
@@ -1993,7 +1989,7 @@ member_type_token:
 
 member_type: type_atom type_signing
 	| type_vec type_signing
-	| hierarchical_type_id { extra->addWiretypeNode($1, extra->astbuf1.get()); }
+	| hierarchical_type_id { extra->addWiretypeNode($1.get(), extra->astbuf1.get()); }
 	;
 
 struct_var_list: struct_var
@@ -2172,8 +2168,8 @@ assign_expr:
 		SET_AST_NODE_LOC(node, @$, @$);
 	};
 
-type_name: TOK_ID		// first time seen
-	 | TOK_USER_TYPE	{ if (extra->isInLocalScope($1)) lexer->err("Duplicate declaration of TYPEDEF '%s'", $1->c_str()+1); $$ = std::move($1); }
+type_name: TOK_ID { $$ = std::move($1); } // first time seen
+	 | TOK_USER_TYPE	{ if (extra->isInLocalScope($1.get())) lexer->err("Duplicate declaration of TYPEDEF '%s'", $1->c_str()+1); $$ = std::move($1); }
 	 ;
 
 typedef_decl:
@@ -2191,15 +2187,15 @@ typedef_decl:
 			}
 			rewriteAsMemoryNode(extra->astbuf1.get(), std::move($5));
 		}
-		extra->addTypedefNode($4, std::move(extra->astbuf1)); }
-	| TOK_TYPEDEF enum_struct_type type_name TOK_SEMICOL   { extra->addTypedefNode($3, std::move($2)); }
+		extra->addTypedefNode($4.get(), std::move(extra->astbuf1)); }
+	| TOK_TYPEDEF enum_struct_type type_name TOK_SEMICOL   { extra->addTypedefNode($3.get(), std::move($2)); }
 	;
 
 typedef_base_type:
 	hierarchical_type_id {
 		$$ = std::make_unique<AstNode>(AST_WIRE);
 		$$->is_logic = true;
-		extra->addWiretypeNode($1, $$.get());
+		extra->addWiretypeNode($1.get(), $$.get());
 	} |
 	integer_vector_type opt_signedness_default_unsigned {
 		$$ = std::make_unique<AstNode>(AST_WIRE);
@@ -2242,10 +2238,10 @@ cell_stmt:
 
 tok_prim_wrapper:
 	TOK_PRIMITIVE {
-		$$ = $1;
+		$$ = std::move($1);
 	} |
 	TOK_OR {
-		$$ = new std::string("or");
+		$$ = std::make_unique<std::string>("or");
 	};
 
 cell_list:
@@ -2485,7 +2481,7 @@ always_event:
 
 opt_label:
 	TOK_COL TOK_ID {
-		$$ = $2;
+		$$ = std::move($2);
 	} |
 	%empty {
 		$$ = nullptr;
@@ -2493,7 +2489,7 @@ opt_label:
 
 opt_sva_label:
 	TOK_SVA_LABEL TOK_COL {
-		$$ = $1;
+		$$ = std::move($1);
 	} |
 	%empty {
 		$$ = nullptr;
@@ -2801,7 +2797,7 @@ behavioral_stmt:
 			node->str = *$4;
 	} behavioral_stmt_list TOK_END opt_label {
 		extra->exitTypeScope();
-		checkLabelsMatch(@8, "Begin label", $4, $8);
+		checkLabelsMatch(@8, "Begin label", $4.get(), $8.get());
 		AstNode *node = extra->ast_stack.back();
 		// In SystemVerilog, unnamed blocks with block item declarations
 		// create an implicit hierarchy scope
@@ -3184,7 +3180,7 @@ gen_block:
 		node->str = $3 ? *$3 : std::string();
 	} module_gen_body TOK_END opt_label {
 		extra->exitTypeScope();
-		checkLabelsMatch(@7, "Begin label", $3, $7);
+		checkLabelsMatch(@7, "Begin label", $3.get(), $7.get());
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @1, @7);
 		extra->ast_stack.pop_back();
 	};
@@ -3530,8 +3526,8 @@ concat_list:
 	};
 
 integral_number:
-	TOK_CONSTVAL { $$ = $1; } |
-	TOK_UNBASED_UNSIZED_CONSTVAL { $$ = $1; } |
+	TOK_CONSTVAL { $$ = std::move($1); } |
+	TOK_UNBASED_UNSIZED_CONSTVAL { $$ = std::move($1); } |
 	TOK_BASE TOK_BASED_CONSTVAL {
 		$1->append(*$2);
 		$$ = std::move($1);

From 84f0c5da73fd5ea890b148bdc1b2b3de5980acd6 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 17 Jun 2025 15:25:57 +0200
Subject: [PATCH 304/931] ast: fix new memory safety bugs from rebase

---
 frontends/ast/genrtlil.cc          | 4 ++--
 frontends/ast/simplify.cc          | 2 +-
 frontends/verilog/verilog_parser.y | 9 +++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 5139aade2..5b1d20ade 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -1613,7 +1613,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 					if (left_at_zero_ast->type != AST_CONSTANT || right_at_zero_ast->type != AST_CONSTANT)
 						input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str.c_str());
 					int width = abs(int(left_at_zero_ast->integer - right_at_zero_ast->integer)) + 1;
-					auto fake_ast = new AstNode(AST_NONE, clone(), children[0]->children.size() >= 2 ?
+					auto fake_ast = std::make_unique<AstNode>(AST_NONE, clone(), children[0]->children.size() >= 2 ?
 							children[0]->children[1]->clone() : children[0]->children[0]->clone());
 					fake_ast->children[0]->delete_children();
 					if (member_node)
@@ -1634,7 +1634,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 					}
 					if (GetSize(shift_val) >= 32)
 						fake_ast->children[1]->is_signed = true;
-					RTLIL::SigSpec sig = binop2rtlil(fake_ast, ID($shiftx), width, fake_ast->children[0]->genRTLIL(), shift_val);
+					RTLIL::SigSpec sig = binop2rtlil(fake_ast.get(), ID($shiftx), width, fake_ast->children[0]->genRTLIL(), shift_val);
 					return sig;
 				} else {
 					chunk.width = children[0]->range_left - children[0]->range_right + 1;
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 3f7176b20..45a0ab007 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1571,7 +1571,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (children[0]->type == AST_WIRE) {
 			int width = 1;
 			std::unique_ptr<AstNode> node;
-			AstNode* child = children[0].release();
+			AstNode* child = children[0].get();
 			if (child->children.size() == 0) {
 				// Base type (e.g., int)
 				width = child->range_left - child->range_right +1;
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 5ef249a60..b605271e1 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -2855,6 +2855,7 @@ behavioral_stmt:
 		std::unique_ptr<AstNode> node_owned;
 		AstNode* node = nullptr;
 		AstNode *context = extra->ast_stack.back();
+		bool patch_block_on_stack = false;
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if)) {
 			AstNode *outer = extra->ast_stack[extra->ast_stack.size() - 2];
 			log_assert (outer && outer->type == AST_CASE);
@@ -2863,6 +2864,9 @@ behavioral_stmt:
 				node = outer;
 				log_assert (node->children.size());
 				node->children.pop_back();
+				// `context` has been killed as a grandchild of `outer`
+				// we have to undangle it from the stack
+				patch_block_on_stack = true;
 			} else if (outer->get_bool_attribute(ID::full_case))
 				(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
 		}
@@ -2874,12 +2878,17 @@ behavioral_stmt:
 			append_attr(node, $1);
 			node->children.push_back(node->get_bool_attribute(ID::parallel_case) ? AstNode::mkconst_int(1, false, 1) : expr->clone());
 			extra->ast_stack.back()->children.push_back(std::move(node_owned));
+		} else {
+			free_attr($1);
 		}
 		auto block_owned = std::make_unique<AstNode>(AST_BLOCK);
 		auto* block = block_owned.get();
 		auto cond_owned = std::make_unique<AstNode>(AST_COND, node->get_bool_attribute(ID::parallel_case) ? std::move(expr) : AstNode::mkconst_int(1, false, 1), std::move(block_owned));
 		SET_AST_NODE_LOC(cond_owned.get(), @4, @4);
 		node->children.push_back(std::move(cond_owned));
+		// Double it and give it to the next person
+		if (patch_block_on_stack)
+			extra->ast_stack.back() = block;
 		extra->ast_stack.push_back(node);
 		extra->ast_stack.push_back(block);
 	} behavioral_stmt {

From b3bf58896607d16e86cc6228412df8a75ae740dc Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 18 Jun 2025 12:39:32 +0200
Subject: [PATCH 305/931] ast, read_verilog: refactoring

---
 frontends/ast/genrtlil.cc             |  2 --
 frontends/ast/simplify.cc             |  4 ----
 frontends/verilog/Makefile.inc        |  3 +++
 frontends/verilog/verilog_frontend.cc |  9 ---------
 frontends/verilog/verilog_frontend.h  |  5 -----
 frontends/verilog/verilog_lexer.h     |  3 ++-
 frontends/verilog/verilog_parser.y    | 11 +++++++++++
 7 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 5b1d20ade..0c3fc513a 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -1339,8 +1339,6 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 	// be instantiated for this type of AST node.
 	IdString type_name;
 
-	current_filename = filename;
-
 	switch (type)
 	{
 	// simply ignore this nodes.
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 45a0ab007..048a15af8 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1038,8 +1038,6 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		return false;
 	}
 
-	current_filename = filename;
-
 	// we do not look inside a task or function
 	// (but as soon as a task or function is instantiated we process the generated AST as usual)
 	if (type == AST_FUNCTION || type == AST_TASK) {
@@ -1906,8 +1904,6 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			current_scope[it->first] = it->second;
 	}
 
-	current_filename = filename;
-
 	if (type == AST_MODULE || type == AST_INTERFACE)
 		current_scope.clear();
 
diff --git a/frontends/verilog/Makefile.inc b/frontends/verilog/Makefile.inc
index 2d26f1930..cc8baf6aa 100644
--- a/frontends/verilog/Makefile.inc
+++ b/frontends/verilog/Makefile.inc
@@ -3,6 +3,9 @@ GENFILES += frontends/verilog/verilog_parser.tab.cc
 GENFILES += frontends/verilog/verilog_parser.tab.hh
 GENFILES += frontends/verilog/verilog_parser.output
 GENFILES += frontends/verilog/verilog_lexer.cc
+GENFILES += frontends/verilog/location.hh
+GENFILES += frontends/verilog/position.hh
+GENFILES += frontends/verilog/stack.hh
 
 frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y
 	$(Q) mkdir -p $(dir $@)
diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index f2a341f54..d4bee02da 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -787,15 +787,6 @@ void VERILOG_FRONTEND::verr_at(std::string filename, int begin_line, char const
     exit(1);
 }
 
-[[noreturn]]
-void VERILOG_FRONTEND::err_at_loc(parser::location_type loc, char const *fmt, ...)
-{
-	va_list args;
-	va_start(args, fmt);
-	verr_at(AST::current_filename, loc.begin.line, fmt, args);
-	va_end(args);
-}
-
 [[noreturn]]
 void VERILOG_FRONTEND::err_at_ast(AstSrcLocType loc, char const *fmt, ...)
 {
diff --git a/frontends/verilog/verilog_frontend.h b/frontends/verilog/verilog_frontend.h
index 6426f57d8..29c16c039 100644
--- a/frontends/verilog/verilog_frontend.h
+++ b/frontends/verilog/verilog_frontend.h
@@ -31,7 +31,6 @@
 
 #include "kernel/yosys.h"
 #include "frontends/ast/ast.h"
-#include "frontends/verilog/location.hh"
 
 #if ! defined(yyFlexLexerOnce)
 #define yyFlexLexer frontend_verilog_yyFlexLexer
@@ -66,10 +65,6 @@ namespace VERILOG_FRONTEND
 
 	};
 	[[noreturn]]
-	extern void verr_at(std::string filename, int begin_line, char const *fmt, va_list ap);
-	[[noreturn]]
-	extern void err_at_loc(frontend_verilog_yy::location loc, char const *fmt, ...);
-	[[noreturn]]
 	extern void err_at_ast(AST::AstSrcLocType loc, char const *fmt, ...);
 };
 
diff --git a/frontends/verilog/verilog_lexer.h b/frontends/verilog/verilog_lexer.h
index 7d73ae193..2c31160dd 100644
--- a/frontends/verilog/verilog_lexer.h
+++ b/frontends/verilog/verilog_lexer.h
@@ -8,7 +8,8 @@
 YOSYS_NAMESPACE_BEGIN
 
 namespace VERILOG_FRONTEND {
-    // lexer input stream
+	[[noreturn]]
+	extern void verr_at(std::string filename, int begin_line, char const *fmt, va_list ap);
 	using parser = frontend_verilog_yy::parser;
 	class VerilogLexer : public frontend_verilog_yyFlexLexer {
 		ParseState* extra;
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index b605271e1..908b3ec41 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -244,6 +244,17 @@
 			node->children.push_back(std::move(rangeNode));
 		}
 
+		[[noreturn]]
+		extern void verr_at(std::string filename, int begin_line, char const *fmt, va_list ap);
+		[[noreturn]]
+		static void err_at_loc(frontend_verilog_yy::parser::location_type loc, char const *fmt, ...)
+		{
+			va_list args;
+			va_start(args, fmt);
+			verr_at(AST::current_filename, loc.begin.line, fmt, args);
+			va_end(args);
+		}
+
 		static void checkLabelsMatch(const frontend_verilog_yy::parser::location_type& loc, const char *element, const std::string* before, const std::string *after)
 		{
 			if (!before && after)

From 8bf750ecbb07cc01f27e8633187835a8e2517e82 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 18 Jun 2025 18:05:48 +0200
Subject: [PATCH 306/931] neater errors, lost in the sauce of source

---
 .../yosys_internals/flow/verilog_frontend.rst | 11 +--
 frontends/ast/ast.cc                          | 50 +++++------
 frontends/ast/ast.h                           | 24 ++---
 frontends/ast/dpicall.cc                      | 12 +--
 frontends/ast/genrtlil.cc                     | 50 +++++------
 frontends/ast/simplify.cc                     | 80 +++++++++--------
 frontends/verilog/Makefile.inc                |  2 +
 frontends/verilog/const2ast.cc                | 11 +--
 frontends/verilog/verilog_frontend.cc         | 69 +++++---------
 frontends/verilog/verilog_frontend.h          |  6 +-
 frontends/verilog/verilog_lexer.h             | 18 ++--
 frontends/verilog/verilog_lexer.l             | 18 ++--
 frontends/verilog/verilog_parser.y            | 90 ++++++++-----------
 13 files changed, 196 insertions(+), 245 deletions(-)

diff --git a/docs/source/yosys_internals/flow/verilog_frontend.rst b/docs/source/yosys_internals/flow/verilog_frontend.rst
index b6a7ba8a0..d6bdf6b6d 100644
--- a/docs/source/yosys_internals/flow/verilog_frontend.rst
+++ b/docs/source/yosys_internals/flow/verilog_frontend.rst
@@ -48,7 +48,7 @@ The lexer does little more than identifying all keywords and literals recognised
 by the Yosys Verilog frontend.
 
 The lexer keeps track of the current location in the Verilog source code using
-some global variables. These variables are used by the constructor of AST nodes
+some VerilogLexer member variables. These variables are used by the constructor of AST nodes
 to annotate each node with the source code location it originated from.
 
 Finally the lexer identifies and handles special comments such as "``// synopsys
@@ -189,10 +189,11 @@ the bison code for parsing multiplications:
 .. code:: none
    	:number-lines:
 
-	basic_expr '*' attr basic_expr {
-		$$ = new AstNode(AST_MUL, $1, $4);
-		append_attr($$, $3);
-	} |
+  basic_expr TOK_ASTER attr basic_expr {
+    $$ = std::make_unique<AstNode>(AST_MUL, std::move($1), std::move($4));
+    SET_AST_NODE_LOC($$.get(), @1, @4);
+    append_attr($$.get(), $3);
+  } |
 
 The generated AST data structure is then passed directly to the AST frontend
 that performs the actual conversion to RTLIL.
diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 877c41283..c6305bd09 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -38,8 +38,7 @@ using namespace AST_INTERNAL;
 
 // instantiate global variables (public API)
 namespace AST {
-	std::string current_filename;
-	bool sv_mode;
+	bool sv_mode_but_global_and_used_for_literally_one_condition;
 	unsigned long long astnodes = 0;
 	unsigned long long astnode_count() { return astnodes; }
 }
@@ -201,7 +200,7 @@ bool AstNode::get_bool_attribute(RTLIL::IdString id)
 
 // create new node (AstNode constructor)
 // (the optional child arguments make it easier to create AST trees)
-AstNode::AstNode(AstNodeType type, std::unique_ptr<AstNode> child1, std::unique_ptr<AstNode> child2, std::unique_ptr<AstNode> child3, std::unique_ptr<AstNode> child4)
+AstNode::AstNode(AstSrcLocType loc, AstNodeType type, std::unique_ptr<AstNode> child1, std::unique_ptr<AstNode> child2, std::unique_ptr<AstNode> child3, std::unique_ptr<AstNode> child4)
 {
 	static unsigned int hashidx_count = 123456789;
 	hashidx_count = mkhash_xorshift(hashidx_count);
@@ -209,7 +208,7 @@ AstNode::AstNode(AstNodeType type, std::unique_ptr<AstNode> child1, std::unique_
 	astnodes++;
 
 	this->type = type;
-	filename = current_filename;
+	loc = loc;
 	is_input = false;
 	is_output = false;
 	is_reg = false;
@@ -253,7 +252,7 @@ AstNode::AstNode(AstNodeType type, std::unique_ptr<AstNode> child1, std::unique_
 // create a (deep recursive) copy of a node
 std::unique_ptr<AstNode> AstNode::clone() const
 {
-	auto that = std::make_unique<AstNode>(this->type);
+	auto that = std::make_unique<AstNode>(this->location, this->type);
 	cloneInto(*that.get());
 	return that;
 }
@@ -288,7 +287,6 @@ void AstNode::cloneInto(AstNode &other) const
 	other.id2ast = id2ast;
 	other.basic_prep = basic_prep;
 	other.lookahead = lookahead;
-	other.filename = filename;
 	other.location = location;
 	other.in_lvalue = in_lvalue;
 	other.in_param = in_param;
@@ -843,9 +841,9 @@ bool AstNode::contains(const AstNode *other) const
 }
 
 // create an AST node for a constant (using a 32 bit int as value)
-std::unique_ptr<AstNode> AstNode::mkconst_int(uint32_t v, bool is_signed, int width)
+std::unique_ptr<AstNode> AstNode::mkconst_int(AstSrcLocType loc, uint32_t v, bool is_signed, int width)
 {
-	auto node = std::make_unique<AstNode>(AST_CONSTANT);
+	auto node = std::make_unique<AstNode>(loc, AST_CONSTANT);
 	node->integer = v;
 	node->is_signed = is_signed;
 	for (int i = 0; i < width; i++) {
@@ -859,9 +857,9 @@ std::unique_ptr<AstNode> AstNode::mkconst_int(uint32_t v, bool is_signed, int wi
 }
 
 // create an AST node for a constant (using a bit vector as value)
-std::unique_ptr<AstNode> AstNode::mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed, bool is_unsized)
+std::unique_ptr<AstNode> AstNode::mkconst_bits(AstSrcLocType loc, const std::vector<RTLIL::State> &v, bool is_signed, bool is_unsized)
 {
-	auto node = std::make_unique<AstNode>(AST_CONSTANT);
+	auto node = std::make_unique<AstNode>(loc, AST_CONSTANT);
 	node->is_signed = is_signed;
 	node->bits = v;
 	for (size_t i = 0; i < 32; i++) {
@@ -877,15 +875,15 @@ std::unique_ptr<AstNode> AstNode::mkconst_bits(const std::vector<RTLIL::State> &
 	return node;
 }
 
-std::unique_ptr<AstNode> AstNode::mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed)
+std::unique_ptr<AstNode> AstNode::mkconst_bits(AstSrcLocType loc, const std::vector<RTLIL::State> &v, bool is_signed)
 {
-	return mkconst_bits(v, is_signed, false);
+	return mkconst_bits(loc, v, is_signed, false);
 }
 
 // create an AST node for a constant (using a string in bit vector form as value)
-std::unique_ptr<AstNode> AstNode::mkconst_str(const std::vector<RTLIL::State> &v)
+std::unique_ptr<AstNode> AstNode::mkconst_str(AstSrcLocType loc, const std::vector<RTLIL::State> &v)
 {
-	auto node = mkconst_str(RTLIL::Const(v).decode_string());
+	auto node = mkconst_str(loc, RTLIL::Const(v).decode_string());
 	while (GetSize(node->bits) < GetSize(v))
 		node->bits.push_back(RTLIL::State::S0);
 	log_assert(node->bits == v);
@@ -893,14 +891,14 @@ std::unique_ptr<AstNode> AstNode::mkconst_str(const std::vector<RTLIL::State> &v
 }
 
 // create an AST node for a constant (using a string as value)
-std::unique_ptr<AstNode> AstNode::mkconst_str(const std::string &str)
+std::unique_ptr<AstNode> AstNode::mkconst_str(AstSrcLocType loc, const std::string &str)
 {
 	std::unique_ptr<AstNode> node;
 
 	// LRM 1364-2005 5.2.3.3 The empty string literal ("") shall be considered
 	// equivalent to the ASCII NUL ("\0")
 	if (str.empty()) {
-		node = AstNode::mkconst_int(0, false, 8);
+		node = AstNode::mkconst_int(loc, 0, false, 8);
 	} else {
 		std::vector<RTLIL::State> data;
 		data.reserve(str.size() * 8);
@@ -911,7 +909,7 @@ std::unique_ptr<AstNode> AstNode::mkconst_str(const std::string &str)
 				ch = ch >> 1;
 			}
 		}
-		node = AstNode::mkconst_bits(data, false);
+		node = AstNode::mkconst_bits(loc, data, false);
 	}
 
 	node->is_string = true;
@@ -920,19 +918,19 @@ std::unique_ptr<AstNode> AstNode::mkconst_str(const std::string &str)
 }
 
 // create a temporary register
-std::unique_ptr<AstNode> AstNode::mktemp_logic(const std::string &name, AstNode *mod, bool nosync, int range_left, int range_right, bool is_signed)
+std::unique_ptr<AstNode> AstNode::mktemp_logic(AstSrcLocType loc, const std::string &name, AstNode *mod, bool nosync, int range_left, int range_right, bool is_signed)
 {
-	auto wire_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(range_left, true), mkconst_int(range_right, true)));
+	auto wire_owned = std::make_unique<AstNode>(loc, AST_WIRE, std::make_unique<AstNode>(loc, AST_RANGE, mkconst_int(loc, range_left, true), mkconst_int(loc, range_right, true)));
 	auto* wire = wire_owned.get();
-	wire->str = stringf("%s%s:%d$%d", name.c_str(), RTLIL::encode_filename(filename).c_str(), location.first_line, autoidx++);
+	wire->str = stringf("%s%s:%d$%d", name.c_str(), RTLIL::encode_filename(location.filename).c_str(), location.first_line, autoidx++);
 	if (nosync)
-		wire->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
+		wire->set_attribute(ID::nosync, AstNode::mkconst_int(loc, 1, false));
 	wire->is_signed = is_signed;
 	wire->is_logic = true;
 	mod->children.push_back(std::move(wire_owned));
 	while (wire->simplify(true, 1, -1, false)) { }
 
-	auto ident = std::make_unique<AstNode>(AST_IDENTIFIER);
+	auto ident = std::make_unique<AstNode>(loc, AST_IDENTIFIER);
 	ident->str = wire->str;
 	ident->id2ast = wire;
 
@@ -986,7 +984,7 @@ RTLIL::Const AstNode::asParaConst() const
 {
 	if (type == AST_REALVALUE)
 	{
-		auto strnode = AstNode::mkconst_str(stringf("%f", realvalue));
+		auto strnode = AstNode::mkconst_str(location, stringf("%f", realvalue));
 		RTLIL::Const val = strnode->asAttrConst();
 		val.flags |= RTLIL::CONST_FLAG_REAL;
 		return val;
@@ -1088,7 +1086,7 @@ RTLIL::Const AstNode::realAsConst(int width)
 
 std::string AstNode::loc_string() const
 {
-	return stringf("%s:%d.%d-%d.%d", filename.c_str(), location.first_line, location.first_column, location.last_line, location.last_column);
+	return stringf("%s:%d.%d-%d.%d", location.filename.c_str(), location.first_line, location.first_column, location.last_line, location.last_column);
 }
 
 void AST::set_src_attr(RTLIL::AttrObject *obj, const AstNode *ast)
@@ -1446,7 +1444,7 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool nodisplay, bool dump
 			if (design->has(child->str)) {
 				RTLIL::Module *existing_mod = design->module(child->str);
 				if (!nooverwrite && !overwrite && !existing_mod->get_blackbox_attribute()) {
-					log_file_error(child->filename, child->location.first_line, "Re-definition of module `%s'!\n", child->str.c_str());
+					log_file_error(child->location.filename, child->location.first_line, "Re-definition of module `%s'!\n", child->str.c_str());
 				} else if (nooverwrite) {
 					log("Ignoring re-definition of module `%s' at %s.\n",
 							child->str.c_str(), child->loc_string().c_str());
@@ -1925,7 +1923,7 @@ void AstNode::input_error(const char *format, ...) const
 {
 	va_list ap;
 	va_start(ap, format);
-	logv_file_error(filename, location.first_line, format, ap);
+	logv_file_error(location.filename, location.first_line, format, ap);
 }
 
 YOSYS_NAMESPACE_END
diff --git a/frontends/ast/ast.h b/frontends/ast/ast.h
index 72dddab67..ccbce2b1a 100644
--- a/frontends/ast/ast.h
+++ b/frontends/ast/ast.h
@@ -164,10 +164,11 @@ namespace AST
 	};
 
 	struct AstSrcLocType {
+		std::string filename;
 		unsigned int first_line, last_line;
 		unsigned int first_column, last_column;
-		AstSrcLocType() : first_line(0), last_line(0), first_column(0), last_column(0) {}
-		AstSrcLocType(int _first_line, int _first_column, int _last_line, int _last_column) : first_line(_first_line), last_line(_last_line), first_column(_first_column), last_column(_last_column) {}
+		AstSrcLocType() : filename(""), first_line(0), last_line(0), first_column(0), last_column(0) {}
+		AstSrcLocType(std::string _filename, int _first_line, int _first_column, int _last_line, int _last_column) : filename(_filename), first_line(_first_line), last_line(_last_line), first_column(_first_column), last_column(_last_column) {}
 	};
 
 	// convert an node type to a string (e.g. for debug output)
@@ -224,7 +225,6 @@ namespace AST
 		// this is the original sourcecode location that resulted in this AST node
 		// it is automatically set by the constructor using AST::current_filename and
 		// the AST::get_line_num() callback function.
-		std::string filename;
 		AstSrcLocType location;
 
 		// are we embedded in an lvalue, param?
@@ -235,7 +235,7 @@ namespace AST
 		bool in_param_from_above;
 
 		// creating and deleting nodes
-		AstNode(AstNodeType type = AST_NONE, std::unique_ptr<AstNode> child1 = nullptr, std::unique_ptr<AstNode> child2 = nullptr, std::unique_ptr<AstNode> child3 = nullptr, std::unique_ptr<AstNode> child4 = nullptr);
+		AstNode(AstSrcLocType loc, AstNodeType type = AST_NONE, std::unique_ptr<AstNode> child1 = nullptr, std::unique_ptr<AstNode> child2 = nullptr, std::unique_ptr<AstNode> child3 = nullptr, std::unique_ptr<AstNode> child4 = nullptr);
 		std::unique_ptr<AstNode> clone() const;
 		void cloneInto(AstNode &other) const;
 		void delete_children();
@@ -323,14 +323,14 @@ namespace AST
 		AstNode operator=(AstNode) = delete;
 
 		// helper functions for creating AST nodes for constants
-		static std::unique_ptr<AstNode> mkconst_int(uint32_t v, bool is_signed, int width = 32);
-		static std::unique_ptr<AstNode> mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed, bool is_unsized);
-		static std::unique_ptr<AstNode> mkconst_bits(const std::vector<RTLIL::State> &v, bool is_signed);
-		static std::unique_ptr<AstNode> mkconst_str(const std::vector<RTLIL::State> &v);
-		static std::unique_ptr<AstNode> mkconst_str(const std::string &str);
+		static std::unique_ptr<AstNode> mkconst_int(AstSrcLocType loc, uint32_t v, bool is_signed, int width = 32);
+		static std::unique_ptr<AstNode> mkconst_bits(AstSrcLocType loc, const std::vector<RTLIL::State> &v, bool is_signed, bool is_unsized);
+		static std::unique_ptr<AstNode> mkconst_bits(AstSrcLocType loc, const std::vector<RTLIL::State> &v, bool is_signed);
+		static std::unique_ptr<AstNode> mkconst_str(AstSrcLocType loc, const std::vector<RTLIL::State> &v);
+		static std::unique_ptr<AstNode> mkconst_str(AstSrcLocType loc, const std::string &str);
 
 		// helper function to create an AST node for a temporary register
-		std::unique_ptr<AstNode> mktemp_logic(const std::string &name, AstNode *mod, bool nosync, int range_left, int range_right, bool is_signed);
+		std::unique_ptr<AstNode> mktemp_logic(AstSrcLocType loc, const std::string &name, AstNode *mod, bool nosync, int range_left, int range_right, bool is_signed);
 
 		// helper function for creating sign-extended const objects
 		RTLIL::Const bitsAsConst(int width, bool is_signed);
@@ -410,7 +410,7 @@ namespace AST
 	// to initialize the filename and linenum properties of new nodes
 	extern std::string current_filename;
 	// also set by the language frontend to control some AST processing
-	extern bool sv_mode;
+	extern bool sv_mode_but_global_and_used_for_literally_one_condition;
 
 	// for stats
 	unsigned long long astnode_count();
@@ -420,7 +420,7 @@ namespace AST
 	void use_internal_line_num();
 
 	// call a DPI function
-	std::unique_ptr<AstNode> dpi_call(const std::string &rtype, const std::string &fname, const std::vector<std::string> &argtypes, const std::vector<std::unique_ptr<AstNode>> &args);
+	std::unique_ptr<AstNode> dpi_call(AstSrcLocType loc, const std::string &rtype, const std::string &fname, const std::vector<std::string> &argtypes, const std::vector<std::unique_ptr<AstNode>> &args);
 
 	// Helper functions related to handling SystemVerilog interfaces
 	std::pair<std::string,std::string> split_modport_from_type(std::string name_type);
diff --git a/frontends/ast/dpicall.cc b/frontends/ast/dpicall.cc
index 4fa375df7..07314e3d7 100644
--- a/frontends/ast/dpicall.cc
+++ b/frontends/ast/dpicall.cc
@@ -64,7 +64,7 @@ static ffi_fptr resolve_fn (std::string symbol_name)
 	log_error("unable to resolve '%s'.\n", symbol_name.c_str());
 }
 
-std::unique_ptr<AST::AstNode> AST::dpi_call(const std::string &rtype, const std::string &fname, const std::vector<std::string> &argtypes, const std::vector<std::unique_ptr<AST::AstNode>> &args)
+std::unique_ptr<AST::AstNode> AST::dpi_call(AstSrcLocType loc, const std::string &rtype, const std::string &fname, const std::vector<std::string> &argtypes, const std::vector<std::unique_ptr<AST::AstNode>> &args)
 {
 	std::unique_ptr<AST::AstNode> newNode = nullptr;
 	union value { double f64; float f32; int32_t i32; void *ptr; };
@@ -125,11 +125,11 @@ std::unique_ptr<AST::AstNode> AST::dpi_call(const std::string &rtype, const std:
         ffi_call(&cif, resolve_fn(fname.c_str()), values[args.size()], values.data());
 
 	if (rtype == "real") {
-		newNode = std::make_unique<AstNode>(AST_REALVALUE);
+		newNode = std::make_unique<AstNode>(loc, AST_REALVALUE);
 		newNode->realvalue = value_store[args.size()].f64;
 		log("  return realvalue: %g\n", newNode->asReal(true));
 	} else if (rtype == "shortreal") {
-		newNode = std::make_unique<AstNode>(AST_REALVALUE);
+		newNode = std::make_unique<AstNode>(loc, AST_REALVALUE);
 		newNode->realvalue = value_store[args.size()].f32;
 		log("  return realvalue: %g\n", newNode->asReal(true));
 	} else if (rtype == "chandle") {
@@ -137,10 +137,10 @@ std::unique_ptr<AST::AstNode> AST::dpi_call(const std::string &rtype, const std:
 		std::vector<RTLIL::State> bits(64);
 		for (int i = 0; i < 64; i++)
 			bits.at(i) = (rawval & (1ULL << i)) ? RTLIL::State::S1 : RTLIL::State::S0;
-		newNode = AstNode::mkconst_bits(bits, false);
+		newNode = AstNode::mkconst_bits(loc, bits, false);
 		log("  return chandle: %llx\n", (unsigned long long)newNode->asInt(false));
 	} else {
-		newNode = AstNode::mkconst_int(value_store[args.size()].i32, false);
+		newNode = AstNode::mkconst_int(loc, value_store[args.size()].i32, false);
 		log("  return integer: %lld\n", (long long)newNode->asInt(true));
 	}
 
@@ -153,7 +153,7 @@ YOSYS_NAMESPACE_END
 
 YOSYS_NAMESPACE_BEGIN
 
-AST::AstNode *AST::dpi_call(const std::string&, const std::string &fname, const std::vector<std::string>&, const std::vector<AstNode*>&)
+AST::AstNode *AST::dpi_call(AstSrcLocType loc, const std::string&, const std::string &fname, const std::vector<std::string>&, const std::vector<AstNode*>&)
 {
 	log_error("Can't call DPI function `%s': this version of yosys is built without plugin support\n", fname.c_str());
 }
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 0c3fc513a..9a98cae3b 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -45,7 +45,7 @@ using namespace AST_INTERNAL;
 // helper function for creating RTLIL code for unary operations
 static RTLIL::SigSpec uniop2rtlil(AstNode *that, IdString type, int result_width, const RTLIL::SigSpec &arg, bool gen_attributes = true)
 {
-	IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(that->filename).c_str(), that->location.first_line, autoidx++);
+	IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(that->location.filename).c_str(), that->location.first_line, autoidx++);
 	RTLIL::Cell *cell = current_module->addCell(name, type);
 	set_src_attr(cell, that);
 
@@ -77,7 +77,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
 		return;
 	}
 
-	IdString name = stringf("$extend$%s:%d$%d", RTLIL::encode_filename(that->filename).c_str(), that->location.first_line, autoidx++);
+	IdString name = stringf("$extend$%s:%d$%d", RTLIL::encode_filename(that->location.filename).c_str(), that->location.first_line, autoidx++);
 	RTLIL::Cell *cell = current_module->addCell(name, ID($pos));
 	set_src_attr(cell, that);
 
@@ -104,7 +104,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
 // helper function for creating RTLIL code for binary operations
 static RTLIL::SigSpec binop2rtlil(AstNode *that, IdString type, int result_width, const RTLIL::SigSpec &left, const RTLIL::SigSpec &right)
 {
-	IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(that->filename).c_str(), that->location.first_line, autoidx++);
+	IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(that->location.filename).c_str(), that->location.first_line, autoidx++);
 	RTLIL::Cell *cell = current_module->addCell(name, type);
 	set_src_attr(cell, that);
 
@@ -138,7 +138,7 @@ static RTLIL::SigSpec mux2rtlil(AstNode *that, const RTLIL::SigSpec &cond, const
 	log_assert(cond.size() == 1);
 
 	std::stringstream sstr;
-	sstr << "$ternary$" << RTLIL::encode_filename(that->filename) << ":" << that->location.first_line << "$" << (autoidx++);
+	sstr << "$ternary$" << RTLIL::encode_filename(that->location.filename) << ":" << that->location.first_line << "$" << (autoidx++);
 
 	RTLIL::Cell *cell = current_module->addCell(sstr.str(), ID($mux));
 	set_src_attr(cell, that);
@@ -347,7 +347,7 @@ struct AST_INTERNAL::ProcessGenerator
 		LookaheadRewriter la_rewriter(always.get());
 
 		// generate process and simple root case
-		proc = current_module->addProcess(stringf("$proc$%s:%d$%d", RTLIL::encode_filename(always->filename).c_str(), always->location.first_line, autoidx++));
+		proc = current_module->addProcess(stringf("$proc$%s:%d$%d", RTLIL::encode_filename(always->location.filename).c_str(), always->location.first_line, autoidx++));
 		set_src_attr(proc, always.get());
 		for (auto &attr : always->attributes) {
 			if (attr.second->type != AST_CONSTANT)
@@ -723,7 +723,7 @@ struct AST_INTERNAL::ProcessGenerator
 			if (ast->str == "$display" || ast->str == "$displayb" || ast->str == "$displayh" || ast->str == "$displayo" ||
 		  ast->str == "$write"   || ast->str == "$writeb"   || ast->str == "$writeh"   || ast->str == "$writeo") {
 				std::stringstream sstr;
-				sstr << ast->str << "$" << ast->filename << ":" << ast->location.first_line << "$" << (autoidx++);
+				sstr << ast->str << "$" << ast->location.filename << ":" << ast->location.first_line << "$" << (autoidx++);
 
 				Wire *en = current_module->addWire(sstr.str() + "_EN", 1);
 				set_src_attr(en, ast);
@@ -766,7 +766,7 @@ struct AST_INTERNAL::ProcessGenerator
 					node->detectSignWidth(width, is_signed, nullptr);
 
 					VerilogFmtArg arg = {};
-					arg.filename = node->filename;
+					arg.filename = node->location.filename;
 					arg.first_line = node->location.first_line;
 					if (node->type == AST_CONSTANT && node->is_string) {
 						arg.type = VerilogFmtArg::STRING;
@@ -793,7 +793,7 @@ struct AST_INTERNAL::ProcessGenerator
 					fmt.append_literal("\n");
 				fmt.emit_rtlil(cell);
 			} else if (!ast->str.empty()) {
-				log_file_error(ast->filename, ast->location.first_line, "Found unsupported invocation of system task `%s'!\n", ast->str.c_str());
+				log_file_error(ast->location.filename, ast->location.first_line, "Found unsupported invocation of system task `%s'!\n", ast->str.c_str());
 			}
 			break;
 
@@ -813,7 +813,7 @@ struct AST_INTERNAL::ProcessGenerator
 
 				IdString cellname;
 				if (ast->str.empty())
-					cellname = stringf("$%s$%s:%d$%d", flavor.c_str(), RTLIL::encode_filename(ast->filename).c_str(), ast->location.first_line, autoidx++);
+					cellname = stringf("$%s$%s:%d$%d", flavor.c_str(), RTLIL::encode_filename(ast->location.filename).c_str(), ast->location.first_line, autoidx++);
 				else
 					cellname = ast->str;
 				check_unique_id(current_module, cellname, ast, "procedural assertion");
@@ -843,7 +843,7 @@ struct AST_INTERNAL::ProcessGenerator
 				set_src_attr(cell, ast);
 				for (auto &attr : ast->attributes) {
 					if (attr.second->type != AST_CONSTANT)
-						log_file_error(ast->filename, ast->location.first_line, "Attribute `%s' with non-constant value!\n", attr.first.c_str());
+						log_file_error(ast->location.filename, ast->location.first_line, "Attribute `%s' with non-constant value!\n", attr.first.c_str());
 					cell->attributes[attr.first] = attr.second->asAttrConst();
 				}
 				cell->setParam(ID::FLAVOR, flavor);
@@ -1504,7 +1504,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			}
 
 			RTLIL::SigSpec sig = realAsConst(width_hint);
-			log_file_warning(filename, location.first_line, "converting real value %e to binary %s.\n", realvalue, log_signal(sig));
+			log_file_warning(location.filename, location.first_line, "converting real value %e to binary %s.\n", realvalue, log_signal(sig));
 			return sig;
 		}
 
@@ -1536,7 +1536,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				if (dynamic_cast<RTLIL::Binding*>(current_module)) {
 					/* nothing to do here */
 				} else if (flag_autowire)
-					log_file_warning(filename, location.first_line, "Identifier `%s' is implicitly declared.\n", str.c_str());
+					log_file_warning(location.filename, location.first_line, "Identifier `%s' is implicitly declared.\n", str.c_str());
 				else
 					input_error("Identifier `%s' is implicitly declared and `default_nettype is set to none.\n", str.c_str());
 			}
@@ -1641,10 +1641,10 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 						chunk.offset = source_width - (chunk.offset + chunk.width);
 					if (chunk.offset > chunk_left || chunk.offset + chunk.width < chunk_right) {
 						if (chunk.width == 1)
-							log_file_warning(filename, location.first_line, "Range select out of bounds on signal `%s': Setting result bit to undef.\n",
+							log_file_warning(location.filename, location.first_line, "Range select out of bounds on signal `%s': Setting result bit to undef.\n",
 									str.c_str());
 						else
-							log_file_warning(filename, location.first_line, "Range select [%d:%d] out of bounds on signal `%s': Setting all %d result bits to undef.\n",
+							log_file_warning(location.filename, location.first_line, "Range select [%d:%d] out of bounds on signal `%s': Setting all %d result bits to undef.\n",
 									children[0]->range_left, children[0]->range_right, str.c_str(), chunk.width);
 						chunk = RTLIL::SigChunk(RTLIL::State::Sx, chunk.width);
 					} else {
@@ -1658,10 +1658,10 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 							chunk.offset += add_undef_bits_lsb;
 						}
 						if (add_undef_bits_lsb)
-							log_file_warning(filename, location.first_line, "Range [%d:%d] select out of bounds on signal `%s': Setting %d LSB bits to undef.\n",
+							log_file_warning(location.filename, location.first_line, "Range [%d:%d] select out of bounds on signal `%s': Setting %d LSB bits to undef.\n",
 									children[0]->range_left, children[0]->range_right, str.c_str(), add_undef_bits_lsb);
 						if (add_undef_bits_msb)
-							log_file_warning(filename, location.first_line, "Range [%d:%d] select out of bounds on signal `%s': Setting %d MSB bits to undef.\n",
+							log_file_warning(location.filename, location.first_line, "Range [%d:%d] select out of bounds on signal `%s': Setting %d MSB bits to undef.\n",
 									children[0]->range_left, children[0]->range_right, str.c_str(), add_undef_bits_msb);
 					}
 				}
@@ -1935,7 +1935,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 	case AST_MEMRD:
 		{
 			std::stringstream sstr;
-			sstr << "$memrd$" << str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
+			sstr << "$memrd$" << str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
 
 			RTLIL::Cell *cell = current_module->addCell(sstr.str(), ID($memrd));
 			set_src_attr(cell, this);
@@ -1973,7 +1973,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 	case AST_MEMINIT:
 		{
 			std::stringstream sstr;
-			sstr << "$meminit$" << str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
+			sstr << "$meminit$" << str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
 
 			SigSpec en_sig = children[2]->genRTLIL();
 
@@ -2018,7 +2018,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 
 			IdString cellname;
 			if (str.empty())
-				cellname = stringf("$%s$%s:%d$%d", flavor.c_str(), RTLIL::encode_filename(filename).c_str(), location.first_line, autoidx++);
+				cellname = stringf("$%s$%s:%d$%d", flavor.c_str(), RTLIL::encode_filename(location.filename).c_str(), location.first_line, autoidx++);
 			else
 				cellname = str;
 			check_unique_id(current_module, cellname, this, "procedural assertion");
@@ -2061,7 +2061,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 						new_left.append(left[i]);
 						new_right.append(right[i]);
 					}
-				log_file_warning(filename, location.first_line, "Ignoring assignment to constant bits:\n"
+				log_file_warning(location.filename, location.first_line, "Ignoring assignment to constant bits:\n"
 						"    old assignment: %s = %s\n    new assignment: %s = %s.\n",
 						log_signal(left), log_signal(right),
 						log_signal(new_left), log_signal(new_right));
@@ -2096,7 +2096,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 					IdString paraname = child->str.empty() ? stringf("$%d", ++para_counter) : child->str;
 					const AstNode *value = child->children[0].get();
 					if (value->type == AST_REALVALUE)
-						log_file_warning(filename, location.first_line, "Replacing floating point parameter %s.%s = %f with string.\n",
+						log_file_warning(location.filename, location.first_line, "Replacing floating point parameter %s.%s = %f with string.\n",
 								log_id(cell), log_id(paraname), value->realvalue);
 					else if (value->type != AST_CONSTANT)
 						input_error("Parameter %s.%s with non-constant value!\n",
@@ -2193,14 +2193,14 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			int sz = children.size();
 			if (str == "$info") {
 				if (sz > 0)
-					log_file_info(filename, location.first_line, "%s.\n", children[0]->str.c_str());
+					log_file_info(location.filename, location.first_line, "%s.\n", children[0]->str.c_str());
 				else
-					log_file_info(filename, location.first_line, "\n");
+					log_file_info(location.filename, location.first_line, "\n");
 			} else if (str == "$warning") {
 				if (sz > 0)
-					log_file_warning(filename, location.first_line, "%s.\n", children[0]->str.c_str());
+					log_file_warning(location.filename, location.first_line, "%s.\n", children[0]->str.c_str());
 				else
-					log_file_warning(filename, location.first_line, "\n");
+					log_file_warning(location.filename, location.first_line, "\n");
 			} else if (str == "$error") {
 				if (sz > 0)
 					input_error("%s.\n", children[0]->str.c_str());
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 048a15af8..374b9c0dc 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -155,7 +155,7 @@ Fmt AstNode::processFormat(int stage, bool sformat_like, int default_base, size_
 		while (node_arg->simplify(true, stage, -1, false)) { }
 
 		VerilogFmtArg arg = {};
-		arg.filename = filename;
+		arg.filename = location.filename;
 		arg.first_line = location.first_line;
 		if (node_arg->type == AST_CONSTANT && node_arg->is_string) {
 			arg.type = VerilogFmtArg::STRING;
@@ -173,10 +173,10 @@ Fmt AstNode::processFormat(int stage, bool sformat_like, int default_base, size_
 			arg.sig = node_arg->bitsAsConst();
 			arg.signed_ = node_arg->is_signed;
 		} else if (may_fail) {
-			log_file_info(filename, location.first_line, "Skipping system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
+			log_file_info(location.filename, location.first_line, "Skipping system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
 			return Fmt();
 		} else {
-			log_file_error(filename, location.first_line, "Failed to evaluate system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
+			log_file_error(location.filename, location.first_line, "Failed to evaluate system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
 		}
 		args.push_back(arg);
 	}
@@ -240,20 +240,20 @@ void AstNode::annotateTypedEnums(AstNode *template_node)
 			RTLIL::Const val = enum_item->children[0]->bitsAsConst(width, is_signed);
 			enum_item_str.append(val.as_string());
 			//set attribute for available val to enum item name mappings
-			set_attribute(enum_item_str.c_str(), mkconst_str(enum_item->str));
+			set_attribute(enum_item_str.c_str(), mkconst_str(location, enum_item->str));
 		}
 	}
 }
 
-static std::unique_ptr<AstNode> make_range(int left, int right, bool is_signed = false)
+static std::unique_ptr<AstNode> make_range(AstSrcLocType loc, int left, int right, bool is_signed = false)
 {
 	// generate a pre-validated range node for a fixed signal range.
-	auto range = std::make_unique<AstNode>(AST_RANGE);
+	auto range = std::make_unique<AstNode>(loc, AST_RANGE);
 	range->range_left = left;
 	range->range_right = right;
 	range->range_valid = true;
-	range->children.push_back(AstNode::mkconst_int(left, true));
-	range->children.push_back(AstNode::mkconst_int(right, true));
+	range->children.push_back(AstNode::mkconst_int(loc, left, true));
+	range->children.push_back(AstNode::mkconst_int(loc, right, true));
 	range->is_signed = is_signed;
 	return range;
 }
@@ -388,30 +388,32 @@ static int size_packed_struct(AstNode *snode, int base_offset)
 	return width;
 }
 
-static std::unique_ptr<AstNode> node_int(int ival)
+static std::unique_ptr<AstNode> node_int(AstSrcLocType loc, int ival)
 {
-	return AstNode::mkconst_int(ival, true);
+	return AstNode::mkconst_int(loc, ival, true);
 }
 
 static std::unique_ptr<AstNode> multiply_by_const(std::unique_ptr<AstNode> expr_node, int stride)
 {
-	return std::make_unique<AstNode>(AST_MUL, std::move(expr_node), node_int(stride));
+	auto loc = expr_node->location;
+	return std::make_unique<AstNode>(loc, AST_MUL, std::move(expr_node), node_int(loc, stride));
 }
 
 static std::unique_ptr<AstNode> normalize_index(AstNode *expr, AstNode *decl_node, int dimension)
 {
 	auto new_expr = expr->clone();
+	auto loc = expr->location;
 
 	int offset = decl_node->dimensions[dimension].range_right;
 	if (offset) {
-		new_expr = std::make_unique<AstNode>(AST_SUB, std::move(new_expr), node_int(offset));
+		new_expr = std::make_unique<AstNode>(loc, AST_SUB, std::move(new_expr), node_int(loc, offset));
 	}
 
 	// Packed dimensions are normally indexed by lsb, while unpacked dimensions are normally indexed by msb.
 	if ((dimension < decl_node->unpacked_dimensions) ^ decl_node->dimensions[dimension].range_swapped) {
 		// Swap the index if the dimension is declared the "wrong" way.
 		int left = decl_node->dimensions[dimension].range_width - 1;
-		new_expr = std::make_unique<AstNode>(AST_SUB, node_int(left), std::move(new_expr));
+		new_expr = std::make_unique<AstNode>(loc, AST_SUB, node_int(loc, left), std::move(new_expr));
 	}
 
 	return new_expr;
@@ -433,7 +435,7 @@ static std::unique_ptr<AstNode> index_msb_offset(std::unique_ptr<AstNode> lsb_of
 	std::unique_ptr<AstNode> add_offset;
 	if (rnode->children.size() == 1) {
 		// Index, e.g. s.a[i]
-		add_offset = node_int(stride - 1);
+		add_offset = node_int(rnode->location, stride - 1);
 	}
 	else {
 		// rnode->children.size() == 2
@@ -620,7 +622,7 @@ const RTLIL::Module* AstNode::lookup_cell_module()
 
 	auto reprocess_after = [this] (const std::string &modname) {
 		if (!attributes.count(ID::reprocess_after))
-			set_attribute(ID::reprocess_after, AstNode::mkconst_str(modname));
+			set_attribute(ID::reprocess_after, AstNode::mkconst_str(location, modname));
 	};
 
 	const AstNode *celltype = nullptr;
@@ -929,7 +931,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 #if 0
 	log("-------------\n");
-	log("AST simplify[%d] depth %d at %s:%d on %s %p:\n", stage, recursion_counter, filename.c_str(), location.first_line, type2str(type).c_str(), this);
+	log("AST simplify[%d] depth %d at %s:%d on %s %p:\n", stage, recursion_counter, location.filename.c_str(), location.first_line, type2str(type).c_str(), this);
 	log("const_fold=%d, stage=%d, width_hint=%d, sign_hint=%d\n",
 			int(const_fold), int(stage), int(width_hint), int(sign_hint));
 	// dumpAst(nullptr, "> ");
@@ -1020,7 +1022,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					for (auto &it : node->attributes)
 						if (it.first != ID::mem2reg)
 							reg->set_attribute(it.first, it.second->clone());
-					reg->filename = node->filename;
+					reg->location.filename = node->location.filename;
 					reg->location = node->location;
 					while (reg->simplify(true, 1, -1, false)) { }
 					children.push_back(std::move(reg));
@@ -1049,7 +1051,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	// note that $display, $finish, and $stop are used for synthesis-time DRC so they're not in this list
 	if ((type == AST_FCALL || type == AST_TCALL) && (str == "$strobe" || str == "$monitor" || str == "$time" ||
 			str == "$dumpfile" || str == "$dumpvars" || str == "$dumpon" || str == "$dumpoff" || str == "$dumpall")) {
-		log_file_warning(filename, location.first_line, "Ignoring call to system %s %s.\n", type == AST_FCALL ? "function" : "task", str.c_str());
+		log_file_warning(location.filename, location.first_line, "Ignoring call to system %s %s.\n", type == AST_FCALL ? "function" : "task", str.c_str());
 		delete_children();
 		str = std::string();
 	}
@@ -1059,7 +1061,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		 str == "$write"   || str == "$writeb"   || str == "$writeh"   || str == "$writeo"))
 	{
 		if (!current_always) {
-			log_file_warning(filename, location.first_line, "System task `%s' outside initial or always block is unsupported.\n", str.c_str());
+			log_file_warning(location.filename, location.first_line, "System task `%s' outside initial or always block is unsupported.\n", str.c_str());
 			delete_children();
 			str = std::string();
 		} else {
@@ -1402,7 +1404,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 				// create the indirection wire
 				std::stringstream sstr;
-				sstr << "$indirect$" << ref->name.c_str() << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
+				sstr << "$indirect$" << ref->name.c_str() << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
 				std::string tmp_str = sstr.str();
 				add_wire_for_ref(ref, tmp_str);
 
@@ -2240,7 +2242,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			int width = std::abs(children[1]->range_left - children[1]->range_right) + 1;
 			if (children[0]->type == AST_REALVALUE) {
 				RTLIL::Const constvalue = children[0]->realAsConst(width);
-				log_file_warning(filename, location.first_line, "converting real value %e to binary %s.\n",
+				log_file_warning(location.filename, location.first_line, "converting real value %e to binary %s.\n",
 						children[0]->realvalue, log_signal(constvalue));
 				children[0] = mkconst_bits(constvalue.to_bits(), sign_hint);
 				fixup_hierarchy_flags();
@@ -2382,7 +2384,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			std::swap(data_range_left, data_range_right);
 
 		std::stringstream sstr;
-		sstr << "$mem2bits$" << str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
+		sstr << "$mem2bits$" << str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
 		std::string wire_id = sstr.str();
 
 		auto wire_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(data_range_left, true), mkconst_int(data_range_right, true)));
@@ -2602,7 +2604,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		for (size_t i = 0; i < children.size(); i++)
 			if (children[i]->type == AST_WIRE || children[i]->type == AST_MEMORY || children[i]->type == AST_PARAMETER || children[i]->type == AST_LOCALPARAM || children[i]->type == AST_TYPEDEF)
 			{
-				log_assert(!sv_mode);
+				log_assert(!sv_mode_but_global_and_used_for_literally_one_condition);
 				children[i]->input_error("Local declaration in unnamed block is only supported in SystemVerilog mode!\n");
 			}
 	}
@@ -3139,7 +3141,7 @@ skip_dynamic_range_lvalue_expansion:;
 
 			auto wire_tmp_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(width_hint-1, true), mkconst_int(0, true)));
 			auto wire_tmp = wire_tmp_owned.get();
-			wire_tmp->str = stringf("$splitcmplxassign$%s:%d$%d", RTLIL::encode_filename(filename).c_str(), location.first_line, autoidx++);
+			wire_tmp->str = stringf("$splitcmplxassign$%s:%d$%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line, autoidx++);
 			current_scope[wire_tmp->str] = wire_tmp;
 			current_ast_mod->children.push_back(std::move(wire_tmp_owned));
 			wire_tmp->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
@@ -3181,7 +3183,7 @@ skip_dynamic_range_lvalue_expansion:;
 			input_error("Insufficient number of array indices for %s.\n", log_id(str));
 
 		std::stringstream sstr;
-		sstr << "$memwr$" << children[0]->str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
+		sstr << "$memwr$" << children[0]->str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
 		std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA", id_en = sstr.str() + "_EN";
 
 		int mem_width, mem_size, addr_bits;
@@ -3452,7 +3454,7 @@ skip_dynamic_range_lvalue_expansion:;
 					auto* reg = reg_owned.get();
 					current_ast_mod->children.push_back(std::move(reg_owned));
 
-					reg->str = stringf("$past$%s:%d$%d$%d", RTLIL::encode_filename(filename).c_str(), location.first_line, myidx, i);
+					reg->str = stringf("$past$%s:%d$%d$%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line, myidx, i);
 					reg->is_reg = true;
 					reg->is_signed = sign_hint;
 
@@ -3828,7 +3830,7 @@ skip_dynamic_range_lvalue_expansion:;
 						input_error("Failed to evaluate DPI function with non-constant argument.\n");
 				}
 
-				newNode = dpi_call(rtype, fname, argtypes, args);
+				newNode = dpi_call(dpi_decl->location, rtype, fname, argtypes, args);
 
 				goto apply_newNode;
 			}
@@ -3912,7 +3914,7 @@ skip_dynamic_range_lvalue_expansion:;
 
 
 		std::stringstream sstr;
-		sstr << str << "$func$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++) << '.';
+		sstr << str << "$func$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++) << '.';
 		std::string prefix = sstr.str();
 
 		auto* decl = current_scope[str];
@@ -4442,7 +4444,7 @@ apply_newNode:
 		// newNode->dumpAst(stderr, "+ ");
 		log_assert(newNode != nullptr);
 		// newNode->null_check();
-		newNode->filename = filename;
+		newNode->location.filename = location.filename;
 		newNode->location = location;
 		newNode->cloneInto(*this);
 		fixup_hierarchy_flags();
@@ -4489,7 +4491,7 @@ std::unique_ptr<AstNode> AstNode::readmem(bool is_readmemh, std::string mem_file
 #else
 		char slash = '/';
 #endif
-		std::string path = filename.substr(0, filename.find_last_of(slash)+1);
+		std::string path = location.filename.substr(0, location.filename.find_last_of(slash)+1);
 		f.open(path + mem_filename.c_str());
 		yosys_input_files.insert(path + mem_filename);
 	} else {
@@ -4546,7 +4548,7 @@ std::unique_ptr<AstNode> AstNode::readmem(bool is_readmemh, std::string mem_file
 				continue;
 			}
 
-			VERILOG_FRONTEND::ConstParser p{mem_filename, std::nullopt};
+			VERILOG_FRONTEND::ConstParser p{memory->location};
 			auto value = p.const2ast(stringf("%d'%c", mem_width, is_readmemh ? 'h' : 'b') + token);
 
 			if (unconditional_init)
@@ -4768,7 +4770,7 @@ static void mark_memories_assign_lhs_complex(dict<AstNode*, pool<std::string>> &
 	if (that->type == AST_IDENTIFIER && that->id2ast && that->id2ast->type == AST_MEMORY) {
 		AstNode *mem = that->id2ast;
 		if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_CMPLX_LHS))
-			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(that->filename).c_str(), that->location.first_line));
+			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(that->location.filename).c_str(), that->location.first_line));
 		mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_CMPLX_LHS;
 	}
 }
@@ -4796,14 +4798,14 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 			// activate mem2reg if this is assigned in an async proc
 			if (flags & AstNode::MEM2REG_FL_ASYNC) {
 				if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_ASYNC))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(filename).c_str(), location.first_line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line));
 				mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_ASYNC;
 			}
 
 			// remember if this is assigned blocking (=)
 			if (type == AST_ASSIGN_EQ) {
 				if (!(proc_flags[mem] & AstNode::MEM2REG_FL_EQ1))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(filename).c_str(), location.first_line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line));
 				proc_flags[mem] |= AstNode::MEM2REG_FL_EQ1;
 			}
 
@@ -4820,11 +4822,11 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 			// remember where this is
 			if (flags & MEM2REG_FL_INIT) {
 				if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_INIT))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(filename).c_str(), location.first_line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line));
 				mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_INIT;
 			} else {
 				if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_ELSE))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(filename).c_str(), location.first_line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line));
 				mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_ELSE;
 			}
 		}
@@ -4841,7 +4843,7 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 
 		// flag if used after blocking assignment (in same proc)
 		if ((proc_flags[mem] & AstNode::MEM2REG_FL_EQ1) && !(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_EQ2)) {
-			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(filename).c_str(), location.first_line));
+			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line));
 			mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_EQ2;
 		}
 	}
@@ -5027,7 +5029,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 			children[0]->children[0]->children[0]->type != AST_CONSTANT)
 	{
 		std::stringstream sstr;
-		sstr << "$mem2reg_wr$" << children[0]->str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
+		sstr << "$mem2reg_wr$" << children[0]->str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
 		std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA";
 
 		int mem_width, mem_size, addr_bits;
@@ -5146,7 +5148,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 		else
 		{
 			std::stringstream sstr;
-			sstr << "$mem2reg_rd$" << str << "$" << RTLIL::encode_filename(filename) << ":" << location.first_line << "$" << (autoidx++);
+			sstr << "$mem2reg_rd$" << str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
 			std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA";
 
 			int mem_width, mem_size, addr_bits;
diff --git a/frontends/verilog/Makefile.inc b/frontends/verilog/Makefile.inc
index cc8baf6aa..338b13e4b 100644
--- a/frontends/verilog/Makefile.inc
+++ b/frontends/verilog/Makefile.inc
@@ -13,6 +13,7 @@ frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y
 
 frontends/verilog/verilog_parser.tab.hh: frontends/verilog/verilog_parser.tab.cc
 frontends/verilog/verilog_frontend.h: frontends/verilog/verilog_parser.tab.hh
+frontends/verilog/verilog_error.h: frontends/verilog/verilog_parser.tab.hh
 
 frontends/verilog/verilog_lexer.cc: frontends/verilog/verilog_lexer.l frontends/verilog/verilog_parser.tab.cc
 	$(Q) mkdir -p $(dir $@)
@@ -24,5 +25,6 @@ OBJS += frontends/verilog/verilog_parser.tab.o
 OBJS += frontends/verilog/verilog_lexer.o
 OBJS += frontends/verilog/preproc.o
 OBJS += frontends/verilog/verilog_frontend.o
+OBJS += frontends/verilog/verilog_error.o
 OBJS += frontends/verilog/const2ast.o
 
diff --git a/frontends/verilog/const2ast.cc b/frontends/verilog/const2ast.cc
index 9c4a2e76c..cd8f05b9b 100644
--- a/frontends/verilog/const2ast.cc
+++ b/frontends/verilog/const2ast.cc
@@ -46,11 +46,8 @@ using namespace VERILOG_FRONTEND;
 
 std::string ConstParser::fmt_maybe_loc(std::string msg) {
 	std::string s;
-	s += filename.value_or("INTERNAL");
 
-	if (loc)
-		s += stringf("%d", loc->first_line);
-	s += ": ";
+	s += stringf("%s:%d:", loc.filename, loc.first_line);
 
 	s += msg;
 	return s;
@@ -191,7 +188,7 @@ std::unique_ptr<AstNode> ConstParser::const2ast(std::string code, char case_type
 				ch = ch >> 1;
 			}
 		}
-		auto ast = AstNode::mkconst_bits(data, false);
+		auto ast = AstNode::mkconst_bits(loc, data, false);
 		ast->str = code;
 		return ast;
 	}
@@ -210,7 +207,7 @@ std::unique_ptr<AstNode> ConstParser::const2ast(std::string code, char case_type
 		my_strtobin(data, str, -1, 10, case_type, false);
 		if (data.back() == State::S1)
 			data.push_back(State::S0);
-		return AstNode::mkconst_bits(data, true);
+		return AstNode::mkconst_bits(loc, data, true);
 	}
 
 	// unsized constant
@@ -258,7 +255,7 @@ std::unique_ptr<AstNode> ConstParser::const2ast(std::string code, char case_type
 			if (is_signed && data.back() == State::S1)
 				data.push_back(State::S0);
 		}
-		return AstNode::mkconst_bits(data, is_signed, is_unsized);
+		return AstNode::mkconst_bits(loc, data, is_signed, is_unsized);
 	}
 
 	return NULL;
diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index d4bee02da..d05f87aff 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -32,10 +32,12 @@
 
 #include "verilog_frontend.h"
 #include "verilog_lexer.h"
+#include "verilog_error.h"
 #include "preproc.h"
 #include "kernel/yosys.h"
 #include "libs/sha1/sha1.h"
 #include <stdarg.h>
+#include <list>
 
 YOSYS_NAMESPACE_BEGIN
 using namespace VERILOG_FRONTEND;
@@ -47,10 +49,10 @@ static std::list<std::vector<std::string>> verilog_defaults_stack;
 
 static void error_on_dpi_function(AST::AstNode *node)
 {
-	if (node->type == AST::AST_DPI_FUNCTION)
-		log_file_error(node->filename, node->location.first_line, "Found DPI function %s.\n", node->str.c_str());
-	for (auto& child : node->children)
-		error_on_dpi_function(child.get());
+    if (node->type == AST::AST_DPI_FUNCTION)
+        err_at_ast(node->location, "Found DPI function %s.\n", node->str.c_str());
+    for (auto& child : node->children)
+        error_on_dpi_function(child.get());
 }
 
 static void add_package_types(dict<std::string, AST::AstNode *> &user_types, std::vector<std::unique_ptr<AST::AstNode>> &package_list)
@@ -69,15 +71,7 @@ static void add_package_types(dict<std::string, AST::AstNode *> &user_types, std
 }
 
 struct VerilogFrontend : public Frontend {
-	ParseMode parse_mode;
-	ParseState parse_state;
-	VerilogLexer lexer;
-	frontend_verilog_yy::parser parser;
-	VerilogFrontend() : Frontend("verilog", "read modules from Verilog file"),
-						parse_mode(),
-						parse_state(),
-						lexer(&parse_state, &parse_mode),
-						parser(&lexer, &parse_state, &parse_mode) { }
+	VerilogFrontend() : Frontend("verilog", "read modules from Verilog file") { }
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
@@ -259,6 +253,8 @@ struct VerilogFrontend : public Frontend {
 		bool flag_dump_vlog1 = false;
 		bool flag_dump_vlog2 = false;
 		bool flag_dump_rtlil = false;
+		bool flag_debug_lexer = false;
+		bool flag_debug_parser = false;
 		bool flag_nolatches = false;
 		bool flag_nomeminit = false;
 		bool flag_nomem2reg = false;
@@ -281,8 +277,8 @@ struct VerilogFrontend : public Frontend {
 		std::list<std::string> include_dirs;
 		std::list<std::string> attributes;
 
-		lexer.set_debug(false);
-		parser.set_debug_level(0);
+		ParseMode parse_mode;
+		ParseState parse_state;
 		parse_mode.sv = false;
 		parse_mode.formal = false;
 		parse_mode.noassert = false;
@@ -340,8 +336,8 @@ struct VerilogFrontend : public Frontend {
 				flag_dump_ast2 = true;
 				flag_dump_vlog1 = true;
 				flag_dump_vlog2 = true;
-				lexer.set_debug(true);
-				parser.set_debug_level(1);
+				flag_debug_lexer = true;
+				flag_debug_parser = true;
 				continue;
 			}
 			if (arg == "-dump_ast1") {
@@ -370,6 +366,8 @@ struct VerilogFrontend : public Frontend {
 			}
 			if (arg == "-yydebug") {
 				flag_yydebug = true;
+				flag_debug_lexer = true;
+				flag_debug_parser = true;
 				continue;
 			}
 			if (arg == "-nolatches") {
@@ -481,6 +479,11 @@ struct VerilogFrontend : public Frontend {
 			break;
 		}
 
+		VerilogLexer lexer(&parse_state, &parse_mode, &filename);
+		frontend_verilog_yy::parser parser(&lexer, &parse_state, &parse_mode);
+		lexer.set_debug(flag_debug_lexer);
+		parser.set_debug_level(flag_debug_parser ? 1 : 0);
+
 		if (parse_mode.formal || !flag_nosynthesis)
 			defines_map.add(parse_mode.formal ? "FORMAL" : "SYNTHESIS", "1");
 
@@ -491,10 +494,10 @@ struct VerilogFrontend : public Frontend {
 		log("Parsing %s%s input from `%s' to AST representation.\n",
 				parse_mode.formal ? "formal " : "", parse_mode.sv ? "SystemVerilog" : "Verilog", filename.c_str());
 
-		AST::current_filename = filename;
-		AST::sv_mode = parse_mode.sv;
+		AST::sv_mode_but_global_and_used_for_literally_one_condition = parse_mode.sv;
 
-		parse_state.current_ast = new AST::AstNode(AST::AST_DESIGN);
+		AstSrcLocType top_loc = AstSrcLocType ( "read_verilog", 0, 0, 0, 0);
+		parse_state.current_ast = new AST::AstNode(top_loc, AST::AST_DESIGN);
 
 		parse_state.lexin = f;
 		std::string code_after_preproc;
@@ -522,10 +525,6 @@ struct VerilogFrontend : public Frontend {
 		// add a new empty type map to allow overriding existing global definitions
 		parse_state.user_type_stack.push_back(UserTypeMap());
 
-		parser.~parser();
-		lexer.~VerilogLexer();
-		new (&lexer) VerilogLexer(&parse_state, &parse_mode);
-		new (&parser) frontend_verilog_yy::parser(&lexer, &parse_state, &parse_mode);
 		if (flag_yydebug) {
 			lexer.set_debug(true);
 			parser.set_debug_level(1);
@@ -537,7 +536,7 @@ struct VerilogFrontend : public Frontend {
 			if (child->type == AST::AST_MODULE)
 				for (auto &attr : attributes)
 					if (child->attributes.count(attr) == 0)
-						child->attributes[attr] = AST::AstNode::mkconst_int(1, false);
+						child->attributes[attr] = AST::AstNode::mkconst_int(top_loc, 1, false);
 		}
 
 		if (flag_nodpi)
@@ -776,24 +775,4 @@ struct VerilogFileList : public Pass {
 
 #endif
 
-[[noreturn]]
-void VERILOG_FRONTEND::verr_at(std::string filename, int begin_line, char const *fmt, va_list ap)
-{
-    char buffer[1024];
-    char *p = buffer;
-    p += vsnprintf(p, buffer + sizeof(buffer) - p, fmt, ap);
-    p += snprintf(p, buffer + sizeof(buffer) - p, "\n");
-    YOSYS_NAMESPACE_PREFIX log_file_error(filename, begin_line, "%s", buffer);
-    exit(1);
-}
-
-[[noreturn]]
-void VERILOG_FRONTEND::err_at_ast(AstSrcLocType loc, char const *fmt, ...)
-{
-	va_list args;
-	va_start(args, fmt);
-	verr_at(AST::current_filename, loc.first_line, fmt, args);
-	va_end(args);
-}
-
 YOSYS_NAMESPACE_END
diff --git a/frontends/verilog/verilog_frontend.h b/frontends/verilog/verilog_frontend.h
index 29c16c039..e97cee4fc 100644
--- a/frontends/verilog/verilog_frontend.h
+++ b/frontends/verilog/verilog_frontend.h
@@ -39,7 +39,6 @@
 
 #include <stdio.h>
 #include <stdint.h>
-#include <list>
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -47,8 +46,7 @@ namespace VERILOG_FRONTEND
 {
 	/* Ephemeral context class */
 	struct ConstParser {
-		std::optional<std::string> filename;
-		std::optional<AST::AstSrcLocType> loc;
+		AST::AstSrcLocType loc;
 	private:
 		std::string fmt_maybe_loc(std::string msg);
 		void log_maybe_loc_error(std::string msg);
@@ -64,8 +62,6 @@ namespace VERILOG_FRONTEND
 		std::unique_ptr<AST::AstNode> const2ast(std::string code, char case_type = 0, bool warn_z = false);
 
 	};
-	[[noreturn]]
-	extern void err_at_ast(AST::AstSrcLocType loc, char const *fmt, ...);
 };
 
 YOSYS_NAMESPACE_END
diff --git a/frontends/verilog/verilog_lexer.h b/frontends/verilog/verilog_lexer.h
index 2c31160dd..a4f3d9bfb 100644
--- a/frontends/verilog/verilog_lexer.h
+++ b/frontends/verilog/verilog_lexer.h
@@ -4,18 +4,20 @@
 #include "kernel/yosys.h"
 #include "frontends/ast/ast.h"
 #include "frontends/verilog/verilog_parser.tab.hh"
+#include <string>
 
 YOSYS_NAMESPACE_BEGIN
 
 namespace VERILOG_FRONTEND {
-	[[noreturn]]
-	extern void verr_at(std::string filename, int begin_line, char const *fmt, va_list ap);
 	using parser = frontend_verilog_yy::parser;
 	class VerilogLexer : public frontend_verilog_yyFlexLexer {
 		ParseState* extra;
 		ParseMode* mode;
 	public:
-		VerilogLexer(ParseState* e, ParseMode* m) : frontend_verilog_yyFlexLexer(e->lexin), extra(e), mode(m) {}
+		parser::location_type out_loc; // TODO private?
+		VerilogLexer(ParseState* e, ParseMode* m, std::string* filename) : frontend_verilog_yyFlexLexer(e->lexin), extra(e), mode(m) {
+			out_loc.begin.filename = filename;
+		}
 		~VerilogLexer() override {}
 		// autogenerated body due to YY_DECL
 		parser::symbol_type nextToken();
@@ -24,19 +26,9 @@ namespace VERILOG_FRONTEND {
 		parser::symbol_type terminate() {
 			return parser::make_FRONTEND_VERILOG_YYEOF(out_loc);
 		}
-		parser::location_type out_loc;
-		[[noreturn]]
-		void err(char const *fmt, ...)
-		{
-			va_list args;
-			va_start(args, fmt);
-			verr_at(AST::current_filename, yylineno, fmt, args);
-		}
 	private:
 		std::vector<std::string> fn_stack;
 		std::vector<int> ln_stack;
-		parser::location_type real_loc;
-		parser::location_type old_loc;
 		int LexerInput(char* buf, int max_size) override {
 			return readsome(*extra->lexin, buf, max_size);
 		}
diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 24e842691..0e07e9e7b 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -85,17 +85,16 @@ YOSYS_NAMESPACE_END
 // 	result = readsome(*extra->lexin, buf, max_size)
 
 #define YY_USER_ACTION \
-		real_loc.begin = real_loc.end; \
+		out_loc.begin = out_loc.end; \
 		for(int i = 0; YYText()[i] != '\0'; ++i){ \
 				if(YYText()[i] == '\n') { \
-						real_loc.end.line++; \
-						real_loc.end.column = 1; \
+						out_loc.end.line++; \
+						out_loc.end.column = 1; \
 				} \
 				else { \
-						real_loc.end.column++; \
+						out_loc.end.column++; \
 				} \
-		} \
-		out_loc = real_loc;
+		}
 
 #define YY_BREAK \
     break;
@@ -183,7 +182,6 @@ TIME_SCALE_SUFFIX [munpf]?s
 		current_filename = current_filename.substr(0, current_filename.size()-1);
 	yylineno = (0);
 	out_loc.begin.line = out_loc.end.line = 0;
-	real_loc.begin.line = real_loc.end.line = 0;
 }
 
 <INITIAL,SYNOPSYS_TRANSLATE_OFF>"`file_pop"[^\n]*\n {
@@ -191,7 +189,6 @@ TIME_SCALE_SUFFIX [munpf]?s
 	fn_stack.pop_back();
 	yylineno = (ln_stack.back());
 	out_loc.begin.line = out_loc.end.line = ln_stack.back();
-	real_loc.begin.line = real_loc.end.line = ln_stack.back();
 	ln_stack.pop_back();
 }
 
@@ -200,7 +197,6 @@ TIME_SCALE_SUFFIX [munpf]?s
 	while (*p == ' ' || *p == '\t') p++;
 	yylineno = (atoi(p));
 	out_loc.begin.line = out_loc.end.line = atoi(p);
-	real_loc.begin.line = real_loc.end.line = atoi(p);
 	while (*p && *p != ' ' && *p != '\t') p++;
 	while (*p == ' ' || *p == '\t') p++;
 	const char *q = *p ? p + 1 : p;
@@ -226,14 +222,14 @@ TIME_SCALE_SUFFIX [munpf]?s
 	else if (!strcmp(p, "wire"))
 		extra->default_nettype_wire = true;
 	else
-		err("Unsupported default nettype: %s", p);
+		err_at_loc(out_loc, "Unsupported default nettype: %s", p);
 }
 
 "`protect"[^\n]* /* ignore `protect*/
 "`endprotect"[^\n]* /* ignore `endprotect*/
 
 "`"[a-zA-Z_$][a-zA-Z0-9_$]* {
-	err("Unimplemented compiler directive or undefined macro %s.", YYText());
+	err_at_loc(out_loc, "Unimplemented compiler directive or undefined macro %s.", YYText());
 }
 
 "module"       { return parser::make_TOK_MODULE(out_loc); }
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 908b3ec41..6f3b3baea 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -45,7 +45,7 @@
 
 %code requires {
 	#include "kernel/yosys_common.h"
-	// #include "frontends/verilog/verilog_lexer.h"
+	#include "frontends/verilog/verilog_error.h"
 	// start requires
 	YOSYS_NAMESPACE_BEGIN
 	namespace VERILOG_FRONTEND {
@@ -157,8 +157,7 @@
 		static ConstParser make_ConstParser_here(parser::location_type flex_loc) {
 			AstSrcLocType loc;
 			SET_LOC(loc, flex_loc, flex_loc);
-			std::optional<std::string> filename = flex_loc.begin.filename ? std::make_optional(*(flex_loc.begin.filename)) : std::nullopt;
-			ConstParser p{filename, loc};
+			ConstParser p{loc};
 			return p;
 		}
 		static void append_attr(AstNode *ast, dict<IdString, std::unique_ptr<AstNode>> *al)
@@ -244,17 +243,6 @@
 			node->children.push_back(std::move(rangeNode));
 		}
 
-		[[noreturn]]
-		extern void verr_at(std::string filename, int begin_line, char const *fmt, va_list ap);
-		[[noreturn]]
-		static void err_at_loc(frontend_verilog_yy::parser::location_type loc, char const *fmt, ...)
-		{
-			va_list args;
-			va_start(args, fmt);
-			verr_at(AST::current_filename, loc.begin.line, fmt, args);
-			va_end(args);
-		}
-
 		static void checkLabelsMatch(const frontend_verilog_yy::parser::location_type& loc, const char *element, const std::string* before, const std::string *after)
 		{
 			if (!before && after)
@@ -733,7 +721,7 @@ module:
 		append_attr(mod, $1);
 	} module_para_opt module_args_opt TOK_SEMICOL module_body TOK_ENDMODULE opt_label {
 		if (extra->port_stubs.size() != 0)
-			lexer->err("Missing details for module port `%s'.",
+			err_at_loc(@7, "Missing details for module port `%s'.",
 					extra->port_stubs.begin()->first.c_str());
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @$);
 		extra->ast_stack.pop_back();
@@ -787,7 +775,7 @@ module_arg_opt_assignment:
 					extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_ASSIGN, std::move(wire), std::move($2)));
 			}
 		} else
-			lexer->err("SystemVerilog interface in module port list cannot have a default value.");
+			err_at_loc(@2, "SystemVerilog interface in module port list cannot have a default value.");
 	} |
 	%empty;
 
@@ -801,7 +789,7 @@ module_arg:
 			extra->ast_stack.back()->children.push_back(std::move(node));
 		} else {
 			if (extra->port_stubs.count(*$1) != 0)
-				lexer->err("Duplicate module port `%s'.", $1->c_str());
+				err_at_loc(@1, "Duplicate module port `%s'.", $1->c_str());
 			extra->port_stubs[*$1] = ++extra->port_counter;
 		}
 	} module_arg_opt_assignment |
@@ -811,7 +799,7 @@ module_arg:
 		extra->astbuf1->children[0]->str = *$1;
 	} TOK_ID {  /* SV interfaces */
 		if (!mode->sv)
-			lexer->err("Interface found in port list (%s). This is not supported unless read_verilog is called with -sv!", $3->c_str());
+			err_at_loc(@3, "Interface found in port list (%s). This is not supported unless read_verilog is called with -sv!", $3->c_str());
 		extra->astbuf2 = extra->astbuf1->clone(); // really only needed if multiple instances of same type.
 		extra->astbuf2->str = *$3;
 		extra->astbuf2->port_id = ++extra->port_counter;
@@ -826,9 +814,9 @@ module_arg:
 		if (range != nullptr)
 			node->children.push_back(std::move(range));
 		if (!node->is_input && !node->is_output)
-			lexer->err("Module port `%s' is neither input nor output.", $4->c_str());
+			err_at_loc(@4, "Module port `%s' is neither input nor output.", $4->c_str());
 		if (node->is_reg && node->is_input && !node->is_output && !mode->sv)
-			lexer->err("Input port `%s' is declared as register.", $4->c_str());
+			err_at_loc(@4, "Input port `%s' is declared as register.", $4->c_str());
 		append_attr(node.get(), $1);
 		extra->ast_stack.back()->children.push_back(std::move(node));
 	} module_arg_opt_assignment |
@@ -878,7 +866,7 @@ interface:
 		intf->str = *$3;
 	} module_para_opt module_args_opt TOK_SEMICOL interface_body TOK_ENDINTERFACE {
 		if (extra->port_stubs.size() != 0)
-			lexer->err("Missing details for module port `%s'.",
+			err_at_loc(@6, "Missing details for module port `%s'.",
 				extra->port_stubs.begin()->first.c_str());
 		extra->ast_stack.pop_back();
 		log_assert(extra->ast_stack.size() == 1);
@@ -1295,7 +1283,7 @@ task_func_port:
 		extra->astbuf2 = checkRange(extra->astbuf1.get(), std::move($3));
 		if (!extra->astbuf1->is_input && !extra->astbuf1->is_output) {
 			if (!mode->sv)
-				lexer->err("task/function argument direction missing");
+				err_at_loc(@2, "task/function argument direction missing");
 			extra->astbuf1->is_input = prev_was_input;
 			extra->astbuf1->is_output = prev_was_output;
 		}
@@ -1303,7 +1291,7 @@ task_func_port:
 	{
 		if (!extra->astbuf1) {
 			if (!mode->sv)
-				lexer->err("task/function argument direction missing");
+				err_at_loc(@$, "task/function argument direction missing");
 			extra->albuf = new dict<IdString, std::unique_ptr<AstNode>>;
 			extra->astbuf1 = std::make_unique<AstNode>(AST_WIRE);
 			extra->current_wire_rand = false;
@@ -1336,7 +1324,7 @@ specify_item:
 		specify_rise_fall_ptr_t timing = std::move($9);
 
 		if (specify_edge != 0 && target->dat == nullptr)
-			lexer->err("Found specify edge but no data spec.\n");
+			err_at_loc(@3, "Found specify edge but no data spec.\n");
 
 		auto cell_owned = std::make_unique<AstNode>(AST_CELL);
 		auto cell = cell_owned.get();
@@ -1411,7 +1399,7 @@ specify_item:
 	TOK_ID TOK_LPAREN specify_edge expr specify_condition TOK_COMMA specify_edge expr specify_condition TOK_COMMA specify_triple specify_opt_triple TOK_RPAREN TOK_SEMICOL {
 		if (*$1 != "$setup" && *$1 != "$hold" && *$1 != "$setuphold" && *$1 != "$removal" && *$1 != "$recovery" &&
 				*$1 != "$recrem" && *$1 != "$skew" && *$1 != "$timeskew" && *$1 != "$fullskew" && *$1 != "$nochange")
-			lexer->err("Unsupported specify rule type: %s\n", $1->c_str());
+			err_at_loc(@1, "Unsupported specify rule type: %s\n", $1->c_str());
 
 		auto src_pen = AstNode::mkconst_int($3 != 0, false, 1);
 		auto src_pol = AstNode::mkconst_int($3 == 'p', false, 1);
@@ -1777,10 +1765,10 @@ single_param_decl:
 		AstNode *decl = extra->ast_stack.back()->children.back().get();
 		if (decl->type != AST_PARAMETER) {
 			log_assert(decl->type == AST_LOCALPARAM);
-			lexer->err("localparam initialization is missing!");
+			err_at_loc(@1, "localparam initialization is missing!");
 		}
 		if (!mode->sv)
-			lexer->err("Parameter defaults can only be omitted in SystemVerilog mode!");
+			err_at_loc(@1, "Parameter defaults can only be omitted in SystemVerilog mode!");
 		decl->children.erase(decl->children.begin());
 	};
 
@@ -1789,7 +1777,7 @@ single_param_decl_ident:
 		std::unique_ptr<AstNode> node_owned;
 		if (extra->astbuf1 == nullptr) {
 			if (!mode->sv)
-				lexer->err("In pure Verilog (not SystemVerilog), parameter/localparam with an initializer must use the parameter/localparam keyword");
+				err_at_loc(@1, "In pure Verilog (not SystemVerilog), parameter/localparam with an initializer must use the parameter/localparam keyword");
 			node_owned = std::make_unique<AstNode>(AST_PARAMETER);
 			node_owned->children.push_back(AstNode::mkconst_int(0, true));
 		} else {
@@ -1940,7 +1928,7 @@ struct_body: opt_packed TOK_LCURL struct_member_list TOK_RCURL
 
 opt_packed:
 	TOK_PACKED opt_signed_struct |
-	%empty { lexer->err("Only PACKED supported at this time"); };
+	%empty { err_at_loc(@$, "Only PACKED supported at this time"); };
 
 opt_signed_struct:
 	  TOK_SIGNED		{ extra->astbuf2->is_signed = true; }
@@ -2125,7 +2113,7 @@ wire_name_and_opt_assign:
 wire_name:
 	TOK_ID range_or_multirange {
 		if (extra->astbuf1 == nullptr)
-			lexer->err("Internal error - should not happen - no AST_WIRE node.");
+			err_at_loc(@1, "Internal error - should not happen - no AST_WIRE node.");
 		auto node = extra->astbuf1->clone();
 		node->str = *$1;
 		append_attr_clone(node.get(), extra->albuf);
@@ -2133,7 +2121,7 @@ wire_name:
 			node->children.push_back(extra->astbuf2->clone());
 		if ($2 != nullptr) {
 			if (node->is_input || node->is_output)
-				lexer->err("input/output/inout ports cannot have unpacked dimensions.");
+				err_at_loc(@2, "input/output/inout ports cannot have unpacked dimensions.");
 			if (!extra->astbuf2 && !node->is_custom_type) {
 				addRange(node.get(), 0, 0, false);
 			}
@@ -2144,21 +2132,21 @@ wire_name:
 				node->port_id = extra->current_function_or_task_port_id++;
 		} else if (extra->ast_stack.back()->type == AST_GENBLOCK) {
 			if (node->is_input || node->is_output)
-				lexer->err("Cannot declare module port `%s' within a generate block.", $1->c_str());
+				err_at_loc(@1, "Cannot declare module port `%s' within a generate block.", $1->c_str());
 		} else {
 			if (extra->do_not_require_port_stubs && (node->is_input || node->is_output) && extra->port_stubs.count(*$1) == 0) {
 				extra->port_stubs[*$1] = ++extra->port_counter;
 			}
 			if (extra->port_stubs.count(*$1) != 0) {
 				if (!node->is_input && !node->is_output)
-					lexer->err("Module port `%s' is neither input nor output.", $1->c_str());
+					err_at_loc(@1, "Module port `%s' is neither input nor output.", $1->c_str());
 				if (node->is_reg && node->is_input && !node->is_output && !mode->sv)
-					lexer->err("Input port `%s' is declared as register.", $1->c_str());
+					err_at_loc(@1, "Input port `%s' is declared as register.", $1->c_str());
 				node->port_id = extra->port_stubs[*$1];
 				extra->port_stubs.erase(*$1);
 			} else {
 				if (node->is_input || node->is_output)
-					lexer->err("Module port `%s' is not declared in module header.", $1->c_str());
+					err_at_loc(@1, "Module port `%s' is not declared in module header.", $1->c_str());
 			}
 		}
 		//FIXME: for some reason, TOK_ID has a location which always points to one column *after* the real last column...
@@ -2180,7 +2168,7 @@ assign_expr:
 	};
 
 type_name: TOK_ID { $$ = std::move($1); } // first time seen
-	 | TOK_USER_TYPE	{ if (extra->isInLocalScope($1.get())) lexer->err("Duplicate declaration of TYPEDEF '%s'", $1->c_str()+1); $$ = std::move($1); }
+	 | TOK_USER_TYPE	{ if (extra->isInLocalScope($1.get())) err_at_loc(@1, "Duplicate declaration of TYPEDEF '%s'", $1->c_str()+1); $$ = std::move($1); }
 	 ;
 
 typedef_decl:
@@ -2358,7 +2346,7 @@ cell_port_list:
 		}
 
 		if (has_positional_args && has_named_args)
-			lexer->err("Mix of positional and named cell ports.");
+			err_at_loc(@1, "Mix of positional and named cell ports.");
 	};
 
 cell_port_list_rules:
@@ -2399,7 +2387,7 @@ cell_port:
 	} |
 	attr TOK_WILDCARD_CONNECT {
 		if (!mode->sv)
-			lexer->err("Wildcard port connections are only supported in SystemVerilog mode.");
+			err_at_loc(@2, "Wildcard port connections are only supported in SystemVerilog mode.");
 		extra->cell_hack->attributes[ID::wildcard_port_conns] = AstNode::mkconst_int(1, false);
 		free_attr($1);
 	};
@@ -2738,11 +2726,11 @@ for_initialization:
 		extra->ast_stack.back()->children.push_back(std::move(node));
 	} |
 	non_io_wire_type range TOK_ID {
-		lexer->err("For loop variable declaration is missing initialization!");
+		err_at_loc(@3, "For loop variable declaration is missing initialization!");
 	} |
 	non_io_wire_type range TOK_ID TOK_EQ expr {
 		if (!mode->sv)
-			lexer->err("For loop inline variable declaration is only supported in SystemVerilog mode!");
+			err_at_loc(@4, "For loop inline variable declaration is only supported in SystemVerilog mode!");
 
 		// loop variable declaration
 		auto wire = std::move($1);
@@ -2926,21 +2914,21 @@ if_attr:
 	attr TOK_UNIQUE0 {
 		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
-			lexer->err("unique0 keyword cannot be used for 'else if' branch.");
+			err_at_loc(@2, "unique0 keyword cannot be used for 'else if' branch.");
 		(*$1)[ID::parallel_case] = AstNode::mkconst_int(1, false);
 		$$ = $1;
 	} |
 	attr TOK_PRIORITY {
 		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
-			lexer->err("priority keyword cannot be used for 'else if' branch.");
+			err_at_loc(@2, "priority keyword cannot be used for 'else if' branch.");
 		(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
 		$$ = $1;
 	} |
 	attr TOK_UNIQUE {
 		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
-			lexer->err("unique keyword cannot be used for 'else if' branch.");
+			err_at_loc(@2, "unique keyword cannot be used for 'else if' branch.");
 		(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
 		(*$1)[ID::parallel_case] = AstNode::mkconst_int(1, false);
 		$$ = $1;
@@ -3138,11 +3126,11 @@ genvar_identifier:
 
 genvar_initialization:
 	TOK_GENVAR genvar_identifier {
-		lexer->err("Generate for loop variable declaration is missing initialization!");
+		err_at_loc(@2, "Generate for loop variable declaration is missing initialization!");
 	} |
 	TOK_GENVAR genvar_identifier TOK_EQ expr {
 		if (!mode->sv)
-			lexer->err("Generate for loop inline variable declaration is only supported in SystemVerilog mode!");
+			err_at_loc(@3, "Generate for loop inline variable declaration is only supported in SystemVerilog mode!");
 		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_GENVAR));
 		node->is_reg = true;
 		node->is_signed = true;
@@ -3244,7 +3232,7 @@ basic_expr:
 	} |
 	TOK_LPAREN expr TOK_RPAREN integral_number {
 		if ($4->compare(0, 1, "'") != 0)
-			lexer->err("Cast operation must be applied on sized constants e.g. (<expr>)<constval> , while %s is not a sized constant.", $4->c_str());
+			err_at_loc(@4, "Cast operation must be applied on sized constants e.g. (<expr>)<constval> , while %s is not a sized constant.", $4->c_str());
 		auto p = make_ConstParser_here(@4);
 		auto val = p.const2ast(*$4, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
 		if (val == nullptr)
@@ -3253,7 +3241,7 @@ basic_expr:
 	} |
 	hierarchical_id integral_number {
 		if ($2->compare(0, 1, "'") != 0)
-			lexer->err("Cast operation must be applied on sized constants, e.g. <ID>\'d0, while %s is not a sized constant.", $2->c_str());
+			err_at_loc(@2, "Cast operation must be applied on sized constants, e.g. <ID>\'d0, while %s is not a sized constant.", $2->c_str());
 		auto bits = std::make_unique<AstNode>(AST_IDENTIFIER);
 		bits->str = *$1;
 		SET_AST_NODE_LOC(bits.get(), @1, @1);
@@ -3502,25 +3490,25 @@ basic_expr:
 	} |
 	TOK_SIGNED OP_CAST TOK_LPAREN expr TOK_RPAREN {
 		if (!mode->sv)
-			lexer->err("Static cast is only supported in SystemVerilog mode.");
+			err_at_loc(@2, "Static cast is only supported in SystemVerilog mode.");
 		$$ = std::make_unique<AstNode>(AST_TO_SIGNED, std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |
 	TOK_UNSIGNED OP_CAST TOK_LPAREN expr TOK_RPAREN {
 		if (!mode->sv)
-			lexer->err("Static cast is only supported in SystemVerilog mode.");
+			err_at_loc(@2, "Static cast is only supported in SystemVerilog mode.");
 		$$ = std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |
 	basic_expr OP_CAST TOK_LPAREN expr TOK_RPAREN {
 		if (!mode->sv)
-			lexer->err("Static cast is only supported in SystemVerilog mode.");
+			err_at_loc(@2, "Static cast is only supported in SystemVerilog mode.");
 		$$ = std::make_unique<AstNode>(AST_CAST_SIZE, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |
 	typedef_base_type OP_CAST TOK_LPAREN expr TOK_RPAREN {
 		if (!mode->sv)
-			lexer->err("Static cast is only supported in SystemVerilog mode.");
+			err_at_loc(@2, "Static cast is only supported in SystemVerilog mode.");
 		$$ = std::make_unique<AstNode>(AST_CAST_SIZE, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |

From ecec9a760b8397251e27445c01760b97464956db Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 18 Jun 2025 22:50:46 +0200
Subject: [PATCH 307/931] ast, read_verilog: unify location types, reduce
 filename copying

---
 frontends/ast/ast.cc                  |  37 +-
 frontends/ast/ast.h                   |  11 +-
 frontends/ast/genrtlil.cc             |  67 +--
 frontends/ast/simplify.cc             | 562 +++++++++++-----------
 frontends/verilog/.gitignore          |   2 -
 frontends/verilog/Makefile.inc        |   4 +-
 frontends/verilog/const2ast.cc        |   2 +-
 frontends/verilog/verilog_frontend.cc |  25 +-
 frontends/verilog/verilog_lexer.h     |   6 +-
 frontends/verilog/verilog_lexer.l     |  38 +-
 frontends/verilog/verilog_parser.y    | 650 +++++++++++++-------------
 kernel/rtlil.cc                       |   4 +-
 12 files changed, 715 insertions(+), 693 deletions(-)

diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index c6305bd09..09989e7ab 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -208,7 +208,7 @@ AstNode::AstNode(AstSrcLocType loc, AstNodeType type, std::unique_ptr<AstNode> c
 	astnodes++;
 
 	this->type = type;
-	loc = loc;
+	location = loc;
 	is_input = false;
 	is_output = false;
 	is_reg = false;
@@ -922,7 +922,7 @@ std::unique_ptr<AstNode> AstNode::mktemp_logic(AstSrcLocType loc, const std::str
 {
 	auto wire_owned = std::make_unique<AstNode>(loc, AST_WIRE, std::make_unique<AstNode>(loc, AST_RANGE, mkconst_int(loc, range_left, true), mkconst_int(loc, range_right, true)));
 	auto* wire = wire_owned.get();
-	wire->str = stringf("%s%s:%d$%d", name.c_str(), RTLIL::encode_filename(location.filename).c_str(), location.first_line, autoidx++);
+	wire->str = stringf("%s%s:%d$%d", name.c_str(), RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line, autoidx++);
 	if (nosync)
 		wire->set_attribute(ID::nosync, AstNode::mkconst_int(loc, 1, false));
 	wire->is_signed = is_signed;
@@ -1086,7 +1086,7 @@ RTLIL::Const AstNode::realAsConst(int width)
 
 std::string AstNode::loc_string() const
 {
-	return stringf("%s:%d.%d-%d.%d", location.filename.c_str(), location.first_line, location.first_column, location.last_line, location.last_column);
+	return stringf("%s:%d.%d-%d.%d", location.begin.filename->c_str(), location.begin.line, location.begin.column, location.end.line, location.end.column);
 }
 
 void AST::set_src_attr(RTLIL::AttrObject *obj, const AstNode *ast)
@@ -1247,7 +1247,7 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 			ast->children.swap(new_children);
 
 			if (ast->attributes.count(ID::blackbox) == 0) {
-				ast->set_attribute(ID::blackbox, AstNode::mkconst_int(1, false));
+				ast->set_attribute(ID::blackbox, AstNode::mkconst_int(ast->location, 1, false));
 			}
 		}
 
@@ -1444,7 +1444,7 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool nodisplay, bool dump
 			if (design->has(child->str)) {
 				RTLIL::Module *existing_mod = design->module(child->str);
 				if (!nooverwrite && !overwrite && !existing_mod->get_blackbox_attribute()) {
-					log_file_error(child->location.filename, child->location.first_line, "Re-definition of module `%s'!\n", child->str.c_str());
+					log_file_error(*child->location.begin.filename, child->location.begin.line, "Re-definition of module `%s'!\n", child->str.c_str());
 				} else if (nooverwrite) {
 					log("Ignoring re-definition of module `%s' at %s.\n",
 							child->str.c_str(), child->loc_string().c_str());
@@ -1527,7 +1527,8 @@ AstNode * AST::find_modport(AstNode *intf, std::string name)
 void AST::explode_interface_port(AstNode *module_ast, RTLIL::Module * intfmodule, std::string intfname, AstNode *modport)
 {
 	for (auto w : intfmodule->wires()){
-		auto wire = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(w->width -1, true), AstNode::mkconst_int(0, true)));
+		auto loc = module_ast->location;
+		auto wire = std::make_unique<AstNode>(loc, AST_WIRE, std::make_unique<AstNode>(loc, AST_RANGE, AstNode::mkconst_int(loc, w->width -1, true), AstNode::mkconst_int(loc, 0, true)));
 		std::string origname = log_id(w->name);
 		std::string newname = intfname + "." + origname;
 		wire->str = newname;
@@ -1584,11 +1585,12 @@ void AstModule::expand_interfaces(RTLIL::Design *design, const dict<RTLIL::IdStr
 	loadconfig();
 
 	auto new_ast = ast->clone();
+	auto loc = ast->location;
 	for (auto &intf : local_interfaces) {
 		std::string intfname = intf.first.str();
 		RTLIL::Module *intfmodule = intf.second;
 		for (auto w : intfmodule->wires()){
-			auto wire = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(w->width -1, true), AstNode::mkconst_int(0, true)));
+			auto wire = std::make_unique<AstNode>(loc, AST_WIRE, std::make_unique<AstNode>(loc, AST_RANGE, AstNode::mkconst_int(loc, w->width -1, true), AstNode::mkconst_int(loc, 0, true)));
 			std::string newname = log_id(w->name);
 			newname = intfname + "." + newname;
 			wire->str = newname;
@@ -1616,9 +1618,9 @@ void AstModule::expand_interfaces(RTLIL::Design *design, const dict<RTLIL::IdStr
 						if (design->module(interface_type) != nullptr) {
 							// Add a cell to the module corresponding to the interface port such that
 							// it can further propagated down if needed:
-							auto celltype_for_intf = std::make_unique<AstNode>(AST_CELLTYPE);
+							auto celltype_for_intf = std::make_unique<AstNode>(loc, AST_CELLTYPE);
 							celltype_for_intf->str = interface_type;
-							auto cell_for_intf = std::make_unique<AstNode>(AST_CELL, std::move(celltype_for_intf));
+							auto cell_for_intf = std::make_unique<AstNode>(loc, AST_CELL, std::move(celltype_for_intf));
 							cell_for_intf->str = name_port + "_inst_from_top_dummy";
 							new_ast->children.push_back(std::move(cell_for_intf));
 
@@ -1825,8 +1827,9 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 	rewritten.reserve(GetSize(parameters));
 
 	auto new_ast = ast->clone();
+	auto loc = ast->location;
 	if (!new_ast->attributes.count(ID::hdlname))
-		new_ast->set_attribute(ID::hdlname, AstNode::mkconst_str(stripped_name.substr(1)));
+		new_ast->set_attribute(ID::hdlname, AstNode::mkconst_str(loc, stripped_name.substr(1)));
 
 	para_counter = 0;
 	for (auto& child : new_ast->children) {
@@ -1850,12 +1853,12 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 		if (param_has_no_default(child))
 			child->children.insert(child->children.begin(), nullptr);
 		if ((it->second.flags & RTLIL::CONST_FLAG_REAL) != 0) {
-			child->children[0] = std::make_unique<AstNode>(AST_REALVALUE);
+			child->children[0] = std::make_unique<AstNode>(loc, AST_REALVALUE);
 			child->children[0]->realvalue = std::stod(it->second.decode_string());
 		} else if ((it->second.flags & RTLIL::CONST_FLAG_STRING) != 0)
-			child->children[0] = AstNode::mkconst_str(it->second.decode_string());
+			child->children[0] = AstNode::mkconst_str(loc, it->second.decode_string());
 		else
-			child->children[0] = AstNode::mkconst_bits(it->second.to_bits(), (it->second.flags & RTLIL::CONST_FLAG_SIGNED) != 0);
+			child->children[0] = AstNode::mkconst_bits(loc, it->second.to_bits(), (it->second.flags & RTLIL::CONST_FLAG_SIGNED) != 0);
 		rewritten.insert(it->first);
 	}
 
@@ -1863,12 +1866,12 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 		for (const auto &param : parameters) {
 			if (rewritten.count(param.first))
 				continue;
-			auto defparam = std::make_unique<AstNode>(AST_DEFPARAM, std::make_unique<AstNode>(AST_IDENTIFIER));
+			auto defparam = std::make_unique<AstNode>(loc, AST_DEFPARAM, std::make_unique<AstNode>(loc, AST_IDENTIFIER));
 			defparam->children[0]->str = param.first.str();
 			if ((param.second.flags & RTLIL::CONST_FLAG_STRING) != 0)
-				defparam->children.push_back(AstNode::mkconst_str(param.second.decode_string()));
+				defparam->children.push_back(AstNode::mkconst_str(loc, param.second.decode_string()));
 			else
-				defparam->children.push_back(AstNode::mkconst_bits(param.second.to_bits(), (param.second.flags & RTLIL::CONST_FLAG_SIGNED) != 0));
+				defparam->children.push_back(AstNode::mkconst_bits(loc, param.second.to_bits(), (param.second.flags & RTLIL::CONST_FLAG_SIGNED) != 0));
 			new_ast->children.push_back(std::move(defparam));
 		}
 
@@ -1923,7 +1926,7 @@ void AstNode::input_error(const char *format, ...) const
 {
 	va_list ap;
 	va_start(ap, format);
-	logv_file_error(location.filename, location.first_line, format, ap);
+	logv_file_error(*location.begin.filename, location.begin.line, format, ap);
 }
 
 YOSYS_NAMESPACE_END
diff --git a/frontends/ast/ast.h b/frontends/ast/ast.h
index ccbce2b1a..6804c6a30 100644
--- a/frontends/ast/ast.h
+++ b/frontends/ast/ast.h
@@ -28,6 +28,7 @@
 
 #include "kernel/rtlil.h"
 #include "kernel/fmt.h"
+#include "frontends/verilog/verilog_location.h"
 #include <stdint.h>
 #include <set>
 
@@ -163,13 +164,7 @@ namespace AST
 		AST_BIND
 	};
 
-	struct AstSrcLocType {
-		std::string filename;
-		unsigned int first_line, last_line;
-		unsigned int first_column, last_column;
-		AstSrcLocType() : filename(""), first_line(0), last_line(0), first_column(0), last_column(0) {}
-		AstSrcLocType(std::string _filename, int _first_line, int _first_column, int _last_line, int _last_column) : filename(_filename), first_line(_first_line), last_line(_last_line), first_column(_first_column), last_column(_last_column) {}
-	};
+	using AstSrcLocType = location;
 
 	// convert an node type to a string (e.g. for debug output)
 	std::string type2str(AstNodeType type);
@@ -408,7 +403,7 @@ namespace AST
 	// this must be set by the language frontend before parsing the sources
 	// the AstNode constructor then uses current_filename and get_line_num()
 	// to initialize the filename and linenum properties of new nodes
-	extern std::string current_filename;
+	// extern std::string current_filename;
 	// also set by the language frontend to control some AST processing
 	extern bool sv_mode_but_global_and_used_for_literally_one_condition;
 
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 9a98cae3b..93731abf0 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -45,7 +45,7 @@ using namespace AST_INTERNAL;
 // helper function for creating RTLIL code for unary operations
 static RTLIL::SigSpec uniop2rtlil(AstNode *that, IdString type, int result_width, const RTLIL::SigSpec &arg, bool gen_attributes = true)
 {
-	IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(that->location.filename).c_str(), that->location.first_line, autoidx++);
+	IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(*that->location.begin.filename).c_str(), that->location.begin.line, autoidx++);
 	RTLIL::Cell *cell = current_module->addCell(name, type);
 	set_src_attr(cell, that);
 
@@ -77,7 +77,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
 		return;
 	}
 
-	IdString name = stringf("$extend$%s:%d$%d", RTLIL::encode_filename(that->location.filename).c_str(), that->location.first_line, autoidx++);
+	IdString name = stringf("$extend$%s:%d$%d", RTLIL::encode_filename(*that->location.begin.filename).c_str(), that->location.begin.line, autoidx++);
 	RTLIL::Cell *cell = current_module->addCell(name, ID($pos));
 	set_src_attr(cell, that);
 
@@ -104,7 +104,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
 // helper function for creating RTLIL code for binary operations
 static RTLIL::SigSpec binop2rtlil(AstNode *that, IdString type, int result_width, const RTLIL::SigSpec &left, const RTLIL::SigSpec &right)
 {
-	IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(that->location.filename).c_str(), that->location.first_line, autoidx++);
+	IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(*that->location.begin.filename).c_str(), that->location.begin.line, autoidx++);
 	RTLIL::Cell *cell = current_module->addCell(name, type);
 	set_src_attr(cell, that);
 
@@ -138,7 +138,7 @@ static RTLIL::SigSpec mux2rtlil(AstNode *that, const RTLIL::SigSpec &cond, const
 	log_assert(cond.size() == 1);
 
 	std::stringstream sstr;
-	sstr << "$ternary$" << RTLIL::encode_filename(that->location.filename) << ":" << that->location.first_line << "$" << (autoidx++);
+	sstr << "$ternary$" << RTLIL::encode_filename(*that->location.begin.filename) << ":" << that->location.begin.line << "$" << (autoidx++);
 
 	RTLIL::Cell *cell = current_module->addCell(sstr.str(), ID($mux));
 	set_src_attr(cell, that);
@@ -195,12 +195,12 @@ struct AST_INTERNAL::LookaheadRewriter
 		if (node->lookahead) {
 			log_assert(node->type == AST_IDENTIFIER);
 			if (!lookaheadids.count(node->str)) {
-				auto wire = std::make_unique<AstNode>(AST_WIRE);
+				auto wire = std::make_unique<AstNode>(node->location, AST_WIRE);
 				for (auto& c : node->id2ast->children)
 					wire->children.push_back(c->clone());
 				wire->fixup_hierarchy_flags();
 				wire->str = stringf("$lookahead%s$%d", node->str.c_str(), autoidx++);
-				wire->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
+				wire->set_attribute(ID::nosync, AstNode::mkconst_int(node->location, 1, false));
 				wire->is_logic = true;
 				while (wire->simplify(true, 1, -1, false)) { }
 				lookaheadids[node->str] = make_pair(node->id2ast, wire.get());
@@ -271,6 +271,7 @@ struct AST_INTERNAL::LookaheadRewriter
 		// top->dumpVlog(nullptr, "REWRITE-BEFORE> ");
 
 		AstNode *block = nullptr;
+		auto loc = top->location;
 
 		for (auto& c : top->children)
 			if (c->type == AST_BLOCK) {
@@ -284,18 +285,18 @@ struct AST_INTERNAL::LookaheadRewriter
 
 		for (auto it : lookaheadids)
 		{
-			auto ref_orig = std::make_unique<AstNode>(AST_IDENTIFIER);
+			auto ref_orig = std::make_unique<AstNode>(loc, AST_IDENTIFIER);
 			ref_orig->str = it.second.first->str;
 			ref_orig->id2ast = it.second.first;
 			ref_orig->was_checked = true;
 
-			auto ref_temp = std::make_unique<AstNode>(AST_IDENTIFIER);
+			auto ref_temp = std::make_unique<AstNode>(loc, AST_IDENTIFIER);
 			ref_temp->str = it.second.second->str;
 			ref_temp->id2ast = it.second.second;
 			ref_temp->was_checked = true;
 
-			auto init_assign = std::make_unique<AstNode>(AST_ASSIGN_EQ, ref_temp->clone(), ref_orig->clone());
-			auto final_assign = std::make_unique<AstNode>(AST_ASSIGN_LE, std::move(ref_orig), std::move(ref_temp));
+			auto init_assign = std::make_unique<AstNode>(loc, AST_ASSIGN_EQ, ref_temp->clone(), ref_orig->clone());
+			auto final_assign = std::make_unique<AstNode>(loc, AST_ASSIGN_LE, std::move(ref_orig), std::move(ref_temp));
 
 			block->children.insert(block->children.begin(), std::move(init_assign));
 			block->children.push_back(std::move(final_assign));
@@ -347,7 +348,7 @@ struct AST_INTERNAL::ProcessGenerator
 		LookaheadRewriter la_rewriter(always.get());
 
 		// generate process and simple root case
-		proc = current_module->addProcess(stringf("$proc$%s:%d$%d", RTLIL::encode_filename(always->location.filename).c_str(), always->location.first_line, autoidx++));
+		proc = current_module->addProcess(stringf("$proc$%s:%d$%d", RTLIL::encode_filename(*always->location.begin.filename).c_str(), always->location.begin.line, autoidx++));
 		set_src_attr(proc, always.get());
 		for (auto &attr : always->attributes) {
 			if (attr.second->type != AST_CONSTANT)
@@ -723,7 +724,7 @@ struct AST_INTERNAL::ProcessGenerator
 			if (ast->str == "$display" || ast->str == "$displayb" || ast->str == "$displayh" || ast->str == "$displayo" ||
 		  ast->str == "$write"   || ast->str == "$writeb"   || ast->str == "$writeh"   || ast->str == "$writeo") {
 				std::stringstream sstr;
-				sstr << ast->str << "$" << ast->location.filename << ":" << ast->location.first_line << "$" << (autoidx++);
+				sstr << ast->str << "$" << ast->location.begin.filename << ":" << ast->location.begin.line << "$" << (autoidx++);
 
 				Wire *en = current_module->addWire(sstr.str() + "_EN", 1);
 				set_src_attr(en, ast);
@@ -766,8 +767,8 @@ struct AST_INTERNAL::ProcessGenerator
 					node->detectSignWidth(width, is_signed, nullptr);
 
 					VerilogFmtArg arg = {};
-					arg.filename = node->location.filename;
-					arg.first_line = node->location.first_line;
+					arg.filename = *node->location.begin.filename;
+					arg.first_line = node->location.begin.line;
 					if (node->type == AST_CONSTANT && node->is_string) {
 						arg.type = VerilogFmtArg::STRING;
 						arg.str = node->bitsAsConst().decode_string();
@@ -793,7 +794,7 @@ struct AST_INTERNAL::ProcessGenerator
 					fmt.append_literal("\n");
 				fmt.emit_rtlil(cell);
 			} else if (!ast->str.empty()) {
-				log_file_error(ast->location.filename, ast->location.first_line, "Found unsupported invocation of system task `%s'!\n", ast->str.c_str());
+				log_file_error(*ast->location.begin.filename, ast->location.begin.line, "Found unsupported invocation of system task `%s'!\n", ast->str.c_str());
 			}
 			break;
 
@@ -813,7 +814,7 @@ struct AST_INTERNAL::ProcessGenerator
 
 				IdString cellname;
 				if (ast->str.empty())
-					cellname = stringf("$%s$%s:%d$%d", flavor.c_str(), RTLIL::encode_filename(ast->location.filename).c_str(), ast->location.first_line, autoidx++);
+					cellname = stringf("$%s$%s:%d$%d", flavor.c_str(), RTLIL::encode_filename(*ast->location.begin.filename).c_str(), ast->location.begin.line, autoidx++);
 				else
 					cellname = ast->str;
 				check_unique_id(current_module, cellname, ast, "procedural assertion");
@@ -843,7 +844,7 @@ struct AST_INTERNAL::ProcessGenerator
 				set_src_attr(cell, ast);
 				for (auto &attr : ast->attributes) {
 					if (attr.second->type != AST_CONSTANT)
-						log_file_error(ast->location.filename, ast->location.first_line, "Attribute `%s' with non-constant value!\n", attr.first.c_str());
+						log_file_error(*ast->location.begin.filename, ast->location.begin.line, "Attribute `%s' with non-constant value!\n", attr.first.c_str());
 					cell->attributes[attr.first] = attr.second->asAttrConst();
 				}
 				cell->setParam(ID::FLAVOR, flavor);
@@ -1504,7 +1505,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			}
 
 			RTLIL::SigSpec sig = realAsConst(width_hint);
-			log_file_warning(location.filename, location.first_line, "converting real value %e to binary %s.\n", realvalue, log_signal(sig));
+			log_file_warning(*location.begin.filename, location.begin.line, "converting real value %e to binary %s.\n", realvalue, log_signal(sig));
 			return sig;
 		}
 
@@ -1536,7 +1537,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				if (dynamic_cast<RTLIL::Binding*>(current_module)) {
 					/* nothing to do here */
 				} else if (flag_autowire)
-					log_file_warning(location.filename, location.first_line, "Identifier `%s' is implicitly declared.\n", str.c_str());
+					log_file_warning(*location.begin.filename, location.begin.line, "Identifier `%s' is implicitly declared.\n", str.c_str());
 				else
 					input_error("Identifier `%s' is implicitly declared and `default_nettype is set to none.\n", str.c_str());
 			}
@@ -1611,7 +1612,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 					if (left_at_zero_ast->type != AST_CONSTANT || right_at_zero_ast->type != AST_CONSTANT)
 						input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str.c_str());
 					int width = abs(int(left_at_zero_ast->integer - right_at_zero_ast->integer)) + 1;
-					auto fake_ast = std::make_unique<AstNode>(AST_NONE, clone(), children[0]->children.size() >= 2 ?
+					auto fake_ast = std::make_unique<AstNode>(children[0]->location, AST_NONE, clone(), children[0]->children.size() >= 2 ?
 							children[0]->children[1]->clone() : children[0]->children[0]->clone());
 					fake_ast->children[0]->delete_children();
 					if (member_node)
@@ -1641,10 +1642,10 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 						chunk.offset = source_width - (chunk.offset + chunk.width);
 					if (chunk.offset > chunk_left || chunk.offset + chunk.width < chunk_right) {
 						if (chunk.width == 1)
-							log_file_warning(location.filename, location.first_line, "Range select out of bounds on signal `%s': Setting result bit to undef.\n",
+							log_file_warning(*location.begin.filename, location.begin.line, "Range select out of bounds on signal `%s': Setting result bit to undef.\n",
 									str.c_str());
 						else
-							log_file_warning(location.filename, location.first_line, "Range select [%d:%d] out of bounds on signal `%s': Setting all %d result bits to undef.\n",
+							log_file_warning(*location.begin.filename, location.begin.line, "Range select [%d:%d] out of bounds on signal `%s': Setting all %d result bits to undef.\n",
 									children[0]->range_left, children[0]->range_right, str.c_str(), chunk.width);
 						chunk = RTLIL::SigChunk(RTLIL::State::Sx, chunk.width);
 					} else {
@@ -1658,10 +1659,10 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 							chunk.offset += add_undef_bits_lsb;
 						}
 						if (add_undef_bits_lsb)
-							log_file_warning(location.filename, location.first_line, "Range [%d:%d] select out of bounds on signal `%s': Setting %d LSB bits to undef.\n",
+							log_file_warning(*location.begin.filename, location.begin.line, "Range [%d:%d] select out of bounds on signal `%s': Setting %d LSB bits to undef.\n",
 									children[0]->range_left, children[0]->range_right, str.c_str(), add_undef_bits_lsb);
 						if (add_undef_bits_msb)
-							log_file_warning(location.filename, location.first_line, "Range [%d:%d] select out of bounds on signal `%s': Setting %d MSB bits to undef.\n",
+							log_file_warning(*location.begin.filename, location.begin.line, "Range [%d:%d] select out of bounds on signal `%s': Setting %d MSB bits to undef.\n",
 									children[0]->range_left, children[0]->range_right, str.c_str(), add_undef_bits_msb);
 					}
 				}
@@ -1935,7 +1936,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 	case AST_MEMRD:
 		{
 			std::stringstream sstr;
-			sstr << "$memrd$" << str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
+			sstr << "$memrd$" << str << "$" << RTLIL::encode_filename(*location.begin.filename) << ":" << location.begin.line << "$" << (autoidx++);
 
 			RTLIL::Cell *cell = current_module->addCell(sstr.str(), ID($memrd));
 			set_src_attr(cell, this);
@@ -1973,7 +1974,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 	case AST_MEMINIT:
 		{
 			std::stringstream sstr;
-			sstr << "$meminit$" << str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
+			sstr << "$meminit$" << str << "$" << RTLIL::encode_filename(*location.begin.filename) << ":" << location.begin.line << "$" << (autoidx++);
 
 			SigSpec en_sig = children[2]->genRTLIL();
 
@@ -2018,7 +2019,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 
 			IdString cellname;
 			if (str.empty())
-				cellname = stringf("$%s$%s:%d$%d", flavor.c_str(), RTLIL::encode_filename(location.filename).c_str(), location.first_line, autoidx++);
+				cellname = stringf("$%s$%s:%d$%d", flavor.c_str(), RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line, autoidx++);
 			else
 				cellname = str;
 			check_unique_id(current_module, cellname, this, "procedural assertion");
@@ -2061,7 +2062,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 						new_left.append(left[i]);
 						new_right.append(right[i]);
 					}
-				log_file_warning(location.filename, location.first_line, "Ignoring assignment to constant bits:\n"
+				log_file_warning(*location.begin.filename, location.begin.line, "Ignoring assignment to constant bits:\n"
 						"    old assignment: %s = %s\n    new assignment: %s = %s.\n",
 						log_signal(left), log_signal(right),
 						log_signal(new_left), log_signal(new_right));
@@ -2096,7 +2097,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 					IdString paraname = child->str.empty() ? stringf("$%d", ++para_counter) : child->str;
 					const AstNode *value = child->children[0].get();
 					if (value->type == AST_REALVALUE)
-						log_file_warning(location.filename, location.first_line, "Replacing floating point parameter %s.%s = %f with string.\n",
+						log_file_warning(*location.begin.filename, location.begin.line, "Replacing floating point parameter %s.%s = %f with string.\n",
 								log_id(cell), log_id(paraname), value->realvalue);
 					else if (value->type != AST_CONSTANT)
 						input_error("Parameter %s.%s with non-constant value!\n",
@@ -2193,14 +2194,14 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			int sz = children.size();
 			if (str == "$info") {
 				if (sz > 0)
-					log_file_info(location.filename, location.first_line, "%s.\n", children[0]->str.c_str());
+					log_file_info(*location.begin.filename, location.begin.line, "%s.\n", children[0]->str.c_str());
 				else
-					log_file_info(location.filename, location.first_line, "\n");
+					log_file_info(*location.begin.filename, location.begin.line, "\n");
 			} else if (str == "$warning") {
 				if (sz > 0)
-					log_file_warning(location.filename, location.first_line, "%s.\n", children[0]->str.c_str());
+					log_file_warning(*location.begin.filename, location.begin.line, "%s.\n", children[0]->str.c_str());
 				else
-					log_file_warning(location.filename, location.first_line, "\n");
+					log_file_warning(*location.begin.filename, location.begin.line, "\n");
 			} else if (str == "$error") {
 				if (sz > 0)
 					input_error("%s.\n", children[0]->str.c_str());
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 374b9c0dc..8cacec275 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -155,8 +155,8 @@ Fmt AstNode::processFormat(int stage, bool sformat_like, int default_base, size_
 		while (node_arg->simplify(true, stage, -1, false)) { }
 
 		VerilogFmtArg arg = {};
-		arg.filename = location.filename;
-		arg.first_line = location.first_line;
+		arg.filename = *location.begin.filename;
+		arg.first_line = location.begin.line;
 		if (node_arg->type == AST_CONSTANT && node_arg->is_string) {
 			arg.type = VerilogFmtArg::STRING;
 			arg.str = node_arg->bitsAsConst().decode_string();
@@ -173,10 +173,10 @@ Fmt AstNode::processFormat(int stage, bool sformat_like, int default_base, size_
 			arg.sig = node_arg->bitsAsConst();
 			arg.signed_ = node_arg->is_signed;
 		} else if (may_fail) {
-			log_file_info(location.filename, location.first_line, "Skipping system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
+			log_file_info(*location.begin.filename, location.begin.line, "Skipping system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
 			return Fmt();
 		} else {
-			log_file_error(location.filename, location.first_line, "Failed to evaluate system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
+			log_file_error(*location.begin.filename, location.begin.line, "Failed to evaluate system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
 		}
 		args.push_back(arg);
 	}
@@ -424,12 +424,13 @@ static std::unique_ptr<AstNode> index_offset(std::unique_ptr<AstNode> offset, As
 	stride /= decl_node->dimensions[dimension].range_width;
 	auto right = normalize_index(rnode->children.back().get(), decl_node, dimension);
 	auto add_offset = stride > 1 ? multiply_by_const(std::move(right), stride) : std::move(right);
-	return offset ? std::make_unique<AstNode>(AST_ADD, std::move(offset), std::move(add_offset)) : std::move(add_offset);
+	return offset ? std::make_unique<AstNode>(rnode->location, AST_ADD, std::move(offset), std::move(add_offset)) : std::move(add_offset);
 }
 
 static std::unique_ptr<AstNode> index_msb_offset(std::unique_ptr<AstNode> lsb_offset, AstNode *rnode, AstNode *decl_node, int dimension, int stride)
 {
 	log_assert(rnode->children.size() <= 2);
+	auto loc = rnode->location;
 
 	// Offset to add to LSB
 	std::unique_ptr<AstNode> add_offset;
@@ -442,15 +443,15 @@ static std::unique_ptr<AstNode> index_msb_offset(std::unique_ptr<AstNode> lsb_of
 		// Slice, e.g. s.a[i:j]
 		auto left = normalize_index(rnode->children[0].get(), decl_node, dimension);
 		auto right = normalize_index(rnode->children[1].get(), decl_node, dimension);
-		add_offset = std::make_unique<AstNode>(AST_SUB, std::move(left), std::move(right));
+		add_offset = std::make_unique<AstNode>(loc, AST_SUB, std::move(left), std::move(right));
 		if (stride > 1) {
 			// offset = (msb - lsb + 1)*stride - 1
-			auto slice_width = std::make_unique<AstNode>(AST_ADD, std::move(add_offset), node_int(1));
-			add_offset = std::make_unique<AstNode>(AST_SUB, multiply_by_const(std::move(slice_width), stride), node_int(1));
+			auto slice_width = std::make_unique<AstNode>(loc, AST_ADD, std::move(add_offset), node_int(loc, 1));
+			add_offset = std::make_unique<AstNode>(loc, AST_SUB, multiply_by_const(std::move(slice_width), stride), node_int(loc, 1));
 		}
 	}
 
-	return std::make_unique<AstNode>(AST_ADD, std::move(lsb_offset), std::move(add_offset));
+	return std::make_unique<AstNode>(loc, AST_ADD, std::move(lsb_offset), std::move(add_offset));
 }
 
 
@@ -461,7 +462,7 @@ std::unique_ptr<AstNode> AstNode::make_index_range(AstNode *decl_node, bool unpa
 	// such as array indexing or slicing
 	if (children.empty()) {
 		// no range operations apply, return the whole width
-		return make_range(decl_node->range_left - decl_node->range_right, 0);
+		return make_range(decl_node->location, decl_node->range_left - decl_node->range_right, 0);
 	}
 
 	log_assert(children.size() == 1);
@@ -495,7 +496,7 @@ std::unique_ptr<AstNode> AstNode::make_index_range(AstNode *decl_node, bool unpa
 		input_error("Unsupported range operation for %s\n", str.c_str());
 	}
 
-	std::unique_ptr<AstNode>index_range = std::make_unique<AstNode>(AST_RANGE);
+	std::unique_ptr<AstNode> index_range = std::make_unique<AstNode>(rnode->location, AST_RANGE);
 
 	if (!unpacked_range && (stride > 1 || GetSize(rnode->children) == 2)) {
 		// Calculate MSB offset for the final index / slice of packed dimensions.
@@ -537,7 +538,8 @@ static void add_members_to_scope(AstNode *snode, std::string name)
 std::unique_ptr<AstNode> make_packed_struct(AstNode *template_node, std::string &name, decltype(AstNode::attributes) &attributes)
 {
 	// create a wire for the packed struct
-	auto wnode = std::make_unique<AstNode>(AST_WIRE, make_range(template_node->range_left, 0));
+	auto loc = template_node->location;
+	auto wnode = std::make_unique<AstNode>(loc, AST_WIRE, make_range(loc, template_node->range_left, 0));
 	wnode->str = name;
 	wnode->is_logic = true;
 	wnode->range_valid = true;
@@ -557,8 +559,9 @@ std::unique_ptr<AstNode> make_packed_struct(AstNode *template_node, std::string
 static void prepend_ranges(std::unique_ptr<AstNode> &range, AstNode *range_add)
 {
 	// Convert range to multirange.
+	auto loc = range->location;
 	if (range->type == AST_RANGE)
-		range = std::make_unique<AstNode>(AST_MULTIRANGE, std::move(range));
+		range = std::make_unique<AstNode>(loc, AST_MULTIRANGE, std::move(range));
 
 	// Add range or ranges.
 	if (range_add->type == AST_RANGE)
@@ -693,15 +696,15 @@ static bool contains_unbased_unsized(const AstNode *node)
 
 // adds a wire to the current module with the given name that matches the
 // dimensions of the given wire reference
-void add_wire_for_ref(const RTLIL::Wire *ref, const std::string &str)
+void add_wire_for_ref(location loc, const RTLIL::Wire *ref, const std::string &str)
 {
-	std::unique_ptr<AstNode> left = AstNode::mkconst_int(ref->width - 1 + ref->start_offset, true);
-	std::unique_ptr<AstNode> right = AstNode::mkconst_int(ref->start_offset, true);
+	std::unique_ptr<AstNode> left = AstNode::mkconst_int(loc, ref->width - 1 + ref->start_offset, true);
+	std::unique_ptr<AstNode> right = AstNode::mkconst_int(loc, ref->start_offset, true);
 	if (ref->upto)
 		std::swap(left, right);
-	std::unique_ptr<AstNode> range = std::make_unique<AstNode>(AST_RANGE, std::move(left), std::move(right));
+	std::unique_ptr<AstNode> range = std::make_unique<AstNode>(loc, AST_RANGE, std::move(left), std::move(right));
 
-	std::unique_ptr<AstNode> wire = std::make_unique<AstNode>(AST_WIRE, std::move(range));
+	std::unique_ptr<AstNode> wire = std::make_unique<AstNode>(loc, AST_WIRE, std::move(range));
 	wire->is_signed = ref->is_signed;
 	wire->is_logic = true;
 	wire->str = str;
@@ -790,7 +793,7 @@ std::unique_ptr<AstNode> AstNode::clone_at_zero()
 		YS_FALLTHROUGH
 	case AST_MEMRD:
 		detectSignWidth(width_hint, sign_hint);
-		return mkconst_int(0, sign_hint, width_hint);
+		return mkconst_int(location, 0, sign_hint, width_hint);
 
 	default:
 		break;
@@ -842,7 +845,7 @@ static void mark_auto_nosync(AstNode *block, const AstNode *wire)
 {
 	log_assert(block->type == AST_BLOCK);
 	log_assert(wire->type == AST_WIRE);
-	block->set_attribute(auto_nosync_prefix + wire->str, AstNode::mkconst_int(1, false));
+	block->set_attribute(auto_nosync_prefix + wire->str, AstNode::mkconst_int(block->location, 1, false));
 }
 
 // block names can be prefixed with an explicit scope during elaboration
@@ -883,7 +886,7 @@ static void check_auto_nosync(AstNode *node)
 		// mark the wire with `nosync`
 		AstNode *wire = it->second;
 		log_assert(wire->type == AST_WIRE);
-		wire->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
+		wire->set_attribute(ID::nosync, AstNode::mkconst_int(wire->location, 1, false));
 	}
 
 	// remove the attributes we've "consumed"
@@ -931,7 +934,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 #if 0
 	log("-------------\n");
-	log("AST simplify[%d] depth %d at %s:%d on %s %p:\n", stage, recursion_counter, location.filename.c_str(), location.first_line, type2str(type).c_str(), this);
+	log("AST simplify[%d] depth %d at %s:%d on %s %p:\n", stage, recursion_counter, location.begin.filename->c_str(), location.begin.line, type2str(type).c_str(), this);
 	log("const_fold=%d, stage=%d, width_hint=%d, sign_hint=%d\n",
 			int(const_fold), int(stage), int(width_hint), int(sign_hint));
 	// dumpAst(nullptr, "> ");
@@ -1013,16 +1016,17 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				if (node->children[0]->range_swapped)
 					std::swap(data_range_left, data_range_right);
 
+				auto loc = node->location;
 				for (int i = 0; i < mem_size; i++) {
-					auto reg = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE,
-							mkconst_int(data_range_left, true), mkconst_int(data_range_right, true)));
+					auto reg = std::make_unique<AstNode>(loc, AST_WIRE, std::make_unique<AstNode>(loc, AST_RANGE,
+							mkconst_int(loc, data_range_left, true), mkconst_int(loc, data_range_right, true)));
 					reg->str = stringf("%s[%d]", node->str.c_str(), i);
 					reg->is_reg = true;
 					reg->is_signed = node->is_signed;
 					for (auto &it : node->attributes)
 						if (it.first != ID::mem2reg)
 							reg->set_attribute(it.first, it.second->clone());
-					reg->location.filename = node->location.filename;
+					reg->location.begin.filename = node->location.begin.filename;
 					reg->location = node->location;
 					while (reg->simplify(true, 1, -1, false)) { }
 					children.push_back(std::move(reg));
@@ -1051,7 +1055,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	// note that $display, $finish, and $stop are used for synthesis-time DRC so they're not in this list
 	if ((type == AST_FCALL || type == AST_TCALL) && (str == "$strobe" || str == "$monitor" || str == "$time" ||
 			str == "$dumpfile" || str == "$dumpvars" || str == "$dumpon" || str == "$dumpoff" || str == "$dumpall")) {
-		log_file_warning(location.filename, location.first_line, "Ignoring call to system %s %s.\n", type == AST_FCALL ? "function" : "task", str.c_str());
+		log_file_warning(*location.begin.filename, location.begin.line, "Ignoring call to system %s %s.\n", type == AST_FCALL ? "function" : "task", str.c_str());
 		delete_children();
 		str = std::string();
 	}
@@ -1061,7 +1065,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		 str == "$write"   || str == "$writeb"   || str == "$writeh"   || str == "$writeo"))
 	{
 		if (!current_always) {
-			log_file_warning(location.filename, location.first_line, "System task `%s' outside initial or always block is unsupported.\n", str.c_str());
+			log_file_warning(*location.begin.filename, location.begin.line, "System task `%s' outside initial or always block is unsupported.\n", str.c_str());
 			delete_children();
 			str = std::string();
 		} else {
@@ -1178,7 +1182,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				if (node->children.size() == 1 && node->children[0]->type == AST_RANGE) {
 					for (auto& c : node->children[0]->children) {
 						if (!c->is_simple_const_expr())
-							set_attribute(ID::dynports, AstNode::mkconst_int(1, true));
+							set_attribute(ID::dynports, AstNode::mkconst_int(c->location, 1, true));
 					}
 				}
 				if (this_wire_scope.count(node->str) > 0) {
@@ -1404,15 +1408,15 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 				// create the indirection wire
 				std::stringstream sstr;
-				sstr << "$indirect$" << ref->name.c_str() << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
+				sstr << "$indirect$" << ref->name.c_str() << "$" << RTLIL::encode_filename(*location.begin.filename) << ":" << location.begin.line << "$" << (autoidx++);
 				std::string tmp_str = sstr.str();
-				add_wire_for_ref(ref, tmp_str);
+				add_wire_for_ref(location, ref, tmp_str);
 
-				auto asgn_owned = std::make_unique<AstNode>(AST_ASSIGN);
+				auto asgn_owned = std::make_unique<AstNode>(child->location, AST_ASSIGN);
 				auto* asgn = asgn_owned.get();
 				current_ast_mod->children.push_back(std::move(asgn_owned));
 
-				auto ident = std::make_unique<AstNode>(AST_IDENTIFIER);
+				auto ident = std::make_unique<AstNode>(child->location, AST_IDENTIFIER);
 				ident->str = tmp_str;
 				child->children[0] = ident->clone();
 
@@ -1575,7 +1579,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			if (child->children.size() == 0) {
 				// Base type (e.g., int)
 				width = child->range_left - child->range_right +1;
-				node = mkconst_int(width, child->is_signed);
+				node = mkconst_int(child->location, width, child->is_signed);
 			} else {
 				// User defined type
 				log_assert(child->children[0]->type == AST_WIRETYPE);
@@ -1598,7 +1602,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					if (template_node->children.size() > 0 && template_node->children[0]->type == AST_RANGE)
 						width = range_width(this, template_node->children[0].get());
 					child->delete_children();
-					node = mkconst_int(width, true);
+					node = mkconst_int(child->location, width, true);
 					break;
 				}
 
@@ -1606,7 +1610,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				case AST_UNION: {
 					child->delete_children();
 					width = size_packed_struct(template_node, 0);
-					node = mkconst_int(width, false);
+					node = mkconst_int(child->location, width, false);
 					break;
 				}
 
@@ -1938,7 +1942,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			input_error("Defparam argument `%s . %s` does not match a cell!\n",
 					RTLIL::unescape_id(modname).c_str(), RTLIL::unescape_id(paramname).c_str());
 
-		auto paraset = std::make_unique<AstNode>(AST_PARASET, children[1]->clone(), GetSize(children) > 2 ? children[2]->clone() : nullptr);
+		auto paraset = std::make_unique<AstNode>(location, AST_PARASET, children[1]->clone(), GetSize(children) > 2 ? children[2]->clone() : nullptr);
 		paraset->str = paramname;
 
 		AstNode *cell = current_scope.at(modname);
@@ -1980,7 +1984,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			if (!str.empty() && str[0] == '\\' && (template_node->type == AST_STRUCT || template_node->type == AST_UNION)) {
 				// replace instance with wire representing the packed structure
 				newNode = make_packed_struct(template_node.get(), str, attributes);
-				newNode->set_attribute(ID::wiretype, mkconst_str(resolved_type_node->str));
+				newNode->set_attribute(ID::wiretype, mkconst_str(newNode->location, resolved_type_node->str));
 				// add original input/output attribute to resolved wire
 				newNode->is_input = this->is_input;
 				newNode->is_output = this->is_output;
@@ -1991,7 +1995,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			// Prepare replacement node.
 			newNode = template_node->clone();
 			newNode->str = str;
-			newNode->set_attribute(ID::wiretype, mkconst_str(resolved_type_node->str));
+			newNode->set_attribute(ID::wiretype, mkconst_str(newNode->location, resolved_type_node->str));
 			newNode->is_input = is_input;
 			newNode->is_output = is_output;
 			newNode->is_wand = is_wand;
@@ -2082,7 +2086,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (children[1]->type != AST_CONSTANT)
 			input_error("Right operand of to_bits expression is not constant!\n");
 		RTLIL::Const new_value = children[1]->bitsAsConst(children[0]->bitsAsConst().as_int(), children[1]->is_signed);
-		newNode = mkconst_bits(new_value.to_bits(), children[1]->is_signed);
+		newNode = mkconst_bits(location, new_value.to_bits(), children[1]->is_signed);
 		goto apply_newNode;
 	}
 
@@ -2144,7 +2148,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					range_swapped = force_upto;
 				}
 				if (range_left == range_right && !attributes.count(ID::single_bit_vector))
-					set_attribute(ID::single_bit_vector, mkconst_int(1, false));
+					set_attribute(ID::single_bit_vector, mkconst_int(location, 1, false));
 			}
 		} else {
 			if (!range_valid)
@@ -2171,7 +2175,8 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					int left = width - 1, right = 0;
 					if (i)
 						std::swap(left, right);
-					children[i] = std::make_unique<AstNode>(AST_RANGE, mkconst_int(left, true), mkconst_int(right, true));
+					auto loc = children[i]->location;
+					children[i] = std::make_unique<AstNode>(loc, AST_RANGE, mkconst_int(loc, left, true), mkconst_int(loc, right, true));
 					fixup_hierarchy_flags();
 					did_something = true;
 				} else if (children[i]->type == AST_RANGE) {
@@ -2242,9 +2247,9 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			int width = std::abs(children[1]->range_left - children[1]->range_right) + 1;
 			if (children[0]->type == AST_REALVALUE) {
 				RTLIL::Const constvalue = children[0]->realAsConst(width);
-				log_file_warning(location.filename, location.first_line, "converting real value %e to binary %s.\n",
+				log_file_warning(*location.begin.filename, location.begin.line, "converting real value %e to binary %s.\n",
 						children[0]->realvalue, log_signal(constvalue));
-				children[0] = mkconst_bits(constvalue.to_bits(), sign_hint);
+				children[0] = mkconst_bits(location, constvalue.to_bits(), sign_hint);
 				fixup_hierarchy_flags();
 				did_something = true;
 			}
@@ -2252,7 +2257,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				if (width != int(children[0]->bits.size())) {
 					RTLIL::SigSpec sig(children[0]->bits);
 					sig.extend_u0(width, children[0]->is_signed);
-					children[0] = mkconst_bits(sig.as_const().to_bits(), is_signed);
+					children[0] = mkconst_bits(location, sig.as_const().to_bits(), is_signed);
 					fixup_hierarchy_flags();
 				}
 				children[0]->is_signed = is_signed;
@@ -2264,7 +2269,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		} else
 		if (children.size() > 1 && children[1]->type == AST_REALVALUE && children[0]->type == AST_CONSTANT) {
 			double as_realvalue = children[0]->asReal(sign_hint);
-			children[0] = std::make_unique<AstNode>(AST_REALVALUE);
+			children[0] = std::make_unique<AstNode>(location, AST_REALVALUE);
 			children[0]->realvalue = as_realvalue;
 			fixup_hierarchy_flags();
 			did_something = true;
@@ -2293,7 +2298,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				if (found_sname) {
 					// structure member, rewrite this node to reference the packed struct wire
 					auto range = make_index_range(item_node);
-					newNode = std::make_unique<AstNode>(AST_IDENTIFIER, std::move(range));
+					newNode = std::make_unique<AstNode>(location, AST_IDENTIFIER, std::move(range));
 					newNode->str = sname;
 					// save type and original number of dimensions for $size() etc.
 					newNode->set_attribute(ID::wiretype, item_node->clone());
@@ -2305,7 +2310,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					}
 					newNode->basic_prep = true;
 					if (item_node->is_signed)
-						newNode = std::make_unique<AstNode>(AST_TO_SIGNED, std::move(newNode));
+						newNode = std::make_unique<AstNode>(location, AST_TO_SIGNED, std::move(newNode));
 					goto apply_newNode;
 				}
 			}
@@ -2353,7 +2358,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			if (current_ast_mod == nullptr) {
 				input_error("Identifier `%s' is implicitly declared outside of a module.\n", str.c_str());
 			} else if (flag_autowire || str == "\\$global_clock") {
-				auto auto_wire = std::make_unique<AstNode>(AST_AUTOWIRE);
+				auto auto_wire = std::make_unique<AstNode>(location, AST_AUTOWIRE);
 				auto_wire->str = str;
 				current_scope[str] = auto_wire.get();
 				current_ast_mod->children.push_back(std::move(auto_wire));
@@ -2384,21 +2389,21 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			std::swap(data_range_left, data_range_right);
 
 		std::stringstream sstr;
-		sstr << "$mem2bits$" << str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
+		sstr << "$mem2bits$" << str << "$" << RTLIL::encode_filename(*location.begin.filename) << ":" << location.begin.line << "$" << (autoidx++);
 		std::string wire_id = sstr.str();
 
-		auto wire_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(data_range_left, true), mkconst_int(data_range_right, true)));
+		auto wire_owned = std::make_unique<AstNode>(location, AST_WIRE, std::make_unique<AstNode>(location, AST_RANGE, mkconst_int(location, data_range_left, true), mkconst_int(location, data_range_right, true)));
 		auto* wire = wire_owned.get();
 		current_ast_mod->children.push_back(std::move(wire_owned));
 		wire->str = wire_id;
 		if (current_block)
-			wire->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
+			wire->set_attribute(ID::nosync, AstNode::mkconst_int(location, 1, false));
 		while (wire->simplify(true, 1, -1, false)) { }
 
 		auto data = clone();
 		data->children.pop_back();
 
-		auto assign = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), std::move(data));
+		auto assign = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), std::move(data));
 		assign->children[0]->str = wire_id;
 		assign->children[0]->was_checked = true;
 
@@ -2413,12 +2418,12 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		}
 		else
 		{
-			auto proc = std::make_unique<AstNode>(AST_ALWAYS, std::make_unique<AstNode>(AST_BLOCK));
+			auto proc = std::make_unique<AstNode>(location, AST_ALWAYS, std::make_unique<AstNode>(location, AST_BLOCK));
 			proc->children[0]->children.push_back(std::move(assign));
 			current_ast_mod->children.push_back(std::move(proc));
 		}
 
-		newNode = std::make_unique<AstNode>(AST_IDENTIFIER, children[1]->clone());
+		newNode = std::make_unique<AstNode>(location, AST_IDENTIFIER, children[1]->clone());
 		newNode->str = wire_id;
 		newNode->integer = integer; // save original number of dimensions for $size() etc.
 		newNode->id2ast = wire;
@@ -2508,7 +2513,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			}
 		}
 
-		varbuf = std::make_unique<AstNode>(AST_LOCALPARAM, std::move(varbuf));
+		varbuf = std::make_unique<AstNode>(location, AST_LOCALPARAM, std::move(varbuf));
 		varbuf->str = init_ast->children[0]->str;
 
 		AstNode *backup_scope_varbuf = current_scope[varbuf->str];
@@ -2673,7 +2678,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (buf)
 		{
 			if (buf->type != AST_GENBLOCK)
-				buf = std::make_unique<AstNode>(AST_GENBLOCK, std::move(buf));
+				buf = std::make_unique<AstNode>(location, AST_GENBLOCK, std::move(buf));
 
 			if (!buf->str.empty()) {
 				buf->expand_genblock(buf->str + ".");
@@ -2773,7 +2778,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (!children.at(0)->range_valid)
 			input_error("Non-constant array range on cell array.\n");
 
-		newNode = std::make_unique<AstNode>(AST_GENBLOCK);
+		newNode = std::make_unique<AstNode>(location, AST_GENBLOCK);
 		int num = max(children.at(0)->range_left, children.at(0)->range_right) - min(children.at(0)->range_left, children.at(0)->range_right) + 1;
 
 		for (int i = 0; i < num; i++) {
@@ -2818,15 +2823,15 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 			auto& mux_input = children_list.at(1);
 			if (str == "notif0" || str == "notif1") {
-				mux_input = std::make_unique<AstNode>(AST_BIT_NOT, std::move(mux_input));
+				mux_input = std::make_unique<AstNode>(location, AST_BIT_NOT, std::move(mux_input));
 			}
-			auto node = std::make_unique<AstNode>(AST_TERNARY, std::move(children_list.at(2)));
+			auto node = std::make_unique<AstNode>(location, AST_TERNARY, std::move(children_list.at(2)));
 			if (str == "bufif0") {
-				node->children.push_back(AstNode::mkconst_bits(z_const, false));
+				node->children.push_back(AstNode::mkconst_bits(location, z_const, false));
 				node->children.push_back(std::move(mux_input));
 			} else {
 				node->children.push_back(std::move(mux_input));
-				node->children.push_back(AstNode::mkconst_bits(z_const, false));
+				node->children.push_back(AstNode::mkconst_bits(location, z_const, false));
 			}
 
 			str.clear();
@@ -2841,11 +2846,11 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		{
 			auto& input = children_list.back();
 			if (str == "not")
-				input = std::make_unique<AstNode>(AST_BIT_NOT, std::move(input));
+				input = std::make_unique<AstNode>(location, AST_BIT_NOT, std::move(input));
 
-			newNode = std::make_unique<AstNode>(AST_GENBLOCK);
+			newNode = std::make_unique<AstNode>(location, AST_GENBLOCK);
 			for (auto it = children_list.begin(); it != std::prev(children_list.end()); it++) {
-				newNode->children.push_back(std::make_unique<AstNode>(AST_ASSIGN, std::move(*it), input->clone()));
+				newNode->children.push_back(std::make_unique<AstNode>(location, AST_ASSIGN, std::move(*it), input->clone()));
 				newNode->children.back()->was_checked = true;
 			}
 
@@ -2873,11 +2878,11 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			auto& node = children_list[1];
 			if (op_type != AST_POS)
 				for (size_t i = 2; i < children_list.size(); i++) {
-					node = std::make_unique<AstNode>(op_type, std::move(node), std::move(children_list[i]));
+					node = std::make_unique<AstNode>(location, op_type, std::move(node), std::move(children_list[i]));
 					node->location = location;
 				}
 			if (invert_results)
-				node = std::make_unique<AstNode>(AST_BIT_NOT, std::move(node));
+				node = std::make_unique<AstNode>(location, AST_BIT_NOT, std::move(node));
 
 			str.clear();
 			type = AST_ASSIGN;
@@ -3012,13 +3017,13 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			int rvalue_width;
 			bool rvalue_sign;
 			children[1]->detectSignWidth(rvalue_width, rvalue_sign);
-			auto rvalue = mktemp_logic("$bitselwrite$rvalue$", current_ast_mod, true, rvalue_width - 1, 0, rvalue_sign);
+			auto rvalue = mktemp_logic(location, "$bitselwrite$rvalue$", current_ast_mod, true, rvalue_width - 1, 0, rvalue_sign);
 			auto* rvalue_leaky = rvalue.get();
 			log("make 1\n");
-			auto case_node_owned = std::make_unique<AstNode>(AST_CASE, std::move(shift_expr));
+			auto case_node_owned = std::make_unique<AstNode>(location, AST_CASE, std::move(shift_expr));
 			auto* case_node = case_node_owned.get();
-			newNode = std::make_unique<AstNode>(AST_BLOCK,
-						  std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(rvalue), children[1]->clone()),
+			newNode = std::make_unique<AstNode>(location, AST_BLOCK,
+						  std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::move(rvalue), children[1]->clone()),
 						  std::move(case_node_owned));
 
 			did_something = true;
@@ -3032,14 +3037,14 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				if (start_bit%bitno_div != 0 || (stride == 0 && start_bit != 0))
 					continue;
 
-				auto cond = std::make_unique<AstNode>(AST_COND, mkconst_int(start_bit, case_sign_hint, max_width));
+				auto cond = std::make_unique<AstNode>(location, AST_COND, mkconst_int(location, start_bit, case_sign_hint, max_width));
 				auto lvalue = children[0]->clone();
 				lvalue->delete_children();
 				if (member_node)
 					lvalue->set_attribute(ID::wiretype, member_node->clone());
-				lvalue->children.push_back(std::make_unique<AstNode>(AST_RANGE,
-						mkconst_int(end_bit, true), mkconst_int(start_bit, true)));
-				cond->children.push_back(std::make_unique<AstNode>(AST_BLOCK, std::make_unique<AstNode>(std::move(type), std::move(lvalue), rvalue_leaky->clone())));
+				lvalue->children.push_back(std::make_unique<AstNode>(location, AST_RANGE,
+						mkconst_int(location, end_bit, true), mkconst_int(location, start_bit, true)));
+				cond->children.push_back(std::make_unique<AstNode>(location, AST_BLOCK, std::make_unique<AstNode>(location, std::move(type), std::move(lvalue), rvalue_leaky->clone())));
 				case_node->children.push_back(std::move(cond));
 			}
 		} else {
@@ -3060,50 +3065,50 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			shift_expr->detectSignWidth(shift_width_hint, shift_sign_hint);
 
 			// All operations are carried out in a new block.
-			newNode = std::make_unique<AstNode>(AST_BLOCK);
+			newNode = std::make_unique<AstNode>(location, AST_BLOCK);
 
 			// Temporary register holding the result of the bit- or part-select position expression.
-			auto pos = mktemp_logic("$bitselwrite$pos$", current_ast_mod, true, shift_width_hint - 1, 0, shift_sign_hint);
+			auto pos = mktemp_logic(location, "$bitselwrite$pos$", current_ast_mod, true, shift_width_hint - 1, 0, shift_sign_hint);
 			// Calculate lsb from position.
 			auto shift_val = pos->clone();
 
-			newNode->children.push_back(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(pos), std::move(shift_expr)));
+			newNode->children.push_back(std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::move(pos), std::move(shift_expr)));
 
 			// If the expression is signed, we must add an extra bit for possible negation of the most negative number.
 			// If the expression is unsigned, we must add an extra bit for sign.
-			shift_val = std::make_unique<AstNode>(AST_CAST_SIZE, mkconst_int(shift_width_hint + 1, true), std::move(shift_val));
+			shift_val = std::make_unique<AstNode>(location, AST_CAST_SIZE, mkconst_int(location, shift_width_hint + 1, true), std::move(shift_val));
 			if (!shift_sign_hint)
-				shift_val = std::make_unique<AstNode>(AST_TO_SIGNED, std::move(shift_val));
+				shift_val = std::make_unique<AstNode>(location, AST_TO_SIGNED, std::move(shift_val));
 
 			// offset the shift amount by the lower bound of the dimension
 			if (wire_offset != 0)
-				shift_val = std::make_unique<AstNode>(AST_SUB, std::move(shift_val), mkconst_int(wire_offset, true));
+				shift_val = std::make_unique<AstNode>(location, AST_SUB, std::move(shift_val), mkconst_int(location, wire_offset, true));
 
 			// reflect the shift amount if the dimension is swapped
 			if (children[0]->id2ast->range_swapped)
-				shift_val = std::make_unique<AstNode>(AST_SUB, mkconst_int(wire_width - result_width, true), std::move(shift_val));
+				shift_val = std::make_unique<AstNode>(location, AST_SUB, mkconst_int(location, wire_width - result_width, true), std::move(shift_val));
 
 			// AST_SHIFT uses negative amounts for shifting left
-			shift_val = std::make_unique<AstNode>(AST_NEG, std::move(shift_val));
+			shift_val = std::make_unique<AstNode>(location, AST_NEG, std::move(shift_val));
 			auto also_shift_val = shift_val->clone();
 
 			// dst = (dst & ~(width'1 << lsb)) | unsigned'(width'(src)) << lsb)
 			did_something = true;
-			auto bitmask = mkconst_bits(std::vector<RTLIL::State>(result_width, State::S1), false);
+			auto bitmask = mkconst_bits(location, std::vector<RTLIL::State>(result_width, State::S1), false);
 			newNode->children.push_back(
-				std::make_unique<AstNode>(std::move(type),
+				std::make_unique<AstNode>(location, std::move(type),
 						std::move(lvalue),
-						std::make_unique<AstNode>(AST_BIT_OR,
-							std::make_unique<AstNode>(AST_BIT_AND,
+						std::make_unique<AstNode>(location, AST_BIT_OR,
+							std::make_unique<AstNode>(location, AST_BIT_AND,
 									std::move(old_data),
-									std::make_unique<AstNode>(AST_BIT_NOT,
-										std::make_unique<AstNode>(AST_SHIFT,
+									std::make_unique<AstNode>(location, AST_BIT_NOT,
+										std::make_unique<AstNode>(location, AST_SHIFT,
 												std::move(bitmask),
 												std::move(shift_val)))),
-							std::make_unique<AstNode>(AST_SHIFT,
-									std::make_unique<AstNode>(AST_TO_UNSIGNED,
-										std::make_unique<AstNode>(AST_CAST_SIZE,
-												mkconst_int(result_width, true),
+							std::make_unique<AstNode>(location, AST_SHIFT,
+									std::make_unique<AstNode>(location, AST_TO_UNSIGNED,
+										std::make_unique<AstNode>(location, AST_CAST_SIZE,
+												mkconst_int(location, result_width, true),
 												children[1]->clone())),
 									std::move(also_shift_val)))));
 
@@ -3119,7 +3124,7 @@ skip_dynamic_range_lvalue_expansion:;
 			children.size() == 1 && children[0]->type == AST_RANGE && children[0]->children.size() == 1) {
 		if (integer < (unsigned)id2ast->unpacked_dimensions)
 			input_error("Insufficient number of array indices for %s.\n", log_id(str));
-		newNode = std::make_unique<AstNode>(AST_MEMRD, children[0]->children[0]->clone());
+		newNode = std::make_unique<AstNode>(location, AST_MEMRD, children[0]->children[0]->clone());
 		newNode->str = str;
 		newNode->id2ast = id2ast;
 		goto apply_newNode;
@@ -3137,22 +3142,22 @@ skip_dynamic_range_lvalue_expansion:;
 
 		if (found_nontrivial_member)
 		{
-			newNode = std::make_unique<AstNode>(AST_BLOCK);
+			newNode = std::make_unique<AstNode>(location, AST_BLOCK);
 
-			auto wire_tmp_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(width_hint-1, true), mkconst_int(0, true)));
+			auto wire_tmp_owned = std::make_unique<AstNode>(location, AST_WIRE, std::make_unique<AstNode>(location, AST_RANGE, mkconst_int(location, width_hint-1, true), mkconst_int(location, 0, true)));
 			auto wire_tmp = wire_tmp_owned.get();
-			wire_tmp->str = stringf("$splitcmplxassign$%s:%d$%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line, autoidx++);
+			wire_tmp->str = stringf("$splitcmplxassign$%s:%d$%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line, autoidx++);
 			current_scope[wire_tmp->str] = wire_tmp;
 			current_ast_mod->children.push_back(std::move(wire_tmp_owned));
-			wire_tmp->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
+			wire_tmp->set_attribute(ID::nosync, AstNode::mkconst_int(location, 1, false));
 			while (wire_tmp->simplify(true, 1, -1, false)) { }
 			wire_tmp->is_logic = true;
 
-			auto wire_tmp_id_owned = std::make_unique<AstNode>(AST_IDENTIFIER);
+			auto wire_tmp_id_owned = std::make_unique<AstNode>(location, AST_IDENTIFIER);
 			auto* wire_tmp_id = wire_tmp_id_owned.get();
 			wire_tmp_id->str = wire_tmp->str;
 
-			newNode->children.push_back(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(wire_tmp_id_owned), children[1]->clone()));
+			newNode->children.push_back(std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::move(wire_tmp_id_owned), children[1]->clone()));
 			newNode->children.back()->was_checked = true;
 
 			int cursor = 0;
@@ -3163,8 +3168,8 @@ skip_dynamic_range_lvalue_expansion:;
 				child->detectSignWidth(child_width_hint, child_sign_hint);
 
 				auto rhs = wire_tmp_id->clone();
-				rhs->children.push_back(std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(cursor+child_width_hint-1, true), AstNode::mkconst_int(cursor, true)));
-				newNode->children.push_back(std::make_unique<AstNode>(type, child->clone(), std::move(rhs)));
+				rhs->children.push_back(std::make_unique<AstNode>(location, AST_RANGE, AstNode::mkconst_int(location, cursor+child_width_hint-1, true), AstNode::mkconst_int(location, cursor, true)));
+				newNode->children.push_back(std::make_unique<AstNode>(location, type, child->clone(), std::move(rhs)));
 
 				cursor += child_width_hint;
 			}
@@ -3183,15 +3188,15 @@ skip_dynamic_range_lvalue_expansion:;
 			input_error("Insufficient number of array indices for %s.\n", log_id(str));
 
 		std::stringstream sstr;
-		sstr << "$memwr$" << children[0]->str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
+		sstr << "$memwr$" << children[0]->str << "$" << RTLIL::encode_filename(*location.begin.filename) << ":" << location.begin.line << "$" << (autoidx++);
 		std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA", id_en = sstr.str() + "_EN";
 
 		int mem_width, mem_size, addr_bits;
 		bool mem_signed = children[0]->id2ast->is_signed;
 		children[0]->id2ast->meminfo(mem_width, mem_size, addr_bits);
 
-		newNode = std::make_unique<AstNode>(AST_BLOCK);
-		auto defNode = std::make_unique<AstNode>(AST_BLOCK);
+		newNode = std::make_unique<AstNode>(location, AST_BLOCK);
+		auto defNode = std::make_unique<AstNode>(location, AST_BLOCK);
 
 		int data_range_left = children[0]->id2ast->children[0]->range_left;
 		int data_range_right = children[0]->id2ast->children[0]->range_right;
@@ -3214,7 +3219,7 @@ skip_dynamic_range_lvalue_expansion:;
 		if (children[0]->children[0]->children[0]->isConst()) {
 			node_addr = children[0]->children[0]->children[0]->clone();
 		} else {
-			auto wire_addr_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(addr_bits-1, true), mkconst_int(0, true)));
+			auto wire_addr_owned = std::make_unique<AstNode>(location, AST_WIRE, std::make_unique<AstNode>(location, AST_RANGE, mkconst_int(location, addr_bits-1, true), mkconst_int(location, 0, true)));
 			auto* wire_addr = wire_addr_owned.get();
 			wire_addr->str = id_addr;
 			wire_addr->was_checked = true;
@@ -3222,17 +3227,17 @@ skip_dynamic_range_lvalue_expansion:;
 			current_scope[wire_addr->str] = wire_addr;
 			while (wire_addr->simplify(true, 1, -1, false)) { }
 
-			auto assign_addr = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), mkconst_bits(x_bits_addr, false));
+			auto assign_addr = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), mkconst_bits(location, x_bits_addr, false));
 			assign_addr->children[0]->str = id_addr;
 			assign_addr->children[0]->was_checked = true;
 			defNode->children.push_back(std::move(assign_addr));
 
-			assign_addr = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), children[0]->children[0]->children[0]->clone());
+			assign_addr = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), children[0]->children[0]->children[0]->clone());
 			assign_addr->children[0]->str = id_addr;
 			assign_addr->children[0]->was_checked = true;
 			newNode->children.push_back(std::move(assign_addr));
 
-			node_addr = std::make_unique<AstNode>(AST_IDENTIFIER);
+			node_addr = std::make_unique<AstNode>(location, AST_IDENTIFIER);
 			node_addr->str = id_addr;
 		}
 
@@ -3240,7 +3245,7 @@ skip_dynamic_range_lvalue_expansion:;
 		if (children[0]->children.size() == 1 && children[1]->isConst()) {
 			node_data = children[1]->clone();
 		} else {
-			auto wire_data_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
+			auto wire_data_owned = std::make_unique<AstNode>(location, AST_WIRE, std::make_unique<AstNode>(location, AST_RANGE, mkconst_int(location, mem_width-1, true), mkconst_int(location, 0, true)));
 			auto* wire_data = wire_data_owned.get();
 			wire_data->str = id_data;
 			wire_data->was_checked = true;
@@ -3249,16 +3254,16 @@ skip_dynamic_range_lvalue_expansion:;
 			current_ast_mod->children.push_back(std::move(wire_data_owned));
 			while (wire_data->simplify(true, 1, -1, false)) { }
 
-			auto assign_data = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), mkconst_bits(x_bits_data, false));
+			auto assign_data = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), mkconst_bits(location, x_bits_data, false));
 			assign_data->children[0]->str = id_data;
 			assign_data->children[0]->was_checked = true;
 			defNode->children.push_back(std::move(assign_data));
 
-			node_data = std::make_unique<AstNode>(AST_IDENTIFIER);
+			node_data = std::make_unique<AstNode>(location, AST_IDENTIFIER);
 			node_data->str = id_data;
 		}
 
-		auto wire_en_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
+		auto wire_en_owned = std::make_unique<AstNode>(location, AST_WIRE, std::make_unique<AstNode>(location, AST_RANGE, mkconst_int(location, mem_width-1, true), mkconst_int(location, 0, true)));
 		auto* wire_en = wire_en_owned.get();
 		wire_en->str = id_en;
 		wire_en->was_checked = true;
@@ -3266,12 +3271,12 @@ skip_dynamic_range_lvalue_expansion:;
 		current_ast_mod->children.push_back(std::move(wire_en_owned));
 		while (wire_en->simplify(true, 1, -1, false)) { }
 
-		auto assign_en_first = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), mkconst_int(0, false, mem_width));
+		auto assign_en_first = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), mkconst_int(location, 0, false, mem_width));
 		assign_en_first->children[0]->str = id_en;
 		assign_en_first->children[0]->was_checked = true;
 		defNode->children.push_back(std::move(assign_en_first));
 
-		auto node_en = std::make_unique<AstNode>(AST_IDENTIFIER);
+		auto node_en = std::make_unique<AstNode>(location, AST_IDENTIFIER);
 		node_en->str = id_en;
 
 		if (!defNode->children.empty())
@@ -3289,14 +3294,14 @@ skip_dynamic_range_lvalue_expansion:;
 
 				std::vector<RTLIL::State> padding_x(offset, RTLIL::State::Sx);
 
-				assign_data = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER),
-						std::make_unique<AstNode>(AST_CONCAT, mkconst_bits(padding_x, false), children[1]->clone()));
+				assign_data = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER),
+						std::make_unique<AstNode>(location, AST_CONCAT, mkconst_bits(location, padding_x, false), children[1]->clone()));
 				assign_data->children[0]->str = id_data;
 				assign_data->children[0]->was_checked = true;
 
 				for (int i = 0; i < mem_width; i++)
 					set_bits_en[i] = offset <= i && i < offset+width ? RTLIL::State::S1 : RTLIL::State::S0;
-				assign_en = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), mkconst_bits(set_bits_en, false));
+				assign_en = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), mkconst_bits(location, set_bits_en, false));
 				assign_en->children[0]->str = id_en;
 				assign_en->children[0]->was_checked = true;
 			}
@@ -3315,17 +3320,17 @@ skip_dynamic_range_lvalue_expansion:;
 					offset_ast = the_range->children[0]->clone();
 
 				if (mem_data_range_offset)
-					offset_ast = std::make_unique<AstNode>(AST_SUB, std::move(offset_ast), mkconst_int(mem_data_range_offset, true));
+					offset_ast = std::make_unique<AstNode>(location, AST_SUB, std::move(offset_ast), mkconst_int(location, mem_data_range_offset, true));
 
-				assign_data = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER),
-						std::make_unique<AstNode>(AST_SHIFT_LEFT, children[1]->clone(), offset_ast->clone()));
+				assign_data = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER),
+						std::make_unique<AstNode>(location, AST_SHIFT_LEFT, children[1]->clone(), offset_ast->clone()));
 				assign_data->children[0]->str = id_data;
 				assign_data->children[0]->was_checked = true;
 
 				for (int i = 0; i < mem_width; i++)
 					set_bits_en[i] = i < width ? RTLIL::State::S1 : RTLIL::State::S0;
-				assign_en = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER),
-						std::make_unique<AstNode>(AST_SHIFT_LEFT, mkconst_bits(set_bits_en, false), offset_ast->clone()));
+				assign_en = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER),
+						std::make_unique<AstNode>(location, AST_SHIFT_LEFT, mkconst_bits(location, set_bits_en, false), offset_ast->clone()));
 				assign_en->children[0]->str = id_en;
 				assign_en->children[0]->was_checked = true;
 			}
@@ -3333,12 +3338,12 @@ skip_dynamic_range_lvalue_expansion:;
 		else
 		{
 			if (!(children[0]->children.size() == 1 && children[1]->isConst())) {
-				assign_data = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), children[1]->clone());
+				assign_data = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), children[1]->clone());
 				assign_data->children[0]->str = id_data;
 				assign_data->children[0]->was_checked = true;
 			}
 
-			assign_en = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), mkconst_bits(set_bits_en, false));
+			assign_en = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), mkconst_bits(location, set_bits_en, false));
 			assign_en->children[0]->str = id_en;
 			assign_en->children[0]->was_checked = true;
 		}
@@ -3349,21 +3354,21 @@ skip_dynamic_range_lvalue_expansion:;
 
 		std::unique_ptr<AstNode> wrnode;
 		if (current_always->type == AST_INITIAL)
-			wrnode = std::make_unique<AstNode>(AST_MEMINIT, std::move(node_addr), std::move(node_data), std::move(node_en), mkconst_int(1, false));
+			wrnode = std::make_unique<AstNode>(location, AST_MEMINIT, std::move(node_addr), std::move(node_data), std::move(node_en), mkconst_int(location, 1, false));
 		else
-			wrnode = std::make_unique<AstNode>(AST_MEMWR, std::move(node_addr), std::move(node_data), std::move(node_en));
+			wrnode = std::make_unique<AstNode>(location, AST_MEMWR, std::move(node_addr), std::move(node_data), std::move(node_en));
 		wrnode->str = children[0]->str;
 		wrnode->id2ast = children[0]->id2ast;
 		wrnode->location = location;
 		if (wrnode->type == AST_MEMWR) {
 			int portid = current_memwr_count[wrnode->str]++;
-			wrnode->children.push_back(mkconst_int(portid, false));
+			wrnode->children.push_back(mkconst_int(location, portid, false));
 			std::vector<RTLIL::State> priority_mask;
 			for (int i = 0; i < portid; i++) {
 				bool has_prio = current_memwr_visible[wrnode->str].count(i);
 				priority_mask.push_back(State(has_prio));
 			}
-			wrnode->children.push_back(mkconst_bits(priority_mask, false));
+			wrnode->children.push_back(mkconst_bits(location, priority_mask, false));
 			current_memwr_visible[wrnode->str].insert(portid);
 			current_always->children.push_back(std::move(wrnode));
 		} else {
@@ -3371,7 +3376,7 @@ skip_dynamic_range_lvalue_expansion:;
 		}
 
 		if (newNode->children.empty()) {
-			newNode = std::make_unique<AstNode>();
+			newNode = std::make_unique<AstNode>(location);
 		}
 		goto apply_newNode;
 	}
@@ -3385,13 +3390,13 @@ skip_dynamic_range_lvalue_expansion:;
 			{
 				int myidx = autoidx++;
 
-				auto wire_owned = std::make_unique<AstNode>(AST_WIRE);
+				auto wire_owned = std::make_unique<AstNode>(location, AST_WIRE);
 				auto* wire = wire_owned.get();
 				current_ast_mod->children.push_back(std::move(wire_owned));
 				wire->str = stringf("$initstate$%d_wire", myidx);
 				while (wire->simplify(true, 1, -1, false)) { }
 
-				auto cell = std::make_unique<AstNode>(AST_CELL, std::make_unique<AstNode>(AST_CELLTYPE), std::make_unique<AstNode>(AST_ARGUMENT, std::make_unique<AstNode>(AST_IDENTIFIER)));
+				auto cell = std::make_unique<AstNode>(location, AST_CELL, std::make_unique<AstNode>(location, AST_CELLTYPE), std::make_unique<AstNode>(location, AST_ARGUMENT, std::make_unique<AstNode>(location, AST_IDENTIFIER)));
 				cell->str = stringf("$initstate$%d", myidx);
 				cell->children[0]->str = "$initstate";
 				cell->children[1]->str = "\\Y";
@@ -3400,7 +3405,7 @@ skip_dynamic_range_lvalue_expansion:;
 				current_ast_mod->children.push_back(std::move(cell));
 				while (cell->simplify(true, 1, -1, false)) { }
 
-				newNode = std::make_unique<AstNode>(AST_IDENTIFIER);
+				newNode = std::make_unique<AstNode>(location, AST_IDENTIFIER);
 				newNode->str = wire->str;
 				newNode->id2ast = wire;
 				goto apply_newNode;
@@ -3449,19 +3454,19 @@ skip_dynamic_range_lvalue_expansion:;
 
 				for (int i = 0; i < num_steps; i++)
 				{
-					auto reg_owned = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE,
-							mkconst_int(width_hint-1, true), mkconst_int(0, true)));
+					auto reg_owned = std::make_unique<AstNode>(location, AST_WIRE, std::make_unique<AstNode>(location, AST_RANGE,
+							mkconst_int(location, width_hint-1, true), mkconst_int(location, 0, true)));
 					auto* reg = reg_owned.get();
 					current_ast_mod->children.push_back(std::move(reg_owned));
 
-					reg->str = stringf("$past$%s:%d$%d$%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line, myidx, i);
+					reg->str = stringf("$past$%s:%d$%d$%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line, myidx, i);
 					reg->is_reg = true;
 					reg->is_signed = sign_hint;
 
 
 					while (reg->simplify(true, 1, -1, false)) { }
 
-					auto regid = std::make_unique<AstNode>(AST_IDENTIFIER);
+					auto regid = std::make_unique<AstNode>(location, AST_IDENTIFIER);
 					regid->str = reg->str;
 					regid->id2ast = reg;
 					regid->was_checked = true;
@@ -3471,16 +3476,16 @@ skip_dynamic_range_lvalue_expansion:;
 					if (outreg == nullptr) {
 						rhs = children.at(0)->clone();
 					} else {
-						rhs = std::make_unique<AstNode>(AST_IDENTIFIER);
+						rhs = std::make_unique<AstNode>(location, AST_IDENTIFIER);
 						rhs->str = outreg->str;
 						rhs->id2ast = outreg;
 					}
 
-					block->children.push_back(std::make_unique<AstNode>(AST_ASSIGN_LE, std::move(regid), std::move(rhs)));
+					block->children.push_back(std::make_unique<AstNode>(location, AST_ASSIGN_LE, std::move(regid), std::move(rhs)));
 					outreg = reg;
 				}
 
-				newNode = std::make_unique<AstNode>(AST_IDENTIFIER);
+				newNode = std::make_unique<AstNode>(location, AST_IDENTIFIER);
 				newNode->str = outreg->str;
 				newNode->id2ast = outreg;
 				goto apply_newNode;
@@ -3501,20 +3506,20 @@ skip_dynamic_range_lvalue_expansion:;
 				past->str = "\\$past";
 
 				if (str == "\\$stable")
-					newNode = std::make_unique<AstNode>(AST_EQ, std::move(past), std::move(present));
+					newNode = std::make_unique<AstNode>(location, AST_EQ, std::move(past), std::move(present));
 
 				else if (str == "\\$changed")
-					newNode = std::make_unique<AstNode>(AST_NE, std::move(past), std::move(present));
+					newNode = std::make_unique<AstNode>(location, AST_NE, std::move(past), std::move(present));
 
 				else if (str == "\\$rose")
-					newNode = std::make_unique<AstNode>(AST_LOGIC_AND,
-							std::make_unique<AstNode>(AST_LOGIC_NOT, std::make_unique<AstNode>(AST_BIT_AND, std::move(past), mkconst_int(1,false))),
-							std::make_unique<AstNode>(AST_BIT_AND, std::move(present), mkconst_int(1,false)));
+					newNode = std::make_unique<AstNode>(location, AST_LOGIC_AND,
+							std::make_unique<AstNode>(location, AST_LOGIC_NOT, std::make_unique<AstNode>(location, AST_BIT_AND, std::move(past), mkconst_int(location, 1, false))),
+							std::make_unique<AstNode>(location, AST_BIT_AND, std::move(present), mkconst_int(location, 1, false)));
 
 				else if (str == "\\$fell")
-					newNode = std::make_unique<AstNode>(AST_LOGIC_AND,
-							std::make_unique<AstNode>(AST_BIT_AND, std::move(past), mkconst_int(1,false)),
-							std::make_unique<AstNode>(AST_LOGIC_NOT, std::make_unique<AstNode>(AST_BIT_AND, std::move(present), mkconst_int(1,false))));
+					newNode = std::make_unique<AstNode>(location, AST_LOGIC_AND,
+							std::make_unique<AstNode>(location, AST_BIT_AND, std::move(past), mkconst_int(location, 1, false)),
+							std::make_unique<AstNode>(location, AST_LOGIC_NOT, std::make_unique<AstNode>(location, AST_BIT_AND, std::move(present), mkconst_int(location, 1, false))));
 
 				else
 					log_abort();
@@ -3548,7 +3553,7 @@ skip_dynamic_range_lvalue_expansion:;
 					if (arg_value.at(i) == RTLIL::State::S1)
 						result = i + 1;
 
-				newNode = mkconst_int(result, true);
+				newNode = mkconst_int(location, result, true);
 				goto apply_newNode;
 			}
 
@@ -3639,7 +3644,7 @@ skip_dynamic_range_lvalue_expansion:;
 				else { // str == "\\$bits"
 					result = width * mem_depth;
 				}
-				newNode = mkconst_int(result, true);
+				newNode = mkconst_int(location, result, true);
 				goto apply_newNode;
 			}
 
@@ -3685,9 +3690,9 @@ skip_dynamic_range_lvalue_expansion:;
 				}
 
 				if (str == "\\$rtoi") {
-					newNode = AstNode::mkconst_int(x, true);
+					newNode = AstNode::mkconst_int(location, x, true);
 				} else {
-					newNode = std::make_unique<AstNode>(AST_REALVALUE);
+					newNode = std::make_unique<AstNode>(location, AST_REALVALUE);
 					if (str == "\\$ln")		 newNode->realvalue = ::log(x);
 					else if (str == "\\$log10") newNode->realvalue = ::log10(x);
 					else if (str == "\\$exp")   newNode->realvalue = ::exp(x);
@@ -3717,7 +3722,7 @@ skip_dynamic_range_lvalue_expansion:;
 
 			if (str == "\\$sformatf") {
 				Fmt fmt = processFormat(stage, /*sformat_like=*/true);
-				newNode = AstNode::mkconst_str(fmt.render());
+				newNode = AstNode::mkconst_str(location, fmt.render());
 				goto apply_newNode;
 			}
 
@@ -3745,24 +3750,24 @@ skip_dynamic_range_lvalue_expansion:;
 				auto& exp = children[0];
 				exp->detectSignWidth(exp_width, exp_sign, nullptr);
 
-				newNode = mkconst_int(0, false);
+				newNode = mkconst_int(location, 0, false);
 
 				for (int i = 0; i < exp_width; i++) {
 					// Generate nodes for:  exp << i >> ($size(exp) - 1)
 					//						  ^^   ^^
-					auto lsh_node = std::make_unique<AstNode>(AST_SHIFT_LEFT, exp->clone(), mkconst_int(i, false));
-					auto rsh_node = std::make_unique<AstNode>(AST_SHIFT_RIGHT, std::move(lsh_node), mkconst_int(exp_width - 1, false));
+					auto lsh_node = std::make_unique<AstNode>(location, AST_SHIFT_LEFT, exp->clone(), mkconst_int(location, i, false));
+					auto rsh_node = std::make_unique<AstNode>(location, AST_SHIFT_RIGHT, std::move(lsh_node), mkconst_int(location, exp_width - 1, false));
 
 					std::unique_ptr<AstNode> or_node = nullptr;
 
 					for (RTLIL::State control_bit : control_bits) {
 						// Generate node for:  (exp << i >> ($size(exp) - 1)) === control_bit
 						//													^^^
-						auto eq_node = std::make_unique<AstNode>(AST_EQX, rsh_node->clone(), mkconst_bits({control_bit}, false));
+						auto eq_node = std::make_unique<AstNode>(location, AST_EQX, rsh_node->clone(), mkconst_bits(location, {control_bit}, false));
 
 						// Or the result for each checked bit value
 						if (or_node)
-							or_node = std::make_unique<AstNode>(AST_LOGIC_OR, std::move(or_node), std::move(eq_node));
+							or_node = std::make_unique<AstNode>(location, AST_LOGIC_OR, std::move(or_node), std::move(eq_node));
 						else
 							or_node = std::move(eq_node);
 					}
@@ -3772,7 +3777,7 @@ skip_dynamic_range_lvalue_expansion:;
 					log_assert(or_node != nullptr);
 
 					// Generate node for adding with result of previous bit
-					newNode = std::make_unique<AstNode>(AST_ADD, std::move(newNode), std::move(or_node));
+					newNode = std::make_unique<AstNode>(location, AST_ADD, std::move(newNode), std::move(or_node));
 				}
 
 				goto apply_newNode;
@@ -3787,18 +3792,18 @@ skip_dynamic_range_lvalue_expansion:;
 				countbits->str = "\\$countbits";
 
 				if (str == "\\$countones") {
-					countbits->children.push_back(mkconst_bits({RTLIL::State::S1}, false));
+					countbits->children.push_back(mkconst_bits(location, {RTLIL::State::S1}, false));
 					newNode = std::move(countbits);
 				} else if (str == "\\$isunknown") {
-					countbits->children.push_back(mkconst_bits({RTLIL::Sx}, false));
-					countbits->children.push_back(mkconst_bits({RTLIL::Sz}, false));
-					newNode = std::make_unique<AstNode>(AST_GT, std::move(countbits), mkconst_int(0, false));
+					countbits->children.push_back(mkconst_bits(location, {RTLIL::Sx}, false));
+					countbits->children.push_back(mkconst_bits(location, {RTLIL::Sz}, false));
+					newNode = std::make_unique<AstNode>(location, AST_GT, std::move(countbits), mkconst_int(location, 0, false));
 				} else if (str == "\\$onehot") {
-					countbits->children.push_back(mkconst_bits({RTLIL::State::S1}, false));
-					newNode = std::make_unique<AstNode>(AST_EQ, std::move(countbits), mkconst_int(1, false));
+					countbits->children.push_back(mkconst_bits(location, {RTLIL::State::S1}, false));
+					newNode = std::make_unique<AstNode>(location, AST_EQ, std::move(countbits), mkconst_int(location, 1, false));
 				} else if (str == "\\$onehot0") {
-					countbits->children.push_back(mkconst_bits({RTLIL::State::S1}, false));
-					newNode = std::make_unique<AstNode>(AST_LE, std::move(countbits), mkconst_int(1, false));
+					countbits->children.push_back(mkconst_bits(location, {RTLIL::State::S1}, false));
+					newNode = std::make_unique<AstNode>(location, AST_LE, std::move(countbits), mkconst_int(location, 1, false));
 				} else {
 					log_abort();
 				}
@@ -3914,7 +3919,7 @@ skip_dynamic_range_lvalue_expansion:;
 
 
 		std::stringstream sstr;
-		sstr << str << "$func$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++) << '.';
+		sstr << str << "$func$" << RTLIL::encode_filename(*location.begin.filename) << ":" << location.begin.line << "$" << (autoidx++) << '.';
 		std::string prefix = sstr.str();
 
 		auto* decl = current_scope[str];
@@ -3977,11 +3982,11 @@ skip_dynamic_range_lvalue_expansion:;
 			current_ast_mod->children.push_back(std::move(wire));
 			while (wire_leaky->simplify(true, 1, -1, false)) { }
 
-			auto lvalue = std::make_unique<AstNode>(AST_IDENTIFIER);
+			auto lvalue = std::make_unique<AstNode>(location, AST_IDENTIFIER);
 			lvalue->str = wire_leaky->str;
 
-			auto always = std::make_unique<AstNode>(AST_ALWAYS, std::make_unique<AstNode>(AST_BLOCK,
-					std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(lvalue), clone())));
+			auto always = std::make_unique<AstNode>(location, AST_ALWAYS, std::make_unique<AstNode>(location, AST_BLOCK,
+					std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::move(lvalue), clone())));
 			always->children[0]->children[0]->was_checked = true;
 
 			current_ast_mod->children.push_back(std::move(always));
@@ -4001,14 +4006,14 @@ skip_dynamic_range_lvalue_expansion:;
 			} else
 				celltype = RTLIL::escape_id(celltype);
 
-			auto cell = std::make_unique<AstNode>(AST_CELL, std::make_unique<AstNode>(AST_CELLTYPE));
+			auto cell = std::make_unique<AstNode>(location, AST_CELL, std::make_unique<AstNode>(location, AST_CELLTYPE));
 			cell->str = prefix.substr(0, GetSize(prefix)-1);
 			cell->children[0]->str = celltype;
 
 			for (auto& attr : decl->attributes)
 				if (attr.first.str().rfind("\\via_celltype_defparam_", 0) == 0)
 				{
-					auto cell_arg = std::make_unique<AstNode>(AST_PARASET, attr.second->clone());
+					auto cell_arg = std::make_unique<AstNode>(location, AST_PARASET, attr.second->clone());
 					cell_arg->str = RTLIL::escape_id(attr.first.substr(strlen("\\via_celltype_defparam_")));
 					cell->children.push_back(std::move(cell_arg));
 				}
@@ -4023,15 +4028,15 @@ skip_dynamic_range_lvalue_expansion:;
 					current_ast_mod->children.push_back(std::move(wire));
 					while (wire->simplify(true, 1, -1, false)) { }
 
-					auto wire_id = std::make_unique<AstNode>(AST_IDENTIFIER);
+					auto wire_id = std::make_unique<AstNode>(location, AST_IDENTIFIER);
 					wire_id->str = wire->str;
 
 					if ((child->is_input || child->is_output) && arg_count < children.size())
 					{
 						auto arg = children[arg_count++]->clone();
 						auto assign = child->is_input ?
-								std::make_unique<AstNode>(AST_ASSIGN_EQ, wire_id->clone(), std::move(arg)) :
-								std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(arg), wire_id->clone());
+								std::make_unique<AstNode>(location, AST_ASSIGN_EQ, wire_id->clone(), std::move(arg)) :
+								std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::move(arg), wire_id->clone());
 						assign->children[0]->was_checked = true;
 
 						for (auto it = current_block->children.begin(); it != current_block->children.end(); it++) {
@@ -4042,7 +4047,7 @@ skip_dynamic_range_lvalue_expansion:;
 						}
 					}
 
-					auto cell_arg = std::make_unique<AstNode>(AST_ARGUMENT, std::move(wire_id));
+					auto cell_arg = std::make_unique<AstNode>(location, AST_ARGUMENT, std::move(wire_id));
 					cell_arg->str = child->str == str ? outport : child->str;
 					cell->children.push_back(std::move(cell_arg));
 				}
@@ -4083,7 +4088,7 @@ skip_dynamic_range_lvalue_expansion:;
 					wire->is_input = false;
 					wire->is_output = false;
 					wire->is_reg = true;
-					wire->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
+					wire->set_attribute(ID::nosync, AstNode::mkconst_int(location, 1, false));
 					if (child->type == AST_ENUM_ITEM)
 						wire->set_attribute(ID::enum_base_type, std::move(child->attributes[ID::enum_base_type]));
 
@@ -4114,10 +4119,10 @@ skip_dynamic_range_lvalue_expansion:;
 									break;
 								}
 							if (!uses_explicit_size) {
-								auto range = std::make_unique<AstNode>();
+								auto range = std::make_unique<AstNode>(location);
 								range->type = AST_RANGE;
-								range->children.push_back(mkconst_int(0, true));
-								range->children.push_back(mkconst_int(0, true));
+								range->children.push_back(mkconst_int(location, 0, true));
+								range->children.push_back(mkconst_int(location, 0, true));
 								wire->children.push_back(std::move(range));
 							}
 						}
@@ -4127,16 +4132,16 @@ skip_dynamic_range_lvalue_expansion:;
 						continue;
 					}
 
-					auto wire_id = std::make_unique<AstNode>(AST_IDENTIFIER);
+					auto wire_id = std::make_unique<AstNode>(location, AST_IDENTIFIER);
 					wire_id->str = wire->str;
 					if (child->is_input) {
-						auto assign = std::make_unique<AstNode>(AST_ASSIGN_EQ, wire_id->clone(), arg->clone());
+						auto assign = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, wire_id->clone(), arg->clone());
 						assign->children[0]->was_checked = true;
 						new_stmts.push_back(std::move(assign));
 					}
 
 					if (child->is_output) {
-						auto assign = std::make_unique<AstNode>(AST_ASSIGN_EQ, arg->clone(), wire_id->clone());
+						auto assign = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, arg->clone(), wire_id->clone());
 						assign->children[0]->was_checked = true;
 						output_assignments.push_back(std::move(assign));
 					}
@@ -4207,7 +4212,7 @@ replace_fcall_later:;
 							else
 								data.push_back(RTLIL::State::Sx);
 						}
-						newNode = mkconst_bits(data, false);
+						newNode = mkconst_bits(location, data, false);
 					} else
 					if (children.size() == 0)
 						newNode = current_scope[str]->children[0]->clone();
@@ -4219,14 +4224,14 @@ replace_fcall_later:;
 		case AST_BIT_NOT:
 			if (children[0]->type == AST_CONSTANT) {
 				RTLIL::Const y = RTLIL::const_not(children[0]->bitsAsConst(width_hint, sign_hint), dummy_arg, sign_hint, false, width_hint);
-				newNode = mkconst_bits(y.to_bits(), sign_hint);
+				newNode = mkconst_bits(location, y.to_bits(), sign_hint);
 			}
 			break;
 		case AST_TO_SIGNED:
 		case AST_TO_UNSIGNED:
 			if (children[0]->type == AST_CONSTANT) {
 				RTLIL::Const y = children[0]->bitsAsConst(width_hint, sign_hint);
-				newNode = mkconst_bits(y.to_bits(), type == AST_TO_SIGNED);
+				newNode = mkconst_bits(location, y.to_bits(), type == AST_TO_SIGNED);
 			}
 			break;
 		if (0) { case AST_BIT_AND:  const_func = RTLIL::const_and;  }
@@ -4236,7 +4241,7 @@ replace_fcall_later:;
 			if (children[0]->type == AST_CONSTANT && children[1]->type == AST_CONSTANT) {
 				RTLIL::Const y = const_func(children[0]->bitsAsConst(width_hint, sign_hint),
 						children[1]->bitsAsConst(width_hint, sign_hint), sign_hint, sign_hint, width_hint);
-				newNode = mkconst_bits(y.to_bits(), sign_hint);
+				newNode = mkconst_bits(location, y.to_bits(), sign_hint);
 			}
 			break;
 		if (0) { case AST_REDUCE_AND:  const_func = RTLIL::const_reduce_and;  }
@@ -4246,16 +4251,16 @@ replace_fcall_later:;
 		if (0) { case AST_REDUCE_BOOL: const_func = RTLIL::const_reduce_bool; }
 			if (children[0]->type == AST_CONSTANT) {
 				RTLIL::Const y = const_func(RTLIL::Const(children[0]->bits), dummy_arg, false, false, -1);
-				newNode = mkconst_bits(y.to_bits(), false);
+				newNode = mkconst_bits(location, y.to_bits(), false);
 			}
 			break;
 		case AST_LOGIC_NOT:
 			if (children[0]->type == AST_CONSTANT) {
 				RTLIL::Const y = RTLIL::const_logic_not(RTLIL::Const(children[0]->bits), dummy_arg, children[0]->is_signed, false, -1);
-				newNode = mkconst_bits(y.to_bits(), false);
+				newNode = mkconst_bits(location, y.to_bits(), false);
 			} else
 			if (children[0]->isConst()) {
-				newNode = mkconst_int(children[0]->asReal(sign_hint) == 0, false, 1);
+				newNode = mkconst_int(location, children[0]->asReal(sign_hint) == 0, false, 1);
 			}
 			break;
 		if (0) { case AST_LOGIC_AND: const_func = RTLIL::const_logic_and; }
@@ -4263,13 +4268,13 @@ replace_fcall_later:;
 			if (children[0]->type == AST_CONSTANT && children[1]->type == AST_CONSTANT) {
 				RTLIL::Const y = const_func(RTLIL::Const(children[0]->bits), RTLIL::Const(children[1]->bits),
 						children[0]->is_signed, children[1]->is_signed, -1);
-				newNode = mkconst_bits(y.to_bits(), false);
+				newNode = mkconst_bits(location, y.to_bits(), false);
 			} else
 			if (children[0]->isConst() && children[1]->isConst()) {
 				if (type == AST_LOGIC_AND)
-					newNode = mkconst_int((children[0]->asReal(sign_hint) != 0) && (children[1]->asReal(sign_hint) != 0), false, 1);
+					newNode = mkconst_int(location, (children[0]->asReal(sign_hint) != 0) && (children[1]->asReal(sign_hint) != 0), false, 1);
 				else
-					newNode = mkconst_int((children[0]->asReal(sign_hint) != 0) || (children[1]->asReal(sign_hint) != 0), false, 1);
+					newNode = mkconst_int(location, (children[0]->asReal(sign_hint) != 0) || (children[1]->asReal(sign_hint) != 0), false, 1);
 			}
 			break;
 		if (0) { case AST_SHIFT_LEFT:   const_func = RTLIL::const_shl;  }
@@ -4280,10 +4285,10 @@ replace_fcall_later:;
 			if (children[0]->type == AST_CONSTANT && children[1]->type == AST_CONSTANT) {
 				RTLIL::Const y = const_func(children[0]->bitsAsConst(width_hint, sign_hint),
 						RTLIL::Const(children[1]->bits), sign_hint, type == AST_POW ? children[1]->is_signed : false, width_hint);
-				newNode = mkconst_bits(y.to_bits(), sign_hint);
+				newNode = mkconst_bits(location, y.to_bits(), sign_hint);
 			} else
 			if (type == AST_POW && children[0]->isConst() && children[1]->isConst()) {
-				newNode = std::make_unique<AstNode>(AST_REALVALUE);
+				newNode = std::make_unique<AstNode>(location, AST_REALVALUE);
 				newNode->realvalue = pow(children[0]->asReal(sign_hint), children[1]->asReal(sign_hint));
 			}
 			break;
@@ -4300,19 +4305,19 @@ replace_fcall_later:;
 				bool cmp_signed = children[0]->is_signed && children[1]->is_signed;
 				RTLIL::Const y = const_func(children[0]->bitsAsConst(cmp_width, cmp_signed),
 						children[1]->bitsAsConst(cmp_width, cmp_signed), cmp_signed, cmp_signed, 1);
-				newNode = mkconst_bits(y.to_bits(), false);
+				newNode = mkconst_bits(location, y.to_bits(), false);
 			} else
 			if (children[0]->isConst() && children[1]->isConst()) {
 				bool cmp_signed = (children[0]->type == AST_REALVALUE || children[0]->is_signed) && (children[1]->type == AST_REALVALUE || children[1]->is_signed);
 				switch (type) {
-				case AST_LT:  newNode = mkconst_int(children[0]->asReal(cmp_signed) <  children[1]->asReal(cmp_signed), false, 1); break;
-				case AST_LE:  newNode = mkconst_int(children[0]->asReal(cmp_signed) <= children[1]->asReal(cmp_signed), false, 1); break;
-				case AST_EQ:  newNode = mkconst_int(children[0]->asReal(cmp_signed) == children[1]->asReal(cmp_signed), false, 1); break;
-				case AST_NE:  newNode = mkconst_int(children[0]->asReal(cmp_signed) != children[1]->asReal(cmp_signed), false, 1); break;
-				case AST_EQX: newNode = mkconst_int(children[0]->asReal(cmp_signed) == children[1]->asReal(cmp_signed), false, 1); break;
-				case AST_NEX: newNode = mkconst_int(children[0]->asReal(cmp_signed) != children[1]->asReal(cmp_signed), false, 1); break;
-				case AST_GE:  newNode = mkconst_int(children[0]->asReal(cmp_signed) >= children[1]->asReal(cmp_signed), false, 1); break;
-				case AST_GT:  newNode = mkconst_int(children[0]->asReal(cmp_signed) >  children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_LT:  newNode = mkconst_int(location, children[0]->asReal(cmp_signed) <  children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_LE:  newNode = mkconst_int(location, children[0]->asReal(cmp_signed) <= children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_EQ:  newNode = mkconst_int(location, children[0]->asReal(cmp_signed) == children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_NE:  newNode = mkconst_int(location, children[0]->asReal(cmp_signed) != children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_EQX: newNode = mkconst_int(location, children[0]->asReal(cmp_signed) == children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_NEX: newNode = mkconst_int(location, children[0]->asReal(cmp_signed) != children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_GE:  newNode = mkconst_int(location, children[0]->asReal(cmp_signed) >= children[1]->asReal(cmp_signed), false, 1); break;
+				case AST_GT:  newNode = mkconst_int(location, children[0]->asReal(cmp_signed) >  children[1]->asReal(cmp_signed), false, 1); break;
 				default: log_abort();
 				}
 			}
@@ -4325,10 +4330,10 @@ replace_fcall_later:;
 			if (children[0]->type == AST_CONSTANT && children[1]->type == AST_CONSTANT) {
 				RTLIL::Const y = const_func(children[0]->bitsAsConst(width_hint, sign_hint),
 						children[1]->bitsAsConst(width_hint, sign_hint), sign_hint, sign_hint, width_hint);
-				newNode = mkconst_bits(y.to_bits(), sign_hint);
+				newNode = mkconst_bits(location, y.to_bits(), sign_hint);
 			} else
 			if (children[0]->isConst() && children[1]->isConst()) {
-				newNode = std::make_unique<AstNode>(AST_REALVALUE);
+				newNode = std::make_unique<AstNode>(location, AST_REALVALUE);
 				switch (type) {
 				case AST_ADD: newNode->realvalue = children[0]->asReal(sign_hint) + children[1]->asReal(sign_hint); break;
 				case AST_SUB: newNode->realvalue = children[0]->asReal(sign_hint) - children[1]->asReal(sign_hint); break;
@@ -4344,10 +4349,10 @@ replace_fcall_later:;
 		if (0) { case AST_NEG: const_func = RTLIL::const_neg; }
 			if (children[0]->type == AST_CONSTANT) {
 				RTLIL::Const y = const_func(children[0]->bitsAsConst(width_hint, sign_hint), dummy_arg, sign_hint, false, width_hint);
-				newNode = mkconst_bits(y.to_bits(), sign_hint);
+				newNode = mkconst_bits(location, y.to_bits(), sign_hint);
 			} else
 			if (children[0]->isConst()) {
-				newNode = std::make_unique<AstNode>(AST_REALVALUE);
+				newNode = std::make_unique<AstNode>(location, AST_REALVALUE);
 				if (type == AST_NEG)
 					newNode->realvalue = -children[0]->asReal(sign_hint);
 				else
@@ -4367,15 +4372,15 @@ replace_fcall_later:;
 						bool other_sign_hint = sign_hint, other_real = false;
 						not_choice->detectSignWidth(other_width_hint, other_sign_hint, &other_real);
 						if (other_real) {
-							newNode = std::make_unique<AstNode>(AST_REALVALUE);
+							newNode = std::make_unique<AstNode>(location, AST_REALVALUE);
 							choice->detectSignWidth(width_hint, sign_hint);
 							newNode->realvalue = choice->asReal(sign_hint);
 						} else {
 							RTLIL::Const y = choice->bitsAsConst(width_hint, sign_hint);
 							if (choice->is_string && y.size() % 8 == 0 && sign_hint == false)
-								newNode = mkconst_str(y.to_bits());
+								newNode = mkconst_str(location, y.to_bits());
 							else
-								newNode = mkconst_bits(y.to_bits(), sign_hint);
+								newNode = mkconst_bits(location, y.to_bits(), sign_hint);
 						}
 					} else
 					if (choice->isConst()) {
@@ -4388,9 +4393,9 @@ replace_fcall_later:;
 					for (auto i = 0; i < a.size(); i++)
 						if (a[i] != b[i])
 							a.bits()[i] = RTLIL::State::Sx;
-					newNode = mkconst_bits(a.to_bits(), sign_hint);
+					newNode = mkconst_bits(location, a.to_bits(), sign_hint);
 				} else if (children[1]->isConst() && children[2]->isConst()) {
-					newNode = std::make_unique<AstNode>(AST_REALVALUE);
+					newNode = std::make_unique<AstNode>(location, AST_REALVALUE);
 					if (children[1]->asReal(sign_hint) == children[2]->asReal(sign_hint))
 						newNode->realvalue = children[1]->asReal(sign_hint);
 					else
@@ -4409,7 +4414,7 @@ replace_fcall_later:;
 					val = children[1]->bitsAsUnsizedConst(width);
 				else
 					val = children[1]->bitsAsConst(width);
-				newNode = mkconst_bits(val.to_bits(), children[1]->is_signed);
+				newNode = mkconst_bits(location, val.to_bits(), children[1]->is_signed);
 			}
 			break;
 		case AST_CONCAT:
@@ -4421,14 +4426,14 @@ replace_fcall_later:;
 					string_op = false;
 				tmp_bits.insert(tmp_bits.end(), (*it)->bits.begin(), (*it)->bits.end());
 			}
-			newNode = string_op ? mkconst_str(tmp_bits) : mkconst_bits(tmp_bits, false);
+			newNode = string_op ? mkconst_str(location, tmp_bits) : mkconst_bits(location, tmp_bits, false);
 			break;
 		case AST_REPLICATE:
 			if (children.at(0)->type != AST_CONSTANT || children.at(1)->type != AST_CONSTANT)
 				goto not_const;
 			for (int i = 0; i < children[0]->bitsAsConst().as_int(); i++)
 				tmp_bits.insert(tmp_bits.end(), children.at(1)->bits.begin(), children.at(1)->bits.end());
-			newNode = children.at(1)->is_string ? mkconst_str(tmp_bits) : mkconst_bits(tmp_bits, false);
+			newNode = children.at(1)->is_string ? mkconst_str(location, tmp_bits) : mkconst_bits(location, tmp_bits, false);
 			break;
 		default:
 		not_const:
@@ -4444,7 +4449,7 @@ apply_newNode:
 		// newNode->dumpAst(stderr, "+ ");
 		log_assert(newNode != nullptr);
 		// newNode->null_check();
-		newNode->location.filename = location.filename;
+		newNode->location.begin.filename = location.begin.filename;
 		newNode->location = location;
 		newNode->cloneInto(*this);
 		fixup_hierarchy_flags();
@@ -4472,7 +4477,7 @@ std::unique_ptr<AstNode> AstNode::readmem(bool is_readmemh, std::string mem_file
 	int mem_width, mem_size, addr_bits;
 	memory->meminfo(mem_width, mem_size, addr_bits);
 
-	auto block = std::make_unique<AstNode>(AST_BLOCK);
+	auto block = std::make_unique<AstNode>(location, AST_BLOCK);
 
 	AstNode* meminit = nullptr;
 	int next_meminit_cursor=0;
@@ -4491,7 +4496,7 @@ std::unique_ptr<AstNode> AstNode::readmem(bool is_readmemh, std::string mem_file
 #else
 		char slash = '/';
 #endif
-		std::string path = location.filename.substr(0, location.filename.find_last_of(slash)+1);
+		std::string path = location.begin.filename->substr(0, location.begin.filename->find_last_of(slash)+1);
 		f.open(path + mem_filename.c_str());
 		yosys_input_files.insert(path + mem_filename);
 	} else {
@@ -4556,15 +4561,15 @@ std::unique_ptr<AstNode> AstNode::readmem(bool is_readmemh, std::string mem_file
 				if (meminit == nullptr || cursor != next_meminit_cursor)
 				{
 					if (meminit != nullptr) {
-						meminit->children[1] = AstNode::mkconst_bits(meminit_bits, false);
-						meminit->children[3] = AstNode::mkconst_int(meminit_size, false);
+						meminit->children[1] = AstNode::mkconst_bits(location, meminit_bits, false);
+						meminit->children[3] = AstNode::mkconst_int(location, meminit_size, false);
 					}
 
-					auto meminit_owned = std::make_unique<AstNode>(AST_MEMINIT);
+					auto meminit_owned = std::make_unique<AstNode>(location, AST_MEMINIT);
 					meminit = meminit_owned.get();
-					meminit->children.push_back(AstNode::mkconst_int(cursor, false));
+					meminit->children.push_back(AstNode::mkconst_int(location, cursor, false));
 					meminit->children.push_back(nullptr);
-					meminit->children.push_back(AstNode::mkconst_bits(en_bits, false));
+					meminit->children.push_back(AstNode::mkconst_bits(location, en_bits, false));
 					meminit->children.push_back(nullptr);
 					meminit->str = memory->str;
 					meminit->id2ast = memory;
@@ -4581,7 +4586,13 @@ std::unique_ptr<AstNode> AstNode::readmem(bool is_readmemh, std::string mem_file
 			}
 			else
 			{
-				block->children.push_back(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER, std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(cursor, false))), std::move(value)));
+				block->children.push_back(
+					std::make_unique<AstNode>(location,
+						AST_ASSIGN_EQ, std::make_unique<AstNode>(location,
+							AST_IDENTIFIER, std::make_unique<AstNode>(location,
+								AST_RANGE, AstNode::mkconst_int(location,
+									cursor, false))),
+							std::move(value)));
 				block->children.back()->children[0]->str = memory->str;
 				block->children.back()->children[0]->id2ast = memory;
 				block->children.back()->children[0]->was_checked = true;
@@ -4597,8 +4608,8 @@ std::unique_ptr<AstNode> AstNode::readmem(bool is_readmemh, std::string mem_file
 	}
 
 	if (meminit != nullptr) {
-		meminit->children[1] = AstNode::mkconst_bits(meminit_bits, false);
-		meminit->children[3] = AstNode::mkconst_int(meminit_size, false);
+		meminit->children[1] = AstNode::mkconst_bits(location, meminit_bits, false);
+		meminit->children[3] = AstNode::mkconst_int(location, meminit_size, false);
 	}
 
 	return block;
@@ -4770,7 +4781,7 @@ static void mark_memories_assign_lhs_complex(dict<AstNode*, pool<std::string>> &
 	if (that->type == AST_IDENTIFIER && that->id2ast && that->id2ast->type == AST_MEMORY) {
 		AstNode *mem = that->id2ast;
 		if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_CMPLX_LHS))
-			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(that->location.filename).c_str(), that->location.first_line));
+			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*that->location.begin.filename).c_str(), that->location.begin.line));
 		mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_CMPLX_LHS;
 	}
 }
@@ -4798,14 +4809,14 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 			// activate mem2reg if this is assigned in an async proc
 			if (flags & AstNode::MEM2REG_FL_ASYNC) {
 				if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_ASYNC))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line));
 				mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_ASYNC;
 			}
 
 			// remember if this is assigned blocking (=)
 			if (type == AST_ASSIGN_EQ) {
 				if (!(proc_flags[mem] & AstNode::MEM2REG_FL_EQ1))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line));
 				proc_flags[mem] |= AstNode::MEM2REG_FL_EQ1;
 			}
 
@@ -4822,11 +4833,11 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 			// remember where this is
 			if (flags & MEM2REG_FL_INIT) {
 				if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_INIT))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line));
 				mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_INIT;
 			} else {
 				if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_ELSE))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line));
 				mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_ELSE;
 			}
 		}
@@ -4843,7 +4854,7 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 
 		// flag if used after blocking assignment (in same proc)
 		if ((proc_flags[mem] & AstNode::MEM2REG_FL_EQ1) && !(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_EQ2)) {
-			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(location.filename).c_str(), location.first_line));
+			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line));
 			mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_EQ2;
 		}
 	}
@@ -4960,7 +4971,9 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 
 		if (length != 0)
 		{
-			auto block_owned = std::make_unique<AstNode>(AST_INITIAL, std::make_unique<AstNode>(AST_BLOCK));
+			auto block_owned = std::make_unique<AstNode>(location,
+				AST_INITIAL, std::make_unique<AstNode>(location,
+					AST_BLOCK));
 			auto block = block_owned.get();
 			mod->children.push_back(std::move(block_owned));
 			block = block->children[0].get();
@@ -4977,7 +4990,9 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 						while (epos < wordsz && en[epos] == State::S1)
 							epos++;
 						int clen = epos - pos;
-						auto range = std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(cursor+i, false));
+						auto range = std::make_unique<AstNode>(location,
+							AST_RANGE, AstNode::mkconst_int(location,
+								cursor+i, false));
 						if (pos != 0 || epos != wordsz) {
 							int left;
 							int right;
@@ -4989,20 +5004,29 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 								right = mrange->range_right + pos;
 								left = mrange->range_right + epos - 1;
 							}
-							range = std::make_unique<AstNode>(AST_MULTIRANGE, std::move(range), std::make_unique<AstNode>(AST_RANGE, AstNode::mkconst_int(left, true), AstNode::mkconst_int(right, true)));
+							range = std::make_unique<AstNode>(location,
+								AST_MULTIRANGE, std::move(range), std::make_unique<AstNode>(location,
+									AST_RANGE,
+									AstNode::mkconst_int(location, left, true),
+									AstNode::mkconst_int(location, right, true)));
 						}
-						auto target = std::make_unique<AstNode>(AST_IDENTIFIER, std::move(range));
+						auto target = std::make_unique<AstNode>(location, AST_IDENTIFIER, std::move(range));
 						target->str = str;
 						target->id2ast = id2ast;
 						target->was_checked = true;
-						block->children.push_back(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(target), mkconst_bits(data.extract(i*wordsz + pos, clen).to_bits(), false)));
+						block->children.push_back(std::make_unique<AstNode>(location,
+							AST_ASSIGN_EQ,
+							std::move(target),
+							mkconst_bits(location,
+								data.extract(i*wordsz + pos, clen).to_bits(),
+								false)));
 						pos = epos;
 					}
 				}
 			}
 		}
 
-		auto newNode = std::make_unique<AstNode>(AST_NONE);
+		auto newNode = std::make_unique<AstNode>(location, AST_NONE);
 		newNode->cloneInto(*this);
 		did_something = true;
 	}
@@ -5010,7 +5034,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 	if (type == AST_ASSIGN && block == nullptr && children[0]->mem2reg_check(mem2reg_set))
 	{
 		if (async_block == nullptr) {
-			auto async_block_owned = std::make_unique<AstNode>(AST_ALWAYS, std::make_unique<AstNode>(AST_BLOCK));
+			auto async_block_owned = std::make_unique<AstNode>(location, AST_ALWAYS, std::make_unique<AstNode>(location, AST_BLOCK));
 			async_block = async_block_owned.get();
 			mod->children.push_back(std::move(async_block_owned));
 		}
@@ -5020,7 +5044,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 		newNode->children[0]->was_checked = true;
 		async_block->children[0]->children.push_back(std::move(newNode));
 
-		newNode = std::make_unique<AstNode>(AST_NONE);
+		newNode = std::make_unique<AstNode>(location, AST_NONE);
 		newNode->cloneInto(*this);
 		did_something = true;
 	}
@@ -5029,27 +5053,27 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 			children[0]->children[0]->children[0]->type != AST_CONSTANT)
 	{
 		std::stringstream sstr;
-		sstr << "$mem2reg_wr$" << children[0]->str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
+		sstr << "$mem2reg_wr$" << children[0]->str << "$" << RTLIL::encode_filename(*location.begin.filename) << ":" << location.begin.line << "$" << (autoidx++);
 		std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA";
 
 		int mem_width, mem_size, addr_bits;
 		bool mem_signed = children[0]->id2ast->is_signed;
 		children[0]->id2ast->meminfo(mem_width, mem_size, addr_bits);
 
-		auto wire_addr = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(addr_bits-1, true), mkconst_int(0, true)));
+		auto wire_addr = std::make_unique<AstNode>(location, AST_WIRE, std::make_unique<AstNode>(location, AST_RANGE, mkconst_int(location, addr_bits-1, true), mkconst_int(location, 0, true)));
 		wire_addr->str = id_addr;
 		wire_addr->is_reg = true;
 		wire_addr->was_checked = true;
-		wire_addr->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
+		wire_addr->set_attribute(ID::nosync, AstNode::mkconst_int(location, 1, false));
 		while (wire_addr->simplify(true, 1, -1, false)) { }
 		mod->children.push_back(std::move(wire_addr));
 
-		auto wire_data = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
+		auto wire_data = std::make_unique<AstNode>(location, AST_WIRE, std::make_unique<AstNode>(location, AST_RANGE, mkconst_int(location, mem_width-1, true), mkconst_int(location, 0, true)));
 		wire_data->str = id_data;
 		wire_data->is_reg = true;
 		wire_data->was_checked = true;
 		wire_data->is_signed = mem_signed;
-		wire_data->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
+		wire_data->set_attribute(ID::nosync, AstNode::mkconst_int(location, 1, false));
 		while (wire_data->simplify(true, 1, -1, false)) { }
 		mod->children.push_back(std::move(wire_data));
 
@@ -5059,18 +5083,18 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 			assign_idx++;
 		log_assert(assign_idx < block->children.size());
 
-		auto assign_addr = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), children[0]->children[0]->children[0]->clone());
+		auto assign_addr = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), children[0]->children[0]->children[0]->clone());
 		assign_addr->children[0]->str = id_addr;
 		assign_addr->children[0]->was_checked = true;
 		block->children.insert(block->children.begin()+assign_idx+1, std::move(assign_addr));
 
-		auto case_node = std::make_unique<AstNode>(AST_CASE, std::make_unique<AstNode>(AST_IDENTIFIER));
+		auto case_node = std::make_unique<AstNode>(location, AST_CASE, std::make_unique<AstNode>(location, AST_IDENTIFIER));
 		case_node->children[0]->str = id_addr;
 		for (int i = 0; i < mem_size; i++) {
 			if (children[0]->children[0]->children[0]->type == AST_CONSTANT && int(children[0]->children[0]->children[0]->integer) != i)
 				continue;
-			auto cond_node = std::make_unique<AstNode>(AST_COND, AstNode::mkconst_int(i, false, addr_bits), std::make_unique<AstNode>(AST_BLOCK));
-			auto assign_reg = std::make_unique<AstNode>(type, std::make_unique<AstNode>(AST_IDENTIFIER), std::make_unique<AstNode>(AST_IDENTIFIER));
+			auto cond_node = std::make_unique<AstNode>(location, AST_COND, AstNode::mkconst_int(location, i, false, addr_bits), std::make_unique<AstNode>(location, AST_BLOCK));
+			auto assign_reg = std::make_unique<AstNode>(location, type, std::make_unique<AstNode>(location, AST_IDENTIFIER), std::make_unique<AstNode>(location, AST_IDENTIFIER));
 			if (children[0]->children.size() == 2)
 				assign_reg->children[0]->children.push_back(children[0]->children[1]->clone());
 			assign_reg->children[0]->str = stringf("%s[%d]", children[0]->str.c_str(), i);
@@ -5141,51 +5165,51 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 				std::vector<RTLIL::State> x_bits;
 				for (int i = 0; i < width; i++)
 					x_bits.push_back(RTLIL::State::Sx);
-				std::unique_ptr<AstNode> constant = AstNode::mkconst_bits(x_bits, false);
+				std::unique_ptr<AstNode> constant = AstNode::mkconst_bits(location, x_bits, false);
 				constant->cloneInto(*this);
 			}
 		}
 		else
 		{
 			std::stringstream sstr;
-			sstr << "$mem2reg_rd$" << str << "$" << RTLIL::encode_filename(location.filename) << ":" << location.first_line << "$" << (autoidx++);
+			sstr << "$mem2reg_rd$" << str << "$" << RTLIL::encode_filename(*location.begin.filename) << ":" << location.begin.line << "$" << (autoidx++);
 			std::string id_addr = sstr.str() + "_ADDR", id_data = sstr.str() + "_DATA";
 
 			int mem_width, mem_size, addr_bits;
 			bool mem_signed = id2ast->is_signed;
 			id2ast->meminfo(mem_width, mem_size, addr_bits);
 
-			auto wire_addr = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(addr_bits-1, true), mkconst_int(0, true)));
+			auto wire_addr = std::make_unique<AstNode>(location, AST_WIRE, std::make_unique<AstNode>(location, AST_RANGE, mkconst_int(location, addr_bits-1, true), mkconst_int(location, 0, true)));
 			wire_addr->str = id_addr;
 			wire_addr->is_reg = true;
 			wire_addr->was_checked = true;
 			if (block)
-				wire_addr->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
+				wire_addr->set_attribute(ID::nosync, AstNode::mkconst_int(location, 1, false));
 			while (wire_addr->simplify(true, 1, -1, false)) { }
 			mod->children.push_back(std::move(wire_addr));
 
-			auto wire_data = std::make_unique<AstNode>(AST_WIRE, std::make_unique<AstNode>(AST_RANGE, mkconst_int(mem_width-1, true), mkconst_int(0, true)));
+			auto wire_data = std::make_unique<AstNode>(location, AST_WIRE, std::make_unique<AstNode>(location, AST_RANGE, mkconst_int(location, mem_width-1, true), mkconst_int(location, 0, true)));
 			wire_data->str = id_data;
 			wire_data->is_reg = true;
 			wire_data->was_checked = true;
 			wire_data->is_signed = mem_signed;
 			if (block)
-				wire_data->set_attribute(ID::nosync, AstNode::mkconst_int(1, false));
+				wire_data->set_attribute(ID::nosync, AstNode::mkconst_int(location, 1, false));
 			while (wire_data->simplify(true, 1, -1, false)) { }
 			mod->children.push_back(std::move(wire_data));
 
-			auto assign_addr = std::make_unique<AstNode>(block ? AST_ASSIGN_EQ : AST_ASSIGN, std::make_unique<AstNode>(AST_IDENTIFIER), children[0]->children[0]->clone());
+			auto assign_addr = std::make_unique<AstNode>(location, block ? AST_ASSIGN_EQ : AST_ASSIGN, std::make_unique<AstNode>(location, AST_IDENTIFIER), children[0]->children[0]->clone());
 			assign_addr->children[0]->str = id_addr;
 			assign_addr->children[0]->was_checked = true;
 
-			auto case_node = std::make_unique<AstNode>(AST_CASE, std::make_unique<AstNode>(AST_IDENTIFIER));
+			auto case_node = std::make_unique<AstNode>(location, AST_CASE, std::make_unique<AstNode>(location, AST_IDENTIFIER));
 			case_node->children[0]->str = id_addr;
 
 			for (int i = 0; i < mem_size; i++) {
 				if (children[0]->children[0]->type == AST_CONSTANT && int(children[0]->children[0]->integer) != i)
 					continue;
-				auto cond_node = std::make_unique<AstNode>(AST_COND, AstNode::mkconst_int(i, false, addr_bits), std::make_unique<AstNode>(AST_BLOCK));
-				auto assign_reg = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), std::make_unique<AstNode>(AST_IDENTIFIER));
+				auto cond_node = std::make_unique<AstNode>(location, AST_COND, AstNode::mkconst_int(location, i, false, addr_bits), std::make_unique<AstNode>(location, AST_BLOCK));
+				auto assign_reg = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), std::make_unique<AstNode>(location, AST_IDENTIFIER));
 				assign_reg->children[0]->str = id_data;
 				assign_reg->children[0]->was_checked = true;
 				assign_reg->children[1]->str = stringf("%s[%d]", str.c_str(), i);
@@ -5197,8 +5221,8 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 			for (int i = 0; i < mem_width; i++)
 				x_bits.push_back(RTLIL::State::Sx);
 
-			auto cond_node = std::make_unique<AstNode>(AST_COND, std::make_unique<AstNode>(AST_DEFAULT), std::make_unique<AstNode>(AST_BLOCK));
-			auto assign_reg = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::make_unique<AstNode>(AST_IDENTIFIER), AstNode::mkconst_bits(x_bits, false));
+			auto cond_node = std::make_unique<AstNode>(location, AST_COND, std::make_unique<AstNode>(location, AST_DEFAULT), std::make_unique<AstNode>(location, AST_BLOCK));
+			auto assign_reg = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), AstNode::mkconst_bits(location, x_bits, false));
 			assign_reg->children[0]->str = id_data;
 			assign_reg->children[0]->was_checked = true;
 			cond_node->children[1]->children.push_back(std::move(assign_reg));
@@ -5218,7 +5242,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 			}
 			else
 			{
-				auto proc = std::make_unique<AstNode>(AST_ALWAYS, std::make_unique<AstNode>(AST_BLOCK, std::move(case_node)));
+				auto proc = std::make_unique<AstNode>(location, AST_ALWAYS, std::make_unique<AstNode>(location, AST_BLOCK, std::move(case_node)));
 				mod->children.push_back(std::move(proc));
 				mod->children.push_back(std::move(assign_addr));
 				mod->fixup_hierarchy_flags();
@@ -5373,7 +5397,7 @@ bool AstNode::replace_variables(std::map<std::string, AstNode::varinfo_t> &varia
 			offset = -offset;
 		std::vector<RTLIL::State> &var_bits = variables.at(str).val.bits();
 		std::vector<RTLIL::State> new_bits(var_bits.begin() + offset, var_bits.begin() + offset + width);
-		auto newNode = mkconst_bits(new_bits, variables.at(str).is_signed);
+		auto newNode = mkconst_bits(location, new_bits, variables.at(str).is_signed);
 		newNode->cloneInto(*this);
 		return true;
 	}
@@ -5389,7 +5413,7 @@ std::unique_ptr<AstNode> AstNode::eval_const_function(AstNode *fcall, bool must_
 {
 	std::map<std::string, AstNode*> backup_scope = current_scope;
 	std::map<std::string, AstNode::varinfo_t> variables;
-	auto block = std::make_unique<AstNode>(AST_BLOCK);
+	auto block = std::make_unique<AstNode>(location, AST_BLOCK);
 	std::unique_ptr<AstNode> result = nullptr;
 
 	size_t argidx = 0;
@@ -5614,7 +5638,7 @@ std::unique_ptr<AstNode> AstNode::eval_const_function(AstNode *fcall, bool must_
 					if (!cond->replace_variables(variables, fcall, must_succeed))
 						goto finished;
 
-					cond = std::make_unique<AstNode>(AST_EQ, expr->clone(), std::move(cond));
+					cond = std::make_unique<AstNode>(location, AST_EQ, expr->clone(), std::move(cond));
 					cond->set_in_param_flag(true);
 					while (cond->simplify(true, 1, -1, false)) { }
 
@@ -5666,7 +5690,7 @@ std::unique_ptr<AstNode> AstNode::eval_const_function(AstNode *fcall, bool must_
 		log_abort();
 	}
 
-	result = AstNode::mkconst_bits(variables.at(str).val.to_bits(), variables.at(str).is_signed);
+	result = AstNode::mkconst_bits(location, variables.at(str).val.to_bits(), variables.at(str).is_signed);
 
 finished:
 	current_scope = backup_scope;
@@ -5682,12 +5706,12 @@ void AstNode::allocateDefaultEnumValues()
 	int last_enum_int = -1;
 	for (auto& node : children) {
 		log_assert(node->type==AST_ENUM_ITEM);
-		node->set_attribute(ID::enum_base_type, mkconst_str(str));
+		node->set_attribute(ID::enum_base_type, mkconst_str(node->location, str));
 		for (size_t i = 0; i < node->children.size(); i++) {
 			switch (node->children[i]->type) {
 			case AST_NONE:
 				// replace with auto-incremented constant
-				node->children[i] = AstNode::mkconst_int(++last_enum_int, true);
+				node->children[i] = AstNode::mkconst_int(node->location, ++last_enum_int, true);
 				break;
 			case AST_CONSTANT:
 				// explicit constant (or folded expression)
diff --git a/frontends/verilog/.gitignore b/frontends/verilog/.gitignore
index a6d4c8b86..cb6775cbc 100644
--- a/frontends/verilog/.gitignore
+++ b/frontends/verilog/.gitignore
@@ -2,6 +2,4 @@ verilog_lexer.cc
 verilog_parser.output
 verilog_parser.tab.cc
 verilog_parser.tab.hh
-position.hh
-location.hh
 stack.hh
diff --git a/frontends/verilog/Makefile.inc b/frontends/verilog/Makefile.inc
index 338b13e4b..a563c899c 100644
--- a/frontends/verilog/Makefile.inc
+++ b/frontends/verilog/Makefile.inc
@@ -3,11 +3,9 @@ GENFILES += frontends/verilog/verilog_parser.tab.cc
 GENFILES += frontends/verilog/verilog_parser.tab.hh
 GENFILES += frontends/verilog/verilog_parser.output
 GENFILES += frontends/verilog/verilog_lexer.cc
-GENFILES += frontends/verilog/location.hh
-GENFILES += frontends/verilog/position.hh
 GENFILES += frontends/verilog/stack.hh
 
-frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y
+frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y frontends/verilog/verilog_location.h
 	$(Q) mkdir -p $(dir $@)
 	$(P) $(BISON) -Wall -Werror -o $@ -d -r all -b frontends/verilog/verilog_parser $<
 
diff --git a/frontends/verilog/const2ast.cc b/frontends/verilog/const2ast.cc
index cd8f05b9b..5d906cb0f 100644
--- a/frontends/verilog/const2ast.cc
+++ b/frontends/verilog/const2ast.cc
@@ -47,7 +47,7 @@ using namespace VERILOG_FRONTEND;
 std::string ConstParser::fmt_maybe_loc(std::string msg) {
 	std::string s;
 
-	s += stringf("%s:%d:", loc.filename, loc.first_line);
+	s += stringf("%s:%d:", loc.begin.filename->c_str(), loc.begin.line);
 
 	s += msg;
 	return s;
diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index d05f87aff..733ec8ba7 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -33,6 +33,7 @@
 #include "verilog_frontend.h"
 #include "verilog_lexer.h"
 #include "verilog_error.h"
+#include "verilog_location.h"
 #include "preproc.h"
 #include "kernel/yosys.h"
 #include "libs/sha1/sha1.h"
@@ -277,8 +278,8 @@ struct VerilogFrontend : public Frontend {
 		std::list<std::string> include_dirs;
 		std::list<std::string> attributes;
 
-		ParseMode parse_mode;
-		ParseState parse_state;
+		ParseMode parse_mode = {};
+		ParseState parse_state = {};
 		parse_mode.sv = false;
 		parse_mode.formal = false;
 		parse_mode.noassert = false;
@@ -479,11 +480,6 @@ struct VerilogFrontend : public Frontend {
 			break;
 		}
 
-		VerilogLexer lexer(&parse_state, &parse_mode, &filename);
-		frontend_verilog_yy::parser parser(&lexer, &parse_state, &parse_mode);
-		lexer.set_debug(flag_debug_lexer);
-		parser.set_debug_level(flag_debug_parser ? 1 : 0);
-
 		if (parse_mode.formal || !flag_nosynthesis)
 			defines_map.add(parse_mode.formal ? "FORMAL" : "SYNTHESIS", "1");
 
@@ -495,13 +491,9 @@ struct VerilogFrontend : public Frontend {
 				parse_mode.formal ? "formal " : "", parse_mode.sv ? "SystemVerilog" : "Verilog", filename.c_str());
 
 		AST::sv_mode_but_global_and_used_for_literally_one_condition = parse_mode.sv;
-
-		AstSrcLocType top_loc = AstSrcLocType ( "read_verilog", 0, 0, 0, 0);
-		parse_state.current_ast = new AST::AstNode(top_loc, AST::AST_DESIGN);
-
-		parse_state.lexin = f;
 		std::string code_after_preproc;
 
+		parse_state.lexin = f;
 		if (!flag_nopp) {
 			code_after_preproc = frontend_verilog_preproc(*f, filename, defines_map, *design->verilog_defines, include_dirs, parse_state, parse_mode);
 			if (flag_ppdump)
@@ -509,6 +501,15 @@ struct VerilogFrontend : public Frontend {
 			parse_state.lexin = new std::istringstream(code_after_preproc);
 		}
 
+		auto filename_shared = std::make_shared<std::string>(filename);
+		auto top_loc = location();
+		top_loc.begin.filename = filename_shared;
+		parse_state.current_ast = new AST::AstNode(top_loc, AST::AST_DESIGN);
+		VerilogLexer lexer(&parse_state, &parse_mode, filename_shared);
+		frontend_verilog_yy::parser parser(&lexer, &parse_state, &parse_mode);
+		lexer.set_debug(flag_debug_lexer);
+		parser.set_debug_level(flag_debug_parser ? 1 : 0);
+
 		// make package typedefs available to parser
 		add_package_types(parse_state.pkg_user_types, design->verilog_packages);
 
diff --git a/frontends/verilog/verilog_lexer.h b/frontends/verilog/verilog_lexer.h
index a4f3d9bfb..b7885181c 100644
--- a/frontends/verilog/verilog_lexer.h
+++ b/frontends/verilog/verilog_lexer.h
@@ -5,6 +5,7 @@
 #include "frontends/ast/ast.h"
 #include "frontends/verilog/verilog_parser.tab.hh"
 #include <string>
+#include <memory>
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -15,7 +16,7 @@ namespace VERILOG_FRONTEND {
 		ParseMode* mode;
 	public:
 		parser::location_type out_loc; // TODO private?
-		VerilogLexer(ParseState* e, ParseMode* m, std::string* filename) : frontend_verilog_yyFlexLexer(e->lexin), extra(e), mode(m) {
+		VerilogLexer(ParseState* e, ParseMode* m, std::shared_ptr<string> filename) : frontend_verilog_yyFlexLexer(e->lexin), extra(e), mode(m) {
 			out_loc.begin.filename = filename;
 		}
 		~VerilogLexer() override {}
@@ -27,7 +28,8 @@ namespace VERILOG_FRONTEND {
 			return parser::make_FRONTEND_VERILOG_YYEOF(out_loc);
 		}
 	private:
-		std::vector<std::string> fn_stack;
+		std::shared_ptr<std::string> current_filename;
+		std::vector<std::shared_ptr<std::string>> fn_stack;
 		std::vector<int> ln_stack;
 		int LexerInput(char* buf, int max_size) override {
 			return readsome(*extra->lexin, buf, max_size);
diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 0e07e9e7b..84d5ce880 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -50,8 +50,10 @@
 
 #include "frontends/verilog/verilog_lexer.h"
 #include "frontends/ast/ast.h"
+#include "frontends/verilog/verilog_location.h"
 #include "kernel/log.h"
 #include <vector>
+#include <memory>
 
 USING_YOSYS_NAMESPACE
 using namespace AST;
@@ -73,7 +75,7 @@ YOSYS_NAMESPACE_END
 	if (mode->sv) return _tok; \
 	log("Lexer warning: The SystemVerilog keyword `%s' (at %s:%d) is not "\
 			"recognized unless read_verilog is called with -sv!\n", YYText(), \
-			AST::current_filename.c_str(), yylineno); \
+			current_filename->c_str(), yylineno); \
 	string_t val = std::make_unique<std::string>(std::string("\\") + YYText()); \
 	return parser::make_TOK_ID(std::move(val), out_loc);
 
@@ -85,16 +87,17 @@ YOSYS_NAMESPACE_END
 // 	result = readsome(*extra->lexin, buf, max_size)
 
 #define YY_USER_ACTION \
-		out_loc.begin = out_loc.end; \
-		for(int i = 0; YYText()[i] != '\0'; ++i){ \
-				if(YYText()[i] == '\n') { \
-						out_loc.end.line++; \
-						out_loc.end.column = 1; \
-				} \
-				else { \
-						out_loc.end.column++; \
-				} \
-		}
+	out_loc.step(); \
+	for(int i = 0; YYText()[i] != '\0'; ++i){ \
+		if(YYText()[i] == '\n') { \
+			out_loc.lines(); \
+		} \
+		else { \
+			out_loc.columns(); \
+		} \
+	} \
+	out_loc.begin.filename = current_filename; \
+	out_loc.end.filename = current_filename;
 
 #define YY_BREAK \
     break;
@@ -175,11 +178,12 @@ TIME_SCALE_SUFFIX [munpf]?s
 <INITIAL,SYNOPSYS_TRANSLATE_OFF>"`file_push "[^\n]* {
 	fn_stack.push_back(current_filename);
 	ln_stack.push_back(yylineno);
-	current_filename = YYText()+11;
-	if (!current_filename.empty() && current_filename.front() == '"')
-		current_filename = current_filename.substr(1);
-	if (!current_filename.empty() && current_filename.back() == '"')
-		current_filename = current_filename.substr(0, current_filename.size()-1);
+	std::string filename = YYText()+11;
+	if (!filename.empty() && filename.front() == '"')
+		filename = filename.substr(1);
+	if (!filename.empty() && filename.back() == '"')
+		filename = filename.substr(0, filename.size()-1);
+	current_filename = std::make_shared<std::string>(filename);
 	yylineno = (0);
 	out_loc.begin.line = out_loc.end.line = 0;
 }
@@ -201,7 +205,7 @@ TIME_SCALE_SUFFIX [munpf]?s
 	while (*p == ' ' || *p == '\t') p++;
 	const char *q = *p ? p + 1 : p;
 	while (*q && *q != '"') q++;
-	current_filename = std::string(p).substr(1, q-p-1);
+	current_filename = std::make_shared<std::string>(std::string(p).substr(1, q-p-1));
 }
 
 "`file_notfound "[^\n]* {
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 6f3b3baea..743061ae5 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -38,14 +38,17 @@
 %define api.value.type variant
 %define api.prefix {frontend_verilog_yy}
 %define api.token.constructor
+%define api.location.type {location}
 
 %param { YOSYS_NAMESPACE_PREFIX VERILOG_FRONTEND::VerilogLexer* lexer }
 %parse-param { YOSYS_NAMESPACE_PREFIX VERILOG_FRONTEND::ParseState* extra }
 %parse-param { YOSYS_NAMESPACE_PREFIX VERILOG_FRONTEND::ParseMode* mode }
 
+
 %code requires {
 	#include "kernel/yosys_common.h"
 	#include "frontends/verilog/verilog_error.h"
+	#include "frontends/verilog/verilog_location.h"
 	// start requires
 	YOSYS_NAMESPACE_BEGIN
 	namespace VERILOG_FRONTEND {
@@ -101,10 +104,10 @@
 			const AstNode *addIncOrDecStmt(dict<IdString, std::unique_ptr<AstNode>> *stmt_attr,
 									std::unique_ptr<AstNode> lhs,
 									dict<IdString, std::unique_ptr<AstNode>> *op_attr, AST::AstNodeType op,
-									parser::location_type begin, parser::location_type end);
-			std::unique_ptr<AstNode> addIncOrDecExpr(std::unique_ptr<AstNode> lhs, dict<IdString, std::unique_ptr<AstNode>> *attr, AST::AstNodeType op, parser::location_type begin, parser::location_type end, bool undo, bool sv_mode);
+									parser::location_type loc);
+			std::unique_ptr<AstNode> addIncOrDecExpr(std::unique_ptr<AstNode> lhs, dict<IdString, std::unique_ptr<AstNode>> *attr, AST::AstNodeType op, parser::location_type loc, bool undo, bool sv_mode);
 			// add a binary operator assignment statement, e.g., a += b
-			std::unique_ptr<AstNode> addAsgnBinopStmt(dict<IdString, std::unique_ptr<AstNode>> *attr, std::unique_ptr<AstNode> eq_lhs, AST::AstNodeType op, std::unique_ptr<AstNode> rhs, parser::location_type begin, parser::location_type end);
+			std::unique_ptr<AstNode> addAsgnBinopStmt(dict<IdString, std::unique_ptr<AstNode>> *attr, std::unique_ptr<AstNode> eq_lhs, AST::AstNodeType op, std::unique_ptr<AstNode> rhs);
 		};
 		struct ParseMode {
 			bool noassert = false;
@@ -140,13 +143,7 @@
 		return lexer->nextToken();
 	}
 
-	#define SET_LOC(WHICH, BEGIN, END) \
-		do { WHICH.first_line = (BEGIN).begin.line; \
-		WHICH.first_column = (BEGIN).begin.column; \
-		WHICH.last_line = (END).end.line; \
-		WHICH.last_column = (END).end.column; } while(0)
-
-	#define SET_AST_NODE_LOC(WHICH, BEGIN, END) SET_LOC((WHICH)->location, BEGIN, END)
+	#define SET_AST_NODE_LOC(WHICH, BEGIN, END) (WHICH)->location = location_range(BEGIN, END)
 
 	#define SET_RULE_LOC(LHS, BEGIN, END) \
 		do { (LHS).begin = BEGIN.begin; \
@@ -154,10 +151,13 @@
 
 	YOSYS_NAMESPACE_BEGIN
 	namespace VERILOG_FRONTEND {
+
+		static location location_range(location begin, location end) {
+			return location(begin.begin, end.end);
+		}
+
 		static ConstParser make_ConstParser_here(parser::location_type flex_loc) {
-			AstSrcLocType loc;
-			SET_LOC(loc, flex_loc, flex_loc);
-			ConstParser p{loc};
+			ConstParser p{flex_loc};
 			return p;
 		}
 		static void append_attr(AstNode *ast, dict<IdString, std::unique_ptr<AstNode>> *al)
@@ -180,18 +180,18 @@
 			delete al;
 		}
 
-		static std::unique_ptr<AstNode> makeRange(int msb = 31, int lsb = 0, bool isSigned = true)
+		static std::unique_ptr<AstNode> makeRange(parser::location_type loc, int msb = 31, int lsb = 0, bool isSigned = true)
 		{
-			auto range = std::make_unique<AstNode>(AST_RANGE);
-			range->children.push_back(AstNode::mkconst_int(msb, true));
-			range->children.push_back(AstNode::mkconst_int(lsb, true));
+			auto range = std::make_unique<AstNode>(loc, AST_RANGE);
+			range->children.push_back(AstNode::mkconst_int(loc, msb, true));
+			range->children.push_back(AstNode::mkconst_int(loc, lsb, true));
 			range->is_signed = isSigned;
 			return range;
 		}
 
 		static void addRange(AstNode *parent, int msb = 31, int lsb = 0, bool isSigned = true)
 		{
-			auto range = makeRange(msb, lsb, isSigned);
+			auto range = makeRange(parent->location, msb, lsb, isSigned);
 			parent->children.push_back(std::move(range));
 		}
 
@@ -203,7 +203,7 @@
 					err_at_ast(type_node->location, "integer/genvar types cannot have packed dimensions.");
 				}
 				else {
-					range_node = makeRange(type_node->range_left, type_node->range_right, false);
+					range_node = makeRange(type_node->location, type_node->range_left, type_node->range_right, false);
 				}
 			}
 
@@ -227,8 +227,8 @@
 		{
 			if (rangeNode->type == AST_RANGE && rangeNode->children.size() == 1) {
 				// SV array size [n], rewrite as [0:n-1]
-				rangeNode->children.push_back(std::make_unique<AstNode>(AST_SUB, std::move(rangeNode->children[0]), AstNode::mkconst_int(1, true)));
-				rangeNode->children[0] = AstNode::mkconst_int(0, false);
+				rangeNode->children.push_back(std::make_unique<AstNode>(rangeNode->location, AST_SUB, std::move(rangeNode->children[0]), AstNode::mkconst_int(rangeNode->location, 1, true)));
+				rangeNode->children[0] = AstNode::mkconst_int(rangeNode->location, 0, false);
 			}
 		}
 
@@ -268,14 +268,14 @@
 		{
 			log_assert(node);
 			node->is_custom_type = true;
-			node->children.push_back(std::make_unique<AstNode>(AST_WIRETYPE));
+			node->children.push_back(std::make_unique<AstNode>(node->location, AST_WIRETYPE));
 			node->children.back()->str = *name;
 		}
 
 		void ParseState::addTypedefNode(std::string *name, std::unique_ptr<AstNode> node)
 		{
 			log_assert((bool)node);
-			AstNode* tnode = saveChild(std::make_unique<AstNode>(AST_TYPEDEF, std::move(node)));
+			AstNode* tnode = saveChild(std::make_unique<AstNode>(node->location, AST_TYPEDEF, std::move(node)));
 			log_assert((bool)name);
 			tnode->str = *name;
 			auto &user_types = user_type_stack.back();
@@ -342,9 +342,9 @@
 
 			// create a new localparam with old name so that the items in the loop
 			// can simply use the old name and shadow it as necessary
-			auto indirect = std::make_unique<AstNode>(AST_LOCALPARAM);
+			auto indirect = std::make_unique<AstNode>(loop->location, AST_LOCALPARAM);
 			indirect->str = old_str;
-			auto ident = std::make_unique<AstNode>(AST_IDENTIFIER);
+			auto ident = std::make_unique<AstNode>(loop->location, AST_IDENTIFIER);
 			ident->str = new_str;
 			indirect->children.push_back(std::move(ident));
 
@@ -376,54 +376,48 @@
 		const AstNode *ParseState::addIncOrDecStmt(dict<IdString, std::unique_ptr<AstNode>> *stmt_attr,
 							std::unique_ptr<AstNode> lhs,
 							dict<IdString, std::unique_ptr<AstNode>> *op_attr, AST::AstNodeType op,
-							frontend_verilog_yy::location begin, frontend_verilog_yy::location end)
+							location loc)
 		{
-			auto one = AstNode::mkconst_int(1, true);
-			auto rhs = std::make_unique<AstNode>(op, lhs->clone(), std::move(one));
+			auto one = AstNode::mkconst_int(loc, 1, true);
+			auto rhs = std::make_unique<AstNode>(loc, op, lhs->clone(), std::move(one));
 			if (op_attr != nullptr)
 				append_attr(rhs.get(), op_attr);
-			auto stmt_owned = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(lhs), std::move(rhs));
+			auto stmt_owned = std::make_unique<AstNode>(loc, AST_ASSIGN_EQ, std::move(lhs), std::move(rhs));
 			auto* stmt = stmt_owned.get();
 			ast_stack.back()->children.push_back(std::move(stmt_owned));
-			SET_AST_NODE_LOC(stmt, begin, end);
 			if (stmt_attr != nullptr)
 				append_attr(stmt, stmt_attr);
 			return stmt;
 		}
 
 		// create a pre/post-increment/decrement expression, and add the corresponding statement
-		std::unique_ptr<AstNode> ParseState::addIncOrDecExpr(std::unique_ptr<AstNode> lhs, dict<IdString, std::unique_ptr<AstNode>> *attr, AST::AstNodeType op, frontend_verilog_yy::location begin, frontend_verilog_yy::location end, bool undo, bool sv_mode)
+		std::unique_ptr<AstNode> ParseState::addIncOrDecExpr(std::unique_ptr<AstNode> lhs, dict<IdString, std::unique_ptr<AstNode>> *attr, AST::AstNodeType op, location loc, bool undo, bool sv_mode)
 		{
-			ensureAsgnExprAllowed(begin, sv_mode);
-			const AstNode *stmt = addIncOrDecStmt(nullptr, std::move(lhs), attr, op, begin, end);
+			ensureAsgnExprAllowed(loc, sv_mode);
+			const AstNode *stmt = addIncOrDecStmt(nullptr, std::move(lhs), attr, op, loc);
 			log_assert(stmt->type == AST_ASSIGN_EQ);
 			auto expr = stmt->children[0]->clone();
 			if (undo) {
-				auto one = AstNode::mkconst_int(1, false, 1);
-				auto minus_one = std::make_unique<AstNode>(AST_NEG, std::move(one));
-				expr = std::make_unique<AstNode>(op, std::move(expr), std::move(minus_one));
+				auto one = AstNode::mkconst_int(loc, 1, false, 1);
+				auto minus_one = std::make_unique<AstNode>(loc, AST_NEG, std::move(one));
+				expr = std::make_unique<AstNode>(loc, op, std::move(expr), std::move(minus_one));
 			}
-			SET_AST_NODE_LOC(expr.get(), begin, end);
 			return expr;
 		}
 
 		// add a binary operator assignment statement, e.g., a += b
-		std::unique_ptr<AstNode> ParseState::addAsgnBinopStmt(dict<IdString, std::unique_ptr<AstNode>> *attr, std::unique_ptr<AstNode> eq_lhs, AST::AstNodeType op, std::unique_ptr<AstNode> rhs, frontend_verilog_yy::location begin, frontend_verilog_yy::location end)
+		std::unique_ptr<AstNode> ParseState::addAsgnBinopStmt(dict<IdString, std::unique_ptr<AstNode>> *attr, std::unique_ptr<AstNode> eq_lhs, AST::AstNodeType op, std::unique_ptr<AstNode> rhs)
 		{
-			SET_AST_NODE_LOC(rhs.get(), end, end);
+			location loc = location_range(eq_lhs->location, rhs->location);
 			if (op == AST_SHIFT_LEFT || op == AST_SHIFT_RIGHT ||
 				op == AST_SHIFT_SLEFT || op == AST_SHIFT_SRIGHT) {
-				rhs = std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move(rhs));
-				SET_AST_NODE_LOC(rhs.get(), end, end);
+				rhs = std::make_unique<AstNode>(rhs->location, AST_TO_UNSIGNED, std::move(rhs));
 			}
 			auto binop_lhs = eq_lhs->clone();
-			auto eq_rhs_owned = std::make_unique<AstNode>(op, std::move(binop_lhs), std::move(rhs));
-			auto* eq_rhs = eq_rhs_owned.get();
+			auto eq_rhs_owned = std::make_unique<AstNode>(loc, op, std::move(binop_lhs), std::move(rhs));
 			auto ret_lhs = eq_lhs->clone();
-			auto stmt_owned = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(eq_lhs), std::move(eq_rhs_owned));
+			auto stmt_owned = std::make_unique<AstNode>(loc, AST_ASSIGN_EQ, std::move(eq_lhs), std::move(eq_rhs_owned));
 			auto* stmt = stmt_owned.get();
-			SET_AST_NODE_LOC(eq_rhs, begin, end);
-			SET_AST_NODE_LOC(stmt, begin, end);
 			ast_stack.back()->children.push_back(std::move(stmt_owned));
 			if (attr != nullptr)
 				append_attr(stmt, attr);
@@ -677,7 +671,7 @@ attr_list:
 
 attr_assign:
 	hierarchical_id {
-		(*extra->attr_list)[*$1] = AstNode::mkconst_int(1, false);
+		(*extra->attr_list)[*$1] = AstNode::mkconst_int(@1, 1, false);
 	} |
 	hierarchical_id TOK_EQ expr {
 		(*extra->attr_list)[*$1] = std::move($3);
@@ -713,7 +707,7 @@ module:
 		extra->enterTypeScope();
 	} TOK_ID {
 		extra->do_not_require_port_stubs = false;
-		AstNode* mod = extra->pushChild(std::make_unique<AstNode>(AST_MODULE));
+		AstNode* mod = extra->pushChild(std::make_unique<AstNode>(@$, AST_MODULE));
 		extra->current_ast_mod = mod;
 		extra->port_stubs.clear();
 		extra->port_counter = 0;
@@ -740,13 +734,13 @@ module_para_list:
 single_module_para:
 	%empty |
 	attr TOK_PARAMETER {
-		extra->astbuf1 = std::make_unique<AstNode>(AST_PARAMETER);
-		extra->astbuf1->children.push_back(AstNode::mkconst_int(0, true));
+		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_PARAMETER);
+		extra->astbuf1->children.push_back(AstNode::mkconst_int(@2, 0, true));
 		append_attr(extra->astbuf1.get(), $1);
 	} param_type single_param_decl |
 	attr TOK_LOCALPARAM {
-		extra->astbuf1 = std::make_unique<AstNode>(AST_LOCALPARAM);
-		extra->astbuf1->children.push_back(AstNode::mkconst_int(0, true));
+		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_LOCALPARAM);
+		extra->astbuf1->children.push_back(AstNode::mkconst_int(@2, 0, true));
 		append_attr(extra->astbuf1.get(), $1);
 	} param_type single_param_decl |
 	single_param_decl;
@@ -767,12 +761,12 @@ module_arg_opt_assignment:
 				auto& n = extra->ast_stack.back()->children.back();
 				n->attributes[ID::defaultvalue] = std::move($2);
 			} else {
-				auto wire = std::make_unique<AstNode>(AST_IDENTIFIER);
+				auto wire = std::make_unique<AstNode>(@$, AST_IDENTIFIER);
 				wire->str = extra->ast_stack.back()->children.back()->str;
 				if (extra->ast_stack.back()->children.back()->is_reg || extra->ast_stack.back()->children.back()->is_logic)
-					extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_INITIAL, std::make_unique<AstNode>(AST_BLOCK, std::make_unique<AstNode>(AST_ASSIGN_LE, std::move(wire), std::move($2)))));
+					extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_INITIAL, std::make_unique<AstNode>(@$, AST_BLOCK, std::make_unique<AstNode>(@$, AST_ASSIGN_LE, std::move(wire), std::move($2)))));
 				else
-					extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_ASSIGN, std::move(wire), std::move($2)));
+					extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_ASSIGN, std::move(wire), std::move($2)));
 			}
 		} else
 			err_at_loc(@2, "SystemVerilog interface in module port list cannot have a default value.");
@@ -794,8 +788,8 @@ module_arg:
 		}
 	} module_arg_opt_assignment |
 	TOK_ID {
-		extra->astbuf1 = std::make_unique<AstNode>(AST_INTERFACEPORT);
-		extra->astbuf1->children.push_back(std::make_unique<AstNode>(AST_INTERFACEPORTTYPE));
+		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_INTERFACEPORT);
+		extra->astbuf1->children.push_back(std::make_unique<AstNode>(@$, AST_INTERFACEPORTTYPE));
 		extra->astbuf1->children[0]->str = *$1;
 	} TOK_ID {  /* SV interfaces */
 		if (!mode->sv)
@@ -828,7 +822,7 @@ package:
 	attr TOK_PACKAGE {
 		extra->enterTypeScope();
 	} TOK_ID {
-		AstNode* mod = extra->pushChild(std::make_unique<AstNode>(AST_PACKAGE));
+		AstNode* mod = extra->pushChild(std::make_unique<AstNode>(@$, AST_PACKAGE));
 		extra->current_ast_mod = mod;
 		mod->str = *$4;
 		append_attr(mod, $1);
@@ -859,7 +853,7 @@ interface:
 		extra->enterTypeScope();
 	} TOK_ID {
 		extra->do_not_require_port_stubs = false;
-		AstNode* intf = extra->pushChild(std::make_unique<AstNode>(AST_INTERFACE));
+		AstNode* intf = extra->pushChild(std::make_unique<AstNode>(@$, AST_INTERFACE));
 		extra->current_ast_mod = intf;
 		extra->port_stubs.clear();
 		extra->port_counter = 0;
@@ -883,7 +877,7 @@ interface_body_stmt:
 
 bind_directive:
 	TOK_BIND {
-		(void)extra->pushChild(std::make_unique<AstNode>(AST_BIND));
+		(void)extra->pushChild(std::make_unique<AstNode>(@$, AST_BIND));
 	}
 	bind_target {
 		// bind_target should have added at least one child
@@ -892,8 +886,8 @@ bind_directive:
 	TOK_ID {
 		// The single_cell parser in cell_list_no_array uses extra->astbuf1 as
 		// a sort of template for constructing cells.
-		extra->astbuf1 = std::make_unique<AstNode>(AST_CELL);
-		extra->astbuf1->children.push_back(std::make_unique<AstNode>(AST_CELLTYPE));
+		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_CELL);
+		extra->astbuf1->children.push_back(std::make_unique<AstNode>(@$, AST_CELLTYPE));
 		extra->astbuf1->children[0]->str = *$5;
 	}
 	cell_parameter_list_opt cell_list_no_array TOK_SEMICOL {
@@ -932,7 +926,7 @@ bind_target_instance_list:
 // the bind node where we should add it.
 bind_target_instance:
 	hierarchical_id {
-		auto node = std::make_unique<AstNode>(AST_IDENTIFIER);
+		auto node = std::make_unique<AstNode>(@$, AST_IDENTIFIER);
 		node->str = *$1;
 		extra->ast_stack.back()->children.push_back(std::move(node));
 	};
@@ -956,12 +950,12 @@ delay:
 	non_opt_delay | %empty;
 
 io_wire_type:
-	{ extra->astbuf3 = std::make_unique<AstNode>(AST_WIRE); extra->current_wire_rand = false; extra->current_wire_const = false; }
+	{ extra->astbuf3 = std::make_unique<AstNode>(@$, AST_WIRE); extra->current_wire_rand = false; extra->current_wire_const = false; }
 	wire_type_token_io wire_type_const_rand opt_wire_type_token wire_type_signedness
 	{ $$ = std::move(extra->astbuf3); SET_RULE_LOC(@$, @2, @$); };
 
 non_io_wire_type:
-	{ extra->astbuf3 = std::make_unique<AstNode>(AST_WIRE); extra->current_wire_rand = false; extra->current_wire_const = false; }
+	{ extra->astbuf3 = std::make_unique<AstNode>(@$, AST_WIRE); extra->current_wire_rand = false; extra->current_wire_const = false; }
 	wire_type_const_rand wire_type_token wire_type_signedness
 	{ $$ = std::move(extra->astbuf3); SET_RULE_LOC(@$, @2, @$); };
 
@@ -1067,30 +1061,30 @@ integer_vector_type:
 
 non_opt_range:
 	TOK_LBRA expr TOK_COL expr TOK_RBRA {
-		$$ = std::make_unique<AstNode>(AST_RANGE);
+		$$ = std::make_unique<AstNode>(@$, AST_RANGE);
 		$$->children.push_back(std::move($2));
 		$$->children.push_back(std::move($4));
 	} |
 	TOK_LBRA expr TOK_POS_INDEXED expr TOK_RBRA {
-		$$ = std::make_unique<AstNode>(AST_RANGE);
-		auto expr = std::make_unique<AstNode>(AST_SELFSZ, std::move($2));
-		$$->children.push_back(std::make_unique<AstNode>(AST_SUB, std::make_unique<AstNode>(AST_ADD, expr->clone(), std::move($4)), AstNode::mkconst_int(1, true)));
-		$$->children.push_back(std::make_unique<AstNode>(AST_ADD, std::move(expr), AstNode::mkconst_int(0, true)));
+		$$ = std::make_unique<AstNode>(@$, AST_RANGE);
+		auto expr = std::make_unique<AstNode>(@$, AST_SELFSZ, std::move($2));
+		$$->children.push_back(std::make_unique<AstNode>(@$, AST_SUB, std::make_unique<AstNode>(@$, AST_ADD, expr->clone(), std::move($4)), AstNode::mkconst_int(@$, 1, true)));
+		$$->children.push_back(std::make_unique<AstNode>(@$, AST_ADD, std::move(expr), AstNode::mkconst_int(@$, 0, true)));
 	} |
 	TOK_LBRA expr TOK_NEG_INDEXED expr TOK_RBRA {
-		$$ = std::make_unique<AstNode>(AST_RANGE);
-		auto expr = std::make_unique<AstNode>(AST_SELFSZ, std::move($2));
-		$$->children.push_back(std::make_unique<AstNode>(AST_ADD, expr->clone(), AstNode::mkconst_int(0, true)));
-		$$->children.push_back(std::make_unique<AstNode>(AST_SUB, std::make_unique<AstNode>(AST_ADD, std::move(expr), AstNode::mkconst_int(1, true)), std::move($4)));
+		$$ = std::make_unique<AstNode>(@$, AST_RANGE);
+		auto expr = std::make_unique<AstNode>(@$, AST_SELFSZ, std::move($2));
+		$$->children.push_back(std::make_unique<AstNode>(@$, AST_ADD, expr->clone(), AstNode::mkconst_int(@$, 0, true)));
+		$$->children.push_back(std::make_unique<AstNode>(@$, AST_SUB, std::make_unique<AstNode>(@$, AST_ADD, std::move(expr), AstNode::mkconst_int(@$, 1, true)), std::move($4)));
 	} |
 	TOK_LBRA expr TOK_RBRA {
-		$$ = std::make_unique<AstNode>(AST_RANGE);
+		$$ = std::make_unique<AstNode>(@$, AST_RANGE);
 		$$->children.push_back(std::move($2));
 	};
 
 non_opt_multirange:
 	non_opt_range non_opt_range {
-		$$ = std::make_unique<AstNode>(AST_MULTIRANGE, std::move($1), std::move($2));
+		$$ = std::make_unique<AstNode>(@$, AST_MULTIRANGE, std::move($1), std::move($2));
 	} |
 	non_opt_multirange non_opt_range {
 		$$ = std::move($1);
@@ -1124,7 +1118,7 @@ module_body_stmt:
 
 checker_decl:
 	TOK_CHECKER TOK_ID TOK_SEMICOL {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_GENBLOCK));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_GENBLOCK));
 		node->str = *$2;
 	} module_body TOK_ENDCHECKER {
 		extra->ast_stack.pop_back();
@@ -1132,28 +1126,28 @@ checker_decl:
 
 task_func_decl:
 	attr TOK_DPI_FUNCTION TOK_ID TOK_ID {
-		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(AST_DPI_FUNCTION, AstNode::mkconst_str(*$3), AstNode::mkconst_str(*$4)));
+		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(@$, AST_DPI_FUNCTION, AstNode::mkconst_str(@3, *$3), AstNode::mkconst_str(@4, *$4)));
 		extra->current_function_or_task->str = *$4;
 		append_attr(extra->current_function_or_task, $1);
 	} opt_dpi_function_args TOK_SEMICOL {
 		extra->current_function_or_task = nullptr;
 	} |
 	attr TOK_DPI_FUNCTION TOK_ID TOK_EQ TOK_ID TOK_ID {
-		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(AST_DPI_FUNCTION, AstNode::mkconst_str(*$5), AstNode::mkconst_str(*$3)));
+		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(@$, AST_DPI_FUNCTION, AstNode::mkconst_str(@5, *$5), AstNode::mkconst_str(@3, *$3)));
 		extra->current_function_or_task->str = *$6;
 		append_attr(extra->current_function_or_task, $1);
 	} opt_dpi_function_args TOK_SEMICOL {
 		extra->current_function_or_task = nullptr;
 	} |
 	attr TOK_DPI_FUNCTION TOK_ID TOK_COL TOK_ID TOK_EQ TOK_ID TOK_ID {
-		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(AST_DPI_FUNCTION, AstNode::mkconst_str(*$7), AstNode::mkconst_str(*$3 + ":" + RTLIL::unescape_id(*$5))));
+		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(@$, AST_DPI_FUNCTION, AstNode::mkconst_str(@7, *$7), AstNode::mkconst_str(location_range(@3, @5), *$3 + ":" + RTLIL::unescape_id(*$5))));
 		extra->current_function_or_task->str = *$8;
 		append_attr(extra->current_function_or_task, $1);
 	} opt_dpi_function_args TOK_SEMICOL {
 		extra->current_function_or_task = nullptr;
 	} |
 	attr TOK_TASK opt_automatic TOK_ID {
-		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(AST_TASK));
+		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(@$, AST_TASK));
 		extra->current_function_or_task->str = *$4;
 		append_attr(extra->current_function_or_task, $1);
 		extra->current_function_or_task_port_id = 1;
@@ -1167,7 +1161,7 @@ task_func_decl:
 		// inlined, but ignores signals read only in tasks. This only matters
 		// for event based simulation, and for synthesis we can treat a void
 		// function like a task.
-		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(AST_TASK));
+		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(@$, AST_TASK));
 		extra->current_function_or_task->str = *$5;
 		append_attr(extra->current_function_or_task, $1);
 		extra->current_function_or_task_port_id = 1;
@@ -1176,10 +1170,10 @@ task_func_decl:
 		extra->ast_stack.pop_back();
 	} |
 	attr TOK_FUNCTION opt_automatic func_return_type TOK_ID {
-		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(AST_FUNCTION));
+		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(@$, AST_FUNCTION));
 		extra->current_function_or_task->str = *$5;
 		append_attr(extra->current_function_or_task, $1);
-		auto outreg = std::make_unique<AstNode>(AST_WIRE);
+		auto outreg = std::make_unique<AstNode>(@$, AST_WIRE);
 		outreg->str = *$5;
 		outreg->is_signed = false;
 		outreg->is_reg = true;
@@ -1198,18 +1192,18 @@ task_func_decl:
 
 func_return_type:
 	hierarchical_type_id {
-		$$ = std::make_unique<AstNode>(AST_WIRETYPE);
+		$$ = std::make_unique<AstNode>(@$, AST_WIRETYPE);
 		$$->str = *$1;
 	} |
 	opt_type_vec opt_signedness_default_unsigned {
-		$$ = makeRange(0, 0, $2);
+		$$ = makeRange(@$, 0, 0, $2);
 	} |
 	opt_type_vec opt_signedness_default_unsigned non_opt_range {
 		$$ = std::move($3);
 		$$->is_signed = $2;
 	} |
 	integer_atom_type opt_signedness_default_signed {
-		$$ = makeRange($1 - 1, 0, $2);
+		$$ = makeRange(@$, $1 - 1, 0, $2);
 	};
 
 opt_type_vec:
@@ -1231,10 +1225,10 @@ opt_signedness_default_unsigned:
 
 dpi_function_arg:
 	TOK_ID TOK_ID {
-		extra->current_function_or_task->children.push_back(AstNode::mkconst_str(*$1));
+		extra->current_function_or_task->children.push_back(AstNode::mkconst_str(@1, *$1));
 	} |
 	TOK_ID {
-		extra->current_function_or_task->children.push_back(AstNode::mkconst_str(*$1));
+		extra->current_function_or_task->children.push_back(AstNode::mkconst_str(@1, *$1));
 	};
 
 opt_dpi_function_args:
@@ -1293,7 +1287,7 @@ task_func_port:
 			if (!mode->sv)
 				err_at_loc(@$, "task/function argument direction missing");
 			extra->albuf = new dict<IdString, std::unique_ptr<AstNode>>;
-			extra->astbuf1 = std::make_unique<AstNode>(AST_WIRE);
+			extra->astbuf1 = std::make_unique<AstNode>(@$, AST_WIRE);
 			extra->current_wire_rand = false;
 			extra->current_wire_const = false;
 			extra->astbuf1->is_input = true;
@@ -1326,11 +1320,11 @@ specify_item:
 		if (specify_edge != 0 && target->dat == nullptr)
 			err_at_loc(@3, "Found specify edge but no data spec.\n");
 
-		auto cell_owned = std::make_unique<AstNode>(AST_CELL);
+		auto cell_owned = std::make_unique<AstNode>(@$, AST_CELL);
 		auto cell = cell_owned.get();
 		extra->ast_stack.back()->children.push_back(std::move(cell_owned));
 		cell->str = stringf("$specify$%d", autoidx++);
-		cell->children.push_back(std::make_unique<AstNode>(AST_CELLTYPE));
+		cell->children.push_back(std::make_unique<AstNode>(@$, AST_CELLTYPE));
 		cell->children.back()->str = target->dat ? "$specify3" : "$specify2";
 		SET_AST_NODE_LOC(cell, en_expr.get() ? @1 : @2, @10);
 
@@ -1342,57 +1336,57 @@ specify_item:
 			oper_type = oper->at(1);
 		}
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(oper_type == '*', false, 1)));
+		cell->children.push_back(std::make_unique<AstNode>(@5, AST_PARASET, AstNode::mkconst_int(@5, oper_type == '*', false, 1)));
 		cell->children.back()->str = "\\FULL";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(oper_polarity != 0, false, 1)));
+		cell->children.push_back(std::make_unique<AstNode>(@5, AST_PARASET, AstNode::mkconst_int(@5, oper_polarity != 0, false, 1)));
 		cell->children.back()->str = "\\SRC_DST_PEN";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(oper_polarity == '+', false, 1)));
+		cell->children.push_back(std::make_unique<AstNode>(@5, AST_PARASET, AstNode::mkconst_int(@5, oper_polarity == '+', false, 1)));
 		cell->children.back()->str = "\\SRC_DST_POL";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->rise.t_min)));
+		cell->children.push_back(std::make_unique<AstNode>(@9, AST_PARASET, std::move(timing->rise.t_min)));
 		cell->children.back()->str = "\\T_RISE_MIN";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->rise.t_avg)));
+		cell->children.push_back(std::make_unique<AstNode>(@9, AST_PARASET, std::move(timing->rise.t_avg)));
 		cell->children.back()->str = "\\T_RISE_TYP";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->rise.t_max)));
+		cell->children.push_back(std::make_unique<AstNode>(@9, AST_PARASET, std::move(timing->rise.t_max)));
 		cell->children.back()->str = "\\T_RISE_MAX";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->fall.t_min)));
+		cell->children.push_back(std::make_unique<AstNode>(@9, AST_PARASET, std::move(timing->fall.t_min)));
 		cell->children.back()->str = "\\T_FALL_MIN";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->fall.t_avg)));
+		cell->children.push_back(std::make_unique<AstNode>(@9, AST_PARASET, std::move(timing->fall.t_avg)));
 		cell->children.back()->str = "\\T_FALL_TYP";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(timing->fall.t_max)));
+		cell->children.push_back(std::make_unique<AstNode>(@9, AST_PARASET, std::move(timing->fall.t_max)));
 		cell->children.back()->str = "\\T_FALL_MAX";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, en_expr ? std::move(en_expr) : AstNode::mkconst_int(1, false, 1)));
+		cell->children.push_back(std::make_unique<AstNode>(@1, AST_ARGUMENT, en_expr ? std::move(en_expr) : AstNode::mkconst_int(@1, 1, false, 1)));
 		cell->children.back()->str = "\\EN";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(src_expr)));
+		cell->children.push_back(std::make_unique<AstNode>(@4, AST_ARGUMENT, std::move(src_expr)));
 		cell->children.back()->str = "\\SRC";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(target->dst)));
+		cell->children.push_back(std::make_unique<AstNode>(@6, AST_ARGUMENT, std::move(target->dst)));
 		cell->children.back()->str = "\\DST";
 
 		if (target->dat)
 		{
-			cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(specify_edge != 0, false, 1)));
+			cell->children.push_back(std::make_unique<AstNode>(@3, AST_PARASET, AstNode::mkconst_int(@3, specify_edge != 0, false, 1)));
 			cell->children.back()->str = "\\EDGE_EN";
 
-			cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(specify_edge == 'p', false, 1)));
+			cell->children.push_back(std::make_unique<AstNode>(@3, AST_PARASET, AstNode::mkconst_int(@3, specify_edge == 'p', false, 1)));
 			cell->children.back()->str = "\\EDGE_POL";
 
-			cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(target->polarity_op != 0, false, 1)));
+			cell->children.push_back(std::make_unique<AstNode>(@6, AST_PARASET, AstNode::mkconst_int(@6, target->polarity_op != 0, false, 1)));
 			cell->children.back()->str = "\\DAT_DST_PEN";
 
-			cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_int(target->polarity_op == '+', false, 1)));
+			cell->children.push_back(std::make_unique<AstNode>(@6, AST_PARASET, AstNode::mkconst_int(@6, target->polarity_op == '+', false, 1)));
 			cell->children.back()->str = "\\DAT_DST_POL";
 
-			cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(target->dat)));
+			cell->children.push_back(std::make_unique<AstNode>(@6, AST_ARGUMENT, std::move(target->dat)));
 			cell->children.back()->str = "\\DAT";
 		}
 	} |
@@ -1401,68 +1395,68 @@ specify_item:
 				*$1 != "$recrem" && *$1 != "$skew" && *$1 != "$timeskew" && *$1 != "$fullskew" && *$1 != "$nochange")
 			err_at_loc(@1, "Unsupported specify rule type: %s\n", $1->c_str());
 
-		auto src_pen = AstNode::mkconst_int($3 != 0, false, 1);
-		auto src_pol = AstNode::mkconst_int($3 == 'p', false, 1);
-		auto src_expr = std::move($4), src_en = $5 ? std::move($5) : AstNode::mkconst_int(1, false, 1);
+		auto src_pen = AstNode::mkconst_int(@3, $3 != 0, false, 1);
+		auto src_pol = AstNode::mkconst_int(@3, $3 == 'p', false, 1);
+		auto src_expr = std::move($4), src_en = $5 ? std::move($5) : AstNode::mkconst_int(@5, 1, false, 1);
 
-		auto dst_pen = AstNode::mkconst_int($7 != 0, false, 1);
-		auto dst_pol = AstNode::mkconst_int($7 == 'p', false, 1);
-		auto dst_expr = std::move($8), dst_en = $9 ? std::move($9) : AstNode::mkconst_int(1, false, 1);
+		auto dst_pen = AstNode::mkconst_int(@7, $7 != 0, false, 1);
+		auto dst_pol = AstNode::mkconst_int(@7, $7 == 'p', false, 1);
+		auto dst_expr = std::move($8), dst_en = $9 ? std::move($9) : AstNode::mkconst_int(@5, 1, false, 1);
 
 		specify_triple_ptr_t limit = std::move($11);
 		specify_triple_ptr_t limit2 = std::move($12);
 
-		auto cell_owned = std::make_unique<AstNode>(AST_CELL);
+		auto cell_owned = std::make_unique<AstNode>(@$, AST_CELL);
 		auto cell = cell_owned.get();
 		extra->ast_stack.back()->children.push_back(std::move(cell_owned));
 		cell->str = stringf("$specify$%d", autoidx++);
-		cell->children.push_back(std::make_unique<AstNode>(AST_CELLTYPE));
+		cell->children.push_back(std::make_unique<AstNode>(@$, AST_CELLTYPE));
 		cell->children.back()->str = "$specrule";
 		SET_AST_NODE_LOC(cell, @1, @14);
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, AstNode::mkconst_str(*$1)));
+		cell->children.push_back(std::make_unique<AstNode>(@1, AST_PARASET, AstNode::mkconst_str(@1, *$1)));
 		cell->children.back()->str = "\\TYPE";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(limit->t_min)));
+		cell->children.push_back(std::make_unique<AstNode>(@11, AST_PARASET, std::move(limit->t_min)));
 		cell->children.back()->str = "\\T_LIMIT_MIN";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(limit->t_avg)));
+		cell->children.push_back(std::make_unique<AstNode>(@11, AST_PARASET, std::move(limit->t_avg)));
 		cell->children.back()->str = "\\T_LIMIT_TYP";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(limit->t_max)));
+		cell->children.push_back(std::make_unique<AstNode>(@11, AST_PARASET, std::move(limit->t_max)));
 		cell->children.back()->str = "\\T_LIMIT_MAX";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, limit2 ? std::move(limit2->t_min) : AstNode::mkconst_int(0, true)));
+		cell->children.push_back(std::make_unique<AstNode>(@12, AST_PARASET, limit2 ? std::move(limit2->t_min) : AstNode::mkconst_int(@12, 0, true)));
 		cell->children.back()->str = "\\T_LIMIT2_MIN";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, limit2 ? std::move(limit2->t_avg) : AstNode::mkconst_int(0, true)));
+		cell->children.push_back(std::make_unique<AstNode>(@12, AST_PARASET, limit2 ? std::move(limit2->t_avg) : AstNode::mkconst_int(@12, 0, true)));
 		cell->children.back()->str = "\\T_LIMIT2_TYP";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, limit2 ? std::move(limit2->t_max) : AstNode::mkconst_int(0, true)));
+		cell->children.push_back(std::make_unique<AstNode>(@12, AST_PARASET, limit2 ? std::move(limit2->t_max) : AstNode::mkconst_int(@12, 0, true)));
 		cell->children.back()->str = "\\T_LIMIT2_MAX";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(src_pen)));
+		cell->children.push_back(std::make_unique<AstNode>(@3, AST_PARASET, std::move(src_pen)));
 		cell->children.back()->str = "\\SRC_PEN";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(src_pol)));
+		cell->children.push_back(std::make_unique<AstNode>(@3, AST_PARASET, std::move(src_pol)));
 		cell->children.back()->str = "\\SRC_POL";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(dst_pen)));
+		cell->children.push_back(std::make_unique<AstNode>(@3, AST_PARASET, std::move(dst_pen)));
 		cell->children.back()->str = "\\DST_PEN";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_PARASET, std::move(dst_pol)));
+		cell->children.push_back(std::make_unique<AstNode>(@7, AST_PARASET, std::move(dst_pol)));
 		cell->children.back()->str = "\\DST_POL";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(src_en)));
+		cell->children.push_back(std::make_unique<AstNode>(@5, AST_ARGUMENT, std::move(src_en)));
 		cell->children.back()->str = "\\SRC_EN";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(src_expr)));
+		cell->children.push_back(std::make_unique<AstNode>(@4, AST_ARGUMENT, std::move(src_expr)));
 		cell->children.back()->str = "\\SRC";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(dst_en)));
+		cell->children.push_back(std::make_unique<AstNode>(@9, AST_ARGUMENT, std::move(dst_en)));
 		cell->children.back()->str = "\\DST_EN";
 
-		cell->children.push_back(std::make_unique<AstNode>(AST_ARGUMENT, std::move(dst_expr)));
+		cell->children.push_back(std::make_unique<AstNode>(@8, AST_ARGUMENT, std::move(dst_expr)));
 		cell->children.back()->str = "\\DST";
 	};
 
@@ -1538,19 +1532,19 @@ specify_rise_fall:
 		$$ = std::make_unique<struct specify_rise_fall>();
 		$$->rise = std::move(*$2);
 		$$->fall = std::move(*$4);
-		log_file_warning(current_filename, @$.begin.line, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
+		err_at_loc(@$, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
 	} |
 	TOK_LPAREN specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_RPAREN {
 		$$ = std::make_unique<struct specify_rise_fall>();
 		$$->rise = std::move(*$2);
 		$$->fall = std::move(*$4);
-		log_file_warning(current_filename, @$.begin.line, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
+		err_at_loc(@$, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
 	} |
 	TOK_LPAREN specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_RPAREN {
 		$$ = std::make_unique<struct specify_rise_fall>();
 		$$->rise = std::move(*$2);
 		$$->fall = std::move(*$4);
-		log_file_warning(current_filename, @$.begin.line, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
+		err_at_loc(@$, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
 	}
 
 specify_triple:
@@ -1708,7 +1702,7 @@ param_integer:
 
 param_real:
 	TOK_REAL {
-		extra->astbuf1->children.push_back(std::make_unique<AstNode>(AST_REALVALUE));
+		extra->astbuf1->children.push_back(std::make_unique<AstNode>(@$, AST_REALVALUE));
 	};
 
 param_range:
@@ -1736,8 +1730,8 @@ param_type:
 
 param_decl:
 	attr TOK_PARAMETER {
-		extra->astbuf1 = std::make_unique<AstNode>(AST_PARAMETER);
-		extra->astbuf1->children.push_back(AstNode::mkconst_int(0, true));
+		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_PARAMETER);
+		extra->astbuf1->children.push_back(AstNode::mkconst_int(@$, 0, true));
 		append_attr(extra->astbuf1.get(), $1);
 	} param_type param_decl_list TOK_SEMICOL {
 		(void)extra->astbuf1.reset();
@@ -1745,8 +1739,8 @@ param_decl:
 
 localparam_decl:
 	attr TOK_LOCALPARAM {
-		extra->astbuf1 = std::make_unique<AstNode>(AST_LOCALPARAM);
-		extra->astbuf1->children.push_back(AstNode::mkconst_int(0, true));
+		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_LOCALPARAM);
+		extra->astbuf1->children.push_back(AstNode::mkconst_int(@$, 0, true));
 		append_attr(extra->astbuf1.get(), $1);
 	} param_type param_decl_list TOK_SEMICOL {
 		(void)extra->astbuf1.reset();
@@ -1778,8 +1772,8 @@ single_param_decl_ident:
 		if (extra->astbuf1 == nullptr) {
 			if (!mode->sv)
 				err_at_loc(@1, "In pure Verilog (not SystemVerilog), parameter/localparam with an initializer must use the parameter/localparam keyword");
-			node_owned = std::make_unique<AstNode>(AST_PARAMETER);
-			node_owned->children.push_back(AstNode::mkconst_int(0, true));
+			node_owned = std::make_unique<AstNode>(@$, AST_PARAMETER);
+			node_owned->children.push_back(AstNode::mkconst_int(@$, 0, true));
 		} else {
 			node_owned = extra->astbuf1->clone();
 		}
@@ -1797,7 +1791,7 @@ defparam_decl_list:
 
 single_defparam_decl:
 	range rvalue TOK_EQ expr {
-		auto node = std::make_unique<AstNode>(AST_DEFPARAM);
+		auto node = std::make_unique<AstNode>(@$, AST_DEFPARAM);
 		node->children.push_back(std::move($2));
 		node->children.push_back(std::move($4));
 		if ($1 != nullptr)
@@ -1812,15 +1806,15 @@ single_defparam_decl:
 enum_type: TOK_ENUM {
 		static int enum_count;
 		// create parent node for the enum
-		extra->astbuf2 = std::make_unique<AstNode>(AST_ENUM);
+		extra->astbuf2 = std::make_unique<AstNode>(@$, AST_ENUM);
 		extra->astbuf2->str = std::string("$enum");
 		extra->astbuf2->str += std::to_string(enum_count++);
 		log_assert(!extra->cell_hack);
 		extra->cell_hack = extra->astbuf2.get();
 		extra->ast_stack.back()->children.push_back(std::move(extra->astbuf2));
 		// create the template for the names
-		extra->astbuf1 = std::make_unique<AstNode>(AST_ENUM_ITEM);
-		extra->astbuf1->children.push_back(AstNode::mkconst_int(0, true));
+		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_ENUM_ITEM);
+		extra->astbuf1->children.push_back(AstNode::mkconst_int(@$, 0, true));
 	} enum_base_type TOK_LCURL enum_name_list optional_comma TOK_RCURL {
 		// create template for the enum vars
 		log_assert(extra->cell_hack);
@@ -1828,7 +1822,7 @@ enum_type: TOK_ENUM {
 		auto* tnode = tnode_owned.get();
 		extra->astbuf1 = std::move(tnode_owned);
 		tnode->type = AST_WIRE;
-		tnode->attributes[ID::enum_type] = AstNode::mkconst_str(extra->cell_hack->str);
+		tnode->attributes[ID::enum_type] = AstNode::mkconst_str(@$, extra->cell_hack->str);
 		extra->cell_hack = nullptr;
 		// drop constant but keep any range
 		tnode->children.erase(tnode->children.begin());
@@ -1869,7 +1863,7 @@ enum_name_decl:
 		auto node = extra->astbuf1->clone();
 		node->str = *$1;
 		SET_AST_NODE_LOC(node.get(), @1, @1);
-		node->children[0] = $2 ? std::move($2) : std::make_unique<AstNode>(AST_NONE);
+		node->children[0] = $2 ? std::move($2) : std::make_unique<AstNode>(@$, AST_NONE);
 		extra->cell_hack->children.push_back(std::move(node));
 	}
 	;
@@ -1919,8 +1913,8 @@ struct_type:
 	;
 
 struct_union:
-	  TOK_STRUCT		{ $$ = std::make_unique<AstNode>(AST_STRUCT); }
-	| TOK_UNION		{ $$ = std::make_unique<AstNode>(AST_UNION); }
+	  TOK_STRUCT		{ $$ = std::make_unique<AstNode>(@$, AST_STRUCT); }
+	| TOK_UNION		{ $$ = std::make_unique<AstNode>(@$, AST_UNION); }
 	;
 
 struct_body: opt_packed TOK_LCURL struct_member_list TOK_RCURL
@@ -1962,7 +1956,7 @@ member_name: TOK_ID {
 	}
 	;
 
-struct_member_type: { extra->astbuf1 = std::make_unique<AstNode>(AST_STRUCT_ITEM); } member_type_token
+struct_member_type: { extra->astbuf1 = std::make_unique<AstNode>(@$, AST_STRUCT_ITEM); } member_type_token
 	;
 
 member_type_token:
@@ -2019,17 +2013,17 @@ wire_decl:
 		free_attr(extra->albuf);
 	} TOK_SEMICOL |
 	attr TOK_SUPPLY0 TOK_ID {
-		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_WIRE));
+		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_WIRE));
 		extra->ast_stack.back()->children.back()->str = *$3;
 		append_attr(extra->ast_stack.back()->children.back().get(), $1);
-		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_ASSIGN, std::make_unique<AstNode>(AST_IDENTIFIER), AstNode::mkconst_int(0, false, 1)));
+		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_ASSIGN, std::make_unique<AstNode>(@$, AST_IDENTIFIER), AstNode::mkconst_int(@$, 0, false, 1)));
 		extra->ast_stack.back()->children.back()->children[0]->str = *$3;
 	} opt_supply_wires TOK_SEMICOL |
 	attr TOK_SUPPLY1 TOK_ID {
-		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_WIRE));
+		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_WIRE));
 		extra->ast_stack.back()->children.back()->str = *$3;
 		append_attr(extra->ast_stack.back()->children.back().get(), $1);
-		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_ASSIGN, std::make_unique<AstNode>(AST_IDENTIFIER), AstNode::mkconst_int(1, false, 1)));
+		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_ASSIGN, std::make_unique<AstNode>(@$, AST_IDENTIFIER), AstNode::mkconst_int(@$, 1, false, 1)));
 		extra->ast_stack.back()->children.back()->children[0]->str = *$3;
 	} opt_supply_wires TOK_SEMICOL;
 
@@ -2070,8 +2064,8 @@ wire_name_and_opt_assign:
 			attr_allseq = true;
 		}
 		if (extra->current_wire_rand || attr_anyconst || attr_anyseq || attr_allconst || attr_allseq) {
-			auto wire = std::make_unique<AstNode>(AST_IDENTIFIER);
-			auto fcall = std::make_unique<AstNode>(AST_FCALL);
+			auto wire = std::make_unique<AstNode>(@$, AST_IDENTIFIER);
+			auto fcall = std::make_unique<AstNode>(@$, AST_FCALL);
 			wire->str = extra->ast_stack.back()->children.back()->str;
 			fcall->str = extra->current_wire_const ? "\\$anyconst" : "\\$anyseq";
 			if (attr_anyconst)
@@ -2082,28 +2076,28 @@ wire_name_and_opt_assign:
 				fcall->str = "\\$allconst";
 			if (attr_allseq)
 				fcall->str = "\\$allseq";
-			fcall->attributes[ID::reg] = AstNode::mkconst_str(RTLIL::unescape_id(wire->str));
-			extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_ASSIGN, std::move(wire), std::move(fcall)));
+			fcall->attributes[ID::reg] = AstNode::mkconst_str(@$, RTLIL::unescape_id(wire->str));
+			extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_ASSIGN, std::move(wire), std::move(fcall)));
 		}
 	} |
 	wire_name TOK_EQ expr {
-		auto wire = std::make_unique<AstNode>(AST_IDENTIFIER);
+		auto wire = std::make_unique<AstNode>(@$, AST_IDENTIFIER);
 		wire->str = extra->ast_stack.back()->children.back()->str;
 		if (extra->astbuf1->is_input) {
 			extra->astbuf1->attributes[ID::defaultvalue] = std::move($3);
 		}
 		else if (extra->astbuf1->is_reg || extra->astbuf1->is_logic){
-			auto assign = std::make_unique<AstNode>(AST_ASSIGN_LE, std::move(wire), std::move($3));
+			auto assign = std::make_unique<AstNode>(@$, AST_ASSIGN_LE, std::move(wire), std::move($3));
 			SET_AST_NODE_LOC(assign.get(), @1, @3);
-			auto block = std::make_unique<AstNode>(AST_BLOCK, std::move(assign));
+			auto block = std::make_unique<AstNode>(@$, AST_BLOCK, std::move(assign));
 			SET_AST_NODE_LOC(block.get(), @1, @3);
-			auto init = std::make_unique<AstNode>(AST_INITIAL, std::move(block));
+			auto init = std::make_unique<AstNode>(@$, AST_INITIAL, std::move(block));
 			SET_AST_NODE_LOC(init.get(), @1, @3);
 
 			extra->ast_stack.back()->children.push_back(std::move(init));
 		}
 		else {
-			auto assign = std::make_unique<AstNode>(AST_ASSIGN, std::move(wire), std::move($3));
+			auto assign = std::make_unique<AstNode>(@$, AST_ASSIGN, std::move(wire), std::move($3));
 			SET_AST_NODE_LOC(assign.get(), @1, @3);
 			extra->ast_stack.back()->children.push_back(std::move(assign));
 		}
@@ -2163,7 +2157,7 @@ assign_expr_list:
 
 assign_expr:
 	lvalue TOK_EQ expr {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSIGN, std::move($1), std::move($3)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_ASSIGN, std::move($1), std::move($3)));
 		SET_AST_NODE_LOC(node, @$, @$);
 	};
 
@@ -2192,12 +2186,12 @@ typedef_decl:
 
 typedef_base_type:
 	hierarchical_type_id {
-		$$ = std::make_unique<AstNode>(AST_WIRE);
+		$$ = std::make_unique<AstNode>(@$, AST_WIRE);
 		$$->is_logic = true;
 		extra->addWiretypeNode($1.get(), $$.get());
 	} |
 	integer_vector_type opt_signedness_default_unsigned {
-		$$ = std::make_unique<AstNode>(AST_WIRE);
+		$$ = std::make_unique<AstNode>(@$, AST_WIRE);
 		if ($1 == token::TOK_REG) {
 			$$->is_reg = true;
 		} else {
@@ -2206,7 +2200,7 @@ typedef_base_type:
 		$$->is_signed = $2;
 	} |
 	integer_atom_type opt_signedness_default_signed {
-		$$ = std::make_unique<AstNode>(AST_WIRE);
+		$$ = std::make_unique<AstNode>(@$, AST_WIRE);
 		$$->is_logic = true;
 		$$->is_signed = $2;
 		$$->range_left = $1 - 1;
@@ -2220,15 +2214,15 @@ enum_struct_type:
 
 cell_stmt:
 	attr TOK_ID {
-		extra->astbuf1 = std::make_unique<AstNode>(AST_CELL);
+		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_CELL);
 		append_attr(extra->astbuf1.get(), $1);
-		extra->astbuf1->children.push_back(std::make_unique<AstNode>(AST_CELLTYPE));
+		extra->astbuf1->children.push_back(std::make_unique<AstNode>(@$, AST_CELLTYPE));
 		extra->astbuf1->children[0]->str = *$2;
 	} cell_parameter_list_opt cell_list TOK_SEMICOL {
 		(void)extra->astbuf1.reset();
 	} |
 	attr tok_prim_wrapper delay {
-		extra->astbuf1 = std::make_unique<AstNode>(AST_PRIMITIVE);
+		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_PRIMITIVE);
 		extra->astbuf1->str = *$2;
 		append_attr(extra->astbuf1.get(), $1);
 	} prim_list TOK_SEMICOL {
@@ -2271,7 +2265,7 @@ single_cell_arraylist:
 			extra->astbuf2->str = *$1;
 		// TODO optimize again
 		extra->cell_hack = extra->astbuf2.get();
-		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(AST_CELLARRAY, std::move($2), std::move(extra->astbuf2)));
+		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_CELLARRAY, std::move($2), std::move(extra->astbuf2)));
 	} TOK_LPAREN cell_port_list TOK_RPAREN{
 		log_assert(extra->cell_hack);
 		SET_AST_NODE_LOC(extra->cell_hack, @1, @$);
@@ -2309,7 +2303,7 @@ cell_parameter_list:
 cell_parameter:
 	%empty |
 	expr {
-		auto node = std::make_unique<AstNode>(AST_PARASET);
+		auto node = std::make_unique<AstNode>(@$, AST_PARASET);
 		node->children.push_back(std::move($1));
 		extra->astbuf1->children.push_back(std::move(node));
 	} |
@@ -2317,7 +2311,7 @@ cell_parameter:
 		// just ignore empty parameters
 	} |
 	TOK_DOT TOK_ID TOK_LPAREN expr TOK_RPAREN {
-		auto node = std::make_unique<AstNode>(AST_PARASET);
+		auto node = std::make_unique<AstNode>(@$, AST_PARASET);
 		node->str = *$2;
 		node->children.push_back(std::move($4));
 		extra->astbuf1->children.push_back(std::move(node));
@@ -2354,33 +2348,33 @@ cell_port_list_rules:
 
 cell_port:
 	attr {
-		auto node = std::make_unique<AstNode>(AST_ARGUMENT);
+		auto node = std::make_unique<AstNode>(@$, AST_ARGUMENT);
 		extra->cell_hack->children.push_back(std::move(node));
 		free_attr($1);
 	} |
 	attr expr {
-		auto node = std::make_unique<AstNode>(AST_ARGUMENT);
+		auto node = std::make_unique<AstNode>(@$, AST_ARGUMENT);
 		node->children.push_back(std::move($2));
 		extra->cell_hack->children.push_back(std::move(node));
 		free_attr($1);
 	} |
 	attr TOK_DOT TOK_ID TOK_LPAREN expr TOK_RPAREN {
-		auto node = std::make_unique<AstNode>(AST_ARGUMENT);
+		auto node = std::make_unique<AstNode>(@$, AST_ARGUMENT);
 		node->str = *$3;
 		node->children.push_back(std::move($5));
 		extra->cell_hack->children.push_back(std::move(node));
 		free_attr($1);
 	} |
 	attr TOK_DOT TOK_ID TOK_LPAREN TOK_RPAREN {
-		auto node = std::make_unique<AstNode>(AST_ARGUMENT);
+		auto node = std::make_unique<AstNode>(@$, AST_ARGUMENT);
 		node->str = *$3;
 		extra->cell_hack->children.push_back(std::move(node));
 		free_attr($1);
 	} |
 	attr TOK_DOT TOK_ID {
-		auto node = std::make_unique<AstNode>(AST_ARGUMENT);
+		auto node = std::make_unique<AstNode>(@$, AST_ARGUMENT);
 		node->str = *$3;
-		node->children.push_back(std::make_unique<AstNode>(AST_IDENTIFIER));
+		node->children.push_back(std::make_unique<AstNode>(@$, AST_IDENTIFIER));
 		node->children.back()->str = *$3;
 		extra->cell_hack->children.push_back(std::move(node));
 		free_attr($1);
@@ -2388,7 +2382,7 @@ cell_port:
 	attr TOK_WILDCARD_CONNECT {
 		if (!mode->sv)
 			err_at_loc(@2, "Wildcard port connections are only supported in SystemVerilog mode.");
-		extra->cell_hack->attributes[ID::wildcard_port_conns] = AstNode::mkconst_int(1, false);
+		extra->cell_hack->attributes[ID::wildcard_port_conns] = AstNode::mkconst_int(@2, 1, false);
 		free_attr($1);
 	};
 
@@ -2410,12 +2404,12 @@ always_or_always_ff:
 
 always_stmt:
 	attr always_or_always_ff {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_ALWAYS));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_ALWAYS));
 		append_attr(node, $1);
 		if ($2)
-			node->attributes[ID::always_ff] = AstNode::mkconst_int(1, false);
+			node->attributes[ID::always_ff] = AstNode::mkconst_int(@2, 1, false);
 	} always_cond {
-		(void)extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
+		(void)extra->pushChild(std::make_unique<AstNode>(@$, AST_BLOCK));
 	} behavioral_stmt {
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @6, @6);
 		extra->ast_stack.pop_back();
@@ -2426,21 +2420,21 @@ always_stmt:
 		SET_RULE_LOC(@$, @2, @$);
 	} |
 	attr always_comb_or_latch {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_ALWAYS));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_ALWAYS));
 		append_attr(node, $1);
 		if ($2)
-			node->attributes[ID::always_latch] = AstNode::mkconst_int(1, false);
+			node->attributes[ID::always_latch] = AstNode::mkconst_int(@2, 1, false);
 		else
-			node->attributes[ID::always_comb] = AstNode::mkconst_int(1, false);
-		(void)extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
+			node->attributes[ID::always_comb] = AstNode::mkconst_int(@2, 1, false);
+		(void)extra->pushChild(std::make_unique<AstNode>(@$, AST_BLOCK));
 	} behavioral_stmt {
 		extra->ast_stack.pop_back();
 		extra->ast_stack.pop_back();
 	} |
 	attr TOK_INITIAL {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_INITIAL));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_INITIAL));
 		append_attr(node, $1);
-		(void)extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
+		(void)extra->pushChild(std::make_unique<AstNode>(@$, AST_BLOCK));
 	} behavioral_stmt {
 		extra->ast_stack.pop_back();
 		extra->ast_stack.pop_back();
@@ -2461,19 +2455,19 @@ always_events:
 
 always_event:
 	TOK_POSEDGE expr {
-		auto node = std::make_unique<AstNode>(AST_POSEDGE);
+		auto node = std::make_unique<AstNode>(@$, AST_POSEDGE);
 		SET_AST_NODE_LOC(node.get(), @1, @1);
 		node->children.push_back(std::move($2));
 		extra->ast_stack.back()->children.push_back(std::move(node));
 	} |
 	TOK_NEGEDGE expr {
-		auto node = std::make_unique<AstNode>(AST_NEGEDGE);
+		auto node = std::make_unique<AstNode>(@$, AST_NEGEDGE);
 		SET_AST_NODE_LOC(node.get(), @1, @1);
 		node->children.push_back(std::move($2));
 		extra->ast_stack.back()->children.push_back(std::move(node));
 	} |
 	expr {
-		auto node = std::make_unique<AstNode>(AST_EDGE);
+		auto node = std::make_unique<AstNode>(@$, AST_EDGE);
 		node->children.push_back(std::move($1));
 		extra->ast_stack.back()->children.push_back(std::move(node));
 	};
@@ -2507,7 +2501,7 @@ opt_property:
 
 modport_stmt:
     TOK_MODPORT TOK_ID {
-		AstNode* modport = extra->pushChild(std::make_unique<AstNode>(AST_MODPORT));
+		AstNode* modport = extra->pushChild(std::make_unique<AstNode>(@$, AST_MODPORT));
         modport->str = *$2;
 
     }  modport_args_opt {
@@ -2527,7 +2521,7 @@ modport_arg:
 
 modport_member:
     TOK_ID {
-		AstNode* modport_member = extra->saveChild(std::make_unique<AstNode>(AST_MODPORTMEMBER));
+		AstNode* modport_member = extra->saveChild(std::make_unique<AstNode>(@$, AST_MODPORTMEMBER));
         modport_member->str = *$1;
         modport_member->is_input = extra->current_modport_input;
         modport_member->is_output = extra->current_modport_output;
@@ -2542,7 +2536,7 @@ assert:
 		if (mode->noassert) {
 
 		} else {
-			AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assume_asserts ? AST_ASSUME : AST_ASSERT, std::move($5)));
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, mode->assume_asserts ? AST_ASSUME : AST_ASSERT, std::move($5)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @6);
 			if ($1 != nullptr)
 				node->str = *$1;
@@ -2551,7 +2545,7 @@ assert:
 	opt_sva_label TOK_ASSUME opt_property TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
 		if (mode->noassume) {
 		} else {
-			AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assert_assumes ? AST_ASSERT : AST_ASSUME, std::move($5)));
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, mode->assert_assumes ? AST_ASSERT : AST_ASSUME, std::move($5)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @6);
 			if ($1 != nullptr)
 				node->str = *$1;
@@ -2560,7 +2554,7 @@ assert:
 	opt_sva_label TOK_ASSERT opt_property TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
 		if (mode->noassert) {
 		} else {
-			AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assume_asserts ? AST_FAIR : AST_LIVE, std::move($6)));
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, mode->assume_asserts ? AST_FAIR : AST_LIVE, std::move($6)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @7);
 			if ($1 != nullptr)
 				node->str = *$1;
@@ -2569,28 +2563,28 @@ assert:
 	opt_sva_label TOK_ASSUME opt_property TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
 		if (mode->noassume) {
 		} else {
-			AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assert_assumes ? AST_LIVE : AST_FAIR, std::move($6)));
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, mode->assert_assumes ? AST_LIVE : AST_FAIR, std::move($6)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @7);
 			if ($1 != nullptr)
 				node->str = *$1;
 		}
 	} |
 	opt_sva_label TOK_COVER opt_property TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_COVER, std::move($5)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_COVER, std::move($5)));
 		SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @6);
 		if ($1 != nullptr) {
 			node->str = *$1;
 		}
 	} |
 	opt_sva_label TOK_COVER opt_property TOK_LPAREN TOK_RPAREN TOK_SEMICOL {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_COVER, AstNode::mkconst_int(1, false)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_COVER, AstNode::mkconst_int(@$, 1, false)));
 		SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @5);
 		if ($1 != nullptr) {
 			node->str = *$1;
 		}
 	} |
 	opt_sva_label TOK_COVER TOK_SEMICOL {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_COVER, AstNode::mkconst_int(1, false)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_COVER, AstNode::mkconst_int(@$, 1, false)));
 		SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @2);
 		if ($1 != nullptr) {
 			node->str = *$1;
@@ -2599,57 +2593,57 @@ assert:
 	opt_sva_label TOK_RESTRICT opt_property TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
 		if (mode->norestrict) {
 		} else {
-			AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSUME, std::move($5)));
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_ASSUME, std::move($5)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @6);
 			if ($1 != nullptr)
 				node->str = *$1;
 		}
 		if (!$3)
-			log_file_warning(current_filename, @$.begin.line, "SystemVerilog does not allow \"restrict\" without \"property\".\n");
+			err_at_loc(@$, "SystemVerilog does not allow \"restrict\" without \"property\".\n");
 	} |
 	opt_sva_label TOK_RESTRICT opt_property TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
 		if (mode->norestrict) {
 		} else {
-			AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_FAIR, std::move($6)));
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_FAIR, std::move($6)));
 			SET_AST_NODE_LOC(node, ($1 != nullptr ? @1 : @2), @7);
 			if ($1 != nullptr)
 				node->str = *$1;
 		}
 		if (!$3)
-			log_file_warning(current_filename, @$.begin.line, "SystemVerilog does not allow \"restrict\" without \"property\".\n");
+			err_at_loc(@$, "SystemVerilog does not allow \"restrict\" without \"property\".\n");
 	};
 
 assert_property:
 	opt_sva_label TOK_ASSERT TOK_PROPERTY TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assume_asserts ? AST_ASSUME : AST_ASSERT, std::move($5)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, mode->assume_asserts ? AST_ASSUME : AST_ASSERT, std::move($5)));
 		SET_AST_NODE_LOC(node, @1, @6);
 		if ($1 != nullptr) {
 			extra->ast_stack.back()->children.back()->str = *$1;
 		}
 	} |
 	opt_sva_label TOK_ASSUME TOK_PROPERTY TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSUME, std::move($5)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_ASSUME, std::move($5)));
 		SET_AST_NODE_LOC(node, @1, @6);
 		if ($1 != nullptr) {
 			extra->ast_stack.back()->children.back()->str = *$1;
 		}
 	} |
 	opt_sva_label TOK_ASSERT TOK_PROPERTY TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(mode->assume_asserts ? AST_FAIR : AST_LIVE, std::move($6)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, mode->assume_asserts ? AST_FAIR : AST_LIVE, std::move($6)));
 		SET_AST_NODE_LOC(node, @1, @7);
 		if ($1 != nullptr) {
 			extra->ast_stack.back()->children.back()->str = *$1;
 		}
 	} |
 	opt_sva_label TOK_ASSUME TOK_PROPERTY TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_FAIR, std::move($6)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_FAIR, std::move($6)));
 		SET_AST_NODE_LOC(node, @1, @7);
 		if ($1 != nullptr) {
 			extra->ast_stack.back()->children.back()->str = *$1;
 		}
 	} |
 	opt_sva_label TOK_COVER TOK_PROPERTY TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_COVER, std::move($5)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_COVER, std::move($5)));
 		SET_AST_NODE_LOC(node, @1, @6);
 		if ($1 != nullptr) {
 			extra->ast_stack.back()->children.back()->str = *$1;
@@ -2658,7 +2652,7 @@ assert_property:
 	opt_sva_label TOK_RESTRICT TOK_PROPERTY TOK_LPAREN expr TOK_RPAREN TOK_SEMICOL {
 		if (mode->norestrict) {
 		} else {
-			AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSUME, std::move($5)));
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_ASSUME, std::move($5)));
 			SET_AST_NODE_LOC(node, @1, @6);
 			if ($1 != nullptr) {
 				extra->ast_stack.back()->children.back()->str = *$1;
@@ -2668,7 +2662,7 @@ assert_property:
 	opt_sva_label TOK_RESTRICT TOK_PROPERTY TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
 		if (mode->norestrict) {
 		} else {
-			AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_FAIR, std::move($6)));
+			AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_FAIR, std::move($6)));
 			SET_AST_NODE_LOC(node, @1, @7);
 			if ($1 != nullptr) {
 				extra->ast_stack.back()->children.back()->str = *$1;
@@ -2678,23 +2672,23 @@ assert_property:
 
 simple_behavioral_stmt:
 	attr lvalue TOK_EQ delay expr {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move($2), std::move($5)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_ASSIGN_EQ, std::move($2), std::move($5)));
 		SET_AST_NODE_LOC(node, @2, @5);
 		append_attr(node, $1);
 	} |
 	attr lvalue attr inc_or_dec_op {
-		extra->addIncOrDecStmt($1, std::move($2), $3, $4, @1, @4);
+		extra->addIncOrDecStmt($1, std::move($2), $3, $4, location_range(@1, @4));
 	} |
 	attr inc_or_dec_op attr lvalue {
-		extra->addIncOrDecStmt($1, std::move($4), $3, $2, @1, @4);
+		extra->addIncOrDecStmt($1, std::move($4), $3, $2, location_range(@1, @4));
 	} |
 	attr lvalue OP_LE delay expr {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSIGN_LE, std::move($2), std::move($5)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_ASSIGN_LE, std::move($2), std::move($5)));
 		SET_AST_NODE_LOC(node, @2, @5);
 		append_attr(node, $1);
 	} |
 	attr lvalue asgn_binop delay expr {
-		(void)extra->addAsgnBinopStmt($1, std::move($2), $3, std::move($5), @2, @5);
+		(void)extra->addAsgnBinopStmt($1, std::move($2), $3, std::move($5));
 	};
 
 asgn_binop:
@@ -2719,9 +2713,9 @@ inc_or_dec_op:
 
 for_initialization:
 	TOK_ID TOK_EQ expr {
-		auto ident = std::make_unique<AstNode>(AST_IDENTIFIER);
+		auto ident = std::make_unique<AstNode>(@$, AST_IDENTIFIER);
 		ident->str = *$1;
-		auto node = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(ident), std::move($3));
+		auto node = std::make_unique<AstNode>(@$, AST_ASSIGN_EQ, std::move(ident), std::move($3));
 		SET_AST_NODE_LOC(node.get(), @1, @3);
 		extra->ast_stack.back()->children.push_back(std::move(node));
 	} |
@@ -2740,7 +2734,7 @@ for_initialization:
 		if (range != nullptr)
 			wire->children.push_back(std::move(range));
 
-		auto ident = std::make_unique<AstNode>(AST_IDENTIFIER);
+		auto ident = std::make_unique<AstNode>(@$, AST_IDENTIFIER);
 		ident->str = *$3;
 		wire->str = *$3;
 
@@ -2750,13 +2744,13 @@ for_initialization:
 
 		// loop variable initialization
 		SET_AST_NODE_LOC(ident.get(), @3, @3);
-		auto asgn = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move(ident), std::move($5));
+		auto asgn = std::make_unique<AstNode>(@$, AST_ASSIGN_EQ, std::move(ident), std::move($5));
 		SET_AST_NODE_LOC(asgn.get(), @3, @5);
 		loop->children.push_back(std::move(asgn));
 
 		// inject a wrapping block to declare the loop variable and
 		// contain the current loop
-		auto wrapper = std::make_unique<AstNode>(AST_BLOCK);
+		auto wrapper = std::make_unique<AstNode>(@$, AST_BLOCK);
 		wrapper->str = "$fordecl_block$" + std::to_string(autoidx++);
 		wrapper->children.push_back(std::move(wire));
 		wrapper->children.push_back(std::move(loop));
@@ -2772,7 +2766,7 @@ behavioral_stmt:
 		free_attr($1);
 	} |
 	attr hierarchical_id {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_TCALL));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_TCALL));
 		node->str = *$2;
 		append_attr(node, $1);
 	} opt_arg_list TOK_SEMICOL{
@@ -2780,7 +2774,7 @@ behavioral_stmt:
 		extra->ast_stack.pop_back();
 	} |
 	attr TOK_MSG_TASKS {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_TCALL));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_TCALL));
 		node->str = *$2;
 		append_attr(node, $1);
 	} opt_arg_list TOK_SEMICOL{
@@ -2790,7 +2784,7 @@ behavioral_stmt:
 	attr TOK_BEGIN {
 		extra->enterTypeScope();
 	} opt_label {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_BLOCK));
 		append_attr(node, $1);
 		if ($4 != nullptr)
 			node->str = *$4;
@@ -2811,12 +2805,12 @@ behavioral_stmt:
 		extra->ast_stack.pop_back();
 	} |
 	attr TOK_FOR TOK_LPAREN {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_FOR));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_FOR));
 		append_attr(node, $1);
 	} for_initialization TOK_SEMICOL expr {
 		extra->ast_stack.back()->children.push_back(std::move($7));
 	} TOK_SEMICOL simple_behavioral_stmt TOK_RPAREN {
-		AstNode* block = extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
+		AstNode* block = extra->pushChild(std::make_unique<AstNode>(@$, AST_BLOCK));
 		block->str = "$for_loop$" + std::to_string(autoidx++);
 	} behavioral_stmt {
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @13, @13);
@@ -2825,9 +2819,9 @@ behavioral_stmt:
 		extra->ast_stack.pop_back();
 	} |
 	attr TOK_WHILE TOK_LPAREN expr TOK_RPAREN {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_WHILE));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_WHILE));
 		append_attr(node, $1);
-		auto block_owned = std::make_unique<AstNode>(AST_BLOCK);
+		auto block_owned = std::make_unique<AstNode>(@$, AST_BLOCK);
 		auto* block = block_owned.get();
 		extra->ast_stack.back()->children.push_back(std::move($4));
 		extra->ast_stack.back()->children.push_back(std::move(block_owned));
@@ -2838,9 +2832,9 @@ behavioral_stmt:
 		extra->ast_stack.pop_back();
 	} |
 	attr TOK_REPEAT TOK_LPAREN expr TOK_RPAREN {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_REPEAT));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_REPEAT));
 		append_attr(node, $1);
-		auto block_owned = std::make_unique<AstNode>(AST_BLOCK);
+		auto block_owned = std::make_unique<AstNode>(@$, AST_BLOCK);
 		auto* block = block_owned.get();
 		extra->ast_stack.back()->children.push_back(std::move($4));
 		extra->ast_stack.back()->children.push_back(std::move(block_owned));
@@ -2867,22 +2861,22 @@ behavioral_stmt:
 				// we have to undangle it from the stack
 				patch_block_on_stack = true;
 			} else if (outer->get_bool_attribute(ID::full_case))
-				(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
+				(*$1)[ID::full_case] = AstNode::mkconst_int(@$, 1, false);
 		}
-		auto expr = std::make_unique<AstNode>(AST_REDUCE_BOOL, std::move($4));
+		auto expr = std::make_unique<AstNode>(@$, AST_REDUCE_BOOL, std::move($4));
 		if (!node) {
 			// not parallel "else if": begin new construction
-			node_owned = std::make_unique<AstNode>(AST_CASE);
+			node_owned = std::make_unique<AstNode>(@$, AST_CASE);
 			node = node_owned.get();
 			append_attr(node, $1);
-			node->children.push_back(node->get_bool_attribute(ID::parallel_case) ? AstNode::mkconst_int(1, false, 1) : expr->clone());
+			node->children.push_back(node->get_bool_attribute(ID::parallel_case) ? AstNode::mkconst_int(@$, 1, false, 1) : expr->clone());
 			extra->ast_stack.back()->children.push_back(std::move(node_owned));
 		} else {
 			free_attr($1);
 		}
-		auto block_owned = std::make_unique<AstNode>(AST_BLOCK);
+		auto block_owned = std::make_unique<AstNode>(@$, AST_BLOCK);
 		auto* block = block_owned.get();
-		auto cond_owned = std::make_unique<AstNode>(AST_COND, node->get_bool_attribute(ID::parallel_case) ? std::move(expr) : AstNode::mkconst_int(1, false, 1), std::move(block_owned));
+		auto cond_owned = std::make_unique<AstNode>(@$, AST_COND, node->get_bool_attribute(ID::parallel_case) ? std::move(expr) : AstNode::mkconst_int(@$, 1, false, 1), std::move(block_owned));
 		SET_AST_NODE_LOC(cond_owned.get(), @4, @4);
 		node->children.push_back(std::move(cond_owned));
 		// Double it and give it to the next person
@@ -2898,7 +2892,7 @@ behavioral_stmt:
 		extra->ast_stack.pop_back();
 	} |
 	case_attr case_type TOK_LPAREN expr TOK_RPAREN {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_CASE, std::move($4)));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_CASE, std::move($4)));
 		append_attr(node, $1);
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @4, @4);
 	} opt_synopsys_attr case_body TOK_ENDCASE {
@@ -2915,22 +2909,22 @@ if_attr:
 		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
 			err_at_loc(@2, "unique0 keyword cannot be used for 'else if' branch.");
-		(*$1)[ID::parallel_case] = AstNode::mkconst_int(1, false);
+		(*$1)[ID::parallel_case] = AstNode::mkconst_int(@$, 1, false);
 		$$ = $1;
 	} |
 	attr TOK_PRIORITY {
 		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
 			err_at_loc(@2, "priority keyword cannot be used for 'else if' branch.");
-		(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
+		(*$1)[ID::full_case] = AstNode::mkconst_int(@$, 1, false);
 		$$ = $1;
 	} |
 	attr TOK_UNIQUE {
 		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
 			err_at_loc(@2, "unique keyword cannot be used for 'else if' branch.");
-		(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
-		(*$1)[ID::parallel_case] = AstNode::mkconst_int(1, false);
+		(*$1)[ID::full_case] = AstNode::mkconst_int(@$, 1, false);
+		(*$1)[ID::parallel_case] = AstNode::mkconst_int(@$, 1, false);
 		$$ = $1;
 	};
 
@@ -2939,16 +2933,16 @@ case_attr:
 		$$ = $1;
 	} |
 	attr TOK_UNIQUE0 {
-		(*$1)[ID::parallel_case] = AstNode::mkconst_int(1, false);
+		(*$1)[ID::parallel_case] = AstNode::mkconst_int(@$, 1, false);
 		$$ = $1;
 	} |
 	attr TOK_PRIORITY {
-		(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
+		(*$1)[ID::full_case] = AstNode::mkconst_int(@$, 1, false);
 		$$ = $1;
 	} |
 	attr TOK_UNIQUE {
-		(*$1)[ID::full_case] = AstNode::mkconst_int(1, false);
-		(*$1)[ID::parallel_case] = AstNode::mkconst_int(1, false);
+		(*$1)[ID::full_case] = AstNode::mkconst_int(@$, 1, false);
+		(*$1)[ID::parallel_case] = AstNode::mkconst_int(@$, 1, false);
 		$$ = $1;
 	};
 
@@ -2966,11 +2960,11 @@ case_type:
 opt_synopsys_attr:
 	opt_synopsys_attr TOK_SYNOPSYS_FULL_CASE {
 		if (extra->ast_stack.back()->attributes.count(ID::full_case) == 0)
-			extra->ast_stack.back()->attributes[ID::full_case] = AstNode::mkconst_int(1, false);
+			extra->ast_stack.back()->attributes[ID::full_case] = AstNode::mkconst_int(@$, 1, false);
 	} |
 	opt_synopsys_attr TOK_SYNOPSYS_PARALLEL_CASE {
 		if (extra->ast_stack.back()->attributes.count(ID::parallel_case) == 0)
-			extra->ast_stack.back()->attributes[ID::parallel_case] = AstNode::mkconst_int(1, false);
+			extra->ast_stack.back()->attributes[ID::parallel_case] = AstNode::mkconst_int(@$, 1, false);
 	} |
 	%empty;
 
@@ -2981,12 +2975,12 @@ behavioral_stmt_list:
 optional_else:
 	TOK_ELSE {
 		extra->ast_stack.pop_back();
-		auto block_owned = std::make_unique<AstNode>(AST_BLOCK);
+		auto block_owned = std::make_unique<AstNode>(@$, AST_BLOCK);
 		auto* block = block_owned.get();
-		block->attributes[ID::promoted_if] = AstNode::mkconst_int(1, false);
+		block->attributes[ID::promoted_if] = AstNode::mkconst_int(@$, 1, false);
 		AstNode* cond = extra->saveChild(
-			std::make_unique<AstNode>(AST_COND,
-				std::make_unique<AstNode>(AST_DEFAULT),
+			std::make_unique<AstNode>(@$, AST_COND,
+				std::make_unique<AstNode>(@$, AST_DEFAULT),
 				std::move(block_owned)));
 		extra->ast_stack.push_back(block);
 		SET_AST_NODE_LOC(cond, @1, @1);
@@ -3002,10 +2996,11 @@ case_body:
 case_item:
 	{
 		(void)extra->pushChild(std::make_unique<AstNode>(
+				@$,
 				extra->case_type_stack.size() && extra->case_type_stack.back() == 'x' ? AST_CONDX :
 				extra->case_type_stack.size() && extra->case_type_stack.back() == 'z' ? AST_CONDZ : AST_COND));
 	} case_select {
-		(void)extra->pushChild(std::make_unique<AstNode>(AST_BLOCK));
+		(void)extra->pushChild(std::make_unique<AstNode>(@$, AST_BLOCK));
 		extra->case_type_stack.push_back(0);
 	} behavioral_stmt {
 		extra->case_type_stack.pop_back();
@@ -3021,6 +3016,7 @@ gen_case_body:
 gen_case_item:
 	{
 		(void)extra->pushChild(std::make_unique<AstNode>(
+				@$,
 				extra->case_type_stack.size() && extra->case_type_stack.back() == 'x' ? AST_CONDX :
 				extra->case_type_stack.size() && extra->case_type_stack.back() == 'z' ? AST_CONDZ : AST_COND));
 	} case_select {
@@ -3037,11 +3033,11 @@ case_select:
 
 case_expr_list:
 	TOK_DEFAULT {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_DEFAULT));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_DEFAULT));
 		SET_AST_NODE_LOC(node, @1, @1);
 	} |
 	TOK_SVA_LABEL {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_IDENTIFIER));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_IDENTIFIER));
 		SET_AST_NODE_LOC(node, @1, @1);
 	} |
 	expr {
@@ -3053,12 +3049,12 @@ case_expr_list:
 
 rvalue:
 	hierarchical_id TOK_LBRA expr TOK_RBRA TOK_DOT rvalue {
-		$$ = std::make_unique<AstNode>(AST_PREFIX, std::move($3), std::move($6));
+		$$ = std::make_unique<AstNode>(@$, AST_PREFIX, std::move($3), std::move($6));
 		$$->str = *$1;
 		SET_AST_NODE_LOC($$.get(), @1, @6);
 	} |
 	hierarchical_id range {
-		$$ = std::make_unique<AstNode>(AST_IDENTIFIER, std::move($2));
+		$$ = std::make_unique<AstNode>(@$, AST_IDENTIFIER, std::move($2));
 		$$->str = *$1;
 		SET_AST_NODE_LOC($$.get(), @1, @1);
 		if ($2 == nullptr && ($$->str == "\\$initstate" ||
@@ -3067,7 +3063,7 @@ rvalue:
 			$$->type = AST_FCALL;
 	} |
 	hierarchical_id non_opt_multirange {
-		$$ = std::make_unique<AstNode>(AST_IDENTIFIER, std::move($2));
+		$$ = std::make_unique<AstNode>(@$, AST_IDENTIFIER, std::move($2));
 		$$->str = *$1;
 		SET_AST_NODE_LOC($$.get(), @1, @1);
 	};
@@ -3082,7 +3078,7 @@ lvalue:
 
 lvalue_concat_list:
 	expr {
-		$$ = std::make_unique<AstNode>(AST_CONCAT);
+		$$ = std::make_unique<AstNode>(@$, AST_CONCAT);
 		$$->children.push_back(std::move($1));
 	} |
 	expr TOK_COMMA lvalue_concat_list {
@@ -3120,7 +3116,7 @@ gen_stmt_or_module_body_stmt:
 
 genvar_identifier:
 	TOK_ID {
-		$$ = std::make_unique<AstNode>(AST_IDENTIFIER);
+		$$ = std::make_unique<AstNode>(@$, AST_IDENTIFIER);
 		$$->str = *$1;
 	};
 
@@ -3131,7 +3127,7 @@ genvar_initialization:
 	TOK_GENVAR genvar_identifier TOK_EQ expr {
 		if (!mode->sv)
 			err_at_loc(@3, "Generate for loop inline variable declaration is only supported in SystemVerilog mode!");
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_GENVAR));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_GENVAR));
 		node->is_reg = true;
 		node->is_signed = true;
 		node->range_left = 31;
@@ -3139,18 +3135,18 @@ genvar_initialization:
 		node->str = $2->str;
 		node->children.push_back(checkRange(node, nullptr));
 		SET_AST_NODE_LOC(node, @1, @4);
-		node = extra->saveChild(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move($2), std::move($4)));
+		node = extra->saveChild(std::make_unique<AstNode>(@$, AST_ASSIGN_EQ, std::move($2), std::move($4)));
 		SET_AST_NODE_LOC(node, @1, @4);
 	} |
 	genvar_identifier TOK_EQ expr {
-		AstNode* node = extra->saveChild(std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move($1), std::move($3)));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_ASSIGN_EQ, std::move($1), std::move($3)));
 		SET_AST_NODE_LOC(node, @1, @3);
 	};
 
 // this production creates the obligatory if-else shift/reduce conflict
 gen_stmt:
 	TOK_FOR TOK_LPAREN {
-		(void)extra->pushChild(std::make_unique<AstNode>(AST_GENFOR));
+		(void)extra->pushChild(std::make_unique<AstNode>(@$, AST_GENFOR));
 	} genvar_initialization TOK_SEMICOL expr {
 		extra->ast_stack.back()->children.push_back(std::move($6));
 	} TOK_SEMICOL simple_behavioral_stmt TOK_RPAREN gen_stmt_block {
@@ -3159,21 +3155,21 @@ gen_stmt:
 		extra->ast_stack.pop_back();
 	} |
 	TOK_IF TOK_LPAREN expr TOK_RPAREN {
-		(void)extra->pushChild(std::make_unique<AstNode>(AST_GENIF));
+		(void)extra->pushChild(std::make_unique<AstNode>(@$, AST_GENIF));
 		extra->ast_stack.back()->children.push_back(std::move($3));
 	} gen_stmt_block opt_gen_else {
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @1, @7);
 		extra->ast_stack.pop_back();
 	} |
 	case_type TOK_LPAREN expr TOK_RPAREN {
-		(void)extra->pushChild(std::make_unique<AstNode>(AST_GENCASE, std::move($3)));
+		(void)extra->pushChild(std::make_unique<AstNode>(@$, AST_GENCASE, std::move($3)));
 	} gen_case_body TOK_ENDCASE {
 		extra->case_type_stack.pop_back();
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @1, @7);
 		extra->ast_stack.pop_back();
 	} |
 	TOK_MSG_TASKS {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_TECALL));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_TECALL));
 		node->str = *$1;
 	} opt_arg_list TOK_SEMICOL{
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @1, @3);
@@ -3184,7 +3180,7 @@ gen_block:
 	TOK_BEGIN {
 		extra->enterTypeScope();
 	} opt_label {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(AST_GENBLOCK));
+		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_GENBLOCK));
 		node->str = $3 ? *$3 : std::string();
 	} module_gen_body TOK_END opt_label {
 		extra->exitTypeScope();
@@ -3196,7 +3192,7 @@ gen_block:
 // result is wrapped in a genblock only if necessary
 gen_stmt_block:
 	{
-		(void)extra->pushChild(std::make_unique<AstNode>(AST_GENBLOCK));
+		(void)extra->pushChild(std::make_unique<AstNode>(@$, AST_GENBLOCK));
 	} gen_stmt_or_module_body_stmt {
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @2);
 		extra->ast_stack.pop_back();
@@ -3210,7 +3206,7 @@ expr:
 		$$ = std::move($1);
 	} |
 	basic_expr TOK_QUE attr expr TOK_COL expr {
-		$$ = std::make_unique<AstNode>(AST_TERNARY);
+		$$ = std::make_unique<AstNode>(@$, AST_TERNARY);
 		$$->children.push_back(std::move($1));
 		$$->children.push_back(std::move($4));
 		$$->children.push_back(std::move($6));
@@ -3218,12 +3214,12 @@ expr:
 		append_attr($$.get(), $3);
 	} |
 	inc_or_dec_op attr rvalue {
-		$$ = extra->addIncOrDecExpr(std::move($3), $2, $1, @1, @3, false, mode->sv);
+		$$ = extra->addIncOrDecExpr(std::move($3), $2, $1, location_range(@1, @3), false, mode->sv);
 	} |
 	// TODO: Attributes are allowed in the middle here, but they create some
 	// non-trivial conflicts that don't seem worth solving for now.
 	rvalue inc_or_dec_op {
-		$$ = extra->addIncOrDecExpr(std::move($1), nullptr, $2, @1, @2, true, mode->sv);
+		$$ = extra->addIncOrDecExpr(std::move($1), nullptr, $2, location_range(@1, @2), true, mode->sv);
 	};
 
 basic_expr:
@@ -3237,12 +3233,12 @@ basic_expr:
 		auto val = p.const2ast(*$4, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
 		if (val == nullptr)
 			log_error("Value conversion failed: `%s'\n", $4->c_str());
-		$$ = std::make_unique<AstNode>(AST_TO_BITS, std::move($2), std::move(val));
+		$$ = std::make_unique<AstNode>(@$, AST_TO_BITS, std::move($2), std::move(val));
 	} |
 	hierarchical_id integral_number {
 		if ($2->compare(0, 1, "'") != 0)
 			err_at_loc(@2, "Cast operation must be applied on sized constants, e.g. <ID>\'d0, while %s is not a sized constant.", $2->c_str());
-		auto bits = std::make_unique<AstNode>(AST_IDENTIFIER);
+		auto bits = std::make_unique<AstNode>(@$, AST_IDENTIFIER);
 		bits->str = *$1;
 		SET_AST_NODE_LOC(bits.get(), @1, @1);
 		auto p = make_ConstParser_here(@2);
@@ -3250,7 +3246,7 @@ basic_expr:
 		SET_AST_NODE_LOC(val.get(), @2, @2);
 		if (val == nullptr)
 			log_error("Value conversion failed: `%s'\n", $2->c_str());
-		$$ = std::make_unique<AstNode>(AST_TO_BITS, std::move(bits), std::move(val));
+		$$ = std::make_unique<AstNode>(@$, AST_TO_BITS, std::move(bits), std::move(val));
 	} |
 	integral_number {
 		auto p = make_ConstParser_here(@1);
@@ -3260,7 +3256,7 @@ basic_expr:
 			log_error("Value conversion failed: `%s'\n", $1->c_str());
 	} |
 	TOK_REALVAL {
-		$$ = std::make_unique<AstNode>(AST_REALVALUE);
+		$$ = std::make_unique<AstNode>(@$, AST_REALVALUE);
 		char *p = (char*)malloc(GetSize(*$1) + 1), *q;
 		for (int i = 0, j = 0; j < GetSize(*$1); j++)
 			if ((*$1)[j] != '_')
@@ -3271,12 +3267,12 @@ basic_expr:
 		free(p);
 	} |
 	TOK_STRING {
-		$$ = AstNode::mkconst_str(*$1);
+		$$ = AstNode::mkconst_str(@1, *$1);
 		SET_AST_NODE_LOC($$.get(), @1, @1);
 	} |
 	hierarchical_id attr {
 		// super sketchy! Orphaned pointer in non-owning extra->ast_stack
-		AstNode *node = new AstNode(AST_FCALL);
+		AstNode *node = new AstNode(@1, AST_FCALL);
 		node->str = *$1;
 		extra->ast_stack.push_back(node);
 		SET_AST_NODE_LOC(node, @1, @1);
@@ -3286,11 +3282,11 @@ basic_expr:
 		extra->ast_stack.pop_back();
 	} |
 	TOK_TO_SIGNED attr TOK_LPAREN expr TOK_RPAREN {
-		$$ = std::make_unique<AstNode>(AST_TO_SIGNED, std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_TO_SIGNED, std::move($4));
 		append_attr($$.get(), $2);
 	} |
 	TOK_TO_UNSIGNED attr TOK_LPAREN expr TOK_RPAREN {
-		$$ = std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_TO_UNSIGNED, std::move($4));
 		append_attr($$.get(), $2);
 	} |
 	TOK_LPAREN expr TOK_RPAREN {
@@ -3303,230 +3299,230 @@ basic_expr:
 		$$ = std::move($2);
 	} |
 	TOK_LCURL expr TOK_LCURL concat_list TOK_RCURL TOK_RCURL {
-		$$ = std::make_unique<AstNode>(AST_REPLICATE, std::move($2), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_REPLICATE, std::move($2), std::move($4));
 	} |
 	TOK_TILDE attr basic_expr %prec UNARY_OPS {
-		$$ = std::make_unique<AstNode>(AST_BIT_NOT, std::move($3));
+		$$ = std::make_unique<AstNode>(@$, AST_BIT_NOT, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 		append_attr($$.get(), $2);
 	} |
 	basic_expr TOK_AMP attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_BIT_AND, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_BIT_AND, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_NAND attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_BIT_NOT, std::make_unique<AstNode>(AST_BIT_AND, std::move($1), std::move($4)));
+		$$ = std::make_unique<AstNode>(@$, AST_BIT_NOT, std::make_unique<AstNode>(@$, AST_BIT_AND, std::move($1), std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr TOK_PIPE attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_BIT_OR, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_BIT_OR, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_NOR attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_BIT_NOT, std::make_unique<AstNode>(AST_BIT_OR, std::move($1), std::move($4)));
+		$$ = std::make_unique<AstNode>(@$, AST_BIT_NOT, std::make_unique<AstNode>(@$, AST_BIT_OR, std::move($1), std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr TOK_CARET attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_BIT_XOR, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_BIT_XOR, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_XNOR attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_BIT_XNOR, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_BIT_XNOR, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	TOK_AMP attr basic_expr %prec UNARY_OPS {
-		$$ = std::make_unique<AstNode>(AST_REDUCE_AND, std::move($3));
+		$$ = std::make_unique<AstNode>(@$, AST_REDUCE_AND, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 		append_attr($$.get(), $2);
 	} |
 	OP_NAND attr basic_expr %prec UNARY_OPS {
-		$$ = std::make_unique<AstNode>(AST_REDUCE_AND, std::move($3));
+		$$ = std::make_unique<AstNode>(@$, AST_REDUCE_AND, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 		append_attr($$.get(), $2);
-		$$ = std::make_unique<AstNode>(AST_LOGIC_NOT, std::move($$));
+		$$ = std::make_unique<AstNode>(@$, AST_LOGIC_NOT, std::move($$));
 	} |
 	TOK_PIPE attr basic_expr %prec UNARY_OPS {
-		$$ = std::make_unique<AstNode>(AST_REDUCE_OR, std::move($3));
+		$$ = std::make_unique<AstNode>(@$, AST_REDUCE_OR, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 		append_attr($$.get(), std::move($2));
 	} |
 	OP_NOR attr basic_expr %prec UNARY_OPS {
-		$$ = std::make_unique<AstNode>(AST_REDUCE_OR, std::move($3));
+		$$ = std::make_unique<AstNode>(@$, AST_REDUCE_OR, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 		append_attr($$.get(), $2);
-		$$ = std::make_unique<AstNode>(AST_LOGIC_NOT, std::move($$));
+		$$ = std::make_unique<AstNode>(@$, AST_LOGIC_NOT, std::move($$));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 	} |
 	TOK_CARET attr basic_expr %prec UNARY_OPS {
-		$$ = std::make_unique<AstNode>(AST_REDUCE_XOR, std::move($3));
+		$$ = std::make_unique<AstNode>(@$, AST_REDUCE_XOR, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 		append_attr($$.get(), $2);
 	} |
 	OP_XNOR attr basic_expr %prec UNARY_OPS {
-		$$ = std::make_unique<AstNode>(AST_REDUCE_XNOR, std::move($3));
+		$$ = std::make_unique<AstNode>(@$, AST_REDUCE_XNOR, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 		append_attr($$.get(), $2);
 	} |
 	basic_expr OP_SHL attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_SHIFT_LEFT, std::move($1), std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4)));
+		$$ = std::make_unique<AstNode>(@$, AST_SHIFT_LEFT, std::move($1), std::make_unique<AstNode>(@$, AST_TO_UNSIGNED, std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_SHR attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_SHIFT_RIGHT, std::move($1), std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4)));
+		$$ = std::make_unique<AstNode>(@$, AST_SHIFT_RIGHT, std::move($1), std::make_unique<AstNode>(@$, AST_TO_UNSIGNED, std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_SSHL attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_SHIFT_SLEFT, std::move($1), std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4)));
+		$$ = std::make_unique<AstNode>(@$, AST_SHIFT_SLEFT, std::move($1), std::make_unique<AstNode>(@$, AST_TO_UNSIGNED, std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_SSHR attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_SHIFT_SRIGHT, std::move($1), std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4)));
+		$$ = std::make_unique<AstNode>(@$, AST_SHIFT_SRIGHT, std::move($1), std::make_unique<AstNode>(@$, AST_TO_UNSIGNED, std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr TOK_LT attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_LT, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_LT, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_LE attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_LE, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_LE, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_EQ attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_EQ, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_EQ, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_NE attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_NE, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_NE, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_EQX attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_EQX, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_EQX, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_NEX attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_NEX, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_NEX, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_GE attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_GE, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_GE, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr TOK_GT attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_GT, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_GT, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr TOK_PLUS attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_ADD, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_ADD, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr TOK_MINUS attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_SUB, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_SUB, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr TOK_ASTER attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_MUL, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_MUL, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr TOK_SLASH attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_DIV, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_DIV, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr TOK_PERC attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_MOD, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_MOD, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_POW attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_POW, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_POW, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	TOK_PLUS attr basic_expr %prec UNARY_OPS {
-		$$ = std::make_unique<AstNode>(AST_POS, std::move($3));
+		$$ = std::make_unique<AstNode>(@$, AST_POS, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 		append_attr($$.get(), $2);
 	} |
 	TOK_MINUS attr basic_expr %prec UNARY_OPS {
-		$$ = std::make_unique<AstNode>(AST_NEG, std::move($3));
+		$$ = std::make_unique<AstNode>(@$, AST_NEG, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 		append_attr($$.get(), $2);
 	} |
 	basic_expr OP_LAND attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_LOGIC_AND, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_LOGIC_AND, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	basic_expr OP_LOR attr basic_expr {
-		$$ = std::make_unique<AstNode>(AST_LOGIC_OR, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_LOGIC_OR, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 		append_attr($$.get(), $3);
 	} |
 	TOK_EXCL attr basic_expr %prec UNARY_OPS {
-		$$ = std::make_unique<AstNode>(AST_LOGIC_NOT, std::move($3));
+		$$ = std::make_unique<AstNode>(@$, AST_LOGIC_NOT, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 		append_attr($$.get(), $2);
 	} |
 	TOK_SIGNED OP_CAST TOK_LPAREN expr TOK_RPAREN {
 		if (!mode->sv)
 			err_at_loc(@2, "Static cast is only supported in SystemVerilog mode.");
-		$$ = std::make_unique<AstNode>(AST_TO_SIGNED, std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_TO_SIGNED, std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |
 	TOK_UNSIGNED OP_CAST TOK_LPAREN expr TOK_RPAREN {
 		if (!mode->sv)
 			err_at_loc(@2, "Static cast is only supported in SystemVerilog mode.");
-		$$ = std::make_unique<AstNode>(AST_TO_UNSIGNED, std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_TO_UNSIGNED, std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |
 	basic_expr OP_CAST TOK_LPAREN expr TOK_RPAREN {
 		if (!mode->sv)
 			err_at_loc(@2, "Static cast is only supported in SystemVerilog mode.");
-		$$ = std::make_unique<AstNode>(AST_CAST_SIZE, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_CAST_SIZE, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |
 	typedef_base_type OP_CAST TOK_LPAREN expr TOK_RPAREN {
 		if (!mode->sv)
 			err_at_loc(@2, "Static cast is only supported in SystemVerilog mode.");
-		$$ = std::make_unique<AstNode>(AST_CAST_SIZE, std::move($1), std::move($4));
+		$$ = std::make_unique<AstNode>(@$, AST_CAST_SIZE, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
 	} |
 	TOK_LPAREN expr TOK_EQ expr TOK_RPAREN {
 		extra->ensureAsgnExprAllowed(@3, mode->sv);
 		$$ = $2->clone();
-		auto node = std::make_unique<AstNode>(AST_ASSIGN_EQ, std::move($2), std::move($4));
+		auto node = std::make_unique<AstNode>(@$, AST_ASSIGN_EQ, std::move($2), std::move($4));
 		SET_AST_NODE_LOC(node.get(), @2, @4);
 		extra->ast_stack.back()->children.push_back(std::move(node));
 	} |
 	TOK_LPAREN expr asgn_binop expr TOK_RPAREN {
 		extra->ensureAsgnExprAllowed(@3, mode->sv);
-		$$ = extra->addAsgnBinopStmt(nullptr, std::move($2), $3, std::move($4), @2, @4)-> clone();
+		$$ = extra->addAsgnBinopStmt(nullptr, std::move($2), $3, std::move($4))-> clone();
 	};
 
 concat_list:
 	expr {
-		$$ = std::make_unique<AstNode>(AST_CONCAT, std::move($1));
+		$$ = std::make_unique<AstNode>(@$, AST_CONCAT, std::move($1));
 	} |
 	expr TOK_COMMA concat_list {
 		$$ = std::move($3);
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 941a7ba3a..fd67b7404 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5710,7 +5710,7 @@ bool RTLIL::SigSpec::parse(RTLIL::SigSpec &sig, RTLIL::Module *module, std::stri
 {
 	cover("kernel.rtlil.sigspec.parse");
 
-	AST::current_filename = "input";
+	// AST::current_filename = "input";
 
 	std::vector<std::string> tokens;
 	sigspec_parse_split(tokens, str, ',');
@@ -5726,7 +5726,7 @@ bool RTLIL::SigSpec::parse(RTLIL::SigSpec &sig, RTLIL::Module *module, std::stri
 
 		if (('0' <= netname[0] && netname[0] <= '9') || netname[0] == '\'') {
 			cover("kernel.rtlil.sigspec.parse.const");
-			VERILOG_FRONTEND::ConstParser p;
+			VERILOG_FRONTEND::ConstParser p{location()};
 			auto ast = p.const2ast(netname);
 			if (ast == nullptr)
 				return false;

From 87352f97b22da3bd184b0502e2d68a607e3cc8fe Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 24 Jun 2025 22:14:30 +0200
Subject: [PATCH 308/931] fixup! ast, read_verilog: unify location types,
 reduce filename copying

---
 frontends/verilog/verilog_error.cc   | 54 ++++++++++++++++
 frontends/verilog/verilog_error.h    | 25 ++++++++
 frontends/verilog/verilog_location.h | 96 ++++++++++++++++++++++++++++
 3 files changed, 175 insertions(+)
 create mode 100644 frontends/verilog/verilog_error.cc
 create mode 100644 frontends/verilog/verilog_error.h
 create mode 100644 frontends/verilog/verilog_location.h

diff --git a/frontends/verilog/verilog_error.cc b/frontends/verilog/verilog_error.cc
new file mode 100644
index 000000000..410a13580
--- /dev/null
+++ b/frontends/verilog/verilog_error.cc
@@ -0,0 +1,54 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ *  ---
+ *
+ */
+
+#include "kernel/yosys_common.h"
+#include "frontends/verilog/verilog_error.h"
+#include "frontends/verilog/verilog_location.h"
+
+USING_YOSYS_NAMESPACE
+
+[[noreturn]]
+static void verr_at(std::string filename, int begin_line, char const *fmt, va_list ap)
+{
+    char buffer[1024];
+    char *p = buffer;
+    p += vsnprintf(p, buffer + sizeof(buffer) - p, fmt, ap);
+    p += snprintf(p, buffer + sizeof(buffer) - p, "\n");
+    YOSYS_NAMESPACE_PREFIX log_file_error(filename, begin_line, "%s", buffer);
+    exit(1);
+}
+
+void VERILOG_FRONTEND::err_at_ast(AST::AstSrcLocType loc, char const *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    verr_at(*loc.begin.filename, loc.begin.line, fmt, args);
+    va_end(args);
+}
+
+[[noreturn]]
+void VERILOG_FRONTEND::err_at_loc(location loc, char const *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    verr_at(loc.begin.filename ? *(loc.begin.filename) : "UNKNOWN", loc.begin.line, fmt, args);
+}
+
diff --git a/frontends/verilog/verilog_error.h b/frontends/verilog/verilog_error.h
new file mode 100644
index 000000000..4cb65164b
--- /dev/null
+++ b/frontends/verilog/verilog_error.h
@@ -0,0 +1,25 @@
+#ifndef VERILOG_ERROR_H
+#define VERILOG_ERROR_H
+
+#include "kernel/yosys_common.h"
+#include "frontends/ast/ast.h"
+#include "frontends/verilog/verilog_location.h"
+
+#if ! defined(yyFlexLexerOnce)
+#define yyFlexLexer frontend_verilog_yyFlexLexer
+#include <FlexLexer.h>
+#endif
+
+YOSYS_NAMESPACE_BEGIN
+
+namespace VERILOG_FRONTEND
+{
+    [[noreturn]]
+    void err_at_ast(AST::AstSrcLocType loc, char const *fmt, ...);
+    [[noreturn]]
+    void err_at_loc(location loc, char const *fmt, ...);
+};
+
+YOSYS_NAMESPACE_END
+
+#endif
diff --git a/frontends/verilog/verilog_location.h b/frontends/verilog/verilog_location.h
new file mode 100644
index 000000000..d2ef8e94c
--- /dev/null
+++ b/frontends/verilog/verilog_location.h
@@ -0,0 +1,96 @@
+#ifndef VERILOG_LOCATION_H
+#define VERILOG_LOCATION_H
+
+#include <memory>
+#include <string>
+#include <stack>
+#include <string>
+
+/**
+ * Provide frontend-wide location tracking like what bison generates
+ * but using shared_ptr for filename
+ */
+
+struct position {
+	std::shared_ptr<std::string> filename;
+	int line;
+	int column;
+
+	position(std::shared_ptr<std::string> filename, int line = 1, int column = 1)
+		: filename(filename), line(line), column(column) {}
+	position() = default;
+	position(const position& other) = default;
+	position& operator=(const position& other) = default;
+
+	void advance() { ++column; }
+	void columns(int count = 1) {
+		column += count;
+	}
+
+	void lines(int count = 1) {
+		line += count;
+		column = 1;
+	}
+	std::string to_string() const  {
+		std::ostringstream oss;
+		if (filename && !filename->empty()) {
+			oss << *filename << ":";
+		}
+		oss << line << ":" << column;
+		return oss.str();
+	}
+};
+
+struct location {
+	position begin;
+	position end;
+
+	location() = default;
+	location(const position& b, const position& e)
+		: begin(b), end(e) {}
+	location(const location& other) = default;
+	location& operator=(const location& other) = default;
+
+	void step() { begin = end; }
+
+	void columns(int count = 1) {
+		end.columns(count);
+	}
+
+	void lines(int count = 1) {
+		end.lines(count);
+	}
+	std::string to_string() const {
+		std::ostringstream oss;
+		bool same_file = (!begin.filename && !end.filename) ||
+						(begin.filename && end.filename &&
+						*begin.filename == *end.filename);
+
+		if (same_file) {
+			if (begin.filename && !begin.filename->empty())
+				oss << *begin.filename << ":";
+
+			if (begin.line == end.line) {
+				if (begin.column == end.column) {
+					oss << begin.line << ":" << begin.column;
+				} else {
+					oss << begin.line << ":" << begin.column
+						<< "-" << end.column;
+				}
+			} else {
+				oss << begin.line << ":" << begin.column
+					<< "-" << end.line << ":" << end.column;
+			}
+		} else {
+			oss << begin.to_string() << "-" << end.to_string();
+		}
+
+		return oss.str();
+	}
+};
+
+static inline std::ostream& operator<<(std::ostream& os, const location& loc) {
+	return os << loc.to_string();
+}
+
+#endif

From 27899180a339dc0d0f88a26439d6776fbf02f73d Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 24 Jun 2025 22:45:59 +0200
Subject: [PATCH 309/931] fixup! fixup! ast, read_verilog: unify location
 types, reduce filename copying

---
 frontends/verilog/verilog_frontend.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frontends/verilog/verilog_frontend.h b/frontends/verilog/verilog_frontend.h
index e97cee4fc..eabc0d46b 100644
--- a/frontends/verilog/verilog_frontend.h
+++ b/frontends/verilog/verilog_frontend.h
@@ -32,11 +32,6 @@
 #include "kernel/yosys.h"
 #include "frontends/ast/ast.h"
 
-#if ! defined(yyFlexLexerOnce)
-#define yyFlexLexer frontend_verilog_yyFlexLexer
-#include <FlexLexer.h>
-#endif
-
 #include <stdio.h>
 #include <stdint.h>
 

From 2b7b09b81adf0e1989f6f117cd5a9e30122636ee Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 25 Jun 2025 10:23:44 +1200
Subject: [PATCH 310/931] Add libfl-dev

Should fix the missing `<FlexLexer.h>` error.
---
 .github/actions/setup-build-env/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index dfdcd88c0..059287a63 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -8,7 +8,7 @@ runs:
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install gperf build-essential bison flex libreadline-dev gawk tcl-dev libffi-dev git graphviz xdot pkg-config python3 libboost-system-dev libboost-python-dev libboost-filesystem-dev zlib1g-dev libbz2-dev
+        sudo apt-get install gperf build-essential bison flex libfl-dev libreadline-dev gawk tcl-dev libffi-dev git graphviz xdot pkg-config python3 libboost-system-dev libboost-python-dev libboost-filesystem-dev zlib1g-dev libbz2-dev
 
     - name: Install macOS Dependencies
       if: runner.os == 'macOS'

From 8e89eab9a280cd3c179d3cc0a8d43e8113efc3db Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 25 Jun 2025 10:38:07 +1200
Subject: [PATCH 311/931] preproc depends on parser

---
 frontends/verilog/Makefile.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontends/verilog/Makefile.inc b/frontends/verilog/Makefile.inc
index a563c899c..838ee8c58 100644
--- a/frontends/verilog/Makefile.inc
+++ b/frontends/verilog/Makefile.inc
@@ -13,6 +13,8 @@ frontends/verilog/verilog_parser.tab.hh: frontends/verilog/verilog_parser.tab.cc
 frontends/verilog/verilog_frontend.h: frontends/verilog/verilog_parser.tab.hh
 frontends/verilog/verilog_error.h: frontends/verilog/verilog_parser.tab.hh
 
+frontends/verilog/preproc.o: frontends/verilog/verilog_parser.tab.hh
+
 frontends/verilog/verilog_lexer.cc: frontends/verilog/verilog_lexer.l frontends/verilog/verilog_parser.tab.cc
 	$(Q) mkdir -p $(dir $@)
 	$(P) flex -o frontends/verilog/verilog_lexer.cc $<

From 69f2f3ca8122e1111953c72875ed5f17d8e8920e Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 25 Jun 2025 10:39:50 +1200
Subject: [PATCH 312/931] docs/verilog_frontend.rst: Fix indentation

---
 .../source/yosys_internals/flow/verilog_frontend.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/source/yosys_internals/flow/verilog_frontend.rst b/docs/source/yosys_internals/flow/verilog_frontend.rst
index d6bdf6b6d..2a26daec3 100644
--- a/docs/source/yosys_internals/flow/verilog_frontend.rst
+++ b/docs/source/yosys_internals/flow/verilog_frontend.rst
@@ -187,13 +187,13 @@ simplifies the creation of AST nodes for simple expressions a bit. For example
 the bison code for parsing multiplications:
 
 .. code:: none
-   	:number-lines:
+   :number-lines:
 
-  basic_expr TOK_ASTER attr basic_expr {
-    $$ = std::make_unique<AstNode>(AST_MUL, std::move($1), std::move($4));
-    SET_AST_NODE_LOC($$.get(), @1, @4);
-    append_attr($$.get(), $3);
-  } |
+   basic_expr TOK_ASTER attr basic_expr {
+     $$ = std::make_unique<AstNode>(AST_MUL, std::move($1), std::move($4));
+     SET_AST_NODE_LOC($$.get(), @1, @4);
+     append_attr($$.get(), $3);
+   } |
 
 The generated AST data structure is then passed directly to the AST frontend
 that performs the actual conversion to RTLIL.

From d2573f168d0e94b12a17841935200847bcbae63d Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 25 Jun 2025 11:25:39 +1200
Subject: [PATCH 313/931] preproc.cc: Use full path for generated file

Fixes out-of-tree builds.
---
 frontends/verilog/preproc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontends/verilog/preproc.cc b/frontends/verilog/preproc.cc
index d07e39189..b83fad7c3 100644
--- a/frontends/verilog/preproc.cc
+++ b/frontends/verilog/preproc.cc
@@ -34,7 +34,7 @@
 
 #include "preproc.h"
 #include "verilog_frontend.h"
-#include "verilog_parser.tab.hh"
+#include "frontends/verilog/verilog_parser.tab.hh"
 #include "kernel/log.h"
 #include <assert.h>
 #include <stack>

From f4016d96ccc74fc4e792b112656d1c84a8087e42 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 25 Jun 2025 11:32:46 +1200
Subject: [PATCH 314/931] Makefile: Add flex lib/include for brew

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 512c1410d..b0f565338 100644
--- a/Makefile
+++ b/Makefile
@@ -132,8 +132,8 @@ ifeq ($(ENABLE_PYOSYS),1)
 CXXFLAGS += -I$(BREW_PREFIX)/boost/include
 LINKFLAGS += -L$(BREW_PREFIX)/boost/lib -L$(BREW_PREFIX)/boost-python3/lib
 endif
-CXXFLAGS += -I$(BREW_PREFIX)/readline/include
-LINKFLAGS += -L$(BREW_PREFIX)/readline/lib
+CXXFLAGS += -I$(BREW_PREFIX)/readline/include -I$(BREW_PREFIX)/flex/include
+LINKFLAGS += -L$(BREW_PREFIX)/readline/lib -L$(BREW_PREFIX)/flex/lib
 PKG_CONFIG_PATH := $(BREW_PREFIX)/libffi/lib/pkgconfig:$(PKG_CONFIG_PATH)
 PKG_CONFIG_PATH := $(BREW_PREFIX)/tcl-tk/lib/pkgconfig:$(PKG_CONFIG_PATH)
 export PATH := $(BREW_PREFIX)/bison/bin:$(BREW_PREFIX)/gettext/bin:$(BREW_PREFIX)/flex/bin:$(PATH)

From 0f7080ebf8cbccbbf8cd2a183498d7abf3849a42 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 25 Jun 2025 11:37:40 +1200
Subject: [PATCH 315/931] dpicall.cc: Fix sans-plugin function call

---
 frontends/ast/dpicall.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontends/ast/dpicall.cc b/frontends/ast/dpicall.cc
index 07314e3d7..d76318739 100644
--- a/frontends/ast/dpicall.cc
+++ b/frontends/ast/dpicall.cc
@@ -153,7 +153,7 @@ YOSYS_NAMESPACE_END
 
 YOSYS_NAMESPACE_BEGIN
 
-AST::AstNode *AST::dpi_call(AstSrcLocType loc, const std::string&, const std::string &fname, const std::vector<std::string>&, const std::vector<AstNode*>&)
+std::unique_ptr<AST::AstNode> AST::dpi_call(AstSrcLocType, const std::string&, const std::string &fname, const std::vector<std::string>&, const std::vector<std::unique_ptr<AST::AstNode>>&)
 {
 	log_error("Can't call DPI function `%s': this version of yosys is built without plugin support\n", fname.c_str());
 }

From e6e680cd62cc75be9c6e1a7439473956bafdfd23 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 9 Jul 2025 14:34:03 +0200
Subject: [PATCH 316/931] readme, verilog_parser: bison 3.8 and ubuntu 22.04
 example

---
 README.md                          | 2 +-
 frontends/verilog/verilog_parser.y | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e5b8d1072..96fd54a52 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,7 @@ recommended) and some standard tools such as GNU Flex, GNU Bison, and GNU Make.
 TCL, readline and libffi are optional (see ``ENABLE_*`` settings in Makefile).
 Xdot (graphviz) is used by the ``show`` command in yosys to display schematics.
 
-For example on Ubuntu Linux 16.04 LTS the following commands will install all
+For example on Ubuntu Linux 22.04 LTS the following commands will install all
 prerequisites for building yosys:
 
 	$ sudo apt-get install build-essential clang lld bison flex \
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 743061ae5..8192c0eb4 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -33,7 +33,7 @@
  *
  */
 
-%require "3.0"
+%require "3.8"
 %language "c++"
 %define api.value.type variant
 %define api.prefix {frontend_verilog_yy}

From 42b5c14e359d538e5b3b7f0f6d9547abc6d536a6 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 9 Jul 2025 15:24:34 +0200
Subject: [PATCH 317/931] read_verilog, ast: use unified locations in errors
 and simplify dependencies

---
 frontends/verilog/.gitignore          |  1 -
 frontends/verilog/Makefile.inc        |  6 ++----
 frontends/verilog/verilog_error.cc    | 14 ++++++--------
 frontends/verilog/verilog_error.h     |  7 -------
 frontends/verilog/verilog_frontend.cc |  2 +-
 frontends/verilog/verilog_lexer.h     |  5 +++++
 frontends/verilog/verilog_parser.y    |  4 ++--
 7 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/frontends/verilog/.gitignore b/frontends/verilog/.gitignore
index cb6775cbc..aadbcdcdd 100644
--- a/frontends/verilog/.gitignore
+++ b/frontends/verilog/.gitignore
@@ -2,4 +2,3 @@ verilog_lexer.cc
 verilog_parser.output
 verilog_parser.tab.cc
 verilog_parser.tab.hh
-stack.hh
diff --git a/frontends/verilog/Makefile.inc b/frontends/verilog/Makefile.inc
index 838ee8c58..67e8074bf 100644
--- a/frontends/verilog/Makefile.inc
+++ b/frontends/verilog/Makefile.inc
@@ -3,18 +3,16 @@ GENFILES += frontends/verilog/verilog_parser.tab.cc
 GENFILES += frontends/verilog/verilog_parser.tab.hh
 GENFILES += frontends/verilog/verilog_parser.output
 GENFILES += frontends/verilog/verilog_lexer.cc
-GENFILES += frontends/verilog/stack.hh
 
-frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y frontends/verilog/verilog_location.h
+frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y
 	$(Q) mkdir -p $(dir $@)
 	$(P) $(BISON) -Wall -Werror -o $@ -d -r all -b frontends/verilog/verilog_parser $<
 
 frontends/verilog/verilog_parser.tab.hh: frontends/verilog/verilog_parser.tab.cc
-frontends/verilog/verilog_frontend.h: frontends/verilog/verilog_parser.tab.hh
-frontends/verilog/verilog_error.h: frontends/verilog/verilog_parser.tab.hh
 
 frontends/verilog/preproc.o: frontends/verilog/verilog_parser.tab.hh
 
+frontends/verilog/verilog_lexer.h: frontends/verilog/verilog_parser.tab.hh
 frontends/verilog/verilog_lexer.cc: frontends/verilog/verilog_lexer.l frontends/verilog/verilog_parser.tab.cc
 	$(Q) mkdir -p $(dir $@)
 	$(P) flex -o frontends/verilog/verilog_lexer.cc $<
diff --git a/frontends/verilog/verilog_error.cc b/frontends/verilog/verilog_error.cc
index 410a13580..4adfaafa6 100644
--- a/frontends/verilog/verilog_error.cc
+++ b/frontends/verilog/verilog_error.cc
@@ -25,6 +25,12 @@
 
 USING_YOSYS_NAMESPACE
 
+/**
+ * Legacy behavior is to only track lines. Now we have columns too, but we don't
+ * report them in errors.
+ * TODO: report columns, too
+ */
+
 [[noreturn]]
 static void verr_at(std::string filename, int begin_line, char const *fmt, va_list ap)
 {
@@ -36,14 +42,6 @@ static void verr_at(std::string filename, int begin_line, char const *fmt, va_li
     exit(1);
 }
 
-void VERILOG_FRONTEND::err_at_ast(AST::AstSrcLocType loc, char const *fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    verr_at(*loc.begin.filename, loc.begin.line, fmt, args);
-    va_end(args);
-}
-
 [[noreturn]]
 void VERILOG_FRONTEND::err_at_loc(location loc, char const *fmt, ...)
 {
diff --git a/frontends/verilog/verilog_error.h b/frontends/verilog/verilog_error.h
index 4cb65164b..2eeb4538e 100644
--- a/frontends/verilog/verilog_error.h
+++ b/frontends/verilog/verilog_error.h
@@ -5,17 +5,10 @@
 #include "frontends/ast/ast.h"
 #include "frontends/verilog/verilog_location.h"
 
-#if ! defined(yyFlexLexerOnce)
-#define yyFlexLexer frontend_verilog_yyFlexLexer
-#include <FlexLexer.h>
-#endif
-
 YOSYS_NAMESPACE_BEGIN
 
 namespace VERILOG_FRONTEND
 {
-    [[noreturn]]
-    void err_at_ast(AST::AstSrcLocType loc, char const *fmt, ...);
     [[noreturn]]
     void err_at_loc(location loc, char const *fmt, ...);
 };
diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index 733ec8ba7..e7d34dac5 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -51,7 +51,7 @@ static std::list<std::vector<std::string>> verilog_defaults_stack;
 static void error_on_dpi_function(AST::AstNode *node)
 {
     if (node->type == AST::AST_DPI_FUNCTION)
-        err_at_ast(node->location, "Found DPI function %s.\n", node->str.c_str());
+        err_at_loc(node->location, "Found DPI function %s.\n", node->str.c_str());
     for (auto& child : node->children)
         error_on_dpi_function(child.get());
 }
diff --git a/frontends/verilog/verilog_lexer.h b/frontends/verilog/verilog_lexer.h
index b7885181c..fe56b27d2 100644
--- a/frontends/verilog/verilog_lexer.h
+++ b/frontends/verilog/verilog_lexer.h
@@ -7,6 +7,11 @@
 #include <string>
 #include <memory>
 
+#if ! defined(yyFlexLexerOnce)
+#define yyFlexLexer frontend_verilog_yyFlexLexer
+#include <FlexLexer.h>
+#endif
+
 YOSYS_NAMESPACE_BEGIN
 
 namespace VERILOG_FRONTEND {
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 8192c0eb4..5f77e712f 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -200,7 +200,7 @@
 			if (type_node->range_left >= 0 && type_node->range_right >= 0) {
 				// type already restricts the range
 				if (range_node) {
-					err_at_ast(type_node->location, "integer/genvar types cannot have packed dimensions.");
+					err_at_loc(type_node->location, "integer/genvar types cannot have packed dimensions.");
 				}
 				else {
 					range_node = makeRange(type_node->location, type_node->range_left, type_node->range_right, false);
@@ -217,7 +217,7 @@
 					}
 				}
 				if (!valid)
-					err_at_ast(type_node->location, "wire/reg/logic packed dimension must be of the form [<expr>:<expr>]");
+					err_at_loc(type_node->location, "wire/reg/logic packed dimension must be of the form [<expr>:<expr>]");
 			}
 
 			return range_node;

From 0a5aa4c78b6417c7cbd9e31564aadc8ffcf5a438 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 9 Jul 2025 16:11:10 +0200
Subject: [PATCH 318/931] docs: fix verilog frontend internals

---
 .../yosys_internals/flow/verilog_frontend.rst    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/source/yosys_internals/flow/verilog_frontend.rst b/docs/source/yosys_internals/flow/verilog_frontend.rst
index 2a26daec3..8381641b3 100644
--- a/docs/source/yosys_internals/flow/verilog_frontend.rst
+++ b/docs/source/yosys_internals/flow/verilog_frontend.rst
@@ -47,9 +47,9 @@ be found in :file:`frontends/verilog/verilog_lexer.l` in the Yosys source tree.
 The lexer does little more than identifying all keywords and literals recognised
 by the Yosys Verilog frontend.
 
-The lexer keeps track of the current location in the Verilog source code using
-some VerilogLexer member variables. These variables are used by the constructor of AST nodes
-to annotate each node with the source code location it originated from.
+The lexer keeps track of the current location in the Verilog source code with
+a ``VerilogLexer::out_loc`` and uses it to construct parser-defined
+symbol objects.
 
 Finally the lexer identifies and handles special comments such as "``// synopsys
 translate_off``" and "``// synopsys full_case``". (It is recommended to use
@@ -178,11 +178,11 @@ properties:
 
 -  | Source code location
    | Each ``AST::AstNode`` is automatically annotated with the current source
-     code location by the ``AST::AstNode`` constructor. It is stored in the
-     ``std::string filename`` and ``int linenum`` member variables.
+     code location by the ``AST::AstNode`` constructor. The ``location`` type
+     is a manual reimplementation of the bison-provided location type. This
+     type is defined at ``frontends/verilog/verilog_location.h``.
 
-The ``AST::AstNode`` constructor can be called with up to two child nodes that
-are automatically added to the list of child nodes for the new object. This
+The ``AST::AstNode`` constructor can be called with up to 4 child nodes. This
 simplifies the creation of AST nodes for simple expressions a bit. For example
 the bison code for parsing multiplications:
 
@@ -205,7 +205,7 @@ tree respectively.
 Transforming AST to RTLIL
 -------------------------
 
-The AST Frontend converts a set of modules in AST representation to modules in
+The AST frontend converts a set of modules in AST representation to modules in
 RTLIL representation and adds them to the current design. This is done in two
 steps: simplification and RTLIL generation.
 

From 105a3cd32d548e04089ac4cf1ec5449b3f25d0e3 Mon Sep 17 00:00:00 2001
From: garytwong <garytwong@users.noreply.github.com>
Date: Thu, 19 Jun 2025 16:41:18 +0000
Subject: [PATCH 319/931] verilog: fix string literal regular expression
 (#5187)

* verilog: fix string literal regular expression.

A backslash was improperly quoted, causing string literal matching
to fail when the final token before a closing quote was an escaped
backslash.

* verilog: add regression test for string literal regex bug.

Test for bug triggered by escaped backslash immediately before
closing quote (introduced in ca7d94af and fixed by 40aa7eaf).
---
 frontends/verilog/verilog_lexer.l | 2 +-
 tests/verilog/bug5160.v           | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 tests/verilog/bug5160.v

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 84d5ce880..ee4611ceb 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -372,7 +372,7 @@ TIME_SCALE_SUFFIX [munpf]?s
 }
 
 \"		{ BEGIN(STRING); }
-<STRING>([^\"]|\\.)+	{ yymore(); }
+<STRING>([^\\"]|\\.)+	{ yymore(); }
 <STRING>\"	{
 	BEGIN(0);
 	char *yystr = strdup(YYText());
diff --git a/tests/verilog/bug5160.v b/tests/verilog/bug5160.v
new file mode 100644
index 000000000..5b141a360
--- /dev/null
+++ b/tests/verilog/bug5160.v
@@ -0,0 +1,5 @@
+// Regression test for bug mentioned in #5160:
+// https://github.com/YosysHQ/yosys/pull/5160#issuecomment-2983643084
+module top;
+    initial $display( "\\" );
+endmodule

From 4ffd05af6fdf7c90ce544ded320822765a561465 Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Thu, 3 Jul 2025 20:51:12 -0600
Subject: [PATCH 320/931] verilog: add support for SystemVerilog string
 literals.

Differences are new escape sequences (including escaped newline
continuations and hex escapes) and triple-quoted literals.
---
 docs/source/using_yosys/verilog.rst |   3 +
 frontends/verilog/verilog_lexer.l   | 167 +++++++++++++-----
 tests/verilog/bug5160.v             |   5 -
 tests/verilog/string-literals.ys    | 257 ++++++++++++++++++++++++++++
 4 files changed, 385 insertions(+), 47 deletions(-)
 delete mode 100644 tests/verilog/bug5160.v
 create mode 100644 tests/verilog/string-literals.ys

diff --git a/docs/source/using_yosys/verilog.rst b/docs/source/using_yosys/verilog.rst
index eb18cb699..92f223e49 100644
--- a/docs/source/using_yosys/verilog.rst
+++ b/docs/source/using_yosys/verilog.rst
@@ -379,3 +379,6 @@ from SystemVerilog:
   will process conditionals using these keywords by annotating their
   representation with the appropriate ``full_case`` and/or ``parallel_case``
   attributes, which are described above.)
+
+- SystemVerilog string literals are supported (triple-quoted strings and
+  escape sequences such as line continuations and hex escapes).
diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index ee4611ceb..d6918d19c 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -154,11 +154,132 @@ parser::symbol_type char_tok(char c, parser::location_type loc) {
 			return parser::make_ch_t(c, loc);
 	}
 }
+static bool is_hex_dig(char c, int *val, parser::location_type loc)
+{
+	if ('0' <= c && c <= '9') {
+		*val = c - '0';
+		return true;
+	} else if ('a' <= c && c <= 'f') {
+		*val = c - 'a' + 0xA;
+		return true;
+	} else if ('A' <= c && c <= 'F') {
+		*val = c - 'A' + 0xA;
+		return true;
+	} else if (c == 'x' || c == 'X' || c == 'z' || c == 'Z' || c == '?') {
+		log_file_warning(loc.begin.filename->c_str(), loc.begin.line, "'%c' not a valid digit in hex escape sequence.\n", c);
+		*val = 0; // not semantically valid in hex escape...
+		return true; // ...but still processed as part of hex token
+	}
+
+	return false;
+}
+
+static bool is_oct_dig(char c, int *val, parser::location_type loc)
+{
+	if ('0' <= c && c <= '7') {
+		*val = c - '0';
+		return true;
+	} else if (c == 'x' || c == 'X' || c == 'z' || c == 'Z' || c == '?') {
+		log_file_warning(loc.begin.filename->c_str(), loc.begin.line, "'%c' not a valid digit in octal escape sequence.\n", c);
+		*val = 0; // not semantically valid in octal escape...
+		return true; // ...but still processed as part of octal token
+	}
+
+	return false;
+}
+
+static parser::symbol_type process_str(char *str, int len, bool triple, parser::location_type loc)
+{
+	char *in, *out; // Overwrite input buffer: flex manual states "Actions
+		// are free to modify 'yytext' except for lengthening it".
+
+	for (in = str, out = str; in < str + len; in++)
+		switch (*in) {
+		case '\n':
+		case '\r':
+			if (in + 1 < str + len && (in[1] ^ *in) == ('\n' ^ '\r'))
+				in++;
+			if (!triple)
+				log_file_warning(loc.begin.filename->c_str(), loc.begin.line, "Multi-line string literals should be triple-quoted or escaped.\n");
+			*out++ = '\n';
+			break;
+		case '\\':
+			in++;
+			log_assert(in < str + len);
+			switch (*in) {
+			case 'a':
+				*out++ = '\a';
+				break;
+			case 'f':
+				*out++ = '\f';
+				break;
+			case 'n':
+				*out++ = '\n';
+				break;
+			case 'r': /* not part of IEEE-1800 2023, but seems
+				     like a good idea to support it anyway */
+				*out++ = '\r';
+				break;
+			case 't':
+				*out++ = '\t';
+				break;
+			case 'v':
+				*out++ = '\v';
+				break;
+			case 'x':
+				int val;
+				if (in + 1 < str + len && is_hex_dig(in[1], &val, loc)) {
+					*out = val;
+					in++;
+					if (in + 1 < str + len && is_hex_dig(in[1], &val, loc)) {
+						*out = *out * 0x10 + val;
+						in++;
+					}
+					out++;
+				} else
+					log_file_warning(loc.begin.filename->c_str(), loc.begin.line, "ignoring invalid hex escape.\n");
+				break;
+			case '\\':
+				*out++ = '\\';
+				break;
+			case '"':
+				*out++ = '"';
+				break;
+			case '\n':
+			case '\r':
+				if (in + 1 < str + len && (in[1] ^ *in) == ('\n' ^ '\r'))
+					in++;
+				break;
+			default:
+				if ('0' <= *in && *in <= '7') {
+					int val;
+
+					*out = *in - '0';
+					if (in + 1 < str + len && is_oct_dig(in[1], &val, loc)) {
+						*out = *out * 010 + val;
+						in++;
+						if (in + 1 < str + len && is_oct_dig(in[1], &val, loc)) {
+							if (*out >= 040)
+								log_file_warning(loc.begin.filename->c_str(), loc.begin.line, "octal escape exceeds \\377\n");
+							*out = *out * 010 + val;
+							in++;
+						}
+					}
+					out++;
+				} else
+					*out++ = *in;
+			}
+			break;
+		default:
+			*out++ = *in;
+		}
+
+	return parser::make_TOK_STRING(std::make_unique<std::string>(str, out - str), loc);
+}
 
 %}
 
 %x COMMENT
-%x STRING
 %x SYNOPSYS_TRANSLATE_OFF
 %x SYNOPSYS_FLAGS
 %x IMPORT_DPI
@@ -371,47 +492,9 @@ TIME_SCALE_SUFFIX [munpf]?s
 	return parser::make_TOK_REALVAL(std::move(val), out_loc);
 }
 
-\"		{ BEGIN(STRING); }
-<STRING>([^\\"]|\\.)+	{ yymore(); }
-<STRING>\"	{
-	BEGIN(0);
-	char *yystr = strdup(YYText());
-	yystr[strlen(YYText()) - 1] = 0;
-	int i = 0, j = 0;
-	while (yystr[i]) {
-		if (yystr[i] == '\\' && yystr[i + 1]) {
-			i++;
-			if (yystr[i] == 'a')
-				yystr[i] = '\a';
-			else if (yystr[i] == 'f')
-				yystr[i] = '\f';
-			else if (yystr[i] == 'n')
-				yystr[i] = '\n';
-			else if (yystr[i] == 'r')
-				yystr[i] = '\r';
-			else if (yystr[i] == 't')
-				yystr[i] = '\t';
-			else if (yystr[i] == 'v')
-				yystr[i] = '\v';
-			else if ('0' <= yystr[i] && yystr[i] <= '7') {
-				yystr[i] = yystr[i] - '0';
-				if ('0' <= yystr[i + 1] && yystr[i + 1] <= '7') {
-					yystr[i + 1] = yystr[i] * 8 + yystr[i + 1] - '0';
-					i++;
-				}
-				if ('0' <= yystr[i + 1] && yystr[i + 1] <= '7') {
-					yystr[i + 1] = yystr[i] * 8 + yystr[i + 1] - '0';
-					i++;
-				}
-			}
-		}
-		yystr[j++] = yystr[i++];
-	}
-	yystr[j] = 0;
-	string_t val = std::make_unique<std::string>(yystr, j);
-	free(yystr);
-	return parser::make_TOK_STRING(std::move(val), out_loc);
-}
+\"([^\\"]|\\.|\\\n)*\"			{ return process_str(yytext + 1, yyleng - 2, false, out_loc); }
+
+\"{3}(\"{0,2}([^\\"]|\\.|\\\n))*\"{3}	{ return process_str(yytext + 3, yyleng - 6, true, out_loc); }
 
 and|nand|or|nor|xor|xnor|not|buf|bufif0|bufif1|notif0|notif1 {
 	auto val = std::make_unique<std::string>(YYText());
diff --git a/tests/verilog/bug5160.v b/tests/verilog/bug5160.v
deleted file mode 100644
index 5b141a360..000000000
--- a/tests/verilog/bug5160.v
+++ /dev/null
@@ -1,5 +0,0 @@
-// Regression test for bug mentioned in #5160:
-// https://github.com/YosysHQ/yosys/pull/5160#issuecomment-2983643084
-module top;
-    initial $display( "\\" );
-endmodule
diff --git a/tests/verilog/string-literals.ys b/tests/verilog/string-literals.ys
new file mode 100644
index 000000000..a0f0f0460
--- /dev/null
+++ b/tests/verilog/string-literals.ys
@@ -0,0 +1,257 @@
+# Test valid escape sequences yield correct results:
+logger -expect-no-warnings
+read_verilog << EOF
+module top;
+	wire[7:0] sp = "\ ";
+	wire[7:0] spval = 32;
+	wire[7:0] ex = "\!";
+	wire[7:0] exval = 33;
+	wire[7:0] dq = "\"";
+	wire[7:0] dqval = 34;
+	wire[7:0] ha = "\#";
+	wire[7:0] haval = 35;
+	wire[7:0] do = "\$";
+	wire[7:0] doval = 36;
+	wire[7:0] pc = "\%";
+	wire[7:0] pcval = 37;
+	wire[7:0] am = "\&";
+	wire[7:0] amval = 38;
+	wire[7:0] sq = "\'";
+	wire[7:0] sqval = 39;
+	wire[7:0] op = "\(";
+	wire[7:0] opval = 40;
+	wire[7:0] cp = "\)";
+	wire[7:0] cpval = 41;
+	wire[7:0] as = "\*";
+	wire[7:0] asval = 42;
+	wire[7:0] pl = "\+";
+	wire[7:0] plval = 43;
+	wire[7:0] co = "\,";
+	wire[7:0] coval = 44;
+	wire[7:0] mi = "\-";
+	wire[7:0] mival = 45;
+	wire[7:0] do = "\.";
+	wire[7:0] doval = 46;
+	wire[7:0] sl = "\/";
+	wire[7:0] slval = 47;
+
+	wire[7:0] dig0 = "\012";
+	wire[7:0] dig0val = 10;
+	wire[7:0] dig8 = "\8"; // not octal, a literal '8'
+	wire[7:0] dig8val = 56;
+	wire[7:0] dig9 = "\9"; // not octal, a literal '9'
+	wire[7:0] dig9val = 57;
+	
+	wire[7:0] cl = "\:";
+	wire[7:0] clval = 58;
+	wire[7:0] sc = "\;";
+	wire[7:0] scval = 59;
+	wire[7:0] lt = "\<";
+	wire[7:0] ltval = 60;
+	wire[7:0] eq = "\=";
+	wire[7:0] eqval = 61;
+	wire[7:0] gt = "\>";
+	wire[7:0] gtval = 62;
+	wire[7:0] qu = "\?";
+	wire[7:0] quval = 63;
+	wire[7:0] at = "\@";
+	wire[7:0] atval = 64;
+
+	wire[7:0] A = "\A";
+	wire[7:0] Aval = 65; // etc. etc.
+
+	wire[7:0] os = "\[";
+	wire[7:0] osval = 91;
+	wire[7:0] bs = "\\";
+	wire[7:0] bsval = 92;
+	wire[7:0] cs = "\]";
+	wire[7:0] csval = 93;
+	wire[7:0] ca = "\^";
+	wire[7:0] caval = 94;
+	wire[7:0] us = "\_";
+	wire[7:0] usval = 95;
+	wire[7:0] bq = "\`";
+	wire[7:0] bqval = 96;
+
+	wire[7:0] a = "\a"; // alert, ASCII BEL=7
+	wire[7:0] aval = 7;
+	wire[7:0] b = "\b";
+	wire[7:0] bval = 98;
+	wire[7:0] c = "\c";
+	wire[7:0] cval = 99;
+	wire[7:0] d = "\d";
+	wire[7:0] dval = 100;
+	wire[7:0] e = "\e";
+	wire[7:0] eval = 101;
+	wire[7:0] f = "\f"; // form feed, ASCII FF=12
+	wire[7:0] fval = 12;
+	wire[7:0] g = "\g";
+	wire[7:0] gval = 103;
+	wire[7:0] h = "\h";
+	wire[7:0] hval = 104;
+	wire[7:0] i = "\i";
+	wire[7:0] ival = 105;
+	wire[7:0] j = "\j";
+	wire[7:0] jval = 106;
+	wire[7:0] k = "\k";
+	wire[7:0] kval = 107;
+	wire[7:0] l = "\l";
+	wire[7:0] lval = 108;
+	wire[7:0] m = "\m";
+	wire[7:0] mval = 109;
+	wire[7:0] n = "\n"; // new line, ASCII LF=10
+	wire[7:0] nval = 10;
+	wire[7:0] o = "\o";
+	wire[7:0] oval = 111;
+	wire[7:0] p = "\p";
+	wire[7:0] pval = 112;
+	wire[7:0] q = "\q";
+	wire[7:0] qval = 113;
+	wire[7:0] r = "\r"; // carriage return, ASCII CR=13, not IEEE 1800-2023
+	wire[7:0] rval = 13;
+	wire[7:0] s = "\s";
+	wire[7:0] sval = 115;
+	wire[7:0] t = "\t"; // tab, ASCII HT=9
+	wire[7:0] tval = 9;
+	wire[7:0] u = "\u";
+	wire[7:0] uval = 117;
+	wire[7:0] v = "\v"; // vertical tab, ASCII VT=11
+	wire[7:0] vval = 11;
+	wire[7:0] w = "\w";
+	wire[7:0] wval = 119;
+	wire[7:0] x = "\x2A"; // hex escape
+	wire[7:0] xval = 42;
+	wire[7:0] y = "\y";
+	wire[7:0] yval = 121;
+	wire[7:0] z = "\z";
+	wire[7:0] zval = 122;
+
+	wire[7:0] ob = "\{";
+	wire[7:0] obval = 123;
+	wire[7:0] vb = "\|";
+	wire[7:0] vbval = 124;
+	wire[7:0] cb = "\}";
+	wire[7:0] cbval = 125;
+	wire[7:0] ti = "\~";
+	wire[7:0] tival = 126;
+endmodule
+EOF
+sat -prove sp spval -prove ex exval -prove dq dqval -prove ha haval -prove do doval -prove pc pcval -prove am amval -prove sq sqval -prove op opval -prove cp cpval -prove as asval -prove pl plval -prove co coval -prove mi mival -prove do doval -prove sl slval -verify
+sat -prove dig0 dig0val -prove dig8 dig8val -prove dig9 dig9val -verify
+sat -prove cl clval -prove sc scval -prove lt ltval -prove eq eqval -prove gt gtval -prove qu quval -prove at atval -prove A Aval -verify
+sat -prove os osval -prove bs bsval -prove cs csval -prove ca caval -prove us usval -prove bq bqval -verify
+sat -prove a aval -prove b bval -prove c cval -prove d dval -prove e eval -prove f fval -prove g gval -prove h hval -prove i ival -prove j jval -prove k kval -prove l lval -prove m mval -prove n nval -prove o oval -prove p pval -prove q qval -prove r rval -prove s sval -prove t tval -prove u uval -prove v vval -prove w wval -prove x xval -prove y yval -prove z zval -verify
+sat -prove ob obval -prove vb vbval -prove cb cbval -prove ti tival -verify
+logger -check-expected
+design -reset
+
+# Test octal escape out of range.
+logger -expect warning "octal escape exceeds \\377" 1
+read_verilog << EOF
+module top;
+	wire[7:0] x = "\400";
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test invalid octal digit.
+logger -expect warning "'\?' not a valid digit in octal escape sequence" 1
+read_verilog << EOF
+module top;
+	wire[7:0] x = "\0?";
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test invalid hex digit.
+logger -expect warning "'X' not a valid digit in hex escape sequence" 1
+read_verilog << EOF
+module top;
+	wire[7:0] x = "\x0X";
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test hex escape with no hex digits at all.
+logger -expect warning "ignoring invalid hex escape" 1
+read_verilog << EOF
+module top;
+	wire[7:0] x = "\xy";
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test hex escape interrupted by end of string.
+logger -expect warning "ignoring invalid hex escape" 1
+read_verilog << EOF
+module top;
+	wire[7:0] x = "\x";
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test multi-line string.
+logger -expect warning "Multi-line string literals should be triple-quoted or escaped" 1
+read_verilog << EOF
+module top;
+	wire[31:0] x = "A
+BC";
+	wire[31:0] xval = 32'h410A4243;
+endmodule
+EOF
+logger -check-expected
+design -reset
+
+# Test multi-line triple-quoted string.
+logger -expect-no-warnings
+read_verilog << EOF
+module top;
+	wire[31:0] x = """A
+BC""";
+	wire[31:0] xval = 32'h410A4243;
+endmodule
+EOF
+logger -check-expected
+sat -prove x xval -verify
+design -reset
+
+# Test escaped multi-line string.
+logger -expect-no-warnings
+read_verilog << EOF
+module top;
+	wire[31:0] x = "AB\
+CD";
+	wire[31:0] xval = 32'h41424344;
+endmodule
+EOF
+logger -check-expected
+sat -prove x xval -verify
+design -reset
+
+# Test octal escape with surrounding data.
+logger -expect-no-warnings
+read_verilog << EOF
+module top;
+	wire[31:0] x = "AB\234C";
+	wire[31:0] xval = 32'h41429C43;
+endmodule
+EOF
+logger -check-expected
+sat -prove x xval -verify
+design -reset
+
+# Test hex escape with surrounding data.
+logger -expect-no-warnings
+read_verilog << EOF
+module top;
+	wire[31:0] x = "A\xBCDE";
+	wire[31:0] xval = 32'h41BC4445;
+endmodule
+EOF
+logger -check-expected
+sat -prove x xval -verify

From 85b5a7d08b9afbf7a944ab512a755323423924c0 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 10 Jul 2025 23:59:54 +0200
Subject: [PATCH 321/931] verilog: fix build dependency graph

---
 frontends/verilog/Makefile.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontends/verilog/Makefile.inc b/frontends/verilog/Makefile.inc
index 67e8074bf..3f937f3c2 100644
--- a/frontends/verilog/Makefile.inc
+++ b/frontends/verilog/Makefile.inc
@@ -10,6 +10,7 @@ frontends/verilog/verilog_parser.tab.cc: frontends/verilog/verilog_parser.y
 
 frontends/verilog/verilog_parser.tab.hh: frontends/verilog/verilog_parser.tab.cc
 
+frontends/verilog/verilog_frontend.o: frontends/verilog/verilog_parser.tab.hh
 frontends/verilog/preproc.o: frontends/verilog/verilog_parser.tab.hh
 
 frontends/verilog/verilog_lexer.h: frontends/verilog/verilog_parser.tab.hh

From f3ebf0557e0c00a252e4cfbddc36e6911355a35a Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 14 Jul 2025 21:45:41 +0200
Subject: [PATCH 322/931] CI: sneak FlexLexer.h into the WASI sysroot

---
 .github/workflows/extra-builds.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 8d64b2e0e..36215454f 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -72,6 +72,7 @@ jobs:
           cat > build/Makefile.conf <<END
           export PATH := $(pwd)/${WASI_SDK}/bin:${PATH}
           WASI_SYSROOT := $(pwd)/${WASI_SDK}/share/wasi-sysroot
+          ln -s /usr/include/FlexLexer.h ${WASI_SYSROOT}/include/
 
           CONFIG := wasi
           PREFIX := /

From 3ec3afb41450c861dfe1ea7e976d9f46a3529270 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 14 Jul 2025 22:14:11 +0200
Subject: [PATCH 323/931] CI: bump flex and bison on Windows

---
 .github/workflows/wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index d81e340aa..502200e0d 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -79,7 +79,7 @@ jobs:
       - if: ${{ matrix.os.family == 'windows' }}
         name: "[Windows] Flex/Bison"
         run: |
-          choco install winflexbison3
+          choco install winflexbison3 --source https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip
       - if: ${{ matrix.os.family == 'macos' && matrix.os.archs == 'arm64' }}
         name: "[macOS/arm64] Install Python 3.8 (see: https://cibuildwheel.pypa.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64)"
         uses: actions/setup-python@v5

From 0ce51029f6d6745529b2f8cfb80f909c76546fda Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 14 Jul 2025 22:16:46 +0200
Subject: [PATCH 324/931] fixup! CI: sneak FlexLexer.h into the WASI sysroot

---
 .github/workflows/extra-builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 36215454f..8959103ca 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -67,12 +67,12 @@ jobs:
           WASI_SDK=wasi-sdk-19.0
           WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-linux.tar.gz
           if ! [ -d ${WASI_SDK} ]; then curl -L ${WASI_SDK_URL} | tar xzf -; fi
+          ln -s /usr/include/FlexLexer.h ${WASI_SDK}/share/wasi-sysroot/include/
 
           mkdir -p build
           cat > build/Makefile.conf <<END
           export PATH := $(pwd)/${WASI_SDK}/bin:${PATH}
           WASI_SYSROOT := $(pwd)/${WASI_SDK}/share/wasi-sysroot
-          ln -s /usr/include/FlexLexer.h ${WASI_SYSROOT}/include/
 
           CONFIG := wasi
           PREFIX := /

From 4956d3cce50d69344419a1f480cce330f3b07e1d Mon Sep 17 00:00:00 2001
From: Catherine <whitequark@whitequark.org>
Date: Thu, 17 Jul 2025 12:03:39 +0000
Subject: [PATCH 325/931] CI: install flex for WASI builds.

---
 .github/workflows/extra-builds.yml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 8959103ca..1891a4cc3 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -33,13 +33,13 @@ jobs:
         with:
           name: vcxsrc
           path: yosys-win32-vcxsrc-latest.zip
-  
+
   vs-build:
     name: Visual Studio build
     runs-on: windows-latest
     needs: [vs-prep, pre_job]
     if: needs.pre_job.outputs.should_skip != 'true'
-    steps:  
+    steps:
       - uses: actions/download-artifact@v4
         with:
           name: vcxsrc
@@ -67,11 +67,21 @@ jobs:
           WASI_SDK=wasi-sdk-19.0
           WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-linux.tar.gz
           if ! [ -d ${WASI_SDK} ]; then curl -L ${WASI_SDK_URL} | tar xzf -; fi
-          ln -s /usr/include/FlexLexer.h ${WASI_SDK}/share/wasi-sysroot/include/
+
+          FLEX_VER=2.6.4
+          FLEX=flex-${FLEX_VER}
+          FLEX_URL=https://github.com/westes/flex/releases/download/v${FLEX_VER}/${FLEX}.tar.gz
+          if ! [ -d ${FLEX} ]; then curl -L ${FLEX_URL} | tar xzf -; fi
+
+          mkdir -p flex-build
+          (cd flex-build &&
+            ../${FLEX}/configure --prefix=$(pwd)/../flex-prefix &&
+            make &&
+            make install)
 
           mkdir -p build
           cat > build/Makefile.conf <<END
-          export PATH := $(pwd)/${WASI_SDK}/bin:${PATH}
+          export PATH := $(pwd)/${WASI_SDK}/bin:$(pwd)/${FLEX}/bin:${PATH}
           WASI_SYSROOT := $(pwd)/${WASI_SDK}/share/wasi-sysroot
 
           CONFIG := wasi
@@ -81,6 +91,8 @@ jobs:
           ENABLE_READLINE := 0
           ENABLE_PLUGINS := 0
           ENABLE_ZLIB := 0
+
+          CXXFLAGS += -I$(pwd)/${FLEX}/include
           END
 
           make -C build -f ../Makefile CXX=clang -j$(nproc)

From 8455503a5035d95349081182ccb62ec20d145284 Mon Sep 17 00:00:00 2001
From: Catherine <whitequark@whitequark.org>
Date: Thu, 17 Jul 2025 12:15:47 +0000
Subject: [PATCH 326/931] CI: fix typo

---
 .github/workflows/extra-builds.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 1891a4cc3..8c8b892d0 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -81,7 +81,7 @@ jobs:
 
           mkdir -p build
           cat > build/Makefile.conf <<END
-          export PATH := $(pwd)/${WASI_SDK}/bin:$(pwd)/${FLEX}/bin:${PATH}
+          export PATH := $(pwd)/${WASI_SDK}/bin:$(pwd)/flex-prefix/bin:${PATH}
           WASI_SYSROOT := $(pwd)/${WASI_SDK}/share/wasi-sysroot
 
           CONFIG := wasi
@@ -92,7 +92,7 @@ jobs:
           ENABLE_PLUGINS := 0
           ENABLE_ZLIB := 0
 
-          CXXFLAGS += -I$(pwd)/${FLEX}/include
+          CXXFLAGS += -I$(pwd)/flex-prefix/include
           END
 
           make -C build -f ../Makefile CXX=clang -j$(nproc)

From 4f824e42236e3fb5d26cea2748586c706e2e290e Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 16 Jul 2025 11:52:46 +1200
Subject: [PATCH 327/931] Sneak FlexLexer.h into VS build

---
 .github/workflows/extra-builds.yml | 1 +
 misc/create_vcxsrc.sh              | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 8c8b892d0..458eb76a6 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -27,6 +27,7 @@ jobs:
         with:
           submodules: true
           persist-credentials: false
+      - run: sudo apt-get install libfl-dev
       - name: Build
         run: make vcxsrc YOSYS_VER=latest
       - uses: actions/upload-artifact@v4
diff --git a/misc/create_vcxsrc.sh b/misc/create_vcxsrc.sh
index d7b516fd6..31bea8a36 100644
--- a/misc/create_vcxsrc.sh
+++ b/misc/create_vcxsrc.sh
@@ -20,6 +20,13 @@ mv zlib-1.2.11/* "$vcxsrc"/yosys/libs/zlib/.
 rm -rf zlib-1.2.11
 pushd "$vcxsrc"/yosys
 ls libs/zlib/*.c | sed 's,.*:,,; s,//*,/,g; s,/[^/]*/\.\./,/,g; y, \\,\n\n,;' | grep '^[^/]'  >> ../../srcfiles.txt
+
+if [ -f "/usr/include/FlexLexer.h" ] ; then
+	mkdir -p libs/flex
+	cp /usr/include/FlexLexer.h libs/flex/FlexLexer.h
+	ls libs/flex/*.h >> ../../srcfiles.txt
+fi
+
 popd
 {
 	n=$(grep -B999 '<ItemGroup>' "$vcxsrc"/YosysVS/YosysVS.vcxproj | wc -l)

From 1a63dd56bd649c4863427832e772ffa262709359 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 16 Jul 2025 13:48:31 +1200
Subject: [PATCH 328/931] Add flex lib to vcxsrc include dirs

---
 misc/create_vcxsrc.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/misc/create_vcxsrc.sh b/misc/create_vcxsrc.sh
index 31bea8a36..d6800d15e 100644
--- a/misc/create_vcxsrc.sh
+++ b/misc/create_vcxsrc.sh
@@ -38,6 +38,9 @@ popd
 } > "$vcxsrc"/YosysVS/YosysVS.vcxproj.new
 
 sed -i 's,</AdditionalIncludeDirectories>,</AdditionalIncludeDirectories>\n      <LanguageStandard>stdcpp17</LanguageStandard>\n      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>,g' "$vcxsrc"/YosysVS/YosysVS.vcxproj.new
+if [ -f "/usr/include/FlexLexer.h" ] ; then
+	sed -i 's,</AdditionalIncludeDirectories>,;..\\yosys\\libs\\flex</AdditionalIncludeDirectories>,g' "$vcxsrc"/YosysVS/YosysVS.vcxproj.new
+fi
 mv "$vcxsrc"/YosysVS/YosysVS.vcxproj.new "$vcxsrc"/YosysVS/YosysVS.vcxproj
 
 mkdir -p "$vcxsrc"/yosys

From aedc237c7a4586a180672c953d339f0026452a60 Mon Sep 17 00:00:00 2001
From: Emil J <emil@tywoniak.eu>
Date: Sat, 19 Jul 2025 22:21:17 +0200
Subject: [PATCH 329/931] rtlil: remove comment

Co-authored-by: KrystalDelusion <93062060+KrystalDelusion@users.noreply.github.com>
---
 kernel/rtlil.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index fd67b7404..1b133d9c1 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5710,7 +5710,6 @@ bool RTLIL::SigSpec::parse(RTLIL::SigSpec &sig, RTLIL::Module *module, std::stri
 {
 	cover("kernel.rtlil.sigspec.parse");
 
-	// AST::current_filename = "input";
 
 	std::vector<std::string> tokens;
 	sigspec_parse_split(tokens, str, ',');

From cbccc01d38969e88ea4f6ce894bb88e4f1876075 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Sat, 19 Jul 2025 22:39:55 +0200
Subject: [PATCH 330/931] Revert "CI: bump flex and bison on Windows"

This reverts commit efbc138ced04e2fc9cff67b8ca7a862cdd7b4278.
---
 .github/workflows/wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 502200e0d..d81e340aa 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -79,7 +79,7 @@ jobs:
       - if: ${{ matrix.os.family == 'windows' }}
         name: "[Windows] Flex/Bison"
         run: |
-          choco install winflexbison3 --source https://github.com/lexxmark/winflexbison/releases/download/v2.5.25/win_flex_bison-2.5.25.zip
+          choco install winflexbison3
       - if: ${{ matrix.os.family == 'macos' && matrix.os.archs == 'arm64' }}
         name: "[macOS/arm64] Install Python 3.8 (see: https://cibuildwheel.pypa.io/en/stable/faq/#macos-building-cpython-38-wheels-on-arm64)"
         uses: actions/setup-python@v5

From deedfbefe267adcfbfea483933aa3210e69402c1 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Sat, 19 Jul 2025 22:40:45 +0200
Subject: [PATCH 331/931] fixup! readme, verilog_parser: bison 3.8 and ubuntu
 22.04 example

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 96fd54a52..6118d6079 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ Xdot (graphviz) is used by the ``show`` command in yosys to display schematics.
 For example on Ubuntu Linux 22.04 LTS the following commands will install all
 prerequisites for building yosys:
 
-	$ sudo apt-get install build-essential clang lld bison flex \
+	$ sudo apt-get install build-essential clang lld bison flex libfl-dev \
 		libreadline-dev gawk tcl-dev libffi-dev git \
 		graphviz xdot pkg-config python3 libboost-system-dev \
 		libboost-python-dev libboost-filesystem-dev zlib1g-dev

From abb8b8d28b42d057c9cef3dc318e6f93d89f387b Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Sat, 19 Jul 2025 22:45:19 +0200
Subject: [PATCH 332/931] preproc: formatting

---
 frontends/verilog/preproc.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontends/verilog/preproc.h b/frontends/verilog/preproc.h
index 51562787a..fd2e99f3d 100644
--- a/frontends/verilog/preproc.h
+++ b/frontends/verilog/preproc.h
@@ -73,12 +73,12 @@ struct define_map_t;
 
 std::string
 frontend_verilog_preproc(std::istream                 &f,
-                         std::string                   filename,
-                         const define_map_t           &pre_defines,
-                         define_map_t                 &global_defines_cache,
-                         const std::list<std::string> &include_dirs,
-						 VERILOG_FRONTEND::ParseState &parse_state,
-						 VERILOG_FRONTEND::ParseMode  &parse_mode);
+						std::string                   filename,
+						const define_map_t           &pre_defines,
+						define_map_t                 &global_defines_cache,
+						const std::list<std::string> &include_dirs,
+						VERILOG_FRONTEND::ParseState &parse_state,
+						VERILOG_FRONTEND::ParseMode  &parse_mode);
 
 YOSYS_NAMESPACE_END
 

From 39c5c256c03682ad506fe48bc5b915c9c59f22fa Mon Sep 17 00:00:00 2001
From: Emil J <emil@tywoniak.eu>
Date: Sat, 19 Jul 2025 22:46:17 +0200
Subject: [PATCH 333/931] verilog_lexer: remove comment

Co-authored-by: KrystalDelusion <93062060+KrystalDelusion@users.noreply.github.com>
---
 frontends/verilog/verilog_lexer.l | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index d6918d19c..7b42970c4 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -83,8 +83,6 @@ YOSYS_NAMESPACE_END
 	string_t val = std::make_unique<std::string>(std::string("\\") + YYText()); \
 	return parser::make_TOK_ID(std::move(val), out_loc);
 
-// #define YY_INPUT(buf,result,max_size) \
-// 	result = readsome(*extra->lexin, buf, max_size)
 
 #define YY_USER_ACTION \
 	out_loc.step(); \

From ae65b4fc84951de9f9e13c3c64d666045ad96525 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Sat, 19 Jul 2025 22:53:02 +0200
Subject: [PATCH 334/931] verilog_lexer: fix fallthrough warning

---
 frontends/verilog/verilog_lexer.l | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 7b42970c4..893db9aae 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -67,7 +67,7 @@ YOSYS_NAMESPACE_BEGIN
 #define YY_DECL parser::symbol_type VerilogLexer::nextToken()
 
 #undef yyterminate
-#define yyterminate() terminate()
+#define yyterminate() return terminate()
 
 YOSYS_NAMESPACE_END
 

From 9a10f4c02f61d5dbe49597bfd13bb6981d47775b Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Sat, 19 Jul 2025 22:56:48 +0200
Subject: [PATCH 335/931] verilog_lexer, verilog_parser: remove comment

---
 frontends/verilog/verilog_lexer.l  | 2 --
 frontends/verilog/verilog_parser.y | 9 ---------
 2 files changed, 11 deletions(-)

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 893db9aae..8280c0067 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -59,8 +59,6 @@ USING_YOSYS_NAMESPACE
 using namespace AST;
 using namespace VERILOG_FRONTEND;
 using parser = frontend_verilog_yy::parser;
-//#define YYSTYPE FRONTEND_VERILOG_YYSTYPE
-//#define YYLTYPE FRONTEND_VERILOG_YYLTYPE
 
 YOSYS_NAMESPACE_BEGIN
 #undef YY_DECL
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 5f77e712f..c59144bd0 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -49,7 +49,6 @@
 	#include "kernel/yosys_common.h"
 	#include "frontends/verilog/verilog_error.h"
 	#include "frontends/verilog/verilog_location.h"
-	// start requires
 	YOSYS_NAMESPACE_BEGIN
 	namespace VERILOG_FRONTEND {
 		struct ParseState;
@@ -57,11 +56,9 @@
 		class VerilogLexer;
 	};
 	YOSYS_NAMESPACE_END
-	// end requires
 }
 
 %code provides {
-	// start provides
 	USING_YOSYS_NAMESPACE;
 	using namespace AST;
 	using namespace VERILOG_FRONTEND;
@@ -70,7 +67,6 @@
 	namespace VERILOG_FRONTEND {
 		typedef std::map<std::string, AST::AstNode*> UserTypeMap;
 		struct ParseState {
-			// TODO initialization?
 			int port_counter;
 			dict<std::string, int> port_stubs;
 			dict<IdString, std::unique_ptr<AstNode>> *attr_list, default_attr_list;
@@ -122,11 +118,9 @@
 		};
 	};
 	YOSYS_NAMESPACE_END
-	// end provides
 }
 
 %code {
-	// start unqual
 	#include <list>
 	#include <stack>
 	#include <memory>
@@ -430,11 +424,9 @@
 	{
 		err_at_loc(loc, "%s", msg.c_str());
 	}
-	// end unqual
 }
 
 %code requires {
-	// start requires
 	#include <map>
 	#include <string>
 	#include <memory>
@@ -480,7 +472,6 @@
 	using ch_t = char;
 	using integer_t = int;
 	using ast_node_type_t = YOSYS_NAMESPACE_PREFIX AST::AstNodeType;
-	// end requires
 }
 
 %token <string_t> string_t "string"

From 5b62616b63b93a78d260896df65e27054df18ac7 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Sat, 19 Jul 2025 22:57:53 +0200
Subject: [PATCH 336/931] preproc: formatting

---
 frontends/verilog/preproc.cc |  4 ++--
 frontends/verilog/preproc.h  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontends/verilog/preproc.cc b/frontends/verilog/preproc.cc
index b83fad7c3..6dff1b6fc 100644
--- a/frontends/verilog/preproc.cc
+++ b/frontends/verilog/preproc.cc
@@ -751,8 +751,8 @@ frontend_verilog_preproc(std::istream                 &f,
                          const define_map_t           &pre_defines,
                          define_map_t                 &global_defines_cache,
                          const std::list<std::string> &include_dirs,
-						 ParseState                   &parse_state,
-						 ParseMode                    &parse_mode)
+                         ParseState                   &parse_state,
+                         ParseMode                    &parse_mode)
 {
 	define_map_t defines;
 	defines.merge(pre_defines);
diff --git a/frontends/verilog/preproc.h b/frontends/verilog/preproc.h
index fd2e99f3d..8333f7661 100644
--- a/frontends/verilog/preproc.h
+++ b/frontends/verilog/preproc.h
@@ -73,12 +73,12 @@ struct define_map_t;
 
 std::string
 frontend_verilog_preproc(std::istream                 &f,
-						std::string                   filename,
-						const define_map_t           &pre_defines,
-						define_map_t                 &global_defines_cache,
-						const std::list<std::string> &include_dirs,
-						VERILOG_FRONTEND::ParseState &parse_state,
-						VERILOG_FRONTEND::ParseMode  &parse_mode);
+                         std::string                   filename,
+                         const define_map_t           &pre_defines,
+                         define_map_t                 &global_defines_cache,
+                         const std::list<std::string> &include_dirs,
+                         VERILOG_FRONTEND::ParseState &parse_state,
+                         VERILOG_FRONTEND::ParseMode  &parse_mode);
 
 YOSYS_NAMESPACE_END
 

From 720f33271d505b6f0d4d7d9c25d9dca8da60c2b7 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 8 Aug 2025 14:00:53 +1200
Subject: [PATCH 337/931] docs: Update ubuntu apt-get

Also mention CXXSTD fix for cygwin.
---
 docs/source/getting_started/installation.rst | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docs/source/getting_started/installation.rst b/docs/source/getting_started/installation.rst
index fe96b2314..0ac85d199 100644
--- a/docs/source/getting_started/installation.rst
+++ b/docs/source/getting_started/installation.rst
@@ -88,18 +88,18 @@ Build prerequisites
 ^^^^^^^^^^^^^^^^^^^
 
 A C++ compiler with C++17 support is required as well as some standard tools
-such as GNU Flex, GNU Bison, Make and Python.  Some additional tools: readline,
-libffi, Tcl and zlib; are optional but enabled by default (see
+such as GNU Flex, GNU Bison (>=3.8), Make, and Python (>=3.11). Some additional
+tools: readline, libffi, Tcl and zlib; are optional but enabled by default (see
 :makevar:`ENABLE_*` settings in Makefile). Graphviz and Xdot are used by the
 `show` command to display schematics.
 
-Installing all prerequisites for Ubuntu 20.04:
+Installing all prerequisites for Ubuntu 22.04:
 
 .. code:: console
 
-   sudo apt-get install gperf build-essential bison flex \
-      libreadline-dev gawk tcl-dev libffi-dev git graphviz \
-      xdot pkg-config python3 libboost-system-dev \
+   sudo apt-get install gperf build-essential clang lld bison flex libfl-dev \
+      libreadline-dev gawk tcl-dev libffi-dev git \
+      graphviz xdot pkg-config python3 libboost-system-dev \
       libboost-python-dev libboost-filesystem-dev zlib1g-dev
 
 Installing all prerequisites for macOS 13 (with Homebrew):
@@ -137,8 +137,9 @@ For Cygwin use the following command to install all prerequisites, or select the
    minimum required version of Python is 3.11.  This means that Cygwin is not
    compatible with many of the Python-based frontends.  While this does not
    currently prevent Yosys itself from working, no guarantees are made for
-   continued support.  It is instead recommended to use Windows Subsystem for
-   Linux (WSL) and follow the instructions for Ubuntu.
+   continued support.  You may also need to specify `CXXSTD=gnu++17` to resolve
+   missing `strdup` function when using gcc.  It is instead recommended to use
+   Windows Subsystem for Linux (WSL) and follow the instructions for Ubuntu.
 
 .. 
    For MSYS2 (MINGW64):

From 9b882c32c1a34e02171949cce838813643f0440f Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 8 Aug 2025 17:10:16 +1200
Subject: [PATCH 338/931] frontends/ast: More usage of auto

For consistency.
---
 frontends/ast/genrtlil.cc |  6 +++---
 frontends/ast/simplify.cc | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 93731abf0..0002f6308 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -2086,7 +2086,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			cell->set_bool_attribute(ID::module_not_derived);
 
 			for (auto it = children.begin(); it != children.end(); it++) {
-				AstNode *child = it->get();
+				auto* child = it->get();
 				if (child->type == AST_CELLTYPE) {
 					cell->type = child->str;
 					if (flag_icells && cell->type.begins_with("\\$"))
@@ -2095,7 +2095,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				}
 				if (child->type == AST_PARASET) {
 					IdString paraname = child->str.empty() ? stringf("$%d", ++para_counter) : child->str;
-					const AstNode *value = child->children[0].get();
+					const auto* value = child->children[0].get();
 					if (value->type == AST_REALVALUE)
 						log_file_warning(*location.begin.filename, location.begin.line, "Replacing floating point parameter %s.%s = %f with string.\n",
 								log_id(cell), log_id(paraname), value->realvalue);
@@ -2108,7 +2108,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				if (child->type == AST_ARGUMENT) {
 					RTLIL::SigSpec sig;
 					if (child->children.size() > 0) {
-						AstNode *arg = child->children[0].get();
+						auto* arg = child->children[0].get();
 						int local_width_hint = -1;
 						bool local_sign_hint = false;
 						// don't inadvertently attempt to detect the width of interfaces
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 8cacec275..0a43955a2 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -698,13 +698,13 @@ static bool contains_unbased_unsized(const AstNode *node)
 // dimensions of the given wire reference
 void add_wire_for_ref(location loc, const RTLIL::Wire *ref, const std::string &str)
 {
-	std::unique_ptr<AstNode> left = AstNode::mkconst_int(loc, ref->width - 1 + ref->start_offset, true);
-	std::unique_ptr<AstNode> right = AstNode::mkconst_int(loc, ref->start_offset, true);
+	auto left = AstNode::mkconst_int(loc, ref->width - 1 + ref->start_offset, true);
+	auto right = AstNode::mkconst_int(loc, ref->start_offset, true);
 	if (ref->upto)
 		std::swap(left, right);
-	std::unique_ptr<AstNode> range = std::make_unique<AstNode>(loc, AST_RANGE, std::move(left), std::move(right));
+	auto range = std::make_unique<AstNode>(loc, AST_RANGE, std::move(left), std::move(right));
 
-	std::unique_ptr<AstNode> wire = std::make_unique<AstNode>(loc, AST_WIRE, std::move(range));
+	auto wire = std::make_unique<AstNode>(loc, AST_WIRE, std::move(range));
 	wire->is_signed = ref->is_signed;
 	wire->is_logic = true;
 	wire->str = str;
@@ -821,8 +821,8 @@ static bool try_determine_range_width(AstNode *range, int &result_width)
 		return true;
 	}
 
-	std::unique_ptr<AstNode> left_at_zero_ast = range->children[0]->clone_at_zero();
-	std::unique_ptr<AstNode> right_at_zero_ast = range->children[1]->clone_at_zero();
+	auto left_at_zero_ast = range->children[0]->clone_at_zero();
+	auto right_at_zero_ast = range->children[1]->clone_at_zero();
 
 	while (left_at_zero_ast->simplify(true, 1, -1, false)) {}
 	while (right_at_zero_ast->simplify(true, 1, -1, false)) {}
@@ -1575,7 +1575,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (children[0]->type == AST_WIRE) {
 			int width = 1;
 			std::unique_ptr<AstNode> node;
-			AstNode* child = children[0].get();
+			auto* child = children[0].get();
 			if (child->children.size() == 0) {
 				// Base type (e.g., int)
 				width = child->range_left - child->range_right +1;
@@ -1591,7 +1591,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				if (resolved_type_node->type != AST_TYPEDEF)
 					input_error("`%s' does not name a type\n", type_name.c_str());
 				log_assert(resolved_type_node->children.size() == 1);
-				AstNode *template_node = resolved_type_node->children[0].get();
+				auto* template_node = resolved_type_node->children[0].get();
 
 				// Ensure typedef itself is fully simplified
 				while (template_node->simplify(const_fold, stage, width_hint, sign_hint)) {};
@@ -2048,7 +2048,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			// Pretend it's just a wire in order to resolve the type in the code block above.
 			AstNodeType param_type = type;
 			type = AST_WIRE;
-			std::unique_ptr<AstNode> expr = std::move(children.front());
+			auto expr = std::move(children.front());
 			children.erase(children.begin());
 			while (is_custom_type && simplify(const_fold, stage, width_hint, sign_hint)) {};
 			type = param_type;
@@ -2130,13 +2130,13 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				range_right = children[0]->range_right;
 				bool force_upto = false, force_downto = false;
 				if (attributes.count(ID::force_upto)) {
-					AstNode *val = attributes[ID::force_upto].get();
+					auto* val = attributes[ID::force_upto].get();
 					if (val->type != AST_CONSTANT)
 						input_error("Attribute `force_upto' with non-constant value!\n");
 					force_upto = val->asAttrConst().as_bool();
 				}
 				if (attributes.count(ID::force_downto)) {
-					AstNode *val = attributes[ID::force_downto].get();
+					auto* val = attributes[ID::force_downto].get();
 					if (val->type != AST_CONSTANT)
 						input_error("Attribute `force_downto' with non-constant value!\n");
 					force_downto = val->asAttrConst().as_bool();
@@ -3307,7 +3307,7 @@ skip_dynamic_range_lvalue_expansion:;
 			}
 			else
 			{
-				std::unique_ptr<AstNode>& the_range = children[0]->children[1];
+				auto& the_range = children[0]->children[1];
 				std::unique_ptr<AstNode> offset_ast;
 				int width;
 
@@ -5165,7 +5165,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 				std::vector<RTLIL::State> x_bits;
 				for (int i = 0; i < width; i++)
 					x_bits.push_back(RTLIL::State::Sx);
-				std::unique_ptr<AstNode> constant = AstNode::mkconst_bits(location, x_bits, false);
+				auto constant = AstNode::mkconst_bits(location, x_bits, false);
 				constant->cloneInto(*this);
 			}
 		}
@@ -5427,7 +5427,7 @@ std::unique_ptr<AstNode> AstNode::eval_const_function(AstNode *fcall, bool must_
 	while (!block->children.empty())
 	{
 		// log("%zu left in block %p\n", block->children.size(), block.get());
-		std::unique_ptr<AstNode>& stmt = block->children.front();
+		auto& stmt = block->children.front();
 
 #if 0
 		log("-----------------------------------\n");

From d3e33a3be52cdf7d603886d652f596ead6b8c95b Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 8 Aug 2025 17:14:31 +1200
Subject: [PATCH 339/931] simplify.cc: Drop unused debug prints

At least the ones added by this PR.  There are some unused debug prints that are *changed* by this PR, but I've left them.
---
 frontends/ast/simplify.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 0a43955a2..dc2ae1b31 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -5426,7 +5426,6 @@ std::unique_ptr<AstNode> AstNode::eval_const_function(AstNode *fcall, bool must_
 
 	while (!block->children.empty())
 	{
-		// log("%zu left in block %p\n", block->children.size(), block.get());
 		auto& stmt = block->children.front();
 
 #if 0
@@ -5435,8 +5434,6 @@ std::unique_ptr<AstNode> AstNode::eval_const_function(AstNode *fcall, bool must_
 			log("%20s %40s\n", it.first.c_str(), log_signal(it.second.val));
 		stmt->dumpAst(nullptr, "stmt> ");
 #endif
-		// log("A\n");
-		// log("%s\n", type2str(stmt->type).c_str());
 		if (stmt->type == AST_WIRE)
 		{
 			while (stmt->simplify(true, 1, -1, false)) { }

From 97bc0088d824486ad1f4bb9ee647f3519cf02a3f Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 8 Aug 2025 12:31:13 +0200
Subject: [PATCH 340/931] simplify: std::gcd

---
 frontends/ast/simplify.cc | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index dc2ae1b31..d4191cef7 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -36,25 +36,13 @@
 #include <stdlib.h>
 #include <math.h>
 #include <optional>
-// For std::gcd in C++17
-// #include <numeric>
+#include <numeric>
 
 YOSYS_NAMESPACE_BEGIN
 
 using namespace AST;
 using namespace AST_INTERNAL;
 
-// gcd computed by Euclidian division.
-// To be replaced by C++17 std::gcd
-template<class I> I gcd(I a, I b) {
-	while (b != 0) {
-		I tmp = b;
-		b = a%b;
-		a = tmp;
-	}
-	return std::abs(a);
-}
-
 void AstNode::set_in_lvalue_flag(bool flag, bool no_descend)
 {
 	if (flag != in_lvalue_from_above) {
@@ -3001,9 +2989,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 						//
 						// long long is at least 64 bits in C++11
 						long long shift_mod = 1ll << (max_width - case_sign_hint);
-						// std::gcd requires C++17
-						// bitno_div = std::gcd(stride, shift_mod);
-						bitno_div = gcd((long long)stride, shift_mod);
+						bitno_div = std::gcd((long long)stride, shift_mod);
 					}
 				}
 			}

From 25d2a8ce3a96a6e7f25fd883d846ea9b360c1eae Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 8 Aug 2025 12:31:40 +0200
Subject: [PATCH 341/931] simplify: simplify

---
 frontends/ast/genrtlil.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 0002f6308..b53fa7a44 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -2180,14 +2180,13 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 
 	// use ProcessGenerator for always blocks
 	case AST_ALWAYS: {
-			auto always = this->clone();
-			ProcessGenerator generator(std::move(always));
+			ProcessGenerator generator(this->clone());
 			ignoreThisSignalsInInitial.append(generator.outputSignals);
 		} break;
 
 	case AST_INITIAL: {
 			auto always = this->clone();
-			ProcessGenerator generator(std::move(always), ignoreThisSignalsInInitial);
+			ProcessGenerator generator(this->clone(), ignoreThisSignalsInInitial);
 		} break;
 
 	case AST_TECALL: {

From 646c45e6b89da4d2fc5d4f933b18962f3ad82af8 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 8 Aug 2025 12:32:43 +0200
Subject: [PATCH 342/931] ast: remove null_check as dead code

---
 frontends/ast/ast.h       |  1 -
 frontends/ast/simplify.cc | 12 ------------
 2 files changed, 13 deletions(-)

diff --git a/frontends/ast/ast.h b/frontends/ast/ast.h
index 6804c6a30..4baa2a3f6 100644
--- a/frontends/ast/ast.h
+++ b/frontends/ast/ast.h
@@ -260,7 +260,6 @@ namespace AST
 		// simplify() creates a simpler AST by unrolling for-loops, expanding generate blocks, etc.
 		// it also sets the id2ast pointers so that identifier lookups are fast in genRTLIL()
 		bool simplify(bool const_fold, int stage, int width_hint, bool sign_hint);
-		void null_check();
 		void replace_result_wire_name_in_function(const std::string &from, const std::string &to);
 		std::unique_ptr<AstNode> readmem(bool is_readmemh, std::string mem_filename, AstNode *memory, int start_addr, int finish_addr, bool unconditional_init);
 		void expand_genblock(const std::string &prefix);
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index d4191cef7..e6954dbb9 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -888,16 +888,6 @@ static void check_auto_nosync(AstNode *node)
 		check_auto_nosync(child.get());
 }
 
-void AstNode::null_check()
-{
-	for (auto& child : children) {
-		// if (!child)
-		// 	VALGRIND_PRINTF_BACKTRACE("null child");
-		log_assert((bool) child);
-		child->null_check();
-	}
-}
-
 // convert the AST into a simpler AST that has all parameters substituted by their
 // values, unrolled for-loops, expanded generate blocks, etc. when this function
 // is done with an AST it can be converted into RTLIL using genRTLIL().
@@ -906,7 +896,6 @@ void AstNode::null_check()
 // nodes that link to a different node using names and lexical scoping.
 bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hint)
 {
-	// null_check();
 	static int recursion_counter = 0;
 	static bool deep_recursion_warning = false;
 
@@ -4434,7 +4423,6 @@ apply_newNode:
 		// dumpAst(stderr, "- ");
 		// newNode->dumpAst(stderr, "+ ");
 		log_assert(newNode != nullptr);
-		// newNode->null_check();
 		newNode->location.begin.filename = location.begin.filename;
 		newNode->location = location;
 		newNode->cloneInto(*this);

From 740ed3fc1cf2dfc3a5dcfe01b23f5b049a4310a1 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 8 Aug 2025 13:00:39 +0200
Subject: [PATCH 343/931] ast: refactor

---
 frontends/ast/ast.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 09989e7ab..aba0ef5dd 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -191,11 +191,11 @@ bool AstNode::get_bool_attribute(RTLIL::IdString id)
 	if (attributes.count(id) == 0)
 		return false;
 
-	AstNode& attr = *(attributes.at(id));
-	if (attr.type != AST_CONSTANT)
-		attr.input_error("Attribute `%s' with non-constant value!\n", id.c_str());
+	auto& attr = attributes.at(id);
+	if (attr->type != AST_CONSTANT)
+		attr->input_error("Attribute `%s' with non-constant value!\n", id.c_str());
 
-	return attr.integer != 0;
+	return attr->integer != 0;
 }
 
 // create new node (AstNode constructor)
@@ -1094,7 +1094,7 @@ void AST::set_src_attr(RTLIL::AttrObject *obj, const AstNode *ast)
 	obj->attributes[ID::src] = ast->loc_string();
 }
 
-static bool param_has_no_default(const std::unique_ptr<AstNode> &param) {
+static bool param_has_no_default(const AstNode* param) {
 	const auto &children = param->children;
 	log_assert(param->type == AST_PARAMETER);
 	log_assert(children.size() <= 2);
@@ -1142,7 +1142,7 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 	if (!defer)
 	{
 		for (auto& node : ast->children)
-			if (node->type == AST_PARAMETER && param_has_no_default(node))
+			if (node->type == AST_PARAMETER && param_has_no_default(node.get()))
 				node->input_error("Parameter `%s' has no default value and has not been overridden!\n", node->str.c_str());
 
 		bool blackbox_module = flag_lib;
@@ -1430,7 +1430,7 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool nodisplay, bool dump
 			bool defer_local = defer;
 			if (!defer_local)
 				for (const auto& node : child->children)
-					if (node->type == AST_PARAMETER && param_has_no_default(node))
+					if (node->type == AST_PARAMETER && param_has_no_default(node.get()))
 					{
 						log("Deferring `%s' because it contains parameter(s) without defaults.\n", child->str.c_str());
 						defer_local = true;
@@ -1850,7 +1850,7 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 		}
 		continue;
 	rewrite_parameter:
-		if (param_has_no_default(child))
+		if (param_has_no_default(child.get()))
 			child->children.insert(child->children.begin(), nullptr);
 		if ((it->second.flags & RTLIL::CONST_FLAG_REAL) != 0) {
 			child->children[0] = std::make_unique<AstNode>(loc, AST_REALVALUE);

From df8422d24467743fec8d0ee40970d2a874a9e8dd Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 8 Aug 2025 13:00:51 +0200
Subject: [PATCH 344/931] verilog_lexer: refactor

---
 frontends/verilog/verilog_lexer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontends/verilog/verilog_lexer.h b/frontends/verilog/verilog_lexer.h
index fe56b27d2..363c17b76 100644
--- a/frontends/verilog/verilog_lexer.h
+++ b/frontends/verilog/verilog_lexer.h
@@ -19,8 +19,8 @@ namespace VERILOG_FRONTEND {
 	class VerilogLexer : public frontend_verilog_yyFlexLexer {
 		ParseState* extra;
 		ParseMode* mode;
+		parser::location_type out_loc;
 	public:
-		parser::location_type out_loc; // TODO private?
 		VerilogLexer(ParseState* e, ParseMode* m, std::shared_ptr<string> filename) : frontend_verilog_yyFlexLexer(e->lexin), extra(e), mode(m) {
 			out_loc.begin.filename = filename;
 		}

From 5195f812574fbc419a7556cb609d9be8e8ddbb17 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 8 Aug 2025 16:15:20 +0200
Subject: [PATCH 345/931] ast: fix import node

---
 frontends/ast/simplify.cc          | 16 +++++++---------
 frontends/verilog/verilog_parser.y |  7 +++----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index e6954dbb9..c651553c4 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1089,7 +1089,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 		// Process package imports after clearing the scope but before processing module declarations
 		for (size_t i = 0; i < children.size(); i++) {
-			AstNode *child = children[i];
+			AstNode *child = children[i].get();
 			if (child->type == AST_IMPORT) {
 				// Find the package in the design
 				AstNode *package_node = nullptr;
@@ -1099,7 +1099,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					for (auto &design_child : current_ast->children) {
 						if (design_child->type == AST_PACKAGE) {
 							if (design_child->str == child->str) {
-								package_node = design_child;
+								package_node = design_child.get();
 								break;
 							}
 						}
@@ -1115,7 +1115,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 							package_name = package_name.substr(1);
 						}
 						if (package_name == child->str || design_package->str == child->str) {
-							package_node = design_package;
+							package_node = design_package.get();
 							break;
 						}
 					}
@@ -1123,30 +1123,28 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 				if (package_node) {
 					// Import all names from the package into current scope
-					for (auto &pkg_child : package_node->children) {
+					for (auto& pkg_child : package_node->children) {
 						if (pkg_child->type == AST_PARAMETER || pkg_child->type == AST_LOCALPARAM ||
 							pkg_child->type == AST_TYPEDEF || pkg_child->type == AST_FUNCTION ||
 							pkg_child->type == AST_TASK || pkg_child->type == AST_ENUM) {
-							current_scope[pkg_child->str] = pkg_child;
+							current_scope[pkg_child->str] = pkg_child.get();
 						}
 						if (pkg_child->type == AST_ENUM) {
-							for (auto enode : pkg_child->children) {
+							for (auto& enode : pkg_child->children) {
 								log_assert(enode->type==AST_ENUM_ITEM);
 								if (current_scope.count(enode->str) == 0)
-									current_scope[enode->str] = enode;
+									current_scope[enode->str] = enode.get();
 								else
 									input_error("enum item %s already exists in current scope\n", enode->str.c_str());
 							}
 						}
 					}
 					// Remove the import node since it's been processed
-					delete child;
 					children.erase(children.begin() + i);
 					i--; // Adjust index since we removed an element
 				} else {
 					// If we can't find the package, just remove the import node to avoid errors later
 					log_warning("Package `%s' not found for import, removing import statement\n", child->str.c_str());
-					delete child;
 					children.erase(children.begin() + i);
 					i--; // Adjust index since we removed an element
 				}
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index c59144bd0..6762ada9e 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -831,12 +831,11 @@ package_body_stmt:
 	typedef_decl | localparam_decl | param_decl | task_func_decl;
 
 import_stmt:
-	TOK_IMPORT hierarchical_id TOK_PACKAGESEP '*' ';' {
+	TOK_IMPORT hierarchical_id TOK_PACKAGESEP TOK_ASTER TOK_SEMICOL {
 		// Create an import node to track package imports
-		AstNode *import_node = new AstNode(AST_IMPORT);
+		auto import_node = std::make_unique<AstNode>(@$, AST_IMPORT);
 		import_node->str = *$2;
-		ast_stack.back()->children.push_back(import_node);
-		delete $2;
+		extra->ast_stack.back()->children.push_back(std::move(import_node));
 	};
 
 interface:

From 99ab73424d07ab36ad210f514cf6b44f45431f5b Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 8 Aug 2025 16:22:54 +0200
Subject: [PATCH 346/931] verilog_location: rename location to Location to
 avoid conflict with Pass::location

---
 frontends/ast/ast.h                   |  2 +-
 frontends/ast/simplify.cc             |  2 +-
 frontends/verilog/verilog_error.cc    |  2 +-
 frontends/verilog/verilog_error.h     |  2 +-
 frontends/verilog/verilog_frontend.cc |  2 +-
 frontends/verilog/verilog_location.h  | 26 +++++++++++++-------------
 frontends/verilog/verilog_parser.y    | 22 +++++++++-------------
 kernel/rtlil.cc                       |  2 +-
 8 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/frontends/ast/ast.h b/frontends/ast/ast.h
index 4baa2a3f6..fdf4d1ec9 100644
--- a/frontends/ast/ast.h
+++ b/frontends/ast/ast.h
@@ -164,7 +164,7 @@ namespace AST
 		AST_BIND
 	};
 
-	using AstSrcLocType = location;
+	using AstSrcLocType = Location;
 
 	// convert an node type to a string (e.g. for debug output)
 	std::string type2str(AstNodeType type);
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index c651553c4..c25d0183f 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -684,7 +684,7 @@ static bool contains_unbased_unsized(const AstNode *node)
 
 // adds a wire to the current module with the given name that matches the
 // dimensions of the given wire reference
-void add_wire_for_ref(location loc, const RTLIL::Wire *ref, const std::string &str)
+void add_wire_for_ref(Location loc, const RTLIL::Wire *ref, const std::string &str)
 {
 	auto left = AstNode::mkconst_int(loc, ref->width - 1 + ref->start_offset, true);
 	auto right = AstNode::mkconst_int(loc, ref->start_offset, true);
diff --git a/frontends/verilog/verilog_error.cc b/frontends/verilog/verilog_error.cc
index 4adfaafa6..19e634b5d 100644
--- a/frontends/verilog/verilog_error.cc
+++ b/frontends/verilog/verilog_error.cc
@@ -43,7 +43,7 @@ static void verr_at(std::string filename, int begin_line, char const *fmt, va_li
 }
 
 [[noreturn]]
-void VERILOG_FRONTEND::err_at_loc(location loc, char const *fmt, ...)
+void VERILOG_FRONTEND::err_at_loc(Location loc, char const *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
diff --git a/frontends/verilog/verilog_error.h b/frontends/verilog/verilog_error.h
index 2eeb4538e..07198a2ba 100644
--- a/frontends/verilog/verilog_error.h
+++ b/frontends/verilog/verilog_error.h
@@ -10,7 +10,7 @@ YOSYS_NAMESPACE_BEGIN
 namespace VERILOG_FRONTEND
 {
     [[noreturn]]
-    void err_at_loc(location loc, char const *fmt, ...);
+    void err_at_loc(Location loc, char const *fmt, ...);
 };
 
 YOSYS_NAMESPACE_END
diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index e7d34dac5..4b4f7ad8d 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -502,7 +502,7 @@ struct VerilogFrontend : public Frontend {
 		}
 
 		auto filename_shared = std::make_shared<std::string>(filename);
-		auto top_loc = location();
+		auto top_loc = Location();
 		top_loc.begin.filename = filename_shared;
 		parse_state.current_ast = new AST::AstNode(top_loc, AST::AST_DESIGN);
 		VerilogLexer lexer(&parse_state, &parse_mode, filename_shared);
diff --git a/frontends/verilog/verilog_location.h b/frontends/verilog/verilog_location.h
index d2ef8e94c..9b530fbeb 100644
--- a/frontends/verilog/verilog_location.h
+++ b/frontends/verilog/verilog_location.h
@@ -11,16 +11,16 @@
  * but using shared_ptr for filename
  */
 
-struct position {
+struct Position {
 	std::shared_ptr<std::string> filename;
 	int line;
 	int column;
 
-	position(std::shared_ptr<std::string> filename, int line = 1, int column = 1)
+	Position(std::shared_ptr<std::string> filename, int line = 1, int column = 1)
 		: filename(filename), line(line), column(column) {}
-	position() = default;
-	position(const position& other) = default;
-	position& operator=(const position& other) = default;
+	Position() = default;
+	Position(const Position& other) = default;
+	Position& operator=(const Position& other) = default;
 
 	void advance() { ++column; }
 	void columns(int count = 1) {
@@ -41,15 +41,15 @@ struct position {
 	}
 };
 
-struct location {
-	position begin;
-	position end;
+struct Location {
+	Position begin;
+	Position end;
 
-	location() = default;
-	location(const position& b, const position& e)
+	Location() = default;
+	Location(const Position& b, const Position& e)
 		: begin(b), end(e) {}
-	location(const location& other) = default;
-	location& operator=(const location& other) = default;
+	Location(const Location& other) = default;
+	Location& operator=(const Location& other) = default;
 
 	void step() { begin = end; }
 
@@ -89,7 +89,7 @@ struct location {
 	}
 };
 
-static inline std::ostream& operator<<(std::ostream& os, const location& loc) {
+static inline std::ostream& operator<<(std::ostream& os, const Location& loc) {
 	return os << loc.to_string();
 }
 
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 6762ada9e..46dfeedd0 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -38,7 +38,7 @@
 %define api.value.type variant
 %define api.prefix {frontend_verilog_yy}
 %define api.token.constructor
-%define api.location.type {location}
+%define api.location.type {Location}
 
 %param { YOSYS_NAMESPACE_PREFIX VERILOG_FRONTEND::VerilogLexer* lexer }
 %parse-param { YOSYS_NAMESPACE_PREFIX VERILOG_FRONTEND::ParseState* extra }
@@ -146,14 +146,10 @@
 	YOSYS_NAMESPACE_BEGIN
 	namespace VERILOG_FRONTEND {
 
-		static location location_range(location begin, location end) {
-			return location(begin.begin, end.end);
+		static Location location_range(Location begin, Location end) {
+			return Location(begin.begin, end.end);
 		}
 
-		static ConstParser make_ConstParser_here(parser::location_type flex_loc) {
-			ConstParser p{flex_loc};
-			return p;
-		}
 		static void append_attr(AstNode *ast, dict<IdString, std::unique_ptr<AstNode>> *al)
 		{
 			for (auto &it : *al) {
@@ -370,7 +366,7 @@
 		const AstNode *ParseState::addIncOrDecStmt(dict<IdString, std::unique_ptr<AstNode>> *stmt_attr,
 							std::unique_ptr<AstNode> lhs,
 							dict<IdString, std::unique_ptr<AstNode>> *op_attr, AST::AstNodeType op,
-							location loc)
+							Location loc)
 		{
 			auto one = AstNode::mkconst_int(loc, 1, true);
 			auto rhs = std::make_unique<AstNode>(loc, op, lhs->clone(), std::move(one));
@@ -385,7 +381,7 @@
 		}
 
 		// create a pre/post-increment/decrement expression, and add the corresponding statement
-		std::unique_ptr<AstNode> ParseState::addIncOrDecExpr(std::unique_ptr<AstNode> lhs, dict<IdString, std::unique_ptr<AstNode>> *attr, AST::AstNodeType op, location loc, bool undo, bool sv_mode)
+		std::unique_ptr<AstNode> ParseState::addIncOrDecExpr(std::unique_ptr<AstNode> lhs, dict<IdString, std::unique_ptr<AstNode>> *attr, AST::AstNodeType op, Location loc, bool undo, bool sv_mode)
 		{
 			ensureAsgnExprAllowed(loc, sv_mode);
 			const AstNode *stmt = addIncOrDecStmt(nullptr, std::move(lhs), attr, op, loc);
@@ -402,7 +398,7 @@
 		// add a binary operator assignment statement, e.g., a += b
 		std::unique_ptr<AstNode> ParseState::addAsgnBinopStmt(dict<IdString, std::unique_ptr<AstNode>> *attr, std::unique_ptr<AstNode> eq_lhs, AST::AstNodeType op, std::unique_ptr<AstNode> rhs)
 		{
-			location loc = location_range(eq_lhs->location, rhs->location);
+			Location loc = location_range(eq_lhs->location, rhs->location);
 			if (op == AST_SHIFT_LEFT || op == AST_SHIFT_RIGHT ||
 				op == AST_SHIFT_SLEFT || op == AST_SHIFT_SRIGHT) {
 				rhs = std::make_unique<AstNode>(rhs->location, AST_TO_UNSIGNED, std::move(rhs));
@@ -3219,7 +3215,7 @@ basic_expr:
 	TOK_LPAREN expr TOK_RPAREN integral_number {
 		if ($4->compare(0, 1, "'") != 0)
 			err_at_loc(@4, "Cast operation must be applied on sized constants e.g. (<expr>)<constval> , while %s is not a sized constant.", $4->c_str());
-		auto p = make_ConstParser_here(@4);
+		ConstParser p{@4};
 		auto val = p.const2ast(*$4, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
 		if (val == nullptr)
 			log_error("Value conversion failed: `%s'\n", $4->c_str());
@@ -3231,7 +3227,7 @@ basic_expr:
 		auto bits = std::make_unique<AstNode>(@$, AST_IDENTIFIER);
 		bits->str = *$1;
 		SET_AST_NODE_LOC(bits.get(), @1, @1);
-		auto p = make_ConstParser_here(@2);
+		ConstParser p{@2};
 		auto val = p.const2ast(*$2, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
 		SET_AST_NODE_LOC(val.get(), @2, @2);
 		if (val == nullptr)
@@ -3239,7 +3235,7 @@ basic_expr:
 		$$ = std::make_unique<AstNode>(@$, AST_TO_BITS, std::move(bits), std::move(val));
 	} |
 	integral_number {
-		auto p = make_ConstParser_here(@1);
+		ConstParser p{@1};
 		$$ = p.const2ast(*$1, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
 		SET_AST_NODE_LOC($$.get(), @1, @1);
 		if ($$ == nullptr)
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 1b133d9c1..5899328ef 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5725,7 +5725,7 @@ bool RTLIL::SigSpec::parse(RTLIL::SigSpec &sig, RTLIL::Module *module, std::stri
 
 		if (('0' <= netname[0] && netname[0] <= '9') || netname[0] == '\'') {
 			cover("kernel.rtlil.sigspec.parse.const");
-			VERILOG_FRONTEND::ConstParser p{location()};
+			VERILOG_FRONTEND::ConstParser p{Location()};
 			auto ast = p.const2ast(netname);
 			if (ast == nullptr)
 				return false;

From 642e041f771dc09eb58c9991ee2860c46df8cb32 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 8 Aug 2025 16:32:51 +0200
Subject: [PATCH 347/931] const2ast: fix for consistency with previous
 diagnostics behavior

---
 frontends/verilog/const2ast.cc       | 13 ++-----------
 frontends/verilog/verilog_frontend.h |  1 -
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/frontends/verilog/const2ast.cc b/frontends/verilog/const2ast.cc
index 5d906cb0f..9b197b356 100644
--- a/frontends/verilog/const2ast.cc
+++ b/frontends/verilog/const2ast.cc
@@ -44,21 +44,12 @@ YOSYS_NAMESPACE_BEGIN
 using namespace AST;
 using namespace VERILOG_FRONTEND;
 
-std::string ConstParser::fmt_maybe_loc(std::string msg) {
-	std::string s;
-
-	s += stringf("%s:%d:", loc.begin.filename->c_str(), loc.begin.line);
-
-	s += msg;
-	return s;
-}
-
 void ConstParser::log_maybe_loc_error(std::string msg) {
-	log_error("%s", fmt_maybe_loc(msg).c_str());
+	log_file_error(*loc.begin.filename, loc.begin.line, "%s", msg.c_str());
 }
 
 void ConstParser::log_maybe_loc_warn(std::string msg) {
-	log_warning("%s", fmt_maybe_loc(msg).c_str());
+	log_file_warning(*loc.begin.filename, loc.begin.line, "%s", msg.c_str());
 }
 
 // divide an arbitrary length decimal number by two and return the rest
diff --git a/frontends/verilog/verilog_frontend.h b/frontends/verilog/verilog_frontend.h
index eabc0d46b..83c0e37a1 100644
--- a/frontends/verilog/verilog_frontend.h
+++ b/frontends/verilog/verilog_frontend.h
@@ -43,7 +43,6 @@ namespace VERILOG_FRONTEND
 	struct ConstParser {
 		AST::AstSrcLocType loc;
 	private:
-		std::string fmt_maybe_loc(std::string msg);
 		void log_maybe_loc_error(std::string msg);
 		void log_maybe_loc_warn(std::string msg);
 		// divide an arbitrary length decimal number by two and return the rest

From 481ecb51a724410012dac05e9005c674a580f23d Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 12 Aug 2025 10:57:58 +1200
Subject: [PATCH 348/931] test_cell: Disable $macc testing

Needs updating to `$macc_v2`.
---
 passes/tests/test_cell.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index b6385766c..227d39139 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -939,7 +939,7 @@ struct TestCellPass : public Pass {
 		cell_types[ID($sop)] = "*";
 		cell_types[ID($alu)] = "ABSY";
 		cell_types[ID($lcu)] = "*";
-		cell_types[ID($macc)] = "*";
+		// cell_types[ID($macc)] = "*";
 		cell_types[ID($fa)] = "*";
 
 		for (; argidx < GetSize(args); argidx++)

From 22aa9fba3b864efb159e18ccfa9b48331cbde68f Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 12 Aug 2025 10:57:58 +1200
Subject: [PATCH 349/931] test_cell: Support more cell types

Still unsupported:
- wide muxes (`$_MUX16_` and friends)

Partially supported types have comments in `test_cell.cc`.

Fix `CellTypes::eval() for `$_NMUX_`.
Fix `RTLIL::Cell::fixup_parameters()` for $concat, $bwmux and $bweqx.
---
 kernel/celltypes.h        |   2 +
 kernel/rtlil.cc           |   6 +-
 passes/tests/test_cell.cc | 162 +++++++++++++++++++++++++++++++++++---
 3 files changed, 157 insertions(+), 13 deletions(-)

diff --git a/kernel/celltypes.h b/kernel/celltypes.h
index 0ce5db54d..9aeba6797 100644
--- a/kernel/celltypes.h
+++ b/kernel/celltypes.h
@@ -507,6 +507,8 @@ struct CellTypes
 	{
 		if (cell->type.in(ID($mux), ID($_MUX_)))
 			return const_mux(arg1, arg2, arg3);
+		if (cell->type == ID($_NMUX_))
+			return eval_not(const_mux(arg1, arg2, arg3));
 		if (cell->type == ID($bwmux))
 			return const_bwmux(arg1, arg2, arg3);
 		if (cell->type == ID($pmux))
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 646ffcb35..b0ce13ea4 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -4287,9 +4287,9 @@ void RTLIL::Cell::fixup_parameters(bool set_a_signed, bool set_b_signed)
 			type.begins_with("$verific$") || type.begins_with("$array:") || type.begins_with("$extern:"))
 		return;
 
-	if (type == ID($buf) || type == ID($mux) || type == ID($pmux) || type == ID($bmux)) {
+	if (type == ID($buf) || type == ID($mux) || type == ID($pmux) || type == ID($bmux) || type == ID($bwmux) || type == ID($bweqx)) {
 		parameters[ID::WIDTH] = GetSize(connections_[ID::Y]);
-		if (type != ID($buf) && type != ID($mux))
+		if (type.in(ID($pmux), ID($bmux)))
 			parameters[ID::S_WIDTH] = GetSize(connections_[ID::S]);
 		check();
 		return;
@@ -4344,7 +4344,7 @@ void RTLIL::Cell::fixup_parameters(bool set_a_signed, bool set_b_signed)
 		parameters[ID::B_WIDTH] = GetSize(connections_[ID::B]);
 	}
 
-	if (connections_.count(ID::Y))
+	if (connections_.count(ID::Y) && type != ID($concat))
 		parameters[ID::Y_WIDTH] = GetSize(connections_[ID::Y]);
 
 	if (connections_.count(ID::Q))
diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index 227d39139..ab4fd2c9f 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -71,6 +71,29 @@ static RTLIL::Cell* create_gold_module(RTLIL::Design *design, RTLIL::IdString ce
 		cell->setPort(ID::Y, wire);
 	}
 
+	if (cell_type.in(ID($_MUX_), ID($_NMUX_)))
+	{
+		wire = module->addWire(ID::A);
+		wire->width = 1;
+		wire->port_input = true;
+		cell->setPort(ID::A, wire);
+
+		wire = module->addWire(ID::B);
+		wire->width = 1;
+		wire->port_input = true;
+		cell->setPort(ID::B, wire);
+
+		wire = module->addWire(ID::S);
+		wire->width = 1;
+		wire->port_input = true;
+		cell->setPort(ID::S, wire);
+
+		wire = module->addWire(ID::Y);
+		wire->width = 1;
+		wire->port_output = true;
+		cell->setPort(ID::Y, wire);
+	}
+
 	if (cell_type == ID($bmux))
 	{
 		int width = 1 + xorshift32(8 * bloat_factor);
@@ -273,14 +296,19 @@ static RTLIL::Cell* create_gold_module(RTLIL::Design *design, RTLIL::IdString ce
 
 	if (cell_type_flags.find('A') != std::string::npos) {
 		wire = module->addWire(ID::A);
-		wire->width = 1 + xorshift32(8 * bloat_factor);
+		if (cell_type_flags.find('b') != std::string::npos)
+			wire->width = 1;
+		else
+			wire->width = 1 + xorshift32(8 * bloat_factor);
 		wire->port_input = true;
 		cell->setPort(ID::A, wire);
 	}
 
 	if (cell_type_flags.find('B') != std::string::npos) {
 		wire = module->addWire(ID::B);
-		if (cell_type_flags.find('h') != std::string::npos)
+		if (cell_type_flags.find('b') != std::string::npos)
+			wire->width = 1;
+		else if (cell_type_flags.find('h') != std::string::npos)
 			wire->width = 1 + xorshift32(6 * bloat_factor);
 		else
 			wire->width = 1 + xorshift32(8 * bloat_factor);
@@ -288,6 +316,26 @@ static RTLIL::Cell* create_gold_module(RTLIL::Design *design, RTLIL::IdString ce
 		cell->setPort(ID::B, wire);
 	}
 
+	if (cell_type_flags.find('C') != std::string::npos) {
+		wire = module->addWire(ID::C);
+		if (cell_type_flags.find('b') != std::string::npos)
+			wire->width = 1;
+		else
+			wire->width = 1 + xorshift32(8 * bloat_factor);
+		wire->port_input = true;
+		cell->setPort(ID::C, wire);
+	}
+
+	if (cell_type_flags.find('D') != std::string::npos) {
+		wire = module->addWire(ID::D);
+		if (cell_type_flags.find('b') != std::string::npos)
+			wire->width = 1;
+		else
+			wire->width = 1 + xorshift32(8 * bloat_factor);
+		wire->port_input = true;
+		cell->setPort(ID::D, wire);
+	}
+
 	if (cell_type_flags.find('S') != std::string::npos && xorshift32(2)) {
 		if (cell_type_flags.find('A') != std::string::npos)
 			cell->parameters[ID::A_SIGNED] = true;
@@ -304,7 +352,10 @@ static RTLIL::Cell* create_gold_module(RTLIL::Design *design, RTLIL::IdString ce
 
 	if (cell_type_flags.find('Y') != std::string::npos) {
 		wire = module->addWire(ID::Y);
-		wire->width = 1 + xorshift32(8 * bloat_factor);
+		if (cell_type_flags.find('b') != std::string::npos)
+			wire->width = 1;
+		else
+			wire->width = 1 + xorshift32(8 * bloat_factor);
 		wire->port_output = true;
 		cell->setPort(ID::Y, wire);
 	}
@@ -345,6 +396,58 @@ static RTLIL::Cell* create_gold_module(RTLIL::Design *design, RTLIL::IdString ce
 		cell->setPort(ID::CO, wire);
 	}
 
+	if (cell_type == ID($slice))
+	{
+		int a_size = GetSize(cell->getPort(ID::A));
+		int y_size = 1;
+		if (a_size > 1)
+			y_size += (xorshift32(8 * bloat_factor) % (a_size - 1));
+		wire = module->addWire(ID::Y);
+		wire->width = y_size;
+		wire->port_output = true;
+		cell->setPort(ID::Y, wire);
+		if (a_size > y_size)
+			cell->setParam(ID::OFFSET, (xorshift32(8 * bloat_factor) % (a_size - y_size)));
+		else
+			cell->setParam(ID::OFFSET, 0);
+	}
+
+	if (cell_type == ID($concat))
+	{
+		wire = module->addWire(ID::Y);
+		wire->width = GetSize(cell->getPort(ID::A)) + GetSize(cell->getPort(ID::B));
+		wire->port_output = true;
+		cell->setPort(ID::Y, wire);
+	}
+
+	if (cell_type == ID($buf))
+	{
+		wire = module->addWire(ID::Y);
+		wire->width = GetSize(cell->getPort(ID::A));
+		wire->port_output = true;
+		cell->setPort(ID::Y, wire);
+	}
+
+	if (cell_type.in(ID($bwmux), ID($bweqx)))
+	{
+		int a_size = GetSize(cell->getPort(ID::A));
+		wire = module->addWire(ID::B);
+		wire->width = a_size;
+		wire->port_output = true;
+		cell->setPort(ID::B, wire);
+		if (cell_type == ID($bwmux))
+		{
+			wire = module->addWire(ID::S);
+			wire->width = a_size;
+			wire->port_output = true;
+			cell->setPort(ID::S, wire);
+		}
+		wire = module->addWire(ID::Y);
+		wire->width = a_size;
+		wire->port_output = true;
+		cell->setPort(ID::Y, wire);
+	}
+
 	if (constmode)
 	{
 		auto conn_list = cell->connections();
@@ -884,6 +987,9 @@ struct TestCellPass : public Pass {
 		cell_types[ID($not)] = "ASY";
 		cell_types[ID($pos)] = "ASY";
 		cell_types[ID($neg)] = "ASY";
+		// $buf is unsupported with techmap -assert
+		if (techmap_cmd.compare("techmap -assert") != 0)
+			cell_types[ID($buf)] = "A";
 
 		cell_types[ID($and)]  = "ABSY";
 		cell_types[ID($or)]   = "ABSY";
@@ -907,8 +1013,16 @@ struct TestCellPass : public Pass {
 		cell_types[ID($le)]  = "ABSY";
 		cell_types[ID($eq)]  = "ABSY";
 		cell_types[ID($ne)]  = "ABSY";
-		// cell_types[ID($eqx)] = "ABSY";
-		// cell_types[ID($nex)] = "ABSY";
+		// $eqx, $nex, and $bweqx don't work in sat, and are unsupported with
+		// 'techmap -assert'
+		if (nosat && techmap_cmd.compare("techmap -assert") != 0)
+		{
+			cell_types[ID($eqx)] = "ABSY";
+			cell_types[ID($nex)] = "ABSY";
+		}
+		// $bweqx is additionally unsupported by ConstEval
+		if (nosat && techmap_cmd.compare("techmap -assert") != 0 && noeval)
+			cell_types[ID($bweqx)] = "A";
 		cell_types[ID($ge)]  = "ABSY";
 		cell_types[ID($gt)]  = "ABSY";
 
@@ -919,7 +1033,10 @@ struct TestCellPass : public Pass {
 		cell_types[ID($mod)] = "ABSY";
 		cell_types[ID($divfloor)] = "ABSY";
 		cell_types[ID($modfloor)] = "ABSY";
-		// cell_types[ID($pow)] = "ABsY";
+		// $pow doesnt work in sat, not supported with 'techmap -assert', and only
+		// only partially supported with '-simlib'
+		if (nosat && techmap_cmd.compare("aigmap") == 0)
+			cell_types[ID($pow)] = "ABsY";
 
 		cell_types[ID($logic_not)] = "ASY";
 		cell_types[ID($logic_and)] = "ABSY";
@@ -928,20 +1045,45 @@ struct TestCellPass : public Pass {
 		cell_types[ID($mux)] = "*";
 		cell_types[ID($bmux)] = "*";
 		cell_types[ID($demux)] = "*";
-		if (edges) {
+		// $pmux doesn't work in sat, and is not supported with 'techmap -assert'
+		if (nosat && techmap_cmd.compare("aigmap") == 0)
 			cell_types[ID($pmux)] = "*";
-		}
+		// $bwmux is not supported by ConstEval
+		if (noeval)
+			cell_types[ID($bwmux)] = "A";
 
-		// cell_types[ID($slice)] = "A";
-		// cell_types[ID($concat)] = "A";
+		cell_types[ID($slice)] = "A";
+		cell_types[ID($concat)] = "AB";
 
 		cell_types[ID($lut)] = "*";
 		cell_types[ID($sop)] = "*";
 		cell_types[ID($alu)] = "ABSY";
 		cell_types[ID($lcu)] = "*";
+		// create_gold_module() needs updating for $macc_v2
 		// cell_types[ID($macc)] = "*";
 		cell_types[ID($fa)] = "*";
 
+		cell_types[ID($_BUF_)] = "AYb";
+		cell_types[ID($_NOT_)] = "AYb";
+		cell_types[ID($_AND_)] = "ABYb";
+		cell_types[ID($_NAND_)] = "ABYb";
+		cell_types[ID($_OR_)] = "ABYb";
+		cell_types[ID($_NOR_)] = "ABYb";
+		cell_types[ID($_XOR_)] = "ABYb";
+		cell_types[ID($_XNOR_)] = "ABYb";
+		cell_types[ID($_ANDNOT_)] = "ABYb";
+		cell_types[ID($_ORNOT_)] = "ABYb";
+		cell_types[ID($_MUX_)] = "*";
+		cell_types[ID($_NMUX_)] = "*";
+		// wide $_MUX_ cells are not yet implemented
+		// cell_types[ID($_MUX4_)] = "*";
+		// cell_types[ID($_MUX8_)] = "*";
+		// cell_types[ID($_MUX16_)] = "*";
+		cell_types[ID($_AOI3_)] = "ABCYb";
+		cell_types[ID($_OAI3_)] = "ABCYb";
+		cell_types[ID($_AOI4_)] = "ABCDYb";
+		cell_types[ID($_OAI4_)] = "ABCDYb";
+
 		for (; argidx < GetSize(args); argidx++)
 		{
 			if (args[argidx].rfind("-", 0) == 0)

From 014eadd8b95945738a03d1872d68c783e8e14ec8 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 12 Aug 2025 10:57:58 +1200
Subject: [PATCH 350/931] test_cell: Fix $bweqx

---
 passes/tests/test_cell.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index ab4fd2c9f..37c82397b 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -433,13 +433,13 @@ static RTLIL::Cell* create_gold_module(RTLIL::Design *design, RTLIL::IdString ce
 		int a_size = GetSize(cell->getPort(ID::A));
 		wire = module->addWire(ID::B);
 		wire->width = a_size;
-		wire->port_output = true;
+		wire->port_input = true;
 		cell->setPort(ID::B, wire);
 		if (cell_type == ID($bwmux))
 		{
 			wire = module->addWire(ID::S);
 			wire->width = a_size;
-			wire->port_output = true;
+			wire->port_input = true;
 			cell->setPort(ID::S, wire);
 		}
 		wire = module->addWire(ID::Y);
@@ -1019,10 +1019,8 @@ struct TestCellPass : public Pass {
 		{
 			cell_types[ID($eqx)] = "ABSY";
 			cell_types[ID($nex)] = "ABSY";
-		}
-		// $bweqx is additionally unsupported by ConstEval
-		if (nosat && techmap_cmd.compare("techmap -assert") != 0 && noeval)
 			cell_types[ID($bweqx)] = "A";
+		}
 		cell_types[ID($ge)]  = "ABSY";
 		cell_types[ID($gt)]  = "ABSY";
 

From db4ffaffd2d2f94e1c76d64e08118c2ec2287845 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 12 Aug 2025 10:57:58 +1200
Subject: [PATCH 351/931] consteval: Fix $bwmux handling

If the cell type has a S signal and hasn't already been handled, use `CellTypes::eval(cell, A, B, S)`.
---
 kernel/consteval.h        | 6 +++++-
 passes/tests/test_cell.cc | 4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/kernel/consteval.h b/kernel/consteval.h
index 844120ef0..adcf86f8a 100644
--- a/kernel/consteval.h
+++ b/kernel/consteval.h
@@ -349,7 +349,11 @@ struct ConstEval
 				return false;
 
 			bool eval_err = false;
-			RTLIL::Const eval_ret = CellTypes::eval(cell, sig_a.as_const(), sig_b.as_const(), sig_c.as_const(), sig_d.as_const(), &eval_err);
+			RTLIL::Const eval_ret;
+			if (sig_s.size() > 0 && eval(sig_s, undef, cell)) {
+				eval_ret = CellTypes::eval(cell, sig_a.as_const(), sig_b.as_const(), sig_s.as_const(), &eval_err);
+			} else
+				eval_ret = CellTypes::eval(cell, sig_a.as_const(), sig_b.as_const(), sig_c.as_const(), sig_d.as_const(), &eval_err);
 
 			if (eval_err)
 				return false;
diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index 37c82397b..83ef1a66e 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -1046,9 +1046,7 @@ struct TestCellPass : public Pass {
 		// $pmux doesn't work in sat, and is not supported with 'techmap -assert'
 		if (nosat && techmap_cmd.compare("aigmap") == 0)
 			cell_types[ID($pmux)] = "*";
-		// $bwmux is not supported by ConstEval
-		if (noeval)
-			cell_types[ID($bwmux)] = "A";
+		cell_types[ID($bwmux)] = "A";
 
 		cell_types[ID($slice)] = "A";
 		cell_types[ID($concat)] = "AB";

From c5897144334cb9ae94f96bf567e7bc4a811c141a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Tue, 12 Aug 2025 10:57:59 +1200
Subject: [PATCH 352/931] test_cell: Update to $macc_v2

---
 passes/tests/test_cell.cc | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index 83ef1a66e..dd8db2dd1 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -190,7 +190,7 @@ static RTLIL::Cell* create_gold_module(RTLIL::Design *design, RTLIL::IdString ce
 		cell->setPort(ID::CO, wire);
 	}
 
-	if (cell_type == ID($macc))
+	if (cell_type == ID($macc_v2))
 	{
 		Macc macc;
 		int width = 1 + xorshift32(8 * bloat_factor);
@@ -224,6 +224,7 @@ static RTLIL::Cell* create_gold_module(RTLIL::Design *design, RTLIL::IdString ce
 			this_term.do_subtract = xorshift32(2) == 1;
 			macc.terms.push_back(this_term);
 		}
+
 		// Macc::to_cell sets the input ports
 		macc.to_cell(cell);
 
@@ -231,12 +232,6 @@ static RTLIL::Cell* create_gold_module(RTLIL::Design *design, RTLIL::IdString ce
 		wire->width = width;
 		wire->port_output = true;
 		cell->setPort(ID::Y, wire);
-
-		// override the B input (macc helpers always sets an empty vector)
-		wire = module->addWire(ID::B);
-		wire->width = xorshift32(mulbits_a ? xorshift32(4)+1 : xorshift32(16)+1);
-		wire->port_input = true;
-		cell->setPort(ID::B, wire);
 	}
 
 	if (cell_type == ID($lut))
@@ -1055,8 +1050,7 @@ struct TestCellPass : public Pass {
 		cell_types[ID($sop)] = "*";
 		cell_types[ID($alu)] = "ABSY";
 		cell_types[ID($lcu)] = "*";
-		// create_gold_module() needs updating for $macc_v2
-		// cell_types[ID($macc)] = "*";
+		cell_types[ID($macc_v2)] = "*";
 		cell_types[ID($fa)] = "*";
 
 		cell_types[ID($_BUF_)] = "AYb";

From 20c2d2a6f3992c8f1fb18dde920397c8ef4da691 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 12 Aug 2025 10:57:59 +1200
Subject: [PATCH 353/931] test_cell: Add comment on $pmux

`-simlib` also doesn't work.
---
 passes/tests/test_cell.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index dd8db2dd1..4285611f7 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -1038,7 +1038,8 @@ struct TestCellPass : public Pass {
 		cell_types[ID($mux)] = "*";
 		cell_types[ID($bmux)] = "*";
 		cell_types[ID($demux)] = "*";
-		// $pmux doesn't work in sat, and is not supported with 'techmap -assert'
+		// $pmux doesn't work in sat, and is not supported with 'techmap -assert' or
+		// '-simlib'
 		if (nosat && techmap_cmd.compare("aigmap") == 0)
 			cell_types[ID($pmux)] = "*";
 		cell_types[ID($bwmux)] = "A";

From 1afe8d9f4d95cdfee032371b6fa0e5d99c6e7c3f Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 12 Aug 2025 10:57:59 +1200
Subject: [PATCH 354/931] celltypes: Comment pointing to ConstEval

`CellTypes::eval()` is more generic but also more limited.  `ConstEval::eval()` requires more setup (both in code and at runtime) but has more complete support.
---
 kernel/celltypes.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kernel/celltypes.h b/kernel/celltypes.h
index 9aeba6797..11640c25f 100644
--- a/kernel/celltypes.h
+++ b/kernel/celltypes.h
@@ -334,6 +334,7 @@ struct CellTypes
 		return v;
 	}
 
+	// Consider using the ConstEval struct instead if you need named ports and/or multiple outputs
 	static RTLIL::Const eval(RTLIL::IdString type, const RTLIL::Const &arg1, const RTLIL::Const &arg2, bool signed1, bool signed2, int result_len, bool *errp = nullptr)
 	{
 		if (type == ID($sshr) && !signed1)
@@ -416,6 +417,7 @@ struct CellTypes
 		log_abort();
 	}
 
+	// Consider using the ConstEval struct instead if you need named ports and/or multiple outputs
 	static RTLIL::Const eval(RTLIL::Cell *cell, const RTLIL::Const &arg1, const RTLIL::Const &arg2, bool *errp = nullptr)
 	{
 		if (cell->type == ID($slice)) {
@@ -503,6 +505,7 @@ struct CellTypes
 		return eval(cell->type, arg1, arg2, signed_a, signed_b, result_len, errp);
 	}
 
+	// Consider using the ConstEval struct instead if you need named ports and/or multiple outputs
 	static RTLIL::Const eval(RTLIL::Cell *cell, const RTLIL::Const &arg1, const RTLIL::Const &arg2, const RTLIL::Const &arg3, bool *errp = nullptr)
 	{
 		if (cell->type.in(ID($mux), ID($_MUX_)))
@@ -522,6 +525,7 @@ struct CellTypes
 		return eval(cell, arg1, arg2, errp);
 	}
 
+	// Consider using the ConstEval struct instead if you need named ports and/or multiple outputs
 	static RTLIL::Const eval(RTLIL::Cell *cell, const RTLIL::Const &arg1, const RTLIL::Const &arg2, const RTLIL::Const &arg3, const RTLIL::Const &arg4, bool *errp = nullptr)
 	{
 		if (cell->type == ID($_AOI4_))

From ba01f7c64f06db0542b3316878aa9873a82c9ef9 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 12 Aug 2025 10:57:59 +1200
Subject: [PATCH 355/931] ci: Run test_cell

Includes special cases for partially supported cells.
---
 .github/workflows/test-build.yml | 34 ++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index bdd290189..9115a19e7 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -161,6 +161,40 @@ jobs:
         run: |
           find tests/**/*.err -print -exec cat {} \;
 
+  test-cells:
+    name: Run test_cell
+    runs-on: ubuntu-latest
+    needs: [build-yosys, pre_job]
+    if: needs.pre_job.outputs.should_skip != 'true'
+    env:
+      CC: clang
+    steps:
+      - name: Checkout Yosys
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
+      - name: Setup environment
+        uses: ./.github/actions/setup-build-env
+
+      - name: Download build artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: build-ubuntu-latest
+
+      - name: Uncompress build
+        shell: bash
+        run:
+          tar -xvf build.tar
+
+      - name: test_cell
+        shell: bash
+        run: |
+          ./yosys -p 'test_cell all'
+          ./yosys -p 'test_cell -nosat -aigmap $pow $pmux'
+          ./yosys -p 'test_cell -nosat -aigmap $eqx $nex $bweqx'
+          ./yosys -p 'test_cell -aigmap $buf'
+
   test-docs:
     name: Run docs tests
     runs-on: ${{ matrix.os }}

From c630f995d5974184b2e28cbb6798f52da5c91c11 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 12 Aug 2025 11:17:00 +1200
Subject: [PATCH 356/931] ci: Reduce test_cell count and use a seed

---
 .github/workflows/test-build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 9115a19e7..886b23d36 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -190,10 +190,10 @@ jobs:
       - name: test_cell
         shell: bash
         run: |
-          ./yosys -p 'test_cell all'
-          ./yosys -p 'test_cell -nosat -aigmap $pow $pmux'
-          ./yosys -p 'test_cell -nosat -aigmap $eqx $nex $bweqx'
-          ./yosys -p 'test_cell -aigmap $buf'
+          ./yosys -p 'test_cell -n 20 -s 1 all'
+          ./yosys -p 'test_cell -n 20 -s 1 -nosat -aigmap $pow $pmux'
+          ./yosys -p 'test_cell -n 20 -s 1 -nosat -aigmap $eqx $nex $bweqx'
+          ./yosys -p 'test_cell -n 20 -s 1 -aigmap $buf'
 
   test-docs:
     name: Run docs tests

From 73403ad8304ec5a94e7effa6f10bb35a0d167dd9 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 12 Aug 2025 12:05:23 +1200
Subject: [PATCH 357/931] ci: Adjust workflow triggers for tests

In light of problems with concurrent skipping, disable it.
Instead, limit the `push` trigger to just main, and enable `workflow_dispatch` for manual triggering.
Don't cancel builds from main if a new commit is pushed.
---
 .github/workflows/extra-builds.yml | 16 ++++++++++++----
 .github/workflows/test-build.yml   | 23 ++++++++++++++++-------
 .github/workflows/test-compile.yml | 16 ++++++++++++----
 .github/workflows/test-verific.yml | 16 ++++++++++++----
 4 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 8d64b2e0e..944bb9e09 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -1,6 +1,14 @@
 name: Test extra build flows
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre_job:
@@ -11,11 +19,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   vs-prep:
     name: Prepare Visual Studio build
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index bdd290189..4cfd64da3 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -1,6 +1,14 @@
 name: Build and run tests
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre_job:
@@ -11,11 +19,12 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+
   pre_docs_job:
     runs-on: ubuntu-latest
     outputs:
@@ -24,11 +33,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on readme changes
           paths_ignore: '["**/README.md"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   build-yosys:
     name: Reusable build
diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index 7a706e69a..f208b911a 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -1,6 +1,14 @@
 name: Compiler testing
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre_job:
@@ -11,11 +19,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   test-compile:
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/test-verific.yml b/.github/workflows/test-verific.yml
index 013c9f8ca..9af07b920 100644
--- a/.github/workflows/test-verific.yml
+++ b/.github/workflows/test-verific.yml
@@ -1,6 +1,14 @@
 name: Build and run tests with Verific (Linux)
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre-job:
@@ -11,11 +19,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   test-verific:
     needs: pre-job

From 0f8c040371e7f1c8c10859e77882bdea0f7bfab9 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 12 Aug 2025 12:21:50 +1200
Subject: [PATCH 358/931] ci: Move SAN into a separate workflow

---
 .github/workflows/test-build.yml      |  13 +---
 .github/workflows/test-sanitizers.yml | 105 ++++++++++++++++++++++++++
 2 files changed, 109 insertions(+), 9 deletions(-)
 create mode 100644 .github/workflows/test-sanitizers.yml

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 4cfd64da3..b62973414 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -42,6 +42,7 @@ jobs:
   build-yosys:
     name: Reusable build
     runs-on: ${{ matrix.os }}
+    # pre_job is a subset of pre_docs_job, so we can always build for pre_docs_job
     needs: pre_docs_job
     if: needs.pre_docs_job.outputs.should_skip != 'true'
     env:
@@ -49,7 +50,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -67,7 +67,6 @@ jobs:
           mkdir build
           cd build
           make -f ../Makefile config-$CC
-          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
           make -f ../Makefile -j$procs ENABLE_LTO=1
 
       - name: Log yosys-config output
@@ -83,7 +82,7 @@ jobs:
       - name: Store build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
+          name: build-${{ matrix.os }}
           path: build.tar
           retention-days: 1
 
@@ -94,12 +93,9 @@ jobs:
     if: needs.pre_job.outputs.should_skip != 'true'
     env:
       CC: clang
-      ASAN_OPTIONS: halt_on_error=1
-      UBSAN_OPTIONS: halt_on_error=1
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -148,7 +144,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
+          name: build-${{ matrix.os }}
 
       - name: Uncompress build
         shell: bash
@@ -180,7 +176,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -194,7 +189,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
+          name: build-${{ matrix.os }}
 
       - name: Uncompress build
         shell: bash
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
new file mode 100644
index 000000000..fb76d1266
--- /dev/null
+++ b/.github/workflows/test-sanitizers.yml
@@ -0,0 +1,105 @@
+name: Check clang sanitizers
+
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # ignore PRs due to time needed
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
+
+jobs:
+  pre_job:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          # don't run on documentation changes
+          paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
+
+  run_san:
+    name: Build and run tests
+    runs-on: ${{ matrix.os }}
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
+    env:
+      CC: clang
+      ASAN_OPTIONS: halt_on_error=1
+      UBSAN_OPTIONS: halt_on_error=1
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        sanitizer: ['undefined,address']
+      fail-fast: false
+    steps:
+      - name: Checkout Yosys
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          persist-credentials: false
+
+      - name: Setup environment
+        uses: ./.github/actions/setup-build-env
+
+      - name: Build
+        shell: bash
+        run: |
+          mkdir build
+          cd build
+          make -f ../Makefile config-$CC
+          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
+          make -f ../Makefile -j$procs ENABLE_LTO=1
+
+      - name: Log yosys-config output
+        run: |
+          ./yosys-config || true
+
+      - name: Get iverilog
+        shell: bash
+        run: |
+          git clone https://github.com/steveicarus/iverilog.git
+          cd iverilog
+          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
+      - name: Get vcd2fst
+        shell: bash
+        run: |
+          git clone https://github.com/mmicko/libwave.git
+          mkdir -p ${{ github.workspace }}/.local/
+          cd libwave
+          cmake . -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.local
+          make -j$procs
+          make install
+
+      - name: Cache iverilog
+        id: cache-iverilog
+        uses: actions/cache@v4
+        with:
+          path: .local/
+          key: ${{ matrix.os }}-${IVERILOG_GIT}
+
+      - name: Build iverilog
+        if: steps.cache-iverilog.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          mkdir -p ${{ github.workspace }}/.local/
+          cd iverilog
+          autoconf
+          CC=gcc CXX=g++ ./configure --prefix=${{ github.workspace }}/.local
+          make -j$procs
+          make install
+
+      - name: Run tests
+        shell: bash
+        run: |
+          make -j$procs test TARGETS= EXTRA_TARGETS= CONFIG=$CC
+
+      - name: Report errors
+        if: ${{ failure() }}
+        shell: bash
+        run: |
+          find tests/**/*.err -print -exec cat {} \;

From 1e6e25c81f0d12b3906473ffd39c2fb5cc1c00b4 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 12 Aug 2025 12:43:14 +1200
Subject: [PATCH 359/931] ci: Use correct build artifact

---
 .github/workflows/test-build.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 886b23d36..f9574594a 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -163,11 +163,15 @@ jobs:
 
   test-cells:
     name: Run test_cell
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     needs: [build-yosys, pre_job]
     if: needs.pre_job.outputs.should_skip != 'true'
     env:
       CC: clang
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        sanitizer: [undefined]
     steps:
       - name: Checkout Yosys
         uses: actions/checkout@v4
@@ -180,7 +184,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-ubuntu-latest
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Uncompress build
         shell: bash

From a0dde68487da600c569c0b61b684dc845fd5c554 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Tue, 15 Apr 2025 09:39:49 +0200
Subject: [PATCH 360/931] Improve STAT

---
 passes/cmds/stat.cc | 617 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 472 insertions(+), 145 deletions(-)

diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index af7023bdd..0d19849c3 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -19,13 +19,14 @@
 
 #include <iterator>
 
-#include "kernel/yosys.h"
 #include "kernel/celltypes.h"
-#include "passes/techmap/libparse.h"
 #include "kernel/cost.h"
 #include "kernel/gzip.h"
+#include "kernel/yosys.h"
 #include "libs/json11/json11.hpp"
 #include "kernel/log_help.h"
+#include "passes/techmap/libparse.h"
+#include <charconv>
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -35,137 +36,225 @@ struct cell_area_t {
 	bool is_sequential;
 };
 
-struct statdata_t
-{
-	#define STAT_INT_MEMBERS X(num_wires) X(num_wire_bits) X(num_pub_wires) X(num_pub_wire_bits) \
-			X(num_ports) X(num_port_bits) X(num_memories) X(num_memory_bits) X(num_cells) \
-			X(num_processes)
+struct statdata_t {
+#define STAT_INT_MEMBERS                                                                                                                             \
+	X(num_wires)                                                                                                                                 \
+	X(num_wire_bits)                                                                                                                             \
+	X(num_pub_wires) X(num_pub_wire_bits) X(num_ports) X(num_port_bits) X(num_memories) X(num_memory_bits) X(num_cells) X(num_processes)
 
-	#define STAT_NUMERIC_MEMBERS STAT_INT_MEMBERS X(area) X(sequential_area)
+#define STAT_NUMERIC_MEMBERS STAT_INT_MEMBERS X(area) X(sequential_area)
 
-	#define X(_name) unsigned int _name;
+#define X(_name) unsigned int _name;
 	STAT_INT_MEMBERS
-	#undef X
+#undef X
+#define X(_name) unsigned int local_##_name;
+	STAT_INT_MEMBERS
+#undef X
 	double area = 0;
 	double sequential_area = 0;
+	double local_area = 0;
+	double local_sequential_area = 0;
+	double submodule_area = 0;
+	int num_submodules = 0;
+	std::map<RTLIL::IdString, unsigned int, RTLIL::sort_by_id_str> num_submodules_by_type;
+	std::map<RTLIL::IdString, double, RTLIL::sort_by_id_str> submodules_area_by_type;
+
+	std::map<RTLIL::IdString, unsigned int, RTLIL::sort_by_id_str> local_num_cells_by_type;
+	std::map<RTLIL::IdString, double, RTLIL::sort_by_id_str> local_area_cells_by_type;
+	std::map<RTLIL::IdString, double, RTLIL::sort_by_id_str> local_seq_area_cells_by_type;
 	string tech;
 
 	std::map<RTLIL::IdString, unsigned int, RTLIL::sort_by_id_str> num_cells_by_type;
+	std::map<RTLIL::IdString, double, RTLIL::sort_by_id_str> area_cells_by_type;
+	std::map<RTLIL::IdString, double, RTLIL::sort_by_id_str> seq_area_cells_by_type;
 	std::set<RTLIL::IdString> unknown_cell_area;
 
 	statdata_t operator+(const statdata_t &other) const
 	{
 		statdata_t sum = other;
-	#define X(_name) sum._name += _name;
+#define X(_name) sum._name += _name;
 		STAT_NUMERIC_MEMBERS
-	#undef X
+#undef X
 		for (auto &it : num_cells_by_type)
 			sum.num_cells_by_type[it.first] += it.second;
 		return sum;
 	}
-
 	statdata_t operator*(unsigned int other) const
 	{
 		statdata_t sum = *this;
-	#define X(_name) sum._name *= other;
+#define X(_name) sum._name *= other;
 		STAT_NUMERIC_MEMBERS
-	#undef X
+#undef X
 		for (auto &it : sum.num_cells_by_type)
 			it.second *= other;
 		return sum;
 	}
+	statdata_t add(const statdata_t &other)
+	{
+#define X(_name) _name += other._name;
+		STAT_NUMERIC_MEMBERS
+#undef X
+		for (auto &it : other.num_cells_by_type) {
+			if (num_cells_by_type.count(it.first))
+				num_cells_by_type[it.first] += it.second;
+			else
+				num_cells_by_type[it.first] = it.second;
+		}
+		for (auto &it : other.submodules_area_by_type) {
+			if (submodules_area_by_type.count(it.first))
+				submodules_area_by_type[it.first] += it.second;
+			else
+				submodules_area_by_type[it.first] = it.second;
+		}
+		for (auto &it : other.area_cells_by_type) {
+			if (area_cells_by_type.count(it.first))
+				area_cells_by_type[it.first] += it.second;
+			else
+				area_cells_by_type[it.first] = it.second;
+		}
+		for (auto &it : other.seq_area_cells_by_type) {
+			if (seq_area_cells_by_type.count(it.first))
+				seq_area_cells_by_type[it.first] += it.second;
+			else
+				seq_area_cells_by_type[it.first] = it.second;
+		}
+		unknown_cell_area.insert(other.unknown_cell_area.begin(), other.unknown_cell_area.end());
+		return *this;
+	}
 
 	statdata_t()
 	{
-	#define X(_name) _name = 0;
+#define X(_name) _name = 0;
 		STAT_NUMERIC_MEMBERS
-	#undef X
+#undef X
 	}
 
-	statdata_t(RTLIL::Design *design, RTLIL::Module *mod, bool width_mode, const dict<IdString, cell_area_t> &cell_area, string techname)
+	statdata_t(cell_area_t &cell_data, string techname)
+	{
+		tech = techname;
+		area = cell_data.area;
+		if (cell_data.is_sequential) {
+			sequential_area = cell_data.area;
+		}
+	}
+
+	statdata_t(const RTLIL::Design *design, const RTLIL::Module *mod, bool width_mode, dict<IdString, cell_area_t> &cell_area, string techname)
 	{
 		tech = techname;
 
-	#define X(_name) _name = 0;
+#define X(_name) _name = 0;
 		STAT_NUMERIC_MEMBERS
-	#undef X
+#undef X
+#define X(_name) local_##_name = 0;
+		STAT_NUMERIC_MEMBERS
+#undef X
+		// additional_cell_area
 
-		for (auto wire : mod->selected_wires())
-		{
+		for (auto wire : mod->selected_wires()) {
 			if (wire->port_input || wire->port_output) {
 				num_ports++;
+				local_num_ports++;
 				num_port_bits += wire->width;
+				local_num_port_bits += wire->width;
 			}
 
 			if (wire->name.isPublic()) {
 				num_pub_wires++;
+				local_num_pub_wires++;
 				num_pub_wire_bits += wire->width;
+				local_num_pub_wire_bits += wire->width;
 			}
 
 			num_wires++;
+			local_num_wires++;
 			num_wire_bits += wire->width;
+			local_num_wire_bits += wire->width;
 		}
 
 		for (auto &it : mod->memories) {
 			if (!design->selected(mod, it.second))
 				continue;
 			num_memories++;
+			local_num_memories++;
 			num_memory_bits += it.second->width * it.second->size;
+			local_num_memory_bits += it.second->width * it.second->size;
 		}
-
-		for (auto cell : mod->selected_cells())
-		{
+		for (auto cell : mod->selected_cells()) {
 			RTLIL::IdString cell_type = cell->type;
-
-			if (width_mode)
-			{
-				if (cell_type.in(ID($not), ID($pos), ID($neg),
-						ID($logic_not), ID($logic_and), ID($logic_or),
-						ID($reduce_and), ID($reduce_or), ID($reduce_xor), ID($reduce_xnor), ID($reduce_bool),
-						ID($lut), ID($and), ID($or), ID($xor), ID($xnor),
-						ID($shl), ID($shr), ID($sshl), ID($sshr), ID($shift), ID($shiftx),
-						ID($lt), ID($le), ID($eq), ID($ne), ID($eqx), ID($nex), ID($ge), ID($gt),
-						ID($add), ID($sub), ID($mul), ID($div), ID($mod), ID($divfloor), ID($modfloor), ID($pow), ID($alu))) {
+			if (width_mode) {
+				if (cell_type.in(ID($not), ID($pos), ID($neg), ID($logic_not), ID($logic_and), ID($logic_or), ID($reduce_and),
+						 ID($reduce_or), ID($reduce_xor), ID($reduce_xnor), ID($reduce_bool), ID($lut), ID($and), ID($or),
+						 ID($xor), ID($xnor), ID($shl), ID($shr), ID($sshl), ID($sshr), ID($shift), ID($shiftx), ID($lt),
+						 ID($le), ID($eq), ID($ne), ID($eqx), ID($nex), ID($ge), ID($gt), ID($add), ID($sub), ID($mul),
+						 ID($div), ID($mod), ID($divfloor), ID($modfloor), ID($pow), ID($alu))) {
 					int width_a = cell->hasPort(ID::A) ? GetSize(cell->getPort(ID::A)) : 0;
 					int width_b = cell->hasPort(ID::B) ? GetSize(cell->getPort(ID::B)) : 0;
 					int width_y = cell->hasPort(ID::Y) ? GetSize(cell->getPort(ID::Y)) : 0;
 					cell_type = stringf("%s_%d", cell_type.c_str(), max<int>({width_a, width_b, width_y}));
-				}
-				else if (cell_type.in(ID($mux), ID($pmux)))
+				} else if (cell_type.in(ID($mux)))
 					cell_type = stringf("%s_%d", cell_type.c_str(), GetSize(cell->getPort(ID::Y)));
-				else if (cell_type == ID($bmux))
-					cell_type = stringf("%s_%d_%d", cell_type.c_str(), GetSize(cell->getPort(ID::Y)), GetSize(cell->getPort(ID::S)));
+				else if (cell_type.in(ID($bmux), ID($pmux)))
+					cell_type =
+					  stringf("%s_%d_%d", cell_type.c_str(), GetSize(cell->getPort(ID::Y)), GetSize(cell->getPort(ID::S)));
 				else if (cell_type == ID($demux))
-					cell_type = stringf("%s_%d_%d", cell_type.c_str(), GetSize(cell->getPort(ID::A)), GetSize(cell->getPort(ID::S)));
-				else if (cell_type.in(
-						ID($sr), ID($ff), ID($dff), ID($dffe), ID($dffsr), ID($dffsre),
-						ID($adff), ID($adffe), ID($sdff), ID($sdffe), ID($sdffce),
-						ID($aldff), ID($aldffe), ID($dlatch), ID($adlatch), ID($dlatchsr)))
+					cell_type =
+					  stringf("%s_%d_%d", cell_type.c_str(), GetSize(cell->getPort(ID::A)), GetSize(cell->getPort(ID::S)));
+				else if (cell_type.in(ID($sr), ID($ff), ID($dff), ID($dffe), ID($dffsr), ID($dffsre), ID($adff), ID($adffe),
+						      ID($sdff), ID($sdffe), ID($sdffce), ID($aldff), ID($aldffe), ID($dlatch), ID($adlatch),
+						      ID($dlatchsr)))
 					cell_type = stringf("%s_%d", cell_type.c_str(), GetSize(cell->getPort(ID::Q)));
 			}
 
 			if (!cell_area.empty()) {
+
 				if (cell_area.count(cell_type)) {
 					cell_area_t cell_data = cell_area.at(cell_type);
 					if (cell_data.is_sequential) {
 						sequential_area += cell_data.area;
+						local_sequential_area += cell_data.area;
 					}
 					area += cell_data.area;
-				}
-				else {
-					unknown_cell_area.insert(cell_type);
-				}
-			}
+					num_cells++;
+					num_cells_by_type[cell_type]++;
+					area_cells_by_type[cell_type] += cell_data.area;
+					seq_area_cells_by_type[cell_type] += cell_data.is_sequential ? cell_data.area : 0;
+					local_area_cells_by_type[cell_type] += cell_data.area;
+					local_seq_area_cells_by_type[cell_type] += cell_data.is_sequential ? cell_data.area : 0;
+					local_area += cell_data.area;
+					local_num_cells++;
+					local_num_cells_by_type[cell_type]++;
 
-			num_cells++;
-			num_cells_by_type[cell_type]++;
+				} else {
+					unknown_cell_area.insert(cell_type);
+					num_cells++;
+					num_cells_by_type[cell_type]++;
+					local_num_cells++;
+					local_num_cells_by_type[cell_type]++;
+					area_cells_by_type[cell_type] = 0;
+					seq_area_cells_by_type[cell_type] = 0;
+					local_area_cells_by_type[cell_type] = 0;
+					local_seq_area_cells_by_type[cell_type] = 0;
+				}
+			} else {
+				num_cells++;
+				num_cells_by_type[cell_type]++;
+				area_cells_by_type[cell_type] = 0;
+				seq_area_cells_by_type[cell_type] = 0;
+				local_num_cells++;
+				local_num_cells_by_type[cell_type]++;
+				local_area_cells_by_type[cell_type] = 0;
+				local_seq_area_cells_by_type[cell_type] = 0;
+			}
 		}
 
 		for (auto &it : mod->processes) {
 			if (!design->selected(mod, it.second))
 				continue;
 			num_processes++;
+			local_num_processes++;
 		}
+		RTLIL::IdString cell_name = mod->name;
+		auto s = cell_name.str();
 	}
 
 	unsigned int estimate_xilinx_lc()
@@ -238,22 +327,119 @@ struct statdata_t
 		return tran_cnt;
 	}
 
-	void log_data(RTLIL::IdString mod_name, bool top_mod)
+	/*
+	format a floating point value to a of 8 characters, with at most 7 digits or scientific notation
+	uses - to mark zero or very small values
+	*/
+	std::string f_val(double value)
 	{
-		log("   Number of wires:             %6u\n", num_wires);
-		log("   Number of wire bits:         %6u\n", num_wire_bits);
-		log("   Number of public wires:      %6u\n", num_pub_wires);
-		log("   Number of public wire bits:  %6u\n", num_pub_wire_bits);
-		log("   Number of ports:             %6u\n", num_ports);
-		log("   Number of port bits:         %6u\n", num_port_bits);
-		log("   Number of memories:          %6u\n", num_memories);
-		log("   Number of memory bits:       %6u\n", num_memory_bits);
-		log("   Number of processes:         %6u\n", num_processes);
-		log("   Number of cells:             %6u\n", num_cells);
-		for (auto &it : num_cells_by_type)
-			if (it.second)
-				log("     %-26s %6u\n", log_id(it.first), it.second);
+		if (std::abs(value) < 1e-12)
+			return "       -";
 
+		char buf[16];
+
+		int len = std::snprintf(buf, sizeof(buf), "%.3f", value);
+
+		while (len > 0 && buf[len - 1] == '0')
+			--len;
+		if (len > 0 && buf[len - 1] == '.')
+			--len;
+		buf[len] = '\0';
+
+		if (len <= 7) {
+			return std::string(8 - len, ' ') + std::string(buf);
+		}
+
+		// use scientific notation, this should always fit in 8 characters
+		std::snprintf(buf, sizeof(buf), "%8.3G", value);
+
+		return std::string(buf);
+	}
+
+	void print_log_line(const std::string &name, unsigned int count_local, double area_local, unsigned int count_global, double area_global,
+			    int spacer = 0, bool print_area = true, bool print_hierarchical = true)
+	{
+		const std::string indent(2 * spacer, ' ');
+
+		std::string count_local_str = f_val(static_cast<double>(count_local));
+		std::string count_global_str = f_val(static_cast<double>(count_global));
+		std::string area_local_str = f_val(area_local);
+		std::string area_global_str = f_val(area_global);
+
+		if (print_area) {
+			if (print_hierarchical) {
+				log(" %s %s %s %s %s%s\n", count_global_str.c_str(), area_global_str.c_str(), count_local_str.c_str(),
+				    area_local_str.c_str(), indent.c_str(), name.c_str());
+			} else {
+				if (count_local > 0)
+					log(" %s %s %s%s\n", count_local_str.c_str(), area_local_str.c_str(), indent.c_str(), name.c_str());
+			}
+		} else {
+			if (print_hierarchical) {
+				log(" %s %s %s%s\n", count_global_str.c_str(), count_local_str.c_str(), indent.c_str(), name.c_str());
+			} else {
+				if (count_local > 0)
+					log(" %s %s%s\n", count_local_str.c_str(), indent.c_str(), name.c_str());
+			}
+		}
+	}
+
+	void print_log_header(bool print_area = true, bool print_hierarchical = true)
+	{
+		if (print_area) {
+			if (print_hierarchical) {
+				log(" %8s-%8s-%8s-%8s-%s\n", "+", "--------", "--------", "--------", "Count including submodules.");
+				log(" %8s %8s-%8s-%8s-%s\n", "|", "+", "--------", "--------", "Area including submodules.");
+				log(" %8s %8s %8s-%8s-%s\n", "|", "|", "+", "--------", "Local count, excluding submodules.");
+				log(" %8s %8s %8s %8s-%s\n", "|", "|", "|", "+", "Local area, excluding submodules.");
+				log(" %8s %8s %8s %8s \n", "|", "|", "|", "|");
+			} else {
+				log(" %8s-%8s-%s\n", "+", "--------", "Local Count including submodules.");
+				log(" %8s %8s-%s\n", "|", "+", "Local Area including submodules.");
+				log(" %8s %8s \n", "|", "|");
+			}
+		} else {
+			if (print_hierarchical) {
+				log(" %8s-%8s-%8s-%s\n", "+", "--------", "--------", "Count including submodules.");
+				log(" %8s %8s-%8s-%s\n", "|", "+", "--------", "Local count, excluding submodules.");
+				log(" %8s %8s \n", "|", "|");
+			} else {
+				log(" %8s-%8s-%s\n", "+", "--------", "Local Count including submodules.");
+				log(" %8s \n", "|");
+			}
+		}
+	}
+
+	void log_data(RTLIL::IdString mod_name, bool top_mod, bool print_area = true, bool print_hierarchical = true)
+	{
+
+		print_log_header(print_area, print_hierarchical);
+
+		print_log_line("wires", local_num_wires, 0, num_wires, 0, 0, print_area, print_hierarchical);
+		print_log_line("wire bits", local_num_wire_bits, 0, num_wire_bits, 0, 0, print_area, print_hierarchical);
+		print_log_line("public wires", local_num_pub_wires, 0, num_pub_wires, 0, 0, print_area, print_hierarchical);
+		print_log_line("public wire bits", local_num_pub_wire_bits, 0, num_pub_wire_bits, 0, 0, print_area, print_hierarchical);
+		print_log_line("ports", local_num_ports, 0, num_ports, 0, 0, print_area, print_hierarchical);
+		print_log_line("port bits", local_num_port_bits, 0, num_port_bits, 0, 0, print_area, print_hierarchical);
+		print_log_line("memories", local_num_memories, 0, num_memories, 0, 0, print_area, print_hierarchical);
+		print_log_line("memory bits", local_num_memory_bits, 0, num_memory_bits, 0, 0, print_area, print_hierarchical);
+		print_log_line("processes", local_num_processes, 0, num_processes, 0, 0, print_area, print_hierarchical);
+		print_log_line("cells", local_num_cells, local_area, num_cells, area, 0, print_area, print_hierarchical);
+		for (auto &it : num_cells_by_type)
+			if (it.second) {
+				auto name = string(log_id(it.first));
+				print_log_line(name, local_num_cells_by_type.count(it.first) ? local_num_cells_by_type.at(it.first) : 0,
+					       local_area_cells_by_type.count(it.first) ? local_area_cells_by_type.at(it.first) : 0, it.second,
+					       area_cells_by_type.at(it.first), 1, print_area, print_hierarchical);
+			}
+		if (num_submodules > 0) {
+			print_log_line("submodules", num_submodules, 0, num_submodules, submodule_area, 0, print_area, print_hierarchical);
+			for (auto &it : num_submodules_by_type)
+				if (it.second)
+					print_log_line(string(log_id(it.first)), it.second, 0, it.second,
+						       submodules_area_by_type.count(it.first) ? submodules_area_by_type.at(it.first) : 0, 1,
+						       print_area, print_hierarchical);
+		}
 		if (!unknown_cell_area.empty()) {
 			log("\n");
 			for (auto cell_type : unknown_cell_area)
@@ -263,17 +449,15 @@ struct statdata_t
 		if (area != 0) {
 			log("\n");
 			log("   Chip area for %smodule '%s': %f\n", (top_mod) ? "top " : "", mod_name.c_str(), area);
-			log("     of which used for sequential elements: %f (%.2f%%)\n", sequential_area, 100.0*sequential_area/area);
+			log("     of which used for sequential elements: %f (%.2f%%)\n", sequential_area, 100.0 * sequential_area / area);
 		}
 
-		if (tech == "xilinx")
-		{
+		if (tech == "xilinx") {
 			log("\n");
 			log("   Estimated number of LCs: %10u\n", estimate_xilinx_lc());
 		}
 
-		if (tech == "cmos")
-		{
+		if (tech == "cmos") {
 			bool tran_cnt_exact = true;
 			unsigned int tran_cnt = cmos_transistor_count(&tran_cnt_exact);
 
@@ -282,87 +466,203 @@ struct statdata_t
 		}
 	}
 
-	void log_data_json(const char *mod_name, bool first_module)
+	string json_line(unsigned int count_local, double area_local, unsigned int count_global, double area_global)
+	{
+
+		return stringf("{ \"count\": \"%u\", \"area\": \"%f\", \"local_count\": \"%u\", \"local_area\": \"%f\" }", count_global, area_global,
+			       count_local, area_local);
+	}
+
+	void log_data_json(const char *mod_name, bool first_module, bool hierarchical = false)
 	{
 		if (!first_module)
 			log(",\n");
-		log("      %s: {\n", json11::Json(mod_name).dump().c_str());
-		log("         \"num_wires\":         %u,\n", num_wires);
-		log("         \"num_wire_bits\":     %u,\n", num_wire_bits);
-		log("         \"num_pub_wires\":     %u,\n", num_pub_wires);
-		log("         \"num_pub_wire_bits\": %u,\n", num_pub_wire_bits);
-		log("         \"num_ports\":         %u,\n", num_ports);
-		log("         \"num_port_bits\":     %u,\n", num_port_bits);
-		log("         \"num_memories\":      %u,\n", num_memories);
-		log("         \"num_memory_bits\":   %u,\n", num_memory_bits);
-		log("         \"num_processes\":     %u,\n", num_processes);
-		log("         \"num_cells\":         %u,\n", num_cells);
-		if (area != 0) {
-			log("         \"area\":              %f,\n", area);
-		}
-		log("         \"num_cells_by_type\": {\n");
-		bool first_line = true;
-		for (auto &it : num_cells_by_type)
-			if (it.second) {
-				if (!first_line)
-					log(",\n");
-				log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
-				first_line = false;
+		if (hierarchical) {
+			log("      %s: {\n", json11::Json(mod_name).dump().c_str());
+			log("         \"num_wires\":         %s,\n", json_line(local_num_wires, 0, num_wires, 0).c_str());
+			log("         \"num_wire_bits\":     %s,\n", json_line(local_num_wire_bits, 0, num_wire_bits, 0).c_str());
+			log("         \"num_pub_wires\":     %s,\n", json_line(local_num_pub_wires, 0, num_pub_wires, 0).c_str());
+			log("         \"num_pub_wire_bits\": %s,\n", json_line(local_num_pub_wire_bits, 0, num_pub_wire_bits, 0).c_str());
+			log("         \"num_ports\":         %s,\n", json_line(local_num_ports, 0, num_ports, 0).c_str());
+			log("         \"num_port_bits\":     %s,\n", json_line(local_num_port_bits, 0, num_port_bits, 0).c_str());
+			log("         \"num_memories\":      %s,\n", json_line(local_num_memories, 0, num_memories, 0).c_str());
+			log("         \"num_memory_bits\":   %s,\n", json_line(local_num_memory_bits, 0, num_memory_bits, 0).c_str());
+			log("         \"num_processes\":     %s,\n", json_line(local_num_processes, 0, num_processes, 0).c_str());
+			log("         \"num_cells\":         %s,\n", json_line(local_num_cells, local_area, num_cells, area).c_str());
+			log("         \"num_submodules\":       %s,\n", json_line(0, 0, num_submodules, submodule_area).c_str());
+			log("         \"sequential_area\":    %s,\n", json_line(0, local_sequential_area, 0, sequential_area).c_str());
+
+			log("         \"num_cells_by_type\": {\n");
+			bool first_line = true;
+			for (auto &it : num_cells_by_type)
+				if (it.second) {
+					if (!first_line)
+						log(",\n");
+					log("            %s: %s", json11::Json(log_id(it.first)).dump().c_str(),
+					    json_line(local_num_cells_by_type.count(it.first) ? local_num_cells_by_type.at(it.first) : 0,
+						      local_area_cells_by_type.count(it.first) ? local_area_cells_by_type.at(it.first) : 0, it.second,
+						      area_cells_by_type.at(it.first))
+					      .c_str());
+					first_line = false;
+				}
+			log("\n      },\n");
+			log("         \"num_submodules_by_type\": {\n");
+			first_line = true;
+			for (auto &it : num_submodules_by_type)
+				if (it.second) {
+					if (!first_line)
+						log(",\n");
+					log("            %s: %s", json11::Json(log_id(it.first)).dump().c_str(),
+					    json_line(0, 0, it.second,
+						      submodules_area_by_type.count(it.first) ? submodules_area_by_type.at(it.first) : 0)
+					      .c_str());
+					first_line = false;
+				}
+			log("\n      }\n");
+			if (tech == "xilinx") {
+				log("         \"estimated_num_lc\": %u,\n", estimate_xilinx_lc());
 			}
-		log("\n");
-		log("         }");
-		if (tech == "xilinx")
-		{
-			log(",\n");
-			log("         \"estimated_num_lc\": %u", estimate_xilinx_lc());
+			if (tech == "cmos") {
+				bool tran_cnt_exact = true;
+				unsigned int tran_cnt = cmos_transistor_count(&tran_cnt_exact);
+				log("		 \"estimated_num_transistors\": \"%u%s\"\n", tran_cnt, tran_cnt_exact ? "" : "+");
+			}
+			log("      }");
+
+		} else {
+
+			log("      %s: {\n", json11::Json(mod_name).dump().c_str());
+			log("         \"num_wires\":         %u,\n", num_wires);
+			log("         \"num_wire_bits\":     %u,\n", num_wire_bits);
+			log("         \"num_pub_wires\":     %u,\n", num_pub_wires);
+			log("         \"num_pub_wire_bits\": %u,\n", num_pub_wire_bits);
+			log("         \"num_ports\":         %u,\n", num_ports);
+			log("         \"num_port_bits\":     %u,\n", num_port_bits);
+			log("         \"num_memories\":      %u,\n", num_memories);
+			log("         \"num_memory_bits\":   %u,\n", num_memory_bits);
+			log("         \"num_processes\":     %u,\n", num_processes);
+			log("         \"num_cells\":         %u,\n", local_num_cells);
+			log("         \"num_submodules\":       %u,\n", num_submodules);
+			if (area != 0) {
+				log("         \"area\":              %f,\n", area);
+				log("         \"sequential_area\":    %f,\n", sequential_area);
+			}
+			log("         \"num_cells_by_type\": {\n");
+			bool first_line = true;
+			for (auto &it : local_num_cells_by_type)
+				if (it.second) {
+					if (!first_line)
+						log(",\n");
+					log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
+					first_line = false;
+				}
+			for (auto &it : num_submodules_by_type)
+				if (it.second) {
+					if (!first_line)
+						log(",\n");
+					log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
+					first_line = false;
+				}
+			log("\n");
+			log("         }");
+			if (tech == "xilinx") {
+				log(",\n");
+				log("         \"estimated_num_lc\": %u", estimate_xilinx_lc());
+			}
+			if (tech == "cmos") {
+				bool tran_cnt_exact = true;
+				unsigned int tran_cnt = cmos_transistor_count(&tran_cnt_exact);
+				log(",\n");
+				log("         \"estimated_num_transistors\": \"%u%s\"", tran_cnt, tran_cnt_exact ? "" : "+");
+			}
+			log("\n");
+			log("      }");
 		}
-		if (tech == "cmos")
-		{
-			bool tran_cnt_exact = true;
-			unsigned int tran_cnt = cmos_transistor_count(&tran_cnt_exact);
-			log(",\n");
-			log("         \"estimated_num_transistors\": \"%u%s\"", tran_cnt, tran_cnt_exact ? "" : "+");
-		}
-		log("\n");
-		log("      }");
 	}
 };
 
-statdata_t hierarchy_worker(std::map<RTLIL::IdString, statdata_t> &mod_stat, RTLIL::IdString mod, int level, bool quiet = false)
+statdata_t hierarchy_worker(std::map<RTLIL::IdString, statdata_t> &mod_stat, RTLIL::IdString mod, int level, bool quiet = false, bool has_area = true,
+			    bool hierarchy_mode = true)
 {
 	statdata_t mod_data = mod_stat.at(mod);
-	std::map<RTLIL::IdString, unsigned int, RTLIL::sort_by_id_str> num_cells_by_type;
-	num_cells_by_type.swap(mod_data.num_cells_by_type);
 
-	for (auto &it : num_cells_by_type)
+	for (auto &it : mod_data.num_submodules_by_type) {
 		if (mod_stat.count(it.first) > 0) {
 			if (!quiet)
-				log("     %*s%-*s %6u\n", 2*level, "", 26-2*level, log_id(it.first), it.second);
-			mod_data = mod_data + hierarchy_worker(mod_stat, it.first, level+1, quiet) * it.second;
-			mod_data.num_cells -= it.second;
-		} else {
-			mod_data.num_cells_by_type[it.first] += it.second;
+				mod_data.print_log_line(string(log_id(it.first)), mod_stat.at(it.first).local_num_cells,
+							mod_stat.at(it.first).local_area, mod_stat.at(it.first).num_cells, mod_stat.at(it.first).area,
+							level, has_area, hierarchy_mode);
+			hierarchy_worker(mod_stat, it.first, level + 1, quiet, has_area, hierarchy_mode) * it.second;
 		}
+	}
 
 	return mod_data;
 }
 
+statdata_t hierarchy_builder(const RTLIL::Design *design, const RTLIL::Module *top_mod, std::map<RTLIL::IdString, statdata_t> &mod_stat,
+			     bool width_mode, dict<IdString, cell_area_t> &cell_area, string techname)
+{
+	if (top_mod == nullptr)
+		top_mod = design->top_module();
+	statdata_t mod_data(design, top_mod, width_mode, cell_area, techname);
+	for (auto cell : top_mod->selected_cells()) {
+		if (cell_area.count(cell->type) == 0) {
+			if (design->has(cell->type)) {
+				if (!(design->module(cell->type)->attributes.count(ID::blackbox))) {
+					// deal with modules
+					mod_data.add(
+					  hierarchy_builder(design, design->module(cell->type), mod_stat, width_mode, cell_area, techname));
+					mod_data.num_submodules_by_type[cell->type]++;
+					mod_data.submodules_area_by_type[cell->type] += mod_stat.at(cell->type).area;
+					mod_data.submodule_area += mod_stat.at(cell->type).area;
+					mod_data.num_submodules++;
+					mod_data.unknown_cell_area.erase(cell->type);
+					mod_data.num_cells -= mod_data.num_cells_by_type.erase(cell->type);
+					mod_data.area_cells_by_type.erase(cell->type);
+					mod_data.local_num_cells -= mod_data.local_num_cells_by_type.erase(cell->type);
+					mod_data.local_area_cells_by_type.erase(cell->type);
+				} else {
+					// deal with blackbox cells
+					if (design->module(cell->type)->attributes.count(ID::area) &&
+					    design->module(cell->type)->attributes.at(ID::area).size() == 0) {
+						mod_data.num_submodules_by_type[cell->type]++;
+						mod_data.num_submodules++;
+						mod_data.submodules_area_by_type[cell->type] +=
+						  double(design->module(cell->type)->attributes.at(ID::area).as_int());
+						mod_data.area += double(design->module(cell->type)->attributes.at(ID::area).as_int());
+						mod_data.unknown_cell_area.erase(cell->type);
+					} else {
+						mod_data.unknown_cell_area.insert(cell->type);
+						mod_data.num_submodules++;
+						mod_data.num_submodules_by_type[cell->type]++;
+						mod_data.submodules_area_by_type[cell->type] = 0;
+						mod_data.seq_area_cells_by_type[cell->type] = 0;
+					}
+				}
+			}
+		}
+	}
+	mod_stat[top_mod->name] = mod_data;
+	return mod_data;
+}
+
 void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string liberty_file)
 {
-	std::istream* f = uncompressed(liberty_file.c_str());
+	std::istream *f = uncompressed(liberty_file.c_str());
 	yosys_input_files.insert(liberty_file);
 	LibertyParser libparser(*f, liberty_file);
 	delete f;
 
-	for (auto cell : libparser.ast->children)
-	{
+	for (auto cell : libparser.ast->children) {
 		if (cell->id != "cell" || cell->args.size() != 1)
 			continue;
 
 		const LibertyAst *ar = cell->find("area");
 		bool is_flip_flop = cell->find("ff") != nullptr;
-		if (ar != nullptr && !ar->value.empty())
-			cell_area["\\" + cell->args[0]] = {/*area=*/atof(ar->value.c_str()), is_flip_flop};
+		if (ar != nullptr && !ar->value.empty()) {
+			string prefix = cell->args[0].substr(0, 1) == "$" ? "" : "\\";
+			cell_area[prefix + cell->args[0]] = {atof(ar->value.c_str()), is_flip_flop};
+		}
 	}
 }
 
@@ -381,6 +681,7 @@ struct StatPass : public Pass {
 		log("\n");
 		log("Print some statistics (number of objects) on the selected portion of the\n");
 		log("design.\n");
+		log("Extracts the area of cells from a liberty file, if provided.\n");
 		log("\n");
 		log("    -top <module>\n");
 		log("        print design hierarchy with this module as top. if the design is fully\n");
@@ -402,35 +703,38 @@ struct StatPass : public Pass {
 		log("        output the statistics in a machine-readable JSON format.\n");
 		log("        this is output to the console; use \"tee\" to output to a file.\n");
 		log("\n");
+		log("    -hierarchy\n");
+		log("        print hierarchical statistics, i.e. The area and number of cells include submodules.\n");
+		log(" 	     this changes the format of the json output.\n");
+		log("\n");
 	}
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
-		bool width_mode = false, json_mode = false;
+		bool width_mode = false, json_mode = false, hierarchy_mode = false;
 		RTLIL::Module *top_mod = nullptr;
 		std::map<RTLIL::IdString, statdata_t> mod_stat;
 		dict<IdString, cell_area_t> cell_area;
 		string techname;
 
 		size_t argidx;
-		for (argidx = 1; argidx < args.size(); argidx++)
-		{
+		for (argidx = 1; argidx < args.size(); argidx++) {
 			if (args[argidx] == "-width") {
 				width_mode = true;
 				continue;
 			}
-			if (args[argidx] == "-liberty" && argidx+1 < args.size()) {
+			if (args[argidx] == "-liberty" && argidx + 1 < args.size()) {
 				string liberty_file = args[++argidx];
 				rewrite_filename(liberty_file);
 				read_liberty_cellarea(cell_area, liberty_file);
 				continue;
 			}
-			if (args[argidx] == "-tech" && argidx+1 < args.size()) {
+			if (args[argidx] == "-tech" && argidx + 1 < args.size()) {
 				techname = args[++argidx];
 				continue;
 			}
-			if (args[argidx] == "-top" && argidx+1 < args.size()) {
-				if (design->module(RTLIL::escape_id(args[argidx+1])) == nullptr)
-					log_cmd_error("Can't find module %s.\n", args[argidx+1].c_str());
+			if (args[argidx] == "-top" && argidx + 1 < args.size()) {
+				if (design->module(RTLIL::escape_id(args[argidx + 1])) == nullptr)
+					log_cmd_error("Can't find module %s.\n", args[argidx + 1].c_str());
 				top_mod = design->module(RTLIL::escape_id(args[++argidx]));
 				continue;
 			}
@@ -438,11 +742,15 @@ struct StatPass : public Pass {
 				json_mode = true;
 				continue;
 			}
+			if (args[argidx] == "-hierarchy") {
+				hierarchy_mode = true;
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
 
-		if(!json_mode)
+		if (!json_mode)
 			log_header(design, "Printing statistics.\n");
 
 		if (techname != "" && techname != "xilinx" && techname != "cmos" && !json_mode)
@@ -457,24 +765,40 @@ struct StatPass : public Pass {
 			log("   \"modules\": {\n");
 		}
 
+		printf("building cell area\n");
+		if (top_mod != nullptr) {
+			hierarchy_builder(design, top_mod, mod_stat, width_mode, cell_area, techname);
+		} else {
+			for (auto mod : design->selected_modules()) {
+				if (mod_stat.count(mod->name) == 0) {
+					hierarchy_builder(design, mod, mod_stat, width_mode, cell_area, techname);
+				}
+			}
+		}
+
+		printf("built hierarchy\n");
 		bool first_module = true;
-		for (auto mod : design->selected_modules())
-		{
+		// determine if anything has a area.
+		bool has_area = false;
+		for (auto &it : mod_stat) {
+			if (it.second.area > 0 || it.second.sequential_area > 0) {
+				has_area = true;
+				break;
+			}
+		}
+		for (auto mod : design->selected_modules()) {
 			if (!top_mod && design->full_selection())
 				if (mod->get_bool_attribute(ID::top))
 					top_mod = mod;
-
-			statdata_t data(design, mod, width_mode, cell_area, techname);
-			mod_stat[mod->name] = data;
-
+			statdata_t data = mod_stat.at(mod->name);
 			if (json_mode) {
-				data.log_data_json(mod->name.c_str(), first_module);
+				data.log_data_json(mod->name.c_str(), first_module, hierarchy_mode);
 				first_module = false;
 			} else {
 				log("\n");
 				log("=== %s%s ===\n", log_id(mod->name), mod->is_selected_whole() ? "" : " (partially selected)");
 				log("\n");
-				data.log_data(mod->name, false);
+				data.log_data(mod->name, false, has_area, hierarchy_mode);
 			}
 		}
 
@@ -483,22 +807,24 @@ struct StatPass : public Pass {
 			log(top_mod == nullptr ? "   }\n" : "   },\n");
 		}
 
-		if (top_mod != nullptr)
-		{
+		if (top_mod != nullptr) {
 			if (!json_mode && GetSize(mod_stat) > 1) {
 				log("\n");
 				log("=== design hierarchy ===\n");
 				log("\n");
-				log("   %-28s %6d\n", log_id(top_mod->name), 1);
+				mod_stat[top_mod->name].print_log_header(has_area, hierarchy_mode);
+				mod_stat[top_mod->name].print_log_line(log_id(top_mod->name), mod_stat[top_mod->name].local_num_cells,
+								       mod_stat[top_mod->name].local_area, mod_stat[top_mod->name].num_cells,
+								       mod_stat[top_mod->name].area, 0, has_area, hierarchy_mode);
 			}
 
-			statdata_t data = hierarchy_worker(mod_stat, top_mod->name, 0, /*quiet=*/json_mode);
+			statdata_t data = hierarchy_worker(mod_stat, top_mod->name, 0, /*quiet=*/json_mode, has_area, hierarchy_mode);
 
 			if (json_mode)
-				data.log_data_json("design", true);
+				data.log_data_json("design", true, true);
 			else if (GetSize(mod_stat) > 1) {
 				log("\n");
-				data.log_data(top_mod->name, true);
+				data.log_data(top_mod->name, true, has_area, hierarchy_mode);
 			}
 
 			design->scratchpad_set_int("stat.num_wires", data.num_wires);
@@ -520,6 +846,7 @@ struct StatPass : public Pass {
 		}
 
 		log("\n");
+		printf("processed statistics\n");
 	}
 } StatPass;
 

From 2a97987cf208d353ff76f6c3964ea2ee689c0955 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Tue, 12 Aug 2025 09:16:05 +0200
Subject: [PATCH 361/931] formatting and remove debug statements

---
 passes/cmds/stat.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 0d19849c3..24b21d674 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -22,9 +22,9 @@
 #include "kernel/celltypes.h"
 #include "kernel/cost.h"
 #include "kernel/gzip.h"
+#include "kernel/log_help.h"
 #include "kernel/yosys.h"
 #include "libs/json11/json11.hpp"
-#include "kernel/log_help.h"
 #include "passes/techmap/libparse.h"
 #include <charconv>
 
@@ -667,8 +667,9 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 }
 
 struct StatPass : public Pass {
-	StatPass() : Pass("stat", "print some statistics") { }
-	bool formatted_help() override {
+	StatPass() : Pass("stat", "print some statistics") {}
+	bool formatted_help() override
+	{
 		auto *help = PrettyHelp::get_current();
 		help->set_group("passes/status");
 		return false;
@@ -765,7 +766,6 @@ struct StatPass : public Pass {
 			log("   \"modules\": {\n");
 		}
 
-		printf("building cell area\n");
 		if (top_mod != nullptr) {
 			hierarchy_builder(design, top_mod, mod_stat, width_mode, cell_area, techname);
 		} else {
@@ -776,7 +776,6 @@ struct StatPass : public Pass {
 			}
 		}
 
-		printf("built hierarchy\n");
 		bool first_module = true;
 		// determine if anything has a area.
 		bool has_area = false;

From 8582136a459c6ac38c1edcab9ed0e8c563ddfe73 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 12 Aug 2025 12:39:36 +0200
Subject: [PATCH 362/931] simplify: fix $initstate segfault

---
 frontends/ast/simplify.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index c25d0183f..b1a615d76 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -3369,13 +3369,14 @@ skip_dynamic_range_lvalue_expansion:;
 				wire->str = stringf("$initstate$%d_wire", myidx);
 				while (wire->simplify(true, 1, -1, false)) { }
 
-				auto cell = std::make_unique<AstNode>(location, AST_CELL, std::make_unique<AstNode>(location, AST_CELLTYPE), std::make_unique<AstNode>(location, AST_ARGUMENT, std::make_unique<AstNode>(location, AST_IDENTIFIER)));
+				auto cell_owned = std::make_unique<AstNode>(location, AST_CELL, std::make_unique<AstNode>(location, AST_CELLTYPE), std::make_unique<AstNode>(location, AST_ARGUMENT, std::make_unique<AstNode>(location, AST_IDENTIFIER)));
+				auto* cell = cell_owned.get();
 				cell->str = stringf("$initstate$%d", myidx);
 				cell->children[0]->str = "$initstate";
 				cell->children[1]->str = "\\Y";
 				cell->children[1]->children[0]->str = wire->str;
 				cell->children[1]->children[0]->id2ast = wire;
-				current_ast_mod->children.push_back(std::move(cell));
+				current_ast_mod->children.push_back(std::move(cell_owned));
 				while (cell->simplify(true, 1, -1, false)) { }
 
 				newNode = std::make_unique<AstNode>(location, AST_IDENTIFIER);

From 6042ae0e8a18b1707a388b21630c1d819ea728d2 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 12 Aug 2025 12:59:31 +0200
Subject: [PATCH 363/931] simplify: add smoke test for system function calls

---
 tests/verilog/fcall_smoke.ys | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 tests/verilog/fcall_smoke.ys

diff --git a/tests/verilog/fcall_smoke.ys b/tests/verilog/fcall_smoke.ys
new file mode 100644
index 000000000..a878e76f6
--- /dev/null
+++ b/tests/verilog/fcall_smoke.ys
@@ -0,0 +1,15 @@
+read_verilog -sv <<EOT
+module smoke_initstate (
+	input resetn,
+    input clk,
+    input a
+);
+    always @(posedge clk) begin
+        assert property ($stable(a));
+        assert property ($changed(a));
+        assert property ($rose(a));
+        assert property ($fell(a));
+		assume(resetn == !$initstate);
+	end
+endmodule
+EOT

From 256aa3e389e325b925e554d1d3b52abaac2c7a11 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 12 Aug 2025 14:38:20 +0200
Subject: [PATCH 364/931] check: Limit detailed cell edge checking for $pmux
 and $bmux

While these cells can't have a quadratic number of edges between A, B
and Y, they do have a quadratic number of edges between S and Y.
---
 passes/cmds/check.cc | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/passes/cmds/check.cc b/passes/cmds/check.cc
index 8bbcb8da0..3017630a6 100644
--- a/passes/cmds/check.cc
+++ b/passes/cmds/check.cc
@@ -195,16 +195,23 @@ struct CheckPass : public Pass {
 					// in port widths are those for us to check.
 					if (!cell->type.in(
 							ID($add), ID($sub),
-							ID($shl), ID($shr), ID($sshl), ID($sshr), ID($shift), ID($shiftx)))
+							ID($shl), ID($shr), ID($sshl), ID($sshr), ID($shift), ID($shiftx),
+							ID($pmux), ID($bmux)))
 						return false;
 
 					int in_widths = 0, out_widths = 0;
 
-					for (auto &conn : cell->connections()) {
-						if (cell->input(conn.first))
-							in_widths += conn.second.size();
-						if (cell->output(conn.first))
-							out_widths += conn.second.size();
+					if (cell->type.in(ID($pmux), ID($bmux))) {
+						// We're skipping inputs A and B, since each of their bits contributes only one edge
+						in_widths = GetSize(cell->getPort(ID::S));
+						out_widths = GetSize(cell->getPort(ID::Y));
+					} else {
+						for (auto &conn : cell->connections()) {
+							if (cell->input(conn.first))
+								in_widths += conn.second.size();
+							if (cell->output(conn.first))
+								out_widths += conn.second.size();
+						}
 					}
 
 					const int threshold = 1024;

From 1f876f3a226ebb7b5e6227c915b868361a86ba37 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 12 Aug 2025 15:26:36 +0200
Subject: [PATCH 365/931] abstract: Add -initstates option

---
 passes/cmds/abstract.cc              | 65 +++++++++++++++++++++++-----
 tests/various/abstract_initstates.ys | 30 +++++++++++++
 2 files changed, 84 insertions(+), 11 deletions(-)
 create mode 100644 tests/various/abstract_initstates.ys

diff --git a/passes/cmds/abstract.cc b/passes/cmds/abstract.cc
index d4eb22ca5..907a16fe0 100644
--- a/passes/cmds/abstract.cc
+++ b/passes/cmds/abstract.cc
@@ -373,6 +373,12 @@ struct AbstractPass : public Pass {
 		log("        abstractions performed by either mode. This option is not supported in\n");
 		log("        the -init mode.\n");
 		log("\n");
+		log("    -initstates <n>\n");
+		log("        Perform conditional abstraction for the first <n> time steps. See the\n");
+		log("        description of the -state and -value modes for details on how the\n");
+		log("        condition affects the abstractions performed by either mode. This option\n");
+		log("        is not supported in the -init mode.\n");
+		log("\n");
 		log("    -slice <lhs>:<rhs>\n");
 		log("    -slice <index>\n");
 		log("    -rtlilslice <lhs>:<rhs>\n");
@@ -402,8 +408,10 @@ struct AbstractPass : public Pass {
 			Always = -1,
 			ActiveLow = false, // ensuring we can use bool(enable)
 			ActiveHigh = true,
+			Initstates = 2,
 		};
 		Enable enable = Enable::Always;
+		int initstates = 0;
 		std::string enable_name;
 		std::vector<Slice> slices;
 		for (argidx = 1; argidx < args.size(); argidx++)
@@ -435,6 +443,13 @@ struct AbstractPass : public Pass {
 				enable = Enable::ActiveLow;
 				continue;
 			}
+			if (arg == "-initstates" && argidx + 1 < args.size()) {
+				if (enable != Enable::Always)
+					log_cmd_error("Multiple enable condition are not supported\n");
+				initstates = atoi(args[++argidx].c_str());
+				enable = Enable::Initstates;
+				continue;
+			}
 			if (arg == "-slice" && argidx + 1 < args.size()) {
 				slices.emplace_back(SliceIndices::HdlSlice, args[++argidx]);
 				continue;
@@ -451,22 +466,50 @@ struct AbstractPass : public Pass {
 			if (mode == Mode::Initial)
 				log_cmd_error("Conditional initial value abstraction is not supported\n");
 
-			if (enable_name.empty())
-				log_cmd_error("Unspecified enable wire\n");
+			switch (enable) {
+				case Enable::Always:
+					log_assert(false);
+				case Enable::ActiveLow:
+				case Enable::ActiveHigh: {
+					if (enable_name.empty())
+						log_cmd_error("Unspecified enable wire\n");
+				} break;
+				case Enable::Initstates: {
+					if (initstates <= 0)
+						log_cmd_error("Number of initial time steps must be positive\n");
+				} break;
+			}
 		}
 
 		unsigned int changed = 0;
 		if ((mode == State) || (mode == Value)) {
 			for (auto mod : design->selected_modules()) {
-				EnableLogic enable_logic = { State::S1, true };
-				if (enable != Enable::Always) {
-					Wire *enable_wire = mod->wire("\\" + enable_name);
-					if (!enable_wire)
-						log_cmd_error("Enable wire %s not found in module %s\n", enable_name.c_str(), mod->name.c_str());
-					if (GetSize(enable_wire) != 1)
-						log_cmd_error("Enable wire %s must have width 1 but has width %d in module %s\n",
-								enable_name.c_str(), GetSize(enable_wire), mod->name.c_str());
-					enable_logic = { enable_wire, enable == Enable::ActiveHigh };
+				EnableLogic enable_logic;
+
+				switch (enable) {
+					case Enable::Always: {
+						enable_logic = { State::S1, true };
+					} break;
+					case Enable::ActiveLow:
+					case Enable::ActiveHigh: {
+						Wire *enable_wire = mod->wire("\\" + enable_name);
+						if (!enable_wire)
+							log_cmd_error("Enable wire %s not found in module %s\n", enable_name.c_str(), mod->name.c_str());
+						if (GetSize(enable_wire) != 1)
+							log_cmd_error("Enable wire %s must have width 1 but has width %d in module %s\n",
+									enable_name.c_str(), GetSize(enable_wire), mod->name.c_str());
+						enable_logic = { enable_wire, enable == Enable::ActiveHigh };
+					} break;
+					case Enable::Initstates: {
+						SigBit in_init_states = mod->Initstate(NEW_ID);
+						for (int i = 1; i < initstates; i++) {
+							Wire *in_init_states_q = mod->addWire(NEW_ID);
+							mod->addFf(NEW_ID, in_init_states, in_init_states_q);
+							in_init_states_q->attributes[ID::init] = State::S1;
+							in_init_states = in_init_states_q;
+						}
+						enable_logic = { in_init_states, true };
+					} break;
 				}
 				if (mode == State)
 					changed += abstract_state(mod, enable_logic, slices);
diff --git a/tests/various/abstract_initstates.ys b/tests/various/abstract_initstates.ys
new file mode 100644
index 000000000..35d17cf62
--- /dev/null
+++ b/tests/various/abstract_initstates.ys
@@ -0,0 +1,30 @@
+read_verilog <<EOT
+
+module half_clock (CLK, Q, magic);
+	input CLK;
+	output reg Q = 0;
+	input magic;
+	always @(posedge CLK)
+		Q <= ~Q;
+endmodule
+
+EOT
+proc
+design -save half_clock
+
+sat -set-init-undef -enable_undef -verify -seq 5 -set-at 1 Q 0
+sat -set-init-undef -enable_undef -falsify -seq 5 -set-at 1 Q 0 -set-at 2 Q 0
+sat -set-init-undef -enable_undef -falsify -seq 5 -set-at 2 Q 0 -set-at 3 Q 0
+abstract -state -initstates 1 */Q
+sat -set-init-undef -enable_undef -verify -seq 5 -set-at 1 Q 0 -set-at 2 Q 0
+sat -set-init-undef -enable_undef -falsify -seq 5 -set-at 2 Q 0 -set-at 3 Q 0
+
+design -load half_clock
+
+sat -set-init-undef -enable_undef -falsify -seq 5 -set-at 1 Q 0 -set-at 2 Q 0
+sat -set-init-undef -enable_undef -falsify -seq 5 -set-at 2 Q 0 -set-at 3 Q 0
+sat -set-init-undef -enable_undef -falsify -seq 5 -set-at 3 Q 0 -set-at 4 Q 0
+abstract -state -initstates 2 */Q
+sat -set-init-undef -enable_undef -verify -seq 5 -set-at 1 Q 0 -set-at 2 Q 0
+sat -set-init-undef -enable_undef -verify -seq 5 -set-at 1 Q 0 -set-at 2 Q 0 -set-at 3 Q 0
+sat -set-init-undef -enable_undef -falsify -seq 5 -set-at 3 Q 0 -set-at 4 Q 0

From b3ca5ee0f10a8e8be5110b7c9d7fc7b46a316772 Mon Sep 17 00:00:00 2001
From: Anhijkt <mihail.ershov.zp@gmail.com>
Date: Wed, 13 Aug 2025 01:48:59 +0300
Subject: [PATCH 366/931] opt_dff: fix timeout issue

---
 passes/opt/opt_dff.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/opt/opt_dff.cc b/passes/opt/opt_dff.cc
index 210c4828f..2fb0f947f 100644
--- a/passes/opt/opt_dff.cc
+++ b/passes/opt/opt_dff.cc
@@ -199,7 +199,7 @@ struct OptDffWorker
 
 					const auto complimentary_var = find_comp(left, right);
 
-					if (complimentary_var) {
+					if (complimentary_var && new_patterns.count(right)) {
 						new_patterns.erase(right);
 						right.erase(complimentary_var.value());
 						new_patterns.insert(right);

From 8634d83320e7c1362ae554c46f339055db27e25f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 13 Aug 2025 00:25:15 +0000
Subject: [PATCH 367/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b0f565338..10f8add20 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+30
+YOSYS_VER := 0.56+101
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 4ba42c4752795e5d7db003b330d904ad61d1ba8b Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 15 Jul 2025 01:26:24 +0000
Subject: [PATCH 368/931] Move ABC pass state to a struct instead of storing it
 in global variables.

---
 passes/techmap/abc.cc | 124 +++++++++++++++++++++---------------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index cc37677ce..16d27a0e6 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -113,23 +113,42 @@ bool map_mux8;
 bool map_mux16;
 
 bool markgroups;
-int map_autoidx;
-SigMap assign_map;
-RTLIL::Module *module;
-std::vector<gate_t> signal_list;
-dict<RTLIL::SigBit, int> signal_map;
-FfInitVals initvals;
+
 pool<std::string> enabled_gates;
 bool cmos_cost;
-bool had_init;
 
-bool clk_polarity, en_polarity, arst_polarity, srst_polarity;
-RTLIL::SigSpec clk_sig, en_sig, arst_sig, srst_sig;
-dict<int, std::string> pi_map, po_map;
+struct AbcModuleState {
+	int map_autoidx = 0;
+	SigMap assign_map;
+	RTLIL::Module *module = nullptr;
+	std::vector<gate_t> signal_list;
+	dict<RTLIL::SigBit, int> signal_map;
+	FfInitVals initvals;
+	bool had_init = false;
 
-int undef_bits_lost;
+	bool clk_polarity = false;
+	bool en_polarity = false;
+	bool arst_polarity = false;
+	bool srst_polarity = false;
+	RTLIL::SigSpec clk_sig, en_sig, arst_sig, srst_sig;
+	dict<int, std::string> pi_map, po_map;
 
-int map_signal(RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1)
+	int undef_bits_lost = 0;
+
+	int map_signal(RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1);
+	void mark_port(RTLIL::SigSpec sig);
+	void extract_cell(RTLIL::Cell *cell, bool keepff);
+	std::string remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire = nullptr);
+	void dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edges, pool<int> &workpool, std::vector<int> &in_counts);
+	void handle_loops();
+	void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std::string script_file, std::string exe_file,
+		std::vector<std::string> &liberty_files, std::vector<std::string> &genlib_files, std::string constr_file,
+		bool cleanup, vector<int> lut_costs, bool dff_mode, std::string clk_str, bool keepff, std::string delay_target,
+		std::string sop_inputs, std::string sop_products, std::string lutin_shared, bool fast_mode,
+		const std::vector<RTLIL::Cell*> &cells, bool show_tempdir, bool sop_mode, bool abc_dress, std::vector<std::string> &dont_use_cells);
+};
+
+int AbcModuleState::map_signal(RTLIL::SigBit bit, gate_type_t gate_type, int in1, int in2, int in3, int in4)
 {
 	assign_map.apply(bit);
 
@@ -167,14 +186,14 @@ int map_signal(RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1,
 	return gate.id;
 }
 
-void mark_port(RTLIL::SigSpec sig)
+void AbcModuleState::mark_port(RTLIL::SigSpec sig)
 {
 	for (auto &bit : assign_map(sig))
 		if (bit.wire != nullptr && signal_map.count(bit) > 0)
 			signal_list[signal_map[bit]].is_port = true;
 }
 
-void extract_cell(RTLIL::Cell *cell, bool keepff)
+void AbcModuleState::extract_cell(RTLIL::Cell *cell, bool keepff)
 {
 	if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
 		FfData ff(&initvals, cell);
@@ -377,7 +396,7 @@ void extract_cell(RTLIL::Cell *cell, bool keepff)
 	}
 }
 
-std::string remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire = nullptr)
+std::string AbcModuleState::remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire)
 {
 	std::string abc_sname = abc_name.substr(1);
 	bool isnew = false;
@@ -416,7 +435,7 @@ std::string remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire = nullp
 	return stringf("$abc$%d$%s", map_autoidx, abc_name.c_str()+1);
 }
 
-void dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edges, pool<int> &workpool, std::vector<int> &in_counts)
+void AbcModuleState::dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edges, pool<int> &workpool, std::vector<int> &in_counts)
 {
 	if (f == nullptr)
 		return;
@@ -445,7 +464,7 @@ void dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edges, pool<int> &w
 	fprintf(f, "}\n");
 }
 
-void handle_loops()
+void AbcModuleState::handle_loops()
 {
 	// http://en.wikipedia.org/wiki/Topological_sorting
 	// (Kahn, Arthur B. (1962), "Topological sorting of large networks")
@@ -646,13 +665,15 @@ std::string replace_tempdir(std::string text, std::string tempdir_name, bool sho
 
 struct abc_output_filter
 {
+	const AbcModuleState &state;
 	bool got_cr;
 	int escape_seq_state;
 	std::string linebuf;
 	std::string tempdir_name;
 	bool show_tempdir;
 
-	abc_output_filter(std::string tempdir_name, bool show_tempdir) : tempdir_name(tempdir_name), show_tempdir(show_tempdir)
+	abc_output_filter(const AbcModuleState& state, std::string tempdir_name, bool show_tempdir)
+		: state(state), tempdir_name(tempdir_name), show_tempdir(show_tempdir)
 	{
 		got_cr = false;
 		escape_seq_state = 0;
@@ -693,8 +714,8 @@ struct abc_output_filter
 		int pi, po;
 		if (sscanf(line.c_str(), "Start-point = pi%d.  End-point = po%d.", &pi, &po) == 2) {
 			log("ABC: Start-point = pi%d (%s).  End-point = po%d (%s).\n",
-					pi, pi_map.count(pi) ? pi_map.at(pi).c_str() : "???",
-					po, po_map.count(po) ? po_map.at(po).c_str() : "???");
+					pi, state.pi_map.count(pi) ? state.pi_map.at(pi).c_str() : "???",
+					po, state.po_map.count(po) ? state.po_map.at(po).c_str() : "???");
 			return;
 		}
 
@@ -703,20 +724,16 @@ struct abc_output_filter
 	}
 };
 
-void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std::string script_file, std::string exe_file,
+void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std::string script_file, std::string exe_file,
 		std::vector<std::string> &liberty_files, std::vector<std::string> &genlib_files, std::string constr_file,
 		bool cleanup, vector<int> lut_costs, bool dff_mode, std::string clk_str, bool keepff, std::string delay_target,
 		std::string sop_inputs, std::string sop_products, std::string lutin_shared, bool fast_mode,
 		const std::vector<RTLIL::Cell*> &cells, bool show_tempdir, bool sop_mode, bool abc_dress, std::vector<std::string> &dont_use_cells)
 {
 	module = current_module;
+	initvals.set(&assign_map, module);
 	map_autoidx = autoidx++;
 
-	signal_map.clear();
-	signal_list.clear();
-	pi_map.clear();
-	po_map.clear();
-
 	if (clk_str != "$")
 	{
 		clk_polarity = true;
@@ -1109,7 +1126,7 @@ void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std::strin
 		log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, show_tempdir).c_str());
 
 #ifndef YOSYS_LINK_ABC
-		abc_output_filter filt(tempdir_name, show_tempdir);
+		abc_output_filter filt(*this, tempdir_name, show_tempdir);
 		int ret = run_command(buffer, std::bind(&abc_output_filter::next_line, filt, std::placeholders::_1));
 #else
 		string temp_stdouterr_name = stringf("%s/stdouterr.txt", tempdir_name.c_str());
@@ -1652,13 +1669,6 @@ struct AbcPass : public Pass {
 		log_header(design, "Executing ABC pass (technology mapping using ABC).\n");
 		log_push();
 
-		assign_map.clear();
-		signal_list.clear();
-		signal_map.clear();
-		initvals.clear();
-		pi_map.clear();
-		po_map.clear();
-
 		std::string exe_file = yosys_abc_executable;
 		std::string script_file, default_liberty_file, constr_file, clk_str;
 		std::vector<std::string> liberty_files, genlib_files, dont_use_cells;
@@ -1667,13 +1677,6 @@ struct AbcPass : public Pass {
 		bool show_tempdir = false, sop_mode = false;
 		bool abc_dress = false;
 		vector<int> lut_costs;
-		markgroups = false;
-
-		map_mux4 = false;
-		map_mux8 = false;
-		map_mux16 = false;
-		enabled_gates.clear();
-		cmos_cost = false;
 
 		// get arguments from scratchpad first, then override by command arguments
 		std::string lut_arg, luts_arg, g_arg;
@@ -2049,11 +2052,10 @@ struct AbcPass : public Pass {
 				continue;
 			}
 
-			assign_map.set(mod);
-			initvals.set(&assign_map, mod);
-
 			if (!dff_mode || !clk_str.empty()) {
-				abc_module(design, mod, script_file, exe_file, liberty_files, genlib_files, constr_file, cleanup, lut_costs, dff_mode, clk_str, keepff,
+				AbcModuleState state;
+				state.assign_map.set(mod);
+				state.abc_module(design, mod, script_file, exe_file, liberty_files, genlib_files, constr_file, cleanup, lut_costs, dff_mode, clk_str, keepff,
 						delay_target, sop_inputs, sop_products, lutin_shared, fast_mode, mod->selected_cells(), show_tempdir, sop_mode, abc_dress, dont_use_cells);
 				continue;
 			}
@@ -2074,6 +2076,10 @@ struct AbcPass : public Pass {
 			dict<RTLIL::Cell*, pool<RTLIL::SigBit>> cell_to_bit, cell_to_bit_up, cell_to_bit_down;
 			dict<RTLIL::SigBit, pool<RTLIL::Cell*>> bit_to_cell, bit_to_cell_up, bit_to_cell_down;
 
+			SigMap assign_map;
+			assign_map.set(mod);
+			FfInitVals initvals;
+			initvals.set(&assign_map, mod);
 			for (auto cell : all_cells)
 			{
 				clkdomain_t key;
@@ -2207,27 +2213,21 @@ struct AbcPass : public Pass {
 						std::get<6>(it.first) ? "" : "!", log_signal(std::get<7>(it.first)));
 
 			for (auto &it : assigned_cells) {
-				clk_polarity = std::get<0>(it.first);
-				clk_sig = assign_map(std::get<1>(it.first));
-				en_polarity = std::get<2>(it.first);
-				en_sig = assign_map(std::get<3>(it.first));
-				arst_polarity = std::get<4>(it.first);
-				arst_sig = assign_map(std::get<5>(it.first));
-				srst_polarity = std::get<6>(it.first);
-				srst_sig = assign_map(std::get<7>(it.first));
-				abc_module(design, mod, script_file, exe_file, liberty_files, genlib_files, constr_file, cleanup, lut_costs, !clk_sig.empty(), "$",
+				AbcModuleState state;
+				state.assign_map.set(mod);
+				state.clk_polarity = std::get<0>(it.first);
+				state.clk_sig = assign_map(std::get<1>(it.first));
+				state.en_polarity = std::get<2>(it.first);
+				state.en_sig = assign_map(std::get<3>(it.first));
+				state.arst_polarity = std::get<4>(it.first);
+				state.arst_sig = assign_map(std::get<5>(it.first));
+				state.srst_polarity = std::get<6>(it.first);
+				state.srst_sig = assign_map(std::get<7>(it.first));
+				state.abc_module(design, mod, script_file, exe_file, liberty_files, genlib_files, constr_file, cleanup, lut_costs, !state.clk_sig.empty(), "$",
 						keepff, delay_target, sop_inputs, sop_products, lutin_shared, fast_mode, it.second, show_tempdir, sop_mode, abc_dress, dont_use_cells);
-				assign_map.set(mod);
 			}
 		}
 
-		assign_map.clear();
-		signal_list.clear();
-		signal_map.clear();
-		initvals.clear();
-		pi_map.clear();
-		po_map.clear();
-
 		log_pop();
 	}
 } AbcPass;

From ceedcecfae4a2110f42f471f10ec8a901a73264e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 15 Jul 2025 03:38:54 +0000
Subject: [PATCH 369/931] Move the input parameters to `abc_module` that are
 identical across modules to an `AbcConfig` struct.

---
 passes/techmap/abc.cc | 260 ++++++++++++++++++++++--------------------
 1 file changed, 137 insertions(+), 123 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 16d27a0e6..28e39998d 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -117,7 +117,30 @@ bool markgroups;
 pool<std::string> enabled_gates;
 bool cmos_cost;
 
+struct AbcConfig
+{
+	std::string script_file;
+	std::string exe_file;
+	std::vector<std::string> liberty_files;
+	std::vector<std::string> genlib_files;
+	std::string constr_file;
+	vector<int> lut_costs;
+	std::string delay_target;
+	std::string sop_inputs;
+	std::string sop_products;
+	std::string lutin_shared;
+	std::vector<std::string> dont_use_cells;
+	bool cleanup = true;
+	bool keepff = false;
+	bool fast_mode = false;
+	bool show_tempdir = false;
+	bool sop_mode = false;
+	bool abc_dress = false;
+};
+
 struct AbcModuleState {
+	const AbcConfig &config;
+
 	int map_autoidx = 0;
 	SigMap assign_map;
 	RTLIL::Module *module = nullptr;
@@ -135,17 +158,16 @@ struct AbcModuleState {
 
 	int undef_bits_lost = 0;
 
+	AbcModuleState(const AbcConfig &config) : config(config) {}
+
 	int map_signal(RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1);
 	void mark_port(RTLIL::SigSpec sig);
 	void extract_cell(RTLIL::Cell *cell, bool keepff);
 	std::string remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire = nullptr);
 	void dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edges, pool<int> &workpool, std::vector<int> &in_counts);
 	void handle_loops();
-	void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std::string script_file, std::string exe_file,
-		std::vector<std::string> &liberty_files, std::vector<std::string> &genlib_files, std::string constr_file,
-		bool cleanup, vector<int> lut_costs, bool dff_mode, std::string clk_str, bool keepff, std::string delay_target,
-		std::string sop_inputs, std::string sop_products, std::string lutin_shared, bool fast_mode,
-		const std::vector<RTLIL::Cell*> &cells, bool show_tempdir, bool sop_mode, bool abc_dress, std::vector<std::string> &dont_use_cells);
+	void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, const std::vector<RTLIL::Cell*> &cells,
+		bool dff_mode, std::string clk_str);
 };
 
 int AbcModuleState::map_signal(RTLIL::SigBit bit, gate_type_t gate_type, int in1, int in2, int in3, int in4)
@@ -724,11 +746,8 @@ struct abc_output_filter
 	}
 };
 
-void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_module, std::string script_file, std::string exe_file,
-		std::vector<std::string> &liberty_files, std::vector<std::string> &genlib_files, std::string constr_file,
-		bool cleanup, vector<int> lut_costs, bool dff_mode, std::string clk_str, bool keepff, std::string delay_target,
-		std::string sop_inputs, std::string sop_products, std::string lutin_shared, bool fast_mode,
-		const std::vector<RTLIL::Cell*> &cells, bool show_tempdir, bool sop_mode, bool abc_dress, std::vector<std::string> &dont_use_cells)
+void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_module, const std::vector<RTLIL::Cell*> &cells,
+	bool dff_mode, std::string clk_str)
 {
 	module = current_module;
 	initvals.set(&assign_map, module);
@@ -805,38 +824,39 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 		log_cmd_error("Clock domain %s not found.\n", clk_str.c_str());
 
 	std::string tempdir_name;
-	if (cleanup) 
+	if (config.cleanup)
 		tempdir_name = get_base_tmpdir() + "/";
 	else
 		tempdir_name = "_tmp_";
 	tempdir_name += proc_program_prefix() + "yosys-abc-XXXXXX";
 	tempdir_name = make_temp_dir(tempdir_name);
 	log_header(design, "Extracting gate netlist of module `%s' to `%s/input.blif'..\n",
-			module->name.c_str(), replace_tempdir(tempdir_name, tempdir_name, show_tempdir).c_str());
+			module->name.c_str(), replace_tempdir(tempdir_name, tempdir_name, config.show_tempdir).c_str());
 
 	std::string abc_script = stringf("read_blif \"%s/input.blif\"; ", tempdir_name.c_str());
 
-	if (!liberty_files.empty() || !genlib_files.empty()) {
+	if (!config.liberty_files.empty() || !config.genlib_files.empty()) {
 		std::string dont_use_args;
-		for (std::string dont_use_cell : dont_use_cells) {
+		for (std::string dont_use_cell : config.dont_use_cells) {
 			dont_use_args += stringf("-X \"%s\" ", dont_use_cell.c_str());
 		}
 		bool first_lib = true;
-		for (std::string liberty_file : liberty_files) {
+		for (std::string liberty_file : config.liberty_files) {
 			abc_script += stringf("read_lib %s %s -w \"%s\" ; ", dont_use_args.c_str(), first_lib ? "" : "-m", liberty_file.c_str());
 			first_lib = false;
 		}
-		for (std::string liberty_file : genlib_files)
+		for (std::string liberty_file : config.genlib_files)
 			abc_script += stringf("read_library \"%s\"; ", liberty_file.c_str());
-		if (!constr_file.empty())
-			abc_script += stringf("read_constr -v \"%s\"; ", constr_file.c_str());
+		if (!config.constr_file.empty())
+			abc_script += stringf("read_constr -v \"%s\"; ", config.constr_file.c_str());
 	} else
-	if (!lut_costs.empty())
+	if (!config.lut_costs.empty())
 		abc_script += stringf("read_lut %s/lutdefs.txt; ", tempdir_name.c_str());
 	else
 		abc_script += stringf("read_library %s/stdcells.genlib; ", tempdir_name.c_str());
 
-	if (!script_file.empty()) {
+	if (!config.script_file.empty()) {
+		const std::string &script_file = config.script_file;
 		if (script_file[0] == '+') {
 			for (size_t i = 1; i < script_file.size(); i++)
 				if (script_file[i] == '\'')
@@ -847,37 +867,38 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 					abc_script += script_file[i];
 		} else
 			abc_script += stringf("source %s", script_file.c_str());
-	} else if (!lut_costs.empty()) {
+	} else if (!config.lut_costs.empty()) {
 		bool all_luts_cost_same = true;
-		for (int this_cost : lut_costs)
-			if (this_cost != lut_costs.front())
+		for (int this_cost : config.lut_costs)
+			if (this_cost != config.lut_costs.front())
 				all_luts_cost_same = false;
-		abc_script += fast_mode ? ABC_FAST_COMMAND_LUT : ABC_COMMAND_LUT;
-		if (all_luts_cost_same && !fast_mode)
+		abc_script += config.fast_mode ? ABC_FAST_COMMAND_LUT : ABC_COMMAND_LUT;
+		if (all_luts_cost_same && !config.fast_mode)
 			abc_script += "; lutpack {S}";
-	} else if (!liberty_files.empty() || !genlib_files.empty())
-		abc_script += constr_file.empty() ? (fast_mode ? ABC_FAST_COMMAND_LIB : ABC_COMMAND_LIB) : (fast_mode ? ABC_FAST_COMMAND_CTR : ABC_COMMAND_CTR);
-	else if (sop_mode)
-		abc_script += fast_mode ? ABC_FAST_COMMAND_SOP : ABC_COMMAND_SOP;
+	} else if (!config.liberty_files.empty() || !config.genlib_files.empty())
+		abc_script += config.constr_file.empty() ?
+			(config.fast_mode ? ABC_FAST_COMMAND_LIB : ABC_COMMAND_LIB) : (config.fast_mode ? ABC_FAST_COMMAND_CTR : ABC_COMMAND_CTR);
+	else if (config.sop_mode)
+		abc_script += config.fast_mode ? ABC_FAST_COMMAND_SOP : ABC_COMMAND_SOP;
 	else
-		abc_script += fast_mode ? ABC_FAST_COMMAND_DFL : ABC_COMMAND_DFL;
+		abc_script += config.fast_mode ? ABC_FAST_COMMAND_DFL : ABC_COMMAND_DFL;
 
-	if (script_file.empty() && !delay_target.empty())
+	if (config.script_file.empty() && !config.delay_target.empty())
 		for (size_t pos = abc_script.find("dretime;"); pos != std::string::npos; pos = abc_script.find("dretime;", pos+1))
 			abc_script = abc_script.substr(0, pos) + "dretime; retime -o {D};" + abc_script.substr(pos+8);
 
 	for (size_t pos = abc_script.find("{D}"); pos != std::string::npos; pos = abc_script.find("{D}", pos))
-		abc_script = abc_script.substr(0, pos) + delay_target + abc_script.substr(pos+3);
+		abc_script = abc_script.substr(0, pos) + config.delay_target + abc_script.substr(pos+3);
 
 	for (size_t pos = abc_script.find("{I}"); pos != std::string::npos; pos = abc_script.find("{I}", pos))
-		abc_script = abc_script.substr(0, pos) + sop_inputs + abc_script.substr(pos+3);
+		abc_script = abc_script.substr(0, pos) + config.sop_inputs + abc_script.substr(pos+3);
 
 	for (size_t pos = abc_script.find("{P}"); pos != std::string::npos; pos = abc_script.find("{P}", pos))
-		abc_script = abc_script.substr(0, pos) + sop_products + abc_script.substr(pos+3);
+		abc_script = abc_script.substr(0, pos) + config.sop_products + abc_script.substr(pos+3);
 
 	for (size_t pos = abc_script.find("{S}"); pos != std::string::npos; pos = abc_script.find("{S}", pos))
-		abc_script = abc_script.substr(0, pos) + lutin_shared + abc_script.substr(pos+3);
-	if (abc_dress)
+		abc_script = abc_script.substr(0, pos) + config.lutin_shared + abc_script.substr(pos+3);
+	if (config.abc_dress)
 		abc_script += stringf("; dress \"%s/input.blif\"", tempdir_name.c_str());
 	abc_script += stringf("; write_blif %s/output.blif", tempdir_name.c_str());
 	abc_script = add_echos_to_abc_cmd(abc_script);
@@ -913,7 +934,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 
 	had_init = false;
 	for (auto c : cells)
-		extract_cell(c, keepff);
+		extract_cell(c, config.keepff);
 
 	if (undef_bits_lost)
 		log("Replacing %d occurrences of constant undef bits with constant zero bits\n", undef_bits_lost);
@@ -1112,21 +1133,21 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 			fprintf(f, "GATE MUX16  %d Y=(!S*!T*!U*!V*A)+(S*!T*!U*!V*B)+(!S*T*!U*!V*C)+(S*T*!U*!V*D)+(!S*!T*U*!V*E)+(S*!T*U*!V*F)+(!S*T*U*!V*G)+(S*T*U*!V*H)+(!S*!T*!U*V*I)+(S*!T*!U*V*J)+(!S*T*!U*V*K)+(S*T*!U*V*L)+(!S*!T*U*V*M)+(S*!T*U*V*N)+(!S*T*U*V*O)+(S*T*U*V*P); PIN * UNKNOWN 1 999 1 0 1 0\n", 8*cell_cost.at(ID($_MUX_)));
 		fclose(f);
 
-		if (!lut_costs.empty()) {
+		if (!config.lut_costs.empty()) {
 			buffer = stringf("%s/lutdefs.txt", tempdir_name.c_str());
 			f = fopen(buffer.c_str(), "wt");
 			if (f == nullptr)
 				log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
-			for (int i = 0; i < GetSize(lut_costs); i++)
-				fprintf(f, "%d %d.00 1.00\n", i+1, lut_costs.at(i));
+			for (int i = 0; i < GetSize(config.lut_costs); i++)
+				fprintf(f, "%d %d.00 1.00\n", i+1, config.lut_costs.at(i));
 			fclose(f);
 		}
 
-		buffer = stringf("\"%s\" -s -f %s/abc.script 2>&1", exe_file.c_str(), tempdir_name.c_str());
-		log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, show_tempdir).c_str());
+		buffer = stringf("\"%s\" -s -f %s/abc.script 2>&1", config.exe_file.c_str(), tempdir_name.c_str());
+		log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, config.show_tempdir).c_str());
 
 #ifndef YOSYS_LINK_ABC
-		abc_output_filter filt(*this, tempdir_name, show_tempdir);
+		abc_output_filter filt(*this, tempdir_name, config.show_tempdir);
 		int ret = run_command(buffer, std::bind(&abc_output_filter::next_line, filt, std::placeholders::_1));
 #else
 		string temp_stdouterr_name = stringf("%s/stdouterr.txt", tempdir_name.c_str());
@@ -1150,7 +1171,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 		// These needs to be mutable, supposedly due to getopt
 		char *abc_argv[5];
 		string tmp_script_name = stringf("%s/abc.script", tempdir_name.c_str());
-		abc_argv[0] = strdup(exe_file.c_str());
+		abc_argv[0] = strdup(config.exe_file.c_str());
 		abc_argv[1] = strdup("-s");
 		abc_argv[2] = strdup("-f");
 		abc_argv[3] = strdup(tmp_script_name.c_str());
@@ -1167,7 +1188,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 		fclose(old_stdout);
 		fclose(old_stderr);
 		std::ifstream temp_stdouterr_r(temp_stdouterr_name);
-		abc_output_filter filt(tempdir_name, show_tempdir);
+		abc_output_filter filt(*this, tempdir_name, config.show_tempdir);
 		for (std::string line; std::getline(temp_stdouterr_r, line); )
 			filt.next_line(line + "\n");
 		temp_stdouterr_r.close();
@@ -1181,9 +1202,9 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 		if (ifs.fail())
 			log_error("Can't open ABC output file `%s'.\n", buffer.c_str());
 
-		bool builtin_lib = liberty_files.empty() && genlib_files.empty();
+		bool builtin_lib = config.liberty_files.empty() && config.genlib_files.empty();
 		RTLIL::Design *mapped_design = new RTLIL::Design;
-		parse_blif(mapped_design, ifs, builtin_lib ? ID(DFF) : ID(_dff_), false, sop_mode);
+		parse_blif(mapped_design, ifs, builtin_lib ? ID(DFF) : ID(_dff_), false, config.sop_mode);
 
 		ifs.close();
 
@@ -1459,7 +1480,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 		log("Don't call ABC as there is nothing to map.\n");
 	}
 
-	if (cleanup)
+	if (config.cleanup)
 	{
 		log("Removing temp directory.\n");
 		remove_directory(tempdir_name);
@@ -1669,57 +1690,52 @@ struct AbcPass : public Pass {
 		log_header(design, "Executing ABC pass (technology mapping using ABC).\n");
 		log_push();
 
-		std::string exe_file = yosys_abc_executable;
-		std::string script_file, default_liberty_file, constr_file, clk_str;
-		std::vector<std::string> liberty_files, genlib_files, dont_use_cells;
-		std::string delay_target, sop_inputs, sop_products, lutin_shared = "-S 1";
-		bool fast_mode = false, dff_mode = false, keepff = false, cleanup = true;
-		bool show_tempdir = false, sop_mode = false;
-		bool abc_dress = false;
-		vector<int> lut_costs;
+		AbcConfig config;
 
 		// get arguments from scratchpad first, then override by command arguments
 		std::string lut_arg, luts_arg, g_arg;
-		exe_file = design->scratchpad_get_string("abc.exe", exe_file /* inherit default value if not set */);
-		script_file = design->scratchpad_get_string("abc.script", script_file);
-		default_liberty_file = design->scratchpad_get_string("abc.liberty", default_liberty_file);
-		constr_file = design->scratchpad_get_string("abc.constr", constr_file);
+		config.exe_file = design->scratchpad_get_string("abc.exe", yosys_abc_executable /* inherit default value if not set */);
+		config.script_file = design->scratchpad_get_string("abc.script", "");
+		std::string default_liberty_file = design->scratchpad_get_string("abc.liberty", "");
+		config.constr_file = design->scratchpad_get_string("abc.constr", "");
 		if (design->scratchpad.count("abc.D")) {
-			delay_target = "-D " + design->scratchpad_get_string("abc.D");
+			config.delay_target = "-D " + design->scratchpad_get_string("abc.D");
 		}
 		if (design->scratchpad.count("abc.I")) {
-			sop_inputs = "-I " + design->scratchpad_get_string("abc.I");
+			config.sop_inputs = "-I " + design->scratchpad_get_string("abc.I");
 		}
 		if (design->scratchpad.count("abc.P")) {
-			sop_products = "-P " + design->scratchpad_get_string("abc.P");
+			config.sop_products = "-P " + design->scratchpad_get_string("abc.P");
 		}
 		if (design->scratchpad.count("abc.S")) {
-			lutin_shared = "-S " + design->scratchpad_get_string("abc.S");
+			config.lutin_shared = "-S " + design->scratchpad_get_string("abc.S");
+		} else {
+			config.lutin_shared = "-S 1";
 		}
 		lut_arg = design->scratchpad_get_string("abc.lut", lut_arg);
 		luts_arg = design->scratchpad_get_string("abc.luts", luts_arg);
-		sop_mode = design->scratchpad_get_bool("abc.sop", sop_mode);
+		config.sop_mode = design->scratchpad_get_bool("abc.sop", false);
 		map_mux4 = design->scratchpad_get_bool("abc.mux4", map_mux4);
 		map_mux8 = design->scratchpad_get_bool("abc.mux8", map_mux8);
 		map_mux16 = design->scratchpad_get_bool("abc.mux16", map_mux16);
-		abc_dress = design->scratchpad_get_bool("abc.dress", abc_dress);
+		config.abc_dress = design->scratchpad_get_bool("abc.dress", false);
 		g_arg = design->scratchpad_get_string("abc.g", g_arg);
 
-		fast_mode = design->scratchpad_get_bool("abc.fast", fast_mode);
-		dff_mode = design->scratchpad_get_bool("abc.dff", dff_mode);
+		config.fast_mode = design->scratchpad_get_bool("abc.fast", false);
+		bool dff_mode = design->scratchpad_get_bool("abc.dff", false);
+		std::string clk_str;
 		if (design->scratchpad.count("abc.clk")) {
 			clk_str = design->scratchpad_get_string("abc.clk");
 			dff_mode = true;
 		}
-		keepff = design->scratchpad_get_bool("abc.keepff", keepff);
-		cleanup = !design->scratchpad_get_bool("abc.nocleanup", !cleanup);
-		keepff = design->scratchpad_get_bool("abc.keepff", keepff);
-		show_tempdir = design->scratchpad_get_bool("abc.showtmp", show_tempdir);
+		config.keepff = design->scratchpad_get_bool("abc.keepff", false);
+		config.cleanup = !design->scratchpad_get_bool("abc.nocleanup", false);
+		config.show_tempdir = design->scratchpad_get_bool("abc.showtmp", false);
 		markgroups = design->scratchpad_get_bool("abc.markgroups", markgroups);
 
 		if (design->scratchpad_get_bool("abc.debug")) {
-			cleanup = false;
-			show_tempdir = true;
+			config.cleanup = false;
+			config.show_tempdir = true;
 		}
 
 		size_t argidx, g_argidx = -1;
@@ -1736,43 +1752,43 @@ struct AbcPass : public Pass {
 		for (argidx = 1; argidx < args.size(); argidx++) {
 			std::string arg = args[argidx];
 			if (arg == "-exe" && argidx+1 < args.size()) {
-				exe_file = args[++argidx];
+				config.exe_file = args[++argidx];
 				continue;
 			}
 			if (arg == "-script" && argidx+1 < args.size()) {
-				script_file = args[++argidx];
+				config.script_file = args[++argidx];
 				continue;
 			}
 			if (arg == "-liberty" && argidx+1 < args.size()) {
-				liberty_files.push_back(args[++argidx]);
+				config.liberty_files.push_back(args[++argidx]);
 				continue;
 			}
 			if (arg == "-dont_use" && argidx+1 < args.size()) {
-				dont_use_cells.push_back(args[++argidx]);
+				config.dont_use_cells.push_back(args[++argidx]);
 				continue;
 			}
 			if (arg == "-genlib" && argidx+1 < args.size()) {
-				genlib_files.push_back(args[++argidx]);
+				config.genlib_files.push_back(args[++argidx]);
 				continue;
 			}
 			if (arg == "-constr" && argidx+1 < args.size()) {
-				constr_file = args[++argidx];
+				config.constr_file = args[++argidx];
 				continue;
 			}
 			if (arg == "-D" && argidx+1 < args.size()) {
-				delay_target = "-D " + args[++argidx];
+				config.delay_target = "-D " + args[++argidx];
 				continue;
 			}
 			if (arg == "-I" && argidx+1 < args.size()) {
-				sop_inputs = "-I " + args[++argidx];
+				config.sop_inputs = "-I " + args[++argidx];
 				continue;
 			}
 			if (arg == "-P" && argidx+1 < args.size()) {
-				sop_products = "-P " + args[++argidx];
+				config.sop_products = "-P " + args[++argidx];
 				continue;
 			}
 			if (arg == "-S" && argidx+1 < args.size()) {
-				lutin_shared = "-S " + args[++argidx];
+				config.lutin_shared = "-S " + args[++argidx];
 				continue;
 			}
 			if (arg == "-lut" && argidx+1 < args.size()) {
@@ -1784,7 +1800,7 @@ struct AbcPass : public Pass {
 				continue;
 			}
 			if (arg == "-sop") {
-				sop_mode = true;
+				config.sop_mode = true;
 				continue;
 			}
 			if (arg == "-mux4") {
@@ -1800,7 +1816,7 @@ struct AbcPass : public Pass {
 				continue;
 			}
 			if (arg == "-dress") {
-				abc_dress = true;
+				config.abc_dress = true;
 				continue;
 			}
 			if (arg == "-g" && argidx+1 < args.size()) {
@@ -1812,7 +1828,7 @@ struct AbcPass : public Pass {
 				continue;
 			}
 			if (arg == "-fast") {
-				fast_mode = true;
+				config.fast_mode = true;
 				continue;
 			}
 			if (arg == "-dff") {
@@ -1825,15 +1841,15 @@ struct AbcPass : public Pass {
 				continue;
 			}
 			if (arg == "-keepff") {
-				keepff = true;
+				config.keepff = true;
 				continue;
 			}
 			if (arg == "-nocleanup") {
-				cleanup = false;
+				config.cleanup = false;
 				continue;
 			}
 			if (arg == "-showtmp") {
-				show_tempdir = true;
+				config.show_tempdir = true;
 				continue;
 			}
 			if (arg == "-markgroups") {
@@ -1844,25 +1860,25 @@ struct AbcPass : public Pass {
 		}
 		extra_args(args, argidx, design);
 
-		if (genlib_files.empty() && liberty_files.empty() && !default_liberty_file.empty())
-			liberty_files.push_back(default_liberty_file);
+		if (config.genlib_files.empty() && config.liberty_files.empty() && !default_liberty_file.empty())
+			config.liberty_files.push_back(default_liberty_file);
 
-		rewrite_filename(script_file);
-		if (!script_file.empty() && !is_absolute_path(script_file) && script_file[0] != '+')
-			script_file = std::string(pwd) + "/" + script_file;
-		for (int i = 0; i < GetSize(liberty_files); i++) {
-			rewrite_filename(liberty_files[i]);
-			if (!liberty_files[i].empty() && !is_absolute_path(liberty_files[i]))
-				liberty_files[i] = std::string(pwd) + "/" + liberty_files[i];
+		rewrite_filename(config.script_file);
+		if (!config.script_file.empty() && !is_absolute_path(config.script_file) && config.script_file[0] != '+')
+			config.script_file = std::string(pwd) + "/" + config.script_file;
+		for (int i = 0; i < GetSize(config.liberty_files); i++) {
+			rewrite_filename(config.liberty_files[i]);
+			if (!config.liberty_files[i].empty() && !is_absolute_path(config.liberty_files[i]))
+				config.liberty_files[i] = std::string(pwd) + "/" + config.liberty_files[i];
 		}
-		for (int i = 0; i < GetSize(genlib_files); i++) {
-			rewrite_filename(genlib_files[i]);
-			if (!genlib_files[i].empty() && !is_absolute_path(genlib_files[i]))
-				genlib_files[i] = std::string(pwd) + "/" + genlib_files[i];
+		for (int i = 0; i < GetSize(config.genlib_files); i++) {
+			rewrite_filename(config.genlib_files[i]);
+			if (!config.genlib_files[i].empty() && !is_absolute_path(config.genlib_files[i]))
+				config.genlib_files[i] = std::string(pwd) + "/" + config.genlib_files[i];
 		}
-		rewrite_filename(constr_file);
-		if (!constr_file.empty() && !is_absolute_path(constr_file))
-			constr_file = std::string(pwd) + "/" + constr_file;
+		rewrite_filename(config.constr_file);
+		if (!config.constr_file.empty() && !is_absolute_path(config.constr_file))
+			config.constr_file = std::string(pwd) + "/" + config.constr_file;
 
 		// handle -lut argument
 		if (!lut_arg.empty()) {
@@ -1875,24 +1891,24 @@ struct AbcPass : public Pass {
 				lut_mode = atoi(lut_arg.c_str());
 				lut_mode2 = lut_mode;
 			}
-			lut_costs.clear();
+			config.lut_costs.clear();
 			for (int i = 0; i < lut_mode; i++)
-				lut_costs.push_back(1);
+				config.lut_costs.push_back(1);
 			for (int i = lut_mode; i < lut_mode2; i++)
-				lut_costs.push_back(2 << (i - lut_mode));
+				config.lut_costs.push_back(2 << (i - lut_mode));
 		}
 		//handle -luts argument
 		if (!luts_arg.empty()){
-			lut_costs.clear();
+			config.lut_costs.clear();
 			for (auto &tok : split_tokens(luts_arg, ",")) {
 				auto parts = split_tokens(tok, ":");
-				if (GetSize(parts) == 0 && !lut_costs.empty())
-					lut_costs.push_back(lut_costs.back());
+				if (GetSize(parts) == 0 && !config.lut_costs.empty())
+					config.lut_costs.push_back(config.lut_costs.back());
 				else if (GetSize(parts) == 1)
-					lut_costs.push_back(atoi(parts.at(0).c_str()));
+					config.lut_costs.push_back(atoi(parts.at(0).c_str()));
 				else if (GetSize(parts) == 2)
-					while (GetSize(lut_costs) < std::atoi(parts.at(0).c_str()))
-						lut_costs.push_back(atoi(parts.at(1).c_str()));
+					while (GetSize(config.lut_costs) < std::atoi(parts.at(0).c_str()))
+						config.lut_costs.push_back(atoi(parts.at(1).c_str()));
 				else
 					log_cmd_error("Invalid -luts syntax.\n");
 			}
@@ -2023,9 +2039,9 @@ struct AbcPass : public Pass {
 			}
 		}
 
-		if (!lut_costs.empty() && !(liberty_files.empty() && genlib_files.empty()))
+		if (!config.lut_costs.empty() && !(config.liberty_files.empty() && config.genlib_files.empty()))
 			log_cmd_error("Got -lut and -liberty/-genlib! These two options are exclusive.\n");
-		if (!constr_file.empty() && (liberty_files.empty() && genlib_files.empty()))
+		if (!config.constr_file.empty() && (config.liberty_files.empty() && config.genlib_files.empty()))
 			log_cmd_error("Got -constr but no -liberty/-genlib!\n");
 
 		if (enabled_gates.empty()) {
@@ -2053,10 +2069,9 @@ struct AbcPass : public Pass {
 			}
 
 			if (!dff_mode || !clk_str.empty()) {
-				AbcModuleState state;
+				AbcModuleState state(config);
 				state.assign_map.set(mod);
-				state.abc_module(design, mod, script_file, exe_file, liberty_files, genlib_files, constr_file, cleanup, lut_costs, dff_mode, clk_str, keepff,
-						delay_target, sop_inputs, sop_products, lutin_shared, fast_mode, mod->selected_cells(), show_tempdir, sop_mode, abc_dress, dont_use_cells);
+				state.abc_module(design, mod, mod->selected_cells(), dff_mode, clk_str);
 				continue;
 			}
 
@@ -2213,7 +2228,7 @@ struct AbcPass : public Pass {
 						std::get<6>(it.first) ? "" : "!", log_signal(std::get<7>(it.first)));
 
 			for (auto &it : assigned_cells) {
-				AbcModuleState state;
+				AbcModuleState state(config);
 				state.assign_map.set(mod);
 				state.clk_polarity = std::get<0>(it.first);
 				state.clk_sig = assign_map(std::get<1>(it.first));
@@ -2223,8 +2238,7 @@ struct AbcPass : public Pass {
 				state.arst_sig = assign_map(std::get<5>(it.first));
 				state.srst_polarity = std::get<6>(it.first);
 				state.srst_sig = assign_map(std::get<7>(it.first));
-				state.abc_module(design, mod, script_file, exe_file, liberty_files, genlib_files, constr_file, cleanup, lut_costs, !state.clk_sig.empty(), "$",
-						keepff, delay_target, sop_inputs, sop_products, lutin_shared, fast_mode, it.second, show_tempdir, sop_mode, abc_dress, dont_use_cells);
+				state.abc_module(design, mod, it.second, !state.clk_sig.empty(), "$");
 			}
 		}
 

From 53c72c0d3944535e7d81d785d4c6f78c7cafcc33 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 15 Jul 2025 03:54:41 +0000
Subject: [PATCH 370/931] Move code in `abc_module()` that modifies the design
 into a new function `extract()`

Splits up the big `abc_module()` function and isolates the code that modifies the design
after running ABC.
---
 passes/techmap/abc.cc | 491 ++++++++++++++++++++++--------------------
 1 file changed, 255 insertions(+), 236 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 28e39998d..494494a49 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -148,6 +148,7 @@ struct AbcModuleState {
 	dict<RTLIL::SigBit, int> signal_map;
 	FfInitVals initvals;
 	bool had_init = false;
+	bool did_run_abc = false;
 
 	bool clk_polarity = false;
 	bool en_polarity = false;
@@ -158,6 +159,8 @@ struct AbcModuleState {
 
 	int undef_bits_lost = 0;
 
+	std::string tempdir_name;
+
 	AbcModuleState(const AbcConfig &config) : config(config) {}
 
 	int map_signal(RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1);
@@ -168,6 +171,8 @@ struct AbcModuleState {
 	void handle_loops();
 	void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, const std::vector<RTLIL::Cell*> &cells,
 		bool dff_mode, std::string clk_str);
+	void extract(RTLIL::Design *design);
+	void finish();
 };
 
 int AbcModuleState::map_signal(RTLIL::SigBit bit, gate_type_t gate_type, int in1, int in2, int in3, int in4)
@@ -823,7 +828,6 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 	if (dff_mode && clk_sig.empty())
 		log_cmd_error("Clock domain %s not found.\n", clk_str.c_str());
 
-	std::string tempdir_name;
 	if (config.cleanup)
 		tempdir_name = get_base_tmpdir() + "/";
 	else
@@ -1193,194 +1197,155 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 			filt.next_line(line + "\n");
 		temp_stdouterr_r.close();
 #endif
-		if (ret != 0)
+		if (ret != 0) {
 			log_error("ABC: execution of command \"%s\" failed: return code %d.\n", buffer.c_str(), ret);
-
-		buffer = stringf("%s/%s", tempdir_name.c_str(), "output.blif");
-		std::ifstream ifs;
-		ifs.open(buffer);
-		if (ifs.fail())
-			log_error("Can't open ABC output file `%s'.\n", buffer.c_str());
-
-		bool builtin_lib = config.liberty_files.empty() && config.genlib_files.empty();
-		RTLIL::Design *mapped_design = new RTLIL::Design;
-		parse_blif(mapped_design, ifs, builtin_lib ? ID(DFF) : ID(_dff_), false, config.sop_mode);
-
-		ifs.close();
-
-		log_header(design, "Re-integrating ABC results.\n");
-		RTLIL::Module *mapped_mod = mapped_design->module(ID(netlist));
-		if (mapped_mod == nullptr)
-			log_error("ABC output file does not contain a module `netlist'.\n");
-		for (auto w : mapped_mod->wires()) {
-			RTLIL::Wire *orig_wire = nullptr;
-			RTLIL::Wire *wire = module->addWire(remap_name(w->name, &orig_wire));
-			if (orig_wire != nullptr && orig_wire->attributes.count(ID::src))
-				wire->attributes[ID::src] = orig_wire->attributes[ID::src];
-			if (markgroups) wire->attributes[ID::abcgroup] = map_autoidx;
-			design->select(module, wire);
+			return;
 		}
+		did_run_abc = true;
+		return;
+	}
+	log("Don't call ABC as there is nothing to map.\n");
+}
 
-		SigMap mapped_sigmap(mapped_mod);
-		FfInitVals mapped_initvals(&mapped_sigmap, mapped_mod);
+void AbcModuleState::extract(RTLIL::Design *design)
+{
+	if (!did_run_abc) {
+		return;
+	}
 
-		dict<std::string, int> cell_stats;
-		for (auto c : mapped_mod->cells())
+	std::string buffer = stringf("%s/%s", tempdir_name.c_str(), "output.blif");
+	std::ifstream ifs;
+	ifs.open(buffer);
+	if (ifs.fail())
+		log_error("Can't open ABC output file `%s'.\n", buffer.c_str());
+
+	bool builtin_lib = config.liberty_files.empty() && config.genlib_files.empty();
+	RTLIL::Design *mapped_design = new RTLIL::Design;
+	parse_blif(mapped_design, ifs, builtin_lib ? ID(DFF) : ID(_dff_), false, config.sop_mode);
+
+	ifs.close();
+
+	log_header(design, "Re-integrating ABC results.\n");
+	RTLIL::Module *mapped_mod = mapped_design->module(ID(netlist));
+	if (mapped_mod == nullptr)
+		log_error("ABC output file does not contain a module `netlist'.\n");
+	for (auto w : mapped_mod->wires()) {
+		RTLIL::Wire *orig_wire = nullptr;
+		RTLIL::Wire *wire = module->addWire(remap_name(w->name, &orig_wire));
+		if (orig_wire != nullptr && orig_wire->attributes.count(ID::src))
+			wire->attributes[ID::src] = orig_wire->attributes[ID::src];
+		if (markgroups) wire->attributes[ID::abcgroup] = map_autoidx;
+		design->select(module, wire);
+	}
+
+	SigMap mapped_sigmap(mapped_mod);
+	FfInitVals mapped_initvals(&mapped_sigmap, mapped_mod);
+
+	dict<std::string, int> cell_stats;
+	for (auto c : mapped_mod->cells())
+	{
+		if (builtin_lib)
 		{
-			if (builtin_lib)
-			{
-				cell_stats[RTLIL::unescape_id(c->type)]++;
-				if (c->type.in(ID(ZERO), ID(ONE))) {
-					RTLIL::SigSig conn;
-					RTLIL::IdString name_y = remap_name(c->getPort(ID::Y).as_wire()->name);
-					conn.first = module->wire(name_y);
-					conn.second = RTLIL::SigSpec(c->type == ID(ZERO) ? 0 : 1, 1);
-					module->connect(conn);
-					continue;
-				}
-				if (c->type == ID(BUF)) {
-					RTLIL::SigSig conn;
-					RTLIL::IdString name_y = remap_name(c->getPort(ID::Y).as_wire()->name);
-					RTLIL::IdString name_a = remap_name(c->getPort(ID::A).as_wire()->name);
-					conn.first = module->wire(name_y);
-					conn.second = module->wire(name_a);
-					module->connect(conn);
-					continue;
-				}
-				if (c->type == ID(NOT)) {
-					RTLIL::Cell *cell = module->addCell(remap_name(c->name), ID($_NOT_));
-					if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
-					for (auto name : {ID::A, ID::Y}) {
-						RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
-						cell->setPort(name, module->wire(remapped_name));
-					}
-					design->select(module, cell);
-					continue;
-				}
-				if (c->type.in(ID(AND), ID(OR), ID(XOR), ID(NAND), ID(NOR), ID(XNOR), ID(ANDNOT), ID(ORNOT))) {
-					RTLIL::Cell *cell = module->addCell(remap_name(c->name), stringf("$_%s_", c->type.c_str()+1));
-					if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
-					for (auto name : {ID::A, ID::B, ID::Y}) {
-						RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
-						cell->setPort(name, module->wire(remapped_name));
-					}
-					design->select(module, cell);
-					continue;
-				}
-				if (c->type.in(ID(MUX), ID(NMUX))) {
-					RTLIL::Cell *cell = module->addCell(remap_name(c->name), stringf("$_%s_", c->type.c_str()+1));
-					if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
-					for (auto name : {ID::A, ID::B, ID::S, ID::Y}) {
-						RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
-						cell->setPort(name, module->wire(remapped_name));
-					}
-					design->select(module, cell);
-					continue;
-				}
-				if (c->type == ID(MUX4)) {
-					RTLIL::Cell *cell = module->addCell(remap_name(c->name), ID($_MUX4_));
-					if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
-					for (auto name : {ID::A, ID::B, ID::C, ID::D, ID::S, ID::T, ID::Y}) {
-						RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
-						cell->setPort(name, module->wire(remapped_name));
-					}
-					design->select(module, cell);
-					continue;
-				}
-				if (c->type == ID(MUX8)) {
-					RTLIL::Cell *cell = module->addCell(remap_name(c->name), ID($_MUX8_));
-					if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
-					for (auto name : {ID::A, ID::B, ID::C, ID::D, ID::E, ID::F, ID::G, ID::H, ID::S, ID::T, ID::U, ID::Y}) {
-						RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
-						cell->setPort(name, module->wire(remapped_name));
-					}
-					design->select(module, cell);
-					continue;
-				}
-				if (c->type == ID(MUX16)) {
-					RTLIL::Cell *cell = module->addCell(remap_name(c->name), ID($_MUX16_));
-					if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
-					for (auto name : {ID::A, ID::B, ID::C, ID::D, ID::E, ID::F, ID::G, ID::H, ID::I, ID::J, ID::K,
-							ID::L, ID::M, ID::N, ID::O, ID::P, ID::S, ID::T, ID::U, ID::V, ID::Y}) {
-						RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
-						cell->setPort(name, module->wire(remapped_name));
-					}
-					design->select(module, cell);
-					continue;
-				}
-				if (c->type.in(ID(AOI3), ID(OAI3))) {
-					RTLIL::Cell *cell = module->addCell(remap_name(c->name), stringf("$_%s_", c->type.c_str()+1));
-					if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
-					for (auto name : {ID::A, ID::B, ID::C, ID::Y}) {
-						RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
-						cell->setPort(name, module->wire(remapped_name));
-					}
-					design->select(module, cell);
-					continue;
-				}
-				if (c->type.in(ID(AOI4), ID(OAI4))) {
-					RTLIL::Cell *cell = module->addCell(remap_name(c->name), stringf("$_%s_", c->type.c_str()+1));
-					if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
-					for (auto name : {ID::A, ID::B, ID::C, ID::D, ID::Y}) {
-						RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
-						cell->setPort(name, module->wire(remapped_name));
-					}
-					design->select(module, cell);
-					continue;
-				}
-				if (c->type == ID(DFF)) {
-					log_assert(clk_sig.size() == 1);
-					FfData ff(module, &initvals, remap_name(c->name));
-					ff.width = 1;
-					ff.is_fine = true;
-					ff.has_clk = true;
-					ff.pol_clk = clk_polarity;
-					ff.sig_clk = clk_sig;
-					if (en_sig.size() != 0) {
-						log_assert(en_sig.size() == 1);
-						ff.has_ce = true;
-						ff.pol_ce = en_polarity;
-						ff.sig_ce = en_sig;
-					}
-					RTLIL::Const init = mapped_initvals(c->getPort(ID::Q));
-					if (had_init)
-						ff.val_init = init;
-					else
-						ff.val_init = State::Sx;
-					if (arst_sig.size() != 0) {
-						log_assert(arst_sig.size() == 1);
-						ff.has_arst = true;
-						ff.pol_arst = arst_polarity;
-						ff.sig_arst = arst_sig;
-						ff.val_arst = init;
-					}
-					if (srst_sig.size() != 0) {
-						log_assert(srst_sig.size() == 1);
-						ff.has_srst = true;
-						ff.pol_srst = srst_polarity;
-						ff.sig_srst = srst_sig;
-						ff.val_srst = init;
-					}
-					ff.sig_d = module->wire(remap_name(c->getPort(ID::D).as_wire()->name));
-					ff.sig_q = module->wire(remap_name(c->getPort(ID::Q).as_wire()->name));
-					RTLIL::Cell *cell = ff.emit();
-					if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
-					design->select(module, cell);
-					continue;
-				}
-			}
-			else
-				cell_stats[RTLIL::unescape_id(c->type)]++;
-
-			if (c->type.in(ID(_const0_), ID(_const1_))) {
+			cell_stats[RTLIL::unescape_id(c->type)]++;
+			if (c->type.in(ID(ZERO), ID(ONE))) {
 				RTLIL::SigSig conn;
-				conn.first = module->wire(remap_name(c->connections().begin()->second.as_wire()->name));
-				conn.second = RTLIL::SigSpec(c->type == ID(_const0_) ? 0 : 1, 1);
+				RTLIL::IdString name_y = remap_name(c->getPort(ID::Y).as_wire()->name);
+				conn.first = module->wire(name_y);
+				conn.second = RTLIL::SigSpec(c->type == ID(ZERO) ? 0 : 1, 1);
 				module->connect(conn);
 				continue;
 			}
-
-			if (c->type == ID(_dff_)) {
+			if (c->type == ID(BUF)) {
+				RTLIL::SigSig conn;
+				RTLIL::IdString name_y = remap_name(c->getPort(ID::Y).as_wire()->name);
+				RTLIL::IdString name_a = remap_name(c->getPort(ID::A).as_wire()->name);
+				conn.first = module->wire(name_y);
+				conn.second = module->wire(name_a);
+				module->connect(conn);
+				continue;
+			}
+			if (c->type == ID(NOT)) {
+				RTLIL::Cell *cell = module->addCell(remap_name(c->name), ID($_NOT_));
+				if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
+				for (auto name : {ID::A, ID::Y}) {
+					RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
+					cell->setPort(name, module->wire(remapped_name));
+				}
+				design->select(module, cell);
+				continue;
+			}
+			if (c->type.in(ID(AND), ID(OR), ID(XOR), ID(NAND), ID(NOR), ID(XNOR), ID(ANDNOT), ID(ORNOT))) {
+				RTLIL::Cell *cell = module->addCell(remap_name(c->name), stringf("$_%s_", c->type.c_str()+1));
+				if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
+				for (auto name : {ID::A, ID::B, ID::Y}) {
+					RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
+					cell->setPort(name, module->wire(remapped_name));
+				}
+				design->select(module, cell);
+				continue;
+			}
+			if (c->type.in(ID(MUX), ID(NMUX))) {
+				RTLIL::Cell *cell = module->addCell(remap_name(c->name), stringf("$_%s_", c->type.c_str()+1));
+				if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
+				for (auto name : {ID::A, ID::B, ID::S, ID::Y}) {
+					RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
+					cell->setPort(name, module->wire(remapped_name));
+				}
+				design->select(module, cell);
+				continue;
+			}
+			if (c->type == ID(MUX4)) {
+				RTLIL::Cell *cell = module->addCell(remap_name(c->name), ID($_MUX4_));
+				if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
+				for (auto name : {ID::A, ID::B, ID::C, ID::D, ID::S, ID::T, ID::Y}) {
+					RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
+					cell->setPort(name, module->wire(remapped_name));
+				}
+				design->select(module, cell);
+				continue;
+			}
+			if (c->type == ID(MUX8)) {
+				RTLIL::Cell *cell = module->addCell(remap_name(c->name), ID($_MUX8_));
+				if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
+				for (auto name : {ID::A, ID::B, ID::C, ID::D, ID::E, ID::F, ID::G, ID::H, ID::S, ID::T, ID::U, ID::Y}) {
+					RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
+					cell->setPort(name, module->wire(remapped_name));
+				}
+				design->select(module, cell);
+				continue;
+			}
+			if (c->type == ID(MUX16)) {
+				RTLIL::Cell *cell = module->addCell(remap_name(c->name), ID($_MUX16_));
+				if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
+				for (auto name : {ID::A, ID::B, ID::C, ID::D, ID::E, ID::F, ID::G, ID::H, ID::I, ID::J, ID::K,
+						ID::L, ID::M, ID::N, ID::O, ID::P, ID::S, ID::T, ID::U, ID::V, ID::Y}) {
+					RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
+					cell->setPort(name, module->wire(remapped_name));
+				}
+				design->select(module, cell);
+				continue;
+			}
+			if (c->type.in(ID(AOI3), ID(OAI3))) {
+				RTLIL::Cell *cell = module->addCell(remap_name(c->name), stringf("$_%s_", c->type.c_str()+1));
+				if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
+				for (auto name : {ID::A, ID::B, ID::C, ID::Y}) {
+					RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
+					cell->setPort(name, module->wire(remapped_name));
+				}
+				design->select(module, cell);
+				continue;
+			}
+			if (c->type.in(ID(AOI4), ID(OAI4))) {
+				RTLIL::Cell *cell = module->addCell(remap_name(c->name), stringf("$_%s_", c->type.c_str()+1));
+				if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
+				for (auto name : {ID::A, ID::B, ID::C, ID::D, ID::Y}) {
+					RTLIL::IdString remapped_name = remap_name(c->getPort(name).as_wire()->name);
+					cell->setPort(name, module->wire(remapped_name));
+				}
+				design->select(module, cell);
+				continue;
+			}
+			if (c->type == ID(DFF)) {
 				log_assert(clk_sig.size() == 1);
 				FfData ff(module, &initvals, remap_name(c->name));
 				ff.width = 1;
@@ -1390,6 +1355,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 				ff.sig_clk = clk_sig;
 				if (en_sig.size() != 0) {
 					log_assert(en_sig.size() == 1);
+					ff.has_ce = true;
 					ff.pol_ce = en_polarity;
 					ff.sig_ce = en_sig;
 				}
@@ -1400,12 +1366,14 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 					ff.val_init = State::Sx;
 				if (arst_sig.size() != 0) {
 					log_assert(arst_sig.size() == 1);
+					ff.has_arst = true;
 					ff.pol_arst = arst_polarity;
 					ff.sig_arst = arst_sig;
 					ff.val_arst = init;
 				}
 				if (srst_sig.size() != 0) {
 					log_assert(srst_sig.size() == 1);
+					ff.has_srst = true;
 					ff.pol_srst = srst_polarity;
 					ff.sig_srst = srst_sig;
 					ff.val_srst = init;
@@ -1417,69 +1385,116 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 				design->select(module, cell);
 				continue;
 			}
+		}
+		else
+			cell_stats[RTLIL::unescape_id(c->type)]++;
 
-			if (c->type == ID($lut) && GetSize(c->getPort(ID::A)) == 1 && c->getParam(ID::LUT).as_int() == 2) {
-				SigSpec my_a = module->wire(remap_name(c->getPort(ID::A).as_wire()->name));
-				SigSpec my_y = module->wire(remap_name(c->getPort(ID::Y).as_wire()->name));
-				module->connect(my_y, my_a);
-				continue;
-			}
-
-			RTLIL::Cell *cell = module->addCell(remap_name(c->name), c->type);
-			if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
-			cell->parameters = c->parameters;
-			for (auto &conn : c->connections()) {
-				RTLIL::SigSpec newsig;
-				for (auto &c : conn.second.chunks()) {
-					if (c.width == 0)
-						continue;
-					log_assert(c.width == 1);
-					newsig.append(module->wire(remap_name(c.wire->name)));
-				}
-				cell->setPort(conn.first, newsig);
-			}
-			design->select(module, cell);
+		if (c->type.in(ID(_const0_), ID(_const1_))) {
+			RTLIL::SigSig conn;
+			conn.first = module->wire(remap_name(c->connections().begin()->second.as_wire()->name));
+			conn.second = RTLIL::SigSpec(c->type == ID(_const0_) ? 0 : 1, 1);
+			module->connect(conn);
+			continue;
 		}
 
-		for (auto conn : mapped_mod->connections()) {
-			if (!conn.first.is_fully_const())
-				conn.first = module->wire(remap_name(conn.first.as_wire()->name));
-			if (!conn.second.is_fully_const())
-				conn.second = module->wire(remap_name(conn.second.as_wire()->name));
+		if (c->type == ID(_dff_)) {
+			log_assert(clk_sig.size() == 1);
+			FfData ff(module, &initvals, remap_name(c->name));
+			ff.width = 1;
+			ff.is_fine = true;
+			ff.has_clk = true;
+			ff.pol_clk = clk_polarity;
+			ff.sig_clk = clk_sig;
+			if (en_sig.size() != 0) {
+				log_assert(en_sig.size() == 1);
+				ff.pol_ce = en_polarity;
+				ff.sig_ce = en_sig;
+			}
+			RTLIL::Const init = mapped_initvals(c->getPort(ID::Q));
+			if (had_init)
+				ff.val_init = init;
+			else
+				ff.val_init = State::Sx;
+			if (arst_sig.size() != 0) {
+				log_assert(arst_sig.size() == 1);
+				ff.pol_arst = arst_polarity;
+				ff.sig_arst = arst_sig;
+				ff.val_arst = init;
+			}
+			if (srst_sig.size() != 0) {
+				log_assert(srst_sig.size() == 1);
+				ff.pol_srst = srst_polarity;
+				ff.sig_srst = srst_sig;
+				ff.val_srst = init;
+			}
+			ff.sig_d = module->wire(remap_name(c->getPort(ID::D).as_wire()->name));
+			ff.sig_q = module->wire(remap_name(c->getPort(ID::Q).as_wire()->name));
+			RTLIL::Cell *cell = ff.emit();
+			if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
+			design->select(module, cell);
+			continue;
+		}
+
+		if (c->type == ID($lut) && GetSize(c->getPort(ID::A)) == 1 && c->getParam(ID::LUT).as_int() == 2) {
+			SigSpec my_a = module->wire(remap_name(c->getPort(ID::A).as_wire()->name));
+			SigSpec my_y = module->wire(remap_name(c->getPort(ID::Y).as_wire()->name));
+			module->connect(my_y, my_a);
+			continue;
+		}
+
+		RTLIL::Cell *cell = module->addCell(remap_name(c->name), c->type);
+		if (markgroups) cell->attributes[ID::abcgroup] = map_autoidx;
+		cell->parameters = c->parameters;
+		for (auto &conn : c->connections()) {
+			RTLIL::SigSpec newsig;
+			for (auto &c : conn.second.chunks()) {
+				if (c.width == 0)
+					continue;
+				log_assert(c.width == 1);
+				newsig.append(module->wire(remap_name(c.wire->name)));
+			}
+			cell->setPort(conn.first, newsig);
+		}
+		design->select(module, cell);
+	}
+
+	for (auto conn : mapped_mod->connections()) {
+		if (!conn.first.is_fully_const())
+			conn.first = module->wire(remap_name(conn.first.as_wire()->name));
+		if (!conn.second.is_fully_const())
+			conn.second = module->wire(remap_name(conn.second.as_wire()->name));
+		module->connect(conn);
+	}
+
+	cell_stats.sort();
+	for (auto &it : cell_stats)
+		log("ABC RESULTS:   %15s cells: %8d\n", it.first.c_str(), it.second);
+	int in_wires = 0, out_wires = 0;
+	for (auto &si : signal_list)
+		if (si.is_port) {
+			char buffer[100];
+			snprintf(buffer, 100, "\\ys__n%d", si.id);
+			RTLIL::SigSig conn;
+			if (si.type != G(NONE)) {
+				conn.first = si.bit;
+				conn.second = module->wire(remap_name(buffer));
+				out_wires++;
+			} else {
+				conn.first = module->wire(remap_name(buffer));
+				conn.second = si.bit;
+				in_wires++;
+			}
 			module->connect(conn);
 		}
+	log("ABC RESULTS:        internal signals: %8d\n", int(signal_list.size()) - in_wires - out_wires);
+	log("ABC RESULTS:           input signals: %8d\n", in_wires);
+	log("ABC RESULTS:          output signals: %8d\n", out_wires);
 
-		cell_stats.sort();
-		for (auto &it : cell_stats)
-			log("ABC RESULTS:   %15s cells: %8d\n", it.first.c_str(), it.second);
-		int in_wires = 0, out_wires = 0;
-		for (auto &si : signal_list)
-			if (si.is_port) {
-				char buffer[100];
-				snprintf(buffer, 100, "\\ys__n%d", si.id);
-				RTLIL::SigSig conn;
-				if (si.type != G(NONE)) {
-					conn.first = si.bit;
-					conn.second = module->wire(remap_name(buffer));
-					out_wires++;
-				} else {
-					conn.first = module->wire(remap_name(buffer));
-					conn.second = si.bit;
-					in_wires++;
-				}
-				module->connect(conn);
-			}
-		log("ABC RESULTS:        internal signals: %8d\n", int(signal_list.size()) - in_wires - out_wires);
-		log("ABC RESULTS:           input signals: %8d\n", in_wires);
-		log("ABC RESULTS:          output signals: %8d\n", out_wires);
-
-		delete mapped_design;
-	}
-	else
-	{
-		log("Don't call ABC as there is nothing to map.\n");
-	}
+	delete mapped_design;
+}
 
+void AbcModuleState::finish()
+{
 	if (config.cleanup)
 	{
 		log("Removing temp directory.\n");
@@ -2072,6 +2087,8 @@ struct AbcPass : public Pass {
 				AbcModuleState state(config);
 				state.assign_map.set(mod);
 				state.abc_module(design, mod, mod->selected_cells(), dff_mode, clk_str);
+				state.extract(design);
+				state.finish();
 				continue;
 			}
 
@@ -2239,6 +2256,8 @@ struct AbcPass : public Pass {
 				state.srst_polarity = std::get<6>(it.first);
 				state.srst_sig = assign_map(std::get<7>(it.first));
 				state.abc_module(design, mod, it.second, !state.clk_sig.empty(), "$");
+				state.extract(design);
+				state.finish();
 			}
 		}
 

From 885bb744e3b7c25d684b9f8db2a4c5e970ce65d3 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 15 Jul 2025 04:17:48 +0000
Subject: [PATCH 371/931] Make `module` a parameter of the function so we can
 change its constness in context

---
 passes/techmap/abc.cc | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 494494a49..fb889f530 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -143,7 +143,6 @@ struct AbcModuleState {
 
 	int map_autoidx = 0;
 	SigMap assign_map;
-	RTLIL::Module *module = nullptr;
 	std::vector<gate_t> signal_list;
 	dict<RTLIL::SigBit, int> signal_map;
 	FfInitVals initvals;
@@ -165,13 +164,13 @@ struct AbcModuleState {
 
 	int map_signal(RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1);
 	void mark_port(RTLIL::SigSpec sig);
-	void extract_cell(RTLIL::Cell *cell, bool keepff);
+	void extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool keepff);
 	std::string remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire = nullptr);
 	void dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edges, pool<int> &workpool, std::vector<int> &in_counts);
-	void handle_loops();
-	void abc_module(RTLIL::Design *design, RTLIL::Module *current_module, const std::vector<RTLIL::Cell*> &cells,
+	void handle_loops(RTLIL::Module *module);
+	void abc_module(RTLIL::Design *design, RTLIL::Module *module, const std::vector<RTLIL::Cell*> &cells,
 		bool dff_mode, std::string clk_str);
-	void extract(RTLIL::Design *design);
+	void extract(RTLIL::Design *design, RTLIL::Module *module);
 	void finish();
 };
 
@@ -220,7 +219,7 @@ void AbcModuleState::mark_port(RTLIL::SigSpec sig)
 			signal_list[signal_map[bit]].is_port = true;
 }
 
-void AbcModuleState::extract_cell(RTLIL::Cell *cell, bool keepff)
+void AbcModuleState::extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool keepff)
 {
 	if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
 		FfData ff(&initvals, cell);
@@ -491,7 +490,7 @@ void AbcModuleState::dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edg
 	fprintf(f, "}\n");
 }
 
-void AbcModuleState::handle_loops()
+void AbcModuleState::handle_loops(RTLIL::Module *module)
 {
 	// http://en.wikipedia.org/wiki/Topological_sorting
 	// (Kahn, Arthur B. (1962), "Topological sorting of large networks")
@@ -751,10 +750,9 @@ struct abc_output_filter
 	}
 };
 
-void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_module, const std::vector<RTLIL::Cell*> &cells,
+void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, const std::vector<RTLIL::Cell*> &cells,
 	bool dff_mode, std::string clk_str)
 {
-	module = current_module;
 	initvals.set(&assign_map, module);
 	map_autoidx = autoidx++;
 
@@ -938,7 +936,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 
 	had_init = false;
 	for (auto c : cells)
-		extract_cell(c, config.keepff);
+		extract_cell(module, c, config.keepff);
 
 	if (undef_bits_lost)
 		log("Replacing %d occurrences of constant undef bits with constant zero bits\n", undef_bits_lost);
@@ -964,7 +962,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 	if (srst_sig.size() != 0)
 		mark_port(srst_sig);
 
-	handle_loops();
+	handle_loops(module);
 
 	buffer = stringf("%s/input.blif", tempdir_name.c_str());
 	f = fopen(buffer.c_str(), "wt");
@@ -1207,7 +1205,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *current_mo
 	log("Don't call ABC as there is nothing to map.\n");
 }
 
-void AbcModuleState::extract(RTLIL::Design *design)
+void AbcModuleState::extract(RTLIL::Design *design, RTLIL::Module *module)
 {
 	if (!did_run_abc) {
 		return;
@@ -2087,7 +2085,7 @@ struct AbcPass : public Pass {
 				AbcModuleState state(config);
 				state.assign_map.set(mod);
 				state.abc_module(design, mod, mod->selected_cells(), dff_mode, clk_str);
-				state.extract(design);
+				state.extract(design, mod);
 				state.finish();
 				continue;
 			}
@@ -2256,7 +2254,7 @@ struct AbcPass : public Pass {
 				state.srst_polarity = std::get<6>(it.first);
 				state.srst_sig = assign_map(std::get<7>(it.first));
 				state.abc_module(design, mod, it.second, !state.clk_sig.empty(), "$");
-				state.extract(design);
+				state.extract(design, mod);
 				state.finish();
 			}
 		}

From ccb23ffc1a37d2227c759a4b8f9c9e096ef71982 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 15 Jul 2025 04:19:09 +0000
Subject: [PATCH 372/931] Fix indentation

---
 passes/techmap/abc.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index fb889f530..0c2576c1a 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -947,8 +947,8 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, co
 	}
 
 	for (auto cell : module->cells())
-	for (auto &port_it : cell->connections())
-		mark_port(port_it.second);
+		for (auto &port_it : cell->connections())
+			mark_port(port_it.second);
 
 	if (clk_sig.size() != 0)
 		mark_port(clk_sig);

From 1eb8844e38ce0dd88f797e26661cfd31007a1597 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Wed, 13 Aug 2025 08:36:26 +0200
Subject: [PATCH 373/931] fix labeling in report fix design hierarchy
 containing wrong values. remove left over debug print.

---
 passes/cmds/stat.cc | 62 +++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 24b21d674..8ed4e5b93 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -338,7 +338,7 @@ struct statdata_t {
 
 		char buf[16];
 
-		int len = std::snprintf(buf, sizeof(buf), "%.3f", value);
+		int len = snprintf(buf, sizeof(buf), "%.3f", value);
 
 		while (len > 0 && buf[len - 1] == '0')
 			--len;
@@ -351,13 +351,13 @@ struct statdata_t {
 		}
 
 		// use scientific notation, this should always fit in 8 characters
-		std::snprintf(buf, sizeof(buf), "%8.3G", value);
+		snprintf(buf, sizeof(buf), "%8.3G", value);
 
 		return std::string(buf);
 	}
 
 	void print_log_line(const std::string &name, unsigned int count_local, double area_local, unsigned int count_global, double area_global,
-			    int spacer = 0, bool print_area = true, bool print_hierarchical = true)
+			    int spacer = 0, bool print_area = true, bool print_hierarchical = true, bool print_global_only = false)
 	{
 		const std::string indent(2 * spacer, ' ');
 
@@ -370,6 +370,8 @@ struct statdata_t {
 			if (print_hierarchical) {
 				log(" %s %s %s %s %s%s\n", count_global_str.c_str(), area_global_str.c_str(), count_local_str.c_str(),
 				    area_local_str.c_str(), indent.c_str(), name.c_str());
+			} else if (print_global_only) {
+				log(" %s %s %s%s\n", count_global_str.c_str(), area_global_str.c_str(), indent.c_str(), name.c_str());
 			} else {
 				if (count_local > 0)
 					log(" %s %s %s%s\n", count_local_str.c_str(), area_local_str.c_str(), indent.c_str(), name.c_str());
@@ -377,6 +379,8 @@ struct statdata_t {
 		} else {
 			if (print_hierarchical) {
 				log(" %s %s %s%s\n", count_global_str.c_str(), count_local_str.c_str(), indent.c_str(), name.c_str());
+			} else if (print_global_only) {
+				log(" %s %s%s\n", count_global_str.c_str(), indent.c_str(), name.c_str());
 			} else {
 				if (count_local > 0)
 					log(" %s %s%s\n", count_local_str.c_str(), indent.c_str(), name.c_str());
@@ -384,7 +388,7 @@ struct statdata_t {
 		}
 	}
 
-	void print_log_header(bool print_area = true, bool print_hierarchical = true)
+	void print_log_header(bool print_area = true, bool print_hierarchical = true, bool print_global_only = false)
 	{
 		if (print_area) {
 			if (print_hierarchical) {
@@ -393,9 +397,13 @@ struct statdata_t {
 				log(" %8s %8s %8s-%8s-%s\n", "|", "|", "+", "--------", "Local count, excluding submodules.");
 				log(" %8s %8s %8s %8s-%s\n", "|", "|", "|", "+", "Local area, excluding submodules.");
 				log(" %8s %8s %8s %8s \n", "|", "|", "|", "|");
+			} else if (print_global_only) {
+				log(" %8s-%8s-%s\n", "+", "--------", "Count including submodules.");
+				log(" %8s %8s-%s\n", "|", "+", "Area including submodules.");
+				log(" %8s %8s \n", "|", "|");
 			} else {
-				log(" %8s-%8s-%s\n", "+", "--------", "Local Count including submodules.");
-				log(" %8s %8s-%s\n", "|", "+", "Local Area including submodules.");
+				log(" %8s-%8s-%s\n", "+", "--------", "Local Count, excluding submodules.");
+				log(" %8s %8s-%s\n", "|", "+", "Local Area, excluding submodules.");
 				log(" %8s %8s \n", "|", "|");
 			}
 		} else {
@@ -403,42 +411,47 @@ struct statdata_t {
 				log(" %8s-%8s-%8s-%s\n", "+", "--------", "--------", "Count including submodules.");
 				log(" %8s %8s-%8s-%s\n", "|", "+", "--------", "Local count, excluding submodules.");
 				log(" %8s %8s \n", "|", "|");
+			} else if (print_global_only) {
+				log(" %8s-%8s-%s\n", "+", "--------", "Count including submodules.");
+				log(" %8s %8s \n", "|", "|");
 			} else {
-				log(" %8s-%8s-%s\n", "+", "--------", "Local Count including submodules.");
+				log(" %8s-%8s-%s\n", "+", "--------", "Local Count, excluding submodules.");
 				log(" %8s \n", "|");
 			}
 		}
 	}
 
-	void log_data(RTLIL::IdString mod_name, bool top_mod, bool print_area = true, bool print_hierarchical = true)
+	void log_data(RTLIL::IdString mod_name, bool top_mod, bool print_area = true, bool print_hierarchical = true, bool print_global_only = false)
 	{
 
-		print_log_header(print_area, print_hierarchical);
+		print_log_header(print_area, print_hierarchical, print_global_only);
 
-		print_log_line("wires", local_num_wires, 0, num_wires, 0, 0, print_area, print_hierarchical);
-		print_log_line("wire bits", local_num_wire_bits, 0, num_wire_bits, 0, 0, print_area, print_hierarchical);
-		print_log_line("public wires", local_num_pub_wires, 0, num_pub_wires, 0, 0, print_area, print_hierarchical);
-		print_log_line("public wire bits", local_num_pub_wire_bits, 0, num_pub_wire_bits, 0, 0, print_area, print_hierarchical);
-		print_log_line("ports", local_num_ports, 0, num_ports, 0, 0, print_area, print_hierarchical);
-		print_log_line("port bits", local_num_port_bits, 0, num_port_bits, 0, 0, print_area, print_hierarchical);
-		print_log_line("memories", local_num_memories, 0, num_memories, 0, 0, print_area, print_hierarchical);
-		print_log_line("memory bits", local_num_memory_bits, 0, num_memory_bits, 0, 0, print_area, print_hierarchical);
-		print_log_line("processes", local_num_processes, 0, num_processes, 0, 0, print_area, print_hierarchical);
-		print_log_line("cells", local_num_cells, local_area, num_cells, area, 0, print_area, print_hierarchical);
+		print_log_line("wires", local_num_wires, 0, num_wires, 0, 0, print_area, print_hierarchical, print_global_only);
+		print_log_line("wire bits", local_num_wire_bits, 0, num_wire_bits, 0, 0, print_area, print_hierarchical, print_global_only);
+		print_log_line("public wires", local_num_pub_wires, 0, num_pub_wires, 0, 0, print_area, print_hierarchical, print_global_only);
+		print_log_line("public wire bits", local_num_pub_wire_bits, 0, num_pub_wire_bits, 0, 0, print_area, print_hierarchical,
+			       print_global_only);
+		print_log_line("ports", local_num_ports, 0, num_ports, 0, 0, print_area, print_hierarchical, print_global_only);
+		print_log_line("port bits", local_num_port_bits, 0, num_port_bits, 0, 0, print_area, print_hierarchical, print_global_only);
+		print_log_line("memories", local_num_memories, 0, num_memories, 0, 0, print_area, print_hierarchical, print_global_only);
+		print_log_line("memory bits", local_num_memory_bits, 0, num_memory_bits, 0, 0, print_area, print_hierarchical, print_global_only);
+		print_log_line("processes", local_num_processes, 0, num_processes, 0, 0, print_area, print_hierarchical, print_global_only);
+		print_log_line("cells", local_num_cells, local_area, num_cells, area, 0, print_area, print_hierarchical, print_global_only);
 		for (auto &it : num_cells_by_type)
 			if (it.second) {
 				auto name = string(log_id(it.first));
 				print_log_line(name, local_num_cells_by_type.count(it.first) ? local_num_cells_by_type.at(it.first) : 0,
 					       local_area_cells_by_type.count(it.first) ? local_area_cells_by_type.at(it.first) : 0, it.second,
-					       area_cells_by_type.at(it.first), 1, print_area, print_hierarchical);
+					       area_cells_by_type.at(it.first), 1, print_area, print_hierarchical, print_global_only);
 			}
 		if (num_submodules > 0) {
-			print_log_line("submodules", num_submodules, 0, num_submodules, submodule_area, 0, print_area, print_hierarchical);
+			print_log_line("submodules", num_submodules, 0, num_submodules, submodule_area, 0, print_area, print_hierarchical,
+				       print_global_only);
 			for (auto &it : num_submodules_by_type)
 				if (it.second)
 					print_log_line(string(log_id(it.first)), it.second, 0, it.second,
 						       submodules_area_by_type.count(it.first) ? submodules_area_by_type.at(it.first) : 0, 1,
-						       print_area, print_hierarchical);
+						       print_area, print_hierarchical, print_global_only);
 		}
 		if (!unknown_cell_area.empty()) {
 			log("\n");
@@ -811,7 +824,7 @@ struct StatPass : public Pass {
 				log("\n");
 				log("=== design hierarchy ===\n");
 				log("\n");
-				mod_stat[top_mod->name].print_log_header(has_area, hierarchy_mode);
+				mod_stat[top_mod->name].print_log_header(has_area, hierarchy_mode, true);
 				mod_stat[top_mod->name].print_log_line(log_id(top_mod->name), mod_stat[top_mod->name].local_num_cells,
 								       mod_stat[top_mod->name].local_area, mod_stat[top_mod->name].num_cells,
 								       mod_stat[top_mod->name].area, 0, has_area, hierarchy_mode);
@@ -823,7 +836,7 @@ struct StatPass : public Pass {
 				data.log_data_json("design", true, true);
 			else if (GetSize(mod_stat) > 1) {
 				log("\n");
-				data.log_data(top_mod->name, true, has_area, hierarchy_mode);
+				data.log_data(top_mod->name, true, has_area, hierarchy_mode, true);
 			}
 
 			design->scratchpad_set_int("stat.num_wires", data.num_wires);
@@ -845,7 +858,6 @@ struct StatPass : public Pass {
 		}
 
 		log("\n");
-		printf("processed statistics\n");
 	}
 } StatPass;
 

From 383d11c2ac9254836f8107e4a2fa6901b7bccd09 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Wed, 13 Aug 2025 10:09:02 +0200
Subject: [PATCH 374/931] fix design overview in json.

Fix some unknown cells apearing twice.
---
 passes/cmds/stat.cc | 118 ++++++++++++++++++++++++++++----------------
 1 file changed, 76 insertions(+), 42 deletions(-)

diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 8ed4e5b93..ea9dfcd3c 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -486,7 +486,7 @@ struct statdata_t {
 			       count_local, area_local);
 	}
 
-	void log_data_json(const char *mod_name, bool first_module, bool hierarchical = false)
+	void log_data_json(const char *mod_name, bool first_module, bool hierarchical = false, bool global_only = false)
 	{
 		if (!first_module)
 			log(",\n");
@@ -543,41 +543,77 @@ struct statdata_t {
 			log("      }");
 
 		} else {
-
-			log("      %s: {\n", json11::Json(mod_name).dump().c_str());
-			log("         \"num_wires\":         %u,\n", num_wires);
-			log("         \"num_wire_bits\":     %u,\n", num_wire_bits);
-			log("         \"num_pub_wires\":     %u,\n", num_pub_wires);
-			log("         \"num_pub_wire_bits\": %u,\n", num_pub_wire_bits);
-			log("         \"num_ports\":         %u,\n", num_ports);
-			log("         \"num_port_bits\":     %u,\n", num_port_bits);
-			log("         \"num_memories\":      %u,\n", num_memories);
-			log("         \"num_memory_bits\":   %u,\n", num_memory_bits);
-			log("         \"num_processes\":     %u,\n", num_processes);
-			log("         \"num_cells\":         %u,\n", local_num_cells);
-			log("         \"num_submodules\":       %u,\n", num_submodules);
-			if (area != 0) {
-				log("         \"area\":              %f,\n", area);
-				log("         \"sequential_area\":    %f,\n", sequential_area);
+			if (global_only) {
+				log("      %s: {\n", json11::Json(mod_name).dump().c_str());
+				log("         \"num_wires\":         %u,\n", num_wires);
+				log("         \"num_wire_bits\":     %u,\n", num_wire_bits);
+				log("         \"num_pub_wires\":     %u,\n", num_pub_wires);
+				log("         \"num_pub_wire_bits\": %u,\n", num_pub_wire_bits);
+				log("         \"num_ports\":         %u,\n", num_ports);
+				log("         \"num_port_bits\":     %u,\n", num_port_bits);
+				log("         \"num_memories\":      %u,\n", num_memories);
+				log("         \"num_memory_bits\":   %u,\n", num_memory_bits);
+				log("         \"num_processes\":     %u,\n", num_processes);
+				log("         \"num_cells\":         %u,\n", num_cells);
+				log("         \"num_submodules\":       %u,\n", num_submodules);
+				if (area != 0) {
+					log("         \"area\":              %f,\n", area);
+					log("         \"sequential_area\":    %f,\n", sequential_area);
+				}
+				log("         \"num_cells_by_type\": {\n");
+				bool first_line = true;
+				for (auto &it : num_cells_by_type)
+					if (it.second) {
+						if (!first_line)
+							log(",\n");
+						log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
+						first_line = false;
+					}
+				for (auto &it : num_submodules_by_type)
+					if (it.second) {
+						if (!first_line)
+							log(",\n");
+						log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
+						first_line = false;
+					}
+				log("\n");
+				log("         }");
+			} else {
+				log("      %s: {\n", json11::Json(mod_name).dump().c_str());
+				log("         \"num_wires\":         %u,\n", local_num_wires);
+				log("         \"num_wire_bits\":     %u,\n", local_num_wire_bits);
+				log("         \"num_pub_wires\":     %u,\n", local_num_pub_wires);
+				log("         \"num_pub_wire_bits\": %u,\n", local_num_pub_wire_bits);
+				log("         \"num_ports\":         %u,\n", local_num_ports);
+				log("         \"num_port_bits\":     %u,\n", local_num_port_bits);
+				log("         \"num_memories\":      %u,\n", local_num_memories);
+				log("         \"num_memory_bits\":   %u,\n", local_num_memory_bits);
+				log("         \"num_processes\":     %u,\n", local_num_processes);
+				log("         \"num_cells\":         %u,\n", local_num_cells);
+				log("         \"num_submodules\":       %u,\n", num_submodules);
+				if (area != 0) {
+					log("         \"area\":              %f,\n", area);
+					log("         \"sequential_area\":    %f,\n", sequential_area);
+				}
+				log("         \"num_cells_by_type\": {\n");
+				bool first_line = true;
+				for (auto &it : local_num_cells_by_type)
+					if (it.second) {
+						if (!first_line)
+							log(",\n");
+						log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
+						first_line = false;
+					}
+				for (auto &it : num_submodules_by_type)
+					if (it.second) {
+						if (!first_line)
+							log(",\n");
+						log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
+						first_line = false;
+					}
+				log("\n");
+				log("         }");
 			}
-			log("         \"num_cells_by_type\": {\n");
-			bool first_line = true;
-			for (auto &it : local_num_cells_by_type)
-				if (it.second) {
-					if (!first_line)
-						log(",\n");
-					log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
-					first_line = false;
-				}
-			for (auto &it : num_submodules_by_type)
-				if (it.second) {
-					if (!first_line)
-						log(",\n");
-					log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
-					first_line = false;
-				}
-			log("\n");
-			log("         }");
 			if (tech == "xilinx") {
 				log(",\n");
 				log("         \"estimated_num_lc\": %u", estimate_xilinx_lc());
@@ -644,12 +680,10 @@ statdata_t hierarchy_builder(const RTLIL::Design *design, const RTLIL::Module *t
 						  double(design->module(cell->type)->attributes.at(ID::area).as_int());
 						mod_data.area += double(design->module(cell->type)->attributes.at(ID::area).as_int());
 						mod_data.unknown_cell_area.erase(cell->type);
-					} else {
-						mod_data.unknown_cell_area.insert(cell->type);
-						mod_data.num_submodules++;
-						mod_data.num_submodules_by_type[cell->type]++;
-						mod_data.submodules_area_by_type[cell->type] = 0;
-						mod_data.seq_area_cells_by_type[cell->type] = 0;
+						mod_data.num_cells -= mod_data.num_cells_by_type.erase(cell->type);
+						mod_data.area_cells_by_type.erase(cell->type);
+						mod_data.local_num_cells -= mod_data.local_num_cells_by_type.erase(cell->type);
+						mod_data.local_area_cells_by_type.erase(cell->type);
 					}
 				}
 			}
@@ -833,7 +867,7 @@ struct StatPass : public Pass {
 			statdata_t data = hierarchy_worker(mod_stat, top_mod->name, 0, /*quiet=*/json_mode, has_area, hierarchy_mode);
 
 			if (json_mode)
-				data.log_data_json("design", true, true);
+				data.log_data_json("design", true, hierarchy_mode, true);
 			else if (GetSize(mod_stat) > 1) {
 				log("\n");
 				data.log_data(top_mod->name, true, has_area, hierarchy_mode, true);

From 910ff3ff36806106ab065e949e0b80c4bf701ec0 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 13 Aug 2025 10:54:47 +0200
Subject: [PATCH 375/931] verilog: demote some parser errors to warnings again

---
 frontends/verilog/verilog_error.cc | 16 ++++++++++++++++
 frontends/verilog/verilog_error.h  |  1 +
 frontends/verilog/verilog_parser.y | 14 +++++++-------
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/frontends/verilog/verilog_error.cc b/frontends/verilog/verilog_error.cc
index 19e634b5d..491b8c7f5 100644
--- a/frontends/verilog/verilog_error.cc
+++ b/frontends/verilog/verilog_error.cc
@@ -42,6 +42,15 @@ static void verr_at(std::string filename, int begin_line, char const *fmt, va_li
     exit(1);
 }
 
+static void vwarn_at(std::string filename, int begin_line, char const *fmt, va_list ap)
+{
+    char buffer[1024];
+    char *p = buffer;
+    p += vsnprintf(p, buffer + sizeof(buffer) - p, fmt, ap);
+    p += snprintf(p, buffer + sizeof(buffer) - p, "\n");
+    YOSYS_NAMESPACE_PREFIX log_file_warning(filename, begin_line, "%s", buffer);
+}
+
 [[noreturn]]
 void VERILOG_FRONTEND::err_at_loc(Location loc, char const *fmt, ...)
 {
@@ -49,4 +58,11 @@ void VERILOG_FRONTEND::err_at_loc(Location loc, char const *fmt, ...)
     va_start(args, fmt);
     verr_at(loc.begin.filename ? *(loc.begin.filename) : "UNKNOWN", loc.begin.line, fmt, args);
 }
+void VERILOG_FRONTEND::warn_at_loc(Location loc, char const *fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    vwarn_at(loc.begin.filename ? *(loc.begin.filename) : "UNKNOWN", loc.begin.line, fmt, args);
+    va_end(args);
+}
 
diff --git a/frontends/verilog/verilog_error.h b/frontends/verilog/verilog_error.h
index 07198a2ba..b36de19b8 100644
--- a/frontends/verilog/verilog_error.h
+++ b/frontends/verilog/verilog_error.h
@@ -11,6 +11,7 @@ namespace VERILOG_FRONTEND
 {
     [[noreturn]]
     void err_at_loc(Location loc, char const *fmt, ...);
+    void warn_at_loc(Location loc, char const *fmt, ...);
 };
 
 YOSYS_NAMESPACE_END
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 46dfeedd0..e8ca5d078 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -1304,7 +1304,7 @@ specify_item:
 		specify_rise_fall_ptr_t timing = std::move($9);
 
 		if (specify_edge != 0 && target->dat == nullptr)
-			err_at_loc(@3, "Found specify edge but no data spec.\n");
+			err_at_loc(@3, "Found specify edge but no data spec.");
 
 		auto cell_owned = std::make_unique<AstNode>(@$, AST_CELL);
 		auto cell = cell_owned.get();
@@ -1379,7 +1379,7 @@ specify_item:
 	TOK_ID TOK_LPAREN specify_edge expr specify_condition TOK_COMMA specify_edge expr specify_condition TOK_COMMA specify_triple specify_opt_triple TOK_RPAREN TOK_SEMICOL {
 		if (*$1 != "$setup" && *$1 != "$hold" && *$1 != "$setuphold" && *$1 != "$removal" && *$1 != "$recovery" &&
 				*$1 != "$recrem" && *$1 != "$skew" && *$1 != "$timeskew" && *$1 != "$fullskew" && *$1 != "$nochange")
-			err_at_loc(@1, "Unsupported specify rule type: %s\n", $1->c_str());
+			err_at_loc(@1, "Unsupported specify rule type: %s", $1->c_str());
 
 		auto src_pen = AstNode::mkconst_int(@3, $3 != 0, false, 1);
 		auto src_pol = AstNode::mkconst_int(@3, $3 == 'p', false, 1);
@@ -1518,19 +1518,19 @@ specify_rise_fall:
 		$$ = std::make_unique<struct specify_rise_fall>();
 		$$->rise = std::move(*$2);
 		$$->fall = std::move(*$4);
-		err_at_loc(@$, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
+		warn_at_loc(@$, "Path delay expressions beyond rise/fall not currently supported. Ignoring.");
 	} |
 	TOK_LPAREN specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_RPAREN {
 		$$ = std::make_unique<struct specify_rise_fall>();
 		$$->rise = std::move(*$2);
 		$$->fall = std::move(*$4);
-		err_at_loc(@$, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
+		warn_at_loc(@$, "Path delay expressions beyond rise/fall not currently supported. Ignoring.");
 	} |
 	TOK_LPAREN specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_COMMA specify_triple TOK_RPAREN {
 		$$ = std::make_unique<struct specify_rise_fall>();
 		$$->rise = std::move(*$2);
 		$$->fall = std::move(*$4);
-		err_at_loc(@$, "Path delay expressions beyond rise/fall not currently supported. Ignoring.\n");
+		warn_at_loc(@$, "Path delay expressions beyond rise/fall not currently supported. Ignoring.");
 	}
 
 specify_triple:
@@ -2585,7 +2585,7 @@ assert:
 				node->str = *$1;
 		}
 		if (!$3)
-			err_at_loc(@$, "SystemVerilog does not allow \"restrict\" without \"property\".\n");
+			warn_at_loc(@$, "SystemVerilog does not allow \"restrict\" without \"property\".");
 	} |
 	opt_sva_label TOK_RESTRICT opt_property TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
 		if (mode->norestrict) {
@@ -2596,7 +2596,7 @@ assert:
 				node->str = *$1;
 		}
 		if (!$3)
-			err_at_loc(@$, "SystemVerilog does not allow \"restrict\" without \"property\".\n");
+			warn_at_loc(@$, "SystemVerilog does not allow \"restrict\" without \"property\".");
 	};
 
 assert_property:

From 1603828b30c997ffe1cd237fad292e5de27c8c6a Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 13 Aug 2025 10:56:48 +0200
Subject: [PATCH 376/931] verilog_parser: fix locations of warnings for
 restrict keyword

---
 frontends/verilog/verilog_parser.y | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index e8ca5d078..e299d3148 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -2585,7 +2585,7 @@ assert:
 				node->str = *$1;
 		}
 		if (!$3)
-			warn_at_loc(@$, "SystemVerilog does not allow \"restrict\" without \"property\".");
+			warn_at_loc(@3, "SystemVerilog does not allow \"restrict\" without \"property\".");
 	} |
 	opt_sva_label TOK_RESTRICT opt_property TOK_LPAREN TOK_EVENTUALLY expr TOK_RPAREN TOK_SEMICOL {
 		if (mode->norestrict) {
@@ -2596,7 +2596,7 @@ assert:
 				node->str = *$1;
 		}
 		if (!$3)
-			warn_at_loc(@$, "SystemVerilog does not allow \"restrict\" without \"property\".");
+			warn_at_loc(@3, "SystemVerilog does not allow \"restrict\" without \"property\".");
 	};
 
 assert_property:

From 77089a8d031399e7677ca99006f094138406276e Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Wed, 7 May 2025 12:22:37 +0200
Subject: [PATCH 377/931] rename: add -move-to-cell option in -wire mode

---
 passes/cmds/rename.cc                     | 54 +++++++++++++++++++----
 tests/various/rename_wire_move_to_cell.ys | 35 +++++++++++++++
 2 files changed, 80 insertions(+), 9 deletions(-)
 create mode 100644 tests/various/rename_wire_move_to_cell.ys

diff --git a/passes/cmds/rename.cc b/passes/cmds/rename.cc
index e0586ec7e..4b5b41f23 100644
--- a/passes/cmds/rename.cc
+++ b/passes/cmds/rename.cc
@@ -67,7 +67,7 @@ static std::string derive_name_from_src(const std::string &src, int counter)
 		return stringf("\\%s$%d", src_base.c_str(), counter);
 }
 
-static IdString derive_name_from_cell_output_wire(const RTLIL::Cell *cell, string suffix)
+static IdString derive_name_from_cell_output_wire(const RTLIL::Cell *cell, string suffix, bool move_to_cell)
 {
 	// Find output
 	const SigSpec *output = nullptr;
@@ -93,13 +93,23 @@ static IdString derive_name_from_cell_output_wire(const RTLIL::Cell *cell, strin
 
 		name += chunk.wire->name.str();
 		if (chunk.wire->width != chunk.width) {
-			name += "[";
-			if (chunk.width != 1)
-				name += std::to_string(chunk.offset + chunk.width) + ":";
-			name += std::to_string(chunk.offset) + "]";
+			int lhs = chunk.wire->to_hdl_index(chunk.offset + chunk.width - 1);
+			int rhs = chunk.wire->to_hdl_index(chunk.offset);
+			if (chunk.wire->upto)
+				std::swap(lhs, rhs);
+
+			if (lhs != rhs)
+				name += stringf("[%d:%d]", lhs, rhs);
+			else
+				name += stringf("[%d]", lhs);
 		}
 	}
 
+	RTLIL::Wire *wire;
+
+	if (move_to_cell && (!(wire = cell->module->wire(name)) || !(wire->port_input || wire->port_output)))
+		return name;
+
 	if (suffix.empty()) {
 		suffix = cell->type.str();
 	}
@@ -232,13 +242,17 @@ struct RenamePass : public Pass {
 		log("cells with private names.\n");
 		log("\n");
 		log("\n");
-		log("    rename -wire [selection] [-suffix <suffix>]\n");
+		log("    rename -wire [selection] [-move-to-cell] [-suffix <suffix>]\n");
 		log("\n");
 		log("Assign auto-generated names based on the wires they drive to all selected\n");
 		log("cells with private names. Ignores cells driving privatly named wires.\n");
 		log("By default, the cell is named after the wire with the cell type as suffix.\n");
 		log("The -suffix option can be used to set the suffix to the given string instead.\n");
 		log("\n");
+		log("The -move-to-cell option can be used to name the cell after the wire without\n");
+		log("any suffix. If this would lead to conflicts, the suffix is added to the wire\n");
+		log("instead. For cells driving ports, the -move-to-cell option is ignored.\n");
+		log("\n");
 		log("\n");
 		log("    rename -enumerate [-pattern <pattern>] [selection]\n");
 		log("\n");
@@ -286,6 +300,7 @@ struct RenamePass : public Pass {
 		std::string cell_suffix = "";
 		bool flag_src = false;
 		bool flag_wire = false;
+		bool flag_move_to_cell = false;
 		bool flag_enumerate = false;
 		bool flag_witness = false;
 		bool flag_hide = false;
@@ -345,6 +360,10 @@ struct RenamePass : public Pass {
 				got_mode = true;
 				continue;
 			}
+			if (arg == "-move-to-cell" && flag_wire && !flag_move_to_cell) {
+				flag_move_to_cell = true;
+				continue;
+			}
 			if (arg == "-pattern" && argidx+1 < args.size() && args[argidx+1].find('%') != std::string::npos) {
 				int pos = args[++argidx].find('%');
 				pattern_prefix = args[argidx].substr(0, pos);
@@ -396,9 +415,26 @@ struct RenamePass : public Pass {
 				dict<RTLIL::Cell *, IdString> new_cell_names;
 				for (auto cell : module->selected_cells())
 					if (cell->name[0] == '$')
-						new_cell_names[cell] = derive_name_from_cell_output_wire(cell, cell_suffix);
-				for (auto &it : new_cell_names)
-					module->rename(it.first, it.second);
+						new_cell_names[cell] = derive_name_from_cell_output_wire(cell, cell_suffix, flag_move_to_cell);
+				for (auto &[cell, new_name] : new_cell_names) {
+					if (flag_move_to_cell) {
+						RTLIL::Wire *found_wire = module->wire(new_name);
+						if (found_wire) {
+							std::string wire_suffix = cell_suffix;
+							if (wire_suffix.empty()) {
+								for (auto const &[port, _] : cell->connections()) {
+									if (cell->output(port)) {
+										wire_suffix += stringf("%s.%s", cell->type.c_str(), port.c_str() + 1);
+										break;
+									}
+								}
+							}
+							IdString new_wire_name = found_wire->name.str() + wire_suffix;
+							module->rename(found_wire, new_wire_name);
+						}
+					}
+					module->rename(cell, new_name);
+				}
 			}
 		}
 		else
diff --git a/tests/various/rename_wire_move_to_cell.ys b/tests/various/rename_wire_move_to_cell.ys
new file mode 100644
index 000000000..482447edd
--- /dev/null
+++ b/tests/various/rename_wire_move_to_cell.ys
@@ -0,0 +1,35 @@
+read_verilog <<EOF
+module top(input clk, rst, input [7:0] din, output [7:0] dout, input bin, output bout);
+    reg [7:0] dq;
+    reg bq;
+
+    always @(posedge clk, posedge rst) begin
+        if (rst) dq <= '0;
+        else dq <= din;
+    end
+
+    always @(posedge clk) bq <= bin;
+
+    assign dout = dq;
+    assign bout = bq;
+endmodule
+EOF
+
+proc
+hierarchy -top top
+
+select -assert-count 1 t:$dff
+select -assert-count 1 t:$adff
+select -assert-count 0 t:$dff n:bq %i
+select -assert-count 0 t:$adff n:dq %i
+select -assert-count 1 w:bq
+select -assert-count 1 w:dq
+
+rename -wire -move-to-cell
+
+select -assert-count 1 t:$dff
+select -assert-count 1 t:$adff
+select -assert-count 1 t:$dff n:bq %i
+select -assert-count 1 t:$adff n:dq %i
+select -assert-count 0 w:bq
+select -assert-count 0 w:dq

From 856fc43a87131f24f4b2ddf71e0cc449ef25f788 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 4 Jun 2025 11:18:38 +0200
Subject: [PATCH 378/931] rename: format vector slices consistently with HDL
 upto/downto direction

---
 passes/cmds/rename.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/passes/cmds/rename.cc b/passes/cmds/rename.cc
index 4b5b41f23..7e3f87147 100644
--- a/passes/cmds/rename.cc
+++ b/passes/cmds/rename.cc
@@ -95,8 +95,6 @@ static IdString derive_name_from_cell_output_wire(const RTLIL::Cell *cell, strin
 		if (chunk.wire->width != chunk.width) {
 			int lhs = chunk.wire->to_hdl_index(chunk.offset + chunk.width - 1);
 			int rhs = chunk.wire->to_hdl_index(chunk.offset);
-			if (chunk.wire->upto)
-				std::swap(lhs, rhs);
 
 			if (lhs != rhs)
 				name += stringf("[%d:%d]", lhs, rhs);

From 71307b4a519dbbe81fff5988987f69eec290e737 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Wed, 13 Aug 2025 14:46:01 +0200
Subject: [PATCH 379/931] add Testcases Fix existing testcases Fix edgecase
 where modules where counted as cells.

---
 passes/cmds/stat.cc             | 16 +++++----
 tests/various/stat.ys           |  7 +++-
 tests/various/stat_hierarchy.ys | 62 +++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 tests/various/stat_hierarchy.ys

diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index ea9dfcd3c..5cb223ba8 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -666,9 +666,10 @@ statdata_t hierarchy_builder(const RTLIL::Design *design, const RTLIL::Module *t
 					mod_data.submodule_area += mod_stat.at(cell->type).area;
 					mod_data.num_submodules++;
 					mod_data.unknown_cell_area.erase(cell->type);
-					mod_data.num_cells -= mod_data.num_cells_by_type.erase(cell->type);
-					mod_data.area_cells_by_type.erase(cell->type);
-					mod_data.local_num_cells -= mod_data.local_num_cells_by_type.erase(cell->type);
+					mod_data.num_cells -= (mod_data.num_cells_by_type.count(cell->type) != 0)?  mod_data.num_cells_by_type.at(cell->type): 0;
+					mod_data.num_cells_by_type.erase(cell->type);
+					mod_data.local_num_cells -= (mod_data.local_num_cells_by_type.count(cell->type) != 0)? mod_data.local_num_cells_by_type.at(cell->type): 0;
+					mod_data.local_num_cells_by_type.erase(cell->type);
 					mod_data.local_area_cells_by_type.erase(cell->type);
 				} else {
 					// deal with blackbox cells
@@ -680,9 +681,10 @@ statdata_t hierarchy_builder(const RTLIL::Design *design, const RTLIL::Module *t
 						  double(design->module(cell->type)->attributes.at(ID::area).as_int());
 						mod_data.area += double(design->module(cell->type)->attributes.at(ID::area).as_int());
 						mod_data.unknown_cell_area.erase(cell->type);
-						mod_data.num_cells -= mod_data.num_cells_by_type.erase(cell->type);
-						mod_data.area_cells_by_type.erase(cell->type);
-						mod_data.local_num_cells -= mod_data.local_num_cells_by_type.erase(cell->type);
+						mod_data.num_cells -= (mod_data.num_cells_by_type.count(cell->type) != 0)?  mod_data.num_cells_by_type.at(cell->type): 0;
+						mod_data.num_cells_by_type.erase(cell->type);
+						mod_data.local_num_cells -= (mod_data.local_num_cells_by_type.count(cell->type) != 0)? mod_data.local_num_cells_by_type.at(cell->type): 0;
+						mod_data.local_num_cells_by_type.erase(cell->type);
 						mod_data.local_area_cells_by_type.erase(cell->type);
 					}
 				}
@@ -861,7 +863,7 @@ struct StatPass : public Pass {
 				mod_stat[top_mod->name].print_log_header(has_area, hierarchy_mode, true);
 				mod_stat[top_mod->name].print_log_line(log_id(top_mod->name), mod_stat[top_mod->name].local_num_cells,
 								       mod_stat[top_mod->name].local_area, mod_stat[top_mod->name].num_cells,
-								       mod_stat[top_mod->name].area, 0, has_area, hierarchy_mode);
+								       mod_stat[top_mod->name].area, 0, has_area, hierarchy_mode, true);
 			}
 
 			statdata_t data = hierarchy_worker(mod_stat, top_mod->name, 0, /*quiet=*/json_mode, has_area, hierarchy_mode);
diff --git a/tests/various/stat.ys b/tests/various/stat.ys
index cf084a986..50e1a35d8 100644
--- a/tests/various/stat.ys
+++ b/tests/various/stat.ys
@@ -11,6 +11,8 @@ end
 EOT
 logger -expect log "Chip area for module '\\top': 9.072000" 1
 logger -expect-no-warnings
+logger -expect log "        1    9.072 cells" 1
+logger -expect log "        1    9.072   sg13g2_and2_1" 1
 stat -liberty ../../tests/liberty/foundry_data/sg13g2_stdcell_typ_1p20V_25C.lib.filtered.gz
 
 
@@ -69,6 +71,9 @@ module \child
 end
 EOT
 logger -expect log "Chip area for top module '\\top': 112.492800" 1
-logger -expect log "of which used for sequential elements: 94.348800" 1
+logger -expect log "of which used for sequential elements: 94.348800" 2
+logger -expect log "2   18.144 cells" 1 
+logger -expect log "4  112.493 cells" 1
+logger -expect log "2   94.349   sg13g2_dfrbp_1" 1
 logger -expect-no-warnings
 stat -liberty ../../tests/liberty/foundry_data/sg13g2_stdcell_typ_1p20V_25C.lib.filtered.gz -top \top
diff --git a/tests/various/stat_hierarchy.ys b/tests/various/stat_hierarchy.ys
new file mode 100644
index 000000000..f41165629
--- /dev/null
+++ b/tests/various/stat_hierarchy.ys
@@ -0,0 +1,62 @@
+
+read_rtlil << EOT
+module \top
+  wire input 1 \A
+  wire output 2 \Y
+  wire output 3 \N
+
+  cell \sg13g2_and2_1 \sub1
+    connect \A \A
+    connect \B 1'0
+    connect \Y \Y
+  end
+
+  cell \child \sequential
+    connect \A \A
+    connect \B 1'0
+    connect \R 1'0
+    connect \Y \Y
+    connect \N \N
+  end
+
+  cell \child \sequential1
+    connect \A \A
+    connect \B 1'0
+    connect \R 1'0
+    connect \Y \Y
+    connect \N \N
+  end
+
+  cell \sg13g2_and2_1 \sub2
+    connect \A \A
+    connect \B 1'0
+    connect \Y \Y
+  end
+end
+
+module \child
+  wire input 1 \A
+  wire input 2 \B
+  wire input 3 \R
+
+  wire output 4 \Y
+  wire output 5 \N
+
+  cell \sg13g2_dfrbp_1 \sequential_ff
+    connect \CLK \A
+    connect \D \B
+    connect \Q \Y
+    connect \Q_N \N
+    connect \RESET_B \R
+  end
+
+end
+EOT
+logger -expect log "4  112.493        2   18.144 cells" 2 
+logger -expect log "2   18.144        2   18.144   sg13g2_and2_1" 2
+logger -expect log "2   94.349        -        -   sg13g2_dfrbp_1" 2
+logger -expect log "2   94.349        2        - submodules" 2
+logger -expect-no-warnings
+stat -liberty ../../tests/liberty/foundry_data/sg13g2_stdcell_typ_1p20V_25C.lib.filtered.gz -top \top -hierarchy
+
+

From e486994f60a201f79b2bb60ea9f8625829bf4c8b Mon Sep 17 00:00:00 2001
From: Anhijkt <mihail.ershov.zp@gmail.com>
Date: Thu, 14 Aug 2025 00:13:23 +0300
Subject: [PATCH 380/931] opt_dff: add test

---
 tests/opt/opt_dff-simplify.il | 648 ++++++++++++++++++++++++++++++++++
 tests/opt/opt_dff-simplify.ys |  12 +
 2 files changed, 660 insertions(+)
 create mode 100644 tests/opt/opt_dff-simplify.il
 create mode 100644 tests/opt/opt_dff-simplify.ys

diff --git a/tests/opt/opt_dff-simplify.il b/tests/opt/opt_dff-simplify.il
new file mode 100644
index 000000000..3b86e9e35
--- /dev/null
+++ b/tests/opt/opt_dff-simplify.il
@@ -0,0 +1,648 @@
+# Generated by Yosys 0.53+24 (git sha1 ab636979e, sccache clang++ 19.1.7 -fPIC -O3 -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize=address,undefined)
+autoidx 171528
+attribute \hdlname "csr_regfile_0000000000000000_1"
+module \csr_regfile_0000000000000000_1
+  wire $delete_wire$169641
+  wire $delete_wire$169642
+  wire $delete_wire$169643
+  wire $delete_wire$169644
+  wire $delete_wire$169645
+  wire $delete_wire$169646
+  wire $delete_wire$169647
+  wire $delete_wire$169648
+  wire $delete_wire$169649
+  wire $delete_wire$169650
+  wire $delete_wire$169651
+  wire $delete_wire$169652
+  wire $delete_wire$169653
+  wire $delete_wire$169654
+  wire $delete_wire$169655
+  wire $delete_wire$169656
+  wire $delete_wire$169657
+  wire $delete_wire$169658
+  wire $delete_wire$169659
+  wire $delete_wire$169660
+  wire $delete_wire$169661
+  wire $delete_wire$169662
+  wire $delete_wire$169663
+  wire $delete_wire$169664
+  wire $delete_wire$169665
+  wire $delete_wire$169666
+  wire $delete_wire$169667
+  wire $delete_wire$169668
+  wire $delete_wire$169669
+  wire $delete_wire$169670
+  wire $delete_wire$169671
+  wire $delete_wire$169672
+  wire $delete_wire$169673
+  wire $delete_wire$169674
+  wire $delete_wire$169675
+  wire $delete_wire$169676
+  wire $delete_wire$169677
+  wire $delete_wire$169678
+  wire $delete_wire$169679
+  wire $delete_wire$169680
+  wire $delete_wire$169681
+  wire $delete_wire$169682
+  wire $delete_wire$169683
+  wire $delete_wire$169684
+  wire $delete_wire$169685
+  wire $delete_wire$169686
+  wire $delete_wire$169687
+  wire $delete_wire$169688
+  wire $delete_wire$169689
+  wire $delete_wire$169690
+  wire $delete_wire$169691
+  wire $delete_wire$169692
+  wire $delete_wire$169693
+  wire $delete_wire$169694
+  wire $delete_wire$169695
+  wire $delete_wire$169696
+  wire $delete_wire$169697
+  wire $delete_wire$169698
+  wire $delete_wire$169699
+  wire $delete_wire$169700
+  wire $delete_wire$169701
+  wire $delete_wire$169702
+  wire $delete_wire$169703
+  wire $delete_wire$169704
+  wire $delete_wire$169705
+  wire $delete_wire$169706
+  wire $delete_wire$169707
+  wire $delete_wire$169708
+  wire $delete_wire$169709
+  wire $delete_wire$169710
+  wire $delete_wire$169711
+  wire $delete_wire$169712
+  wire width 32 $delete_wire$169713
+  wire $delete_wire$169714
+  wire $delete_wire$169715
+  wire $delete_wire$169716
+  wire $delete_wire$169717
+  wire $delete_wire$169718
+  wire $delete_wire$169719
+  wire $delete_wire$169720
+  wire $delete_wire$169721
+  wire $delete_wire$169722
+  wire $delete_wire$169723
+  wire $delete_wire$169724
+  wire $delete_wire$169725
+  wire $delete_wire$169726
+  wire $delete_wire$169727
+  wire $delete_wire$169728
+  wire $delete_wire$169729
+  wire $delete_wire$169730
+  wire $delete_wire$169731
+  wire $delete_wire$169732
+  wire $delete_wire$169733
+  wire $delete_wire$169734
+  wire $delete_wire$169735
+  wire $delete_wire$169736
+  wire $delete_wire$169737
+  wire $delete_wire$169738
+  wire $delete_wire$169739
+  wire $delete_wire$169740
+  wire $delete_wire$169741
+  wire $delete_wire$169742
+  wire $delete_wire$169743
+  wire $delete_wire$169744
+  wire $delete_wire$169745
+  wire $delete_wire$169746
+  wire $delete_wire$169747
+  wire $delete_wire$169748
+  wire $delete_wire$169749
+  wire $delete_wire$169750
+  wire $delete_wire$169751
+  wire $delete_wire$169752
+  wire $delete_wire$169753
+  wire $delete_wire$169754
+  wire $delete_wire$169755
+  wire $delete_wire$169756
+  wire $delete_wire$169757
+  wire $delete_wire$169758
+  wire $delete_wire$169759
+  wire $delete_wire$169760
+  wire $delete_wire$169761
+  wire $delete_wire$169762
+  wire $delete_wire$169763
+  wire $delete_wire$169764
+  wire $delete_wire$169765
+  wire $delete_wire$169766
+  wire $delete_wire$169767
+  wire $delete_wire$169768
+  wire $delete_wire$169769
+  wire $delete_wire$169770
+  wire $delete_wire$169771
+  wire $delete_wire$169772
+  wire $delete_wire$169773
+  wire $delete_wire$169774
+  wire $delete_wire$169775
+  wire $delete_wire$169776
+  wire $delete_wire$169777
+  wire $delete_wire$169778
+  wire $delete_wire$169779
+  wire $delete_wire$169780
+  wire $delete_wire$169781
+  wire $delete_wire$169782
+  wire $delete_wire$169783
+  wire $delete_wire$169784
+  wire $delete_wire$169785
+  wire $delete_wire$169786
+  wire $delete_wire$169787
+  wire $delete_wire$169788
+  wire $delete_wire$169789
+  wire $delete_wire$169790
+  wire $delete_wire$169791
+  wire $delete_wire$169792
+  wire $delete_wire$169793
+  wire $delete_wire$169794
+  wire $delete_wire$169795
+  wire $delete_wire$169796
+  wire $delete_wire$169797
+  wire $delete_wire$169798
+  wire $delete_wire$169799
+  wire $delete_wire$169800
+  wire $delete_wire$169801
+  wire $delete_wire$169802
+  wire $delete_wire$169803
+  wire $delete_wire$169804
+  wire $delete_wire$169805
+  wire $delete_wire$169806
+  wire $delete_wire$169807
+  wire $delete_wire$169808
+  wire $delete_wire$169809
+  wire $delete_wire$169810
+  wire $delete_wire$169811
+  wire $delete_wire$169812
+  wire $delete_wire$169813
+  wire $delete_wire$169814
+  wire $delete_wire$169815
+  wire $delete_wire$169816
+  wire $delete_wire$169817
+  wire $delete_wire$169818
+  wire $delete_wire$169819
+  wire $delete_wire$169820
+  wire $delete_wire$169821
+  wire width 5 $delete_wire$169822
+  wire width 17 $delete_wire$169823
+  wire $delete_wire$169824
+  wire $delete_wire$169825
+  wire $delete_wire$169826
+  wire $delete_wire$169827
+  wire $delete_wire$169828
+  wire $delete_wire$169829
+  wire $delete_wire$169830
+  wire $delete_wire$169831
+  wire $delete_wire$169832
+  wire $delete_wire$169833
+  wire $delete_wire$169834
+  wire $delete_wire$169835
+  wire $delete_wire$169836
+  wire $delete_wire$169837
+  wire $delete_wire$169838
+  wire $delete_wire$169839
+  wire $delete_wire$169840
+  wire $delete_wire$169960
+  wire $delete_wire$169961
+  wire $delete_wire$169962
+  wire $delete_wire$169963
+  wire $delete_wire$169964
+  wire $delete_wire$169965
+  wire $delete_wire$169966
+  wire $delete_wire$169967
+  wire $delete_wire$169968
+  wire $delete_wire$169969
+  wire $delete_wire$169970
+  wire $delete_wire$169971
+  wire $delete_wire$169972
+  wire $delete_wire$169973
+  wire $delete_wire$169974
+  wire $delete_wire$169975
+  wire $delete_wire$169976
+  wire $delete_wire$169977
+  wire $delete_wire$169978
+  wire $delete_wire$169979
+  wire $delete_wire$169980
+  wire $delete_wire$169981
+  wire $delete_wire$169982
+  wire $delete_wire$169983
+  wire $delete_wire$169984
+  wire $delete_wire$169985
+  wire $delete_wire$169986
+  wire $delete_wire$169987
+  wire $delete_wire$169988
+  wire $delete_wire$169989
+  wire $delete_wire$169990
+  wire $delete_wire$169991
+  wire $delete_wire$169992
+  wire $delete_wire$169993
+  wire $delete_wire$169994
+  wire $delete_wire$169995
+  wire $delete_wire$169996
+  wire $delete_wire$169997
+  wire $delete_wire$169998
+  wire $delete_wire$169999
+  wire $delete_wire$170000
+  wire $delete_wire$170001
+  wire $delete_wire$170002
+  wire $delete_wire$170003
+  wire $delete_wire$170004
+  wire $delete_wire$170005
+  wire $delete_wire$170006
+  wire $delete_wire$170007
+  wire $delete_wire$170008
+  wire $delete_wire$170009
+  wire $delete_wire$170010
+  wire $delete_wire$170011
+  wire $delete_wire$170012
+  wire $delete_wire$170013
+  wire $delete_wire$170014
+  wire $delete_wire$170015
+  wire $delete_wire$170016
+  wire $delete_wire$170017
+  wire $delete_wire$170018
+  wire $delete_wire$170019
+  wire $delete_wire$170020
+  wire $delete_wire$170021
+  wire $delete_wire$170022
+  wire $delete_wire$170023
+  wire $delete_wire$170024
+  wire $delete_wire$170025
+  wire $delete_wire$170026
+  wire $delete_wire$170027
+  wire $delete_wire$170028
+  wire $delete_wire$170029
+  wire $delete_wire$170030
+  wire $delete_wire$170031
+  wire $delete_wire$170032
+  wire $delete_wire$170033
+  wire $delete_wire$170034
+  wire $delete_wire$170035
+  wire $delete_wire$170036
+  wire $delete_wire$170037
+  wire $delete_wire$170038
+  wire $delete_wire$170039
+  wire $delete_wire$170040
+  wire $delete_wire$170041
+  wire $delete_wire$170042
+  wire $delete_wire$170043
+  wire $delete_wire$170044
+  wire $delete_wire$170045
+  wire $delete_wire$170046
+  wire $delete_wire$170047
+  wire $delete_wire$170048
+  wire $delete_wire$170049
+  wire $delete_wire$170050
+  wire $delete_wire$170051
+  wire $delete_wire$170052
+  wire $delete_wire$170053
+  wire $delete_wire$170054
+  wire $delete_wire$170055
+  wire $delete_wire$170056
+  wire $delete_wire$170057
+  wire $delete_wire$170058
+  wire $delete_wire$170059
+  wire $delete_wire$170635
+  wire $delete_wire$170636
+  wire $delete_wire$170637
+  wire $delete_wire$170638
+  wire $delete_wire$170639
+  wire $delete_wire$170640
+  wire $delete_wire$170641
+  wire $delete_wire$170642
+  wire $delete_wire$170643
+  wire $delete_wire$170644
+  wire $delete_wire$170645
+  wire $delete_wire$170646
+  wire $delete_wire$170647
+  wire $delete_wire$170648
+  wire $delete_wire$170649
+  wire $delete_wire$170650
+  wire $delete_wire$170651
+  wire $delete_wire$170652
+  wire $delete_wire$170653
+  wire $delete_wire$170654
+  wire $delete_wire$170655
+  wire $delete_wire$170656
+  wire $delete_wire$170657
+  wire $delete_wire$170658
+  wire $delete_wire$170659
+  wire $delete_wire$170660
+  wire $delete_wire$170661
+  wire $delete_wire$170662
+  wire $delete_wire$170663
+  wire $delete_wire$170664
+  wire $delete_wire$170665
+  wire $delete_wire$170666
+  wire $delete_wire$170667
+  wire $delete_wire$170668
+  wire $delete_wire$170669
+  wire $delete_wire$170670
+  wire $delete_wire$170749
+  wire $delete_wire$170750
+  wire $delete_wire$170751
+  wire $delete_wire$170752
+  wire $delete_wire$170753
+  wire $delete_wire$170754
+  wire $delete_wire$170755
+  wire width 2 $delete_wire$170756
+  wire width 2 $delete_wire$170757
+  wire $delete_wire$170758
+  wire $delete_wire$170759
+  wire $delete_wire$170760
+  wire $delete_wire$170761
+  wire $delete_wire$170762
+  wire $delete_wire$170763
+  wire $delete_wire$170764
+  wire $delete_wire$170765
+  wire $delete_wire$170766
+  wire $delete_wire$170767
+  wire $delete_wire$170768
+  wire $delete_wire$170769
+  wire $delete_wire$170770
+  wire $delete_wire$170771
+  wire $delete_wire$170772
+  wire $delete_wire$170773
+  wire $delete_wire$170774
+  wire $delete_wire$170775
+  wire $delete_wire$170859
+  wire $delete_wire$170860
+  wire $delete_wire$170861
+  wire $delete_wire$170862
+  wire $delete_wire$170863
+  wire $delete_wire$170864
+  wire $delete_wire$170865
+  wire $delete_wire$170866
+  wire $delete_wire$170867
+  wire $delete_wire$170868
+  wire $delete_wire$170869
+  wire $delete_wire$170870
+  wire $delete_wire$170871
+  wire $delete_wire$170872
+  wire $delete_wire$170873
+  wire $delete_wire$170874
+  wire $delete_wire$170875
+  wire $delete_wire$170876
+  wire $delete_wire$170877
+  wire $delete_wire$170878
+  wire $delete_wire$170879
+  wire $delete_wire$170880
+  wire $delete_wire$170881
+  wire $delete_wire$170882
+  wire $delete_wire$170996
+  wire $delete_wire$170997
+  wire $delete_wire$170998
+  wire $delete_wire$170999
+  wire $delete_wire$171000
+  wire $delete_wire$171001
+  wire $delete_wire$171002
+  wire $delete_wire$171003
+  wire $delete_wire$171004
+  wire $delete_wire$171005
+  wire $delete_wire$171006
+  wire $delete_wire$171007
+  wire $delete_wire$171008
+  wire $delete_wire$171009
+  wire $delete_wire$171010
+  wire $delete_wire$171011
+  wire $delete_wire$171035
+  wire $delete_wire$171036
+  wire $delete_wire$171037
+  wire $delete_wire$171038
+  wire $delete_wire$171039
+  wire $delete_wire$171040
+  wire $delete_wire$171041
+  wire $delete_wire$171042
+  wire $delete_wire$171043
+  wire $delete_wire$171044
+  wire $delete_wire$171045
+  wire $delete_wire$171046
+  wire $delete_wire$171047
+  wire $delete_wire$171048
+  wire $delete_wire$171049
+  wire $delete_wire$171172
+  wire $delete_wire$171173
+  wire $delete_wire$171174
+  wire $delete_wire$171175
+  wire $delete_wire$171176
+  wire $delete_wire$171177
+  wire $delete_wire$171178
+  wire $delete_wire$171179
+  wire $delete_wire$171180
+  wire $delete_wire$171181
+  wire $delete_wire$171182
+  wire $delete_wire$171183
+  wire $delete_wire$171184
+  wire $delete_wire$171185
+  wire $delete_wire$171186
+  wire $delete_wire$171187
+  wire $delete_wire$171188
+  wire $delete_wire$171189
+  wire $delete_wire$171190
+  wire width 2 $delete_wire$171200
+  wire width 2 $delete_wire$171201
+  wire $delete_wire$171202
+  wire $delete_wire$171203
+  wire $delete_wire$171204
+  wire $delete_wire$171205
+  wire $delete_wire$171206
+  wire $delete_wire$171207
+  wire $delete_wire$171226
+  wire $delete_wire$171227
+  wire $delete_wire$171228
+  wire $delete_wire$171229
+  wire $delete_wire$171230
+  wire $delete_wire$171231
+  wire $delete_wire$171232
+  wire $delete_wire$171254
+  wire $delete_wire$171255
+  wire $delete_wire$171256
+  wire $delete_wire$171257
+  wire $delete_wire$171258
+  wire $delete_wire$171259
+  wire $delete_wire$171267
+  wire $delete_wire$171268
+  wire $delete_wire$171269
+  wire $delete_wire$171270
+  wire $delete_wire$171271
+  wire $delete_wire$171272
+  wire $delete_wire$171314
+  wire $delete_wire$171315
+  wire $delete_wire$171316
+  wire $delete_wire$171317
+  wire $delete_wire$171318
+  wire $delete_wire$171338
+  wire $delete_wire$171339
+  wire $delete_wire$171340
+  wire $delete_wire$171341
+  wire $delete_wire$171350
+  wire $delete_wire$171351
+  wire $delete_wire$171352
+  wire $delete_wire$171353
+  wire $delete_wire$171354
+  wire $delete_wire$171355
+  wire $delete_wire$171356
+  wire $delete_wire$171357
+  wire $delete_wire$171358
+  wire $delete_wire$171359
+  wire $delete_wire$171360
+  wire width 2 $delete_wire$171361
+  wire $delete_wire$171362
+  wire $delete_wire$171371
+  wire $delete_wire$171372
+  wire $delete_wire$171373
+  wire $delete_wire$171374
+  wire $delete_wire$171387
+  wire $delete_wire$171388
+  wire $delete_wire$171389
+  wire $delete_wire$171390
+  wire $delete_wire$171408
+  wire $delete_wire$171409
+  wire $delete_wire$171441
+  wire $delete_wire$171442
+  wire $delete_wire$171449
+  wire $delete_wire$171450
+  wire $delete_wire$171454
+  wire $delete_wire$171455
+  wire $delete_wire$171471
+  wire $delete_wire$171472
+  wire $delete_wire$171477
+  wire $delete_wire$171501
+  wire $delete_wire$171502
+  wire $delete_wire$171507
+  wire $delete_wire$171512
+  wire $delete_wire$171513
+  wire $delete_wire$171514
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216088$6333_Y
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216089$6332_Y
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216090$6331_Y
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216091$6330_Y
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216092$6329_Y
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216093$6328_Y
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216094$6327_Y
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216095$6326_Y
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216096$6325_Y
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216097$6324_Y
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216098$6323_Y
+  wire width 32 $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216099$6322_Y
+  wire \N2231
+  wire \N3558
+  attribute \unused_bits "1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
+  wire width 32 \dcsr_d
+  wire \dcsr_q_prv__0_
+  cell $adff $procdff$137332
+    parameter \ARST_POLARITY 0
+    parameter \ARST_VALUE 1'1
+    parameter \CLK_POLARITY 1'1
+    parameter \WIDTH 1
+    connect \ARST $delete_wire$170004
+    connect \CLK $delete_wire$171206
+    connect \D \dcsr_d [0]
+    connect \Q \dcsr_q_prv__0_
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216087$6334
+    parameter \WIDTH 32
+    connect \A { $delete_wire$170875 $delete_wire$171472 $delete_wire$171181 $delete_wire$169735 $delete_wire$169994 $delete_wire$169963 $delete_wire$170670 $delete_wire$169702 $delete_wire$169975 $delete_wire$170002 $delete_wire$169641 $delete_wire$171011 $delete_wire$171006 $delete_wire$171173 $delete_wire$171387 $delete_wire$170769 $delete_wire$170881 $delete_wire$169743 $delete_wire$169731 $delete_wire$169710 $delete_wire$169756 $delete_wire$170018 $delete_wire$169779 $delete_wire$170037 $delete_wire$169794 $delete_wire$171339 $delete_wire$171256 $delete_wire$171205 $delete_wire$169670 $delete_wire$171352 $delete_wire$171315 \dcsr_q_prv__0_ }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216088$6333_Y
+    connect \S $delete_wire$169809
+    connect \Y { $delete_wire$169830 $delete_wire$171390 $delete_wire$169837 $delete_wire$169679 $delete_wire$169677 $delete_wire$169767 $delete_wire$169828 $delete_wire$170038 $delete_wire$169704 $delete_wire$169653 $delete_wire$169707 $delete_wire$169684 $delete_wire$169986 $delete_wire$169712 $delete_wire$170033 $delete_wire$169759 $delete_wire$171513 $delete_wire$170012 $delete_wire$170876 $delete_wire$170007 $delete_wire$169965 $delete_wire$169825 $delete_wire$169655 $delete_wire$169839 $delete_wire$170034 $delete_wire$170042 $delete_wire$171338 $delete_wire$169833 $delete_wire$169762 $delete_wire$169835 $delete_wire$169764 \N2231 }
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216088$6333
+    parameter \WIDTH 32
+    connect \A { $delete_wire$170014 $delete_wire$171257 $delete_wire$170770 $delete_wire$169725 $delete_wire$170873 $delete_wire$171514 $delete_wire$170870 $delete_wire$169692 $delete_wire$171184 $delete_wire$170045 $delete_wire$169649 $delete_wire$170859 $delete_wire$171455 $delete_wire$170053 $delete_wire$170044 $delete_wire$170768 $delete_wire$170659 $delete_wire$169742 $delete_wire$169730 $delete_wire$169718 $delete_wire$169741 $delete_wire$170019 $delete_wire$169778 $delete_wire$170024 $delete_wire$169807 $delete_wire$171046 $delete_wire$171374 $delete_wire$170861 $delete_wire$169669 $delete_wire$171182 $delete_wire$171388 \dcsr_q_prv__0_ }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216089$6332_Y
+    connect \S $delete_wire$169810
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216088$6333_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216089$6332
+    parameter \WIDTH 32
+    connect \A { $delete_wire$169820 $delete_wire$171507 $delete_wire$171441 $delete_wire$169724 $delete_wire$169992 $delete_wire$169691 $delete_wire$171356 $delete_wire$169700 $delete_wire$169977 $delete_wire$170046 $delete_wire$169648 $delete_wire$170774 $delete_wire$171038 $delete_wire$171005 $delete_wire$170057 $delete_wire$171226 $delete_wire$170874 $delete_wire$169755 $delete_wire$169729 $delete_wire$171450 $delete_wire$169754 $delete_wire$170020 $delete_wire$169777 $delete_wire$170025 $delete_wire$169806 $delete_wire$170643 $delete_wire$171177 $delete_wire$171449 $delete_wire$169668 $delete_wire$171512 $delete_wire$171501 \dcsr_q_prv__0_ }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216090$6331_Y
+    connect \S $delete_wire$169997
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216089$6332_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216090$6331
+    parameter \WIDTH 32
+    connect \A { $delete_wire$169819 $delete_wire$170772 $delete_wire$170773 $delete_wire$169723 $delete_wire$169990 $delete_wire$169690 $delete_wire$170669 $delete_wire$169699 $delete_wire$169978 $delete_wire$170047 $delete_wire$169647 $delete_wire$171049 $delete_wire$171007 $delete_wire$170872 $delete_wire$170056 $delete_wire$171004 $delete_wire$171202 $delete_wire$169793 $delete_wire$169728 $delete_wire$170664 $delete_wire$169753 $delete_wire$170021 $delete_wire$169776 $delete_wire$170026 $delete_wire$169805 $delete_wire$170644 $delete_wire$171008 $delete_wire$170657 $delete_wire$169658 $delete_wire$171003 $delete_wire$170749 \dcsr_q_prv__0_ }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216091$6330_Y
+    connect \S $delete_wire$169826
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216090$6331_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216091$6330
+    parameter \WIDTH 32
+    connect \A { 4'0100 $delete_wire$169823 2'00 $delete_wire$169822 1'0 $delete_wire$169781 $delete_wire$170757 }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216092$6329_Y
+    connect \S $delete_wire$170006
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216091$6330_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216092$6329
+    parameter \WIDTH 32
+    connect \A { $delete_wire$169818 $delete_wire$170762 $delete_wire$170868 $delete_wire$169722 $delete_wire$169991 $delete_wire$169689 $delete_wire$170642 $delete_wire$169698 $delete_wire$169979 $delete_wire$170048 $delete_wire$169646 $delete_wire$171409 $delete_wire$171259 $delete_wire$170043 $delete_wire$170055 $delete_wire$171471 $delete_wire$170646 $delete_wire$169792 $delete_wire$169727 $delete_wire$169740 $delete_wire$169752 $delete_wire$170022 $delete_wire$169775 $delete_wire$170027 $delete_wire$169804 $delete_wire$170666 $delete_wire$170663 $delete_wire$171179 $delete_wire$169666 $delete_wire$171186 $delete_wire$170655 \dcsr_q_prv__0_ }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216093$6328_Y
+    connect \S $delete_wire$169972
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216092$6329_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216093$6328
+    parameter \WIDTH 32
+    connect \A { $delete_wire$169817 $delete_wire$171190 $delete_wire$171408 $delete_wire$169721 $delete_wire$171002 $delete_wire$169688 $delete_wire$171270 $delete_wire$169697 $delete_wire$169980 $delete_wire$169982 $delete_wire$169645 $delete_wire$171180 $delete_wire$169771 $delete_wire$170860 $delete_wire$170054 $delete_wire$171009 $delete_wire$170639 $delete_wire$169791 $delete_wire$170879 $delete_wire$169739 $delete_wire$169751 $delete_wire$170049 $delete_wire$169774 $delete_wire$170028 $delete_wire$169803 $delete_wire$170645 $delete_wire$169989 $delete_wire$171272 $delete_wire$169665 $delete_wire$171174 $delete_wire$170653 \dcsr_q_prv__0_ }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216094$6327_Y
+    connect \S $delete_wire$170036
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216093$6328_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216094$6327
+    parameter \WIDTH 32
+    connect \A { $delete_wire$169816 $delete_wire$171228 $delete_wire$171454 $delete_wire$169720 $delete_wire$170997 $delete_wire$169687 $delete_wire$170649 $delete_wire$169696 $delete_wire$169981 $delete_wire$170050 $delete_wire$169644 $delete_wire$170760 $delete_wire$169786 $delete_wire$170862 $delete_wire$170032 $delete_wire$171389 $delete_wire$171043 $delete_wire$169790 $delete_wire$169749 $delete_wire$169738 $delete_wire$169750 $delete_wire$169983 $delete_wire$169773 $delete_wire$170029 $delete_wire$169802 $delete_wire$170660 $delete_wire$169962 $delete_wire$170658 $delete_wire$169664 $delete_wire$170751 $delete_wire$170640 \dcsr_q_prv__0_ }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216095$6326_Y
+    connect \S $delete_wire$169705
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216094$6327_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216095$6326
+    parameter \WIDTH 32
+    connect \A { $delete_wire$169815 $delete_wire$171372 $delete_wire$171175 $delete_wire$169719 $delete_wire$171044 $delete_wire$169686 $delete_wire$171231 $delete_wire$169695 $delete_wire$170008 $delete_wire$170052 $delete_wire$169643 $delete_wire$170996 $delete_wire$169785 $delete_wire$170865 $delete_wire$170636 $delete_wire$171185 $delete_wire$171188 $delete_wire$169789 $delete_wire$171045 $delete_wire$169737 $delete_wire$169765 $delete_wire$171268 $delete_wire$169772 $delete_wire$170016 $delete_wire$169801 $delete_wire$170665 $delete_wire$170058 $delete_wire$169961 $delete_wire$169663 $delete_wire$171502 $delete_wire$170652 \dcsr_q_prv__0_ }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216096$6325_Y
+    connect \S $delete_wire$170650
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216095$6326_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216096$6325
+    parameter \WIDTH 32
+    connect \A { $delete_wire$169814 $delete_wire$170753 $delete_wire$171176 $delete_wire$169709 $delete_wire$170999 $delete_wire$169685 $delete_wire$170647 $delete_wire$169694 $delete_wire$169999 $delete_wire$170051 $delete_wire$169642 $delete_wire$170863 $delete_wire$169784 $delete_wire$170755 $delete_wire$170754 $delete_wire$171204 $delete_wire$171373 $delete_wire$169788 $delete_wire$170059 $delete_wire$169736 $delete_wire$169748 $delete_wire$171351 $delete_wire$169787 $delete_wire$171340 $delete_wire$169800 $delete_wire$170638 $delete_wire$169970 $delete_wire$169974 $delete_wire$169662 $delete_wire$170764 $delete_wire$170651 \dcsr_q_prv__0_ }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216097$6324_Y
+    connect \S $delete_wire$169996
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216096$6325_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216097$6324
+    parameter \WIDTH 32
+    connect \A { $delete_wire$169813 $delete_wire$171229 $delete_wire$170765 $delete_wire$169717 $delete_wire$171035 $delete_wire$169675 $delete_wire$170637 $delete_wire$169693 $delete_wire$170000 $delete_wire$171000 $delete_wire$169650 $delete_wire$171442 $delete_wire$169783 $delete_wire$170882 $delete_wire$171318 $delete_wire$171010 $delete_wire$171357 $delete_wire$169821 $delete_wire$170880 $delete_wire$169726 $delete_wire$169747 $delete_wire$169984 $delete_wire$169770 $delete_wire$170031 $delete_wire$169799 $delete_wire$171048 $delete_wire$169969 $delete_wire$170656 $delete_wire$169661 $delete_wire$171354 $delete_wire$170661 \dcsr_q_prv__0_ }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216098$6323_Y
+    connect \S $delete_wire$169671
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216097$6324_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216098$6323
+    parameter \WIDTH 32
+    connect \A { $delete_wire$169998 $delete_wire$171350 $delete_wire$170759 $delete_wire$169716 $delete_wire$169993 $delete_wire$169683 $delete_wire$170654 $delete_wire$169667 $delete_wire$170001 $delete_wire$171371 $delete_wire$169674 $delete_wire$170667 $delete_wire$169782 $delete_wire$171187 $delete_wire$170878 $delete_wire$170766 $delete_wire$171254 $delete_wire$169796 $delete_wire$170877 $delete_wire$169734 $delete_wire$169746 $delete_wire$171207 $delete_wire$169769 $delete_wire$170009 $delete_wire$169798 $delete_wire$171172 $delete_wire$169968 $delete_wire$171271 $delete_wire$169660 $delete_wire$171232 $delete_wire$170662 \dcsr_q_prv__0_ }
+    connect \B $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216099$6322_Y
+    connect \S $delete_wire$169831
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216098$6323_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216099$6322
+    parameter \WIDTH 32
+    connect \A { $delete_wire$169811 $delete_wire$171355 $delete_wire$170763 $delete_wire$169715 $delete_wire$171039 $delete_wire$169682 $delete_wire$169988 $delete_wire$169657 $delete_wire$170015 $delete_wire$171317 $delete_wire$169673 $delete_wire$170866 $delete_wire$169768 $delete_wire$170998 $delete_wire$170752 $delete_wire$170023 $delete_wire$170767 $delete_wire$169795 $delete_wire$170030 $delete_wire$169733 $delete_wire$169745 $delete_wire$171360 $delete_wire$169834 $delete_wire$170010 $delete_wire$169976 $delete_wire$171203 $delete_wire$169967 $delete_wire$171477 $delete_wire$169659 $delete_wire$171230 $delete_wire$170641 \dcsr_q_prv__0_ }
+    connect \B $delete_wire$169713
+    connect \S $delete_wire$171001
+    connect \Y $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:216099$6322_Y
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:217099$7332
+    parameter \WIDTH 32
+    connect \A { $delete_wire$170013 $delete_wire$171353 $delete_wire$171037 $delete_wire$169714 $delete_wire$171269 $delete_wire$169681 $delete_wire$170668 $delete_wire$169656 $delete_wire$170003 $delete_wire$171189 $delete_wire$169672 $delete_wire$169960 $delete_wire$169780 $delete_wire$170775 $delete_wire$170871 $delete_wire$170864 $delete_wire$171183 $delete_wire$169808 $delete_wire$170017 $delete_wire$169732 $delete_wire$169744 $delete_wire$171359 $delete_wire$171041 $delete_wire$171040 $delete_wire$170761 $delete_wire$170635 $delete_wire$169966 $delete_wire$169971 $delete_wire$169701 $delete_wire$170648 $delete_wire$171255 \dcsr_q_prv__0_ }
+    connect \B { $delete_wire$169829 $delete_wire$171316 $delete_wire$169836 $delete_wire$169678 $delete_wire$169676 $delete_wire$169766 $delete_wire$169827 $delete_wire$170039 $delete_wire$169703 $delete_wire$169652 $delete_wire$169706 $delete_wire$169708 $delete_wire$169987 $delete_wire$169711 $delete_wire$169985 $delete_wire$169758 $delete_wire$169973 $delete_wire$170011 $delete_wire$170869 $delete_wire$169812 $delete_wire$169964 $delete_wire$169824 $delete_wire$169654 $delete_wire$169838 $delete_wire$170035 $delete_wire$169840 $delete_wire$171341 $delete_wire$169832 $delete_wire$169761 $delete_wire$169797 $delete_wire$169763 \N2231 }
+    connect \S $delete_wire$169760
+    connect \Y { \dcsr_d [31:9] $delete_wire$171047 $delete_wire$170040 $delete_wire$170750 \dcsr_d [5:2] $delete_wire$171227 \N3558 }
+  end
+  cell $mux $ternary$/workspace/OpenROAD-flow-scripts/flow/designs/src/ariane133/ariane.sv2v.v:217233$7498
+    parameter \WIDTH 5
+    connect \A { $delete_wire$169995 $delete_wire$169651 $delete_wire$171042 $delete_wire$171201 }
+    connect \B { $delete_wire$170867 $delete_wire$170041 $delete_wire$171178 $delete_wire$171358 \N3558 }
+    connect \S $delete_wire$170771
+    connect \Y { \dcsr_d [8:6] \dcsr_d [1:0] }
+  end
+end
diff --git a/tests/opt/opt_dff-simplify.ys b/tests/opt/opt_dff-simplify.ys
new file mode 100644
index 000000000..3a4d6778c
--- /dev/null
+++ b/tests/opt/opt_dff-simplify.ys
@@ -0,0 +1,12 @@
+read_rtlil opt_dff-simplify.il 
+opt_dff
+
+select -assert-count 8 t:$ne r:A_WIDTH=3 %i
+select -assert-count 5 t:$ne r:A_WIDTH=2 %i
+
+select -assert-none t:$ne r:A_WIDTH=13 %i
+select -assert-none t:$ne r:A_WIDTH=14 %i
+select -assert-none t:$ne r:A_WIDTH=15 %i
+select -assert-none t:$ne r:A_WIDTH=10 %i
+select -assert-none t:$ne r:A_WIDTH=12 %i
+select -assert-none t:$ne r:A_WIDTH=11 %i

From a265b23ac0c686e7e54613f58da4f132f406eca5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 14 Aug 2025 00:25:16 +0000
Subject: [PATCH 381/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 10f8add20..8ec8715d3 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+101
+YOSYS_VER := 0.56+105
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 1dbf2df9837a33381b1bf62269edd8eaec144a3c Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 14 Aug 2025 09:15:43 +0200
Subject: [PATCH 382/931] Add libfl-dev for CodeQL CI job

---
 .github/workflows/codeql.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 75d799fe1..95595924a 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Install deps
-      run: sudo apt-get install bison flex libreadline-dev tcl-dev libffi-dev
+      run: sudo apt-get install bison flex libfl-dev libreadline-dev tcl-dev libffi-dev
 
     - name: Checkout repository
       uses: actions/checkout@v4

From 4de3ee093eecf4e766734fddb113187df36be31a Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Sat, 26 Jul 2025 09:34:37 +0000
Subject: [PATCH 383/931] Mark kept FF output wires as ports directly instead
 of via the 'keep' attribute

---
 passes/techmap/abc.cc | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 0c2576c1a..dfaee9415 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -291,12 +291,15 @@ void AbcModuleState::extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool
 				return;
 		}
 
-		if (keepff)
-			for (auto &c : ff.sig_q.chunks())
-				if (c.wire != nullptr)
-					c.wire->attributes[ID::keep] = 1;
-
-		map_signal(ff.sig_q, type, map_signal(ff.sig_d));
+		int gate_id = map_signal(ff.sig_q, type, map_signal(ff.sig_d));
+		if (keepff) {
+			SigBit bit = ff.sig_q;
+			if (assign_map(bit).wire != nullptr) {
+				signal_list[gate_id].is_port = true;
+			}
+			if (bit.wire != nullptr)
+				bit.wire->attributes[ID::keep] = 1;
+		}
 
 		ff.remove();
 		return;

From ac8259b02e6d2ac98fd903603d012c8180540aba Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 17 Jul 2025 06:16:54 +0000
Subject: [PATCH 384/931] Preserve `assign_map` across ABC invocations.

Currently `assign_map` is rebuilt from the module from scratch every time we invoke ABC.
That doesn't scale when we do thousands of ABC runs over large modules. Instead,
create it once and then maintain incrementally it as we update the module.
---
 passes/techmap/abc.cc | 130 ++++++++++++++++++++++--------------------
 1 file changed, 68 insertions(+), 62 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index dfaee9415..75f19f77b 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -142,7 +142,6 @@ struct AbcModuleState {
 	const AbcConfig &config;
 
 	int map_autoidx = 0;
-	SigMap assign_map;
 	std::vector<gate_t> signal_list;
 	dict<RTLIL::SigBit, int> signal_map;
 	FfInitVals initvals;
@@ -162,19 +161,19 @@ struct AbcModuleState {
 
 	AbcModuleState(const AbcConfig &config) : config(config) {}
 
-	int map_signal(RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1);
-	void mark_port(RTLIL::SigSpec sig);
-	void extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool keepff);
+	int map_signal(const SigMap &assign_map, RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1);
+	void mark_port(const SigMap &assign_map, RTLIL::SigSpec sig);
+	void extract_cell(const SigMap &assign_map, RTLIL::Module *module, RTLIL::Cell *cell, bool keepff);
 	std::string remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire = nullptr);
 	void dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edges, pool<int> &workpool, std::vector<int> &in_counts);
-	void handle_loops(RTLIL::Module *module);
-	void abc_module(RTLIL::Design *design, RTLIL::Module *module, const std::vector<RTLIL::Cell*> &cells,
+	void handle_loops(SigMap &assign_map, RTLIL::Module *module);
+	void abc_module(RTLIL::Design *design, RTLIL::Module *module, SigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
 		bool dff_mode, std::string clk_str);
-	void extract(RTLIL::Design *design, RTLIL::Module *module);
+	void extract(SigMap &assign_map, RTLIL::Design *design, RTLIL::Module *module);
 	void finish();
 };
 
-int AbcModuleState::map_signal(RTLIL::SigBit bit, gate_type_t gate_type, int in1, int in2, int in3, int in4)
+int AbcModuleState::map_signal(const SigMap &assign_map, RTLIL::SigBit bit, gate_type_t gate_type, int in1, int in2, int in3, int in4)
 {
 	assign_map.apply(bit);
 
@@ -212,14 +211,14 @@ int AbcModuleState::map_signal(RTLIL::SigBit bit, gate_type_t gate_type, int in1
 	return gate.id;
 }
 
-void AbcModuleState::mark_port(RTLIL::SigSpec sig)
+void AbcModuleState::mark_port(const SigMap &assign_map, RTLIL::SigSpec sig)
 {
 	for (auto &bit : assign_map(sig))
 		if (bit.wire != nullptr && signal_map.count(bit) > 0)
 			signal_list[signal_map[bit]].is_port = true;
 }
 
-void AbcModuleState::extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool keepff)
+void AbcModuleState::extract_cell(const SigMap &assign_map, RTLIL::Module *module, RTLIL::Cell *cell, bool keepff)
 {
 	if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
 		FfData ff(&initvals, cell);
@@ -291,7 +290,7 @@ void AbcModuleState::extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool
 				return;
 		}
 
-		int gate_id = map_signal(ff.sig_q, type, map_signal(ff.sig_d));
+		int gate_id = map_signal(assign_map, ff.sig_q, type, map_signal(assign_map, ff.sig_d));
 		if (keepff) {
 			SigBit bit = ff.sig_q;
 			if (assign_map(bit).wire != nullptr) {
@@ -301,6 +300,8 @@ void AbcModuleState::extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool
 				bit.wire->attributes[ID::keep] = 1;
 		}
 
+		map_signal(assign_map, ff.sig_q, type, map_signal(assign_map, ff.sig_d));
+
 		ff.remove();
 		return;
 	}
@@ -313,7 +314,7 @@ void AbcModuleState::extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool
 		assign_map.apply(sig_a);
 		assign_map.apply(sig_y);
 
-		map_signal(sig_y, cell->type == ID($_BUF_) ? G(BUF) : G(NOT), map_signal(sig_a));
+		map_signal(assign_map, sig_y, cell->type == ID($_BUF_) ? G(BUF) : G(NOT), map_signal(assign_map, sig_a));
 
 		module->remove(cell);
 		return;
@@ -329,25 +330,25 @@ void AbcModuleState::extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool
 		assign_map.apply(sig_b);
 		assign_map.apply(sig_y);
 
-		int mapped_a = map_signal(sig_a);
-		int mapped_b = map_signal(sig_b);
+		int mapped_a = map_signal(assign_map, sig_a);
+		int mapped_b = map_signal(assign_map, sig_b);
 
 		if (cell->type == ID($_AND_))
-			map_signal(sig_y, G(AND), mapped_a, mapped_b);
+			map_signal(assign_map, sig_y, G(AND), mapped_a, mapped_b);
 		else if (cell->type == ID($_NAND_))
-			map_signal(sig_y, G(NAND), mapped_a, mapped_b);
+			map_signal(assign_map, sig_y, G(NAND), mapped_a, mapped_b);
 		else if (cell->type == ID($_OR_))
-			map_signal(sig_y, G(OR), mapped_a, mapped_b);
+			map_signal(assign_map, sig_y, G(OR), mapped_a, mapped_b);
 		else if (cell->type == ID($_NOR_))
-			map_signal(sig_y, G(NOR), mapped_a, mapped_b);
+			map_signal(assign_map, sig_y, G(NOR), mapped_a, mapped_b);
 		else if (cell->type == ID($_XOR_))
-			map_signal(sig_y, G(XOR), mapped_a, mapped_b);
+			map_signal(assign_map, sig_y, G(XOR), mapped_a, mapped_b);
 		else if (cell->type == ID($_XNOR_))
-			map_signal(sig_y, G(XNOR), mapped_a, mapped_b);
+			map_signal(assign_map, sig_y, G(XNOR), mapped_a, mapped_b);
 		else if (cell->type == ID($_ANDNOT_))
-			map_signal(sig_y, G(ANDNOT), mapped_a, mapped_b);
+			map_signal(assign_map, sig_y, G(ANDNOT), mapped_a, mapped_b);
 		else if (cell->type == ID($_ORNOT_))
-			map_signal(sig_y, G(ORNOT), mapped_a, mapped_b);
+			map_signal(assign_map, sig_y, G(ORNOT), mapped_a, mapped_b);
 		else
 			log_abort();
 
@@ -367,11 +368,11 @@ void AbcModuleState::extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool
 		assign_map.apply(sig_s);
 		assign_map.apply(sig_y);
 
-		int mapped_a = map_signal(sig_a);
-		int mapped_b = map_signal(sig_b);
-		int mapped_s = map_signal(sig_s);
+		int mapped_a = map_signal(assign_map, sig_a);
+		int mapped_b = map_signal(assign_map, sig_b);
+		int mapped_s = map_signal(assign_map, sig_s);
 
-		map_signal(sig_y, cell->type == ID($_MUX_) ? G(MUX) : G(NMUX), mapped_a, mapped_b, mapped_s);
+		map_signal(assign_map, sig_y, cell->type == ID($_MUX_) ? G(MUX) : G(NMUX), mapped_a, mapped_b, mapped_s);
 
 		module->remove(cell);
 		return;
@@ -389,11 +390,11 @@ void AbcModuleState::extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool
 		assign_map.apply(sig_c);
 		assign_map.apply(sig_y);
 
-		int mapped_a = map_signal(sig_a);
-		int mapped_b = map_signal(sig_b);
-		int mapped_c = map_signal(sig_c);
+		int mapped_a = map_signal(assign_map, sig_a);
+		int mapped_b = map_signal(assign_map, sig_b);
+		int mapped_c = map_signal(assign_map, sig_c);
 
-		map_signal(sig_y, cell->type == ID($_AOI3_) ? G(AOI3) : G(OAI3), mapped_a, mapped_b, mapped_c);
+		map_signal(assign_map, sig_y, cell->type == ID($_AOI3_) ? G(AOI3) : G(OAI3), mapped_a, mapped_b, mapped_c);
 
 		module->remove(cell);
 		return;
@@ -413,12 +414,12 @@ void AbcModuleState::extract_cell(RTLIL::Module *module, RTLIL::Cell *cell, bool
 		assign_map.apply(sig_d);
 		assign_map.apply(sig_y);
 
-		int mapped_a = map_signal(sig_a);
-		int mapped_b = map_signal(sig_b);
-		int mapped_c = map_signal(sig_c);
-		int mapped_d = map_signal(sig_d);
+		int mapped_a = map_signal(assign_map, sig_a);
+		int mapped_b = map_signal(assign_map, sig_b);
+		int mapped_c = map_signal(assign_map, sig_c);
+		int mapped_d = map_signal(assign_map, sig_d);
 
-		map_signal(sig_y, cell->type == ID($_AOI4_) ? G(AOI4) : G(OAI4), mapped_a, mapped_b, mapped_c, mapped_d);
+		map_signal(assign_map, sig_y, cell->type == ID($_AOI4_) ? G(AOI4) : G(OAI4), mapped_a, mapped_b, mapped_c, mapped_d);
 
 		module->remove(cell);
 		return;
@@ -493,7 +494,13 @@ void AbcModuleState::dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edg
 	fprintf(f, "}\n");
 }
 
-void AbcModuleState::handle_loops(RTLIL::Module *module)
+void connect(SigMap &assign_map, RTLIL::Module *module, const RTLIL::SigSig &conn)
+{
+	module->connect(conn);
+	assign_map.add(conn.first, conn.second);
+}
+
+void AbcModuleState::handle_loops(SigMap &assign_map, RTLIL::Module *module)
 {
 	// http://en.wikipedia.org/wiki/Topological_sorting
 	// (Kahn, Arthur B. (1962), "Topological sorting of large networks")
@@ -598,7 +605,7 @@ void AbcModuleState::handle_loops(RTLIL::Module *module)
 				first_line = false;
 			}
 
-			int id3 = map_signal(RTLIL::SigSpec(wire));
+			int id3 = map_signal(assign_map, RTLIL::SigSpec(wire));
 			signal_list[id1].is_port = true;
 			signal_list[id3].is_port = true;
 			log_assert(id3 == int(in_edges_count.size()));
@@ -617,7 +624,7 @@ void AbcModuleState::handle_loops(RTLIL::Module *module)
 			}
 			edges[id1].swap(edges[id3]);
 
-			module->connect(RTLIL::SigSig(signal_list[id3].bit, signal_list[id1].bit));
+			connect(assign_map, module, RTLIL::SigSig(signal_list[id3].bit, signal_list[id1].bit));
 			dump_loop_graph(dot_f, dot_nr, edges, workpool, in_edges_count);
 		}
 	}
@@ -753,7 +760,7 @@ struct abc_output_filter
 	}
 };
 
-void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, const std::vector<RTLIL::Cell*> &cells,
+void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, SigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
 	bool dff_mode, std::string clk_str)
 {
 	initvals.set(&assign_map, module);
@@ -939,33 +946,33 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, co
 
 	had_init = false;
 	for (auto c : cells)
-		extract_cell(module, c, config.keepff);
+		extract_cell(assign_map, module, c, config.keepff);
 
 	if (undef_bits_lost)
 		log("Replacing %d occurrences of constant undef bits with constant zero bits\n", undef_bits_lost);
 
 	for (auto wire : module->wires()) {
 		if (wire->port_id > 0 || wire->get_bool_attribute(ID::keep))
-			mark_port(wire);
+			mark_port(assign_map, wire);
 	}
 
 	for (auto cell : module->cells())
 		for (auto &port_it : cell->connections())
-			mark_port(port_it.second);
+			mark_port(assign_map, port_it.second);
 
 	if (clk_sig.size() != 0)
-		mark_port(clk_sig);
+		mark_port(assign_map, clk_sig);
 
 	if (en_sig.size() != 0)
-		mark_port(en_sig);
+		mark_port(assign_map, en_sig);
 
 	if (arst_sig.size() != 0)
-		mark_port(arst_sig);
+		mark_port(assign_map, arst_sig);
 
 	if (srst_sig.size() != 0)
-		mark_port(srst_sig);
+		mark_port(assign_map, srst_sig);
 
-	handle_loops(module);
+	handle_loops(assign_map, module);
 
 	buffer = stringf("%s/input.blif", tempdir_name.c_str());
 	f = fopen(buffer.c_str(), "wt");
@@ -1208,7 +1215,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, co
 	log("Don't call ABC as there is nothing to map.\n");
 }
 
-void AbcModuleState::extract(RTLIL::Design *design, RTLIL::Module *module)
+void AbcModuleState::extract(SigMap &assign_map, RTLIL::Design *design, RTLIL::Module *module)
 {
 	if (!did_run_abc) {
 		return;
@@ -1253,7 +1260,7 @@ void AbcModuleState::extract(RTLIL::Design *design, RTLIL::Module *module)
 				RTLIL::IdString name_y = remap_name(c->getPort(ID::Y).as_wire()->name);
 				conn.first = module->wire(name_y);
 				conn.second = RTLIL::SigSpec(c->type == ID(ZERO) ? 0 : 1, 1);
-				module->connect(conn);
+				connect(assign_map, module, conn);
 				continue;
 			}
 			if (c->type == ID(BUF)) {
@@ -1262,7 +1269,7 @@ void AbcModuleState::extract(RTLIL::Design *design, RTLIL::Module *module)
 				RTLIL::IdString name_a = remap_name(c->getPort(ID::A).as_wire()->name);
 				conn.first = module->wire(name_y);
 				conn.second = module->wire(name_a);
-				module->connect(conn);
+				connect(assign_map, module, conn);
 				continue;
 			}
 			if (c->type == ID(NOT)) {
@@ -1394,7 +1401,7 @@ void AbcModuleState::extract(RTLIL::Design *design, RTLIL::Module *module)
 			RTLIL::SigSig conn;
 			conn.first = module->wire(remap_name(c->connections().begin()->second.as_wire()->name));
 			conn.second = RTLIL::SigSpec(c->type == ID(_const0_) ? 0 : 1, 1);
-			module->connect(conn);
+			connect(assign_map, module, conn);
 			continue;
 		}
 
@@ -1439,7 +1446,7 @@ void AbcModuleState::extract(RTLIL::Design *design, RTLIL::Module *module)
 		if (c->type == ID($lut) && GetSize(c->getPort(ID::A)) == 1 && c->getParam(ID::LUT).as_int() == 2) {
 			SigSpec my_a = module->wire(remap_name(c->getPort(ID::A).as_wire()->name));
 			SigSpec my_y = module->wire(remap_name(c->getPort(ID::Y).as_wire()->name));
-			module->connect(my_y, my_a);
+			connect(assign_map, module, RTLIL::SigSig(my_a, my_y));
 			continue;
 		}
 
@@ -1464,7 +1471,7 @@ void AbcModuleState::extract(RTLIL::Design *design, RTLIL::Module *module)
 			conn.first = module->wire(remap_name(conn.first.as_wire()->name));
 		if (!conn.second.is_fully_const())
 			conn.second = module->wire(remap_name(conn.second.as_wire()->name));
-		module->connect(conn);
+		connect(assign_map, module, conn);
 	}
 
 	cell_stats.sort();
@@ -1485,7 +1492,7 @@ void AbcModuleState::extract(RTLIL::Design *design, RTLIL::Module *module)
 				conn.second = si.bit;
 				in_wires++;
 			}
-			module->connect(conn);
+			connect(assign_map, module, conn);
 		}
 	log("ABC RESULTS:        internal signals: %8d\n", int(signal_list.size()) - in_wires - out_wires);
 	log("ABC RESULTS:           input signals: %8d\n", in_wires);
@@ -2079,6 +2086,9 @@ struct AbcPass : public Pass {
 
 		for (auto mod : design->selected_modules())
 		{
+			SigMap assign_map;
+			assign_map.set(mod);
+
 			if (mod->processes.size() > 0) {
 				log("Skipping module %s as it contains processes.\n", log_id(mod));
 				continue;
@@ -2086,9 +2096,8 @@ struct AbcPass : public Pass {
 
 			if (!dff_mode || !clk_str.empty()) {
 				AbcModuleState state(config);
-				state.assign_map.set(mod);
-				state.abc_module(design, mod, mod->selected_cells(), dff_mode, clk_str);
-				state.extract(design, mod);
+				state.abc_module(design, mod, assign_map, mod->selected_cells(), dff_mode, clk_str);
+				state.extract(assign_map, design, mod);
 				state.finish();
 				continue;
 			}
@@ -2109,8 +2118,6 @@ struct AbcPass : public Pass {
 			dict<RTLIL::Cell*, pool<RTLIL::SigBit>> cell_to_bit, cell_to_bit_up, cell_to_bit_down;
 			dict<RTLIL::SigBit, pool<RTLIL::Cell*>> bit_to_cell, bit_to_cell_up, bit_to_cell_down;
 
-			SigMap assign_map;
-			assign_map.set(mod);
 			FfInitVals initvals;
 			initvals.set(&assign_map, mod);
 			for (auto cell : all_cells)
@@ -2247,7 +2254,6 @@ struct AbcPass : public Pass {
 
 			for (auto &it : assigned_cells) {
 				AbcModuleState state(config);
-				state.assign_map.set(mod);
 				state.clk_polarity = std::get<0>(it.first);
 				state.clk_sig = assign_map(std::get<1>(it.first));
 				state.en_polarity = std::get<2>(it.first);
@@ -2256,8 +2262,8 @@ struct AbcPass : public Pass {
 				state.arst_sig = assign_map(std::get<5>(it.first));
 				state.srst_polarity = std::get<6>(it.first);
 				state.srst_sig = assign_map(std::get<7>(it.first));
-				state.abc_module(design, mod, it.second, !state.clk_sig.empty(), "$");
-				state.extract(design, mod);
+				state.abc_module(design, mod, assign_map, it.second, !state.clk_sig.empty(), "$");
+				state.extract(assign_map, design, mod);
 				state.finish();
 			}
 		}

From 2654bd53553b3502cd65f5e0fb0a6566fe1584be Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Sun, 27 Jul 2025 23:44:41 +0000
Subject: [PATCH 385/931] Compute `is_port` in AbcPass without iterating
 through all cells and wires in the module every time we run ABC.

This does not scale when we run ABC thousands of times in a single AbcPass.
---
 kernel/ffinit.h       |   6 +-
 kernel/ffmerge.h      |   2 +-
 kernel/hashlib.h      |   3 +-
 kernel/sigtools.h     | 172 +++++++++++++++++++++++++++++++++---------
 passes/techmap/abc.cc | 172 +++++++++++++++++++++++++++++-------------
 5 files changed, 264 insertions(+), 91 deletions(-)

diff --git a/kernel/ffinit.h b/kernel/ffinit.h
index 6d4c97ac3..66c13b68f 100644
--- a/kernel/ffinit.h
+++ b/kernel/ffinit.h
@@ -27,10 +27,10 @@ YOSYS_NAMESPACE_BEGIN
 
 struct FfInitVals
 {
-	const SigMap *sigmap;
+	const SigMapView *sigmap;
 	dict<SigBit, std::pair<State,SigBit>> initbits;
 
-	void set(const SigMap *sigmap_, RTLIL::Module *module)
+	void set(const SigMapView *sigmap_, RTLIL::Module *module)
 	{
 		sigmap = sigmap_;
 		initbits.clear();
@@ -126,7 +126,7 @@ struct FfInitVals
 		initbits.clear();
 	}
 
-	FfInitVals (const SigMap *sigmap, RTLIL::Module *module)
+	FfInitVals (const SigMapView *sigmap, RTLIL::Module *module)
 	{
 		set(sigmap, module);
 	}
diff --git a/kernel/ffmerge.h b/kernel/ffmerge.h
index 5428da324..028987503 100644
--- a/kernel/ffmerge.h
+++ b/kernel/ffmerge.h
@@ -58,7 +58,7 @@ YOSYS_NAMESPACE_BEGIN
 
 struct FfMergeHelper
 {
-	const SigMap *sigmap;
+	const SigMapView *sigmap;
 	RTLIL::Module *module;
 	FfInitVals *initvals;
 
diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index 52ff96028..7a5650fa3 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -1353,7 +1353,8 @@ public:
 		return p;
 	}
 
-	// Merge sets if the given indices belong to different sets
+	// Merge sets if the given indices belong to different sets.
+	// Makes ifind(j) the root of the merged set.
 	void imerge(int i, int j)
 	{
 		i = ifind(i);
diff --git a/kernel/sigtools.h b/kernel/sigtools.h
index 3b0d7b40d..7962eaa70 100644
--- a/kernel/sigtools.h
+++ b/kernel/sigtools.h
@@ -237,6 +237,42 @@ using sort_by_name_id_guard = typename std::enable_if<std::is_same<T,RTLIL::Cell
 template<typename T>
 class SigSet<T, sort_by_name_id_guard<T>> : public SigSet<T, RTLIL::sort_by_name_id<typename std::remove_pointer<T>::type>> {};
 
+struct SigMapView
+{
+	mfp<SigBit> database;
+
+	// Modify bit to its representative
+	void apply(RTLIL::SigBit &bit) const
+	{
+		bit = database.find(bit);
+	}
+
+	void apply(RTLIL::SigSpec &sig) const
+	{
+		for (auto &bit : sig)
+			apply(bit);
+	}
+
+	RTLIL::SigBit operator()(RTLIL::SigBit bit) const
+	{
+		apply(bit);
+		return bit;
+	}
+
+	RTLIL::SigSpec operator()(RTLIL::SigSpec sig) const
+	{
+		apply(sig);
+		return sig;
+	}
+
+	RTLIL::SigSpec operator()(RTLIL::Wire *wire) const
+	{
+		SigSpec sig(wire);
+		apply(sig);
+		return sig;
+	}
+};
+
 /**
  * SigMap wraps a union-find "database"
  * to map SigBits of a module to canonical representative SigBits.
@@ -244,10 +280,8 @@ class SigSet<T, sort_by_name_id_guard<T>> : public SigSet<T, RTLIL::sort_by_name
  * If a SigBit has a const state (impl: bit.wire is nullptr),
  * it's promoted to a representative.
  */
-struct SigMap
+struct SigMap final : public SigMapView
 {
-	mfp<SigBit> database;
-
 	SigMap(RTLIL::Module *module = NULL)
 	{
 		if (module != NULL)
@@ -320,37 +354,6 @@ struct SigMap
 
 	inline void add(Wire *wire) { return add(RTLIL::SigSpec(wire)); }
 
-	// Modify bit to its representative
-	void apply(RTLIL::SigBit &bit) const
-	{
-		bit = database.find(bit);
-	}
-
-	void apply(RTLIL::SigSpec &sig) const
-	{
-		for (auto &bit : sig)
-			apply(bit);
-	}
-
-	RTLIL::SigBit operator()(RTLIL::SigBit bit) const
-	{
-		apply(bit);
-		return bit;
-	}
-
-	RTLIL::SigSpec operator()(RTLIL::SigSpec sig) const
-	{
-		apply(sig);
-		return sig;
-	}
-
-	RTLIL::SigSpec operator()(RTLIL::Wire *wire) const
-	{
-		SigSpec sig(wire);
-		apply(sig);
-		return sig;
-	}
-
 	// All non-const bits
 	RTLIL::SigSpec allbits() const
 	{
@@ -362,6 +365,107 @@ struct SigMap
 	}
 };
 
+/**
+ * SiValgMap wraps a union-find "database" to map SigBits of a module to
+ * canonical representative SigBits plus some optional Val value associated with the bits.
+ * Val has a commutative, associative, idempotent operator|=, a default constructor
+ * which constructs an identity element, and a copy constructor.
+ * SigBits that are connected share a set in the underlying database;
+ * the associated value is the "sum" of all the values associated with the contributing bits.
+ * If any of the SigBits in a set are a constant, the canonical SigBit is a constant.
+ */
+template <class Val>
+struct SigValMap final : public SigMapView
+{
+	dict<SigBit, Val> values;
+
+	void swap(SigValMap<Val> &other)
+	{
+		database.swap(other.database);
+		values.swap(other.values);
+	}
+
+	void clear()
+	{
+		database.clear();
+		values.clear();
+	}
+
+	// Rebuild SigMap for all connections in module
+	void set(RTLIL::Module *module)
+	{
+		int bitcount = 0;
+		for (auto &it : module->connections())
+			bitcount += it.first.size();
+
+		database.clear();
+		values.clear();
+		database.reserve(bitcount);
+
+		for (auto &it : module->connections())
+			add(it.first, it.second);
+	}
+
+	// Add connections from "from" to "to", bit-by-bit.
+	void add(const RTLIL::SigSpec& from, const RTLIL::SigSpec& to)
+	{
+		log_assert(GetSize(from) == GetSize(to));
+
+		for (int i = 0; i < GetSize(from); i++)
+		{
+			int bfi = database.lookup(from[i]);
+			int bti = database.lookup(to[i]);
+			if (bfi == bti) {
+				continue;
+			}
+
+			const RTLIL::SigBit &bf = database[bfi];
+			const RTLIL::SigBit &bt = database[bti];
+			if (bf.wire == nullptr) {
+				// bf is constant so make it the canonical representative.
+				database.imerge(bti, bfi);
+				merge_value(bt, bf);
+			} else {
+				// Make bt the canonical representative.
+				database.imerge(bfi, bti);
+				merge_value(bf, bt);
+			}
+		}
+	}
+
+	void addVal(const RTLIL::SigBit &bit, const Val &val)
+	{
+		values[database.find(bit)] |= val;
+	}
+
+	void addVal(const RTLIL::SigSpec &sig, const Val &val)
+	{
+		for (const auto &bit : sig)
+			addVal(bit, val);
+	}
+
+	Val apply_and_get_value(RTLIL::SigBit &bit) const
+	{
+		bit = database.find(bit);
+		auto it = values.find(bit);
+		return it == values.end() ? Val() : it->second;
+	}
+
+private:
+	void merge_value(const RTLIL::SigBit &from, const RTLIL::SigBit &to)
+	{
+		auto it = values.find(from);
+		if (it == values.end()) {
+			return;
+		}
+		// values[to] could resize the underlying `entries` so
+		// finish using `it` first.
+		Val v = it->second;
+		values.erase(it);
+		values[to] |= v;
+	}
+};
+
 YOSYS_NAMESPACE_END
 
 #endif /* SIGTOOLS_H */
diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 75f19f77b..f3d53d042 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -138,6 +138,18 @@ struct AbcConfig
 	bool abc_dress = false;
 };
 
+struct AbcSigVal {
+	bool is_port;
+
+	AbcSigVal(bool is_port = false) : is_port(is_port) {}
+	AbcSigVal &operator|=(const AbcSigVal &other) {
+		is_port |= other.is_port;
+		return *this;
+	}
+};
+
+using AbcSigMap = SigValMap<AbcSigVal>;
+
 struct AbcModuleState {
 	const AbcConfig &config;
 
@@ -161,21 +173,21 @@ struct AbcModuleState {
 
 	AbcModuleState(const AbcConfig &config) : config(config) {}
 
-	int map_signal(const SigMap &assign_map, RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1);
-	void mark_port(const SigMap &assign_map, RTLIL::SigSpec sig);
-	void extract_cell(const SigMap &assign_map, RTLIL::Module *module, RTLIL::Cell *cell, bool keepff);
+	int map_signal(const AbcSigMap &assign_map, RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1);
+	void mark_port(const AbcSigMap &assign_map, RTLIL::SigSpec sig);
+	bool extract_cell(const AbcSigMap &assign_map, RTLIL::Module *module, RTLIL::Cell *cell, bool keepff);
 	std::string remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire = nullptr);
 	void dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edges, pool<int> &workpool, std::vector<int> &in_counts);
-	void handle_loops(SigMap &assign_map, RTLIL::Module *module);
-	void abc_module(RTLIL::Design *design, RTLIL::Module *module, SigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
+	void handle_loops(AbcSigMap &assign_map, RTLIL::Module *module);
+	void abc_module(RTLIL::Design *design, RTLIL::Module *module, AbcSigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
 		bool dff_mode, std::string clk_str);
-	void extract(SigMap &assign_map, RTLIL::Design *design, RTLIL::Module *module);
+	void extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL::Module *module);
 	void finish();
 };
 
-int AbcModuleState::map_signal(const SigMap &assign_map, RTLIL::SigBit bit, gate_type_t gate_type, int in1, int in2, int in3, int in4)
+int AbcModuleState::map_signal(const AbcSigMap &assign_map, RTLIL::SigBit bit, gate_type_t gate_type, int in1, int in2, int in3, int in4)
 {
-	assign_map.apply(bit);
+	AbcSigVal val = assign_map.apply_and_get_value(bit);
 
 	if (bit == State::Sx)
 		undef_bits_lost++;
@@ -188,7 +200,7 @@ int AbcModuleState::map_signal(const SigMap &assign_map, RTLIL::SigBit bit, gate
 		gate.in2 = -1;
 		gate.in3 = -1;
 		gate.in4 = -1;
-		gate.is_port = false;
+		gate.is_port = bit.wire != nullptr && val.is_port;
 		gate.bit = bit;
 		gate.init = initvals(bit);
 		signal_list.push_back(gate);
@@ -211,40 +223,40 @@ int AbcModuleState::map_signal(const SigMap &assign_map, RTLIL::SigBit bit, gate
 	return gate.id;
 }
 
-void AbcModuleState::mark_port(const SigMap &assign_map, RTLIL::SigSpec sig)
+void AbcModuleState::mark_port(const AbcSigMap &assign_map, RTLIL::SigSpec sig)
 {
 	for (auto &bit : assign_map(sig))
 		if (bit.wire != nullptr && signal_map.count(bit) > 0)
 			signal_list[signal_map[bit]].is_port = true;
 }
 
-void AbcModuleState::extract_cell(const SigMap &assign_map, RTLIL::Module *module, RTLIL::Cell *cell, bool keepff)
+bool AbcModuleState::extract_cell(const AbcSigMap &assign_map, RTLIL::Module *module, RTLIL::Cell *cell, bool keepff)
 {
 	if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
 		FfData ff(&initvals, cell);
 		gate_type_t type = G(FF);
 		if (!ff.has_clk)
-			return;
+			return false;
 		if (ff.has_gclk)
-			return;
+			return false;
 		if (ff.has_aload)
-			return;
+			return false;
 		if (ff.has_sr)
-			return;
+			return false;
 		if (!ff.is_fine)
-			return;
+			return false;
 		if (clk_polarity != ff.pol_clk)
-			return;
+			return false;
 		if (clk_sig != assign_map(ff.sig_clk))
-			return;
+			return false;
 		if (ff.has_ce) {
 			if (en_polarity != ff.pol_ce)
-				return;
+				return false;
 			if (en_sig != assign_map(ff.sig_ce))
-				return;
+				return false;
 		} else {
 			if (GetSize(en_sig) != 0)
-				return;
+				return false;
 		}
 		if (ff.val_init == State::S1) {
 			type = G(FF1);
@@ -255,39 +267,39 @@ void AbcModuleState::extract_cell(const SigMap &assign_map, RTLIL::Module *modul
 		}
 		if (ff.has_arst) {
 			if (arst_polarity != ff.pol_arst)
-				return;
+				return false;
 			if (arst_sig != assign_map(ff.sig_arst))
-				return;
+				return false;
 			if (ff.val_arst == State::S1) {
 				if (type == G(FF0))
-					return;
+					return false;
 				type = G(FF1);
 			} else if (ff.val_arst == State::S0) {
 				if (type == G(FF1))
-					return;
+					return false;
 				type = G(FF0);
 			}
 		} else {
 			if (GetSize(arst_sig) != 0)
-				return;
+				return false;
 		}
 		if (ff.has_srst) {
 			if (srst_polarity != ff.pol_srst)
-				return;
+				return false;
 			if (srst_sig != assign_map(ff.sig_srst))
-				return;
+				return false;
 			if (ff.val_srst == State::S1) {
 				if (type == G(FF0))
-					return;
+					return false;
 				type = G(FF1);
 			} else if (ff.val_srst == State::S0) {
 				if (type == G(FF1))
-					return;
+					return false;
 				type = G(FF0);
 			}
 		} else {
 			if (GetSize(srst_sig) != 0)
-				return;
+				return false;
 		}
 
 		int gate_id = map_signal(assign_map, ff.sig_q, type, map_signal(assign_map, ff.sig_d));
@@ -303,7 +315,7 @@ void AbcModuleState::extract_cell(const SigMap &assign_map, RTLIL::Module *modul
 		map_signal(assign_map, ff.sig_q, type, map_signal(assign_map, ff.sig_d));
 
 		ff.remove();
-		return;
+		return true;
 	}
 
 	if (cell->type.in(ID($_BUF_), ID($_NOT_)))
@@ -317,7 +329,7 @@ void AbcModuleState::extract_cell(const SigMap &assign_map, RTLIL::Module *modul
 		map_signal(assign_map, sig_y, cell->type == ID($_BUF_) ? G(BUF) : G(NOT), map_signal(assign_map, sig_a));
 
 		module->remove(cell);
-		return;
+		return true;
 	}
 
 	if (cell->type.in(ID($_AND_), ID($_NAND_), ID($_OR_), ID($_NOR_), ID($_XOR_), ID($_XNOR_), ID($_ANDNOT_), ID($_ORNOT_)))
@@ -353,7 +365,7 @@ void AbcModuleState::extract_cell(const SigMap &assign_map, RTLIL::Module *modul
 			log_abort();
 
 		module->remove(cell);
-		return;
+		return true;
 	}
 
 	if (cell->type.in(ID($_MUX_), ID($_NMUX_)))
@@ -375,7 +387,7 @@ void AbcModuleState::extract_cell(const SigMap &assign_map, RTLIL::Module *modul
 		map_signal(assign_map, sig_y, cell->type == ID($_MUX_) ? G(MUX) : G(NMUX), mapped_a, mapped_b, mapped_s);
 
 		module->remove(cell);
-		return;
+		return true;
 	}
 
 	if (cell->type.in(ID($_AOI3_), ID($_OAI3_)))
@@ -397,7 +409,7 @@ void AbcModuleState::extract_cell(const SigMap &assign_map, RTLIL::Module *modul
 		map_signal(assign_map, sig_y, cell->type == ID($_AOI3_) ? G(AOI3) : G(OAI3), mapped_a, mapped_b, mapped_c);
 
 		module->remove(cell);
-		return;
+		return true;
 	}
 
 	if (cell->type.in(ID($_AOI4_), ID($_OAI4_)))
@@ -422,8 +434,10 @@ void AbcModuleState::extract_cell(const SigMap &assign_map, RTLIL::Module *modul
 		map_signal(assign_map, sig_y, cell->type == ID($_AOI4_) ? G(AOI4) : G(OAI4), mapped_a, mapped_b, mapped_c, mapped_d);
 
 		module->remove(cell);
-		return;
+		return true;
 	}
+
+	return false;
 }
 
 std::string AbcModuleState::remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire)
@@ -494,13 +508,13 @@ void AbcModuleState::dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edg
 	fprintf(f, "}\n");
 }
 
-void connect(SigMap &assign_map, RTLIL::Module *module, const RTLIL::SigSig &conn)
+void connect(AbcSigMap &assign_map, RTLIL::Module *module, const RTLIL::SigSig &conn)
 {
 	module->connect(conn);
 	assign_map.add(conn.first, conn.second);
 }
 
-void AbcModuleState::handle_loops(SigMap &assign_map, RTLIL::Module *module)
+void AbcModuleState::handle_loops(AbcSigMap &assign_map, RTLIL::Module *module)
 {
 	// http://en.wikipedia.org/wiki/Topological_sorting
 	// (Kahn, Arthur B. (1962), "Topological sorting of large networks")
@@ -760,7 +774,7 @@ struct abc_output_filter
 	}
 };
 
-void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, SigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
+void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, AbcSigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
 	bool dff_mode, std::string clk_str)
 {
 	initvals.set(&assign_map, module);
@@ -945,18 +959,18 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Si
 	undef_bits_lost = 0;
 
 	had_init = false;
+	std::vector<RTLIL::Cell *> kept_cells;
 	for (auto c : cells)
-		extract_cell(assign_map, module, c, config.keepff);
+		if (!extract_cell(assign_map, module, c, config.keepff))
+			kept_cells.push_back(c);
 
 	if (undef_bits_lost)
 		log("Replacing %d occurrences of constant undef bits with constant zero bits\n", undef_bits_lost);
 
-	for (auto wire : module->wires()) {
-		if (wire->port_id > 0 || wire->get_bool_attribute(ID::keep))
-			mark_port(assign_map, wire);
-	}
-
-	for (auto cell : module->cells())
+	// Wires with port_id > 0, ID::keep, and connections to cells outside our cell set have already
+	// been accounted for via AbcSigVal::is_port. Now we just need to account for
+	// connections to cells inside our cell set that weren't removed by extract_cell().
+	for (auto cell : kept_cells)
 		for (auto &port_it : cell->connections())
 			mark_port(assign_map, port_it.second);
 
@@ -1215,7 +1229,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Si
 	log("Don't call ABC as there is nothing to map.\n");
 }
 
-void AbcModuleState::extract(SigMap &assign_map, RTLIL::Design *design, RTLIL::Module *module)
+void AbcModuleState::extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL::Module *module)
 {
 	if (!did_run_abc) {
 		return;
@@ -1512,6 +1526,47 @@ void AbcModuleState::finish()
 	log_pop();
 }
 
+// For every signal that connects cells from different sets, or a cell in a set to a cell not in any set,
+// mark it as a port in `assign_map`.
+void assign_cell_connection_ports(RTLIL::Module *module, const std::vector<std::vector<RTLIL::Cell *> *> &cell_sets,
+	AbcSigMap &assign_map)
+{
+	pool<RTLIL::Cell *> cells_in_no_set;
+	for (RTLIL::Cell *cell : module->cells()) {
+		cells_in_no_set.insert(cell);
+	}
+	// For every canonical signal in `assign_map`, the index of the set it is connected to,
+	// or -1 if it connects a cell in one set to a cell in another set or not in any set.
+	dict<SigBit, int> signal_cell_set;
+	for (int i = 0; i < int(cell_sets.size()); ++i) {
+		for (RTLIL::Cell *cell : *cell_sets[i]) {
+			cells_in_no_set.erase(cell);
+			for (auto &port_it : cell->connections()) {
+				for (SigBit bit : port_it.second) {
+					assign_map.apply(bit);
+					auto it = signal_cell_set.find(bit);
+					if (it == signal_cell_set.end())
+						signal_cell_set[bit] = i;
+					else if (it->second >= 0 && it->second != i) {
+						it->second = -1;
+						assign_map.addVal(bit, AbcSigVal(true));
+					}
+				}
+			}
+		}
+	}
+	for (RTLIL::Cell *cell : cells_in_no_set) {
+		for (auto &port_it : cell->connections()) {
+			for (SigBit bit : port_it.second) {
+				assign_map.apply(bit);
+				auto it = signal_cell_set.find(bit);
+				if (it != signal_cell_set.end() && it->second >= 0)
+					assign_map.addVal(bit, AbcSigVal(true));
+			}
+		}
+	}
+}
+
 struct AbcPass : public Pass {
 	AbcPass() : Pass("abc", "use ABC for technology mapping") { }
 	void help() override
@@ -2086,17 +2141,24 @@ struct AbcPass : public Pass {
 
 		for (auto mod : design->selected_modules())
 		{
-			SigMap assign_map;
-			assign_map.set(mod);
-
 			if (mod->processes.size() > 0) {
 				log("Skipping module %s as it contains processes.\n", log_id(mod));
 				continue;
 			}
 
+			AbcSigMap assign_map;
+			assign_map.set(mod);
+
+			for (auto wire : mod->wires())
+				if (wire->port_id > 0 || wire->get_bool_attribute(ID::keep))
+					assign_map.addVal(SigSpec(wire), AbcSigVal(true));
+
 			if (!dff_mode || !clk_str.empty()) {
+				std::vector<RTLIL::Cell*> cells = mod->selected_cells();
+				assign_cell_connection_ports(mod, {&cells}, assign_map);
+
 				AbcModuleState state(config);
-				state.abc_module(design, mod, assign_map, mod->selected_cells(), dff_mode, clk_str);
+				state.abc_module(design, mod, assign_map, cells, dff_mode, clk_str);
 				state.extract(assign_map, design, mod);
 				state.finish();
 				continue;
@@ -2252,6 +2314,12 @@ struct AbcPass : public Pass {
 						std::get<4>(it.first) ? "" : "!", log_signal(std::get<5>(it.first)),
 						std::get<6>(it.first) ? "" : "!", log_signal(std::get<7>(it.first)));
 
+			{
+				std::vector<std::vector<RTLIL::Cell*>*> cell_sets;
+				for (auto &it : assigned_cells)
+					cell_sets.push_back(&it.second);
+				assign_cell_connection_ports(mod, cell_sets, assign_map);
+			}
 			for (auto &it : assigned_cells) {
 				AbcModuleState state(config);
 				state.clk_polarity = std::get<0>(it.first);

From 62c441107dfdf7eac04ebbdc74d5693da69988a9 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 5 Aug 2025 22:21:30 +0000
Subject: [PATCH 386/931] Build FfInitVals for the entire module once and use
 it for every ABC run.

---
 passes/techmap/abc.cc | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index f3d53d042..9aaac84e9 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -156,7 +156,7 @@ struct AbcModuleState {
 	int map_autoidx = 0;
 	std::vector<gate_t> signal_list;
 	dict<RTLIL::SigBit, int> signal_map;
-	FfInitVals initvals;
+	FfInitVals &initvals;
 	bool had_init = false;
 	bool did_run_abc = false;
 
@@ -171,7 +171,8 @@ struct AbcModuleState {
 
 	std::string tempdir_name;
 
-	AbcModuleState(const AbcConfig &config) : config(config) {}
+	AbcModuleState(const AbcConfig &config, FfInitVals &initvals)
+		: config(config), initvals(initvals) {}
 
 	int map_signal(const AbcSigMap &assign_map, RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1);
 	void mark_port(const AbcSigMap &assign_map, RTLIL::SigSpec sig);
@@ -777,7 +778,6 @@ struct abc_output_filter
 void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, AbcSigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
 	bool dff_mode, std::string clk_str)
 {
-	initvals.set(&assign_map, module);
 	map_autoidx = autoidx++;
 
 	if (clk_str != "$")
@@ -2148,6 +2148,11 @@ struct AbcPass : public Pass {
 
 			AbcSigMap assign_map;
 			assign_map.set(mod);
+			// Create an FfInitVals and use it for all ABC runs. FfInitVals only cares about
+			// wires with the ID::init attribute and we don't add or remove any such wires
+			// in this pass.
+			FfInitVals initvals;
+			initvals.set(&assign_map, mod);
 
 			for (auto wire : mod->wires())
 				if (wire->port_id > 0 || wire->get_bool_attribute(ID::keep))
@@ -2157,7 +2162,7 @@ struct AbcPass : public Pass {
 				std::vector<RTLIL::Cell*> cells = mod->selected_cells();
 				assign_cell_connection_ports(mod, {&cells}, assign_map);
 
-				AbcModuleState state(config);
+				AbcModuleState state(config, initvals);
 				state.abc_module(design, mod, assign_map, cells, dff_mode, clk_str);
 				state.extract(assign_map, design, mod);
 				state.finish();
@@ -2180,8 +2185,6 @@ struct AbcPass : public Pass {
 			dict<RTLIL::Cell*, pool<RTLIL::SigBit>> cell_to_bit, cell_to_bit_up, cell_to_bit_down;
 			dict<RTLIL::SigBit, pool<RTLIL::Cell*>> bit_to_cell, bit_to_cell_up, bit_to_cell_down;
 
-			FfInitVals initvals;
-			initvals.set(&assign_map, mod);
 			for (auto cell : all_cells)
 			{
 				clkdomain_t key;
@@ -2321,7 +2324,7 @@ struct AbcPass : public Pass {
 				assign_cell_connection_ports(mod, cell_sets, assign_map);
 			}
 			for (auto &it : assigned_cells) {
-				AbcModuleState state(config);
+				AbcModuleState state(config, initvals);
 				state.clk_polarity = std::get<0>(it.first);
 				state.clk_sig = assign_map(std::get<1>(it.first));
 				state.en_polarity = std::get<2>(it.first);

From ec18d1aede7cfcc6415e19be635a86bc09c88c4f Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 15 Aug 2025 10:48:32 +1200
Subject: [PATCH 387/931] rename.cc: Fixup ports after -unescape

---
 passes/cmds/rename.cc            |  2 ++
 tests/various/rename_unescape.ys | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/passes/cmds/rename.cc b/passes/cmds/rename.cc
index 7e3f87147..167997dc0 100644
--- a/passes/cmds/rename.cc
+++ b/passes/cmds/rename.cc
@@ -598,6 +598,8 @@ struct RenamePass : public Pass {
 
 				for (auto &it : new_cell_names)
 					module->rename(it.first, it.second);
+
+				module->fixup_ports();
 			}
 		}
 		else
diff --git a/tests/various/rename_unescape.ys b/tests/various/rename_unescape.ys
index 546d97357..2bb5286cc 100644
--- a/tests/various/rename_unescape.ys
+++ b/tests/various/rename_unescape.ys
@@ -39,3 +39,18 @@ select -assert-count 1 w:d__1
 select -assert-count 1 w:_e
 select -assert-count 1 w:wire_
 select -assert-count 1 w:$add$<<EOF:*$1_Y
+
+# Ports are updated during rename
+design -reset
+read_verilog << EOT
+module top(output \$e );
+submod \a$ (\$e );
+endmodule
+
+module submod(output \a[0] );
+    assign \a[0] = 0;
+endmodule
+EOT
+
+rename -unescape
+check

From dd88423334a48b27423a1064c9d7dfb1500be5e2 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Wed, 13 Aug 2025 21:22:45 +0000
Subject: [PATCH 388/931] Make OptMuxtree int-indexed vectors into hashtables

For one of our large circuits, this reduced the time for an OPT_MUXTREE pass from
169s to 5s.
---
 passes/opt/opt_muxtree.cc | 48 +++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/passes/opt/opt_muxtree.cc b/passes/opt/opt_muxtree.cc
index 100b1b495..e1ed5da08 100644
--- a/passes/opt/opt_muxtree.cc
+++ b/passes/opt/opt_muxtree.cc
@@ -23,6 +23,8 @@
 #include "kernel/celltypes.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <unordered_map>
+#include <unordered_set>
 #include <set>
 
 USING_YOSYS_NAMESPACE
@@ -291,14 +293,14 @@ struct OptMuxtreeWorker
 		// database of known inactive signals
 		// the payload is a reference counter used to manage the
 		// list. when it is non-zero the signal in known to be inactive
-		vector<int> known_inactive;
+		std::unordered_map<int, int> known_inactive;
 
 		// database of known active signals
-		vector<int> known_active;
+		std::unordered_map<int, int> known_active;
 
 		// this is just used to keep track of visited muxes in order to prohibit
 		// endless recursion in mux loops
-		vector<bool> visited_muxes;
+		std::unordered_set<int> visited_muxes;
 	};
 
 	void eval_mux_port(knowledge_t &knowledge, int mux_idx, int port_idx, bool do_replace_known, bool do_enable_ports, int abort_count)
@@ -315,17 +317,18 @@ struct OptMuxtreeWorker
 			if (i == port_idx)
 				continue;
 			if (muxinfo.ports[i].ctrl_sig >= 0)
-				knowledge.known_inactive.at(muxinfo.ports[i].ctrl_sig)++;
+				++knowledge.known_inactive[muxinfo.ports[i].ctrl_sig];
 		}
 
 		if (port_idx < GetSize(muxinfo.ports)-1 && !muxinfo.ports[port_idx].const_activated)
-			knowledge.known_active.at(muxinfo.ports[port_idx].ctrl_sig)++;
+			++knowledge.known_active[muxinfo.ports[port_idx].ctrl_sig];
 
 		vector<int> parent_muxes;
 		for (int m : muxinfo.ports[port_idx].input_muxes) {
-			if (knowledge.visited_muxes[m])
+			auto it = knowledge.visited_muxes.find(m);
+			if (it != knowledge.visited_muxes.end())
 				continue;
-			knowledge.visited_muxes[m] = true;
+			knowledge.visited_muxes.insert(it, m);
 			parent_muxes.push_back(m);
 		}
 		for (int m : parent_muxes) {
@@ -344,16 +347,24 @@ struct OptMuxtreeWorker
 				return;
 		}
 		for (int m : parent_muxes)
-			knowledge.visited_muxes[m] = false;
+			knowledge.visited_muxes.erase(m);
 
-		if (port_idx < GetSize(muxinfo.ports)-1 && !muxinfo.ports[port_idx].const_activated)
-			knowledge.known_active.at(muxinfo.ports[port_idx].ctrl_sig)--;
+		if (port_idx < GetSize(muxinfo.ports)-1 && !muxinfo.ports[port_idx].const_activated) {
+			auto it = knowledge.known_active.find(muxinfo.ports[port_idx].ctrl_sig);
+			if (it != knowledge.known_active.end())
+				if (--it->second == 0)
+					knowledge.known_active.erase(it);
+		}
 
 		for (int i = 0; i < GetSize(muxinfo.ports); i++) {
 			if (i == port_idx)
 				continue;
-			if (muxinfo.ports[i].ctrl_sig >= 0)
-				knowledge.known_inactive.at(muxinfo.ports[i].ctrl_sig)--;
+			if (muxinfo.ports[i].ctrl_sig >= 0) {
+				auto it = knowledge.known_inactive.find(muxinfo.ports[i].ctrl_sig);
+				if (it != knowledge.known_inactive.end())
+					if (--it->second == 0)
+						knowledge.known_inactive.erase(it);
+			}
 		}
 	}
 
@@ -373,11 +384,11 @@ struct OptMuxtreeWorker
 		vector<int> bits = sig2bits(sig, false);
 		for (int i = 0; i < GetSize(bits); i++) {
 			if (bits[i] >= 0) {
-				if (knowledge.known_inactive.at(bits[i])) {
+				if (knowledge.known_inactive.count(bits[i]) > 0) {
 					sig[i] = State::S0;
 					did_something = true;
 				} else
-				if (knowledge.known_active.at(bits[i])) {
+				if (knowledge.known_active.count(bits[i]) > 0) {
 					sig[i] = State::S1;
 					did_something = true;
 				}
@@ -435,7 +446,7 @@ struct OptMuxtreeWorker
 			portinfo_t &portinfo = muxinfo.ports[port_idx];
 			if (portinfo.const_deactivated)
 				continue;
-			if (knowledge.known_active.at(portinfo.ctrl_sig)) {
+			if (knowledge.known_active.count(portinfo.ctrl_sig) > 0) {
 				eval_mux_port(knowledge, mux_idx, port_idx, do_replace_known, do_enable_ports, abort_count);
 				return;
 			}
@@ -449,7 +460,7 @@ struct OptMuxtreeWorker
 			if (portinfo.const_deactivated)
 				continue;
 			if (port_idx < GetSize(muxinfo.ports)-1)
-				if (knowledge.known_inactive.at(portinfo.ctrl_sig))
+				if (knowledge.known_inactive.count(portinfo.ctrl_sig) > 0)
 					continue;
 			eval_mux_port(knowledge, mux_idx, port_idx, do_replace_known, do_enable_ports, abort_count);
 
@@ -462,10 +473,7 @@ struct OptMuxtreeWorker
 	{
 		log_assert(glob_abort_cnt > 0);
 		knowledge_t knowledge;
-		knowledge.known_inactive.resize(GetSize(bit2info));
-		knowledge.known_active.resize(GetSize(bit2info));
-		knowledge.visited_muxes.resize(GetSize(mux2info));
-		knowledge.visited_muxes[mux_idx] = true;
+		knowledge.visited_muxes.insert(mux_idx);
 		eval_mux(knowledge, mux_idx, true, root_enable_muxes.at(mux_idx), 3);
 	}
 };

From bf625951d774d2747fa606f923ba5cf34b935a4a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 15 Aug 2025 00:26:03 +0000
Subject: [PATCH 389/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8ec8715d3..ed9b10d79 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+105
+YOSYS_VER := 0.56+110
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 6d62a1fff72c38c2c7b38b86c75d7b3043a27def Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 15 Aug 2025 05:43:53 +0000
Subject: [PATCH 390/931] Fix vararg alignment

---
 kernel/io.cc | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 78 insertions(+), 2 deletions(-)

diff --git a/kernel/io.cc b/kernel/io.cc
index 9811919ba..ef73a3b3d 100644
--- a/kernel/io.cc
+++ b/kernel/io.cc
@@ -412,6 +412,70 @@ static std::string string_view_stringf(std::string_view spec, ...)
 	return result;
 }
 
+static int spec_parameter_size(std::string_view spec)
+{
+	// Every valid spec starts with '%' which means the code below
+	// won't look before the spec start.
+	switch (spec[spec.size() - 1]) {
+	case 'd':
+	case 'i':
+	case 'o':
+	case 'u':
+	case 'x':
+	case 'X':
+		switch (spec[spec.size() - 2]) {
+		case 'h':
+			if (spec[spec.size() - 3] == 'h')
+				return sizeof(char);
+			return sizeof(short);
+		case 'l':
+			if (spec[spec.size() - 3] == 'l')
+				return sizeof(long long);
+			return sizeof(long);
+		case 'L':
+		case 'q':
+			return sizeof(long long);
+		case 'j':
+			return sizeof(intmax_t);
+		case 'z':
+		case 'Z':
+			return sizeof(size_t);
+		case 't':
+			return sizeof(ptrdiff_t);
+		}
+		return sizeof(int);
+	case 'e':
+	case 'E':
+	case 'f':
+	case 'F':
+	case 'g':
+	case 'G':
+	case 'a':
+	case 'A':
+		if (spec[spec.size() - 2] == 'L')
+			return sizeof(long double);
+		if (spec[spec.size() - 2] == 'l' && spec[spec.size() - 3] == 'l')
+			return sizeof(long double);
+		return sizeof(double);
+	case 'c':
+		if (spec[spec.size() - 2] == 'l') {
+			return sizeof(wchar_t);
+		}
+		return sizeof(unsigned char);
+	case 'C':
+		return sizeof(wchar_t);
+	case 's':
+	case 'p':
+	case 'S':
+	case 'n':
+		return sizeof(void *);
+	case 'm':
+		return sizeof(int);
+	default:
+		return -1;
+	}
+}
+
 template <typename Arg>
 static void format_emit_stringf(std::string &result, std::string_view spec, int *dynamic_ints,
 	DynamicIntCount num_dynamic_ints, Arg arg)
@@ -439,7 +503,13 @@ void format_emit_long_long(std::string &result, std::string_view spec, int *dyna
 		result += std::to_string(static_cast<int>(arg));
 		return;
 	}
-	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg);
+	if (spec_parameter_size(spec) <= 4) {
+		// On some platforms (Wasm) we must ensure that the arg is properly aligned
+		// after the dynamic `int` parameters.
+		format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, (int)arg);
+	} else {
+		format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg);
+	}
 }
 
 void format_emit_unsigned_long_long(std::string &result, std::string_view spec, int *dynamic_ints,
@@ -454,7 +524,13 @@ void format_emit_unsigned_long_long(std::string &result, std::string_view spec,
 		result += static_cast<char>(arg);
 		return;
 	}
-	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg);
+	if (spec_parameter_size(spec) <= 4) {
+                // On some platforms (Wasm) we must ensure that the arg is properly aligned
+                // after the dynamic `int` parameters.
+		format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, (unsigned int)arg);
+	} else {
+		format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg);
+	}
 }
 
 void format_emit_double(std::string &result, std::string_view spec, int *dynamic_ints,

From e906ea3f1ba4e9097bb763d188ba7e15399c7f6c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 15 Aug 2025 23:58:58 +0000
Subject: [PATCH 391/931] Add tests for dynamic precision and with with an int
 parameter

---
 tests/unit/kernel/ioTest.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/unit/kernel/ioTest.cc b/tests/unit/kernel/ioTest.cc
index 7cb8498cb..43a71eb79 100644
--- a/tests/unit/kernel/ioTest.cc
+++ b/tests/unit/kernel/ioTest.cc
@@ -69,4 +69,14 @@ TEST(KernelStringfTest, dynamicWidthAndPrecision)
         EXPECT_EQ(stringf("%*.*f", 8, 4, 1.0), "  1.0000");
 }
 
+TEST(KernelStringfTest, dynamicPrecisionInt)
+{
+        EXPECT_EQ(stringf("%.*d", 4, 7), "0007");
+}
+
+TEST(KernelStringfTest, dynamicWidthAndPrecisionInt)
+{
+        EXPECT_EQ(stringf("%*.*d", 8, 4, 7), "    0007");
+}
+
 YOSYS_NAMESPACE_END

From d10fdc0ec5ee17e5fb5d6e1f12c081fffc719750 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 16 Aug 2025 00:24:02 +0000
Subject: [PATCH 392/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ed9b10d79..e83d32ac2 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+110
+YOSYS_VER := 0.56+125
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From f5b219f59eb02fb0d8a4a9fad731cf0cc96368ab Mon Sep 17 00:00:00 2001
From: suisseWalter <42143099+suisseWalter@users.noreply.github.com>
Date: Sat, 16 Aug 2025 08:36:06 +0200
Subject: [PATCH 393/931] Update passes/cmds/stat.cc

Co-authored-by: KrystalDelusion <93062060+KrystalDelusion@users.noreply.github.com>
---
 passes/cmds/stat.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 5cb223ba8..6d8d3105f 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -413,7 +413,7 @@ struct statdata_t {
 				log(" %8s %8s \n", "|", "|");
 			} else if (print_global_only) {
 				log(" %8s-%8s-%s\n", "+", "--------", "Count including submodules.");
-				log(" %8s %8s \n", "|", "|");
+				log(" %8s \n", "|");
 			} else {
 				log(" %8s-%8s-%s\n", "+", "--------", "Local Count, excluding submodules.");
 				log(" %8s \n", "|");

From a6e0ab5ea5b6938f3ff67e5b36ecdf8797ce852c Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Sat, 16 Aug 2025 09:09:57 +0200
Subject: [PATCH 394/931] Update (sequential) area to be only local without
 -hierarchy

---
 passes/cmds/stat.cc | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 6d8d3105f..c41b8831f 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -461,8 +461,20 @@ struct statdata_t {
 
 		if (area != 0) {
 			log("\n");
-			log("   Chip area for %smodule '%s': %f\n", (top_mod) ? "top " : "", mod_name.c_str(), area);
-			log("     of which used for sequential elements: %f (%.2f%%)\n", sequential_area, 100.0 * sequential_area / area);
+			if (print_hierarchical || print_global_only) {
+				log("   Chip area for %smodule '%s': %f\n", (top_mod) ? "top " : "", mod_name.c_str(), area);
+				log("     of which used for sequential elements: %f (%.2f%%)\n", sequential_area, 100.0 * sequential_area / area);
+			} else {
+				double local_area = 0;
+				for (auto &it : local_area_cells_by_type)
+					local_area += it.second;
+				double local_sequential_area = 0;
+				for (auto &it : local_seq_area_cells_by_type)
+					local_sequential_area += it.second;
+				log("   Chip area for %smodule '%s': %f\n", (top_mod) ? "top " : "", mod_name.c_str(), local_area);
+				log("     of which used for sequential elements: %f (%.2f%%)\n", local_sequential_area,
+				    100.0 * local_sequential_area / local_area);
+			}
 		}
 
 		if (tech == "xilinx") {
@@ -666,9 +678,12 @@ statdata_t hierarchy_builder(const RTLIL::Design *design, const RTLIL::Module *t
 					mod_data.submodule_area += mod_stat.at(cell->type).area;
 					mod_data.num_submodules++;
 					mod_data.unknown_cell_area.erase(cell->type);
-					mod_data.num_cells -= (mod_data.num_cells_by_type.count(cell->type) != 0)?  mod_data.num_cells_by_type.at(cell->type): 0;
+					mod_data.num_cells -=
+					  (mod_data.num_cells_by_type.count(cell->type) != 0) ? mod_data.num_cells_by_type.at(cell->type) : 0;
 					mod_data.num_cells_by_type.erase(cell->type);
-					mod_data.local_num_cells -= (mod_data.local_num_cells_by_type.count(cell->type) != 0)? mod_data.local_num_cells_by_type.at(cell->type): 0;
+					mod_data.local_num_cells -= (mod_data.local_num_cells_by_type.count(cell->type) != 0)
+								      ? mod_data.local_num_cells_by_type.at(cell->type)
+								      : 0;
 					mod_data.local_num_cells_by_type.erase(cell->type);
 					mod_data.local_area_cells_by_type.erase(cell->type);
 				} else {
@@ -681,9 +696,12 @@ statdata_t hierarchy_builder(const RTLIL::Design *design, const RTLIL::Module *t
 						  double(design->module(cell->type)->attributes.at(ID::area).as_int());
 						mod_data.area += double(design->module(cell->type)->attributes.at(ID::area).as_int());
 						mod_data.unknown_cell_area.erase(cell->type);
-						mod_data.num_cells -= (mod_data.num_cells_by_type.count(cell->type) != 0)?  mod_data.num_cells_by_type.at(cell->type): 0;
+						mod_data.num_cells -=
+						  (mod_data.num_cells_by_type.count(cell->type) != 0) ? mod_data.num_cells_by_type.at(cell->type) : 0;
 						mod_data.num_cells_by_type.erase(cell->type);
-						mod_data.local_num_cells -= (mod_data.local_num_cells_by_type.count(cell->type) != 0)? mod_data.local_num_cells_by_type.at(cell->type): 0;
+						mod_data.local_num_cells -= (mod_data.local_num_cells_by_type.count(cell->type) != 0)
+									      ? mod_data.local_num_cells_by_type.at(cell->type)
+									      : 0;
 						mod_data.local_num_cells_by_type.erase(cell->type);
 						mod_data.local_area_cells_by_type.erase(cell->type);
 					}

From d8fb4da437b9fc1b4e818f8bfac10ded3a1cee15 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Sat, 16 Aug 2025 09:32:08 +0200
Subject: [PATCH 395/931] updated testcase

---
 tests/various/stat.ys | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/various/stat.ys b/tests/various/stat.ys
index 50e1a35d8..1644f63e3 100644
--- a/tests/various/stat.ys
+++ b/tests/various/stat.ys
@@ -71,7 +71,7 @@ module \child
 end
 EOT
 logger -expect log "Chip area for top module '\\top': 112.492800" 1
-logger -expect log "of which used for sequential elements: 94.348800" 2
+logger -expect log "of which used for sequential elements: 94.348800" 1
 logger -expect log "2   18.144 cells" 1 
 logger -expect log "4  112.493 cells" 1
 logger -expect log "2   94.349   sg13g2_dfrbp_1" 1

From 5fc0e77c3d8d954594ef933d6270b5864f410661 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Tue, 12 Aug 2025 08:56:05 +0200
Subject: [PATCH 396/931] add functionality to be able to use parameterised
 cells.

cells can have their area as a function of the input port width.
---
 passes/cmds/stat.cc | 143 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 142 insertions(+), 1 deletion(-)

diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index c41b8831f..827ee0f05 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -34,6 +34,9 @@ PRIVATE_NAMESPACE_BEGIN
 struct cell_area_t {
 	double area;
 	bool is_sequential;
+	vector<double> single_parameter_area;
+	vector<vector<double>> double_parameter_area;
+	vector<string> parameter_names;
 };
 
 struct statdata_t {
@@ -206,6 +209,89 @@ struct statdata_t {
 			}
 
 			if (!cell_area.empty()) {
+				// check if cell_area provides a area calculator
+				if (cell_area.count(cell->type)) {
+					cell_area_t cell_data = cell_area.at(cell->type);
+					if (cell_data.single_parameter_area.size() > 0) {
+						// assume that we just take the max of the A,B,Y ports
+
+						int width_a = cell->hasPort(ID::A) ? GetSize(cell->getPort(ID::A)) : 0;
+						int width_b = cell->hasPort(ID::B) ? GetSize(cell->getPort(ID::B)) : 0;
+						int width_y = cell->hasPort(ID::Y) ? GetSize(cell->getPort(ID::Y)) : 0;
+						int width_q = cell->hasPort(ID::Q) ? GetSize(cell->getPort(ID::Q)) : 0;
+						int max_width = max<int>({width_a, width_b, width_y, width_q});
+						if (!cell_area.count(cell_type)) {
+							cell_area[cell_type] = cell_data;
+						}
+						if (cell_data.single_parameter_area.size() > max_width - 1u) {
+							cell_area.at(cell_type).area = cell_data.single_parameter_area.at(max_width - 1);
+							cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
+
+						} else {
+							printf("too small single_parameter_area %s %d %f\n", cell_type.c_str(), max_width,
+							       cell_data.single_parameter_area.back());
+							cell_area.at(cell_type).area = cell_data.single_parameter_area.back();
+							cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
+						}
+						// printf("single_paramter_extraction %s %d %f\n", cell_type.c_str(), max_width,
+						// cell_area.at(cell_type).area);
+					}
+					vector<double> widths;
+					if (cell_data.parameter_names.size() > 0) {
+						for (auto &it : cell_data.parameter_names) {
+							RTLIL::IdString port_name;
+							// TODO: there has to be a better way to do this
+							if (it == "A") {
+								port_name = ID::A;
+							} else if (it == "B") {
+								port_name = ID::B;
+							} else if (it == "Y") {
+								port_name = ID::Y;
+							} else if (it == "Q") {
+								port_name = ID::Q;
+							} else if (it == "S") {
+								port_name = ID::S;
+							} else {
+								port_name = ID(it);
+							}
+							if (cell->hasPort(port_name)) {
+								int width = GetSize(cell->getPort(port_name));
+								widths.push_back(width);
+							} else {
+								widths.push_back(0);
+							}
+						}
+					}
+
+					if (cell_data.double_parameter_area.size() > 0) {
+						if (!cell_area.count(cell_type)) {
+							cell_area[cell_type] = cell_data;
+						}
+						if (widths.size() == 2) {
+							unsigned int width_a = widths.at(0);
+							unsigned int width_b = widths.at(1);
+							if (width_a > 0 && width_b > 0) {
+								if (cell_data.double_parameter_area.size() > width_a - 1 &&
+								    cell_data.double_parameter_area.at(width_a - 1).size() > width_b - 1) {
+									cell_area.at(cell_type).area =
+									  cell_data.double_parameter_area.at(width_a - 1).at(width_b - 1);
+									cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
+								} else {
+									printf("too small double_parameter_area %s %d %d %f\n", cell_type.c_str(),
+									       width_a, width_b, cell_data.double_parameter_area.back().back());
+									cell_area.at(cell_type).area = cell_data.double_parameter_area.back().back();
+									cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
+								}
+							} else {
+								cell_area.at(cell_type).area = cell_data.area;
+								cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
+							}
+						} else {
+							printf("double_paramter_extraction %s %zu %f\n", cell_type.c_str(), widths.size(),
+							       cell_area.at(cell_type).area);
+						}
+					}
+				}
 
 				if (cell_area.count(cell_type)) {
 					cell_area_t cell_data = cell_area.at(cell_type);
@@ -726,9 +812,64 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 
 		const LibertyAst *ar = cell->find("area");
 		bool is_flip_flop = cell->find("ff") != nullptr;
+		vector<double> single_parameter_area;
+		vector<vector<double>> double_parameter_area;
+		vector<string> port_names;
+		const LibertyAst *sar = cell->find("single_area_parameterised");
+		if (sar != nullptr) {
+			for (const auto &s : sar->args) {
+				double value = 0;
+				auto [ptr, ec] = std::from_chars(s.data(), s.data() + s.size(), value);
+				// ec != std::errc() means parse error, or ptr didn't consume entire string
+				if (ec != std::errc() || ptr != s.data() + s.size())
+					break;
+				single_parameter_area.push_back(value);
+			}
+			if (single_parameter_area.size() == 0)
+				printf("error: %s\n", sar->args[single_parameter_area.size() - 1].c_str());
+			// check if it is a double parameterised area
+		}
+		const LibertyAst *dar = cell->find("double_area_parameterised");
+		if (dar != nullptr) {
+			for (const auto &s : dar->args) {
+
+				// printf("value: %s\n",sar->value.c_str());
+				// printf("args1: %s\n",dar->args[0].c_str());
+
+				vector<string> sub_array;
+				std::string::size_type start = 0;
+				std::string::size_type end = s.find_first_of(",", start);
+				while (end != std::string::npos) {
+					sub_array.push_back(s.substr(start, end - start));
+					start = end + 1;
+					end = s.find_first_of(",", start);
+				}
+				sub_array.push_back(s.substr(start, end));
+
+				vector<double> cast_sub_array;
+				for (const auto &s : sub_array) {
+					double value = 0;
+					auto [ptr, ec] = std::from_chars(s.data() + 1, s.data() + s.size(), value);
+					if (ec != std::errc() || ptr != s.data() + s.size())
+						break;
+					cast_sub_array.push_back(value);
+				}
+				double_parameter_area.push_back(cast_sub_array);
+				if (cast_sub_array.size() == 0)
+					printf("error: %s\n", s.c_str());
+			}
+		}
+		const LibertyAst *par = cell->find("port_names");
+		if (par != nullptr) {
+			for (const auto &s : par->args) {
+				port_names.push_back(s);
+			}
+		}
+
 		if (ar != nullptr && !ar->value.empty()) {
 			string prefix = cell->args[0].substr(0, 1) == "$" ? "" : "\\";
-			cell_area[prefix + cell->args[0]] = {atof(ar->value.c_str()), is_flip_flop};
+			cell_area[prefix + cell->args[0]] = {atof(ar->value.c_str()), is_flip_flop, single_parameter_area, double_parameter_area,
+							     port_names};
 		}
 	}
 }

From 50fe9dd7f26615c8e90d01bb443644096e9f6185 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Tue, 12 Aug 2025 09:37:55 +0200
Subject: [PATCH 397/931] clean parsing code

---
 passes/cmds/stat.cc | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 827ee0f05..a036b1930 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -818,12 +818,12 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 		const LibertyAst *sar = cell->find("single_area_parameterised");
 		if (sar != nullptr) {
 			for (const auto &s : sar->args) {
-				double value = 0;
-				auto [ptr, ec] = std::from_chars(s.data(), s.data() + s.size(), value);
-				// ec != std::errc() means parse error, or ptr didn't consume entire string
-				if (ec != std::errc() || ptr != s.data() + s.size())
-					break;
-				single_parameter_area.push_back(value);
+				try {
+					double value = std::stod(s);
+					single_parameter_area.push_back(value);
+				} catch (const std::exception &e) {
+					log_error("Failed to parse single parameter area value '%s': %s\n", s.c_str(), e.what());
+				}
 			}
 			if (single_parameter_area.size() == 0)
 				printf("error: %s\n", sar->args[single_parameter_area.size() - 1].c_str());
@@ -849,10 +849,12 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 				vector<double> cast_sub_array;
 				for (const auto &s : sub_array) {
 					double value = 0;
-					auto [ptr, ec] = std::from_chars(s.data() + 1, s.data() + s.size(), value);
-					if (ec != std::errc() || ptr != s.data() + s.size())
-						break;
-					cast_sub_array.push_back(value);
+					try {
+						value = std::stod(s);
+						cast_sub_array.push_back(value);
+					} catch (const std::exception &e) {
+						log_error("Failed to parse double parameter area value '%s': %s\n", s.c_str(), e.what());
+					}
 				}
 				double_parameter_area.push_back(cast_sub_array);
 				if (cast_sub_array.size() == 0)

From 8b1f77ebd297ab312af81be0661f44f09b0edb43 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Wed, 13 Aug 2025 15:16:15 +0200
Subject: [PATCH 398/931] cleanup. printf to errors or warnings

---
 passes/cmds/stat.cc | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index a036b1930..4d01b8535 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -228,19 +228,16 @@ struct statdata_t {
 							cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
 
 						} else {
-							printf("too small single_parameter_area %s %d %f\n", cell_type.c_str(), max_width,
-							       cell_data.single_parameter_area.back());
+							log_warning("too small single_parameter_area %s width: %d size: %d\n", cell_type.c_str(), max_width,
+							       (int)cell_data.single_parameter_area.size());
 							cell_area.at(cell_type).area = cell_data.single_parameter_area.back();
 							cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
 						}
-						// printf("single_paramter_extraction %s %d %f\n", cell_type.c_str(), max_width,
-						// cell_area.at(cell_type).area);
 					}
 					vector<double> widths;
 					if (cell_data.parameter_names.size() > 0) {
 						for (auto &it : cell_data.parameter_names) {
 							RTLIL::IdString port_name;
-							// TODO: there has to be a better way to do this
 							if (it == "A") {
 								port_name = ID::A;
 							} else if (it == "B") {
@@ -277,8 +274,9 @@ struct statdata_t {
 									  cell_data.double_parameter_area.at(width_a - 1).at(width_b - 1);
 									cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
 								} else {
-									printf("too small double_parameter_area %s %d %d %f\n", cell_type.c_str(),
-									       width_a, width_b, cell_data.double_parameter_area.back().back());
+									log_warning("too small double_parameter_area %s, width_a: %d, width_b: %d, size_a: %d, size_b: %d\n", cell_type.c_str(),
+									       (int)width_a, width_b, cell_data.double_parameter_area.size(),
+									       (int)cell_data.double_parameter_area.at(width_a - 1).size());
 									cell_area.at(cell_type).area = cell_data.double_parameter_area.back().back();
 									cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
 								}
@@ -287,8 +285,8 @@ struct statdata_t {
 								cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
 							}
 						} else {
-							printf("double_paramter_extraction %s %zu %f\n", cell_type.c_str(), widths.size(),
-							       cell_area.at(cell_type).area);
+							log_error("double_parameter_area for %s has %d parameters, but only 2 are expected.\n", cell_type.c_str(),
+							       (int)cell_data.double_parameter_area.size());
 						}
 					}
 				}
@@ -826,15 +824,13 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 				}
 			}
 			if (single_parameter_area.size() == 0)
-				printf("error: %s\n", sar->args[single_parameter_area.size() - 1].c_str());
+				log_error("single parameter area has size 0: %s\n", sar->args[single_parameter_area.size() - 1].c_str());
 			// check if it is a double parameterised area
 		}
 		const LibertyAst *dar = cell->find("double_area_parameterised");
 		if (dar != nullptr) {
 			for (const auto &s : dar->args) {
 
-				// printf("value: %s\n",sar->value.c_str());
-				// printf("args1: %s\n",dar->args[0].c_str());
 
 				vector<string> sub_array;
 				std::string::size_type start = 0;
@@ -858,7 +854,7 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 				}
 				double_parameter_area.push_back(cast_sub_array);
 				if (cast_sub_array.size() == 0)
-					printf("error: %s\n", s.c_str());
+					log_error("double paramter array has size 0: %s\n", s.c_str());
 			}
 		}
 		const LibertyAst *par = cell->find("port_names");

From 73d1177665815012981f439138f97937c4a90373 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Thu, 14 Aug 2025 09:57:44 +0200
Subject: [PATCH 399/931] testcases one testcase for single parameter cells.
 one testcase for double parameter cells.

---
 tests/various/stat_area_by_width.lib | 42 +++++++++++++
 tests/various/stat_high_level.ys     | 92 ++++++++++++++++++++++++++++
 tests/various/stat_high_level2.ys    | 91 +++++++++++++++++++++++++++
 3 files changed, 225 insertions(+)
 create mode 100644 tests/various/stat_area_by_width.lib
 create mode 100644 tests/various/stat_high_level.ys
 create mode 100644 tests/various/stat_high_level2.ys

diff --git a/tests/various/stat_area_by_width.lib b/tests/various/stat_area_by_width.lib
new file mode 100644
index 000000000..73e266472
--- /dev/null
+++ b/tests/various/stat_area_by_width.lib
@@ -0,0 +1,42 @@
+
+/************************************************************************
+
+ Copyright 2025 Clemens Walter, <cwalter@ethz.ch>
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+    https://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. 
+ 
+************************************************************************/
+//Mock library for Yosys pre techmap 
+library (mock) { 
+cell ( "$reduce_xor" ) {
+  area : 3.0 ;
+  delay : 2.5 ;
+  single_area_parameterised (  3.0, 5.5, 8.0, 10.5, 13.0, 15.5, 18.0, 20.5, 23.0, 25.5, 28.0, 30.5, 33.0, 35.5, 38.0, 40.5, 43.0, 45.5, 48.0, 50.5, 53.0, 55.5, 58.0, 60.5, 63.0, 65.5, 68.0, 70.5, 73.0, 75.5, 78.0, 80.5, 83.0, 85.5, 88.0, 90.5, 93.0, 95.5, 98.0, 100.5, 103.0, 105.5, 108.0, 110.5, 113.0, 115.5, 118.0, 120.5,  ) ;
+
+}
+
+cell ( "$xor" ) {
+  area : 5.0 ;
+  delay : 2.0 ;
+  single_area_parameterised (  5.0, 7.5, 10.0, 12.5, 15.0, 17.5, 20.0, 22.5, 25.0, 27.5, 30.0, 32.5, 35.0, 37.5, 40.0, 42.5, 45.0, 47.5, 50.0, 52.5, 55.0,  ) ;
+
+}
+
+cell ( "$bmux" ) {
+  area : 3.0 ;
+  delay : 2.0 ;
+  port_names  ( "Y", "S" ) ;
+  double_area_parameterised ( " 3.0, 6.0, 9.0, 12.0, 15.0, 18.0, 21.0, 24.0, 27.0, 30.0, 33.0, 36.0, 39.0, 42.0, 45.0, 48.0, 51.0, 54.0, 57.0, 60.0, 63.0, 66.0, 69.0, 72.0, 75.0, 78.0, 81.0, 84.0, 87.0, 90.0, 93.0, 96.0, 99.0, 102.0, 105.0, 108.0, 111.0, 114.0, 117.0, 120.0, 123.0, 126.0, 129.0, 132.0, 135.0, 138.0, 141.0, 144.0, 147.0, 150.0, 153.0, 156.0, 159.0, 162.0, 165.0, 168.0, 171.0, 174.0, 177.0, 180.0, 183.0, 186.0, 189.0, 192.0, 195.0, 198.0, 201.0, 204.0, 207.0, 210.0, 213.0, 216.0, 219.0, 222.0, 225.0, 228.0, 231.0, 234.0, 237.0, 240.0, 243.0, 246.0, 249.0, 252.0, 255.0, 258.0, 261.0, 264.0, 267.0, 270.0, 273.0, 276.0, 279.0, 282.0, 285.0, 288.0, 291.0, 294.0, 297.0, 300.0, 303.0, 306.0, 309.0, 312.0, 315.0, 318.0, 321.0, 324.0, 327.0, 330.0, 333.0, 336.0, 339.0, 342.0, 345.0, 348.0, 351.0, 354.0, 357.0, 360.0, 363.0, 366.0, 369.0, 372.0, 375.0, 378.0, 381.0, 384.0,", " 6.0, 12.0, 18.0, 24.0, 30.0, 36.0, 42.0, 48.0, 54.0, 60.0, 66.0, 72.0, 78.0, 84.0, 90.0, 96.0, 102.0, 108.0, 114.0, 120.0, 126.0, 132.0, 138.0, 144.0, 150.0, 156.0, 162.0, 168.0, 174.0, 180.0, 186.0, 192.0, 198.0, 204.0, 210.0, 216.0, 222.0, 228.0, 234.0, 240.0, 246.0, 252.0, 258.0, 264.0, 270.0, 276.0, 282.0, 288.0, 294.0, 300.0, 306.0, 312.0, 318.0, 324.0, 330.0, 336.0, 342.0, 348.0, 354.0, 360.0, 366.0, 372.0, 378.0, 384.0, 390.0, 396.0, 402.0, 408.0, 414.0, 420.0, 426.0, 432.0, 438.0, 444.0, 450.0, 456.0, 462.0, 468.0, 474.0, 480.0, 486.0, 492.0, 498.0, 504.0, 510.0, 516.0, 522.0, 528.0, 534.0, 540.0, 546.0, 552.0, 558.0, 564.0, 570.0, 576.0, 582.0, 588.0, 594.0, 600.0, 606.0, 612.0, 618.0, 624.0, 630.0, 636.0, 642.0, 648.0, 654.0, 660.0, 666.0, 672.0, 678.0, 684.0, 690.0, 696.0, 702.0, 708.0, 714.0, 720.0, 726.0, 732.0, 738.0, 744.0, 750.0, 756.0, 762.0, 768.0,", " 9.0, 18.0, 27.0, 36.0, 45.0, 54.0, 63.0, 72.0, 81.0, 90.0, 99.0, 108.0, 117.0, 126.0, 135.0, 144.0, 153.0, 162.0, 171.0, 180.0, 189.0, 198.0, 207.0, 216.0, 225.0, 234.0, 243.0, 252.0, 261.0, 270.0, 279.0, 288.0, 297.0, 306.0, 315.0, 324.0, 333.0, 342.0, 351.0, 360.0, 369.0, 378.0, 387.0, 396.0, 405.0, 414.0, 423.0, 432.0, 441.0, 450.0, 459.0, 468.0, 477.0, 486.0, 495.0, 504.0, 513.0, 522.0, 531.0, 540.0, 549.0, 558.0, 567.0, 576.0, 585.0, 594.0, 603.0, 612.0, 621.0, 630.0, 639.0, 648.0, 657.0, 666.0, 675.0, 684.0, 693.0, 702.0, 711.0, 720.0, 729.0, 738.0, 747.0, 756.0, 765.0, 774.0, 783.0, 792.0, 801.0, 810.0, 819.0, 828.0, 837.0, 846.0, 855.0, 864.0, 873.0, 882.0, 891.0, 900.0, 909.0, 918.0, 927.0, 936.0, 945.0, 954.0, 963.0, 972.0, 981.0, 990.0, 999.0, 1008.0, 1017.0, 1026.0, 1035.0, 1044.0, 1053.0, 1062.0, 1071.0, 1080.0, 1089.0, 1098.0, 1107.0, 1116.0, 1125.0, 1134.0, 1143.0, 1152.0,", " 12.0, 24.0, 36.0, 48.0, 60.0, 72.0, 84.0, 96.0, 108.0, 120.0, 132.0, 144.0, 156.0, 168.0, 180.0, 192.0, 204.0, 216.0, 228.0, 240.0, 252.0, 264.0, 276.0, 288.0, 300.0, 312.0, 324.0, 336.0, 348.0, 360.0, 372.0, 384.0, 396.0, 408.0, 420.0, 432.0, 444.0, 456.0, 468.0, 480.0, 492.0, 504.0, 516.0, 528.0, 540.0, 552.0, 564.0, 576.0, 588.0, 600.0, 612.0, 624.0, 636.0, 648.0, 660.0, 672.0, 684.0, 696.0, 708.0, 720.0, 732.0, 744.0, 756.0, 768.0, 780.0, 792.0, 804.0, 816.0, 828.0, 840.0, 852.0, 864.0, 876.0, 888.0, 900.0, 912.0, 924.0, 936.0, 948.0, 960.0, 972.0, 984.0, 996.0, 1008.0, 1020.0, 1032.0, 1044.0, 1056.0, 1068.0, 1080.0, 1092.0, 1104.0, 1116.0, 1128.0, 1140.0, 1152.0, 1164.0, 1176.0, 1188.0, 1200.0, 1212.0, 1224.0, 1236.0, 1248.0, 1260.0, 1272.0, 1284.0, 1296.0, 1308.0, 1320.0, 1332.0, 1344.0, 1356.0, 1368.0, 1380.0, 1392.0, 1404.0, 1416.0, 1428.0, 1440.0, 1452.0, 1464.0, 1476.0, 1488.0, 1500.0, 1512.0, 1524.0, 1536.0,", " 15.0, 30.0, 45.0, 60.0, 75.0, 90.0, 105.0, 120.0, 135.0, 150.0, 165.0, 180.0, 195.0, 210.0, 225.0, 240.0, 255.0, 270.0, 285.0, 300.0, 315.0, 330.0, 345.0, 360.0, 375.0, 390.0, 405.0, 420.0, 435.0, 450.0, 465.0, 480.0, 495.0, 510.0, 525.0, 540.0, 555.0, 570.0, 585.0, 600.0, 615.0, 630.0, 645.0, 660.0, 675.0, 690.0, 705.0, 720.0, 735.0, 750.0, 765.0, 780.0, 795.0, 810.0, 825.0, 840.0, 855.0, 870.0, 885.0, 900.0, 915.0, 930.0, 945.0, 960.0, 975.0, 990.0, 1005.0, 1020.0, 1035.0, 1050.0, 1065.0, 1080.0, 1095.0, 1110.0, 1125.0, 1140.0, 1155.0, 1170.0, 1185.0, 1200.0, 1215.0, 1230.0, 1245.0, 1260.0, 1275.0, 1290.0, 1305.0, 1320.0, 1335.0, 1350.0, 1365.0, 1380.0, 1395.0, 1410.0, 1425.0, 1440.0, 1455.0, 1470.0, 1485.0, 1500.0, 1515.0, 1530.0, 1545.0, 1560.0, 1575.0, 1590.0, 1605.0, 1620.0, 1635.0, 1650.0, 1665.0, 1680.0, 1695.0, 1710.0, 1725.0, 1740.0, 1755.0, 1770.0, 1785.0, 1800.0, 1815.0, 1830.0, 1845.0, 1860.0, 1875.0, 1890.0, 1905.0, 1920.0,", " 18.0, 36.0, 54.0, 72.0, 90.0, 108.0, 126.0, 144.0, 162.0, 180.0, 198.0, 216.0, 234.0, 252.0, 270.0, 288.0, 306.0, 324.0, 342.0, 360.0, 378.0, 396.0, 414.0, 432.0, 450.0, 468.0, 486.0, 504.0, 522.0, 540.0, 558.0, 576.0, 594.0, 612.0, 630.0, 648.0, 666.0, 684.0, 702.0, 720.0, 738.0, 756.0, 774.0, 792.0, 810.0, 828.0, 846.0, 864.0, 882.0, 900.0, 918.0, 936.0, 954.0, 972.0, 990.0, 1008.0, 1026.0, 1044.0, 1062.0, 1080.0, 1098.0, 1116.0, 1134.0, 1152.0, 1170.0, 1188.0, 1206.0, 1224.0, 1242.0, 1260.0, 1278.0, 1296.0, 1314.0, 1332.0, 1350.0, 1368.0, 1386.0, 1404.0, 1422.0, 1440.0, 1458.0, 1476.0, 1494.0, 1512.0, 1530.0, 1548.0, 1566.0, 1584.0, 1602.0, 1620.0, 1638.0, 1656.0, 1674.0, 1692.0, 1710.0, 1728.0, 1746.0, 1764.0, 1782.0, 1800.0, 1818.0, 1836.0, 1854.0, 1872.0, 1890.0, 1908.0, 1926.0, 1944.0, 1962.0, 1980.0, 1998.0, 2016.0, 2034.0, 2052.0, 2070.0, 2088.0, 2106.0, 2124.0, 2142.0, 2160.0, 2178.0, 2196.0, 2214.0, 2232.0, 2250.0, 2268.0, 2286.0, 2304.0,", " 21.0, 42.0, 63.0, 84.0, 105.0, 126.0, 147.0, 168.0, 189.0, 210.0, 231.0, 252.0, 273.0, 294.0, 315.0, 336.0, 357.0, 378.0, 399.0, 420.0, 441.0, 462.0, 483.0, 504.0, 525.0, 546.0, 567.0, 588.0, 609.0, 630.0, 651.0, 672.0, 693.0, 714.0, 735.0, 756.0, 777.0, 798.0, 819.0, 840.0, 861.0, 882.0, 903.0, 924.0, 945.0, 966.0, 987.0, 1008.0, 1029.0, 1050.0, 1071.0, 1092.0, 1113.0, 1134.0, 1155.0, 1176.0, 1197.0, 1218.0, 1239.0, 1260.0, 1281.0, 1302.0, 1323.0, 1344.0, 1365.0, 1386.0, 1407.0, 1428.0, 1449.0, 1470.0, 1491.0, 1512.0, 1533.0, 1554.0, 1575.0, 1596.0, 1617.0, 1638.0, 1659.0, 1680.0, 1701.0, 1722.0, 1743.0, 1764.0, 1785.0, 1806.0, 1827.0, 1848.0, 1869.0, 1890.0, 1911.0, 1932.0, 1953.0, 1974.0, 1995.0, 2016.0, 2037.0, 2058.0, 2079.0, 2100.0, 2121.0, 2142.0, 2163.0, 2184.0, 2205.0, 2226.0, 2247.0, 2268.0, 2289.0, 2310.0, 2331.0, 2352.0, 2373.0, 2394.0, 2415.0, 2436.0, 2457.0, 2478.0, 2499.0, 2520.0, 2541.0, 2562.0, 2583.0, 2604.0, 2625.0, 2646.0, 2667.0, 2688.0,", " 24.0, 48.0, 72.0, 96.0, 120.0, 144.0, 168.0, 192.0, 216.0, 240.0, 264.0, 288.0, 312.0, 336.0, 360.0, 384.0, 408.0, 432.0, 456.0, 480.0, 504.0, 528.0, 552.0, 576.0, 600.0, 624.0, 648.0, 672.0, 696.0, 720.0, 744.0, 768.0, 792.0, 816.0, 840.0, 864.0, 888.0, 912.0, 936.0, 960.0, 984.0, 1008.0, 1032.0, 1056.0, 1080.0, 1104.0, 1128.0, 1152.0, 1176.0, 1200.0, 1224.0, 1248.0, 1272.0, 1296.0, 1320.0, 1344.0, 1368.0, 1392.0, 1416.0, 1440.0, 1464.0, 1488.0, 1512.0, 1536.0, 1560.0, 1584.0, 1608.0, 1632.0, 1656.0, 1680.0, 1704.0, 1728.0, 1752.0, 1776.0, 1800.0, 1824.0, 1848.0, 1872.0, 1896.0, 1920.0, 1944.0, 1968.0, 1992.0, 2016.0, 2040.0, 2064.0, 2088.0, 2112.0, 2136.0, 2160.0, 2184.0, 2208.0, 2232.0, 2256.0, 2280.0, 2304.0, 2328.0, 2352.0, 2376.0, 2400.0, 2424.0, 2448.0, 2472.0, 2496.0, 2520.0, 2544.0, 2568.0, 2592.0, 2616.0, 2640.0, 2664.0, 2688.0, 2712.0, 2736.0, 2760.0, 2784.0, 2808.0, 2832.0, 2856.0, 2880.0, 2904.0, 2928.0, 2952.0, 2976.0, 3000.0, 3024.0, 3048.0, 3072.0,", " 27.0, 54.0, 81.0, 108.0, 135.0, 162.0, 189.0, 216.0, 243.0, 270.0, 297.0, 324.0, 351.0, 378.0, 405.0, 432.0, 459.0, 486.0, 513.0, 540.0, 567.0, 594.0, 621.0, 648.0, 675.0, 702.0, 729.0, 756.0, 783.0, 810.0, 837.0, 864.0, 891.0, 918.0, 945.0, 972.0, 999.0, 1026.0, 1053.0, 1080.0, 1107.0, 1134.0, 1161.0, 1188.0, 1215.0, 1242.0, 1269.0, 1296.0, 1323.0, 1350.0, 1377.0, 1404.0, 1431.0, 1458.0, 1485.0, 1512.0, 1539.0, 1566.0, 1593.0, 1620.0, 1647.0, 1674.0, 1701.0, 1728.0, 1755.0, 1782.0, 1809.0, 1836.0, 1863.0, 1890.0, 1917.0, 1944.0, 1971.0, 1998.0, 2025.0, 2052.0, 2079.0, 2106.0, 2133.0, 2160.0, 2187.0, 2214.0, 2241.0, 2268.0, 2295.0, 2322.0, 2349.0, 2376.0, 2403.0, 2430.0, 2457.0, 2484.0, 2511.0, 2538.0, 2565.0, 2592.0, 2619.0, 2646.0, 2673.0, 2700.0, 2727.0, 2754.0, 2781.0, 2808.0, 2835.0, 2862.0, 2889.0, 2916.0, 2943.0, 2970.0, 2997.0, 3024.0, 3051.0, 3078.0, 3105.0, 3132.0, 3159.0, 3186.0, 3213.0, 3240.0, 3267.0, 3294.0, 3321.0, 3348.0, 3375.0, 3402.0, 3429.0, 3456.0,", " 30.0, 60.0, 90.0, 120.0, 150.0, 180.0, 210.0, 240.0, 270.0, 300.0, 330.0, 360.0, 390.0, 420.0, 450.0, 480.0, 510.0, 540.0, 570.0, 600.0, 630.0, 660.0, 690.0, 720.0, 750.0, 780.0, 810.0, 840.0, 870.0, 900.0, 930.0, 960.0, 990.0, 1020.0, 1050.0, 1080.0, 1110.0, 1140.0, 1170.0, 1200.0, 1230.0, 1260.0, 1290.0, 1320.0, 1350.0, 1380.0, 1410.0, 1440.0, 1470.0, 1500.0, 1530.0, 1560.0, 1590.0, 1620.0, 1650.0, 1680.0, 1710.0, 1740.0, 1770.0, 1800.0, 1830.0, 1860.0, 1890.0, 1920.0, 1950.0, 1980.0, 2010.0, 2040.0, 2070.0, 2100.0, 2130.0, 2160.0, 2190.0, 2220.0, 2250.0, 2280.0, 2310.0, 2340.0, 2370.0, 2400.0, 2430.0, 2460.0, 2490.0, 2520.0, 2550.0, 2580.0, 2610.0, 2640.0, 2670.0, 2700.0, 2730.0, 2760.0, 2790.0, 2820.0, 2850.0, 2880.0, 2910.0, 2940.0, 2970.0, 3000.0, 3030.0, 3060.0, 3090.0, 3120.0, 3150.0, 3180.0, 3210.0, 3240.0, 3270.0, 3300.0, 3330.0, 3360.0, 3390.0, 3420.0, 3450.0, 3480.0, 3510.0, 3540.0, 3570.0, 3600.0, 3630.0, 3660.0, 3690.0, 3720.0, 3750.0, 3780.0, 3810.0, 3840.0,", " 33.0, 66.0, 99.0, 132.0, 165.0, 198.0, 231.0, 264.0, 297.0, 330.0, 363.0, 396.0, 429.0, 462.0, 495.0, 528.0, 561.0, 594.0, 627.0, 660.0, 693.0, 726.0, 759.0, 792.0, 825.0, 858.0, 891.0, 924.0, 957.0, 990.0, 1023.0, 1056.0, 1089.0, 1122.0, 1155.0, 1188.0, 1221.0, 1254.0, 1287.0, 1320.0, 1353.0, 1386.0, 1419.0, 1452.0, 1485.0, 1518.0, 1551.0, 1584.0, 1617.0, 1650.0, 1683.0, 1716.0, 1749.0, 1782.0, 1815.0, 1848.0, 1881.0, 1914.0, 1947.0, 1980.0, 2013.0, 2046.0, 2079.0, 2112.0, 2145.0, 2178.0, 2211.0, 2244.0, 2277.0, 2310.0, 2343.0, 2376.0, 2409.0, 2442.0, 2475.0, 2508.0, 2541.0, 2574.0, 2607.0, 2640.0, 2673.0, 2706.0, 2739.0, 2772.0, 2805.0, 2838.0, 2871.0, 2904.0, 2937.0, 2970.0, 3003.0, 3036.0, 3069.0, 3102.0, 3135.0, 3168.0, 3201.0, 3234.0, 3267.0, 3300.0, 3333.0, 3366.0, 3399.0, 3432.0, 3465.0, 3498.0, 3531.0, 3564.0, 3597.0, 3630.0, 3663.0, 3696.0, 3729.0, 3762.0, 3795.0, 3828.0, 3861.0, 3894.0, 3927.0, 3960.0, 3993.0, 4026.0, 4059.0, 4092.0, 4125.0, 4158.0, 4191.0, 4224.0,", " 36.0, 72.0, 108.0, 144.0, 180.0, 216.0, 252.0, 288.0, 324.0, 360.0, 396.0, 432.0, 468.0, 504.0, 540.0, 576.0, 612.0, 648.0, 684.0, 720.0, 756.0, 792.0, 828.0, 864.0, 900.0, 936.0, 972.0, 1008.0, 1044.0, 1080.0, 1116.0, 1152.0, 1188.0, 1224.0, 1260.0, 1296.0, 1332.0, 1368.0, 1404.0, 1440.0, 1476.0, 1512.0, 1548.0, 1584.0, 1620.0, 1656.0, 1692.0, 1728.0, 1764.0, 1800.0, 1836.0, 1872.0, 1908.0, 1944.0, 1980.0, 2016.0, 2052.0, 2088.0, 2124.0, 2160.0, 2196.0, 2232.0, 2268.0, 2304.0, 2340.0, 2376.0, 2412.0, 2448.0, 2484.0, 2520.0, 2556.0, 2592.0, 2628.0, 2664.0, 2700.0, 2736.0, 2772.0, 2808.0, 2844.0, 2880.0, 2916.0, 2952.0, 2988.0, 3024.0, 3060.0, 3096.0, 3132.0, 3168.0, 3204.0, 3240.0, 3276.0, 3312.0, 3348.0, 3384.0, 3420.0, 3456.0, 3492.0, 3528.0, 3564.0, 3600.0, 3636.0, 3672.0, 3708.0, 3744.0, 3780.0, 3816.0, 3852.0, 3888.0, 3924.0, 3960.0, 3996.0, 4032.0, 4068.0, 4104.0, 4140.0, 4176.0, 4212.0, 4248.0, 4284.0, 4320.0, 4356.0, 4392.0, 4428.0, 4464.0, 4500.0, 4536.0, 4572.0, 4608.0,", " 39.0, 78.0, 117.0, 156.0, 195.0, 234.0, 273.0, 312.0, 351.0, 390.0, 429.0, 468.0, 507.0, 546.0, 585.0, 624.0, 663.0, 702.0, 741.0, 780.0, 819.0, 858.0, 897.0, 936.0, 975.0, 1014.0, 1053.0, 1092.0, 1131.0, 1170.0, 1209.0, 1248.0, 1287.0, 1326.0, 1365.0, 1404.0, 1443.0, 1482.0, 1521.0, 1560.0, 1599.0, 1638.0, 1677.0, 1716.0, 1755.0, 1794.0, 1833.0, 1872.0, 1911.0, 1950.0, 1989.0, 2028.0, 2067.0, 2106.0, 2145.0, 2184.0, 2223.0, 2262.0, 2301.0, 2340.0, 2379.0, 2418.0, 2457.0, 2496.0, 2535.0, 2574.0, 2613.0, 2652.0, 2691.0, 2730.0, 2769.0, 2808.0, 2847.0, 2886.0, 2925.0, 2964.0, 3003.0, 3042.0, 3081.0, 3120.0, 3159.0, 3198.0, 3237.0, 3276.0, 3315.0, 3354.0, 3393.0, 3432.0, 3471.0, 3510.0, 3549.0, 3588.0, 3627.0, 3666.0, 3705.0, 3744.0, 3783.0, 3822.0, 3861.0, 3900.0, 3939.0, 3978.0, 4017.0, 4056.0, 4095.0, 4134.0, 4173.0, 4212.0, 4251.0, 4290.0, 4329.0, 4368.0, 4407.0, 4446.0, 4485.0, 4524.0, 4563.0, 4602.0, 4641.0, 4680.0, 4719.0, 4758.0, 4797.0, 4836.0, 4875.0, 4914.0, 4953.0, 4992.0,",   ) ;
+ 
+}
+}
\ No newline at end of file
diff --git a/tests/various/stat_high_level.ys b/tests/various/stat_high_level.ys
new file mode 100644
index 000000000..03e5e957e
--- /dev/null
+++ b/tests/various/stat_high_level.ys
@@ -0,0 +1,92 @@
+
+read_rtlil << EOT
+module \top
+  wire input 1 \A
+  wire output 2 \Y
+  wire output 3 \N
+
+  cell $and \sub1
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \A
+    connect \B 1'0
+    connect \Y \Y
+  end
+
+  cell \child \sequential
+    connect \A \A
+    connect \B 1'0
+    connect \R 1'0
+    connect \Y \Y
+    connect \N \N
+  end
+
+  cell \child \sequential1
+    connect \A \A
+    connect \B 1'0
+    connect \R 1'0
+    connect \Y \Y
+    connect \N \N
+  end
+
+  cell $xor \sub2
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \A
+    connect \B 1'0
+    connect \Y \Y
+  end
+end
+
+module \child
+  wire input 1 \A
+  wire input 2 \B
+  wire input 3 \R
+
+  wire output 4 \Y
+  wire output 5 \N
+  wire \Y1
+  wire \Y2
+  cell \sg13g2_dfrbp_1 \sequential_ff
+    connect \CLK \A
+    connect \D \Y2
+    connect \Q \Y
+    connect \Q_N \N
+    connect \RESET_B \R
+  end
+
+  cell $xor \sub2
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \B
+    connect \B 1'0
+    connect \Y \Y1
+  end
+
+  cell $reduce_xor \sub3
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 10
+    parameter \Y_WIDTH 1
+    connect \A 10'0000000000
+    connect \Y \Y2
+  end
+
+end
+EOT
+logger -expect log "Chip area for top module '\\top': 66.000000" 1
+logger -expect log "3     30.5        3     30.5 cells" 1
+logger -expect log "2       51        -        -   \$reduce_xor" 2
+logger -expect log "8       66        2        5 cells" 2
+logger -expect-no-warnings
+stat -liberty ./stat_area_by_width.lib -top \top -hierarchy
+
+
diff --git a/tests/various/stat_high_level2.ys b/tests/various/stat_high_level2.ys
new file mode 100644
index 000000000..63d59da95
--- /dev/null
+++ b/tests/various/stat_high_level2.ys
@@ -0,0 +1,91 @@
+
+read_rtlil << EOT
+module \top
+  wire input 1 \A
+  wire output 2 \Y
+  wire output 3 \N
+
+  cell $and \sub1
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \A
+    connect \B 1'0
+    connect \Y \Y
+  end
+
+  cell \child \sequential
+    connect \A \A
+    connect \B 1'0
+    connect \R 1'0
+    connect \Y \Y
+    connect \N \N
+  end
+
+  cell \child \sequential1
+    connect \A \A
+    connect \B 1'0
+    connect \R 1'0
+    connect \Y \Y
+    connect \N \N
+  end
+
+  cell $xor \sub2
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \A
+    connect \B 1'0
+    connect \Y \Y
+  end
+end
+
+module \child
+  wire input 1 \A
+  wire input 2 \B
+  wire input 3 \R
+
+  wire output 4 \Y
+  wire output 5 \N
+  wire \Y1
+  wire \Y2
+  wire width 2 \A2
+  cell \sg13g2_dfrbp_1 \sequential_ff
+    connect \CLK \A
+    connect \D \Y2
+    connect \Q \Y
+    connect \Q_N \N
+    connect \RESET_B \R
+  end
+
+  cell $bmux \bmux1
+    parameter \WIDTH 2
+    parameter \S_WIDTH 2
+    connect \A 8'00000000
+    connect \S 2'00
+    connect \Y \A2
+  end
+
+  cell $reduce_xor \sub3
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 10
+    parameter \Y_WIDTH 1
+    connect \A 10'0000000000
+    connect \Y \Y2
+  end
+
+end
+EOT
+
+logger -expect log "Chip area for top module '\\top': 80.000000" 1
+logger -expect log "1       12        1       12   \$bmux" 1
+logger -expect log "3     37.5        3     37.5 cells" 1
+logger -expect log "8       80        2        5 cells" 2
+logger -expect-no-warnings
+stat -liberty ./stat_area_by_width.lib -top \top -hierarchy
+
+

From 4e45b5e1bb26a7c742b7abab7c4f78d80be0c052 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Thu, 14 Aug 2025 11:13:40 +0200
Subject: [PATCH 400/931] permit trailing comma

---
 passes/cmds/stat.cc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 4d01b8535..07b1e5228 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -275,7 +275,7 @@ struct statdata_t {
 									cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
 								} else {
 									log_warning("too small double_parameter_area %s, width_a: %d, width_b: %d, size_a: %d, size_b: %d\n", cell_type.c_str(),
-									       (int)width_a, width_b, cell_data.double_parameter_area.size(),
+									       width_a, width_b, (int)cell_data.double_parameter_area.size(),
 									       (int)cell_data.double_parameter_area.at(width_a - 1).size());
 									cell_area.at(cell_type).area = cell_data.double_parameter_area.back().back();
 									cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
@@ -816,6 +816,10 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 		const LibertyAst *sar = cell->find("single_area_parameterised");
 		if (sar != nullptr) {
 			for (const auto &s : sar->args) {
+				if (s.empty()) {
+					//catches trailing commas
+					continue;
+				}
 				try {
 					double value = std::stod(s);
 					single_parameter_area.push_back(value);
@@ -845,11 +849,15 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 				vector<double> cast_sub_array;
 				for (const auto &s : sub_array) {
 					double value = 0;
+					if (s.empty()) {
+						//catches trailing commas
+						continue;
+					}
 					try {
 						value = std::stod(s);
 						cast_sub_array.push_back(value);
 					} catch (const std::exception &e) {
-						log_error("Failed to parse double parameter area value '%s': %s\n", s.c_str(), e.what());
+						log_error("Failed to parse double parameter area value for  '%s': %s\n", s.c_str(), e.what());
 					}
 				}
 				double_parameter_area.push_back(cast_sub_array);

From 9278bed853e0e391d42a646bb1633da9ae5f7597 Mon Sep 17 00:00:00 2001
From: clemens <cwalter@ethz.ch>
Date: Thu, 14 Aug 2025 16:33:59 +0200
Subject: [PATCH 401/931] removed copyright notice on lib file. Should be
 covered by the yosys license not  anything else.

---
 tests/various/stat_area_by_width.lib | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/tests/various/stat_area_by_width.lib b/tests/various/stat_area_by_width.lib
index 73e266472..1e98aa488 100644
--- a/tests/various/stat_area_by_width.lib
+++ b/tests/various/stat_area_by_width.lib
@@ -1,22 +1,5 @@
 
-/************************************************************************
-
- Copyright 2025 Clemens Walter, <cwalter@ethz.ch>
- 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- 
-    https://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. 
- 
-************************************************************************/
-//Mock library for Yosys pre techmap 
+//library for testcases, can also be used as a template for new libraries
 library (mock) { 
 cell ( "$reduce_xor" ) {
   area : 3.0 ;

From 3f2c4f6f83b699c02fdad90aef8afdc0052531b4 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Sun, 17 Aug 2025 23:34:11 +0000
Subject: [PATCH 402/931] Remove redundant construction of `assign_map`.

We call 'assign_map.set()' below which wipes the `SigMap` and reconstructs it.

This operation is expensive because it scans the whole module. I think it's
better to make heavyweight operations more visible so I'm removing
the less obvious operation.
---
 passes/opt/opt_merge.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index b519d33d6..5ca19bc2f 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -227,7 +227,7 @@ struct OptMergeWorker
 	}
 
 	OptMergeWorker(RTLIL::Design *design, RTLIL::Module *module, bool mode_nomux, bool mode_share_all, bool mode_keepdc) :
-		design(design), module(module), assign_map(module), mode_share_all(mode_share_all)
+		design(design), module(module), mode_share_all(mode_share_all)
 	{
 		total_count = 0;
 		ct.setup_internals();

From d73cd78001a4ea2d3279f7533b3f443128f63bad Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 18 Aug 2025 00:27:23 +0000
Subject: [PATCH 403/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e83d32ac2..d9f9f432b 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+125
+YOSYS_VER := 0.56+141
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From e0e70d11580df9743acf8fac2c91e8a305bcbf35 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 18 Aug 2025 03:07:45 +0000
Subject: [PATCH 404/931] Remove some `c_str()` calls where they're no longer
 needed as parameters to `stringf()`.

---
 backends/btor/btor.cc             |  6 +--
 backends/firrtl/firrtl.cc         | 66 ++++++++++++++---------------
 backends/intersynth/intersynth.cc |  8 ++--
 backends/simplec/simplec.cc       | 70 +++++++++++++++----------------
 backends/spice/spice.cc           | 22 +++++-----
 5 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/backends/btor/btor.cc b/backends/btor/btor.cc
index bfd293557..1daf68c9d 100644
--- a/backends/btor/btor.cc
+++ b/backends/btor/btor.cc
@@ -129,7 +129,7 @@ struct BtorWorker
 				std::replace(src.begin(), src.end(), ' ', '_');
 				if (srcsymbols.count(src) || module->count_id("\\" + src)) {
 					for (int i = 1;; i++) {
-						string s = stringf("%s-%d", src.c_str(), i);
+						string s = stringf("%s-%d", src, i);
 						if (!srcsymbols.count(s) && !module->count_id("\\" + s)) {
 							src = s;
 							break;
@@ -192,7 +192,7 @@ struct BtorWorker
 	void btorf_push(const string &id)
 	{
 		if (verbose) {
-			f << indent << stringf("  ; begin %s\n", id.c_str());
+			f << indent << stringf("  ; begin %s\n", id);
 			indent += "    ";
 		}
 	}
@@ -201,7 +201,7 @@ struct BtorWorker
 	{
 		if (verbose) {
 			indent = indent.substr(4);
-			f << indent << stringf("  ; end %s\n", id.c_str());
+			f << indent << stringf("  ; end %s\n", id);
 		}
 	}
 
diff --git a/backends/firrtl/firrtl.cc b/backends/firrtl/firrtl.cc
index e4254f85a..7c9feebb1 100644
--- a/backends/firrtl/firrtl.cc
+++ b/backends/firrtl/firrtl.cc
@@ -253,7 +253,7 @@ void emit_extmodule(RTLIL::Cell *cell, RTLIL::Module *mod_instance, std::ostream
 	const std::string extmoduleFileinfo = getFileinfo(cell);
 
 	// Emit extmodule header.
-	f << stringf("  extmodule %s: %s\n", exported_name.c_str(), extmoduleFileinfo.c_str());
+	f << stringf("  extmodule %s: %s\n", exported_name, extmoduleFileinfo);
 
 	// Emit extmodule ports.
 	for (auto wire : mod_instance->wires())
@@ -280,7 +280,7 @@ void emit_extmodule(RTLIL::Cell *cell, RTLIL::Module *mod_instance, std::ostream
 	// Emit extmodule "defname" field. This is the name of the verilog blackbox
 	// that is used when verilog is emitted, so we use the name of mod_instance
 	// here.
-	f << stringf("%sdefname = %s\n", indent.c_str(), blackbox_name.c_str());
+	f << stringf("%sdefname = %s\n", indent, blackbox_name);
 
 	// Emit extmodule generic parameters.
 	for (const auto &p : cell->parameters)
@@ -301,7 +301,7 @@ void emit_extmodule(RTLIL::Cell *cell, RTLIL::Module *mod_instance, std::ostream
 			param_name.end()
 		);
 
-		f << stringf("%sparameter %s = %s\n", indent.c_str(), param_name.c_str(), param_value.c_str());
+		f << stringf("%sparameter %s = %s\n", indent, param_name, param_value);
 	}
 
 	f << "\n";
@@ -417,7 +417,7 @@ struct FirrtlWorker
 			else
 			{
 				string wire_id = make_id(chunk.wire->name);
-				new_expr = stringf("bits(%s, %d, %d)", wire_id.c_str(), chunk.offset + chunk.width - 1, chunk.offset);
+				new_expr = stringf("bits(%s, %d, %d)", wire_id, chunk.offset + chunk.width - 1, chunk.offset);
 			}
 
 			if (expr.empty())
@@ -477,7 +477,7 @@ struct FirrtlWorker
 			instanceOf;
 
 		std::string cellFileinfo = getFileinfo(cell);
-		wire_exprs.push_back(stringf("%s" "inst %s%s of %s %s", indent.c_str(), cell_name.c_str(), cell_name_comment.c_str(), instanceName.c_str(), cellFileinfo.c_str()));
+		wire_exprs.push_back(stringf("%s" "inst %s%s of %s %s", indent, cell_name, cell_name_comment, instanceName, cellFileinfo));
 
 		for (auto it = cell->connections().begin(); it != cell->connections().end(); ++it) {
 			if (it->second.size() > 0) {
@@ -518,7 +518,7 @@ struct FirrtlWorker
 					//  as part of the coalesced subfield assignments for this wire.
 					register_reverse_wire_map(sourceExpr, *sinkSig);
 				} else {
-					wire_exprs.push_back(stringf("\n%s%s <= %s %s", indent.c_str(), sinkExpr.c_str(), sourceExpr.c_str(), cellFileinfo.c_str()));
+					wire_exprs.push_back(stringf("\n%s%s <= %s %s", indent, sinkExpr, sourceExpr, cellFileinfo));
 				}
 			}
 		}
@@ -535,7 +535,7 @@ struct FirrtlWorker
 			int max_shift_width_bits = FIRRTL_MAX_DSH_WIDTH_ERROR - 1;
 			string max_shift_string = stringf("UInt<%d>(%d)", max_shift_width_bits, (1<<max_shift_width_bits) - 1);
 			// Deal with the difference in semantics between FIRRTL and verilog
-			result = stringf("mux(gt(%s, %s), %s, bits(%s, %d, 0))", b_expr.c_str(), max_shift_string.c_str(), max_shift_string.c_str(), b_expr.c_str(), max_shift_width_bits - 1);
+			result = stringf("mux(gt(%s, %s), %s, bits(%s, %d, 0))", b_expr, max_shift_string, max_shift_string, b_expr, max_shift_width_bits - 1);
 		}
 		return result;
 	}
@@ -543,7 +543,7 @@ struct FirrtlWorker
 	void emit_module()
 	{
 		std::string moduleFileinfo = getFileinfo(module);
-		f << stringf("  module %s: %s\n", make_id(module->name), moduleFileinfo.c_str());
+		f << stringf("  module %s: %s\n", make_id(module->name), moduleFileinfo);
 		vector<string> port_decls, wire_decls, mem_exprs, cell_exprs, wire_exprs;
 
 		std::vector<Mem> memories = Mem::get_all_memories(module);
@@ -602,7 +602,7 @@ struct FirrtlWorker
 			if (cell->type.in(ID($not), ID($logic_not), ID($_NOT_), ID($neg), ID($reduce_and), ID($reduce_or), ID($reduce_xor), ID($reduce_bool), ID($reduce_xnor)))
 			{
 				string a_expr = make_expr(cell->getPort(ID::A));
-				wire_decls.push_back(stringf("%swire %s: UInt<%d> %s\n", indent.c_str(), y_id.c_str(), y_width, cellFileinfo.c_str()));
+				wire_decls.push_back(stringf("%swire %s: UInt<%d> %s\n", indent, y_id, y_width, cellFileinfo));
 
 				if (a_signed) {
 					a_expr = "asSInt(" + a_expr + ")";
@@ -610,7 +610,7 @@ struct FirrtlWorker
 
 				// Don't use the results of logical operations (a single bit) to control padding
 				if (!(cell->type.in(ID($eq), ID($eqx), ID($gt), ID($ge), ID($lt), ID($le), ID($ne), ID($nex), ID($reduce_bool), ID($logic_not)) && y_width == 1) ) {
-					a_expr = stringf("pad(%s, %d)", a_expr.c_str(), y_width);
+					a_expr = stringf("pad(%s, %d)", a_expr, y_width);
 				}
 
 				// Assume the FIRRTL width is a single bit.
@@ -622,27 +622,27 @@ struct FirrtlWorker
 					firrtl_width = a_width;
 				} else if (cell->type == ID($logic_not)) {
 					primop = "eq";
-					a_expr = stringf("%s, UInt(0)", a_expr.c_str());
+					a_expr = stringf("%s, UInt(0)", a_expr);
 				}
 				else if (cell->type == ID($reduce_and)) primop = "andr";
 				else if (cell->type == ID($reduce_or)) primop = "orr";
 				else if (cell->type == ID($reduce_xor)) primop = "xorr";
 				else if (cell->type == ID($reduce_xnor)) {
 					primop = "not";
-					a_expr = stringf("xorr(%s)", a_expr.c_str());
+					a_expr = stringf("xorr(%s)", a_expr);
 				}
 				else if (cell->type == ID($reduce_bool)) {
 					primop = "neq";
 					// Use the sign of the a_expr and its width as the type (UInt/SInt) and width of the comparand.
-					a_expr = stringf("%s, %cInt<%d>(0)", a_expr.c_str(), a_signed ? 'S' : 'U', a_width);
+					a_expr = stringf("%s, %cInt<%d>(0)", a_expr, a_signed ? 'S' : 'U', a_width);
 				}
 
-				string expr = stringf("%s(%s)", primop.c_str(), a_expr.c_str());
+				string expr = stringf("%s(%s)", primop, a_expr);
 
 				if ((firrtl_is_signed && !always_uint))
-					expr = stringf("asUInt(%s)", expr.c_str());
+					expr = stringf("asUInt(%s)", expr);
 
-				cell_exprs.push_back(stringf("%s%s <= %s %s\n", indent.c_str(), y_id.c_str(), expr.c_str(), cellFileinfo.c_str()));
+				cell_exprs.push_back(stringf("%s%s <= %s %s\n", indent, y_id, expr, cellFileinfo));
 				register_reverse_wire_map(y_id, cell->getPort(ID::Y));
 
 				continue;
@@ -654,13 +654,13 @@ struct FirrtlWorker
 				string a_expr = make_expr(cell->getPort(ID::A));
 				string b_expr = make_expr(cell->getPort(ID::B));
 				std::string cellFileinfo = getFileinfo(cell);
-				wire_decls.push_back(stringf("%swire %s: UInt<%d> %s\n", indent.c_str(), y_id.c_str(), y_width, cellFileinfo.c_str()));
+				wire_decls.push_back(stringf("%swire %s: UInt<%d> %s\n", indent, y_id, y_width, cellFileinfo));
 
 				if (a_signed) {
 					a_expr = "asSInt(" + a_expr + ")";
 					// Expand the "A" operand to the result width
 					if (a_width < y_width) {
-						a_expr = stringf("pad(%s, %d)", a_expr.c_str(), y_width);
+						a_expr = stringf("pad(%s, %d)", a_expr, y_width);
 						a_width = y_width;
 					}
 				}
@@ -670,7 +670,7 @@ struct FirrtlWorker
 					b_expr = "asSInt(" + b_expr + ")";
 					// Expand the "B" operand to the result width
 					if (b_width < y_width) {
-						b_expr = stringf("pad(%s, %d)", b_expr.c_str(), y_width);
+						b_expr = stringf("pad(%s, %d)", b_expr, y_width);
 						b_width = y_width;
 					}
 				}
@@ -680,11 +680,11 @@ struct FirrtlWorker
 				if (cell->type.in(ID($add), ID($sub), ID($mul), ID($div), ID($mod), ID($xor), ID($_XOR_), ID($xnor), ID($and), ID($_AND_), ID($or), ID($_OR_)))
 				{
 					if (a_width < y_width) {
-						a_expr = stringf("pad(%s, %d)", a_expr.c_str(), y_width);
+						a_expr = stringf("pad(%s, %d)", a_expr, y_width);
 						a_width = y_width;
 					}
 					if (b_width < y_width) {
-						b_expr = stringf("pad(%s, %d)", b_expr.c_str(), y_width);
+						b_expr = stringf("pad(%s, %d)", b_expr, y_width);
 						b_width = y_width;
 					}
 				}
@@ -856,23 +856,23 @@ struct FirrtlWorker
 				string expr;
 				// Deal with $xnor == ~^ (not xor)
 				if (primop == "xnor") {
-					expr = stringf("not(xor(%s, %s))", a_expr.c_str(), b_expr.c_str());
+					expr = stringf("not(xor(%s, %s))", a_expr, b_expr);
 				} else {
-					expr = stringf("%s(%s, %s)", primop.c_str(), a_expr.c_str(), b_expr.c_str());
+					expr = stringf("%s(%s, %s)", primop, a_expr, b_expr);
 				}
 
 				// Deal with FIRRTL's "shift widens" semantics, or the need to widen the FIRRTL result.
 				// If the operation is signed, the FIRRTL width will be 1 one bit larger.
 				if (extract_y_bits) {
-					expr = stringf("bits(%s, %d, 0)", expr.c_str(), y_width - 1);
+					expr = stringf("bits(%s, %d, 0)", expr, y_width - 1);
 				} else if (firrtl_is_signed && (firrtl_width + 1) < y_width) {
-					expr = stringf("pad(%s, %d)", expr.c_str(), y_width);
+					expr = stringf("pad(%s, %d)", expr, y_width);
 				}
 
 				if ((firrtl_is_signed && !always_uint))
-					expr = stringf("asUInt(%s)", expr.c_str());
+					expr = stringf("asUInt(%s)", expr);
 
-				cell_exprs.push_back(stringf("%s%s <= %s %s\n", indent.c_str(), y_id.c_str(), expr.c_str(), cellFileinfo.c_str()));
+				cell_exprs.push_back(stringf("%s%s <= %s %s\n", indent, y_id, expr, cellFileinfo));
 				register_reverse_wire_map(y_id, cell->getPort(ID::Y));
 
 				continue;
@@ -887,9 +887,9 @@ struct FirrtlWorker
 				string s_expr = make_expr(cell->getPort(ID::S));
 				wire_decls.push_back(stringf("%swire %s: UInt<%d> %s\n", indent.c_str(), y_id.c_str(), width, cellFileinfo.c_str()));
 
-				string expr = stringf("mux(%s, %s, %s)", s_expr.c_str(), b_expr.c_str(), a_expr.c_str());
+				string expr = stringf("mux(%s, %s, %s)", s_expr, b_expr, a_expr);
 
-				cell_exprs.push_back(stringf("%s%s <= %s %s\n", indent.c_str(), y_id.c_str(), expr.c_str(), cellFileinfo.c_str()));
+				cell_exprs.push_back(stringf("%s%s <= %s %s\n", indent, y_id, expr, cellFileinfo));
 				register_reverse_wire_map(y_id, cell->getPort(ID::Y));
 
 				continue;
@@ -911,9 +911,9 @@ struct FirrtlWorker
 				string expr = make_expr(cell->getPort(ID::D));
 				string clk_expr = "asClock(" + make_expr(cell->getPort(ID::CLK)) + ")";
 
-				wire_decls.push_back(stringf("%sreg %s: UInt<%d>, %s %s\n", indent.c_str(), y_id.c_str(), width, clk_expr.c_str(), cellFileinfo.c_str()));
+				wire_decls.push_back(stringf("%sreg %s: UInt<%d>, %s %s\n", indent, y_id, width, clk_expr, cellFileinfo));
 
-				cell_exprs.push_back(stringf("%s%s <= %s %s\n", indent.c_str(), y_id.c_str(), expr.c_str(), cellFileinfo.c_str()));
+				cell_exprs.push_back(stringf("%s%s <= %s %s\n", indent, y_id, expr, cellFileinfo));
 				register_reverse_wire_map(y_id, cell->getPort(ID::Q));
 
 				continue;
@@ -934,7 +934,7 @@ struct FirrtlWorker
 					int b_sign = cell->parameters.at(ID::B_WIDTH).as_int() - 1;
 					b_expr = stringf("validif(not(bits(%s, %d, %d)), %s)", b_string, b_sign, b_sign, b_string);
 				}
-				string expr = stringf("dshr(%s, %s)", a_expr.c_str(), b_expr.c_str());
+				string expr = stringf("dshr(%s, %s)", a_expr, b_expr);
 
 				cell_exprs.push_back(stringf("%s%s <= %s\n", indent.c_str(), y_id.c_str(), expr.c_str()));
 				register_reverse_wire_map(y_id, cell->getPort(ID::Y));
@@ -973,7 +973,7 @@ struct FirrtlWorker
 				// Verilog appears to treat the result as signed, so if the result is wider than "A",
 				//  we need to pad.
 				if (a_width < y_width) {
-					a_expr = stringf("pad(%s, %d)", a_expr.c_str(), y_width);
+					a_expr = stringf("pad(%s, %d)", a_expr, y_width);
 				}
 				wire_decls.push_back(stringf("%swire %s: UInt<%d>\n", indent.c_str(), y_id.c_str(), y_width));
 				cell_exprs.push_back(stringf("%s%s <= %s\n", indent.c_str(), y_id.c_str(), a_expr.c_str()));
diff --git a/backends/intersynth/intersynth.cc b/backends/intersynth/intersynth.cc
index dcf107de3..4c098e019 100644
--- a/backends/intersynth/intersynth.cc
+++ b/backends/intersynth/intersynth.cc
@@ -172,7 +172,7 @@ struct IntersynthBackend : public Backend {
 					if (sig.size() != 0) {
 						conntypes_code.insert(stringf("conntype b%d %d 2 %d\n", sig.size(), sig.size(), sig.size()));
 						celltype_code += stringf(" b%d %s%s", sig.size(), ct.cell_output(cell->type, port.first) ? "*" : "", log_id(port.first));
-						node_code += stringf(" %s %s", log_id(port.first), netname(conntypes_code, celltypes_code, constcells_code, sig).c_str());
+						node_code += stringf(" %s %s", log_id(port.first), netname(conntypes_code, celltypes_code, constcells_code, sig));
 					}
 				}
 				for (auto &param : cell->parameters) {
@@ -199,13 +199,13 @@ struct IntersynthBackend : public Backend {
 		if (!flag_notypes) {
 			*f << stringf("### Connection Types\n");
 			for (auto code : conntypes_code)
-				*f << stringf("%s", code.c_str());
+				*f << stringf("%s", code);
 			*f << stringf("\n### Cell Types\n");
 			for (auto code : celltypes_code)
-				*f << stringf("%s", code.c_str());
+				*f << stringf("%s", code);
 		}
 		*f << stringf("\n### Netlists\n");
-		*f << stringf("%s", netlists_code.c_str());
+		*f << stringf("%s", netlists_code);
 
 		for (auto lib : libs)
 			delete lib;
diff --git a/backends/simplec/simplec.cc b/backends/simplec/simplec.cc
index e70c62a71..1ab586e43 100644
--- a/backends/simplec/simplec.cc
+++ b/backends/simplec/simplec.cc
@@ -218,8 +218,8 @@ struct SimplecWorker
 				s[i] -= 'a' - 'A';
 
 		util_declarations.push_back("");
-		util_declarations.push_back(stringf("#ifndef %s", s.c_str()));
-		util_declarations.push_back(stringf("#define %s", s.c_str()));
+		util_declarations.push_back(stringf("#ifndef %s", s));
+		util_declarations.push_back(stringf("#define %s", s));
 	}
 
 	string util_get_bit(const string &signame, int n, int idx)
@@ -232,33 +232,33 @@ struct SimplecWorker
 		if (generated_utils.count(util_name) == 0)
 		{
 			util_ifdef_guard(util_name);
-			util_declarations.push_back(stringf("static inline bool %s(const %s *sig)", util_name.c_str(), sigtype(n).c_str()));
+			util_declarations.push_back(stringf("static inline bool %s(const %s *sig)", util_name, sigtype(n)));
 			util_declarations.push_back(stringf("{"));
 
 			int word_idx = idx / max_uintsize, word_offset = idx % max_uintsize;
 			string value_name = stringf("value_%d_%d", std::min(n-1, (word_idx+1)*max_uintsize-1), word_idx*max_uintsize);
 
-			util_declarations.push_back(stringf("  return (sig->%s >> %d) & 1;", value_name.c_str(), word_offset));
+			util_declarations.push_back(stringf("  return (sig->%s >> %d) & 1;", value_name, word_offset));
 
 			util_declarations.push_back(stringf("}"));
 			util_declarations.push_back(stringf("#endif"));
 			generated_utils.insert(util_name);
 		}
 
-		return stringf("%s(&%s)", util_name.c_str(), signame.c_str());
+		return stringf("%s(&%s)", util_name, signame);
 	}
 
 	string util_set_bit(const string &signame, int n, int idx, const string &expr)
 	{
 		if (n == 1 && idx == 0)
-			return stringf("  %s.value_0_0 = %s;", signame.c_str(), expr.c_str());
+			return stringf("  %s.value_0_0 = %s;", signame, expr);
 
 		string util_name = stringf("yosys_simplec_set_bit_%d_of_%d", idx, n);
 
 		if (generated_utils.count(util_name) == 0)
 		{
 			util_ifdef_guard(util_name);
-			util_declarations.push_back(stringf("static inline void %s(%s *sig, bool value)", util_name.c_str(), sigtype(n).c_str()));
+			util_declarations.push_back(stringf("static inline void %s(%s *sig, bool value)", util_name, sigtype(n)));
 			util_declarations.push_back(stringf("{"));
 
 			int word_idx = idx / max_uintsize, word_offset = idx % max_uintsize;
@@ -266,9 +266,9 @@ struct SimplecWorker
 
 		#if 0
 			util_declarations.push_back(stringf("  if (value)"));
-			util_declarations.push_back(stringf("    sig->%s |= 1UL << %d;", value_name.c_str(), word_offset));
+			util_declarations.push_back(stringf("    sig->%s |= 1UL << %d;", value_name, word_offset));
 			util_declarations.push_back(stringf("  else"));
-			util_declarations.push_back(stringf("    sig->%s &= ~(1UL << %d);", value_name.c_str(), word_offset));
+			util_declarations.push_back(stringf("    sig->%s &= ~(1UL << %d);", value_name, word_offset));
 		#else
 			util_declarations.push_back(stringf("    sig->%s = (sig->%s & ~((uint%d_t)1 << %d)) | ((uint%d_t)value << %d);",
 					value_name.c_str(), value_name.c_str(), max_uintsize, word_offset, max_uintsize, word_offset));
@@ -279,7 +279,7 @@ struct SimplecWorker
 			generated_utils.insert(util_name);
 		}
 
-		return stringf("  %s(&%s, %s);", util_name.c_str(), signame.c_str(), expr.c_str());
+		return stringf("  %s(&%s, %s);", util_name, signame, expr);
 	}
 
 	void create_module_struct(Module *mod)
@@ -339,38 +339,38 @@ struct SimplecWorker
 		for (int i = 0; i < GetSize(topo.sorted); i++)
 			topoidx[mod->cell(topo.sorted[i])] = i;
 
-		string ifdef_name = stringf("yosys_simplec_%s_state_t", cid(mod->name).c_str());
+		string ifdef_name = stringf("yosys_simplec_%s_state_t", cid(mod->name));
 
 		for (int i = 0; i < GetSize(ifdef_name); i++)
 			if ('a' <= ifdef_name[i] && ifdef_name[i] <= 'z')
 				ifdef_name[i] -= 'a' - 'A';
 
 		struct_declarations.push_back("");
-		struct_declarations.push_back(stringf("#ifndef %s", ifdef_name.c_str()));
-		struct_declarations.push_back(stringf("#define %s", ifdef_name.c_str()));
-		struct_declarations.push_back(stringf("struct %s_state_t", cid(mod->name).c_str()));
+		struct_declarations.push_back(stringf("#ifndef %s", ifdef_name));
+		struct_declarations.push_back(stringf("#define %s", ifdef_name));
+		struct_declarations.push_back(stringf("struct %s_state_t", cid(mod->name)));
 		struct_declarations.push_back("{");
 
 		struct_declarations.push_back("  // Input Ports");
 		for (Wire *w : mod->wires())
 			if (w->port_input)
-				struct_declarations.push_back(stringf("  %s %s; // %s", sigtype(w->width).c_str(), cid(w->name).c_str(), log_id(w)));
+				struct_declarations.push_back(stringf("  %s %s; // %s", sigtype(w->width), cid(w->name), log_id(w)));
 
 		struct_declarations.push_back("");
 		struct_declarations.push_back("  // Output Ports");
 		for (Wire *w : mod->wires())
 			if (!w->port_input && w->port_output)
-				struct_declarations.push_back(stringf("  %s %s; // %s", sigtype(w->width).c_str(), cid(w->name).c_str(), log_id(w)));
+				struct_declarations.push_back(stringf("  %s %s; // %s", sigtype(w->width), cid(w->name), log_id(w)));
 
 		struct_declarations.push_back("");
 		struct_declarations.push_back("  // Internal Wires");
 		for (Wire *w : mod->wires())
 			if (!w->port_input && !w->port_output)
-				struct_declarations.push_back(stringf("  %s %s; // %s", sigtype(w->width).c_str(), cid(w->name).c_str(), log_id(w)));
+				struct_declarations.push_back(stringf("  %s %s; // %s", sigtype(w->width), cid(w->name), log_id(w)));
 
 		for (Cell *c : mod->cells())
 			if (design->module(c->type))
-				struct_declarations.push_back(stringf("  struct %s_state_t %s; // %s", cid(c->type).c_str(), cid(c->name).c_str(), log_id(c)));
+				struct_declarations.push_back(stringf("  struct %s_state_t %s; // %s", cid(c->type), cid(c->name), log_id(c)));
 
 		struct_declarations.push_back(stringf("};"));
 		struct_declarations.push_back("#endif");
@@ -407,14 +407,14 @@ struct SimplecWorker
 			string b_expr = b.wire ? util_get_bit(work->prefix + cid(b.wire->name), b.wire->width, b.offset) : b.data ? "1" : "0";
 			string expr;
 
-			if (cell->type == ID($_AND_))    expr = stringf("%s & %s",    a_expr.c_str(), b_expr.c_str());
-			if (cell->type == ID($_NAND_))   expr = stringf("!(%s & %s)", a_expr.c_str(), b_expr.c_str());
-			if (cell->type == ID($_OR_))     expr = stringf("%s | %s",    a_expr.c_str(), b_expr.c_str());
-			if (cell->type == ID($_NOR_))    expr = stringf("!(%s | %s)", a_expr.c_str(), b_expr.c_str());
-			if (cell->type == ID($_XOR_))    expr = stringf("%s ^ %s",    a_expr.c_str(), b_expr.c_str());
-			if (cell->type == ID($_XNOR_))   expr = stringf("!(%s ^ %s)", a_expr.c_str(), b_expr.c_str());
-			if (cell->type == ID($_ANDNOT_)) expr = stringf("%s & (!%s)", a_expr.c_str(), b_expr.c_str());
-			if (cell->type == ID($_ORNOT_))  expr = stringf("%s | (!%s)", a_expr.c_str(), b_expr.c_str());
+			if (cell->type == ID($_AND_))    expr = stringf("%s & %s",    a_expr, b_expr);
+			if (cell->type == ID($_NAND_))   expr = stringf("!(%s & %s)", a_expr, b_expr);
+			if (cell->type == ID($_OR_))     expr = stringf("%s | %s",    a_expr, b_expr);
+			if (cell->type == ID($_NOR_))    expr = stringf("!(%s | %s)", a_expr, b_expr);
+			if (cell->type == ID($_XOR_))    expr = stringf("%s ^ %s",    a_expr, b_expr);
+			if (cell->type == ID($_XNOR_))   expr = stringf("!(%s ^ %s)", a_expr, b_expr);
+			if (cell->type == ID($_ANDNOT_)) expr = stringf("%s & (!%s)", a_expr, b_expr);
+			if (cell->type == ID($_ORNOT_))  expr = stringf("%s | (!%s)", a_expr, b_expr);
 
 			log_assert(y.wire);
 			funct_declarations.push_back(util_set_bit(work->prefix + cid(y.wire->name), y.wire->width, y.offset, expr) +
@@ -436,8 +436,8 @@ struct SimplecWorker
 			string c_expr = c.wire ? util_get_bit(work->prefix + cid(c.wire->name), c.wire->width, c.offset) : c.data ? "1" : "0";
 			string expr;
 
-			if (cell->type == ID($_AOI3_)) expr = stringf("!((%s & %s) | %s)", a_expr.c_str(), b_expr.c_str(), c_expr.c_str());
-			if (cell->type == ID($_OAI3_)) expr = stringf("!((%s | %s) & %s)", a_expr.c_str(), b_expr.c_str(), c_expr.c_str());
+			if (cell->type == ID($_AOI3_)) expr = stringf("!((%s & %s) | %s)", a_expr, b_expr, c_expr);
+			if (cell->type == ID($_OAI3_)) expr = stringf("!((%s | %s) & %s)", a_expr, b_expr, c_expr);
 
 			log_assert(y.wire);
 			funct_declarations.push_back(util_set_bit(work->prefix + cid(y.wire->name), y.wire->width, y.offset, expr) +
@@ -461,8 +461,8 @@ struct SimplecWorker
 			string d_expr = d.wire ? util_get_bit(work->prefix + cid(d.wire->name), d.wire->width, d.offset) : d.data ? "1" : "0";
 			string expr;
 
-			if (cell->type == ID($_AOI4_)) expr = stringf("!((%s & %s) | (%s & %s))", a_expr.c_str(), b_expr.c_str(), c_expr.c_str(), d_expr.c_str());
-			if (cell->type == ID($_OAI4_)) expr = stringf("!((%s | %s) & (%s | %s))", a_expr.c_str(), b_expr.c_str(), c_expr.c_str(), d_expr.c_str());
+			if (cell->type == ID($_AOI4_)) expr = stringf("!((%s & %s) | (%s & %s))", a_expr, b_expr, c_expr, d_expr);
+			if (cell->type == ID($_OAI4_)) expr = stringf("!((%s | %s) & (%s | %s))", a_expr, b_expr, c_expr, d_expr);
 
 			log_assert(y.wire);
 			funct_declarations.push_back(util_set_bit(work->prefix + cid(y.wire->name), y.wire->width, y.offset, expr) +
@@ -484,9 +484,9 @@ struct SimplecWorker
 			string s_expr = s.wire ? util_get_bit(work->prefix + cid(s.wire->name), s.wire->width, s.offset) : s.data ? "1" : "0";
 
 			// casts to bool are a workaround for CBMC bug (https://github.com/diffblue/cbmc/issues/933)
-			string expr = stringf("%s ? %s(bool)%s : %s(bool)%s", s_expr.c_str(),
-					cell->type == ID($_NMUX_) ? "!" : "", b_expr.c_str(),
-					cell->type == ID($_NMUX_) ? "!" : "", a_expr.c_str());
+			string expr = stringf("%s ? %s(bool)%s : %s(bool)%s", s_expr,
+					cell->type == ID($_NMUX_) ? "!" : "", b_expr,
+					cell->type == ID($_NMUX_) ? "!" : "", a_expr);
 
 			log_assert(y.wire);
 			funct_declarations.push_back(util_set_bit(work->prefix + cid(y.wire->name), y.wire->width, y.offset, expr) +
@@ -518,7 +518,7 @@ struct SimplecWorker
 							continue;
 						if (verbose)
 							log("    Propagating %s.%s[%d:%d].\n", work->log_prefix.c_str(), log_id(chunk.wire), chunk.offset+chunk.width-1, chunk.offset);
-						funct_declarations.push_back(stringf("  // Updated signal in %s: %s", work->log_prefix.c_str(), log_signal(chunk)));
+						funct_declarations.push_back(stringf("  // Updated signal in %s: %s", work->log_prefix, log_signal(chunk)));
 					}
 
 					for (SigBit bit : dirtysig)
@@ -636,7 +636,7 @@ struct SimplecWorker
 		reactivated_cells.clear();
 
 		funct_declarations.push_back("");
-		funct_declarations.push_back(stringf("static void %s(struct %s_state_t *state)", func_name.c_str(), cid(work->module->name).c_str()));
+		funct_declarations.push_back(stringf("static void %s(struct %s_state_t *state)", func_name, cid(work->module->name)));
 		funct_declarations.push_back("{");
 		for (auto &line : preamble)
 			funct_declarations.push_back(line);
diff --git a/backends/spice/spice.cc b/backends/spice/spice.cc
index e55db95e1..573093ff7 100644
--- a/backends/spice/spice.cc
+++ b/backends/spice/spice.cc
@@ -51,16 +51,16 @@ static void print_spice_net(std::ostream &f, RTLIL::SigBit s, std::string &neg,
 		if (s.wire->port_id)
 			use_inames = true;
 		if (s.wire->width > 1)
-			f << stringf(" %s.%d", spice_id2str(s.wire->name, use_inames, inums).c_str(), s.offset);
+			f << stringf(" %s.%d", spice_id2str(s.wire->name, use_inames, inums), s.offset);
 		else
-			f << stringf(" %s", spice_id2str(s.wire->name, use_inames, inums).c_str());
+			f << stringf(" %s", spice_id2str(s.wire->name, use_inames, inums));
 	} else {
 		if (s == RTLIL::State::S0)
-			f << stringf(" %s", neg.c_str());
+			f << stringf(" %s", neg);
 		else if (s == RTLIL::State::S1)
-			f << stringf(" %s", pos.c_str());
+			f << stringf(" %s", pos);
 		else
-			f << stringf(" %s%d", ncpf.c_str(), nc_counter++);
+			f << stringf(" %s%d", ncpf, nc_counter++);
 	}
 }
 
@@ -119,7 +119,7 @@ static void print_spice_module(std::ostream &f, RTLIL::Module *module, RTLIL::De
 			}
 		}
 
-		f << stringf(" %s\n", spice_id2str(cell->type).c_str());
+		f << stringf(" %s\n", spice_id2str(cell->type));
 	}
 
 	for (auto &conn : module->connections())
@@ -127,7 +127,7 @@ static void print_spice_module(std::ostream &f, RTLIL::Module *module, RTLIL::De
 		f << (buf == "DC" ? stringf("V%d", conn_counter++) : stringf("X%d", cell_counter++));
 		print_spice_net(f, conn.second.extract(i, 1), neg, pos, ncpf, nc_counter, use_inames, inums);
 		print_spice_net(f, conn.first.extract(i, 1), neg, pos, ncpf, nc_counter, use_inames, inums);
-		f << (buf == "DC" ? " DC 0\n" : stringf(" %s\n", buf.c_str()));
+		f << (buf == "DC" ? " DC 0\n" : stringf(" %s\n", buf));
 	}
 }
 
@@ -242,18 +242,18 @@ struct SpiceBackend : public Backend {
 				ports.at(wire->port_id-1) = wire;
 			}
 
-			*f << stringf(".SUBCKT %s", spice_id2str(module->name).c_str());
+			*f << stringf(".SUBCKT %s", spice_id2str(module->name));
 			for (RTLIL::Wire *wire : ports) {
 				log_assert(wire != NULL);
 				if (wire->width > 1) {
 					for (int i = 0; i < wire->width; i++)
-						*f << stringf(" %s.%d", spice_id2str(wire->name).c_str(), big_endian ? wire->width - 1 - i : i);
+						*f << stringf(" %s.%d", spice_id2str(wire->name), big_endian ? wire->width - 1 - i : i);
 				} else
-					*f << stringf(" %s", spice_id2str(wire->name).c_str());
+					*f << stringf(" %s", spice_id2str(wire->name));
 			}
 			*f << stringf("\n");
 			print_spice_module(*f, module, design, neg, pos, buf, ncpf, big_endian, use_inames);
-			*f << stringf(".ENDS %s\n\n", spice_id2str(module->name).c_str());
+			*f << stringf(".ENDS %s\n\n", spice_id2str(module->name));
 		}
 
 		if (!top_module_name.empty()) {

From 6a2984540b5cc0d70966b10b3e6e7c73d5c910a8 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 18 Jul 2024 15:48:52 +0200
Subject: [PATCH 405/931] bitpattern: comments

---
 kernel/bitpattern.h | 49 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/kernel/bitpattern.h b/kernel/bitpattern.h
index 821490dca..0e12e6dce 100644
--- a/kernel/bitpattern.h
+++ b/kernel/bitpattern.h
@@ -25,6 +25,18 @@
 
 YOSYS_NAMESPACE_BEGIN
 
+/**
+ * This file implements BitPatternPool for efficiently storing and querying
+ * sets of fixed-width 2-valued logic constants compressed as "bit patterns".
+ * A bit pattern can have don't cares on one or more bit positions (State::Sa).
+ *
+ * In terms of logic synthesis:
+ * A BitPatternPool is a sum of products (SOP).
+ * BitPatternPool::bits_t is a cube.
+ *
+ * BitPatternPool does not permit adding new patterns, only removing.
+ * Its intended use case is in analysing cases in case/match constructs in HDL.
+ */
 struct BitPatternPool
 {
 	int width;
@@ -67,6 +79,9 @@ struct BitPatternPool
 		}
 	}
 
+	/**
+	 * Constructs a pool of all possible patterns (all don't-care bits)
+	 */
 	BitPatternPool(int width)
 	{
 		this->width = width;
@@ -78,6 +93,10 @@ struct BitPatternPool
 		}
 	}
 
+	/**
+	 * Convert a constant SigSpec to a pattern. Normalize Yosys many-valued
+	 * to three-valued logic.
+	 */
 	bits_t sig2bits(RTLIL::SigSpec sig)
 	{
 		bits_t bits;
@@ -88,6 +107,9 @@ struct BitPatternPool
 		return bits;
 	}
 
+	/**
+	 * Two cubes match if their intersection is non-empty.
+	 */
 	bool match(bits_t a, bits_t b)
 	{
 		log_assert(int(a.bitdata.size()) == width);
@@ -98,6 +120,15 @@ struct BitPatternPool
 		return true;
 	}
 
+	/**
+	 * Does cube sig overlap any cube in the pool?
+	 * For example:
+	 * pool({aaa}).has_any(01a) == true
+	 * pool({01a}).has_any(01a) == true
+	 * pool({011}).has_any(01a) == true
+	 * pool({01a}).has_any(011) == true
+	 * pool({111}).has_any(01a) == false
+	 */
 	bool has_any(RTLIL::SigSpec sig)
 	{
 		bits_t bits = sig2bits(sig);
@@ -107,6 +138,15 @@ struct BitPatternPool
 		return false;
 	}
 
+	/**
+	 * Is cube sig covered by a cube in the pool?
+	 * For example:
+	 * pool({aaa}).has_all(01a) == true
+	 * pool({01a}).has_any(01a) == true
+	 * pool({01a}).has_any(011) == true
+	 * pool({011}).has_all(01a) == false
+	 * pool({111}).has_all(01a) == false
+	 */
 	bool has_all(RTLIL::SigSpec sig)
 	{
 		bits_t bits = sig2bits(sig);
@@ -121,6 +161,12 @@ struct BitPatternPool
 		return false;
 	}
 
+	/**
+	 * Remove cube sig from the pool, splitting the remaining cubes. True if success.
+	 * For example:
+	 * Taking 011 out of pool({01a}) -> pool({010}), returns true.
+	 * Taking 011 out of pool({010}) does nothing, returns false.
+	 */
 	bool take(RTLIL::SigSpec sig)
 	{
 		bool status = false;
@@ -143,6 +189,9 @@ struct BitPatternPool
 		return status;
 	}
 
+	/**
+	 * Remove all patterns. Returns false if already empty.
+	 */
 	bool take_all()
 	{
 		if (database.empty())

From 7ee62c832b19d5b18b822af7603a6fb1898ca748 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 18 Aug 2025 19:50:43 +0200
Subject: [PATCH 406/931] bitpattern: unit test

---
 tests/unit/kernel/bitpatternTest.cc | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 tests/unit/kernel/bitpatternTest.cc

diff --git a/tests/unit/kernel/bitpatternTest.cc b/tests/unit/kernel/bitpatternTest.cc
new file mode 100644
index 000000000..001d47060
--- /dev/null
+++ b/tests/unit/kernel/bitpatternTest.cc
@@ -0,0 +1,32 @@
+#include <gtest/gtest.h>
+
+#include "kernel/bitpattern.h"
+#include "kernel/rtlil.h"
+
+YOSYS_NAMESPACE_BEGIN
+
+TEST(BitpatternTest, has)
+{
+    SigSpec _aaa = {RTLIL::Sa, RTLIL::Sa, RTLIL::Sa};
+    SigSpec _01a = {RTLIL::S0, RTLIL::S1, RTLIL::Sa};
+    SigSpec _011 = {RTLIL::S0, RTLIL::S1, RTLIL::S1};
+    SigSpec _111 = {RTLIL::S1, RTLIL::S1, RTLIL::S1};
+
+    EXPECT_TRUE(BitPatternPool(_aaa).has_any(_01a));
+    EXPECT_TRUE(BitPatternPool(_01a).has_any(_01a));
+    // 011 overlaps with 01a
+    EXPECT_TRUE(BitPatternPool(_011).has_any(_01a));
+    // overlap is symmetric
+    EXPECT_TRUE(BitPatternPool(_01a).has_any(_011));
+    EXPECT_FALSE(BitPatternPool(_111).has_any(_01a));
+
+	EXPECT_TRUE(BitPatternPool(_aaa).has_all(_01a));
+	EXPECT_TRUE(BitPatternPool(_01a).has_all(_01a));
+    // 011 is covered by 01a
+    EXPECT_TRUE(BitPatternPool(_01a).has_all(_011));
+    // 01a is not covered by 011
+    EXPECT_FALSE(BitPatternPool(_011).has_all(_01a));
+    EXPECT_FALSE(BitPatternPool(_111).has_all(_01a));
+}
+
+YOSYS_NAMESPACE_END

From b640a16b07ec7c313ee3d97a4a84b0eccd3d59f9 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Mon, 18 Aug 2025 20:39:00 +0200
Subject: [PATCH 407/931] Revert "Workflow adjustments"

---
 .github/workflows/extra-builds.yml    |  16 +---
 .github/workflows/test-build.yml      |  36 ++++-----
 .github/workflows/test-compile.yml    |  16 +---
 .github/workflows/test-sanitizers.yml | 105 --------------------------
 .github/workflows/test-verific.yml    |  16 +---
 5 files changed, 28 insertions(+), 161 deletions(-)
 delete mode 100644 .github/workflows/test-sanitizers.yml

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 11fd42a6c..458eb76a6 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -1,14 +1,6 @@
 name: Test extra build flows
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre_job:
@@ -19,11 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   vs-prep:
     name: Prepare Visual Studio build
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index f44dee1ba..f9574594a 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -1,14 +1,6 @@
 name: Build and run tests
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre_job:
@@ -19,12 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
-
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
   pre_docs_job:
     runs-on: ubuntu-latest
     outputs:
@@ -33,16 +24,15 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on readme changes
           paths_ignore: '["**/README.md"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   build-yosys:
     name: Reusable build
     runs-on: ${{ matrix.os }}
-    # pre_job is a subset of pre_docs_job, so we can always build for pre_docs_job
     needs: pre_docs_job
     if: needs.pre_docs_job.outputs.should_skip != 'true'
     env:
@@ -50,6 +40,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -67,6 +58,7 @@ jobs:
           mkdir build
           cd build
           make -f ../Makefile config-$CC
+          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
           make -f ../Makefile -j$procs ENABLE_LTO=1
 
       - name: Log yosys-config output
@@ -82,7 +74,7 @@ jobs:
       - name: Store build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
           path: build.tar
           retention-days: 1
 
@@ -93,9 +85,12 @@ jobs:
     if: needs.pre_job.outputs.should_skip != 'true'
     env:
       CC: clang
+      ASAN_OPTIONS: halt_on_error=1
+      UBSAN_OPTIONS: halt_on_error=1
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -144,7 +139,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Uncompress build
         shell: bash
@@ -214,6 +209,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -227,7 +223,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Uncompress build
         shell: bash
diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index f208b911a..7a706e69a 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -1,14 +1,6 @@
 name: Compiler testing
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre_job:
@@ -19,11 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   test-compile:
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
deleted file mode 100644
index fb76d1266..000000000
--- a/.github/workflows/test-sanitizers.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-name: Check clang sanitizers
-
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # ignore PRs due to time needed
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
-
-jobs:
-  pre_job:
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          # don't run on documentation changes
-          paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
-
-  run_san:
-    name: Build and run tests
-    runs-on: ${{ matrix.os }}
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
-    env:
-      CC: clang
-      ASAN_OPTIONS: halt_on_error=1
-      UBSAN_OPTIONS: halt_on_error=1
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        sanitizer: ['undefined,address']
-      fail-fast: false
-    steps:
-      - name: Checkout Yosys
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-          persist-credentials: false
-
-      - name: Setup environment
-        uses: ./.github/actions/setup-build-env
-
-      - name: Build
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          make -f ../Makefile config-$CC
-          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
-          make -f ../Makefile -j$procs ENABLE_LTO=1
-
-      - name: Log yosys-config output
-        run: |
-          ./yosys-config || true
-
-      - name: Get iverilog
-        shell: bash
-        run: |
-          git clone https://github.com/steveicarus/iverilog.git
-          cd iverilog
-          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
-
-      - name: Get vcd2fst
-        shell: bash
-        run: |
-          git clone https://github.com/mmicko/libwave.git
-          mkdir -p ${{ github.workspace }}/.local/
-          cd libwave
-          cmake . -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.local
-          make -j$procs
-          make install
-
-      - name: Cache iverilog
-        id: cache-iverilog
-        uses: actions/cache@v4
-        with:
-          path: .local/
-          key: ${{ matrix.os }}-${IVERILOG_GIT}
-
-      - name: Build iverilog
-        if: steps.cache-iverilog.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          mkdir -p ${{ github.workspace }}/.local/
-          cd iverilog
-          autoconf
-          CC=gcc CXX=g++ ./configure --prefix=${{ github.workspace }}/.local
-          make -j$procs
-          make install
-
-      - name: Run tests
-        shell: bash
-        run: |
-          make -j$procs test TARGETS= EXTRA_TARGETS= CONFIG=$CC
-
-      - name: Report errors
-        if: ${{ failure() }}
-        shell: bash
-        run: |
-          find tests/**/*.err -print -exec cat {} \;
diff --git a/.github/workflows/test-verific.yml b/.github/workflows/test-verific.yml
index 9af07b920..013c9f8ca 100644
--- a/.github/workflows/test-verific.yml
+++ b/.github/workflows/test-verific.yml
@@ -1,14 +1,6 @@
 name: Build and run tests with Verific (Linux)
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre-job:
@@ -19,11 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   test-verific:
     needs: pre-job

From 6cbd44daa5362b87a084809f6f3b6808815a08ba Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Mon, 18 Aug 2025 22:34:15 +0300
Subject: [PATCH 408/931] wheels: bison 3.8 on almalinux + memory pressure
 easing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- cibw now builds and uses bison 3.8.2 explicitly on platforms with no or out-of-date bison — AlmaLinux 8 only goes up to Bison 3.0
- cibw environment now includes `OPTFLAGS=-O3` to avoid generating debug info for abc, saving space in memory during linking
- setup.py attempts to build `yosys-abc` independently first to avoid memory pressure from gigantic abc link step running in parallel with something else
---
 .github/workflows/wheels.yml                | 15 ++++++---
 .github/workflows/wheels/_run_cibw_linux.py | 14 ++++++--
 .github/workflows/wheels/cibw_before_all.sh | 36 ++++++++++++++-------
 .gitignore                                  |  1 +
 setup.py                                    | 20 +++++++++---
 5 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index d81e340aa..b48b981a8 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -4,7 +4,7 @@ name: Build Wheels for PyPI
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 10 * * 0'
+    - cron: "0 10 * * 0"
 
 jobs:
   build_wheels:
@@ -54,9 +54,6 @@ jobs:
           fetch-depth: 0
           submodules: true
           persist-credentials: false
-      - if: ${{ matrix.os.family == 'linux' }}
-        name: "[Linux] Set up QEMU"
-        uses: docker/setup-qemu-action@v3
       - uses: actions/setup-python@v5
       - name: Get Boost Source
         shell: bash
@@ -68,6 +65,12 @@ jobs:
         run: |
           mkdir -p ffi
           curl -L https://github.com/libffi/libffi/releases/download/v3.4.6/libffi-3.4.6.tar.gz | tar --strip-components=1 -xzC ffi
+      - if: ${{ matrix.os.family == 'linux' }}
+        name: "[Linux] Bison 3.8.2"
+        shell: bash
+        run: |
+          mkdir -p bison
+          curl -L https://ftpmirror.gnu.org/gnu/bison/bison-3.8.2.tar.gz | tar --strip-components=1 -xzC bison
       ## Software installed by default in GitHub Action Runner VMs:
       ##  https://github.com/actions/runner-images
       - if: ${{ matrix.os.family == 'macos' }}
@@ -100,16 +103,20 @@ jobs:
           CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
           CIBW_BEFORE_ALL: bash ./.github/workflows/wheels/cibw_before_all.sh
           CIBW_ENVIRONMENT: >
+            OPTFLAGS=-O3
             CXXFLAGS=-I./boost/pfx/include
             LINKFLAGS=-L./boost/pfx/lib
             PKG_CONFIG_PATH=./ffi/pfx/lib/pkgconfig
             makeFlags='BOOST_PYTHON_LIB=./boost/pfx/lib/libboost_python*.a'
+            PATH=$PWD/bison/src:$PATH
           CIBW_ENVIRONMENT_MACOS: >
+            OPTFLAGS=-O3
             CXXFLAGS=-I./boost/pfx/include
             LINKFLAGS=-L./boost/pfx/lib
             PKG_CONFIG_PATH=./ffi/pfx/lib/pkgconfig
             MACOSX_DEPLOYMENT_TARGET=11
             makeFlags='BOOST_PYTHON_LIB=./boost/pfx/lib/libboost_python*.a CONFIG=clang'
+            PATH=$PWD/bison/src:$PATH
           CIBW_BEFORE_BUILD: bash ./.github/workflows/wheels/cibw_before_build.sh
           CIBW_TEST_COMMAND: python3 {project}/tests/arch/ecp5/add_sub.py
       - uses: actions/upload-artifact@v4
diff --git a/.github/workflows/wheels/_run_cibw_linux.py b/.github/workflows/wheels/_run_cibw_linux.py
index 894470a5a..fb4e0b839 100644
--- a/.github/workflows/wheels/_run_cibw_linux.py
+++ b/.github/workflows/wheels/_run_cibw_linux.py
@@ -20,11 +20,19 @@ import os
 import yaml
 import platform
 import subprocess
+from pathlib import Path
 
-__dir__ = os.path.dirname(os.path.abspath(__file__))
+__yosys_root__ = Path(__file__).absolute().parents[3]
 
+for source in ["boost", "ffi", "bison"]:
+    if not (__yosys_root__ / source).is_dir():
+        print(
+            "You need to download boost, ffi and bison in a similar manner to wheels.yml first."
+        )
+        exit(-1)
 
-workflow = yaml.safe_load(open(os.path.join(os.path.dirname(__dir__), "wheels.yml")))
+with open(__yosys_root__ / ".github" / "workflows" / "wheels.yml") as f:
+    workflow = yaml.safe_load(f)
 
 env = os.environ.copy()
 
@@ -40,5 +48,5 @@ for key, value in cibw_step["env"].items():
         continue
     env[key] = value
 
-env["CIBW_ARCHS"] = os.getenv("CIBW_ARCHS") or platform.machine()
+env["CIBW_ARCHS"] = os.getenv("CIBW_ARCHS", platform.machine())
 subprocess.check_call(["cibuildwheel"], env=env)
diff --git a/.github/workflows/wheels/cibw_before_all.sh b/.github/workflows/wheels/cibw_before_all.sh
index fbb8dcad8..1aef650d7 100644
--- a/.github/workflows/wheels/cibw_before_all.sh
+++ b/.github/workflows/wheels/cibw_before_all.sh
@@ -1,23 +1,37 @@
-set -e
-set -x
+#!/bin/bash
+set -e -x
 
 # Build-time dependencies
 ## Linux Docker Images
 if command -v yum &> /dev/null; then
-    yum install -y flex bison
+    yum install -y flex # manylinux's bison versions are hopelessly out of date
 fi
 
 if command -v apk &> /dev/null; then
     apk add flex bison
 fi
 
+if ! printf '%s\n' '%require "3.8"' '%%' 'start: ;' | bison -o /dev/null /dev/stdin ; then
+	(
+		set -e -x
+		cd bison
+		./configure
+		make clean
+		make install -j$(getconf _NPROCESSORS_ONLN 2>/dev/null || sysctl -n hw.ncpu)
+	)
+fi
+
 ## macOS/Windows -- installed in GitHub Action itself, not container
 
-# Build Static FFI (platform-dependent but not Python version dependent)
-cd ffi
-## Ultimate libyosys.so will be shared, so we need fPIC for the static libraries
-CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --prefix=$PWD/pfx
-## Without this, SHELL has a space in its path which breaks the makefile
-make install -j$(getconf _NPROCESSORS_ONLN 2>/dev/null || sysctl -n hw.ncpu)
-## Forces static library to be used in all situations
-sed -i.bak 's@-L${toolexeclibdir} -lffi@${toolexeclibdir}/libffi.a@' ./pfx/lib/pkgconfig/libffi.pc
+# Runtime Dependencies
+## Build Static FFI (platform-dependent but not Python version dependent)
+(
+	set -e -x
+	cd ffi
+	## Ultimate libyosys.so will be shared, so we need fPIC for the static libraries
+	CFLAGS=-fPIC CXXFLAGS=-fPIC ./configure --prefix=$PWD/pfx
+	make clean
+	make install -j$(getconf _NPROCESSORS_ONLN 2>/dev/null || sysctl -n hw.ncpu)
+	## Forces static library to be used in all situations
+	sed -i.bak 's@-L${toolexeclibdir} -lffi@${toolexeclibdir}/libffi.a@' ./pfx/lib/pkgconfig/libffi.pc
+)
diff --git a/.gitignore b/.gitignore
index 3b77edf1f..cac630d7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@
 /kernel/python_wrappers.cc
 /boost
 /ffi
+/bison
 /venv
 /*.whl
 /*.egg-info
diff --git a/setup.py b/setup.py
index a199530d0..4a6ef5af9 100644
--- a/setup.py
+++ b/setup.py
@@ -51,16 +51,27 @@ class libyosys_so_ext(Extension):
         ]
 
     def custom_build(self, bext: build_ext):
+        make_flags_split = shlex.split(os.getenv("makeFlags", ""))
+        # abc linking takes a lot of memory, best get it out of the way first
+        bext.spawn(
+            [
+                "make",
+                f"-j{os.cpu_count() or 1}",
+                "yosys-abc",
+                *make_flags_split,
+                *self.args,
+            ]
+        )
+        # build libyosys and share with abc out of the way
         bext.spawn(
             [
                 "make",
                 f"-j{os.cpu_count() or 1}",
                 self.name,
-                "yosys-abc",
                 "share",
+                *make_flags_split,
+                *self.args,
             ]
-            + shlex.split(os.getenv("makeFlags", ""))
-            + self.args
         )
         build_path = os.path.dirname(os.path.dirname(bext.get_ext_fullpath(self.name)))
         pyosys_path = os.path.join(build_path, "pyosys")
@@ -85,6 +96,7 @@ class libyosys_so_ext(Extension):
 
         shutil.copytree("share", share_target)
 
+
 class custom_build_ext(build_ext):
     def build_extension(self, ext) -> None:
         if not hasattr(ext, "custom_build"):
@@ -100,8 +112,8 @@ setup(
     long_description=open(os.path.join(__dir__, "README.md")).read(),
     long_description_content_type="text/markdown",
     install_requires=["wheel", "setuptools"],
+    license="MIT",
     classifiers=[
-        "License :: OSI Approved :: MIT License",
         "Programming Language :: Python :: 3",
         "Intended Audience :: Developers",
         "Operating System :: POSIX :: Linux",

From 2ed7a7aac92a8f2fc9148a11b2f536f7f7468792 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Tue, 19 Aug 2025 01:28:46 +0300
Subject: [PATCH 409/931] wheels: fix PATH variables

---
 .github/workflows/wheels.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b48b981a8..41d9183fc 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -77,8 +77,7 @@ jobs:
         name: "[macOS] Flex/Bison"
         run: |
           brew install flex bison
-          echo "PATH=$(brew --prefix flex)/bin:$PATH" >> $GITHUB_ENV
-          echo "PATH=$(brew --prefix bison)/bin:$PATH" >> $GITHUB_ENV
+          echo "PATH=$(brew --prefix flex)/bin:$(brew --prefix bison)/bin:$PATH" >> $GITHUB_ENV
       - if: ${{ matrix.os.family == 'windows' }}
         name: "[Windows] Flex/Bison"
         run: |
@@ -108,7 +107,7 @@ jobs:
             LINKFLAGS=-L./boost/pfx/lib
             PKG_CONFIG_PATH=./ffi/pfx/lib/pkgconfig
             makeFlags='BOOST_PYTHON_LIB=./boost/pfx/lib/libboost_python*.a'
-            PATH=$PWD/bison/src:$PATH
+            PATH="$PWD/bison/src:$PATH"
           CIBW_ENVIRONMENT_MACOS: >
             OPTFLAGS=-O3
             CXXFLAGS=-I./boost/pfx/include
@@ -116,7 +115,7 @@ jobs:
             PKG_CONFIG_PATH=./ffi/pfx/lib/pkgconfig
             MACOSX_DEPLOYMENT_TARGET=11
             makeFlags='BOOST_PYTHON_LIB=./boost/pfx/lib/libboost_python*.a CONFIG=clang'
-            PATH=$PWD/bison/src:$PATH
+            PATH="$PWD/bison/src:$PATH"
           CIBW_BEFORE_BUILD: bash ./.github/workflows/wheels/cibw_before_build.sh
           CIBW_TEST_COMMAND: python3 {project}/tests/arch/ecp5/add_sub.py
       - uses: actions/upload-artifact@v4

From eb773ce071339316034e1dc89156dd686db6bbc2 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:29:53 +1200
Subject: [PATCH 410/931] Reapply "Workflow adjustments"

This reverts commit b640a16b07ec7c313ee3d97a4a84b0eccd3d59f9.
---
 .github/workflows/extra-builds.yml    |  16 +++-
 .github/workflows/test-build.yml      |  36 +++++----
 .github/workflows/test-compile.yml    |  16 +++-
 .github/workflows/test-sanitizers.yml | 105 ++++++++++++++++++++++++++
 .github/workflows/test-verific.yml    |  16 +++-
 5 files changed, 161 insertions(+), 28 deletions(-)
 create mode 100644 .github/workflows/test-sanitizers.yml

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 458eb76a6..11fd42a6c 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -1,6 +1,14 @@
 name: Test extra build flows
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre_job:
@@ -11,11 +19,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   vs-prep:
     name: Prepare Visual Studio build
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index f9574594a..f44dee1ba 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -1,6 +1,14 @@
 name: Build and run tests
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre_job:
@@ -11,11 +19,12 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+
   pre_docs_job:
     runs-on: ubuntu-latest
     outputs:
@@ -24,15 +33,16 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on readme changes
           paths_ignore: '["**/README.md"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   build-yosys:
     name: Reusable build
     runs-on: ${{ matrix.os }}
+    # pre_job is a subset of pre_docs_job, so we can always build for pre_docs_job
     needs: pre_docs_job
     if: needs.pre_docs_job.outputs.should_skip != 'true'
     env:
@@ -40,7 +50,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -58,7 +67,6 @@ jobs:
           mkdir build
           cd build
           make -f ../Makefile config-$CC
-          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
           make -f ../Makefile -j$procs ENABLE_LTO=1
 
       - name: Log yosys-config output
@@ -74,7 +82,7 @@ jobs:
       - name: Store build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
+          name: build-${{ matrix.os }}
           path: build.tar
           retention-days: 1
 
@@ -85,12 +93,9 @@ jobs:
     if: needs.pre_job.outputs.should_skip != 'true'
     env:
       CC: clang
-      ASAN_OPTIONS: halt_on_error=1
-      UBSAN_OPTIONS: halt_on_error=1
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -139,7 +144,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
+          name: build-${{ matrix.os }}
 
       - name: Uncompress build
         shell: bash
@@ -209,7 +214,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -223,7 +227,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
+          name: build-${{ matrix.os }}
 
       - name: Uncompress build
         shell: bash
diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index 7a706e69a..f208b911a 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -1,6 +1,14 @@
 name: Compiler testing
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre_job:
@@ -11,11 +19,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   test-compile:
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
new file mode 100644
index 000000000..fb76d1266
--- /dev/null
+++ b/.github/workflows/test-sanitizers.yml
@@ -0,0 +1,105 @@
+name: Check clang sanitizers
+
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # ignore PRs due to time needed
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
+
+jobs:
+  pre_job:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          # don't run on documentation changes
+          paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
+
+  run_san:
+    name: Build and run tests
+    runs-on: ${{ matrix.os }}
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
+    env:
+      CC: clang
+      ASAN_OPTIONS: halt_on_error=1
+      UBSAN_OPTIONS: halt_on_error=1
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        sanitizer: ['undefined,address']
+      fail-fast: false
+    steps:
+      - name: Checkout Yosys
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          persist-credentials: false
+
+      - name: Setup environment
+        uses: ./.github/actions/setup-build-env
+
+      - name: Build
+        shell: bash
+        run: |
+          mkdir build
+          cd build
+          make -f ../Makefile config-$CC
+          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
+          make -f ../Makefile -j$procs ENABLE_LTO=1
+
+      - name: Log yosys-config output
+        run: |
+          ./yosys-config || true
+
+      - name: Get iverilog
+        shell: bash
+        run: |
+          git clone https://github.com/steveicarus/iverilog.git
+          cd iverilog
+          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
+      - name: Get vcd2fst
+        shell: bash
+        run: |
+          git clone https://github.com/mmicko/libwave.git
+          mkdir -p ${{ github.workspace }}/.local/
+          cd libwave
+          cmake . -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.local
+          make -j$procs
+          make install
+
+      - name: Cache iverilog
+        id: cache-iverilog
+        uses: actions/cache@v4
+        with:
+          path: .local/
+          key: ${{ matrix.os }}-${IVERILOG_GIT}
+
+      - name: Build iverilog
+        if: steps.cache-iverilog.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          mkdir -p ${{ github.workspace }}/.local/
+          cd iverilog
+          autoconf
+          CC=gcc CXX=g++ ./configure --prefix=${{ github.workspace }}/.local
+          make -j$procs
+          make install
+
+      - name: Run tests
+        shell: bash
+        run: |
+          make -j$procs test TARGETS= EXTRA_TARGETS= CONFIG=$CC
+
+      - name: Report errors
+        if: ${{ failure() }}
+        shell: bash
+        run: |
+          find tests/**/*.err -print -exec cat {} \;
diff --git a/.github/workflows/test-verific.yml b/.github/workflows/test-verific.yml
index 013c9f8ca..9af07b920 100644
--- a/.github/workflows/test-verific.yml
+++ b/.github/workflows/test-verific.yml
@@ -1,6 +1,14 @@
 name: Build and run tests with Verific (Linux)
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre-job:
@@ -11,11 +19,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   test-verific:
     needs: pre-job

From b42be1df80470eba66ebb1e120379c44edf89652 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 19 Aug 2025 10:40:42 +1200
Subject: [PATCH 411/931] ci: Fix test-cells

---
 .github/workflows/test-build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index f44dee1ba..acc295f4a 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -176,7 +176,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        sanitizer: [undefined]
     steps:
       - name: Checkout Yosys
         uses: actions/checkout@v4
@@ -189,7 +188,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
+          name: build-${{ matrix.os }}
 
       - name: Uncompress build
         shell: bash

From d63f43acf0c532b6c0f04e41f873f9c7dec18dd9 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 19 Aug 2025 10:46:02 +1200
Subject: [PATCH 412/931] ci: iverilog before yosys

---
 .github/workflows/test-sanitizers.yml | 31 ++++++++++++++++-----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
index fb76d1266..d4dfb9d84 100644
--- a/.github/workflows/test-sanitizers.yml
+++ b/.github/workflows/test-sanitizers.yml
@@ -45,19 +45,6 @@ jobs:
       - name: Setup environment
         uses: ./.github/actions/setup-build-env
 
-      - name: Build
-        shell: bash
-        run: |
-          mkdir build
-          cd build
-          make -f ../Makefile config-$CC
-          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
-          make -f ../Makefile -j$procs ENABLE_LTO=1
-
-      - name: Log yosys-config output
-        run: |
-          ./yosys-config || true
-
       - name: Get iverilog
         shell: bash
         run: |
@@ -93,6 +80,24 @@ jobs:
           make -j$procs
           make install
 
+      - name: Check iverilog
+        shell: bash
+        run: |
+          iverilog -V
+
+      - name: Build
+        shell: bash
+        run: |
+          mkdir build
+          cd build
+          make -f ../Makefile config-$CC
+          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
+          make -f ../Makefile -j$procs ENABLE_LTO=1
+
+      - name: Log yosys-config output
+        run: |
+          ./yosys-config || true
+
       - name: Run tests
         shell: bash
         run: |

From 94d07872e6b29b72c91eb673d30208f9235fa5e5 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:12:11 +1200
Subject: [PATCH 413/931] test-sanitizers.yml: Build in-tree

Should fix missing `../../yosys-abc`
---
 .github/workflows/test-sanitizers.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
index d4dfb9d84..5639f6286 100644
--- a/.github/workflows/test-sanitizers.yml
+++ b/.github/workflows/test-sanitizers.yml
@@ -88,11 +88,9 @@ jobs:
       - name: Build
         shell: bash
         run: |
-          mkdir build
-          cd build
-          make -f ../Makefile config-$CC
+          make config-$CC
           echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
-          make -f ../Makefile -j$procs ENABLE_LTO=1
+          make -j$procs ENABLE_LTO=1
 
       - name: Log yosys-config output
         run: |

From 1cdf058df476d413bbdd486541a9cd1da426dbbd Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 19 Aug 2025 11:02:34 +1200
Subject: [PATCH 414/931] ci: Fix iverilog version caching

---
 .github/workflows/test-build.yml      | 5 +++--
 .github/workflows/test-sanitizers.yml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index acc295f4a..16ad98bec 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -107,11 +107,12 @@ jobs:
         uses: ./.github/actions/setup-build-env
 
       - name: Get iverilog
+        id: get-iverilog
         shell: bash
         run: |
           git clone https://github.com/steveicarus/iverilog.git
           cd iverilog
-          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
 
       - name: Get vcd2fst
         shell: bash
@@ -128,7 +129,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: .local/
-          key: ${{ matrix.os }}-${IVERILOG_GIT}
+          key: ${{ matrix.os }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
 
       - name: Build iverilog
         if: steps.cache-iverilog.outputs.cache-hit != 'true'
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
index 5639f6286..255b9daa5 100644
--- a/.github/workflows/test-sanitizers.yml
+++ b/.github/workflows/test-sanitizers.yml
@@ -46,11 +46,12 @@ jobs:
         uses: ./.github/actions/setup-build-env
 
       - name: Get iverilog
+        id: get-iverilog
         shell: bash
         run: |
           git clone https://github.com/steveicarus/iverilog.git
           cd iverilog
-          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
 
       - name: Get vcd2fst
         shell: bash
@@ -67,7 +68,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: .local/
-          key: ${{ matrix.os }}-${IVERILOG_GIT}
+          key: ${{ matrix.os }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
 
       - name: Build iverilog
         if: steps.cache-iverilog.outputs.cache-hit != 'true'

From bfc9a322e2a854418e6679e141be3d482dde808c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 19 Aug 2025 00:24:35 +0000
Subject: [PATCH 415/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d9f9f432b..5165db4a0 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+141
+YOSYS_VER := 0.56+152
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 3ca2b7951fb35f1714a4b2dbb69f8e199ea94997 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 19 Aug 2025 17:05:51 +1200
Subject: [PATCH 416/931] memlib: Fix ubsan

---
 passes/memory/memlib.cc | 2 +-
 passes/memory/memlib.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/passes/memory/memlib.cc b/passes/memory/memlib.cc
index 8a7adc9ac..3a8c3c06e 100644
--- a/passes/memory/memlib.cc
+++ b/passes/memory/memlib.cc
@@ -878,7 +878,7 @@ struct Parser {
 						}
 					}
 				}
-				var.clk_en = find_single_cap(pdef.clken, cram.options, portopts, "clken");
+				var.clk_en = find_single_cap(pdef.clken, cram.options, portopts, "clken") != nullptr;
 			}
 			const PortWidthDef *wdef = find_single_cap(pdef.width, cram.options, portopts, "width");
 			if (wdef) {
diff --git a/passes/memory/memlib.h b/passes/memory/memlib.h
index 43dec7386..7394baf4e 100644
--- a/passes/memory/memlib.h
+++ b/passes/memory/memlib.h
@@ -109,7 +109,7 @@ struct PortVariant {
 	PortKind kind;
 	int clk_shared;
 	ClkPolKind clk_pol;
-	bool clk_en;
+	bool clk_en = false;
 	bool width_tied;
 	int min_wr_wide_log2;
 	int max_wr_wide_log2;

From e1276560cd142995473b97df375c5928ca79d634 Mon Sep 17 00:00:00 2001
From: Anhijkt <mihail.ershov.zp@gmail.com>
Date: Tue, 19 Aug 2025 23:48:45 +0300
Subject: [PATCH 417/931] opt_dff: add another test

---
 tests/opt/opt_dff-simplify.ys | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/opt/opt_dff-simplify.ys b/tests/opt/opt_dff-simplify.ys
index 3a4d6778c..a803c2475 100644
--- a/tests/opt/opt_dff-simplify.ys
+++ b/tests/opt/opt_dff-simplify.ys
@@ -1,3 +1,6 @@
+# 5287 issue
+# Check only for complimentary patterns elimination
+
 read_rtlil opt_dff-simplify.il 
 opt_dff
 
@@ -10,3 +13,31 @@ select -assert-none t:$ne r:A_WIDTH=15 %i
 select -assert-none t:$ne r:A_WIDTH=10 %i
 select -assert-none t:$ne r:A_WIDTH=12 %i
 select -assert-none t:$ne r:A_WIDTH=11 %i
+
+# Check for both complimentary and redundancy elimination
+
+read_verilog << EOT
+module test(input clk, input h, input i, input m, output reg p);
+  wire D;
+  wire a;
+  wire j;
+  wire c;
+  wire mux_test;
+  wire n;
+
+  always @(posedge clk)
+    p <= D;
+  assign j = n ? 1'hx : a;
+  assign a = i ? mux_test : p;
+  assign D = m ? h : j;
+  assign c = n ? 1'hx : p;
+  assign mux_test = m ? 1'hx : c;
+endmodule
+EOT
+
+cd test
+proc
+opt_dff
+
+select -assert-count 1 t:$ne r:A_WIDTH=2 %i
+select -assert-none t:$ne r:A_WIDTH=3 %i

From 3a5742ffd2e9a34b10af9a87748a7f1a7e94e62d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 19 Aug 2025 03:21:54 +0000
Subject: [PATCH 418/931] Improve commutative hashing.

The simple XOR `commutative_eat()` implementation produces a lot of collisions.
https://www.preprints.org/manuscript/201710.0192/v1/download is a useful reference on this topic.

Running the included `hashTest.cc` without the hashlib changes, I get 49,580,349 collisions.
The 49,995,000 (i,j) pairs (0 <= i < 10000, i < j < 10000) hash into only 414,651 unique hash values.
We get simple collisions like (0,1) colliding with (2,3).

With the hashlib changes, we get only 707,099 collisions and 49,287,901 unique hash values.
Much better! The `commutative_hash` implementation corresponds to `Sum(4)` in the paper
mentioned above.
---
 kernel/hashlib.h              | 39 ++++++++++++++++++++++++------
 kernel/yosys_common.h         |  1 +
 tests/unit/kernel/hashTest.cc | 45 +++++++++++++++++++++++++++++++++++
 3 files changed, 78 insertions(+), 7 deletions(-)
 create mode 100644 tests/unit/kernel/hashTest.cc

diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index 7a5650fa3..b43b7302e 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -12,6 +12,7 @@
 #ifndef HASHLIB_H
 #define HASHLIB_H
 
+#include <array>
 #include <stdexcept>
 #include <algorithm>
 #include <optional>
@@ -100,7 +101,7 @@ private:
 		uint32_t hash = ((a << 5) + a) ^ b;
 		return hash;
 	}
-	public:
+public:
 	void hash32(uint32_t i) {
 		state = djb2_xor(i, state);
 		state = mkhash_xorshift(fudge ^ state);
@@ -127,6 +128,7 @@ private:
 		*this = hash_ops<T>::hash_into(t, *this);
 	}
 
+	[[deprecated]]
 	void commutative_eat(hash_t t) {
 		state ^= t;
 	}
@@ -356,6 +358,29 @@ template<typename K, int offset = 0, typename OPS = hash_ops<K>> class idict;
 template<typename K, typename OPS = hash_ops<K>> class pool;
 template<typename K, typename OPS = hash_ops<K>> class mfp;
 
+// Computes the hash value of an unordered set of elements.
+// See https://www.preprints.org/manuscript/201710.0192/v1/download.
+// This is the Sum(4) algorithm from that paper, which has good collision resistance,
+// much better than Sum(1) or Xor(1) (and somewhat better than Xor(4)).
+class commutative_hash {
+public:
+	commutative_hash() {
+		buckets.fill(0);
+	}
+	void eat(Hasher h) {
+		Hasher::hash_t v = h.yield();
+		size_t index = v & (buckets.size() - 1);
+		buckets[index] += v;
+	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const {
+		for (auto b : buckets)
+			h.eat(b);
+		return h;
+	}
+private:
+	std::array<Hasher::hash_t, 4> buckets;
+};
+
 template<typename K, typename T, typename OPS>
 class dict {
 	struct entry_t
@@ -801,14 +826,14 @@ public:
 	}
 
 	[[nodiscard]] Hasher hash_into(Hasher h) const {
+		commutative_hash comm;
 		for (auto &it : entries) {
 			Hasher entry_hash;
 			entry_hash.eat(it.udata.first);
 			entry_hash.eat(it.udata.second);
-			h.commutative_eat(entry_hash.yield());
+			comm.eat(entry_hash);
 		}
-		h.eat(entries.size());
-		return h;
+		return comm.hash_into(h);
 	}
 
 	void reserve(size_t n) { entries.reserve(n); }
@@ -1184,11 +1209,11 @@ public:
 	}
 
 	[[nodiscard]] Hasher hash_into(Hasher h) const {
+		commutative_hash comm;
 		for (auto &it : entries) {
-			h.commutative_eat(ops.hash(it.udata).yield());
+			comm.eat(ops.hash(it.udata));
 		}
-		h.eat(entries.size());
-		return h;
+		return comm.hash_into(h);
 	}
 
 	void reserve(size_t n) { entries.reserve(n); }
diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index ecc8ce623..bc92e7869 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -20,6 +20,7 @@
 #ifndef YOSYS_COMMON_H
 #define YOSYS_COMMON_H
 
+#include <array>
 #include <map>
 #include <set>
 #include <tuple>
diff --git a/tests/unit/kernel/hashTest.cc b/tests/unit/kernel/hashTest.cc
new file mode 100644
index 000000000..6e4610ec8
--- /dev/null
+++ b/tests/unit/kernel/hashTest.cc
@@ -0,0 +1,45 @@
+#include <gtest/gtest.h>
+#include "kernel/yosys_common.h"
+
+#include <unordered_set>
+
+YOSYS_NAMESPACE_BEGIN
+
+static Hasher hash(int x)
+{
+	Hasher h;
+	h.eat(x);
+	return h;
+}
+
+TEST(CommutativeTest, basic)
+{
+	hashlib::commutative_hash comm1;
+	comm1.eat(hash(1));
+	comm1.eat(hash(2));
+	hashlib::commutative_hash comm2;
+	comm2.eat(hash(2));
+	comm2.eat(hash(1));
+	EXPECT_EQ(comm1.hash_into(Hasher()).yield(), comm2.hash_into(Hasher()).yield());
+}
+
+TEST(PoolHashTest, collisions)
+{
+	uint64_t collisions = 0;
+	std::unordered_set<Hasher::hash_t> hashes;
+	for (int i = 0; i < 10000; ++i) {
+		for (int j = i + 1; j < 10000; ++j) {
+			pool<int> p1;
+			p1.insert(i);
+			p1.insert(j);
+			auto h = p1.hash_into(Hasher()).yield();
+			if (!hashes.insert(h).second) {
+				++collisions;
+			}
+		}
+	}
+	std::cout << "pool<int> collisions: " << collisions << std::endl;
+	EXPECT_LT(collisions, 1000000);
+}
+
+YOSYS_NAMESPACE_END

From 01de9fb453f8fadc23067d5c7e2442fcd1013d97 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 19 Aug 2025 16:35:34 +0200
Subject: [PATCH 419/931] hashlib: extend unit test with subset collisions,
 shorten runtime

---
 tests/unit/kernel/hashTest.cc | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/tests/unit/kernel/hashTest.cc b/tests/unit/kernel/hashTest.cc
index 6e4610ec8..319d064a7 100644
--- a/tests/unit/kernel/hashTest.cc
+++ b/tests/unit/kernel/hashTest.cc
@@ -27,8 +27,8 @@ TEST(PoolHashTest, collisions)
 {
 	uint64_t collisions = 0;
 	std::unordered_set<Hasher::hash_t> hashes;
-	for (int i = 0; i < 10000; ++i) {
-		for (int j = i + 1; j < 10000; ++j) {
+	for (int i = 0; i < 1000; ++i) {
+		for (int j = i + 1; j < 1000; ++j) {
 			pool<int> p1;
 			p1.insert(i);
 			p1.insert(j);
@@ -39,7 +39,29 @@ TEST(PoolHashTest, collisions)
 		}
 	}
 	std::cout << "pool<int> collisions: " << collisions << std::endl;
-	EXPECT_LT(collisions, 1000000);
+	EXPECT_LT(collisions, 10'000);
+}
+
+TEST(PoolHashTest, subset_collisions)
+{
+	uint64_t collisions = 0;
+	std::unordered_set<Hasher::hash_t> hashes;
+	for (int i = 0; i < 1000 * 1000; ++i) {
+
+		pool<int> p1;
+		for (int b = 0; i >> b; ++b) {
+			if ((i >> b) & 1) {
+				p1.insert(b);
+			}
+		}
+		auto h = p1.hash_into(Hasher()).yield();
+		if (!hashes.insert(h).second) {
+			++collisions;
+		}
+
+	}
+	std::cout << "pool<int> subset collisions: " << collisions << std::endl;
+	EXPECT_LT(collisions, 100);
 }
 
 YOSYS_NAMESPACE_END

From 7d0ea0d64f4e5845d78d9dc6c1757e909b0c4ada Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 19 Aug 2025 05:41:08 +0000
Subject: [PATCH 420/931] Refactor call to sorted_pmux_in to avoid copying the
 connection dictionary

---
 passes/opt/opt_merge.cc | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index 5ca19bc2f..f9ee7ba40 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -44,11 +44,8 @@ struct OptMergeWorker
 	CellTypes ct;
 	int total_count;
 
-	static vector<pair<SigBit, SigSpec>> sorted_pmux_in(const dict<RTLIL::IdString, RTLIL::SigSpec> &conn)
+	static vector<pair<SigBit, SigSpec>> sorted_pmux_in(const SigSpec& sig_s, const SigSpec& sig_b)
 	{
-		SigSpec sig_s = conn.at(ID::S);
-		SigSpec sig_b = conn.at(ID::B);
-
 		int s_width = GetSize(sig_s);
 		int width = GetSize(sig_b) / s_width;
 
@@ -104,11 +101,9 @@ struct OptMergeWorker
 			a.sort_and_unify();
 			h = a.hash_into(h);
 		} else if (cell->type == ID($pmux)) {
-			dict<RTLIL::IdString, RTLIL::SigSpec> conn = cell->connections();
-			assign_map.apply(conn.at(ID::A));
-			assign_map.apply(conn.at(ID::B));
-			assign_map.apply(conn.at(ID::S));
-			for (const auto& [s_bit, b_chunk] : sorted_pmux_in(conn)) {
+			SigSpec sig_s = assign_map(cell->getPort(ID::S));
+			SigSpec sig_b = assign_map(cell->getPort(ID::B));
+			for (const auto& [s_bit, b_chunk] : sorted_pmux_in(sig_s, sig_b)) {
 				h = s_bit.hash_into(h);
 				h = b_chunk.hash_into(h);
 			}

From 8c04e5266c1819b21e2656dd2083948ecf914082 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 19 Aug 2025 05:09:16 +0000
Subject: [PATCH 421/931] Use commutative hashing instead of expensive
 allocation and sorting

For one of our large circuits, this improves the `OptMergePass` runtime
from about 150s to about 130s. It's also simpler code.
---
 passes/opt/opt_merge.cc | 50 +++++++++++++++--------------------------
 1 file changed, 18 insertions(+), 32 deletions(-)

diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index f9ee7ba40..ba8168e74 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -44,17 +44,16 @@ struct OptMergeWorker
 	CellTypes ct;
 	int total_count;
 
-	static vector<pair<SigBit, SigSpec>> sorted_pmux_in(const SigSpec& sig_s, const SigSpec& sig_b)
+	static Hasher hash_pmux_in(const SigSpec& sig_s, const SigSpec& sig_b, Hasher h)
 	{
 		int s_width = GetSize(sig_s);
 		int width = GetSize(sig_b) / s_width;
 
-		vector<pair<SigBit, SigSpec>> sb_pairs;
+		hashlib::commutative_hash comm;
 		for (int i = 0; i < s_width; i++)
-			sb_pairs.push_back(pair<SigBit, SigSpec>(sig_s[i], sig_b.extract(i*width, width)));
+			comm.eat(hash_ops<std::pair<SigBit, SigSpec>>::hash({sig_s[i], sig_b.extract(i*width, width)}));
 
-		std::sort(sb_pairs.begin(), sb_pairs.end());
-		return sb_pairs;
+		return comm.hash_into(h);
 	}
 
 	static void sort_pmux_conn(dict<RTLIL::IdString, RTLIL::SigSpec> &conn)
@@ -86,12 +85,10 @@ struct OptMergeWorker
 		// (builtin || stdcell) && (unary || binary) && symmetrical
 		if (cell->type.in(ID($and), ID($or), ID($xor), ID($xnor), ID($add), ID($mul),
 				ID($logic_and), ID($logic_or), ID($_AND_), ID($_OR_), ID($_XOR_))) {
-			std::array<RTLIL::SigSpec, 2> inputs = {
-				assign_map(cell->getPort(ID::A)),
-				assign_map(cell->getPort(ID::B))
-			};
-			std::sort(inputs.begin(), inputs.end());
-			h = hash_ops<std::array<RTLIL::SigSpec, 2>>::hash_into(inputs, h);
+			hashlib::commutative_hash comm;
+			comm.eat(hash_ops<RTLIL::SigSpec>::hash(assign_map(cell->getPort(ID::A))));
+			comm.eat(hash_ops<RTLIL::SigSpec>::hash(assign_map(cell->getPort(ID::B))));
+			h = comm.hash_into(h);
 		} else if (cell->type.in(ID($reduce_xor), ID($reduce_xnor))) {
 			SigSpec a = assign_map(cell->getPort(ID::A));
 			a.sort();
@@ -103,40 +100,29 @@ struct OptMergeWorker
 		} else if (cell->type == ID($pmux)) {
 			SigSpec sig_s = assign_map(cell->getPort(ID::S));
 			SigSpec sig_b = assign_map(cell->getPort(ID::B));
-			for (const auto& [s_bit, b_chunk] : sorted_pmux_in(sig_s, sig_b)) {
-				h = s_bit.hash_into(h);
-				h = b_chunk.hash_into(h);
-			}
+			h = hash_pmux_in(sig_s, sig_b, h);
 			h = assign_map(cell->getPort(ID::A)).hash_into(h);
 		} else {
-			std::vector<std::pair<IdString, SigSpec>> conns;
-			for (const auto& conn : cell->connections()) {
-				conns.push_back(conn);
+			hashlib::commutative_hash comm;
+			for (const auto& [port, sig] : cell->connections()) {
+				if (cell->output(port))
+					continue;
+				comm.eat(hash_ops<std::pair<IdString, SigSpec>>::hash({port, assign_map(sig)}));
 			}
-			std::sort(conns.begin(), conns.end());
-			for (const auto& [port, sig] : conns) {
-				if (!cell->output(port)) {
-					h = port.hash_into(h);
-					h = assign_map(sig).hash_into(h);
-				}
-			}
-
+			h = comm.hash_into(h);
 			if (RTLIL::builtin_ff_cell_types().count(cell->type))
 				h = initvals(cell->getPort(ID::Q)).hash_into(h);
-
 		}
 		return h;
 	}
 
 	static Hasher hash_cell_parameters(const RTLIL::Cell *cell, Hasher h)
 	{
-		using Paramvec = std::vector<std::pair<IdString, Const>>;
-		Paramvec params;
+		hashlib::commutative_hash comm;
 		for (const auto& param : cell->parameters) {
-			params.push_back(param);
+			comm.eat(hash_ops<std::pair<IdString, Const>>::hash(param));
 		}
-		std::sort(params.begin(), params.end());
-		return hash_ops<Paramvec>::hash_into(params, h);
+		return comm.hash_into(h);
 	}
 
 	Hasher hash_cell_function(const RTLIL::Cell *cell, Hasher h) const

From 4926e846f6a81de2a98c1df6ccde4e6c72cd2815 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 21 Aug 2025 00:22:37 +0000
Subject: [PATCH 422/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5165db4a0..19fab9780 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+152
+YOSYS_VER := 0.56+165
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 7f0130efce1ac96a0f4b4a30326ab98541258bd1 Mon Sep 17 00:00:00 2001
From: Ethan Mahintorabi <ethanmoon@google.com>
Date: Wed, 20 Aug 2025 22:56:26 +0000
Subject: [PATCH 423/931] verilog: Fix missing sstream include

Signed-off-by: Ethan Mahintorabi <ethanmoon@google.com>
---
 frontends/verilog/verilog_location.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontends/verilog/verilog_location.h b/frontends/verilog/verilog_location.h
index 9b530fbeb..8ffe0552d 100644
--- a/frontends/verilog/verilog_location.h
+++ b/frontends/verilog/verilog_location.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <stack>
 #include <string>
+#include <sstream>
 
 /**
  * Provide frontend-wide location tracking like what bison generates

From d10190606c34cc0d3b53679d32f5dd9448044dd4 Mon Sep 17 00:00:00 2001
From: Ethan Mahintorabi <ethanmoon@google.com>
Date: Wed, 20 Aug 2025 22:58:51 +0000
Subject: [PATCH 424/931] verilog: Lower required bison version to 3.6

We're currently on version 3.6 of bison at Google, and Yosys
still correctly builds with it. This should better reflect
the actual requirements rather than an overly restrictive
check. If features from 3.8 are required it seems like bumping
would be appropriate.

Signed-off-by: Ethan Mahintorabi <ethanmoon@google.com>
---
 frontends/verilog/verilog_parser.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index e299d3148..392d8921a 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -33,7 +33,7 @@
  *
  */
 
-%require "3.8"
+%require "3.6"
 %language "c++"
 %define api.value.type variant
 %define api.prefix {frontend_verilog_yy}

From 4dea77417153a90b4e55101386649300733b75ed Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 18 Aug 2025 17:22:47 +0200
Subject: [PATCH 425/931] opt_muxtree: refactor

---
 passes/opt/opt_muxtree.cc | 415 ++++++++++++++++++++++++--------------
 1 file changed, 260 insertions(+), 155 deletions(-)

diff --git a/passes/opt/opt_muxtree.cc b/passes/opt/opt_muxtree.cc
index e1ed5da08..ae9b1a632 100644
--- a/passes/opt/opt_muxtree.cc
+++ b/passes/opt/opt_muxtree.cc
@@ -30,7 +30,33 @@
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
-using RTLIL::id2cstr;
+/**
+  * TERMINOLOGY
+  *
+  * A multiplexer tree (mux tree) is a tree composed exclusively of muxes.
+  * By mux, I mean $mux or $pmux. By port, I usually mean input port.
+  * The children of a node are all the muxes driving its input ports (A, B).
+  * It must be rooted in a "root mux", a mux which has multiple mux users
+  * or any number of non-mux users. Only the root and leaf nodes can be
+  * root muxes, not the internal nodes. Leaf nodes that are root muxes
+  * are roots of "input trees".
+  *
+  * OPERATING PRINCIPLE
+  *
+  * This pass traverses mux trees, learning port activations and making
+  * assumptions about them as it goes. When valid, ports are replaced
+  * with constants, or removed if they can never be activated.
+  * When valid, muxes are replaced with shorts from port to output,
+  * or removed if their outputs are found to be no longer observable.
+  *
+  * Input trees can be recursed into if limits_t::recursions_left allows.
+  * Otherwise, the input tree is queued for a re-run with a fresh knowledge_t.
+  * At any point, if glob_evals_left goes to 0, the pass terminates.
+  *
+  * Unlike share, this pass doesn't use SAT to learn things about logic
+  * driving the mux control signals, and traverses mux regions from users
+  * to drivers.
+  */
 
 struct OptMuxtreeWorker
 {
@@ -38,9 +64,10 @@ struct OptMuxtreeWorker
 	RTLIL::Module *module;
 	SigMap assign_map;
 	int removed_count;
-	int glob_abort_cnt = 100000;
+	int glob_evals_left = 100000;
 
 	struct bitinfo_t {
+		// Is bit directly used by non-mux cells or ports?
 		bool seen_non_mux;
 		pool<int> mux_users;
 		pool<int> mux_drivers;
@@ -50,12 +77,13 @@ struct OptMuxtreeWorker
 	vector<bitinfo_t> bit2info;
 
 	struct portinfo_t {
-		int ctrl_sig;
-		pool<int> input_sigs;
-		pool<int> input_muxes;
-		bool const_activated;
-		bool const_deactivated;
-		bool enabled;
+		int ctrl_sig = -1; // No associated control signal by default
+		pool<int> input_sigs = {};
+		pool<int> input_muxes = {};
+		bool const_activated = false;
+		bool const_deactivated = false;
+		// Is the port reachable from inputs of a mux tree?
+		bool observable = false;
 	};
 
 	struct muxinfo_t {
@@ -68,13 +96,16 @@ struct OptMuxtreeWorker
 	vector<bool> root_enable_muxes;
 	pool<int> root_mux_rerun;
 
-	OptMuxtreeWorker(RTLIL::Design *design, RTLIL::Module *module) :
-			design(design), module(module), assign_map(module), removed_count(0)
-	{
-		log("Running muxtree optimizer on module %s..\n", module->name.c_str());
-
-		log("  Creating internal representation of mux trees.\n");
+	portinfo_t used_port_bit(RTLIL::SigSpec& sig, int mux_idx) {
+		portinfo_t portinfo = {};
+		for (int bit_idx : sig2bits(sig)) {
+			bit2info[bit_idx].mux_users.insert(mux_idx);
+			portinfo.input_sigs.insert(bit_idx);
+		}
+		return portinfo;
+	}
 
+	void track_mux(Cell* cell) {
 		// Populate bit2info[]:
 		//	.seen_non_mux
 		//	.mux_users
@@ -84,73 +115,59 @@ struct OptMuxtreeWorker
 		//	.input_sigs
 		//	.const_activated
 		//	.const_deactivated
-		for (auto cell : module->cells())
-		{
-			if (cell->type.in(ID($mux), ID($pmux)))
-			{
-				RTLIL::SigSpec sig_a = cell->getPort(ID::A);
-				RTLIL::SigSpec sig_b = cell->getPort(ID::B);
-				RTLIL::SigSpec sig_s = cell->getPort(ID::S);
-				RTLIL::SigSpec sig_y = cell->getPort(ID::Y);
+		RTLIL::SigSpec sig_a = cell->getPort(ID::A);
+		RTLIL::SigSpec sig_b = cell->getPort(ID::B);
+		RTLIL::SigSpec sig_s = cell->getPort(ID::S);
+		RTLIL::SigSpec sig_y = cell->getPort(ID::Y);
 
-				muxinfo_t muxinfo;
-				muxinfo.cell = cell;
+		muxinfo_t muxinfo;
+		muxinfo.cell = cell;
+		int this_mux_idx = GetSize(mux2info);
 
-				for (int i = 0; i < GetSize(sig_s); i++) {
-					RTLIL::SigSpec sig = sig_b.extract(i*GetSize(sig_a), GetSize(sig_a));
-					RTLIL::SigSpec ctrl_sig = assign_map(sig_s.extract(i, 1));
-					portinfo_t portinfo;
-					portinfo.ctrl_sig = sig2bits(ctrl_sig, false).front();
-					for (int idx : sig2bits(sig)) {
-						bit2info[idx].mux_users.insert(GetSize(mux2info));
-						portinfo.input_sigs.insert(idx);
-					}
-					portinfo.const_activated = ctrl_sig.is_fully_const() && ctrl_sig.as_bool();
-					portinfo.const_deactivated = ctrl_sig.is_fully_const() && !ctrl_sig.as_bool();
-					portinfo.enabled = false;
-					muxinfo.ports.push_back(portinfo);
-				}
-
-				portinfo_t portinfo;
-				for (int idx : sig2bits(sig_a)) {
-					bit2info[idx].mux_users.insert(GetSize(mux2info));
-					portinfo.input_sigs.insert(idx);
-				}
-				portinfo.ctrl_sig = -1;
-				portinfo.const_activated = false;
-				portinfo.const_deactivated = false;
-				portinfo.enabled = false;
-				muxinfo.ports.push_back(portinfo);
-
-				for (int idx : sig2bits(sig_y))
-					bit2info[idx].mux_drivers.insert(GetSize(mux2info));
-
-				for (int idx : sig2bits(sig_s))
-					bit2info[idx].seen_non_mux = true;
-
-				mux2info.push_back(muxinfo);
-			}
-			else
-			{
-				for (auto &it : cell->connections()) {
-					for (int idx : sig2bits(it.second))
-						bit2info[idx].seen_non_mux = true;
-				}
-			}
+		// Analyze port B
+		// In case of $pmux, port B is multiple slices, concatenated, one per bit of port S
+		for (int i = 0; i < GetSize(sig_s); i++) {
+			RTLIL::SigSpec sig = sig_b.extract(i*GetSize(sig_a), GetSize(sig_a));
+			RTLIL::SigSpec ctrl_sig = assign_map(sig_s.extract(i, 1));
+			portinfo_t portinfo = used_port_bit(sig, this_mux_idx);
+			portinfo.ctrl_sig = sig2bits(ctrl_sig, false).front();
+			portinfo.const_activated = ctrl_sig.is_fully_const() && ctrl_sig.as_bool();
+			portinfo.const_deactivated = ctrl_sig.is_fully_const() && !ctrl_sig.as_bool();
+			muxinfo.ports.push_back(portinfo);
 		}
+
+		// Analyze port A
+		muxinfo.ports.push_back(used_port_bit(sig_a, this_mux_idx));
+
+		for (int idx : sig2bits(sig_y))
+			bit2info[idx].mux_drivers.insert(this_mux_idx);
+
+		for (int idx : sig2bits(sig_s))
+			bit2info[idx].seen_non_mux = true;
+
+		mux2info.push_back(muxinfo);
+	}
+
+	void see_non_mux_cell(Cell* cell) {
+		for (auto &it : cell->connections()) {
+			for (int idx : sig2bits(it.second))
+				bit2info[idx].seen_non_mux = true;
+		}
+	}
+
+	void see_non_mux_wires() {
 		for (auto wire : module->wires()) {
 			if (wire->port_output || wire->get_bool_attribute(ID::keep))
 				for (int idx : sig2bits(RTLIL::SigSpec(wire)))
 					bit2info[idx].seen_non_mux = true;
 		}
+	}
 
-		if (mux2info.empty()) {
-			log("  No muxes found in this module.\n");
-			return;
-		}
-
-		// Populate mux2info[].ports[]:
-		//	.input_muxes
+	// Populate mux2info[].ports[]:
+	//	.input_muxes
+	void fixup_input_muxes() {
+		// bit2info knows the mux users and mux drivers of bits
+		// use this to tell mux2info ports about what muxes are driven by it
 		for (int i = 0; i < GetSize(bit2info); i++)
 		for (int j : bit2info[i].mux_users)
 		for (auto &p : mux2info[j].ports) {
@@ -158,12 +175,15 @@ struct OptMuxtreeWorker
 				for (int k : bit2info[i].mux_drivers)
 					p.input_muxes.insert(k);
 		}
+	}
 
-		log("  Evaluating internal representation of mux trees.\n");
-
+	void populate_roots() {
+		// mux_to_users[i] means "set of muxes using output of mux i"
 		dict<int, pool<int>> mux_to_users;
-		root_muxes.resize(GetSize(mux2info));
+		// Pure root muxes (outputs seen by non-muxes)
 		root_enable_muxes.resize(GetSize(mux2info));
+		// All root muxes (outputs seen by non-muxes or multiple muxes)
+		root_muxes.resize(GetSize(mux2info));
 
 		for (auto &bi : bit2info) {
 			for (int i : bi.mux_drivers)
@@ -177,16 +197,44 @@ struct OptMuxtreeWorker
 			}
 		}
 
-		for (auto &it : mux_to_users)
-			if (GetSize(it.second) > 1)
-				root_muxes.at(it.first) = true;
+		for (auto &[driving_mux, user_muxes] : mux_to_users)
+			if (GetSize(user_muxes) > 1)
+				root_muxes.at(driving_mux) = true;
+	}
+
+	OptMuxtreeWorker(RTLIL::Design *design, RTLIL::Module *module) :
+			design(design), module(module), assign_map(module), removed_count(0)
+	{
+		log("Running muxtree optimizer on module %s..\n", module->name.c_str());
+
+		log("  Creating internal representation of mux trees.\n");
+
+		for (auto cell : module->cells())
+		{
+			if (cell->type.in(ID($mux), ID($pmux)))
+				track_mux(cell);
+			else
+				see_non_mux_cell(cell);
+		}
+		see_non_mux_wires();
+
+		if (mux2info.empty()) {
+			log("  No muxes found in this module.\n");
+			return;
+		}
+
+		fixup_input_muxes();
+
+		log("  Evaluating internal representation of mux trees.\n");
+
+		populate_roots();
 
 		for (int mux_idx = 0; mux_idx < GetSize(root_muxes); mux_idx++)
 			if (root_muxes.at(mux_idx)) {
 				log_debug("    Root of a mux tree: %s%s\n", log_id(mux2info[mux_idx].cell), root_enable_muxes.at(mux_idx) ? " (pure)" : "");
 				root_mux_rerun.erase(mux_idx);
 				eval_root_mux(mux_idx);
-				if (glob_abort_cnt == 0) {
+				if (glob_evals_left == 0) {
 					log("  Giving up (too many iterations)\n");
 					return;
 				}
@@ -198,21 +246,21 @@ struct OptMuxtreeWorker
 			log_assert(root_enable_muxes.at(mux_idx));
 			root_mux_rerun.erase(mux_idx);
 			eval_root_mux(mux_idx);
-			if (glob_abort_cnt == 0) {
+			if (glob_evals_left == 0) {
 				log("  Giving up (too many iterations)\n");
 				return;
 			}
 		}
 
 		log("  Analyzing evaluation results.\n");
-		log_assert(glob_abort_cnt > 0);
+		log_assert(glob_evals_left > 0);
 
 		for (auto &mi : mux2info)
 		{
 			vector<int> live_ports;
 			for (int port_idx = 0; port_idx < GetSize(mi.ports); port_idx++) {
 				portinfo_t &pi = mi.ports[port_idx];
-				if (pi.enabled) {
+				if (pi.observable) {
 					live_ports.push_back(port_idx);
 				} else {
 					log("    dead port %d/%d on %s %s.\n", port_idx+1, GetSize(mi.ports),
@@ -290,9 +338,10 @@ struct OptMuxtreeWorker
 
 	struct knowledge_t
 	{
-		// database of known inactive signals
-		// the payload is a reference counter used to manage the
-		// list. when it is non-zero the signal in known to be inactive
+		// Known inactive signals
+		// The payload is a reference counter used to manage the list
+		// When it is non-zero, the signal in known to be inactive
+		// When it reaches zero, the map element is removed
 		std::unordered_map<int, int> known_inactive;
 
 		// database of known active signals
@@ -303,84 +352,123 @@ struct OptMuxtreeWorker
 		std::unordered_set<int> visited_muxes;
 	};
 
-	void eval_mux_port(knowledge_t &knowledge, int mux_idx, int port_idx, bool do_replace_known, bool do_enable_ports, int abort_count)
-	{
-		if (glob_abort_cnt == 0)
-			return;
-
-		muxinfo_t &muxinfo = mux2info[mux_idx];
-
-		if (do_enable_ports)
-			muxinfo.ports[port_idx].enabled = true;
-
+	static void activate_port(knowledge_t &knowledge, int port_idx, const muxinfo_t &muxinfo) {
+		// First, mark all other ports inactive
 		for (int i = 0; i < GetSize(muxinfo.ports); i++) {
 			if (i == port_idx)
 				continue;
 			if (muxinfo.ports[i].ctrl_sig >= 0)
 				++knowledge.known_inactive[muxinfo.ports[i].ctrl_sig];
 		}
-
+		// Mark port active unless it's the last one
 		if (port_idx < GetSize(muxinfo.ports)-1 && !muxinfo.ports[port_idx].const_activated)
 			++knowledge.known_active[muxinfo.ports[port_idx].ctrl_sig];
+	}
 
-		vector<int> parent_muxes;
-		for (int m : muxinfo.ports[port_idx].input_muxes) {
-			auto it = knowledge.visited_muxes.find(m);
-			if (it != knowledge.visited_muxes.end())
-				continue;
-			knowledge.visited_muxes.insert(it, m);
-			parent_muxes.push_back(m);
-		}
-		for (int m : parent_muxes) {
-			if (root_enable_muxes.at(m))
-				continue;
-			else if (root_muxes.at(m)) {
-				if (abort_count == 0) {
-					root_mux_rerun.insert(m);
-					root_enable_muxes.at(m) = true;
-					log_debug("      Removing pure flag from root mux %s.\n", log_id(mux2info[m].cell));
-				} else
-					eval_mux(knowledge, m, false, do_enable_ports, abort_count - 1);
-			} else
-				eval_mux(knowledge, m, do_replace_known, do_enable_ports, abort_count);
-			if (glob_abort_cnt == 0)
-				return;
-		}
-		for (int m : parent_muxes)
-			knowledge.visited_muxes.erase(m);
-
-		if (port_idx < GetSize(muxinfo.ports)-1 && !muxinfo.ports[port_idx].const_activated) {
-			auto it = knowledge.known_active.find(muxinfo.ports[port_idx].ctrl_sig);
-			if (it != knowledge.known_active.end())
+	static void deactivate_port(knowledge_t &knowledge, int port_idx, const muxinfo_t &muxinfo) {
+		auto unlearn = [](std::unordered_map<int, int>& knowns, int i) {
+			auto it = knowns.find(i);
+			if (it != knowns.end())
 				if (--it->second == 0)
-					knowledge.known_active.erase(it);
-		}
+					knowns.erase(it);
+		};
 
+		if (port_idx < GetSize(muxinfo.ports)-1 && !muxinfo.ports[port_idx].const_activated)
+			unlearn(knowledge.known_active, muxinfo.ports[port_idx].ctrl_sig);
+
+		// Undo inactivity assumptions for other ports
 		for (int i = 0; i < GetSize(muxinfo.ports); i++) {
 			if (i == port_idx)
 				continue;
-			if (muxinfo.ports[i].ctrl_sig >= 0) {
-				auto it = knowledge.known_inactive.find(muxinfo.ports[i].ctrl_sig);
-				if (it != knowledge.known_inactive.end())
-					if (--it->second == 0)
-						knowledge.known_inactive.erase(it);
-			}
+			if (muxinfo.ports[i].ctrl_sig >= 0)
+				unlearn(knowledge.known_inactive, muxinfo.ports[i].ctrl_sig);
 		}
 	}
 
+	struct limits_t {
+		// Are we allowed to replace inputs with constants?
+		// True if knowledge doesn't contain assumptions
+		bool do_replace_known = true;
+		// Are we allowed to mark ports as observable?
+		// True if we're recursing from a pure root mux
+		bool do_mark_ports_observable = true;
+		// How many more subtree recursions into input trees can we take?
+		// Then shalt thou count to three, no more, no less. Three shall be the number thou shalt count, and the number of the counting shall be three.
+		int recursions_left = 3;
+		limits_t subtree() const {
+			limits_t ret = *this;
+			log_assert(ret.recursions_left > 0);
+			ret.recursions_left--;
+			return ret;
+		}
+	};
+	void eval_mux_port(knowledge_t &knowledge, int mux_idx, int port_idx, limits_t limits)
+	{
+		if (glob_evals_left == 0)
+			return;
+
+		muxinfo_t &muxinfo = mux2info[mux_idx];
+
+		if (limits.do_mark_ports_observable)
+			muxinfo.ports[port_idx].observable = true;
+
+		// For the purposes of recursion, we assume the port is active,
+		// meaning all other ports are inactive
+		activate_port(knowledge, port_idx, muxinfo);
+
+		vector<int> input_mux_queue;
+		for (int m : muxinfo.ports[port_idx].input_muxes) {
+			if (knowledge.visited_muxes.count(m))
+				continue;
+			knowledge.visited_muxes.insert(m);
+			input_mux_queue.push_back(m);
+		}
+		for (int m : input_mux_queue) {
+			if (root_enable_muxes.at(m))
+				continue;
+			else if (root_muxes.at(m)) {
+				if (limits.recursions_left == 0) {
+					// Ran out of subtree depth, re-eval this subtree in the next re-run
+					root_mux_rerun.insert(m);
+					root_enable_muxes.at(m) = true;
+					log_debug("      Removing pure flag from root mux %s.\n", log_id(mux2info[m].cell));
+				} else {
+					auto new_limits = limits.subtree();
+					// Since our knowledge includes assumption, we can't generally allow replacing based on it
+					new_limits.do_replace_known = false;
+					eval_mux(knowledge, m, new_limits);
+				}
+			} else {
+				// This non-root input mux has only this mux as a user,
+				// so here we are allowed to pass along do_replace_known
+				eval_mux(knowledge, m, limits);
+			}
+			if (glob_evals_left == 0)
+				return;
+		}
+
+		// Allow revisiting input muxes, since evaluating other ports should
+		// revisit these input muxes with different activation assumptions
+		for (int m : input_mux_queue)
+			knowledge.visited_muxes.erase(m);
+
+		// Undo our assumptions that the port is active
+		deactivate_port(knowledge, port_idx, muxinfo);
+	}
+
 	void replace_known(knowledge_t &knowledge, muxinfo_t &muxinfo, IdString portname)
 	{
 		SigSpec sig = muxinfo.cell->getPort(portname);
 		bool did_something = false;
 
-		int width = 0;
+		int width_if_b = 0;
 		idict<int> ctrl_bits;
 		if (portname == ID::B)
-			width = GetSize(muxinfo.cell->getPort(ID::A));
+			width_if_b = GetSize(muxinfo.cell->getPort(ID::A));
 		for (int bit : sig2bits(muxinfo.cell->getPort(ID::S), false))
 			ctrl_bits(bit);
 
-		int port_idx = 0, port_off = 0;
+		int slice_idx = 0, slice_off = 0;
 		vector<int> bits = sig2bits(sig, false);
 		for (int i = 0; i < GetSize(bits); i++) {
 			if (bits[i] >= 0) {
@@ -393,17 +481,31 @@ struct OptMuxtreeWorker
 					did_something = true;
 				}
 				if (ctrl_bits.count(bits[i])) {
-					if (width) {
-						sig[i] = ctrl_bits.at(bits[i]) == port_idx ? State::S1 : State::S0;
-					} else {
+					if (!width_if_b) {
+						// Single-bit $mux example
+						//  mux: S ? B : A = Y
+						// A=S
+						//  0 ? B : 0 = 0
+						//  1 ? B : 1 = B
+						// rewrite to A=0
+						//  0 ? B : 0 = 0
+						//  1 ? B : 0 = B
+						// which is equivalent
 						sig[i] = State::S0;
+					} else {
+						// "Sliced" $pmux example
+						// B[i]=S[j]
+						// i == j => B[i] activated only when B[i] is high, safe to rewrite to 1
+						// i != j => B[i] activated only when B[i] is low, safe to rewrite to 0
+						sig[i] = ctrl_bits.at(bits[i]) == slice_idx ? State::S1 : State::S0;
 					}
 					did_something = true;
 				}
 			}
-			if (width) {
-				if (++port_off == width)
-					port_idx++, port_off=0;
+			if (width_if_b) {
+				// Roll over into next slice
+				if (++slice_off == width_if_b)
+					slice_idx++, slice_off=0;
 			}
 		}
 
@@ -414,16 +516,17 @@ struct OptMuxtreeWorker
 		}
 	}
 
-	void eval_mux(knowledge_t &knowledge, int mux_idx, bool do_replace_known, bool do_enable_ports, int abort_count)
+	void eval_mux(knowledge_t &knowledge, int mux_idx, limits_t limits)
 	{
-		if (glob_abort_cnt == 0)
+		if (glob_evals_left == 0)
 			return;
-		glob_abort_cnt--;
+		glob_evals_left--;
 
 		muxinfo_t &muxinfo = mux2info[mux_idx];
+		log_debug("\t\teval %s (replace %d enable %d)\n", log_id(muxinfo.cell), limits.do_replace_known, limits.do_mark_ports_observable);
 
 		// set input ports to constants if we find known active or inactive signals
-		if (do_replace_known) {
+		if (limits.do_replace_known) {
 			replace_known(knowledge, muxinfo, ID::A);
 			replace_known(knowledge, muxinfo, ID::B);
 		}
@@ -433,21 +536,21 @@ struct OptMuxtreeWorker
 		{
 			portinfo_t &portinfo = muxinfo.ports[port_idx];
 			if (portinfo.const_activated) {
-				eval_mux_port(knowledge, mux_idx, port_idx, do_replace_known, do_enable_ports, abort_count);
+				eval_mux_port(knowledge, mux_idx, port_idx, limits);
 				return;
 			}
 		}
 
-		// compare ports with known_active signals. if we find a match, only this
-		// port can be active. do not include the last port (its the default port
-		// that has no control signals).
+		// Compare ports with known active control signals. if we find a match,
+		// only this port can be active. Do not include the last port,
+		// it's the default port without an associated control signal
 		for (int port_idx = 0; port_idx < GetSize(muxinfo.ports)-1; port_idx++)
 		{
 			portinfo_t &portinfo = muxinfo.ports[port_idx];
 			if (portinfo.const_deactivated)
 				continue;
 			if (knowledge.known_active.count(portinfo.ctrl_sig) > 0) {
-				eval_mux_port(knowledge, mux_idx, port_idx, do_replace_known, do_enable_ports, abort_count);
+				eval_mux_port(knowledge, mux_idx, port_idx, limits);
 				return;
 			}
 		}
@@ -462,19 +565,21 @@ struct OptMuxtreeWorker
 			if (port_idx < GetSize(muxinfo.ports)-1)
 				if (knowledge.known_inactive.count(portinfo.ctrl_sig) > 0)
 					continue;
-			eval_mux_port(knowledge, mux_idx, port_idx, do_replace_known, do_enable_ports, abort_count);
+			eval_mux_port(knowledge, mux_idx, port_idx, limits);
 
-			if (glob_abort_cnt == 0)
+			if (glob_evals_left == 0)
 				return;
 		}
 	}
 
 	void eval_root_mux(int mux_idx)
 	{
-		log_assert(glob_abort_cnt > 0);
+		log_assert(glob_evals_left > 0);
 		knowledge_t knowledge;
 		knowledge.visited_muxes.insert(mux_idx);
-		eval_mux(knowledge, mux_idx, true, root_enable_muxes.at(mux_idx), 3);
+		limits_t limits = {};
+		limits.do_mark_ports_observable = root_enable_muxes.at(mux_idx);
+		eval_mux(knowledge, mux_idx, limits);
 	}
 };
 

From 6fdcdd41de8c8bfa73fabf435da3b898c920a640 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Aug 2025 00:23:32 +0000
Subject: [PATCH 426/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 19fab9780..70beb047e 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+165
+YOSYS_VER := 0.56+171
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From b5aa3ab9f7c395275c0aeca6ffc133fdb563f849 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 25 Aug 2025 03:09:04 +0000
Subject: [PATCH 427/931] hash_ops should take all parameters by reference
 instead of requiring copies of vectors, tuples etc

---
 kernel/hashlib.h | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index b43b7302e..9c53e6687 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -179,58 +179,58 @@ struct hash_ops {
 };
 
 template<typename P, typename Q> struct hash_ops<std::pair<P, Q>> {
-	static inline bool cmp(std::pair<P, Q> a, std::pair<P, Q> b) {
+	static inline bool cmp(const std::pair<P, Q> &a, const std::pair<P, Q> &b) {
 		return a == b;
 	}
-	[[nodiscard]] static inline Hasher hash_into(std::pair<P, Q> a, Hasher h) {
+	[[nodiscard]] static inline Hasher hash_into(const std::pair<P, Q> &a, Hasher h) {
 		h = hash_ops<P>::hash_into(a.first, h);
 		h = hash_ops<Q>::hash_into(a.second, h);
 		return h;
 	}
-	HASH_TOP_LOOP_FST (std::pair<P, Q> a) HASH_TOP_LOOP_SND
+	HASH_TOP_LOOP_FST (const std::pair<P, Q> &a) HASH_TOP_LOOP_SND
 };
 
 template<typename... T> struct hash_ops<std::tuple<T...>> {
-	static inline bool cmp(std::tuple<T...> a, std::tuple<T...> b) {
+	static inline bool cmp(const std::tuple<T...> &a, const std::tuple<T...> &b) {
 		return a == b;
 	}
 	template<size_t I = 0>
-	static inline typename std::enable_if<I == sizeof...(T), Hasher>::type hash_into(std::tuple<T...>, Hasher h) {
+	static inline typename std::enable_if<I == sizeof...(T), Hasher>::type hash_into(const std::tuple<T...> &, Hasher h) {
 		return h;
 	}
 	template<size_t I = 0>
-	static inline typename std::enable_if<I != sizeof...(T), Hasher>::type hash_into(std::tuple<T...> a, Hasher h) {
+	static inline typename std::enable_if<I != sizeof...(T), Hasher>::type hash_into(const std::tuple<T...> &a, Hasher h) {
 		typedef hash_ops<typename std::tuple_element<I, std::tuple<T...>>::type> element_ops_t;
 		h = hash_into<I+1>(a, h);
 		h = element_ops_t::hash_into(std::get<I>(a), h);
 		return h;
 	}
-	HASH_TOP_LOOP_FST (std::tuple<T...> a) HASH_TOP_LOOP_SND
+	HASH_TOP_LOOP_FST (const std::tuple<T...> &a) HASH_TOP_LOOP_SND
 };
 
 template<typename T> struct hash_ops<std::vector<T>> {
-	static inline bool cmp(std::vector<T> a, std::vector<T> b) {
+	static inline bool cmp(const std::vector<T> &a, const std::vector<T> &b) {
 		return a == b;
 	}
-	[[nodiscard]] static inline Hasher hash_into(std::vector<T> a, Hasher h) {
+	[[nodiscard]] static inline Hasher hash_into(const std::vector<T> &a, Hasher h) {
 		h.eat((uint32_t)a.size());
 		for (auto k : a)
 			h.eat(k);
 		return h;
 	}
-	HASH_TOP_LOOP_FST (std::vector<T> a) HASH_TOP_LOOP_SND
+	HASH_TOP_LOOP_FST (const std::vector<T> &a) HASH_TOP_LOOP_SND
 };
 
 template<typename T, size_t N> struct hash_ops<std::array<T, N>> {
-    static inline bool cmp(std::array<T, N> a, std::array<T, N> b) {
+    static inline bool cmp(const std::array<T, N> &a, const std::array<T, N> &b) {
         return a == b;
     }
-    [[nodiscard]] static inline Hasher hash_into(std::array<T, N> a, Hasher h) {
+    [[nodiscard]] static inline Hasher hash_into(const std::array<T, N> &a, Hasher h) {
         for (const auto& k : a)
             h = hash_ops<T>::hash_into(k, h);
         return h;
     }
-	HASH_TOP_LOOP_FST (std::array<T, N> a) HASH_TOP_LOOP_SND
+	HASH_TOP_LOOP_FST (const std::array<T, N> &a) HASH_TOP_LOOP_SND
 };
 
 struct hash_cstr_ops {
@@ -302,10 +302,10 @@ template<> struct hash_ops<std::monostate> {
 };
 
 template<typename... T> struct hash_ops<std::variant<T...>> {
-	static inline bool cmp(std::variant<T...> a, std::variant<T...> b) {
+	static inline bool cmp(const std::variant<T...> &a, const std::variant<T...> &b) {
 		return a == b;
 	}
-	[[nodiscard]] static inline Hasher hash_into(std::variant<T...> a, Hasher h) {
+	[[nodiscard]] static inline Hasher hash_into(const std::variant<T...> &a, Hasher h) {
 		std::visit([& h](const auto &v) { h.eat(v); }, a);
 		h.eat(a.index());
 		return h;
@@ -313,10 +313,10 @@ template<typename... T> struct hash_ops<std::variant<T...>> {
 };
 
 template<typename T> struct hash_ops<std::optional<T>> {
-	static inline bool cmp(std::optional<T> a, std::optional<T> b) {
+	static inline bool cmp(const std::optional<T> &a, const std::optional<T> &b) {
 		return a == b;
 	}
-	[[nodiscard]] static inline Hasher hash_into(std::optional<T> a, Hasher h) {
+	[[nodiscard]] static inline Hasher hash_into(const std::optional<T> &a, Hasher h) {
 		if(a.has_value())
 			h.eat(*a);
 		else

From 9f0904d048751e3f6518713f642ccc021e7f6b22 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 25 Aug 2025 07:46:34 +0200
Subject: [PATCH 428/931] Makefile: fix hardcoded -install_name for libyosys.so

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e182f51cc..b3ea79657 100644
--- a/Makefile
+++ b/Makefile
@@ -745,7 +745,7 @@ $(PROGRAM_PREFIX)yosys$(EXE): $(OBJS)
 
 libyosys.so: $(filter-out kernel/driver.o,$(OBJS))
 ifeq ($(OS), Darwin)
-	$(P) $(CXX) -o libyosys.so -shared -undefined dynamic_lookup -Wl,-install_name,$(LIBDIR)/libyosys.so $(LINKFLAGS) $^ $(LIBS) $(LIBS_VERIFIC)
+	$(P) $(CXX) -o libyosys.so -shared -undefined dynamic_lookup -Wl,-install_name,libyosys.so $(LINKFLAGS) $^ $(LIBS) $(LIBS_VERIFIC)
 else
 	$(P) $(CXX) -o libyosys.so -shared -Wl,-soname,libyosys.so $(LINKFLAGS) $^ $(LIBS) $(LIBS_VERIFIC)
 endif

From b45e5854bfe19fa3c433e327fce19012e1b395c7 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 25 Aug 2025 16:36:07 +0200
Subject: [PATCH 429/931] opt_muxtree: comment wording

---
 passes/opt/opt_muxtree.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/passes/opt/opt_muxtree.cc b/passes/opt/opt_muxtree.cc
index ae9b1a632..98803b935 100644
--- a/passes/opt/opt_muxtree.cc
+++ b/passes/opt/opt_muxtree.cc
@@ -427,14 +427,17 @@ struct OptMuxtreeWorker
 			if (root_enable_muxes.at(m))
 				continue;
 			else if (root_muxes.at(m)) {
+				// This leaf node of the current tree
+				// is the root of an input tree of the current tree
 				if (limits.recursions_left == 0) {
-					// Ran out of subtree depth, re-eval this subtree in the next re-run
+					// Ran out of subtree depth, re-eval this input tree in the next re-run
 					root_mux_rerun.insert(m);
 					root_enable_muxes.at(m) = true;
 					log_debug("      Removing pure flag from root mux %s.\n", log_id(mux2info[m].cell));
 				} else {
 					auto new_limits = limits.subtree();
-					// Since our knowledge includes assumption, we can't generally allow replacing based on it
+					// Since our knowledge includes assumption,
+					// we can't generally allow replacing in an input tree based on it
 					new_limits.do_replace_known = false;
 					eval_mux(knowledge, m, new_limits);
 				}

From 15d24bf2e65450602f902574a131a8b97d2e6487 Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Mon, 11 Nov 2024 11:22:05 +0100
Subject: [PATCH 430/931] synth_quicklogic: add -noflatten option

---
 techlibs/quicklogic/synth_quicklogic.cc | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/techlibs/quicklogic/synth_quicklogic.cc b/techlibs/quicklogic/synth_quicklogic.cc
index 07ec769b5..c9b8eb289 100644
--- a/techlibs/quicklogic/synth_quicklogic.cc
+++ b/techlibs/quicklogic/synth_quicklogic.cc
@@ -78,7 +78,7 @@ struct SynthQuickLogicPass : public ScriptPass {
 	}
 
 	string top_opt, blif_file, edif_file, family, currmodule, verilog_file, lib_path;
-	bool abc9, inferAdder, nobram, bramTypes, dsp, ioff;
+	bool abc9, inferAdder, nobram, bramTypes, dsp, ioff, flatten;
 
 	void clear_flags() override
 	{
@@ -95,6 +95,7 @@ struct SynthQuickLogicPass : public ScriptPass {
 		lib_path = "+/quicklogic/";
 		dsp = true;
 		ioff = true;
+		flatten = true;
 	}
 
 	void set_scratchpad_defaults(RTLIL::Design *design) {
@@ -163,6 +164,10 @@ struct SynthQuickLogicPass : public ScriptPass {
 				ioff = false;
 				continue;
 			}
+			if (args[argidx] == "-noflatten") {
+				flatten = false;
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
@@ -207,7 +212,8 @@ struct SynthQuickLogicPass : public ScriptPass {
 
 		if (check_label("prepare")) {
 			run("proc");
-			run("flatten");
+			if (flatten)
+				run("flatten", "(unless -noflatten)");
 			if (help_mode || family == "pp3") {
 				run("tribuf -logic", "                   (for pp3)");
 			}

From 83d953e957e90433ed0d57e8b2bca9850b435c18 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 00:23:36 +0000
Subject: [PATCH 431/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b3ea79657..4cb86510a 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+171
+YOSYS_VER := 0.56+186
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 8333a83cef48c8ee08086ba5c4d0962ad7d814cc Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 27 Aug 2025 11:29:57 +0200
Subject: [PATCH 432/931] opt_dff: more explicit testing, typo

---
 tests/opt/opt_dff-simplify.ys | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/opt/opt_dff-simplify.ys b/tests/opt/opt_dff-simplify.ys
index a803c2475..699bfe065 100644
--- a/tests/opt/opt_dff-simplify.ys
+++ b/tests/opt/opt_dff-simplify.ys
@@ -1,9 +1,17 @@
-# 5287 issue
+# 5279 issue
 # Check only for complimentary patterns elimination
 
-read_rtlil opt_dff-simplify.il 
+read_rtlil opt_dff-simplify.il
+
+select -assert-count 0 t:$adffe
+select -assert-count 1 t:$adff
+select -assert-count 0 t:$ne
+
 opt_dff
 
+select -assert-count 1 t:$adffe
+select -assert-count 0 t:$adff
+
 select -assert-count 8 t:$ne r:A_WIDTH=3 %i
 select -assert-count 5 t:$ne r:A_WIDTH=2 %i
 
@@ -37,7 +45,14 @@ EOT
 
 cd test
 proc
+
+select -assert-count 0 t:$dffe
+select -assert-count 1 t:$dff
+select -assert-count 0 t:$ne
+
 opt_dff
 
+select -assert-count 1 t:$dffe
+select -assert-count 0 t:$dff
 select -assert-count 1 t:$ne r:A_WIDTH=2 %i
 select -assert-none t:$ne r:A_WIDTH=3 %i

From 88eb83a0c3e19c1c1cca42658aeb762abe2ed913 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 28 Aug 2025 11:58:02 +0200
Subject: [PATCH 433/931] Revert "Merge pull request #5301 from
 KrystalDelusion/krys/re_5280"

This reverts commit c9a602e882fc036165ef0cde9cc2e26736c092cf, reversing
changes made to 51eaaffe090cb25d447b30c3d262d8c3f04d1cb3.
---
 .github/workflows/extra-builds.yml    |  16 +---
 .github/workflows/test-build.yml      |  44 +++++------
 .github/workflows/test-compile.yml    |  16 +---
 .github/workflows/test-sanitizers.yml | 109 --------------------------
 .github/workflows/test-verific.yml    |  16 +---
 passes/memory/memlib.cc               |   2 +-
 passes/memory/memlib.h                |   2 +-
 7 files changed, 34 insertions(+), 171 deletions(-)
 delete mode 100644 .github/workflows/test-sanitizers.yml

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 11fd42a6c..458eb76a6 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -1,14 +1,6 @@
 name: Test extra build flows
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre_job:
@@ -19,11 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   vs-prep:
     name: Prepare Visual Studio build
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 16ad98bec..f9574594a 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -1,14 +1,6 @@
 name: Build and run tests
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre_job:
@@ -19,12 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
-
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
   pre_docs_job:
     runs-on: ubuntu-latest
     outputs:
@@ -33,16 +24,15 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on readme changes
           paths_ignore: '["**/README.md"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   build-yosys:
     name: Reusable build
     runs-on: ${{ matrix.os }}
-    # pre_job is a subset of pre_docs_job, so we can always build for pre_docs_job
     needs: pre_docs_job
     if: needs.pre_docs_job.outputs.should_skip != 'true'
     env:
@@ -50,6 +40,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -67,6 +58,7 @@ jobs:
           mkdir build
           cd build
           make -f ../Makefile config-$CC
+          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
           make -f ../Makefile -j$procs ENABLE_LTO=1
 
       - name: Log yosys-config output
@@ -82,7 +74,7 @@ jobs:
       - name: Store build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
           path: build.tar
           retention-days: 1
 
@@ -93,9 +85,12 @@ jobs:
     if: needs.pre_job.outputs.should_skip != 'true'
     env:
       CC: clang
+      ASAN_OPTIONS: halt_on_error=1
+      UBSAN_OPTIONS: halt_on_error=1
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -107,12 +102,11 @@ jobs:
         uses: ./.github/actions/setup-build-env
 
       - name: Get iverilog
-        id: get-iverilog
         shell: bash
         run: |
           git clone https://github.com/steveicarus/iverilog.git
           cd iverilog
-          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
 
       - name: Get vcd2fst
         shell: bash
@@ -129,7 +123,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: .local/
-          key: ${{ matrix.os }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
+          key: ${{ matrix.os }}-${IVERILOG_GIT}
 
       - name: Build iverilog
         if: steps.cache-iverilog.outputs.cache-hit != 'true'
@@ -145,7 +139,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Uncompress build
         shell: bash
@@ -177,6 +171,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        sanitizer: [undefined]
     steps:
       - name: Checkout Yosys
         uses: actions/checkout@v4
@@ -189,7 +184,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Uncompress build
         shell: bash
@@ -214,6 +209,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -227,7 +223,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}
+          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
 
       - name: Uncompress build
         shell: bash
diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index f208b911a..7a706e69a 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -1,14 +1,6 @@
 name: Compiler testing
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre_job:
@@ -19,11 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   test-compile:
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
deleted file mode 100644
index 255b9daa5..000000000
--- a/.github/workflows/test-sanitizers.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-name: Check clang sanitizers
-
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # ignore PRs due to time needed
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
-
-jobs:
-  pre_job:
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
-        with:
-          # don't run on documentation changes
-          paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
-
-  run_san:
-    name: Build and run tests
-    runs-on: ${{ matrix.os }}
-    needs: pre_job
-    if: needs.pre_job.outputs.should_skip != 'true'
-    env:
-      CC: clang
-      ASAN_OPTIONS: halt_on_error=1
-      UBSAN_OPTIONS: halt_on_error=1
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-        sanitizer: ['undefined,address']
-      fail-fast: false
-    steps:
-      - name: Checkout Yosys
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-          persist-credentials: false
-
-      - name: Setup environment
-        uses: ./.github/actions/setup-build-env
-
-      - name: Get iverilog
-        id: get-iverilog
-        shell: bash
-        run: |
-          git clone https://github.com/steveicarus/iverilog.git
-          cd iverilog
-          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Get vcd2fst
-        shell: bash
-        run: |
-          git clone https://github.com/mmicko/libwave.git
-          mkdir -p ${{ github.workspace }}/.local/
-          cd libwave
-          cmake . -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.local
-          make -j$procs
-          make install
-
-      - name: Cache iverilog
-        id: cache-iverilog
-        uses: actions/cache@v4
-        with:
-          path: .local/
-          key: ${{ matrix.os }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
-
-      - name: Build iverilog
-        if: steps.cache-iverilog.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          mkdir -p ${{ github.workspace }}/.local/
-          cd iverilog
-          autoconf
-          CC=gcc CXX=g++ ./configure --prefix=${{ github.workspace }}/.local
-          make -j$procs
-          make install
-
-      - name: Check iverilog
-        shell: bash
-        run: |
-          iverilog -V
-
-      - name: Build
-        shell: bash
-        run: |
-          make config-$CC
-          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
-          make -j$procs ENABLE_LTO=1
-
-      - name: Log yosys-config output
-        run: |
-          ./yosys-config || true
-
-      - name: Run tests
-        shell: bash
-        run: |
-          make -j$procs test TARGETS= EXTRA_TARGETS= CONFIG=$CC
-
-      - name: Report errors
-        if: ${{ failure() }}
-        shell: bash
-        run: |
-          find tests/**/*.err -print -exec cat {} \;
diff --git a/.github/workflows/test-verific.yml b/.github/workflows/test-verific.yml
index 9af07b920..013c9f8ca 100644
--- a/.github/workflows/test-verific.yml
+++ b/.github/workflows/test-verific.yml
@@ -1,14 +1,6 @@
 name: Build and run tests with Verific (Linux)
 
-on:
-  # always test main
-  push:
-    branches:
-      - main
-  # test PRs
-  pull_request:
-  # allow triggering tests, ignores skip check
-  workflow_dispatch:
+on: [push, pull_request]
 
 jobs:
   pre-job:
@@ -19,11 +11,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
-          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          # but never cancel main
-          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+          cancel_others: 'true'
+          # only run on push *or* pull_request, not both
+          concurrent_skipping: 'same_content_newer'
 
   test-verific:
     needs: pre-job
diff --git a/passes/memory/memlib.cc b/passes/memory/memlib.cc
index 3a8c3c06e..8a7adc9ac 100644
--- a/passes/memory/memlib.cc
+++ b/passes/memory/memlib.cc
@@ -878,7 +878,7 @@ struct Parser {
 						}
 					}
 				}
-				var.clk_en = find_single_cap(pdef.clken, cram.options, portopts, "clken") != nullptr;
+				var.clk_en = find_single_cap(pdef.clken, cram.options, portopts, "clken");
 			}
 			const PortWidthDef *wdef = find_single_cap(pdef.width, cram.options, portopts, "width");
 			if (wdef) {
diff --git a/passes/memory/memlib.h b/passes/memory/memlib.h
index 7394baf4e..43dec7386 100644
--- a/passes/memory/memlib.h
+++ b/passes/memory/memlib.h
@@ -109,7 +109,7 @@ struct PortVariant {
 	PortKind kind;
 	int clk_shared;
 	ClkPolKind clk_pol;
-	bool clk_en = false;
+	bool clk_en;
 	bool width_tied;
 	int min_wr_wide_log2;
 	int max_wr_wide_log2;

From d4c4b2106697f62852cce03cd98eb78395a7779c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 Aug 2025 00:23:40 +0000
Subject: [PATCH 434/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4cb86510a..003743f49 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+186
+YOSYS_VER := 0.56+197
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 3426905e607dfd885339de450cbcb1cc3f51b78c Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 2 Sep 2025 09:48:17 +1200
Subject: [PATCH 435/931] CI: Use brew bundle

Also skip `brew update`.
Specify llvm@20 due to problems with clang-21 and macOS .dylib.
---
 .github/actions/setup-build-env/action.yml | 3 +--
 Brewfile                                   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 059287a63..285601406 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -14,8 +14,7 @@ runs:
       if: runner.os == 'macOS'
       shell: bash
       run: |
-        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew update
-        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install bison flex gawk libffi pkg-config bash autoconf llvm lld || true
+        brew bundle
 
     - name: Linux runtime environment
       if: runner.os == 'Linux'
diff --git a/Brewfile b/Brewfile
index 3696e40b0..a4efff9a2 100644
--- a/Brewfile
+++ b/Brewfile
@@ -10,5 +10,5 @@ brew "tcl-tk"
 brew "xdot"
 brew "bash"
 brew "boost-python3"
-brew "llvm"
+brew "llvm@19"
 brew "lld"

From 2261c7e366005f1bc028259658eb3f6fb1d25ed6 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 2 Sep 2025 10:08:58 +1200
Subject: [PATCH 436/931] test-compile.yml: Compiler tests for arm mac

---
 .github/workflows/test-compile.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index 7a706e69a..7d87ab56e 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -36,9 +36,12 @@ jobs:
           - 'clang-19'
           - 'gcc-13'
         include:
-          # macOS
+          # macOS x86
           - os: macos-13
             compiler: 'clang'
+          # macOS arm
+          - os: macos-latest
+            compiler: 'clang'
       fail-fast: false
     steps:
       - name: Checkout Yosys

From 5db312b6cfaa76b7458cd37923cdfa0b5bdf7357 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 2 Sep 2025 11:30:57 +1200
Subject: [PATCH 437/931] Bump to llvm@20

---
 .github/actions/setup-build-env/action.yml | 2 +-
 Brewfile                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 285601406..1c2386b06 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -28,7 +28,7 @@ runs:
       shell: bash
       run: |
         echo "${{ github.workspace }}/.local/bin" >> $GITHUB_PATH
-        echo "$(brew --prefix llvm)/bin" >> $GITHUB_PATH
+        echo "$(brew --prefix llvm@20)/bin" >> $GITHUB_PATH
         echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
         echo "$(brew --prefix flex)/bin" >> $GITHUB_PATH
         echo "procs=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
diff --git a/Brewfile b/Brewfile
index a4efff9a2..d2c1063ca 100644
--- a/Brewfile
+++ b/Brewfile
@@ -10,5 +10,5 @@ brew "tcl-tk"
 brew "xdot"
 brew "bash"
 brew "boost-python3"
-brew "llvm@19"
+brew "llvm@20"
 brew "lld"

From c41ba912d887bf2bef09880efcff1bbabae18c34 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 19 Aug 2025 22:21:08 +0000
Subject: [PATCH 438/931] Support IdString parameters in stringf

---
 kernel/io.cc                | 11 +++++++++++
 kernel/io.h                 | 18 ++++++++++++++++--
 tests/unit/kernel/ioTest.cc |  7 +++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/kernel/io.cc b/kernel/io.cc
index ef73a3b3d..62cf6b7f4 100644
--- a/kernel/io.cc
+++ b/kernel/io.cc
@@ -575,6 +575,17 @@ void format_emit_string_view(std::string &result, std::string_view spec, int *dy
 	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, std::string(arg).c_str());
 }
 
+void format_emit_idstring(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, const IdString &arg)
+{
+	if (spec == "%s") {
+		// Format checking will have guaranteed num_dynamic_ints == 0.
+		result += arg.c_str();
+		return;
+	}
+	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg.c_str());
+}
+
 void format_emit_void_ptr(std::string &result, std::string_view spec, int *dynamic_ints,
 	DynamicIntCount num_dynamic_ints, const void *arg)
 {
diff --git a/kernel/io.h b/kernel/io.h
index dafef8bfa..08c234d6e 100644
--- a/kernel/io.h
+++ b/kernel/io.h
@@ -8,6 +8,10 @@
 
 YOSYS_NAMESPACE_BEGIN
 
+namespace RTLIL {
+	struct IdString;
+}
+
 inline std::string vstringf(const char *fmt, va_list ap)
 {
 	// For the common case of strings shorter than 128, save a heap
@@ -240,7 +244,8 @@ constexpr void check_format(std::string_view fmt, int fmt_start, bool *has_escap
 	case CONVSPEC_CHAR_PTR:
 		if constexpr (!std::is_convertible_v<Arg, const char *> &&
 		        !std::is_convertible_v<Arg, const std::string &> &&
-			!std::is_convertible_v<Arg, const std::string_view &>) {
+			!std::is_convertible_v<Arg, const std::string_view &> &&
+			!std::is_convertible_v<Arg, const RTLIL::IdString &>) {
 			YOSYS_ABORT("Expected type convertible to char *");
 		}
 		*specs = found;
@@ -279,6 +284,10 @@ void format_emit_string(std::string &result, std::string_view spec, int *dynamic
 void format_emit_string_view(std::string &result, std::string_view spec, int *dynamic_ints,
 	DynamicIntCount num_dynamic_ints, std::string_view arg);
 
+// Emit the string representation of `arg` that has been converted to a `RTLIL::IdString'.
+void format_emit_idstring(std::string &result, std::string_view spec, int *dynamic_ints,
+	DynamicIntCount num_dynamic_ints, const RTLIL::IdString &arg);
+
 // Emit the string representation of `arg` that has been converted to a `double'.
 void format_emit_void_ptr(std::string &result, std::string_view spec, int *dynamic_ints,
 	DynamicIntCount num_dynamic_ints, const void *arg);
@@ -329,6 +338,11 @@ inline void format_emit_one(std::string &result, std::string_view fmt, const Fou
 			format_emit_string_view(result, spec, dynamic_ints, num_dynamic_ints, s);
 			return;
 		}
+		if constexpr (std::is_convertible_v<Arg, const RTLIL::IdString &>) {
+			const RTLIL::IdString &s = arg;
+			format_emit_idstring(result, spec, dynamic_ints, num_dynamic_ints, s);
+			return;
+		}
 		break;
 	case CONVSPEC_VOID_PTR:
 		if constexpr (std::is_convertible_v<Arg, const void *>) {
@@ -433,7 +447,7 @@ template <typename T> struct WrapType { using type = T; };
 template <typename T> using TypeIdentity = typename WrapType<T>::type;
 
 template <typename... Args>
-inline std::string stringf(FmtString<TypeIdentity<Args>...> fmt, Args... args)
+inline std::string stringf(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
 {
 	return fmt.format(args...);
 }
diff --git a/tests/unit/kernel/ioTest.cc b/tests/unit/kernel/ioTest.cc
index 43a71eb79..6186c34cb 100644
--- a/tests/unit/kernel/ioTest.cc
+++ b/tests/unit/kernel/ioTest.cc
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 
 #include "kernel/io.h"
+#include "kernel/rtlil.h"
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -44,6 +45,12 @@ TEST(KernelStringfTest, stringViewParam)
         EXPECT_EQ(stringf("%s", std::string_view("hello")), "hello");
 }
 
+TEST(KernelStringfTest, idStringParam)
+{
+        RTLIL::IdString id("$hello");
+        EXPECT_EQ(stringf("%s", id), "$hello");
+}
+
 TEST(KernelStringfTest, escapePercent)
 {
 	EXPECT_EQ(stringf("%%"), "%");

From c7df6954b98b7c6d58513dbd2c5a0afd7e6ede52 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 19 Aug 2025 22:45:26 +0000
Subject: [PATCH 439/931] Remove .c_str() from stringf parameters

---
 backends/blif/blif.cc                     |  50 +--
 backends/edif/edif.cc                     |  12 +-
 backends/firrtl/firrtl.cc                 |  64 ++--
 backends/jny/jny.cc                       |  16 +-
 backends/json/json.cc                     |  28 +-
 backends/rtlil/rtlil_backend.cc           |  68 ++--
 backends/smt2/smt2.cc                     |  64 ++--
 backends/smv/smv.cc                       |  50 +--
 backends/verilog/verilog_backend.cc       | 414 +++++++++++-----------
 frontends/aiger/aigerparse.cc             |  14 +-
 frontends/ast/ast.cc                      |   4 +-
 frontends/ast/genrtlil.cc                 |  16 +-
 frontends/ast/simplify.cc                 |  32 +-
 frontends/rpc/rpc_frontend.cc             |   2 +-
 frontends/verific/verific.cc              |  10 +-
 frontends/verific/verificsva.cc           |   4 +-
 frontends/verilog/preproc.cc              |   2 +-
 frontends/verilog/verilog_parser.y        |   2 +-
 kernel/fstdata.cc                         |   4 +-
 kernel/io.cc                              |   4 +-
 kernel/log.cc                             |   2 +-
 kernel/mem.cc                             |  14 +-
 kernel/rtlil.cc                           |   2 +-
 kernel/satgen.h                           |   2 +-
 kernel/tclapi.cc                          |   2 +-
 kernel/yosys.cc                           |   6 +-
 libs/subcircuit/subcircuit.cc             |   4 +-
 passes/cmds/bugpoint.cc                   |  12 +-
 passes/cmds/check.cc                      |  12 +-
 passes/cmds/dft_tag.cc                    |  10 +-
 passes/cmds/glift.cc                      |  10 +-
 passes/cmds/portarcs.cc                   |   2 +-
 passes/cmds/rename.cc                     |   8 +-
 passes/cmds/show.cc                       |  30 +-
 passes/cmds/stat.cc                       |  10 +-
 passes/cmds/timeest.cc                    |   4 +-
 passes/cmds/viz.cc                        |  14 +-
 passes/cmds/wrapcell.cc                   |   4 +-
 passes/cmds/xprop.cc                      |   8 +-
 passes/fsm/fsm_extract.cc                 |   4 +-
 passes/hierarchy/flatten.cc               |   4 +-
 passes/hierarchy/submod.cc                |   2 +-
 passes/memory/memory_bram.cc              |   2 +-
 passes/memory/memory_libmap.cc            |  18 +-
 passes/memory/memory_map.cc               |   2 +-
 passes/opt/opt_expr.cc                    |   4 +-
 passes/proc/proc_mux.cc                   |   2 +-
 passes/sat/clk2fflogic.cc                 |   6 +-
 passes/sat/cutpoint.cc                    |   2 +-
 passes/sat/eval.cc                        |   2 +-
 passes/sat/fmcombine.cc                   |   2 +-
 passes/sat/freduce.cc                     |   4 +-
 passes/sat/mutate.cc                      |   4 +-
 passes/sat/qbfsat.cc                      |   6 +-
 passes/sat/recover_names.cc               |   4 +-
 passes/sat/sim.cc                         |  50 +--
 passes/techmap/abc.cc                     |  38 +-
 passes/techmap/abc9.cc                    |  20 +-
 passes/techmap/abc9_exe.cc                |  32 +-
 passes/techmap/abc9_ops.cc                |  12 +-
 passes/techmap/abc_new.cc                 |   6 +-
 passes/techmap/booth.cc                   |   2 +-
 passes/techmap/dfflibmap.cc               |   4 +-
 passes/techmap/extract.cc                 |   2 +-
 passes/techmap/techmap.cc                 |  14 +-
 passes/tests/test_autotb.cc               |  66 ++--
 passes/tests/test_cell.cc                 |  26 +-
 techlibs/achronix/synth_achronix.cc       |   2 +-
 techlibs/anlogic/synth_anlogic.cc         |   6 +-
 techlibs/common/prep.cc                   |   2 +-
 techlibs/common/synth.cc                  |   6 +-
 techlibs/coolrunner2/synth_coolrunner2.cc |   4 +-
 techlibs/easic/synth_easic.cc             |  16 +-
 techlibs/ecp5/synth_ecp5.cc               |  10 +-
 techlibs/efinix/synth_efinix.cc           |   6 +-
 techlibs/fabulous/synth_fabulous.cc       |   6 +-
 techlibs/gatemate/synth_gatemate.cc       |   6 +-
 techlibs/gowin/synth_gowin.cc             |   4 +-
 techlibs/greenpak4/synth_greenpak4.cc     |   4 +-
 techlibs/ice40/ice40_wrapcarry.cc         |   4 +-
 techlibs/ice40/synth_ice40.cc             |  12 +-
 techlibs/intel/synth_intel.cc             |  10 +-
 techlibs/intel_alm/synth_intel_alm.cc     |  20 +-
 techlibs/lattice/synth_lattice.cc         |  10 +-
 techlibs/microchip/synth_microchip.cc     |   8 +-
 techlibs/nanoxplore/synth_nanoxplore.cc   |   8 +-
 techlibs/nexus/synth_nexus.cc             |  10 +-
 techlibs/quicklogic/synth_quicklogic.cc   |  14 +-
 techlibs/sf2/synth_sf2.cc                 |   8 +-
 techlibs/xilinx/synth_xilinx.cc           |  14 +-
 90 files changed, 773 insertions(+), 773 deletions(-)

diff --git a/backends/blif/blif.cc b/backends/blif/blif.cc
index 5a5b9219f..1ce1ac955 100644
--- a/backends/blif/blif.cc
+++ b/backends/blif/blif.cc
@@ -157,14 +157,14 @@ struct BlifDumper
 						f << stringf("%c", ch);
 				f << stringf("\"\n");
 			} else
-				f << stringf("%s\n", param.second.as_string().c_str());
+				f << stringf("%s\n", param.second.as_string());
 		}
 	}
 
 	void dump()
 	{
 		f << stringf("\n");
-		f << stringf(".model %s\n", str(module->name).c_str());
+		f << stringf(".model %s\n", str(module->name));
 
 		std::map<int, RTLIL::Wire*> inputs, outputs;
 
@@ -179,7 +179,7 @@ struct BlifDumper
 		for (auto &it : inputs) {
 			RTLIL::Wire *wire = it.second;
 			for (int i = 0; i < wire->width; i++)
-				f << stringf(" %s", str(RTLIL::SigSpec(wire, i)).c_str());
+				f << stringf(" %s", str(RTLIL::SigSpec(wire, i)));
 		}
 		f << stringf("\n");
 
@@ -187,7 +187,7 @@ struct BlifDumper
 		for (auto &it : outputs) {
 			RTLIL::Wire *wire = it.second;
 			for (int i = 0; i < wire->width; i++)
-				f << stringf(" %s", str(RTLIL::SigSpec(wire, i)).c_str());
+				f << stringf(" %s", str(RTLIL::SigSpec(wire, i)));
 		}
 		f << stringf("\n");
 
@@ -200,7 +200,7 @@ struct BlifDumper
 		if (!config->impltf_mode) {
 			if (!config->false_type.empty()) {
 				if (config->false_type == "+")
-					f << stringf(".names %s\n", config->false_out.c_str());
+					f << stringf(".names %s\n", config->false_out);
 				else if (config->false_type != "-")
 					f << stringf(".%s %s %s=$false\n", subckt_or_gate(config->false_type),
 							config->false_type.c_str(), config->false_out.c_str());
@@ -208,7 +208,7 @@ struct BlifDumper
 				f << stringf(".names $false\n");
 			if (!config->true_type.empty()) {
 				if (config->true_type == "+")
-					f << stringf(".names %s\n1\n", config->true_out.c_str());
+					f << stringf(".names %s\n1\n", config->true_out);
 				else if (config->true_type != "-")
 					f << stringf(".%s %s %s=$true\n", subckt_or_gate(config->true_type),
 							config->true_type.c_str(), config->true_out.c_str());
@@ -216,7 +216,7 @@ struct BlifDumper
 				f << stringf(".names $true\n1\n");
 			if (!config->undef_type.empty()) {
 				if (config->undef_type == "+")
-					f << stringf(".names %s\n", config->undef_out.c_str());
+					f << stringf(".names %s\n", config->undef_out);
 				else if (config->undef_type != "-")
 					f << stringf(".%s %s %s=$undef\n", subckt_or_gate(config->undef_type),
 							config->undef_type.c_str(), config->undef_out.c_str());
@@ -331,31 +331,31 @@ struct BlifDumper
 			}
 
 			if (!config->icells_mode && cell->type == ID($_FF_)) {
-				f << stringf(".latch %s %s%s\n", str(cell->getPort(ID::D)).c_str(), str(cell->getPort(ID::Q)).c_str(),
+				f << stringf(".latch %s %s%s\n", str(cell->getPort(ID::D)), str(cell->getPort(ID::Q)),
 						str_init(cell->getPort(ID::Q)).c_str());
 				goto internal_cell;
 			}
 
 			if (!config->icells_mode && cell->type == ID($_DFF_N_)) {
-				f << stringf(".latch %s %s fe %s%s\n", str(cell->getPort(ID::D)).c_str(), str(cell->getPort(ID::Q)).c_str(),
+				f << stringf(".latch %s %s fe %s%s\n", str(cell->getPort(ID::D)), str(cell->getPort(ID::Q)),
 						str(cell->getPort(ID::C)).c_str(), str_init(cell->getPort(ID::Q)).c_str());
 				goto internal_cell;
 			}
 
 			if (!config->icells_mode && cell->type == ID($_DFF_P_)) {
-				f << stringf(".latch %s %s re %s%s\n", str(cell->getPort(ID::D)).c_str(), str(cell->getPort(ID::Q)).c_str(),
+				f << stringf(".latch %s %s re %s%s\n", str(cell->getPort(ID::D)), str(cell->getPort(ID::Q)),
 						str(cell->getPort(ID::C)).c_str(), str_init(cell->getPort(ID::Q)).c_str());
 				goto internal_cell;
 			}
 
 			if (!config->icells_mode && cell->type == ID($_DLATCH_N_)) {
-				f << stringf(".latch %s %s al %s%s\n", str(cell->getPort(ID::D)).c_str(), str(cell->getPort(ID::Q)).c_str(),
+				f << stringf(".latch %s %s al %s%s\n", str(cell->getPort(ID::D)), str(cell->getPort(ID::Q)),
 						str(cell->getPort(ID::E)).c_str(), str_init(cell->getPort(ID::Q)).c_str());
 				goto internal_cell;
 			}
 
 			if (!config->icells_mode && cell->type == ID($_DLATCH_P_)) {
-				f << stringf(".latch %s %s ah %s%s\n", str(cell->getPort(ID::D)).c_str(), str(cell->getPort(ID::Q)).c_str(),
+				f << stringf(".latch %s %s ah %s%s\n", str(cell->getPort(ID::D)), str(cell->getPort(ID::Q)),
 						str(cell->getPort(ID::E)).c_str(), str_init(cell->getPort(ID::Q)).c_str());
 				goto internal_cell;
 			}
@@ -366,10 +366,10 @@ struct BlifDumper
 				auto width = cell->parameters.at(ID::WIDTH).as_int();
 				log_assert(inputs.size() == width);
 				for (int i = width-1; i >= 0; i--)
-					f << stringf(" %s", str(inputs.extract(i, 1)).c_str());
+					f << stringf(" %s", str(inputs.extract(i, 1)));
 				auto &output = cell->getPort(ID::Y);
 				log_assert(output.size() == 1);
-				f << stringf(" %s", str(output).c_str());
+				f << stringf(" %s", str(output));
 				f << stringf("\n");
 				RTLIL::SigSpec mask = cell->parameters.at(ID::LUT);
 				for (int i = 0; i < (1 << width); i++)
@@ -392,10 +392,10 @@ struct BlifDumper
 					table.push_back(State::S0);
 				log_assert(inputs.size() == width);
 				for (int i = 0; i < width; i++)
-					f << stringf(" %s", str(inputs.extract(i, 1)).c_str());
+					f << stringf(" %s", str(inputs.extract(i, 1)));
 				auto &output = cell->getPort(ID::Y);
 				log_assert(output.size() == 1);
-				f << stringf(" %s", str(output).c_str());
+				f << stringf(" %s", str(output));
 				f << stringf("\n");
 				for (int i = 0; i < depth; i++) {
 					for (int j = 0; j < width; j++) {
@@ -410,11 +410,11 @@ struct BlifDumper
 				goto internal_cell;
 			}
 
-			f << stringf(".%s %s", subckt_or_gate(cell->type.str()), str(cell->type).c_str());
+			f << stringf(".%s %s", subckt_or_gate(cell->type.str()), str(cell->type));
 			for (auto &conn : cell->connections())
 			{
 				if (conn.second.size() == 1) {
-					f << stringf(" %s=%s", str(conn.first).c_str(), str(conn.second[0]).c_str());
+					f << stringf(" %s=%s", str(conn.first), str(conn.second[0]));
 					continue;
 				}
 
@@ -423,11 +423,11 @@ struct BlifDumper
 
 				if (w == nullptr) {
 					for (int i = 0; i < GetSize(conn.second); i++)
-						f << stringf(" %s[%d]=%s", str(conn.first).c_str(), i, str(conn.second[i]).c_str());
+						f << stringf(" %s[%d]=%s", str(conn.first), i, str(conn.second[i]));
 				} else {
 					for (int i = 0; i < std::min(GetSize(conn.second), GetSize(w)); i++) {
 						SigBit sig(w, i);
-						f << stringf(" %s[%d]=%s", str(conn.first).c_str(), sig.wire->upto ?
+						f << stringf(" %s[%d]=%s", str(conn.first), sig.wire->upto ?
 								sig.wire->start_offset+sig.wire->width-sig.offset-1 :
 								sig.wire->start_offset+sig.offset, str(conn.second[i]).c_str());
 					}
@@ -436,7 +436,7 @@ struct BlifDumper
 			f << stringf("\n");
 
 			if (config->cname_mode)
-				f << stringf(".cname %s\n", str(cell->name).c_str());
+				f << stringf(".cname %s\n", str(cell->name));
 			if (config->attr_mode)
 				dump_params(".attr", cell->attributes);
 			if (config->param_mode)
@@ -445,7 +445,7 @@ struct BlifDumper
 			if (0) {
 		internal_cell:
 				if (config->iname_mode)
-					f << stringf(".cname %s\n", str(cell->name).c_str());
+					f << stringf(".cname %s\n", str(cell->name));
 				if (config->iattr_mode)
 					dump_params(".attr", cell->attributes);
 			}
@@ -461,12 +461,12 @@ struct BlifDumper
 				continue;
 
 			if (config->conn_mode)
-				f << stringf(".conn %s %s\n", str(rhs_bit).c_str(), str(lhs_bit).c_str());
+				f << stringf(".conn %s %s\n", str(rhs_bit), str(lhs_bit));
 			else if (!config->buf_type.empty())
-				f << stringf(".%s %s %s=%s %s=%s\n", subckt_or_gate(config->buf_type), config->buf_type.c_str(),
+				f << stringf(".%s %s %s=%s %s=%s\n", subckt_or_gate(config->buf_type), config->buf_type,
 						config->buf_in.c_str(), str(rhs_bit).c_str(), config->buf_out.c_str(), str(lhs_bit).c_str());
 			else
-				f << stringf(".names %s %s\n1 1\n", str(rhs_bit).c_str(), str(lhs_bit).c_str());
+				f << stringf(".names %s %s\n1 1\n", str(rhs_bit), str(lhs_bit));
 		}
 
 		f << stringf(".end\n");
diff --git a/backends/edif/edif.cc b/backends/edif/edif.cc
index 581590287..cda017059 100644
--- a/backends/edif/edif.cc
+++ b/backends/edif/edif.cc
@@ -48,8 +48,8 @@ struct EdifNames
 		if (define) {
 			std::string new_id = operator()(id, false);
 			if (port_rename)
-				return stringf("(rename %s \"%s%c%d:%d%c\")", new_id.c_str(), id.c_str(), delim_left, range_left, range_right, delim_right);
-			return new_id != id ? stringf("(rename %s \"%s\")", new_id.c_str(), id.c_str()) : id;
+				return stringf("(rename %s \"%s%c%d:%d%c\")", new_id, id, delim_left, range_left, range_right, delim_right);
+			return new_id != id ? stringf("(rename %s \"%s\")", new_id, id) : id;
 		}
 
 		if (name_map.count(id) > 0)
@@ -334,7 +334,7 @@ struct EdifBackend : public Backend {
 
 		auto add_prop = [&](IdString name, Const val) {
 			if ((val.flags & RTLIL::CONST_FLAG_STRING) != 0)
-				*f << stringf("\n            (property %s (string \"%s\"))", EDIF_DEF(name), val.decode_string().c_str());
+				*f << stringf("\n            (property %s (string \"%s\"))", EDIF_DEF(name), val.decode_string());
 			else if (val.size() <= 32 && RTLIL::SigSpec(val).is_fully_def())
 				*f << stringf("\n            (property %s (integer %u))", EDIF_DEF(name), val.as_int());
 			else {
@@ -348,7 +348,7 @@ struct EdifBackend : public Backend {
 					char digit_str[2] = { "0123456789abcdef"[digit_value], 0 };
 					hex_string = std::string(digit_str) + hex_string;
 				}
-				*f << stringf("\n            (property %s (string \"%d'h%s\"))", EDIF_DEF(name), GetSize(val), hex_string.c_str());
+				*f << stringf("\n            (property %s (string \"%d'h%s\"))", EDIF_DEF(name), GetSize(val), hex_string);
 			}
 		};
 		for (auto module : sorted_modules)
@@ -536,7 +536,7 @@ struct EdifBackend : public Backend {
 				}
 				*f << stringf("          (net %s (joined\n", EDIF_DEF(netname));
 				for (auto &ref : it.second)
-					*f << stringf("              %s\n", ref.first.c_str());
+					*f << stringf("              %s\n", ref.first);
 				if (sig.wire == NULL) {
 					if (nogndvcc)
 						log_error("Design contains constant nodes (map with \"hilomap\" first).\n");
@@ -577,7 +577,7 @@ struct EdifBackend : public Backend {
 						auto &refs = net_join_db.at(mapped_sig);
 						for (auto &ref : refs)
 							if (ref.second)
-								*f << stringf("              %s\n", ref.first.c_str());
+								*f << stringf("              %s\n", ref.first);
 						*f << stringf("            )");
 
 						if (attr_properties && raw_sig.wire != NULL)
diff --git a/backends/firrtl/firrtl.cc b/backends/firrtl/firrtl.cc
index 7c9feebb1..cda3d4618 100644
--- a/backends/firrtl/firrtl.cc
+++ b/backends/firrtl/firrtl.cc
@@ -565,12 +565,12 @@ struct FirrtlWorker
 			{
 				if (wire->port_input && wire->port_output)
 					log_error("Module port %s.%s is inout!\n", log_id(module), log_id(wire));
-				port_decls.push_back(stringf("%s%s %s: UInt<%d> %s\n", indent.c_str(), wire->port_input ? "input" : "output",
+				port_decls.push_back(stringf("%s%s %s: UInt<%d> %s\n", indent, wire->port_input ? "input" : "output",
 						wireName, wire->width, wireFileinfo.c_str()));
 			}
 			else
 			{
-				wire_decls.push_back(stringf("%swire %s: UInt<%d> %s\n", indent.c_str(), wireName, wire->width, wireFileinfo.c_str()));
+				wire_decls.push_back(stringf("%swire %s: UInt<%d> %s\n", indent, wireName, wire->width, wireFileinfo));
 			}
 		}
 
@@ -885,7 +885,7 @@ struct FirrtlWorker
 				string a_expr = make_expr(cell->getPort(ID::A));
 				string b_expr = make_expr(cell->getPort(ID::B));
 				string s_expr = make_expr(cell->getPort(ID::S));
-				wire_decls.push_back(stringf("%swire %s: UInt<%d> %s\n", indent.c_str(), y_id.c_str(), width, cellFileinfo.c_str()));
+				wire_decls.push_back(stringf("%swire %s: UInt<%d> %s\n", indent, y_id, width, cellFileinfo));
 
 				string expr = stringf("mux(%s, %s, %s)", s_expr, b_expr, a_expr);
 
@@ -926,7 +926,7 @@ struct FirrtlWorker
 				string a_expr = make_expr(cell->getPort(ID::A));
 				// Get the initial bit selector
 				string b_expr = make_expr(cell->getPort(ID::B));
-				wire_decls.push_back(stringf("%swire %s: UInt<%d>\n", indent.c_str(), y_id.c_str(), y_width));
+				wire_decls.push_back(stringf("%swire %s: UInt<%d>\n", indent, y_id, y_width));
 
 				if (cell->getParam(ID::B_SIGNED).as_bool()) {
 					// Use validif to constrain the selection (test the sign bit)
@@ -936,7 +936,7 @@ struct FirrtlWorker
 				}
 				string expr = stringf("dshr(%s, %s)", a_expr, b_expr);
 
-				cell_exprs.push_back(stringf("%s%s <= %s\n", indent.c_str(), y_id.c_str(), expr.c_str()));
+				cell_exprs.push_back(stringf("%s%s <= %s\n", indent, y_id, expr));
 				register_reverse_wire_map(y_id, cell->getPort(ID::Y));
 				continue;
 			}
@@ -948,21 +948,21 @@ struct FirrtlWorker
 				string b_expr = make_expr(cell->getPort(ID::B));
 				auto b_string = b_expr.c_str();
 				string expr;
-				wire_decls.push_back(stringf("%swire %s: UInt<%d>\n", indent.c_str(), y_id.c_str(), y_width));
+				wire_decls.push_back(stringf("%swire %s: UInt<%d>\n", indent, y_id, y_width));
 
 				if (cell->getParam(ID::B_SIGNED).as_bool()) {
 					// We generate a left or right shift based on the sign of b.
-					std::string dshl = stringf("bits(dshl(%s, %s), 0, %d)", a_expr.c_str(), gen_dshl(b_expr, b_width).c_str(), y_width);
-					std::string dshr = stringf("dshr(%s, %s)", a_expr.c_str(), b_string);
+					std::string dshl = stringf("bits(dshl(%s, %s), 0, %d)", a_expr, gen_dshl(b_expr, b_width), y_width);
+					std::string dshr = stringf("dshr(%s, %s)", a_expr, b_string);
 					expr = stringf("mux(%s < 0, %s, %s)",
 									 b_string,
 									 dshl.c_str(),
 									 dshr.c_str()
 									 );
 				} else {
-					expr = stringf("dshr(%s, %s)", a_expr.c_str(), b_string);
+					expr = stringf("dshr(%s, %s)", a_expr, b_string);
 				}
-				cell_exprs.push_back(stringf("%s%s <= %s\n", indent.c_str(), y_id.c_str(), expr.c_str()));
+				cell_exprs.push_back(stringf("%s%s <= %s\n", indent, y_id, expr));
 				register_reverse_wire_map(y_id, cell->getPort(ID::Y));
 				continue;
 			}
@@ -975,8 +975,8 @@ struct FirrtlWorker
 				if (a_width < y_width) {
 					a_expr = stringf("pad(%s, %d)", a_expr, y_width);
 				}
-				wire_decls.push_back(stringf("%swire %s: UInt<%d>\n", indent.c_str(), y_id.c_str(), y_width));
-				cell_exprs.push_back(stringf("%s%s <= %s\n", indent.c_str(), y_id.c_str(), a_expr.c_str()));
+				wire_decls.push_back(stringf("%swire %s: UInt<%d>\n", indent, y_id, y_width));
+				cell_exprs.push_back(stringf("%s%s <= %s\n", indent, y_id, a_expr));
 				register_reverse_wire_map(y_id, cell->getPort(ID::Y));
 				continue;
 			}
@@ -999,7 +999,7 @@ struct FirrtlWorker
 			for (int i = 0; i < GetSize(mem.rd_ports); i++)
 			{
 				auto &port = mem.rd_ports[i];
-				string port_name(stringf("%s.r%d", mem_id.c_str(), i));
+				string port_name(stringf("%s.r%d", mem_id, i));
 
 				if (port.clk_enable)
 					log_error("Clocked read port %d on memory %s.%s.\n", i, log_id(module), log_id(mem.memid));
@@ -1010,17 +1010,17 @@ struct FirrtlWorker
 				string ena_expr = make_expr(State::S1);
 				string clk_expr = make_expr(State::S0);
 
-				rpe << stringf("%s%s.addr <= %s\n", indent.c_str(), port_name.c_str(), addr_expr.c_str());
-				rpe << stringf("%s%s.en <= %s\n", indent.c_str(), port_name.c_str(), ena_expr.c_str());
-				rpe << stringf("%s%s.clk <= asClock(%s)\n", indent.c_str(), port_name.c_str(), clk_expr.c_str());
+				rpe << stringf("%s%s.addr <= %s\n", indent, port_name, addr_expr);
+				rpe << stringf("%s%s.en <= %s\n", indent, port_name, ena_expr);
+				rpe << stringf("%s%s.clk <= asClock(%s)\n", indent, port_name, clk_expr);
 				cell_exprs.push_back(rpe.str());
-				register_reverse_wire_map(stringf("%s.data", port_name.c_str()), port.data);
+				register_reverse_wire_map(stringf("%s.data", port_name), port.data);
 			}
 
 			for (int i = 0; i < GetSize(mem.wr_ports); i++)
 			{
 				auto &port = mem.wr_ports[i];
-				string port_name(stringf("%s.w%d", mem_id.c_str(), i));
+				string port_name(stringf("%s.w%d", mem_id, i));
 
 				if (!port.clk_enable)
 					log_error("Unclocked write port %d on memory %s.%s.\n", i, log_id(module), log_id(mem.memid));
@@ -1037,18 +1037,18 @@ struct FirrtlWorker
 				string ena_expr = make_expr(port.en[0]);
 				string clk_expr = make_expr(port.clk);
 				string mask_expr = make_expr(State::S1);
-				wpe << stringf("%s%s.data <= %s\n", indent.c_str(), port_name.c_str(), data_expr.c_str());
-				wpe << stringf("%s%s.addr <= %s\n", indent.c_str(), port_name.c_str(), addr_expr.c_str());
-				wpe << stringf("%s%s.en <= %s\n", indent.c_str(), port_name.c_str(), ena_expr.c_str());
-				wpe << stringf("%s%s.clk <= asClock(%s)\n", indent.c_str(), port_name.c_str(), clk_expr.c_str());
-				wpe << stringf("%s%s.mask <= %s\n", indent.c_str(), port_name.c_str(), mask_expr.c_str());
+				wpe << stringf("%s%s.data <= %s\n", indent, port_name, data_expr);
+				wpe << stringf("%s%s.addr <= %s\n", indent, port_name, addr_expr);
+				wpe << stringf("%s%s.en <= %s\n", indent, port_name, ena_expr);
+				wpe << stringf("%s%s.clk <= asClock(%s)\n", indent, port_name, clk_expr);
+				wpe << stringf("%s%s.mask <= %s\n", indent, port_name, mask_expr);
 
 				cell_exprs.push_back(wpe.str());
 			}
 
 			std::ostringstream me;
 
-			me << stringf("    mem %s:\n", mem_id.c_str());
+			me << stringf("    mem %s:\n", mem_id);
 			me << stringf("      data-type => UInt<%d>\n", mem.width);
 			me << stringf("      depth => %d\n", mem.size);
 			for (int i = 0; i < GetSize(mem.rd_ports); i++)
@@ -1068,8 +1068,8 @@ struct FirrtlWorker
 			int y_width =  GetSize(conn.first);
 			string expr = make_expr(conn.second);
 
-			wire_decls.push_back(stringf("%swire %s: UInt<%d>\n", indent.c_str(), y_id.c_str(), y_width));
-			cell_exprs.push_back(stringf("%s%s <= %s\n", indent.c_str(), y_id.c_str(), expr.c_str()));
+			wire_decls.push_back(stringf("%swire %s: UInt<%d>\n", indent, y_id, y_width));
+			cell_exprs.push_back(stringf("%s%s <= %s\n", indent, y_id, expr));
 			register_reverse_wire_map(y_id, conn.first);
 		}
 
@@ -1112,7 +1112,7 @@ struct FirrtlWorker
 						chunk_width++;
 					}
 
-					new_expr = stringf("bits(%s, %d, %d)", start_map.first.c_str(),
+					new_expr = stringf("bits(%s, %d, %d)", start_map.first,
 							start_map.second + chunk_width - 1, start_map.second);
 					is_valid = true;
 				}
@@ -1135,13 +1135,13 @@ struct FirrtlWorker
 
 			if (is_valid) {
 				if (make_unconn_id) {
-					wire_decls.push_back(stringf("%swire %s: UInt<1> %s\n", indent.c_str(), unconn_id.c_str(), wireFileinfo.c_str()));
+					wire_decls.push_back(stringf("%swire %s: UInt<1> %s\n", indent, unconn_id, wireFileinfo));
 					// `invalid` is a firrtl construction for simulation so we will not
 					// tag it with a @[fileinfo] tag as it doesn't directly correspond to
 					// a specific line of verilog code.
-					wire_decls.push_back(stringf("%s%s is invalid\n", indent.c_str(), unconn_id.c_str()));
+					wire_decls.push_back(stringf("%s%s is invalid\n", indent, unconn_id));
 				}
-				wire_exprs.push_back(stringf("%s%s <= %s %s\n", indent.c_str(), make_id(wire->name), expr.c_str(), wireFileinfo.c_str()));
+				wire_exprs.push_back(stringf("%s%s <= %s %s\n", indent, make_id(wire->name), expr, wireFileinfo));
 			} else {
 				if (make_unconn_id) {
 					unconn_id.clear();
@@ -1149,7 +1149,7 @@ struct FirrtlWorker
 				// `invalid` is a firrtl construction for simulation so we will not
 				// tag it with a @[fileinfo] tag as it doesn't directly correspond to
 				// a specific line of verilog code.
-				wire_decls.push_back(stringf("%s%s is invalid\n", indent.c_str(), make_id(wire->name)));
+				wire_decls.push_back(stringf("%s%s is invalid\n", indent, make_id(wire->name)));
 			}
 		}
 
@@ -1249,7 +1249,7 @@ struct FirrtlBackend : public Backend {
 			log_cmd_error("There is no top module in this design!\n");
 
 		std::string circuitFileinfo = getFileinfo(top);
-		*f << stringf("circuit %s: %s\n", make_id(top->name), circuitFileinfo.c_str());
+		*f << stringf("circuit %s: %s\n", make_id(top->name), circuitFileinfo);
 
 		emit_elaborated_extmodules(design, *f);
 
diff --git a/backends/jny/jny.cc b/backends/jny/jny.cc
index 4aacb4e20..001492e40 100644
--- a/backends/jny/jny.cc
+++ b/backends/jny/jny.cc
@@ -125,7 +125,7 @@ struct JnyWriter
 
         f << "{\n";
         f << "  \"$schema\": \"https://raw.githubusercontent.com/YosysHQ/yosys/main/misc/jny.schema.json\",\n";
-        f << stringf("  \"generator\": \"%s\",\n", escape_string(yosys_maybe_version()).c_str());
+        f << stringf("  \"generator\": \"%s\",\n", escape_string(yosys_maybe_version()));
         f << "  \"version\": \"0.0.1\",\n";
         f << "  \"invocation\": \"" << escape_string(invk) << "\",\n";
         f << "  \"features\": [";
@@ -232,7 +232,7 @@ struct JnyWriter
         const auto _indent = gen_indent(indent_level);
 
         f << _indent << "{\n";
-        f << stringf("  %s\"name\": \"%s\",\n", _indent.c_str(), escape_string(RTLIL::unescape_id(mod->name)).c_str());
+        f << stringf("  %s\"name\": \"%s\",\n", _indent, escape_string(RTLIL::unescape_id(mod->name)));
         f << _indent << "  \"cell_sorts\": [\n";
 
         bool first_sort{true};
@@ -280,7 +280,7 @@ struct JnyWriter
                 f << ",\n";
 
             f << _indent << "  {\n";
-            f << stringf("    %s\"name\": \"%s\",\n", _indent.c_str(), escape_string(RTLIL::unescape_id(con.first)).c_str());
+            f << stringf("    %s\"name\": \"%s\",\n", _indent, escape_string(RTLIL::unescape_id(con.first)));
             f << _indent << "    \"direction\": \"";
             if (port_cell->input(con.first))
                 f << "i";
@@ -290,7 +290,7 @@ struct JnyWriter
             if (con.second.size() == 1)
                 f << _indent << "    \"range\": [0, 0]\n";
             else
-                f << stringf("    %s\"range\": [%d, %d]\n", _indent.c_str(), con.second.size(), 0);
+                f << stringf("    %s\"range\": [%d, %d]\n", _indent, con.second.size(), 0);
             f << _indent << "  }";
 
             first_port = false;
@@ -304,7 +304,7 @@ struct JnyWriter
         const auto _indent = gen_indent(indent_level);
 
         f << _indent << "{\n";
-        f << stringf("  %s\"type\": \"%s\",\n", _indent.c_str(), sort.first.c_str());
+        f << stringf("  %s\"type\": \"%s\",\n", _indent, sort.first);
         f << _indent << "  \"ports\": [\n";
 
         write_cell_ports(port_cell, indent_level + 2);
@@ -351,10 +351,10 @@ struct JnyWriter
                 f << stringf(",\n");
             const auto param_val = param.second;
             if (!param_val.empty()) {
-                f << stringf("  %s\"%s\": ", _indent.c_str(), escape_string(RTLIL::unescape_id(param.first)).c_str());
+                f << stringf("  %s\"%s\": ", _indent, escape_string(RTLIL::unescape_id(param.first)));
                 write_param_val(param_val);
             } else {
-                f << stringf("  %s\"%s\": true", _indent.c_str(), escape_string(RTLIL::unescape_id(param.first)).c_str());
+                f << stringf("  %s\"%s\": true", _indent, escape_string(RTLIL::unescape_id(param.first)));
             }
 
             first_param = false;
@@ -366,7 +366,7 @@ struct JnyWriter
         log_assert(cell != nullptr);
 
         f << _indent << "  {\n";
-        f << stringf("    %s\"name\": \"%s\"", _indent.c_str(), escape_string(RTLIL::unescape_id(cell->name)).c_str());
+        f << stringf("    %s\"name\": \"%s\"", _indent, escape_string(RTLIL::unescape_id(cell->name)));
 
         if (_include_connections) {
             f << ",\n" << _indent << "    \"connections\": [\n";
diff --git a/backends/json/json.cc b/backends/json/json.cc
index 98e929dfa..f7b80d53d 100644
--- a/backends/json/json.cc
+++ b/backends/json/json.cc
@@ -135,7 +135,7 @@ struct JsonWriter
 		bool first = true;
 		for (auto &param : parameters) {
 			f << stringf("%s\n", first ? "" : ",");
-			f << stringf("        %s%s: ", for_module ? "" : "    ", get_name(param.first).c_str());
+			f << stringf("        %s%s: ", for_module ? "" : "    ", get_name(param.first));
 			write_parameter_value(param.second);
 			first = false;
 		}
@@ -155,7 +155,7 @@ struct JsonWriter
 			log_error("Module %s contains processes, which are not supported by JSON backend (run `proc` first).\n", log_id(module));
 		}
 
-		f << stringf("    %s: {\n", get_name(module->name).c_str());
+		f << stringf("    %s: {\n", get_name(module->name));
 
 		f << stringf("      \"attributes\": {");
 		write_parameters(module->attributes, /*for_module=*/true);
@@ -174,7 +174,7 @@ struct JsonWriter
 			if (use_selection && !module->selected(w))
 				continue;
 			f << stringf("%s\n", first ? "" : ",");
-			f << stringf("        %s: {\n", get_name(n).c_str());
+			f << stringf("        %s: {\n", get_name(n));
 			f << stringf("          \"direction\": \"%s\",\n", w->port_input ? w->port_output ? "inout" : "input" : "output");
 			if (w->start_offset)
 				f << stringf("          \"offset\": %d,\n", w->start_offset);
@@ -182,7 +182,7 @@ struct JsonWriter
 				f << stringf("          \"upto\": 1,\n");
 			if (w->is_signed)
 				f << stringf("          \"signed\": %d,\n", w->is_signed);
-			f << stringf("          \"bits\": %s\n", get_bits(w).c_str());
+			f << stringf("          \"bits\": %s\n", get_bits(w));
 			f << stringf("        }");
 			first = false;
 		}
@@ -196,13 +196,13 @@ struct JsonWriter
 			if (!scopeinfo_mode && c->type == ID($scopeinfo))
 				continue;
 			f << stringf("%s\n", first ? "" : ",");
-			f << stringf("        %s: {\n", get_name(c->name).c_str());
+			f << stringf("        %s: {\n", get_name(c->name));
 			f << stringf("          \"hide_name\": %s,\n", c->name[0] == '$' ? "1" : "0");
-			f << stringf("          \"type\": %s,\n", get_name(c->type).c_str());
+			f << stringf("          \"type\": %s,\n", get_name(c->type));
 			if (aig_mode) {
 				Aig aig(c);
 				if (!aig.name.empty()) {
-					f << stringf("          \"model\": \"%s\",\n", aig.name.c_str());
+					f << stringf("          \"model\": \"%s\",\n", aig.name);
 					aig_models.insert(aig);
 				}
 			}
@@ -220,7 +220,7 @@ struct JsonWriter
 					if (c->input(conn.first))
 						direction = c->output(conn.first) ? "inout" : "input";
 					f << stringf("%s\n", first2 ? "" : ",");
-					f << stringf("            %s: \"%s\"", get_name(conn.first).c_str(), direction.c_str());
+					f << stringf("            %s: \"%s\"", get_name(conn.first), direction);
 					first2 = false;
 				}
 				f << stringf("\n          },\n");
@@ -229,7 +229,7 @@ struct JsonWriter
 			bool first2 = true;
 			for (auto &conn : c->connections()) {
 				f << stringf("%s\n", first2 ? "" : ",");
-				f << stringf("            %s: %s", get_name(conn.first).c_str(), get_bits(conn.second).c_str());
+				f << stringf("            %s: %s", get_name(conn.first), get_bits(conn.second));
 				first2 = false;
 			}
 			f << stringf("\n          }\n");
@@ -245,7 +245,7 @@ struct JsonWriter
 				if (use_selection && !module->selected(it.second))
 					continue;
 				f << stringf("%s\n", first ? "" : ",");
-				f << stringf("        %s: {\n", get_name(it.second->name).c_str());
+				f << stringf("        %s: {\n", get_name(it.second->name));
 				f << stringf("          \"hide_name\": %s,\n", it.second->name[0] == '$' ? "1" : "0");
 				f << stringf("          \"attributes\": {");
 				write_parameters(it.second->attributes);
@@ -265,9 +265,9 @@ struct JsonWriter
 			if (use_selection && !module->selected(w))
 				continue;
 			f << stringf("%s\n", first ? "" : ",");
-			f << stringf("        %s: {\n", get_name(w->name).c_str());
+			f << stringf("        %s: {\n", get_name(w->name));
 			f << stringf("          \"hide_name\": %s,\n", w->name[0] == '$' ? "1" : "0");
-			f << stringf("          \"bits\": %s,\n", get_bits(w).c_str());
+			f << stringf("          \"bits\": %s,\n", get_bits(w));
 			if (w->start_offset)
 				f << stringf("          \"offset\": %d,\n", w->start_offset);
 			if (w->upto)
@@ -291,7 +291,7 @@ struct JsonWriter
 		design->sort();
 
 		f << stringf("{\n");
-		f << stringf("  \"creator\": %s,\n", get_string(yosys_maybe_version()).c_str());
+		f << stringf("  \"creator\": %s,\n", get_string(yosys_maybe_version()));
 		f << stringf("  \"modules\": {\n");
 		vector<Module*> modules = use_selection ? design->selected_modules() : design->modules();
 		bool first_module = true;
@@ -308,7 +308,7 @@ struct JsonWriter
 			for (auto &aig : aig_models) {
 				if (!first_model)
 					f << stringf(",\n");
-				f << stringf("    \"%s\": [\n", aig.name.c_str());
+				f << stringf("    \"%s\": [\n", aig.name);
 				int node_idx = 0;
 				for (auto &node : aig.nodes) {
 					if (node_idx != 0)
diff --git a/backends/rtlil/rtlil_backend.cc b/backends/rtlil/rtlil_backend.cc
index adde37356..215e0d366 100644
--- a/backends/rtlil/rtlil_backend.cc
+++ b/backends/rtlil/rtlil_backend.cc
@@ -96,11 +96,11 @@ void RTLIL_BACKEND::dump_sigchunk(std::ostream &f, const RTLIL::SigChunk &chunk,
 		dump_const(f, chunk.data, chunk.width, chunk.offset, autoint);
 	} else {
 		if (chunk.width == chunk.wire->width && chunk.offset == 0)
-			f << stringf("%s", chunk.wire->name.c_str());
+			f << stringf("%s", chunk.wire->name);
 		else if (chunk.width == 1)
-			f << stringf("%s [%d]", chunk.wire->name.c_str(), chunk.offset);
+			f << stringf("%s [%d]", chunk.wire->name, chunk.offset);
 		else
-			f << stringf("%s [%d:%d]", chunk.wire->name.c_str(), chunk.offset+chunk.width-1, chunk.offset);
+			f << stringf("%s [%d:%d]", chunk.wire->name, chunk.offset+chunk.width-1, chunk.offset);
 	}
 }
 
@@ -121,15 +121,15 @@ void RTLIL_BACKEND::dump_sigspec(std::ostream &f, const RTLIL::SigSpec &sig, boo
 void RTLIL_BACKEND::dump_wire(std::ostream &f, std::string indent, const RTLIL::Wire *wire)
 {
 	for (auto &it : wire->attributes) {
-		f << stringf("%s" "attribute %s ", indent.c_str(), it.first.c_str());
+		f << stringf("%s" "attribute %s ", indent, it.first);
 		dump_const(f, it.second);
 		f << stringf("\n");
 	}
 	if (wire->driverCell_) {
-		f << stringf("%s" "# driver %s %s\n", indent.c_str(),
+		f << stringf("%s" "# driver %s %s\n", indent,
 				wire->driverCell()->name.c_str(), wire->driverPort().c_str());
 	}
-	f << stringf("%s" "wire ", indent.c_str());
+	f << stringf("%s" "wire ", indent);
 	if (wire->width != 1)
 		f << stringf("width %d ", wire->width);
 	if (wire->upto)
@@ -144,36 +144,36 @@ void RTLIL_BACKEND::dump_wire(std::ostream &f, std::string indent, const RTLIL::
 		f << stringf("inout %d ", wire->port_id);
 	if (wire->is_signed)
 		f << stringf("signed ");
-	f << stringf("%s\n", wire->name.c_str());
+	f << stringf("%s\n", wire->name);
 }
 
 void RTLIL_BACKEND::dump_memory(std::ostream &f, std::string indent, const RTLIL::Memory *memory)
 {
 	for (auto &it : memory->attributes) {
-		f << stringf("%s" "attribute %s ", indent.c_str(), it.first.c_str());
+		f << stringf("%s" "attribute %s ", indent, it.first);
 		dump_const(f, it.second);
 		f << stringf("\n");
 	}
-	f << stringf("%s" "memory ", indent.c_str());
+	f << stringf("%s" "memory ", indent);
 	if (memory->width != 1)
 		f << stringf("width %d ", memory->width);
 	if (memory->size != 0)
 		f << stringf("size %d ", memory->size);
 	if (memory->start_offset != 0)
 		f << stringf("offset %d ", memory->start_offset);
-	f << stringf("%s\n", memory->name.c_str());
+	f << stringf("%s\n", memory->name);
 }
 
 void RTLIL_BACKEND::dump_cell(std::ostream &f, std::string indent, const RTLIL::Cell *cell)
 {
 	for (auto &it : cell->attributes) {
-		f << stringf("%s" "attribute %s ", indent.c_str(), it.first.c_str());
+		f << stringf("%s" "attribute %s ", indent, it.first);
 		dump_const(f, it.second);
 		f << stringf("\n");
 	}
-	f << stringf("%s" "cell %s %s\n", indent.c_str(), cell->type.c_str(), cell->name.c_str());
+	f << stringf("%s" "cell %s %s\n", indent, cell->type, cell->name);
 	for (auto &it : cell->parameters) {
-		f << stringf("%s  parameter%s%s %s ", indent.c_str(),
+		f << stringf("%s  parameter%s%s %s ", indent,
 				(it.second.flags & RTLIL::CONST_FLAG_SIGNED) != 0 ? " signed" : "",
 				(it.second.flags & RTLIL::CONST_FLAG_REAL) != 0 ? " real" : "",
 				it.first.c_str());
@@ -181,18 +181,18 @@ void RTLIL_BACKEND::dump_cell(std::ostream &f, std::string indent, const RTLIL::
 		f << stringf("\n");
 	}
 	for (auto &it : cell->connections()) {
-		f << stringf("%s  connect %s ", indent.c_str(), it.first.c_str());
+		f << stringf("%s  connect %s ", indent, it.first);
 		dump_sigspec(f, it.second);
 		f << stringf("\n");
 	}
-	f << stringf("%s" "end\n", indent.c_str());
+	f << stringf("%s" "end\n", indent);
 }
 
 void RTLIL_BACKEND::dump_proc_case_body(std::ostream &f, std::string indent, const RTLIL::CaseRule *cs)
 {
 	for (auto it = cs->actions.begin(); it != cs->actions.end(); ++it)
 	{
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, it->first);
 		f << stringf(" ");
 		dump_sigspec(f, it->second);
@@ -206,23 +206,23 @@ void RTLIL_BACKEND::dump_proc_case_body(std::ostream &f, std::string indent, con
 void RTLIL_BACKEND::dump_proc_switch(std::ostream &f, std::string indent, const RTLIL::SwitchRule *sw)
 {
 	for (auto it = sw->attributes.begin(); it != sw->attributes.end(); ++it) {
-		f << stringf("%s" "attribute %s ", indent.c_str(), it->first.c_str());
+		f << stringf("%s" "attribute %s ", indent, it->first);
 		dump_const(f, it->second);
 		f << stringf("\n");
 	}
 
-	f << stringf("%s" "switch ", indent.c_str());
+	f << stringf("%s" "switch ", indent);
 	dump_sigspec(f, sw->signal);
 	f << stringf("\n");
 
 	for (auto it = sw->cases.begin(); it != sw->cases.end(); ++it)
 	{
 		for (auto ait = (*it)->attributes.begin(); ait != (*it)->attributes.end(); ++ait) {
-			f << stringf("%s  attribute %s ", indent.c_str(), ait->first.c_str());
+			f << stringf("%s  attribute %s ", indent, ait->first);
 			dump_const(f, ait->second);
 			f << stringf("\n");
 		}
-		f << stringf("%s  case ", indent.c_str());
+		f << stringf("%s  case ", indent);
 		for (size_t i = 0; i < (*it)->compare.size(); i++) {
 			if (i > 0)
 				f << stringf(" , ");
@@ -233,12 +233,12 @@ void RTLIL_BACKEND::dump_proc_switch(std::ostream &f, std::string indent, const
 		dump_proc_case_body(f, indent + "    ", *it);
 	}
 
-	f << stringf("%s" "end\n", indent.c_str());
+	f << stringf("%s" "end\n", indent);
 }
 
 void RTLIL_BACKEND::dump_proc_sync(std::ostream &f, std::string indent, const RTLIL::SyncRule *sy)
 {
-	f << stringf("%s" "sync ", indent.c_str());
+	f << stringf("%s" "sync ", indent);
 	switch (sy->type) {
 	case RTLIL::ST0: f << stringf("low ");
 	if (0) case RTLIL::ST1: f << stringf("high ");
@@ -254,7 +254,7 @@ void RTLIL_BACKEND::dump_proc_sync(std::ostream &f, std::string indent, const RT
 	}
 
 	for (auto &it: sy->actions) {
-		f << stringf("%s  update ", indent.c_str());
+		f << stringf("%s  update ", indent);
 		dump_sigspec(f, it.first);
 		f << stringf(" ");
 		dump_sigspec(f, it.second);
@@ -263,11 +263,11 @@ void RTLIL_BACKEND::dump_proc_sync(std::ostream &f, std::string indent, const RT
 
 	for (auto &it: sy->mem_write_actions) {
 		for (auto it2 = it.attributes.begin(); it2 != it.attributes.end(); ++it2) {
-			f << stringf("%s  attribute %s ", indent.c_str(), it2->first.c_str());
+			f << stringf("%s  attribute %s ", indent, it2->first);
 			dump_const(f, it2->second);
 			f << stringf("\n");
 		}
-		f << stringf("%s  memwr %s ", indent.c_str(), it.memid.c_str());
+		f << stringf("%s  memwr %s ", indent, it.memid);
 		dump_sigspec(f, it.address);
 		f << stringf(" ");
 		dump_sigspec(f, it.data);
@@ -282,20 +282,20 @@ void RTLIL_BACKEND::dump_proc_sync(std::ostream &f, std::string indent, const RT
 void RTLIL_BACKEND::dump_proc(std::ostream &f, std::string indent, const RTLIL::Process *proc)
 {
 	for (auto it = proc->attributes.begin(); it != proc->attributes.end(); ++it) {
-		f << stringf("%s" "attribute %s ", indent.c_str(), it->first.c_str());
+		f << stringf("%s" "attribute %s ", indent, it->first);
 		dump_const(f, it->second);
 		f << stringf("\n");
 	}
-	f << stringf("%s" "process %s\n", indent.c_str(), proc->name.c_str());
+	f << stringf("%s" "process %s\n", indent, proc->name);
 	dump_proc_case_body(f, indent + "  ", &proc->root_case);
 	for (auto it = proc->syncs.begin(); it != proc->syncs.end(); ++it)
 		dump_proc_sync(f, indent + "  ", *it);
-	f << stringf("%s" "end\n", indent.c_str());
+	f << stringf("%s" "end\n", indent);
 }
 
 void RTLIL_BACKEND::dump_conn(std::ostream &f, std::string indent, const RTLIL::SigSpec &left, const RTLIL::SigSpec &right)
 {
-	f << stringf("%s" "connect ", indent.c_str());
+	f << stringf("%s" "connect ", indent);
 	dump_sigspec(f, left);
 	f << stringf(" ");
 	dump_sigspec(f, right);
@@ -310,12 +310,12 @@ void RTLIL_BACKEND::dump_module(std::ostream &f, std::string indent, RTLIL::Modu
 	if (print_header)
 	{
 		for (auto it = module->attributes.begin(); it != module->attributes.end(); ++it) {
-			f << stringf("%s" "attribute %s ", indent.c_str(), it->first.c_str());
+			f << stringf("%s" "attribute %s ", indent, it->first);
 			dump_const(f, it->second);
 			f << stringf("\n");
 		}
 
-		f << stringf("%s" "module %s\n", indent.c_str(), module->name.c_str());
+		f << stringf("%s" "module %s\n", indent, module->name);
 
 		if (!module->avail_parameters.empty()) {
 			if (only_selected)
@@ -323,9 +323,9 @@ void RTLIL_BACKEND::dump_module(std::ostream &f, std::string indent, RTLIL::Modu
 			for (const auto &p : module->avail_parameters) {
 				const auto &it = module->parameter_default_values.find(p);
 				if (it == module->parameter_default_values.end()) {
-					f << stringf("%s" "  parameter %s\n", indent.c_str(), p.c_str());
+					f << stringf("%s" "  parameter %s\n", indent, p);
 				} else {
-					f << stringf("%s" "  parameter %s ", indent.c_str(), p.c_str());
+					f << stringf("%s" "  parameter %s ", indent, p);
 					dump_const(f, it->second);
 					f << stringf("\n");
 				}
@@ -385,7 +385,7 @@ void RTLIL_BACKEND::dump_module(std::ostream &f, std::string indent, RTLIL::Modu
 	}
 
 	if (print_header)
-		f << stringf("%s" "end\n", indent.c_str());
+		f << stringf("%s" "end\n", indent);
 }
 
 void RTLIL_BACKEND::dump_design(std::ostream &f, RTLIL::Design *design, bool only_selected, bool flag_m, bool flag_n)
diff --git a/backends/smt2/smt2.cc b/backends/smt2/smt2.cc
index 87f5a08c8..089e73715 100644
--- a/backends/smt2/smt2.cc
+++ b/backends/smt2/smt2.cc
@@ -82,27 +82,27 @@ struct Smt2Worker
 		if (statebv)
 		{
 			if (width == 0) {
-				decl_str = stringf("(define-fun |%s| ((state |%s_s|)) Bool (= ((_ extract %d %d) state) #b1))", name.c_str(), get_id(module), statebv_width, statebv_width);
+				decl_str = stringf("(define-fun |%s| ((state |%s_s|)) Bool (= ((_ extract %d %d) state) #b1))", name, get_id(module), statebv_width, statebv_width);
 				statebv_width += 1;
 			} else {
-				decl_str = stringf("(define-fun |%s| ((state |%s_s|)) (_ BitVec %d) ((_ extract %d %d) state))", name.c_str(), get_id(module), width, statebv_width+width-1, statebv_width);
+				decl_str = stringf("(define-fun |%s| ((state |%s_s|)) (_ BitVec %d) ((_ extract %d %d) state))", name, get_id(module), width, statebv_width+width-1, statebv_width);
 				statebv_width += width;
 			}
 		}
 		else if (statedt)
 		{
 			if (width == 0) {
-				decl_str = stringf("  (|%s| Bool)", name.c_str());
+				decl_str = stringf("  (|%s| Bool)", name);
 			} else {
-				decl_str = stringf("  (|%s| (_ BitVec %d))", name.c_str(), width);
+				decl_str = stringf("  (|%s| (_ BitVec %d))", name, width);
 			}
 		}
 		else
 		{
 			if (width == 0) {
-				decl_str = stringf("(declare-fun |%s| (|%s_s|) Bool)", name.c_str(), get_id(module));
+				decl_str = stringf("(declare-fun |%s| (|%s_s|) Bool)", name, get_id(module));
 			} else {
-				decl_str = stringf("(declare-fun |%s| (|%s_s|) (_ BitVec %d))", name.c_str(), get_id(module), width);
+				decl_str = stringf("(declare-fun |%s| (|%s_s|) (_ BitVec %d))", name, get_id(module), width);
 			}
 		}
 
@@ -383,7 +383,7 @@ struct Smt2Worker
 			}
 
 			if (fcache.count(sig[i]) && fcache.at(sig[i]).second == -1) {
-				subexpr.push_back(stringf("(ite %s #b1 #b0)", get_bool(sig[i], state_name).c_str()));
+				subexpr.push_back(stringf("(ite %s #b1 #b0)", get_bool(sig[i], state_name)));
 				continue;
 			}
 
@@ -495,7 +495,7 @@ struct Smt2Worker
 		}
 
 		if (width != GetSize(sig_y) && type != 'b')
-			processed_expr = stringf("((_ extract %d 0) %s)", GetSize(sig_y)-1, processed_expr.c_str());
+			processed_expr = stringf("((_ extract %d 0) %s)", GetSize(sig_y)-1, processed_expr);
 
 		if (verbose)
 			log("%*s-> import cell: %s\n", 2+2*GetSize(recursive_cells), "", log_id(cell));
@@ -617,7 +617,7 @@ struct Smt2Worker
 				string infostr = cell->attributes.count(ID::src) ? cell->attributes.at(ID::src).decode_string().c_str() : get_id(cell);
 				if (cell->attributes.count(ID::reg))
 					infostr += " " + cell->attributes.at(ID::reg).decode_string();
-				decls.push_back(stringf("; yosys-smt2-%s %s#%d %d %s\n", cell->type.c_str() + 1, get_id(module), idcounter, GetSize(cell->getPort(QY)), infostr.c_str()));
+				decls.push_back(stringf("; yosys-smt2-%s %s#%d %d %s\n", cell->type.c_str() + 1, get_id(module), idcounter, GetSize(cell->getPort(QY)), infostr));
 				if (cell->getPort(QY).is_wire() && cell->getPort(QY).as_wire()->get_bool_attribute(ID::maximize)){
 					decls.push_back(stringf("; yosys-smt2-maximize %s#%d\n", get_id(module), idcounter));
 					log("Wire %s is maximized\n", cell->getPort(QY).as_wire()->name.str().c_str());
@@ -722,7 +722,7 @@ struct Smt2Worker
 					2*GetSize(cell->getPort(ID::A).chunks()) < GetSize(cell->getPort(ID::A))) {
 				bool is_and = cell->type == ID($reduce_and);
 				string bits(GetSize(cell->getPort(ID::A)), is_and ? '1' : '0');
-				return export_bvop(cell, stringf("(%s A #b%s)", is_and ? "=" : "distinct", bits.c_str()), 'b');
+				return export_bvop(cell, stringf("(%s A #b%s)", is_and ? "=" : "distinct", bits), 'b');
 			}
 
 			if (cell->type == ID($reduce_and)) return export_reduce(cell, "(and A)", true);
@@ -746,7 +746,7 @@ struct Smt2Worker
 				get_bv(sig_s);
 
 				for (int i = 0; i < GetSize(sig_s); i++)
-					processed_expr = stringf("(ite %s %s %s)", get_bool(sig_s[i]).c_str(),
+					processed_expr = stringf("(ite %s %s %s)", get_bool(sig_s[i]),
 							get_bv(sig_b.extract(i*width, width)).c_str(), processed_expr.c_str());
 
 				if (verbose)
@@ -1090,13 +1090,13 @@ struct Smt2Worker
 							use_mask = true;
 						}
 					if (use_mask)
-						init_list.push_back(stringf("(= (bvand %s #b%s) #b%s) ; %s", get_bv(sig).c_str(), mask.as_string().c_str(), val.as_string().c_str(), get_id(wire)));
+						init_list.push_back(stringf("(= (bvand %s #b%s) #b%s) ; %s", get_bv(sig), mask.as_string(), val.as_string(), get_id(wire)));
 					else
-						init_list.push_back(stringf("(= %s #b%s) ; %s", get_bv(sig).c_str(), val.as_string().c_str(), get_id(wire)));
+						init_list.push_back(stringf("(= %s #b%s) ; %s", get_bv(sig), val.as_string(), get_id(wire)));
 				} else {
 					for (int i = 0; i < GetSize(sig); i++)
 						if (val[i] == State::S0 || val[i] == State::S1)
-							init_list.push_back(stringf("(= %s %s) ; %s", get_bool(sig[i]).c_str(), val[i] == State::S1 ? "true" : "false", get_id(wire)));
+							init_list.push_back(stringf("(= %s %s) ; %s", get_bool(sig[i]), val[i] == State::S1 ? "true" : "false", get_id(wire)));
 				}
 			}
 
@@ -1131,7 +1131,7 @@ struct Smt2Worker
 				}
 
 				if (private_name && cell->attributes.count(ID::src))
-					decls.push_back(stringf("; yosys-smt2-%s %d %s %s\n", cell->type.c_str() + 1, id, get_id(cell), cell->attributes.at(ID::src).decode_string().c_str()));
+					decls.push_back(stringf("; yosys-smt2-%s %d %s %s\n", cell->type.c_str() + 1, id, get_id(cell), cell->attributes.at(ID::src).decode_string()));
 				else
 					decls.push_back(stringf("; yosys-smt2-%s %d %s\n", cell->type.c_str() + 1, id, get_id(cell)));
 
@@ -1180,11 +1180,11 @@ struct Smt2Worker
 					SigSpec sig = sigmap(conn.second);
 
 					if (bvmode || GetSize(w) == 1) {
-						hier.push_back(stringf("  (= %s (|%s_n %s| %s)) ; %s.%s\n", (GetSize(w) > 1 ? get_bv(sig) : get_bool(sig)).c_str(),
+						hier.push_back(stringf("  (= %s (|%s_n %s| %s)) ; %s.%s\n", (GetSize(w) > 1 ? get_bv(sig) : get_bool(sig)),
 								get_id(cell->type), get_id(w), cell_state.c_str(), get_id(cell->type), get_id(w)));
 					} else {
 						for (int i = 0; i < GetSize(w); i++)
-							hier.push_back(stringf("  (= %s (|%s_n %s %d| %s)) ; %s.%s[%d]\n", get_bool(sig[i]).c_str(),
+							hier.push_back(stringf("  (= %s (|%s_n %s %d| %s)) ; %s.%s[%d]\n", get_bool(sig[i]),
 									get_id(cell->type), get_id(w), i, cell_state.c_str(), get_id(cell->type), get_id(w), i));
 					}
 				}
@@ -1204,25 +1204,25 @@ struct Smt2Worker
 				{
 					std::string expr_d = get_bool(cell->getPort(ID::D));
 					std::string expr_q = get_bool(cell->getPort(ID::Q), "next_state");
-					trans.push_back(stringf("  (= %s %s) ; %s %s\n", expr_d.c_str(), expr_q.c_str(), get_id(cell), log_signal(cell->getPort(ID::Q))));
-					ex_state_eq.push_back(stringf("(= %s %s)", get_bool(cell->getPort(ID::Q)).c_str(), get_bool(cell->getPort(ID::Q), "other_state").c_str()));
+					trans.push_back(stringf("  (= %s %s) ; %s %s\n", expr_d, expr_q, get_id(cell), log_signal(cell->getPort(ID::Q))));
+					ex_state_eq.push_back(stringf("(= %s %s)", get_bool(cell->getPort(ID::Q)), get_bool(cell->getPort(ID::Q), "other_state")));
 				}
 
 				if (cell->type.in(ID($ff), ID($dff), ID($anyinit)))
 				{
 					std::string expr_d = get_bv(cell->getPort(ID::D));
 					std::string expr_q = get_bv(cell->getPort(ID::Q), "next_state");
-					trans.push_back(stringf("  (= %s %s) ; %s %s\n", expr_d.c_str(), expr_q.c_str(), get_id(cell), log_signal(cell->getPort(ID::Q))));
-					ex_state_eq.push_back(stringf("(= %s %s)", get_bv(cell->getPort(ID::Q)).c_str(), get_bv(cell->getPort(ID::Q), "other_state").c_str()));
+					trans.push_back(stringf("  (= %s %s) ; %s %s\n", expr_d, expr_q, get_id(cell), log_signal(cell->getPort(ID::Q))));
+					ex_state_eq.push_back(stringf("(= %s %s)", get_bv(cell->getPort(ID::Q)), get_bv(cell->getPort(ID::Q), "other_state")));
 				}
 
 				if (cell->type.in(ID($anyconst), ID($allconst)))
 				{
 					std::string expr_d = get_bv(cell->getPort(ID::Y));
 					std::string expr_q = get_bv(cell->getPort(ID::Y), "next_state");
-					trans.push_back(stringf("  (= %s %s) ; %s %s\n", expr_d.c_str(), expr_q.c_str(), get_id(cell), log_signal(cell->getPort(ID::Y))));
+					trans.push_back(stringf("  (= %s %s) ; %s %s\n", expr_d, expr_q, get_id(cell), log_signal(cell->getPort(ID::Y))));
 					if (cell->type == ID($anyconst))
-						ex_state_eq.push_back(stringf("(= %s %s)", get_bv(cell->getPort(ID::Y)).c_str(), get_bv(cell->getPort(ID::Y), "other_state").c_str()));
+						ex_state_eq.push_back(stringf("(= %s %s)", get_bv(cell->getPort(ID::Y)), get_bv(cell->getPort(ID::Y), "other_state")));
 				}
 			}
 
@@ -1341,11 +1341,11 @@ struct Smt2Worker
 
 				std::string expr_d = stringf("(|%s#%d#%d| state)", get_id(module), arrayid, GetSize(mem->wr_ports));
 				std::string expr_q = stringf("(|%s#%d#0| next_state)", get_id(module), arrayid);
-				trans.push_back(stringf("  (= %s %s) ; %s\n", expr_d.c_str(), expr_q.c_str(), get_id(mem->memid)));
+				trans.push_back(stringf("  (= %s %s) ; %s\n", expr_d, expr_q, get_id(mem->memid)));
 				ex_state_eq.push_back(stringf("(= (|%s#%d#0| state) (|%s#%d#0| other_state))", get_id(module), arrayid, get_id(module), arrayid));
 
 				if (has_async_wr)
-					hier.push_back(stringf("  (= %s (|%s| state)) ; %s\n", expr_d.c_str(), final_memstate.c_str(), get_id(mem->memid)));
+					hier.push_back(stringf("  (= %s (|%s| state)) ; %s\n", expr_d, final_memstate, get_id(mem->memid)));
 
 				Const init_data = mem->get_init_data();
 
@@ -1402,7 +1402,7 @@ struct Smt2Worker
 					expr = "\n  " + ex_state_eq.front() + "\n";
 				} else {
 					for (auto &str : ex_state_eq)
-						expr += stringf("\n  %s", str.c_str());
+						expr += stringf("\n  %s", str);
 					expr += "\n)";
 				}
 			}
@@ -1415,7 +1415,7 @@ struct Smt2Worker
 					expr = "\n  " + ex_input_eq.front() + "\n";
 				} else {
 					for (auto &str : ex_input_eq)
-						expr += stringf("\n  %s", str.c_str());
+						expr += stringf("\n  %s", str);
 					expr += "\n)";
 				}
 			}
@@ -1429,7 +1429,7 @@ struct Smt2Worker
 				assert_expr = "\n  " + assert_list.front() + "\n";
 			} else {
 				for (auto &str : assert_list)
-					assert_expr += stringf("\n  %s", str.c_str());
+					assert_expr += stringf("\n  %s", str);
 				assert_expr += "\n)";
 			}
 		}
@@ -1442,7 +1442,7 @@ struct Smt2Worker
 				assume_expr = "\n  " + assume_list.front() + "\n";
 			} else {
 				for (auto &str : assume_list)
-					assume_expr += stringf("\n  %s", str.c_str());
+					assume_expr += stringf("\n  %s", str);
 				assume_expr += "\n)";
 			}
 		}
@@ -1455,7 +1455,7 @@ struct Smt2Worker
 				init_expr = "\n  " + init_list.front() + "\n";
 			} else {
 				for (auto &str : init_list)
-					init_expr += stringf("\n  %s", str.c_str());
+					init_expr += stringf("\n  %s", str);
 				init_expr += "\n)";
 			}
 		}
@@ -1846,7 +1846,7 @@ struct Smt2Backend : public Backend {
 			*f << stringf("; yosys-smt2-stdt\n");
 
 		for (auto &it : solver_options)
-			*f << stringf("; yosys-smt2-solver-option %s %s\n", it.first.c_str(), it.second.c_str());
+			*f << stringf("; yosys-smt2-solver-option %s %s\n", it.first, it.second);
 
 		std::vector<RTLIL::Module*> sorted_modules;
 
@@ -1913,7 +1913,7 @@ struct Smt2Backend : public Backend {
 		}
 
 		if (topmod)
-			*f << stringf("; yosys-smt2-topmod %s\n", topmod_id.c_str());
+			*f << stringf("; yosys-smt2-topmod %s\n", topmod_id);
 
 		*f << stringf("; end of yosys output\n");
 
diff --git a/backends/smv/smv.cc b/backends/smv/smv.cc
index 1c2b2a224..55eadca00 100644
--- a/backends/smv/smv.cc
+++ b/backends/smv/smv.cc
@@ -59,7 +59,7 @@ struct SmvWorker
 	{
 		if (!idcache.count(id))
 		{
-			string name = stringf("_%s", id.c_str());
+			string name = stringf("_%s", id);
 
 			if (name.compare(0, 2, "_\\") == 0)
 				name = "_" + name.substr(2);
@@ -163,15 +163,15 @@ struct SmvWorker
 		if (width >= 0) {
 			if (is_signed) {
 				if (GetSize(sig) > width)
-					s = stringf("signed(resize(%s, %d))", s.c_str(), width);
+					s = stringf("signed(resize(%s, %d))", s, width);
 				else
-					s = stringf("resize(signed(%s), %d)", s.c_str(), width);
+					s = stringf("resize(signed(%s), %d)", s, width);
 			} else
-				s = stringf("resize(%s, %d)", s.c_str(), width);
+				s = stringf("resize(%s, %d)", s, width);
 		} else if (is_signed)
-			s = stringf("signed(%s)", s.c_str());
+			s = stringf("signed(%s)", s);
 		else if (count_chunks > 1)
-			s = stringf("(%s)", s.c_str());
+			s = stringf("(%s)", s);
 
 		strbuf.push_back(s);
 		return strbuf.back().c_str();
@@ -262,7 +262,7 @@ struct SmvWorker
 				if (cell->type == ID($sshr) && signed_a)
 				{
 					expr_a = rvalue_s(sig_a, width);
-					expr = stringf("resize(unsigned(%s %s %s), %d)", expr_a.c_str(), op.c_str(), rvalue(sig_b.extract(0, shift_b_width)), width_y);
+					expr = stringf("resize(unsigned(%s %s %s), %d)", expr_a, op, rvalue(sig_b.extract(0, shift_b_width)), width_y);
 					if (shift_b_width < GetSize(sig_b))
 						expr = stringf("%s != 0ud%d_0 ? (bool(%s) ? !0ud%d_0 : 0ud%d_0) : %s",
 								rvalue(sig_b.extract(shift_b_width, GetSize(sig_b) - shift_b_width)), GetSize(sig_b) - shift_b_width,
@@ -278,8 +278,8 @@ struct SmvWorker
 //					f << stringf("    %s : unsigned word[%d]; -- neg(%s)\n", b_shl, GetSize(sig_b), log_signal(sig_b));
 					definitions.push_back(stringf("%s := unsigned(-%s);", b_shl, rvalue_s(sig_b)));
 
-					string expr_shl = stringf("resize(%s << %s[%d:0], %d)", expr_a.c_str(), b_shl, shift_b_width-1, width_y);
-					string expr_shr = stringf("resize(%s >> %s[%d:0], %d)", expr_a.c_str(), b_shr, shift_b_width-1, width_y);
+					string expr_shl = stringf("resize(%s << %s[%d:0], %d)", expr_a, b_shl, shift_b_width-1, width_y);
+					string expr_shr = stringf("resize(%s >> %s[%d:0], %d)", expr_a, b_shr, shift_b_width-1, width_y);
 
 					if (shift_b_width < GetSize(sig_b)) {
 						expr_shl = stringf("%s[%d:%d] != 0ud%d_0 ? 0ud%d_0 : %s", b_shl, GetSize(sig_b)-1, shift_b_width,
@@ -288,7 +288,7 @@ struct SmvWorker
 								GetSize(sig_b)-shift_b_width, width_y, expr_shr.c_str());
 					}
 
-					expr = stringf("bool(%s) ? %s : %s", rvalue(sig_b[GetSize(sig_b)-1]), expr_shl.c_str(), expr_shr.c_str());
+					expr = stringf("bool(%s) ? %s : %s", rvalue(sig_b[GetSize(sig_b)-1]), expr_shl, expr_shr);
 				}
 				else
 				{
@@ -297,13 +297,13 @@ struct SmvWorker
 					else
 						expr_a = stringf("resize(unsigned(%s), %d)", rvalue_s(sig_a, width_ay), width);
 
-					expr = stringf("resize(%s %s %s[%d:0], %d)", expr_a.c_str(), op.c_str(), rvalue_u(sig_b), shift_b_width-1, width_y);
+					expr = stringf("resize(%s %s %s[%d:0], %d)", expr_a, op, rvalue_u(sig_b), shift_b_width-1, width_y);
 					if (shift_b_width < GetSize(sig_b))
 						expr = stringf("%s[%d:%d] != 0ud%d_0 ? 0ud%d_0 : %s", rvalue_u(sig_b), GetSize(sig_b)-1, shift_b_width,
 								GetSize(sig_b)-shift_b_width, width_y, expr.c_str());
 				}
 
-				definitions.push_back(stringf("%s := %s;", lvalue(cell->getPort(ID::Y)), expr.c_str()));
+				definitions.push_back(stringf("%s := %s;", lvalue(cell->getPort(ID::Y)), expr));
 
 				continue;
 			}
@@ -426,7 +426,7 @@ struct SmvWorker
 				if (cell->type == ID($reduce_or))   expr = stringf("%s != 0ub%d_0", expr_a, width_a);
 				if (cell->type == ID($reduce_bool)) expr = stringf("%s != 0ub%d_0", expr_a, width_a);
 
-				definitions.push_back(stringf("%s := resize(word1(%s), %d);", expr_y, expr.c_str(), width_y));
+				definitions.push_back(stringf("%s := resize(word1(%s), %d);", expr_y, expr, width_y));
 				continue;
 			}
 
@@ -445,7 +445,7 @@ struct SmvWorker
 				if (cell->type == ID($reduce_xnor))
 					expr = "!(" + expr + ")";
 
-				definitions.push_back(stringf("%s := resize(%s, %d);", expr_y, expr.c_str(), width_y));
+				definitions.push_back(stringf("%s := resize(%s, %d);", expr_y, expr, width_y));
 				continue;
 			}
 
@@ -463,7 +463,7 @@ struct SmvWorker
 				if (cell->type == ID($logic_and)) expr = expr_a + " & " + expr_b;
 				if (cell->type == ID($logic_or))  expr = expr_a + " | " + expr_b;
 
-				definitions.push_back(stringf("%s := resize(word1(%s), %d);", expr_y, expr.c_str(), width_y));
+				definitions.push_back(stringf("%s := resize(word1(%s), %d);", expr_y, expr, width_y));
 				continue;
 			}
 
@@ -475,7 +475,7 @@ struct SmvWorker
 				string expr_a = stringf("(%s = 0ub%d_0)", rvalue(cell->getPort(ID::A)), width_a);
 				const char *expr_y = lvalue(cell->getPort(ID::Y));
 
-				definitions.push_back(stringf("%s := resize(word1(%s), %d);", expr_y, expr_a.c_str(), width_y));
+				definitions.push_back(stringf("%s := resize(word1(%s), %d);", expr_y, expr_a, width_y));
 				continue;
 			}
 
@@ -491,7 +491,7 @@ struct SmvWorker
 					expr += stringf("bool(%s) ? %s : ", rvalue(sig_s[i]), rvalue(sig_b.extract(i*width, width)));
 				expr += rvalue(sig_a);
 
-				definitions.push_back(stringf("%s := %s;", lvalue(cell->getPort(ID::Y)), expr.c_str()));
+				definitions.push_back(stringf("%s := %s;", lvalue(cell->getPort(ID::Y)), expr));
 				continue;
 			}
 
@@ -505,7 +505,7 @@ struct SmvWorker
 			if (cell->type.in(ID($_BUF_), ID($_NOT_)))
 			{
 				string op = cell->type == ID($_NOT_) ? "!" : "";
-				definitions.push_back(stringf("%s := %s%s;", lvalue(cell->getPort(ID::Y)), op.c_str(), rvalue(cell->getPort(ID::A))));
+				definitions.push_back(stringf("%s := %s%s;", lvalue(cell->getPort(ID::Y)), op, rvalue(cell->getPort(ID::A))));
 				continue;
 			}
 
@@ -650,7 +650,7 @@ struct SmvWorker
 					for (int k = GetSize(sig)-1; k >= 0; k--)
 						bits += sig[k] == State::S1 ? '1' : '0';
 
-					expr = stringf("0ub%d_%s", GetSize(bits), bits.c_str()) + expr;
+					expr = stringf("0ub%d_%s", GetSize(bits), bits) + expr;
 				}
 				else if (sigmap(SigBit(wire, i)) == SigBit(wire, i))
 				{
@@ -683,36 +683,36 @@ struct SmvWorker
 				}
 			}
 
-			definitions.push_back(stringf("%s := %s;", cid(wire->name), expr.c_str()));
+			definitions.push_back(stringf("%s := %s;", cid(wire->name), expr));
 		}
 
 		if (!inputvars.empty()) {
 			f << stringf("  IVAR\n");
 			for (const string &line : inputvars)
-				f << stringf("    %s\n", line.c_str());
+				f << stringf("    %s\n", line);
 		}
 
 		if (!vars.empty()) {
 			f << stringf("  VAR\n");
 			for (const string &line : vars)
-				f << stringf("    %s\n", line.c_str());
+				f << stringf("    %s\n", line);
 		}
 
 		if (!definitions.empty()) {
 			f << stringf("  DEFINE\n");
 			for (const string &line : definitions)
-				f << stringf("    %s\n", line.c_str());
+				f << stringf("    %s\n", line);
 		}
 
 		if (!assignments.empty()) {
 			f << stringf("  ASSIGN\n");
 			for (const string &line : assignments)
-				f << stringf("    %s\n", line.c_str());
+				f << stringf("    %s\n", line);
 		}
 
 		if (!invarspecs.empty()) {
 			for (const string &line : invarspecs)
-				f << stringf("  INVARSPEC %s\n", line.c_str());
+				f << stringf("  INVARSPEC %s\n", line);
 		}
 	}
 };
diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index 525ab5bcf..b1ed2b1f0 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -158,7 +158,7 @@ void reset_auto_counter(RTLIL::Module *module)
 
 std::string next_auto_id()
 {
-	return stringf("%s_%0*d_", auto_prefix.c_str(), auto_name_digits, auto_name_offset + auto_name_counter++);
+	return stringf("%s_%0*d_", auto_prefix, auto_name_digits, auto_name_offset + auto_name_counter++);
 }
 
 std::string id(RTLIL::IdString internal_id, bool may_rename = true)
@@ -166,7 +166,7 @@ std::string id(RTLIL::IdString internal_id, bool may_rename = true)
 	const char *str = internal_id.c_str();
 
 	if (may_rename && auto_name_map.count(internal_id) != 0)
-		return stringf("%s_%0*d_", auto_prefix.c_str(), auto_name_digits, auto_name_offset + auto_name_map[internal_id]);
+		return stringf("%s_%0*d_", auto_prefix, auto_name_digits, auto_name_offset + auto_name_map[internal_id]);
 
 	if (*str == '\\')
 		str++;
@@ -351,19 +351,19 @@ void dump_sigchunk(std::ostream &f, const RTLIL::SigChunk &chunk, bool no_decima
 		dump_const(f, chunk.data, chunk.width, chunk.offset, no_decimal);
 	} else {
 		if (chunk.width == chunk.wire->width && chunk.offset == 0) {
-			f << stringf("%s", id(chunk.wire->name).c_str());
+			f << stringf("%s", id(chunk.wire->name));
 		} else if (chunk.width == 1) {
 			if (chunk.wire->upto)
-				f << stringf("%s[%d]", id(chunk.wire->name).c_str(), (chunk.wire->width - chunk.offset - 1) + chunk.wire->start_offset);
+				f << stringf("%s[%d]", id(chunk.wire->name), (chunk.wire->width - chunk.offset - 1) + chunk.wire->start_offset);
 			else
-				f << stringf("%s[%d]", id(chunk.wire->name).c_str(), chunk.offset + chunk.wire->start_offset);
+				f << stringf("%s[%d]", id(chunk.wire->name), chunk.offset + chunk.wire->start_offset);
 		} else {
 			if (chunk.wire->upto)
-				f << stringf("%s[%d:%d]", id(chunk.wire->name).c_str(),
+				f << stringf("%s[%d:%d]", id(chunk.wire->name),
 						(chunk.wire->width - (chunk.offset + chunk.width - 1) - 1) + chunk.wire->start_offset,
 						(chunk.wire->width - chunk.offset - 1) + chunk.wire->start_offset);
 			else
-				f << stringf("%s[%d:%d]", id(chunk.wire->name).c_str(),
+				f << stringf("%s[%d:%d]", id(chunk.wire->name),
 						(chunk.offset + chunk.width - 1) + chunk.wire->start_offset,
 						chunk.offset + chunk.wire->start_offset);
 		}
@@ -399,7 +399,7 @@ void dump_attributes(std::ostream &f, std::string indent, dict<RTLIL::IdString,
 	for (auto it = attributes.begin(); it != attributes.end(); ++it) {
 		if (it->first == ID::single_bit_vector) continue;
 		if (it->first == ID::init && regattr) continue;
-		f << stringf("%s" "%s %s", indent.c_str(), as_comment ? "/*" : "(*", id(it->first).c_str());
+		f << stringf("%s" "%s %s", indent, as_comment ? "/*" : "(*", id(it->first));
 		f << stringf(" = ");
 		if (modattr && (it->second == State::S0 || it->second == Const(0)))
 			f << stringf(" 0 ");
@@ -407,7 +407,7 @@ void dump_attributes(std::ostream &f, std::string indent, dict<RTLIL::IdString,
 			f << stringf(" 1 ");
 		else
 			dump_const(f, it->second, -1, 0, false, as_comment);
-		f << stringf(" %s%s", as_comment ? "*/" : "*)", term.c_str());
+		f << stringf(" %s%s", as_comment ? "*/" : "*)", term);
 	}
 }
 
@@ -416,16 +416,16 @@ void dump_wire(std::ostream &f, std::string indent, RTLIL::Wire *wire)
 	dump_attributes(f, indent, wire->attributes, "\n", /*modattr=*/false, /*regattr=*/reg_wires.count(wire->name));
 #if 0
 	if (wire->port_input && !wire->port_output)
-		f << stringf("%s" "input %s", indent.c_str(), reg_wires.count(wire->name) ? "reg " : "");
+		f << stringf("%s" "input %s", indent, reg_wires.count(wire->name) ? "reg " : "");
 	else if (!wire->port_input && wire->port_output)
-		f << stringf("%s" "output %s", indent.c_str(), reg_wires.count(wire->name) ? "reg " : "");
+		f << stringf("%s" "output %s", indent, reg_wires.count(wire->name) ? "reg " : "");
 	else if (wire->port_input && wire->port_output)
-		f << stringf("%s" "inout %s", indent.c_str(), reg_wires.count(wire->name) ? "reg " : "");
+		f << stringf("%s" "inout %s", indent, reg_wires.count(wire->name) ? "reg " : "");
 	else
-		f << stringf("%s" "%s ", indent.c_str(), reg_wires.count(wire->name) ? "reg" : "wire");
+		f << stringf("%s" "%s ", indent, reg_wires.count(wire->name) ? "reg" : "wire");
 	if (wire->width != 1)
 		f << stringf("[%d:%d] ", wire->width - 1 + wire->start_offset, wire->start_offset);
-	f << stringf("%s;\n", id(wire->name).c_str());
+	f << stringf("%s;\n", id(wire->name));
 #else
 	// do not use Verilog-2k "output reg" syntax in Verilog export
 	std::string range = "";
@@ -439,20 +439,20 @@ void dump_wire(std::ostream &f, std::string indent, RTLIL::Wire *wire)
 			range = stringf(" [%d:%d]", wire->start_offset, wire->start_offset);
 	}
 	if (wire->port_input && !wire->port_output)
-		f << stringf("%s" "input%s %s;\n", indent.c_str(), range.c_str(), id(wire->name).c_str());
+		f << stringf("%s" "input%s %s;\n", indent, range, id(wire->name));
 	if (!wire->port_input && wire->port_output)
-		f << stringf("%s" "output%s %s;\n", indent.c_str(), range.c_str(), id(wire->name).c_str());
+		f << stringf("%s" "output%s %s;\n", indent, range, id(wire->name));
 	if (wire->port_input && wire->port_output)
-		f << stringf("%s" "inout%s %s;\n", indent.c_str(), range.c_str(), id(wire->name).c_str());
+		f << stringf("%s" "inout%s %s;\n", indent, range, id(wire->name));
 	if (reg_wires.count(wire->name)) {
-		f << stringf("%s" "reg%s %s", indent.c_str(), range.c_str(), id(wire->name).c_str());
+		f << stringf("%s" "reg%s %s", indent, range, id(wire->name));
 		if (wire->attributes.count(ID::init)) {
 			f << stringf(" = ");
 			dump_const(f, wire->attributes.at(ID::init));
 		}
 		f << stringf(";\n");
 	} else
-		f << stringf("%s" "wire%s %s;\n", indent.c_str(), range.c_str(), id(wire->name).c_str());
+		f << stringf("%s" "wire%s %s;\n", indent, range, id(wire->name));
 #endif
 }
 
@@ -461,7 +461,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 	std::string mem_id = id(mem.memid);
 
 	dump_attributes(f, indent, mem.attributes);
-	f << stringf("%s" "reg [%d:0] %s [%d:%d];\n", indent.c_str(), mem.width-1, mem_id.c_str(), mem.size+mem.start_offset-1, mem.start_offset);
+	f << stringf("%s" "reg [%d:0] %s [%d:%d];\n", indent, mem.width-1, mem_id, mem.size+mem.start_offset-1, mem.start_offset);
 
 	// for memory block make something like:
 	//  reg [7:0] memid [3:0];
@@ -472,7 +472,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 	{
 		if (extmem)
 		{
-			std::string extmem_filename = stringf("%s-%d.mem", extmem_prefix.c_str(), extmem_counter++);
+			std::string extmem_filename = stringf("%s-%d.mem", extmem_prefix, extmem_counter++);
 
 			std::string extmem_filename_esc;
 			for (auto c : extmem_filename)
@@ -490,7 +490,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 				else
 					extmem_filename_esc += c;
 			}
-			f << stringf("%s" "initial $readmemb(\"%s\", %s);\n", indent.c_str(), extmem_filename_esc.c_str(), mem_id.c_str());
+			f << stringf("%s" "initial $readmemb(\"%s\", %s);\n", indent, extmem_filename_esc, mem_id);
 
 			std::ofstream extmem_f(extmem_filename, std::ofstream::trunc);
 			if (extmem_f.fail())
@@ -519,7 +519,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 		}
 		else
 		{
-			f << stringf("%s" "initial begin\n", indent.c_str());
+			f << stringf("%s" "initial begin\n", indent);
 			for (auto &init : mem.inits) {
 				int words = GetSize(init.data) / mem.width;
 				int start = init.addr.as_int();
@@ -536,16 +536,16 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 							j++, width++;
 
 						if (width == mem.width) {
-							f << stringf("%s" "  %s[%d] = ", indent.c_str(), mem_id.c_str(), i + start);
+							f << stringf("%s" "  %s[%d] = ", indent, mem_id, i + start);
 						} else {
-							f << stringf("%s" "  %s[%d][%d:%d] = ", indent.c_str(), mem_id.c_str(), i + start, j, start_j);
+							f << stringf("%s" "  %s[%d][%d:%d] = ", indent, mem_id, i + start, j, start_j);
 						}
 						dump_const(f, init.data.extract(i*mem.width+start_j, width));
 						f << stringf(";\n");
 					}
 				}
 			}
-			f << stringf("%s" "end\n", indent.c_str());
+			f << stringf("%s" "end\n", indent);
 		}
 	}
 
@@ -566,11 +566,11 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 			{
 				std::ostringstream os;
 				dump_sigspec(os, port.clk);
-				clk_domain_str = stringf("%sedge %s", port.clk_polarity ? "pos" : "neg", os.str().c_str());
+				clk_domain_str = stringf("%sedge %s", port.clk_polarity ? "pos" : "neg", os.str());
 				if (port.arst != State::S0) {
 					std::ostringstream os2;
 					dump_sigspec(os2, port.arst);
-					clk_domain_str += stringf(", posedge %s", os2.str().c_str());
+					clk_domain_str += stringf(", posedge %s", os2.str());
 					clk_to_arst_cond[clk_domain_str] = os2.str();
 				}
 			}
@@ -595,13 +595,13 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 				//      if (rd_en) temp_id <= array_reg[r_addr];
 				//   assign r_data = temp_id;
 				std::string temp_id = next_auto_id();
-				lof_reg_declarations.push_back( stringf("reg [%d:0] %s;\n", port.data.size() - 1, temp_id.c_str()) );
+				lof_reg_declarations.push_back( stringf("reg [%d:0] %s;\n", port.data.size() - 1, temp_id) );
 
 				bool has_indent = false;
 
 				if (port.arst != State::S0) {
 					std::ostringstream os;
-					os << stringf("%s <= ", temp_id.c_str());
+					os << stringf("%s <= ", temp_id);
 					dump_sigspec(os, port.arst_value);
 					os << ";\n";
 					clk_to_arst_body[clk_domain_str].push_back(os.str());
@@ -614,7 +614,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 					os << stringf(")\n");
 					clk_to_lof_body[clk_domain_str].push_back(os.str());
 					std::ostringstream os2;
-					os2 << stringf("%s" "%s <= ", indent.c_str(), temp_id.c_str());
+					os2 << stringf("%s" "%s <= ", indent, temp_id);
 					dump_sigspec(os2, port.srst_value);
 					os2 << ";\n";
 					clk_to_lof_body[clk_domain_str].push_back(os2.str());
@@ -646,7 +646,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 					os << temp_id;
 					if (port.wide_log2)
 						os << stringf("[%d:%d]", (sub + 1) * mem.width - 1, sub * mem.width);
-					os << stringf(" <= %s[", mem_id.c_str());
+					os << stringf(" <= %s[", mem_id);
 					dump_sigspec(os, addr);
 					os << stringf("];\n");
 					clk_to_lof_body[clk_domain_str].push_back(os.str());
@@ -721,7 +721,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 					std::ostringstream os2;
 					if (has_indent)
 						os2 << indent;
-					os2 << stringf("%s" "%s <= ", indent.c_str(), temp_id.c_str());
+					os2 << stringf("%s" "%s <= ", indent, temp_id);
 					dump_sigspec(os2, port.srst_value);
 					os2 << ";\n";
 					clk_to_lof_body[clk_domain_str].push_back(os2.str());
@@ -734,14 +734,14 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 				{
 					std::ostringstream os;
 					dump_sigspec(os, port.init_value);
-					std::string line = stringf("initial %s = %s;\n", temp_id.c_str(), os.str().c_str());
+					std::string line = stringf("initial %s = %s;\n", temp_id, os.str());
 					clk_to_lof_body[""].push_back(line);
 				}
 
 				{
 					std::ostringstream os;
 					dump_sigspec(os, port.data);
-					std::string line = stringf("assign %s = %s;\n", os.str().c_str(), temp_id.c_str());
+					std::string line = stringf("assign %s = %s;\n", os.str(), temp_id);
 					clk_to_lof_body[""].push_back(line);
 				}
 			}
@@ -753,11 +753,11 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 				//     temp_id <= r_addr;
 				//   assign r_data = array_reg[temp_id];
 				std::string temp_id = next_auto_id();
-				lof_reg_declarations.push_back( stringf("reg [%d:0] %s;\n", port.addr.size() - 1 - port.wide_log2, temp_id.c_str()) );
+				lof_reg_declarations.push_back( stringf("reg [%d:0] %s;\n", port.addr.size() - 1 - port.wide_log2, temp_id) );
 				{
 					std::ostringstream os;
 					dump_sigspec(os, port.addr.extract_end(port.wide_log2));
-					std::string line = stringf("%s <= %s;\n", temp_id.c_str(), os.str().c_str());
+					std::string line = stringf("%s <= %s;\n", temp_id, os.str());
 					clk_to_lof_body[clk_domain_str].push_back(line);
 				}
 				for (int sub = 0; sub < (1 << port.wide_log2); sub++)
@@ -765,7 +765,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 					std::ostringstream os;
 					os << "assign ";
 					dump_sigspec(os, port.data.extract(sub * mem.width, mem.width));
-					os << stringf(" = %s[", mem_id.c_str());;
+					os << stringf(" = %s[", mem_id);;
 					if (port.wide_log2) {
 						Const addr_lo;
 						for (int i = 0; i < port.wide_log2; i++)
@@ -792,7 +792,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 				std::ostringstream os, os2;
 				dump_sigspec(os, port.data.extract(sub * mem.width, mem.width));
 				dump_sigspec(os2, addr);
-				std::string line = stringf("assign %s = %s[%s];\n", os.str().c_str(), mem_id.c_str(), os2.str().c_str());
+				std::string line = stringf("assign %s = %s[%s];\n", os.str(), mem_id, os2.str());
 				clk_to_lof_body[""].push_back(line);
 			}
 		}
@@ -841,11 +841,11 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 		}
 
 		if (root.clk_enable) {
-			f << stringf("%s" "always%s @(%sedge ", indent.c_str(), systemverilog ? "_ff" : "", root.clk_polarity ? "pos" : "neg");
+			f << stringf("%s" "always%s @(%sedge ", indent, systemverilog ? "_ff" : "", root.clk_polarity ? "pos" : "neg");
 			dump_sigspec(f, root.clk);
 			f << ") begin\n";
 		} else {
-			f << stringf("%s" "always%s begin\n", indent.c_str(), systemverilog ? "_latch" : " @*");
+			f << stringf("%s" "always%s begin\n", indent, systemverilog ? "_latch" : " @*");
 		}
 
 		for (int pidx = 0; pidx < GetSize(mem.wr_ports); pidx++)
@@ -879,15 +879,15 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 					if (wen_bit == State::S0)
 						continue;
 
-					f << stringf("%s%s", indent.c_str(), indent.c_str());
+					f << stringf("%s%s", indent, indent);
 					if (wen_bit != State::S1)
 					{
 						f << stringf("if (");
 						dump_sigspec(f, wen_bit);
 						f << stringf(")\n");
-						f << stringf("%s%s%s", indent.c_str(), indent.c_str(), indent.c_str());
+						f << stringf("%s%s%s", indent, indent, indent);
 					}
-					f << stringf("%s[", mem_id.c_str());
+					f << stringf("%s[", mem_id);
 					dump_sigspec(f, addr);
 					if (width == GetSize(port.en))
 						f << stringf("] <= ");
@@ -899,7 +899,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 			}
 		}
 
-		f << stringf("%s" "end\n", indent.c_str());
+		f << stringf("%s" "end\n", indent);
 	}
 	// Output Verilog that looks something like this:
 	// reg [..] _3_;
@@ -922,7 +922,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 	// the reg ... definitions
 	for(auto &reg : lof_reg_declarations)
 	{
-		f << stringf("%s" "%s", indent.c_str(), reg.c_str());
+		f << stringf("%s" "%s", indent, reg);
 	}
 	// the block of expressions by clock domain
 	for(auto &pair : clk_to_lof_body)
@@ -931,27 +931,27 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 		std::vector<std::string> lof_lines = pair.second;
 		if( clk_domain != "")
 		{
-			f << stringf("%s" "always%s @(%s) begin\n", indent.c_str(), systemverilog ? "_ff" : "", clk_domain.c_str());
+			f << stringf("%s" "always%s @(%s) begin\n", indent, systemverilog ? "_ff" : "", clk_domain);
 			bool has_arst = clk_to_arst_cond.count(clk_domain) != 0;
 			if (has_arst) {
-				f << stringf("%s%s" "if (%s) begin\n", indent.c_str(), indent.c_str(), clk_to_arst_cond[clk_domain].c_str());
+				f << stringf("%s%s" "if (%s) begin\n", indent, indent, clk_to_arst_cond[clk_domain]);
 				for(auto &line : clk_to_arst_body[clk_domain])
-					f << stringf("%s%s%s" "%s", indent.c_str(), indent.c_str(), indent.c_str(), line.c_str());
-				f << stringf("%s%s" "end else begin\n", indent.c_str(), indent.c_str());
+					f << stringf("%s%s%s" "%s", indent, indent, indent, line);
+				f << stringf("%s%s" "end else begin\n", indent, indent);
 				for(auto &line : lof_lines)
-					f << stringf("%s%s%s" "%s", indent.c_str(), indent.c_str(), indent.c_str(), line.c_str());
-				f << stringf("%s%s" "end\n", indent.c_str(), indent.c_str());
+					f << stringf("%s%s%s" "%s", indent, indent, indent, line);
+				f << stringf("%s%s" "end\n", indent, indent);
 			} else {
 				for(auto &line : lof_lines)
-					f << stringf("%s%s" "%s", indent.c_str(), indent.c_str(), line.c_str());
+					f << stringf("%s%s" "%s", indent, indent, line);
 			}
-			f << stringf("%s" "end\n", indent.c_str());
+			f << stringf("%s" "end\n", indent);
 		}
 		else
 		{
 			// the non-clocked assignments
 			for(auto &line : lof_lines)
-				f << stringf("%s" "%s", indent.c_str(), line.c_str());
+				f << stringf("%s" "%s", indent, line);
 		}
 	}
 }
@@ -1004,9 +1004,9 @@ no_special_reg_name:
 
 void dump_cell_expr_uniop(std::ostream &f, std::string indent, RTLIL::Cell *cell, std::string op)
 {
-	f << stringf("%s" "assign ", indent.c_str());
+	f << stringf("%s" "assign ", indent);
 	dump_sigspec(f, cell->getPort(ID::Y));
-	f << stringf(" = %s ", op.c_str());
+	f << stringf(" = %s ", op);
 	dump_attributes(f, "", cell->attributes, " ");
 	dump_cell_expr_port(f, cell, "A", true);
 	f << stringf(";\n");
@@ -1014,11 +1014,11 @@ void dump_cell_expr_uniop(std::ostream &f, std::string indent, RTLIL::Cell *cell
 
 void dump_cell_expr_binop(std::ostream &f, std::string indent, RTLIL::Cell *cell, std::string op)
 {
-	f << stringf("%s" "assign ", indent.c_str());
+	f << stringf("%s" "assign ", indent);
 	dump_sigspec(f, cell->getPort(ID::Y));
 	f << stringf(" = ");
 	dump_cell_expr_port(f, cell, "A", true);
-	f << stringf(" %s ", op.c_str());
+	f << stringf(" %s ", op);
 	dump_attributes(f, "", cell->attributes, " ");
 	dump_cell_expr_port(f, cell, "B", true);
 	f << stringf(";\n");
@@ -1030,7 +1030,7 @@ void dump_cell_expr_print(std::ostream &f, std::string indent, const RTLIL::Cell
 	fmt.parse_rtlil(cell);
 	std::vector<VerilogFmtArg> args = fmt.emit_verilog();
 
-	f << stringf("%s" "$write(", indent.c_str());
+	f << stringf("%s" "$write(", indent);
 	bool first = true;
 	for (auto &arg : args) {
 		if (first) {
@@ -1064,19 +1064,19 @@ void dump_cell_expr_check(std::ostream &f, std::string indent, const RTLIL::Cell
 	std::string flavor = cell->getParam(ID(FLAVOR)).decode_string();
 	std::string label = "";
 	if (cell->name.isPublic()) {
-		label = stringf("%s: ", id(cell->name).c_str());
+		label = stringf("%s: ", id(cell->name));
 	}
 
 	if (flavor == "assert")
-		f << stringf("%s" "%s" "assert (", indent.c_str(), label.c_str());
+		f << stringf("%s" "%s" "assert (", indent, label);
 	else if (flavor == "assume")
-		f << stringf("%s" "%s" "assume (", indent.c_str(), label.c_str());
+		f << stringf("%s" "%s" "assume (", indent, label);
 	else if (flavor == "live")
-		f << stringf("%s" "%s" "assert (eventually ", indent.c_str(), label.c_str());
+		f << stringf("%s" "%s" "assert (eventually ", indent, label);
 	else if (flavor == "fair")
-		f << stringf("%s" "%s" "assume (eventually ", indent.c_str(), label.c_str());
+		f << stringf("%s" "%s" "assume (eventually ", indent, label);
 	else if (flavor == "cover")
-		f << stringf("%s" "%s" "cover (", indent.c_str(), label.c_str());
+		f << stringf("%s" "%s" "cover (", indent, label);
 	else
 		log_abort();
 	dump_sigspec(f, cell->getPort(ID::A));
@@ -1086,7 +1086,7 @@ void dump_cell_expr_check(std::ostream &f, std::string indent, const RTLIL::Cell
 bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 {
 	if (cell->type == ID($_NOT_)) {
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ");
 		f << stringf("~");
@@ -1097,7 +1097,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 	}
 
 	if (cell->type.in(ID($_BUF_), ID($buf))) {
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ");
 		dump_cell_expr_port(f, cell, "A", false);
@@ -1106,7 +1106,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 	}
 
 	if (cell->type.in(ID($_AND_), ID($_NAND_), ID($_OR_), ID($_NOR_), ID($_XOR_), ID($_XNOR_), ID($_ANDNOT_), ID($_ORNOT_))) {
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ");
 		if (cell->type.in(ID($_NAND_), ID($_NOR_), ID($_XNOR_)))
@@ -1131,7 +1131,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 	}
 
 	if (cell->type == ID($_MUX_)) {
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ");
 		dump_cell_expr_port(f, cell, "S", false);
@@ -1145,7 +1145,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 	}
 
 	if (cell->type == ID($_NMUX_)) {
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = !(");
 		dump_cell_expr_port(f, cell, "S", false);
@@ -1159,7 +1159,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 	}
 
 	if (cell->type.in(ID($_AOI3_), ID($_OAI3_))) {
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ~((");
 		dump_cell_expr_port(f, cell, "A", false);
@@ -1174,7 +1174,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 	}
 
 	if (cell->type.in(ID($_AOI4_), ID($_OAI4_))) {
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ~((");
 		dump_cell_expr_port(f, cell, "A", false);
@@ -1259,32 +1259,32 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 			int size_max = std::max(size_a, std::max(size_b, size_y));
 
 			// intentionally one wider than maximum width
-			f << stringf("%s" "wire [%d:0] %s, %s, %s;\n", indent.c_str(), size_max, buf_a.c_str(), buf_b.c_str(), buf_num.c_str());
-			f << stringf("%s" "assign %s = ", indent.c_str(), buf_a.c_str());
+			f << stringf("%s" "wire [%d:0] %s, %s, %s;\n", indent, size_max, buf_a, buf_b, buf_num);
+			f << stringf("%s" "assign %s = ", indent, buf_a);
 			dump_cell_expr_port(f, cell, "A", true);
 			f << stringf(";\n");
-			f << stringf("%s" "assign %s = ", indent.c_str(), buf_b.c_str());
+			f << stringf("%s" "assign %s = ", indent, buf_b);
 			dump_cell_expr_port(f, cell, "B", true);
 			f << stringf(";\n");
 
-			f << stringf("%s" "assign %s = ", indent.c_str(), buf_num.c_str());
+			f << stringf("%s" "assign %s = ", indent, buf_num);
 			f << stringf("(");
 			dump_sigspec(f, sig_a.extract(sig_a.size()-1));
 			f << stringf(" == ");
 			dump_sigspec(f, sig_b.extract(sig_b.size()-1));
 			f << stringf(") || ");
 			dump_sigspec(f, sig_a);
-			f << stringf(" == 0 ? %s : ", buf_a.c_str());
-			f << stringf("$signed(%s - (", buf_a.c_str());
+			f << stringf(" == 0 ? %s : ", buf_a);
+			f << stringf("$signed(%s - (", buf_a);
 			dump_sigspec(f, sig_b.extract(sig_b.size()-1));
-			f << stringf(" ? %s + 1 : %s - 1));\n", buf_b.c_str(), buf_b.c_str());
+			f << stringf(" ? %s + 1 : %s - 1));\n", buf_b, buf_b);
 
 
-			f << stringf("%s" "assign ", indent.c_str());
+			f << stringf("%s" "assign ", indent);
 			dump_sigspec(f, cell->getPort(ID::Y));
-			f << stringf(" = $signed(%s) / ", buf_num.c_str());
+			f << stringf(" = $signed(%s) / ", buf_num);
 			dump_attributes(f, "", cell->attributes, " ");
-			f << stringf("$signed(%s);\n", buf_b.c_str());
+			f << stringf("$signed(%s);\n", buf_b);
 			return true;
 		} else {
 			// same as truncating division
@@ -1303,22 +1303,22 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 			SigSpec sig_b = cell->getPort(ID::B);
 
 			std::string temp_id = next_auto_id();
-			f << stringf("%s" "wire [%d:0] %s = ", indent.c_str(), GetSize(cell->getPort(ID::A))-1, temp_id.c_str());
+			f << stringf("%s" "wire [%d:0] %s = ", indent, GetSize(cell->getPort(ID::A))-1, temp_id);
 			dump_cell_expr_port(f, cell, "A", true);
 			f << stringf(" %% ");
 			dump_attributes(f, "", cell->attributes, " ");
 			dump_cell_expr_port(f, cell, "B", true);
 			f << stringf(";\n");
 
-			f << stringf("%s" "assign ", indent.c_str());
+			f << stringf("%s" "assign ", indent);
 			dump_sigspec(f, cell->getPort(ID::Y));
 			f << stringf(" = (");
 			dump_sigspec(f, sig_a.extract(sig_a.size()-1));
 			f << stringf(" == ");
 			dump_sigspec(f, sig_b.extract(sig_b.size()-1));
-			f << stringf(") || %s == 0 ? $signed(%s) : ", temp_id.c_str(), temp_id.c_str());
+			f << stringf(") || %s == 0 ? $signed(%s) : ", temp_id, temp_id);
 			dump_cell_expr_port(f, cell, "B", true);
-			f << stringf(" + $signed(%s);\n", temp_id.c_str());
+			f << stringf(" + $signed(%s);\n", temp_id);
 			return true;
 		} else {
 			// same as truncating modulo
@@ -1329,7 +1329,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 
 	if (cell->type == ID($shift))
 	{
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ");
 		if (cell->getParam(ID::B_SIGNED).as_bool())
@@ -1357,13 +1357,13 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 	if (cell->type == ID($shiftx))
 	{
 		std::string temp_id = next_auto_id();
-		f << stringf("%s" "wire [%d:0] %s = ", indent.c_str(), GetSize(cell->getPort(ID::A))-1, temp_id.c_str());
+		f << stringf("%s" "wire [%d:0] %s = ", indent, GetSize(cell->getPort(ID::A))-1, temp_id);
 		dump_sigspec(f, cell->getPort(ID::A));
 		f << stringf(";\n");
 
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
-		f << stringf(" = %s[", temp_id.c_str());
+		f << stringf(" = %s[", temp_id);
 		if (cell->getParam(ID::B_SIGNED).as_bool())
 			f << stringf("$signed(");
 		dump_sigspec(f, cell->getPort(ID::B));
@@ -1376,7 +1376,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 
 	if (cell->type == ID($mux))
 	{
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ");
 		dump_sigspec(f, cell->getPort(ID::S));
@@ -1402,44 +1402,44 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 
 		dump_attributes(f, indent + "  ", cell->attributes);
 		if (noparallelcase)
-			f << stringf("%s" "  case (s)\n", indent.c_str());
+			f << stringf("%s" "  case (s)\n", indent);
 		else {
 			if (!noattr)
-				f << stringf("%s" "  (* parallel_case *)\n", indent.c_str());
-			f << stringf("%s" "  casez (s)", indent.c_str());
+				f << stringf("%s" "  (* parallel_case *)\n", indent);
+			f << stringf("%s" "  casez (s)", indent);
 			f << (noattr ? " // synopsys parallel_case\n" : "\n");
 		}
 
 		for (int i = 0; i < s_width; i++)
 		{
-			f << stringf("%s" "    %d'b", indent.c_str(), s_width);
+			f << stringf("%s" "    %d'b", indent, s_width);
 
 			for (int j = s_width-1; j >= 0; j--)
 				f << stringf("%c", j == i ? '1' : noparallelcase ? '0' : '?');
 
 			f << stringf(":\n");
-			f << stringf("%s" "      %s = b[%d:%d];\n", indent.c_str(), func_name.c_str(), (i+1)*width-1, i*width);
+			f << stringf("%s" "      %s = b[%d:%d];\n", indent, func_name, (i+1)*width-1, i*width);
 		}
 
 		if (noparallelcase) {
-			f << stringf("%s" "    %d'b", indent.c_str(), s_width);
+			f << stringf("%s" "    %d'b", indent, s_width);
 			for (int j = s_width-1; j >= 0; j--)
 				f << '0';
 			f << stringf(":\n");
 		} else
-			f << stringf("%s" "    default:\n", indent.c_str());
-		f << stringf("%s" "      %s = a;\n", indent.c_str(), func_name.c_str());
+			f << stringf("%s" "    default:\n", indent);
+		f << stringf("%s" "      %s = a;\n", indent, func_name);
 		if (noparallelcase) {
-			f << stringf("%s" "    default:\n", indent.c_str());
-			f << stringf("%s" "      %s = %d'bx;\n", indent.c_str(), func_name.c_str(), width);
+			f << stringf("%s" "    default:\n", indent);
+			f << stringf("%s" "      %s = %d'bx;\n", indent, func_name, width);
 		}
 
-		f << stringf("%s" "  endcase\n", indent.c_str());
-		f << stringf("%s" "endfunction\n", indent.c_str());
+		f << stringf("%s" "  endcase\n", indent);
+		f << stringf("%s" "endfunction\n", indent);
 
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
-		f << stringf(" = %s(", func_name.c_str());
+		f << stringf(" = %s(", func_name);
 		dump_sigspec(f, cell->getPort(ID::A));
 		f << stringf(", ");
 		dump_sigspec(f, cell->getPort(ID::B));
@@ -1451,7 +1451,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 
 	if (cell->type == ID($tribuf))
 	{
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ");
 		dump_sigspec(f, cell->getPort(ID::EN));
@@ -1463,7 +1463,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 
 	if (cell->type == ID($slice))
 	{
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ");
 		dump_sigspec(f, cell->getPort(ID::A));
@@ -1473,7 +1473,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 
 	if (cell->type == ID($concat))
 	{
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = { ");
 		dump_sigspec(f, cell->getPort(ID::B));
@@ -1485,7 +1485,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 
 	if (cell->type == ID($lut))
 	{
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ");
 		dump_const(f, cell->parameters.at(ID::LUT));
@@ -1509,9 +1509,9 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 
 		if (!out_is_reg_wire) {
 			if (ff.width == 1)
-				f << stringf("%s" "reg %s", indent.c_str(), reg_name.c_str());
+				f << stringf("%s" "reg %s", indent, reg_name);
 			else
-				f << stringf("%s" "reg [%d:0] %s", indent.c_str(), ff.width-1, reg_name.c_str());
+				f << stringf("%s" "reg [%d:0] %s", indent, ff.width-1, reg_name);
 			dump_reg_init(f, ff.sig_q);
 			f << ";\n";
 		}
@@ -1526,7 +1526,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 			Const val_arst, val_srst;
 			std::string reg_bit_name, sig_set_name, sig_clr_name, sig_arst_name, sig_aload_name;
 			if (chunky) {
-				reg_bit_name = stringf("%s[%d]", reg_name.c_str(), i);
+				reg_bit_name = stringf("%s[%d]", reg_name, i);
 				if (ff.has_gclk || ff.has_clk)
 					sig_d = ff.sig_d[i];
 				if (ff.has_aload)
@@ -1547,14 +1547,14 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 					if (ff.sig_set[i].wire == NULL)
 					{
 						sig_set_name = next_auto_id();
-						f << stringf("%s" "wire %s = ", indent.c_str(), sig_set_name.c_str());
+						f << stringf("%s" "wire %s = ", indent, sig_set_name);
 						dump_const(f, ff.sig_set[i].data);
 						f << stringf(";\n");
 					}
 					if (ff.sig_clr[i].wire == NULL)
 					{
 						sig_clr_name = next_auto_id();
-						f << stringf("%s" "wire %s = ", indent.c_str(), sig_clr_name.c_str());
+						f << stringf("%s" "wire %s = ", indent, sig_clr_name);
 						dump_const(f, ff.sig_clr[i].data);
 						f << stringf(";\n");
 					}
@@ -1562,7 +1562,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 					if (ff.sig_arst[0].wire == NULL)
 					{
 						sig_arst_name = next_auto_id();
-						f << stringf("%s" "wire %s = ", indent.c_str(), sig_arst_name.c_str());
+						f << stringf("%s" "wire %s = ", indent, sig_arst_name);
 						dump_const(f, ff.sig_arst[0].data);
 						f << stringf(";\n");
 					}
@@ -1570,7 +1570,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 					if (ff.sig_aload[0].wire == NULL)
 					{
 						sig_aload_name = next_auto_id();
-						f << stringf("%s" "wire %s = ", indent.c_str(), sig_aload_name.c_str());
+						f << stringf("%s" "wire %s = ", indent, sig_aload_name);
 						dump_const(f, ff.sig_aload[0].data);
 						f << stringf(";\n");
 					}
@@ -1581,90 +1581,90 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 			if (ff.has_clk)
 			{
 				// FFs.
-				f << stringf("%s" "always%s @(%sedge ", indent.c_str(), systemverilog ? "_ff" : "", ff.pol_clk ? "pos" : "neg");
+				f << stringf("%s" "always%s @(%sedge ", indent, systemverilog ? "_ff" : "", ff.pol_clk ? "pos" : "neg");
 				dump_sigspec(f, ff.sig_clk);
 				if (ff.has_sr) {
 					f << stringf(", %sedge ", ff.pol_set ? "pos" : "neg");
 					if (ff.sig_set[i].wire == NULL)
-						f << stringf("%s", sig_set_name.c_str());
+						f << stringf("%s", sig_set_name);
 					else
 						dump_sigspec(f, ff.sig_set[i]);
 
 					f << stringf(", %sedge ", ff.pol_clr ? "pos" : "neg");
 					if (ff.sig_clr[i].wire == NULL)
-						f << stringf("%s", sig_clr_name.c_str());
+						f << stringf("%s", sig_clr_name);
 					else
 						dump_sigspec(f, ff.sig_clr[i]);
 				} else if (ff.has_arst) {
 					f << stringf(", %sedge ", ff.pol_arst ? "pos" : "neg");
 					if (ff.sig_arst[0].wire == NULL)
-						f << stringf("%s", sig_arst_name.c_str());
+						f << stringf("%s", sig_arst_name);
 					else
 						dump_sigspec(f, ff.sig_arst);
 				} else if (ff.has_aload) {
 					f << stringf(", %sedge ", ff.pol_aload ? "pos" : "neg");
 					if (ff.sig_aload[0].wire == NULL)
-						f << stringf("%s", sig_aload_name.c_str());
+						f << stringf("%s", sig_aload_name);
 					else
 						dump_sigspec(f, ff.sig_aload);
 				}
 				f << stringf(")\n");
 
-				f << stringf("%s" "  ", indent.c_str());
+				f << stringf("%s" "  ", indent);
 				if (ff.has_sr) {
 					f << stringf("if (%s", ff.pol_clr ? "" : "!");
 					if (ff.sig_clr[i].wire == NULL)
-						f << stringf("%s", sig_clr_name.c_str());
+						f << stringf("%s", sig_clr_name);
 					else
 						dump_sigspec(f, ff.sig_clr[i]);
-					f << stringf(") %s <= 1'b0;\n", reg_bit_name.c_str());
-					f << stringf("%s" "  else if (%s", indent.c_str(), ff.pol_set ? "" : "!");
+					f << stringf(") %s <= 1'b0;\n", reg_bit_name);
+					f << stringf("%s" "  else if (%s", indent, ff.pol_set ? "" : "!");
 					if (ff.sig_set[i].wire == NULL)
-						f << stringf("%s", sig_set_name.c_str());
+						f << stringf("%s", sig_set_name);
 					else
 						dump_sigspec(f, ff.sig_set[i]);
-					f << stringf(") %s <= 1'b1;\n", reg_bit_name.c_str());
-					f << stringf("%s" "  else ", indent.c_str());
+					f << stringf(") %s <= 1'b1;\n", reg_bit_name);
+					f << stringf("%s" "  else ", indent);
 				} else if (ff.has_arst) {
 					f << stringf("if (%s", ff.pol_arst ? "" : "!");
 					if (ff.sig_arst[0].wire == NULL)
-						f << stringf("%s", sig_arst_name.c_str());
+						f << stringf("%s", sig_arst_name);
 					else
 						dump_sigspec(f, ff.sig_arst);
-					f << stringf(") %s <= ", reg_bit_name.c_str());
+					f << stringf(") %s <= ", reg_bit_name);
 					dump_sigspec(f, val_arst);
 					f << stringf(";\n");
-					f << stringf("%s" "  else ", indent.c_str());
+					f << stringf("%s" "  else ", indent);
 				} else if (ff.has_aload) {
 					f << stringf("if (%s", ff.pol_aload ? "" : "!");
 					if (ff.sig_aload[0].wire == NULL)
-						f << stringf("%s", sig_aload_name.c_str());
+						f << stringf("%s", sig_aload_name);
 					else
 						dump_sigspec(f, ff.sig_aload);
-					f << stringf(") %s <= ", reg_bit_name.c_str());
+					f << stringf(") %s <= ", reg_bit_name);
 					dump_sigspec(f, sig_ad);
 					f << stringf(";\n");
-					f << stringf("%s" "  else ", indent.c_str());
+					f << stringf("%s" "  else ", indent);
 				}
 
 				if (ff.has_srst && ff.has_ce && ff.ce_over_srst) {
 					f << stringf("if (%s", ff.pol_ce ? "" : "!");
 					dump_sigspec(f, ff.sig_ce);
 					f << stringf(")\n");
-					f << stringf("%s" "    if (%s", indent.c_str(), ff.pol_srst ? "" : "!");
+					f << stringf("%s" "    if (%s", indent, ff.pol_srst ? "" : "!");
 					dump_sigspec(f, ff.sig_srst);
-					f << stringf(") %s <= ", reg_bit_name.c_str());
+					f << stringf(") %s <= ", reg_bit_name);
 					dump_sigspec(f, val_srst);
 					f << stringf(";\n");
-					f << stringf("%s" "    else ", indent.c_str());
+					f << stringf("%s" "    else ", indent);
 				} else {
 					if (ff.has_srst) {
 						f << stringf("if (%s", ff.pol_srst ? "" : "!");
 						dump_sigspec(f, ff.sig_srst);
-						f << stringf(") %s <= ", reg_bit_name.c_str());
+						f << stringf(") %s <= ", reg_bit_name);
 						dump_sigspec(f, val_srst);
 						f << stringf(";\n");
-						f << stringf("%s" "  else ", indent.c_str());
+						f << stringf("%s" "  else ", indent);
 					}
 					if (ff.has_ce) {
 						f << stringf("if (%s", ff.pol_ce ? "" : "!");
@@ -1673,38 +1673,38 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 					}
 				}
 
-				f << stringf("%s <= ", reg_bit_name.c_str());
+				f << stringf("%s <= ", reg_bit_name);
 				dump_sigspec(f, sig_d);
 				f << stringf(";\n");
 			}
 			else
 			{
 				// Latches.
-				f << stringf("%s" "always%s\n", indent.c_str(), systemverilog ? "_latch" : " @*");
+				f << stringf("%s" "always%s\n", indent, systemverilog ? "_latch" : " @*");
 
-				f << stringf("%s" "  ", indent.c_str());
+				f << stringf("%s" "  ", indent);
 				if (ff.has_sr) {
 					f << stringf("if (%s", ff.pol_clr ? "" : "!");
 					dump_sigspec(f, ff.sig_clr[i]);
-					f << stringf(") %s = 1'b0;\n", reg_bit_name.c_str());
-					f << stringf("%s" "  else if (%s", indent.c_str(), ff.pol_set ? "" : "!");
+					f << stringf(") %s = 1'b0;\n", reg_bit_name);
+					f << stringf("%s" "  else if (%s", indent, ff.pol_set ? "" : "!");
 					dump_sigspec(f, ff.sig_set[i]);
-					f << stringf(") %s = 1'b1;\n", reg_bit_name.c_str());
+					f << stringf(") %s = 1'b1;\n", reg_bit_name);
 					if (ff.has_aload)
-						f << stringf("%s" "  else ", indent.c_str());
+						f << stringf("%s" "  else ", indent);
 				} else if (ff.has_arst) {
 					f << stringf("if (%s", ff.pol_arst ? "" : "!");
 					dump_sigspec(f, ff.sig_arst);
-					f << stringf(") %s = ", reg_bit_name.c_str());
+					f << stringf(") %s = ", reg_bit_name);
 					dump_sigspec(f, val_arst);
 					f << stringf(";\n");
 					if (ff.has_aload)
-						f << stringf("%s" "  else ", indent.c_str());
+						f << stringf("%s" "  else ", indent);
 				}
 				if (ff.has_aload) {
 					f << stringf("if (%s", ff.pol_aload ? "" : "!");
 					dump_sigspec(f, ff.sig_aload);
-					f << stringf(") %s = ", reg_bit_name.c_str());
+					f << stringf(") %s = ", reg_bit_name);
 					dump_sigspec(f, sig_ad);
 					f << stringf(";\n");
 				}
@@ -1712,9 +1712,9 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		}
 
 		if (!out_is_reg_wire) {
-			f << stringf("%s" "assign ", indent.c_str());
+			f << stringf("%s" "assign ", indent);
 			dump_sigspec(f, ff.sig_q);
-			f << stringf(" = %s;\n", reg_name.c_str());
+			f << stringf(" = %s;\n", reg_name);
 		}
 
 		return true;
@@ -1722,7 +1722,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 
 	if (cell->type.in(ID($assert), ID($assume), ID($cover)))
 	{
-		f << stringf("%s" "always%s if (", indent.c_str(), systemverilog ? "_comb" : " @*");
+		f << stringf("%s" "always%s if (", indent, systemverilog ? "_comb" : " @*");
 		dump_sigspec(f, cell->getPort(ID::EN));
 		f << stringf(") %s(", cell->type.c_str()+1);
 		dump_sigspec(f, cell->getPort(ID::A));
@@ -1732,7 +1732,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 
 	if (cell->type.in(ID($specify2), ID($specify3)))
 	{
-		f << stringf("%s" "specify\n%s  ", indent.c_str(), indent.c_str());
+		f << stringf("%s" "specify\n%s  ", indent, indent);
 
 		SigSpec en = cell->getPort(ID::EN);
 		if (en != State::S1) {
@@ -1784,16 +1784,16 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 
 		decimal = bak_decimal;
 
-		f << stringf("%s" "endspecify\n", indent.c_str());
+		f << stringf("%s" "endspecify\n", indent);
 		return true;
 	}
 
 	if (cell->type == ID($specrule))
 	{
-		f << stringf("%s" "specify\n%s  ", indent.c_str(), indent.c_str());
+		f << stringf("%s" "specify\n%s  ", indent, indent);
 
 		IdString spec_type = cell->getParam(ID::TYPE).decode_string();
-		f << stringf("%s(", spec_type.c_str());
+		f << stringf("%s(", spec_type);
 
 		if (cell->getParam(ID::SRC_PEN).as_bool())
 			f << (cell->getParam(ID::SRC_POL).as_bool() ? "posedge ": "negedge ");
@@ -1836,7 +1836,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		f << ");\n";
 		decimal = bak_decimal;
 
-		f << stringf("%s" "endspecify\n", indent.c_str());
+		f << stringf("%s" "endspecify\n", indent);
 		return true;
 	}
 
@@ -1846,9 +1846,9 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		if (cell->getParam(ID::TRG_ENABLE).as_bool())
 			return true;
 
-		f << stringf("%s" "always @*\n", indent.c_str());
+		f << stringf("%s" "always @*\n", indent);
 
-		f << stringf("%s" "  if (", indent.c_str());
+		f << stringf("%s" "  if (", indent);
 		dump_sigspec(f, cell->getPort(ID::EN));
 		f << stringf(")\n");
 
@@ -1862,9 +1862,9 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		if (cell->getParam(ID::TRG_ENABLE).as_bool())
 			return true;
 
-		f << stringf("%s" "always @*\n", indent.c_str());
+		f << stringf("%s" "always @*\n", indent);
 
-		f << stringf("%s" "  if (", indent.c_str());
+		f << stringf("%s" "  if (", indent);
 		dump_sigspec(f, cell->getPort(ID::EN));
 		f << stringf(") begin\n");
 
@@ -1873,18 +1873,18 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 			Fmt fmt;
 			fmt.parse_rtlil(cell);
 			if (!fmt.parts.empty()) {
-				f << stringf("%s" "    if (!", indent.c_str());
+				f << stringf("%s" "    if (!", indent);
 				dump_sigspec(f, cell->getPort(ID::A));
 				f << stringf(")\n");
 				dump_cell_expr_print(f, indent + "      ", cell);
 			}
 		} else {
-			f << stringf("%s" "  /* message omitted */\n", indent.c_str());
+			f << stringf("%s" "  /* message omitted */\n", indent);
 		}
 
 		dump_cell_expr_check(f, indent + "    ", cell);
 
-		f << stringf("%s" "  end\n", indent.c_str());
+		f << stringf("%s" "  end\n", indent);
 
 		return true;
 	}
@@ -1913,26 +1913,26 @@ void dump_cell(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 	}
 
 	dump_attributes(f, indent, cell->attributes);
-	f << stringf("%s" "%s", indent.c_str(), id(cell->type, false).c_str());
+	f << stringf("%s" "%s", indent, id(cell->type, false));
 
 	if (!defparam && cell->parameters.size() > 0) {
 		f << stringf(" #(");
 		for (auto it = cell->parameters.begin(); it != cell->parameters.end(); ++it) {
 			if (it != cell->parameters.begin())
 				f << stringf(",");
-			f << stringf("\n%s  .%s(", indent.c_str(), id(it->first).c_str());
+			f << stringf("\n%s  .%s(", indent, id(it->first));
 			if (it->second.size() > 0)
 				dump_const(f, it->second);
 			f << stringf(")");
 		}
-		f << stringf("\n%s" ")", indent.c_str());
+		f << stringf("\n%s" ")", indent);
 	}
 
 	std::string cell_name = cellname(cell);
 	if (cell_name != id(cell->name))
-		f << stringf(" %s /* %s */ (", cell_name.c_str(), id(cell->name).c_str());
+		f << stringf(" %s /* %s */ (", cell_name, id(cell->name));
 	else
-		f << stringf(" %s (", cell_name.c_str());
+		f << stringf(" %s (", cell_name);
 
 	bool first_arg = true;
 	std::set<RTLIL::IdString> numbered_ports;
@@ -1945,7 +1945,7 @@ void dump_cell(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 			if (!first_arg)
 				f << stringf(",");
 			first_arg = false;
-			f << stringf("\n%s  ", indent.c_str());
+			f << stringf("\n%s  ", indent);
 			dump_sigspec(f, it->second);
 			numbered_ports.insert(it->first);
 			goto found_numbered_port;
@@ -1959,16 +1959,16 @@ void dump_cell(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		if (!first_arg)
 			f << stringf(",");
 		first_arg = false;
-		f << stringf("\n%s  .%s(", indent.c_str(), id(it->first).c_str());
+		f << stringf("\n%s  .%s(", indent, id(it->first));
 		if (it->second.size() > 0)
 			dump_sigspec(f, it->second);
 		f << stringf(")");
 	}
-	f << stringf("\n%s" ");\n", indent.c_str());
+	f << stringf("\n%s" ");\n", indent);
 
 	if (defparam && cell->parameters.size() > 0) {
 		for (auto it = cell->parameters.begin(); it != cell->parameters.end(); ++it) {
-			f << stringf("%sdefparam %s.%s = ", indent.c_str(), cell_name.c_str(), id(it->first).c_str());
+			f << stringf("%sdefparam %s.%s = ", indent, cell_name, id(it->first));
 			dump_const(f, it->second);
 			f << stringf(";\n");
 		}
@@ -1978,7 +1978,7 @@ void dump_cell(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		std::stringstream ss;
 		dump_reg_init(ss, cell->getPort(ID::Q));
 		if (!ss.str().empty()) {
-			f << stringf("%sinitial %s.Q", indent.c_str(), cell_name.c_str());
+			f << stringf("%sinitial %s.Q", indent, cell_name);
 			f << ss.str();
 			f << ";\n";
 		}
@@ -1988,9 +1988,9 @@ void dump_cell(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 void dump_sync_effect(std::ostream &f, std::string indent, const RTLIL::SigSpec &trg, const RTLIL::Const &polarity, std::vector<const RTLIL::Cell*> &cells)
 {
 	if (trg.size() == 0) {
-		f << stringf("%s" "initial begin\n", indent.c_str());
+		f << stringf("%s" "initial begin\n", indent);
 	} else {
-		f << stringf("%s" "always @(", indent.c_str());
+		f << stringf("%s" "always @(", indent);
 		for (int i = 0; i < trg.size(); i++) {
 			if (i != 0)
 				f << " or ";
@@ -2007,7 +2007,7 @@ void dump_sync_effect(std::ostream &f, std::string indent, const RTLIL::SigSpec
 		return a->getParam(ID::PRIORITY).as_int() > b->getParam(ID::PRIORITY).as_int();
 	});
 	for (auto cell : cells) {
-		f << stringf("%s" "  if (", indent.c_str());
+		f << stringf("%s" "  if (", indent);
 		dump_sigspec(f, cell->getPort(ID::EN));
 		f << stringf(") begin\n");
 
@@ -2019,22 +2019,22 @@ void dump_sync_effect(std::ostream &f, std::string indent, const RTLIL::SigSpec
 				Fmt fmt;
 				fmt.parse_rtlil(cell);
 				if (!fmt.parts.empty()) {
-					f << stringf("%s" "    if (!", indent.c_str());
+					f << stringf("%s" "    if (!", indent);
 					dump_sigspec(f, cell->getPort(ID::A));
 					f << stringf(")\n");
 					dump_cell_expr_print(f, indent + "      ", cell);
 				}
 			} else {
-				f << stringf("%s" "  /* message omitted */\n", indent.c_str());
+				f << stringf("%s" "  /* message omitted */\n", indent);
 			}
 
 			dump_cell_expr_check(f, indent + "    ", cell);
 		}
 
-		f << stringf("%s" "  end\n", indent.c_str());
+		f << stringf("%s" "  end\n", indent);
 	}
 
-	f << stringf("%s" "end\n", indent.c_str());
+	f << stringf("%s" "end\n", indent);
 }
 
 void dump_conn(std::ostream &f, std::string indent, const RTLIL::SigSpec &left, const RTLIL::SigSpec &right)
@@ -2044,7 +2044,7 @@ void dump_conn(std::ostream &f, std::string indent, const RTLIL::SigSpec &left,
 		if (chunk.is_wire() && reg_wires.count(chunk.wire->name))
 			all_chunks_wires = false;
 	if (!simple_lhs && all_chunks_wires) {
-		f << stringf("%s" "assign ", indent.c_str());
+		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, left);
 		f << stringf(" = ");
 		dump_sigspec(f, right);
@@ -2053,9 +2053,9 @@ void dump_conn(std::ostream &f, std::string indent, const RTLIL::SigSpec &left,
 		int offset = 0;
 		for (auto &chunk : left.chunks()) {
 			if (chunk.is_wire() && reg_wires.count(chunk.wire->name))
-				f << stringf("%s" "always%s\n%s  ", indent.c_str(), systemverilog ? "_comb" : " @*", indent.c_str());
+				f << stringf("%s" "always%s\n%s  ", indent, systemverilog ? "_comb" : " @*", indent);
 			else
-				f << stringf("%s" "assign ", indent.c_str());
+				f << stringf("%s" "assign ", indent);
 			dump_sigspec(f, chunk);
 			f << stringf(" = ");
 			dump_sigspec(f, right.extract(offset, GetSize(chunk)));
@@ -2072,7 +2072,7 @@ void dump_case_actions(std::ostream &f, std::string indent, RTLIL::CaseRule *cs)
 	for (auto it = cs->actions.begin(); it != cs->actions.end(); ++it) {
 		if (it->first.size() == 0)
 			continue;
-		f << stringf("%s  ", indent.c_str());
+		f << stringf("%s  ", indent);
 		dump_sigspec(f, it->first);
 		f << stringf(" = ");
 		dump_sigspec(f, it->second);
@@ -2133,28 +2133,28 @@ void dump_case_body(std::ostream &f, std::string indent, RTLIL::CaseRule *cs, bo
 	int number_of_stmts = cs->switches.size() + cs->actions.size();
 
 	if (!omit_trailing_begin && number_of_stmts >= 2)
-		f << stringf("%s" "begin\n", indent.c_str());
+		f << stringf("%s" "begin\n", indent);
 
 	dump_case_actions(f, indent, cs);
 	for (auto it = cs->switches.begin(); it != cs->switches.end(); ++it)
 		dump_proc_switch(f, indent + "  ", *it);
 
 	if (!omit_trailing_begin && number_of_stmts == 0)
-		f << stringf("%s  /* empty */;\n", indent.c_str());
+		f << stringf("%s  /* empty */;\n", indent);
 
 	if (omit_trailing_begin || number_of_stmts >= 2)
-		f << stringf("%s" "end\n", indent.c_str());
+		f << stringf("%s" "end\n", indent);
 }
 
 void dump_proc_switch(std::ostream &f, std::string indent, RTLIL::SwitchRule *sw)
 {
 	if (sw->signal.size() == 0) {
-		f << stringf("%s" "begin\n", indent.c_str());
+		f << stringf("%s" "begin\n", indent);
 		for (auto it = sw->cases.begin(); it != sw->cases.end(); ++it) {
 			if ((*it)->compare.size() == 0)
 				dump_case_body(f, indent + "  ", *it);
 		}
-		f << stringf("%s" "end\n", indent.c_str());
+		f << stringf("%s" "end\n", indent);
 		return;
 	}
 
@@ -2162,7 +2162,7 @@ void dump_proc_switch(std::ostream &f, std::string indent, RTLIL::SwitchRule *sw
 		return;
 
 	dump_attributes(f, indent, sw->attributes);
-	f << stringf("%s" "casez (", indent.c_str());
+	f << stringf("%s" "casez (", indent);
 	dump_sigspec(f, sw->signal);
 	f << stringf(")\n");
 
@@ -2170,10 +2170,10 @@ void dump_proc_switch(std::ostream &f, std::string indent, RTLIL::SwitchRule *sw
 		bool got_default = false;
 		dump_attributes(f, indent + "  ", (*it)->attributes, "\n", /*modattr=*/false, /*regattr=*/false, /*as_comment=*/true);
 		if ((*it)->compare.size() == 0) {
-			f << stringf("%s  default", indent.c_str());
+			f << stringf("%s  default", indent);
 			got_default = true;
 		} else {
-			f << stringf("%s  ", indent.c_str());
+			f << stringf("%s  ", indent);
 			for (size_t i = 0; i < (*it)->compare.size(); i++) {
 				if (i > 0)
 					f << stringf(", ");
@@ -2194,10 +2194,10 @@ void dump_proc_switch(std::ostream &f, std::string indent, RTLIL::SwitchRule *sw
 
 	if (sw->cases.empty()) {
 		// Verilog does not allow empty cases.
-		f << stringf("%s  default: ;\n", indent.c_str());
+		f << stringf("%s  default: ;\n", indent);
 	}
 
-	f << stringf("%s" "endcase\n", indent.c_str());
+	f << stringf("%s" "endcase\n", indent);
 }
 
 void case_body_find_regs(RTLIL::CaseRule *cs)
@@ -2226,7 +2226,7 @@ void dump_process(std::ostream &f, std::string indent, RTLIL::Process *proc, boo
 		return;
 	}
 
-	f << stringf("%s" "always%s begin\n", indent.c_str(), systemverilog ? "_comb" : " @*");
+	f << stringf("%s" "always%s begin\n", indent, systemverilog ? "_comb" : " @*");
 	if (!systemverilog)
 		f << indent + "  " << "if (" << id(initial_id) << ") begin end\n";
 	dump_case_body(f, indent, &proc->root_case, true);
@@ -2239,11 +2239,11 @@ void dump_process(std::ostream &f, std::string indent, RTLIL::Process *proc, boo
 		indent = backup_indent;
 
 		if (sync->type == RTLIL::STa) {
-			f << stringf("%s" "always%s begin\n", indent.c_str(), systemverilog ? "_comb" : " @*");
+			f << stringf("%s" "always%s begin\n", indent, systemverilog ? "_comb" : " @*");
 		} else if (sync->type == RTLIL::STi) {
-			f << stringf("%s" "initial begin\n", indent.c_str());
+			f << stringf("%s" "initial begin\n", indent);
 		} else {
-			f << stringf("%s" "always%s @(", indent.c_str(), systemverilog ? "_ff" : "");
+			f << stringf("%s" "always%s @(", indent, systemverilog ? "_ff" : "");
 			if (sync->type == RTLIL::STp || sync->type == RTLIL::ST1)
 				f << stringf("posedge ");
 			if (sync->type == RTLIL::STn || sync->type == RTLIL::ST0)
@@ -2255,7 +2255,7 @@ void dump_process(std::ostream &f, std::string indent, RTLIL::Process *proc, boo
 		indent += "  ";
 
 		if (sync->type == RTLIL::ST0 || sync->type == RTLIL::ST1) {
-			f << stringf("%s" "if (%s", indent.c_str(), sync->type == RTLIL::ST0 ? "!" : "");
+			f << stringf("%s" "if (%s", indent, sync->type == RTLIL::ST0 ? "!" : "");
 			dump_sigspec(f, sync->signal);
 			f << stringf(") begin\n");
 			ends = indent + "end\n" + ends;
@@ -2266,7 +2266,7 @@ void dump_process(std::ostream &f, std::string indent, RTLIL::Process *proc, boo
 			for (size_t j = 0; j < proc->syncs.size(); j++) {
 				RTLIL::SyncRule *sync2 = proc->syncs[j];
 				if (sync2->type == RTLIL::ST0 || sync2->type == RTLIL::ST1) {
-					f << stringf("%s" "if (%s", indent.c_str(), sync2->type == RTLIL::ST1 ? "!" : "");
+					f << stringf("%s" "if (%s", indent, sync2->type == RTLIL::ST1 ? "!" : "");
 					dump_sigspec(f, sync2->signal);
 					f << stringf(") begin\n");
 					ends = indent + "end\n" + ends;
@@ -2278,14 +2278,14 @@ void dump_process(std::ostream &f, std::string indent, RTLIL::Process *proc, boo
 		for (auto it = sync->actions.begin(); it != sync->actions.end(); ++it) {
 			if (it->first.size() == 0)
 				continue;
-			f << stringf("%s  ", indent.c_str());
+			f << stringf("%s  ", indent);
 			dump_sigspec(f, it->first);
 			f << stringf(" <= ");
 			dump_sigspec(f, it->second);
 			f << stringf(";\n");
 		}
 
-		f << stringf("%s", ends.c_str());
+		f << stringf("%s", ends);
 	}
 }
 
@@ -2356,14 +2356,14 @@ void dump_module(std::ostream &f, std::string indent, RTLIL::Module *module)
 	}
 
 	dump_attributes(f, indent, module->attributes, "\n", /*modattr=*/true);
-	f << stringf("%s" "module %s(", indent.c_str(), id(module->name, false).c_str());
+	f << stringf("%s" "module %s(", indent, id(module->name, false));
 	int cnt = 0;
 	for (auto port : module->ports) {
 		Wire *wire = module->wire(port);
 		if (wire) {
 			if (port != module->ports[0])
 				f << stringf(", ");
-			f << stringf("%s", id(wire->name).c_str());
+			f << stringf("%s", id(wire->name));
 			if (cnt==20) { f << stringf("\n"); cnt = 0; } else cnt++;
 			continue;
 		}
@@ -2400,7 +2400,7 @@ void dump_module(std::ostream &f, std::string indent, RTLIL::Module *module)
 	for (auto it = module->connections().begin(); it != module->connections().end(); ++it)
 		dump_conn(f, indent + "  ", it->first, it->second);
 
-	f << stringf("%s" "endmodule\n", indent.c_str());
+	f << stringf("%s" "endmodule\n", indent);
 	active_module = NULL;
 	active_sigmap.clear();
 	active_initdata.clear();
diff --git a/frontends/aiger/aigerparse.cc b/frontends/aiger/aigerparse.cc
index 37ace27fd..c5d9bc70b 100644
--- a/frontends/aiger/aigerparse.cc
+++ b/frontends/aiger/aigerparse.cc
@@ -284,7 +284,7 @@ end_of_header:
 			if ((c == 'i' && l1 > inputs.size()) || (c == 'l' && l1 > latches.size()) || (c == 'o' && l1 > outputs.size()))
 				log_error("Line %u has invalid symbol position!\n", line_count);
 
-			RTLIL::IdString escaped_s = stringf("\\%s", s.c_str());
+			RTLIL::IdString escaped_s = stringf("\\%s", s);
 			RTLIL::Wire* wire;
 			if (c == 'i') wire = inputs[l1];
 			else if (c == 'l') wire = latches[l1];
@@ -830,7 +830,7 @@ void AigerReader::post_process()
 					log_debug(" -> %s\n", log_id(escaped_s));
 				}
 				else {
-					RTLIL::IdString indexed_name = stringf("%s[%d]", escaped_s.c_str(), index);
+					RTLIL::IdString indexed_name = stringf("%s[%d]", escaped_s, index);
 					existing = module->wire(indexed_name);
 					if (!existing)
 						module->rename(wire, indexed_name);
@@ -877,7 +877,7 @@ void AigerReader::post_process()
 					log_debug(" -> %s\n", log_id(escaped_s));
 				}
 				else {
-					RTLIL::IdString indexed_name = stringf("%s[%d]", escaped_s.c_str(), index);
+					RTLIL::IdString indexed_name = stringf("%s[%d]", escaped_s, index);
 					existing = module->wire(indexed_name);
 					if (!existing)
 						module->rename(wire, indexed_name);
@@ -922,7 +922,7 @@ void AigerReader::post_process()
 
 		RTLIL::Wire *wire = module->wire(name);
 		if (wire)
-			module->rename(wire, RTLIL::escape_id(stringf("%s[%d]", name.c_str(), 0)));
+			module->rename(wire, RTLIL::escape_id(stringf("%s[%d]", name, 0)));
 
 		// Do not make ports with a mix of input/output into
 		// wide ports
@@ -942,7 +942,7 @@ void AigerReader::post_process()
 		wire->port_output = port_output;
 
 		for (int i = min; i <= max; i++) {
-			RTLIL::IdString other_name = stringf("%s[%d]", name.c_str(), i);
+			RTLIL::IdString other_name = stringf("%s[%d]", name, i);
 			RTLIL::Wire *other_wire = module->wire(other_name);
 			if (other_wire) {
 				other_wire->port_input = false;
@@ -971,9 +971,9 @@ void AigerReader::post_process()
 		if (cell->type != ID($lut)) continue;
 		auto y_port = cell->getPort(ID::Y).as_bit();
 		if (y_port.wire->width == 1)
-			module->rename(cell, stringf("$lut%s", y_port.wire->name.c_str()));
+			module->rename(cell, stringf("$lut%s", y_port.wire->name));
 		else
-			module->rename(cell, stringf("$lut%s[%d]", y_port.wire->name.c_str(), y_port.offset));
+			module->rename(cell, stringf("$lut%s[%d]", y_port.wire->name, y_port.offset));
 	}
 }
 
diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index aba0ef5dd..313161fc3 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -922,7 +922,7 @@ std::unique_ptr<AstNode> AstNode::mktemp_logic(AstSrcLocType loc, const std::str
 {
 	auto wire_owned = std::make_unique<AstNode>(loc, AST_WIRE, std::make_unique<AstNode>(loc, AST_RANGE, mkconst_int(loc, range_left, true), mkconst_int(loc, range_right, true)));
 	auto* wire = wire_owned.get();
-	wire->str = stringf("%s%s:%d$%d", name.c_str(), RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line, autoidx++);
+	wire->str = stringf("%s%s:%d$%d", name, RTLIL::encode_filename(*location.begin.filename), location.begin.line, autoidx++);
 	if (nosync)
 		wire->set_attribute(ID::nosync, AstNode::mkconst_int(loc, 1, false));
 	wire->is_signed = is_signed;
@@ -1773,7 +1773,7 @@ static std::string serialize_param_value(const RTLIL::Const &val) {
 std::string AST::derived_module_name(std::string stripped_name, const std::vector<std::pair<RTLIL::IdString, RTLIL::Const>> &parameters) {
 	std::string para_info;
 	for (const auto &elem : parameters)
-		para_info += stringf("%s=%s", elem.first.c_str(), serialize_param_value(elem.second).c_str());
+		para_info += stringf("%s=%s", elem.first, serialize_param_value(elem.second));
 
 	if (para_info.size() > 60)
 		return "$paramod$" + sha1(para_info) + stripped_name;
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index b53fa7a44..896ae9bdb 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -45,7 +45,7 @@ using namespace AST_INTERNAL;
 // helper function for creating RTLIL code for unary operations
 static RTLIL::SigSpec uniop2rtlil(AstNode *that, IdString type, int result_width, const RTLIL::SigSpec &arg, bool gen_attributes = true)
 {
-	IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(*that->location.begin.filename).c_str(), that->location.begin.line, autoidx++);
+	IdString name = stringf("%s$%s:%d$%d", type, RTLIL::encode_filename(*that->location.begin.filename), that->location.begin.line, autoidx++);
 	RTLIL::Cell *cell = current_module->addCell(name, type);
 	set_src_attr(cell, that);
 
@@ -77,7 +77,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
 		return;
 	}
 
-	IdString name = stringf("$extend$%s:%d$%d", RTLIL::encode_filename(*that->location.begin.filename).c_str(), that->location.begin.line, autoidx++);
+	IdString name = stringf("$extend$%s:%d$%d", RTLIL::encode_filename(*that->location.begin.filename), that->location.begin.line, autoidx++);
 	RTLIL::Cell *cell = current_module->addCell(name, ID($pos));
 	set_src_attr(cell, that);
 
@@ -104,7 +104,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
 // helper function for creating RTLIL code for binary operations
 static RTLIL::SigSpec binop2rtlil(AstNode *that, IdString type, int result_width, const RTLIL::SigSpec &left, const RTLIL::SigSpec &right)
 {
-	IdString name = stringf("%s$%s:%d$%d", type.c_str(), RTLIL::encode_filename(*that->location.begin.filename).c_str(), that->location.begin.line, autoidx++);
+	IdString name = stringf("%s$%s:%d$%d", type, RTLIL::encode_filename(*that->location.begin.filename), that->location.begin.line, autoidx++);
 	RTLIL::Cell *cell = current_module->addCell(name, type);
 	set_src_attr(cell, that);
 
@@ -199,7 +199,7 @@ struct AST_INTERNAL::LookaheadRewriter
 				for (auto& c : node->id2ast->children)
 					wire->children.push_back(c->clone());
 				wire->fixup_hierarchy_flags();
-				wire->str = stringf("$lookahead%s$%d", node->str.c_str(), autoidx++);
+				wire->str = stringf("$lookahead%s$%d", node->str, autoidx++);
 				wire->set_attribute(ID::nosync, AstNode::mkconst_int(node->location, 1, false));
 				wire->is_logic = true;
 				while (wire->simplify(true, 1, -1, false)) { }
@@ -348,7 +348,7 @@ struct AST_INTERNAL::ProcessGenerator
 		LookaheadRewriter la_rewriter(always.get());
 
 		// generate process and simple root case
-		proc = current_module->addProcess(stringf("$proc$%s:%d$%d", RTLIL::encode_filename(*always->location.begin.filename).c_str(), always->location.begin.line, autoidx++));
+		proc = current_module->addProcess(stringf("$proc$%s:%d$%d", RTLIL::encode_filename(*always->location.begin.filename), always->location.begin.line, autoidx++));
 		set_src_attr(proc, always.get());
 		for (auto &attr : always->attributes) {
 			if (attr.second->type != AST_CONSTANT)
@@ -814,7 +814,7 @@ struct AST_INTERNAL::ProcessGenerator
 
 				IdString cellname;
 				if (ast->str.empty())
-					cellname = stringf("$%s$%s:%d$%d", flavor.c_str(), RTLIL::encode_filename(*ast->location.begin.filename).c_str(), ast->location.begin.line, autoidx++);
+					cellname = stringf("$%s$%s:%d$%d", flavor, RTLIL::encode_filename(*ast->location.begin.filename), ast->location.begin.line, autoidx++);
 				else
 					cellname = ast->str;
 				check_unique_id(current_module, cellname, ast, "procedural assertion");
@@ -1568,7 +1568,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			// This makes it possible for the hierarchy pass to see what are interface connections and then replace them
 			// with the individual signals:
 			if (is_interface) {
-				IdString dummy_wire_name = stringf("$dummywireforinterface%s", str.c_str());
+				IdString dummy_wire_name = stringf("$dummywireforinterface%s", str);
 				RTLIL::Wire *dummy_wire = current_module->wire(dummy_wire_name);
 				if (!dummy_wire) {
 					dummy_wire = current_module->addWire(dummy_wire_name);
@@ -2019,7 +2019,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 
 			IdString cellname;
 			if (str.empty())
-				cellname = stringf("$%s$%s:%d$%d", flavor.c_str(), RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line, autoidx++);
+				cellname = stringf("$%s$%s:%d$%d", flavor, RTLIL::encode_filename(*location.begin.filename), location.begin.line, autoidx++);
 			else
 				cellname = str;
 			check_unique_id(current_module, cellname, this, "procedural assertion");
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index b1a615d76..bf72a770f 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -968,10 +968,10 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 			verbose_activate:
 				if (mem2reg_set.count(mem) == 0) {
-					std::string message = stringf("Replacing memory %s with list of registers.", mem->str.c_str());
+					std::string message = stringf("Replacing memory %s with list of registers.", mem->str);
 					bool first_element = true;
 					for (auto &place : mem2reg_places[it.first]) {
-						message += stringf("%s%s", first_element ? " See " : ", ", place.c_str());
+						message += stringf("%s%s", first_element ? " See " : ", ", place);
 						first_element = false;
 					}
 					log_warning("%s\n", message.c_str());
@@ -997,7 +997,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				for (int i = 0; i < mem_size; i++) {
 					auto reg = std::make_unique<AstNode>(loc, AST_WIRE, std::make_unique<AstNode>(loc, AST_RANGE,
 							mkconst_int(loc, data_range_left, true), mkconst_int(loc, data_range_right, true)));
-					reg->str = stringf("%s[%d]", node->str.c_str(), i);
+					reg->str = stringf("%s[%d]", node->str, i);
 					reg->is_reg = true;
 					reg->is_signed = node->is_signed;
 					for (auto &it : node->attributes)
@@ -2050,7 +2050,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		const char *second_part = children[1]->str.c_str();
 		if (second_part[0] == '\\')
 			second_part++;
-		newNode->str = stringf("%s[%d].%s", str.c_str(), children[0]->integer, second_part);
+		newNode->str = stringf("%s[%d].%s", str, children[0]->integer, second_part);
 		goto apply_newNode;
 	}
 
@@ -2767,7 +2767,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			} else {
 				this->dumpAst(NULL, "    ");
 				log_assert(new_cell->children.at(0)->type == AST_CELLTYPE);
-				new_cell->children.at(0)->str = stringf("$array:%d:%d:%s", i, num, new_cell->children.at(0)->str.c_str());
+				new_cell->children.at(0)->str = stringf("$array:%d:%d:%s", i, num, new_cell->children.at(0)->str);
 			}
 		}
 
@@ -3119,7 +3119,7 @@ skip_dynamic_range_lvalue_expansion:;
 
 			auto wire_tmp_owned = std::make_unique<AstNode>(location, AST_WIRE, std::make_unique<AstNode>(location, AST_RANGE, mkconst_int(location, width_hint-1, true), mkconst_int(location, 0, true)));
 			auto wire_tmp = wire_tmp_owned.get();
-			wire_tmp->str = stringf("$splitcmplxassign$%s:%d$%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line, autoidx++);
+			wire_tmp->str = stringf("$splitcmplxassign$%s:%d$%d", RTLIL::encode_filename(*location.begin.filename), location.begin.line, autoidx++);
 			current_scope[wire_tmp->str] = wire_tmp;
 			current_ast_mod->children.push_back(std::move(wire_tmp_owned));
 			wire_tmp->set_attribute(ID::nosync, AstNode::mkconst_int(location, 1, false));
@@ -3433,7 +3433,7 @@ skip_dynamic_range_lvalue_expansion:;
 					auto* reg = reg_owned.get();
 					current_ast_mod->children.push_back(std::move(reg_owned));
 
-					reg->str = stringf("$past$%s:%d$%d$%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line, myidx, i);
+					reg->str = stringf("$past$%s:%d$%d$%d", RTLIL::encode_filename(*location.begin.filename), location.begin.line, myidx, i);
 					reg->is_reg = true;
 					reg->is_signed = sign_hint;
 
@@ -4754,7 +4754,7 @@ static void mark_memories_assign_lhs_complex(dict<AstNode*, pool<std::string>> &
 	if (that->type == AST_IDENTIFIER && that->id2ast && that->id2ast->type == AST_MEMORY) {
 		AstNode *mem = that->id2ast;
 		if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_CMPLX_LHS))
-			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*that->location.begin.filename).c_str(), that->location.begin.line));
+			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*that->location.begin.filename), that->location.begin.line));
 		mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_CMPLX_LHS;
 	}
 }
@@ -4782,14 +4782,14 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 			// activate mem2reg if this is assigned in an async proc
 			if (flags & AstNode::MEM2REG_FL_ASYNC) {
 				if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_ASYNC))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename), location.begin.line));
 				mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_ASYNC;
 			}
 
 			// remember if this is assigned blocking (=)
 			if (type == AST_ASSIGN_EQ) {
 				if (!(proc_flags[mem] & AstNode::MEM2REG_FL_EQ1))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename), location.begin.line));
 				proc_flags[mem] |= AstNode::MEM2REG_FL_EQ1;
 			}
 
@@ -4806,11 +4806,11 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 			// remember where this is
 			if (flags & MEM2REG_FL_INIT) {
 				if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_INIT))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename), location.begin.line));
 				mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_INIT;
 			} else {
 				if (!(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_SET_ELSE))
-					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line));
+					mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename), location.begin.line));
 				mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_SET_ELSE;
 			}
 		}
@@ -4827,7 +4827,7 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
 
 		// flag if used after blocking assignment (in same proc)
 		if ((proc_flags[mem] & AstNode::MEM2REG_FL_EQ1) && !(mem2reg_candidates[mem] & AstNode::MEM2REG_FL_EQ2)) {
-			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename).c_str(), location.begin.line));
+			mem2reg_places[mem].insert(stringf("%s:%d", RTLIL::encode_filename(*location.begin.filename), location.begin.line));
 			mem2reg_candidates[mem] |= AstNode::MEM2REG_FL_EQ2;
 		}
 	}
@@ -5070,7 +5070,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 			auto assign_reg = std::make_unique<AstNode>(location, type, std::make_unique<AstNode>(location, AST_IDENTIFIER), std::make_unique<AstNode>(location, AST_IDENTIFIER));
 			if (children[0]->children.size() == 2)
 				assign_reg->children[0]->children.push_back(children[0]->children[1]->clone());
-			assign_reg->children[0]->str = stringf("%s[%d]", children[0]->str.c_str(), i);
+			assign_reg->children[0]->str = stringf("%s[%d]", children[0]->str, i);
 			assign_reg->children[1]->str = id_data;
 			cond_node->children[1]->children.push_back(std::move(assign_reg));
 			case_node->children.push_back(std::move(cond_node));
@@ -5108,7 +5108,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 				(right <= id && id <= left);
 			if (valid_const_access)
 			{
-				str = stringf("%s[%d]", str.c_str(), id);
+				str = stringf("%s[%d]", str, id);
 				delete_children();
 				range_valid = false;
 				id2ast = nullptr;
@@ -5185,7 +5185,7 @@ bool AstNode::mem2reg_as_needed_pass2(pool<AstNode*> &mem2reg_set, AstNode *mod,
 				auto assign_reg = std::make_unique<AstNode>(location, AST_ASSIGN_EQ, std::make_unique<AstNode>(location, AST_IDENTIFIER), std::make_unique<AstNode>(location, AST_IDENTIFIER));
 				assign_reg->children[0]->str = id_data;
 				assign_reg->children[0]->was_checked = true;
-				assign_reg->children[1]->str = stringf("%s[%d]", str.c_str(), i);
+				assign_reg->children[1]->str = stringf("%s[%d]", str, i);
 				cond_node->children[1]->children.push_back(std::move(assign_reg));
 				case_node->children.push_back(std::move(cond_node));
 			}
diff --git a/frontends/rpc/rpc_frontend.cc b/frontends/rpc/rpc_frontend.cc
index ec3952661..4a9ce4b8a 100644
--- a/frontends/rpc/rpc_frontend.cc
+++ b/frontends/rpc/rpc_frontend.cc
@@ -168,7 +168,7 @@ struct RpcModule : RTLIL::Module {
 		std::string parameter_info;
 		for (auto &param : parameters) {
 			log("Parameter %s = %s\n", param.first.c_str(), log_signal(RTLIL::SigSpec(param.second)));
-			parameter_info += stringf("%s=%s", param.first.c_str(), log_signal(RTLIL::SigSpec(param.second)));
+			parameter_info += stringf("%s=%s", param.first, log_signal(RTLIL::SigSpec(param.second)));
 		}
 
 		std::string derived_name;
diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 7284c7cd9..d4bedf44f 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -129,7 +129,7 @@ void msg_func(msg_type_t msg_type, const char *message_id, linefile_type linefil
 	message += vstringf(msg, args);
 
 	if (log_verific_callback) {
-		string full_message = stringf("%s%s\n", message_prefix.c_str(), message.c_str());
+		string full_message = stringf("%s%s\n", message_prefix, message);
 #ifdef VERIFIC_LINEFILE_INCLUDES_COLUMNS 
 		log_verific_callback(int(msg_type), message_id, LineFile::GetFileName(linefile), 
 			linefile ? linefile->GetLeftLine() : 0, linefile ? linefile->GetLeftCol() : 0, 
@@ -232,7 +232,7 @@ RTLIL::IdString VerificImporter::new_verific_id(Verific::DesignObj *obj)
 {
 	std::string s = stringf("$verific$%s", obj->Name());
 	if (obj->Linefile())
-		s += stringf("$%s:%d", RTLIL::encode_filename(Verific::LineFile::GetFileName(obj->Linefile())).c_str(), Verific::LineFile::GetLineNo(obj->Linefile()));
+		s += stringf("$%s:%d", RTLIL::encode_filename(Verific::LineFile::GetFileName(obj->Linefile())), Verific::LineFile::GetLineNo(obj->Linefile()));
 	s += stringf("$%d", autoidx++);
 	return s;
 }
@@ -472,7 +472,7 @@ void VerificImporter::import_attributes(dict<RTLIL::IdString, RTLIL::Const> &att
 			if (nl->IsFromVerilog()) {
 				auto const value = verific_const(type_name, v, nl, false);
 
-				attributes.emplace(stringf("\\enum_value_%s", value.as_string().c_str()), RTLIL::escape_id(k));
+				attributes.emplace(stringf("\\enum_value_%s", value.as_string()), RTLIL::escape_id(k));
 			}
 #ifdef VERIFIC_VHDL_SUPPORT
 			else if (nl->IsFromVhdl()) {
@@ -1926,7 +1926,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 				RTLIL::SigSpec data = operatorOutput(inst).extract(i * memory->width, memory->width);
 
 				RTLIL::Cell *cell = module->addCell(numchunks == 1 ? inst_name :
-						RTLIL::IdString(stringf("%s_%d", inst_name.c_str(), i)), ID($memrd));
+						RTLIL::IdString(stringf("%s_%d", inst_name, i)), ID($memrd));
 				cell->parameters[ID::MEMID] = memory->name.str();
 				cell->parameters[ID::CLK_ENABLE] = false;
 				cell->parameters[ID::CLK_POLARITY] = true;
@@ -1956,7 +1956,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 				RTLIL::SigSpec data = operatorInput2(inst).extract(i * memory->width, memory->width);
 
 				RTLIL::Cell *cell = module->addCell(numchunks == 1 ? inst_name :
-						RTLIL::IdString(stringf("%s_%d", inst_name.c_str(), i)), ID($memwr));
+						RTLIL::IdString(stringf("%s_%d", inst_name, i)), ID($memwr));
 				cell->parameters[ID::MEMID] = memory->name.str();
 				cell->parameters[ID::CLK_ENABLE] = false;
 				cell->parameters[ID::CLK_POLARITY] = true;
diff --git a/frontends/verific/verificsva.cc b/frontends/verific/verificsva.cc
index 60d8292b8..8b98997f6 100644
--- a/frontends/verific/verificsva.cc
+++ b/frontends/verific/verificsva.cc
@@ -1031,12 +1031,12 @@ struct VerificSvaImporter
 
 	[[noreturn]] void parser_error(std::string errmsg, linefile_type loc)
 	{
-		parser_error(stringf("%s at %s:%d.\n", errmsg.c_str(), LineFile::GetFileName(loc), LineFile::GetLineNo(loc)));
+		parser_error(stringf("%s at %s:%d.\n", errmsg, LineFile::GetFileName(loc), LineFile::GetLineNo(loc)));
 	}
 
 	[[noreturn]] void parser_error(std::string errmsg, Instance *inst)
 	{
-		parser_error(stringf("%s at %s (%s)", errmsg.c_str(), inst->View()->Owner()->Name(), inst->Name()), inst->Linefile());
+		parser_error(stringf("%s at %s (%s)", errmsg, inst->View()->Owner()->Name(), inst->Name()), inst->Linefile());
 	}
 
 	[[noreturn]] void parser_error(Instance *inst)
diff --git a/frontends/verilog/preproc.cc b/frontends/verilog/preproc.cc
index 6dff1b6fc..7d011b68e 100644
--- a/frontends/verilog/preproc.cc
+++ b/frontends/verilog/preproc.cc
@@ -265,7 +265,7 @@ struct arg_map_t
 	// (something like macro_foobar_arg2). This doesn't include the leading backtick.
 	static std::string str_token(const std::string &macro_name, int pos)
 	{
-		return stringf("macro_%s_arg%d", macro_name.c_str(), pos);
+		return stringf("macro_%s_arg%d", macro_name, pos);
 	}
 
 	// Return definitions for the macro arguments (so that substituting in the macro body and
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 392d8921a..f4ae53a9c 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -323,7 +323,7 @@
 
 			// create a unique name for the genvar
 			std::string old_str = decl->str;
-			std::string new_str = stringf("$genfordecl$%d$%s", autoidx++, old_str.c_str());
+			std::string new_str = stringf("$genfordecl$%d$%s", autoidx++, old_str);
 
 			// rename and move the genvar declaration to the containing description
 			decl->str = new_str;
diff --git a/kernel/fstdata.cc b/kernel/fstdata.cc
index c7bc34dd9..35e7a2865 100644
--- a/kernel/fstdata.cc
+++ b/kernel/fstdata.cc
@@ -33,8 +33,8 @@ FstData::FstData(std::string filename) : ctx(nullptr)
 	std::string filename_trim = file_base_name(filename);
 	if (filename_trim.size() > 4 && filename_trim.compare(filename_trim.size()-4, std::string::npos, ".vcd") == 0) {
 		filename_trim.erase(filename_trim.size()-4);
-		tmp_file = stringf("%s/converted_%s.fst", get_base_tmpdir().c_str(), filename_trim.c_str());
-		std::string cmd = stringf("vcd2fst %s %s", filename.c_str(), tmp_file.c_str());
+		tmp_file = stringf("%s/converted_%s.fst", get_base_tmpdir(), filename_trim);
+		std::string cmd = stringf("vcd2fst %s %s", filename, tmp_file);
 		log("Exec: %s\n", cmd.c_str());
 		if (run_command(cmd) != 0)
 			log_cmd_error("Shell command failed!\n");
diff --git a/kernel/io.cc b/kernel/io.cc
index 62cf6b7f4..4c593501c 100644
--- a/kernel/io.cc
+++ b/kernel/io.cc
@@ -307,7 +307,7 @@ bool is_absolute_path(std::string filename)
 void remove_directory(std::string dirname)
 {
 #ifdef _WIN32
-	run_command(stringf("rmdir /s /q \"%s\"", dirname.c_str()));
+	run_command(stringf("rmdir /s /q \"%s\"", dirname));
 #else
 	struct stat stbuf;
 	struct dirent **namelist;
@@ -315,7 +315,7 @@ void remove_directory(std::string dirname)
 	log_assert(n >= 0);
 	for (int i = 0; i < n; i++) {
 		if (strcmp(namelist[i]->d_name, ".") && strcmp(namelist[i]->d_name, "..")) {
-			std::string buffer = stringf("%s/%s", dirname.c_str(), namelist[i]->d_name);
+			std::string buffer = stringf("%s/%s", dirname, namelist[i]->d_name);
 			if (!stat(buffer.c_str(), &stbuf) && S_ISREG(stbuf.st_mode)) {
 				remove(buffer.c_str());
 			} else
diff --git a/kernel/log.cc b/kernel/log.cc
index 011071439..3203ed3cf 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -791,7 +791,7 @@ dict<std::string, std::pair<std::string, int>> get_coverage_data()
 	dict<std::string, std::pair<std::string, int>> coverage_data;
 
 	for (auto &it : pass_register) {
-		std::string key = stringf("passes.%s", it.first.c_str());
+		std::string key = stringf("passes.%s", it.first);
 		coverage_data[key].first = stringf("%s:%d:%s", __FILE__, __LINE__, __FUNCTION__);
 		coverage_data[key].second += it.second->call_counter;
 	}
diff --git a/kernel/mem.cc b/kernel/mem.cc
index 67501acfd..f614a1f81 100644
--- a/kernel/mem.cc
+++ b/kernel/mem.cc
@@ -900,7 +900,7 @@ Cell *Mem::extract_rdff(int idx, FfInitVals *initvals) {
 
 		if (width)
 		{
-			SigSpec sig_q = module->addWire(stringf("$%s$rdreg[%d]$q", memid.c_str(), idx), width);
+			SigSpec sig_q = module->addWire(stringf("$%s$rdreg[%d]$q", memid, idx), width);
 			SigSpec sig_d;
 
 			int pos = 0;
@@ -910,7 +910,7 @@ Cell *Mem::extract_rdff(int idx, FfInitVals *initvals) {
 					port.addr[i] = sig_q[pos++];
 				}
 
-			c = module->addDff(stringf("$%s$rdreg[%d]", memid.c_str(), idx), port.clk, sig_d, sig_q, port.clk_polarity);
+			c = module->addDff(stringf("$%s$rdreg[%d]", memid, idx), port.clk, sig_d, sig_q, port.clk_polarity);
 		} else {
 			c = nullptr;
 		}
@@ -919,7 +919,7 @@ Cell *Mem::extract_rdff(int idx, FfInitVals *initvals) {
 	{
 		log_assert(port.arst == State::S0 || port.srst == State::S0);
 
-		SigSpec async_d = module->addWire(stringf("$%s$rdreg[%d]$d", memid.c_str(), idx), GetSize(port.data));
+		SigSpec async_d = module->addWire(stringf("$%s$rdreg[%d]$d", memid, idx), GetSize(port.data));
 		SigSpec sig_d = async_d;
 
 		for (int i = 0; i < GetSize(wr_ports); i++) {
@@ -942,7 +942,7 @@ Cell *Mem::extract_rdff(int idx, FfInitVals *initvals) {
 						raddr = port.sub_addr(sub);
 					SigSpec addr_eq;
 					if (raddr != waddr)
-						addr_eq = module->Eq(stringf("$%s$rdtransen[%d][%d][%d]$d", memid.c_str(), idx, i, sub), raddr, waddr);
+						addr_eq = module->Eq(stringf("$%s$rdtransen[%d][%d][%d]$d", memid, idx, i, sub), raddr, waddr);
 					int pos = 0;
 					int ewidth = width << min_wide_log2;
 					int wsub = wide_write ? sub : 0;
@@ -955,10 +955,10 @@ Cell *Mem::extract_rdff(int idx, FfInitVals *initvals) {
 						SigSpec other = port.transparency_mask[i] ? wport.data.extract(pos + wsub * width, epos-pos) : Const(State::Sx, epos-pos);
 						SigSpec cond;
 						if (raddr != waddr)
-							cond = module->And(stringf("$%s$rdtransgate[%d][%d][%d][%d]$d", memid.c_str(), idx, i, sub, pos), wport.en[pos + wsub * width], addr_eq);
+							cond = module->And(stringf("$%s$rdtransgate[%d][%d][%d][%d]$d", memid, idx, i, sub, pos), wport.en[pos + wsub * width], addr_eq);
 						else
 							cond = wport.en[pos + wsub * width];
-						SigSpec merged = module->Mux(stringf("$%s$rdtransmux[%d][%d][%d][%d]$d", memid.c_str(), idx, i, sub, pos), cur, other, cond);
+						SigSpec merged = module->Mux(stringf("$%s$rdtransmux[%d][%d][%d][%d]$d", memid, idx, i, sub, pos), cur, other, cond);
 						sig_d.replace(pos + rsub * width, merged);
 						pos = epos;
 					}
@@ -966,7 +966,7 @@ Cell *Mem::extract_rdff(int idx, FfInitVals *initvals) {
 			}
 		}
 
-		IdString name = stringf("$%s$rdreg[%d]", memid.c_str(), idx);
+		IdString name = stringf("$%s$rdreg[%d]", memid, idx);
 		FfData ff(module, initvals, name);
 		ff.width = GetSize(port.data);
 		ff.has_clk = true;
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 0250346d1..13f6b1075 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -2773,7 +2773,7 @@ RTLIL::IdString RTLIL::Module::uniquify(RTLIL::IdString name, int &index)
 	}
 
 	while (1) {
-		RTLIL::IdString new_name = stringf("%s_%d", name.c_str(), index);
+		RTLIL::IdString new_name = stringf("%s_%d", name, index);
 		if (count_id(new_name) == 0)
 			return new_name;
 		index++;
diff --git a/kernel/satgen.h b/kernel/satgen.h
index 996eaf9fb..7815847b3 100644
--- a/kernel/satgen.h
+++ b/kernel/satgen.h
@@ -103,7 +103,7 @@ struct SatGen
 			} else {
 				std::string wire_name = RTLIL::unescape_id(bit.wire->name);
 				std::string name = pf +
-					(bit.wire->width == 1 ? wire_name : stringf("%s [%d]", wire_name.c_str(), bit.offset));
+					(bit.wire->width == 1 ? wire_name : stringf("%s [%d]", wire_name, bit.offset));
 				vec.push_back(ez->frozen_literal(name));
 				imported_signals[pf][bit] = vec.back();
 			}
diff --git a/kernel/tclapi.cc b/kernel/tclapi.cc
index e970779d7..31d008404 100644
--- a/kernel/tclapi.cc
+++ b/kernel/tclapi.cc
@@ -89,7 +89,7 @@ static int tcl_yosys_cmd(ClientData, Tcl_Interp *interp, int argc, const char *a
 			if (Tcl_GetCommandInfo(interp, tcl_command_name.c_str(), &info) != 0) {
 				log("[TCL: yosys -import] Command name collision: found pre-existing command `%s' -> skip.\n", it.first.c_str());
 			} else {
-				std::string tcl_script = stringf("proc %s args { yosys %s {*}$args }", tcl_command_name.c_str(), it.first.c_str());
+				std::string tcl_script = stringf("proc %s args { yosys %s {*}$args }", tcl_command_name, it.first);
 				Tcl_Eval(interp, tcl_script.c_str());
 			}
 		}
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 196b78186..68e107a3b 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -287,7 +287,7 @@ RTLIL::IdString new_id(std::string file, int line, std::string func)
 	if (pos != std::string::npos)
 		func = func.substr(pos+1);
 
-	return stringf("$auto$%s:%d:%s$%d", file.c_str(), line, func.c_str(), autoidx++);
+	return stringf("$auto$%s:%d:%s$%d", file, line, func, autoidx++);
 }
 
 RTLIL::IdString new_id_suffix(std::string file, int line, std::string func, std::string suffix)
@@ -304,7 +304,7 @@ RTLIL::IdString new_id_suffix(std::string file, int line, std::string func, std:
 	if (pos != std::string::npos)
 		func = func.substr(pos+1);
 
-	return stringf("$auto$%s:%d:%s$%s$%d", file.c_str(), line, func.c_str(), suffix.c_str(), autoidx++);
+	return stringf("$auto$%s:%d:%s$%s$%d", file, line, func, suffix, autoidx++);
 }
 
 RTLIL::Design *yosys_get_design()
@@ -320,7 +320,7 @@ const char *create_prompt(RTLIL::Design *design, int recursion_counter)
 		str += stringf("(%d) ", recursion_counter);
 	str += "yosys";
 	if (!design->selected_active_module.empty())
-		str += stringf(" [%s]", RTLIL::unescape_id(design->selected_active_module).c_str());
+		str += stringf(" [%s]", RTLIL::unescape_id(design->selected_active_module));
 	if (!design->full_selection()) {
 		if (design->selected_active_module.empty())
 			str += "*";
diff --git a/libs/subcircuit/subcircuit.cc b/libs/subcircuit/subcircuit.cc
index 60f27fd55..8c8d3d92d 100644
--- a/libs/subcircuit/subcircuit.cc
+++ b/libs/subcircuit/subcircuit.cc
@@ -411,7 +411,7 @@ class SubCircuit::SolverWorker
 
 		std::string toString() const
 		{
-			return my_stringf("%s[%d]:%s[%d]", fromPort.c_str(), fromBit, toPort.c_str(), toBit);
+			return my_stringf("%s[%d]:%s[%d]", fromPort, fromBit, toPort, toBit);
 		}
 	};
 
@@ -444,7 +444,7 @@ class SubCircuit::SolverWorker
 			std::string str;
 			bool firstPort = true;
 			for (const auto &it : portSizes) {
-				str += my_stringf("%s%s[%d]", firstPort ? "" : ",", it.first.c_str(), it.second);
+				str += my_stringf("%s%s[%d]", firstPort ? "" : ",", it.first, it.second);
 				firstPort = false;
 			}
 			return typeId + "(" + str + ")";
diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index 08dc76dda..d48e25d68 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -126,14 +126,14 @@ struct BugpointPass : public Pass {
 
 		string bugpoint_file = "bugpoint-case";
 		if (suffix.size())
-			bugpoint_file += stringf(".%.8s", suffix.c_str());
+			bugpoint_file += stringf(".%.8s", suffix);
 
 		std::ofstream f(bugpoint_file + ".il");
 		RTLIL_BACKEND::dump_design(f, design, /*only_selected=*/false, /*flag_m=*/true, /*flag_n=*/false);
 		f.close();
 
-		string yosys_cmdline = stringf("%s %s -qq -L %s.log %s %s.il", runner.c_str(), yosys_cmd.c_str(), bugpoint_file.c_str(), yosys_arg.c_str(), bugpoint_file.c_str());
-		if (catch_err) yosys_cmdline += stringf(" 2>%s.err", bugpoint_file.c_str());
+		string yosys_cmdline = stringf("%s %s -qq -L %s.log %s %s.il", runner, yosys_cmd, bugpoint_file, yosys_arg, bugpoint_file);
+		if (catch_err) yosys_cmdline += stringf(" 2>%s.err", bugpoint_file);
 		auto status = run_command(yosys_cmdline);
 		// we're not processing lines, which means we're getting raw system() returns
 		if(WIFEXITED(status))
@@ -156,7 +156,7 @@ struct BugpointPass : public Pass {
 
 		string bugpoint_file = "bugpoint-case";
 		if (suffix.size())
-			bugpoint_file += stringf(".%.8s", suffix.c_str());
+			bugpoint_file += stringf(".%.8s", suffix);
 		bugpoint_file += err ? ".err" : ".log";
 
 		std::ifstream f(bugpoint_file);
@@ -469,13 +469,13 @@ struct BugpointPass : public Pass {
 			if (args[argidx] == "-script" && argidx + 1 < args.size()) {
 				if (!yosys_arg.empty())
 					log_cmd_error("A -script or -command option can be only provided once!\n");
-				yosys_arg = stringf("-s %s", args[++argidx].c_str());
+				yosys_arg = stringf("-s %s", args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-command" && argidx + 1 < args.size()) {
 				if (!yosys_arg.empty())
 					log_cmd_error("A -script or -command option can be only provided once!\n");
-				yosys_arg = stringf("-p %s", args[++argidx].c_str());
+				yosys_arg = stringf("-p %s", args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-grep" && argidx + 1 < args.size()) {
diff --git a/passes/cmds/check.cc b/passes/cmds/check.cc
index 3017630a6..b532b4527 100644
--- a/passes/cmds/check.cc
+++ b/passes/cmds/check.cc
@@ -322,7 +322,7 @@ struct CheckPass : public Pass {
 				if (wire_drivers.count(state)) {
 					string message = stringf("Drivers conflicting with a constant %s driver:\n", log_signal(state));
 					for (auto str : wire_drivers[state])
-						message += stringf("    %s\n", str.c_str());
+						message += stringf("    %s\n", str);
 					log_warning("%s", message.c_str());
 					counter++;
 				}
@@ -331,7 +331,7 @@ struct CheckPass : public Pass {
 				if (wire_drivers_count[it.first] > 1) {
 					string message = stringf("multiple conflicting drivers for %s.%s:\n", log_id(module), log_signal(it.first));
 					for (auto str : it.second)
-						message += stringf("    %s\n", str.c_str());
+						message += stringf("    %s\n", str);
 					log_warning("%s", message.c_str());
 					counter++;
 				}
@@ -394,10 +394,10 @@ struct CheckPass : public Pass {
 					std::string driver_src;
 					if (driver->has_attribute(ID::src)) {
 						std::string src_attr = driver->get_src_attribute();
-						driver_src = stringf(" source: %s", src_attr.c_str());
+						driver_src = stringf(" source: %s", src_attr);
 					}
 
-					message += stringf("    cell %s (%s)%s\n", log_id(driver), log_id(driver->type), driver_src.c_str());
+					message += stringf("    cell %s (%s)%s\n", log_id(driver), log_id(driver->type), driver_src);
 
 					if (!coarsened_cells.count(driver)) {						
 						MatchingEdgePrinter printer(message, sigmap, prev, bit);
@@ -411,9 +411,9 @@ struct CheckPass : public Pass {
 						std::string wire_src;
 						if (wire->has_attribute(ID::src)) {
 							std::string src_attr = wire->get_src_attribute();
-							wire_src = stringf(" source: %s", src_attr.c_str());
+							wire_src = stringf(" source: %s", src_attr);
 						}
-						message += stringf("    wire %s%s\n", log_signal(SigBit(wire, pair.second)), wire_src.c_str());						
+						message += stringf("    wire %s%s\n", log_signal(SigBit(wire, pair.second)), wire_src);						
 					}
 
 					prev = bit;
diff --git a/passes/cmds/dft_tag.cc b/passes/cmds/dft_tag.cc
index 347c8efa4..068b5d7d9 100644
--- a/passes/cmds/dft_tag.cc
+++ b/passes/cmds/dft_tag.cc
@@ -372,7 +372,7 @@ struct DftTagWorker {
 	void propagate_tags(Cell *cell)
 	{
 		if (cell->type == ID($set_tag)) {
-			IdString tag = stringf("\\%s", cell->getParam(ID::TAG).decode_string().c_str());
+			IdString tag = stringf("\\%s", cell->getParam(ID::TAG).decode_string());
 			if (all_tags.insert(tag).second) {
 				auto group_sep = tag.str().find(':');
 				IdString tag_group = group_sep != std::string::npos ? tag.str().substr(0, group_sep) : tag;
@@ -478,7 +478,7 @@ struct DftTagWorker {
 	void process_cell(IdString tag, Cell *cell)
 	{
 		if (cell->type == ID($set_tag)) {
-			IdString cell_tag = stringf("\\%s", cell->getParam(ID::TAG).decode_string().c_str());
+			IdString cell_tag = stringf("\\%s", cell->getParam(ID::TAG).decode_string());
 
 			auto tag_sig_a = tag_signal(tag, cell->getPort(ID::A));
 			auto &sig_y = cell->getPort(ID::Y);
@@ -752,7 +752,7 @@ struct DftTagWorker {
 
 		for (auto cell : get_tag_cells) {
 			auto &sig_a = cell->getPort(ID::A);
-			IdString tag = stringf("\\%s", cell->getParam(ID::TAG).decode_string().c_str());
+			IdString tag = stringf("\\%s", cell->getParam(ID::TAG).decode_string());
 
 			tag_signal(tag, sig_a);
 		}
@@ -772,7 +772,7 @@ struct DftTagWorker {
 						continue;
 
 					int index = 0;
-					auto name = module->uniquify(stringf("%s:%s", wire->name.c_str(), tag.c_str() + 1), index);
+					auto name = module->uniquify(stringf("%s:%s", wire->name, tag.c_str() + 1), index);
 					auto hdlname = wire->get_hdlname_attribute();
 
 					if (!hdlname.empty())
@@ -817,7 +817,7 @@ struct DftTagWorker {
 		for (auto cell : get_tag_cells) {
 			auto &sig_a = cell->getPort(ID::A);
 			auto &sig_y = cell->getPort(ID::Y);
-			IdString tag = stringf("\\%s", cell->getParam(ID::TAG).decode_string().c_str());
+			IdString tag = stringf("\\%s", cell->getParam(ID::TAG).decode_string());
 
 			auto tag_sig = tag_signal(tag, sig_a);
 			module->connect(sig_y, tag_sig);
diff --git a/passes/cmds/glift.cc b/passes/cmds/glift.cc
index 0c321eba6..60324702c 100644
--- a/passes/cmds/glift.cc
+++ b/passes/cmds/glift.cc
@@ -163,7 +163,7 @@ private:
 			std::vector<RTLIL::SigSpec> next_pmux_y_ports, pmux_y_ports(costs.begin(), costs.begin() + exp2(select_width));
 			for (auto i = 0; pmux_y_ports.size() > 1; ++i) {
 				for (auto j = 0; j+1 < GetSize(pmux_y_ports); j += 2) {
-					next_pmux_y_ports.emplace_back(module->Pmux(stringf("%s_mux_%d_%d", metamux_select.as_wire()->name.c_str(), i, j), pmux_y_ports[j], pmux_y_ports[j+1], metamux_select[GetSize(metamux_select) - 1 - i], metamux_select.as_wire()->get_src_attribute()));
+					next_pmux_y_ports.emplace_back(module->Pmux(stringf("%s_mux_%d_%d", metamux_select.as_wire()->name, i, j), pmux_y_ports[j], pmux_y_ports[j+1], metamux_select[GetSize(metamux_select) - 1 - i], metamux_select.as_wire()->get_src_attribute()));
 				}
 				if (GetSize(pmux_y_ports) % 2 == 1)
 					next_pmux_y_ports.push_back(pmux_y_ports[GetSize(pmux_y_ports) - 1]);
@@ -206,7 +206,7 @@ private:
 					int num_versions = opt_instrumentmore? 8 : 4;
 
 					for (auto i = 1; i <= num_versions; ++i)
-						taint_version.emplace_back(RTLIL::SigSpec(module->addWire(stringf("%s_y%d", cell->name.c_str(), i), 1)));
+						taint_version.emplace_back(RTLIL::SigSpec(module->addWire(stringf("%s_y%d", cell->name, i), 1)));
 
 					for (auto i = 0; i < num_versions; ++i) {
 						switch(i) {
@@ -239,7 +239,7 @@ private:
 					std::vector<RTLIL::SigSpec> next_meta_mux_y_ports, meta_mux_y_ports(taint_version);
 					for (auto i = 0; meta_mux_y_ports.size() > 1; ++i) {
 						for (auto j = 0; j+1 < GetSize(meta_mux_y_ports); j += 2) {
-							next_meta_mux_y_ports.emplace_back(module->Mux(stringf("%s_mux_%d_%d", cell->name.c_str(), i, j), meta_mux_y_ports[j], meta_mux_y_ports[j+1], meta_mux_select[GetSize(meta_mux_select) - 1 - i]));
+							next_meta_mux_y_ports.emplace_back(module->Mux(stringf("%s_mux_%d_%d", cell->name, i, j), meta_mux_y_ports[j], meta_mux_y_ports[j+1], meta_mux_select[GetSize(meta_mux_select) - 1 - i]));
 						}
 						if (GetSize(meta_mux_y_ports) % 2 == 1)
 							next_meta_mux_y_ports.push_back(meta_mux_y_ports[GetSize(meta_mux_y_ports) - 1]);
@@ -271,7 +271,7 @@ private:
 					log_assert(exp2(select_width) == num_versions);
 
 					for (auto i = 1; i <= num_versions; ++i)
-						taint_version.emplace_back(RTLIL::SigSpec(module->addWire(stringf("%s_y%d", cell->name.c_str(), i), 1)));
+						taint_version.emplace_back(RTLIL::SigSpec(module->addWire(stringf("%s_y%d", cell->name, i), 1)));
 
 					for (auto i = 0; i < num_versions; ++i) {
 						switch(i) {
@@ -294,7 +294,7 @@ private:
 					std::vector<RTLIL::SigSpec> next_meta_mux_y_ports, meta_mux_y_ports(taint_version);
 					for (auto i = 0; meta_mux_y_ports.size() > 1; ++i) {
 						for (auto j = 0; j+1 < GetSize(meta_mux_y_ports); j += 2) {
-							next_meta_mux_y_ports.emplace_back(module->Mux(stringf("%s_mux_%d_%d", cell->name.c_str(), i, j), meta_mux_y_ports[j], meta_mux_y_ports[j+1], meta_mux_select[GetSize(meta_mux_select) - 1 - i]));
+							next_meta_mux_y_ports.emplace_back(module->Mux(stringf("%s_mux_%d_%d", cell->name, i, j), meta_mux_y_ports[j], meta_mux_y_ports[j+1], meta_mux_select[GetSize(meta_mux_select) - 1 - i]));
 						}
 						if (GetSize(meta_mux_y_ports) % 2 == 1)
 							next_meta_mux_y_ports.push_back(meta_mux_y_ports[GetSize(meta_mux_y_ports) - 1]);
diff --git a/passes/cmds/portarcs.cc b/passes/cmds/portarcs.cc
index 97682efbb..73ca98d88 100644
--- a/passes/cmds/portarcs.cc
+++ b/passes/cmds/portarcs.cc
@@ -243,7 +243,7 @@ struct PortarcsPass : Pass {
 
 			if (draw_mode) {
 				auto bit_str = [](SigBit bit) {
-					return stringf("%s%d", RTLIL::unescape_id(bit.wire->name.str()).c_str(), bit.offset);
+					return stringf("%s%d", RTLIL::unescape_id(bit.wire->name.str()), bit.offset);
 				};
 
 				std::vector<std::string> headings;
diff --git a/passes/cmds/rename.cc b/passes/cmds/rename.cc
index 167997dc0..1f3d0992e 100644
--- a/passes/cmds/rename.cc
+++ b/passes/cmds/rename.cc
@@ -64,7 +64,7 @@ static std::string derive_name_from_src(const std::string &src, int counter)
 	if (src_base.empty())
 		return stringf("$%d", counter);
 	else
-		return stringf("\\%s$%d", src_base.c_str(), counter);
+		return stringf("\\%s$%d", src_base, counter);
 }
 
 static IdString derive_name_from_cell_output_wire(const RTLIL::Cell *cell, string suffix, bool move_to_cell)
@@ -422,7 +422,7 @@ struct RenamePass : public Pass {
 							if (wire_suffix.empty()) {
 								for (auto const &[port, _] : cell->connections()) {
 									if (cell->output(port)) {
-										wire_suffix += stringf("%s.%s", cell->type.c_str(), port.c_str() + 1);
+										wire_suffix += stringf("%s.%s", cell->type, port.c_str() + 1);
 										break;
 									}
 								}
@@ -449,7 +449,7 @@ struct RenamePass : public Pass {
 				for (auto wire : module->selected_wires())
 					if (wire->name[0] == '$') {
 						RTLIL::IdString buf;
-						do buf = stringf("\\%s%d%s", pattern_prefix.c_str(), counter++, pattern_suffix.c_str());
+						do buf = stringf("\\%s%d%s", pattern_prefix, counter++, pattern_suffix);
 						while (module->wire(buf) != nullptr);
 						new_wire_names[wire] = buf;
 					}
@@ -457,7 +457,7 @@ struct RenamePass : public Pass {
 				for (auto cell : module->selected_cells())
 					if (cell->name[0] == '$') {
 						RTLIL::IdString buf;
-						do buf = stringf("\\%s%d%s", pattern_prefix.c_str(), counter++, pattern_suffix.c_str());
+						do buf = stringf("\\%s%d%s", pattern_prefix, counter++, pattern_suffix);
 						while (module->cell(buf) != nullptr);
 						new_cell_names[cell] = buf;
 					}
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index 4eb6569e6..9ea29bc4e 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -149,7 +149,7 @@ struct ShowWorker
 	{
 		for (auto &s : color_selections)
 			if (s.second.selected_member(module->name, member_name)) {
-				return stringf("color=\"%s\", fontcolor=\"%s\"", s.first.c_str(), s.first.c_str());
+				return stringf("color=\"%s\", fontcolor=\"%s\"", s.first, s.first);
 			}
 
 		RTLIL::Const colorattr_value;
@@ -308,11 +308,11 @@ struct ShowWorker
 
 				std::string repinfo = rep > 1 ? stringf("%dx ", rep) : "";
 				std::string portside = stringf("%d:%d", bitpos, bitpos - rep*c.width + 1);
-				std::string remoteside = stringf("%s%d:%d", repinfo.c_str(), cl, cr);
+				std::string remoteside = stringf("%s%d:%d", repinfo, cl, cr);
 
 				if (driver) {
 					log_assert(!net.empty());
-					label_pieces.push_back(stringf("<s%d> %s - %s ", chunk_idx, portside.c_str(), remoteside.c_str()));
+					label_pieces.push_back(stringf("<s%d> %s - %s ", chunk_idx, portside, remoteside));
 					net_conn_map[net].in.insert({stringf("x%d:s%d", dot_idx, chunk_idx), rep*c.width});
 					net_conn_map[net].color = nextColor(c, net_conn_map[net].color);
 				} else {
@@ -325,7 +325,7 @@ struct ShowWorker
 								c.data.front() == State::Sz ? 'Z' : '?',
 								bitpos, bitpos-rep*c.width+1));
 					} else {
-						label_pieces.push_back(stringf("<s%d> %s - %s ", chunk_idx, remoteside.c_str(), portside.c_str()));
+						label_pieces.push_back(stringf("<s%d> %s - %s ", chunk_idx, remoteside, portside));
 						net_conn_map[net].out.insert({stringf("x%d:s%d", dot_idx, chunk_idx), rep*c.width});
 						net_conn_map[net].color = nextColor(c, net_conn_map[net].color);
 					}
@@ -335,14 +335,14 @@ struct ShowWorker
 			}
 
 			code += stringf("x%d [ shape=record, style=rounded, label=\"", dot_idx) \
-					+ join_label_pieces(label_pieces) + stringf("\", %s ];\n", nextColor(sig).c_str());
+					+ join_label_pieces(label_pieces) + stringf("\", %s ];\n", nextColor(sig));
 
 			if (!port.empty()) {
 				currentColor = xorshift32(currentColor);
 				if (driver)
-					code += stringf("%s:e -> x%d:w [arrowhead=odiamond, arrowtail=odiamond, dir=both, %s, %s];\n", port.c_str(), dot_idx, nextColor(sig).c_str(), widthLabel(sig.size()).c_str());
+					code += stringf("%s:e -> x%d:w [arrowhead=odiamond, arrowtail=odiamond, dir=both, %s, %s];\n", port, dot_idx, nextColor(sig), widthLabel(sig.size()));
 				else
-					code += stringf("x%d:e -> %s:w [arrowhead=odiamond, arrowtail=odiamond, dir=both, %s, %s];\n", dot_idx, port.c_str(), nextColor(sig).c_str(), widthLabel(sig.size()).c_str());
+					code += stringf("x%d:e -> %s:w [arrowhead=odiamond, arrowtail=odiamond, dir=both, %s, %s];\n", dot_idx, port, nextColor(sig), widthLabel(sig.size()));
 			}
 			if (node != nullptr)
 				*node = stringf("x%d", dot_idx);
@@ -490,7 +490,7 @@ struct ShowWorker
 			std::string in_label = join_label_pieces(in_label_pieces);
 			std::string out_label = join_label_pieces(out_label_pieces);
 
-			std::string label_string = stringf("{{%s}|%s\\n%s|{%s}}", in_label.c_str(),
+			std::string label_string = stringf("{{%s}|%s\\n%s|{%s}}", in_label,
 											   findLabel(cell->name.str()), escape(cell->type.str()),
 											   out_label.c_str());
 
@@ -904,8 +904,8 @@ struct ShowPass : public Pass {
 		if (libs.size() > 0)
 			log_header(design, "Continuing show pass.\n");
 
-		std::string dot_file = stringf("%s.dot", prefix.c_str());
-		std::string out_file = stringf("%s.%s", prefix.c_str(), format.empty() ? "svg" : format.c_str());
+		std::string dot_file = stringf("%s.dot", prefix);
+		std::string out_file = stringf("%s.%s", prefix, format.empty() ? "svg" : format);
 
 		log("Writing dot description to `%s'.\n", dot_file.c_str());
 		FILE *f = fopen(dot_file.c_str(), "w");
@@ -932,7 +932,7 @@ struct ShowPass : public Pass {
 			#else
 				#define DOT_CMD "dot -T%s '%s' > '%s.new' && mv '%s.new' '%s'"
 			#endif
-			std::string cmd = stringf(DOT_CMD, format.c_str(), dot_file.c_str(), out_file.c_str(), out_file.c_str(), out_file.c_str());
+			std::string cmd = stringf(DOT_CMD, format, dot_file, out_file, out_file, out_file);
 			#undef DOT_CMD
 			log("Exec: %s\n", cmd.c_str());
 			#if !defined(YOSYS_DISABLE_SPAWN)
@@ -950,9 +950,9 @@ struct ShowPass : public Pass {
 					// system()/cmd.exe does not understand single quotes nor
 					// background tasks on Windows. So we have to pause yosys
 					// until the viewer exits.
-					std::string cmd = stringf("%s \"%s\"", viewer_exe.c_str(), out_file.c_str());
+					std::string cmd = stringf("%s \"%s\"", viewer_exe, out_file);
 				#else
-					std::string cmd = stringf("%s '%s' %s", viewer_exe.c_str(), out_file.c_str(), background.c_str());
+					std::string cmd = stringf("%s '%s' %s", viewer_exe, out_file, background);
 				#endif
 				log("Exec: %s\n", cmd.c_str());
 				if (run_command(cmd) != 0)
@@ -960,9 +960,9 @@ struct ShowPass : public Pass {
 			} else
 			if (format.empty()) {
 				#ifdef __APPLE__
-				std::string cmd = stringf("ps -fu %d | grep -q '[ ]%s' || xdot '%s' %s", getuid(), dot_file.c_str(), dot_file.c_str(), background.c_str());
+				std::string cmd = stringf("ps -fu %d | grep -q '[ ]%s' || xdot '%s' %s", getuid(), dot_file, dot_file, background);
 				#else
-				std::string cmd = stringf("{ test -f '%s.pid' && fuser -s '%s.pid' 2> /dev/null; } || ( echo $$ >&3; exec xdot '%s'; ) 3> '%s.pid' %s", dot_file.c_str(), dot_file.c_str(), dot_file.c_str(), dot_file.c_str(), background.c_str());
+				std::string cmd = stringf("{ test -f '%s.pid' && fuser -s '%s.pid' 2> /dev/null; } || ( echo $$ >&3; exec xdot '%s'; ) 3> '%s.pid' %s", dot_file, dot_file, dot_file, dot_file, background);
 				#endif
 				log("Exec: %s\n", cmd.c_str());
 				if (run_command(cmd) != 0)
diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 07b1e5228..ebbd10b5c 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -193,19 +193,19 @@ struct statdata_t {
 					int width_a = cell->hasPort(ID::A) ? GetSize(cell->getPort(ID::A)) : 0;
 					int width_b = cell->hasPort(ID::B) ? GetSize(cell->getPort(ID::B)) : 0;
 					int width_y = cell->hasPort(ID::Y) ? GetSize(cell->getPort(ID::Y)) : 0;
-					cell_type = stringf("%s_%d", cell_type.c_str(), max<int>({width_a, width_b, width_y}));
+					cell_type = stringf("%s_%d", cell_type, max<int>({width_a, width_b, width_y}));
 				} else if (cell_type.in(ID($mux)))
-					cell_type = stringf("%s_%d", cell_type.c_str(), GetSize(cell->getPort(ID::Y)));
+					cell_type = stringf("%s_%d", cell_type, GetSize(cell->getPort(ID::Y)));
 				else if (cell_type.in(ID($bmux), ID($pmux)))
 					cell_type =
-					  stringf("%s_%d_%d", cell_type.c_str(), GetSize(cell->getPort(ID::Y)), GetSize(cell->getPort(ID::S)));
+					  stringf("%s_%d_%d", cell_type, GetSize(cell->getPort(ID::Y)), GetSize(cell->getPort(ID::S)));
 				else if (cell_type == ID($demux))
 					cell_type =
-					  stringf("%s_%d_%d", cell_type.c_str(), GetSize(cell->getPort(ID::A)), GetSize(cell->getPort(ID::S)));
+					  stringf("%s_%d_%d", cell_type, GetSize(cell->getPort(ID::A)), GetSize(cell->getPort(ID::S)));
 				else if (cell_type.in(ID($sr), ID($ff), ID($dff), ID($dffe), ID($dffsr), ID($dffsre), ID($adff), ID($adffe),
 						      ID($sdff), ID($sdffe), ID($sdffce), ID($aldff), ID($aldffe), ID($dlatch), ID($adlatch),
 						      ID($dlatchsr)))
-					cell_type = stringf("%s_%d", cell_type.c_str(), GetSize(cell->getPort(ID::Q)));
+					cell_type = stringf("%s_%d", cell_type, GetSize(cell->getPort(ID::Q)));
 			}
 
 			if (!cell_area.empty()) {
diff --git a/passes/cmds/timeest.cc b/passes/cmds/timeest.cc
index 05dd2a4b3..f0e4943de 100644
--- a/passes/cmds/timeest.cc
+++ b/passes/cmds/timeest.cc
@@ -320,7 +320,7 @@ struct EstimateSta {
 					std::string cell_src;
 					if (cell->has_attribute(ID::src)) {
 						std::string src_attr = cell->get_src_attribute();
-						cell_src = stringf(" source: %s", src_attr.c_str());
+						cell_src = stringf(" source: %s", src_attr);
 					}
 					log("    cell %s (%s)%s\n", log_id(cell), log_id(cell->type), cell_src.c_str());
 					printed.insert(cell);
@@ -331,7 +331,7 @@ struct EstimateSta {
 				std::string wire_src;
 				if (bit.wire && bit.wire->has_attribute(ID::src)) {
 					std::string src_attr = bit.wire->get_src_attribute();
-					wire_src = stringf(" source: %s", src_attr.c_str());
+					wire_src = stringf(" source: %s", src_attr);
 				}
 				log("    wire %s%s (level %ld)\n", log_signal(bit), wire_src.c_str(), levels[node]);
 			}
diff --git a/passes/cmds/viz.cc b/passes/cmds/viz.cc
index 4c73b4d71..323b9cb34 100644
--- a/passes/cmds/viz.cc
+++ b/passes/cmds/viz.cc
@@ -982,8 +982,8 @@ struct VizPass : public Pass {
 		if (modlist.empty())
 			log_cmd_error("Nothing there to show.\n");
 
-		std::string dot_file = stringf("%s.dot", prefix.c_str());
-		std::string out_file = stringf("%s.%s", prefix.c_str(), format.empty() ? "svg" : format.c_str());
+		std::string dot_file = stringf("%s.dot", prefix);
+		std::string out_file = stringf("%s.%s", prefix, format.empty() ? "svg" : format);
 
 		if (custom_prefix)
 			yosys_output_files.insert(dot_file);
@@ -1026,7 +1026,7 @@ struct VizPass : public Pass {
 			#else
 				#define DOT_CMD "dot -T%s '%s' > '%s.new' && mv '%s.new' '%s'"
 			#endif
-			std::string cmd = stringf(DOT_CMD, format.c_str(), dot_file.c_str(), out_file.c_str(), out_file.c_str(), out_file.c_str());
+			std::string cmd = stringf(DOT_CMD, format, dot_file, out_file, out_file, out_file);
 			#undef DOT_CMD
 			log("Exec: %s\n", cmd.c_str());
 			#if !defined(YOSYS_DISABLE_SPAWN)
@@ -1043,9 +1043,9 @@ struct VizPass : public Pass {
 				// system()/cmd.exe does not understand single quotes nor
 				// background tasks on Windows. So we have to pause yosys
 				// until the viewer exits.
-				std::string cmd = stringf("%s \"%s\"", viewer_exe.c_str(), out_file.c_str());
+				std::string cmd = stringf("%s \"%s\"", viewer_exe, out_file);
 			#else
-				std::string cmd = stringf("%s '%s' %s", viewer_exe.c_str(), out_file.c_str(), background.c_str());
+				std::string cmd = stringf("%s '%s' %s", viewer_exe, out_file, background);
 			#endif
 			log("Exec: %s\n", cmd.c_str());
 			if (run_command(cmd) != 0)
@@ -1053,9 +1053,9 @@ struct VizPass : public Pass {
 		} else
 		if (format.empty()) {
 			#ifdef __APPLE__
-			std::string cmd = stringf("ps -fu %d | grep -q '[ ]%s' || xdot '%s' %s", getuid(), dot_file.c_str(), dot_file.c_str(), background.c_str());
+			std::string cmd = stringf("ps -fu %d | grep -q '[ ]%s' || xdot '%s' %s", getuid(), dot_file, dot_file, background);
 			#else
-			std::string cmd = stringf("{ test -f '%s.pid' && fuser -s '%s.pid' 2> /dev/null; } || ( echo $$ >&3; exec xdot '%s'; ) 3> '%s.pid' %s", dot_file.c_str(), dot_file.c_str(), dot_file.c_str(), dot_file.c_str(), background.c_str());
+			std::string cmd = stringf("{ test -f '%s.pid' && fuser -s '%s.pid' 2> /dev/null; } || ( echo $$ >&3; exec xdot '%s'; ) 3> '%s.pid' %s", dot_file, dot_file, dot_file, dot_file, background);
 			#endif
 			log("Exec: %s\n", cmd.c_str());
 			if (run_command(cmd) != 0)
diff --git a/passes/cmds/wrapcell.cc b/passes/cmds/wrapcell.cc
index 0c15848e4..e25d34775 100644
--- a/passes/cmds/wrapcell.cc
+++ b/passes/cmds/wrapcell.cc
@@ -97,9 +97,9 @@ struct Chunk {
 		if (len == cell->getPort(port).size())
 			return port;
 		else if (len == 1)
-			return stringf("%s[%d]", port.c_str(), base);
+			return stringf("%s[%d]", port, base);
 		else
-			return stringf("%s[%d:%d]", port.c_str(), base + len - 1, base);
+			return stringf("%s[%d:%d]", port, base + len - 1, base);
 	}
 
 	SigSpec sample(Cell *cell)
diff --git a/passes/cmds/xprop.cc b/passes/cmds/xprop.cc
index d2d0c4d8e..186e5eec0 100644
--- a/passes/cmds/xprop.cc
+++ b/passes/cmds/xprop.cc
@@ -978,8 +978,8 @@ struct XpropWorker
 				if (wire->port_input == wire->port_output) {
 					log_warning("Port %s not an input or an output port which is not supported by xprop\n", log_id(wire));
 				} else if ((options.split_inputs && !options.assume_def_inputs && wire->port_input) || (options.split_outputs && wire->port_output)) {
-					auto port_d = module->uniquify(stringf("%s_d", port.c_str()));
-					auto port_x = module->uniquify(stringf("%s_x", port.c_str()));
+					auto port_d = module->uniquify(stringf("%s_d", port));
+					auto port_x = module->uniquify(stringf("%s_x", port));
 
 					auto wire_d = module->addWire(port_d, GetSize(wire));
 					auto wire_x = module->addWire(port_x, GetSize(wire));
@@ -1031,8 +1031,8 @@ struct XpropWorker
 				continue;
 			int index_d = 0;
 			int index_x = 0;
-			auto name_d = module->uniquify(stringf("%s_d", wire->name.c_str()), index_d);
-			auto name_x = module->uniquify(stringf("%s_x", wire->name.c_str()), index_x);
+			auto name_d = module->uniquify(stringf("%s_d", wire->name), index_d);
+			auto name_x = module->uniquify(stringf("%s_x", wire->name), index_x);
 
 			auto hdlname = wire->get_hdlname_attribute();
 
diff --git a/passes/fsm/fsm_extract.cc b/passes/fsm/fsm_extract.cc
index 143ae7b54..a0fd50097 100644
--- a/passes/fsm/fsm_extract.cc
+++ b/passes/fsm/fsm_extract.cc
@@ -368,7 +368,7 @@ static void extract_fsm(RTLIL::Wire *wire)
 
 	// create fsm cell
 
-	RTLIL::Cell *fsm_cell = module->addCell(stringf("$fsm$%s$%d", wire->name.c_str(), autoidx++), ID($fsm));
+	RTLIL::Cell *fsm_cell = module->addCell(stringf("$fsm$%s$%d", wire->name, autoidx++), ID($fsm));
 	fsm_cell->setPort(ID::CLK, clk);
 	fsm_cell->setPort(ID::ARST, arst);
 	fsm_cell->parameters[ID::CLK_POLARITY] = clk_polarity ? State::S1 : State::S0;
@@ -390,7 +390,7 @@ static void extract_fsm(RTLIL::Wire *wire)
 
 	module->wires_.erase(wire->name);
 	wire->attributes.erase(ID::fsm_encoding);
-	wire->name = stringf("$fsm$oldstate%s", wire->name.c_str());
+	wire->name = stringf("$fsm$oldstate%s", wire->name);
 	module->wires_[wire->name] = wire;
 	if(wire->attributes.count(ID::hdlname)) {
 		auto hdlname = wire->get_hdlname_attribute();
diff --git a/passes/hierarchy/flatten.cc b/passes/hierarchy/flatten.cc
index 299b18006..17bd6e340 100644
--- a/passes/hierarchy/flatten.cc
+++ b/passes/hierarchy/flatten.cc
@@ -281,11 +281,11 @@ struct FlattenWorker
 				if (attr.first == ID::hdlname)
 					scopeinfo->attributes.insert(attr);
 				else
-					scopeinfo->attributes.emplace(stringf("\\cell_%s", RTLIL::unescape_id(attr.first).c_str()), attr.second);
+					scopeinfo->attributes.emplace(stringf("\\cell_%s", RTLIL::unescape_id(attr.first)), attr.second);
 			}
 
 			for (auto const &attr : tpl->attributes)
-				scopeinfo->attributes.emplace(stringf("\\module_%s", RTLIL::unescape_id(attr.first).c_str()), attr.second);
+				scopeinfo->attributes.emplace(stringf("\\module_%s", RTLIL::unescape_id(attr.first)), attr.second);
 
 			scopeinfo->attributes.emplace(ID(module), RTLIL::unescape_id(tpl->name));
 		}
diff --git a/passes/hierarchy/submod.cc b/passes/hierarchy/submod.cc
index facc5d173..8d88a8919 100644
--- a/passes/hierarchy/submod.cc
+++ b/passes/hierarchy/submod.cc
@@ -166,7 +166,7 @@ struct SubmodWorker
 						}
 					}
 				else if (hidden_mode)
-					new_wire_name = stringf("$submod%s", new_wire_name.c_str());
+					new_wire_name = stringf("$submod%s", new_wire_name);
 			}
 
 			RTLIL::Wire *new_wire = new_mod->addWire(new_wire_name, wire->width);
diff --git a/passes/memory/memory_bram.cc b/passes/memory/memory_bram.cc
index 9db329c5c..9bc8ad9b0 100644
--- a/passes/memory/memory_bram.cc
+++ b/passes/memory/memory_bram.cc
@@ -873,7 +873,7 @@ grow_read_ports:;
 		for (int grid_a = 0; grid_a < acells; grid_a++)
 		for (int dupidx = 0; dupidx < dup_count; dupidx++)
 		{
-			Cell *c = module->addCell(module->uniquify(stringf("%s.%d.%d.%d", mem.memid.c_str(), grid_d, grid_a, dupidx)), bram.name);
+			Cell *c = module->addCell(module->uniquify(stringf("%s.%d.%d.%d", mem.memid, grid_d, grid_a, dupidx)), bram.name);
 			log("      Creating %s cell at grid position <%d %d %d>: %s\n", log_id(bram.name), grid_d, grid_a, dupidx, log_id(c));
 
 			for (auto &vp : variant_params)
diff --git a/passes/memory/memory_libmap.cc b/passes/memory/memory_libmap.cc
index a5b30c7ae..4c7d9636d 100644
--- a/passes/memory/memory_libmap.cc
+++ b/passes/memory/memory_libmap.cc
@@ -1686,7 +1686,7 @@ std::vector<SigSpec> generate_mux(Mem &mem, int rpidx, const Swizzle &swz) {
 void MemMapping::emit_port(const MemConfig &cfg, std::vector<Cell*> &cells, const PortVariant &pdef, const char *name, int wpidx, int rpidx, const std::vector<int> &hw_addr_swizzle) {
 	for (auto &it: pdef.options)
 		for (auto cell: cells)
-			cell->setParam(stringf("\\PORT_%s_OPTION_%s", name, it.first.c_str()), it.second);
+			cell->setParam(stringf("\\PORT_%s_OPTION_%s", name, it.first), it.second);
 	SigSpec addr = Const(State::Sx, cfg.def->abits);
 	int wide_log2 = 0, wr_wide_log2 = 0, rd_wide_log2 = 0;
 	SigSpec clk = State::S0;
@@ -2067,7 +2067,7 @@ void MemMapping::emit(const MemConfig &cfg) {
 	for (int rp = 0; rp < cfg.repl_port; rp++) {
 		std::vector<Cell *> cells;
 		for (int rd = 0; rd < cfg.repl_d; rd++) {
-			Cell *cell = mem.module->addCell(stringf("%s.%d.%d", mem.memid.c_str(), rp, rd), cfg.def->id);
+			Cell *cell = mem.module->addCell(stringf("%s.%d.%d", mem.memid, rp, rd), cfg.def->id);
 			if (cfg.def->width_mode == WidthMode::Global)
 				cell->setParam(ID::WIDTH, cfg.def->dbits[cfg.base_width_log2]);
 			if (cfg.def->widthscale) {
@@ -2077,18 +2077,18 @@ void MemMapping::emit(const MemConfig &cfg) {
 				cell->setParam(ID::BITS_USED, val);
 			}
 			for (auto &it: cfg.def->options)
-				cell->setParam(stringf("\\OPTION_%s", it.first.c_str()), it.second);
+				cell->setParam(stringf("\\OPTION_%s", it.first), it.second);
 			for (int i = 0; i < GetSize(cfg.def->shared_clocks); i++) {
 				auto &cdef = cfg.def->shared_clocks[i];
 				auto &ccfg = cfg.shared_clocks[i];
 				if (cdef.anyedge) {
-					cell->setParam(stringf("\\CLK_%s_POL", cdef.name.c_str()), ccfg.used ? ccfg.polarity : true);
-					cell->setPort(stringf("\\CLK_%s", cdef.name.c_str()), ccfg.used ? ccfg.clk : State::S0);
+					cell->setParam(stringf("\\CLK_%s_POL", cdef.name), ccfg.used ? ccfg.polarity : true);
+					cell->setPort(stringf("\\CLK_%s", cdef.name), ccfg.used ? ccfg.clk : State::S0);
 				} else {
 					SigSpec sig = ccfg.used ? ccfg.clk : State::S0;
 					if (ccfg.used && ccfg.invert)
 						sig = mem.module->Not(NEW_ID, sig);
-					cell->setPort(stringf("\\CLK_%s", cdef.name.c_str()), sig);
+					cell->setPort(stringf("\\CLK_%s", cdef.name), sig);
 				}
 			}
 			if (cfg.def->init == MemoryInitKind::Any || cfg.def->init == MemoryInitKind::NoUndef) {
@@ -2136,11 +2136,11 @@ void MemMapping::emit(const MemConfig &cfg) {
 				}
 				if (pg.optional)
 					for (auto cell: cells)
-						cell->setParam(stringf("\\PORT_%s_USED", pg.names[pi].c_str()), used);
+						cell->setParam(stringf("\\PORT_%s_USED", pg.names[pi]), used);
 				if (pg.optional_rw)
 					for (auto cell: cells) {
-						cell->setParam(stringf("\\PORT_%s_RD_USED", pg.names[pi].c_str()), used_r);
-						cell->setParam(stringf("\\PORT_%s_WR_USED", pg.names[pi].c_str()), used_w);
+						cell->setParam(stringf("\\PORT_%s_RD_USED", pg.names[pi]), used_r);
+						cell->setParam(stringf("\\PORT_%s_WR_USED", pg.names[pi]), used_w);
 					}
 			}
 		}
diff --git a/passes/memory/memory_map.cc b/passes/memory/memory_map.cc
index d1dd0fd88..126ec65b5 100644
--- a/passes/memory/memory_map.cc
+++ b/passes/memory/memory_map.cc
@@ -244,7 +244,7 @@ struct MemoryMapWorker
 				data_reg_in[idx] = w_in;
 				c->setPort(ID::D, w_in);
 
-				std::string w_out_name = stringf("%s[%d]", mem.memid.c_str(), addr);
+				std::string w_out_name = stringf("%s[%d]", mem.memid, addr);
 				if (module->wires_.count(w_out_name) > 0)
 					w_out_name = genid(mem.memid, "", addr, "$q");
 
diff --git a/passes/opt/opt_expr.cc b/passes/opt/opt_expr.cc
index 22aa9d7d3..e5957df08 100644
--- a/passes/opt/opt_expr.cc
+++ b/passes/opt/opt_expr.cc
@@ -2201,7 +2201,7 @@ skip_alu_split:
 						{
 							if (cmp_type == ID($lt)) cmp_name = "<";
 							if (cmp_type == ID($le)) cmp_name = "<=";
-							condition   = stringf("unsigned X[%d:0]%s%s", var_width - 1, cmp_name.c_str(), log_signal(const_sig));
+							condition   = stringf("unsigned X[%d:0]%s%s", var_width - 1, cmp_name, log_signal(const_sig));
 							replacement = "constant 1";
 							replace_sig[0] = State::S1;
 							replace = true;
@@ -2210,7 +2210,7 @@ skip_alu_split:
 						{
 							if (cmp_type == ID($gt)) cmp_name = ">";
 							if (cmp_type == ID($ge)) cmp_name = ">=";
-							condition   = stringf("unsigned X[%d:0]%s%s", var_width - 1, cmp_name.c_str(), log_signal(const_sig));
+							condition   = stringf("unsigned X[%d:0]%s%s", var_width - 1, cmp_name, log_signal(const_sig));
 							replacement = "constant 0";
 							replace_sig[0] = State::S0;
 							replace = true;
diff --git a/passes/proc/proc_mux.cc b/passes/proc/proc_mux.cc
index 61e7f4960..21afdf134 100644
--- a/passes/proc/proc_mux.cc
+++ b/passes/proc/proc_mux.cc
@@ -178,7 +178,7 @@ RTLIL::SigSpec gen_cmp(RTLIL::Module *mod, const RTLIL::SigSpec &signal, const s
 		else
 		{
 			// create compare cell
-			RTLIL::Cell *eq_cell = mod->addCell(stringf("%s_CMP%d", sstr.str().c_str(), cmp_wire->width), ifxmode ? ID($eqx) : ID($eq));
+			RTLIL::Cell *eq_cell = mod->addCell(stringf("%s_CMP%d", sstr.str(), cmp_wire->width), ifxmode ? ID($eqx) : ID($eq));
 			apply_attrs(eq_cell, sw, cs);
 
 			eq_cell->parameters[ID::A_SIGNED] = RTLIL::Const(0);
diff --git a/passes/sat/clk2fflogic.cc b/passes/sat/clk2fflogic.cc
index 6b94cbe19..db1eaad4b 100644
--- a/passes/sat/clk2fflogic.cc
+++ b/passes/sat/clk2fflogic.cc
@@ -72,7 +72,7 @@ struct Clk2fflogicPass : public Pass {
 		}
 		std::string sig_str = log_signal(sig);
 		sig_str.erase(std::remove(sig_str.begin(), sig_str.end(), ' '), sig_str.end());
-		Wire *sampled_sig = module->addWire(NEW_ID_SUFFIX(stringf("%s#sampled", sig_str.c_str())), GetSize(sig));
+		Wire *sampled_sig = module->addWire(NEW_ID_SUFFIX(stringf("%s#sampled", sig_str)), GetSize(sig));
 		sampled_sig->attributes[ID::init] = RTLIL::Const(State::S0, GetSize(sig));
 		if (is_fine)
 			module->addFfGate(NEW_ID, sig, sampled_sig);
@@ -84,7 +84,7 @@ struct Clk2fflogicPass : public Pass {
 	SigSpec sample_control_edge(Module *module, SigSpec sig, bool polarity, bool is_fine) {
 		std::string sig_str = log_signal(sig);
 		sig_str.erase(std::remove(sig_str.begin(), sig_str.end(), ' '), sig_str.end());
-		Wire *sampled_sig = module->addWire(NEW_ID_SUFFIX(stringf("%s#sampled", sig_str.c_str())), GetSize(sig));
+		Wire *sampled_sig = module->addWire(NEW_ID_SUFFIX(stringf("%s#sampled", sig_str)), GetSize(sig));
 		sampled_sig->attributes[ID::init] = RTLIL::Const(polarity ? State::S1 : State::S0, GetSize(sig));
 		if (is_fine)
 			module->addFfGate(NEW_ID, sig, sampled_sig);
@@ -98,7 +98,7 @@ struct Clk2fflogicPass : public Pass {
 		sig_str.erase(std::remove(sig_str.begin(), sig_str.end(), ' '), sig_str.end());
 
 
-		Wire *sampled_sig = module->addWire(NEW_ID_SUFFIX(stringf("%s#sampled", sig_str.c_str())), GetSize(sig));
+		Wire *sampled_sig = module->addWire(NEW_ID_SUFFIX(stringf("%s#sampled", sig_str)), GetSize(sig));
 		sampled_sig->attributes[ID::init] = init;
 
 		Cell *cell;
diff --git a/passes/sat/cutpoint.cc b/passes/sat/cutpoint.cc
index 485e44fd6..7522d716e 100644
--- a/passes/sat/cutpoint.cc
+++ b/passes/sat/cutpoint.cc
@@ -129,7 +129,7 @@ struct CutpointPass : public Pass {
 						if (attr.first == ID::hdlname)
 							scopeinfo->attributes.insert(attr);
 						else
-							scopeinfo->attributes.emplace(stringf("\\cell_%s", RTLIL::unescape_id(attr.first).c_str()), attr.second);
+							scopeinfo->attributes.emplace(stringf("\\cell_%s", RTLIL::unescape_id(attr.first)), attr.second);
 					}
 				}
 
diff --git a/passes/sat/eval.cc b/passes/sat/eval.cc
index bdab9d5f4..7008e35e1 100644
--- a/passes/sat/eval.cc
+++ b/passes/sat/eval.cc
@@ -263,7 +263,7 @@ struct VlogHammerReporter
 						RTLIL::SigSpec sig(wire);
 						if (!ce.eval(sig))
 							log_error("Can't read back value for port %s!\n", log_id(inputs[i]));
-						input_pattern_list += stringf(" %s", sig.as_const().as_string().c_str());
+						input_pattern_list += stringf(" %s", sig.as_const().as_string());
 						log("++PAT++ %d %s %s #\n", idx, log_id(inputs[i]), sig.as_const().as_string().c_str());
 					}
 				}
diff --git a/passes/sat/fmcombine.cc b/passes/sat/fmcombine.cc
index 575b2f40d..2d31822c4 100644
--- a/passes/sat/fmcombine.cc
+++ b/passes/sat/fmcombine.cc
@@ -44,7 +44,7 @@ struct FmcombineWorker
 
 	FmcombineWorker(Design *design, IdString orig_type, const opts_t &opts) :
 			opts(opts), design(design), original(design->module(orig_type)),
-			orig_type(orig_type), combined_type(stringf("$fmcombine%s", orig_type.c_str()))
+			orig_type(orig_type), combined_type(stringf("$fmcombine%s", orig_type))
 	{
 	}
 
diff --git a/passes/sat/freduce.cc b/passes/sat/freduce.cc
index 6063c5ab9..870df7b55 100644
--- a/passes/sat/freduce.cc
+++ b/passes/sat/freduce.cc
@@ -595,9 +595,9 @@ struct FreduceWorker
 
 	void dump()
 	{
-		std::string filename = stringf("%s_%s_%05d.il", dump_prefix.c_str(), RTLIL::id2cstr(module->name), reduce_counter);
+		std::string filename = stringf("%s_%s_%05d.il", dump_prefix, RTLIL::id2cstr(module->name), reduce_counter);
 		log("%s    Writing dump file `%s'.\n", reduce_counter ? "  " : "", filename.c_str());
-		Pass::call(design, stringf("dump -outfile %s %s", filename.c_str(), design->selected_active_module.empty() ? module->name.c_str() : ""));
+		Pass::call(design, stringf("dump -outfile %s %s", filename, design->selected_active_module.empty() ? module->name.c_str() : ""));
 	}
 
 	int run()
diff --git a/passes/sat/mutate.cc b/passes/sat/mutate.cc
index 43373ce0e..7aef9ea38 100644
--- a/passes/sat/mutate.cc
+++ b/passes/sat/mutate.cc
@@ -570,7 +570,7 @@ void mutate_list(Design *design, const mutate_opts_t &opts, const string &filena
 		string str = "mutate";
 		if (!opts.ctrl_name.empty())
 			str += stringf(" -ctrl %s %d %d", log_id(opts.ctrl_name), opts.ctrl_width, ctrl_value++);
-		str += stringf(" -mode %s", entry.mode.c_str());
+		str += stringf(" -mode %s", entry.mode);
 		if (!entry.module.empty())
 			str += stringf(" -module %s", log_id(entry.module));
 		if (!entry.cell.empty())
@@ -586,7 +586,7 @@ void mutate_list(Design *design, const mutate_opts_t &opts, const string &filena
 		if (entry.wirebit >= 0)
 			str += stringf(" -wirebit %d", entry.wirebit);
 		for (auto &s : entry.src)
-			str += stringf(" -src %s", s.c_str());
+			str += stringf(" -src %s", s);
 		if (filename.empty())
 			log("%s\n", str.c_str());
 		else
diff --git a/passes/sat/qbfsat.cc b/passes/sat/qbfsat.cc
index 7a7a31806..c7ddb9168 100644
--- a/passes/sat/qbfsat.cc
+++ b/passes/sat/qbfsat.cc
@@ -219,14 +219,14 @@ QbfSolutionType call_qbf_solver(RTLIL::Module *mod, const QbfSolveOptions &opt,
 	const std::string smtbmc_warning = "z3: WARNING:";
 	const std::string smtbmc_cmd = stringf("\"%s\" -s %s %s -t 1 -g --binary %s %s/problem%d.smt2 2>&1",
 			yosys_smtbmc_exe.c_str(), opt.get_solver_name().c_str(),
-			(opt.timeout != 0? stringf("--timeout %d", opt.timeout) : "").c_str(),
+			(opt.timeout != 0? stringf("--timeout %d", opt.timeout) : ""),
 			(opt.dump_final_smt2? "--dump-smt2 " + opt.dump_final_smt2_file : "").c_str(),
 			tempdir_name.c_str(), iter_num);
 
 	std::string smt2_command = "write_smt2 -stbv -wires ";
 	for (auto &solver_opt : opt.solver_options)
-		smt2_command += stringf("-solver-option %s %s ", solver_opt.first.c_str(), solver_opt.second.c_str());
-	smt2_command += stringf("%s/problem%d.smt2", tempdir_name.c_str(), iter_num);
+		smt2_command += stringf("-solver-option %s %s ", solver_opt.first, solver_opt.second);
+	smt2_command += stringf("%s/problem%d.smt2", tempdir_name, iter_num);
 	Pass::call(mod->design, smt2_command);
 
 	auto process_line = [&ret, &smtbmc_warning, &opt, &quiet](const std::string &line) {
diff --git a/passes/sat/recover_names.cc b/passes/sat/recover_names.cc
index 7ed8b1304..7939a64e0 100644
--- a/passes/sat/recover_names.cc
+++ b/passes/sat/recover_names.cc
@@ -380,7 +380,7 @@ struct RecoverModuleWorker {
             if (root2buffered.count(gate_bit)) {
                 int buf_idx = 0;
                 for (auto buf_bit : root2buffered.at(gate_bit)) {
-                    std::string buf_name_str = stringf("%s_buf_%d", pair.second.bit.name.c_str(), ++buf_idx);
+                    std::string buf_name_str = stringf("%s_buf_%d", pair.second.bit.name, ++buf_idx);
                     if (buf_name_str[0] == '\\')
                         buf_name_str[0] = '$';
                     rename_map[buf_bit] = std::make_pair(
@@ -396,7 +396,7 @@ struct RecoverModuleWorker {
             bool must_invert_name = rule.second.first.inverted;
             while (must_invert_name ||
                     (mod->wire(new_name.name) && !unused_bits.count(SigBit(mod->wire(new_name.name), new_name.bit)))) {
-                std::string new_name_str = stringf("%s_%s_%d", rule.second.first.bit.name.c_str(),
+                std::string new_name_str = stringf("%s_%s_%d", rule.second.first.bit.name,
                     rule.second.first.inverted ? "inv" : "dup", ++dup_idx);
                 if (new_name_str[0] == '\\')
                     new_name_str[0] = '$';
diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index e2b0022ff..044bd8acb 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -2095,12 +2095,12 @@ struct SimWorker : SimShared
 		std::stringstream f;
 
 		if (wire->width==1)
-			f << stringf("%s", RTLIL::unescape_id(wire->name).c_str());
+			f << stringf("%s", RTLIL::unescape_id(wire->name));
 		else
 			if (wire->upto)
-				f << stringf("[%d:%d] %s", wire->start_offset, wire->width - 1 + wire->start_offset, RTLIL::unescape_id(wire->name).c_str());
+				f << stringf("[%d:%d] %s", wire->start_offset, wire->width - 1 + wire->start_offset, RTLIL::unescape_id(wire->name));
 			else
-				f << stringf("[%d:%d] %s", wire->width - 1 + wire->start_offset, wire->start_offset, RTLIL::unescape_id(wire->name).c_str());
+				f << stringf("[%d:%d] %s", wire->width - 1 + wire->start_offset, wire->start_offset, RTLIL::unescape_id(wire->name));
 		return f.str();
 	}
 
@@ -2108,7 +2108,7 @@ struct SimWorker : SimShared
 	{
 		std::stringstream f;
 		for(auto item=signals.begin();item!=signals.end();item++)
-			f << stringf("%c%s", (item==signals.begin() ? ' ' : ','), RTLIL::unescape_id(item->first->name).c_str());
+			f << stringf("%c%s", (item==signals.begin() ? ' ' : ','), RTLIL::unescape_id(item->first->name));
 		return f.str();
 	}
 
@@ -2207,7 +2207,7 @@ struct SimWorker : SimShared
 
 		std::stringstream f;
 		f << stringf("`timescale 1%s/1%s\n", fst->getTimescaleString(),fst->getTimescaleString());
-		f << stringf("module %s();\n",tb_filename.c_str());
+		f << stringf("module %s();\n",tb_filename);
 		int clk_len = 0;
 		int inputs_len = 0;
 		int outputs_len = 0;
@@ -2225,13 +2225,13 @@ struct SimWorker : SimShared
 		}
 		int data_len = clk_len + inputs_len + outputs_len + 32;
 		f << "\n";
-		f << stringf("\t%s uut(",RTLIL::unescape_id(topmod->name).c_str());
+		f << stringf("\t%s uut(",RTLIL::unescape_id(topmod->name));
 		for(auto item=clocks.begin();item!=clocks.end();item++)
-			f << stringf("%c.%s(%s)", (item==clocks.begin() ? ' ' : ','), RTLIL::unescape_id(item->first->name).c_str(), RTLIL::unescape_id(item->first->name).c_str());
+			f << stringf("%c.%s(%s)", (item==clocks.begin() ? ' ' : ','), RTLIL::unescape_id(item->first->name), RTLIL::unescape_id(item->first->name));
 		for(auto &item : inputs)
-			f << stringf(",.%s(%s)", RTLIL::unescape_id(item.first->name).c_str(), RTLIL::unescape_id(item.first->name).c_str());
+			f << stringf(",.%s(%s)", RTLIL::unescape_id(item.first->name), RTLIL::unescape_id(item.first->name));
 		for(auto &item : outputs)
-			f << stringf(",.%s(%s)", RTLIL::unescape_id(item.first->name).c_str(), RTLIL::unescape_id(item.first->name).c_str());
+			f << stringf(",.%s(%s)", RTLIL::unescape_id(item.first->name), RTLIL::unescape_id(item.first->name));
 		f << ");\n";
 		f << "\n";
 		f << "\tinteger i;\n";
@@ -2242,21 +2242,21 @@ struct SimWorker : SimShared
 		unsigned int end_cycle = cycles_set ? numcycles*2 : INT_MAX;
 		fst->reconstructAllAtTimes(fst_clock, startCount, stopCount, end_cycle, [&](uint64_t time) {
 			for(auto &item : clocks)
-				data_file << stringf("%s",fst->valueOf(item.second).c_str());
+				data_file << stringf("%s",fst->valueOf(item.second));
 			for(auto &item : inputs)
-				data_file << stringf("%s",fst->valueOf(item.second).c_str());
+				data_file << stringf("%s",fst->valueOf(item.second));
 			for(auto &item : outputs)
-				data_file << stringf("%s",fst->valueOf(item.second).c_str());
-			data_file << stringf("%s\n",Const(time-prev_time).as_string().c_str());
+				data_file << stringf("%s",fst->valueOf(item.second));
+			data_file << stringf("%s\n",Const(time-prev_time).as_string());
 
 			if (time==startCount) {
 				// initial state
 				for(auto var : fst->getVars()) {
 					if (var.is_reg && !Const::from_string(fst->valueOf(var.id).c_str()).is_fully_undef()) {
 						if (var.scope == scope) {
-							initstate << stringf("\t\tuut.%s = %d'b%s;\n", var.name.c_str(), var.width, fst->valueOf(var.id).c_str());
+							initstate << stringf("\t\tuut.%s = %d'b%s;\n", var.name, var.width, fst->valueOf(var.id));
 						} else if (var.scope.find(scope+".")==0) {
-							initstate << stringf("\t\tuut.%s.%s = %d'b%s;\n",var.scope.substr(scope.size()+1).c_str(), var.name.c_str(), var.width, fst->valueOf(var.id).c_str());
+							initstate << stringf("\t\tuut.%s.%s = %d'b%s;\n",var.scope.substr(scope.size()+1), var.name, var.width, fst->valueOf(var.id));
 						}
 					}
 				}
@@ -2267,22 +2267,22 @@ struct SimWorker : SimShared
 
 		f << stringf("\treg [0:%d] data [0:%d];\n", data_len-1, cycle-1);
 		f << "\tinitial begin;\n";
-		f << stringf("\t\t$dumpfile(\"%s\");\n",tb_filename.c_str());
-		f << stringf("\t\t$dumpvars(0,%s);\n",tb_filename.c_str());
+		f << stringf("\t\t$dumpfile(\"%s\");\n",tb_filename);
+		f << stringf("\t\t$dumpvars(0,%s);\n",tb_filename);
 		f << initstate.str();
-		f << stringf("\t\t$readmemb(\"%s.txt\", data);\n",tb_filename.c_str());
+		f << stringf("\t\t$readmemb(\"%s.txt\", data);\n",tb_filename);
 
 		f << stringf("\t\t#(data[0][%d:%d]);\n", data_len-32, data_len-1);	
-		f << stringf("\t\t{%s } = data[0][%d:%d];\n", signal_list(clocks).c_str(), 0, clk_len-1);		
-		f << stringf("\t\t{%s } <= data[0][%d:%d];\n", signal_list(inputs).c_str(), clk_len, clk_len+inputs_len-1);
+		f << stringf("\t\t{%s } = data[0][%d:%d];\n", signal_list(clocks), 0, clk_len-1);		
+		f << stringf("\t\t{%s } <= data[0][%d:%d];\n", signal_list(inputs), clk_len, clk_len+inputs_len-1);
 
 		f << stringf("\t\tfor (i = 1; i < %d; i++) begin\n",cycle);
 
 		f << stringf("\t\t\t#(data[i][%d:%d]);\n", data_len-32, data_len-1);	
-		f << stringf("\t\t\t{%s } = data[i][%d:%d];\n", signal_list(clocks).c_str(), 0, clk_len-1);		
-		f << stringf("\t\t\t{%s } <= data[i][%d:%d];\n", signal_list(inputs).c_str(), clk_len, clk_len+inputs_len-1);
+		f << stringf("\t\t\t{%s } = data[i][%d:%d];\n", signal_list(clocks), 0, clk_len-1);		
+		f << stringf("\t\t\t{%s } <= data[i][%d:%d];\n", signal_list(inputs), clk_len, clk_len+inputs_len-1);
 		
-		f << stringf("\t\t\tif ({%s } != data[i-1][%d:%d]) begin\n", signal_list(outputs).c_str(), clk_len+inputs_len, clk_len+inputs_len+outputs_len-1);
+		f << stringf("\t\t\tif ({%s } != data[i-1][%d:%d]) begin\n", signal_list(outputs), clk_len+inputs_len, clk_len+inputs_len+outputs_len-1);
 		f << "\t\t\t\t$error(\"Signal difference detected\\n\");\n";
 		f << "\t\t\tend\n";
 		
@@ -2337,7 +2337,7 @@ struct VCDWriter : public OutputWriter
 		}
 
 		if (!worker->timescale.empty())
-			vcdfile << stringf("$timescale %s $end\n", worker->timescale.c_str());
+			vcdfile << stringf("$timescale %s $end\n", worker->timescale);
 
 		worker->top->write_output_header(
 			[this](IdString name) { vcdfile << stringf("$scope module %s $end\n", log_id(name)); },
@@ -2349,7 +2349,7 @@ struct VCDWriter : public OutputWriter
 				// this is consistent with the range gtkwave makes up if it doesn't find a
 				// range
 				std::string full_name = form_vcd_name(name, size, w);
-				vcdfile << stringf("$var %s %d n%d %s%s $end\n", is_reg ? "reg" : "wire", size, id, name[0] == '$' ? "\\" : "", full_name.c_str());
+				vcdfile << stringf("$var %s %d n%d %s%s $end\n", is_reg ? "reg" : "wire", size, id, name[0] == '$' ? "\\" : "", full_name);
 			}
 		);
 
diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 9aaac84e9..d45a652fc 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -859,27 +859,27 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 	log_header(design, "Extracting gate netlist of module `%s' to `%s/input.blif'..\n",
 			module->name.c_str(), replace_tempdir(tempdir_name, tempdir_name, config.show_tempdir).c_str());
 
-	std::string abc_script = stringf("read_blif \"%s/input.blif\"; ", tempdir_name.c_str());
+	std::string abc_script = stringf("read_blif \"%s/input.blif\"; ", tempdir_name);
 
 	if (!config.liberty_files.empty() || !config.genlib_files.empty()) {
 		std::string dont_use_args;
 		for (std::string dont_use_cell : config.dont_use_cells) {
-			dont_use_args += stringf("-X \"%s\" ", dont_use_cell.c_str());
+			dont_use_args += stringf("-X \"%s\" ", dont_use_cell);
 		}
 		bool first_lib = true;
 		for (std::string liberty_file : config.liberty_files) {
-			abc_script += stringf("read_lib %s %s -w \"%s\" ; ", dont_use_args.c_str(), first_lib ? "" : "-m", liberty_file.c_str());
+			abc_script += stringf("read_lib %s %s -w \"%s\" ; ", dont_use_args, first_lib ? "" : "-m", liberty_file);
 			first_lib = false;
 		}
 		for (std::string liberty_file : config.genlib_files)
-			abc_script += stringf("read_library \"%s\"; ", liberty_file.c_str());
+			abc_script += stringf("read_library \"%s\"; ", liberty_file);
 		if (!config.constr_file.empty())
-			abc_script += stringf("read_constr -v \"%s\"; ", config.constr_file.c_str());
+			abc_script += stringf("read_constr -v \"%s\"; ", config.constr_file);
 	} else
 	if (!config.lut_costs.empty())
-		abc_script += stringf("read_lut %s/lutdefs.txt; ", tempdir_name.c_str());
+		abc_script += stringf("read_lut %s/lutdefs.txt; ", tempdir_name);
 	else
-		abc_script += stringf("read_library %s/stdcells.genlib; ", tempdir_name.c_str());
+		abc_script += stringf("read_library %s/stdcells.genlib; ", tempdir_name);
 
 	if (!config.script_file.empty()) {
 		const std::string &script_file = config.script_file;
@@ -892,7 +892,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 				else
 					abc_script += script_file[i];
 		} else
-			abc_script += stringf("source %s", script_file.c_str());
+			abc_script += stringf("source %s", script_file);
 	} else if (!config.lut_costs.empty()) {
 		bool all_luts_cost_same = true;
 		for (int this_cost : config.lut_costs)
@@ -925,15 +925,15 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 	for (size_t pos = abc_script.find("{S}"); pos != std::string::npos; pos = abc_script.find("{S}", pos))
 		abc_script = abc_script.substr(0, pos) + config.lutin_shared + abc_script.substr(pos+3);
 	if (config.abc_dress)
-		abc_script += stringf("; dress \"%s/input.blif\"", tempdir_name.c_str());
-	abc_script += stringf("; write_blif %s/output.blif", tempdir_name.c_str());
+		abc_script += stringf("; dress \"%s/input.blif\"", tempdir_name);
+	abc_script += stringf("; write_blif %s/output.blif", tempdir_name);
 	abc_script = add_echos_to_abc_cmd(abc_script);
 
 	for (size_t i = 0; i+1 < abc_script.size(); i++)
 		if (abc_script[i] == ';' && abc_script[i+1] == ' ')
 			abc_script[i+1] = '\n';
 
-	std::string buffer = stringf("%s/abc.script", tempdir_name.c_str());
+	std::string buffer = stringf("%s/abc.script", tempdir_name);
 	FILE *f = fopen(buffer.c_str(), "wt");
 	if (f == nullptr)
 		log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
@@ -988,7 +988,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 
 	handle_loops(assign_map, module);
 
-	buffer = stringf("%s/input.blif", tempdir_name.c_str());
+	buffer = stringf("%s/input.blif", tempdir_name);
 	f = fopen(buffer.c_str(), "wt");
 	if (f == nullptr)
 		log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
@@ -1115,7 +1115,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 
 		auto &cell_cost = cmos_cost ? CellCosts::cmos_gate_cost() : CellCosts::default_gate_cost();
 
-		buffer = stringf("%s/stdcells.genlib", tempdir_name.c_str());
+		buffer = stringf("%s/stdcells.genlib", tempdir_name);
 		f = fopen(buffer.c_str(), "wt");
 		if (f == nullptr)
 			log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
@@ -1160,7 +1160,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 		fclose(f);
 
 		if (!config.lut_costs.empty()) {
-			buffer = stringf("%s/lutdefs.txt", tempdir_name.c_str());
+			buffer = stringf("%s/lutdefs.txt", tempdir_name);
 			f = fopen(buffer.c_str(), "wt");
 			if (f == nullptr)
 				log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
@@ -1169,14 +1169,14 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 			fclose(f);
 		}
 
-		buffer = stringf("\"%s\" -s -f %s/abc.script 2>&1", config.exe_file.c_str(), tempdir_name.c_str());
+		buffer = stringf("\"%s\" -s -f %s/abc.script 2>&1", config.exe_file, tempdir_name);
 		log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, config.show_tempdir).c_str());
 
 #ifndef YOSYS_LINK_ABC
 		abc_output_filter filt(*this, tempdir_name, config.show_tempdir);
 		int ret = run_command(buffer, std::bind(&abc_output_filter::next_line, filt, std::placeholders::_1));
 #else
-		string temp_stdouterr_name = stringf("%s/stdouterr.txt", tempdir_name.c_str());
+		string temp_stdouterr_name = stringf("%s/stdouterr.txt", tempdir_name);
 		FILE *temp_stdouterr_w = fopen(temp_stdouterr_name.c_str(), "w");
 		if (temp_stdouterr_w == NULL)
 			log_error("ABC: cannot open a temporary file for output redirection");
@@ -1196,7 +1196,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 		fclose(temp_stdouterr_w);
 		// These needs to be mutable, supposedly due to getopt
 		char *abc_argv[5];
-		string tmp_script_name = stringf("%s/abc.script", tempdir_name.c_str());
+		string tmp_script_name = stringf("%s/abc.script", tempdir_name);
 		abc_argv[0] = strdup(config.exe_file.c_str());
 		abc_argv[1] = strdup("-s");
 		abc_argv[2] = strdup("-f");
@@ -1235,7 +1235,7 @@ void AbcModuleState::extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL
 		return;
 	}
 
-	std::string buffer = stringf("%s/%s", tempdir_name.c_str(), "output.blif");
+	std::string buffer = stringf("%s/%s", tempdir_name, "output.blif");
 	std::ifstream ifs;
 	ifs.open(buffer);
 	if (ifs.fail())
@@ -2102,7 +2102,7 @@ struct AbcPass : public Pass {
 					goto ok_alias;
 				}
 				if (g_arg_from_cmd)
-					cmd_error(args, g_argidx, stringf("Unsupported gate type: %s", g.c_str()));
+					cmd_error(args, g_argidx, stringf("Unsupported gate type: %s", g));
 				else
 					log_cmd_error("Unsupported gate type: %s", g.c_str());
 			ok_gate:
diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc
index fe5cc7af1..b79d9dc96 100644
--- a/passes/techmap/abc9.cc
+++ b/passes/techmap/abc9.cc
@@ -332,8 +332,8 @@ struct Abc9Pass : public ScriptPass
 						// Rename all submod-s to _TECHMAP_REPLACE_ to inherit name + attrs
 						for (auto module : active_design->selected_modules()) {
 							active_design->selected_active_module = module->name.str();
-							if (module->cell(stringf("%s_$abc9_flop", module->name.c_str())))
-								run(stringf("rename %s_$abc9_flop _TECHMAP_REPLACE_", module->name.c_str()));
+							if (module->cell(stringf("%s_$abc9_flop", module->name)))
+								run(stringf("rename %s_$abc9_flop _TECHMAP_REPLACE_", module->name));
 						}
 						active_design->selected_active_module.clear();
 					}
@@ -418,10 +418,10 @@ struct Abc9Pass : public ScriptPass
 					tempdir_name = make_temp_dir(tempdir_name);
 
 					if (!lut_mode)
-						run_nocheck(stringf("abc9_ops -write_lut %s/input.lut", tempdir_name.c_str()));
+						run_nocheck(stringf("abc9_ops -write_lut %s/input.lut", tempdir_name));
 					if (box_file.empty())
-						run_nocheck(stringf("abc9_ops -write_box %s/input.box", tempdir_name.c_str()));
-					run_nocheck(stringf("write_xaiger -map %s/input.sym %s %s/input.xaig", tempdir_name.c_str(), dff_mode ? "-dff" : "", tempdir_name.c_str()));
+						run_nocheck(stringf("abc9_ops -write_box %s/input.box", tempdir_name));
+					run_nocheck(stringf("write_xaiger -map %s/input.sym %s %s/input.xaig", tempdir_name, dff_mode ? "-dff" : "", tempdir_name));
 
 					int num_outputs = active_design->scratchpad_get_int("write_xaiger.num_outputs");
 
@@ -433,15 +433,15 @@ struct Abc9Pass : public ScriptPass
 							num_outputs);
 					if (num_outputs) {
 						std::string abc9_exe_cmd;
-						abc9_exe_cmd += stringf("%s -cwd %s", exe_cmd.str().c_str(), tempdir_name.c_str());
+						abc9_exe_cmd += stringf("%s -cwd %s", exe_cmd.str(), tempdir_name);
 						if (!lut_mode)
-							abc9_exe_cmd += stringf(" -lut %s/input.lut", tempdir_name.c_str());
+							abc9_exe_cmd += stringf(" -lut %s/input.lut", tempdir_name);
 						if (box_file.empty())
-							abc9_exe_cmd += stringf(" -box %s/input.box", tempdir_name.c_str());
+							abc9_exe_cmd += stringf(" -box %s/input.box", tempdir_name);
 						else
-							abc9_exe_cmd += stringf(" -box %s", box_file.c_str());
+							abc9_exe_cmd += stringf(" -box %s", box_file);
 						run_nocheck(abc9_exe_cmd);
-						run_nocheck(stringf("read_aiger -xaiger -wideports -module_name %s$abc9 -map %s/input.sym %s/output.aig", log_id(mod), tempdir_name.c_str(), tempdir_name.c_str()));
+						run_nocheck(stringf("read_aiger -xaiger -wideports -module_name %s$abc9 -map %s/input.sym %s/output.aig", log_id(mod), tempdir_name, tempdir_name));
 						run_nocheck(stringf("abc9_ops -reintegrate %s", dff_mode ? "-dff" : ""));
 					}
 					else
diff --git a/passes/techmap/abc9_exe.cc b/passes/techmap/abc9_exe.cc
index dcc507fca..34348fd00 100644
--- a/passes/techmap/abc9_exe.cc
+++ b/passes/techmap/abc9_exe.cc
@@ -173,28 +173,28 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 	std::string abc9_script;
 
 	if (!lut_costs.empty())
-		abc9_script += stringf("read_lut %s/lutdefs.txt; ", tempdir_name.c_str());
+		abc9_script += stringf("read_lut %s/lutdefs.txt; ", tempdir_name);
 	else if (!lut_file.empty())
-		abc9_script += stringf("read_lut \"%s\"; ", lut_file.c_str());
+		abc9_script += stringf("read_lut \"%s\"; ", lut_file);
 	else if (!liberty_files.empty()) {
 		std::string dont_use_args;
 		for (std::string dont_use_cell : dont_use_cells) {
-			dont_use_args += stringf("-X \"%s\" ", dont_use_cell.c_str());
+			dont_use_args += stringf("-X \"%s\" ", dont_use_cell);
 		}
 		for (std::string liberty_file : liberty_files) {
-			abc9_script += stringf("read_lib %s -w \"%s\" ; ", dont_use_args.c_str(), liberty_file.c_str());
+			abc9_script += stringf("read_lib %s -w \"%s\" ; ", dont_use_args, liberty_file);
 		}
 		if (!constr_file.empty())
-			abc9_script += stringf("read_constr -v \"%s\"; ", constr_file.c_str());
+			abc9_script += stringf("read_constr -v \"%s\"; ", constr_file);
 	} else if (!genlib_files.empty()) {
 		for (std::string genlib_file : genlib_files) {
-			abc9_script += stringf("read_genlib \"%s\"; ", genlib_file.c_str());
+			abc9_script += stringf("read_genlib \"%s\"; ", genlib_file);
 		}
 	}
 
 	log_assert(!box_file.empty());
-	abc9_script += stringf("read_box \"%s\"; ", box_file.c_str());
-	abc9_script += stringf("&read %s/input.xaig; &ps; ", tempdir_name.c_str());
+	abc9_script += stringf("read_box \"%s\"; ", box_file);
+	abc9_script += stringf("&read %s/input.xaig; &ps; ", tempdir_name);
 
 	if (!script_file.empty()) {
 		if (script_file[0] == '+') {
@@ -206,7 +206,7 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 				else
 					abc9_script += script_file[i];
 		} else
-			abc9_script += stringf("source %s", script_file.c_str());
+			abc9_script += stringf("source %s", script_file);
 	} else if (!lut_costs.empty() || !lut_file.empty()) {
 		abc9_script += fast_mode ? RTLIL::constpad.at("abc9.script.default.fast").substr(1,std::string::npos)
 			: RTLIL::constpad.at("abc9.script.default").substr(1,std::string::npos);
@@ -238,14 +238,14 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 		for (size_t pos = abc9_script.find("&mfs"); pos != std::string::npos; pos = abc9_script.find("&mfs", pos))
 			abc9_script = abc9_script.erase(pos, strlen("&mfs"));
 	else {
-		auto s = stringf("&write -n %s/output.aig; ", tempdir_name.c_str());
+		auto s = stringf("&write -n %s/output.aig; ", tempdir_name);
 		for (size_t pos = abc9_script.find("&mfs"); pos != std::string::npos; pos = abc9_script.find("&mfs", pos)) {
 			abc9_script = abc9_script.insert(pos, s);
 			pos += GetSize(s) + strlen("&mfs");
 		}
 	}
 
-	abc9_script += stringf("; &ps -l; &write -n %s/output.aig", tempdir_name.c_str());
+	abc9_script += stringf("; &ps -l; &write -n %s/output.aig", tempdir_name);
 	if (design->scratchpad_get_bool("abc9.verify")) {
 		if (dff_mode)
 			abc9_script += "; &verify -s";
@@ -268,7 +268,7 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 	log_header(design, "Executing ABC9.\n");
 
 	if (!lut_costs.empty()) {
-		buffer = stringf("%s/lutdefs.txt", tempdir_name.c_str());
+		buffer = stringf("%s/lutdefs.txt", tempdir_name);
 		f = fopen(buffer.c_str(), "wt");
 		if (f == NULL)
 			log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
@@ -277,14 +277,14 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 		fclose(f);
 	}
 
-	buffer = stringf("\"%s\" -s -f %s/abc.script 2>&1", exe_file.c_str(), tempdir_name.c_str());
+	buffer = stringf("\"%s\" -s -f %s/abc.script 2>&1", exe_file, tempdir_name);
 	log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, show_tempdir).c_str());
 
 #ifndef YOSYS_LINK_ABC
 	abc9_output_filter filt(tempdir_name, show_tempdir);
 	int ret = run_command(buffer, std::bind(&abc9_output_filter::next_line, filt, std::placeholders::_1));
 #else
-	string temp_stdouterr_name = stringf("%s/stdouterr.txt", tempdir_name.c_str());
+	string temp_stdouterr_name = stringf("%s/stdouterr.txt", tempdir_name);
 	FILE *temp_stdouterr_w = fopen(temp_stdouterr_name.c_str(), "w");
 	if (temp_stdouterr_w == NULL)
 		log_error("ABC: cannot open a temporary file for output redirection");
@@ -304,7 +304,7 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 	fclose(temp_stdouterr_w);
 	// These needs to be mutable, supposedly due to getopt
 	char *abc9_argv[5];
-	string tmp_script_name = stringf("%s/abc.script", tempdir_name.c_str());
+	string tmp_script_name = stringf("%s/abc.script", tempdir_name);
 	abc9_argv[0] = strdup(exe_file.c_str());
 	abc9_argv[1] = strdup("-s");
 	abc9_argv[2] = strdup("-f");
@@ -328,7 +328,7 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 	temp_stdouterr_r.close();
 #endif
 	if (ret != 0) {
-		if (check_file_exists(stringf("%s/output.aig", tempdir_name.c_str())))
+		if (check_file_exists(stringf("%s/output.aig", tempdir_name)))
 			log_warning("ABC: execution of command \"%s\" failed: return code %d.\n", buffer.c_str(), ret);
 		else
 			log_error("ABC: execution of command \"%s\" failed: return code %d.\n", buffer.c_str(), ret);
diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index ee0a903c2..85a1099ed 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -856,7 +856,7 @@ void prep_xaiger(RTLIL::Module *module, bool dff)
 						}
 					}
 					else if (w->port_output)
-						conn = holes_module->addWire(stringf("%s.%s", cell->type.c_str(), log_id(port_name)), GetSize(w));
+						conn = holes_module->addWire(stringf("%s.%s", cell->type, log_id(port_name)), GetSize(w));
 				}
 			}
 			else // box_module is a blackbox
@@ -868,7 +868,7 @@ void prep_xaiger(RTLIL::Module *module, bool dff)
 			log_assert(w);
 			if (!w->port_output)
 				continue;
-			Wire *holes_wire = holes_module->addWire(stringf("$abc%s.%s", cell->name.c_str(), log_id(port_name)), GetSize(w));
+			Wire *holes_wire = holes_module->addWire(stringf("$abc%s.%s", cell->name, log_id(port_name)), GetSize(w));
 			holes_wire->port_output = true;
 			holes_wire->port_id = port_id++;
 			holes_module->ports.push_back(holes_wire->name);
@@ -1143,7 +1143,7 @@ void reintegrate(RTLIL::Module *module, bool dff_mode)
 
 	map_autoidx = autoidx++;
 
-	RTLIL::Module *mapped_mod = design->module(stringf("%s$abc9", module->name.c_str()));
+	RTLIL::Module *mapped_mod = design->module(stringf("%s$abc9", module->name));
 	if (mapped_mod == NULL)
 		log_error("ABC output file does not contain a module `%s$abc'.\n", log_id(module));
 
@@ -1271,16 +1271,16 @@ void reintegrate(RTLIL::Module *module, bool dff_mode)
 					// (TODO: Optimise by not cloning unless will increase depth)
 					RTLIL::IdString driver_name;
 					if (GetSize(a_bit.wire) == 1)
-						driver_name = stringf("$lut%s", a_bit.wire->name.c_str());
+						driver_name = stringf("$lut%s", a_bit.wire->name);
 					else
-						driver_name = stringf("$lut%s[%d]", a_bit.wire->name.c_str(), a_bit.offset);
+						driver_name = stringf("$lut%s[%d]", a_bit.wire->name, a_bit.offset);
 					driver_lut = mapped_mod->cell(driver_name);
 				}
 
 				if (!driver_lut) {
 					// If a driver couldn't be found (could be from PI or box CI)
 					// then implement using a LUT
-					RTLIL::Cell *cell = module->addLut(remap_name(stringf("$lut%s", mapped_cell->name.c_str())),
+					RTLIL::Cell *cell = module->addLut(remap_name(stringf("$lut%s", mapped_cell->name)),
 							RTLIL::SigBit(module->wires_.at(remap_name(a_bit.wire->name)), a_bit.offset),
 							RTLIL::SigBit(module->wires_.at(remap_name(y_bit.wire->name)), y_bit.offset),
 							RTLIL::Const::from_string("01"));
diff --git a/passes/techmap/abc_new.cc b/passes/techmap/abc_new.cc
index 00bd23f86..286ab4d5b 100644
--- a/passes/techmap/abc_new.cc
+++ b/passes/techmap/abc_new.cc
@@ -168,9 +168,9 @@ struct AbcNewPass : public ScriptPass {
 						mod->get_string_attribute(ID(abc9_script)));
 				}
 
-				run(stringf("  abc9_ops -write_box %s/input.box", tmpdir.c_str()));
-				run(stringf("  write_xaiger2 -mapping_prep -map2 %s/input.map2 %s/input.xaig", tmpdir.c_str(), tmpdir.c_str()));
-				run(stringf("  abc9_exe %s -cwd %s -box %s/input.box", exe_options.c_str(), tmpdir.c_str(), tmpdir.c_str()));
+				run(stringf("  abc9_ops -write_box %s/input.box", tmpdir));
+				run(stringf("  write_xaiger2 -mapping_prep -map2 %s/input.map2 %s/input.xaig", tmpdir, tmpdir));
+				run(stringf("  abc9_exe %s -cwd %s -box %s/input.box", exe_options, tmpdir, tmpdir));
 				run(stringf("  read_xaiger2 -sc_mapping -module_name %s -map2 %s/input.map2 %s/output.aig",
 							modname.c_str(), tmpdir.c_str(), tmpdir.c_str()));
 
diff --git a/passes/techmap/booth.cc b/passes/techmap/booth.cc
index a692b99fe..11ff71b29 100644
--- a/passes/techmap/booth.cc
+++ b/passes/techmap/booth.cc
@@ -201,7 +201,7 @@ struct BoothPassWorker {
 		log_assert(sig_a.size() == sig_y.size());
 
 		for (int i = 0; i < sig_a.size(); i++)
-			mod->addFa(stringf("%s[%d]", name.c_str(), i), sig_a[i], sig_b[i],
+			mod->addFa(stringf("%s[%d]", name, i), sig_a[i], sig_b[i],
 				   sig_c[i], sig_x[i], sig_y[i], src);
 	}
 
diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index 409ac7865..a2b9c3bff 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -553,7 +553,7 @@ static void dfflibmap(RTLIL::Design *design, RTLIL::Module *module)
 			new_cell->setPort("\\" + port.first, sig);
 		}
 
-		stats[stringf("  mapped %%d %s cells to %s cells.\n", cell_type.c_str(), new_cell->type.c_str())]++;
+		stats[stringf("  mapped %%d %s cells to %s cells.\n", cell_type, new_cell->type)]++;
 	}
 
 	for (auto &stat: stats)
@@ -687,7 +687,7 @@ struct DfflibmapPass : public Pass {
 		if (!map_only_mode) {
 			std::string dfflegalize_cmd = "dfflegalize";
 			for (auto it : cell_mappings)
-				dfflegalize_cmd += stringf(" -cell %s 01", it.first.c_str());
+				dfflegalize_cmd += stringf(" -cell %s 01", it.first);
 			dfflegalize_cmd += " t:$_DFF* t:$_SDFF*";
 			if (info_mode) {
 				log("dfflegalize command line: %s\n", dfflegalize_cmd.c_str());
diff --git a/passes/techmap/extract.cc b/passes/techmap/extract.cc
index 137d22170..ea6ba5ddb 100644
--- a/passes/techmap/extract.cc
+++ b/passes/techmap/extract.cc
@@ -292,7 +292,7 @@ RTLIL::Cell *replace(RTLIL::Module *needle, RTLIL::Module *haystack, SubCircuit:
 	SigSet<std::pair<RTLIL::IdString, int>> sig2port;
 
 	// create new cell
-	RTLIL::Cell *cell = haystack->addCell(stringf("$extract$%s$%d", needle->name.c_str(), autoidx++), needle->name);
+	RTLIL::Cell *cell = haystack->addCell(stringf("$extract$%s$%d", needle->name, autoidx++), needle->name);
 
 	// create cell ports
 	for (auto wire : needle->wires()) {
diff --git a/passes/techmap/techmap.cc b/passes/techmap/techmap.cc
index 95c733f62..dd82958fa 100644
--- a/passes/techmap/techmap.cc
+++ b/passes/techmap/techmap.cc
@@ -42,9 +42,9 @@ PRIVATE_NAMESPACE_BEGIN
 void apply_prefix(IdString prefix, IdString &id)
 {
 	if (id[0] == '\\')
-		id = stringf("%s.%s", prefix.c_str(), id.c_str()+1);
+		id = stringf("%s.%s", prefix, id.c_str()+1);
 	else
-		id = stringf("$techmap%s.%s", prefix.c_str(), id.c_str());
+		id = stringf("$techmap%s.%s", prefix, id);
 }
 
 void apply_prefix(IdString prefix, RTLIL::SigSpec &sig, RTLIL::Module *module)
@@ -107,7 +107,7 @@ struct TechmapWorker
 				}
 			}
 
-		return stringf("$paramod$constmap:%s%s", sha1(constmap_info).c_str(), tpl->name.c_str());
+		return stringf("$paramod$constmap:%s%s", sha1(constmap_info), tpl->name);
 	}
 
 	TechmapWires techmap_find_special_wires(RTLIL::Module *module)
@@ -222,7 +222,7 @@ struct TechmapWorker
 			design->select(module, w);
 
 			if (const char *p = strstr(tpl_w->name.c_str(), "_TECHMAP_REPLACE_.")) {
-				IdString replace_name = stringf("%s%s", orig_cell_name.c_str(), p + strlen("_TECHMAP_REPLACE_"));
+				IdString replace_name = stringf("%s%s", orig_cell_name, p + strlen("_TECHMAP_REPLACE_"));
 				Wire *replace_w = module->addWire(replace_name, tpl_w);
 				module->connect(replace_w, w);
 			}
@@ -327,7 +327,7 @@ struct TechmapWorker
 			if (techmap_replace_cell)
 				c_name = orig_cell_name;
 			else if (const char *p = strstr(tpl_cell->name.c_str(), "_TECHMAP_REPLACE_."))
-				c_name = stringf("%s%s", orig_cell_name.c_str(), p + strlen("_TECHMAP_REPLACE_"));
+				c_name = stringf("%s%s", orig_cell_name, p + strlen("_TECHMAP_REPLACE_"));
 			else
 				apply_prefix(cell->name, c_name);
 
@@ -512,7 +512,7 @@ struct TechmapWorker
 
 					if ((extern_mode && !in_recursion) || extmapper_name == "wrap")
 					{
-						std::string m_name = stringf("$extern:%s:%s", extmapper_name.c_str(), log_id(cell->type));
+						std::string m_name = stringf("$extern:%s:%s", extmapper_name, log_id(cell->type));
 
 						for (auto &c : cell->parameters)
 							m_name += stringf(":%s=%s", log_id(c.first), log_signal(c.second));
@@ -586,7 +586,7 @@ struct TechmapWorker
 					}
 					else
 					{
-						auto msg = stringf("Using extmapper %s for cells of type %s.", extmapper_name.c_str(), log_id(cell->type));
+						auto msg = stringf("Using extmapper %s for cells of type %s.", extmapper_name, log_id(cell->type));
 						if (!log_msg_cache.count(msg)) {
 							log_msg_cache.insert(msg);
 							log("%s\n", msg.c_str());
diff --git a/passes/tests/test_autotb.cc b/passes/tests/test_autotb.cc
index 306e760ee..bcaf097a1 100644
--- a/passes/tests/test_autotb.cc
+++ b/passes/tests/test_autotb.cc
@@ -114,7 +114,7 @@ static void autotest(std::ostream &f, RTLIL::Design *design, int num_iter, int s
 			if (wire->port_output) {
 				count_ports++;
 				signal_out[idy("sig", mod->name.str(), wire->name.str())] = wire->width;
-				f << stringf("wire [%d:0] %s;\n", wire->width-1, idy("sig", mod->name.str(), wire->name.str()).c_str());
+				f << stringf("wire [%d:0] %s;\n", wire->width-1, idy("sig", mod->name.str(), wire->name.str()));
 			} else if (wire->port_input) {
 				count_ports++;
 				bool is_clksignal = wire->get_bool_attribute(ID::gentb_clock);
@@ -134,73 +134,73 @@ static void autotest(std::ostream &f, RTLIL::Design *design, int num_iter, int s
 					if (wire->attributes.count(ID::gentb_constant) != 0)
 						signal_const[idy("sig", mod->name.str(), wire->name.str())] = wire->attributes[ID::gentb_constant].as_string();
 				}
-				f << stringf("reg [%d:0] %s;\n", wire->width-1, idy("sig", mod->name.str(), wire->name.str()).c_str());
+				f << stringf("reg [%d:0] %s;\n", wire->width-1, idy("sig", mod->name.str(), wire->name.str()));
 			}
 		}
-		f << stringf("%s %s(\n", id(mod->name.str()).c_str(), idy("uut", mod->name.str()).c_str());
+		f << stringf("%s %s(\n", id(mod->name.str()), idy("uut", mod->name.str()));
 		for (auto wire : mod->wires()) {
 			if (wire->port_output || wire->port_input)
-				f << stringf("\t.%s(%s)%s\n", id(wire->name.str()).c_str(),
+				f << stringf("\t.%s(%s)%s\n", id(wire->name.str()),
 						idy("sig", mod->name.str(), wire->name.str()).c_str(), --count_ports ? "," : "");
 		}
 		f << stringf(");\n\n");
 
-		f << stringf("task %s;\n", idy(mod->name.str(), "reset").c_str());
+		f << stringf("task %s;\n", idy(mod->name.str(), "reset"));
 		f << stringf("begin\n");
 		int delay_counter = 0;
 		for (auto it = signal_in.begin(); it != signal_in.end(); ++it)
-			f << stringf("\t%s <= #%d 0;\n", it->first.c_str(), ++delay_counter*2);
+			f << stringf("\t%s <= #%d 0;\n", it->first, ++delay_counter*2);
 		for (auto it = signal_clk.begin(); it != signal_clk.end(); ++it)
-			f << stringf("\t%s <= #%d 0;\n", it->first.c_str(), ++delay_counter*2);
+			f << stringf("\t%s <= #%d 0;\n", it->first, ++delay_counter*2);
 		f << stringf("\t#%d;\n", ((2*delay_counter+99)/100)*100);
 		for (auto it = signal_clk.begin(); it != signal_clk.end(); ++it) {
-			f << stringf("\t#100; %s <= 1;\n", it->first.c_str());
-			f << stringf("\t#100; %s <= 0;\n", it->first.c_str());
+			f << stringf("\t#100; %s <= 1;\n", it->first);
+			f << stringf("\t#100; %s <= 0;\n", it->first);
 		}
 		delay_counter = 0;
 		for (auto it = signal_in.begin(); it != signal_in.end(); ++it)
-			f << stringf("\t%s <= #%d ~0;\n", it->first.c_str(), ++delay_counter*2);
+			f << stringf("\t%s <= #%d ~0;\n", it->first, ++delay_counter*2);
 		f << stringf("\t#%d;\n", ((2*delay_counter+99)/100)*100);
 		for (auto it = signal_clk.begin(); it != signal_clk.end(); ++it) {
-			f << stringf("\t#100; %s <= 1;\n", it->first.c_str());
-			f << stringf("\t#100; %s <= 0;\n", it->first.c_str());
+			f << stringf("\t#100; %s <= 1;\n", it->first);
+			f << stringf("\t#100; %s <= 0;\n", it->first);
 		}
 		delay_counter = 0;
 		for (auto it = signal_in.begin(); it != signal_in.end(); ++it) {
 			if (signal_const.count(it->first) == 0)
 				continue;
-			f << stringf("\t%s <= #%d 'b%s;\n", it->first.c_str(), ++delay_counter*2, signal_const[it->first].c_str());
+			f << stringf("\t%s <= #%d 'b%s;\n", it->first, ++delay_counter*2, signal_const[it->first]);
 		}
 		f << stringf("\t#%d;\n", ((2*delay_counter+99)/100)*100);
 		f << stringf("end\n");
 		f << stringf("endtask\n\n");
 
-		f << stringf("task %s;\n", idy(mod->name.str(), "update_data").c_str());
+		f << stringf("task %s;\n", idy(mod->name.str(), "update_data"));
 		f << stringf("begin\n");
 		delay_counter = 0;
 		for (auto it = signal_in.begin(); it != signal_in.end(); it++) {
 			if (signal_const.count(it->first) > 0)
 				continue;
 			f << stringf("\txorshift128;\n");
-			f << stringf("\t%s <= #%d { xorshift128_x, xorshift128_y, xorshift128_z, xorshift128_w };\n", it->first.c_str(), ++delay_counter*2);
+			f << stringf("\t%s <= #%d { xorshift128_x, xorshift128_y, xorshift128_z, xorshift128_w };\n", it->first, ++delay_counter*2);
 		}
 		f << stringf("\t#%d;\n", ((2*delay_counter+99)/100)*100);
 		f << stringf("end\n");
 		f << stringf("endtask\n\n");
 
-		f << stringf("task %s;\n", idy(mod->name.str(), "update_clock").c_str());
+		f << stringf("task %s;\n", idy(mod->name.str(), "update_clock"));
 		f << stringf("begin\n");
 		if (signal_clk.size()) {
 			f << stringf("\txorshift128;\n");
 			f << stringf("\t{");
 			int total_clock_bits = 0;
 			for (auto it = signal_clk.begin(); it != signal_clk.end(); it++) {
-				f << stringf("%s %s", it == signal_clk.begin() ? "" : ",", it->first.c_str());
+				f << stringf("%s %s", it == signal_clk.begin() ? "" : ",", it->first);
 				total_clock_bits += it->second;
 			}
 			f << stringf(" } = {");
 			for (auto it = signal_clk.begin(); it != signal_clk.end(); it++)
-				f << stringf("%s %s", it == signal_clk.begin() ? "" : ",", it->first.c_str());
+				f << stringf("%s %s", it == signal_clk.begin() ? "" : ",", it->first);
 			f << stringf(" } ^ (%d'b1 << (xorshift128_w %% %d));\n", total_clock_bits, total_clock_bits + 1);
 		}
 		f << stringf("end\n");
@@ -210,12 +210,12 @@ static void autotest(std::ostream &f, RTLIL::Design *design, int num_iter, int s
 		std::vector<std::string> header1;
 		std::string header2 = "";
 
-		f << stringf("task %s;\n", idy(mod->name.str(), "print_status").c_str());
+		f << stringf("task %s;\n", idy(mod->name.str(), "print_status"));
 		f << stringf("begin\n");
 		f << stringf("\t$fdisplay(file, \"#OUT# %%b %%b %%b %%t %%d\", {");
 		if (signal_in.size())
 			for (auto it = signal_in.begin(); it != signal_in.end(); it++) {
-				f << stringf("%s %s", it == signal_in.begin() ? "" : ",", it->first.c_str());
+				f << stringf("%s %s", it == signal_in.begin() ? "" : ",", it->first);
 				int len = it->second;
 				header2 += ", \"";
 				if (len > 1)
@@ -237,7 +237,7 @@ static void autotest(std::ostream &f, RTLIL::Design *design, int num_iter, int s
 		header2 += ", \" \"";
 		if (signal_clk.size()) {
 			for (auto it = signal_clk.begin(); it != signal_clk.end(); it++) {
-				f << stringf("%s %s", it == signal_clk.begin() ? "" : ",", it->first.c_str());
+				f << stringf("%s %s", it == signal_clk.begin() ? "" : ",", it->first);
 				int len = it->second;
 				header2 += ", \"";
 				if (len > 1)
@@ -259,7 +259,7 @@ static void autotest(std::ostream &f, RTLIL::Design *design, int num_iter, int s
 		header2 += ", \" \"";
 		if (signal_out.size()) {
 			for (auto it = signal_out.begin(); it != signal_out.end(); it++) {
-				f << stringf("%s %s", it == signal_out.begin() ? "" : ",", it->first.c_str());
+				f << stringf("%s %s", it == signal_out.begin() ? "" : ",", it->first);
 				int len = it->second;
 				header2 += ", \"";
 				if (len > 1)
@@ -281,25 +281,25 @@ static void autotest(std::ostream &f, RTLIL::Design *design, int num_iter, int s
 		f << stringf("end\n");
 		f << stringf("endtask\n\n");
 
-		f << stringf("task %s;\n", idy(mod->name.str(), "print_header").c_str());
+		f << stringf("task %s;\n", idy(mod->name.str(), "print_header"));
 		f << stringf("begin\n");
 		f << stringf("\t$fdisplay(file, \"#OUT#\");\n");
 		for (auto &hdr : header1)
-			f << stringf("\t$fdisplay(file, \"#OUT#   %s\");\n", hdr.c_str());
+			f << stringf("\t$fdisplay(file, \"#OUT#   %s\");\n", hdr);
 		f << stringf("\t$fdisplay(file, \"#OUT#\");\n");
-		f << stringf("\t$fdisplay(file, {\"#OUT# \"%s});\n", header2.c_str());
+		f << stringf("\t$fdisplay(file, {\"#OUT# \"%s});\n", header2);
 		f << stringf("end\n");
 		f << stringf("endtask\n\n");
 
-		f << stringf("task %s;\n", idy(mod->name.str(), "test").c_str());
+		f << stringf("task %s;\n", idy(mod->name.str(), "test"));
 		f << stringf("begin\n");
-		f << stringf("\t$fdisplay(file, \"#OUT#\\n#OUT# ==== %s ====\");\n", idy(mod->name.str()).c_str());
-		f << stringf("\t%s;\n", idy(mod->name.str(), "reset").c_str());
+		f << stringf("\t$fdisplay(file, \"#OUT#\\n#OUT# ==== %s ====\");\n", idy(mod->name.str()));
+		f << stringf("\t%s;\n", idy(mod->name.str(), "reset"));
 		f << stringf("\tfor (i=0; i<%d; i=i+1) begin\n", num_iter);
-		f << stringf("\t\tif (i %% 20 == 0) %s;\n", idy(mod->name.str(), "print_header").c_str());
-		f << stringf("\t\t#100; %s;\n", idy(mod->name.str(), "update_data").c_str());
-		f << stringf("\t\t#100; %s;\n", idy(mod->name.str(), "update_clock").c_str());
-		f << stringf("\t\t#100; %s;\n", idy(mod->name.str(), "print_status").c_str());
+		f << stringf("\t\tif (i %% 20 == 0) %s;\n", idy(mod->name.str(), "print_header"));
+		f << stringf("\t\t#100; %s;\n", idy(mod->name.str(), "update_data"));
+		f << stringf("\t\t#100; %s;\n", idy(mod->name.str(), "update_clock"));
+		f << stringf("\t\t#100; %s;\n", idy(mod->name.str(), "print_status"));
 		f << stringf("\tend\n");
 		f << stringf("end\n");
 		f << stringf("endtask\n\n");
@@ -317,7 +317,7 @@ static void autotest(std::ostream &f, RTLIL::Design *design, int num_iter, int s
 	f << stringf("\tend\n");
 	for (auto module : design->modules())
 		if (!module->get_bool_attribute(ID::gentb_skip))
-			f << stringf("\t%s;\n", idy(module->name.str(), "test").c_str());
+			f << stringf("\t%s;\n", idy(module->name.str(), "test"));
 	f << stringf("\t$fclose(file);\n");
 	f << stringf("\t$finish;\n");
 	f << stringf("end\n\n");
diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index 4285611f7..87e0a00f8 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -591,7 +591,7 @@ static void run_eval_test(RTLIL::Design *design, bool verbose, bool nosat, std::
 
 	if (vlog_file.is_open())
 	{
-		vlog_file << stringf("\nmodule %s;\n", uut_name.c_str());
+		vlog_file << stringf("\nmodule %s;\n", uut_name);
 
 		for (auto port : gold_mod->ports) {
 			RTLIL::Wire *wire = gold_mod->wire(port);
@@ -601,13 +601,13 @@ static void run_eval_test(RTLIL::Design *design, bool verbose, bool nosat, std::
 				vlog_file << stringf("  wire [%d:0] %s_expr, %s_noexpr;\n", GetSize(wire)-1, log_id(wire), log_id(wire));
 		}
 
-		vlog_file << stringf("  %s_expr uut_expr(", uut_name.c_str());
+		vlog_file << stringf("  %s_expr uut_expr(", uut_name);
 		for (int i = 0; i < GetSize(gold_mod->ports); i++)
 			vlog_file << stringf("%s.%s(%s%s)", i ? ", " : "", log_id(gold_mod->ports[i]), log_id(gold_mod->ports[i]),
 					gold_mod->wire(gold_mod->ports[i])->port_input ? "" : "_expr");
 		vlog_file << stringf(");\n");
 
-		vlog_file << stringf("  %s_expr uut_noexpr(", uut_name.c_str());
+		vlog_file << stringf("  %s_expr uut_noexpr(", uut_name);
 		for (int i = 0; i < GetSize(gold_mod->ports); i++)
 			vlog_file << stringf("%s.%s(%s%s)", i ? ", " : "", log_id(gold_mod->ports[i]), log_id(gold_mod->ports[i]),
 					gold_mod->wire(gold_mod->ports[i])->port_input ? "" : "_noexpr");
@@ -615,7 +615,7 @@ static void run_eval_test(RTLIL::Design *design, bool verbose, bool nosat, std::
 
 		vlog_file << stringf("  task run;\n");
 		vlog_file << stringf("    begin\n");
-		vlog_file << stringf("      $display(\"%s\");\n", uut_name.c_str());
+		vlog_file << stringf("      $display(\"%s\");\n", uut_name);
 	}
 
 	for (int i = 0; i < 64; i++)
@@ -662,7 +662,7 @@ static void run_eval_test(RTLIL::Design *design, bool verbose, bool nosat, std::
 			gate_ce.set(gate_wire, in_value);
 
 			if (vlog_file.is_open() && GetSize(in_value) > 0) {
-				vlog_file << stringf("      %s = 'b%s;\n", log_id(gold_wire), in_value.as_string().c_str());
+				vlog_file << stringf("      %s = 'b%s;\n", log_id(gold_wire), in_value.as_string());
 				if (!vlog_pattern_info.empty())
 					vlog_pattern_info += " ";
 				vlog_pattern_info += stringf("%s=%s", log_id(gold_wire), log_signal(in_value));
@@ -716,8 +716,8 @@ static void run_eval_test(RTLIL::Design *design, bool verbose, bool nosat, std::
 			if (vlog_file.is_open()) {
 				vlog_file << stringf("      $display(\"[%s] %s expected: %%b, expr: %%b, noexpr: %%b\", %d'b%s, %s_expr, %s_noexpr);\n",
 						vlog_pattern_info.c_str(), log_id(gold_wire), GetSize(gold_outval), gold_outval.as_string().c_str(), log_id(gold_wire), log_id(gold_wire));
-				vlog_file << stringf("      if (%s_expr !== %d'b%s) begin $display(\"ERROR\"); $finish; end\n", log_id(gold_wire), GetSize(gold_outval), gold_outval.as_string().c_str());
-				vlog_file << stringf("      if (%s_noexpr !== %d'b%s) begin $display(\"ERROR\"); $finish; end\n", log_id(gold_wire), GetSize(gold_outval), gold_outval.as_string().c_str());
+				vlog_file << stringf("      if (%s_expr !== %d'b%s) begin $display(\"ERROR\"); $finish; end\n", log_id(gold_wire), GetSize(gold_outval), gold_outval.as_string());
+				vlog_file << stringf("      if (%s_noexpr !== %d'b%s) begin $display(\"ERROR\"); $finish; end\n", log_id(gold_wire), GetSize(gold_outval), gold_outval.as_string());
 			}
 		}
 
@@ -1142,12 +1142,12 @@ struct TestCellPass : public Pass {
 				else
 					uut = create_gold_module(design, cell_type, cell_types.at(cell_type), constmode, muxdiv);
 				if (!write_prefix.empty()) {
-					Pass::call(design, stringf("write_rtlil %s_%s_%05d.il", write_prefix.c_str(), cell_type.c_str()+1, i));
+					Pass::call(design, stringf("write_rtlil %s_%s_%05d.il", write_prefix, cell_type.c_str()+1, i));
 				} else if (edges) {
 					Pass::call(design, "dump gold");
 					run_edges_test(design, verbose);
 				} else {
-					Pass::call(design, stringf("copy gold gate; cd gate; %s; cd ..", techmap_cmd.c_str()));
+					Pass::call(design, stringf("copy gold gate; cd gate; %s; cd ..", techmap_cmd));
 					if (!noopt)
 						Pass::call(design, "opt -fast gate");
 					if (!nosat)
@@ -1157,11 +1157,11 @@ struct TestCellPass : public Pass {
 					Pass::call(design, "dump gold");
 					if (!nosat)
 						Pass::call(design, "sat -verify -enable_undef -prove trigger 0 -show-inputs -show-outputs miter");
-					std::string uut_name = stringf("uut_%s_%d", cell_type.substr(1).c_str(), i);
+					std::string uut_name = stringf("uut_%s_%d", cell_type.substr(1), i);
 					if (vlog_file.is_open()) {
-						Pass::call(design, stringf("copy gold %s_expr; select %s_expr", uut_name.c_str(), uut_name.c_str()));
+						Pass::call(design, stringf("copy gold %s_expr; select %s_expr", uut_name, uut_name));
 						Backend::backend_call(design, &vlog_file, "<test_cell -vlog>", "verilog -selected");
-						Pass::call(design, stringf("copy gold %s_noexpr; select %s_noexpr", uut_name.c_str(), uut_name.c_str()));
+						Pass::call(design, stringf("copy gold %s_noexpr; select %s_noexpr", uut_name, uut_name));
 						Backend::backend_call(design, &vlog_file, "<test_cell -vlog>", "verilog -selected -noexpr");
 						uut_names.push_back(uut_name);
 					}
@@ -1208,7 +1208,7 @@ struct TestCellPass : public Pass {
 		if (vlog_file.is_open()) {
 			vlog_file << "\nmodule testbench;\n";
 			for (auto &uut : uut_names)
-				vlog_file << stringf("  %s %s ();\n", uut.c_str(), uut.c_str());
+				vlog_file << stringf("  %s %s ();\n", uut, uut);
 			vlog_file << "  initial begin\n";
 			for (auto &uut : uut_names)
 				vlog_file << "    " << uut << ".run;\n";
diff --git a/techlibs/achronix/synth_achronix.cc b/techlibs/achronix/synth_achronix.cc
index 2b969182e..1b48f426b 100644
--- a/techlibs/achronix/synth_achronix.cc
+++ b/techlibs/achronix/synth_achronix.cc
@@ -123,7 +123,7 @@ struct SynthAchronixPass : public ScriptPass {
     if (check_label("begin"))
       {
         run("read_verilog -sv -lib +/achronix/speedster22i/cells_sim.v");
-        run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+        run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
       }
 
     if (flatten && check_label("flatten", "(unless -noflatten)"))
diff --git a/techlibs/anlogic/synth_anlogic.cc b/techlibs/anlogic/synth_anlogic.cc
index c72e7f2a1..a03374fb0 100644
--- a/techlibs/anlogic/synth_anlogic.cc
+++ b/techlibs/anlogic/synth_anlogic.cc
@@ -150,7 +150,7 @@ struct SynthAnlogicPass : public ScriptPass
 		if (check_label("begin"))
 		{
 			run("read_verilog -lib +/anlogic/cells_sim.v +/anlogic/eagle_bb.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
@@ -233,13 +233,13 @@ struct SynthAnlogicPass : public ScriptPass
 		if (check_label("edif"))
 		{
 			if (!edif_file.empty() || help_mode)
-				run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file.c_str()));
+				run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file));
 		}
 
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 	}
 } SynthAnlogicPass;
diff --git a/techlibs/common/prep.cc b/techlibs/common/prep.cc
index e9176304d..a98619abd 100644
--- a/techlibs/common/prep.cc
+++ b/techlibs/common/prep.cc
@@ -177,7 +177,7 @@ struct PrepPass : public ScriptPass
 					else
 						run("hierarchy -check");
 				} else
-					run(stringf("hierarchy -check -top %s", top_module.c_str()));
+					run(stringf("hierarchy -check -top %s", top_module));
 			}
 		}
 
diff --git a/techlibs/common/synth.cc b/techlibs/common/synth.cc
index 8b4561c34..9c85fbbc7 100644
--- a/techlibs/common/synth.cc
+++ b/techlibs/common/synth.cc
@@ -249,7 +249,7 @@ struct SynthPass : public ScriptPass {
 					else
 						run("hierarchy -check");
 				} else
-					run(stringf("hierarchy -check -top %s", top_module.c_str()));
+					run(stringf("hierarchy -check -top %s", top_module));
 			}
 		}
 
@@ -294,7 +294,7 @@ struct SynthPass : public ScriptPass {
 				if (!techmap_maps.empty())
 					techmap_opts += " -map +/techmap.v";
 				for (auto fn : techmap_maps)
-					techmap_opts += stringf(" -map %s", fn.c_str());
+					techmap_opts += stringf(" -map %s", fn);
 				run("techmap" + techmap_opts);
 			}
 			if (help_mode) {
@@ -316,7 +316,7 @@ struct SynthPass : public ScriptPass {
 					run(abc + " -fast -lut k", "(unless -noabc, if -lut)");
 				} else {
 					if (lut)
-						run(stringf("%s -fast -lut %d", abc.c_str(), lut));
+						run(stringf("%s -fast -lut %d", abc, lut));
 					else
 						run(abc + " -fast");
 				}
diff --git a/techlibs/coolrunner2/synth_coolrunner2.cc b/techlibs/coolrunner2/synth_coolrunner2.cc
index a746ac222..7ee1393be 100644
--- a/techlibs/coolrunner2/synth_coolrunner2.cc
+++ b/techlibs/coolrunner2/synth_coolrunner2.cc
@@ -126,7 +126,7 @@ struct SynthCoolrunner2Pass : public ScriptPass
 		if (check_label("begin"))
 		{
 			run("read_verilog -lib +/coolrunner2/cells_sim.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
@@ -198,7 +198,7 @@ struct SynthCoolrunner2Pass : public ScriptPass
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 	}
 } SynthCoolrunner2Pass;
diff --git a/techlibs/easic/synth_easic.cc b/techlibs/easic/synth_easic.cc
index 50526a9ea..6c5df7beb 100644
--- a/techlibs/easic/synth_easic.cc
+++ b/techlibs/easic/synth_easic.cc
@@ -129,14 +129,14 @@ struct SynthEasicPass : public ScriptPass
 
 	void script() override
 	{
-		string phys_clk_lib = stringf("%s/data_ruby28/design_libs/logical/timing/gp/n3x_phys_clk_0v893ff125c.lib", etools_path.c_str());
-		string logic_lut_lib = stringf("%s/data_ruby28/design_libs/logical/timing/gp/n3x_logic_lut_0v893ff125c.lib", etools_path.c_str());
+		string phys_clk_lib = stringf("%s/data_ruby28/design_libs/logical/timing/gp/n3x_phys_clk_0v893ff125c.lib", etools_path);
+		string logic_lut_lib = stringf("%s/data_ruby28/design_libs/logical/timing/gp/n3x_logic_lut_0v893ff125c.lib", etools_path);
 
 		if (check_label("begin"))
 		{
-			run(stringf("read_liberty -lib %s", help_mode ? "<etools_phys_clk_lib>" : phys_clk_lib.c_str()));
-			run(stringf("read_liberty -lib %s", help_mode ? "<etools_logic_lut_lib>" : logic_lut_lib.c_str()));
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("read_liberty -lib %s", help_mode ? "<etools_phys_clk_lib>" : phys_clk_lib));
+			run(stringf("read_liberty -lib %s", help_mode ? "<etools_logic_lut_lib>" : logic_lut_lib));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
@@ -165,8 +165,8 @@ struct SynthEasicPass : public ScriptPass
 
 		if (check_label("map"))
 		{
-			run(stringf("dfflibmap -liberty %s", help_mode ? "<etools_phys_clk_lib>" : phys_clk_lib.c_str()));
-			run(stringf("abc -liberty %s", help_mode ? "<etools_logic_lut_lib>" : logic_lut_lib.c_str()));
+			run(stringf("dfflibmap -liberty %s", help_mode ? "<etools_phys_clk_lib>" : phys_clk_lib));
+			run(stringf("abc -liberty %s", help_mode ? "<etools_logic_lut_lib>" : logic_lut_lib));
 			run("opt_clean");
 		}
 
@@ -181,7 +181,7 @@ struct SynthEasicPass : public ScriptPass
 		if (check_label("vlog"))
 		{
 			if (!vlog_file.empty() || help_mode)
-				run(stringf("write_verilog -noexpr -attr2comment %s", help_mode ? "<file-name>" : vlog_file.c_str()));
+				run(stringf("write_verilog -noexpr -attr2comment %s", help_mode ? "<file-name>" : vlog_file));
 		}
 	}
 } SynthEasicPass;
diff --git a/techlibs/ecp5/synth_ecp5.cc b/techlibs/ecp5/synth_ecp5.cc
index 6e518f5d1..8960df70c 100644
--- a/techlibs/ecp5/synth_ecp5.cc
+++ b/techlibs/ecp5/synth_ecp5.cc
@@ -272,7 +272,7 @@ struct SynthEcp5Pass : public ScriptPass
 		if (check_label("begin"))
 		{
 			run("read_verilog -lib -specify +/ecp5/cells_sim.v +/ecp5/cells_bb.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (check_label("coarse"))
@@ -383,9 +383,9 @@ struct SynthEcp5Pass : public ScriptPass
 					abc9_opts += " -maxlut 4";
 				std::string k = "synth_ecp5.abc9.W";
 				if (active_design && active_design->scratchpad.count(k))
-					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k).c_str());
+					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k));
 				else
-					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k).c_str());
+					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k));
 				if (nowidelut)
 					abc9_opts += " -maxlut 4";
 				if (dff)
@@ -443,13 +443,13 @@ struct SynthEcp5Pass : public ScriptPass
 		if (check_label("edif"))
 		{
 			if (!edif_file.empty() || help_mode)
-				run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file.c_str()));
+				run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file));
 		}
 
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 	}
 } SynthEcp5Pass;
diff --git a/techlibs/efinix/synth_efinix.cc b/techlibs/efinix/synth_efinix.cc
index 419bc2f88..ef245e755 100644
--- a/techlibs/efinix/synth_efinix.cc
+++ b/techlibs/efinix/synth_efinix.cc
@@ -142,7 +142,7 @@ struct SynthEfinixPass : public ScriptPass
 		if (check_label("begin"))
 		{
 			run("read_verilog -lib +/efinix/cells_sim.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
@@ -225,13 +225,13 @@ struct SynthEfinixPass : public ScriptPass
 		if (check_label("edif"))
 		{
 			if (!edif_file.empty() || help_mode)
-				run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file.c_str()));
+				run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file));
 		}
 
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 	}
 } SynthEfinixPass;
diff --git a/techlibs/fabulous/synth_fabulous.cc b/techlibs/fabulous/synth_fabulous.cc
index 8d2fb1471..0e6553fa1 100644
--- a/techlibs/fabulous/synth_fabulous.cc
+++ b/techlibs/fabulous/synth_fabulous.cc
@@ -278,7 +278,7 @@ struct SynthPass : public ScriptPass
 				else
 					run("hierarchy -check");
 			} else
-				run(stringf("hierarchy -check -top %s", top_module.c_str()));
+				run(stringf("hierarchy -check -top %s", top_module));
 			run("proc");
 		}
 
@@ -365,7 +365,7 @@ struct SynthPass : public ScriptPass
 			} else if (!extra_map.empty()) {
 				std::string map_str = "techmap";
 				for (auto map : extra_map)
-					map_str += stringf(" -map %s", map.c_str());
+					map_str += stringf(" -map %s", map);
 				run(map_str);
 			}
 			run("clean");
@@ -399,7 +399,7 @@ struct SynthPass : public ScriptPass
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 	}
 } SynthPass;
diff --git a/techlibs/gatemate/synth_gatemate.cc b/techlibs/gatemate/synth_gatemate.cc
index fa36252f5..7726e7a15 100644
--- a/techlibs/gatemate/synth_gatemate.cc
+++ b/techlibs/gatemate/synth_gatemate.cc
@@ -203,7 +203,7 @@ struct SynthGateMatePass : public ScriptPass
 		if (check_label("begin"))
 		{
 			run("read_verilog -lib -specify +/gatemate/cells_sim.v +/gatemate/cells_bb.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (check_label("prepare"))
@@ -351,14 +351,14 @@ struct SynthGateMatePass : public ScriptPass
 		{
 			run("opt_clean -purge");
 			if (!vlog_file.empty() || help_mode) {
-				run(stringf("write_verilog -noattr %s", help_mode ? "<file-name>" : vlog_file.c_str()));
+				run(stringf("write_verilog -noattr %s", help_mode ? "<file-name>" : vlog_file));
 			}
 		}
 
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode) {
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 			}
 		}
 	}
diff --git a/techlibs/gowin/synth_gowin.cc b/techlibs/gowin/synth_gowin.cc
index 484b88b94..8f3553df6 100644
--- a/techlibs/gowin/synth_gowin.cc
+++ b/techlibs/gowin/synth_gowin.cc
@@ -219,8 +219,8 @@ struct SynthGowinPass : public ScriptPass
 		if (check_label("begin"))
 		{
 			run("read_verilog -specify -lib +/gowin/cells_sim.v");
-			run(stringf("read_verilog -specify -lib +/gowin/cells_xtra_%s.v", help_mode ? "<family>" : family.c_str()));
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("read_verilog -specify -lib +/gowin/cells_xtra_%s.v", help_mode ? "<family>" : family));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
diff --git a/techlibs/greenpak4/synth_greenpak4.cc b/techlibs/greenpak4/synth_greenpak4.cc
index a9f7db679..99fe45dc4 100644
--- a/techlibs/greenpak4/synth_greenpak4.cc
+++ b/techlibs/greenpak4/synth_greenpak4.cc
@@ -138,7 +138,7 @@ struct SynthGreenPAK4Pass : public ScriptPass
 		if (check_label("begin"))
 		{
 			run("read_verilog -lib +/greenpak4/cells_sim.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
@@ -202,7 +202,7 @@ struct SynthGreenPAK4Pass : public ScriptPass
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 	}
 } SynthGreenPAK4Pass;
diff --git a/techlibs/ice40/ice40_wrapcarry.cc b/techlibs/ice40/ice40_wrapcarry.cc
index 014490564..fe928ba6d 100644
--- a/techlibs/ice40/ice40_wrapcarry.cc
+++ b/techlibs/ice40/ice40_wrapcarry.cc
@@ -59,9 +59,9 @@ void create_ice40_wrapcarry(ice40_wrapcarry_pm &pm)
 	cell->setParam(ID::LUT, st.lut->getParam(ID(LUT_INIT)));
 
 	for (const auto &a : st.carry->attributes)
-		cell->attributes[stringf("\\SB_CARRY.%s", a.first.c_str())] = a.second;
+		cell->attributes[stringf("\\SB_CARRY.%s", a.first)] = a.second;
 	for (const auto &a : st.lut->attributes)
-		cell->attributes[stringf("\\SB_LUT4.%s", a.first.c_str())] = a.second;
+		cell->attributes[stringf("\\SB_LUT4.%s", a.first)] = a.second;
 	cell->attributes[ID(SB_LUT4.name)] = Const(st.lut->name.str());
 	if (st.carry->get_bool_attribute(ID::keep) || st.lut->get_bool_attribute(ID::keep))
 		cell->attributes[ID::keep] = true;
diff --git a/techlibs/ice40/synth_ice40.cc b/techlibs/ice40/synth_ice40.cc
index 818323892..d433c0408 100644
--- a/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@ -302,7 +302,7 @@ struct SynthIce40Pass : public ScriptPass
 		if (check_label("begin"))
 		{
 			run("read_verilog " + define + " -lib -specify +/ice40/cells_sim.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 			run("proc");
 		}
 
@@ -419,10 +419,10 @@ struct SynthIce40Pass : public ScriptPass
 					std::string abc9_opts;
 					std::string k = "synth_ice40.abc9.W";
 					if (active_design && active_design->scratchpad.count(k))
-						abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k).c_str());
+						abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k));
 					else {
-						k = stringf("synth_ice40.abc9.%s.W", device_opt.c_str());
-						abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k).c_str());
+						k = stringf("synth_ice40.abc9.%s.W", device_opt);
+						abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k));
 					}
 					if (dff)
 						abc9_opts += " -dff";
@@ -475,13 +475,13 @@ struct SynthIce40Pass : public ScriptPass
 		if (check_label("edif"))
 		{
 			if (!edif_file.empty() || help_mode)
-				run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file.c_str()));
+				run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file));
 		}
 
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 	}
 } SynthIce40Pass;
diff --git a/techlibs/intel/synth_intel.cc b/techlibs/intel/synth_intel.cc
index 11567ece9..af0717235 100644
--- a/techlibs/intel/synth_intel.cc
+++ b/techlibs/intel/synth_intel.cc
@@ -188,12 +188,12 @@ struct SynthIntelPass : public ScriptPass {
 	{
 		if (check_label("begin")) {
 			if (check_label("family"))
-				run(stringf("read_verilog -sv -lib +/intel/%s/cells_sim.v", family_opt.c_str()));
+				run(stringf("read_verilog -sv -lib +/intel/%s/cells_sim.v", family_opt));
 
 			// Misc and common cells
 			run("read_verilog -sv -lib +/intel/common/m9k_bb.v");
 			run("read_verilog -sv -lib +/intel/common/altpll_bb.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (check_label("coarse")) {
@@ -225,7 +225,7 @@ struct SynthIntelPass : public ScriptPass {
 					run("techmap -map +/mul2dsp.v -D DSP_A_MAXWIDTH=9 -D DSP_B_MAXWIDTH=9  -D DSP_A_MINWIDTH=4 -D DSP_B_MINWIDTH=4 -D DSP_NAME=$__MUL9X9");
 					run("chtype -set $mul t:$__soft_mul");
 				run("alumacc");
-				run(stringf("techmap -map +/intel/%s/dsp_map.v", family_opt.c_str()));
+				run(stringf("techmap -map +/intel/%s/dsp_map.v", family_opt));
 			} else {
 				run("alumacc");
 			}
@@ -274,7 +274,7 @@ struct SynthIntelPass : public ScriptPass {
 		if (check_label("map_cells")) {
 			if (iopads || help_mode)
 				run("iopadmap -bits -outpad $__outpad I:O -inpad $__inpad O:I", "(if -iopads)");
-			run(stringf("techmap -map +/intel/%s/cells_map.v", family_opt.c_str()));
+			run(stringf("techmap -map +/intel/%s/cells_map.v", family_opt));
 			run("clean -purge");
 		}
 
@@ -294,7 +294,7 @@ struct SynthIntelPass : public ScriptPass {
 		if (check_label("vpr")) {
 			if (!blif_file.empty() || help_mode) {
 				run(stringf("opt_clean -purge"));
-				run(stringf("write_blif %s", help_mode ? "<file-name>" : blif_file.c_str()));
+				run(stringf("write_blif %s", help_mode ? "<file-name>" : blif_file));
 			}
 		}
 	}
diff --git a/techlibs/intel_alm/synth_intel_alm.cc b/techlibs/intel_alm/synth_intel_alm.cc
index cdae9586e..28852d7df 100644
--- a/techlibs/intel_alm/synth_intel_alm.cc
+++ b/techlibs/intel_alm/synth_intel_alm.cc
@@ -169,17 +169,17 @@ struct SynthIntelALMPass : public ScriptPass {
 
 		if (check_label("begin")) {
 			if (family_opt == "cyclonev")
-				run(stringf("read_verilog -sv -lib +/intel_alm/%s/cells_sim.v", family_opt.c_str()));
-			run(stringf("read_verilog -specify -lib -D %s +/intel_alm/common/alm_sim.v", family_opt.c_str()));
-			run(stringf("read_verilog -specify -lib -D %s +/intel_alm/common/dff_sim.v", family_opt.c_str()));
-			run(stringf("read_verilog -specify -lib -D %s +/intel_alm/common/dsp_sim.v", family_opt.c_str()));
-			run(stringf("read_verilog -specify -lib -D %s +/intel_alm/common/mem_sim.v", family_opt.c_str()));
-			run(stringf("read_verilog -specify -lib -D %s +/intel_alm/common/misc_sim.v", family_opt.c_str()));
-			run(stringf("read_verilog -specify -lib -D %s -icells +/intel_alm/common/abc9_model.v", family_opt.c_str()));
+				run(stringf("read_verilog -sv -lib +/intel_alm/%s/cells_sim.v", family_opt));
+			run(stringf("read_verilog -specify -lib -D %s +/intel_alm/common/alm_sim.v", family_opt));
+			run(stringf("read_verilog -specify -lib -D %s +/intel_alm/common/dff_sim.v", family_opt));
+			run(stringf("read_verilog -specify -lib -D %s +/intel_alm/common/dsp_sim.v", family_opt));
+			run(stringf("read_verilog -specify -lib -D %s +/intel_alm/common/mem_sim.v", family_opt));
+			run(stringf("read_verilog -specify -lib -D %s +/intel_alm/common/misc_sim.v", family_opt));
+			run(stringf("read_verilog -specify -lib -D %s -icells +/intel_alm/common/abc9_model.v", family_opt));
 			// Misc and common cells
 			run("read_verilog -lib +/intel/common/altpll_bb.v");
 			run("read_verilog -lib +/intel_alm/common/megafunction_bb.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (check_label("coarse")) {
@@ -225,8 +225,8 @@ struct SynthIntelALMPass : public ScriptPass {
 		}
 
 		if (!nobram && check_label("map_bram", "(skip if -nobram)")) {
-			run(stringf("memory_bram -rules +/intel_alm/common/bram_%s.txt", bram_type.c_str()));
-			run(stringf("techmap -map +/intel_alm/common/bram_%s_map.v", bram_type.c_str()));
+			run(stringf("memory_bram -rules +/intel_alm/common/bram_%s.txt", bram_type));
+			run(stringf("techmap -map +/intel_alm/common/bram_%s_map.v", bram_type));
 		}
 
 		if (!nolutram && check_label("map_lutram", "(skip if -nolutram)")) {
diff --git a/techlibs/lattice/synth_lattice.cc b/techlibs/lattice/synth_lattice.cc
index 16a068b07..e1df20dd7 100644
--- a/techlibs/lattice/synth_lattice.cc
+++ b/techlibs/lattice/synth_lattice.cc
@@ -333,7 +333,7 @@ struct SynthLatticePass : public ScriptPass
 		if (check_label("begin"))
 		{
 			run("read_verilog -lib -specify +/lattice/cells_sim" + postfix + ".v +/lattice/cells_bb" + postfix + ".v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (check_label("coarse"))
@@ -449,9 +449,9 @@ struct SynthLatticePass : public ScriptPass
 					abc9_opts += " -maxlut 4";
 				std::string k = "synth_lattice.abc9.W";
 				if (active_design && active_design->scratchpad.count(k))
-					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k).c_str());
+					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k));
 				else
-					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k).c_str());
+					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k));
 				if (nowidelut)
 					abc9_opts += " -maxlut 4";
 				if (dff)
@@ -489,13 +489,13 @@ struct SynthLatticePass : public ScriptPass
 		if (check_label("edif"))
 		{
 			if (!edif_file.empty() || help_mode)
-				run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file.c_str()));
+				run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file));
 		}
 
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 	}
 } SynthLatticePass;
diff --git a/techlibs/microchip/synth_microchip.cc b/techlibs/microchip/synth_microchip.cc
index 727bf9ac6..77cedcd1f 100644
--- a/techlibs/microchip/synth_microchip.cc
+++ b/techlibs/microchip/synth_microchip.cc
@@ -262,7 +262,7 @@ struct SynthMicrochipPass : public ScriptPass {
 			read_args += " -lib -specify +/microchip/cells_sim.v";
 			run("read_verilog" + read_args);
 
-			run(stringf("hierarchy -check %s", top_opt.c_str()));
+			run(stringf("hierarchy -check %s", top_opt));
 		}
 
 		if (check_label("prepare")) {
@@ -534,18 +534,18 @@ struct SynthMicrochipPass : public ScriptPass {
 
 		if (check_label("edif")) {
 			if (!edif_file.empty() || help_mode)
-				run(stringf("write_edif -pvector bra %s", edif_file.c_str()));
+				run(stringf("write_edif -pvector bra %s", edif_file));
 		}
 
 		if (check_label("blif")) {
 			if (!blif_file.empty() || help_mode)
-				run(stringf("write_blif %s", blif_file.c_str()));
+				run(stringf("write_blif %s", blif_file));
 		}
 
 		if (check_label("vlog"))
 		{
 			if (!vlog_file.empty() || help_mode)
-				run(stringf("write_verilog %s", help_mode ? "<file-name>" : vlog_file.c_str()));
+				run(stringf("write_verilog %s", help_mode ? "<file-name>" : vlog_file));
 		}
 	}
 } SynthMicrochipPass;
diff --git a/techlibs/nanoxplore/synth_nanoxplore.cc b/techlibs/nanoxplore/synth_nanoxplore.cc
index 4674559fb..a8f4a05d1 100644
--- a/techlibs/nanoxplore/synth_nanoxplore.cc
+++ b/techlibs/nanoxplore/synth_nanoxplore.cc
@@ -244,7 +244,7 @@ struct SynthNanoXplorePass : public ScriptPass
 			run("read_verilog -lib -specify +/nanoxplore/cells_sim.v +/nanoxplore/cells_sim" + postfix + ".v +/nanoxplore/cells_bb.v +/nanoxplore/cells_bb" + postfix + ".v");
 			run("techmap -map +/nanoxplore/cells_wrap.v");
 			run("techmap -map +/nanoxplore/cells_wrap" + postfix + ".v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (check_label("coarse"))
@@ -335,9 +335,9 @@ struct SynthNanoXplorePass : public ScriptPass
 				std::string abc9_opts = " -maxlut 4";
 				std::string k = "synth_nanoxplore.abc9.W";
 				if (active_design && active_design->scratchpad.count(k))
-					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k).c_str());
+					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k));
 				else
-					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k).c_str());
+					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k));
 				run("abc9" + abc9_opts);
 			} else {
 				std::string abc_args = " -dress";
@@ -362,7 +362,7 @@ struct SynthNanoXplorePass : public ScriptPass
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 	}
 } SynthNanoXplorePass;
diff --git a/techlibs/nexus/synth_nexus.cc b/techlibs/nexus/synth_nexus.cc
index 2935fbd3b..83abd156a 100644
--- a/techlibs/nexus/synth_nexus.cc
+++ b/techlibs/nexus/synth_nexus.cc
@@ -254,7 +254,7 @@ struct SynthNexusPass : public ScriptPass
 		if (check_label("begin"))
 		{
 			run("read_verilog -lib -specify +/nexus/cells_sim.v +/nexus/cells_xtra.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (check_label("coarse"))
@@ -361,9 +361,9 @@ struct SynthNexusPass : public ScriptPass
 					abc9_opts += " -maxlut 4";
 				std::string k = "synth_nexus.abc9.W";
 				if (active_design && active_design->scratchpad.count(k))
-					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k).c_str());
+					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k));
 				else
-					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k).c_str());
+					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k));
 				if (nowidelut)
 					abc9_opts += " -maxlut 4";
 				if (dff)
@@ -405,13 +405,13 @@ struct SynthNexusPass : public ScriptPass
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 
 		if (check_label("vm"))
 		{
 			if (!vm_file.empty() || help_mode)
-				run(stringf("write_verilog %s", help_mode ? "<file-name>" : vm_file.c_str()));
+				run(stringf("write_verilog %s", help_mode ? "<file-name>" : vm_file));
 		}
 	}
 } SynthNexusPass;
diff --git a/techlibs/quicklogic/synth_quicklogic.cc b/techlibs/quicklogic/synth_quicklogic.cc
index c9b8eb289..84f9c48a7 100644
--- a/techlibs/quicklogic/synth_quicklogic.cc
+++ b/techlibs/quicklogic/synth_quicklogic.cc
@@ -198,16 +198,16 @@ struct SynthQuickLogicPass : public ScriptPass {
 		}
 
 		if (check_label("begin")) {
-			std::string read_simlibs = stringf("read_verilog -lib -specify %scommon/cells_sim.v %s%s/cells_sim.v", lib_path.c_str(), lib_path.c_str(), family.c_str());
+			std::string read_simlibs = stringf("read_verilog -lib -specify %scommon/cells_sim.v %s%s/cells_sim.v", lib_path, lib_path, family);
 			if (family == "qlf_k6n10f") {
-				read_simlibs += stringf(" %sqlf_k6n10f/brams_sim.v", lib_path.c_str());
+				read_simlibs += stringf(" %sqlf_k6n10f/brams_sim.v", lib_path);
 				if (bramTypes)
-					read_simlibs += stringf(" %sqlf_k6n10f/bram_types_sim.v", lib_path.c_str());
+					read_simlibs += stringf(" %sqlf_k6n10f/bram_types_sim.v", lib_path);
 				if (dsp)
-					read_simlibs += stringf(" %sqlf_k6n10f/dsp_sim.v", lib_path.c_str());
+					read_simlibs += stringf(" %sqlf_k6n10f/dsp_sim.v", lib_path);
 			}
 			run(read_simlibs);
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (check_label("prepare")) {
@@ -373,13 +373,13 @@ struct SynthQuickLogicPass : public ScriptPass {
 
 		if (check_label("blif", "(if -blif)")) {
 			if (!blif_file.empty() || help_mode) {
-				run(stringf("write_blif -attr -param %s %s", top_opt.c_str(), blif_file.c_str()));
+				run(stringf("write_blif -attr -param %s %s", top_opt, blif_file));
 			}
 		}
 
 		if (check_label("verilog", "(if -verilog)")) {
 			if (!verilog_file.empty() || help_mode) {
-				run(stringf("write_verilog -noattr -nohex %s", help_mode ? "<file-name>" : verilog_file.c_str()));
+				run(stringf("write_verilog -noattr -nohex %s", help_mode ? "<file-name>" : verilog_file));
 			}
 		}
 	}
diff --git a/techlibs/sf2/synth_sf2.cc b/techlibs/sf2/synth_sf2.cc
index bf4a6e031..ad335536b 100644
--- a/techlibs/sf2/synth_sf2.cc
+++ b/techlibs/sf2/synth_sf2.cc
@@ -166,7 +166,7 @@ struct SynthSf2Pass : public ScriptPass
 		if (check_label("begin"))
 		{
 			run("read_verilog -lib +/sf2/cells_sim.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt.c_str()));
+			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
 		}
 
 		if (flatten && check_label("flatten", "(unless -noflatten)"))
@@ -244,19 +244,19 @@ struct SynthSf2Pass : public ScriptPass
 		if (check_label("edif"))
 		{
 			if (!edif_file.empty() || help_mode)
-				run(stringf("write_edif -gndvccy %s", help_mode ? "<file-name>" : edif_file.c_str()));
+				run(stringf("write_edif -gndvccy %s", help_mode ? "<file-name>" : edif_file));
 		}
 
 		if (check_label("vlog"))
 		{
 			if (!vlog_file.empty() || help_mode)
-				run(stringf("write_verilog %s", help_mode ? "<file-name>" : vlog_file.c_str()));
+				run(stringf("write_verilog %s", help_mode ? "<file-name>" : vlog_file));
 		}
 
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 	}
 } SynthSf2Pass;
diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index 505026fe8..4e422c5cd 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -350,7 +350,7 @@ struct SynthXilinxPass : public ScriptPass
 
 			run("read_verilog -lib +/xilinx/cells_xtra.v");
 
-			run(stringf("hierarchy -check %s", top_opt.c_str()));
+			run(stringf("hierarchy -check %s", top_opt));
 		}
 
 		if (check_label("prepare")) {
@@ -649,10 +649,10 @@ struct SynthXilinxPass : public ScriptPass
 				std::string abc9_opts;
 				std::string k = "synth_xilinx.abc9.W";
 				if (active_design && active_design->scratchpad.count(k))
-					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k).c_str());
+					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k));
 				else {
-					k = stringf("synth_xilinx.abc9.%s.W", family.c_str());
-					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k, RTLIL::constpad.at("synth_xilinx.abc9.xc7.W")).c_str());
+					k = stringf("synth_xilinx.abc9.%s.W", family);
+					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k, RTLIL::constpad.at("synth_xilinx.abc9.xc7.W")));
 				}
 				if (nowidelut)
 					abc9_opts += stringf(" -maxlut %d", lut_size);
@@ -718,18 +718,18 @@ struct SynthXilinxPass : public ScriptPass
 
 		if (check_label("edif")) {
 			if (!edif_file.empty() || help_mode)
-				run(stringf("write_edif -pvector bra %s", edif_file.c_str()));
+				run(stringf("write_edif -pvector bra %s", edif_file));
 		}
 
 		if (check_label("blif")) {
 			if (!blif_file.empty() || help_mode)
-				run(stringf("write_blif %s", blif_file.c_str()));
+				run(stringf("write_blif %s", blif_file));
 		}
 
 		if (check_label("json"))
 		{
 			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file.c_str()));
+				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
 		}
 	}
 } SynthXilinxPass;

From 11f5913da6e5c3c6e44c2d1f4b4526027bae6f04 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 2 Sep 2025 15:25:39 +1200
Subject: [PATCH 440/931] Brewfile: Skip tcl-tk

---
 Brewfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Brewfile b/Brewfile
index d2c1063ca..7ed3fb906 100644
--- a/Brewfile
+++ b/Brewfile
@@ -6,7 +6,6 @@ brew "git"
 brew "graphviz"
 brew "pkg-config"
 brew "python3"
-brew "tcl-tk"
 brew "xdot"
 brew "bash"
 brew "boost-python3"

From 7fb6c1ee52ef0f64438b443a8d2d1cfdd91a863e Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 3 Sep 2025 03:32:00 +1200
Subject: [PATCH 441/931] test-compile.yml: Specify clang-19

Will trigger C++20 builds to run (which are currently failing).
---
 .github/workflows/test-compile.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index 7d87ab56e..95c6ea4c1 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -38,10 +38,10 @@ jobs:
         include:
           # macOS x86
           - os: macos-13
-            compiler: 'clang'
+            compiler: 'clang-19'
           # macOS arm
           - os: macos-latest
-            compiler: 'clang'
+            compiler: 'clang-19'
       fail-fast: false
     steps:
       - name: Checkout Yosys

From d70f132792bcd02d3de8262eb20a861fccdc7d94 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 3 Sep 2025 03:32:01 +1200
Subject: [PATCH 442/931] wrapcell.cc: Avoid format name collision

---
 passes/cmds/wrapcell.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/passes/cmds/wrapcell.cc b/passes/cmds/wrapcell.cc
index 0c15848e4..39a183e23 100644
--- a/passes/cmds/wrapcell.cc
+++ b/passes/cmds/wrapcell.cc
@@ -47,7 +47,7 @@ struct ContextData {
 	std::string unused_outputs;
 };
 
-std::optional<std::string> format(std::string fmt, const dict<IdString, Const> &parameters,
+std::optional<std::string> format_with_params(std::string fmt, const dict<IdString, Const> &parameters,
 								  const ContextData &context)
 {
 	std::stringstream result;
@@ -230,7 +230,7 @@ struct WrapcellPass : Pass {
 						context.unused_outputs += "_" + RTLIL::unescape_id(chunk.format(cell));
 				}
 
-				std::optional<std::string> unescaped_name = format(name_fmt, cell->parameters, context);
+				std::optional<std::string> unescaped_name = format_with_params(name_fmt, cell->parameters, context);
 				if (!unescaped_name)
 					log_error("Formatting error when processing cell '%s' in module '%s'\n",
 							  log_id(cell), log_id(module));
@@ -270,7 +270,7 @@ struct WrapcellPass : Pass {
 					if (rule.value_fmt.empty()) {
 						subm->set_bool_attribute(rule.name);
 					} else {
-						std::optional<std::string> value = format(rule.value_fmt, cell->parameters, context);
+						std::optional<std::string> value = format_with_params(rule.value_fmt, cell->parameters, context);
 
 						if (!value)
 							log_error("Formatting error when processing cell '%s' in module '%s'\n",

From 5d59903f36ee1582989898000a49d5aa0c600695 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 3 Sep 2025 09:32:21 +1200
Subject: [PATCH 443/931] Bump Windows SDK

---
 .github/workflows/extra-builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 458eb76a6..9c15c3383 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -51,7 +51,7 @@ jobs:
         uses: microsoft/setup-msbuild@v2
       - name: MSBuild
         working-directory: yosys-win32-vcxsrc-latest
-        run: msbuild YosysVS.sln /p:PlatformToolset=v142 /p:Configuration=Release /p:WindowsTargetPlatformVersion=10.0.17763.0
+        run: msbuild YosysVS.sln /p:PlatformToolset=v142 /p:Configuration=Release /p:WindowsTargetPlatformVersion=10.0.26100.0
 
   wasi-build:
     name: WASI build

From 45829e4d082846d9ade378669297c5afd8acb5d1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Sep 2025 00:21:58 +0000
Subject: [PATCH 444/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 003743f49..155deee0e 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+197
+YOSYS_VER := 0.56+213
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 7454699a0062932ac2a7978dec77b6b2cd764a60 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 3 Sep 2025 17:34:09 +0200
Subject: [PATCH 445/931] Update ABC to version as of 03/09/2025

---
 abc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abc b/abc
index fa7fa163d..8827bafb7 160000
--- a/abc
+++ b/abc
@@ -1 +1 @@
-Subproject commit fa7fa163dacdf81bdcb72b2d2713fbe9984b62bb
+Subproject commit 8827bafb7f288de6749dc6e30fa452f2040949c0

From cd7f92429027c35bc237fb27bf996333e9419d7d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 4 Sep 2025 00:22:11 +0000
Subject: [PATCH 446/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 155deee0e..c18fdb2c8 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+213
+YOSYS_VER := 0.56+220
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 3aca86049e79a165932e3e7660358376f45acaed Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 4 Sep 2025 08:00:38 +0200
Subject: [PATCH 447/931] Release version 0.57

---
 CHANGELOG           | 14 +++++++++++++-
 Makefile            |  4 ++--
 docs/source/conf.py |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6365a24e9..360989b2f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,20 @@
 List of major changes and improvements between releases
 =======================================================
 
-Yosys 0.56 .. Yosys 0.57-dev
+Yosys 0.56 .. Yosys 0.57
 --------------------------
+ * New commands and options
+    - Added "-initstates" option to "abstract" pass.
+    - Added "-set-assumes" option to "equiv_induct"
+      and "equiv_simple" passes.
+    - Added "-always" option to "raise_error" pass.
+    - Added "-hierarchy" option to "stat" pass.
+    - Added "-noflatten" option to "synth_quicklogic" pass.
+
+ * Various
+    - smtbmc: Support skipping steps in cover mode.
+    - write_btor: support $buf.
+    - read_verilog: support package import.
 
 Yosys 0.55 .. Yosys 0.56
 --------------------------
diff --git a/Makefile b/Makefile
index c18fdb2c8..2b74548e8 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.56+220
+YOSYS_VER := 0.57
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -182,7 +182,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 9c447ad.. | wc -l`/;" Makefile
+#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 9c447ad.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index ebec6915e..5b93e2e70 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -6,7 +6,7 @@ import os
 project = 'YosysHQ Yosys'
 author = 'YosysHQ GmbH'
 copyright ='2025 YosysHQ GmbH'
-yosys_ver = "0.56"
+yosys_ver = "0.57"
 
 # select HTML theme
 html_theme = 'furo-ys'

From cec48c6abdb4493515330e17c97625675fc1583c Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 4 Sep 2025 08:03:57 +0200
Subject: [PATCH 448/931] Next dev cycle

---
 CHANGELOG | 3 +++
 Makefile  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 360989b2f..468724e81 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 List of major changes and improvements between releases
 =======================================================
 
+Yosys 0.57 .. Yosys 0.58-dev
+--------------------------
+
 Yosys 0.56 .. Yosys 0.57
 --------------------------
  * New commands and options
diff --git a/Makefile b/Makefile
index 2b74548e8..fb4fb5776 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57
+YOSYS_VER := 0.57+0
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -182,7 +182,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 9c447ad.. | wc -l`/;" Makefile
+	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 3aca860.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 

From 41b6c0cb9fefb5dfab77930652c29939f9b89edd Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 1 Sep 2025 03:26:40 +0000
Subject: [PATCH 449/931] Make CellTypes methods take IdString by reference to
 avoid refcount churn

---
 kernel/celltypes.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/celltypes.h b/kernel/celltypes.h
index 11640c25f..f08a695e9 100644
--- a/kernel/celltypes.h
+++ b/kernel/celltypes.h
@@ -303,24 +303,24 @@ struct CellTypes
 		cell_types.clear();
 	}
 
-	bool cell_known(RTLIL::IdString type) const
+	bool cell_known(const RTLIL::IdString &type) const
 	{
 		return cell_types.count(type) != 0;
 	}
 
-	bool cell_output(RTLIL::IdString type, RTLIL::IdString port) const
+	bool cell_output(const RTLIL::IdString &type, const RTLIL::IdString &port) const
 	{
 		auto it = cell_types.find(type);
 		return it != cell_types.end() && it->second.outputs.count(port) != 0;
 	}
 
-	bool cell_input(RTLIL::IdString type, RTLIL::IdString port) const
+	bool cell_input(const RTLIL::IdString &type, const RTLIL::IdString &port) const
 	{
 		auto it = cell_types.find(type);
 		return it != cell_types.end() && it->second.inputs.count(port) != 0;
 	}
 
-	bool cell_evaluable(RTLIL::IdString type) const
+	bool cell_evaluable(const RTLIL::IdString &type) const
 	{
 		auto it = cell_types.find(type);
 		return it != cell_types.end() && it->second.is_evaluable;

From 54a258f8546bbc999fd7ab8a53aeecbdc436fb25 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 1 Sep 2025 03:36:03 +0000
Subject: [PATCH 450/931] In hash_cell_inputs, avoid constructing an std::pair
 (which requires copying the port IdString)

---
 kernel/hashlib.h        | 6 ++++++
 passes/opt/opt_merge.cc | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index 9c53e6687..39530baea 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -188,6 +188,12 @@ template<typename P, typename Q> struct hash_ops<std::pair<P, Q>> {
 		return h;
 	}
 	HASH_TOP_LOOP_FST (const std::pair<P, Q> &a) HASH_TOP_LOOP_SND
+	[[nodiscard]] static inline Hasher hash(const P &p, const Q &q) {
+		Hasher h;
+		h = hash_ops<P>::hash_into(p, h);
+		h = hash_ops<Q>::hash_into(q, h);
+		return h;
+	}
 };
 
 template<typename... T> struct hash_ops<std::tuple<T...>> {
diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index ba8168e74..6c81ee241 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -107,7 +107,7 @@ struct OptMergeWorker
 			for (const auto& [port, sig] : cell->connections()) {
 				if (cell->output(port))
 					continue;
-				comm.eat(hash_ops<std::pair<IdString, SigSpec>>::hash({port, assign_map(sig)}));
+				comm.eat(hash_ops<std::pair<IdString, SigSpec>>::hash(port, assign_map(sig)));
 			}
 			h = comm.hash_into(h);
 			if (RTLIL::builtin_ff_cell_types().count(cell->type))

From b2ccfb2d0e5486e851ccaf70c107add77c3f5914 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 2 Sep 2025 02:43:03 +0000
Subject: [PATCH 451/931] Make in() variadic operator take parameters by
 reference so we don't copy IdStrings

Template argument deduction strips references.
---
 kernel/rtlil.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index e0de79ea9..ea358d83b 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -411,7 +411,7 @@ struct RTLIL::IdString
 	// often one needs to check if a given IdString is part of a list (for example a list
 	// of cell types). the following functions helps with that.
 	template<typename... Args>
-	bool in(Args... args) const {
+	bool in(const Args &... args) const {
 		return (... || in(args));
 	}
 

From ddf7ba5a34619eda291d9510f6da4f65bffbcf4f Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 2 Sep 2025 02:44:02 +0000
Subject: [PATCH 452/931] Make `ID()` macro return a reference to the
 underlying `IdString` instead of copying it

Lambda return type deduction infers `IdString` here.
---
 kernel/yosys_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index bc92e7869..943aa4f05 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -285,7 +285,7 @@ RTLIL::IdString new_id_suffix(std::string file, int line, std::string func, std:
 //
 //  sed -i.orig -r 's/"\\\\([a-zA-Z0-9_]+)"/ID(\1)/g; s/"(\$[a-zA-Z0-9_]+)"/ID(\1)/g;' <filename>
 //
-#define ID(_id) ([]() { const char *p = "\\" #_id, *q = p[1] == '$' ? p+1 : p; \
+#define ID(_id) ([]() -> const RTLIL::IdString & { const char *p = "\\" #_id, *q = p[1] == '$' ? p+1 : p; \
         static const YOSYS_NAMESPACE_PREFIX RTLIL::IdString id(q); return id; })()
 namespace ID = RTLIL::ID;
 

From 030e5ec43851569fc0e7991a6672cebdae295b48 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 2 Sep 2025 03:01:11 +0000
Subject: [PATCH 453/931] Make IdString hashing take a reference to the
 IdString instead of copying it

---
 kernel/rtlil.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index ea358d83b..c81a0c00a 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -430,10 +430,10 @@ namespace hashlib {
 		static inline bool cmp(const RTLIL::IdString &a, const RTLIL::IdString &b) {
 			return a == b;
 		}
-		[[nodiscard]] static inline Hasher hash(const RTLIL::IdString id) {
+		[[nodiscard]] static inline Hasher hash(const RTLIL::IdString &id) {
 			return id.hash_top();
 		}
-		[[nodiscard]] static inline Hasher hash_into(const RTLIL::IdString id, Hasher h) {
+		[[nodiscard]] static inline Hasher hash_into(const RTLIL::IdString &id, Hasher h) {
 			return id.hash_into(h);
 		}
 	};

From ccf140f2efcf916a6e17ecb03dde1c758b75ec56 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 4 Sep 2025 14:47:45 +0200
Subject: [PATCH 454/931] hashlib: don't build an unused hash for expired value
 in do_insert

---
 kernel/hashlib.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index 9c53e6687..bef54b500 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -509,12 +509,11 @@ class dict {
 		return do_lookup_internal(key, hash);
 	}
 
-	int do_insert(const K &key, Hasher::hash_t &hash)
+	int do_insert(const K &key, const Hasher::hash_t &hash)
 	{
 		if (hashtable.empty()) {
 			entries.emplace_back(std::pair<K, T>(key, T()), -1);
 			do_rehash();
-			hash = do_hash(key);
 		} else {
 			entries.emplace_back(std::pair<K, T>(key, T()), hashtable[hash]);
 			hashtable[hash] = entries.size() - 1;
@@ -522,12 +521,11 @@ class dict {
 		return entries.size() - 1;
 	}
 
-	int do_insert(const std::pair<K, T> &value, Hasher::hash_t &hash)
+	int do_insert(const std::pair<K, T> &value, const Hasher::hash_t &hash)
 	{
 		if (hashtable.empty()) {
 			entries.emplace_back(value, -1);
 			do_rehash();
-			hash = do_hash(value.first);
 		} else {
 			entries.emplace_back(value, hashtable[hash]);
 			hashtable[hash] = entries.size() - 1;
@@ -535,13 +533,11 @@ class dict {
 		return entries.size() - 1;
 	}
 
-	int do_insert(std::pair<K, T> &&rvalue, Hasher::hash_t &hash)
+	int do_insert(std::pair<K, T> &&rvalue, const Hasher::hash_t &hash)
 	{
 		if (hashtable.empty()) {
-			auto key = rvalue.first;
 			entries.emplace_back(std::forward<std::pair<K, T>>(rvalue), -1);
 			do_rehash();
-			hash = do_hash(key);
 		} else {
 			entries.emplace_back(std::forward<std::pair<K, T>>(rvalue), hashtable[hash]);
 			hashtable[hash] = entries.size() - 1;

From 6276464ea7366762d68ed3392c8558d7f087388d Mon Sep 17 00:00:00 2001
From: Mike Inouye <mikeinouye@google.com>
Date: Thu, 4 Sep 2025 10:52:37 -0700
Subject: [PATCH 455/931] Increase muxtree glob eval attempts to 10M.

---
 passes/opt/opt_muxtree.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/opt/opt_muxtree.cc b/passes/opt/opt_muxtree.cc
index 98803b935..809353f8c 100644
--- a/passes/opt/opt_muxtree.cc
+++ b/passes/opt/opt_muxtree.cc
@@ -64,7 +64,7 @@ struct OptMuxtreeWorker
 	RTLIL::Module *module;
 	SigMap assign_map;
 	int removed_count;
-	int glob_evals_left = 100000;
+	int glob_evals_left = 10000000;
 
 	struct bitinfo_t {
 		// Is bit directly used by non-mux cells or ports?

From ae8c4e2ea6ee8f6c2e68261c06eb7f33131732ee Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Sat, 30 Aug 2025 06:13:12 +0300
Subject: [PATCH 456/931] libparse/filterlib: mark LibertyParser::error() as
 weak

When FILTERLIB is defined (attempts to compile libparse more or less standalone,) mark the `LibertyParser::error()` as weak so utilities using libparse as a library can override its behavior (the default behavior being exit(1)). As the code is quite performance-critical, I've elected to not modify it to raise an exception or have a callback or similar and simply allow for a link-time replacement.
---
 passes/techmap/libparse.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index c6f87b60b..b60e0b84b 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -676,12 +676,15 @@ void LibertyParser::error(const std::string &str) const
 
 #else
 
+YS_ATTRIBUTE(weak)
 void LibertyParser::error() const
 {
 	fprintf(stderr, "Syntax error in liberty file on line %d.\n", line);
 	exit(1);
 }
 
+
+YS_ATTRIBUTE(weak)
 void LibertyParser::error(const std::string &str) const
 {
 	std::stringstream ss;

From f45255f5a234c46d84b2ac240dbeb86b10f299be Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 12:23:11 +1200
Subject: [PATCH 457/931] tests: More autoname tests

---
 tests/various/autoname.ys | 176 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 172 insertions(+), 4 deletions(-)

diff --git a/tests/various/autoname.ys b/tests/various/autoname.ys
index f12fb7995..88d0837d9 100644
--- a/tests/various/autoname.ys
+++ b/tests/various/autoname.ys
@@ -1,10 +1,11 @@
+# prefer output name
+design -reset
 read_rtlil <<EOT
-autoidx 2
 module \top
-  wire output 3 $y
+  wire output 3 \y
   wire input 1 \a
   wire input 2 \b
-  cell $and \b_$and_B
+  cell $and $name
     parameter \A_SIGNED 0
     parameter \A_WIDTH 1
     parameter \B_SIGNED 0
@@ -12,8 +13,175 @@ module \top
     parameter \Y_WIDTH 1
     connect \A \a
     connect \B \b
+    connect \Y \y
+  end
+end
+EOT
+logger -expect log "Rename cell .name in top to y_.and_Y" 1
+debug autoname
+logger -check-expected
+
+# fallback to shortest name if output is private
+design -reset
+read_rtlil <<EOT
+autoidx 2
+module \top
+  wire output 3 $y
+  wire input 1 \ab
+  wire input 2 \abcd
+  cell $or $name
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \ab
+    connect \B \abcd
     connect \Y $y
   end
 end
 EOT
-autoname
+logger -expect log "Rename cell .name in top to ab_.or_A" 1
+debug autoname
+logger -check-expected
+
+# prefer low fanout over low name length
+design -reset
+read_rtlil <<EOT
+module \top
+  wire output 1 $y
+  wire input 2 \a
+  wire input 3 \bcd
+  wire input 4 \c_has_a_long_name
+  cell $and $name
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \a
+    connect \B \bcd
+    connect \Y $y
+  end
+
+  cell $or $name2
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \a
+    connect \B \c_has_a_long_name
+    connect \Y $y
+  end
+end
+EOT
+logger -expect log "Rename cell .name in top to bcd_.and_B" 1
+logger -expect log "Rename cell .name2 in top to c_has_a_long_name_.or_B" 1
+debug autoname
+logger -check-expected
+
+# names are unique
+design -reset
+read_rtlil <<EOT
+module \top
+  wire output 3 \y
+  wire input 1 \a
+  wire input 2 \b
+  cell $and $name
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \a
+    connect \B \b
+    connect \Y \y
+  end
+
+  cell $and $name2
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \a
+    connect \B \b
+    connect \Y \y
+  end
+end
+EOT
+logger -expect log "Rename cell .name in top to y_.and_Y" 1
+logger -expect log "Rename cell .name2 in top to y_.and_Y_1" 1
+debug autoname
+logger -check-expected
+
+# wires get autonames too
+design -reset
+read_rtlil <<EOT
+module \top
+  wire output 1 $y
+  wire input 2 \a
+  wire input 3 \bcd
+  wire $c
+  wire $d
+  wire $e
+  cell $__unknown $name
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \a
+    connect \B \bcd
+    connect \Y $c
+  end
+
+  cell $or \or
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A \a
+    connect \B \bcd
+    connect \Y $d
+  end
+
+  cell $or $name2
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A $c
+    connect \B $d
+    connect \Y $e
+  end
+
+  cell $and $name3
+    parameter \A_SIGNED 0
+    parameter \A_WIDTH 1
+    parameter \B_SIGNED 0
+    parameter \B_WIDTH 1
+    parameter \Y_WIDTH 1
+    connect \A $c
+    connect \B $e
+    connect \Y $y
+  end
+end
+EOT
+# wires all named for being cell outputs
+logger -expect log "Rename wire .d in top to or_Y" 1
+# $name gets shortest name (otherwise bcd_$__unknown_B)
+logger -expect log "Rename cell .name in top to a_.__unknown_A" 1
+logger -expect log "Rename cell .name2 in top to or_Y_.or_B" 1
+# another output wire
+logger -expect log "Rename wire .e in top to or_Y_.or_B_Y" 1
+# $name3 named for lowest fanout wire (otherwise a_$__unknown_A_Y_$and_A)
+logger -expect log "Rename cell .name3 in top to or_Y_.or_B_Y_.and_B" 1
+# $c gets shortest name, since the cell driving it doesn't have known port
+# directions
+logger -expect log "Rename wire .c in top to or_Y_.or_B_A" 1
+debug autoname t:$and
+logger -check-expected

From fc2cb32e50f1cb920ae770302c9a90dd5dc251de Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 5 Aug 2025 12:24:05 +1200
Subject: [PATCH 458/931] autoname.cc: Avoid int overflow

---
 passes/cmds/autoname.cc | 67 ++++++++++++++++++++++++++---------------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/passes/cmds/autoname.cc b/passes/cmds/autoname.cc
index 737bd3e58..75e54f4b1 100644
--- a/passes/cmds/autoname.cc
+++ b/passes/cmds/autoname.cc
@@ -22,11 +22,24 @@
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
-int autoname_worker(Module *module, const dict<Wire*, int>& wire_score)
+typedef struct name_proposal {
+	string name;
+	unsigned int score;
+	name_proposal() : name(""), score(-1) { }
+	name_proposal(string name, unsigned int score) : name(name), score(score) { }
+	bool operator<(const name_proposal &other) const {
+		if (score != other.score)
+			return score < other.score;
+		else
+			return name.length() < other.name.length();
+	}
+} name_proposal;
+
+int autoname_worker(Module *module, const dict<Wire*, unsigned int>& wire_score)
 {
-	dict<Cell*, pair<int, string>> proposed_cell_names;
-	dict<Wire*, pair<int, string>> proposed_wire_names;
-	int best_score = -1;
+	dict<Cell*, name_proposal> proposed_cell_names;
+	dict<Wire*, name_proposal> proposed_wire_names;
+	name_proposal best_name;
 
 	for (auto cell : module->selected_cells()) {
 		if (cell->name[0] == '$') {
@@ -36,14 +49,14 @@ int autoname_worker(Module *module, const dict<Wire*, int>& wire_score)
 					if (bit.wire != nullptr && bit.wire->name[0] != '$') {
 						if (suffix.empty())
 							suffix = stringf("_%s_%s", log_id(cell->type), log_id(conn.first));
-						string new_name(bit.wire->name.str() + suffix);
-						int score = wire_score.at(bit.wire);
-						if (cell->output(conn.first)) score = 0;
-						score = 10000*score + new_name.size();
-						if (!proposed_cell_names.count(cell) || score < proposed_cell_names.at(cell).first) {
-							if (best_score < 0 || score < best_score)
-								best_score = score;
-							proposed_cell_names[cell] = make_pair(score, new_name);
+						name_proposal proposed_name(
+							bit.wire->name.str() + suffix,
+							cell->output(conn.first) ? 0 : wire_score.at(bit.wire)
+						);
+						if (!proposed_cell_names.count(cell) || proposed_name < proposed_cell_names.at(cell)) {
+							if (proposed_name < best_name)
+								best_name = proposed_name;
+							proposed_cell_names[cell] = proposed_name;
 						}
 					}
 			}
@@ -54,32 +67,36 @@ int autoname_worker(Module *module, const dict<Wire*, int>& wire_score)
 					if (bit.wire != nullptr && bit.wire->name[0] == '$' && !bit.wire->port_id) {
 						if (suffix.empty())
 							suffix = stringf("_%s", log_id(conn.first));
-						string new_name(cell->name.str() + suffix);
-						int score = wire_score.at(bit.wire);
-						if (cell->output(conn.first)) score = 0;
-						score = 10000*score + new_name.size();
-						if (!proposed_wire_names.count(bit.wire) || score < proposed_wire_names.at(bit.wire).first) {
-							if (best_score < 0 || score < best_score)
-								best_score = score;
-							proposed_wire_names[bit.wire] = make_pair(score, new_name);
+						name_proposal proposed_name(
+							cell->name.str() + suffix,
+							cell->output(conn.first) ? 0 : wire_score.at(bit.wire)
+						);
+						if (!proposed_wire_names.count(bit.wire) || proposed_name < proposed_wire_names.at(bit.wire)) {
+							if (proposed_name < best_name)
+								best_name = proposed_name;
+							proposed_wire_names[bit.wire] = proposed_name;
 						}
 					}
 			}
 		}
 	}
 
+	// compare against double best score for following comparisons so we don't
+	// pre-empt a future iteration
+	best_name.score *= 2;
+
 	for (auto &it : proposed_cell_names) {
-		if (best_score*2 < it.second.first)
+		if (best_name < it.second)
 			continue;
-		IdString n = module->uniquify(IdString(it.second.second));
+		IdString n = module->uniquify(IdString(it.second.name));
 		log_debug("Rename cell %s in %s to %s.\n", log_id(it.first), log_id(module), log_id(n));
 		module->rename(it.first, n);
 	}
 
 	for (auto &it : proposed_wire_names) {
-		if (best_score*2 < it.second.first)
+		if (best_name < it.second)
 			continue;
-		IdString n = module->uniquify(IdString(it.second.second));
+		IdString n = module->uniquify(IdString(it.second.name));
 		log_debug("Rename wire %s in %s to %s.\n", log_id(it.first), log_id(module), log_id(n));
 		module->rename(it.first, n);
 	}
@@ -115,7 +132,7 @@ struct AutonamePass : public Pass {
 
 		for (auto module : design->selected_modules())
 		{
-			dict<Wire*, int> wire_score;
+			dict<Wire*, unsigned int> wire_score;
 			for (auto cell : module->selected_cells())
 			for (auto &conn : cell->connections())
 			for (auto bit : conn.second)

From bc77b6213b1db0455ef443a5a044b5160a219145 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 9 Aug 2025 10:52:52 +1200
Subject: [PATCH 459/931] autoname: Fix selection arg

---
 passes/cmds/autoname.cc   | 1 +
 tests/various/autoname.ys | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/passes/cmds/autoname.cc b/passes/cmds/autoname.cc
index 75e54f4b1..d2ff568c3 100644
--- a/passes/cmds/autoname.cc
+++ b/passes/cmds/autoname.cc
@@ -127,6 +127,7 @@ struct AutonamePass : public Pass {
 			// }
 			break;
 		}
+		extra_args(args, argidx, design);
 
 		log_header(design, "Executing AUTONAME pass.\n");
 
diff --git a/tests/various/autoname.ys b/tests/various/autoname.ys
index 88d0837d9..29ca81bbe 100644
--- a/tests/various/autoname.ys
+++ b/tests/various/autoname.ys
@@ -171,11 +171,14 @@ module \top
   end
 end
 EOT
-# wires all named for being cell outputs
+# wires are named for being cell outputs
 logger -expect log "Rename wire .d in top to or_Y" 1
+logger -expect log "Rename cell .name2 in top to or_Y_.or_B" 1
+debug autoname t:$or
+logger -check-expected
+
 # $name gets shortest name (otherwise bcd_$__unknown_B)
 logger -expect log "Rename cell .name in top to a_.__unknown_A" 1
-logger -expect log "Rename cell .name2 in top to or_Y_.or_B" 1
 # another output wire
 logger -expect log "Rename wire .e in top to or_Y_.or_B_Y" 1
 # $name3 named for lowest fanout wire (otherwise a_$__unknown_A_Y_$and_A)
@@ -183,5 +186,5 @@ logger -expect log "Rename cell .name3 in top to or_Y_.or_B_Y_.and_B" 1
 # $c gets shortest name, since the cell driving it doesn't have known port
 # directions
 logger -expect log "Rename wire .c in top to or_Y_.or_B_A" 1
-debug autoname t:$and
+debug autoname
 logger -check-expected

From baa61a146ffdbdb2971022a8cdabebdd1fedffcc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 5 Sep 2025 00:23:12 +0000
Subject: [PATCH 460/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fb4fb5776..a72a35d32 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+0
+YOSYS_VER := 0.57+1
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From c30fd46ea32a132b2524acd98d5a45a97528d725 Mon Sep 17 00:00:00 2001
From: Xing Guo <higuoxing@gmail.com>
Date: Fri, 5 Sep 2025 11:10:25 +0800
Subject: [PATCH 461/931] Fix handling of cases that look like sva labels
 again.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit c8e0ac0 introduces a regression on handling case exprs that look
like sva labels.  After some debugging, we shouldn't push the identifier
ast node to the ast_stack, otherwise, we will get the following
assertion failure:

```
➜  /tmp yosys -p 'read -sv a1.v'

 /----------------------------------------------------------------------------\
 |  yosys -- Yosys Open SYnthesis Suite                                       |
 |  Copyright (C) 2012 - 2025  Claire Xenia Wolf <claire@yosyshq.com>         |
 |  Distributed under an ISC-like license, type "license" to see terms        |
 \----------------------------------------------------------------------------/
 Yosys 0.57+1 (git sha1 baa61a146, clang++ 20.1.8 -fPIC -O3)

-- Running command `read -sv a1.v' --

1. Executing Verilog-2005 frontend: a1.v
Parsing SystemVerilog input from `a1.v' to AST representation.
ERROR: Assert `extra->ast_stack.size() == 1' failed in frontends/verilog/verilog_parser.y:709.
➜  /tmp cat a1.v
module test(input wire A);
  localparam TEST = 1;
  always_comb begin
    case (A)
      TEST: assert(1);
    endcase
  end
endmodule
```

We encountered this issue before but with a different error message[^1],

[^1]: https://github.com/YosysHQ/yosys/issues/862
---
 frontends/verilog/verilog_parser.y | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 392d8921a..c77d0a7cf 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -3023,7 +3023,8 @@ case_expr_list:
 		SET_AST_NODE_LOC(node, @1, @1);
 	} |
 	TOK_SVA_LABEL {
-		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_IDENTIFIER));
+		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_IDENTIFIER));
+		node->str = *$1;
 		SET_AST_NODE_LOC(node, @1, @1);
 	} |
 	expr {

From 62120bda0661102ba60801a871ab5c9f336a8aa6 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 5 Sep 2025 12:34:38 +0200
Subject: [PATCH 462/931] verilog: test cases that look like SVA labels #862

---
 tests/verilog/sva-in-case-expr.ys | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 tests/verilog/sva-in-case-expr.ys

diff --git a/tests/verilog/sva-in-case-expr.ys b/tests/verilog/sva-in-case-expr.ys
new file mode 100644
index 000000000..e326e2bfb
--- /dev/null
+++ b/tests/verilog/sva-in-case-expr.ys
@@ -0,0 +1,10 @@
+read_verilog -sv <<EOT
+module test(input wire A);
+  localparam TEST = 1;
+  always_comb begin
+    case (A)
+      TEST: assert(1);
+    endcase
+  end
+endmodule
+EOT

From 012ddc2f1e5688da442245e6c72ba04626ac2ecf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 6 Sep 2025 00:21:53 +0000
Subject: [PATCH 463/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a72a35d32..5b362a652 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+1
+YOSYS_VER := 0.57+7
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 8fb3f88842ed4dbb6471d830d9ca5e57987987b3 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Thu, 3 Oct 2024 16:34:19 +0200
Subject: [PATCH 464/931] tests: remove -seq 1 from sat with -tempinduct where
 possible

* When used with -tempinduct mode, -seq <N> causes assertions to be
  ignored in the first N steps. While this has uses for reset modelling,
  for these test cases it is unnecessary and could lead to failures
  slipping through uncaught
---
 tests/svtypes/typedef_initial_and_assign.ys | 2 +-
 tests/svtypes/typedef_struct_port.ys        | 4 ++--
 tests/various/const_arg_loop.ys             | 2 +-
 tests/various/const_func.ys                 | 2 +-
 tests/various/countbits.ys                  | 2 +-
 tests/various/param_struct.ys               | 2 +-
 tests/verilog/atom_type_signedness.ys       | 2 +-
 tests/verilog/int_types.ys                  | 2 +-
 tests/verilog/mem_bounds.ys                 | 2 +-
 tests/verilog/param_no_default.ys           | 2 +-
 tests/verilog/parameters_across_files.ys    | 2 +-
 tests/verilog/typedef_across_files.ys       | 2 +-
 tests/verilog/typedef_legacy_conflict.ys    | 2 +-
 tests/verilog/unbased_unsized.ys            | 2 +-
 tests/verilog/unbased_unsized_shift.ys      | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/svtypes/typedef_initial_and_assign.ys b/tests/svtypes/typedef_initial_and_assign.ys
index e778a49bb..4563ca491 100644
--- a/tests/svtypes/typedef_initial_and_assign.ys
+++ b/tests/svtypes/typedef_initial_and_assign.ys
@@ -11,4 +11,4 @@ logger -expect warning "reg '\\var_19' is assigned in a continuous assignment" 1
 read_verilog -sv typedef_initial_and_assign.sv
 hierarchy; proc; opt; async2sync
 select -module top
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/svtypes/typedef_struct_port.ys b/tests/svtypes/typedef_struct_port.ys
index dd0775b9f..6cd61064c 100644
--- a/tests/svtypes/typedef_struct_port.ys
+++ b/tests/svtypes/typedef_struct_port.ys
@@ -1,6 +1,6 @@
 read_verilog -sv typedef_struct_port.sv
 hierarchy; proc; opt; async2sync
 select -module top
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
 select -module test_parser
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/various/const_arg_loop.ys b/tests/various/const_arg_loop.ys
index 01bea7044..21554cc0a 100644
--- a/tests/various/const_arg_loop.ys
+++ b/tests/various/const_arg_loop.ys
@@ -4,4 +4,4 @@ proc
 opt -full
 select -module top
 async2sync
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/various/const_func.ys b/tests/various/const_func.ys
index d982c3a43..e721e0e81 100644
--- a/tests/various/const_func.ys
+++ b/tests/various/const_func.ys
@@ -5,4 +5,4 @@ flatten
 opt -full
 select -module top
 async2sync
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/various/countbits.ys b/tests/various/countbits.ys
index f2db9cfe1..2d972e2d8 100644
--- a/tests/various/countbits.ys
+++ b/tests/various/countbits.ys
@@ -5,4 +5,4 @@ flatten
 opt -full
 select -module top
 async2sync
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/various/param_struct.ys b/tests/various/param_struct.ys
index bb26b61d5..96837aafc 100644
--- a/tests/various/param_struct.ys
+++ b/tests/various/param_struct.ys
@@ -48,4 +48,4 @@ endmodule
 EOF
 hierarchy; proc; opt
 async2sync
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/verilog/atom_type_signedness.ys b/tests/verilog/atom_type_signedness.ys
index c8a82f993..77a0bd291 100644
--- a/tests/verilog/atom_type_signedness.ys
+++ b/tests/verilog/atom_type_signedness.ys
@@ -16,4 +16,4 @@ endmodule
 EOT
 hierarchy; proc; opt; async2sync
 select -module dut
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/verilog/int_types.ys b/tests/verilog/int_types.ys
index 344f3ee09..70c99976c 100644
--- a/tests/verilog/int_types.ys
+++ b/tests/verilog/int_types.ys
@@ -5,4 +5,4 @@ flatten
 opt -full
 async2sync
 select -module top
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/verilog/mem_bounds.ys b/tests/verilog/mem_bounds.ys
index 146a6f433..2c973822a 100644
--- a/tests/verilog/mem_bounds.ys
+++ b/tests/verilog/mem_bounds.ys
@@ -4,4 +4,4 @@ flatten
 opt -full
 select -module top
 async2sync
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all -enable_undef
+sat -verify -tempinduct -prove-asserts -show-all -enable_undef
diff --git a/tests/verilog/param_no_default.ys b/tests/verilog/param_no_default.ys
index 0509f6a1a..c609987e4 100644
--- a/tests/verilog/param_no_default.ys
+++ b/tests/verilog/param_no_default.ys
@@ -5,4 +5,4 @@ flatten
 opt -full
 async2sync
 select -module top
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/verilog/parameters_across_files.ys b/tests/verilog/parameters_across_files.ys
index 94565eb67..3efe3e68c 100644
--- a/tests/verilog/parameters_across_files.ys
+++ b/tests/verilog/parameters_across_files.ys
@@ -18,4 +18,4 @@ flatten
 opt -full
 async2sync
 select -module top
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/verilog/typedef_across_files.ys b/tests/verilog/typedef_across_files.ys
index baa4b7919..8cd578af4 100644
--- a/tests/verilog/typedef_across_files.ys
+++ b/tests/verilog/typedef_across_files.ys
@@ -21,4 +21,4 @@ proc
 opt -full
 async2sync
 select -module top
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/verilog/typedef_legacy_conflict.ys b/tests/verilog/typedef_legacy_conflict.ys
index dd1503a85..d26cc188f 100644
--- a/tests/verilog/typedef_legacy_conflict.ys
+++ b/tests/verilog/typedef_legacy_conflict.ys
@@ -35,4 +35,4 @@ flatten
 opt -full
 async2sync
 select -module top
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/verilog/unbased_unsized.ys b/tests/verilog/unbased_unsized.ys
index 75d1bf5e4..3290650d5 100644
--- a/tests/verilog/unbased_unsized.ys
+++ b/tests/verilog/unbased_unsized.ys
@@ -5,4 +5,4 @@ flatten
 opt -full
 async2sync
 select -module top
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all
diff --git a/tests/verilog/unbased_unsized_shift.ys b/tests/verilog/unbased_unsized_shift.ys
index 2b5b9d8d0..6a72560b8 100644
--- a/tests/verilog/unbased_unsized_shift.ys
+++ b/tests/verilog/unbased_unsized_shift.ys
@@ -5,4 +5,4 @@ flatten
 opt -full
 async2sync
 select -module top
-sat -verify -seq 1 -tempinduct -prove-asserts -show-all
+sat -verify -tempinduct -prove-asserts -show-all

From 23af52c3c8b7cd4898524cf3a9f84f61a8365aa2 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Sat, 6 Sep 2025 00:28:52 +0000
Subject: [PATCH 465/931] Use well-known constants in ID macro and make the
 constant values known at compile time

---
 kernel/constids.inc   | 289 ++++++++++++++++++++++--------------------
 kernel/rtlil.cc       |  27 +++-
 kernel/rtlil.h        | 132 ++++++++++++++++---
 kernel/yosys.cc       |   4 -
 kernel/yosys_common.h |  14 +-
 5 files changed, 294 insertions(+), 172 deletions(-)

diff --git a/kernel/constids.inc b/kernel/constids.inc
index 29872d45e..1419c89fa 100644
--- a/kernel/constids.inc
+++ b/kernel/constids.inc
@@ -1,27 +1,27 @@
+// These must be in perfect ASCII order!!!
+X($_AND_)
+X($_OR_)
+X($_XOR_)
+X($add)
+X($and)
+X($logic_and)
+X($logic_or)
+X($mul)
+X($or)
+X($pmux)
+X($reduce_and)
+X($reduce_bool)
+X($reduce_or)
+X($reduce_xnor)
+X($reduce_xor)
+X($xor)
 X(A)
-X(abc9_box)
-X(abc9_box_id)
-X(abc9_box_seq)
-X(abc9_bypass)
-X(abc9_carry)
-X(abc9_flop)
-X(abc9_keep)
-X(abc9_lut)
-X(abc9_mergeability)
-X(abc9_scc_id)
-X(abcgroup)
 X(ABITS)
 X(AD)
+X(ADDEND_NEGATED)
 X(ADDR)
-X(allconst)
-X(allseq)
 X(ALOAD)
 X(ALOAD_POLARITY)
-X(always_comb)
-X(always_ff)
-X(always_latch)
-X(anyconst)
-X(anyseq)
 X(ARGS)
 X(ARGS_WIDTH)
 X(ARST)
@@ -29,27 +29,21 @@ X(ARST_POLARITY)
 X(ARST_VALUE)
 X(A_SIGNED)
 X(A_WIDTH)
+X(A_WIDTHS)
 X(B)
 X(BI)
 X(BITS_USED)
-X(blackbox)
-X(B_SIGNED)
-X(bugpoint_keep)
-X(B_WIDTH)
 X(BYTE)
+X(B_SIGNED)
+X(B_WIDTH)
+X(B_WIDTHS)
 X(C)
-X(cells_not_processed)
 X(CE_OVER_SRST)
 X(CFG_ABITS)
 X(CFG_DBITS)
 X(CFG_INIT)
-X(chain)
 X(CI)
 X(CLK)
-X(clkbuf_driver)
-X(clkbuf_inhibit)
-X(clkbuf_inv)
-X(clkbuf_sink)
 X(CLK_ENABLE)
 X(CLK_POLARITY)
 X(CLR)
@@ -62,12 +56,13 @@ X(CTRL_IN)
 X(CTRL_IN_WIDTH)
 X(CTRL_OUT)
 X(CTRL_OUT_WIDTH)
+X(C_SIGNED)
+X(C_WIDTHS)
 X(D)
 X(DAT)
 X(DATA)
 X(DAT_DST_PEN)
 X(DAT_DST_POL)
-X(defaultvalue)
 X(DELAY)
 X(DEPTH)
 X(DST)
@@ -75,7 +70,6 @@ X(DST_EN)
 X(DST_PEN)
 X(DST_POL)
 X(DST_WIDTH)
-X(dynports)
 X(E)
 X(EDGE_EN)
 X(EDGE_POL)
@@ -83,82 +77,34 @@ X(EN)
 X(EN_DST)
 X(EN_POLARITY)
 X(EN_SRC)
-X(enum_base_type)
-X(enum_type)
-X(equiv_merged)
-X(equiv_region)
-X(extract_order)
 X(F)
 X(FLAVOR)
 X(FORMAT)
-X(force_downto)
-X(force_upto)
-X(fsm_encoding)
-X(fsm_export)
 X(FULL)
-X(full_case)
 X(G)
-X(gclk)
-X(gentb_clock)
-X(gentb_constant)
-X(gentb_skip)
 X(H)
-X(hdlname)
-X(hierconn)
 X(I)
 X(INIT)
 X(INIT_VALUE)
-X(init)
-X(initial_top)
-X(interface_modport)
-X(interfaces_replaced_in_module)
-X(interface_type)
-X(invertible_pin)
-X(iopad_external_pin)
-X(is_interface)
 X(J)
 X(K)
-X(keep)
-X(keep_hierarchy)
 X(L)
-X(lib_whitebox)
-X(localparam)
-X(logic_block)
-X(lram)
 X(LUT)
-X(lut_keep)
 X(M)
-X(maximize)
-X(mem2reg)
 X(MEMID)
-X(minimize)
-X(module_not_derived)
 X(N)
+X(NADDENDS)
 X(NAME)
-X(noblackbox)
-X(nolatches)
-X(nomem2init)
-X(nomem2reg)
-X(nomeminit)
-X(nosync)
-X(nowrshmsk)
-X(no_ram)
-X(no_rw_check)
+X(NPRODUCTS)
 X(O)
 X(OFFSET)
-X(onehot)
 X(P)
-X(parallel_case)
-X(parameter)
 X(PORTID)
 X(PRIORITY)
 X(PRIORITY_MASK)
-X(promoted_if)
+X(PRODUCT_NEGATED)
 X(Q)
 X(R)
-X(ram_block)
-X(ram_style)
-X(ramstyle)
 X(RD_ADDR)
 X(RD_ARST)
 X(RD_ARST_VALUE)
@@ -176,19 +122,11 @@ X(RD_SRST_VALUE)
 X(RD_TRANSPARENCY_MASK)
 X(RD_TRANSPARENT)
 X(RD_WIDE_CONTINUATION)
-X(reg)
-X(replaced_by_gclk)
-X(reprocess_after)
-X(rom_block)
-X(rom_style)
-X(romstyle)
 X(S)
 X(SET)
 X(SET_POLARITY)
-X(single_bit_vector)
 X(SIZE)
 X(SRC)
-X(src)
 X(SRC_DST_PEN)
 X(SRC_DST_POL)
 X(SRC_EN)
@@ -198,34 +136,24 @@ X(SRC_WIDTH)
 X(SRST)
 X(SRST_POLARITY)
 X(SRST_VALUE)
-X(sta_arrival)
 X(STATE_BITS)
 X(STATE_NUM)
 X(STATE_NUM_LOG2)
 X(STATE_RST)
 X(STATE_TABLE)
-X(smtlib2_module)
-X(smtlib2_comb_expr)
-X(submod)
-X(syn_ramstyle)
-X(syn_romstyle)
 X(S_WIDTH)
 X(T)
 X(TABLE)
 X(TAG)
-X(techmap_autopurge)
-X(_TECHMAP_BITS_CONNMAP_)
-X(_TECHMAP_CELLNAME_)
-X(_TECHMAP_CELLTYPE_)
-X(techmap_celltype)
-X(_TECHMAP_FAIL_)
-X(techmap_maccmap)
-X(_TECHMAP_REPLACE_)
-X(techmap_simplemap)
-X(_techmap_special_)
-X(techmap_wrap)
-X(_TECHMAP_PLACEHOLDER_)
-X(techmap_chtype)
+X(TRANSPARENCY_MASK)
+X(TRANSPARENT)
+X(TRANS_NUM)
+X(TRANS_TABLE)
+X(TRG)
+X(TRG_ENABLE)
+X(TRG_POLARITY)
+X(TRG_WIDTH)
+X(TYPE)
 X(T_FALL_MAX)
 X(T_FALL_MIN)
 X(T_FALL_TYP)
@@ -237,31 +165,12 @@ X(T_LIMIT2_TYP)
 X(T_LIMIT_MAX)
 X(T_LIMIT_MIN)
 X(T_LIMIT_TYP)
-X(to_delete)
-X(top)
-X(TRANS_NUM)
-X(TRANSPARENCY_MASK)
-X(TRANSPARENT)
-X(TRANS_TABLE)
-X(TRG)
-X(TRG_ENABLE)
-X(TRG_POLARITY)
-X(TRG_WIDTH)
 X(T_RISE_MAX)
 X(T_RISE_MIN)
 X(T_RISE_TYP)
-X(TYPE)
 X(U)
-X(unique)
-X(unused_bits)
 X(V)
-X(via_celltype)
-X(wand)
-X(whitebox)
 X(WIDTH)
-X(wildcard_port_conns)
-X(wiretype)
-X(wor)
 X(WORDS)
 X(WR_ADDR)
 X(WR_CLK)
@@ -273,17 +182,125 @@ X(WR_PORTS)
 X(WR_PRIORITY_MASK)
 X(WR_WIDE_CONTINUATION)
 X(X)
-X(xprop_decoder)
 X(Y)
 X(Y_WIDTH)
+X(_TECHMAP_BITS_CONNMAP_)
+X(_TECHMAP_CELLNAME_)
+X(_TECHMAP_CELLTYPE_)
+X(_TECHMAP_FAIL_)
+X(_TECHMAP_PLACEHOLDER_)
+X(_TECHMAP_REPLACE_)
+X(_techmap_special_)
+X(abc9_box)
+X(abc9_box_id)
+X(abc9_box_seq)
+X(abc9_bypass)
+X(abc9_carry)
+X(abc9_flop)
+X(abc9_keep)
+X(abc9_lut)
+X(abc9_mergeability)
+X(abc9_scc_id)
+X(abcgroup)
+X(allconst)
+X(allseq)
+X(always_comb)
+X(always_ff)
+X(always_latch)
+X(anyconst)
+X(anyseq)
 X(area)
+X(blackbox)
+X(bugpoint_keep)
 X(capacitance)
-X(NPRODUCTS)
-X(NADDENDS)
-X(PRODUCT_NEGATED)
-X(ADDEND_NEGATED)
-X(A_WIDTHS)
-X(B_WIDTHS)
-X(C_WIDTHS)
-X(C_SIGNED)
+X(cells_not_processed)
+X(chain)
+X(clkbuf_driver)
+X(clkbuf_inhibit)
+X(clkbuf_inv)
+X(clkbuf_sink)
+X(defaultvalue)
+X(dynports)
+X(enum_base_type)
+X(enum_type)
+X(equiv_merged)
+X(equiv_region)
+X(extract_order)
+X(force_downto)
+X(force_upto)
+X(fsm_encoding)
+X(fsm_export)
+X(full_case)
+X(gclk)
+X(gentb_clock)
+X(gentb_constant)
+X(gentb_skip)
+X(hdlname)
+X(hierconn)
+X(init)
+X(initial_top)
+X(interface_modport)
+X(interface_type)
+X(interfaces_replaced_in_module)
+X(invertible_pin)
+X(iopad_external_pin)
+X(is_interface)
+X(keep)
+X(keep_hierarchy)
+X(lib_whitebox)
+X(localparam)
+X(logic_block)
+X(lram)
+X(lut_keep)
+X(maximize)
+X(mem2reg)
+X(minimize)
+X(module_not_derived)
+X(no_ram)
+X(no_rw_check)
+X(noblackbox)
+X(nolatches)
+X(nomem2init)
+X(nomem2reg)
+X(nomeminit)
+X(nosync)
+X(nowrshmsk)
+X(onehot)
+X(parallel_case)
+X(parameter)
+X(promoted_if)
 X(raise_error)
+X(ram_block)
+X(ram_style)
+X(ramstyle)
+X(reg)
+X(replaced_by_gclk)
+X(reprocess_after)
+X(rom_block)
+X(rom_style)
+X(romstyle)
+X(single_bit_vector)
+X(smtlib2_comb_expr)
+X(smtlib2_module)
+X(src)
+X(sta_arrival)
+X(submod)
+X(syn_ramstyle)
+X(syn_romstyle)
+X(techmap_autopurge)
+X(techmap_celltype)
+X(techmap_chtype)
+X(techmap_maccmap)
+X(techmap_simplemap)
+X(techmap_wrap)
+X(to_delete)
+X(top)
+X(unique)
+X(unused_bits)
+X(via_celltype)
+X(wand)
+X(whitebox)
+X(wildcard_port_conns)
+X(wiretype)
+X(wor)
+X(xprop_decoder)
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 13f6b1075..9c7e3888c 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <algorithm>
 #include <optional>
+#include <string_view>
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -37,7 +38,7 @@ RTLIL::IdString::destruct_guard_t RTLIL::IdString::destruct_guard;
 std::vector<char*> RTLIL::IdString::global_id_storage_;
 std::unordered_map<std::string_view, int> RTLIL::IdString::global_id_index_;
 #ifndef YOSYS_NO_IDS_REFCNT
-std::vector<int> RTLIL::IdString::global_refcount_storage_;
+std::vector<uint32_t> RTLIL::IdString::global_refcount_storage_;
 std::vector<int> RTLIL::IdString::global_free_idx_list_;
 #endif
 #ifdef YOSYS_USE_STICKY_IDS
@@ -45,10 +46,32 @@ int RTLIL::IdString::last_created_idx_[8];
 int RTLIL::IdString::last_created_idx_ptr_;
 #endif
 
-#define X(_id) IdString RTLIL::ID::_id;
+#define X(N) const RTLIL::IdString RTLIL::ID::N(RTLIL::StaticId::N);
 #include "kernel/constids.inc"
 #undef X
 
+static void populate(std::string_view name)
+{
+	if (name[1] == '$') {
+		// Skip prepended '\'
+		name = name.substr(1);
+	}
+	RTLIL::IdString::global_id_index_.insert({name, GetSize(RTLIL::IdString::global_id_storage_)});
+	RTLIL::IdString::global_id_storage_.push_back(const_cast<char*>(name.data()));
+}
+
+void RTLIL::IdString::prepopulate()
+{
+	int size = static_cast<short>(RTLIL::StaticId::STATIC_ID_END);
+	global_id_storage_.reserve(size);
+	RTLIL::IdString::global_id_storage_.push_back(const_cast<char*>(""));
+	global_id_index_.reserve(size);
+	global_refcount_storage_.resize(size, 1);
+#define X(N) populate("\\" #N);
+#include "kernel/constids.inc"
+#undef X
+}
+
 dict<std::string, std::string> RTLIL::constpad;
 
 const pool<IdString> &RTLIL::builtin_ff_cell_types() {
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index c81a0c00a..80d0d0cfb 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -83,6 +83,14 @@ namespace RTLIL
 		SB_EXCL_BB_CMDERR = 15 // call log_cmd_error on black boxed module
 	};
 
+	enum class StaticId : short {
+		STATIC_ID_BEGIN = 0,
+#define X(N) N,
+#include "kernel/constids.inc"
+#undef X
+		STATIC_ID_END,
+	};
+
 	struct Const;
 	struct AttrObject;
 	struct NamedObject;
@@ -105,8 +113,18 @@ namespace RTLIL
 	struct Process;
 	struct Binding;
 	struct IdString;
+	struct StaticIdString;
 
 	typedef std::pair<SigSpec, SigSpec> SigSig;
+
+	struct StaticIdString {
+		constexpr StaticIdString(StaticId id, const IdString &id_str) : id_str(id_str), id(id) {}
+		constexpr inline operator const IdString &() const { return id_str; }
+		constexpr inline int index() const { return static_cast<short>(id); }
+
+		const IdString &id_str;
+		const StaticId id;
+	};
 };
 
 struct RTLIL::IdString
@@ -127,7 +145,13 @@ struct RTLIL::IdString
 	static std::vector<char*> global_id_storage_;
 	static std::unordered_map<std::string_view, int> global_id_index_;
 #ifndef YOSYS_NO_IDS_REFCNT
-	static std::vector<int> global_refcount_storage_;
+	// For prepopulated IdStrings, the refcount is meaningless since they
+	// are never freed even if the refcount is zero. For code efficiency
+	// we increment the refcount of prepopulated IdStrings like any other string,
+	// but we never decrement the refcount or check whether it's zero.
+	// So, make this unsigned because refcounts of preopulated IdStrings may overflow
+	// and overflow of signed integers is undefined behavior.
+	static std::vector<uint32_t> global_refcount_storage_;
 	static std::vector<int> global_free_idx_list_;
 #endif
 
@@ -144,7 +168,7 @@ struct RTLIL::IdString
 			if (global_id_storage_.at(idx) == nullptr)
 				log("#X# DB-DUMP index %d: FREE\n", idx);
 			else
-				log("#X# DB-DUMP index %d: '%s' (ref %d)\n", idx, global_id_storage_.at(idx), global_refcount_storage_.at(idx));
+				log("#X# DB-DUMP index %d: '%s' (ref %u)\n", idx, global_id_storage_.at(idx), global_refcount_storage_.at(idx));
 		}
 	#endif
 	}
@@ -166,15 +190,13 @@ struct RTLIL::IdString
 
 	static inline int get_reference(int idx)
 	{
-		if (idx) {
 	#ifndef YOSYS_NO_IDS_REFCNT
-			global_refcount_storage_[idx]++;
+		global_refcount_storage_[idx]++;
 	#endif
 	#ifdef YOSYS_XTRACE_GET_PUT
-			if (yosys_xtrace)
-				log("#X# GET-BY-INDEX '%s' (index %d, refcount %d)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
+		if (yosys_xtrace && idx >= static_cast<short>(StaticId::STATIC_ID_END))
+			log("#X# GET-BY-INDEX '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
 	#endif
-		}
 		return idx;
 	}
 
@@ -182,9 +204,6 @@ struct RTLIL::IdString
 	{
 		log_assert(destruct_guard_ok);
 
-		if (!p[0])
-			return 0;
-
 		auto it = global_id_index_.find((char*)p);
 		if (it != global_id_index_.end()) {
 	#ifndef YOSYS_NO_IDS_REFCNT
@@ -192,11 +211,17 @@ struct RTLIL::IdString
 	#endif
 	#ifdef YOSYS_XTRACE_GET_PUT
 			if (yosys_xtrace)
-				log("#X# GET-BY-NAME '%s' (index %d, refcount %d)\n", global_id_storage_.at(it->second), it->second, global_refcount_storage_.at(it->second));
+				log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(it->second), it->second, global_refcount_storage_.at(it->second));
 	#endif
 			return it->second;
 		}
 
+		if (global_id_index_.empty())
+			prepopulate();
+
+		if (!p[0])
+			return 0;
+
 		log_assert(p[0] == '$' || p[0] == '\\');
 		log_assert(p[1] != 0);
 		for (const char *c = p; *c; c++)
@@ -238,7 +263,7 @@ struct RTLIL::IdString
 
 	#ifdef YOSYS_XTRACE_GET_PUT
 		if (yosys_xtrace)
-			log("#X# GET-BY-NAME '%s' (index %d, refcount %d)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
+			log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
 	#endif
 
 	#ifdef YOSYS_USE_STICKY_IDS
@@ -258,21 +283,20 @@ struct RTLIL::IdString
 	{
 		// put_reference() may be called from destructors after the destructor of
 		// global_refcount_storage_ has been run. in this case we simply do nothing.
-		if (!destruct_guard_ok || !idx)
+		if (idx < static_cast<short>(StaticId::STATIC_ID_END) || !destruct_guard_ok)
 			return;
 
 	#ifdef YOSYS_XTRACE_GET_PUT
 		if (yosys_xtrace) {
-			log("#X# PUT '%s' (index %d, refcount %d)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
+			log("#X# PUT '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
 		}
 	#endif
 
-		int &refcount = global_refcount_storage_[idx];
+		uint32_t &refcount = global_refcount_storage_[idx];
 
 		if (--refcount > 0)
 			return;
 
-		log_assert(refcount == 0);
 		free_reference(idx);
 	}
 	static inline void free_reference(int idx)
@@ -281,6 +305,7 @@ struct RTLIL::IdString
 			log("#X# Removed IdString '%s' with index %d.\n", global_id_storage_.at(idx), idx);
 			log_backtrace("-X- ", yosys_xtrace-1);
 		}
+		log_assert(idx >= static_cast<short>(StaticId::STATIC_ID_END));
 
 		global_id_index_.erase(global_id_storage_.at(idx));
 		free(global_id_storage_.at(idx));
@@ -300,6 +325,7 @@ struct RTLIL::IdString
 	inline IdString(const IdString &str) : index_(get_reference(str.index_)) { }
 	inline IdString(IdString &&str) : index_(str.index_) { str.index_ = 0; }
 	inline IdString(const std::string &str) : index_(get_reference(str.c_str())) { }
+	inline IdString(StaticId id) : index_(static_cast<short>(id)) {}
 	inline ~IdString() { put_reference(index_); }
 
 	inline void operator=(const IdString &rhs) {
@@ -331,6 +357,8 @@ struct RTLIL::IdString
 
 	inline bool operator==(const IdString &rhs) const { return index_ == rhs.index_; }
 	inline bool operator!=(const IdString &rhs) const { return index_ != rhs.index_; }
+	inline bool operator==(const StaticIdString &rhs) const;
+	inline bool operator!=(const StaticIdString &rhs) const;
 
 	// The methods below are just convenience functions for better compatibility with std::string.
 
@@ -416,12 +444,16 @@ struct RTLIL::IdString
 	}
 
 	bool in(const IdString &rhs) const { return *this == rhs; }
+	bool in(const StaticIdString &rhs) const { return *this == rhs; }
 	bool in(const char *rhs) const { return *this == rhs; }
 	bool in(const std::string &rhs) const { return *this == rhs; }
 	inline bool in(const pool<IdString> &rhs) const;
 	inline bool in(const pool<IdString> &&rhs) const;
 
 	bool isPublic() const { return begins_with("\\"); }
+
+private:
+	static void prepopulate();
 };
 
 namespace hashlib {
@@ -449,12 +481,76 @@ inline bool RTLIL::IdString::in(const pool<IdString> &rhs) const { return rhs.co
 [[deprecated]]
 inline bool RTLIL::IdString::in(const pool<IdString> &&rhs) const { return rhs.count(*this) != 0; }
 
+inline bool RTLIL::IdString::operator==(const RTLIL::StaticIdString &rhs) const {
+	return index_ == rhs.index();
+}
+inline bool RTLIL::IdString::operator!=(const RTLIL::StaticIdString &rhs) const {
+	return index_ != rhs.index();
+}
+
 namespace RTLIL {
 	namespace ID {
-#define X(_id) extern IdString _id;
+#define X(_id) extern const IdString _id;
 #include "kernel/constids.inc"
 #undef X
-	};
+	}
+}
+
+struct IdTableEntry {
+	const std::string_view name;
+	const RTLIL::StaticIdString static_id;
+};
+
+constexpr IdTableEntry IdTable[] = {
+#define X(_id) {#_id, RTLIL::StaticIdString(RTLIL::StaticId::_id, RTLIL::ID::_id)},
+#include "kernel/constids.inc"
+#undef X
+};
+
+constexpr int lookup_well_known_id(std::string_view name)
+{
+	int low = 0;
+	int high = sizeof(IdTable) / sizeof(IdTable[0]);
+	while (high - low >= 2) {
+		int mid = (low + high) / 2;
+		if (name < IdTable[mid].name)
+			high = mid;
+		else
+			low = mid;
+	}
+	if (IdTable[low].name == name)
+		return low;
+	return -1;
+}
+
+// Create a statically allocated IdString object, using for example ID::A or ID($add).
+//
+// Recipe for Converting old code that is using conversion of strings like ID::A and
+// "$add" for creating IdStrings: Run below SED command on the .cc file and then use for
+// example "meld foo.cc foo.cc.orig" to manually compile errors, if necessary.
+//
+//  sed -i.orig -r 's/"\\\\([a-zA-Z0-9_]+)"/ID(\1)/g; s/"(\$[a-zA-Z0-9_]+)"/ID(\1)/g;' <filename>
+//
+typedef const RTLIL::IdString &IDMacroHelperFunc();
+
+template <int IdTableIndex> struct IDMacroHelper {
+	static constexpr RTLIL::StaticIdString eval(IDMacroHelperFunc) {
+		return IdTable[IdTableIndex].static_id;
+	}
+};
+template <> struct IDMacroHelper<-1> {
+	static constexpr const RTLIL::IdString &eval(IDMacroHelperFunc func) {
+		return func();
+	}
+};
+
+#define ID(_id) IDMacroHelper<lookup_well_known_id(#_id)>::eval([]() -> const RTLIL::IdString & { \
+		const char *p = "\\" #_id, *q = p[1] == '$' ? p+1 : p; \
+		static const YOSYS_NAMESPACE_PREFIX RTLIL::IdString id(q); \
+		return id; \
+        })
+
+namespace RTLIL {
 	extern dict<std::string, std::string> constpad;
 
 	const pool<IdString> &builtin_ff_cell_types();
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 68e107a3b..17832d241 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -211,10 +211,6 @@ void yosys_setup()
 	init_share_dirname();
 	init_abc_executable_name();
 
-#define X(_id) RTLIL::ID::_id = "\\" # _id;
-#include "kernel/constids.inc"
-#undef X
-
 	Pass::init_register();
 	yosys_design = new RTLIL::Design;
 	yosys_celltypes.setup();
diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index 943aa4f05..fd84dd74e 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -206,13 +206,13 @@ namespace RTLIL {
 	struct Module;
 	struct Design;
 	struct Monitor;
-    struct Selection;
+	struct Selection;
 	struct SigChunk;
 	enum State : unsigned char;
 
 	typedef std::pair<SigSpec, SigSpec> SigSig;
 
-    namespace ID {}
+	namespace ID {}
 }
 
 namespace AST {
@@ -277,16 +277,6 @@ RTLIL::IdString new_id_suffix(std::string file, int line, std::string func, std:
 #define NEW_ID_SUFFIX(suffix) \
 	YOSYS_NAMESPACE_PREFIX new_id_suffix(__FILE__, __LINE__, __FUNCTION__, suffix)
 
-// Create a statically allocated IdString object, using for example ID::A or ID($add).
-//
-// Recipe for Converting old code that is using conversion of strings like ID::A and
-// "$add" for creating IdStrings: Run below SED command on the .cc file and then use for
-// example "meld foo.cc foo.cc.orig" to manually compile errors, if necessary.
-//
-//  sed -i.orig -r 's/"\\\\([a-zA-Z0-9_]+)"/ID(\1)/g; s/"(\$[a-zA-Z0-9_]+)"/ID(\1)/g;' <filename>
-//
-#define ID(_id) ([]() -> const RTLIL::IdString & { const char *p = "\\" #_id, *q = p[1] == '$' ? p+1 : p; \
-        static const YOSYS_NAMESPACE_PREFIX RTLIL::IdString id(q); return id; })()
 namespace ID = RTLIL::ID;
 
 

From 2a4a9aedfe76e902f6d0755b990edee86f9210aa Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Mon, 8 Sep 2025 11:34:53 +0200
Subject: [PATCH 466/931] Ensure the ID macro consistently uses
 YOSYS_NAMESPACE_PREFIX

The previous version of the ID macro used this for everything in the
Yosys namespace, so the new version should continue to do so.
---
 kernel/rtlil.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 80d0d0cfb..999b60fd7 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -544,10 +544,14 @@ template <> struct IDMacroHelper<-1> {
 	}
 };
 
-#define ID(_id) IDMacroHelper<lookup_well_known_id(#_id)>::eval([]() -> const RTLIL::IdString & { \
-		const char *p = "\\" #_id, *q = p[1] == '$' ? p+1 : p; \
-		static const YOSYS_NAMESPACE_PREFIX RTLIL::IdString id(q); \
-		return id; \
+#define ID(_id) \
+		YOSYS_NAMESPACE_PREFIX IDMacroHelper< \
+				YOSYS_NAMESPACE_PREFIX lookup_well_known_id(#_id) \
+		>::eval([]() \
+		-> const YOSYS_NAMESPACE_PREFIX RTLIL::IdString & { \
+			const char *p = "\\" #_id, *q = p[1] == '$' ? p+1 : p; \
+			static const YOSYS_NAMESPACE_PREFIX RTLIL::IdString id(q); \
+			return id; \
         })
 
 namespace RTLIL {

From 3ebecb631c0396371d9bdb5a06be0c0f2c53e5af Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Mon, 8 Sep 2025 11:49:21 +0200
Subject: [PATCH 467/931] Add a compile time check that kernel/constids.inc is
 sorted

This is an invariant now required by the ID macro, so it's better to
have an actual check and not rely on a comment at the top of
kernel/constids.inc.
---
 kernel/rtlil.cc | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 9c7e3888c..352fbb84e 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -72,6 +72,19 @@ void RTLIL::IdString::prepopulate()
 #undef X
 }
 
+static constexpr bool check_well_known_id_order()
+{
+	int size = sizeof(IdTable) / sizeof(IdTable[0]);
+	for (int i = 1; i < size; ++i)
+		if (IdTable[i - 1].name >= IdTable[i].name)
+			return false;
+	return true;
+}
+
+// Ensure the statically allocated IdStrings in kernel/constids.inc are unique
+// and in sorted ascii order, as required by the ID macro.
+static_assert(check_well_known_id_order());
+
 dict<std::string, std::string> RTLIL::constpad;
 
 const pool<IdString> &RTLIL::builtin_ff_cell_types() {

From b6db32873d505a6d4fad99665a7e869b750056d0 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Mon, 8 Sep 2025 12:59:13 +0200
Subject: [PATCH 468/931] Add IdString const &id_string() const to
 StaticIdString and IdString

The vast majority of ID(...) uses are in a context that is overloaded
for StaticIdString or will cause implicit conversion to an IdString
constant reference. For some sufficently overloaded contexts, implicit
conversion may fail, so it's useful to have a method to force obtaining
a `IdString const &` from an ID(...) use.

When turning all literal IdStrings of the codebase into StaticIdStrings
this was needed in exactly one place, for which this commit adds an
`id_string()` call.
---
 kernel/rtlil.h            | 3 +++
 passes/cmds/example_dt.cc | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 999b60fd7..471aa5e5f 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -121,6 +121,7 @@ namespace RTLIL
 		constexpr StaticIdString(StaticId id, const IdString &id_str) : id_str(id_str), id(id) {}
 		constexpr inline operator const IdString &() const { return id_str; }
 		constexpr inline int index() const { return static_cast<short>(id); }
+		constexpr inline const IdString &id_string() const { return id_str; }
 
 		const IdString &id_str;
 		const StaticId id;
@@ -343,6 +344,8 @@ struct RTLIL::IdString
 		*this = id;
 	}
 
+	constexpr inline const IdString &id_string() const { return *this; }
+
 	inline const char *c_str() const {
 		return global_id_storage_.at(index_);
 	}
diff --git a/passes/cmds/example_dt.cc b/passes/cmds/example_dt.cc
index b10f50502..7d1c42a79 100644
--- a/passes/cmds/example_dt.cc
+++ b/passes/cmds/example_dt.cc
@@ -77,7 +77,7 @@ struct ExampleDtPass : public Pass
 			auto enqueue = [&](DriveSpec const &spec) {
 				int index = queue(spec);
 				if (index == GetSize(graph_nodes))
-					graph_nodes.emplace_back(compute_graph.add(ID($pending), index).index());
+					graph_nodes.emplace_back(compute_graph.add(ID($pending).id_string(), index).index());
 				//if (index >= GetSize(graph_nodes))
 				return compute_graph[graph_nodes[index]];
 			};

From a97381448a1e17e0ce61f944ce98415706053b57 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Mon, 8 Sep 2025 13:33:46 +0200
Subject: [PATCH 469/931] Ensure static IdStrings get prepopulated when
 initializing yosys

An alternative would be to call ensure_prepopulated() in various
IdString methods.
---
 kernel/rtlil.h  | 9 +++++++--
 kernel/yosys.cc | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 471aa5e5f..9112ae64b 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -217,8 +217,7 @@ struct RTLIL::IdString
 			return it->second;
 		}
 
-		if (global_id_index_.empty())
-			prepopulate();
+		ensure_prepopulated();
 
 		if (!p[0])
 			return 0;
@@ -457,6 +456,12 @@ struct RTLIL::IdString
 
 private:
 	static void prepopulate();
+
+public:
+	static void ensure_prepopulated() {
+		if (global_id_index_.empty())
+			prepopulate();
+	}
 };
 
 namespace hashlib {
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 17832d241..46dc6a76f 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -196,6 +196,8 @@ void yosys_setup()
 	already_setup = true;
 	already_shutdown = false;
 
+	IdString::ensure_prepopulated();
+
 #ifdef WITH_PYTHON
 	// With Python 3.12, calling PyImport_AppendInittab on an already
 	// initialized platform fails (such as when libyosys is imported

From 9213bc5d5455406c88d7e310a02d46769d38111b Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Mon, 8 Sep 2025 13:07:40 +0200
Subject: [PATCH 470/931] Update kernel/constids.inc to include all literal ids

I've used this shell command to obtain the list:

    rg -I -t cpp -t yacc -o \
        'ID\((\$?[a-zA-Z0-9_]+)\)|ID::($?[a-zA-Z0-9_]+)' -r 'X($1$2)' \
        | LC_ALL=C sort -u

This removed the entries X(_TECHMAP_FAIL_) and X(nomem2init).
---
 kernel/constids.inc | 700 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 695 insertions(+), 5 deletions(-)

diff --git a/kernel/constids.inc b/kernel/constids.inc
index 1419c89fa..2be70694a 100644
--- a/kernel/constids.inc
+++ b/kernel/constids.inc
@@ -1,62 +1,418 @@
 // These must be in perfect ASCII order!!!
+X($_ALDFFE_NNN_)
+X($_ALDFFE_NNP_)
+X($_ALDFFE_NPN_)
+X($_ALDFFE_NPP_)
+X($_ALDFFE_PNN_)
+X($_ALDFFE_PNP_)
+X($_ALDFFE_PPN_)
+X($_ALDFFE_PPP_)
+X($_ALDFF_NN_)
+X($_ALDFF_NP_)
+X($_ALDFF_PN_)
+X($_ALDFF_PP_)
+X($_ANDNOT_)
 X($_AND_)
+X($_AOI3_)
+X($_AOI4_)
+X($_BUF_)
+X($_DFFE_NN0N_)
+X($_DFFE_NN0P_)
+X($_DFFE_NN1N_)
+X($_DFFE_NN1P_)
+X($_DFFE_NN_)
+X($_DFFE_NP0N_)
+X($_DFFE_NP0P_)
+X($_DFFE_NP1N_)
+X($_DFFE_NP1P_)
+X($_DFFE_NP_)
+X($_DFFE_PN0N_)
+X($_DFFE_PN0P_)
+X($_DFFE_PN1N_)
+X($_DFFE_PN1P_)
+X($_DFFE_PN_)
+X($_DFFE_PP0N_)
+X($_DFFE_PP0P_)
+X($_DFFE_PP1N_)
+X($_DFFE_PP1P_)
+X($_DFFE_PP_)
+X($_DFFSRE_NNNN_)
+X($_DFFSRE_NNNP_)
+X($_DFFSRE_NNPN_)
+X($_DFFSRE_NNPP_)
+X($_DFFSRE_NPNN_)
+X($_DFFSRE_NPNP_)
+X($_DFFSRE_NPPN_)
+X($_DFFSRE_NPPP_)
+X($_DFFSRE_PNNN_)
+X($_DFFSRE_PNNP_)
+X($_DFFSRE_PNPN_)
+X($_DFFSRE_PNPP_)
+X($_DFFSRE_PPNN_)
+X($_DFFSRE_PPNP_)
+X($_DFFSRE_PPPN_)
+X($_DFFSRE_PPPP_)
+X($_DFFSR_NNN_)
+X($_DFFSR_NNP_)
+X($_DFFSR_NPN_)
+X($_DFFSR_NPP_)
+X($_DFFSR_PNN_)
+X($_DFFSR_PNP_)
+X($_DFFSR_PPN_)
+X($_DFFSR_PPP_)
+X($_DFF_N)
+X($_DFF_NN0_)
+X($_DFF_NN1_)
+X($_DFF_NP0_)
+X($_DFF_NP1_)
+X($_DFF_N_)
+X($_DFF_PN0_)
+X($_DFF_PN1_)
+X($_DFF_PP0_)
+X($_DFF_PP1_)
+X($_DFF_P_)
+X($_DLATCHSR_NNN_)
+X($_DLATCHSR_NNP_)
+X($_DLATCHSR_NPN_)
+X($_DLATCHSR_NPP_)
+X($_DLATCHSR_PNN_)
+X($_DLATCHSR_PNP_)
+X($_DLATCHSR_PPN_)
+X($_DLATCHSR_PPP_)
+X($_DLATCH_NN0_)
+X($_DLATCH_NN1_)
+X($_DLATCH_NP0_)
+X($_DLATCH_NP1_)
+X($_DLATCH_N_)
+X($_DLATCH_PN0_)
+X($_DLATCH_PN1_)
+X($_DLATCH_PP0_)
+X($_DLATCH_PP1_)
+X($_DLATCH_P_)
+X($_FF_)
+X($_MUX16_)
+X($_MUX4_)
+X($_MUX8_)
+X($_MUX_)
+X($_NAND_)
+X($_NMUX_)
+X($_NOR_)
+X($_NOT_)
+X($_OAI3_)
+X($_OAI4_)
+X($_ORNOT_)
 X($_OR_)
+X($_SDFFCE_NN0N_)
+X($_SDFFCE_NN0P_)
+X($_SDFFCE_NN1N_)
+X($_SDFFCE_NN1P_)
+X($_SDFFCE_NP0N_)
+X($_SDFFCE_NP0P_)
+X($_SDFFCE_NP1N_)
+X($_SDFFCE_NP1P_)
+X($_SDFFCE_PN0N_)
+X($_SDFFCE_PN0P_)
+X($_SDFFCE_PN1N_)
+X($_SDFFCE_PN1P_)
+X($_SDFFCE_PP0N_)
+X($_SDFFCE_PP0P_)
+X($_SDFFCE_PP1N_)
+X($_SDFFCE_PP1P_)
+X($_SDFFE_NN0N_)
+X($_SDFFE_NN0P_)
+X($_SDFFE_NN1N_)
+X($_SDFFE_NN1P_)
+X($_SDFFE_NP0N_)
+X($_SDFFE_NP0P_)
+X($_SDFFE_NP1N_)
+X($_SDFFE_NP1P_)
+X($_SDFFE_PN0N_)
+X($_SDFFE_PN0P_)
+X($_SDFFE_PN1N_)
+X($_SDFFE_PN1P_)
+X($_SDFFE_PP0N_)
+X($_SDFFE_PP0P_)
+X($_SDFFE_PP1N_)
+X($_SDFFE_PP1P_)
+X($_SDFF_NN0_)
+X($_SDFF_NN1_)
+X($_SDFF_NP0_)
+X($_SDFF_NP1_)
+X($_SDFF_PN0_)
+X($_SDFF_PN1_)
+X($_SDFF_PP0_)
+X($_SDFF_PP1_)
+X($_SR_NN_)
+X($_SR_NP_)
+X($_SR_PN_)
+X($_SR_PP_)
+X($_TBUF_)
+X($_XNOR_)
 X($_XOR_)
+X($__ABC9_DELAY)
+X($__ABC9_SCC_BREAKER)
+X($__CC_NOT)
+X($__COUNT_)
+X($__ICE40_CARRY_WRAPPER)
+X($__QLF_TDP36K)
+X($__QLF_TDP36K_MERGED)
+X($__XILINX_SHREG_)
+X($abc9_flops)
 X($add)
+X($adff)
+X($adffe)
+X($adlatch)
+X($aldff)
+X($aldffe)
+X($allconst)
+X($allseq)
+X($alu)
 X($and)
+X($anyconst)
+X($anyinit)
+X($anyseq)
+X($assert)
+X($assume)
+X($bmux)
+X($buf)
+X($bugpoint)
+X($bweq)
+X($bweqx)
+X($bwmux)
+X($check)
+X($concat)
+X($cover)
+X($demux)
+X($dff)
+X($dffe)
+X($dffsr)
+X($dffsre)
+X($div)
+X($divfloor)
+X($dlatch)
+X($dlatchsr)
+X($eq)
+X($equiv)
+X($eqx)
+X($fa)
+X($fair)
+X($false)
+X($ff)
+X($flowmap_level)
+X($fsm)
+X($fullskew)
+X($future_ff)
+X($ge)
+X($get_tag)
+X($gt)
+X($initstate)
+X($input)
+X($lcu)
+X($le)
+X($live)
 X($logic_and)
+X($logic_not)
 X($logic_or)
+X($lt)
+X($lut)
+X($macc)
+X($macc_v2)
+X($mem)
+X($mem_v2)
+X($meminit)
+X($meminit_v2)
+X($memrd)
+X($memrd_v2)
+X($memwr)
+X($memwr_v2)
+X($mod)
+X($modfloor)
 X($mul)
+X($mux)
+X($ne)
+X($neg)
+X($nex)
+X($not)
 X($or)
+X($original_tag)
+X($output)
+X($overwrite_tag)
+X($pending)
 X($pmux)
+X($pos)
+X($pow)
+X($print)
+X($recrem)
 X($reduce_and)
 X($reduce_bool)
+X($reduce_nand)
 X($reduce_or)
 X($reduce_xnor)
 X($reduce_xor)
+X($scopeinfo)
+X($sdff)
+X($sdffce)
+X($sdffe)
+X($set_tag)
+X($setup)
+X($setuphold)
+X($shift)
+X($shiftx)
+X($shl)
+X($shr)
+X($slice)
+X($sop)
+X($specify2)
+X($specify3)
+X($specrule)
+X($sr)
+X($sshl)
+X($sshr)
+X($state)
+X($sub)
+X($tribuf)
+X($true)
+X($undef)
+X($xnor)
 X($xor)
 X(A)
+X(A0REG)
+X(A1)
+X(A1REG)
+X(A2)
+X(A3)
+X(A4)
 X(ABITS)
+X(ACASCREG)
+X(ACCUMCI)
+X(ACCUMCO)
+X(ACIN)
 X(AD)
 X(ADDEND_NEGATED)
 X(ADDR)
+X(ADDSUBBOT)
+X(ADDSUBTOP)
+X(ADREG)
+X(AHOLD)
 X(ALOAD)
 X(ALOAD_POLARITY)
+X(ALUMODE)
+X(ALUMODEREG)
+X(ALUTYPE)
+X(AL_MAP_ADDER)
+X(AL_MAP_LUT1)
+X(AL_MAP_LUT2)
+X(AL_MAP_LUT3)
+X(AL_MAP_LUT4)
+X(AL_MAP_LUT5)
+X(AL_MAP_LUT6)
+X(ALn)
+X(AND)
+X(ANDNOT)
+X(ANDTERM)
+X(AOI3)
+X(AOI4)
+X(AREG)
 X(ARGS)
 X(ARGS_WIDTH)
 X(ARST)
 X(ARST_POLARITY)
 X(ARST_VALUE)
+X(A_BYPASS)
+X(A_EN)
+X(A_INPUT)
+X(A_REG)
 X(A_SIGNED)
+X(A_SRST_N)
 X(A_WIDTH)
 X(A_WIDTHS)
 X(B)
+X(B0REG)
+X(B1)
+X(B1REG)
+X(B2)
+X(B3)
+X(B4)
+X(BCASCREG)
+X(BCIN)
+X(BHOLD)
 X(BI)
 X(BITS_USED)
-X(BYTE)
+X(BOTADDSUB_CARRYSELECT)
+X(BOTADDSUB_LOWERINPUT)
+X(BOTADDSUB_UPPERINPUT)
+X(BOTOUTPUT_SELECT)
+X(BOT_8x8_MULT_REG)
+X(BREG)
+X(BUF)
+X(BUFG)
+X(BUFGSR)
+X(BUFGTS)
+X(B_BYPASS)
+X(B_EN)
+X(B_INPUT)
+X(B_REG)
 X(B_SIGNED)
+X(B_SRST_N)
 X(B_WIDTH)
 X(B_WIDTHS)
 X(C)
+X(CARRYIN)
+X(CARRYINREG)
+X(CARRYINSEL)
+X(CARRYINSELREG)
+X(CARRYOUT)
+X(CC_L2T4)
+X(CC_L2T5)
+X(CC_LUT2)
+X(CDIN_FDBK_SEL)
+X(CE)
+X(CEA)
+X(CEA1)
+X(CEA2)
+X(CEAD)
+X(CEB)
+X(CEB1)
+X(CEB2)
+X(CEC)
+X(CED)
+X(CEM)
+X(CEP)
 X(CE_OVER_SRST)
+X(CFG1)
+X(CFG2)
+X(CFG3)
+X(CFG4)
 X(CFG_ABITS)
 X(CFG_DBITS)
 X(CFG_INIT)
+X(CHOLD)
 X(CI)
 X(CLK)
+X(CLKIN_DIVIDE)
+X(CLKPOL)
 X(CLK_ENABLE)
 X(CLK_POLARITY)
 X(CLR)
 X(CLR_POLARITY)
 X(CO)
 X(COLLISION_X_MASK)
+X(COMP_INP)
 X(CONFIG)
 X(CONFIG_WIDTH)
+X(COUNT_EXTRACT)
+X(COUNT_TO)
+X(CREG)
 X(CTRL_IN)
 X(CTRL_IN_WIDTH)
 X(CTRL_OUT)
 X(CTRL_OUT_WIDTH)
+X(C_ARST_N)
+X(C_BYPASS)
+X(C_EN)
+X(C_REG)
 X(C_SIGNED)
+X(C_SRST_N)
 X(C_WIDTHS)
 X(D)
 X(DAT)
@@ -65,45 +421,248 @@ X(DAT_DST_PEN)
 X(DAT_DST_POL)
 X(DELAY)
 X(DEPTH)
+X(DFF)
+X(DHOLD)
+X(DIRECTION)
+X(DREG)
+X(DSP48E1)
 X(DST)
 X(DST_EN)
 X(DST_PEN)
 X(DST_POL)
 X(DST_WIDTH)
+X(D_ARST_N)
+X(D_BYPASS)
+X(D_EN)
+X(D_REG)
+X(D_SRST_N)
 X(E)
 X(EDGE_EN)
 X(EDGE_POL)
+X(EFX_ADD)
 X(EN)
+X(ENPOL)
 X(EN_DST)
 X(EN_POLARITY)
 X(EN_SRC)
+X(EQN)
 X(F)
+X(FDCE)
+X(FDCE_1)
+X(FDCP)
+X(FDCPE)
+X(FDCPE_1)
+X(FDCPE_N)
+X(FDCP_N)
+X(FDDCP)
+X(FDDCPE)
+X(FDPE)
+X(FDPE_1)
+X(FDRE)
+X(FDRE_1)
+X(FDRSE)
+X(FDRSE_1)
+X(FDSE)
+X(FDSE_1)
 X(FLAVOR)
 X(FORMAT)
+X(FTCP)
+X(FTCP_N)
+X(FTDCP)
 X(FULL)
 X(G)
+X(GP_DFF)
+X(GP_DFFI)
+X(GP_DFFR)
+X(GP_DFFRI)
+X(GP_DFFS)
+X(GP_DFFSI)
+X(GP_DFFSR)
+X(GP_DFFSRI)
+X(GP_DLATCH)
+X(GP_DLATCHI)
+X(GP_DLATCHR)
+X(GP_DLATCHRI)
+X(GP_DLATCHS)
+X(GP_DLATCHSI)
+X(GP_DLATCHSR)
+X(GP_DLATCHSRI)
+X(GP_INV)
+X(GP_SHREG)
+X(GSR)
 X(H)
+X(HAS_CE)
+X(HAS_POUT)
 X(I)
+X(I0)
+X(I0_POLARITY)
+X(I1)
+X(I1_POLARITY)
+X(I2)
+X(I3)
+X(I3_IS_CI)
+X(I4)
+X(I5)
+X(IBUF)
+X(IN)
 X(INIT)
+X(INIT1)
+X(INIT2)
+X(INIT_FILE)
+X(INIT_L00)
+X(INIT_L01)
+X(INIT_L02)
+X(INIT_L03)
+X(INIT_L10)
+X(INIT_L20)
 X(INIT_VALUE)
+X(INMODE)
+X(INMODEREG)
+X(INV)
+X(INVERT_OUT)
+X(IN_B)
+X(IN_ORTERM)
+X(IN_PTC)
+X(IOBUFE)
+X(IRSTBOT)
+X(IRSTTOP)
+X(IS_C_INVERTED)
+X(IS_D_INVERTED)
+X(IS_R_INVERTED)
+X(IS_S_INVERTED)
 X(J)
 X(K)
 X(L)
+X(LAT)
+X(LDCP)
+X(LDCP_N)
+X(LSR)
 X(LUT)
+X(LUT1)
+X(LUT2)
+X(LUT3)
+X(LUT4)
+X(LUT5)
+X(LUT6)
+X(LUT_INIT)
 X(M)
+X(MACROCELL_XOR)
+X(MASK)
 X(MEMID)
+X(MODE_8x8)
+X(MODE_BITS)
+X(MREG)
+X(MUX)
+X(MUX16)
+X(MUX4)
+X(MUX8)
 X(N)
 X(NADDENDS)
 X(NAME)
+X(NAND)
+X(NEG_TRIGGER)
+X(NMUX)
+X(NOR)
+X(NOT)
 X(NPRODUCTS)
+X(NX_CY)
+X(NX_CY_1BIT)
 X(O)
+X(OAI3)
+X(OAI4)
 X(OFFSET)
+X(OHOLDBOT)
+X(OHOLDTOP)
+X(OLOADBOT)
+X(OLOADTOP)
+X(ONE)
+X(OPMODE)
+X(OPMODEREG)
+X(OPTION_SPLIT)
+X(OR)
+X(ORNOT)
+X(ORSTBOT)
+X(ORSTTOP)
+X(ORTERM)
+X(OUT)
+X(OUTA)
+X(OUTA_INVERT)
+X(OUTA_TAP)
+X(OUTB)
+X(OUTB_TAP)
+X(OVERFLOW)
 X(P)
+X(PASUB)
+X(PATTERN)
+X(PCIN)
+X(PIPELINE_16x16_MULT_REG1)
+X(PIPELINE_16x16_MULT_REG2)
 X(PORTID)
+X(PORT_A1_ADDR)
+X(PORT_A1_CLK)
+X(PORT_A1_CLK_EN)
+X(PORT_A1_RD_DATA)
+X(PORT_A1_WIDTH)
+X(PORT_A1_WR_BE)
+X(PORT_A1_WR_BE_WIDTH)
+X(PORT_A1_WR_DATA)
+X(PORT_A1_WR_EN)
+X(PORT_A2_ADDR)
+X(PORT_A2_CLK)
+X(PORT_A2_CLK_EN)
+X(PORT_A2_RD_DATA)
+X(PORT_A2_WIDTH)
+X(PORT_A2_WR_BE)
+X(PORT_A2_WR_BE_WIDTH)
+X(PORT_A2_WR_DATA)
+X(PORT_A2_WR_EN)
+X(PORT_A_ADDR)
+X(PORT_A_CLK)
+X(PORT_A_CLK_EN)
+X(PORT_A_RD_DATA)
+X(PORT_A_WIDTH)
+X(PORT_A_WR_BE)
+X(PORT_A_WR_BE_WIDTH)
+X(PORT_A_WR_DATA)
+X(PORT_A_WR_EN)
+X(PORT_B1_ADDR)
+X(PORT_B1_CLK)
+X(PORT_B1_CLK_EN)
+X(PORT_B1_RD_DATA)
+X(PORT_B1_WIDTH)
+X(PORT_B1_WR_BE)
+X(PORT_B1_WR_BE_WIDTH)
+X(PORT_B1_WR_DATA)
+X(PORT_B1_WR_EN)
+X(PORT_B2_ADDR)
+X(PORT_B2_CLK)
+X(PORT_B2_CLK_EN)
+X(PORT_B2_RD_DATA)
+X(PORT_B2_WIDTH)
+X(PORT_B2_WR_BE)
+X(PORT_B2_WR_BE_WIDTH)
+X(PORT_B2_WR_DATA)
+X(PORT_B2_WR_EN)
+X(PORT_B_ADDR)
+X(PORT_B_CLK)
+X(PORT_B_CLK_EN)
+X(PORT_B_RD_DATA)
+X(PORT_B_WIDTH)
+X(PORT_B_WR_BE)
+X(PORT_B_WR_BE_WIDTH)
+X(PORT_B_WR_DATA)
+X(PORT_B_WR_EN)
+X(POUT)
+X(PRE)
+X(PREG)
 X(PRIORITY)
 X(PRIORITY_MASK)
 X(PRODUCT_NEGATED)
+X(P_BYPASS)
+X(P_EN)
+X(P_SRST_N)
 X(Q)
+X(QL_DSP2)
 X(R)
 X(RD_ADDR)
 X(RD_ARST)
@@ -122,10 +681,38 @@ X(RD_SRST_VALUE)
 X(RD_TRANSPARENCY_MASK)
 X(RD_TRANSPARENT)
 X(RD_WIDE_CONTINUATION)
+X(RESET_MODE)
+X(RESET_TO_MAX)
+X(RST)
+X(RSTA)
+X(RSTB)
+X(RSTC)
+X(RSTD)
+X(RSTM)
+X(RSTP)
 X(S)
+X(S1)
+X(S2)
+X(S3)
+X(S4)
+X(SB_CARRY)
+X(SB_LUT4)
+X(SB_MAC16)
+X(SB_RAM40_4K)
+X(SB_RAM40_4KNR)
+X(SB_RAM40_4KNRNW)
+X(SB_RAM40_4KNW)
+X(SD)
+X(SEL_MASK)
+X(SEL_PATTERN)
 X(SET)
 X(SET_POLARITY)
+X(SGSR)
+X(SIGNEXTIN)
+X(SIGNEXTOUT)
 X(SIZE)
+X(SLE)
+X(SLn)
 X(SRC)
 X(SRC_DST_PEN)
 X(SRC_DST_POL)
@@ -133,6 +720,7 @@ X(SRC_EN)
 X(SRC_PEN)
 X(SRC_POL)
 X(SRC_WIDTH)
+X(SRMODE)
 X(SRST)
 X(SRST_POLARITY)
 X(SRST_VALUE)
@@ -141,24 +729,31 @@ X(STATE_NUM)
 X(STATE_NUM_LOG2)
 X(STATE_RST)
 X(STATE_TABLE)
+X(SUB)
 X(S_WIDTH)
 X(T)
 X(TABLE)
 X(TAG)
+X(TDP36K)
+X(TOPADDSUB_CARRYSELECT)
+X(TOPADDSUB_LOWERINPUT)
+X(TOPADDSUB_UPPERINPUT)
+X(TOPOUTPUT_SELECT)
+X(TOP_8x8_MULT_REG)
 X(TRANSPARENCY_MASK)
 X(TRANSPARENT)
 X(TRANS_NUM)
 X(TRANS_TABLE)
+X(TRELLIS_FF)
 X(TRG)
 X(TRG_ENABLE)
 X(TRG_POLARITY)
 X(TRG_WIDTH)
+X(TRUE_INP)
 X(TYPE)
 X(T_FALL_MAX)
 X(T_FALL_MIN)
 X(T_FALL_TYP)
-X(T_LIMIT)
-X(T_LIMIT2)
 X(T_LIMIT2_MAX)
 X(T_LIMIT2_MIN)
 X(T_LIMIT2_TYP)
@@ -169,6 +764,12 @@ X(T_RISE_MAX)
 X(T_RISE_MIN)
 X(T_RISE_TYP)
 X(U)
+X(UP)
+X(USE_DPORT)
+X(USE_MULT)
+X(USE_PATTERN_DETECT)
+X(USE_SIMD)
+X(UUT)
 X(V)
 X(WIDTH)
 X(WORDS)
@@ -182,26 +783,41 @@ X(WR_PORTS)
 X(WR_PRIORITY_MASK)
 X(WR_WIDE_CONTINUATION)
 X(X)
+X(XNOR)
+X(XOR)
 X(Y)
 X(Y_WIDTH)
+X(Z)
+X(ZERO)
 X(_TECHMAP_BITS_CONNMAP_)
 X(_TECHMAP_CELLNAME_)
 X(_TECHMAP_CELLTYPE_)
-X(_TECHMAP_FAIL_)
 X(_TECHMAP_PLACEHOLDER_)
 X(_TECHMAP_REPLACE_)
+X(__glift_weight)
+X(_const0_)
+X(_const1_)
+X(_dff_)
+X(_id)
 X(_techmap_special_)
+X(a)
+X(a_i)
 X(abc9_box)
 X(abc9_box_id)
 X(abc9_box_seq)
 X(abc9_bypass)
 X(abc9_carry)
+X(abc9_deferred_box)
 X(abc9_flop)
 X(abc9_keep)
 X(abc9_lut)
 X(abc9_mergeability)
 X(abc9_scc_id)
+X(abc9_script)
 X(abcgroup)
+X(acc_fir)
+X(acc_fir_i)
+X(add_carry)
 X(allconst)
 X(allseq)
 X(always_comb)
@@ -209,34 +825,63 @@ X(always_ff)
 X(always_latch)
 X(anyconst)
 X(anyseq)
+X(architecture)
 X(area)
+X(b)
+X(b_i)
 X(blackbox)
+X(bottom_bound)
 X(bugpoint_keep)
+X(c)
 X(capacitance)
 X(cells_not_processed)
 X(chain)
+X(clk)
+X(clk2fflogic)
 X(clkbuf_driver)
 X(clkbuf_inhibit)
 X(clkbuf_inv)
 X(clkbuf_sink)
+X(clock_i)
+X(cxxrtl_blackbox)
+X(cxxrtl_comb)
+X(cxxrtl_edge)
+X(cxxrtl_sync)
+X(cxxrtl_template)
+X(cxxrtl_width)
 X(defaultvalue)
+X(dff)
+X(dffsre)
+X(dft_tag)
+X(dly_b)
+X(dly_b_o)
+X(dsp_t1_10x9x32)
 X(dynports)
 X(enum_base_type)
 X(enum_type)
 X(equiv_merged)
 X(equiv_region)
 X(extract_order)
+X(f_mode)
+X(feedback)
+X(feedback_i)
+X(first)
 X(force_downto)
 X(force_upto)
 X(fsm_encoding)
 X(fsm_export)
 X(full_case)
+X(gate)
+X(gate_cost_equivalent)
 X(gclk)
 X(gentb_clock)
 X(gentb_constant)
 X(gentb_skip)
+X(glift)
+X(gold)
 X(hdlname)
 X(hierconn)
+X(i)
 X(init)
 X(initial_top)
 X(interface_modport)
@@ -244,28 +889,44 @@ X(interface_type)
 X(interfaces_replaced_in_module)
 X(invertible_pin)
 X(iopad_external_pin)
+X(is_inferred)
 X(is_interface)
+X(it)
 X(keep)
 X(keep_hierarchy)
 X(lib_whitebox)
+X(library)
+X(load_acc)
+X(load_acc_i)
 X(localparam)
 X(logic_block)
 X(lram)
+X(lut)
 X(lut_keep)
 X(maximize)
 X(mem2reg)
 X(minimize)
+X(module)
 X(module_not_derived)
+X(nQ)
+X(nRST)
+X(nSET)
+X(netlist)
 X(no_ram)
 X(no_rw_check)
 X(noblackbox)
+X(nogsr)
 X(nolatches)
-X(nomem2init)
 X(nomem2reg)
 X(nomeminit)
 X(nosync)
 X(nowrshmsk)
+X(o)
+X(offset)
 X(onehot)
+X(output_select)
+X(output_select_i)
+X(p_class)
 X(parallel_case)
 X(parameter)
 X(promoted_if)
@@ -274,17 +935,32 @@ X(ram_block)
 X(ram_style)
 X(ramstyle)
 X(reg)
+X(register_inputs)
+X(register_inputs_i)
 X(replaced_by_gclk)
 X(reprocess_after)
+X(reset)
+X(reset_i)
 X(rom_block)
 X(rom_style)
 X(romstyle)
+X(round)
+X(round_i)
+X(rtlil)
+X(saturate_enable)
+X(saturate_enable_i)
+X(scopename)
+X(sdffsre)
+X(shift_right)
+X(shift_right_i)
 X(single_bit_vector)
 X(smtlib2_comb_expr)
 X(smtlib2_module)
 X(src)
 X(sta_arrival)
 X(submod)
+X(subtract)
+X(subtract_i)
 X(syn_ramstyle)
 X(syn_romstyle)
 X(techmap_autopurge)
@@ -293,14 +969,28 @@ X(techmap_chtype)
 X(techmap_maccmap)
 X(techmap_simplemap)
 X(techmap_wrap)
+X(test)
 X(to_delete)
 X(top)
+X(top_bound)
+X(trg_on_gclk)
+X(trigger)
 X(unique)
+X(unsigned_a)
+X(unsigned_a_i)
+X(unsigned_b)
+X(unsigned_b_i)
 X(unused_bits)
+X(use_dsp)
+X(value)
 X(via_celltype)
 X(wand)
 X(whitebox)
+X(width)
 X(wildcard_port_conns)
 X(wiretype)
 X(wor)
 X(xprop_decoder)
+X(y)
+X(z)
+X(z_o)

From 985b9164dae4a8bd733f017b60ceae78a1a02abb Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Mon, 8 Sep 2025 14:11:31 +0200
Subject: [PATCH 471/931] Disable flaky arch/anlogic/mux test

---
 tests/arch/anlogic/mux.ys | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/arch/anlogic/mux.ys b/tests/arch/anlogic/mux.ys
index 89014b5e0..64a04d08d 100644
--- a/tests/arch/anlogic/mux.ys
+++ b/tests/arch/anlogic/mux.ys
@@ -36,9 +36,17 @@ select -assert-none t:AL_MAP_LUT3 t:AL_MAP_LUT4 t:AL_MAP_LUT5 t:AL_MAP_LUT6 %% t
 design -load read
 hierarchy -top mux16
 proc
-equiv_opt -assert -map +/anlogic/cells_sim.v synth_anlogic # equivalency check
-design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design)
-cd mux16 # Constrain all select calls below inside the top module
-select -assert-count 5 t:AL_MAP_LUT6
 
-select -assert-none t:AL_MAP_LUT6 %% t:* %D
+# Flaky test, started failing with statically allocated IdStrings, but works
+# for me locally when I scramble the names using:
+#
+#     rename -scramble-name -seed 1
+#
+
+#equiv_opt -assert -map +/anlogic/cells_sim.v synth_anlogic # equivalency check
+#design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design)
+#cd mux16 # Constrain all select calls below inside the top module
+#show
+#select -assert-count 5 t:AL_MAP_LUT6
+
+#select -assert-none t:AL_MAP_LUT6 %% t:* %D

From 6498265eb045262df5e0842477cc16caa799bd3a Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Mon, 8 Sep 2025 13:55:09 +0200
Subject: [PATCH 472/931] Add macOS workaround to constids.inc

The ID(OVERFLOW) IdString isn't used widely enough that we require a
statically allocated IdString, but I think it's good to have an example
workaround in place in case more collisions come up.
---
 kernel/constids.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/constids.inc b/kernel/constids.inc
index 2be70694a..d75f0a784 100644
--- a/kernel/constids.inc
+++ b/kernel/constids.inc
@@ -1,4 +1,10 @@
 // These must be in perfect ASCII order!!!
+
+// Workaround for macos's math.h defining an OVERFLOW macro
+#ifdef OVERFLOW
+#undef OVERFLOW
+#endif
+
 X($_ALDFFE_NNN_)
 X($_ALDFFE_NNP_)
 X($_ALDFFE_NPN_)

From 0116dc438470351c7f389fd84c19bdd5ee01dd8a Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Mon, 8 Sep 2025 17:08:01 +0200
Subject: [PATCH 473/931] Add windows workaround to constids.inc

---
 kernel/constids.inc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/kernel/constids.inc b/kernel/constids.inc
index d75f0a784..7aed897e1 100644
--- a/kernel/constids.inc
+++ b/kernel/constids.inc
@@ -5,6 +5,15 @@
 #undef OVERFLOW
 #endif
 
+// Workaround for windows defining IN and OUT macros in minwindef.h which ends
+// up getting included for visual studio builds
+#ifdef IN
+#undef IN
+#endif
+#ifdef OUT
+#undef OUT
+#endif
+
 X($_ALDFFE_NNN_)
 X($_ALDFFE_NNP_)
 X($_ALDFFE_NPN_)

From 23e4c0e4245f26a3d069112ae92b5582c09a550e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 9 Sep 2025 00:23:18 +0000
Subject: [PATCH 474/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5b362a652..aedcd4d3b 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+7
+YOSYS_VER := 0.57+30
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 75316e8c496c93ec048682463d24f8ea28f0cab9 Mon Sep 17 00:00:00 2001
From: Michael Kupfer <michael.kupfer@fau.de>
Date: Wed, 14 May 2025 20:23:29 +0200
Subject: [PATCH 475/931] Add state_dependent_path_declaration so that `ifnone`
 can be parsed

---
 frontends/verilog/verilog_lexer.l  |  1 +
 frontends/verilog/verilog_parser.y | 56 ++++++++++++++++++++++++++----
 tests/verilog/specify-ifnone.ys    | 27 ++++++++++++++
 3 files changed, 77 insertions(+), 7 deletions(-)
 create mode 100644 tests/verilog/specify-ifnone.ys

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 8280c0067..686e9853f 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -377,6 +377,7 @@ TIME_SCALE_SUFFIX [munpf]?s
 "begin"	       { return parser::make_TOK_BEGIN(out_loc); }
 "end"          { return parser::make_TOK_END(out_loc); }
 "if"           { return parser::make_TOK_IF(out_loc); }
+"ifnone"       { return parser::make_TOK_IFNONE(out_loc); }
 "else"         { return parser::make_TOK_ELSE(out_loc); }
 "for"          { return parser::make_TOK_FOR(out_loc); }
 "posedge"      { return parser::make_TOK_POSEDGE(out_loc); }
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index c77d0a7cf..238d39254 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -493,7 +493,7 @@
 %token TOK_INPUT TOK_OUTPUT TOK_INOUT TOK_WIRE TOK_WAND TOK_WOR TOK_REG TOK_LOGIC
 %token TOK_INTEGER TOK_SIGNED TOK_ASSIGN TOK_ALWAYS TOK_INITIAL
 %token TOK_ALWAYS_FF TOK_ALWAYS_COMB TOK_ALWAYS_LATCH
-%token TOK_BEGIN TOK_END TOK_IF TOK_ELSE TOK_FOR TOK_WHILE TOK_REPEAT
+%token TOK_BEGIN TOK_END TOK_IF TOK_ELSE TOK_IFNONE TOK_FOR TOK_WHILE TOK_REPEAT
 %token TOK_DPI_FUNCTION TOK_POSEDGE TOK_NEGEDGE TOK_OR TOK_AUTOMATIC
 %token TOK_CASE TOK_CASEX TOK_CASEZ TOK_ENDCASE TOK_DEFAULT
 %token TOK_FUNCTION TOK_ENDFUNCTION TOK_TASK TOK_ENDTASK TOK_SPECIFY
@@ -1581,18 +1581,60 @@ list_of_specparam_assignments:
 specparam_assignment:
 	ignspec_id TOK_EQ ignspec_expr ;
 
-ignspec_opt_cond:
-	TOK_IF TOK_LPAREN ignspec_expr TOK_RPAREN | %empty;
-
 path_declaration :
 	simple_path_declaration TOK_SEMICOL
 	// | edge_sensitive_path_declaration
-	// | state_dependent_path_declaration
+	| state_dependent_path_declaration TOK_SEMICOL
 	;
 
 simple_path_declaration :
-	ignspec_opt_cond parallel_path_description TOK_EQ path_delay_value |
-	ignspec_opt_cond full_path_description TOK_EQ path_delay_value
+	parallel_path_description TOK_EQ path_delay_value |
+	full_path_description TOK_EQ path_delay_value
+	;
+
+state_dependent_path_declaration:
+	TOK_IF TOK_LPAREN module_path_expression TOK_RPAREN simple_path_declaration
+	// | TOK_IF TOK_LPAREN module_path_expression TOK_RPAREN edge_sensitive_path_declaration
+	| TOK_IFNONE simple_path_declaration
+	;
+
+module_path_expression:
+	module_path_primary
+	// Flatten out unary_operator to avoid shift/reduce conflict
+	| TOK_EXCL attr module_path_primary { free_attr($2); }
+	| TOK_TILDE attr module_path_primary { free_attr($2); }
+	| TOK_AMP attr module_path_primary { free_attr($2); }
+	| OP_NAND attr module_path_primary { free_attr($2); }
+	| TOK_PIPE attr module_path_primary { free_attr($2); }
+	| OP_NOR attr module_path_primary { free_attr($2); }
+	| TOK_CARET attr module_path_primary { free_attr($2); }
+	| OP_XNOR attr module_path_primary { free_attr($2); }
+	// Flatten out binary_operator to avoid shift/reduce conflict
+	| module_path_expression OP_EQ attr module_path_expression { free_attr($3); }
+	| module_path_expression OP_NE attr module_path_expression { free_attr($3); }
+	| module_path_expression OP_LAND attr module_path_expression { free_attr($3); }
+	| module_path_expression OP_LOR attr module_path_expression { free_attr($3); }
+	| module_path_expression TOK_AMP attr module_path_expression { free_attr($3); }
+	| module_path_expression TOK_PIPE attr module_path_expression { free_attr($3); }
+	| module_path_expression TOK_CARET attr module_path_expression { free_attr($3); }
+	| module_path_expression OP_XNOR attr module_path_expression { free_attr($3); }
+	// | module_path_conditional_expression
+	;
+
+module_path_primary:
+	number
+	| TOK_ID
+	// Deviate from specification: Normally string would not be allowed, however they are necessary for the ecp5 tests
+	| TOK_STRING
+	// | module_path_concatenation
+	// | module_path_multiple_concatenation
+	// | function_subroutine_call
+	// | TOK_LPAREN module_path_minmax_expression TOK_RPAREN
+	;
+
+number:
+	integral_number
+	| TOK_REALVAL
 	;
 
 path_delay_value :
diff --git a/tests/verilog/specify-ifnone.ys b/tests/verilog/specify-ifnone.ys
new file mode 100644
index 000000000..50b11d487
--- /dev/null
+++ b/tests/verilog/specify-ifnone.ys
@@ -0,0 +1,27 @@
+# ifnone gets parsed and ignored without -specify
+logger -expect-no-warnings
+read_verilog << EOF
+module dut1 (i, o);
+	output o;
+	input i;
+	specify
+		if (a ^ (* meow *) 1 == 1'b0)
+			(i => o) = 1;
+		ifnone (i => o) = 0;
+	endspecify
+endmodule
+EOF
+
+# ifnone is still an error with -specify
+logger -expect error "syntax error" 1
+read_verilog -specify << EOF
+module dut2 (i, o);
+	output o;
+	input i;
+	specify
+		if (a ^ (* meow *) 1 == 1'b0)
+			(i => o) = 1;
+		ifnone (i => o) = 0;
+	endspecify
+endmodule
+EOF

From 61a00b91313118d414502b19d955bd1b679ade99 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 9 Sep 2025 13:24:48 +0200
Subject: [PATCH 476/931] memory_libmap: Fix use of uninitialized value for
 async read ports

The code in memory_libmap expects `clk_en` to be initialized for all
`PortVariant`s but the parsing in memlib.cc didn't initialize it for
variants of kind `PortKind::Ar` (async read ports).

While this fixes the immediate CI failure, it would be best to refactor
the code so it becomes obvious if something isn't initialized.
---
 passes/memory/memlib.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/passes/memory/memlib.cc b/passes/memory/memlib.cc
index 8a7adc9ac..fb256e41c 100644
--- a/passes/memory/memlib.cc
+++ b/passes/memory/memlib.cc
@@ -855,7 +855,9 @@ struct Parser {
 			PortVariant var;
 			var.options = portopts;
 			var.kind = pdef.kind;
-			if (pdef.kind != PortKind::Ar) {
+			if (pdef.kind == PortKind::Ar) {
+				var.clk_en = false;
+			} else {
 				const ClockDef *cdef = find_single_cap(pdef.clock, cram.options, portopts, "clock");
 				if (!cdef)
 					log_error("%s:%d: missing clock capability.\n", filename.c_str(), orig_line);

From 3f69a768f4aac3e1b95f830b13c866e20a0f073e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 22 Jul 2025 02:30:12 +0000
Subject: [PATCH 477/931] Hide public `logv_` variant declarations that don't
 need to be public

---
 kernel/log.cc | 11 ++++++-----
 kernel/log.h  |  5 -----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index 3203ed3cf..1cd4a5449 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -102,7 +102,7 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
 }
 #endif
 
-void logv(const char *format, va_list ap)
+static void logv(const char *format, va_list ap)
 {
 	while (format[0] == '\n' && format[1] != 0) {
 		log("\n");
@@ -204,7 +204,7 @@ void logv(const char *format, va_list ap)
 	}
 }
 
-void logv_header(RTLIL::Design *design, const char *format, va_list ap)
+static void logv_header(RTLIL::Design *design, const char *format, va_list ap)
 {
 	bool pop_errfile = false;
 
@@ -305,12 +305,12 @@ static void logv_warning_with_prefix(const char *prefix,
 	}
 }
 
-void logv_warning(const char *format, va_list ap)
+static void logv_warning(const char *format, va_list ap)
 {
 	logv_warning_with_prefix("Warning: ", format, ap);
 }
 
-void logv_warning_noprefix(const char *format, va_list ap)
+static void logv_warning_noprefix(const char *format, va_list ap)
 {
 	logv_warning_with_prefix("", format, ap);
 }
@@ -390,7 +390,8 @@ static void logv_error_with_prefix(const char *prefix,
 #endif
 }
 
-void logv_error(const char *format, va_list ap)
+[[noreturn]]
+static void logv_error(const char *format, va_list ap)
 {
 	logv_error_with_prefix("ERROR: ", format, ap);
 }
diff --git a/kernel/log.h b/kernel/log.h
index 48997d250..27ee49d8f 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -119,11 +119,6 @@ extern int log_make_debug;
 extern int log_force_debug;
 extern int log_debug_suppressed;
 
-void logv(const char *format, va_list ap);
-void logv_header(RTLIL::Design *design, const char *format, va_list ap);
-void logv_warning(const char *format, va_list ap);
-void logv_warning_noprefix(const char *format, va_list ap);
-[[noreturn]] void logv_error(const char *format, va_list ap);
 [[noreturn]] void logv_file_error(const string &filename, int lineno, const char *format, va_list ap);
 
 void log(const char *format, ...)  YS_ATTRIBUTE(format(printf, 1, 2));

From d34ac0c87d5a31eacfe9c8ae0ad350f72ba90349 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 10 Jul 2025 05:24:59 +0000
Subject: [PATCH 478/931] Make `log()` use the `FmtString` infrastructure.

Now `log()` supports `std::string`.

We have to fix a few places where the format parameter was not a compile time constant.
This is mostly trivial.
---
 backends/cxxrtl/cxxrtl_backend.cc |  4 +--
 kernel/io.h                       |  1 +
 kernel/log.cc                     | 45 +++++++++++++++++--------------
 kernel/log.h                      | 35 +++++++++++++++++++-----
 passes/cmds/logcmd.cc             | 10 +++----
 passes/cmds/stat.cc               |  2 +-
 passes/equiv/equiv_simple.cc      |  2 +-
 passes/sat/sat.cc                 |  4 +--
 passes/techmap/dfflibmap.cc       | 14 +++++-----
 passes/tests/test_cell.cc         |  2 +-
 10 files changed, 74 insertions(+), 45 deletions(-)

diff --git a/backends/cxxrtl/cxxrtl_backend.cc b/backends/cxxrtl/cxxrtl_backend.cc
index 7080f54d5..0c9f6c054 100644
--- a/backends/cxxrtl/cxxrtl_backend.cc
+++ b/backends/cxxrtl/cxxrtl_backend.cc
@@ -3478,8 +3478,8 @@ struct CxxrtlWorker {
 };
 
 struct CxxrtlBackend : public Backend {
-	static const int DEFAULT_OPT_LEVEL = 6;
-	static const int DEFAULT_DEBUG_LEVEL = 4;
+	static constexpr int DEFAULT_OPT_LEVEL = 6;
+	static constexpr int DEFAULT_DEBUG_LEVEL = 4;
 
 	CxxrtlBackend() : Backend("cxxrtl", "convert design to C++ RTL simulation") { }
 	void help() override
diff --git a/kernel/io.h b/kernel/io.h
index 08c234d6e..2ad0a6466 100644
--- a/kernel/io.h
+++ b/kernel/io.h
@@ -437,6 +437,7 @@ public:
 	{
 		return format_emit_toplevel(fmt, has_escapes, specs, args...);
 	}
+	std::string_view format_string() const { return fmt; }
 private:
 	std::string_view fmt;
 	bool has_escapes = false;
diff --git a/kernel/log.cc b/kernel/log.cc
index 1cd4a5449..0afc98cd0 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -102,17 +102,16 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)
 }
 #endif
 
-static void logv(const char *format, va_list ap)
-{
-	while (format[0] == '\n' && format[1] != 0) {
-		log("\n");
-		format++;
+static void logv_string(std::string_view format, std::string str) {
+	size_t remove_leading = 0;
+	while (format.size() > 1 && format[0] == '\n') {
+		logv_string("\n", "\n");
+		format = format.substr(1);
+		++remove_leading;
+	}
+	if (remove_leading > 0) {
+		str = str.substr(remove_leading);
 	}
-
-	if (log_make_debug && !ys_debug(1))
-		return;
-
-	std::string str = vstringf(format, ap);
 
 	if (str.empty())
 		return;
@@ -145,13 +144,13 @@ static void logv(const char *format, va_list ap)
 			time_str += stringf("[%05d.%06d] ", int(tv.tv_sec), int(tv.tv_usec));
 		}
 
-		if (format[0] && format[strlen(format)-1] == '\n')
+		if (!format.empty() && format[format.size() - 1] == '\n')
 			next_print_log = true;
 
 		// Special case to detect newlines in Python log output, since
 		// the binding always calls `log("%s", payload)` and the newline
 		// is then in the first formatted argument
-		if (!strcmp(format, "%s") && str.back() == '\n')
+		if (format == "%s" && str.back() == '\n')
 			next_print_log = true;
 
 		for (auto f : log_files)
@@ -204,6 +203,20 @@ static void logv(const char *format, va_list ap)
 	}
 }
 
+static void logv(const char *format, va_list ap)
+{
+	if (log_make_debug && !ys_debug(1))
+		return;
+	logv_string(format, vstringf(format, ap));
+}
+
+void log_formatted_string(std::string_view format, std::string str)
+{
+	if (log_make_debug && !ys_debug(1))
+		return;
+	logv_string(format, std::move(str));
+}
+
 static void logv_header(RTLIL::Design *design, const char *format, va_list ap)
 {
 	bool pop_errfile = false;
@@ -412,14 +425,6 @@ void log_file_error(const string &filename, int lineno,
 	logv_file_error(filename, lineno, format, ap);
 }
 
-void log(const char *format, ...)
-{
-	va_list ap;
-	va_start(ap, format);
-	logv(format, ap);
-	va_end(ap);
-}
-
 void log_header(RTLIL::Design *design, const char *format, ...)
 {
 	va_list ap;
diff --git a/kernel/log.h b/kernel/log.h
index 27ee49d8f..f58bf3afe 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -121,7 +121,7 @@ extern int log_debug_suppressed;
 
 [[noreturn]] void logv_file_error(const string &filename, int lineno, const char *format, va_list ap);
 
-void log(const char *format, ...)  YS_ATTRIBUTE(format(printf, 1, 2));
+
 void log_header(RTLIL::Design *design, const char *format, ...) YS_ATTRIBUTE(format(printf, 2, 3));
 void log_warning(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
 void log_experimental(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
@@ -145,6 +145,15 @@ static inline bool ys_debug(int = 0) { return false; }
 #endif
 #  define log_debug(...) do { if (ys_debug(1)) log(__VA_ARGS__); } while (0)
 
+void log_formatted_string(std::string_view format, std::string str);
+template <typename... Args>
+inline void log(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+{
+	if (log_make_debug && !ys_debug(1))
+		return;
+	log_formatted_string(fmt.format_string(), fmt.format(args...));
+}
+
 static inline void log_suppressed() {
 	if (log_debug_suppressed && !log_make_debug) {
 		log("<suppressed ~%d debug messages>\n", log_debug_suppressed);
@@ -346,8 +355,22 @@ static inline void log_dump_val_worker(unsigned long int v) { log("%lu", v); }
 static inline void log_dump_val_worker(long long int v) { log("%lld", v); }
 static inline void log_dump_val_worker(unsigned long long int v) { log("%lld", v); }
 #endif
-static inline void log_dump_val_worker(char c) { log(c >= 32 && c < 127 ? "'%c'" : "'\\x%02x'", c); }
-static inline void log_dump_val_worker(unsigned char c) { log(c >= 32 && c < 127 ? "'%c'" : "'\\x%02x'", c); }
+static inline void log_dump_val_worker(char c)
+{
+	if (c >= 32 && c < 127) {
+		log("'%c'", c);
+	} else {
+		log("'\\x%02x'", c);
+	}
+}
+static inline void log_dump_val_worker(unsigned char c)
+{
+	if (c >= 32 && c < 127) {
+		log("'%c'", c);
+	} else {
+		log("'\\x%02x'", c);
+	}
+}
 static inline void log_dump_val_worker(bool v) { log("%s", v ? "true" : "false"); }
 static inline void log_dump_val_worker(double v) { log("%f", v); }
 static inline void log_dump_val_worker(char *v) { log("%s", v); }
@@ -369,7 +392,7 @@ static inline void log_dump_val_worker(dict<K, T> &v) {
 	log("{");
 	bool first = true;
 	for (auto &it : v) {
-		log(first ? " " : ", ");
+		log("%s ", first ? "" : ",");
 		log_dump_val_worker(it.first);
 		log(": ");
 		log_dump_val_worker(it.second);
@@ -383,7 +406,7 @@ static inline void log_dump_val_worker(pool<K> &v) {
 	log("{");
 	bool first = true;
 	for (auto &it : v) {
-		log(first ? " " : ", ");
+		log("%s ", first ? "" : ",");
 		log_dump_val_worker(it);
 		first = false;
 	}
@@ -395,7 +418,7 @@ static inline void log_dump_val_worker(std::vector<K> &v) {
 	log("{");
 	bool first = true;
 	for (auto &it : v) {
-		log(first ? " " : ", ");
+		log("%s ", first ? "" : ",");
 		log_dump_val_worker(it);
 		first = false;
 	}
diff --git a/passes/cmds/logcmd.cc b/passes/cmds/logcmd.cc
index 0238627d1..391eaea2e 100644
--- a/passes/cmds/logcmd.cc
+++ b/passes/cmds/logcmd.cc
@@ -101,13 +101,13 @@ struct LogPass : public Pass {
 			text += args[argidx] + ' ';
 		if (!text.empty()) text.resize(text.size()-1);
 
-		const char *fmtline = newline ? "%s\n" : "%s";
+		const char *line_end = newline ? "\n" : "";
 
-		if (to_stdout) fprintf(stdout, fmtline, text.c_str());
-		if (to_stderr) fprintf(stderr, fmtline, text.c_str());
+		if (to_stdout) fprintf(stdout, "%s%s", text.c_str(), line_end);
+		if (to_stderr) fprintf(stderr, "%s%s", text.c_str(), line_end);
 		if (to_log) {
-			if (!header) log(fmtline, text.c_str());
-			else log_header(design, fmtline, text.c_str());
+			if (!header) log("%s%s", text.c_str(), line_end);
+			else log_header(design, "%s%s", text.c_str(), line_end);
 		}
 	}
 } LogPass;
diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index ebbd10b5c..9281f3327 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -1017,7 +1017,7 @@ struct StatPass : public Pass {
 
 		if (json_mode) {
 			log("\n");
-			log(top_mod == nullptr ? "   }\n" : "   },\n");
+			log("%s", top_mod == nullptr ? "   }\n" : "   },\n");
 		}
 
 		if (top_mod != nullptr) {
diff --git a/passes/equiv/equiv_simple.cc b/passes/equiv/equiv_simple.cc
index 8ba42595e..9e3076077 100644
--- a/passes/equiv/equiv_simple.cc
+++ b/passes/equiv/equiv_simple.cc
@@ -331,7 +331,7 @@ struct EquivSimpleWorker
 			construct_ezsat(input_bits, step);
 
 			if (!ez->solve(ez_context)) {
-				log(cfg.verbose ? "    Proved equivalence! Marking $equiv cell as proven.\n" : " success!\n");
+				log("%s", cfg.verbose ? "    Proved equivalence! Marking $equiv cell as proven.\n" : " success!\n");
 				// Replace $equiv cell with a short
 				cell->setPort(ID::B, cell->getPort(ID::A));
 				ez->assume(ez->NOT(ez_context));
diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc
index 2f20880cb..60e099097 100644
--- a/passes/sat/sat.cc
+++ b/passes/sat/sat.cc
@@ -634,10 +634,10 @@ struct SatHelper
 						    "---------------------------------------------------------------------------------------------------"
 						    "---------------------------------------------------------------------------------------------------";
 				if (last_timestep == -2) {
-					log(max_timestep > 0 ? "  Time " : "  ");
+					log("%s", max_timestep > 0 ? "  Time " : "  ");
 					log("%-*s %11s %9s %*s\n", maxModelName+5, "Signal Name", "Dec", "Hex", maxModelWidth+3, "Bin");
 				}
-				log(max_timestep > 0 ? "  ---- " : "  ");
+				log("%s", max_timestep > 0 ? "  ---- " : "  ");
 				log("%*.*s %11.11s %9.9s %*.*s\n", maxModelName+5, maxModelName+5,
 						hline, hline, hline, maxModelWidth+3, maxModelWidth+3, hline);
 				last_timestep = info.timestep;
diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index a2b9c3bff..70d0f4ef5 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -135,7 +135,7 @@ static bool parse_next_state(const LibertyAst *cell, const LibertyAst *attr, std
 	if (ff == nullptr || ff->args.size() != 2)
 		return false;
 	auto ff_output = ff->args.at(0);
-	
+
 	// This test is redundant with the one in enable_pin, but we're in a
 	// position that gives better diagnostics here.
 	if (!pin_names.count(ff_output)) {
@@ -166,23 +166,23 @@ static bool parse_next_state(const LibertyAst *cell, const LibertyAst *attr, std
 		// the ff output Q is in a known bit location, so we now just have to compare the LUT mask to known values to find the enable pin and polarity.
 		if (lut == 0xD8) {
 			data_name = pins[1];
-			enable_name = pins[0];	
+			enable_name = pins[0];
 			return true;
 		}
 		if (lut == 0xB8) {
 			data_name = pins[0];
-			enable_name = pins[1];	
+			enable_name = pins[1];
 			return true;
 		}
 		enable_not_inverted = false;
 		if (lut == 0xE4) {
 			data_name = pins[1];
-			enable_name = pins[0];	
+			enable_name = pins[0];
 			return true;
 		}
 		if (lut == 0xE2) {
 			data_name = pins[0];
-			enable_name = pins[1];	
+			enable_name = pins[1];
 			return true;
 		}
 		// this does not match an enable flop.
@@ -553,11 +553,11 @@ static void dfflibmap(RTLIL::Design *design, RTLIL::Module *module)
 			new_cell->setPort("\\" + port.first, sig);
 		}
 
-		stats[stringf("  mapped %%d %s cells to %s cells.\n", cell_type, new_cell->type)]++;
+		stats[stringf("%s cells to %s cells", cell_type, new_cell->type)]++;
 	}
 
 	for (auto &stat: stats)
-		log(stat.first.c_str(), stat.second);
+		log("  mapped %d %s.\n", stat.second, stat.first);
 }
 
 struct DfflibmapPass : public Pass {
diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index 87e0a00f8..a08a6ec29 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -620,7 +620,7 @@ static void run_eval_test(RTLIL::Design *design, bool verbose, bool nosat, std::
 
 	for (int i = 0; i < 64; i++)
 	{
-		log(verbose ? "\n" : ".");
+		log("%s", verbose ? "\n" : ".");
 		gold_ce.clear();
 		gate_ce.clear();
 

From 66d2c2af08447ce1d4f80e91579a7348d1c65381 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 22 Jul 2025 02:26:50 +0000
Subject: [PATCH 479/931] Make `log_header()` use variadic templates.

---
 kernel/log.cc     | 12 ++----------
 kernel/log.h      |  8 +++++++-
 passes/opt/opt.cc |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index 0afc98cd0..bef3efb99 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -217,7 +217,7 @@ void log_formatted_string(std::string_view format, std::string str)
 	logv_string(format, std::move(str));
 }
 
-static void logv_header(RTLIL::Design *design, const char *format, va_list ap)
+void log_formatted_header(RTLIL::Design *design, std::string_view format, std::string str)
 {
 	bool pop_errfile = false;
 
@@ -236,7 +236,7 @@ static void logv_header(RTLIL::Design *design, const char *format, va_list ap)
 		header_id += stringf("%s%d", header_id.empty() ? "" : ".", c);
 
 	log("%s. ", header_id.c_str());
-	logv(format, ap);
+	log_formatted_string(format, std::move(str));
 	log_flush();
 
 	if (log_hdump_all)
@@ -425,14 +425,6 @@ void log_file_error(const string &filename, int lineno,
 	logv_file_error(filename, lineno, format, ap);
 }
 
-void log_header(RTLIL::Design *design, const char *format, ...)
-{
-	va_list ap;
-	va_start(ap, format);
-	logv_header(design, format, ap);
-	va_end(ap);
-}
-
 void log_warning(const char *format, ...)
 {
 	va_list ap;
diff --git a/kernel/log.h b/kernel/log.h
index f58bf3afe..55fa58a34 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -122,7 +122,6 @@ extern int log_debug_suppressed;
 [[noreturn]] void logv_file_error(const string &filename, int lineno, const char *format, va_list ap);
 
 
-void log_header(RTLIL::Design *design, const char *format, ...) YS_ATTRIBUTE(format(printf, 2, 3));
 void log_warning(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
 void log_experimental(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
 
@@ -154,6 +153,13 @@ inline void log(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
 	log_formatted_string(fmt.format_string(), fmt.format(args...));
 }
 
+void log_formatted_header(RTLIL::Design *design, std::string_view format, std::string str);
+template <typename... Args>
+inline void log_header(RTLIL::Design *design, FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+{
+	log_formatted_header(design, fmt.format_string(), fmt.format(args...));
+}
+
 static inline void log_suppressed() {
 	if (log_debug_suppressed && !log_make_debug) {
 		log("<suppressed ~%d debug messages>\n", log_debug_suppressed);
diff --git a/passes/opt/opt.cc b/passes/opt/opt.cc
index 146c21cce..ec5760cd9 100644
--- a/passes/opt/opt.cc
+++ b/passes/opt/opt.cc
@@ -196,7 +196,7 @@ struct OptPass : public Pass {
 		design->sort();
 		design->check();
 
-		log_header(design, fast_mode ? "Finished fast OPT passes.\n" : "Finished OPT passes. (There is nothing left to do.)\n");
+		log_header(design, "Finished fast OPT passes.%s\n", fast_mode ? "" : " (There is nothing left to do.)");
 		log_pop();
 	}
 } OptPass;

From 25cba6181e533f41474e7e87f465b13616931651 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 22 Jul 2025 03:14:15 +0000
Subject: [PATCH 480/931] Make log_warning()/log_warning_noprefix() use
 variadic templates.

---
 kernel/log.cc | 38 +++++---------------------------------
 kernel/log.h  | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index bef3efb99..18de1296a 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -256,10 +256,8 @@ void log_formatted_header(RTLIL::Design *design, std::string_view format, std::s
 		log_files.pop_back();
 }
 
-static void logv_warning_with_prefix(const char *prefix,
-                                     const char *format, va_list ap)
+void log_formatted_warning(std::string_view prefix, std::string message)
 {
-	std::string message = vstringf(format, ap);
 	bool suppressed = false;
 
 	for (auto &re : log_nowarn_regexes)
@@ -268,7 +266,7 @@ static void logv_warning_with_prefix(const char *prefix,
 
 	if (suppressed)
 	{
-		log("Suppressed %s%s", prefix, message.c_str());
+		log("Suppressed %s%s", prefix, message);
 	}
 	else
 	{
@@ -294,7 +292,7 @@ static void logv_warning_with_prefix(const char *prefix,
 
 		if (log_warnings.count(message))
 		{
-			log("%s%s", prefix, message.c_str());
+			log("%s%s", prefix, message);
 			log_flush();
 		}
 		else
@@ -302,7 +300,7 @@ static void logv_warning_with_prefix(const char *prefix,
 			if (log_errfile != NULL && !log_quiet_warnings)
 				log_files.push_back(log_errfile);
 
-			log("%s%s", prefix, message.c_str());
+			log("%s%s", prefix, message);
 			log_flush();
 
 			if (log_errfile != NULL && !log_quiet_warnings)
@@ -318,16 +316,6 @@ static void logv_warning_with_prefix(const char *prefix,
 	}
 }
 
-static void logv_warning(const char *format, va_list ap)
-{
-	logv_warning_with_prefix("Warning: ", format, ap);
-}
-
-static void logv_warning_noprefix(const char *format, va_list ap)
-{
-	logv_warning_with_prefix("", format, ap);
-}
-
 void log_file_warning(const std::string &filename, int lineno,
                       const char *format, ...)
 {
@@ -335,7 +323,7 @@ void log_file_warning(const std::string &filename, int lineno,
 	va_start(ap, format);
 	std::string prefix = stringf("%s:%d: Warning: ",
 			filename.c_str(), lineno);
-	logv_warning_with_prefix(prefix.c_str(), format, ap);
+	log_formatted_warning(prefix, vstringf(format, ap));
 	va_end(ap);
 }
 
@@ -425,14 +413,6 @@ void log_file_error(const string &filename, int lineno,
 	logv_file_error(filename, lineno, format, ap);
 }
 
-void log_warning(const char *format, ...)
-{
-	va_list ap;
-	va_start(ap, format);
-	logv_warning(format, ap);
-	va_end(ap);
-}
-
 void log_experimental(const char *format, ...)
 {
 	va_list ap;
@@ -446,14 +426,6 @@ void log_experimental(const char *format, ...)
 	}
 }
 
-void log_warning_noprefix(const char *format, ...)
-{
-	va_list ap;
-	va_start(ap, format);
-	logv_warning_noprefix(format, ap);
-	va_end(ap);
-}
-
 void log_error(const char *format, ...)
 {
 	va_list ap;
diff --git a/kernel/log.h b/kernel/log.h
index 55fa58a34..c8277f365 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -122,7 +122,6 @@ extern int log_debug_suppressed;
 [[noreturn]] void logv_file_error(const string &filename, int lineno, const char *format, va_list ap);
 
 
-void log_warning(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
 void log_experimental(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
 
 void set_verific_logging(void (*cb)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg));
@@ -132,7 +131,6 @@ extern void (*log_verific_callback)(int msg_type, const char *message_id, const
 void log_file_warning(const std::string &filename, int lineno, const char *format, ...) YS_ATTRIBUTE(format(printf, 3, 4));
 void log_file_info(const std::string &filename, int lineno, const char *format, ...) YS_ATTRIBUTE(format(printf, 3, 4));
 
-void log_warning_noprefix(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
 [[noreturn]] void log_error(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
 [[noreturn]] void log_file_error(const string &filename, int lineno, const char *format, ...) YS_ATTRIBUTE(format(printf, 3, 4));
 [[noreturn]] void log_cmd_error(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
@@ -160,6 +158,18 @@ inline void log_header(RTLIL::Design *design, FmtString<TypeIdentity<Args>...> f
 	log_formatted_header(design, fmt.format_string(), fmt.format(args...));
 }
 
+void log_formatted_warning(std::string_view prefix, std::string str);
+template <typename... Args>
+inline void log_warning(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+{
+	log_formatted_warning("Warning: ", fmt.format(args...));
+}
+template <typename... Args>
+inline void log_warning_noprefix(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+{
+	log_formatted_warning("", fmt.format(args...));
+}
+
 static inline void log_suppressed() {
 	if (log_debug_suppressed && !log_make_debug) {
 		log("<suppressed ~%d debug messages>\n", log_debug_suppressed);

From 2a2c586e2c6ff1d1cca63aefc6df3ba337fa87a7 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 22 Jul 2025 03:51:29 +0000
Subject: [PATCH 481/931] Make log_experimental() just take an std::string,
 since it doesn't need to be varargs.

---
 kernel/log.cc      | 13 ++++---------
 kernel/log.h       |  5 ++---
 kernel/register.cc |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index 18de1296a..e5715425a 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -413,16 +413,11 @@ void log_file_error(const string &filename, int lineno,
 	logv_file_error(filename, lineno, format, ap);
 }
 
-void log_experimental(const char *format, ...)
+void log_experimental(const std::string &str)
 {
-	va_list ap;
-	va_start(ap, format);
-	string s = vstringf(format, ap);
-	va_end(ap);
-
-	if (log_experimentals_ignored.count(s) == 0 && log_experimentals.count(s) == 0) {
-		log_warning("Feature '%s' is experimental.\n", s.c_str());
-		log_experimentals.insert(s);
+	if (log_experimentals_ignored.count(str) == 0 && log_experimentals.count(str) == 0) {
+		log_warning("Feature '%s' is experimental.\n", str);
+		log_experimentals.insert(str);
 	}
 }
 
diff --git a/kernel/log.h b/kernel/log.h
index c8277f365..af30d9cfa 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -121,9 +121,6 @@ extern int log_debug_suppressed;
 
 [[noreturn]] void logv_file_error(const string &filename, int lineno, const char *format, va_list ap);
 
-
-void log_experimental(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
-
 void set_verific_logging(void (*cb)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg));
 extern void (*log_verific_callback)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg);
 
@@ -170,6 +167,8 @@ inline void log_warning_noprefix(FmtString<TypeIdentity<Args>...> fmt, const Arg
 	log_formatted_warning("", fmt.format(args...));
 }
 
+void log_experimental(const std::string &str);
+
 static inline void log_suppressed() {
 	if (log_debug_suppressed && !log_make_debug) {
 		log("<suppressed ~%d debug messages>\n", log_debug_suppressed);
diff --git a/kernel/register.cc b/kernel/register.cc
index 0b02a6aa5..c82620f40 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -265,7 +265,7 @@ void Pass::call(RTLIL::Design *design, std::vector<std::string> args)
 		log_cmd_error("No such command: %s (type 'help' for a command overview)\n", args[0].c_str());
 
 	if (pass_register[args[0]]->experimental_flag)
-		log_experimental("%s", args[0].c_str());
+		log_experimental(args[0]);
 
 	size_t orig_sel_stack_pos = design->selection_stack.size();
 	auto state = pass_register[args[0]]->pre_execute();

From 9764fa5c41c39d704762c961fbba3db4008d41e2 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 22 Jul 2025 04:01:02 +0000
Subject: [PATCH 482/931] Remove superfluous/wasteful .c_str()s in
 log_file_warning() filename parameter

---
 frontends/verilog/verilog_lexer.l | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index 8280c0067..fbc9fca07 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -162,7 +162,7 @@ static bool is_hex_dig(char c, int *val, parser::location_type loc)
 		*val = c - 'A' + 0xA;
 		return true;
 	} else if (c == 'x' || c == 'X' || c == 'z' || c == 'Z' || c == '?') {
-		log_file_warning(loc.begin.filename->c_str(), loc.begin.line, "'%c' not a valid digit in hex escape sequence.\n", c);
+		log_file_warning(*loc.begin.filename, loc.begin.line, "'%c' not a valid digit in hex escape sequence.\n", c);
 		*val = 0; // not semantically valid in hex escape...
 		return true; // ...but still processed as part of hex token
 	}
@@ -176,7 +176,7 @@ static bool is_oct_dig(char c, int *val, parser::location_type loc)
 		*val = c - '0';
 		return true;
 	} else if (c == 'x' || c == 'X' || c == 'z' || c == 'Z' || c == '?') {
-		log_file_warning(loc.begin.filename->c_str(), loc.begin.line, "'%c' not a valid digit in octal escape sequence.\n", c);
+		log_file_warning(*loc.begin.filename, loc.begin.line, "'%c' not a valid digit in octal escape sequence.\n", c);
 		*val = 0; // not semantically valid in octal escape...
 		return true; // ...but still processed as part of octal token
 	}
@@ -196,7 +196,7 @@ static parser::symbol_type process_str(char *str, int len, bool triple, parser::
 			if (in + 1 < str + len && (in[1] ^ *in) == ('\n' ^ '\r'))
 				in++;
 			if (!triple)
-				log_file_warning(loc.begin.filename->c_str(), loc.begin.line, "Multi-line string literals should be triple-quoted or escaped.\n");
+				log_file_warning(*loc.begin.filename, loc.begin.line, "Multi-line string literals should be triple-quoted or escaped.\n");
 			*out++ = '\n';
 			break;
 		case '\\':
@@ -233,7 +233,7 @@ static parser::symbol_type process_str(char *str, int len, bool triple, parser::
 					}
 					out++;
 				} else
-					log_file_warning(loc.begin.filename->c_str(), loc.begin.line, "ignoring invalid hex escape.\n");
+					log_file_warning(*loc.begin.filename, loc.begin.line, "ignoring invalid hex escape.\n");
 				break;
 			case '\\':
 				*out++ = '\\';
@@ -256,7 +256,7 @@ static parser::symbol_type process_str(char *str, int len, bool triple, parser::
 						in++;
 						if (in + 1 < str + len && is_oct_dig(in[1], &val, loc)) {
 							if (*out >= 040)
-								log_file_warning(loc.begin.filename->c_str(), loc.begin.line, "octal escape exceeds \\377\n");
+								log_file_warning(*loc.begin.filename, loc.begin.line, "octal escape exceeds \\377\n");
 							*out = *out * 010 + val;
 							in++;
 						}

From ec5f62e6d4b3a4a207935ff6d94bbb9c0508cc75 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 22 Jul 2025 04:03:43 +0000
Subject: [PATCH 483/931] Make log_file_warning() use variadic templates.

---
 kernel/log.cc | 11 +++--------
 kernel/log.h  | 10 ++++++++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index e5715425a..911afbe9d 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -316,15 +316,10 @@ void log_formatted_warning(std::string_view prefix, std::string message)
 	}
 }
 
-void log_file_warning(const std::string &filename, int lineno,
-                      const char *format, ...)
+void log_formatted_file_warning(std::string_view filename, int lineno, std::string str)
 {
-	va_list ap;
-	va_start(ap, format);
-	std::string prefix = stringf("%s:%d: Warning: ",
-			filename.c_str(), lineno);
-	log_formatted_warning(prefix, vstringf(format, ap));
-	va_end(ap);
+	std::string prefix = stringf("%s:%d: Warning: ", filename, lineno);
+	log_formatted_warning(prefix, std::move(str));
 }
 
 void log_file_info(const std::string &filename, int lineno,
diff --git a/kernel/log.h b/kernel/log.h
index af30d9cfa..694b238df 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -124,8 +124,6 @@ extern int log_debug_suppressed;
 void set_verific_logging(void (*cb)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg));
 extern void (*log_verific_callback)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg);
 
-// Log with filename to report a problem in a source file.
-void log_file_warning(const std::string &filename, int lineno, const char *format, ...) YS_ATTRIBUTE(format(printf, 3, 4));
 void log_file_info(const std::string &filename, int lineno, const char *format, ...) YS_ATTRIBUTE(format(printf, 3, 4));
 
 [[noreturn]] void log_error(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
@@ -169,6 +167,14 @@ inline void log_warning_noprefix(FmtString<TypeIdentity<Args>...> fmt, const Arg
 
 void log_experimental(const std::string &str);
 
+// Log with filename to report a problem in a source file.
+void log_formatted_file_warning(std::string_view filename, int lineno, std::string str);
+template <typename... Args>
+void log_file_warning(std::string_view filename, int lineno, FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+{
+	log_formatted_file_warning(filename, lineno, fmt.format(args...));
+}
+
 static inline void log_suppressed() {
 	if (log_debug_suppressed && !log_make_debug) {
 		log("<suppressed ~%d debug messages>\n", log_debug_suppressed);

From ea2bb5b79aac400f473035e16094d664405477f2 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 22 Jul 2025 04:15:30 +0000
Subject: [PATCH 484/931] Make log_file_info() use variadic templates.

---
 kernel/log.cc | 17 ++---------------
 kernel/log.h  | 11 +++++++++--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index 911afbe9d..27d58b45b 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -203,13 +203,6 @@ static void logv_string(std::string_view format, std::string str) {
 	}
 }
 
-static void logv(const char *format, va_list ap)
-{
-	if (log_make_debug && !ys_debug(1))
-		return;
-	logv_string(format, vstringf(format, ap));
-}
-
 void log_formatted_string(std::string_view format, std::string str)
 {
 	if (log_make_debug && !ys_debug(1))
@@ -322,15 +315,9 @@ void log_formatted_file_warning(std::string_view filename, int lineno, std::stri
 	log_formatted_warning(prefix, std::move(str));
 }
 
-void log_file_info(const std::string &filename, int lineno,
-                      const char *format, ...)
+void log_formatted_file_info(std::string_view filename, int lineno, std::string str)
 {
-	va_list ap;
-	va_start(ap, format);
-	std::string fmt = stringf("%s:%d: Info: %s",
-			filename.c_str(), lineno, format);
-	logv(fmt.c_str(), ap);
-	va_end(ap);
+	log("%s:%d: Info: %s", filename, lineno, str);
 }
 
 [[noreturn]]
diff --git a/kernel/log.h b/kernel/log.h
index 694b238df..c3cbbc04a 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -124,8 +124,6 @@ extern int log_debug_suppressed;
 void set_verific_logging(void (*cb)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg));
 extern void (*log_verific_callback)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg);
 
-void log_file_info(const std::string &filename, int lineno, const char *format, ...) YS_ATTRIBUTE(format(printf, 3, 4));
-
 [[noreturn]] void log_error(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
 [[noreturn]] void log_file_error(const string &filename, int lineno, const char *format, ...) YS_ATTRIBUTE(format(printf, 3, 4));
 [[noreturn]] void log_cmd_error(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
@@ -175,6 +173,15 @@ void log_file_warning(std::string_view filename, int lineno, FmtString<TypeIdent
 	log_formatted_file_warning(filename, lineno, fmt.format(args...));
 }
 
+void log_formatted_file_info(std::string_view filename, int lineno, std::string str);
+template <typename... Args>
+void log_file_info(std::string_view filename, int lineno, FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+{
+	if (log_make_debug && !ys_debug(1))
+		return;
+	log_formatted_file_info(filename, lineno, fmt.format(args...));
+}
+
 static inline void log_suppressed() {
 	if (log_debug_suppressed && !log_make_debug) {
 		log("<suppressed ~%d debug messages>\n", log_debug_suppressed);

From 1b5373de0d4137c671c298cbf6e5530178a10ab8 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Sat, 23 Aug 2025 18:21:33 +1200
Subject: [PATCH 485/931] Move log_assert_worker()'s call to log_error() into
 an out-of-line non-varags function

---
 kernel/log.cc | 5 +++++
 kernel/log.h  | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index 27d58b45b..1e95ea5c5 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -410,6 +410,11 @@ void log_error(const char *format, ...)
 	logv_error(format, ap);
 }
 
+void log_assert_failure(const char *expr, const char *file, int line)
+{
+	log_error("Assert `%s' failed in %s:%d.\n", expr, file, line);
+}
+
 void log_cmd_error(const char *format, ...)
 {
 	va_list ap;
diff --git a/kernel/log.h b/kernel/log.h
index c3cbbc04a..40e1f02ff 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -252,9 +252,11 @@ void log_module(RTLIL::Module *module, std::string indent = "");
 void log_cell(RTLIL::Cell *cell, std::string indent = "");
 void log_wire(RTLIL::Wire *wire, std::string indent = "");
 
+[[noreturn]]
+void log_assert_failure(const char *expr, const char *file, int line);
 #ifndef NDEBUG
 static inline void log_assert_worker(bool cond, const char *expr, const char *file, int line) {
-	if (!cond) log_error("Assert `%s' failed in %s:%d.\n", expr, file, line);
+	if (!cond) log_assert_failure(expr, file, line);
 }
 #  define log_assert(_assert_expr_) YOSYS_NAMESPACE_PREFIX log_assert_worker(_assert_expr_, #_assert_expr_, __FILE__, __LINE__)
 #else

From c3924d06169d4172a336c4ac39766f2bb969c6af Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Sat, 23 Aug 2025 18:30:07 +1200
Subject: [PATCH 486/931] Move log_abort()'s call to log_error() into an
 out-of-line non-varargs function

---
 kernel/log.cc | 5 +++++
 kernel/log.h  | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index 1e95ea5c5..6bab033de 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -415,6 +415,11 @@ void log_assert_failure(const char *expr, const char *file, int line)
 	log_error("Assert `%s' failed in %s:%d.\n", expr, file, line);
 }
 
+void log_abort_internal(const char *file, int line)
+{
+	log_error("Abort in %s:%d.\n", file, line);
+}
+
 void log_cmd_error(const char *format, ...)
 {
 	va_list ap;
diff --git a/kernel/log.h b/kernel/log.h
index 40e1f02ff..653a73ba3 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -263,7 +263,9 @@ static inline void log_assert_worker(bool cond, const char *expr, const char *fi
 #  define log_assert(_assert_expr_) do { if (0) { (void)(_assert_expr_); } } while(0)
 #endif
 
-#define log_abort() YOSYS_NAMESPACE_PREFIX log_error("Abort in %s:%d.\n", __FILE__, __LINE__)
+[[noreturn]]
+void log_abort_internal(const char *file, int line);
+#define log_abort() YOSYS_NAMESPACE_PREFIX log_abort_internal(__FILE__, __LINE__)
 #define log_ping() YOSYS_NAMESPACE_PREFIX log("-- %s:%d %s --\n", __FILE__, __LINE__, __PRETTY_FUNCTION__)
 
 

From 974455378b14e0aa71a7fc55517209bf1cdd0a6c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 22 Jul 2025 04:28:32 +0000
Subject: [PATCH 487/931] Make log_error() use variadic templates.

---
 kernel/log.cc | 25 ++++++++-----------------
 kernel/log.h  |  8 +++++++-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index 6bab033de..55e721768 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -268,7 +268,7 @@ void log_formatted_warning(std::string_view prefix, std::string message)
 
 		for (auto &re : log_werror_regexes)
 			if (std::regex_search(message, re))
-				log_error("%s",  message.c_str());
+				log_error("%s", message);
 
 		bool warning_match = false;
 		for (auto &[_, item] : log_expect_warning)
@@ -321,8 +321,7 @@ void log_formatted_file_info(std::string_view filename, int lineno, std::string
 }
 
 [[noreturn]]
-static void logv_error_with_prefix(const char *prefix,
-                                   const char *format, va_list ap)
+static void log_error_with_prefix(std::string_view prefix, std::string str)
 {
 #ifdef EMSCRIPTEN
 	auto backup_log_files = log_files;
@@ -339,8 +338,8 @@ static void logv_error_with_prefix(const char *prefix,
 			if (f == stdout)
 				f = stderr;
 
-	log_last_error = vstringf(format, ap);
-	log("%s%s", prefix, log_last_error.c_str());
+	log_last_error = std::move(str);
+	log("%s%s", prefix, log_last_error);
 	log_flush();
 
 	log_make_debug = bak_log_make_debug;
@@ -373,18 +372,12 @@ static void logv_error_with_prefix(const char *prefix,
 #endif
 }
 
-[[noreturn]]
-static void logv_error(const char *format, va_list ap)
-{
-	logv_error_with_prefix("ERROR: ", format, ap);
-}
-
 void logv_file_error(const string &filename, int lineno,
                      const char *format, va_list ap)
 {
 	std::string prefix = stringf("%s:%d: ERROR: ",
 				     filename.c_str(), lineno);
-	logv_error_with_prefix(prefix.c_str(), format, ap);
+	log_error_with_prefix(prefix, vstringf(format, ap));
 }
 
 void log_file_error(const string &filename, int lineno,
@@ -403,11 +396,9 @@ void log_experimental(const std::string &str)
 	}
 }
 
-void log_error(const char *format, ...)
+void log_formatted_error(std::string str)
 {
-	va_list ap;
-	va_start(ap, format);
-	logv_error(format, ap);
+	log_error_with_prefix("ERROR: ", std::move(str));
 }
 
 void log_assert_failure(const char *expr, const char *file, int line)
@@ -445,7 +436,7 @@ void log_cmd_error(const char *format, ...)
 		throw log_cmd_error_exception();
 	}
 
-	logv_error(format, ap);
+	log_formatted_error(vstringf(format, ap));
 }
 
 void log_spacer()
diff --git a/kernel/log.h b/kernel/log.h
index 653a73ba3..396a24efa 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -124,7 +124,6 @@ extern int log_debug_suppressed;
 void set_verific_logging(void (*cb)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg));
 extern void (*log_verific_callback)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg);
 
-[[noreturn]] void log_error(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
 [[noreturn]] void log_file_error(const string &filename, int lineno, const char *format, ...) YS_ATTRIBUTE(format(printf, 3, 4));
 [[noreturn]] void log_cmd_error(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
 
@@ -182,6 +181,13 @@ void log_file_info(std::string_view filename, int lineno, FmtString<TypeIdentity
 	log_formatted_file_info(filename, lineno, fmt.format(args...));
 }
 
+[[noreturn]] void log_formatted_error(std::string str);
+template <typename... Args>
+[[noreturn]] void log_error(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+{
+	log_formatted_error(fmt.format(args...));
+}
+
 static inline void log_suppressed() {
 	if (log_debug_suppressed && !log_make_debug) {
 		log("<suppressed ~%d debug messages>\n", log_debug_suppressed);

From 243f5f52013a4dd7efcb44b564d916c2c094435c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 22 Jul 2025 04:35:30 +0000
Subject: [PATCH 488/931] Make log_file_error() use variadic templates.

---
 kernel/log.cc | 18 +++++++-----------
 kernel/log.h  |  8 +++++++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index 55e721768..ceebc3a86 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -372,20 +372,16 @@ static void log_error_with_prefix(std::string_view prefix, std::string str)
 #endif
 }
 
+void log_formatted_file_error(std::string_view filename, int lineno, std::string str)
+{
+	std::string prefix = stringf("%s:%d: ERROR: ", filename, lineno);
+	log_error_with_prefix(prefix, str);
+}
+
 void logv_file_error(const string &filename, int lineno,
                      const char *format, va_list ap)
 {
-	std::string prefix = stringf("%s:%d: ERROR: ",
-				     filename.c_str(), lineno);
-	log_error_with_prefix(prefix, vstringf(format, ap));
-}
-
-void log_file_error(const string &filename, int lineno,
-                    const char *format, ...)
-{
-	va_list ap;
-	va_start(ap, format);
-	logv_file_error(filename, lineno, format, ap);
+	log_formatted_file_error(filename, lineno, vstringf(format, ap));
 }
 
 void log_experimental(const std::string &str)
diff --git a/kernel/log.h b/kernel/log.h
index 396a24efa..6cd97ce11 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -124,7 +124,6 @@ extern int log_debug_suppressed;
 void set_verific_logging(void (*cb)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg));
 extern void (*log_verific_callback)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg);
 
-[[noreturn]] void log_file_error(const string &filename, int lineno, const char *format, ...) YS_ATTRIBUTE(format(printf, 3, 4));
 [[noreturn]] void log_cmd_error(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
 
 #ifndef NDEBUG
@@ -188,6 +187,13 @@ template <typename... Args>
 	log_formatted_error(fmt.format(args...));
 }
 
+[[noreturn]] void log_formatted_file_error(std::string_view filename, int lineno, std::string str);
+template <typename... Args>
+[[noreturn]] void log_file_error(std::string_view filename, int lineno, FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+{
+	log_formatted_file_error(filename, lineno, fmt.format(args...));
+}
+
 static inline void log_suppressed() {
 	if (log_debug_suppressed && !log_make_debug) {
 		log("<suppressed ~%d debug messages>\n", log_debug_suppressed);

From a137d03c329393397ea42f342efa44002f5a6f9f Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 22 Jul 2025 04:42:43 +0000
Subject: [PATCH 489/931] Make log_cmd_error() use variadic templates.

---
 kernel/log.cc | 11 ++++-------
 kernel/log.h  |  9 +++++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index ceebc3a86..0dd56a04f 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -407,13 +407,10 @@ void log_abort_internal(const char *file, int line)
 	log_error("Abort in %s:%d.\n", file, line);
 }
 
-void log_cmd_error(const char *format, ...)
+void log_formatted_cmd_error(std::string str)
 {
-	va_list ap;
-	va_start(ap, format);
-
 	if (log_cmd_error_throw) {
-		log_last_error = vstringf(format, ap);
+		log_last_error = str;
 
 		// Make sure the error message gets through any selective silencing
 		// of log output
@@ -423,7 +420,7 @@ void log_cmd_error(const char *format, ...)
 			pop_errfile = true;
 		}
 
-		log("ERROR: %s", log_last_error.c_str());
+		log("ERROR: %s", log_last_error);
 		log_flush();
 
 		if (pop_errfile)
@@ -432,7 +429,7 @@ void log_cmd_error(const char *format, ...)
 		throw log_cmd_error_exception();
 	}
 
-	log_formatted_error(vstringf(format, ap));
+	log_formatted_error(str);
 }
 
 void log_spacer()
diff --git a/kernel/log.h b/kernel/log.h
index 6cd97ce11..5143524bf 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -124,8 +124,6 @@ extern int log_debug_suppressed;
 void set_verific_logging(void (*cb)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg));
 extern void (*log_verific_callback)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg);
 
-[[noreturn]] void log_cmd_error(const char *format, ...) YS_ATTRIBUTE(format(printf, 1, 2));
-
 #ifndef NDEBUG
 static inline bool ys_debug(int n = 0) { if (log_force_debug) return true; log_debug_suppressed += n; return false; }
 #else
@@ -194,6 +192,13 @@ template <typename... Args>
 	log_formatted_file_error(filename, lineno, fmt.format(args...));
 }
 
+[[noreturn]] void log_formatted_cmd_error(std::string str);
+template <typename... Args>
+[[noreturn]] void log_cmd_error(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+{
+	log_formatted_cmd_error(fmt.format(args...));
+}
+
 static inline void log_suppressed() {
 	if (log_debug_suppressed && !log_make_debug) {
 		log("<suppressed ~%d debug messages>\n", log_debug_suppressed);

From 75a97241fabeb898e0c801349350912cd03cf7d0 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 9 Sep 2025 10:23:15 +0200
Subject: [PATCH 490/931] Maintain logging ABI compatiblity with YosysHQ
 Verific Extensions

The YosysHQ Verific Extensions are compiled separately using their own
stripped-down version of the Yosys headers. To maintain ABI
compatibility with older extension builds post C++-ification of Yosys's
logging APIs, which are backwards compatible on the API but not ABI
level, this commit adds ABI compatible versions of a subset of the old
logging API used by the extensions.
---
 Makefile             |  3 ++
 kernel/log_compat.cc | 86 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 kernel/log_compat.cc

diff --git a/Makefile b/Makefile
index aedcd4d3b..fc8d361e6 100644
--- a/Makefile
+++ b/Makefile
@@ -633,6 +633,9 @@ $(eval $(call add_include_file,backends/rtlil/rtlil_backend.h))
 
 OBJS += kernel/driver.o kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o kernel/yosys.o kernel/io.o kernel/gzip.o
 OBJS += kernel/log_help.o
+ifeq ($(ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS),1)
+OBJS += kernel/log_compat.o
+endif
 OBJS += kernel/binding.o kernel/tclapi.o
 OBJS += kernel/cellaigs.o kernel/celledges.o kernel/cost.o kernel/satgen.o kernel/scopeinfo.o kernel/qcsat.o kernel/mem.o kernel/ffmerge.o kernel/ff.o kernel/yw.o kernel/json.o kernel/fmt.o kernel/sexpr.o
 OBJS += kernel/drivertools.o kernel/functional.o
diff --git a/kernel/log_compat.cc b/kernel/log_compat.cc
new file mode 100644
index 000000000..e93714873
--- /dev/null
+++ b/kernel/log_compat.cc
@@ -0,0 +1,86 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+
+#include "kernel/log.h"
+
+YOSYS_NAMESPACE_BEGIN
+
+// ABI compatibility for the YosysHQ Verific Extensions
+
+// The YosysHQ Verific Extensions are compiled separately using their own
+// stripped-down version of the Yosys headers. To maintain ABI compatibility
+// with older extension builds post C++-ification of Yosys's logging APIs,
+// which are backwards compatible on the API but not ABI level, this file
+// provides ABI compatible versions of a subset of the old logging API used by
+// the extensions.
+
+void log_cmd_error(const char *format, ...)
+{
+    va_list ap;
+	va_start(ap, format);
+	std::string formatted = vstringf(format, ap);
+	va_end(ap);
+    log_formatted_cmd_error(formatted);
+}
+
+void log_warning(const char *format, ...)
+{
+    va_list ap;
+	va_start(ap, format);
+	std::string formatted = vstringf(format, ap);
+	va_end(ap);
+    log_formatted_warning("Warning: ", formatted);
+}
+
+void log_warning_noprefix(const char *format, ...)
+{
+    va_list ap;
+	va_start(ap, format);
+	std::string formatted = vstringf(format, ap);
+	va_end(ap);
+    log_formatted_warning("", formatted);
+}
+
+void log_error(const char *format, ...)
+{
+    va_list ap;
+	va_start(ap, format);
+	std::string formatted = vstringf(format, ap);
+	va_end(ap);
+    log_formatted_error(formatted);
+}
+
+static inline void log_formatted(std::string const &str)
+{
+    // We use this inline wrapper as the following becomes ambiguous as soon as
+    // the `log` function below is declared.
+    return log("%s", str);
+}
+
+void log(const char *format, ...)
+{
+    va_list ap;
+	va_start(ap, format);
+	std::string formatted = vstringf(format, ap);
+	va_end(ap);
+    log_formatted(formatted);
+}
+
+YOSYS_NAMESPACE_END

From c2291c10a6f27142bc376d8aa62c66cf856fcab9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 10 Sep 2025 00:22:30 +0000
Subject: [PATCH 491/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fc8d361e6..5da8066db 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+30
+YOSYS_VER := 0.57+52
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 9a6f25fb738cf50186dcb92fbb774e20f54d518d Mon Sep 17 00:00:00 2001
From: Xing Guo <higuoxing@gmail.com>
Date: Thu, 11 Sep 2025 00:47:40 +0800
Subject: [PATCH 492/931] verilog_parser: Use unique_ptr<> to store the
 attribute list.

We can get rid of the new / delete statements and free_attr() and we
don't need to manage the memory manually.
---
 frontends/verilog/verilog_parser.y | 298 ++++++++++++++---------------
 1 file changed, 144 insertions(+), 154 deletions(-)

diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index eb61e05df..3db92be01 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -69,9 +69,10 @@
 		struct ParseState {
 			int port_counter;
 			dict<std::string, int> port_stubs;
-			dict<IdString, std::unique_ptr<AstNode>> *attr_list, default_attr_list;
-			std::stack<dict<IdString, std::unique_ptr<AstNode>> *> attr_list_stack;
-			dict<IdString, std::unique_ptr<AstNode>> *albuf;
+			std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>> attr_list;
+			dict<IdString, std::unique_ptr<AstNode>> default_attr_list;
+			std::stack<std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>>> attr_list_stack;
+			std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>> albuf;
 			std::vector<UserTypeMap> user_type_stack;
 			dict<std::string, AstNode*> pkg_user_types;
 			std::vector<AstNode*> ast_stack;
@@ -97,13 +98,16 @@
 			bool isInLocalScope(const std::string *name);
 			void rewriteGenForDeclInit(AstNode *loop);
 			void ensureAsgnExprAllowed(const parser::location_type loc, bool sv_mode);
-			const AstNode *addIncOrDecStmt(dict<IdString, std::unique_ptr<AstNode>> *stmt_attr,
+			const AstNode *addIncOrDecStmt(std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>> stmt_attr,
 									std::unique_ptr<AstNode> lhs,
-									dict<IdString, std::unique_ptr<AstNode>> *op_attr, AST::AstNodeType op,
+									std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>> op_attr, AST::AstNodeType op,
 									parser::location_type loc);
-			std::unique_ptr<AstNode> addIncOrDecExpr(std::unique_ptr<AstNode> lhs, dict<IdString, std::unique_ptr<AstNode>> *attr, AST::AstNodeType op, parser::location_type loc, bool undo, bool sv_mode);
+			std::unique_ptr<AstNode> addIncOrDecExpr(std::unique_ptr<AstNode> lhs,
+								 std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>> attr,
+								 AST::AstNodeType op, parser::location_type loc, bool undo, bool sv_mode);
 			// add a binary operator assignment statement, e.g., a += b
-			std::unique_ptr<AstNode> addAsgnBinopStmt(dict<IdString, std::unique_ptr<AstNode>> *attr, std::unique_ptr<AstNode> eq_lhs, AST::AstNodeType op, std::unique_ptr<AstNode> rhs);
+			std::unique_ptr<AstNode> addAsgnBinopStmt(std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>> attr,
+								  std::unique_ptr<AstNode> eq_lhs, AST::AstNodeType op, std::unique_ptr<AstNode> rhs);
 		};
 		struct ParseMode {
 			bool noassert = false;
@@ -150,26 +154,20 @@
 			return Location(begin.begin, end.end);
 		}
 
-		static void append_attr(AstNode *ast, dict<IdString, std::unique_ptr<AstNode>> *al)
+		static void append_attr(AstNode *ast, std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>> al)
 		{
 			for (auto &it : *al) {
 				ast->attributes[it.first] = std::move(it.second);
 			}
-			delete al;
 		}
 
-		static void append_attr_clone(AstNode *ast, dict<IdString, std::unique_ptr<AstNode>> *al)
+		static void append_attr_clone(AstNode *ast, std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>> &al)
 		{
 			for (auto &it : *al) {
 				ast->attributes[it.first] = it.second->clone();
 			}
 		}
 
-		static void free_attr(dict<IdString, std::unique_ptr<AstNode>> *al)
-		{
-			delete al;
-		}
-
 		static std::unique_ptr<AstNode> makeRange(parser::location_type loc, int msb = 31, int lsb = 0, bool isSigned = true)
 		{
 			auto range = std::make_unique<AstNode>(loc, AST_RANGE);
@@ -363,28 +361,31 @@
 		}
 
 		// add a pre/post-increment/decrement statement
-		const AstNode *ParseState::addIncOrDecStmt(dict<IdString, std::unique_ptr<AstNode>> *stmt_attr,
+		const AstNode *ParseState::addIncOrDecStmt(std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>> stmt_attr,
 							std::unique_ptr<AstNode> lhs,
-							dict<IdString, std::unique_ptr<AstNode>> *op_attr, AST::AstNodeType op,
+							std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>> op_attr, AST::AstNodeType op,
 							Location loc)
 		{
 			auto one = AstNode::mkconst_int(loc, 1, true);
 			auto rhs = std::make_unique<AstNode>(loc, op, lhs->clone(), std::move(one));
-			if (op_attr != nullptr)
-				append_attr(rhs.get(), op_attr);
+			if (op_attr)
+				append_attr(rhs.get(), std::move(op_attr));
 			auto stmt_owned = std::make_unique<AstNode>(loc, AST_ASSIGN_EQ, std::move(lhs), std::move(rhs));
 			auto* stmt = stmt_owned.get();
 			ast_stack.back()->children.push_back(std::move(stmt_owned));
-			if (stmt_attr != nullptr)
-				append_attr(stmt, stmt_attr);
+			if (stmt_attr)
+				append_attr(stmt, std::move(stmt_attr));
 			return stmt;
 		}
 
 		// create a pre/post-increment/decrement expression, and add the corresponding statement
-		std::unique_ptr<AstNode> ParseState::addIncOrDecExpr(std::unique_ptr<AstNode> lhs, dict<IdString, std::unique_ptr<AstNode>> *attr, AST::AstNodeType op, Location loc, bool undo, bool sv_mode)
+		std::unique_ptr<AstNode> ParseState::addIncOrDecExpr(std::unique_ptr<AstNode> lhs,
+								     std::unique_ptr<dict<IdString,
+								     std::unique_ptr<AstNode>>> attr,
+								     AST::AstNodeType op, Location loc, bool undo, bool sv_mode)
 		{
 			ensureAsgnExprAllowed(loc, sv_mode);
-			const AstNode *stmt = addIncOrDecStmt(nullptr, std::move(lhs), attr, op, loc);
+			const AstNode *stmt = addIncOrDecStmt(nullptr, std::move(lhs), std::move(attr), op, loc);
 			log_assert(stmt->type == AST_ASSIGN_EQ);
 			auto expr = stmt->children[0]->clone();
 			if (undo) {
@@ -396,7 +397,8 @@
 		}
 
 		// add a binary operator assignment statement, e.g., a += b
-		std::unique_ptr<AstNode> ParseState::addAsgnBinopStmt(dict<IdString, std::unique_ptr<AstNode>> *attr, std::unique_ptr<AstNode> eq_lhs, AST::AstNodeType op, std::unique_ptr<AstNode> rhs)
+		std::unique_ptr<AstNode> ParseState::addAsgnBinopStmt(std::unique_ptr<dict<IdString, std::unique_ptr<AstNode>>> attr,
+								      std::unique_ptr<AstNode> eq_lhs, AST::AstNodeType op, std::unique_ptr<AstNode> rhs)
 		{
 			Location loc = location_range(eq_lhs->location, rhs->location);
 			if (op == AST_SHIFT_LEFT || op == AST_SHIFT_RIGHT ||
@@ -409,8 +411,8 @@
 			auto stmt_owned = std::make_unique<AstNode>(loc, AST_ASSIGN_EQ, std::move(eq_lhs), std::move(eq_rhs_owned));
 			auto* stmt = stmt_owned.get();
 			ast_stack.back()->children.push_back(std::move(stmt_owned));
-			if (attr != nullptr)
-				append_attr(stmt, attr);
+			if (attr)
+				append_attr(stmt, std::move(attr));
 			return ret_lhs;
 		}
 	};
@@ -460,7 +462,7 @@
 
 	using string_t = std::unique_ptr<std::string>;
 	using ast_t = std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode>;
-	using al_t = YOSYS_NAMESPACE_PREFIX dict<YOSYS_NAMESPACE_PREFIX RTLIL::IdString, std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode>>*;
+	using al_t = std::unique_ptr<YOSYS_NAMESPACE_PREFIX dict<YOSYS_NAMESPACE_PREFIX RTLIL::IdString, std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode>>>;
 	using specify_target_ptr_t = std::unique_ptr<struct specify_target>;
 	using specify_triple_ptr_t = std::unique_ptr<struct specify_triple>;
 	using specify_rise_fall_ptr_t = std::unique_ptr<struct specify_rise_fall>;
@@ -613,15 +615,15 @@ design:
 
 attr:
 	{
-		if (extra->attr_list != nullptr)
-			extra->attr_list_stack.push(extra->attr_list);
-		extra->attr_list = new dict<IdString, std::unique_ptr<AstNode>>;
+		if (extra->attr_list)
+			extra->attr_list_stack.push(std::move(extra->attr_list));
+		extra->attr_list = std::make_unique<dict<IdString, std::unique_ptr<AstNode>>>();
 		for (auto &it : extra->default_attr_list)
 			(*extra->attr_list)[it.first] = it.second->clone();
 	} attr_opt {
-		$$ = extra->attr_list;
+		$$ = std::move(extra->attr_list);
 		if (!extra->attr_list_stack.empty()) {
-			extra->attr_list = extra->attr_list_stack.top();
+			extra->attr_list = std::move(extra->attr_list_stack.top());
 			extra->attr_list_stack.pop();
 		} else
 			extra->attr_list = nullptr;
@@ -636,14 +638,14 @@ attr_opt:
 defattr:
 	DEFATTR_BEGIN {
 		if (extra->attr_list != nullptr)
-			extra->attr_list_stack.push(extra->attr_list);
-		extra->attr_list = new dict<IdString, std::unique_ptr<AstNode>>;
+			extra->attr_list_stack.push(std::move(extra->attr_list));
+		extra->attr_list = std::make_unique<dict<IdString, std::unique_ptr<AstNode>>>();
 		extra->default_attr_list.clear();
 	} opt_attr_list {
 		extra->attr_list->swap(extra->default_attr_list);
-		delete extra->attr_list;
+		extra->attr_list.reset();
 		if (!extra->attr_list_stack.empty()) {
-			extra->attr_list = extra->attr_list_stack.top();
+			extra->attr_list = std::move(extra->attr_list_stack.top());
 			extra->attr_list_stack.pop();
 		} else
 			extra->attr_list = nullptr;
@@ -699,7 +701,7 @@ module:
 		extra->port_stubs.clear();
 		extra->port_counter = 0;
 		mod->str = *$4;
-		append_attr(mod, $1);
+		append_attr(mod, std::move($1));
 	} module_para_opt module_args_opt TOK_SEMICOL module_body TOK_ENDMODULE opt_label {
 		if (extra->port_stubs.size() != 0)
 			err_at_loc(@7, "Missing details for module port `%s'.",
@@ -723,12 +725,12 @@ single_module_para:
 	attr TOK_PARAMETER {
 		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_PARAMETER);
 		extra->astbuf1->children.push_back(AstNode::mkconst_int(@2, 0, true));
-		append_attr(extra->astbuf1.get(), $1);
+		append_attr(extra->astbuf1.get(), std::move($1));
 	} param_type single_param_decl |
 	attr TOK_LOCALPARAM {
 		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_LOCALPARAM);
 		extra->astbuf1->children.push_back(AstNode::mkconst_int(@2, 0, true));
-		append_attr(extra->astbuf1.get(), $1);
+		append_attr(extra->astbuf1.get(), std::move($1));
 	} param_type single_param_decl |
 	single_param_decl;
 
@@ -798,7 +800,7 @@ module_arg:
 			err_at_loc(@4, "Module port `%s' is neither input nor output.", $4->c_str());
 		if (node->is_reg && node->is_input && !node->is_output && !mode->sv)
 			err_at_loc(@4, "Input port `%s' is declared as register.", $4->c_str());
-		append_attr(node.get(), $1);
+		append_attr(node.get(), std::move($1));
 		extra->ast_stack.back()->children.push_back(std::move(node));
 	} module_arg_opt_assignment |
 	TOK_DOT TOK_DOT TOK_DOT {
@@ -812,7 +814,7 @@ package:
 		AstNode* mod = extra->pushChild(std::make_unique<AstNode>(@$, AST_PACKAGE));
 		extra->current_ast_mod = mod;
 		mod->str = *$4;
-		append_attr(mod, $1);
+		append_attr(mod, std::move($1));
 	} TOK_SEMICOL package_body TOK_ENDPACKAGE opt_label {
 		extra->ast_stack.pop_back();
 		checkLabelsMatch(@9, "Package name", $4.get(), $9.get());
@@ -1114,28 +1116,28 @@ task_func_decl:
 	attr TOK_DPI_FUNCTION TOK_ID TOK_ID {
 		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(@$, AST_DPI_FUNCTION, AstNode::mkconst_str(@3, *$3), AstNode::mkconst_str(@4, *$4)));
 		extra->current_function_or_task->str = *$4;
-		append_attr(extra->current_function_or_task, $1);
+		append_attr(extra->current_function_or_task, std::move($1));
 	} opt_dpi_function_args TOK_SEMICOL {
 		extra->current_function_or_task = nullptr;
 	} |
 	attr TOK_DPI_FUNCTION TOK_ID TOK_EQ TOK_ID TOK_ID {
 		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(@$, AST_DPI_FUNCTION, AstNode::mkconst_str(@5, *$5), AstNode::mkconst_str(@3, *$3)));
 		extra->current_function_or_task->str = *$6;
-		append_attr(extra->current_function_or_task, $1);
+		append_attr(extra->current_function_or_task, std::move($1));
 	} opt_dpi_function_args TOK_SEMICOL {
 		extra->current_function_or_task = nullptr;
 	} |
 	attr TOK_DPI_FUNCTION TOK_ID TOK_COL TOK_ID TOK_EQ TOK_ID TOK_ID {
 		extra->current_function_or_task = extra->saveChild(std::make_unique<AstNode>(@$, AST_DPI_FUNCTION, AstNode::mkconst_str(@7, *$7), AstNode::mkconst_str(location_range(@3, @5), *$3 + ":" + RTLIL::unescape_id(*$5))));
 		extra->current_function_or_task->str = *$8;
-		append_attr(extra->current_function_or_task, $1);
+		append_attr(extra->current_function_or_task, std::move($1));
 	} opt_dpi_function_args TOK_SEMICOL {
 		extra->current_function_or_task = nullptr;
 	} |
 	attr TOK_TASK opt_automatic TOK_ID {
 		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(@$, AST_TASK));
 		extra->current_function_or_task->str = *$4;
-		append_attr(extra->current_function_or_task, $1);
+		append_attr(extra->current_function_or_task, std::move($1));
 		extra->current_function_or_task_port_id = 1;
 	} task_func_args_opt TOK_SEMICOL task_func_body TOK_ENDTASK {
 		extra->current_function_or_task = nullptr;
@@ -1149,7 +1151,7 @@ task_func_decl:
 		// function like a task.
 		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(@$, AST_TASK));
 		extra->current_function_or_task->str = *$5;
-		append_attr(extra->current_function_or_task, $1);
+		append_attr(extra->current_function_or_task, std::move($1));
 		extra->current_function_or_task_port_id = 1;
 	} task_func_args_opt TOK_SEMICOL task_func_body TOK_ENDFUNCTION {
 		extra->current_function_or_task = nullptr;
@@ -1158,7 +1160,7 @@ task_func_decl:
 	attr TOK_FUNCTION opt_automatic func_return_type TOK_ID {
 		extra->current_function_or_task = extra->pushChild(std::make_unique<AstNode>(@$, AST_FUNCTION));
 		extra->current_function_or_task->str = *$5;
-		append_attr(extra->current_function_or_task, $1);
+		append_attr(extra->current_function_or_task, std::move($1));
 		auto outreg = std::make_unique<AstNode>(@$, AST_WIRE);
 		outreg->str = *$5;
 		outreg->is_signed = false;
@@ -1240,7 +1242,7 @@ task_func_args_opt:
 		(void)extra->astbuf1.reset();
 		if (extra->astbuf2 != nullptr)
 			(void)extra->astbuf2.reset();
-		free_attr(extra->albuf);
+		extra->albuf.reset();
 	} TOK_RPAREN;
 
 task_func_args:
@@ -1256,9 +1258,9 @@ task_func_port:
 			(void)extra->astbuf1.reset();
 			if (extra->astbuf2 != nullptr)
 				(void)extra->astbuf2.reset();
-			free_attr(extra->albuf);
+			extra->albuf.reset();
 		}
-		extra->albuf = $1;
+		extra->albuf = std::move($1);
 		extra->astbuf1 = std::move($2);
 		extra->astbuf2 = checkRange(extra->astbuf1.get(), std::move($3));
 		if (!extra->astbuf1->is_input && !extra->astbuf1->is_output) {
@@ -1272,7 +1274,7 @@ task_func_port:
 		if (!extra->astbuf1) {
 			if (!mode->sv)
 				err_at_loc(@$, "task/function argument direction missing");
-			extra->albuf = new dict<IdString, std::unique_ptr<AstNode>>;
+			extra->albuf = std::make_unique<dict<IdString, std::unique_ptr<AstNode>>>();
 			extra->astbuf1 = std::make_unique<AstNode>(@$, AST_WIRE);
 			extra->current_wire_rand = false;
 			extra->current_wire_const = false;
@@ -1601,23 +1603,23 @@ state_dependent_path_declaration:
 module_path_expression:
 	module_path_primary
 	// Flatten out unary_operator to avoid shift/reduce conflict
-	| TOK_EXCL attr module_path_primary { free_attr($2); }
-	| TOK_TILDE attr module_path_primary { free_attr($2); }
-	| TOK_AMP attr module_path_primary { free_attr($2); }
-	| OP_NAND attr module_path_primary { free_attr($2); }
-	| TOK_PIPE attr module_path_primary { free_attr($2); }
-	| OP_NOR attr module_path_primary { free_attr($2); }
-	| TOK_CARET attr module_path_primary { free_attr($2); }
-	| OP_XNOR attr module_path_primary { free_attr($2); }
+	| TOK_EXCL attr module_path_primary
+	| TOK_TILDE attr module_path_primary
+	| TOK_AMP attr module_path_primary
+	| OP_NAND attr module_path_primary
+	| TOK_PIPE attr module_path_primary
+	| OP_NOR attr module_path_primary
+	| TOK_CARET attr module_path_primary
+	| OP_XNOR attr module_path_primary
 	// Flatten out binary_operator to avoid shift/reduce conflict
-	| module_path_expression OP_EQ attr module_path_expression { free_attr($3); }
-	| module_path_expression OP_NE attr module_path_expression { free_attr($3); }
-	| module_path_expression OP_LAND attr module_path_expression { free_attr($3); }
-	| module_path_expression OP_LOR attr module_path_expression { free_attr($3); }
-	| module_path_expression TOK_AMP attr module_path_expression { free_attr($3); }
-	| module_path_expression TOK_PIPE attr module_path_expression { free_attr($3); }
-	| module_path_expression TOK_CARET attr module_path_expression { free_attr($3); }
-	| module_path_expression OP_XNOR attr module_path_expression { free_attr($3); }
+	| module_path_expression OP_EQ attr module_path_expression
+	| module_path_expression OP_NE attr module_path_expression
+	| module_path_expression OP_LAND attr module_path_expression
+	| module_path_expression OP_LOR attr module_path_expression
+	| module_path_expression TOK_AMP attr module_path_expression
+	| module_path_expression TOK_PIPE attr module_path_expression
+	| module_path_expression TOK_CARET attr module_path_expression
+	| module_path_expression OP_XNOR attr module_path_expression
 	// | module_path_conditional_expression
 	;
 
@@ -1760,7 +1762,7 @@ param_decl:
 	attr TOK_PARAMETER {
 		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_PARAMETER);
 		extra->astbuf1->children.push_back(AstNode::mkconst_int(@$, 0, true));
-		append_attr(extra->astbuf1.get(), $1);
+		append_attr(extra->astbuf1.get(), std::move($1));
 	} param_type param_decl_list TOK_SEMICOL {
 		(void)extra->astbuf1.reset();
 	};
@@ -1769,7 +1771,7 @@ localparam_decl:
 	attr TOK_LOCALPARAM {
 		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_LOCALPARAM);
 		extra->astbuf1->children.push_back(AstNode::mkconst_int(@$, 0, true));
-		append_attr(extra->astbuf1.get(), $1);
+		append_attr(extra->astbuf1.get(), std::move($1));
 	} param_type param_decl_list TOK_SEMICOL {
 		(void)extra->astbuf1.reset();
 	};
@@ -1925,7 +1927,7 @@ enum_decl: enum_type enum_var_list TOK_SEMICOL		{  }
 
 struct_decl:
 	attr struct_type {
-		append_attr(extra->astbuf2.get(), $1);
+		append_attr(extra->astbuf2.get(), std::move($1));
 	} struct_var_list TOK_SEMICOL {
 		(void)extra->astbuf2.reset();
 	}
@@ -2031,26 +2033,26 @@ struct_var:
 
 wire_decl:
 	attr wire_type range_or_multirange {
-		extra->albuf = $1;
+		extra->albuf = std::move($1);
 		extra->astbuf1 = std::move($2);
 		extra->astbuf2 = checkRange(extra->astbuf1.get(), std::move($3));
 	} delay wire_name_list {
 		(void)extra->astbuf1.reset();
 		if (extra->astbuf2 != nullptr)
 			(void)extra->astbuf2.reset();
-		free_attr(extra->albuf);
+		extra->albuf.reset();
 	} TOK_SEMICOL |
 	attr TOK_SUPPLY0 TOK_ID {
 		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_WIRE));
 		extra->ast_stack.back()->children.back()->str = *$3;
-		append_attr(extra->ast_stack.back()->children.back().get(), $1);
+		append_attr(extra->ast_stack.back()->children.back().get(), std::move($1));
 		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_ASSIGN, std::make_unique<AstNode>(@$, AST_IDENTIFIER), AstNode::mkconst_int(@$, 0, false, 1)));
 		extra->ast_stack.back()->children.back()->children[0]->str = *$3;
 	} opt_supply_wires TOK_SEMICOL |
 	attr TOK_SUPPLY1 TOK_ID {
 		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_WIRE));
 		extra->ast_stack.back()->children.back()->str = *$3;
-		append_attr(extra->ast_stack.back()->children.back().get(), $1);
+		append_attr(extra->ast_stack.back()->children.back().get(), std::move($1));
 		extra->ast_stack.back()->children.push_back(std::make_unique<AstNode>(@$, AST_ASSIGN, std::make_unique<AstNode>(@$, AST_IDENTIFIER), AstNode::mkconst_int(@$, 1, false, 1)));
 		extra->ast_stack.back()->children.back()->children[0]->str = *$3;
 	} opt_supply_wires TOK_SEMICOL;
@@ -2243,7 +2245,7 @@ enum_struct_type:
 cell_stmt:
 	attr TOK_ID {
 		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_CELL);
-		append_attr(extra->astbuf1.get(), $1);
+		append_attr(extra->astbuf1.get(), std::move($1));
 		extra->astbuf1->children.push_back(std::make_unique<AstNode>(@$, AST_CELLTYPE));
 		extra->astbuf1->children[0]->str = *$2;
 	} cell_parameter_list_opt cell_list TOK_SEMICOL {
@@ -2252,7 +2254,7 @@ cell_stmt:
 	attr tok_prim_wrapper delay {
 		extra->astbuf1 = std::make_unique<AstNode>(@$, AST_PRIMITIVE);
 		extra->astbuf1->str = *$2;
-		append_attr(extra->astbuf1.get(), $1);
+		append_attr(extra->astbuf1.get(), std::move($1));
 	} prim_list TOK_SEMICOL {
 		(void)extra->astbuf1.reset();
 	};
@@ -2378,26 +2380,22 @@ cell_port:
 	attr {
 		auto node = std::make_unique<AstNode>(@$, AST_ARGUMENT);
 		extra->cell_hack->children.push_back(std::move(node));
-		free_attr($1);
 	} |
 	attr expr {
 		auto node = std::make_unique<AstNode>(@$, AST_ARGUMENT);
 		node->children.push_back(std::move($2));
 		extra->cell_hack->children.push_back(std::move(node));
-		free_attr($1);
 	} |
 	attr TOK_DOT TOK_ID TOK_LPAREN expr TOK_RPAREN {
 		auto node = std::make_unique<AstNode>(@$, AST_ARGUMENT);
 		node->str = *$3;
 		node->children.push_back(std::move($5));
 		extra->cell_hack->children.push_back(std::move(node));
-		free_attr($1);
 	} |
 	attr TOK_DOT TOK_ID TOK_LPAREN TOK_RPAREN {
 		auto node = std::make_unique<AstNode>(@$, AST_ARGUMENT);
 		node->str = *$3;
 		extra->cell_hack->children.push_back(std::move(node));
-		free_attr($1);
 	} |
 	attr TOK_DOT TOK_ID {
 		auto node = std::make_unique<AstNode>(@$, AST_ARGUMENT);
@@ -2405,13 +2403,11 @@ cell_port:
 		node->children.push_back(std::make_unique<AstNode>(@$, AST_IDENTIFIER));
 		node->children.back()->str = *$3;
 		extra->cell_hack->children.push_back(std::move(node));
-		free_attr($1);
 	} |
 	attr TOK_WILDCARD_CONNECT {
 		if (!mode->sv)
 			err_at_loc(@2, "Wildcard port connections are only supported in SystemVerilog mode.");
 		extra->cell_hack->attributes[ID::wildcard_port_conns] = AstNode::mkconst_int(@2, 1, false);
-		free_attr($1);
 	};
 
 always_comb_or_latch:
@@ -2433,7 +2429,7 @@ always_or_always_ff:
 always_stmt:
 	attr always_or_always_ff {
 		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_ALWAYS));
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 		if ($2)
 			node->attributes[ID::always_ff] = AstNode::mkconst_int(@2, 1, false);
 	} always_cond {
@@ -2449,7 +2445,7 @@ always_stmt:
 	} |
 	attr always_comb_or_latch {
 		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_ALWAYS));
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 		if ($2)
 			node->attributes[ID::always_latch] = AstNode::mkconst_int(@2, 1, false);
 		else
@@ -2461,7 +2457,7 @@ always_stmt:
 	} |
 	attr TOK_INITIAL {
 		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_INITIAL));
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 		(void)extra->pushChild(std::make_unique<AstNode>(@$, AST_BLOCK));
 	} behavioral_stmt {
 		extra->ast_stack.pop_back();
@@ -2702,21 +2698,21 @@ simple_behavioral_stmt:
 	attr lvalue TOK_EQ delay expr {
 		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_ASSIGN_EQ, std::move($2), std::move($5)));
 		SET_AST_NODE_LOC(node, @2, @5);
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 	} |
 	attr lvalue attr inc_or_dec_op {
-		extra->addIncOrDecStmt($1, std::move($2), $3, $4, location_range(@1, @4));
+		extra->addIncOrDecStmt(std::move($1), std::move($2), std::move($3), $4, location_range(@1, @4));
 	} |
 	attr inc_or_dec_op attr lvalue {
-		extra->addIncOrDecStmt($1, std::move($4), $3, $2, location_range(@1, @4));
+		extra->addIncOrDecStmt(std::move($1), std::move($4), std::move($3), $2, location_range(@1, @4));
 	} |
 	attr lvalue OP_LE delay expr {
 		AstNode* node = extra->saveChild(std::make_unique<AstNode>(@$, AST_ASSIGN_LE, std::move($2), std::move($5)));
 		SET_AST_NODE_LOC(node, @2, @5);
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 	} |
 	attr lvalue asgn_binop delay expr {
-		(void)extra->addAsgnBinopStmt($1, std::move($2), $3, std::move($5));
+		(void)extra->addAsgnBinopStmt(std::move($1), std::move($2), $3, std::move($5));
 	};
 
 asgn_binop:
@@ -2790,13 +2786,11 @@ behavioral_stmt:
 	defattr | assert | wire_decl | param_decl | localparam_decl | typedef_decl |
 	non_opt_delay behavioral_stmt |
 	simple_behavioral_stmt TOK_SEMICOL |
-	attr TOK_SEMICOL {
-		free_attr($1);
-	} |
+	attr TOK_SEMICOL |
 	attr hierarchical_id {
 		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_TCALL));
 		node->str = *$2;
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 	} opt_arg_list TOK_SEMICOL{
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @5);
 		extra->ast_stack.pop_back();
@@ -2804,7 +2798,7 @@ behavioral_stmt:
 	attr TOK_MSG_TASKS {
 		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_TCALL));
 		node->str = *$2;
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 	} opt_arg_list TOK_SEMICOL{
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @5);
 		extra->ast_stack.pop_back();
@@ -2813,7 +2807,7 @@ behavioral_stmt:
 		extra->enterTypeScope();
 	} opt_label {
 		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_BLOCK));
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 		if ($4 != nullptr)
 			node->str = *$4;
 	} behavioral_stmt_list TOK_END opt_label {
@@ -2834,7 +2828,7 @@ behavioral_stmt:
 	} |
 	attr TOK_FOR TOK_LPAREN {
 		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_FOR));
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 	} for_initialization TOK_SEMICOL expr {
 		extra->ast_stack.back()->children.push_back(std::move($7));
 	} TOK_SEMICOL simple_behavioral_stmt TOK_RPAREN {
@@ -2848,7 +2842,7 @@ behavioral_stmt:
 	} |
 	attr TOK_WHILE TOK_LPAREN expr TOK_RPAREN {
 		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_WHILE));
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 		auto block_owned = std::make_unique<AstNode>(@$, AST_BLOCK);
 		auto* block = block_owned.get();
 		extra->ast_stack.back()->children.push_back(std::move($4));
@@ -2861,7 +2855,7 @@ behavioral_stmt:
 	} |
 	attr TOK_REPEAT TOK_LPAREN expr TOK_RPAREN {
 		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_REPEAT));
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 		auto block_owned = std::make_unique<AstNode>(@$, AST_BLOCK);
 		auto* block = block_owned.get();
 		extra->ast_stack.back()->children.push_back(std::move($4));
@@ -2896,11 +2890,9 @@ behavioral_stmt:
 			// not parallel "else if": begin new construction
 			node_owned = std::make_unique<AstNode>(@$, AST_CASE);
 			node = node_owned.get();
-			append_attr(node, $1);
+			append_attr(node, std::move($1));
 			node->children.push_back(node->get_bool_attribute(ID::parallel_case) ? AstNode::mkconst_int(@$, 1, false, 1) : expr->clone());
 			extra->ast_stack.back()->children.push_back(std::move(node_owned));
-		} else {
-			free_attr($1);
 		}
 		auto block_owned = std::make_unique<AstNode>(@$, AST_BLOCK);
 		auto* block = block_owned.get();
@@ -2921,7 +2913,7 @@ behavioral_stmt:
 	} |
 	case_attr case_type TOK_LPAREN expr TOK_RPAREN {
 		AstNode* node = extra->pushChild(std::make_unique<AstNode>(@$, AST_CASE, std::move($4)));
-		append_attr(node, $1);
+		append_attr(node, std::move($1));
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @4, @4);
 	} opt_synopsys_attr case_body TOK_ENDCASE {
 		SET_AST_NODE_LOC(extra->ast_stack.back(), @2, @9);
@@ -2931,21 +2923,21 @@ behavioral_stmt:
 
 if_attr:
 	attr {
-		$$ = $1;
+		$$ = std::move($1);
 	} |
 	attr TOK_UNIQUE0 {
 		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
 			err_at_loc(@2, "unique0 keyword cannot be used for 'else if' branch.");
 		(*$1)[ID::parallel_case] = AstNode::mkconst_int(@$, 1, false);
-		$$ = $1;
+		$$ = std::move($1);
 	} |
 	attr TOK_PRIORITY {
 		AstNode *context = extra->ast_stack.back();
 		if (context && context->type == AST_BLOCK && context->get_bool_attribute(ID::promoted_if))
 			err_at_loc(@2, "priority keyword cannot be used for 'else if' branch.");
 		(*$1)[ID::full_case] = AstNode::mkconst_int(@$, 1, false);
-		$$ = $1;
+		$$ = std::move($1);
 	} |
 	attr TOK_UNIQUE {
 		AstNode *context = extra->ast_stack.back();
@@ -2953,25 +2945,25 @@ if_attr:
 			err_at_loc(@2, "unique keyword cannot be used for 'else if' branch.");
 		(*$1)[ID::full_case] = AstNode::mkconst_int(@$, 1, false);
 		(*$1)[ID::parallel_case] = AstNode::mkconst_int(@$, 1, false);
-		$$ = $1;
+		$$ = std::move($1);
 	};
 
 case_attr:
 	attr {
-		$$ = $1;
+		$$ = std::move($1);
 	} |
 	attr TOK_UNIQUE0 {
 		(*$1)[ID::parallel_case] = AstNode::mkconst_int(@$, 1, false);
-		$$ = $1;
+		$$ = std::move($1);
 	} |
 	attr TOK_PRIORITY {
 		(*$1)[ID::full_case] = AstNode::mkconst_int(@$, 1, false);
-		$$ = $1;
+		$$ = std::move($1);
 	} |
 	attr TOK_UNIQUE {
 		(*$1)[ID::full_case] = AstNode::mkconst_int(@$, 1, false);
 		(*$1)[ID::parallel_case] = AstNode::mkconst_int(@$, 1, false);
-		$$ = $1;
+		$$ = std::move($1);
 	};
 
 case_type:
@@ -3139,9 +3131,7 @@ module_gen_body:
 
 gen_stmt_or_module_body_stmt:
 	gen_stmt | module_body_stmt |
-	attr TOK_SEMICOL {
-		free_attr($1);
-	};
+	attr TOK_SEMICOL;
 
 genvar_identifier:
 	TOK_ID {
@@ -3240,10 +3230,10 @@ expr:
 		$$->children.push_back(std::move($4));
 		$$->children.push_back(std::move($6));
 		SET_AST_NODE_LOC($$.get(), @1, @$);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	inc_or_dec_op attr rvalue {
-		$$ = extra->addIncOrDecExpr(std::move($3), $2, $1, location_range(@1, @3), false, mode->sv);
+		$$ = extra->addIncOrDecExpr(std::move($3), std::move($2), $1, location_range(@1, @3), false, mode->sv);
 	} |
 	// TODO: Attributes are allowed in the middle here, but they create some
 	// non-trivial conflicts that don't seem worth solving for now.
@@ -3305,18 +3295,18 @@ basic_expr:
 		node->str = *$1;
 		extra->ast_stack.push_back(node);
 		SET_AST_NODE_LOC(node, @1, @1);
-		append_attr(node, $2);
+		append_attr(node, std::move($2));
 	} TOK_LPAREN arg_list optional_comma TOK_RPAREN {
 		$$.reset(extra->ast_stack.back());
 		extra->ast_stack.pop_back();
 	} |
 	TOK_TO_SIGNED attr TOK_LPAREN expr TOK_RPAREN {
 		$$ = std::make_unique<AstNode>(@$, AST_TO_SIGNED, std::move($4));
-		append_attr($$.get(), $2);
+		append_attr($$.get(), std::move($2));
 	} |
 	TOK_TO_UNSIGNED attr TOK_LPAREN expr TOK_RPAREN {
 		$$ = std::make_unique<AstNode>(@$, AST_TO_UNSIGNED, std::move($4));
-		append_attr($$.get(), $2);
+		append_attr($$.get(), std::move($2));
 	} |
 	TOK_LPAREN expr TOK_RPAREN {
 		$$ = std::move($2);
@@ -3333,47 +3323,47 @@ basic_expr:
 	TOK_TILDE attr basic_expr %prec UNARY_OPS {
 		$$ = std::make_unique<AstNode>(@$, AST_BIT_NOT, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
-		append_attr($$.get(), $2);
+		append_attr($$.get(), std::move($2));
 	} |
 	basic_expr TOK_AMP attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_BIT_AND, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_NAND attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_BIT_NOT, std::make_unique<AstNode>(@$, AST_BIT_AND, std::move($1), std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr TOK_PIPE attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_BIT_OR, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_NOR attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_BIT_NOT, std::make_unique<AstNode>(@$, AST_BIT_OR, std::move($1), std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr TOK_CARET attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_BIT_XOR, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_XNOR attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_BIT_XNOR, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	TOK_AMP attr basic_expr %prec UNARY_OPS {
 		$$ = std::make_unique<AstNode>(@$, AST_REDUCE_AND, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
-		append_attr($$.get(), $2);
+		append_attr($$.get(), std::move($2));
 	} |
 	OP_NAND attr basic_expr %prec UNARY_OPS {
 		$$ = std::make_unique<AstNode>(@$, AST_REDUCE_AND, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
-		append_attr($$.get(), $2);
+		append_attr($$.get(), std::move($2));
 		$$ = std::make_unique<AstNode>(@$, AST_LOGIC_NOT, std::move($$));
 	} |
 	TOK_PIPE attr basic_expr %prec UNARY_OPS {
@@ -3384,134 +3374,134 @@ basic_expr:
 	OP_NOR attr basic_expr %prec UNARY_OPS {
 		$$ = std::make_unique<AstNode>(@$, AST_REDUCE_OR, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
-		append_attr($$.get(), $2);
+		append_attr($$.get(), std::move($2));
 		$$ = std::make_unique<AstNode>(@$, AST_LOGIC_NOT, std::move($$));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
 	} |
 	TOK_CARET attr basic_expr %prec UNARY_OPS {
 		$$ = std::make_unique<AstNode>(@$, AST_REDUCE_XOR, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
-		append_attr($$.get(), $2);
+		append_attr($$.get(), std::move($2));
 	} |
 	OP_XNOR attr basic_expr %prec UNARY_OPS {
 		$$ = std::make_unique<AstNode>(@$, AST_REDUCE_XNOR, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
-		append_attr($$.get(), $2);
+		append_attr($$.get(), std::move($2));
 	} |
 	basic_expr OP_SHL attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_SHIFT_LEFT, std::move($1), std::make_unique<AstNode>(@$, AST_TO_UNSIGNED, std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_SHR attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_SHIFT_RIGHT, std::move($1), std::make_unique<AstNode>(@$, AST_TO_UNSIGNED, std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_SSHL attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_SHIFT_SLEFT, std::move($1), std::make_unique<AstNode>(@$, AST_TO_UNSIGNED, std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_SSHR attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_SHIFT_SRIGHT, std::move($1), std::make_unique<AstNode>(@$, AST_TO_UNSIGNED, std::move($4)));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr TOK_LT attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_LT, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_LE attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_LE, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_EQ attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_EQ, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_NE attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_NE, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_EQX attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_EQX, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_NEX attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_NEX, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_GE attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_GE, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr TOK_GT attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_GT, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr TOK_PLUS attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_ADD, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr TOK_MINUS attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_SUB, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr TOK_ASTER attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_MUL, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr TOK_SLASH attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_DIV, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr TOK_PERC attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_MOD, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_POW attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_POW, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	TOK_PLUS attr basic_expr %prec UNARY_OPS {
 		$$ = std::make_unique<AstNode>(@$, AST_POS, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
-		append_attr($$.get(), $2);
+		append_attr($$.get(), std::move($2));
 	} |
 	TOK_MINUS attr basic_expr %prec UNARY_OPS {
 		$$ = std::make_unique<AstNode>(@$, AST_NEG, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
-		append_attr($$.get(), $2);
+		append_attr($$.get(), std::move($2));
 	} |
 	basic_expr OP_LAND attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_LOGIC_AND, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	basic_expr OP_LOR attr basic_expr {
 		$$ = std::make_unique<AstNode>(@$, AST_LOGIC_OR, std::move($1), std::move($4));
 		SET_AST_NODE_LOC($$.get(), @1, @4);
-		append_attr($$.get(), $3);
+		append_attr($$.get(), std::move($3));
 	} |
 	TOK_EXCL attr basic_expr %prec UNARY_OPS {
 		$$ = std::make_unique<AstNode>(@$, AST_LOGIC_NOT, std::move($3));
 		SET_AST_NODE_LOC($$.get(), @1, @3);
-		append_attr($$.get(), $2);
+		append_attr($$.get(), std::move($2));
 	} |
 	TOK_SIGNED OP_CAST TOK_LPAREN expr TOK_RPAREN {
 		if (!mode->sv)

From c7017f7f79899a3372678bea829fb92764f370e0 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 3 Jul 2025 23:47:25 +0000
Subject: [PATCH 493/931] Remove `log_str()` functions and convert their
 `log_signal()` users to return `std::string`

This is a small but easy step towards removing the `log_id_cache`.
See issue #5210.
---
 kernel/drivertools.cc | 30 +++++++++++++++---------------
 kernel/drivertools.h  | 11 ++++++-----
 kernel/functional.cc  |  4 ++--
 kernel/log.cc         | 10 ----------
 kernel/log.h          |  2 --
 5 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/kernel/drivertools.cc b/kernel/drivertools.cc
index b8905d68c..6290f4470 100644
--- a/kernel/drivertools.cc
+++ b/kernel/drivertools.cc
@@ -865,41 +865,41 @@ DriveSpec DriverMap::operator()(DriveSpec spec)
 	return result;
 }
 
-const char *log_signal(DriveChunkWire const &chunk)
+std::string log_signal(DriveChunkWire const &chunk)
 {
 	const char *id = log_id(chunk.wire->name);
 	if (chunk.is_whole())
 		return id;
 	if (chunk.width == 1)
-		return log_str(stringf("%s [%d]", id, chunk.offset));
-	return log_str(stringf("%s [%d:%d]", id, chunk.offset + chunk.width - 1, chunk.offset));
+		return stringf("%s [%d]", id, chunk.offset);
+	return stringf("%s [%d:%d]", id, chunk.offset + chunk.width - 1, chunk.offset);
 }
 
 
-const char *log_signal(DriveChunkPort const &chunk)
+std::string log_signal(DriveChunkPort const &chunk)
 {
 	const char *cell_id = log_id(chunk.cell->name);
 	const char *port_id = log_id(chunk.port);
 	if (chunk.is_whole())
-		return log_str(stringf("%s <%s>", cell_id, port_id));
+		return stringf("%s <%s>", cell_id, port_id);
 	if (chunk.width == 1)
-		return log_str(stringf("%s <%s> [%d]", cell_id, port_id, chunk.offset));
-	return log_str(stringf("%s <%s> [%d:%d]", cell_id, port_id, chunk.offset + chunk.width - 1, chunk.offset));
+		return stringf("%s <%s> [%d]", cell_id, port_id, chunk.offset);
+	return stringf("%s <%s> [%d:%d]", cell_id, port_id, chunk.offset + chunk.width - 1, chunk.offset);
 }
 
-const char *log_signal(DriveChunkMarker const &chunk)
+std::string log_signal(DriveChunkMarker const &chunk)
 {
 	if (chunk.width == 1)
-		return log_str(stringf("<marker %d> [%d]", chunk.marker, chunk.offset));
-	return log_str(stringf("<marker %d> [%d:%d]", chunk.marker, chunk.offset + chunk.width - 1, chunk.offset));
+		return stringf("<marker %d> [%d]", chunk.marker, chunk.offset);
+	return stringf("<marker %d> [%d:%d]", chunk.marker, chunk.offset + chunk.width - 1, chunk.offset);
 }
 
-const char *log_signal(DriveChunk const &chunk)
+std::string log_signal(DriveChunk const &chunk)
 {
 	switch (chunk.type())
 	{
 		case DriveType::NONE:
-			return log_str(stringf("<none x%d>", chunk.size()));
+			return stringf("<none x%d>", chunk.size());
 		case DriveType::CONSTANT:
 			return log_const(chunk.constant());
 		case DriveType::WIRE:
@@ -917,14 +917,14 @@ const char *log_signal(DriveChunk const &chunk)
 				str += log_signal(single);
 			}
 			str += ">";
-			return log_str(str);
+			return str;
 		}
 		default:
 			log_abort();
 	}
 }
 
-const char *log_signal(DriveSpec const &spec)
+std::string log_signal(DriveSpec const &spec)
 {
 	auto &chunks = spec.chunks();
 	if (chunks.empty())
@@ -943,7 +943,7 @@ const char *log_signal(DriveSpec const &spec)
 	}
 	str += " }";
 
-	return log_str(str);
+	return str;
 }
 
 YOSYS_NAMESPACE_END
diff --git a/kernel/drivertools.h b/kernel/drivertools.h
index d46217da5..ba7b2aa84 100644
--- a/kernel/drivertools.h
+++ b/kernel/drivertools.h
@@ -20,6 +20,7 @@
 #ifndef DRIVERTOOLS_H
 #define DRIVERTOOLS_H
 
+#include <string>
 #include <type_traits>
 
 #include "kernel/rtlil.h"
@@ -39,11 +40,11 @@ struct DriveChunk;
 
 struct DriveSpec;
 
-const char *log_signal(DriveChunkWire const &chunk);
-const char *log_signal(DriveChunkPort const &chunk);
-const char *log_signal(DriveChunkMarker const &chunk);
-const char *log_signal(DriveChunk const &chunk);
-const char *log_signal(DriveSpec const &chunk);
+std::string log_signal(DriveChunkWire const &chunk);
+std::string log_signal(DriveChunkPort const &chunk);
+std::string log_signal(DriveChunkMarker const &chunk);
+std::string log_signal(DriveChunk const &chunk);
+std::string log_signal(DriveSpec const &chunk);
 
 enum class DriveType : unsigned char
 {
diff --git a/kernel/functional.cc b/kernel/functional.cc
index 211527926..66dc2e1eb 100644
--- a/kernel/functional.cc
+++ b/kernel/functional.cc
@@ -638,7 +638,7 @@ private:
 			}
 		}
 	}
-	void undriven(const char *name) {
+	void undriven(const std::string& name) {
 		log_error("The design contains an undriven signal %s. This is not supported by the functional backend. "
 			"Call setundef with appropriate options to avoid this error.\n", name);
 	}
@@ -646,7 +646,7 @@ private:
 	void check_undriven(DriveSpec const& spec, std::string const& name) {
 		for(auto const &chunk : spec.chunks())
 			if(chunk.is_none())
-				undriven(name.c_str());
+				undriven(name);
 	}
 public:
 	void process_queue()
diff --git a/kernel/log.cc b/kernel/log.cc
index 0dd56a04f..a03f16350 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -621,16 +621,6 @@ const char *log_id(const RTLIL::IdString &str)
 	return log_id_cache.back();
 }
 
-const char *log_str(const char *str)
-{
-	log_id_cache.push_back(strdup(str));
-	return log_id_cache.back();
-}
-
-const char *log_str(std::string const &str) {
-	return log_str(str.c_str());
-}
-
 void log_module(RTLIL::Module *module, std::string indent)
 {
 	std::stringstream buf;
diff --git a/kernel/log.h b/kernel/log.h
index 5143524bf..1f32e8185 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -256,8 +256,6 @@ void log_check_expected();
 const char *log_signal(const RTLIL::SigSpec &sig, bool autoint = true);
 const char *log_const(const RTLIL::Const &value, bool autoint = true);
 const char *log_id(const RTLIL::IdString &id);
-const char *log_str(const char *str);
-const char *log_str(std::string const &str);
 
 template<typename T> static inline const char *log_id(T *obj, const char *nullstr = nullptr) {
 	if (nullstr && obj == nullptr)

From bc24947a849e9e5068c04cc663eb3379c0995523 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 11 Sep 2025 16:50:23 +0200
Subject: [PATCH 494/931] tests: replace CC and gcc with CXX and g++

---
 tests/cxxrtl/run-test.sh | 4 ++--
 tests/fmt/run-test.sh    | 4 ++--
 tests/tools/autotest.sh  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/cxxrtl/run-test.sh b/tests/cxxrtl/run-test.sh
index ee299fc82..4b542e180 100755
--- a/tests/cxxrtl/run-test.sh
+++ b/tests/cxxrtl/run-test.sh
@@ -5,7 +5,7 @@ set -ex
 run_subtest () {
     local subtest=$1; shift
 
-    ${CC:-gcc} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++
+    ${CXX:-g++} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++
     ./cxxrtl-test-${subtest}
 }
 
@@ -14,4 +14,4 @@ run_subtest value_fuzz
 
 # Compile-only test.
 ../../yosys -p "read_verilog test_unconnected_output.v; select =*; proc; clean; write_cxxrtl cxxrtl-test-unconnected_output.cc"
-${CC:-gcc} -std=c++11 -c -o cxxrtl-test-unconnected_output -I../../backends/cxxrtl/runtime cxxrtl-test-unconnected_output.cc
+${CXX:-g++} -std=c++11 -c -o cxxrtl-test-unconnected_output -I../../backends/cxxrtl/runtime cxxrtl-test-unconnected_output.cc
diff --git a/tests/fmt/run-test.sh b/tests/fmt/run-test.sh
index 998047f83..88ee6e238 100644
--- a/tests/fmt/run-test.sh
+++ b/tests/fmt/run-test.sh
@@ -51,7 +51,7 @@ test_cxxrtl () {
 	local subtest=$1; shift
 
 	../../yosys -p "read_verilog ${subtest}.v; proc; clean; write_cxxrtl -print-output std::cerr yosys-${subtest}.cc"
-	${CC:-gcc} -std=c++11 -o yosys-${subtest} -I../../backends/cxxrtl/runtime ${subtest}_tb.cc -lstdc++
+	${CXX:-g++} -std=c++11 -o yosys-${subtest} -I../../backends/cxxrtl/runtime ${subtest}_tb.cc -lstdc++
 	./yosys-${subtest} 2>yosys-${subtest}.log
 	iverilog -o iverilog-${subtest} ${subtest}.v ${subtest}_tb.v
 	./iverilog-${subtest} |grep -v '\$finish called' >iverilog-${subtest}.log
@@ -69,7 +69,7 @@ diff iverilog-always_full.log iverilog-always_full-1.log
 
 ../../yosys -p "read_verilog display_lm.v" >yosys-display_lm.log
 ../../yosys -p "read_verilog display_lm.v; write_cxxrtl yosys-display_lm.cc"
-${CC:-gcc} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++
+${CXX:-g++} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++
 ./yosys-display_lm_cc >yosys-display_lm_cc.log
 for log in yosys-display_lm.log yosys-display_lm_cc.log; do
 	grep "^%l: \\\\bot\$" "$log"
diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh
index f96eb8d71..47b06d575 100755
--- a/tests/tools/autotest.sh
+++ b/tests/tools/autotest.sh
@@ -26,7 +26,7 @@ xfirrtl="../xfirrtl"
 abcprog="$toolsdir/../../yosys-abc"
 
 if [ ! -f "$toolsdir/cmp_tbdata" -o "$toolsdir/cmp_tbdata.c" -nt "$toolsdir/cmp_tbdata" ]; then
-	( set -ex; ${CC:-gcc} -Wall -o "$toolsdir/cmp_tbdata" "$toolsdir/cmp_tbdata.c"; ) || exit 1
+	( set -ex; ${CXX:-g++} -Wall -o "$toolsdir/cmp_tbdata" "$toolsdir/cmp_tbdata.c"; ) || exit 1
 fi
 
 while getopts xmGl:wkjvref:s:p:n:S:I:A:-: opt; do

From e0ae7b7af44a45795f68990cd16a85bf03770d2a Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 11 Sep 2025 05:25:26 +0000
Subject: [PATCH 495/931] Remove .c_str() calls from log()/log_error()

There are some leftovers, but this is an easy regex-based approach that removes most of them.
---
 backends/aiger/aiger.cc                       |   4 +-
 backends/aiger/xaiger.cc                      |   2 +-
 backends/blif/blif.cc                         |   2 +-
 backends/btor/btor.cc                         |   4 +-
 backends/edif/edif.cc                         |   2 +-
 backends/firrtl/firrtl.cc                     |   6 +-
 backends/functional/cxx.cc                    |   2 +-
 backends/functional/smtlib.cc                 |   2 +-
 backends/functional/smtlib_rosette.cc         |   2 +-
 backends/functional/test_generic.cc           |   2 +-
 backends/intersynth/intersynth.cc             |   4 +-
 backends/jny/jny.cc                           |   4 +-
 backends/json/json.cc                         |   4 +-
 backends/rtlil/rtlil_backend.cc               |   6 +-
 backends/simplec/simplec.cc                   |  14 +-
 backends/smt2/smt2.cc                         |   8 +-
 backends/smv/smv.cc                           |   4 +-
 backends/spice/spice.cc                       |   2 +-
 backends/verilog/verilog_backend.cc           |   6 +-
 .../source/code_examples/extensions/my_cmd.cc |   2 +-
 docs/source/code_examples/functional/dummy.cc |   2 +-
 docs/source/yosys_internals/hashing.rst       |   6 +-
 examples/cxx-api/scopeinfo_example.cc         |   4 +-
 frontends/aiger/aigerparse.cc                 |   2 +-
 frontends/aiger2/xaiger.cc                    |   4 +-
 frontends/ast/ast.cc                          |  24 ++--
 frontends/ast/dpicall.cc                      |  20 +--
 frontends/ast/genrtlil.cc                     |   2 +-
 frontends/ast/simplify.cc                     |  26 ++--
 frontends/blif/blifparse.cc                   |   2 +-
 frontends/json/jsonparse.cc                   |   4 +-
 frontends/liberty/liberty.cc                  |  12 +-
 frontends/rpc/rpc_frontend.cc                 |  20 +--
 frontends/rtlil/rtlil_frontend.cc             |   2 +-
 frontends/verific/verific.cc                  |  24 ++--
 frontends/verific/verificsva.cc               |   2 +-
 frontends/verilog/preproc.cc                  |   8 +-
 frontends/verilog/verilog_frontend.cc         |   2 +-
 frontends/verilog/verilog_parser.y            |   6 +-
 kernel/driver.cc                              |  10 +-
 kernel/fstdata.cc                             |   4 +-
 kernel/functional.cc                          |  12 +-
 kernel/functional.h                           |   6 +-
 kernel/gzip.cc                                |   2 +-
 kernel/log.cc                                 |  16 +--
 kernel/log.h                                  |   2 +-
 kernel/log_help.cc                            |   6 +-
 kernel/register.cc                            |  64 ++++-----
 kernel/rtlil.cc                               |   2 +-
 kernel/sexpr.cc                               |   2 +-
 kernel/tclapi.cc                              |   2 +-
 kernel/yosys.cc                               |  18 +--
 kernel/yw.cc                                  |  30 ++---
 passes/cmds/abstract.cc                       |   2 +-
 passes/cmds/add.cc                            |  14 +-
 passes/cmds/cover.cc                          |   2 +-
 passes/cmds/edgetypes.cc                      |   2 +-
 passes/cmds/exec.cc                           |   2 +-
 passes/cmds/glift.cc                          |   2 +-
 passes/cmds/internal_stats.cc                 |   8 +-
 passes/cmds/linecoverage.cc                   |   4 +-
 passes/cmds/logcmd.cc                         |   2 +-
 passes/cmds/logger.cc                         |   8 +-
 passes/cmds/plugin.cc                         |   6 +-
 passes/cmds/portarcs.cc                       |   2 +-
 passes/cmds/portlist.cc                       |   2 +-
 passes/cmds/printattrs.cc                     |  10 +-
 passes/cmds/rename.cc                         |   6 +-
 passes/cmds/scc.cc                            |   2 +-
 passes/cmds/scratchpad.cc                     |  18 +--
 passes/cmds/select.cc                         |  16 +--
 passes/cmds/setundef.cc                       |   6 +-
 passes/cmds/show.cc                           |  12 +-
 passes/cmds/splice.cc                         |   2 +-
 passes/cmds/stat.cc                           |  74 +++++------
 passes/cmds/timeest.cc                        |   4 +-
 passes/cmds/viz.cc                            |   8 +-
 passes/cmds/wrapcell.cc                       |   4 +-
 passes/fsm/fsm_expand.cc                      |   4 +-
 passes/fsm/fsm_export.cc                      |   2 +-
 passes/fsm/fsm_extract.cc                     |   6 +-
 passes/fsm/fsm_map.cc                         |   2 +-
 passes/fsm/fsm_opt.cc                         |   2 +-
 passes/fsm/fsm_recode.cc                      |  16 +--
 passes/fsm/fsmdata.h                          |   2 +-
 passes/hierarchy/hierarchy.cc                 |  12 +-
 passes/hierarchy/submod.cc                    |  16 +--
 passes/memory/memlib.cc                       | 124 +++++++++---------
 passes/memory/memory_bram.cc                  |   4 +-
 passes/memory/memory_dff.cc                   |   4 +-
 passes/memory/memory_libmap.cc                |  10 +-
 passes/memory/memory_map.cc                   |   2 +-
 passes/memory/memory_share.cc                 |   4 +-
 passes/opt/opt_clean.cc                       |   2 +-
 passes/opt/opt_lut.cc                         |   2 +-
 passes/opt/opt_merge.cc                       |   2 +-
 passes/opt/opt_muxtree.cc                     |   2 +-
 passes/opt/opt_reduce.cc                      |  14 +-
 passes/opt/rmports.cc                         |  10 +-
 passes/pmgen/pmgen.py                         |   4 +-
 passes/proc/proc_arst.cc                      |   4 +-
 passes/proc/proc_clean.cc                     |   4 +-
 passes/proc/proc_dff.cc                       |   6 +-
 passes/proc/proc_dlatch.cc                    |   2 +-
 passes/proc/proc_init.cc                      |   2 +-
 passes/proc/proc_mux.cc                       |   2 +-
 passes/sat/eval.cc                            |  32 ++---
 passes/sat/fminit.cc                          |  10 +-
 passes/sat/freduce.cc                         |   4 +-
 passes/sat/mutate.cc                          |   8 +-
 passes/sat/qbfsat.cc                          |  22 ++--
 passes/sat/sat.cc                             |  12 +-
 passes/sat/sim.cc                             |  60 ++++-----
 passes/sat/synthprop.cc                       |   2 +-
 passes/techmap/abc.cc                         |  42 +++---
 passes/techmap/abc9.cc                        |   6 +-
 passes/techmap/abc9_exe.cc                    |  14 +-
 passes/techmap/abc9_ops.cc                    |   4 +-
 passes/techmap/attrmap.cc                     |   4 +-
 passes/techmap/clkbufmap.cc                   |   4 +-
 passes/techmap/clockgate.cc                   |   6 +-
 passes/techmap/dfflegalize.cc                 |   6 +-
 passes/techmap/dfflibmap.cc                   |  10 +-
 passes/techmap/extract.cc                     |  16 +--
 passes/techmap/extract_counter.cc             |   6 +-
 passes/techmap/extract_reduce.cc              |   4 +-
 passes/techmap/extractinv.cc                  |   2 +-
 passes/techmap/flowmap.cc                     |   2 +-
 passes/techmap/iopadmap.cc                    |   6 +-
 passes/techmap/libcache.cc                    |   4 +-
 passes/techmap/libparse.cc                    |   6 +-
 passes/techmap/libparse.h                     |   2 +-
 passes/techmap/techmap.cc                     |  10 +-
 passes/tests/raise_error.cc                   |   2 +-
 passes/tests/test_autotb.cc                   |   2 +-
 passes/tests/test_cell.cc                     |   2 +-
 techlibs/coolrunner2/coolrunner2_fixup.cc     |  14 +-
 techlibs/ice40/ice40_braminit.cc              |   4 +-
 techlibs/microchip/microchip_dffopt.cc        |   2 +-
 techlibs/xilinx/xilinx_dffopt.cc              |   2 +-
 140 files changed, 623 insertions(+), 623 deletions(-)

diff --git a/backends/aiger/aiger.cc b/backends/aiger/aiger.cc
index e8b8e32ce..95f4c19e2 100644
--- a/backends/aiger/aiger.cc
+++ b/backends/aiger/aiger.cc
@@ -1040,7 +1040,7 @@ struct AigerBackend : public Backend {
 			std::ofstream mapf;
 			mapf.open(map_filename.c_str(), std::ofstream::trunc);
 			if (mapf.fail())
-				log_error("Can't open file `%s' for writing: %s\n", map_filename.c_str(), strerror(errno));
+				log_error("Can't open file `%s' for writing: %s\n", map_filename, strerror(errno));
 			writer.write_map(mapf, verbose_map, no_startoffset);
 		}
 
@@ -1051,7 +1051,7 @@ struct AigerBackend : public Backend {
 			PrettyJson json;
 
 			if (!json.write_to_file(yw_map_filename))
-				log_error("Can't open file `%s' for writing: %s\n", yw_map_filename.c_str(), strerror(errno));
+				log_error("Can't open file `%s' for writing: %s\n", yw_map_filename, strerror(errno));
 			writer.write_ywmap(json);
 		}
 	}
diff --git a/backends/aiger/xaiger.cc b/backends/aiger/xaiger.cc
index 97dec40e4..988bc558b 100644
--- a/backends/aiger/xaiger.cc
+++ b/backends/aiger/xaiger.cc
@@ -788,7 +788,7 @@ struct XAigerBackend : public Backend {
 			std::ofstream mapf;
 			mapf.open(map_filename.c_str(), std::ofstream::trunc);
 			if (mapf.fail())
-				log_error("Can't open file `%s' for writing: %s\n", map_filename.c_str(), strerror(errno));
+				log_error("Can't open file `%s' for writing: %s\n", map_filename, strerror(errno));
 			writer.write_map(mapf);
 		}
 	}
diff --git a/backends/blif/blif.cc b/backends/blif/blif.cc
index 1ce1ac955..ab7861802 100644
--- a/backends/blif/blif.cc
+++ b/backends/blif/blif.cc
@@ -674,7 +674,7 @@ struct BlifBackend : public Backend {
 		}
 
 		if (!top_module_name.empty())
-			log_error("Can't find top module `%s'!\n", top_module_name.c_str());
+			log_error("Can't find top module `%s'!\n", top_module_name);
 
 		for (auto module : mod_list)
 			BlifDumper::dump(*f, module, design, config);
diff --git a/backends/btor/btor.cc b/backends/btor/btor.cc
index c2b831a44..3cbb5defc 100644
--- a/backends/btor/btor.cc
+++ b/backends/btor/btor.cc
@@ -246,7 +246,7 @@ struct BtorWorker
 			string cell_list;
 			for (auto c : cell_recursion_guard)
 				cell_list += stringf("\n    %s", log_id(c));
-			log_error("Found topological loop while processing cell %s. Active cells:%s\n", log_id(cell), cell_list.c_str());
+			log_error("Found topological loop while processing cell %s. Active cells:%s\n", log_id(cell), cell_list);
 		}
 
 		cell_recursion_guard.insert(cell);
@@ -1489,7 +1489,7 @@ struct BtorWorker
 			std::ofstream f;
 			f.open(info_filename.c_str(), std::ofstream::trunc);
 			if (f.fail())
-				log_error("Can't open file `%s' for writing: %s\n", info_filename.c_str(), strerror(errno));
+				log_error("Can't open file `%s' for writing: %s\n", info_filename, strerror(errno));
 			for (auto &it : info_lines)
 				f << it;
 			f.close();
diff --git a/backends/edif/edif.cc b/backends/edif/edif.cc
index cda017059..83d0afaf3 100644
--- a/backends/edif/edif.cc
+++ b/backends/edif/edif.cc
@@ -519,7 +519,7 @@ struct EdifBackend : public Backend {
 						continue;
 					} else {
 						for (auto &ref : it.second)
-							log_error("Don't know how to handle %s on %s.\n", log_signal(sig), ref.first.c_str());
+							log_error("Don't know how to handle %s on %s.\n", log_signal(sig), ref.first);
 						log_abort();
 					}
 				}
diff --git a/backends/firrtl/firrtl.cc b/backends/firrtl/firrtl.cc
index cda3d4618..e54b46e63 100644
--- a/backends/firrtl/firrtl.cc
+++ b/backends/firrtl/firrtl.cc
@@ -347,7 +347,7 @@ void emit_elaborated_extmodules(RTLIL::Design *design, std::ostream &f)
 				auto modInstance = design->module(cell->type);
 				// Ensure that we actually have a module instance
 				if (modInstance == nullptr) {
-					log_error("Unknown cell type %s\n", cell->type.c_str());
+					log_error("Unknown cell type %s\n", cell->type);
 					return;
 				}
 
@@ -505,14 +505,14 @@ struct FirrtlWorker
 						sinkExpr = firstName;
 						break;
 					default:
-						log_error("Instance port %s.%s unrecognized connection direction 0x%x !\n", cell_type.c_str(), log_signal(it->second), dir);
+						log_error("Instance port %s.%s unrecognized connection direction 0x%x !\n", cell_type, log_signal(it->second), dir);
 						break;
 				}
 				// Check for subfield assignment.
 				std::string bitsString = "bits(";
 				if (sinkExpr.compare(0, bitsString.length(), bitsString) == 0) {
 					if (sinkSig == nullptr)
-						log_error("Unknown subfield %s.%s\n", cell_type.c_str(), sinkExpr.c_str());
+						log_error("Unknown subfield %s.%s\n", cell_type, sinkExpr);
 					// Don't generate the assignment here.
 					// Add the source and sink to the "reverse_wire_map" and we'll output the assignment
 					//  as part of the coalesced subfield assignments for this wire.
diff --git a/backends/functional/cxx.cc b/backends/functional/cxx.cc
index 1f677120a..7f4ad1ea7 100644
--- a/backends/functional/cxx.cc
+++ b/backends/functional/cxx.cc
@@ -268,7 +268,7 @@ struct FunctionalCxxBackend : public Backend
 		extra_args(f, filename, args, argidx, design);
 
 		for (auto module : design->selected_modules()) {
-            log("Dumping module `%s'.\n", module->name.c_str());
+            log("Dumping module `%s'.\n", module->name);
 			printCxx(*f, filename, module);
 		}
 	}
diff --git a/backends/functional/smtlib.cc b/backends/functional/smtlib.cc
index 3eacf407c..1504c8fba 100644
--- a/backends/functional/smtlib.cc
+++ b/backends/functional/smtlib.cc
@@ -285,7 +285,7 @@ struct FunctionalSmtBackend : public Backend {
 		extra_args(f, filename, args, argidx, design);
 
 		for (auto module : design->selected_modules()) {
-			log("Processing module `%s`.\n", module->name.c_str());
+			log("Processing module `%s`.\n", module->name);
 			SmtModule smt(module);
 			smt.write(*f);
 		}
diff --git a/backends/functional/smtlib_rosette.cc b/backends/functional/smtlib_rosette.cc
index c9e737d19..8abfe3e41 100644
--- a/backends/functional/smtlib_rosette.cc
+++ b/backends/functional/smtlib_rosette.cc
@@ -307,7 +307,7 @@ struct FunctionalSmtrBackend : public Backend {
 		}
 
 		for (auto module : design->selected_modules()) {
-			log("Processing module `%s`.\n", module->name.c_str());
+			log("Processing module `%s`.\n", module->name);
 			SmtrModule smtr(module);
 			smtr.write(*f);
 		}
diff --git a/backends/functional/test_generic.cc b/backends/functional/test_generic.cc
index 42d6c2b95..a0474ea2b 100644
--- a/backends/functional/test_generic.cc
+++ b/backends/functional/test_generic.cc
@@ -143,7 +143,7 @@ struct FunctionalTestGeneric : public Pass
 */
 
 		for (auto module : design->selected_modules()) {
-            log("Dumping module `%s'.\n", module->name.c_str());
+            log("Dumping module `%s'.\n", module->name);
 			auto fir = Functional::IR::from_module(module);
 			for(auto node : fir)
 				std::cout << RTLIL::unescape_id(node.name()) << " = " << node.to_string([](auto n) { return RTLIL::unescape_id(n.name()); }) << "\n";
diff --git a/backends/intersynth/intersynth.cc b/backends/intersynth/intersynth.cc
index 4c098e019..78eab17da 100644
--- a/backends/intersynth/intersynth.cc
+++ b/backends/intersynth/intersynth.cc
@@ -100,13 +100,13 @@ struct IntersynthBackend : public Backend {
 		}
 		extra_args(f, filename, args, argidx);
 
-		log("Output filename: %s\n", filename.c_str());
+		log("Output filename: %s\n", filename);
 
 		for (auto filename : libfiles) {
 			std::ifstream f;
 			f.open(filename.c_str());
 			if (f.fail())
-				log_error("Can't open lib file `%s'.\n", filename.c_str());
+				log_error("Can't open lib file `%s'.\n", filename);
 			RTLIL::Design *lib = new RTLIL::Design;
 			Frontend::frontend_call(lib, &f, filename, (filename.size() > 3 && filename.compare(filename.size()-3, std::string::npos, ".il") == 0 ? "rtlil" : "verilog"));
 			libs.push_back(lib);
diff --git a/backends/jny/jny.cc b/backends/jny/jny.cc
index 001492e40..ee0c0d14c 100644
--- a/backends/jny/jny.cc
+++ b/backends/jny/jny.cc
@@ -553,7 +553,7 @@ struct JnyPass : public Pass {
             ff->open(filename.c_str(), std::ofstream::trunc);
             if (ff->fail()) {
                 delete ff;
-                log_error("Can't open file `%s' for writing: %s\n", filename.c_str(), strerror(errno));
+                log_error("Can't open file `%s' for writing: %s\n", filename, strerror(errno));
             }
             f = ff;
             invk << filename;
@@ -568,7 +568,7 @@ struct JnyPass : public Pass {
         if (!empty) {
             delete f;
         } else {
-            log("%s", buf.str().c_str());
+            log("%s", buf.str());
         }
     }
 
diff --git a/backends/json/json.cc b/backends/json/json.cc
index f7b80d53d..b04083622 100644
--- a/backends/json/json.cc
+++ b/backends/json/json.cc
@@ -701,7 +701,7 @@ struct JsonPass : public Pass {
 			ff->open(filename.c_str(), std::ofstream::trunc);
 			if (ff->fail()) {
 				delete ff;
-				log_error("Can't open file `%s' for writing: %s\n", filename.c_str(), strerror(errno));
+				log_error("Can't open file `%s' for writing: %s\n", filename, strerror(errno));
 			}
 			f = ff;
 		} else {
@@ -714,7 +714,7 @@ struct JsonPass : public Pass {
 		if (!empty) {
 			delete f;
 		} else {
-			log("%s", buf.str().c_str());
+			log("%s", buf.str());
 		}
 	}
 } JsonPass;
diff --git a/backends/rtlil/rtlil_backend.cc b/backends/rtlil/rtlil_backend.cc
index 215e0d366..cb17432b1 100644
--- a/backends/rtlil/rtlil_backend.cc
+++ b/backends/rtlil/rtlil_backend.cc
@@ -458,7 +458,7 @@ struct RTLILBackend : public Backend {
 
 		design->sort();
 
-		log("Output filename: %s\n", filename.c_str());
+		log("Output filename: %s\n", filename);
 
 		*f << stringf("# Generated by %s\n", yosys_maybe_version());
 		RTLIL_BACKEND::dump_design(*f, design, selected, true, false);
@@ -531,7 +531,7 @@ struct DumpPass : public Pass {
 			ff->open(filename.c_str(), append ? std::ofstream::app : std::ofstream::trunc);
 			if (ff->fail()) {
 				delete ff;
-				log_error("Can't open file `%s' for writing: %s\n", filename.c_str(), strerror(errno));
+				log_error("Can't open file `%s' for writing: %s\n", filename, strerror(errno));
 			}
 			f = ff;
 		} else {
@@ -543,7 +543,7 @@ struct DumpPass : public Pass {
 		if (!empty) {
 			delete f;
 		} else {
-			log("%s", buf.str().c_str());
+			log("%s", buf.str());
 		}
 	}
 } DumpPass;
diff --git a/backends/simplec/simplec.cc b/backends/simplec/simplec.cc
index 1ab586e43..ed981f961 100644
--- a/backends/simplec/simplec.cc
+++ b/backends/simplec/simplec.cc
@@ -504,7 +504,7 @@ struct SimplecWorker
 		while (work->dirty)
 		{
 			if (verbose && (!work->dirty_bits.empty() || !work->dirty_cells.empty()))
-				log("  In %s:\n", work->log_prefix.c_str());
+				log("  In %s:\n", work->log_prefix);
 
 			while (!work->dirty_bits.empty() || !work->dirty_cells.empty())
 			{
@@ -517,7 +517,7 @@ struct SimplecWorker
 						if (chunk.wire == nullptr)
 							continue;
 						if (verbose)
-							log("    Propagating %s.%s[%d:%d].\n", work->log_prefix.c_str(), log_id(chunk.wire), chunk.offset+chunk.width-1, chunk.offset);
+							log("    Propagating %s.%s[%d:%d].\n", work->log_prefix, log_id(chunk.wire), chunk.offset+chunk.width-1, chunk.offset);
 						funct_declarations.push_back(stringf("  // Updated signal in %s: %s", work->log_prefix, log_signal(chunk)));
 					}
 
@@ -539,7 +539,7 @@ struct SimplecWorker
 								work->parent->set_dirty(parent_bit);
 
 								if (verbose)
-									log("      Propagating %s.%s[%d] -> %s.%s[%d].\n", work->log_prefix.c_str(), log_id(bit.wire), bit.offset,
+									log("      Propagating %s.%s[%d] -> %s.%s[%d].\n", work->log_prefix, log_id(bit.wire), bit.offset,
 											work->parent->log_prefix.c_str(), log_id(parent_bit.wire), parent_bit.offset);
 							}
 
@@ -556,11 +556,11 @@ struct SimplecWorker
 								child->set_dirty(child_bit);
 
 								if (verbose)
-									log("      Propagating %s.%s[%d] -> %s.%s.%s[%d].\n", work->log_prefix.c_str(), log_id(bit.wire), bit.offset,
+									log("      Propagating %s.%s[%d] -> %s.%s.%s[%d].\n", work->log_prefix, log_id(bit.wire), bit.offset,
 											work->log_prefix.c_str(), log_id(std::get<0>(port)), log_id(child_bit.wire), child_bit.offset);
 							} else {
 								if (verbose)
-									log("      Marking cell %s.%s (via %s.%s[%d]).\n", work->log_prefix.c_str(), log_id(std::get<0>(port)),
+									log("      Marking cell %s.%s (via %s.%s[%d]).\n", work->log_prefix, log_id(std::get<0>(port)),
 											work->log_prefix.c_str(), log_id(bit.wire), bit.offset);
 								work->set_dirty(std::get<0>(port));
 							}
@@ -579,7 +579,7 @@ struct SimplecWorker
 					string hiername = work->log_prefix + "." + log_id(cell);
 
 					if (verbose)
-						log("    Evaluating %s (%s, best of %d).\n", hiername.c_str(), log_id(cell->type), GetSize(work->dirty_cells));
+						log("    Evaluating %s (%s, best of %d).\n", hiername, log_id(cell->type), GetSize(work->dirty_cells));
 
 					if (activated_cells.count(hiername))
 						reactivated_cells.insert(hiername);
@@ -630,7 +630,7 @@ struct SimplecWorker
 
 	void make_func(HierDirtyFlags *work, const string &func_name, const vector<string> &preamble)
 	{
-		log("Generating function %s():\n", func_name.c_str());
+		log("Generating function %s():\n", func_name);
 
 		activated_cells.clear();
 		reactivated_cells.clear();
diff --git a/backends/smt2/smt2.cc b/backends/smt2/smt2.cc
index 089e73715..1d3757463 100644
--- a/backends/smt2/smt2.cc
+++ b/backends/smt2/smt2.cc
@@ -130,7 +130,7 @@ struct Smt2Worker
 		for (auto &mem : memories)
 		{
 			if (is_smtlib2_module)
-				log_error("Memory %s.%s not allowed in module with smtlib2_module attribute", get_id(module), mem.memid.c_str());
+				log_error("Memory %s.%s not allowed in module with smtlib2_module attribute", get_id(module), mem.memid);
 
 			mem.narrow();
 			mem_dict[mem.memid] = &mem;
@@ -620,11 +620,11 @@ struct Smt2Worker
 				decls.push_back(stringf("; yosys-smt2-%s %s#%d %d %s\n", cell->type.c_str() + 1, get_id(module), idcounter, GetSize(cell->getPort(QY)), infostr));
 				if (cell->getPort(QY).is_wire() && cell->getPort(QY).as_wire()->get_bool_attribute(ID::maximize)){
 					decls.push_back(stringf("; yosys-smt2-maximize %s#%d\n", get_id(module), idcounter));
-					log("Wire %s is maximized\n", cell->getPort(QY).as_wire()->name.str().c_str());
+					log("Wire %s is maximized\n", cell->getPort(QY).as_wire()->name.str());
 				}
 				else if (cell->getPort(QY).is_wire() && cell->getPort(QY).as_wire()->get_bool_attribute(ID::minimize)){
 					decls.push_back(stringf("; yosys-smt2-minimize %s#%d\n", get_id(module), idcounter));
-					log("Wire %s is minimized\n", cell->getPort(QY).as_wire()->name.str().c_str());
+					log("Wire %s is minimized\n", cell->getPort(QY).as_wire()->name.str());
 				}
 
 				bool init_only = cell->type.in(ID($anyconst), ID($anyinit), ID($allconst));
@@ -1776,7 +1776,7 @@ struct Smt2Backend : public Backend {
 			if (args[argidx] == "-tpl" && argidx+1 < args.size()) {
 				template_f.open(args[++argidx]);
 				if (template_f.fail())
-					log_error("Can't open template file `%s'.\n", args[argidx].c_str());
+					log_error("Can't open template file `%s'.\n", args[argidx]);
 				continue;
 			}
 			if (args[argidx] == "-bv" || args[argidx] == "-mem") {
diff --git a/backends/smv/smv.cc b/backends/smv/smv.cc
index 55eadca00..a6ccbf27f 100644
--- a/backends/smv/smv.cc
+++ b/backends/smv/smv.cc
@@ -756,7 +756,7 @@ struct SmvBackend : public Backend {
 			if (args[argidx] == "-tpl" && argidx+1 < args.size()) {
 				template_f.open(args[++argidx]);
 				if (template_f.fail())
-					log_error("Can't open template file `%s'.\n", args[argidx].c_str());
+					log_error("Can't open template file `%s'.\n", args[argidx]);
 				continue;
 			}
 			if (args[argidx] == "-verbose") {
@@ -795,7 +795,7 @@ struct SmvBackend : public Backend {
 						modules.erase(module);
 
 						if (module == nullptr)
-							log_error("Module '%s' not found.\n", stmt[1].c_str());
+							log_error("Module '%s' not found.\n", stmt[1]);
 
 						*f << stringf("-- SMV description generated by %s\n", yosys_maybe_version());
 
diff --git a/backends/spice/spice.cc b/backends/spice/spice.cc
index 573093ff7..16458d647 100644
--- a/backends/spice/spice.cc
+++ b/backends/spice/spice.cc
@@ -258,7 +258,7 @@ struct SpiceBackend : public Backend {
 
 		if (!top_module_name.empty()) {
 			if (top_module == NULL)
-				log_error("Can't find top module `%s'!\n", top_module_name.c_str());
+				log_error("Can't find top module `%s'!\n", top_module_name);
 			print_spice_module(*f, top_module, design, neg, pos, buf, ncpf, big_endian, use_inames);
 			*f << stringf("\n");
 		}
diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index b1ed2b1f0..71969f177 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -153,7 +153,7 @@ void reset_auto_counter(RTLIL::Module *module)
 
 	if (verbose)
 		for (auto it = auto_name_map.begin(); it != auto_name_map.end(); ++it)
-			log("  renaming `%s' to `%s_%0*d_'.\n", it->first.c_str(), auto_prefix.c_str(), auto_name_digits, auto_name_offset + it->second);
+			log("  renaming `%s' to `%s_%0*d_'.\n", it->first, auto_prefix, auto_name_digits, auto_name_offset + it->second);
 }
 
 std::string next_auto_id()
@@ -494,7 +494,7 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 
 			std::ofstream extmem_f(extmem_filename, std::ofstream::trunc);
 			if (extmem_f.fail())
-				log_error("Can't open file `%s' for writing: %s\n", extmem_filename.c_str(), strerror(errno));
+				log_error("Can't open file `%s' for writing: %s\n", extmem_filename, strerror(errno));
 			else
 			{
 				Const data = mem.get_init_data();
@@ -2632,7 +2632,7 @@ struct VerilogBackend : public Backend {
 					log_cmd_error("Can't handle partially selected module %s!\n", log_id(module->name));
 				continue;
 			}
-			log("Dumping module `%s'.\n", module->name.c_str());
+			log("Dumping module `%s'.\n", module->name);
 			module->sort();
 			dump_module(*f, "", module);
 		}
diff --git a/docs/source/code_examples/extensions/my_cmd.cc b/docs/source/code_examples/extensions/my_cmd.cc
index e6660469c..d52268b4a 100644
--- a/docs/source/code_examples/extensions/my_cmd.cc
+++ b/docs/source/code_examples/extensions/my_cmd.cc
@@ -10,7 +10,7 @@ struct MyPass : public Pass {
     {
         log("Arguments to my_cmd:\n");
         for (auto &arg : args)
-            log("  %s\n", arg.c_str());
+            log("  %s\n", arg);
 
         log("Modules in current design:\n");
         for (auto mod : design->modules())
diff --git a/docs/source/code_examples/functional/dummy.cc b/docs/source/code_examples/functional/dummy.cc
index 3d84b84ba..42b05b339 100644
--- a/docs/source/code_examples/functional/dummy.cc
+++ b/docs/source/code_examples/functional/dummy.cc
@@ -16,7 +16,7 @@ struct FunctionalDummyBackend : public Backend {
 
 		for (auto module : design->selected_modules())
 		{
-			log("Processing module `%s`.\n", module->name.c_str());
+			log("Processing module `%s`.\n", module->name);
 
 			// convert module to FunctionalIR
 			auto ir = Functional::IR::from_module(module);
diff --git a/docs/source/yosys_internals/hashing.rst b/docs/source/yosys_internals/hashing.rst
index b9608d99e..1993e617a 100644
--- a/docs/source/yosys_internals/hashing.rst
+++ b/docs/source/yosys_internals/hashing.rst
@@ -45,9 +45,9 @@ creates a bijective map from ``K`` to the integers. For example:
    log("%d\n", si("world"));      // will print 43
    log("%d\n", si.at("world"));   // will print 43
    log("%d\n", si.at("dummy"));   // will throw exception
-   log("%s\n", si[42].c_str()));  // will print hello
-   log("%s\n", si[43].c_str()));  // will print world
-   log("%s\n", si[44].c_str()));  // will throw exception
+   log("%s\n", si[42]));  // will print hello
+   log("%s\n", si[43]));  // will print world
+   log("%s\n", si[44]));  // will throw exception
 
 It is not possible to remove elements from an idict.
 
diff --git a/examples/cxx-api/scopeinfo_example.cc b/examples/cxx-api/scopeinfo_example.cc
index 0882ba804..fd5d2a781 100644
--- a/examples/cxx-api/scopeinfo_example.cc
+++ b/examples/cxx-api/scopeinfo_example.cc
@@ -77,9 +77,9 @@ struct ScopeinfoExamplePass : public Pass {
 						continue;
 					}
 
-					log("%s %s\n", wire_scope.first.path_str().c_str(), log_id(wire_scope.second));
+					log("%s %s\n", wire_scope.first.path_str(), log_id(wire_scope.second));
 					for (auto src : index.sources(wire))
-						log(" - %s\n", src.c_str());
+						log(" - %s\n", src);
 				}
 			}
 		}
diff --git a/frontends/aiger/aigerparse.cc b/frontends/aiger/aigerparse.cc
index c5d9bc70b..db4cb12ba 100644
--- a/frontends/aiger/aigerparse.cc
+++ b/frontends/aiger/aigerparse.cc
@@ -909,7 +909,7 @@ void AigerReader::post_process()
 					module->rename(cell, escaped_s);
 			}
 			else
-				log_error("Symbol type '%s' not recognised.\n", type.c_str());
+				log_error("Symbol type '%s' not recognised.\n", type);
 		}
 	}
 
diff --git a/frontends/aiger2/xaiger.cc b/frontends/aiger2/xaiger.cc
index 616bec9e7..d983f8c41 100644
--- a/frontends/aiger2/xaiger.cc
+++ b/frontends/aiger2/xaiger.cc
@@ -91,7 +91,7 @@ struct Xaiger2Frontend : public Frontend {
 		std::ifstream map_file;
 		map_file.open(map_filename);
 		if (!map_file)
-			log_error("Failed to open map file '%s'\n", map_filename.c_str());
+			log_error("Failed to open map file '%s'\n", map_filename);
 
 		unsigned int M, I, L, O, A;
 		std::string header;
@@ -388,7 +388,7 @@ struct Xaiger2Frontend : public Frontend {
 			if (f->eof())
 				break;
 			log_assert(!f->fail());
-			log("input file: %s\n", scratch.c_str());
+			log("input file: %s\n", scratch);
 		}
 
 		log_debug("co_counter=%d\n", co_counter);
diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 313161fc3..2f93ea198 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -1108,9 +1108,9 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 	log_assert(ast->type == AST_MODULE || ast->type == AST_INTERFACE);
 
 	if (defer)
-		log("Storing AST representation for module `%s'.\n", ast->str.c_str());
+		log("Storing AST representation for module `%s'.\n", ast->str);
 	else if (!quiet) {
-		log("Generating RTLIL representation for module `%s'.\n", ast->str.c_str());
+		log("Generating RTLIL representation for module `%s'.\n", ast->str);
 	}
 
 	AstModule *module = new AstModule;
@@ -1411,7 +1411,7 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool nodisplay, bool dump
 			for (auto& n : design->verilog_packages) {
 				for (auto &o : n->children) {
 					auto cloned_node = o->clone();
-					// log("cloned node %s\n", type2str(cloned_node->type).c_str());
+					// log("cloned node %s\n", type2str(cloned_node->type));
 					if (cloned_node->type == AST_ENUM) {
 						for (auto &e : cloned_node->children) {
 							log_assert(e->type == AST_ENUM_ITEM);
@@ -1432,7 +1432,7 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool nodisplay, bool dump
 				for (const auto& node : child->children)
 					if (node->type == AST_PARAMETER && param_has_no_default(node.get()))
 					{
-						log("Deferring `%s' because it contains parameter(s) without defaults.\n", child->str.c_str());
+						log("Deferring `%s' because it contains parameter(s) without defaults.\n", child->str);
 						defer_local = true;
 						break;
 					}
@@ -1507,7 +1507,7 @@ std::pair<std::string,std::string> AST::split_modport_from_type(std::string name
 			interface_modport = seglist[1];
 		}
 		else { // Erroneous port type
-			log_error("More than two '.' in signal port type (%s)\n", name_type.c_str());
+			log_error("More than two '.' in signal port type (%s)\n", name_type);
 		}
 	}
 	return std::pair<std::string,std::string>(interface_type, interface_modport);
@@ -1720,7 +1720,7 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, const dict<RTLIL::IdStr
 				new_subcell->set_bool_attribute(ID::is_interface);
 			}
 			else {
-				log_error("No port with matching name found (%s) in %s. Stopping\n", log_id(intf.first), modname.c_str());
+				log_error("No port with matching name found (%s) in %s. Stopping\n", log_id(intf.first), modname);
 			}
 		}
 
@@ -1731,7 +1731,7 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, const dict<RTLIL::IdStr
 
 	} else {
 		modname = new_modname;
-		log("Found cached RTLIL representation for module `%s'.\n", modname.c_str());
+		log("Found cached RTLIL representation for module `%s'.\n", modname);
 	}
 
 	return modname;
@@ -1750,7 +1750,7 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, const dict<RTLIL::IdStr
 		process_module(design, new_ast.get(), false, NULL, quiet);
 		design->module(modname)->check();
 	} else if (!quiet) {
-		log("Found cached RTLIL representation for module `%s'.\n", modname.c_str());
+		log("Found cached RTLIL representation for module `%s'.\n", modname);
 	}
 
 	return modname;
@@ -1799,14 +1799,14 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 		auto it = parameters.find(child->str);
 		if (it != parameters.end()) {
 			if (!quiet)
-				log("Parameter %s = %s\n", child->str.c_str(), log_signal(it->second));
+				log("Parameter %s = %s\n", child->str, log_signal(it->second));
 			named_parameters.emplace_back(child->str, it->second);
 			continue;
 		}
 		it = parameters.find(stringf("$%d", para_counter));
 		if (it != parameters.end()) {
 			if (!quiet)
-				log("Parameter %d (%s) = %s\n", para_counter, child->str.c_str(), log_signal(it->second));
+				log("Parameter %d (%s) = %s\n", para_counter, child->str, log_signal(it->second));
 			named_parameters.emplace_back(child->str, it->second);
 			continue;
 		}
@@ -1839,13 +1839,13 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 		auto it = parameters.find(child->str);
 		if (it != parameters.end()) {
 			if (!quiet)
-				log("Parameter %s = %s\n", child->str.c_str(), log_signal(it->second));
+				log("Parameter %s = %s\n", child->str, log_signal(it->second));
 			goto rewrite_parameter;
 		}
 		it = parameters.find(stringf("$%d", para_counter));
 		if (it != parameters.end()) {
 			if (!quiet)
-				log("Parameter %d (%s) = %s\n", para_counter, child->str.c_str(), log_signal(it->second));
+				log("Parameter %d (%s) = %s\n", para_counter, child->str, log_signal(it->second));
 			goto rewrite_parameter;
 		}
 		continue;
diff --git a/frontends/ast/dpicall.cc b/frontends/ast/dpicall.cc
index d76318739..4c2a7fac9 100644
--- a/frontends/ast/dpicall.cc
+++ b/frontends/ast/dpicall.cc
@@ -40,7 +40,7 @@ static ffi_fptr resolve_fn (std::string symbol_name)
 			plugin_name = loaded_plugin_aliases.at(plugin_name);
 
 		if (loaded_plugins.count(plugin_name) == 0)
-			log_error("unable to resolve '%s': can't find plugin `%s'\n", symbol_name.c_str(), plugin_name.c_str());
+			log_error("unable to resolve '%s': can't find plugin `%s'\n", symbol_name, plugin_name);
 
 		void *symbol = dlsym(loaded_plugins.at(plugin_name), real_symbol_name.c_str());
 
@@ -61,7 +61,7 @@ static ffi_fptr resolve_fn (std::string symbol_name)
 	if (symbol != nullptr)
 		return (ffi_fptr) symbol;
 
-	log_error("unable to resolve '%s'.\n", symbol_name.c_str());
+	log_error("unable to resolve '%s'.\n", symbol_name);
 }
 
 std::unique_ptr<AST::AstNode> AST::dpi_call(AstSrcLocType loc, const std::string &rtype, const std::string &fname, const std::vector<std::string> &argtypes, const std::vector<std::unique_ptr<AST::AstNode>> &args)
@@ -74,32 +74,32 @@ std::unique_ptr<AST::AstNode> AST::dpi_call(AstSrcLocType loc, const std::string
 	ffi_cif cif;
 	int status;
 
-	log("Calling DPI function `%s' and returning `%s':\n", fname.c_str(), rtype.c_str());
+	log("Calling DPI function `%s' and returning `%s':\n", fname, rtype);
 
 	log_assert(GetSize(args) == GetSize(argtypes));
 	for (int i = 0; i < GetSize(args); i++) {
 		if (argtypes[i] == "real") {
-			log("  arg %d (%s): %f\n", i, argtypes[i].c_str(), args[i]->asReal(args[i]->is_signed));
+			log("  arg %d (%s): %f\n", i, argtypes[i], args[i]->asReal(args[i]->is_signed));
 			value_store[i].f64 = args[i]->asReal(args[i]->is_signed);
 			values[i] = &value_store[i].f64;
 			types[i] = &ffi_type_double;
 		} else if (argtypes[i] == "shortreal") {
-			log("  arg %d (%s): %f\n", i, argtypes[i].c_str(), args[i]->asReal(args[i]->is_signed));
+			log("  arg %d (%s): %f\n", i, argtypes[i], args[i]->asReal(args[i]->is_signed));
 			value_store[i].f32 = args[i]->asReal(args[i]->is_signed);
 			values[i] = &value_store[i].f32;
 			types[i] = &ffi_type_double;
 		} else if (argtypes[i] == "integer") {
-			log("  arg %d (%s): %lld\n", i, argtypes[i].c_str(), (long long)args[i]->asInt(args[i]->is_signed));
+			log("  arg %d (%s): %lld\n", i, argtypes[i], (long long)args[i]->asInt(args[i]->is_signed));
 			value_store[i].i32 = args[i]->asInt(args[i]->is_signed);
 			values[i] = &value_store[i].i32;
 			types[i] = &ffi_type_sint32;
 		} else if (argtypes[i] == "chandle") {
-			log("  arg %d (%s): %llx\n", i, argtypes[i].c_str(), (unsigned long long)args[i]->asInt(false));
+			log("  arg %d (%s): %llx\n", i, argtypes[i], (unsigned long long)args[i]->asInt(false));
 			value_store[i].ptr = (void *)args[i]->asInt(args[i]->is_signed);
 			values[i] = &value_store[i].ptr;
 			types[i] = &ffi_type_pointer;
 		} else {
-			log_error("invalid argtype '%s' for argument %d.\n", argtypes[i].c_str(), i);
+			log_error("invalid argtype '%s' for argument %d.\n", argtypes[i], i);
 		}
 	}
 
@@ -116,7 +116,7 @@ std::unique_ptr<AST::AstNode> AST::dpi_call(AstSrcLocType loc, const std::string
                 types[args.size()] = &ffi_type_pointer;
                 values[args.size()] = &value_store[args.size()].ptr;
         } else {
-                log_error("invalid rtype '%s'.\n", rtype.c_str());
+                log_error("invalid rtype '%s'.\n", rtype);
         }
 
         if ((status = ffi_prep_cif(&cif, FFI_DEFAULT_ABI, args.size(), types[args.size()], types.data())) != FFI_OK)
@@ -155,7 +155,7 @@ YOSYS_NAMESPACE_BEGIN
 
 std::unique_ptr<AST::AstNode> AST::dpi_call(AstSrcLocType, const std::string&, const std::string &fname, const std::vector<std::string>&, const std::vector<std::unique_ptr<AST::AstNode>>&)
 {
-	log_error("Can't call DPI function `%s': this version of yosys is built without plugin support\n", fname.c_str());
+	log_error("Can't call DPI function `%s': this version of yosys is built without plugin support\n", fname);
 }
 
 YOSYS_NAMESPACE_END
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 896ae9bdb..a30823e24 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -382,7 +382,7 @@ struct AST_INTERNAL::ProcessGenerator
 		if (found_anyedge_syncs) {
 			if (found_global_syncs)
 				always->input_error("Found non-synthesizable event list!\n");
-			log("Note: Assuming pure combinatorial block at %s in\n", always->loc_string().c_str());
+			log("Note: Assuming pure combinatorial block at %s in\n", always->loc_string());
 			log("compliance with IEC 62142(E):2005 / IEEE Std. 1364.1(E):2002. Recommending\n");
 			log("use of @* instead of @(...) for better match of synthesis and simulation.\n");
 		}
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index bf72a770f..dee4d5854 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -180,10 +180,10 @@ void AstNode::annotateTypedEnums(AstNode *template_node)
 	if (template_node->attributes.count(ID::enum_type)) {
 		//get reference to enum node:
 		std::string enum_type = template_node->attributes[ID::enum_type]->str.c_str();
-		//			log("enum_type=%s (count=%lu)\n", enum_type.c_str(), current_scope.count(enum_type));
+		//			log("enum_type=%s (count=%lu)\n", enum_type, current_scope.count(enum_type));
 		//			log("current scope:\n");
 		//			for (auto &it : current_scope)
-		//				log("  %s\n", it.first.c_str());
+		//				log("  %s\n", it.first);
 		log_assert(current_scope.count(enum_type) == 1);
 		AstNode *enum_node = current_scope.at(enum_type);
 		log_assert(enum_node->type == AST_ENUM);
@@ -911,7 +911,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 #if 0
 	log("-------------\n");
-	log("AST simplify[%d] depth %d at %s:%d on %s %p:\n", stage, recursion_counter, location.begin.filename->c_str(), location.begin.line, type2str(type).c_str(), this);
+	log("AST simplify[%d] depth %d at %s:%d on %s %p:\n", stage, recursion_counter, location.begin.filename, location.begin.line, type2str(type), this);
 	log("const_fold=%d, stage=%d, width_hint=%d, sign_hint=%d\n",
 			int(const_fold), int(stage), int(width_hint), int(sign_hint));
 	// dumpAst(nullptr, "> ");
@@ -963,7 +963,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				if ((memflags & AstNode::MEM2REG_FL_CONST_LHS) && !(memflags & AstNode::MEM2REG_FL_VAR_LHS))
 					goto verbose_activate;
 
-				// log("Note: Not replacing memory %s with list of registers (flags=0x%08lx).\n", mem->str.c_str(), long(memflags));
+				// log("Note: Not replacing memory %s with list of registers (flags=0x%08lx).\n", mem->str, long(memflags));
 				continue;
 
 			verbose_activate:
@@ -978,7 +978,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				}
 
 			silent_activate:
-				// log("Note: Replacing memory %s with list of registers (flags=0x%08lx).\n", mem->str.c_str(), long(memflags));
+				// log("Note: Replacing memory %s with list of registers (flags=0x%08lx).\n", mem->str, long(memflags));
 				mem2reg_set.insert(mem);
 			}
 
@@ -1063,7 +1063,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				Fmt fmt = processFormat(stage, /*sformat_like=*/false, default_base, /*first_arg_at=*/0, /*may_fail=*/true);
 				if (str.substr(0, 8) == "$display")
 					fmt.append_literal("\n");
-				log("%s", fmt.render().c_str());
+				log("%s", fmt.render());
 			}
 
 			return false;
@@ -1499,7 +1499,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		break;
 
 	case AST_ENUM:
-		//log("\nENUM %s: %d child %d\n", str.c_str(), basic_prep, children[0]->basic_prep);
+		//log("\nENUM %s: %d child %d\n", str, basic_prep, children[0]->basic_prep);
 		if (!basic_prep) {
 			for (auto& item_node : children) {
 				while (!item_node->basic_prep && item_node->simplify(false, stage, -1, false))
@@ -1590,7 +1590,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				}
 
 				default:
-					log_error("Don't know how to translate static cast of type %s\n", type2str(template_node->type).c_str());
+					log_error("Don't know how to translate static cast of type %s\n", type2str(template_node->type));
 				}
 			}
 
@@ -2297,7 +2297,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			AstNode *current_scope_ast = (current_ast_mod == nullptr) ? current_ast : current_ast_mod;
 			str = try_pop_module_prefix();
 			for (auto& node : current_scope_ast->children) {
-				//log("looking at mod scope child %s\n", type2str(node->type).c_str());
+				//log("looking at mod scope child %s\n", type2str(node->type));
 				switch (node->type) {
 				case AST_PARAMETER:
 				case AST_LOCALPARAM:
@@ -2308,9 +2308,9 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				case AST_FUNCTION:
 				case AST_TASK:
 				case AST_DPI_FUNCTION:
-					//log("found child %s, %s\n", type2str(node->type).c_str(), node->str.c_str());
+					//log("found child %s, %s\n", type2str(node->type), node->str);
 					if (str == node->str) {
-						//log("add %s, type %s to scope\n", str.c_str(), type2str(node->type).c_str());
+						//log("add %s, type %s to scope\n", str, type2str(node->type));
 						current_scope[node->str] = node.get();
 					}
 					break;
@@ -2319,7 +2319,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					for (auto& enum_node : node->children) {
 						log_assert(enum_node->type==AST_ENUM_ITEM);
 						if (str == enum_node->str) {
-							//log("\nadding enum item %s to scope\n", str.c_str());
+							//log("\nadding enum item %s to scope\n", str);
 							current_scope[str] = enum_node.get();
 						}
 					}
@@ -5404,7 +5404,7 @@ std::unique_ptr<AstNode> AstNode::eval_const_function(AstNode *fcall, bool must_
 #if 0
 		log("-----------------------------------\n");
 		for (auto &it : variables)
-			log("%20s %40s\n", it.first.c_str(), log_signal(it.second.val));
+			log("%20s %40s\n", it.first, log_signal(it.second.val));
 		stmt->dumpAst(nullptr, "stmt> ");
 #endif
 		if (stmt->type == AST_WIRE)
diff --git a/frontends/blif/blifparse.cc b/frontends/blif/blifparse.cc
index f6b894563..d63044923 100644
--- a/frontends/blif/blifparse.cc
+++ b/frontends/blif/blifparse.cc
@@ -618,7 +618,7 @@ void parse_blif(RTLIL::Design *design, std::istream &f, IdString dff_name, bool
 error:
 	log_error("Syntax error in line %d!\n", line_count);
 error_with_reason:
-	log_error("Syntax error in line %d: %s\n", line_count, err_reason.c_str());
+	log_error("Syntax error in line %d: %s\n", line_count, err_reason);
 }
 
 struct BlifFrontend : public Frontend {
diff --git a/frontends/json/jsonparse.cc b/frontends/json/jsonparse.cc
index 1aab81015..f2faa669b 100644
--- a/frontends/json/jsonparse.cc
+++ b/frontends/json/jsonparse.cc
@@ -289,7 +289,7 @@ void json_parse_attr_param(dict<IdString, Const> &results, JsonNode *node)
 
 void json_import(Design *design, string &modname, JsonNode *node)
 {
-	log("Importing module %s from JSON tree.\n", modname.c_str());
+	log("Importing module %s from JSON tree.\n", modname);
 
 	Module *module = new RTLIL::Module;
 	module->name = RTLIL::escape_id(modname.c_str());
@@ -367,7 +367,7 @@ void json_import(Design *design, string &modname, JsonNode *node)
 				port_wire->port_input = true;
 				port_wire->port_output = true;
 			} else
-				log_error("JSON port node '%s' has invalid '%s' direction attribute.\n", log_id(port_name), port_direction_node->data_string.c_str());
+				log_error("JSON port node '%s' has invalid '%s' direction attribute.\n", log_id(port_name), port_direction_node->data_string);
 
 			port_wire->port_id = port_id;
 
diff --git a/frontends/liberty/liberty.cc b/frontends/liberty/liberty.cc
index 3228f02fb..72ad8b2b7 100644
--- a/frontends/liberty/liberty.cc
+++ b/frontends/liberty/liberty.cc
@@ -47,7 +47,7 @@ static RTLIL::SigSpec parse_func_identifier(RTLIL::Module *module, const char *&
 
 	std::string id = RTLIL::escape_id(std::string(expr, id_len));
 	if (!module->wires_.count(id))
-		log_error("Can't resolve wire name %s.\n", RTLIL::unescape_id(id).c_str());
+		log_error("Can't resolve wire name %s.\n", RTLIL::unescape_id(id));
 
 	expr += id_len;
 	return module->wires_.at(id);
@@ -550,7 +550,7 @@ struct LibertyFrontend : public Frontend {
 			if (cell->id != "cell" || cell->args.size() != 1)
 				continue;
 
-			// log("Processing cell type %s.\n", RTLIL::unescape_id(cell_name).c_str());
+			// log("Processing cell type %s.\n", RTLIL::unescape_id(cell_name));
 
 			std::map<std::string, std::tuple<int, int, bool>> type_map = global_type_map;
 			parse_type_map(type_map, cell);
@@ -582,9 +582,9 @@ struct LibertyFrontend : public Frontend {
 					{
 						if (!flag_ignore_miss_dir)
 						{
-							log_error("Missing or invalid direction for pin %s on cell %s.\n", node->args.at(0).c_str(), log_id(module->name));
+							log_error("Missing or invalid direction for pin %s on cell %s.\n", node->args.at(0), log_id(module->name));
 						} else {
-							log("Ignoring cell %s with missing or invalid direction for pin %s.\n", log_id(module->name), node->args.at(0).c_str());
+							log("Ignoring cell %s with missing or invalid direction for pin %s.\n", log_id(module->name), node->args.at(0));
 							delete module;
 							goto skip_cell;
 						}
@@ -596,7 +596,7 @@ struct LibertyFrontend : public Frontend {
 				if (node->id == "bus" && node->args.size() == 1)
 				{
 					if (flag_ignore_buses) {
-						log("Ignoring cell %s with a bus interface %s.\n", log_id(module->name), node->args.at(0).c_str());
+						log("Ignoring cell %s with a bus interface %s.\n", log_id(module->name), node->args.at(0));
 						delete module;
 						goto skip_cell;
 					}
@@ -613,7 +613,7 @@ struct LibertyFrontend : public Frontend {
 					}
 
 					if (!dir || (dir->value != "input" && dir->value != "output" && dir->value != "inout" && dir->value != "internal"))
-						log_error("Missing or invalid direction for bus %s on cell %s.\n", node->args.at(0).c_str(), log_id(module->name));
+						log_error("Missing or invalid direction for bus %s on cell %s.\n", node->args.at(0), log_id(module->name));
 
 					simple_comb_cell = false;
 
diff --git a/frontends/rpc/rpc_frontend.cc b/frontends/rpc/rpc_frontend.cc
index 4a9ce4b8a..df64ecd2f 100644
--- a/frontends/rpc/rpc_frontend.cc
+++ b/frontends/rpc/rpc_frontend.cc
@@ -167,7 +167,7 @@ struct RpcModule : RTLIL::Module {
 
 		std::string parameter_info;
 		for (auto &param : parameters) {
-			log("Parameter %s = %s\n", param.first.c_str(), log_signal(RTLIL::SigSpec(param.second)));
+			log("Parameter %s = %s\n", param.first, log_signal(RTLIL::SigSpec(param.second)));
 			parameter_info += stringf("%s=%s", param.first, log_signal(RTLIL::SigSpec(param.second)));
 		}
 
@@ -180,7 +180,7 @@ struct RpcModule : RTLIL::Module {
 			derived_name = "$paramod" + stripped_name + parameter_info;
 
 		if (design->has(derived_name)) {
-			log("Found cached RTLIL representation for module `%s'.\n", derived_name.c_str());
+			log("Found cached RTLIL representation for module `%s'.\n", derived_name);
 		} else {
 			std::string command, input;
 			std::tie(command, input) = server->derive_module(stripped_name.substr(1), parameters);
@@ -437,7 +437,7 @@ struct RpcFrontend : public Pass {
 
 			command_path_len_w = SearchPathW(/*lpPath=*/NULL, /*lpFileName=*/command_w.c_str(), /*lpExtension=*/L".exe", /*nBufferLength=*/0, /*lpBuffer=*/NULL, /*lpFilePart=*/NULL);
 			if (command_path_len_w == 0) {
-				log_error("SearchPathW failed: %s\n", get_last_error_str().c_str());
+				log_error("SearchPathW failed: %s\n", get_last_error_str());
 				goto cleanup_exec;
 			}
 			command_path_w.resize(command_path_len_w - 1);
@@ -448,19 +448,19 @@ struct RpcFrontend : public Pass {
 			pipe_attr.bInheritHandle = TRUE;
 			pipe_attr.lpSecurityDescriptor = NULL;
 			if (!CreatePipe(&send_r, &send_w, &pipe_attr, /*nSize=*/0)) {
-				log_error("CreatePipe failed: %s\n", get_last_error_str().c_str());
+				log_error("CreatePipe failed: %s\n", get_last_error_str());
 				goto cleanup_exec;
 			}
 			if (!SetHandleInformation(send_w, HANDLE_FLAG_INHERIT, 0)) {
-				log_error("SetHandleInformation failed: %s\n", get_last_error_str().c_str());
+				log_error("SetHandleInformation failed: %s\n", get_last_error_str());
 				goto cleanup_exec;
 			}
 			if (!CreatePipe(&recv_r, &recv_w, &pipe_attr, /*nSize=*/0)) {
-				log_error("CreatePipe failed: %s\n", get_last_error_str().c_str());
+				log_error("CreatePipe failed: %s\n", get_last_error_str());
 				goto cleanup_exec;
 			}
 			if (!SetHandleInformation(recv_r, HANDLE_FLAG_INHERIT, 0)) {
-				log_error("SetHandleInformation failed: %s\n", get_last_error_str().c_str());
+				log_error("SetHandleInformation failed: %s\n", get_last_error_str());
 				goto cleanup_exec;
 			}
 
@@ -470,7 +470,7 @@ struct RpcFrontend : public Pass {
 			startup_info.hStdError = GetStdHandle(STD_ERROR_HANDLE);
 			startup_info.dwFlags |= STARTF_USESTDHANDLES;
 			if (!CreateProcessW(/*lpApplicationName=*/command_path_w.c_str(), /*lpCommandLine=*/&command_line_w[0], /*lpProcessAttributes=*/NULL, /*lpThreadAttributes=*/NULL, /*bInheritHandles=*/TRUE, /*dwCreationFlags=*/0, /*lpEnvironment=*/NULL, /*lpCurrentDirectory=*/NULL, &startup_info, &proc_info)) {
-				log_error("CreateProcessW failed: %s\n", get_last_error_str().c_str());
+				log_error("CreateProcessW failed: %s\n", get_last_error_str());
 				goto cleanup_exec;
 			}
 			CloseHandle(proc_info.hProcess);
@@ -550,7 +550,7 @@ cleanup_exec:
 
 			h = CreateFileW(path_w.c_str(), GENERIC_READ|GENERIC_WRITE, /*dwShareMode=*/0, /*lpSecurityAttributes=*/NULL, /*dwCreationDisposition=*/OPEN_EXISTING, /*dwFlagsAndAttributes=*/0, /*hTemplateFile=*/NULL);
 			if (h == INVALID_HANDLE_VALUE) {
-				log_error("CreateFileW failed: %s\n", get_last_error_str().c_str());
+				log_error("CreateFileW failed: %s\n", get_last_error_str());
 				goto cleanup_path;
 			}
 
@@ -586,7 +586,7 @@ cleanup_path:
 			log_cmd_error("Failed to connect to RPC frontend.\n");
 
 		for (auto &module_name : server->get_module_names()) {
-			log("Linking module `%s'.\n", module_name.c_str());
+			log("Linking module `%s'.\n", module_name);
 			RpcModule *module = new RpcModule;
 			module->name = "$abstract\\" + module_name;
 			module->server = server;
diff --git a/frontends/rtlil/rtlil_frontend.cc b/frontends/rtlil/rtlil_frontend.cc
index 2c1910d13..e8d6ac9c9 100644
--- a/frontends/rtlil/rtlil_frontend.cc
+++ b/frontends/rtlil/rtlil_frontend.cc
@@ -90,7 +90,7 @@ struct RTLILFrontend : public Frontend {
 		}
 		extra_args(f, filename, args, argidx);
 
-		log("Input filename: %s\n", filename.c_str());
+		log("Input filename: %s\n", filename);
 
 		RTLIL_FRONTEND::lexin = f;
 		RTLIL_FRONTEND::current_design = design;
diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index d4bedf44f..9e3436c14 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -143,7 +143,7 @@ void msg_func(msg_type_t msg_type, const char *message_id, linefile_type linefil
 		if (msg_type == VERIFIC_ERROR || msg_type == VERIFIC_WARNING || msg_type == VERIFIC_PROGRAM_ERROR)
 			log_warning_noprefix("%s%s\n", message_prefix.c_str(), message.c_str());
 		else
-			log("%s%s\n", message_prefix.c_str(), message.c_str());
+			log("%s%s\n", message_prefix, message);
 	}
 	if (verific_error_msg.empty() && (msg_type == VERIFIC_ERROR || msg_type == VERIFIC_PROGRAM_ERROR))
 		verific_error_msg = message;
@@ -250,7 +250,7 @@ static const RTLIL::Const extract_vhdl_bit(std::string &val, std::string &typ)
 {
 	if (val.size()==3 && val[0]=='\'' && val.back()=='\'')
 		return  RTLIL::Const::from_string(val.substr(1,val.size()-2));
-	log_error("Error parsing VHDL %s.\n", typ.c_str());
+	log_error("Error parsing VHDL %s.\n", typ);
 }
 
 static const RTLIL::Const extract_vhdl_bit_vector(std::string &val, std::string &typ)
@@ -261,7 +261,7 @@ static const RTLIL::Const extract_vhdl_bit_vector(std::string &val, std::string
 			c.flags |= RTLIL::CONST_FLAG_SIGNED;
 		return c;
 	}
-	log_error("Error parsing VHDL %s.\n", typ.c_str());
+	log_error("Error parsing VHDL %s.\n", typ);
 }
 
 static const RTLIL::Const extract_vhdl_integer(std::string &val)
@@ -2655,7 +2655,7 @@ struct VerificExtNets
 			cursor = ((Instance*)cursor->GetReferences()->GetLast())->Owner();
 		}
 
-		log_error("No common ancestor found between %s and %s.\n", get_full_netlist_name(A).c_str(), get_full_netlist_name(B).c_str());
+		log_error("No common ancestor found between %s and %s.\n", get_full_netlist_name(A), get_full_netlist_name(B));
 	}
 
 	void run(Netlist *nl)
@@ -2679,17 +2679,17 @@ struct VerificExtNets
 				continue;
 
 			if (verific_verbose)
-				log("Fixing external net reference on port %s.%s.%s:\n", get_full_netlist_name(nl).c_str(), inst->Name(), port->Name());
+				log("Fixing external net reference on port %s.%s.%s:\n", get_full_netlist_name(nl), inst->Name(), port->Name());
 
 			Netlist *ext_nl = net->Owner();
 
 			if (verific_verbose)
-				log(" external net owner: %s\n", get_full_netlist_name(ext_nl).c_str());
+				log(" external net owner: %s\n", get_full_netlist_name(ext_nl));
 
 			Netlist *ca_nl = find_common_ancestor(nl, ext_nl);
 
 			if (verific_verbose)
-				log(" common ancestor: %s\n", get_full_netlist_name(ca_nl).c_str());
+				log(" common ancestor: %s\n", get_full_netlist_name(ca_nl));
 
 			Net *ca_net = route_up(net, !port->IsOutput(), ca_nl);
 			Net *new_net = ca_net;
@@ -3038,7 +3038,7 @@ std::string verific_import(Design *design, const std::map<std::string,std::strin
 	}
 
 	if (!verific_error_msg.empty())
-		log_error("%s\n", verific_error_msg.c_str());
+		log_error("%s\n", verific_error_msg);
 
 	for (auto nl : nl_todo)
 		nl.second->ChangePortBusStructures(1 /* hierarchical */);
@@ -3060,7 +3060,7 @@ std::string verific_import(Design *design, const std::map<std::string,std::strin
 
 	verific_cleanup();
 	if (!verific_error_msg.empty())
-		log_error("%s\n", verific_error_msg.c_str());
+		log_error("%s\n", verific_error_msg);
 	return top;
 }
 
@@ -3349,7 +3349,7 @@ struct VerificPass : public Pass {
 				char block[4096];
 				while (1) {
 					if (fgets(block, 4096, Frontend::current_script_file == nullptr? stdin : Frontend::current_script_file) == nullptr)
-						log_error("Unexpected end of file in here document '%s'!\n", filename.c_str());
+						log_error("Unexpected end of file in here document '%s'!\n", filename);
 					buffer += block;
 					if (buffer.size() > 0 && (buffer[buffer.size() - 1] == '\n' || buffer[buffer.size() - 1] == '\r'))
 						break;
@@ -4232,7 +4232,7 @@ struct VerificPass : public Pass {
 				}
 				lines.sort();
 				for (auto &line : lines)
-					log("verific -cfg %s\n", line.c_str());
+					log("verific -cfg %s\n", line);
 				goto check_error;
 			}
 
@@ -4291,7 +4291,7 @@ struct VerificPass : public Pass {
 		}
 
 		if (!verific_error_msg.empty())
-			log_error("%s\n", verific_error_msg.c_str());
+			log_error("%s\n", verific_error_msg);
 
 	}
 #else /* YOSYS_ENABLE_VERIFIC */
diff --git a/frontends/verific/verificsva.cc b/frontends/verific/verificsva.cc
index 8b98997f6..cc5f07004 100644
--- a/frontends/verific/verificsva.cc
+++ b/frontends/verific/verificsva.cc
@@ -1024,7 +1024,7 @@ struct VerificSvaImporter
 	[[noreturn]] void parser_error(std::string errmsg)
 	{
 		if (!importer->mode_keep)
-			log_error("%s", errmsg.c_str());
+			log_error("%s", errmsg);
 		log_warning("%s", errmsg.c_str());
 		throw ParserErrorException();
 	}
diff --git a/frontends/verilog/preproc.cc b/frontends/verilog/preproc.cc
index 7d011b68e..8674758ab 100644
--- a/frontends/verilog/preproc.cc
+++ b/frontends/verilog/preproc.cc
@@ -242,7 +242,7 @@ struct arg_map_t
 	void add_arg(const std::string &name, const char *default_value)
 	{
 		if (find(name)) {
-			log_error("Duplicate macro arguments with name `%s'.\n", name.c_str());
+			log_error("Duplicate macro arguments with name `%s'.\n", name);
 		}
 
 		name_to_pos[name] = args.size();
@@ -789,14 +789,14 @@ frontend_verilog_preproc(std::istream                 &f,
 			else if (ifdef_pass_level > 0)
 				ifdef_pass_level--;
 			else
-				log_error("Found %s outside of macro conditional branch!\n", tok.c_str());
+				log_error("Found %s outside of macro conditional branch!\n", tok);
 			continue;
 		}
 
 		if (tok == "`else") {
 			if (ifdef_fail_level == 0) {
 				if (ifdef_pass_level == 0)
-					log_error("Found %s outside of macro conditional branch!\n", tok.c_str());
+					log_error("Found %s outside of macro conditional branch!\n", tok);
 				ifdef_pass_level--;
 				ifdef_fail_level = 1;
 				ifdef_already_satisfied = true;
@@ -813,7 +813,7 @@ frontend_verilog_preproc(std::istream                 &f,
 			std::string name = next_token(true);
 			if (ifdef_fail_level == 0) {
 				if (ifdef_pass_level == 0)
-					log_error("Found %s outside of macro conditional branch!\n", tok.c_str());
+					log_error("Found %s outside of macro conditional branch!\n", tok);
 				ifdef_pass_level--;
 				ifdef_fail_level = 1;
 				ifdef_already_satisfied = true;
diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index 4b4f7ad8d..589b80f8d 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -497,7 +497,7 @@ struct VerilogFrontend : public Frontend {
 		if (!flag_nopp) {
 			code_after_preproc = frontend_verilog_preproc(*f, filename, defines_map, *design->verilog_defines, include_dirs, parse_state, parse_mode);
 			if (flag_ppdump)
-				log("-- Verilog code after preprocessor --\n%s-- END OF DUMP --\n", code_after_preproc.c_str());
+				log("-- Verilog code after preprocessor --\n%s-- END OF DUMP --\n", code_after_preproc);
 			parse_state.lexin = new std::istringstream(code_after_preproc);
 		}
 
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index eb61e05df..d61fa7830 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -3261,7 +3261,7 @@ basic_expr:
 		ConstParser p{@4};
 		auto val = p.const2ast(*$4, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
 		if (val == nullptr)
-			log_error("Value conversion failed: `%s'\n", $4->c_str());
+			log_error("Value conversion failed: `%s'\n", *$4);
 		$$ = std::make_unique<AstNode>(@$, AST_TO_BITS, std::move($2), std::move(val));
 	} |
 	hierarchical_id integral_number {
@@ -3274,7 +3274,7 @@ basic_expr:
 		auto val = p.const2ast(*$2, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
 		SET_AST_NODE_LOC(val.get(), @2, @2);
 		if (val == nullptr)
-			log_error("Value conversion failed: `%s'\n", $2->c_str());
+			log_error("Value conversion failed: `%s'\n", *$2);
 		$$ = std::make_unique<AstNode>(@$, AST_TO_BITS, std::move(bits), std::move(val));
 	} |
 	integral_number {
@@ -3282,7 +3282,7 @@ basic_expr:
 		$$ = p.const2ast(*$1, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
 		SET_AST_NODE_LOC($$.get(), @1, @1);
 		if ($$ == nullptr)
-			log_error("Value conversion failed: `%s'\n", $1->c_str());
+			log_error("Value conversion failed: `%s'\n", *$1);
 	} |
 	TOK_REALVAL {
 		$$ = std::make_unique<AstNode>(@$, AST_REALVALUE);
diff --git a/kernel/driver.cc b/kernel/driver.cc
index 76c11853e..bbe4e46f3 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -585,7 +585,7 @@ int main(int argc, char **argv)
 
 			FILE *scriptfp = fopen(scriptfile.c_str(), "r");
 			if (scriptfp == nullptr) {
-				log_error("Failed to open file '%s' for reading.\n", scriptfile.c_str());
+				log_error("Failed to open file '%s' for reading.\n", scriptfile);
 			}
 			if (PyRun_SimpleFile(scriptfp, scriptfile.c_str()) != 0) {
 				log_flush();
@@ -664,7 +664,7 @@ int main(int argc, char **argv)
 			log("Warnings: %d experimental features used (not excluded with -x).\n", GetSize(log_experimentals));
 
 #ifdef _WIN32
-		log("End of script. Logfile hash: %s\n", hash.c_str());
+		log("End of script. Logfile hash: %s\n", hash);
 #else
 		std::string meminfo;
 		std::string stats_divider = ", ";
@@ -690,7 +690,7 @@ int main(int argc, char **argv)
 		meminfo = stringf(", MEM: %.2f MB peak",
 				ru_buffer.ru_maxrss / (1024.0 * 1024.0));
 #endif
-		log("End of script. Logfile hash: %s%sCPU: user %.2fs system %.2fs%s\n", hash.c_str(),
+		log("End of script. Logfile hash: %s%sCPU: user %.2fs system %.2fs%s\n", hash,
 				stats_divider.c_str(), ru_buffer.ru_utime.tv_sec + 1e-6 * ru_buffer.ru_utime.tv_usec,
 				ru_buffer.ru_stime.tv_sec + 1e-6 * ru_buffer.ru_stime.tv_usec, meminfo.c_str());
 #endif
@@ -768,9 +768,9 @@ int main(int argc, char **argv)
 		f = fopen(filename.c_str(), "a+");
 
 		if (f == NULL)
-			log_error("Can't create coverage file `%s'.\n", filename.c_str());
+			log_error("Can't create coverage file `%s'.\n", filename);
 
-		log("<writing coverage file \"%s\">\n", filename.c_str());
+		log("<writing coverage file \"%s\">\n", filename);
 
 		for (auto &it : get_coverage_data())
 			fprintf(f, "%-60s %10d %s\n", it.second.first.c_str(), it.second.second, it.first.c_str());
diff --git a/kernel/fstdata.cc b/kernel/fstdata.cc
index 35e7a2865..cc558d418 100644
--- a/kernel/fstdata.cc
+++ b/kernel/fstdata.cc
@@ -35,7 +35,7 @@ FstData::FstData(std::string filename) : ctx(nullptr)
 		filename_trim.erase(filename_trim.size()-4);
 		tmp_file = stringf("%s/converted_%s.fst", get_base_tmpdir(), filename_trim);
 		std::string cmd = stringf("vcd2fst %s %s", filename, tmp_file);
-		log("Exec: %s\n", cmd.c_str());
+		log("Exec: %s\n", cmd);
 		if (run_command(cmd) != 0)
 			log_cmd_error("Shell command failed!\n");
 		filename = tmp_file;
@@ -44,7 +44,7 @@ FstData::FstData(std::string filename) : ctx(nullptr)
 	const std::vector<std::string> g_units = { "s", "ms", "us", "ns", "ps", "fs", "as", "zs" };
 	ctx = (fstReaderContext *)fstReaderOpen(filename.c_str());
 	if (!ctx)
-		log_error("Error opening '%s' as FST file\n", filename.c_str());
+		log_error("Error opening '%s' as FST file\n", filename);
 	int scale = (int)fstReaderGetTimescale(ctx);	
 	timescale = pow(10.0, scale);
 	timescale_str = "";
diff --git a/kernel/functional.cc b/kernel/functional.cc
index 211527926..de8e7e8fc 100644
--- a/kernel/functional.cc
+++ b/kernel/functional.cc
@@ -395,7 +395,7 @@ public:
 					Node y = neg_if(y_flipped, sign(b));
 					return factory.extend(y, y_width, true);
 				} else
-					log_error("unhandled cell in CellSimplifier %s\n", cellType.c_str());
+					log_error("unhandled cell in CellSimplifier %s\n", cellType);
 			} else {
 				if(cellType.in(ID($mod), ID($modfloor)))
 					return factory.extend(factory.unsigned_mod(a, b), y_width, false);
@@ -458,9 +458,9 @@ public:
 				return factory.value(state);
 			}
 		} else if(cellType == ID($check)) {
-			log_error("The design contains a $check cell `%s'. This is not supported by the functional backend. Call `chformal -lower' to avoid this error.\n", cellName.c_str());
+			log_error("The design contains a $check cell `%s'. This is not supported by the functional backend. Call `chformal -lower' to avoid this error.\n", cellName);
 		} else {
-			log_error("`%s' cells are not supported by the functional backend\n", cellType.c_str());
+			log_error("`%s' cells are not supported by the functional backend\n", cellType);
 		}
 	}
 };
@@ -744,7 +744,7 @@ void IR::topological_sort() {
             log_warning("Combinational loop:\n");
             for (int *i = begin; i != end; ++i) {
 				Node node(_graph[*i]);
-                log("- %s = %s\n", RTLIL::unescape_id(node.name()).c_str(), node.to_string().c_str());
+                log("- %s = %s\n", RTLIL::unescape_id(node.name()), node.to_string());
 			}
             log("\n");
             scc = true;
@@ -836,7 +836,7 @@ void Writer::print_impl(const char *fmt, vector<std::function<void()>> &fns)
 				else
 					p = pe;
 				if(index >= fns.size())
-					log_error("invalid format string: index %zu out of bounds (%zu): \"%s\"\n", index, fns.size(), quote_fmt(fmt).c_str());
+					log_error("invalid format string: index %zu out of bounds (%zu): \"%s\"\n", index, fns.size(), quote_fmt(fmt));
 				fns[index]();
 				next_index = index + 1;
 			}
@@ -844,7 +844,7 @@ void Writer::print_impl(const char *fmt, vector<std::function<void()>> &fns)
 		case '}':
 			p++;
 			if(*p != '}')
-				log_error("invalid format string: unescaped }: \"%s\"\n", quote_fmt(fmt).c_str());
+				log_error("invalid format string: unescaped }: \"%s\"\n", quote_fmt(fmt));
 			*os << '}';
 			break;
 		default:
diff --git a/kernel/functional.h b/kernel/functional.h
index 7e5becef4..073adf40a 100644
--- a/kernel/functional.h
+++ b/kernel/functional.h
@@ -552,17 +552,17 @@ namespace Functional {
 		}
 		IRInput &add_input(IdString name, IdString kind, Sort sort) {
 			auto [it, inserted] = _ir._inputs.emplace({name, kind}, IRInput(_ir, name, kind, std::move(sort)));
-			if (!inserted) log_error("input `%s` was re-defined", name.c_str());
+			if (!inserted) log_error("input `%s` was re-defined", name);
 			return it->second;
 		}
 		IROutput &add_output(IdString name, IdString kind, Sort sort) {
 			auto [it, inserted] = _ir._outputs.emplace({name, kind}, IROutput(_ir, name, kind, std::move(sort)));
-			if (!inserted) log_error("output `%s` was re-defined", name.c_str());
+			if (!inserted) log_error("output `%s` was re-defined", name);
 			return it->second;
 		}
 		IRState &add_state(IdString name, IdString kind, Sort sort) {
 			auto [it, inserted] = _ir._states.emplace({name, kind}, IRState(_ir, name, kind, std::move(sort)));
-			if (!inserted) log_error("state `%s` was re-defined", name.c_str());
+			if (!inserted) log_error("state `%s` was re-defined", name);
 			return it->second;
 		}
 		Node value(IRInput const& input) {
diff --git a/kernel/gzip.cc b/kernel/gzip.cc
index 24907d8cf..d19c06579 100644
--- a/kernel/gzip.cc
+++ b/kernel/gzip.cc
@@ -121,7 +121,7 @@ std::istream* uncompressed(const std::string filename, std::ios_base::openmode m
 	}
 	if (n == 3 && magic[0] == 0x1f && magic[1] == 0x8b) {
 #ifdef YOSYS_ENABLE_ZLIB
-		log("Found gzip magic in file `%s', decompressing using zlib.\n", filename.c_str());
+		log("Found gzip magic in file `%s', decompressing using zlib.\n", filename);
 		if (magic[2] != 8)
 			log_cmd_error("gzip file `%s' uses unsupported compression type %02x\n",
 				filename.c_str(), unsigned(magic[2]));
diff --git a/kernel/log.cc b/kernel/log.cc
index 0dd56a04f..494047cde 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -228,7 +228,7 @@ void log_formatted_header(RTLIL::Design *design, std::string_view format, std::s
 	for (int c : header_count)
 		header_id += stringf("%s%d", header_id.empty() ? "" : ".", c);
 
-	log("%s. ", header_id.c_str());
+	log("%s. ", header_id);
 	log_formatted_string(format, std::move(str));
 	log_flush();
 
@@ -237,7 +237,7 @@ void log_formatted_header(RTLIL::Design *design, std::string_view format, std::s
 
 	if (log_hdump.count(header_id) && design != nullptr)
 		for (auto &filename : log_hdump.at(header_id)) {
-			log("Dumping current design to '%s'.\n", filename.c_str());
+			log("Dumping current design to '%s'.\n", filename);
 			if (yosys_xtrace)
 				IdString::xtrace_db_dump();
 			Pass::call(design, {"dump", "-o", filename});
@@ -635,21 +635,21 @@ void log_module(RTLIL::Module *module, std::string indent)
 {
 	std::stringstream buf;
 	RTLIL_BACKEND::dump_module(buf, indent, module, module->design, false);
-	log("%s", buf.str().c_str());
+	log("%s", buf.str());
 }
 
 void log_cell(RTLIL::Cell *cell, std::string indent)
 {
 	std::stringstream buf;
 	RTLIL_BACKEND::dump_cell(buf, indent, cell);
-	log("%s", buf.str().c_str());
+	log("%s", buf.str());
 }
 
 void log_wire(RTLIL::Wire *wire, std::string indent)
 {
 	std::stringstream buf;
 	RTLIL_BACKEND::dump_wire(buf, indent, wire);
-	log("%s", buf.str().c_str());
+	log("%s", buf.str());
 }
 
 void log_check_expected()
@@ -668,7 +668,7 @@ void log_check_expected()
 	auto check = [&](const std::string kind, std::string pattern, LogExpectedItem item) {
 		if (item.current_count == 0) {
 			log_warn_regexes.clear();
-			log_error("Expected %s pattern '%s' not found !\n", kind.c_str(), pattern.c_str());
+			log_error("Expected %s pattern '%s' not found !\n", kind, pattern);
 		}
 		if (item.current_count != item.expected_count) {
 			log_warn_regexes.clear();
@@ -689,7 +689,7 @@ void log_check_expected()
 	auto check_err = [&](const std::string kind, std::string pattern, LogExpectedItem item) {
 		if (item.current_count == item.expected_count) {
 			log_warn_regexes.clear();
-			log("Expected %s pattern '%s' found !!!\n", kind.c_str(), pattern.c_str());
+			log("Expected %s pattern '%s' found !!!\n", kind, pattern);
 			yosys_shutdown();
 			#ifdef EMSCRIPTEN
 				throw 0;
@@ -700,7 +700,7 @@ void log_check_expected()
 			#endif
 		} else {
 			log_warn_regexes.clear();
-			log_error("Expected %s pattern '%s' not found !\n", kind.c_str(), pattern.c_str());
+			log_error("Expected %s pattern '%s' not found !\n", kind, pattern);
 		}
 	};
 	for (auto &[pattern, item] : expect_error)
diff --git a/kernel/log.h b/kernel/log.h
index 5143524bf..2a33953ff 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -424,7 +424,7 @@ static inline void log_dump_val_worker(bool v) { log("%s", v ? "true" : "false")
 static inline void log_dump_val_worker(double v) { log("%f", v); }
 static inline void log_dump_val_worker(char *v) { log("%s", v); }
 static inline void log_dump_val_worker(const char *v) { log("%s", v); }
-static inline void log_dump_val_worker(std::string v) { log("%s", v.c_str()); }
+static inline void log_dump_val_worker(std::string v) { log("%s", v); }
 static inline void log_dump_val_worker(PerformanceTimer p) { log("%f seconds", p.sec()); }
 static inline void log_dump_args_worker(const char *p) { log_assert(*p == 0); }
 void log_dump_val_worker(RTLIL::IdString v);
diff --git a/kernel/log_help.cc b/kernel/log_help.cc
index 30c06a7c3..93b91b08b 100644
--- a/kernel/log_help.cc
+++ b/kernel/log_help.cc
@@ -85,7 +85,7 @@ void log_pass_str(const std::string &pass_str, std::string indent_str, bool lead
 	if (leading_newline)
 		log("\n");
 	for (std::string line; std::getline(iss, line);) {
-		log("%s", indent_str.c_str());
+		log("%s", indent_str);
 		auto curr_len = indent_str.length();
 		std::istringstream lss(line);
 		for (std::string word; std::getline(lss, word, ' ');) {
@@ -93,10 +93,10 @@ void log_pass_str(const std::string &pass_str, std::string indent_str, bool lead
 				word = word.substr(1, word.length()-2);
 			if (curr_len + word.length() >= MAX_LINE_LEN-1) {
 				curr_len = 0;
-				log("\n%s", indent_str.c_str());
+				log("\n%s", indent_str);
 			}
 			if (word.length()) {
-				log("%s ", word.c_str());
+				log("%s ", word);
 				curr_len += word.length() + 1;
 			}
 		}
diff --git a/kernel/register.cc b/kernel/register.cc
index c82620f40..4afd7ada3 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -54,7 +54,7 @@ Pass::Pass(std::string name, std::string short_help, source_location location) :
 void Pass::run_register()
 {
 	if (pass_register.count(pass_name) && !replace_existing_pass())
-		log_error("Unable to register pass '%s', pass already exists!\n", pass_name.c_str());
+		log_error("Unable to register pass '%s', pass already exists!\n", pass_name);
 	pass_register[pass_name] = this;
 }
 
@@ -123,7 +123,7 @@ void Pass::help()
 		prettyHelp.log_help();
 	} else {
 		log("\n");
-		log("No help message for command `%s'.\n", pass_name.c_str());
+		log("No help message for command `%s'.\n", pass_name);
 		log("\n");
 	}
 }
@@ -143,7 +143,7 @@ void Pass::cmd_log_args(const std::vector<std::string> &args)
 		return;
 	log("Full command line:");
 	for (size_t i = 0; i < args.size(); i++)
-		log(" %s", args[i].c_str());
+		log(" %s", args[i]);
 	log("\n");
 }
 
@@ -158,7 +158,7 @@ void Pass::cmd_error(const std::vector<std::string> &args, size_t argidx, std::s
 		command_text = command_text + (command_text.empty() ? "" : " ") + args[i];
 	}
 
-	log("\nSyntax error in command `%s':\n", command_text.c_str());
+	log("\nSyntax error in command `%s':\n", command_text);
 	help();
 
 	log_cmd_error("Command syntax error: %s\n> %s\n> %*s^\n",
@@ -257,7 +257,7 @@ void Pass::call(RTLIL::Design *design, std::vector<std::string> args)
 	if (echo_mode) {
 		log("%s", create_prompt(design, 0));
 		for (size_t i = 0; i < args.size(); i++)
-			log("%s%s", i ? " " : "", args[i].c_str());
+			log("%s%s", i ? " " : "", args[i]);
 		log("\n");
 	}
 
@@ -330,9 +330,9 @@ bool ScriptPass::check_label(std::string label, std::string info)
 	if (active_design == nullptr) {
 		log("\n");
 		if (info.empty())
-			log("    %s:\n", label.c_str());
+			log("    %s:\n", label);
 		else
-			log("    %s:    %s\n", label.c_str(), info.c_str());
+			log("    %s:    %s\n", label, info);
 		return true;
 	} else {
 		if (!active_run_from.empty() && active_run_from == active_run_to) {
@@ -351,9 +351,9 @@ void ScriptPass::run(std::string command, std::string info)
 {
 	if (active_design == nullptr) {
 		if (info.empty())
-			log("        %s\n", command.c_str());
+			log("        %s\n", command);
 		else
-			log("        %s    %s\n", command.c_str(), info.c_str());
+			log("        %s    %s\n", command, info);
 	} else {
 		Pass::call(active_design, command);
 		active_design->check();
@@ -364,9 +364,9 @@ void ScriptPass::run_nocheck(std::string command, std::string info)
 {
 	if (active_design == nullptr) {
 		if (info.empty())
-			log("        %s\n", command.c_str());
+			log("        %s\n", command);
 		else
-			log("        %s    %s\n", command.c_str(), info.c_str());
+			log("        %s    %s\n", command, info);
 	} else {
 		Pass::call(active_design, command);
 	}
@@ -402,11 +402,11 @@ Frontend::Frontend(std::string name, std::string short_help, source_location loc
 void Frontend::run_register()
 {
 	if (pass_register.count(pass_name) && !replace_existing_pass())
-		log_error("Unable to register pass '%s', pass already exists!\n", pass_name.c_str());
+		log_error("Unable to register pass '%s', pass already exists!\n", pass_name);
 	pass_register[pass_name] = this;
 
 	if (frontend_register.count(frontend_name) && !replace_existing_pass())
-		log_error("Unable to register frontend '%s', frontend already exists!\n", frontend_name.c_str());
+		log_error("Unable to register frontend '%s', frontend already exists!\n", frontend_name);
 	frontend_register[frontend_name] = this;
 }
 
@@ -462,7 +462,7 @@ void Frontend::extra_args(std::istream *&f, std::string &filename, std::vector<s
 				char block[4096];
 				while (1) {
 					if (fgets(block, 4096, Frontend::current_script_file == nullptr? stdin : Frontend::current_script_file) == nullptr)
-						log_error("Unexpected end of file in here document '%s'!\n", filename.c_str());
+						log_error("Unexpected end of file in here document '%s'!\n", filename);
 					buffer += block;
 					if (buffer.size() > 0 && (buffer[buffer.size() - 1] == '\n' || buffer[buffer.size() - 1] == '\r'))
 						break;
@@ -548,11 +548,11 @@ Backend::Backend(std::string name, std::string short_help, source_location locat
 void Backend::run_register()
 {
 	if (pass_register.count(pass_name))
-		log_error("Unable to register pass '%s', pass already exists!\n", pass_name.c_str());
+		log_error("Unable to register pass '%s', pass already exists!\n", pass_name);
 	pass_register[pass_name] = this;
 
 	if (backend_register.count(backend_name))
-		log_error("Unable to register backend '%s', backend already exists!\n", backend_name.c_str());
+		log_error("Unable to register backend '%s', backend already exists!\n", backend_name);
 	backend_register[backend_name] = this;
 }
 
@@ -699,12 +699,12 @@ static void log_warning_flags(Pass *pass) {
 	if (pass->experimental_flag) {
 		if (!has_warnings) log("\n");
 		has_warnings = true;
-		log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", name.c_str());
+		log("WARNING: THE '%s' COMMAND IS EXPERIMENTAL.\n", name);
 	}
 	if (pass->internal_flag) {
 		if (!has_warnings) log("\n");
 		has_warnings = true;
-		log("WARNING: THE '%s' COMMAND IS INTENDED FOR INTERNAL DEVELOPER USE ONLY.\n", name.c_str());
+		log("WARNING: THE '%s' COMMAND IS INTENDED FOR INTERNAL DEVELOPER USE ONLY.\n", name);
 	}
 	if (has_warnings)
 		log("\n");
@@ -966,7 +966,7 @@ struct HelpPass : public Pass {
 				auto cell_pair = pair<SimHelper, CellType>(cell_help, it.second);
 				cells.emplace(name, cell_pair);
 			} else {
-				log("ERROR: Missing cell help for cell '%s'.\n", name.c_str());
+				log("ERROR: Missing cell help for cell '%s'.\n", name);
 				raise_error |= true;
 			}
 		}
@@ -1028,7 +1028,7 @@ struct HelpPass : public Pass {
 		if (args.size() == 1) {
 			log("\n");
 			for (auto &it : pass_register)
-				log("    %-20s %s\n", it.first.c_str(), it.second->short_help.c_str());
+				log("    %-20s %s\n", it.first, it.second->short_help);
 			log("\n");
 			log("Type 'help <command>' for more information on a command.\n");
 			log("Type 'help -cells' for a list of all cell types.\n");
@@ -1040,7 +1040,7 @@ struct HelpPass : public Pass {
 			if (args[1] == "-all") {
 				for (auto &it : pass_register) {
 					log("\n\n");
-					log("%s  --  %s\n", it.first.c_str(), it.second->short_help.c_str());
+					log("%s  --  %s\n", it.first, it.second->short_help);
 					for (size_t i = 0; i < it.first.size() + it.second->short_help.size() + 6; i++)
 						log("=");
 					log("\n");
@@ -1052,7 +1052,7 @@ struct HelpPass : public Pass {
 				log("\n");
 				for (auto &it : cell_help_messages.cell_help) {
 					SimHelper help_cell = it.second;
-					log("    %-15s %s\n", help_cell.name.c_str(), help_cell.ports.c_str());
+					log("    %-15s %s\n", help_cell.name, help_cell.ports);
 				}
 				log("\n");
 				log("Type 'help <cell_type>' for more information on a cell type.\n");
@@ -1067,34 +1067,34 @@ struct HelpPass : public Pass {
 				auto help_cell = cell_help_messages.get(args[1]);
 				if (is_code_getter(args[1])) {
 						log("\n");
-						log("%s\n", help_cell.code.c_str());
+						log("%s\n", help_cell.code);
 				} else {
-					log("\n    %s %s\n\n", help_cell.name.c_str(), help_cell.ports.c_str());
+					log("\n    %s %s\n\n", help_cell.name, help_cell.ports);
 					if (help_cell.ver == "2" || help_cell.ver == "2a") {
-						if (help_cell.title != "") log("%s:\n", help_cell.title.c_str());
+						if (help_cell.title != "") log("%s:\n", help_cell.title);
 						std::stringstream ss;
 						ss << help_cell.desc;
 						for (std::string line; std::getline(ss, line, '\n');) {
-							if (line != "::") log("%s\n", line.c_str());
+							if (line != "::") log("%s\n", line);
 						}
 					} else if (help_cell.desc.length()) {
-						log("%s\n", help_cell.desc.c_str());
+						log("%s\n", help_cell.desc);
 					} else {
 						log("No help message for this cell type found.\n");
 					}
-					log("\nRun 'help %s+' to display the Verilog model for this cell type.\n", args[1].c_str());
+					log("\nRun 'help %s+' to display the Verilog model for this cell type.\n", args[1]);
 					log("\n");
 				}
 			}
 			else
-				log("No such command or cell type: %s\n", args[1].c_str());
+				log("No such command or cell type: %s\n", args[1]);
 			return;
 		} else if (args.size() == 3) {
 			// this option is undocumented as it is for internal use only
 			if (args[1] == "-dump-cmds-json") {
 				PrettyJson json;
 				if (!json.write_to_file(args[2]))
-					log_error("Can't open file `%s' for writing: %s\n", args[2].c_str(), strerror(errno));
+					log_error("Can't open file `%s' for writing: %s\n", args[2], strerror(errno));
 				if (dump_cmds_json(json)) {
 					log_abort();
 				}
@@ -1103,13 +1103,13 @@ struct HelpPass : public Pass {
 			else if (args[1] == "-dump-cells-json") {
 				PrettyJson json;
 				if (!json.write_to_file(args[2]))
-					log_error("Can't open file `%s' for writing: %s\n", args[2].c_str(), strerror(errno));
+					log_error("Can't open file `%s' for writing: %s\n", args[2], strerror(errno));
 				if (dump_cells_json(json)) {
 					log_error("One or more cells defined in celltypes.h are missing help documentation.\n");
 				}
 			}
 			else
-				log("Unknown help command: `%s %s'\n", args[1].c_str(), args[2].c_str());
+				log("Unknown help command: `%s %s'\n", args[1], args[2]);
 			return;
 		}
 
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 352fbb84e..3a8b25d1d 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -1056,7 +1056,7 @@ void RTLIL::Design::add(RTLIL::Binding *binding)
 RTLIL::Module *RTLIL::Design::addModule(RTLIL::IdString name)
 {
 	if (modules_.count(name) != 0)
-		log_error("Attempted to add new module named '%s', but a module by that name already exists\n", name.c_str());
+		log_error("Attempted to add new module named '%s', but a module by that name already exists\n", name);
 	log_assert(refcount_modules_ == 0);
 
 	RTLIL::Module *module = new RTLIL::Module;
diff --git a/kernel/sexpr.cc b/kernel/sexpr.cc
index 0b977d2a8..bea3376a0 100644
--- a/kernel/sexpr.cc
+++ b/kernel/sexpr.cc
@@ -119,7 +119,7 @@ void SExprWriter::print(SExpr const &sexpr, bool close, bool indent_rest) {
             _pending_nl = true;
         }
     }else
-        log_error("shouldn't happen: SExpr '%s' is neither an atom nor a list", sexpr.to_string().c_str());
+        log_error("shouldn't happen: SExpr '%s' is neither an atom nor a list", sexpr.to_string());
 }
 
 void SExprWriter::close(size_t n) {
diff --git a/kernel/tclapi.cc b/kernel/tclapi.cc
index 31d008404..4bdb680ac 100644
--- a/kernel/tclapi.cc
+++ b/kernel/tclapi.cc
@@ -87,7 +87,7 @@ static int tcl_yosys_cmd(ClientData, Tcl_Interp *interp, int argc, const char *a
 				tcl_command_name = "renames";
 			Tcl_CmdInfo info;
 			if (Tcl_GetCommandInfo(interp, tcl_command_name.c_str(), &info) != 0) {
-				log("[TCL: yosys -import] Command name collision: found pre-existing command `%s' -> skip.\n", it.first.c_str());
+				log("[TCL: yosys -import] Command name collision: found pre-existing command `%s' -> skip.\n", it.first);
 			} else {
 				std::string tcl_script = stringf("proc %s args { yosys %s {*}$args }", tcl_command_name, it.first);
 				Tcl_Eval(interp, tcl_script.c_str());
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 46dc6a76f..dc640fae9 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -710,7 +710,7 @@ bool run_frontend(std::string filename, std::string command, RTLIL::Design *desi
 	  } else if (filename == "-") {
 	    command = "script";
 	  } else {
-	    log_error("Can't guess frontend for input file `%s' (missing -f option)!\n", filename.c_str());
+	    log_error("Can't guess frontend for input file `%s' (missing -f option)!\n", filename);
 	  }
 	}
 
@@ -731,7 +731,7 @@ bool run_frontend(std::string filename, std::string command, RTLIL::Design *desi
 			from_to_active = run_from.empty();
 		}
 
-		log("\n-- Executing script file `%s' --\n", filename.c_str());
+		log("\n-- Executing script file `%s' --\n", filename);
 
 		FILE *f = stdin;
 
@@ -741,7 +741,7 @@ bool run_frontend(std::string filename, std::string command, RTLIL::Design *desi
 		}
 
 		if (f == NULL)
-			log_error("Can't open script file `%s' for reading: %s\n", filename.c_str(), strerror(errno));
+			log_error("Can't open script file `%s' for reading: %s\n", filename, strerror(errno));
 
 		FILE *backup_script_file = Frontend::current_script_file;
 		Frontend::current_script_file = f;
@@ -790,9 +790,9 @@ bool run_frontend(std::string filename, std::string command, RTLIL::Design *desi
 	}
 
 	if (filename == "-") {
-		log("\n-- Parsing stdin using frontend `%s' --\n", command.c_str());
+		log("\n-- Parsing stdin using frontend `%s' --\n", command);
 	} else {
-		log("\n-- Parsing `%s' using frontend `%s' --\n", filename.c_str(), command.c_str());
+		log("\n-- Parsing `%s' using frontend `%s' --\n", filename, command);
 	}
 
 	if (command[0] == ' ') {
@@ -811,7 +811,7 @@ void run_pass(std::string command, RTLIL::Design *design)
 	if (design == nullptr)
 		design = yosys_design;
 
-	log("\n-- Running command `%s' --\n", command.c_str());
+	log("\n-- Running command `%s' --\n", command);
 
 	Pass::call(design, command);
 }
@@ -843,16 +843,16 @@ void run_backend(std::string filename, std::string command, RTLIL::Design *desig
 		else if (filename.empty())
 			return;
 		else
-			log_error("Can't guess backend for output file `%s' (missing -b option)!\n", filename.c_str());
+			log_error("Can't guess backend for output file `%s' (missing -b option)!\n", filename);
 	}
 
 	if (filename.empty())
 		filename = "-";
 
 	if (filename == "-") {
-		log("\n-- Writing to stdout using backend `%s' --\n", command.c_str());
+		log("\n-- Writing to stdout using backend `%s' --\n", command);
 	} else {
-		log("\n-- Writing to `%s' using backend `%s' --\n", filename.c_str(), command.c_str());
+		log("\n-- Writing to `%s' using backend `%s' --\n", filename, command);
 	}
 
 	Backend::backend_call(design, NULL, filename, command);
diff --git a/kernel/yw.cc b/kernel/yw.cc
index f36212c7f..daad53380 100644
--- a/kernel/yw.cc
+++ b/kernel/yw.cc
@@ -108,38 +108,38 @@ ReadWitness::ReadWitness(const std::string &filename) :
 {
 	std::ifstream f(filename.c_str());
 	if (f.fail() || GetSize(filename) == 0)
-		log_error("Cannot open file `%s`\n", filename.c_str());
+		log_error("Cannot open file `%s`\n", filename);
 	std::stringstream buf;
 	buf << f.rdbuf();
 	std::string err;
 	json11::Json json = json11::Json::parse(buf.str(), err);
 	if (!err.empty())
-		log_error("Failed to parse `%s`: %s\n", filename.c_str(), err.c_str());
+		log_error("Failed to parse `%s`: %s\n", filename, err);
 
 	std::string format = json["format"].string_value();
 
 	if (format.empty())
-		log_error("Failed to parse `%s`: Unknown format\n", filename.c_str());
+		log_error("Failed to parse `%s`: Unknown format\n", filename);
 	if (format != "Yosys Witness Trace")
-		log_error("Failed to parse `%s`: Unsupported format `%s`\n", filename.c_str(), format.c_str());
+		log_error("Failed to parse `%s`: Unsupported format `%s`\n", filename, format);
 
 	for (auto &clock_json : json["clocks"].array_items()) {
 		Clock clock;
 		clock.path = get_path(clock_json["path"]);
 		if (clock.path.empty())
-			log_error("Failed to parse `%s`: Missing path for clock `%s`\n", filename.c_str(), clock_json.dump().c_str());
+			log_error("Failed to parse `%s`: Missing path for clock `%s`\n", filename, clock_json.dump());
 		auto edge_str = clock_json["edge"];
 		if (edge_str.string_value() == "posedge")
 			clock.is_posedge = true;
 		else if (edge_str.string_value() == "negedge")
 			clock.is_negedge = true;
 		else
-			log_error("Failed to parse `%s`: Unknown edge type for clock `%s`\n", filename.c_str(), clock_json.dump().c_str());
+			log_error("Failed to parse `%s`: Unknown edge type for clock `%s`\n", filename, clock_json.dump());
 		if (!clock_json["offset"].is_number())
-			log_error("Failed to parse `%s`: Unknown offset for clock `%s`\n", filename.c_str(), clock_json.dump().c_str());
+			log_error("Failed to parse `%s`: Unknown offset for clock `%s`\n", filename, clock_json.dump());
 		clock.offset = clock_json["offset"].int_value();
 		if (clock.offset < 0)
-			log_error("Failed to parse `%s`: Invalid offset for clock `%s`\n", filename.c_str(), clock_json.dump().c_str());
+			log_error("Failed to parse `%s`: Invalid offset for clock `%s`\n", filename, clock_json.dump());
 		clocks.push_back(clock);
 	}
 
@@ -149,18 +149,18 @@ ReadWitness::ReadWitness(const std::string &filename) :
 		signal.bits_offset = bits_offset;
 		signal.path = get_path(signal_json["path"]);
 		if (signal.path.empty())
-			log_error("Failed to parse `%s`: Missing path for signal `%s`\n", filename.c_str(), signal_json.dump().c_str());
+			log_error("Failed to parse `%s`: Missing path for signal `%s`\n", filename, signal_json.dump());
 		if (!signal_json["width"].is_number())
-			log_error("Failed to parse `%s`: Unknown width for signal `%s`\n", filename.c_str(), signal_json.dump().c_str());
+			log_error("Failed to parse `%s`: Unknown width for signal `%s`\n", filename, signal_json.dump());
 		signal.width = signal_json["width"].int_value();
 		if (signal.width < 0)
-			log_error("Failed to parse `%s`: Invalid width for signal `%s`\n", filename.c_str(), signal_json.dump().c_str());
+			log_error("Failed to parse `%s`: Invalid width for signal `%s`\n", filename, signal_json.dump());
 		bits_offset += signal.width;
 		if (!signal_json["offset"].is_number())
-			log_error("Failed to parse `%s`: Unknown offset for signal `%s`\n", filename.c_str(), signal_json.dump().c_str());
+			log_error("Failed to parse `%s`: Unknown offset for signal `%s`\n", filename, signal_json.dump());
 		signal.offset = signal_json["offset"].int_value();
 		if (signal.offset < 0)
-			log_error("Failed to parse `%s`: Invalid offset for signal `%s`\n", filename.c_str(), signal_json.dump().c_str());
+			log_error("Failed to parse `%s`: Invalid offset for signal `%s`\n", filename, signal_json.dump());
 		signal.init_only = signal_json["init_only"].bool_value();
 		signals.push_back(signal);
 	}
@@ -168,11 +168,11 @@ ReadWitness::ReadWitness(const std::string &filename) :
 	for (auto &step_json : json["steps"].array_items()) {
 		Step step;
 		if (!step_json["bits"].is_string())
-			log_error("Failed to parse `%s`: Expected string as bits value for step %d\n", filename.c_str(), GetSize(steps));
+			log_error("Failed to parse `%s`: Expected string as bits value for step %d\n", filename, GetSize(steps));
 		step.bits = step_json["bits"].string_value();
 		for (char c : step.bits) {
 			if (c != '0' && c != '1' && c != 'x' && c != '?')
-				log_error("Failed to parse `%s`: Invalid bit '%c' value for step %d\n", filename.c_str(), c, GetSize(steps));
+				log_error("Failed to parse `%s`: Invalid bit '%c' value for step %d\n", filename, c, GetSize(steps));
 		}
 		steps.push_back(step);
 	}
diff --git a/passes/cmds/abstract.cc b/passes/cmds/abstract.cc
index 907a16fe0..e475ba71c 100644
--- a/passes/cmds/abstract.cc
+++ b/passes/cmds/abstract.cc
@@ -67,7 +67,7 @@ struct Slice {
 	int wire_offset(RTLIL::Wire *wire, int index) const {
 		int rtl_offset = indices == RtlilSlice ? index : wire->from_hdl_index(index);
 		if (rtl_offset < 0 || rtl_offset >= wire->width) {
-			log_error("Slice %s is out of bounds for wire %s in module %s", to_string().c_str(), log_id(wire), log_id(wire->module));
+			log_error("Slice %s is out of bounds for wire %s in module %s", to_string(), log_id(wire), log_id(wire->module));
 		}
 		return rtl_offset;
 	}
diff --git a/passes/cmds/add.cc b/passes/cmds/add.cc
index 833d6006d..0d395f043 100644
--- a/passes/cmds/add.cc
+++ b/passes/cmds/add.cc
@@ -38,22 +38,22 @@ static void add_formal(RTLIL::Module *module, const std::string &celltype, const
 	log_assert(is_formal_celltype(celltype));
 
 	if (wire == nullptr) {
-		log_error("Could not find wire with name \"%s\".\n", name.c_str());
+		log_error("Could not find wire with name \"%s\".\n", name);
 	}
 	else {
 		RTLIL::Cell *formal_cell = module->addCell(NEW_ID, "$" + celltype);
 		formal_cell->setPort(ID::A, wire);
 		if(enable_name == "") {
 			formal_cell->setPort(ID::EN, State::S1);
-			log("Added $%s cell for wire \"%s.%s\"\n", celltype.c_str(), module->name.str().c_str(), name.c_str());
+			log("Added $%s cell for wire \"%s.%s\"\n", celltype, module->name.str(), name);
 		}
 		else {
 			RTLIL::Wire *enable_wire = module->wire(escaped_enable_name);
 			if(enable_wire == nullptr)
-				log_error("Could not find enable wire with name \"%s\".\n", enable_name.c_str());
+				log_error("Could not find enable wire with name \"%s\".\n", enable_name);
 
 			formal_cell->setPort(ID::EN, enable_wire);
-			log("Added $%s cell for wire \"%s.%s\" enabled by wire \"%s.%s\".\n", celltype.c_str(), module->name.str().c_str(), name.c_str(), module->name.str().c_str(), enable_name.c_str());
+			log("Added $%s cell for wire \"%s.%s\" enabled by wire \"%s.%s\".\n", celltype, module->name.str(), name, module->name.str(), enable_name);
 		}
 	}
 }
@@ -79,7 +79,7 @@ static void add_wire(RTLIL::Design *design, RTLIL::Module *module, std::string n
 		if (wire == nullptr)
 			log_cmd_error("Found incompatible object with same name in module %s!\n", module->name.c_str());
 
-		log("Module %s already has such an object.\n", module->name.c_str());
+		log("Module %s already has such an object.\n", module->name);
 	}
 	else
 	{
@@ -91,7 +91,7 @@ static void add_wire(RTLIL::Design *design, RTLIL::Module *module, std::string n
 			module->fixup_ports();
 		}
 
-		log("Added wire %s to module %s.\n", name.c_str(), module->name.c_str());
+		log("Added wire %s to module %s.\n", name, module->name);
 	}
 
 	if (!flag_global)
@@ -110,7 +110,7 @@ static void add_wire(RTLIL::Design *design, RTLIL::Module *module, std::string n
 			continue;
 
 		cell->setPort(name, wire);
-		log("Added connection %s to cell %s.%s (%s).\n", name.c_str(), module->name.c_str(), cell->name.c_str(), cell->type.c_str());
+		log("Added connection %s to cell %s.%s (%s).\n", name, module->name, cell->name, cell->type);
 	}
 }
 
diff --git a/passes/cmds/cover.cc b/passes/cmds/cover.cc
index 47354f1d5..bab00c287 100644
--- a/passes/cmds/cover.cc
+++ b/passes/cmds/cover.cc
@@ -146,7 +146,7 @@ struct CoverPass : public Pass {
 			for (auto f : out_files)
 				fprintf(f, "%-60s %10d %s\n", it.second.first.c_str(), it.second.second, it.first.c_str());
 			if (do_log)
-				log("%-60s %10d %s\n", it.second.first.c_str(), it.second.second, it.first.c_str());
+				log("%-60s %10d %s\n", it.second.first, it.second.second, it.first);
 		}
 #else
 		for (auto f : out_files)
diff --git a/passes/cmds/edgetypes.cc b/passes/cmds/edgetypes.cc
index 933bd457f..9324cf630 100644
--- a/passes/cmds/edgetypes.cc
+++ b/passes/cmds/edgetypes.cc
@@ -105,7 +105,7 @@ struct EdgetypePass : public Pass {
 
 		edge_cache.sort();
 		for (auto &str : edge_cache)
-			log("%s\n", str.c_str());
+			log("%s\n", str);
 	}
 } EdgetypePass;
 
diff --git a/passes/cmds/exec.cc b/passes/cmds/exec.cc
index 486fa1c2b..b346fc95d 100644
--- a/passes/cmds/exec.cc
+++ b/passes/cmds/exec.cc
@@ -172,7 +172,7 @@ struct ExecPass : public Pass {
 				std::string line = linebuf.substr(0, pos);
 				linebuf.erase(0, pos + 1);
 				if (!flag_quiet)
-					log("%s\n", line.c_str());
+					log("%s\n", line);
 
 				if (flag_expect_stdout)
 					for(auto &x : expect_stdout)
diff --git a/passes/cmds/glift.cc b/passes/cmds/glift.cc
index 60324702c..d7264d392 100644
--- a/passes/cmds/glift.cc
+++ b/passes/cmds/glift.cc
@@ -343,7 +343,7 @@ private:
 				//with taint signals and connect the new ports to the corresponding taint signals.
 				RTLIL::Module *cell_module_def = module->design->module(cell->type);
 				dict<RTLIL::IdString, RTLIL::SigSpec> orig_ports = cell->connections();
-				log("Adding cell %s\n", cell_module_def->name.c_str());
+				log("Adding cell %s\n", cell_module_def->name);
 				for (auto &it : orig_ports) {
 					RTLIL::SigSpec port = it.second;
 					RTLIL::SigSpec port_taint = get_corresponding_taint_signal(port);
diff --git a/passes/cmds/internal_stats.cc b/passes/cmds/internal_stats.cc
index 00456b8f9..65e74cc04 100644
--- a/passes/cmds/internal_stats.cc
+++ b/passes/cmds/internal_stats.cc
@@ -100,15 +100,15 @@ struct InternalStatsPass : public Pass {
 
 		if (json_mode) {
 			log("{\n");
-			log("   \"creator\": %s,\n", json11::Json(yosys_maybe_version()).dump().c_str());
+			log("   \"creator\": %s,\n", json11::Json(yosys_maybe_version()).dump());
 			std::stringstream invocation;
 			std::copy(args.begin(), args.end(), std::ostream_iterator<std::string>(invocation, " "));
-			log("   \"invocation\": %s,\n", json11::Json(invocation.str()).dump().c_str());
+			log("   \"invocation\": %s,\n", json11::Json(invocation.str()).dump());
 			if (auto mem = current_mem_bytes()) {
-				log("   \"memory_now\": %s,\n", std::to_string(*mem).c_str());
+				log("   \"memory_now\": %s,\n", std::to_string(*mem));
 			}
 			auto ast_bytes = AST::astnode_count() * (unsigned long long) sizeof(AST::AstNode);
-			log("   \"memory_ast\": %s,\n", std::to_string(ast_bytes).c_str());
+			log("   \"memory_ast\": %s,\n", std::to_string(ast_bytes));
 		}
 
 		// stats go here
diff --git a/passes/cmds/linecoverage.cc b/passes/cmds/linecoverage.cc
index 9a88dec7f..6898f33f5 100644
--- a/passes/cmds/linecoverage.cc
+++ b/passes/cmds/linecoverage.cc
@@ -85,7 +85,7 @@ struct CoveragePass : public Pass {
 		if (!ofile.empty()) {
 			fout.open(ofile, std::ios::out | std::ios::trunc);
 			if (!fout.is_open())
-				log_error("Could not open file \"%s\" with write access.\n", ofile.c_str());
+				log_error("Could not open file \"%s\" with write access.\n", ofile);
 		}
 
 		std::map<std::string, std::set<int>> uncovered_lines;
@@ -128,7 +128,7 @@ struct CoveragePass : public Pass {
 		for (const auto& file_entry : all_lines) {
 			int lines_found = file_entry.second.size();
 			int lines_hit = file_entry.second.size() - (uncovered_lines.count(file_entry.first) ? uncovered_lines[file_entry.first].size() : 0);
-			log("File %s: %d/%d lines covered\n", file_entry.first.c_str(), lines_hit, lines_found);
+			log("File %s: %d/%d lines covered\n", file_entry.first, lines_hit, lines_found);
 
 			if(!ofile.empty()) {
 				fout << "SF:" << file_entry.first << "\n";
diff --git a/passes/cmds/logcmd.cc b/passes/cmds/logcmd.cc
index 391eaea2e..57759fc90 100644
--- a/passes/cmds/logcmd.cc
+++ b/passes/cmds/logcmd.cc
@@ -106,7 +106,7 @@ struct LogPass : public Pass {
 		if (to_stdout) fprintf(stdout, "%s%s", text.c_str(), line_end);
 		if (to_stderr) fprintf(stderr, "%s%s", text.c_str(), line_end);
 		if (to_log) {
-			if (!header) log("%s%s", text.c_str(), line_end);
+			if (!header) log("%s%s", text, line_end);
 			else log_header(design, "%s%s", text.c_str(), line_end);
 		}
 	}
diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc
index a9762f630..37240bb7e 100644
--- a/passes/cmds/logger.cc
+++ b/passes/cmds/logger.cc
@@ -108,7 +108,7 @@ struct LoggerPass : public Pass {
 				std::string pattern = args[++argidx];
 				if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2);		
 				try {
-					log("Added regex '%s' for warnings to warn list.\n", pattern.c_str());
+					log("Added regex '%s' for warnings to warn list.\n", pattern);
 					log_warn_regexes.push_back(YS_REGEX_COMPILE(pattern));
 				}
 				catch (const std::regex_error& e) {
@@ -120,7 +120,7 @@ struct LoggerPass : public Pass {
 				std::string pattern = args[++argidx];
 				if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2);	
 				try {
-					log("Added regex '%s' for warnings to nowarn list.\n", pattern.c_str());
+					log("Added regex '%s' for warnings to nowarn list.\n", pattern);
 					log_nowarn_regexes.push_back(YS_REGEX_COMPILE(pattern));
 				}
 				catch (const std::regex_error& e) {
@@ -132,7 +132,7 @@ struct LoggerPass : public Pass {
 				std::string pattern = args[++argidx];
 				if (pattern.front() == '\"' && pattern.back() == '\"') pattern = pattern.substr(1, pattern.size() - 2);	
 				try {
-					log("Added regex '%s' for warnings to werror list.\n", pattern.c_str());
+					log("Added regex '%s' for warnings to werror list.\n", pattern);
 					log_werror_regexes.push_back(YS_REGEX_COMPILE(pattern));
 				}
 				catch (const std::regex_error& e) {
@@ -152,7 +152,7 @@ struct LoggerPass : public Pass {
 			}
 			if (args[argidx] == "-experimental" && argidx+1 < args.size()) {
 				std::string value = args[++argidx];
-				log("Added '%s' experimental ignore list.\n", value.c_str());
+				log("Added '%s' experimental ignore list.\n", value);
 				log_experimentals_ignored.insert(value);
 				continue;
 			}
diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index a653844b7..6c7921d53 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -187,11 +187,11 @@ struct PluginPass : public Pass {
 				log("Loaded plugins:\n");
 
 			for (auto &it : loaded_plugins)
-				log("  %s\n", it.first.c_str());
+				log("  %s\n", it.first);
 
 #ifdef WITH_PYTHON
 			for (auto &it : loaded_python_plugins)
-				log("  %s\n", it.first.c_str());
+				log("  %s\n", it.first);
 #endif
 
 			if (!loaded_plugin_aliases.empty()) {
@@ -200,7 +200,7 @@ struct PluginPass : public Pass {
 				for (auto &it : loaded_plugin_aliases)
 					max_alias_len = max(max_alias_len, GetSize(it.first));
 				for (auto &it : loaded_plugin_aliases)
-					log("Alias: %-*s %s\n", max_alias_len, it.first.c_str(), it.second.c_str());
+					log("Alias: %-*s %s\n", max_alias_len, it.first, it.second);
 			}
 		}
 	}
diff --git a/passes/cmds/portarcs.cc b/passes/cmds/portarcs.cc
index 73ca98d88..36870489a 100644
--- a/passes/cmds/portarcs.cc
+++ b/passes/cmds/portarcs.cc
@@ -278,7 +278,7 @@ struct PortarcsPass : Pass {
 				log("\n");
 
 				for (auto bit : outputs) {
-					log("  %10s  ", bit_str(bit).c_str());
+					log("  %10s  ", bit_str(bit));
 					int *p = annotations.at(canonical_bit(bit));
 					for (auto i = 0; i < inputs.size(); i++)
 						log("\033[48;5;%dm ", 232 + ((std::max(p[i], 0) * 24) - 1) / max_delay);
diff --git a/passes/cmds/portlist.cc b/passes/cmds/portlist.cc
index f78d9d3b6..b109ce22a 100644
--- a/passes/cmds/portlist.cc
+++ b/passes/cmds/portlist.cc
@@ -75,7 +75,7 @@ struct PortlistPass : public Pass {
 			}
 			log("module %s%s\n", log_id(module), m_mode ? " (" : "");
 			for (int i = 0; i < GetSize(ports); i++)
-				log("%s%s\n", ports[i].c_str(), m_mode && i+1 < GetSize(ports) ? "," : "");
+				log("%s%s\n", ports[i], m_mode && i+1 < GetSize(ports) ? "," : "");
 			if (m_mode)
 				log(");\nendmodule\n");
 		};
diff --git a/passes/cmds/printattrs.cc b/passes/cmds/printattrs.cc
index c8b0a1d1f..e4e78b0ea 100644
--- a/passes/cmds/printattrs.cc
+++ b/passes/cmds/printattrs.cc
@@ -47,9 +47,9 @@ struct PrintAttrsPass : public Pass {
 
 	static void log_const(const RTLIL::IdString &s, const RTLIL::Const &x, const unsigned int indent) {
 		if (x.flags & RTLIL::CONST_FLAG_STRING)
-			log("%s(* %s=\"%s\" *)\n", get_indent_str(indent).c_str(), log_id(s), x.decode_string().c_str());
+			log("%s(* %s=\"%s\" *)\n", get_indent_str(indent), log_id(s), x.decode_string());
 		else if (x.flags == RTLIL::CONST_FLAG_NONE || x.flags == RTLIL::CONST_FLAG_SIGNED)
-			log("%s(* %s=%s *)\n", get_indent_str(indent).c_str(), log_id(s), x.as_string().c_str());
+			log("%s(* %s=%s *)\n", get_indent_str(indent), log_id(s), x.as_string());
 		else
 			log_assert(x.flags & RTLIL::CONST_FLAG_STRING || x.flags == RTLIL::CONST_FLAG_NONE); //intended to fail
 	}
@@ -63,14 +63,14 @@ struct PrintAttrsPass : public Pass {
 		for (auto mod : design->selected_modules())
 		{
 			if (design->selected_whole_module(mod)) {
-				log("%s%s\n", get_indent_str(indent).c_str(), log_id(mod->name));
+				log("%s%s\n", get_indent_str(indent), log_id(mod->name));
 				indent += 2;
 				for (auto &it : mod->attributes)
 					log_const(it.first, it.second, indent);
 			}
 
 			for (auto cell : mod->selected_cells()) {
-				log("%s%s\n", get_indent_str(indent).c_str(), log_id(cell->name));
+				log("%s%s\n", get_indent_str(indent), log_id(cell->name));
 				indent += 2;
 				for (auto &it : cell->attributes)
 					log_const(it.first, it.second, indent);
@@ -78,7 +78,7 @@ struct PrintAttrsPass : public Pass {
 			}
 
 			for (auto wire : mod->selected_wires()) {
-				log("%s%s\n", get_indent_str(indent).c_str(), log_id(wire->name));
+				log("%s%s\n", get_indent_str(indent), log_id(wire->name));
 				indent += 2;
 				for (auto &it : wire->attributes)
 					log_const(it.first, it.second, indent);
diff --git a/passes/cmds/rename.cc b/passes/cmds/rename.cc
index 1f3d0992e..c4bb7135e 100644
--- a/passes/cmds/rename.cc
+++ b/passes/cmds/rename.cc
@@ -577,7 +577,7 @@ struct RenamePass : public Pass {
 					new_wire_names[wire] = module->uniquify("\\" + renamed_unescaped(name));
 					auto new_name = new_wire_names[wire].str().substr(1);
 					if (VERILOG_BACKEND::id_is_verilog_escaped(new_name))
-						log_error("Failed to rename wire %s -> %s\n", name.c_str(), new_name.c_str());
+						log_error("Failed to rename wire %s -> %s\n", name, new_name);
 				}
 
 				for (auto cell : module->selected_cells()) {
@@ -590,7 +590,7 @@ struct RenamePass : public Pass {
 					new_cell_names[cell] = module->uniquify("\\" + renamed_unescaped(name));
 					auto new_name = new_cell_names[cell].str().substr(1);
 					if (VERILOG_BACKEND::id_is_verilog_escaped(new_name))
-						log_error("Failed to rename cell %s -> %s\n", name.c_str(), new_name.c_str());
+						log_error("Failed to rename cell %s -> %s\n", name, new_name);
 				}
 
 				for (auto &it : new_wire_names)
@@ -629,7 +629,7 @@ struct RenamePass : public Pass {
 
 				if (module_to_rename != nullptr) {
 					to_name = RTLIL::escape_id(to_name);
-					log("Renaming module %s to %s.\n", module_to_rename->name.c_str(), to_name.c_str());
+					log("Renaming module %s to %s.\n", module_to_rename->name, to_name);
 					design->rename(module_to_rename, to_name);
 				} else
 					log_cmd_error("Object `%s' not found!\n", from_name.c_str());
diff --git a/passes/cmds/scc.cc b/passes/cmds/scc.cc
index e55e63828..680531f25 100644
--- a/passes/cmds/scc.cc
+++ b/passes/cmds/scc.cc
@@ -101,7 +101,7 @@ struct SccWorker
 			design(design), module(module), sigmap(module)
 	{
 		if (module->processes.size() > 0) {
-			log("Skipping module %s as it contains processes (run 'proc' pass first).\n", module->name.c_str());
+			log("Skipping module %s as it contains processes (run 'proc' pass first).\n", module->name);
 			return;
 		}
 
diff --git a/passes/cmds/scratchpad.cc b/passes/cmds/scratchpad.cc
index 4a63f2f60..f64ce943c 100644
--- a/passes/cmds/scratchpad.cc
+++ b/passes/cmds/scratchpad.cc
@@ -76,18 +76,18 @@ struct ScratchpadPass : public Pass {
 			if (args[argidx] == "-get" && argidx+1 < args.size()) {
 				string identifier = args[++argidx];
 				if (design->scratchpad.count(identifier)) {
-					log("%s\n", design->scratchpad_get_string(identifier).c_str());
+					log("%s\n", design->scratchpad_get_string(identifier));
 				} else if (RTLIL::constpad.count(identifier)) {
-					log("%s\n", RTLIL::constpad.at(identifier).c_str());
+					log("%s\n", RTLIL::constpad.at(identifier));
 				} else {
-					log("\"%s\" not set\n", identifier.c_str());
+					log("\"%s\" not set\n", identifier);
 				}
 				continue;
 			}
 			if (args[argidx] == "-set" && argidx+2 < args.size()) {
 				string identifier = args[++argidx];
 				if (RTLIL::constpad.count(identifier))
-					log_error("scratchpad entry \"%s\" is a global constant\n", identifier.c_str());
+					log_error("scratchpad entry \"%s\" is a global constant\n", identifier);
 				string value = args[++argidx];
 				if (value.front() == '\"' && value.back() == '\"') value = value.substr(1, value.size() - 2);
 				design->scratchpad_set_string(identifier, value);
@@ -107,9 +107,9 @@ struct ScratchpadPass : public Pass {
 				else if (RTLIL::constpad.count(identifier_from))
 					value = RTLIL::constpad.at(identifier_from);
 				else
-					log_error("\"%s\" not set\n", identifier_from.c_str());
+					log_error("\"%s\" not set\n", identifier_from);
 				if (RTLIL::constpad.count(identifier_to))
-					log_error("scratchpad entry \"%s\" is a global constant\n", identifier_to.c_str());
+					log_error("scratchpad entry \"%s\" is a global constant\n", identifier_to);
 				design->scratchpad_set_string(identifier_to, value);
 				continue;
 			}
@@ -118,7 +118,7 @@ struct ScratchpadPass : public Pass {
 				string expected = args[++argidx];
 				if (expected.front() == '\"' && expected.back() == '\"') expected = expected.substr(1, expected.size() - 2);
 				if (design->scratchpad.count(identifier) == 0)
-					log_error("scratchpad entry '%s' is not defined\n", identifier.c_str());
+					log_error("scratchpad entry '%s' is not defined\n", identifier);
 				string value = design->scratchpad_get_string(identifier);
 				if (value != expected) {
 					log_error("scratchpad entry '%s' is set to '%s' instead of the asserted '%s'\n",
@@ -129,13 +129,13 @@ struct ScratchpadPass : public Pass {
 			if (args[argidx] == "-assert-set" && argidx+1 < args.size()) {
 				string identifier = args[++argidx];
 				if (design->scratchpad.count(identifier) == 0)
-					log_error("scratchpad entry '%s' is not defined\n", identifier.c_str());
+					log_error("scratchpad entry '%s' is not defined\n", identifier);
 				continue;
 			}
 			if (args[argidx] == "-assert-unset" && argidx+1 < args.size()) {
 				string identifier = args[++argidx];
 				if (design->scratchpad.count(identifier) > 0)
-					log_error("scratchpad entry '%s' is defined\n", identifier.c_str());
+					log_error("scratchpad entry '%s' is defined\n", identifier);
 				continue;
 			}
 			break;
diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc
index 901f923f8..7fcf5cfcd 100644
--- a/passes/cmds/select.cc
+++ b/passes/cmds/select.cc
@@ -632,20 +632,20 @@ static void select_op_expand(RTLIL::Design *design, const std::string &arg, char
 		if (rule.cell_types.size() > 0) {
 			log("    cell types:");
 			for (auto &it : rule.cell_types)
-				log(" %s", it.c_str());
+				log(" %s", it);
 			log("\n");
 		}
 		if (rule.port_names.size() > 0) {
 			log("    port names:");
 			for (auto &it : rule.port_names)
-				log(" %s", it.c_str());
+				log(" %s", it);
 			log("\n");
 		}
 	}
 	if (limits.size() > 0) {
 		log("  limits:");
 		for (auto &it : limits)
-			log(" %s", it.c_str());
+			log(" %s", it);
 		log("\n");
 	}
 #endif
@@ -1443,7 +1443,7 @@ struct SelectPass : public Pass {
 			std::ifstream f(read_file);
 			yosys_input_files.insert(read_file);
 			if (f.fail())
-				log_error("Can't open '%s' for reading: %s\n", read_file.c_str(), strerror(errno));
+				log_error("Can't open '%s' for reading: %s\n", read_file, strerror(errno));
 
 			auto sel = RTLIL::Selection::EmptySelection(design);
 			string line;
@@ -1518,7 +1518,7 @@ struct SelectPass : public Pass {
 				f = fopen(write_file.c_str(), "w");
 				yosys_output_files.insert(write_file);
 				if (f == nullptr)
-					log_error("Can't open '%s' for writing: %s\n", write_file.c_str(), strerror(errno));
+					log_error("Can't open '%s' for writing: %s\n", write_file, strerror(errno));
 			}
 			if (work_stack.size() > 0)
 				design->push_selection(work_stack.back());
@@ -1573,7 +1573,7 @@ struct SelectPass : public Pass {
 				RTLIL::Selection *sel = &work_stack.back();
 				sel->optimize(design);
 				std::string desc = describe_selection_for_assert(design, sel, true);
-				log_error("Assertion failed: selection is not empty:%s\n%s", sel_str.c_str(), desc.c_str());
+				log_error("Assertion failed: selection is not empty:%s\n%s", sel_str, desc);
 			}
 			return;
 		}
@@ -1588,7 +1588,7 @@ struct SelectPass : public Pass {
 				RTLIL::Selection *sel = &work_stack.back();
 				sel->optimize(design);
 				std::string desc = describe_selection_for_assert(design, sel, true);
-				log_error("Assertion failed: selection is empty:%s\n%s", sel_str.c_str(), desc.c_str());
+				log_error("Assertion failed: selection is empty:%s\n%s", sel_str, desc);
 			}
 			return;
 		}
@@ -1645,7 +1645,7 @@ struct SelectPass : public Pass {
 		if (!unset_name.empty())
 		{
 			if (!design->selection_vars.erase(unset_name))
-				log_error("Selection '%s' does not exist!\n", unset_name.c_str());
+				log_error("Selection '%s' does not exist!\n", unset_name);
 			return;
 		}
 
diff --git a/passes/cmds/setundef.cc b/passes/cmds/setundef.cc
index dce33c05b..c4a555e6a 100644
--- a/passes/cmds/setundef.cc
+++ b/passes/cmds/setundef.cc
@@ -41,7 +41,7 @@ static RTLIL::Wire * add_wire(RTLIL::Module *module, std::string name, int width
 
 	if (module->count_id(name) != 0)
 	{
-		log("Module %s already has such an object %s.\n", module->name.c_str(), name.c_str());
+		log("Module %s already has such an object %s.\n", module->name, name);
 		name += "$";
 		return add_wire(module, name, width, flag_input, flag_output);
 	}
@@ -56,7 +56,7 @@ static RTLIL::Wire * add_wire(RTLIL::Module *module, std::string name, int width
 			module->fixup_ports();
 		}
 
-		log("Added wire %s to module %s.\n", name.c_str(), module->name.c_str());
+		log("Added wire %s to module %s.\n", name, module->name);
 	}
 
 	return wire;
@@ -319,7 +319,7 @@ struct SetundefPass : public Pass {
 							wire = add_wire(module, name, c.width, true, false);
 							module->connect(RTLIL::SigSig(c, wire));
 						}
-						log("Exposing undriven wire %s as input.\n", wire->name.c_str());
+						log("Exposing undriven wire %s as input.\n", wire->name);
 					}
 					module->fixup_ports();
 				}
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index 9ea29bc4e..49032a0e0 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -188,7 +188,7 @@ struct ShowWorker
 			if (enumerateIds) {
 				if (autonames.count(id) == 0) {
 					autonames[id] = autonames.size() + 1;
-					log("Generated short name for internal identifier: _%d_ -> %s\n", autonames[id], id.c_str());
+					log("Generated short name for internal identifier: _%d_ -> %s\n", autonames[id], id);
 				}
 				id = stringf("_%d_", autonames[id]);
 			} else if (abbreviateIds) {
@@ -895,7 +895,7 @@ struct ShowPass : public Pass {
 			f.open(filename.c_str());
 			yosys_input_files.insert(filename);
 			if (f.fail())
-				log_error("Can't open lib file `%s'.\n", filename.c_str());
+				log_error("Can't open lib file `%s'.\n", filename);
 			RTLIL::Design *lib = new RTLIL::Design;
 			Frontend::frontend_call(lib, &f, filename, (filename.size() > 3 && filename.compare(filename.size()-3, std::string::npos, ".il") == 0 ? "rtlil" : "verilog"));
 			libs.push_back(lib);
@@ -907,7 +907,7 @@ struct ShowPass : public Pass {
 		std::string dot_file = stringf("%s.dot", prefix);
 		std::string out_file = stringf("%s.%s", prefix, format.empty() ? "svg" : format);
 
-		log("Writing dot description to `%s'.\n", dot_file.c_str());
+		log("Writing dot description to `%s'.\n", dot_file);
 		FILE *f = fopen(dot_file.c_str(), "w");
 		if (custom_prefix)
 			yosys_output_files.insert(dot_file);
@@ -934,7 +934,7 @@ struct ShowPass : public Pass {
 			#endif
 			std::string cmd = stringf(DOT_CMD, format, dot_file, out_file, out_file, out_file);
 			#undef DOT_CMD
-			log("Exec: %s\n", cmd.c_str());
+			log("Exec: %s\n", cmd);
 			#if !defined(YOSYS_DISABLE_SPAWN)
 				if (run_command(cmd) != 0)
 					log_cmd_error("Shell command failed!\n");
@@ -954,7 +954,7 @@ struct ShowPass : public Pass {
 				#else
 					std::string cmd = stringf("%s '%s' %s", viewer_exe, out_file, background);
 				#endif
-				log("Exec: %s\n", cmd.c_str());
+				log("Exec: %s\n", cmd);
 				if (run_command(cmd) != 0)
 					log_cmd_error("Shell command failed!\n");
 			} else
@@ -964,7 +964,7 @@ struct ShowPass : public Pass {
 				#else
 				std::string cmd = stringf("{ test -f '%s.pid' && fuser -s '%s.pid' 2> /dev/null; } || ( echo $$ >&3; exec xdot '%s'; ) 3> '%s.pid' %s", dot_file, dot_file, dot_file, dot_file, background);
 				#endif
-				log("Exec: %s\n", cmd.c_str());
+				log("Exec: %s\n", cmd);
 				if (run_command(cmd) != 0)
 					log_cmd_error("Shell command failed!\n");
 			}
diff --git a/passes/cmds/splice.cc b/passes/cmds/splice.cc
index 4ad0d2b25..2993c3d3a 100644
--- a/passes/cmds/splice.cc
+++ b/passes/cmds/splice.cc
@@ -345,7 +345,7 @@ struct SplicePass : public Pass {
 		for (auto module : design->selected_modules())
 		{
 			if (module->processes.size()) {
-				log("Skipping module %s as it contains processes.\n", module->name.c_str());
+				log("Skipping module %s as it contains processes.\n", module->name);
 				continue;
 			}
 
diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 9281f3327..1b9e6106c 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -285,7 +285,7 @@ struct statdata_t {
 								cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
 							}
 						} else {
-							log_error("double_parameter_area for %s has %d parameters, but only 2 are expected.\n", cell_type.c_str(),
+							log_error("double_parameter_area for %s has %d parameters, but only 2 are expected.\n", cell_type,
 							       (int)cell_data.double_parameter_area.size());
 						}
 					}
@@ -452,22 +452,22 @@ struct statdata_t {
 
 		if (print_area) {
 			if (print_hierarchical) {
-				log(" %s %s %s %s %s%s\n", count_global_str.c_str(), area_global_str.c_str(), count_local_str.c_str(),
+				log(" %s %s %s %s %s%s\n", count_global_str, area_global_str, count_local_str,
 				    area_local_str.c_str(), indent.c_str(), name.c_str());
 			} else if (print_global_only) {
-				log(" %s %s %s%s\n", count_global_str.c_str(), area_global_str.c_str(), indent.c_str(), name.c_str());
+				log(" %s %s %s%s\n", count_global_str, area_global_str, indent, name);
 			} else {
 				if (count_local > 0)
-					log(" %s %s %s%s\n", count_local_str.c_str(), area_local_str.c_str(), indent.c_str(), name.c_str());
+					log(" %s %s %s%s\n", count_local_str, area_local_str, indent, name);
 			}
 		} else {
 			if (print_hierarchical) {
-				log(" %s %s %s%s\n", count_global_str.c_str(), count_local_str.c_str(), indent.c_str(), name.c_str());
+				log(" %s %s %s%s\n", count_global_str, count_local_str, indent, name);
 			} else if (print_global_only) {
-				log(" %s %s%s\n", count_global_str.c_str(), indent.c_str(), name.c_str());
+				log(" %s %s%s\n", count_global_str, indent, name);
 			} else {
 				if (count_local > 0)
-					log(" %s %s%s\n", count_local_str.c_str(), indent.c_str(), name.c_str());
+					log(" %s %s%s\n", count_local_str, indent, name);
 			}
 		}
 	}
@@ -540,13 +540,13 @@ struct statdata_t {
 		if (!unknown_cell_area.empty()) {
 			log("\n");
 			for (auto cell_type : unknown_cell_area)
-				log("   Area for cell type %s is unknown!\n", cell_type.c_str());
+				log("   Area for cell type %s is unknown!\n", cell_type);
 		}
 
 		if (area != 0) {
 			log("\n");
 			if (print_hierarchical || print_global_only) {
-				log("   Chip area for %smodule '%s': %f\n", (top_mod) ? "top " : "", mod_name.c_str(), area);
+				log("   Chip area for %smodule '%s': %f\n", (top_mod) ? "top " : "", mod_name, area);
 				log("     of which used for sequential elements: %f (%.2f%%)\n", sequential_area, 100.0 * sequential_area / area);
 			} else {
 				double local_area = 0;
@@ -555,7 +555,7 @@ struct statdata_t {
 				double local_sequential_area = 0;
 				for (auto &it : local_seq_area_cells_by_type)
 					local_sequential_area += it.second;
-				log("   Chip area for %smodule '%s': %f\n", (top_mod) ? "top " : "", mod_name.c_str(), local_area);
+				log("   Chip area for %smodule '%s': %f\n", (top_mod) ? "top " : "", mod_name, local_area);
 				log("     of which used for sequential elements: %f (%.2f%%)\n", local_sequential_area,
 				    100.0 * local_sequential_area / local_area);
 			}
@@ -587,19 +587,19 @@ struct statdata_t {
 		if (!first_module)
 			log(",\n");
 		if (hierarchical) {
-			log("      %s: {\n", json11::Json(mod_name).dump().c_str());
-			log("         \"num_wires\":         %s,\n", json_line(local_num_wires, 0, num_wires, 0).c_str());
-			log("         \"num_wire_bits\":     %s,\n", json_line(local_num_wire_bits, 0, num_wire_bits, 0).c_str());
-			log("         \"num_pub_wires\":     %s,\n", json_line(local_num_pub_wires, 0, num_pub_wires, 0).c_str());
-			log("         \"num_pub_wire_bits\": %s,\n", json_line(local_num_pub_wire_bits, 0, num_pub_wire_bits, 0).c_str());
-			log("         \"num_ports\":         %s,\n", json_line(local_num_ports, 0, num_ports, 0).c_str());
-			log("         \"num_port_bits\":     %s,\n", json_line(local_num_port_bits, 0, num_port_bits, 0).c_str());
-			log("         \"num_memories\":      %s,\n", json_line(local_num_memories, 0, num_memories, 0).c_str());
-			log("         \"num_memory_bits\":   %s,\n", json_line(local_num_memory_bits, 0, num_memory_bits, 0).c_str());
-			log("         \"num_processes\":     %s,\n", json_line(local_num_processes, 0, num_processes, 0).c_str());
-			log("         \"num_cells\":         %s,\n", json_line(local_num_cells, local_area, num_cells, area).c_str());
-			log("         \"num_submodules\":       %s,\n", json_line(0, 0, num_submodules, submodule_area).c_str());
-			log("         \"sequential_area\":    %s,\n", json_line(0, local_sequential_area, 0, sequential_area).c_str());
+			log("      %s: {\n", json11::Json(mod_name).dump());
+			log("         \"num_wires\":         %s,\n", json_line(local_num_wires, 0, num_wires, 0));
+			log("         \"num_wire_bits\":     %s,\n", json_line(local_num_wire_bits, 0, num_wire_bits, 0));
+			log("         \"num_pub_wires\":     %s,\n", json_line(local_num_pub_wires, 0, num_pub_wires, 0));
+			log("         \"num_pub_wire_bits\": %s,\n", json_line(local_num_pub_wire_bits, 0, num_pub_wire_bits, 0));
+			log("         \"num_ports\":         %s,\n", json_line(local_num_ports, 0, num_ports, 0));
+			log("         \"num_port_bits\":     %s,\n", json_line(local_num_port_bits, 0, num_port_bits, 0));
+			log("         \"num_memories\":      %s,\n", json_line(local_num_memories, 0, num_memories, 0));
+			log("         \"num_memory_bits\":   %s,\n", json_line(local_num_memory_bits, 0, num_memory_bits, 0));
+			log("         \"num_processes\":     %s,\n", json_line(local_num_processes, 0, num_processes, 0));
+			log("         \"num_cells\":         %s,\n", json_line(local_num_cells, local_area, num_cells, area));
+			log("         \"num_submodules\":       %s,\n", json_line(0, 0, num_submodules, submodule_area));
+			log("         \"sequential_area\":    %s,\n", json_line(0, local_sequential_area, 0, sequential_area));
 
 			log("         \"num_cells_by_type\": {\n");
 			bool first_line = true;
@@ -607,7 +607,7 @@ struct statdata_t {
 				if (it.second) {
 					if (!first_line)
 						log(",\n");
-					log("            %s: %s", json11::Json(log_id(it.first)).dump().c_str(),
+					log("            %s: %s", json11::Json(log_id(it.first)).dump(),
 					    json_line(local_num_cells_by_type.count(it.first) ? local_num_cells_by_type.at(it.first) : 0,
 						      local_area_cells_by_type.count(it.first) ? local_area_cells_by_type.at(it.first) : 0, it.second,
 						      area_cells_by_type.at(it.first))
@@ -621,7 +621,7 @@ struct statdata_t {
 				if (it.second) {
 					if (!first_line)
 						log(",\n");
-					log("            %s: %s", json11::Json(log_id(it.first)).dump().c_str(),
+					log("            %s: %s", json11::Json(log_id(it.first)).dump(),
 					    json_line(0, 0, it.second,
 						      submodules_area_by_type.count(it.first) ? submodules_area_by_type.at(it.first) : 0)
 					      .c_str());
@@ -640,7 +640,7 @@ struct statdata_t {
 
 		} else {
 			if (global_only) {
-				log("      %s: {\n", json11::Json(mod_name).dump().c_str());
+				log("      %s: {\n", json11::Json(mod_name).dump());
 				log("         \"num_wires\":         %u,\n", num_wires);
 				log("         \"num_wire_bits\":     %u,\n", num_wire_bits);
 				log("         \"num_pub_wires\":     %u,\n", num_pub_wires);
@@ -662,20 +662,20 @@ struct statdata_t {
 					if (it.second) {
 						if (!first_line)
 							log(",\n");
-						log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
+						log("            %s: %u", json11::Json(log_id(it.first)).dump(), it.second);
 						first_line = false;
 					}
 				for (auto &it : num_submodules_by_type)
 					if (it.second) {
 						if (!first_line)
 							log(",\n");
-						log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
+						log("            %s: %u", json11::Json(log_id(it.first)).dump(), it.second);
 						first_line = false;
 					}
 				log("\n");
 				log("         }");
 			} else {
-				log("      %s: {\n", json11::Json(mod_name).dump().c_str());
+				log("      %s: {\n", json11::Json(mod_name).dump());
 				log("         \"num_wires\":         %u,\n", local_num_wires);
 				log("         \"num_wire_bits\":     %u,\n", local_num_wire_bits);
 				log("         \"num_pub_wires\":     %u,\n", local_num_pub_wires);
@@ -697,14 +697,14 @@ struct statdata_t {
 					if (it.second) {
 						if (!first_line)
 							log(",\n");
-						log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
+						log("            %s: %u", json11::Json(log_id(it.first)).dump(), it.second);
 						first_line = false;
 					}
 				for (auto &it : num_submodules_by_type)
 					if (it.second) {
 						if (!first_line)
 							log(",\n");
-						log("            %s: %u", json11::Json(log_id(it.first)).dump().c_str(), it.second);
+						log("            %s: %u", json11::Json(log_id(it.first)).dump(), it.second);
 						first_line = false;
 					}
 				log("\n");
@@ -824,11 +824,11 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 					double value = std::stod(s);
 					single_parameter_area.push_back(value);
 				} catch (const std::exception &e) {
-					log_error("Failed to parse single parameter area value '%s': %s\n", s.c_str(), e.what());
+					log_error("Failed to parse single parameter area value '%s': %s\n", s, e.what());
 				}
 			}
 			if (single_parameter_area.size() == 0)
-				log_error("single parameter area has size 0: %s\n", sar->args[single_parameter_area.size() - 1].c_str());
+				log_error("single parameter area has size 0: %s\n", sar->args[single_parameter_area.size() - 1]);
 			// check if it is a double parameterised area
 		}
 		const LibertyAst *dar = cell->find("double_area_parameterised");
@@ -857,12 +857,12 @@ void read_liberty_cellarea(dict<IdString, cell_area_t> &cell_area, string libert
 						value = std::stod(s);
 						cast_sub_array.push_back(value);
 					} catch (const std::exception &e) {
-						log_error("Failed to parse double parameter area value for  '%s': %s\n", s.c_str(), e.what());
+						log_error("Failed to parse double parameter area value for  '%s': %s\n", s, e.what());
 					}
 				}
 				double_parameter_area.push_back(cast_sub_array);
 				if (cast_sub_array.size() == 0)
-					log_error("double paramter array has size 0: %s\n", s.c_str());
+					log_error("double paramter array has size 0: %s\n", s);
 			}
 		}
 		const LibertyAst *par = cell->find("port_names");
@@ -973,10 +973,10 @@ struct StatPass : public Pass {
 
 		if (json_mode) {
 			log("{\n");
-			log("   \"creator\": %s,\n", json11::Json(yosys_maybe_version()).dump().c_str());
+			log("   \"creator\": %s,\n", json11::Json(yosys_maybe_version()).dump());
 			std::stringstream invocation;
 			std::copy(args.begin(), args.end(), std::ostream_iterator<std::string>(invocation, " "));
-			log("   \"invocation\": %s,\n", json11::Json(invocation.str()).dump().c_str());
+			log("   \"invocation\": %s,\n", json11::Json(invocation.str()).dump());
 			log("   \"modules\": {\n");
 		}
 
diff --git a/passes/cmds/timeest.cc b/passes/cmds/timeest.cc
index f0e4943de..86a529520 100644
--- a/passes/cmds/timeest.cc
+++ b/passes/cmds/timeest.cc
@@ -322,7 +322,7 @@ struct EstimateSta {
 						std::string src_attr = cell->get_src_attribute();
 						cell_src = stringf(" source: %s", src_attr);
 					}
-					log("    cell %s (%s)%s\n", log_id(cell), log_id(cell->type), cell_src.c_str());
+					log("    cell %s (%s)%s\n", log_id(cell), log_id(cell->type), cell_src);
 					printed.insert(cell);
 				}
 			} else {
@@ -333,7 +333,7 @@ struct EstimateSta {
 					std::string src_attr = bit.wire->get_src_attribute();
 					wire_src = stringf(" source: %s", src_attr);
 				}
-				log("    wire %s%s (level %ld)\n", log_signal(bit), wire_src.c_str(), levels[node]);
+				log("    wire %s%s (level %ld)\n", log_signal(bit), wire_src, levels[node]);
 			}
 		}
 
diff --git a/passes/cmds/viz.cc b/passes/cmds/viz.cc
index 323b9cb34..fd45d6ba0 100644
--- a/passes/cmds/viz.cc
+++ b/passes/cmds/viz.cc
@@ -988,7 +988,7 @@ struct VizPass : public Pass {
 		if (custom_prefix)
 			yosys_output_files.insert(dot_file);
 
-		log("Writing dot description to `%s'.\n", dot_file.c_str());
+		log("Writing dot description to `%s'.\n", dot_file);
 		FILE *f = nullptr;
 		auto open_dot_file = [&]() {
 			if (f != nullptr) return;
@@ -1028,7 +1028,7 @@ struct VizPass : public Pass {
 			#endif
 			std::string cmd = stringf(DOT_CMD, format, dot_file, out_file, out_file, out_file);
 			#undef DOT_CMD
-			log("Exec: %s\n", cmd.c_str());
+			log("Exec: %s\n", cmd);
 			#if !defined(YOSYS_DISABLE_SPAWN)
 				if (run_command(cmd) != 0)
 					log_cmd_error("Shell command failed!\n");
@@ -1047,7 +1047,7 @@ struct VizPass : public Pass {
 			#else
 				std::string cmd = stringf("%s '%s' %s", viewer_exe, out_file, background);
 			#endif
-			log("Exec: %s\n", cmd.c_str());
+			log("Exec: %s\n", cmd);
 			if (run_command(cmd) != 0)
 				log_cmd_error("Shell command failed!\n");
 		} else
@@ -1057,7 +1057,7 @@ struct VizPass : public Pass {
 			#else
 			std::string cmd = stringf("{ test -f '%s.pid' && fuser -s '%s.pid' 2> /dev/null; } || ( echo $$ >&3; exec xdot '%s'; ) 3> '%s.pid' %s", dot_file, dot_file, dot_file, dot_file, background);
 			#endif
-			log("Exec: %s\n", cmd.c_str());
+			log("Exec: %s\n", cmd);
 			if (run_command(cmd) != 0)
 				log_cmd_error("Shell command failed!\n");
 		}
diff --git a/passes/cmds/wrapcell.cc b/passes/cmds/wrapcell.cc
index f7d9fbeed..4c6f44ed7 100644
--- a/passes/cmds/wrapcell.cc
+++ b/passes/cmds/wrapcell.cc
@@ -59,7 +59,7 @@ std::optional<std::string> format_with_params(std::string fmt, const dict<IdStri
 			auto beg = it;
 			while (it != fmt.end() && *it != '}') it++;
 			if (it == fmt.end()) {
-				log("Unclosed curly brackets in format string '%s'\n", fmt.c_str());
+				log("Unclosed curly brackets in format string '%s'\n", fmt);
 				return {};
 			}
 
@@ -70,7 +70,7 @@ std::optional<std::string> format_with_params(std::string fmt, const dict<IdStri
 			} else {
 				auto id = RTLIL::escape_id(std::string(beg, it));
 				if (!parameters.count(id)) {
-					log("Parameter %s referenced in format string '%s' not found\n", log_id(id), fmt.c_str());
+					log("Parameter %s referenced in format string '%s' not found\n", log_id(id), fmt);
 					return {};
 				}
 
diff --git a/passes/fsm/fsm_expand.cc b/passes/fsm/fsm_expand.cc
index 239f17f36..b11f0d3be 100644
--- a/passes/fsm/fsm_expand.cc
+++ b/passes/fsm/fsm_expand.cc
@@ -140,7 +140,7 @@ struct FsmExpand
 	{
 		optimze_as_needed();
 
-		log("  merging %s cell %s.\n", cell->type.c_str(), cell->name.c_str());
+		log("  merging %s cell %s.\n", cell->type, cell->name);
 		merged_set.insert(cell);
 		already_optimized = false;
 
@@ -243,7 +243,7 @@ struct FsmExpand
 	void execute()
 	{
 		log("\n");
-		log("Expanding FSM `%s' from module `%s':\n", fsm_cell->name.c_str(), module->name.c_str());
+		log("Expanding FSM `%s' from module `%s':\n", fsm_cell->name, module->name);
 
 		already_optimized = false;
 		limit_transitions =  16 * fsm_cell->parameters[ID::TRANS_NUM].as_int();
diff --git a/passes/fsm/fsm_export.cc b/passes/fsm/fsm_export.cc
index 65dda1267..7c79a53cc 100644
--- a/passes/fsm/fsm_export.cc
+++ b/passes/fsm/fsm_export.cc
@@ -76,7 +76,7 @@ void write_kiss2(struct RTLIL::Module *module, struct RTLIL::Cell *cell, std::st
 	kiss_file.open(kiss_name, std::ios::out | std::ios::trunc);
 
 	if (!kiss_file.is_open()) {
-		log_error("Could not open file \"%s\" with write access.\n", kiss_name.c_str());
+		log_error("Could not open file \"%s\" with write access.\n", kiss_name);
 	}
 
 	fsm_data.copy_from_cell(cell);
diff --git a/passes/fsm/fsm_extract.cc b/passes/fsm/fsm_extract.cc
index a0fd50097..d83cff5cdc 100644
--- a/passes/fsm/fsm_extract.cc
+++ b/passes/fsm/fsm_extract.cc
@@ -71,7 +71,7 @@ static bool find_states(RTLIL::SigSpec sig, const RTLIL::SigSpec &dff_out, RTLIL
 	{
 		RTLIL::Cell *cell = module->cells_.at(cellport.first);
 		if ((cell->type != ID($mux) && cell->type != ID($pmux)) || cellport.second != ID::Y) {
-			log("  unexpected cell type %s (%s) found in state selection tree.\n", cell->type.c_str(), cell->name.c_str());
+			log("  unexpected cell type %s (%s) found in state selection tree.\n", cell->type, cell->name);
 			return false;
 		}
 
@@ -255,7 +255,7 @@ undef_bit_in_next_state:
 
 static void extract_fsm(RTLIL::Wire *wire)
 {
-	log("Extracting FSM `%s' from module `%s'.\n", wire->name.c_str(), module->name.c_str());
+	log("Extracting FSM `%s' from module `%s'.\n", wire->name, module->name);
 
 	// get input and output signals for state ff
 
@@ -274,7 +274,7 @@ static void extract_fsm(RTLIL::Wire *wire)
 		RTLIL::Cell *cell = module->cells_.at(cellport.first);
 		if ((cell->type != ID($dff) && cell->type != ID($adff)) || cellport.second != ID::Q)
 			continue;
-		log("  found %s cell for state register: %s\n", cell->type.c_str(), cell->name.c_str());
+		log("  found %s cell for state register: %s\n", cell->type, cell->name);
 		RTLIL::SigSpec sig_q = assign_map(cell->getPort(ID::Q));
 		RTLIL::SigSpec sig_d = assign_map(cell->getPort(ID::D));
 		clk = cell->getPort(ID::CLK);
diff --git a/passes/fsm/fsm_map.cc b/passes/fsm/fsm_map.cc
index 711a81db2..8a18d259a 100644
--- a/passes/fsm/fsm_map.cc
+++ b/passes/fsm/fsm_map.cc
@@ -156,7 +156,7 @@ static void implement_pattern_cache(RTLIL::Module *module, std::map<RTLIL::Const
 
 static void map_fsm(RTLIL::Cell *fsm_cell, RTLIL::Module *module)
 {
-	log("Mapping FSM `%s' from module `%s'.\n", fsm_cell->name.c_str(), module->name.c_str());
+	log("Mapping FSM `%s' from module `%s'.\n", fsm_cell->name, module->name);
 
 	FsmData fsm_data;
 	fsm_data.copy_from_cell(fsm_cell);
diff --git a/passes/fsm/fsm_opt.cc b/passes/fsm/fsm_opt.cc
index 2db011cd0..99771f90a 100644
--- a/passes/fsm/fsm_opt.cc
+++ b/passes/fsm/fsm_opt.cc
@@ -293,7 +293,7 @@ struct FsmOpt
 
 	FsmOpt(RTLIL::Cell *cell, RTLIL::Module *module)
 	{
-		log("Optimizing FSM `%s' from module `%s'.\n", cell->name.c_str(), module->name.c_str());
+		log("Optimizing FSM `%s' from module `%s'.\n", cell->name, module->name);
 
 		fsm_data.copy_from_cell(cell);
 		this->cell = cell;
diff --git a/passes/fsm/fsm_recode.cc b/passes/fsm/fsm_recode.cc
index bcdea9d87..8ee03329f 100644
--- a/passes/fsm/fsm_recode.cc
+++ b/passes/fsm/fsm_recode.cc
@@ -56,15 +56,15 @@ static void fsm_recode(RTLIL::Cell *cell, RTLIL::Module *module, FILE *fm_set_fs
 {
 	std::string encoding = cell->attributes.count(ID::fsm_encoding) ? cell->attributes.at(ID::fsm_encoding).decode_string() : "auto";
 
-	log("Recoding FSM `%s' from module `%s' using `%s' encoding:\n", cell->name.c_str(), module->name.c_str(), encoding.c_str());
+	log("Recoding FSM `%s' from module `%s' using `%s' encoding:\n", cell->name, module->name, encoding);
 
 	if (encoding != "none" && encoding != "user" && encoding != "one-hot" && encoding != "binary" && encoding != "auto") {
-		log("  unknown encoding `%s': using auto instead.\n", encoding.c_str());
+		log("  unknown encoding `%s': using auto instead.\n", encoding);
 		encoding = "auto";
 	}
 
 	if (encoding == "none" || encoding == "user") {
-		log("  nothing to do for encoding `%s'.\n", encoding.c_str());
+		log("  nothing to do for encoding `%s'.\n", encoding);
 		return;
 	}
 
@@ -79,7 +79,7 @@ static void fsm_recode(RTLIL::Cell *cell, RTLIL::Module *module, FILE *fm_set_fs
 			encoding = default_encoding;
 		else
 			encoding = GetSize(fsm_data.state_table) < 32 ? "one-hot" : "binary";
-		log("  mapping auto encoding to `%s` for this FSM.\n", encoding.c_str());
+		log("  mapping auto encoding to `%s` for this FSM.\n", encoding);
 	}
 
 	if (encoding == "one-hot") {
@@ -93,7 +93,7 @@ static void fsm_recode(RTLIL::Cell *cell, RTLIL::Module *module, FILE *fm_set_fs
 		}
 		fsm_data.state_bits = new_num_state_bits;
 	} else
-		log_error("FSM encoding `%s' is not supported!\n", encoding.c_str());
+		log_error("FSM encoding `%s' is not supported!\n", encoding);
 
 	if (encfile)
 		fprintf(encfile, ".fsm %s %s\n", log_id(module), RTLIL::unescape_id(cell->parameters[ID::NAME].decode_string()).c_str());
@@ -113,7 +113,7 @@ static void fsm_recode(RTLIL::Cell *cell, RTLIL::Module *module, FILE *fm_set_fs
 		} else
 			log_abort();
 
-		log("  %s -> %s\n", fsm_data.state_table[i].as_string().c_str(), new_code.as_string().c_str());
+		log("  %s -> %s\n", fsm_data.state_table[i].as_string(), new_code.as_string());
 		if (encfile)
 			fprintf(encfile, ".map %s %s\n", fsm_data.state_table[i].as_string().c_str(), new_code.as_string().c_str());
 		fsm_data.state_table[i] = new_code;
@@ -165,13 +165,13 @@ struct FsmRecodePass : public Pass {
 			if (arg == "-fm_set_fsm_file" && argidx+1 < args.size() && fm_set_fsm_file == NULL) {
 				fm_set_fsm_file = fopen(args[++argidx].c_str(), "w");
 				if (fm_set_fsm_file == NULL)
-					log_error("Can't open fm_set_fsm_file `%s' for writing: %s\n", args[argidx].c_str(), strerror(errno));
+					log_error("Can't open fm_set_fsm_file `%s' for writing: %s\n", args[argidx], strerror(errno));
 				continue;
 			}
 			if (arg == "-encfile" && argidx+1 < args.size() && encfile == NULL) {
 				encfile = fopen(args[++argidx].c_str(), "w");
 				if (encfile == NULL)
-					log_error("Can't open encfile `%s' for writing: %s\n", args[argidx].c_str(), strerror(errno));
+					log_error("Can't open encfile `%s' for writing: %s\n", args[argidx], strerror(errno));
 				continue;
 			}
 			if (arg == "-encoding" && argidx+1 < args.size() && default_encoding.empty()) {
diff --git a/passes/fsm/fsmdata.h b/passes/fsm/fsmdata.h
index 1c6aaf65f..9aa12241e 100644
--- a/passes/fsm/fsmdata.h
+++ b/passes/fsm/fsmdata.h
@@ -134,7 +134,7 @@ struct FsmData
 	{
 		log("-------------------------------------\n");
 		log("\n");
-		log("  Information on FSM %s (%s):\n", cell->name.c_str(), cell->parameters[ID::NAME].decode_string().c_str());
+		log("  Information on FSM %s (%s):\n", cell->name, cell->parameters[ID::NAME].decode_string());
 		log("\n");
 		log("  Number of input signals:  %3d\n", num_inputs);
 		log("  Number of output signals: %3d\n", num_outputs);
diff --git a/passes/hierarchy/hierarchy.cc b/passes/hierarchy/hierarchy.cc
index 69ef744ca..6fec628c2 100644
--- a/passes/hierarchy/hierarchy.cc
+++ b/passes/hierarchy/hierarchy.cc
@@ -59,7 +59,7 @@ void generate(RTLIL::Design *design, const std::vector<std::string> &celltypes,
 		std::set<RTLIL::IdString> portnames;
 		std::set<RTLIL::IdString> parameters;
 		std::map<RTLIL::IdString, int> portwidths;
-		log("Generate module for cell type %s:\n", celltype.c_str());
+		log("Generate module for cell type %s:\n", celltype);
 
 		for (auto mod : design->modules())
 		for (auto cell : mod->cells())
@@ -605,9 +605,9 @@ void hierarchy_worker(RTLIL::Design *design, std::set<RTLIL::Module*, IdString::
 		return;
 
 	if (indent == 0)
-		log("Top module:  %s\n", mod->name.c_str());
+		log("Top module:  %s\n", mod->name);
 	else if (!mod->get_blackbox_attribute())
-		log("Used module: %*s%s\n", indent, "", mod->name.c_str());
+		log("Used module: %*s%s\n", indent, "", mod->name);
 	used.insert(mod);
 
 	for (auto cell : mod->cells()) {
@@ -647,7 +647,7 @@ void hierarchy_clean(RTLIL::Design *design, RTLIL::Module *top, bool purge_lib)
 	for (auto mod : del_modules) {
 		if (!purge_lib && mod->get_blackbox_attribute())
 			continue;
-		log("Removing unused module `%s'.\n", mod->name.c_str());
+		log("Removing unused module `%s'.\n", mod->name);
 		design->remove(mod);
 		del_counter++;
 	}
@@ -873,11 +873,11 @@ struct HierarchyPass : public Pass {
 					log("Port declaration: %s", decl.input ? decl.output ? "inout" : "input" : "output");
 					if (decl.index >= 1)
 						log(" [at position %d]", decl.index);
-					log(" %s\n", decl.portname.c_str());
+					log(" %s\n", decl.portname);
 					generate_ports.push_back(decl);
 					continue;
 				is_celltype:
-					log("Celltype: %s\n", args[argidx].c_str());
+					log("Celltype: %s\n", args[argidx]);
 					generate_cells.push_back(RTLIL::unescape_id(args[argidx]));
 				}
 				continue;
diff --git a/passes/hierarchy/submod.cc b/passes/hierarchy/submod.cc
index 8d88a8919..d77d65359 100644
--- a/passes/hierarchy/submod.cc
+++ b/passes/hierarchy/submod.cc
@@ -87,7 +87,7 @@ struct SubmodWorker
 
 	void handle_submodule(SubModule &submod)
 	{
-		log("Creating submodule %s (%s) of module %s.\n", submod.name.c_str(), submod.full_name.c_str(), module->name.c_str());
+		log("Creating submodule %s (%s) of module %s.\n", submod.name, submod.full_name, module->name);
 
 		wire_flags.clear();
 		for (RTLIL::Cell *cell : submod.cells) {
@@ -192,13 +192,13 @@ struct SubmodWorker
 			}
 
 			if (new_wire->port_input && new_wire->port_output)
-				log("  signal %s: inout %s\n", wire->name.c_str(), new_wire->name.c_str());
+				log("  signal %s: inout %s\n", wire->name, new_wire->name);
 			else if (new_wire->port_input)
-				log("  signal %s: input %s\n", wire->name.c_str(), new_wire->name.c_str());
+				log("  signal %s: input %s\n", wire->name, new_wire->name);
 			else if (new_wire->port_output)
-				log("  signal %s: output %s\n", wire->name.c_str(), new_wire->name.c_str());
+				log("  signal %s: output %s\n", wire->name, new_wire->name);
 			else
-				log("  signal %s: internal\n", wire->name.c_str());
+				log("  signal %s: internal\n", wire->name);
 
 			flags.new_wire = new_wire;
 		}
@@ -214,7 +214,7 @@ struct SubmodWorker
 						log_assert(wire_flags.count(bit.wire) > 0);
 						bit.wire = wire_flags.at(bit.wire).new_wire;
 					}
-			log("  cell %s (%s)\n", new_cell->name.c_str(), new_cell->type.c_str());
+			log("  cell %s (%s)\n", new_cell->name, new_cell->type);
 			if (!copy_mode)
 				module->remove(cell);
 		}
@@ -250,12 +250,12 @@ struct SubmodWorker
 			return;
 
 		if (module->processes.size() > 0) {
-			log("Skipping module %s as it contains processes (run 'proc' pass first).\n", module->name.c_str());
+			log("Skipping module %s as it contains processes (run 'proc' pass first).\n", module->name);
 			return;
 		}
 
 		if (module->memories.size() > 0) {
-			log("Skipping module %s as it contains memories (run 'memory' pass first).\n", module->name.c_str());
+			log("Skipping module %s as it contains memories (run 'memory' pass first).\n", module->name);
 			return;
 		}
 
diff --git a/passes/memory/memlib.cc b/passes/memory/memlib.cc
index fb256e41c..61589cab0 100644
--- a/passes/memory/memlib.cc
+++ b/passes/memory/memlib.cc
@@ -134,7 +134,7 @@ struct Parser {
 		rewrite_filename(filename);
 		infile.open(filename);
 		if (infile.fail()) {
-			log_error("failed to open %s\n", filename.c_str());
+			log_error("failed to open %s\n", filename);
 		}
 		parse();
 		infile.close();
@@ -181,14 +181,14 @@ struct Parser {
 	void eat_token(std::string expected) {
 		std::string token = get_token();
 		if (token != expected) {
-			log_error("%s:%d: expected `%s`, got `%s`.\n", filename.c_str(), line_number, expected.c_str(), token.c_str());
+			log_error("%s:%d: expected `%s`, got `%s`.\n", filename, line_number, expected, token);
 		}
 	}
 
 	IdString get_id() {
 		std::string token = get_token();
 		if (token.empty() || (token[0] != '$' && token[0] != '\\')) {
-			log_error("%s:%d: expected id string, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+			log_error("%s:%d: expected id string, got `%s`.\n", filename, line_number, token);
 		}
 		return IdString(token);
 	}
@@ -203,14 +203,14 @@ struct Parser {
 			if (!isalnum(c) && c != '_')
 				valid = false;
 		if (!valid)
-			log_error("%s:%d: expected name, got `%s`.\n", filename.c_str(), line_number, res.c_str());
+			log_error("%s:%d: expected name, got `%s`.\n", filename, line_number, res);
 		return res;
 	}
 
 	std::string get_string() {
 		std::string token = get_token();
 		if (token.size() < 2 || token[0] != '"' || token[token.size()-1] != '"') {
-			log_error("%s:%d: expected string, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+			log_error("%s:%d: expected string, got `%s`.\n", filename, line_number, token);
 		}
 		return token.substr(1, token.size()-2);
 	}
@@ -225,7 +225,7 @@ struct Parser {
 		char *endptr;
 		long res = strtol(token.c_str(), &endptr, 0);
 		if (token.empty() || *endptr || res > INT_MAX) {
-			log_error("%s:%d: expected int, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+			log_error("%s:%d: expected int, got `%s`.\n", filename, line_number, token);
 		}
 		return res;
 	}
@@ -235,7 +235,7 @@ struct Parser {
 		char *endptr;
 		double res = strtod(token.c_str(), &endptr);
 		if (token.empty() || *endptr) {
-			log_error("%s:%d: expected float, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+			log_error("%s:%d: expected float, got `%s`.\n", filename, line_number, token);
 		}
 		return res;
 	}
@@ -248,7 +248,7 @@ struct Parser {
 	void get_semi() {
 		std::string token = get_token();
 		if (token != ";") {
-			log_error("%s:%d: expected `;`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+			log_error("%s:%d: expected `;`, got `%s`.\n", filename, line_number, token);
 		}
 	}
 
@@ -387,7 +387,7 @@ struct Parser {
 			exit_portoption();
 		} else if (token == "clock") {
 			if (port.kind == PortKind::Ar) {
-				log_error("%s:%d: `clock` not allowed in async read port.\n", filename.c_str(), line_number);
+				log_error("%s:%d: `clock` not allowed in async read port.\n", filename, line_number);
 			}
 			ClockDef def;
 			token = get_token();
@@ -398,7 +398,7 @@ struct Parser {
 			} else if (token == "negedge") {
 				def.kind = ClkPolKind::Negedge;
 			} else {
-				log_error("%s:%d: expected `posedge`, `negedge`, or `anyedge`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: expected `posedge`, `negedge`, or `anyedge`, got `%s`.\n", filename, line_number, token);
 			}
 			if (peek_string()) {
 				def.name = get_string();
@@ -407,13 +407,13 @@ struct Parser {
 			add_cap(port.clock, def);
 		} else if (token == "clken") {
 			if (port.kind == PortKind::Ar) {
-				log_error("%s:%d: `clken` not allowed in async read port.\n", filename.c_str(), line_number);
+				log_error("%s:%d: `clken` not allowed in async read port.\n", filename, line_number);
 			}
 			get_semi();
 			add_cap(port.clken, {});
 		} else if (token == "wrbe_separate") {
 			if (port.kind == PortKind::Ar || port.kind == PortKind::Sr) {
-				log_error("%s:%d: `wrbe_separate` not allowed in read port.\n", filename.c_str(), line_number);
+				log_error("%s:%d: `wrbe_separate` not allowed in read port.\n", filename, line_number);
 			}
 			get_semi();
 			add_cap(port.wrbe_separate, {});
@@ -424,14 +424,14 @@ struct Parser {
 			if (token == "tied") {
 				get_token();
 				if (!is_rw)
-					log_error("%s:%d: `tied` only makes sense for read+write ports.\n", filename.c_str(), line_number);
+					log_error("%s:%d: `tied` only makes sense for read+write ports.\n", filename, line_number);
 				while (peek_int())
 					def.wr_widths.push_back(get_int());
 				def.tied = true;
 			} else if (token == "mix") {
 				get_token();
 				if (!is_rw)
-					log_error("%s:%d: `mix` only makes sense for read+write ports.\n", filename.c_str(), line_number);
+					log_error("%s:%d: `mix` only makes sense for read+write ports.\n", filename, line_number);
 				while (peek_int())
 					def.wr_widths.push_back(get_int());
 				def.rd_widths = def.wr_widths;
@@ -439,7 +439,7 @@ struct Parser {
 			} else if (token == "rd") {
 				get_token();
 				if (!is_rw)
-					log_error("%s:%d: `rd` only makes sense for read+write ports.\n", filename.c_str(), line_number);
+					log_error("%s:%d: `rd` only makes sense for read+write ports.\n", filename, line_number);
 				do {
 					def.rd_widths.push_back(get_int());
 				} while (peek_int());
@@ -451,7 +451,7 @@ struct Parser {
 			} else if (token == "wr") {
 				get_token();
 				if (!is_rw)
-					log_error("%s:%d: `wr` only makes sense for read+write ports.\n", filename.c_str(), line_number);
+					log_error("%s:%d: `wr` only makes sense for read+write ports.\n", filename, line_number);
 				do {
 					def.wr_widths.push_back(get_int());
 				} while (peek_int());
@@ -470,12 +470,12 @@ struct Parser {
 			add_cap(port.width, def);
 		} else if (token == "rden") {
 			if (port.kind != PortKind::Sr && port.kind != PortKind::Srsw)
-				log_error("%s:%d: `rden` only allowed on sync read ports.\n", filename.c_str(), line_number);
+				log_error("%s:%d: `rden` only allowed on sync read ports.\n", filename, line_number);
 			get_semi();
 			add_cap(port.rden, {});
 		} else if (token == "rdwr") {
 			if (port.kind != PortKind::Srsw)
-				log_error("%s:%d: `rdwr` only allowed on sync read+write ports.\n", filename.c_str(), line_number);
+				log_error("%s:%d: `rdwr` only allowed on sync read+write ports.\n", filename, line_number);
 			RdWrKind kind;
 			token = get_token();
 			if (token == "undefined") {
@@ -489,13 +489,13 @@ struct Parser {
 			} else if (token == "new_only") {
 				kind = RdWrKind::NewOnly;
 			} else {
-				log_error("%s:%d: expected `undefined`, `new`, `old`, `new_only`, or `no_change`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: expected `undefined`, `new`, `old`, `new_only`, or `no_change`, got `%s`.\n", filename, line_number, token);
 			}
 			get_semi();
 			add_cap(port.rdwr, kind);
 		} else if (token == "rdinit") {
 			if (port.kind != PortKind::Sr && port.kind != PortKind::Srsw)
-				log_error("%s:%d: `%s` only allowed on sync read ports.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: `%s` only allowed on sync read ports.\n", filename, line_number, token);
 			ResetValKind kind;
 			token = get_token();
 			if (token == "none") {
@@ -507,13 +507,13 @@ struct Parser {
 			} else if (token == "no_undef") {
 				kind = ResetValKind::NoUndef;
 			} else {
-				log_error("%s:%d: expected `none`, `zero`, `any`, or `no_undef`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: expected `none`, `zero`, `any`, or `no_undef`, got `%s`.\n", filename, line_number, token);
 			}
 			get_semi();
 			add_cap(port.rdinit, kind);
 		} else if (token == "rdarst") {
 			if (port.kind != PortKind::Sr && port.kind != PortKind::Srsw)
-				log_error("%s:%d: `%s` only allowed on sync read ports.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: `%s` only allowed on sync read ports.\n", filename, line_number, token);
 			ResetValKind kind;
 			token = get_token();
 			if (token == "none") {
@@ -527,13 +527,13 @@ struct Parser {
 			} else if (token == "init") {
 				kind = ResetValKind::Init;
 			} else {
-				log_error("%s:%d: expected `none`, `zero`, `any`, `no_undef`, or `init`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: expected `none`, `zero`, `any`, `no_undef`, or `init`, got `%s`.\n", filename, line_number, token);
 			}
 			get_semi();
 			add_cap(port.rdarst, kind);
 		} else if (token == "rdsrst") {
 			if (port.kind != PortKind::Sr && port.kind != PortKind::Srsw)
-				log_error("%s:%d: `%s` only allowed on sync read ports.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: `%s` only allowed on sync read ports.\n", filename, line_number, token);
 			SrstDef def;
 			token = get_token();
 			if (token == "none") {
@@ -547,7 +547,7 @@ struct Parser {
 			} else if (token == "init") {
 				def.val = ResetValKind::Init;
 			} else {
-				log_error("%s:%d: expected `none`, `zero`, `any`, `no_undef`, or `init`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: expected `none`, `zero`, `any`, `no_undef`, or `init`, got `%s`.\n", filename, line_number, token);
 			}
 			if (def.val == ResetValKind::None) {
 				def.kind = SrstKind::None;
@@ -560,7 +560,7 @@ struct Parser {
 				} else if (token == "gated_rden") {
 					def.kind = SrstKind::GatedRdEn;
 				} else {
-					log_error("%s:%d: expected `ungated`, `gated_clken` or `gated_rden`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+					log_error("%s:%d: expected `ungated`, `gated_clken` or `gated_rden`, got `%s`.\n", filename, line_number, token);
 				}
 			}
 			def.block_wr = false;
@@ -572,14 +572,14 @@ struct Parser {
 			add_cap(port.rdsrst, def);
 		} else if (token == "wrprio") {
 			if (port.kind == PortKind::Ar || port.kind == PortKind::Sr)
-				log_error("%s:%d: `wrprio` only allowed on write ports.\n", filename.c_str(), line_number);
+				log_error("%s:%d: `wrprio` only allowed on write ports.\n", filename, line_number);
 			do {
 				add_cap(port.wrprio, get_string());
 			} while (peek_string());
 			get_semi();
 		} else if (token == "wrtrans") {
 			if (port.kind == PortKind::Ar || port.kind == PortKind::Sr)
-				log_error("%s:%d: `wrtrans` only allowed on write ports.\n", filename.c_str(), line_number);
+				log_error("%s:%d: `wrtrans` only allowed on write ports.\n", filename, line_number);
 			token = peek_token();
 			RawWrTransDef def;
 			if (token == "all") {
@@ -595,7 +595,7 @@ struct Parser {
 			} else if (token == "old") {
 				def.kind = WrTransKind::Old;
 			} else {
-				log_error("%s:%d: expected `new` or `old`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: expected `new` or `old`, got `%s`.\n", filename, line_number, token);
 			}
 			get_semi();
 			add_cap(port.wrtrans, def);
@@ -609,9 +609,9 @@ struct Parser {
 			get_semi();
 			add_cap(port.optional_rw, {});
 		} else if (token == "") {
-			log_error("%s:%d: unexpected EOF while parsing port item.\n", filename.c_str(), line_number);
+			log_error("%s:%d: unexpected EOF while parsing port item.\n", filename, line_number);
 		} else {
-			log_error("%s:%d: unknown port-level item `%s`.\n", filename.c_str(), line_number, token.c_str());
+			log_error("%s:%d: unknown port-level item `%s`.\n", filename, line_number, token);
 		}
 	}
 
@@ -646,14 +646,14 @@ struct Parser {
 		} else if (token == "abits") {
 			int val = get_int();
 			if (val < 0)
-				log_error("%s:%d: abits %d nagative.\n", filename.c_str(), line_number, val);
+				log_error("%s:%d: abits %d nagative.\n", filename, line_number, val);
 			get_semi();
 			add_cap(ram.abits, val);
 		} else if (token == "width") {
 			WidthsDef def;
 			int w = get_int();
 			if (w <= 0)
-				log_error("%s:%d: width %d not positive.\n", filename.c_str(), line_number, w);
+				log_error("%s:%d: width %d not positive.\n", filename, line_number, w);
 			def.widths.push_back(w);
 			def.mode = WidthMode::Single;
 			get_semi();
@@ -664,9 +664,9 @@ struct Parser {
 			do {
 				int w = get_int();
 				if (w <= 0)
-					log_error("%s:%d: width %d not positive.\n", filename.c_str(), line_number, w);
+					log_error("%s:%d: width %d not positive.\n", filename, line_number, w);
 				if (w < last * 2)
-					log_error("%s:%d: width %d smaller than %d required for progression.\n", filename.c_str(), line_number, w, last * 2);
+					log_error("%s:%d: width %d smaller than %d required for progression.\n", filename, line_number, w, last * 2);
 				last = w;
 				def.widths.push_back(w);
 			} while(peek_int());
@@ -676,7 +676,7 @@ struct Parser {
 			} else if (token == "per_port") {
 				def.mode = WidthMode::PerPort;
 			} else {
-				log_error("%s:%d: expected `global`, or `per_port`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: expected `global`, or `per_port`, got `%s`.\n", filename, line_number, token);
 			}
 			get_semi();
 			add_cap(ram.widths, def);
@@ -702,7 +702,7 @@ struct Parser {
 		} else if (token == "byte") {
 			int val = get_int();
 			if (val <= 0)
-				log_error("%s:%d: byte width %d not positive.\n", filename.c_str(), line_number, val);
+				log_error("%s:%d: byte width %d not positive.\n", filename, line_number, val);
 			add_cap(ram.byte, val);
 			get_semi();
 		} else if (token == "init") {
@@ -717,7 +717,7 @@ struct Parser {
 			} else if (token == "none") {
 				kind = MemoryInitKind::None;
 			} else {
-				log_error("%s:%d: expected `zero`, `any`, `none`, or `no_undef`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: expected `zero`, `any`, `none`, or `no_undef`, got `%s`.\n", filename, line_number, token);
 			}
 			get_semi();
 			add_cap(ram.init, kind);
@@ -743,7 +743,7 @@ struct Parser {
 			} else if (token == "srsw") {
 				port.kind = PortKind::Srsw;
 			} else {
-				log_error("%s:%d: expected `ar`, `sr`, `sw`, `arsw`, or `srsw`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: expected `ar`, `sr`, `sw`, `arsw`, or `srsw`, got `%s`.\n", filename, line_number, token);
 			}
 			do {
 				port.names.push_back(get_string());
@@ -752,9 +752,9 @@ struct Parser {
 			if (active)
 				add_cap(ram.ports, port);
 		} else if (token == "") {
-			log_error("%s:%d: unexpected EOF while parsing ram item.\n", filename.c_str(), line_number);
+			log_error("%s:%d: unexpected EOF while parsing ram item.\n", filename, line_number);
 		} else {
-			log_error("%s:%d: unknown ram-level item `%s`.\n", filename.c_str(), line_number, token.c_str());
+			log_error("%s:%d: unknown ram-level item `%s`.\n", filename, line_number, token);
 		}
 	}
 
@@ -787,7 +787,7 @@ struct Parser {
 			} else if (token == "huge") {
 				ram.kind = RamKind::Huge;
 			} else {
-				log_error("%s:%d: expected `distributed`, `block`, or `huge`, got `%s`.\n", filename.c_str(), line_number, token.c_str());
+				log_error("%s:%d: expected `distributed`, `block`, or `huge`, got `%s`.\n", filename, line_number, token);
 			}
 			ram.id = get_id();
 			parse_ram_block();
@@ -795,9 +795,9 @@ struct Parser {
 				compile_ram(orig_line);
 			}
 		} else if (token == "") {
-			log_error("%s:%d: unexpected EOF while parsing top item.\n", filename.c_str(), line_number);
+			log_error("%s:%d: unexpected EOF while parsing top item.\n", filename, line_number);
 		} else {
-			log_error("%s:%d: unknown top-level item `%s`.\n", filename.c_str(), line_number, token.c_str());
+			log_error("%s:%d: unknown top-level item `%s`.\n", filename, line_number, token);
 		}
 	}
 
@@ -816,7 +816,7 @@ struct Parser {
 			if (!opts_ok(cap.portopts, portopts))
 				continue;
 			if (res)
-				log_error("%s:%d: duplicate %s cap.\n", filename.c_str(), line_number, name);
+				log_error("%s:%d: duplicate %s cap.\n", filename, line_number, name);
 			res = &cap.val;
 		}
 		return res;
@@ -860,7 +860,7 @@ struct Parser {
 			} else {
 				const ClockDef *cdef = find_single_cap(pdef.clock, cram.options, portopts, "clock");
 				if (!cdef)
-					log_error("%s:%d: missing clock capability.\n", filename.c_str(), orig_line);
+					log_error("%s:%d: missing clock capability.\n", filename, orig_line);
 				var.clk_pol = cdef->kind;
 				if (cdef->name.empty()) {
 					var.clk_shared = -1;
@@ -876,7 +876,7 @@ struct Parser {
 					} else {
 						var.clk_shared = it->second;
 						if (cram.shared_clocks[var.clk_shared].anyedge != anyedge) {
-							log_error("%s:%d: named clock \"%s\" used with both posedge/negedge and anyedge clocks.\n", filename.c_str(), orig_line, cdef->name.c_str());
+							log_error("%s:%d: named clock \"%s\" used with both posedge/negedge and anyedge clocks.\n", filename, orig_line, cdef->name);
 						}
 					}
 				}
@@ -885,7 +885,7 @@ struct Parser {
 			const PortWidthDef *wdef = find_single_cap(pdef.width, cram.options, portopts, "width");
 			if (wdef) {
 				if (cram.width_mode != WidthMode::PerPort)
-					log_error("%s:%d: per-port width doesn't make sense for tied dbits.\n", filename.c_str(), orig_line);
+					log_error("%s:%d: per-port width doesn't make sense for tied dbits.\n", filename, orig_line);
 				compile_widths(var, cram.dbits, *wdef);
 			} else {
 				var.width_tied = true;
@@ -908,9 +908,9 @@ struct Parser {
 					var.rdsrstmode = srv->kind;
 					var.rdsrst_block_wr = srv->block_wr;
 					if (srv->kind == SrstKind::GatedClkEn && !var.clk_en)
-						log_error("%s:%d: `gated_clken` used without `clken`.\n", filename.c_str(), orig_line);
+						log_error("%s:%d: `gated_clken` used without `clken`.\n", filename, orig_line);
 					if (srv->kind == SrstKind::GatedRdEn && !var.rd_en)
-						log_error("%s:%d: `gated_rden` used without `rden`.\n", filename.c_str(), orig_line);
+						log_error("%s:%d: `gated_rden` used without `rden`.\n", filename, orig_line);
 				} else {
 					var.rdsrstval = ResetValKind::None;
 					var.rdsrstmode = SrstKind::None;
@@ -918,13 +918,13 @@ struct Parser {
 				}
 				if (var.rdarstval == ResetValKind::Init || var.rdsrstval == ResetValKind::Init) {
 					if (var.rdinitval != ResetValKind::Any && var.rdinitval != ResetValKind::NoUndef) {
-						log_error("%s:%d: reset value `init` has to be paired with `any` or `no_undef` initial value.\n", filename.c_str(), orig_line);
+						log_error("%s:%d: reset value `init` has to be paired with `any` or `no_undef` initial value.\n", filename, orig_line);
 					}
 				}
 			}
 			var.wrbe_separate = find_single_cap(pdef.wrbe_separate, cram.options, portopts, "wrbe_separate");
 			if (var.wrbe_separate && cram.byte == 0) {
-				log_error("%s:%d: `wrbe_separate` used without `byte`.\n", filename.c_str(), orig_line);
+				log_error("%s:%d: `wrbe_separate` used without `byte`.\n", filename, orig_line);
 			}
 			for (auto &def: pdef.wrprio) {
 				if (!opts_ok(def.opts, cram.options))
@@ -948,18 +948,18 @@ struct Parser {
 			grp.variants.push_back(var);
 		}
 		if (grp.variants.empty()) {
-			log_error("%s:%d: all port option combinations are forbidden.\n", filename.c_str(), orig_line);
+			log_error("%s:%d: all port option combinations are forbidden.\n", filename, orig_line);
 		}
 		cram.port_groups.push_back(grp);
 	}
 
 	void compile_ram(int orig_line) {
 		if (ram.abits.empty())
-			log_error("%s:%d: `dims` capability should be specified.\n", filename.c_str(), orig_line);
+			log_error("%s:%d: `dims` capability should be specified.\n", filename, orig_line);
 		if (ram.widths.empty())
-			log_error("%s:%d: `widths` capability should be specified.\n", filename.c_str(), orig_line);
+			log_error("%s:%d: `widths` capability should be specified.\n", filename, orig_line);
 		if (ram.ports.empty())
-			log_error("%s:%d: at least one port group should be specified.\n", filename.c_str(), orig_line);
+			log_error("%s:%d: at least one port group should be specified.\n", filename, orig_line);
 		for (auto opts: make_opt_combinations(ram.opts)) {
 			bool forbidden = false;
 			for (auto &fdef: ram.forbid) {
@@ -1003,7 +1003,7 @@ struct Parser {
 			const int *byte = find_single_cap(ram.byte, opts, Options(), "byte");
 			cram.byte = byte ? *byte : 0;
 			if (GetSize(cram.dbits) - 1 > cram.abits)
-				log_error("%s:%d: abits %d too small for dbits progression.\n", filename.c_str(), line_number, cram.abits);
+				log_error("%s:%d: abits %d too small for dbits progression.\n", filename, line_number, cram.abits);
 			validate_byte(widths->widths, cram.byte);
 			const MemoryInitKind *ik = find_single_cap(ram.init, opts, Options(), "init");
 			cram.init = ik ? *ik : MemoryInitKind::None;
@@ -1037,18 +1037,18 @@ struct Parser {
 		if (widths[0] % byte == 0) {
 			for (int j = 1; j < GetSize(widths); j++)
 				if (widths[j] % byte != 0)
-					log_error("%s:%d: width progression past byte width %d is not divisible.\n", filename.c_str(), line_number, byte);
+					log_error("%s:%d: width progression past byte width %d is not divisible.\n", filename, line_number, byte);
 			return;
 		}
 		for (int i = 0; i < GetSize(widths); i++) {
 			if (widths[i] == byte) {
 				for (int j = i + 1; j < GetSize(widths); j++)
 					if (widths[j] % byte != 0)
-						log_error("%s:%d: width progression past byte width %d is not divisible.\n", filename.c_str(), line_number, byte);
+						log_error("%s:%d: width progression past byte width %d is not divisible.\n", filename, line_number, byte);
 				return;
 			}
 		}
-		log_error("%s:%d: byte width %d invalid for dbits.\n", filename.c_str(), line_number, byte);
+		log_error("%s:%d: byte width %d invalid for dbits.\n", filename, line_number, byte);
 	}
 
 	void compile_widths(PortVariant &var, const std::vector<int> &widths, const PortWidthDef &width) {
@@ -1073,13 +1073,13 @@ struct Parser {
 			if (dbits[i] == widths[0]) {
 				for (int j = 0; j < GetSize(widths); j++) {
 					if (i+j >= GetSize(dbits) || dbits[i+j] != widths[j]) {
-						log_error("%s:%d: port width %d doesn't match dbits progression.\n", filename.c_str(), line_number, widths[j]);
+						log_error("%s:%d: port width %d doesn't match dbits progression.\n", filename, line_number, widths[j]);
 					}
 				}
 				return {i, i + GetSize(widths) - 1};
 			}
 		}
-		log_error("%s:%d: port width %d invalid for dbits.\n", filename.c_str(), line_number, widths[0]);
+		log_error("%s:%d: port width %d invalid for dbits.\n", filename, line_number, widths[0]);
 	}
 
 	void parse() {
diff --git a/passes/memory/memory_bram.cc b/passes/memory/memory_bram.cc
index 9bc8ad9b0..8ef2c4271 100644
--- a/passes/memory/memory_bram.cc
+++ b/passes/memory/memory_bram.cc
@@ -369,7 +369,7 @@ struct rules_t
 		attr_icase = false;
 
 		if (infile.fail())
-			log_error("Can't open rules file `%s'.\n", filename.c_str());
+			log_error("Can't open rules file `%s'.\n", filename);
 
 		while (next_line())
 		{
@@ -1020,7 +1020,7 @@ void handle_memory(Mem &mem, const rules_t &rules, FfInitVals *initvals)
 
 	log("  Properties:");
 	for (auto &it : match_properties)
-		log(" %s=%d", it.first.c_str(), it.second);
+		log(" %s=%d", it.first, it.second);
 	log("\n");
 
 	pool<pair<IdString, int>> failed_brams;
diff --git a/passes/memory/memory_dff.cc b/passes/memory/memory_dff.cc
index 75c6e6a3a..916b21233 100644
--- a/passes/memory/memory_dff.cc
+++ b/passes/memory/memory_dff.cc
@@ -334,7 +334,7 @@ struct MemoryDffWorker
 	void handle_rd_port(Mem &mem, QuickConeSat &qcsat, int idx)
 	{
 		auto &port = mem.rd_ports[idx];
-		log("Checking read port `%s'[%d] in module `%s': ", mem.memid.c_str(), idx, module->name.c_str());
+		log("Checking read port `%s'[%d] in module `%s': ", mem.memid, idx, module->name);
 
 		std::vector<MuxData> muxdata;
 		SigSpec data = walk_muxes(port.data, muxdata);
@@ -554,7 +554,7 @@ struct MemoryDffWorker
 	void handle_rd_port_addr(Mem &mem, int idx)
 	{
 		auto &port = mem.rd_ports[idx];
-		log("Checking read port address `%s'[%d] in module `%s': ", mem.memid.c_str(), idx, module->name.c_str());
+		log("Checking read port address `%s'[%d] in module `%s': ", mem.memid, idx, module->name);
 
 		FfData ff;
 		pool<std::pair<Cell *, int>> bits;
diff --git a/passes/memory/memory_libmap.cc b/passes/memory/memory_libmap.cc
index 4c7d9636d..0fb4608b1 100644
--- a/passes/memory/memory_libmap.cc
+++ b/passes/memory/memory_libmap.cc
@@ -548,20 +548,20 @@ void MemMapping::determine_style() {
 				// Nothing.
 			} else if (val_s == "logic" || val_s == "registers") {
 				kind = RamKind::Logic;
-				log("found attribute '%s = %s' on memory %s.%s, forced mapping to FF\n", log_id(attr), val_s.c_str(), log_id(mem.module->name), log_id(mem.memid));
+				log("found attribute '%s = %s' on memory %s.%s, forced mapping to FF\n", log_id(attr), val_s, log_id(mem.module->name), log_id(mem.memid));
 			} else if (val_s == "distributed") {
 				kind = RamKind::Distributed;
-				log("found attribute '%s = %s' on memory %s.%s, forced mapping to distributed RAM\n", log_id(attr), val_s.c_str(), log_id(mem.module->name), log_id(mem.memid));
+				log("found attribute '%s = %s' on memory %s.%s, forced mapping to distributed RAM\n", log_id(attr), val_s, log_id(mem.module->name), log_id(mem.memid));
 			} else if (val_s == "block" || val_s == "block_ram" || val_s == "ebr") {
 				kind = RamKind::Block;
-				log("found attribute '%s = %s' on memory %s.%s, forced mapping to block RAM\n", log_id(attr), val_s.c_str(), log_id(mem.module->name), log_id(mem.memid));
+				log("found attribute '%s = %s' on memory %s.%s, forced mapping to block RAM\n", log_id(attr), val_s, log_id(mem.module->name), log_id(mem.memid));
 			} else if (val_s == "huge" || val_s == "ultra") {
 				kind = RamKind::Huge;
-				log("found attribute '%s = %s' on memory %s.%s, forced mapping to huge RAM\n", log_id(attr), val_s.c_str(), log_id(mem.module->name), log_id(mem.memid));
+				log("found attribute '%s = %s' on memory %s.%s, forced mapping to huge RAM\n", log_id(attr), val_s, log_id(mem.module->name), log_id(mem.memid));
 			} else {
 				kind = RamKind::NotLogic;
 				style = val_s;
-				log("found attribute '%s = %s' on memory %s.%s, forced mapping to %s RAM\n", log_id(attr), val_s.c_str(), log_id(mem.module->name), log_id(mem.memid), val_s.c_str());
+				log("found attribute '%s = %s' on memory %s.%s, forced mapping to %s RAM\n", log_id(attr), val_s, log_id(mem.module->name), log_id(mem.memid), val_s);
 			}
 			return;
 		}
diff --git a/passes/memory/memory_map.cc b/passes/memory/memory_map.cc
index 126ec65b5..cc8dce13e 100644
--- a/passes/memory/memory_map.cc
+++ b/passes/memory/memory_map.cc
@@ -192,7 +192,7 @@ struct MemoryMapWorker
 			}
 		}
 
-		log("Mapping memory %s in module %s:\n", mem.memid.c_str(), module->name.c_str());
+		log("Mapping memory %s in module %s:\n", mem.memid, module->name);
 
 		int abits = ceil_log2(mem.size);
 		std::vector<RTLIL::SigSpec> data_reg_in(1 << abits);
diff --git a/passes/memory/memory_share.cc b/passes/memory/memory_share.cc
index a19807f22..6a424952a 100644
--- a/passes/memory/memory_share.cc
+++ b/passes/memory/memory_share.cc
@@ -371,9 +371,9 @@ struct MemoryShareWorker
 				ports += std::to_string(idx);
 			}
 			if (!some_port.clk_enable) {
-				log("  Checking unclocked group, width %d: ports %s.\n", mem.width << some_port.wide_log2, ports.c_str());
+				log("  Checking unclocked group, width %d: ports %s.\n", mem.width << some_port.wide_log2, ports);
 			} else {
-				log("  Checking group clocked with %sedge %s, width %d: ports %s.\n", some_port.clk_polarity ? "pos" : "neg", log_signal(some_port.clk), mem.width << some_port.wide_log2, ports.c_str());
+				log("  Checking group clocked with %sedge %s, width %d: ports %s.\n", some_port.clk_polarity ? "pos" : "neg", log_signal(some_port.clk), mem.width << some_port.wide_log2, ports);
 			}
 
 			// Okay, time to actually run the SAT solver.
diff --git a/passes/opt/opt_clean.cc b/passes/opt/opt_clean.cc
index 620b38813..4dd5ba616 100644
--- a/passes/opt/opt_clean.cc
+++ b/passes/opt/opt_clean.cc
@@ -597,7 +597,7 @@ bool rmunused_module_init(RTLIL::Module *module, bool verbose)
 void rmunused_module(RTLIL::Module *module, bool purge_mode, bool verbose, bool rminit)
 {
 	if (verbose)
-		log("Finding unused cells or wires in module %s..\n", module->name.c_str());
+		log("Finding unused cells or wires in module %s..\n", module->name);
 
 	std::vector<RTLIL::Cell*> delcells;
 	for (auto cell : module->cells())
diff --git a/passes/opt/opt_lut.cc b/passes/opt/opt_lut.cc
index 1625b86ea..97147fc48 100644
--- a/passes/opt/opt_lut.cc
+++ b/passes/opt/opt_lut.cc
@@ -99,7 +99,7 @@ struct OptLutWorker
 		}
 		for (int i = 0; i < GetSize(dlogic); i++)
 		{
-			log("  with %-12s (#%d) %4d\n", dlogic[i].cell_type.c_str(), i, dlogic_counts[i]);
+			log("  with %-12s (#%d) %4d\n", dlogic[i].cell_type, i, dlogic_counts[i]);
 		}
 	}
 
diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index 6c81ee241..fbfdb9b63 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -228,7 +228,7 @@ struct OptMergeWorker
 		ct.cell_types.erase(ID($allseq));
 		ct.cell_types.erase(ID($allconst));
 
-		log("Finding identical cells in module `%s'.\n", module->name.c_str());
+		log("Finding identical cells in module `%s'.\n", module->name);
 		assign_map.set(module);
 
 		initvals.set(&assign_map, module);
diff --git a/passes/opt/opt_muxtree.cc b/passes/opt/opt_muxtree.cc
index 809353f8c..2f7d26dcf 100644
--- a/passes/opt/opt_muxtree.cc
+++ b/passes/opt/opt_muxtree.cc
@@ -205,7 +205,7 @@ struct OptMuxtreeWorker
 	OptMuxtreeWorker(RTLIL::Design *design, RTLIL::Module *module) :
 			design(design), module(module), assign_map(module), removed_count(0)
 	{
-		log("Running muxtree optimizer on module %s..\n", module->name.c_str());
+		log("Running muxtree optimizer on module %s..\n", module->name);
 
 		log("  Creating internal representation of mux trees.\n");
 
diff --git a/passes/opt/opt_reduce.cc b/passes/opt/opt_reduce.cc
index d27878fa7..6d6cadfe7 100644
--- a/passes/opt/opt_reduce.cc
+++ b/passes/opt/opt_reduce.cc
@@ -93,7 +93,7 @@ struct OptReduceWorker
 			new_sig_a = (cell->type == ID($reduce_or)) ? State::S0 : State::S1;
 
 		if (new_sig_a != sig_a || sig_a.size() != cell->getPort(ID::A).size()) {
-			log("    New input vector for %s cell %s: %s\n", cell->type.c_str(), cell->name.c_str(), log_signal(new_sig_a));
+			log("    New input vector for %s cell %s: %s\n", cell->type, cell->name, log_signal(new_sig_a));
 			did_something = true;
 			total_count++;
 		}
@@ -155,7 +155,7 @@ struct OptReduceWorker
 		}
 
 		if (new_sig_s.size() != sig_s.size() || (new_sig_s.size() == 1 && cell->type == ID($pmux))) {
-			log("    New ctrl vector for %s cell %s: %s\n", cell->type.c_str(), cell->name.c_str(), log_signal(new_sig_s));
+			log("    New ctrl vector for %s cell %s: %s\n", cell->type, cell->name, log_signal(new_sig_s));
 			did_something = true;
 			total_count++;
 			cell->setPort(ID::B, new_sig_b);
@@ -242,7 +242,7 @@ struct OptReduceWorker
 		}
 
 		if (new_sig_s.size() != sig_s.size()) {
-			log("    New ctrl vector for %s cell %s: %s\n", cell->type.c_str(), cell->name.c_str(), log_signal(new_sig_s));
+			log("    New ctrl vector for %s cell %s: %s\n", cell->type, cell->name, log_signal(new_sig_s));
 			did_something = true;
 			total_count++;
 			cell->setPort(ID::A, new_sig_a);
@@ -308,7 +308,7 @@ struct OptReduceWorker
 		if (new_sig_s.size() == sig_s.size() && sig_s.size() > 0)
 			return;
 
-		log("    New ctrl vector for %s cell %s: %s\n", cell->type.c_str(), cell->name.c_str(), log_signal(new_sig_s));
+		log("    New ctrl vector for %s cell %s: %s\n", cell->type, cell->name, log_signal(new_sig_s));
 		did_something = true;
 		total_count++;
 
@@ -388,7 +388,7 @@ struct OptReduceWorker
 
 		if (GetSize(swizzle) != width)
 		{
-			log("    Consolidated identical input bits for %s cell %s:\n", cell->type.c_str(), cell->name.c_str());
+			log("    Consolidated identical input bits for %s cell %s:\n", cell->type, cell->name);
 			if (cell->type != ID($bmux)) {
 				log("      Old ports: A=%s, B=%s, Y=%s\n", log_signal(cell->getPort(ID::A)),
 						log_signal(cell->getPort(ID::B)), log_signal(cell->getPort(ID::Y)));
@@ -479,7 +479,7 @@ struct OptReduceWorker
 
 		if (GetSize(swizzle) != width)
 		{
-			log("    Consolidated identical input bits for %s cell %s:\n", cell->type.c_str(), cell->name.c_str());
+			log("    Consolidated identical input bits for %s cell %s:\n", cell->type, cell->name);
 			log("      Old ports: A=%s, Y=%s\n", log_signal(cell->getPort(ID::A)),
 					log_signal(cell->getPort(ID::Y)));
 
@@ -515,7 +515,7 @@ struct OptReduceWorker
 	OptReduceWorker(RTLIL::Design *design, RTLIL::Module *module, bool do_fine) :
 			design(design), module(module), assign_map(module)
 	{
-		log("  Optimizing cells in module %s.\n", module->name.c_str());
+		log("  Optimizing cells in module %s.\n", module->name);
 
 		total_count = 0;
 		did_something = true;
diff --git a/passes/opt/rmports.cc b/passes/opt/rmports.cc
index 0ac391790..3a39570b4 100644
--- a/passes/opt/rmports.cc
+++ b/passes/opt/rmports.cc
@@ -64,7 +64,7 @@ struct RmportsPassPass : public Pass {
 
 	void CleanupModule(Module *module, dict<IdString, pool<IdString>> &removed_ports)
 	{
-		log("Removing now-unused cell ports in module %s\n", module->name.c_str());
+		log("Removing now-unused cell ports in module %s\n", module->name);
 
 		auto cells = module->cells();
 		for(auto cell : cells)
@@ -88,7 +88,7 @@ struct RmportsPassPass : public Pass {
 
 	void ScanModule(Module* module, dict<IdString, pool<IdString>> &removed_ports)
 	{
-		log("Finding unconnected ports in module %s\n", module->name.c_str());
+		log("Finding unconnected ports in module %s\n", module->name);
 
 		pool<IdString> used_ports;
 
@@ -113,7 +113,7 @@ struct RmportsPassPass : public Pass {
 				if( (w1 == NULL) || (w2 == NULL) )
 					continue;
 
-				//log("  conn %s, %s\n", w1->name.c_str(), w2->name.c_str());
+				//log("  conn %s, %s\n", w1->name, w2->name);
 
 				if( (w1->port_input || w1->port_output) && (used_ports.find(w1->name) == used_ports.end()) )
 					used_ports.insert(w1->name);
@@ -136,7 +136,7 @@ struct RmportsPassPass : public Pass {
 					if(sig == NULL)
 						continue;
 
-					// log("  sig %s\n", sig->name.c_str());
+					// log("  sig %s\n", sig->name);
 					if( (sig->port_input || sig->port_output) && (used_ports.find(sig->name) == used_ports.end()) )
 						used_ports.insert(sig->name);
 				}
@@ -155,7 +155,7 @@ struct RmportsPassPass : public Pass {
 		// Print the ports out as we go through them
 		for(auto port : unused_ports)
 		{
-			log("  removing unused port %s\n", port.c_str());
+			log("  removing unused port %s\n", port);
 			removed_ports[module->name].insert(port);
 
 			// Remove from ports list
diff --git a/passes/pmgen/pmgen.py b/passes/pmgen/pmgen.py
index 97c6f5600..d2adbbdd9 100644
--- a/passes/pmgen/pmgen.py
+++ b/passes/pmgen/pmgen.py
@@ -454,7 +454,7 @@ with open(outfile, "w") as f:
     print("  SigSpec port(Cell *cell, IdString portname) {", file=f)
     print("    try {", file=f)
     print("      return sigmap(cell->getPort(portname));", file=f)
-    print("    } catch(std::out_of_range&) { log_error(\"Accessing non existing port %s\\n\",portname.c_str()); }", file=f)
+    print("    } catch(std::out_of_range&) { log_error(\"Accessing non existing port %s\\n\",portname); }", file=f)
     print("  }", file=f)
     print("", file=f)
     print("  SigSpec port(Cell *cell, IdString portname, const SigSpec& defval) {", file=f)
@@ -465,7 +465,7 @@ with open(outfile, "w") as f:
     print("  Const param(Cell *cell, IdString paramname) {", file=f)
     print("    try {", file=f)
     print("      return cell->getParam(paramname);", file=f)
-    print("    } catch(std::out_of_range&) { log_error(\"Accessing non existing parameter %s\\n\",paramname.c_str()); }", file=f)
+    print("    } catch(std::out_of_range&) { log_error(\"Accessing non existing parameter %s\\n\",paramname); }", file=f)
     print("  }", file=f)
     print("", file=f)
     print("  Const param(Cell *cell, IdString paramname, const Const& defval) {", file=f)
diff --git a/passes/proc/proc_arst.cc b/passes/proc/proc_arst.cc
index 3cd3f6fe4..92d8d0569 100644
--- a/passes/proc/proc_arst.cc
+++ b/passes/proc/proc_arst.cc
@@ -204,7 +204,7 @@ void proc_arst(RTLIL::Module *mod, RTLIL::Process *proc, SigMap &assign_map)
 			bool polarity = sync->type == RTLIL::SyncType::STp;
 			if (check_signal(mod, root_sig, sync->signal, polarity)) {
 				if (edge_syncs.size() > 1) {
-					log("Found async reset %s in `%s.%s'.\n", log_signal(sync->signal), mod->name.c_str(), proc->name.c_str());
+					log("Found async reset %s in `%s.%s'.\n", log_signal(sync->signal), mod->name, proc->name);
 					sync->type = sync->type == RTLIL::SyncType::STp ? RTLIL::SyncType::ST1 : RTLIL::SyncType::ST0;
 					arst_syncs.push_back(sync);
 					edge_syncs.erase(it);
@@ -223,7 +223,7 @@ void proc_arst(RTLIL::Module *mod, RTLIL::Process *proc, SigMap &assign_map)
 					sync->mem_write_actions.clear();
 					eliminate_const(mod, &proc->root_case, root_sig, polarity);
 				} else {
-					log("Found VHDL-style edge-trigger %s in `%s.%s'.\n", log_signal(sync->signal), mod->name.c_str(), proc->name.c_str());
+					log("Found VHDL-style edge-trigger %s in `%s.%s'.\n", log_signal(sync->signal), mod->name, proc->name);
 					eliminate_const(mod, &proc->root_case, root_sig, !polarity);
 				}
 				did_something = true;
diff --git a/passes/proc/proc_clean.cc b/passes/proc/proc_clean.cc
index b8bd74f50..19c2be4ca 100644
--- a/passes/proc/proc_clean.cc
+++ b/passes/proc/proc_clean.cc
@@ -171,7 +171,7 @@ void proc_clean(RTLIL::Module *mod, RTLIL::Process *proc, int &total_count, bool
 		proc_clean_case(&proc->root_case, did_something, count, -1);
 	}
 	if (count > 0 && !quiet)
-		log("Found and cleaned up %d empty switch%s in `%s.%s'.\n", count, count == 1 ? "" : "es", mod->name.c_str(), proc->name.c_str());
+		log("Found and cleaned up %d empty switch%s in `%s.%s'.\n", count, count == 1 ? "" : "es", mod->name, proc->name);
 	total_count += count;
 }
 
@@ -215,7 +215,7 @@ struct ProcCleanPass : public Pass {
 				if (proc->syncs.size() == 0 && proc->root_case.switches.size() == 0 &&
 						proc->root_case.actions.size() == 0) {
 					if (!quiet)
-						log("Removing empty process `%s.%s'.\n", log_id(mod), proc->name.c_str());
+						log("Removing empty process `%s.%s'.\n", log_id(mod), proc->name);
 					delme.push_back(proc);
 				}
 			}
diff --git a/passes/proc/proc_dff.cc b/passes/proc/proc_dff.cc
index 7e3c56552..06c740a88 100644
--- a/passes/proc/proc_dff.cc
+++ b/passes/proc/proc_dff.cc
@@ -106,7 +106,7 @@ void gen_aldff(RTLIL::Module *mod, RTLIL::SigSpec sig_in, RTLIL::SigSpec sig_set
 	cell->setPort(ID::CLK, clk);
 	cell->setPort(ID::ALOAD, set);
 
-	log("  created %s cell `%s' with %s edge clock and %s level non-const reset.\n", cell->type.c_str(), cell->name.c_str(),
+	log("  created %s cell `%s' with %s edge clock and %s level non-const reset.\n", cell->type, cell->name,
 			clk_polarity ? "positive" : "negative", set_polarity ? "positive" : "negative");
 }
 
@@ -136,9 +136,9 @@ void gen_dff(RTLIL::Module *mod, RTLIL::SigSpec sig_in, RTLIL::Const val_rst, RT
 		cell->setPort(ID::CLK, clk);
 
 	if (!clk.empty())
-		log("  created %s cell `%s' with %s edge clock", cell->type.c_str(), cell->name.c_str(), clk_polarity ? "positive" : "negative");
+		log("  created %s cell `%s' with %s edge clock", cell->type, cell->name, clk_polarity ? "positive" : "negative");
 	else
-		log("  created %s cell `%s' with global clock", cell->type.c_str(), cell->name.c_str());
+		log("  created %s cell `%s' with global clock", cell->type, cell->name);
 	if (arst)
 		log(" and %s level reset", arst_polarity ? "positive" : "negative");
 	log(".\n");
diff --git a/passes/proc/proc_dlatch.cc b/passes/proc/proc_dlatch.cc
index f170dbf36..bda2d272f 100644
--- a/passes/proc/proc_dlatch.cc
+++ b/passes/proc/proc_dlatch.cc
@@ -404,7 +404,7 @@ void proc_dlatch(proc_dlatch_db_t &db, RTLIL::Process *proc)
 		for (auto &bit : lhs) {
 			State val = db.initvals(bit);
 			if (db.initvals(bit) != State::Sx) {
-				log("Removing init bit %s for non-memory siginal `%s.%s` in process `%s.%s`.\n", log_signal(val), db.module->name.c_str(), log_signal(bit), db.module->name.c_str(), proc->name.c_str());
+				log("Removing init bit %s for non-memory siginal `%s.%s` in process `%s.%s`.\n", log_signal(val), db.module->name, log_signal(bit), db.module->name, proc->name);
 			}
 			db.initvals.remove_init(bit);
 		}
diff --git a/passes/proc/proc_init.cc b/passes/proc/proc_init.cc
index 817ced404..99cacf5fd 100644
--- a/passes/proc/proc_init.cc
+++ b/passes/proc/proc_init.cc
@@ -31,7 +31,7 @@ void proc_init(RTLIL::Module *mod, SigMap &sigmap, RTLIL::Process *proc)
 	for (auto &sync : proc->syncs)
 		if (sync->type == RTLIL::SyncType::STi)
 		{
-			log("Found init rule in `%s.%s'.\n", mod->name.c_str(), proc->name.c_str());
+			log("Found init rule in `%s.%s'.\n", mod->name, proc->name);
 
 			for (auto &action : sync->actions)
 			{
diff --git a/passes/proc/proc_mux.cc b/passes/proc/proc_mux.cc
index 21afdf134..68127d1bc 100644
--- a/passes/proc/proc_mux.cc
+++ b/passes/proc/proc_mux.cc
@@ -412,7 +412,7 @@ RTLIL::SigSpec signal_to_mux_tree(RTLIL::Module *mod, SnippetSwCache &swcache, d
 
 void proc_mux(RTLIL::Module *mod, RTLIL::Process *proc, bool ifxmode)
 {
-	log("Creating decoders for process `%s.%s'.\n", mod->name.c_str(), proc->name.c_str());
+	log("Creating decoders for process `%s.%s'.\n", mod->name, proc->name);
 
 	SigSnippets sigsnip;
 	sigsnip.insert(&proc->root_case);
diff --git a/passes/sat/eval.cc b/passes/sat/eval.cc
index 7008e35e1..bde5e1ecb 100644
--- a/passes/sat/eval.cc
+++ b/passes/sat/eval.cc
@@ -87,7 +87,7 @@ struct BruteForceEquivChecker
 	BruteForceEquivChecker(RTLIL::Module *mod1, RTLIL::Module *mod2, bool ignore_x_mod1) :
 			mod1(mod1), mod2(mod2), counter(0), errors(0), ignore_x_mod1(ignore_x_mod1)
 	{
-		log("Checking for equivalence (brute-force): %s vs %s\n", mod1->name.c_str(), mod2->name.c_str());
+		log("Checking for equivalence (brute-force): %s vs %s\n", mod1->name, mod2->name);
 		for (auto w : mod1->wires())
 		{
 			if (w->port_id == 0)
@@ -264,7 +264,7 @@ struct VlogHammerReporter
 						if (!ce.eval(sig))
 							log_error("Can't read back value for port %s!\n", log_id(inputs[i]));
 						input_pattern_list += stringf(" %s", sig.as_const().as_string());
-						log("++PAT++ %d %s %s #\n", idx, log_id(inputs[i]), sig.as_const().as_string().c_str());
+						log("++PAT++ %d %s %s #\n", idx, log_id(inputs[i]), sig.as_const().as_string());
 					}
 				}
 
@@ -280,7 +280,7 @@ struct VlogHammerReporter
 					ce.set(undef, RTLIL::Const(RTLIL::State::Sx, undef.size()));
 				}
 
-				log("++VAL++ %d %s %s #\n", idx, module_name.c_str(), sig.as_const().as_string().c_str());
+				log("++VAL++ %d %s %s #\n", idx, module_name, sig.as_const().as_string());
 
 				if (module_name == "rtl") {
 					rtl_sig = sig;
@@ -294,7 +294,7 @@ struct VlogHammerReporter
 							sig[i] = RTLIL::State::Sx;
 				}
 
-				log("++RPT++ %d%s %s %s\n", idx, input_pattern_list.c_str(), sig.as_const().as_string().c_str(), module_name.c_str());
+				log("++RPT++ %d%s %s %s\n", idx, input_pattern_list, sig.as_const().as_string(), module_name);
 			}
 
 			log("++RPT++ ----\n");
@@ -307,8 +307,8 @@ struct VlogHammerReporter
 		for (auto name : split(module_list, ",")) {
 			RTLIL::IdString esc_name = RTLIL::escape_id(module_prefix + name);
 			if (design->module(esc_name) == nullptr)
-				log_error("Can't find module %s in current design!\n", name.c_str());
-			log("Using module %s (%s).\n", esc_name.c_str(), name.c_str());
+				log_error("Can't find module %s in current design!\n", name);
+			log("Using module %s (%s).\n", esc_name, name);
 			modules.push_back(design->module(esc_name));
 			module_names.push_back(name);
 		}
@@ -319,15 +319,15 @@ struct VlogHammerReporter
 			RTLIL::IdString esc_name = RTLIL::escape_id(name);
 			for (auto mod : modules) {
 				if (mod->wire(esc_name) == nullptr)
-					log_error("Can't find input %s in module %s!\n", name.c_str(), log_id(mod->name));
+					log_error("Can't find input %s in module %s!\n", name, log_id(mod->name));
 				RTLIL::Wire *port = mod->wire(esc_name);
 				if (!port->port_input || port->port_output)
-					log_error("Wire %s in module %s is not an input!\n", name.c_str(), log_id(mod->name));
+					log_error("Wire %s in module %s is not an input!\n", name, log_id(mod->name));
 				if (width >= 0 && width != port->width)
-					log_error("Port %s has different sizes in the different modules!\n", name.c_str());
+					log_error("Port %s has different sizes in the different modules!\n", name);
 				width = port->width;
 			}
-			log("Using input port %s with width %d.\n", esc_name.c_str(), width);
+			log("Using input port %s with width %d.\n", esc_name, width);
 			inputs.push_back(esc_name);
 			input_widths.push_back(width);
 			total_input_width += width;
@@ -341,9 +341,9 @@ struct VlogHammerReporter
 				pattern = pattern.substr(1);
 			}
 			if (!RTLIL::SigSpec::parse(sig, NULL, pattern) || !sig.is_fully_const())
-				log_error("Failed to parse pattern %s!\n", pattern.c_str());
+				log_error("Failed to parse pattern %s!\n", pattern);
 			if (sig.size() < total_input_width)
-				log_error("Pattern %s is to short!\n", pattern.c_str());
+				log_error("Pattern %s is to short!\n", pattern);
 			patterns.push_back(sig.as_const());
 			if (invert_pattern) {
 				for (auto &bit : patterns.back().bits())
@@ -352,7 +352,7 @@ struct VlogHammerReporter
 					else if (bit == RTLIL::State::S1)
 						bit = RTLIL::State::S0;
 			}
-			log("Using pattern %s.\n", patterns.back().as_string().c_str());
+			log("Using pattern %s.\n", patterns.back().as_string());
 		}
 	}
 };
@@ -415,9 +415,9 @@ struct EvalPass : public Pass {
 				std::string mod1_name = RTLIL::escape_id(args[++argidx]);
 				std::string mod2_name = RTLIL::escape_id(args[++argidx]);
 				if (design->module(mod1_name) == nullptr)
-					log_error("Can't find module `%s'!\n", mod1_name.c_str());
+					log_error("Can't find module `%s'!\n", mod1_name);
 				if (design->module(mod2_name) == nullptr)
-					log_error("Can't find module `%s'!\n", mod2_name.c_str());
+					log_error("Can't find module `%s'!\n", mod2_name);
 				BruteForceEquivChecker checker(design->module(mod1_name), design->module(mod2_name), args[argidx-2] == "-brute_force_equiv_checker_x");
 				if (checker.errors > 0)
 					log_cmd_error("Modules are not equivalent!\n");
@@ -574,7 +574,7 @@ struct EvalPass : public Pass {
 			for (auto &row : tab) {
 				for (size_t i = 0; i < row.size(); i++) {
 					int k = int(i) < tab_sep_colidx ? tab_sep_colidx - i - 1 : i;
-					log(" %s%*s", k == tab_sep_colidx ? "| " : "", tab_column_width[k], row[k].c_str());
+					log(" %s%*s", k == tab_sep_colidx ? "| " : "", tab_column_width[k], row[k]);
 				}
 				log("\n");
 				if (first) {
diff --git a/passes/sat/fminit.cc b/passes/sat/fminit.cc
index 547082164..4627a6c96 100644
--- a/passes/sat/fminit.cc
+++ b/passes/sat/fminit.cc
@@ -109,7 +109,7 @@ struct FminitPass : public Pass {
 		SigSpec clksig;
 		if (!clocksignal.empty()) {
 			if (!SigSpec::parse(clksig, module, clocksignal))
-				log_error("Error parsing expression '%s'.\n", clocksignal.c_str());
+				log_error("Error parsing expression '%s'.\n", clocksignal);
 		}
 
 		for (auto &it : setdata)
@@ -117,10 +117,10 @@ struct FminitPass : public Pass {
 			SigSpec lhs, rhs;
 
 			if (!SigSpec::parse(lhs, module, it.first))
-				log_error("Error parsing expression '%s'.\n", it.first.c_str());
+				log_error("Error parsing expression '%s'.\n", it.first);
 
 			if (!SigSpec::parse_rhs(lhs, rhs, module, it.second))
-				log_error("Error parsing expression '%s'.\n", it.second.c_str());
+				log_error("Error parsing expression '%s'.\n", it.second);
 
 			SigSpec final_lhs, final_rhs;
 
@@ -144,7 +144,7 @@ struct FminitPass : public Pass {
 			SigSpec lhs, rhs;
 
 			if (!SigSpec::parse(lhs, module, it.first))
-				log_error("Error parsing expression '%s'.\n", it.first.c_str());
+				log_error("Error parsing expression '%s'.\n", it.first);
 
 			for (int i = 0; i < GetSize(it.second); i++)
 			{
@@ -183,7 +183,7 @@ struct FminitPass : public Pass {
 				SigSpec final_lhs, final_rhs;
 
 				if (!SigSpec::parse_rhs(lhs, rhs, module, it.second[i]))
-					log_error("Error parsing expression '%s'.\n", it.second[i].c_str());
+					log_error("Error parsing expression '%s'.\n", it.second[i]);
 
 				for (int i = 0; i < GetSize(rhs); i++)
 					if (rhs[i] != State::Sz) {
diff --git a/passes/sat/freduce.cc b/passes/sat/freduce.cc
index 870df7b55..4b0669c25 100644
--- a/passes/sat/freduce.cc
+++ b/passes/sat/freduce.cc
@@ -247,7 +247,7 @@ struct PerformReduction
 			string loop_signals;
 			for (auto loop_bit : recursion_guard)
 				loop_signals += string(" ") + log_signal(loop_bit);
-			log_error("Found logic loop:%s\n", loop_signals.c_str());
+			log_error("Found logic loop:%s\n", loop_signals);
 		}
 
 		recursion_guard.insert(out);
@@ -596,7 +596,7 @@ struct FreduceWorker
 	void dump()
 	{
 		std::string filename = stringf("%s_%s_%05d.il", dump_prefix, RTLIL::id2cstr(module->name), reduce_counter);
-		log("%s    Writing dump file `%s'.\n", reduce_counter ? "  " : "", filename.c_str());
+		log("%s    Writing dump file `%s'.\n", reduce_counter ? "  " : "", filename);
 		Pass::call(design, stringf("dump -outfile %s %s", filename, design->selected_active_module.empty() ? module->name.c_str() : ""));
 	}
 
diff --git a/passes/sat/mutate.cc b/passes/sat/mutate.cc
index 7aef9ea38..58d932f20 100644
--- a/passes/sat/mutate.cc
+++ b/passes/sat/mutate.cc
@@ -539,7 +539,7 @@ void mutate_list(Design *design, const mutate_opts_t &opts, const string &filena
 		std::ofstream sout;
 		sout.open(srcsfile, std::ios::out | std::ios::trunc);
 		if (!sout.is_open())
-			log_error("Could not open file \"%s\" with write access.\n", srcsfile.c_str());
+			log_error("Could not open file \"%s\" with write access.\n", srcsfile);
 		sources.sort();
 		for (auto &s : sources)
 			sout << s << std::endl;
@@ -550,7 +550,7 @@ void mutate_list(Design *design, const mutate_opts_t &opts, const string &filena
 	if (!filename.empty()) {
 		fout.open(filename, std::ios::out | std::ios::trunc);
 		if (!fout.is_open())
-			log_error("Could not open file \"%s\" with write access.\n", filename.c_str());
+			log_error("Could not open file \"%s\" with write access.\n", filename);
 	}
 
 	int ctrl_value = opts.ctrl_value;
@@ -561,7 +561,7 @@ void mutate_list(Design *design, const mutate_opts_t &opts, const string &filena
 			str += stringf(" -ctrl %s %d %d", log_id(opts.ctrl_name), opts.ctrl_width, ctrl_value++);
 		str += " -mode none";
 		if (filename.empty())
-			log("%s\n", str.c_str());
+			log("%s\n", str);
 		else
 			fout << str << std::endl;
 	}
@@ -588,7 +588,7 @@ void mutate_list(Design *design, const mutate_opts_t &opts, const string &filena
 		for (auto &s : entry.src)
 			str += stringf(" -src %s", s);
 		if (filename.empty())
-			log("%s\n", str.c_str());
+			log("%s\n", str);
 		else
 			fout << str << std::endl;
 	}
diff --git a/passes/sat/qbfsat.cc b/passes/sat/qbfsat.cc
index c7ddb9168..20cee7956 100644
--- a/passes/sat/qbfsat.cc
+++ b/passes/sat/qbfsat.cc
@@ -122,7 +122,7 @@ void specialize_from_file(RTLIL::Module *module, const std::string &file) {
 	for (auto &it : hole_assignments) {
 		RTLIL::SigSpec lhs(it.first);
 		RTLIL::SigSpec rhs(it.second);
-		log("Specializing %s from file with %s = %d.\n", module->name.c_str(), log_signal(it.first), it.second == RTLIL::State::S1? 1 : 0);
+		log("Specializing %s from file with %s = %d.\n", module->name, log_signal(it.first), it.second == RTLIL::State::S1? 1 : 0);
 		module->connect(lhs, rhs);
 	}
 }
@@ -151,7 +151,7 @@ void specialize(RTLIL::Module *module, const QbfSolutionType &sol, bool quiet =
 			RTLIL::SigSpec lhs(hole_sigbit.wire, hole_sigbit.offset, 1);
 			RTLIL::State hole_bit_val = hole_value[bit_idx] == '1'? RTLIL::State::S1 : RTLIL::State::S0;
 			if (!quiet)
-				log("Specializing %s with %s = %d.\n", module->name.c_str(), log_signal(hole_sigbit), hole_bit_val == RTLIL::State::S0? 0 : 1)
+				log("Specializing %s with %s = %d.\n", module->name, log_signal(hole_sigbit), hole_bit_val == RTLIL::State::S0? 0 : 1)
 ;
 			module->connect(lhs, hole_bit_val);
 		}
@@ -168,7 +168,7 @@ void allconstify_inputs(RTLIL::Module *module, const pool<std::string> &input_wi
 		allconst->setPort(ID::Y, input);
 		allconst->set_src_attribute(input->get_src_attribute());
 		input->port_input = false;
-		log("Replaced input %s with $allconst cell.\n", n.c_str());
+		log("Replaced input %s with $allconst cell.\n", n);
 	}
 	module->fixup_ports();
 }
@@ -184,7 +184,7 @@ void assume_miter_outputs(RTLIL::Module *module, bool assume_neg) {
 	else {
 		log("Adding $assume cell for output(s): ");
 		for (auto w : wires_to_assume)
-			log("\"%s\" ", w->name.c_str());
+			log("\"%s\" ", w->name);
 		log("\n");
 	}
 
@@ -236,10 +236,10 @@ QbfSolutionType call_qbf_solver(RTLIL::Module *mod, const QbfSolveOptions &opt,
 			log_warning("%s", line.substr(warning_pos + smtbmc_warning.size() + 1).c_str());
 		else
 			if (opt.show_smtbmc && !quiet)
-				log("smtbmc output: %s", line.c_str());
+				log("smtbmc output: %s", line);
 	};
 	log_header(mod->design, "Solving QBF-SAT problem.\n");
-	if (!quiet) log("Launching \"%s\".\n", smtbmc_cmd.c_str());
+	if (!quiet) log("Launching \"%s\".\n", smtbmc_cmd);
 	int64_t begin = PerformanceTimer::query();
 	run_command(smtbmc_cmd, process_line);
 	int64_t end = PerformanceTimer::query();
@@ -303,7 +303,7 @@ QbfSolutionType qbf_solve(RTLIL::Module *mod, const QbfSolveOptions &opt) {
 
 		log_assert(wire_to_optimize_name != "");
 		log_assert(module->wire(wire_to_optimize_name) != nullptr);
-		log("%s wire \"%s\".\n", (maximize? "Maximizing" : "Minimizing"), wire_to_optimize_name.c_str());
+		log("%s wire \"%s\".\n", (maximize? "Maximizing" : "Minimizing"), wire_to_optimize_name);
 
 		//If maximizing, grow until we get a failure.  Then bisect success and failure.
 		while (failure == 0 || difference(success, failure) > 1) {
@@ -316,7 +316,7 @@ QbfSolutionType qbf_solve(RTLIL::Module *mod, const QbfSolveOptions &opt) {
 				                                    : module->Le(NEW_ID, module->wire(wire_to_optimize_name), RTLIL::Const(cur_thresh), false);
 
 				module->addAssume(wire_to_optimize_name.str() + "__threshold", comparator, RTLIL::Const(1, 1));
-				log("Trying to solve with %s %s %d.\n", wire_to_optimize_name.c_str(), (maximize? ">=" : "<="), cur_thresh);
+				log("Trying to solve with %s %s %d.\n", wire_to_optimize_name, (maximize? ">=" : "<="), cur_thresh);
 			}
 
 			ret = call_qbf_solver(module, opt, tempdir_name, false, iter_num);
@@ -337,7 +337,7 @@ QbfSolutionType qbf_solve(RTLIL::Module *mod, const QbfSolveOptions &opt) {
 				log_assert(value.is_fully_const());
 				success = value.as_const().as_int();
 				best_soln = ret;
-				log("Problem is satisfiable with %s = %d.\n", wire_to_optimize_name.c_str(), success);
+				log("Problem is satisfiable with %s = %d.\n", wire_to_optimize_name, success);
 				Pass::call(design, "design -pop");
 				module = design->module(module_name);
 
@@ -355,7 +355,7 @@ QbfSolutionType qbf_solve(RTLIL::Module *mod, const QbfSolveOptions &opt) {
 					break;
 				}
 				else
-					log("Problem is NOT satisfiable with %s %s %d.\n", wire_to_optimize_name.c_str(), (maximize? ">=" : "<="), failure);
+					log("Problem is NOT satisfiable with %s %s %d.\n", wire_to_optimize_name, (maximize? ">=" : "<="), failure);
 			}
 
 			iter_num++;
@@ -367,7 +367,7 @@ QbfSolutionType qbf_solve(RTLIL::Module *mod, const QbfSolveOptions &opt) {
 				cur_thresh = (success + failure) / 2; //bisection
 		}
 		if (success != 0 || failure != 0) {
-			log("Wire %s is %s at %d.\n", wire_to_optimize_name.c_str(), (maximize? "maximized" : "minimized"), success);
+			log("Wire %s is %s at %d.\n", wire_to_optimize_name, (maximize? "maximized" : "minimized"), success);
 			ret = best_soln;
 		}
 	}
diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc
index 60e099097..967cb0472 100644
--- a/passes/sat/sat.cc
+++ b/passes/sat/sat.cc
@@ -652,9 +652,9 @@ struct SatHelper
 				log("  ");
 
 			if (info.width <= 32 && !found_undef)
-				log("%-*s %11d %9x %*s\n", maxModelName+5, info.description.c_str(), value.as_int(), value.as_int(), maxModelWidth+3, value.as_string().c_str());
+				log("%-*s %11d %9x %*s\n", maxModelName+5, info.description, value.as_int(), value.as_int(), maxModelWidth+3, value.as_string());
 			else
-				log("%-*s %11s %9s %*s\n", maxModelName+5, info.description.c_str(), "--", "--", maxModelWidth+3, value.as_string().c_str());
+				log("%-*s %11s %9s %*s\n", maxModelName+5, info.description, "--", "--", maxModelWidth+3, value.as_string());
 		}
 
 		if (last_timestep == -2)
@@ -668,7 +668,7 @@ struct SatHelper
 		if (!f)
 			log_cmd_error("Can't open output file `%s' for writing: %s\n", vcd_file_name.c_str(), strerror(errno));
 
-		log("Dumping SAT model to VCD file %s\n", vcd_file_name.c_str());
+		log("Dumping SAT model to VCD file %s\n", vcd_file_name);
 
 		time_t timestamp;
 		struct tm* now;
@@ -772,7 +772,7 @@ struct SatHelper
 		if (!f)
 			log_cmd_error("Can't open output file `%s' for writing: %s\n", json_file_name.c_str(), strerror(errno));
 
-		log("Dumping SAT model to WaveJSON file '%s'.\n", json_file_name.c_str());
+		log("Dumping SAT model to WaveJSON file '%s'.\n", json_file_name);
 
 		int mintime = 1, maxtime = 0, maxwidth = 0;;
 		dict<string, pair<int, dict<int, Const>>> wavedata;
@@ -1530,7 +1530,7 @@ struct SatPass : public Pass {
 							if (!f)
 								log_cmd_error("Can't open output file `%s' for writing: %s\n", cnf_file_name.c_str(), strerror(errno));
 
-							log("Dumping CNF to file `%s'.\n", cnf_file_name.c_str());
+							log("Dumping CNF to file `%s'.\n", cnf_file_name);
 							cnf_file_name.clear();
 
 							inductstep.ez->printDIMACS(f, false);
@@ -1634,7 +1634,7 @@ struct SatPass : public Pass {
 				if (!f)
 					log_cmd_error("Can't open output file `%s' for writing: %s\n", cnf_file_name.c_str(), strerror(errno));
 
-				log("Dumping CNF to file `%s'.\n", cnf_file_name.c_str());
+				log("Dumping CNF to file `%s'.\n", cnf_file_name);
 				cnf_file_name.clear();
 
 				sathelper.ez->printDIMACS(f, false);
diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index 044bd8acb..0510bc7df 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -60,10 +60,10 @@ static double stringToTime(std::string str)
 	long value = strtol(str.c_str(), &endptr, 10);
 
 	if (g_units.find(endptr)==g_units.end())
-		log_error("Cannot parse '%s', bad unit '%s'\n", str.c_str(), endptr);
+		log_error("Cannot parse '%s', bad unit '%s'\n", str, endptr);
 
 	if (value < 0)
-		log_error("Time value '%s' must be positive\n", str.c_str());
+		log_error("Time value '%s' must be positive\n", str);
 
 	return value * pow(10.0, g_units.at(endptr));
 }
@@ -430,7 +430,7 @@ struct SimInstance
 				value.bits().push_back(State::Sz);
 
 		if (shared->debug)
-			log("[%s] get %s: %s\n", hiername().c_str(), log_signal(sig), log_signal(value));
+			log("[%s] get %s: %s\n", hiername(), log_signal(sig), log_signal(value));
 		return value;
 	}
 
@@ -449,7 +449,7 @@ struct SimInstance
 			}
 
 		if (shared->debug)
-			log("[%s] set %s: %s\n", hiername().c_str(), log_signal(sig), log_signal(value));
+			log("[%s] set %s: %s\n", hiername(), log_signal(sig), log_signal(value));
 		return did_something;
 	}
 
@@ -551,7 +551,7 @@ struct SimInstance
 			if (has_y) sig_y = cell->getPort(ID::Y);
 
 			if (shared->debug)
-				log("[%s] eval %s (%s)\n", hiername().c_str(), log_id(cell), log_id(cell->type));
+				log("[%s] eval %s (%s)\n", hiername(), log_id(cell), log_id(cell->type));
 
 			// Simple (A -> Y) and (A,B -> Y) cells
 			if (has_a && !has_c && !has_d && !has_s && has_y) {
@@ -793,14 +793,14 @@ struct SimInstance
 	static void log_source(RTLIL::AttrObject *src)
 	{
 		for (auto src : src->get_strpool_attribute(ID::src))
-			log("    %s\n", src.c_str());
+			log("    %s\n", src);
 	}
 
 	void log_cell_w_hierarchy(std::string opening_verbiage, RTLIL::Cell *cell)
 	{
 		log_assert(cell->module == module);
 		bool has_src = cell->has_attribute(ID::src);
-		log("%s %s%s\n", opening_verbiage.c_str(),
+		log("%s %s%s\n", opening_verbiage,
 			log_id(cell), has_src ? " at" : "");
 		log_source(cell);
 
@@ -894,7 +894,7 @@ struct SimInstance
 					}
 
 					std::string rendered = print.fmt.render();
-					log("%s", rendered.c_str());
+					log("%s", rendered);
 					shared->display_output.emplace_back(shared->step, this, cell, rendered);
 				}
 			}
@@ -921,15 +921,15 @@ struct SimInstance
 				}
 
 				if (cell->type == ID($cover) && en == State::S1 && a == State::S1)
-					log("Cover %s.%s (%s) reached.\n", hiername().c_str(), log_id(cell), label.c_str());
+					log("Cover %s.%s (%s) reached.\n", hiername(), log_id(cell), label);
 
 				if (cell->type == ID($assume) && en == State::S1 && a != State::S1)
-					log("Assumption %s.%s (%s) failed.\n", hiername().c_str(), log_id(cell), label.c_str());
+					log("Assumption %s.%s (%s) failed.\n", hiername(), log_id(cell), label);
 
 				if (cell->type == ID($assert) && en == State::S1 && a != State::S1) {
 					log_cell_w_hierarchy("Failed assertion", cell);
 					if (shared->serious_asserts)
-						log_error("Assertion %s.%s (%s) failed.\n", hiername().c_str(), log_id(cell), label.c_str());
+						log_error("Assertion %s.%s (%s) failed.\n", hiername(), log_id(cell), label);
 					else
 						log_warning("Assertion %s.%s (%s) failed.\n", hiername().c_str(), log_id(cell), label.c_str());
 				}
@@ -952,7 +952,7 @@ struct SimInstance
 	{
 		if (!ff_database.empty() || !mem_database.empty()) {
 			if (wbmods.count(module))
-				log_error("Instance %s of module %s is not unique: Writeback not possible. (Fix by running 'uniquify'.)\n", hiername().c_str(), log_id(module));
+				log_error("Instance %s of module %s is not unique: Writeback not possible. (Fix by running 'uniquify'.)\n", hiername(), log_id(module));
 			wbmods.insert(module);
 		}
 
@@ -1192,7 +1192,7 @@ struct SimInstance
 						}
 					}
 					if (!found)
-						log_error("Unable to find required '%s' signal in file\n",(scope + "." + RTLIL::unescape_id(sig_y.as_wire()->name)).c_str());
+						log_error("Unable to find required '%s' signal in file\n",(scope + "." + RTLIL::unescape_id(sig_y.as_wire()->name)));
 				}
 			}
 		}
@@ -1478,7 +1478,7 @@ struct SimWorker : SimShared
 				log_error("Clock port %s on module %s is not input.\n", log_id(portname), log_id(top->module));
 			fstHandle id = fst->getHandle(scope + "." + RTLIL::unescape_id(portname));
 			if (id==0)
-				log_error("Can't find port %s.%s in FST.\n", scope.c_str(), log_id(portname));
+				log_error("Can't find port %s.%s in FST.\n", scope, log_id(portname));
 			fst_clock.push_back(id);
 		}
 		for (auto portname : clockn)
@@ -1490,7 +1490,7 @@ struct SimWorker : SimShared
 				log_error("Clock port %s on module %s is not input.\n", log_id(portname), log_id(top->module));
 			fstHandle id = fst->getHandle(scope + "." + RTLIL::unescape_id(portname));
 			if (id==0)
-				log_error("Can't find port %s.%s in FST.\n", scope.c_str(), log_id(portname));
+				log_error("Can't find port %s.%s in FST.\n", scope, log_id(portname));
 			fst_clock.push_back(id);
 		}
 
@@ -1500,7 +1500,7 @@ struct SimWorker : SimShared
 			if (wire->port_input) {
 				fstHandle id = fst->getHandle(scope + "." + RTLIL::unescape_id(wire->name));
 				if (id==0)
-					log_error("Unable to find required '%s' signal in file\n",(scope + "." + RTLIL::unescape_id(wire->name)).c_str());
+					log_error("Unable to find required '%s' signal in file\n",(scope + "." + RTLIL::unescape_id(wire->name)));
 				top->fst_inputs[wire] = id;
 			}
 		}
@@ -1623,9 +1623,9 @@ struct SimWorker : SimShared
 					else if (type == "latch")
 						mem_latches[variable] = { memid, offset };
 					else
-						log_error("Map file addressing cell %s as type %s\n", symbol.c_str(), type.c_str());
+						log_error("Map file addressing cell %s as type %s\n", symbol, type);
 				} else {
-					log_error("Cell %s in map file is not memory cell\n", symbol.c_str());
+					log_error("Cell %s in map file is not memory cell\n", symbol);
 				}
 			} else {
 				if (index < w->start_offset || index > w->start_offset + w->width)
@@ -1645,7 +1645,7 @@ struct SimWorker : SimShared
 		std::ifstream f;
 		f.open(sim_filename.c_str());
 		if (f.fail() || GetSize(sim_filename) == 0)
-			log_error("Can not open file `%s`\n", sim_filename.c_str());
+			log_error("Can not open file `%s`\n", sim_filename);
 
 		int state = 0;
 		std::string status;
@@ -1729,7 +1729,7 @@ struct SimWorker : SimShared
 		if (pos==std::string::npos) {
 			pos = name.find_first_of("#");
 			if (pos==std::string::npos)
-				log_error("Line does not contain proper signal name `%s`\n", name.c_str());
+				log_error("Line does not contain proper signal name `%s`\n", name);
 		}
 		return name.substr(0, pos);
 	}
@@ -1744,7 +1744,7 @@ struct SimWorker : SimShared
 		std::ifstream f;
 		f.open(sim_filename.c_str());
 		if (f.fail() || GetSize(sim_filename) == 0)
-			log_error("Can not open file `%s`\n", sim_filename.c_str());
+			log_error("Can not open file `%s`\n", sim_filename);
 
 		int state = 0;
 		int cycle = 0;
@@ -1874,7 +1874,7 @@ struct SimWorker : SimShared
 			if (item.wire != nullptr) {
 				if (paths.count(path)) {
 					if (debug)
-						log("witness hierarchy: found wire %s\n", path.str().c_str());
+						log("witness hierarchy: found wire %s\n", path.str());
 					bool inserted = hierarchy.paths.emplace(path, {instance, item.wire, {}, INT_MIN}).second;
 					if (!inserted)
 						log_warning("Yosys witness path `%s` is ambiguous in this design\n", path.str().c_str());
@@ -1883,7 +1883,7 @@ struct SimWorker : SimShared
 				auto it = mem_paths.find(path);
 				if (it != mem_paths.end()) {
 					if (debug)
-						log("witness hierarchy: found mem %s\n", path.str().c_str());
+						log("witness hierarchy: found mem %s\n", path.str());
 					IdPath word_path = path;
 					word_path.emplace_back();
 					for (auto addr_part : it->second) {
@@ -1951,7 +1951,7 @@ struct SimWorker : SimShared
 			Const value = yw.get_bits(t, signal.bits_offset, signal.width);
 
 			if (debug)
-				log("yw: set %s to %s\n", signal.path.str().c_str(), log_const(value));
+				log("yw: set %s to %s\n", signal.path.str(), log_const(value));
 
 			if (found_path.wire != nullptr) {
 				found_path.instance->set_state_parent_drivers(
@@ -2052,7 +2052,7 @@ struct SimWorker : SimShared
 
 		PrettyJson json;
 		if (!json.write_to_file(summary_filename))
-			log_error("Can't open file `%s' for writing: %s\n", summary_filename.c_str(), strerror(errno));
+			log_error("Can't open file `%s' for writing: %s\n", summary_filename, strerror(errno));
 
 		json.begin_object();
 		json.entry("version", "Yosys sim summary");
@@ -2134,7 +2134,7 @@ struct SimWorker : SimShared
 				log_error("Clock port %s on module %s is not input.\n", log_id(portname), log_id(top->module));
 			fstHandle id = fst->getHandle(scope + "." + RTLIL::unescape_id(portname));
 			if (id==0)
-				log_error("Can't find port %s.%s in FST.\n", scope.c_str(), log_id(portname));
+				log_error("Can't find port %s.%s in FST.\n", scope, log_id(portname));
 			fst_clock.push_back(id);
 			clocks[w] = id;
 		}
@@ -2147,7 +2147,7 @@ struct SimWorker : SimShared
 				log_error("Clock port %s on module %s is not input.\n", log_id(portname), log_id(top->module));
 			fstHandle id = fst->getHandle(scope + "." + RTLIL::unescape_id(portname));
 			if (id==0)
-				log_error("Can't find port %s.%s in FST.\n", scope.c_str(), log_id(portname));
+				log_error("Can't find port %s.%s in FST.\n", scope, log_id(portname));
 			fst_clock.push_back(id);
 			clocks[w] = id;
 		}
@@ -2159,7 +2159,7 @@ struct SimWorker : SimShared
 		for (auto wire : topmod->wires()) {
 			fstHandle id = fst->getHandle(scope + "." + RTLIL::unescape_id(wire->name));
 			if (id==0 && (wire->port_input || wire->port_output))
-				log_error("Unable to find required '%s' signal in file\n",(scope + "." + RTLIL::unescape_id(wire->name)).c_str());
+				log_error("Unable to find required '%s' signal in file\n",(scope + "." + RTLIL::unescape_id(wire->name)));
 			if (wire->port_input)
 				if (clocks.find(wire)==clocks.end())
 					inputs[wire] = id;
@@ -2236,7 +2236,7 @@ struct SimWorker : SimShared
 		f << "\n";
 		f << "\tinteger i;\n";
 		uint64_t prev_time = startCount;
-		log("Writing data to `%s`\n", (tb_filename+".txt").c_str());
+		log("Writing data to `%s`\n", (tb_filename+".txt"));
 		std::ofstream data_file(tb_filename+".txt");
 		std::stringstream initstate;
 		unsigned int end_cycle = cycles_set ? numcycles*2 : INT_MAX;
@@ -2292,7 +2292,7 @@ struct SimWorker : SimShared
 		f << "\tend\n";
 		f << "endmodule\n";
 
-		log("Writing testbench to `%s`\n", (tb_filename+".v").c_str());
+		log("Writing testbench to `%s`\n", (tb_filename+".v"));
 		std::ofstream tb_file(tb_filename+".v");
 		tb_file << f.str();
 
diff --git a/passes/sat/synthprop.cc b/passes/sat/synthprop.cc
index 4703e4ad7..d94b4a7f7 100644
--- a/passes/sat/synthprop.cc
+++ b/passes/sat/synthprop.cc
@@ -170,7 +170,7 @@ void SynthPropWorker::run()
 		std::ofstream fout;
 		fout.open(map_file, std::ios::out | std::ios::trunc);
 		if (!fout.is_open())
-			log_error("Could not open file \"%s\" with write access.\n", map_file.c_str());
+			log_error("Could not open file \"%s\" with write access.\n", map_file);
 
 		for (auto name : tracing_data[module].names) {
 			fout << name << std::endl;
diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index d45a652fc..7d81b52d2 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -751,7 +751,7 @@ struct abc_output_filter
 			return;
 		}
 		if (ch == '\n') {
-			log("ABC: %s\n", replace_tempdir(linebuf, tempdir_name, show_tempdir).c_str());
+			log("ABC: %s\n", replace_tempdir(linebuf, tempdir_name, show_tempdir));
 			got_cr = false, linebuf.clear();
 			return;
 		}
@@ -936,7 +936,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 	std::string buffer = stringf("%s/abc.script", tempdir_name);
 	FILE *f = fopen(buffer.c_str(), "wt");
 	if (f == nullptr)
-		log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
+		log_error("Opening %s for writing failed: %s\n", buffer, strerror(errno));
 	fprintf(f, "%s\n", abc_script.c_str());
 	fclose(f);
 
@@ -991,7 +991,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 	buffer = stringf("%s/input.blif", tempdir_name);
 	f = fopen(buffer.c_str(), "wt");
 	if (f == nullptr)
-		log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
+		log_error("Opening %s for writing failed: %s\n", buffer, strerror(errno));
 
 	fprintf(f, ".model netlist\n");
 
@@ -1118,7 +1118,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 		buffer = stringf("%s/stdcells.genlib", tempdir_name);
 		f = fopen(buffer.c_str(), "wt");
 		if (f == nullptr)
-			log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
+			log_error("Opening %s for writing failed: %s\n", buffer, strerror(errno));
 		fprintf(f, "GATE ZERO    1 Y=CONST0;\n");
 		fprintf(f, "GATE ONE     1 Y=CONST1;\n");
 		fprintf(f, "GATE BUF    %d Y=A;                  PIN * NONINV  1 999 1 0 1 0\n", cell_cost.at(ID($_BUF_)));
@@ -1163,14 +1163,14 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 			buffer = stringf("%s/lutdefs.txt", tempdir_name);
 			f = fopen(buffer.c_str(), "wt");
 			if (f == nullptr)
-				log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
+				log_error("Opening %s for writing failed: %s\n", buffer, strerror(errno));
 			for (int i = 0; i < GetSize(config.lut_costs); i++)
 				fprintf(f, "%d %d.00 1.00\n", i+1, config.lut_costs.at(i));
 			fclose(f);
 		}
 
 		buffer = stringf("\"%s\" -s -f %s/abc.script 2>&1", config.exe_file, tempdir_name);
-		log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, config.show_tempdir).c_str());
+		log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, config.show_tempdir));
 
 #ifndef YOSYS_LINK_ABC
 		abc_output_filter filt(*this, tempdir_name, config.show_tempdir);
@@ -1220,7 +1220,7 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 		temp_stdouterr_r.close();
 #endif
 		if (ret != 0) {
-			log_error("ABC: execution of command \"%s\" failed: return code %d.\n", buffer.c_str(), ret);
+			log_error("ABC: execution of command \"%s\" failed: return code %d.\n", buffer, ret);
 			return;
 		}
 		did_run_abc = true;
@@ -1239,7 +1239,7 @@ void AbcModuleState::extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL
 	std::ifstream ifs;
 	ifs.open(buffer);
 	if (ifs.fail())
-		log_error("Can't open ABC output file `%s'.\n", buffer.c_str());
+		log_error("Can't open ABC output file `%s'.\n", buffer);
 
 	bool builtin_lib = config.liberty_files.empty() && config.genlib_files.empty();
 	RTLIL::Design *mapped_design = new RTLIL::Design;
@@ -1490,7 +1490,7 @@ void AbcModuleState::extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL
 
 	cell_stats.sort();
 	for (auto &it : cell_stats)
-		log("ABC RESULTS:   %15s cells: %8d\n", it.first.c_str(), it.second);
+		log("ABC RESULTS:   %15s cells: %8d\n", it.first, it.second);
 	int in_wires = 0, out_wires = 0;
 	for (auto &si : signal_list)
 		if (si.is_port) {
@@ -1582,7 +1582,7 @@ struct AbcPass : public Pass {
 #ifdef ABCEXTERNAL
 		log("        use the specified command instead of \"" ABCEXTERNAL "\" to execute ABC.\n");
 #else
-		log("        use the specified command instead of \"<yosys-bindir>/%syosys-abc\" to execute ABC.\n", proc_program_prefix().c_str());
+		log("        use the specified command instead of \"<yosys-bindir>/%syosys-abc\" to execute ABC.\n", proc_program_prefix());
 #endif
 		log("        This can e.g. be used to call a specific version of ABC or a wrapper.\n");
 		log("\n");
@@ -1597,41 +1597,41 @@ struct AbcPass : public Pass {
 		log("        if no -script parameter is given, the following scripts are used:\n");
 		log("\n");
 		log("        for -liberty/-genlib without -constr:\n");
-		log("%s\n", fold_abc_cmd(ABC_COMMAND_LIB).c_str());
+		log("%s\n", fold_abc_cmd(ABC_COMMAND_LIB));
 		log("\n");
 		log("        for -liberty/-genlib with -constr:\n");
-		log("%s\n", fold_abc_cmd(ABC_COMMAND_CTR).c_str());
+		log("%s\n", fold_abc_cmd(ABC_COMMAND_CTR));
 		log("\n");
 		log("        for -lut/-luts (only one LUT size):\n");
-		log("%s\n", fold_abc_cmd(ABC_COMMAND_LUT "; lutpack {S}").c_str());
+		log("%s\n", fold_abc_cmd(ABC_COMMAND_LUT "; lutpack {S}"));
 		log("\n");
 		log("        for -lut/-luts (different LUT sizes):\n");
-		log("%s\n", fold_abc_cmd(ABC_COMMAND_LUT).c_str());
+		log("%s\n", fold_abc_cmd(ABC_COMMAND_LUT));
 		log("\n");
 		log("        for -sop:\n");
-		log("%s\n", fold_abc_cmd(ABC_COMMAND_SOP).c_str());
+		log("%s\n", fold_abc_cmd(ABC_COMMAND_SOP));
 		log("\n");
 		log("        otherwise:\n");
-		log("%s\n", fold_abc_cmd(ABC_COMMAND_DFL).c_str());
+		log("%s\n", fold_abc_cmd(ABC_COMMAND_DFL));
 		log("\n");
 		log("    -fast\n");
 		log("        use different default scripts that are slightly faster (at the cost\n");
 		log("        of output quality):\n");
 		log("\n");
 		log("        for -liberty/-genlib without -constr:\n");
-		log("%s\n", fold_abc_cmd(ABC_FAST_COMMAND_LIB).c_str());
+		log("%s\n", fold_abc_cmd(ABC_FAST_COMMAND_LIB));
 		log("\n");
 		log("        for -liberty/-genlib with -constr:\n");
-		log("%s\n", fold_abc_cmd(ABC_FAST_COMMAND_CTR).c_str());
+		log("%s\n", fold_abc_cmd(ABC_FAST_COMMAND_CTR));
 		log("\n");
 		log("        for -lut/-luts:\n");
-		log("%s\n", fold_abc_cmd(ABC_FAST_COMMAND_LUT).c_str());
+		log("%s\n", fold_abc_cmd(ABC_FAST_COMMAND_LUT));
 		log("\n");
 		log("        for -sop:\n");
-		log("%s\n", fold_abc_cmd(ABC_FAST_COMMAND_SOP).c_str());
+		log("%s\n", fold_abc_cmd(ABC_FAST_COMMAND_SOP));
 		log("\n");
 		log("        otherwise:\n");
-		log("%s\n", fold_abc_cmd(ABC_FAST_COMMAND_DFL).c_str());
+		log("%s\n", fold_abc_cmd(ABC_FAST_COMMAND_DFL));
 		log("\n");
 		log("    -liberty <file>\n");
 		log("        generate netlists for the specified cell library (using the liberty\n");
diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc
index b79d9dc96..2cf28f849 100644
--- a/passes/techmap/abc9.cc
+++ b/passes/techmap/abc9.cc
@@ -106,7 +106,7 @@ struct Abc9Pass : public ScriptPass
 #ifdef ABCEXTERNAL
 		log("        use the specified command instead of \"" ABCEXTERNAL "\" to execute ABC.\n");
 #else
-		log("        use the specified command instead of \"<yosys-bindir>/%syosys-abc\" to execute ABC.\n", proc_program_prefix().c_str());
+		log("        use the specified command instead of \"<yosys-bindir>/%syosys-abc\" to execute ABC.\n", proc_program_prefix());
 #endif
 		log("        This can e.g. be used to call a specific version of ABC or a wrapper.\n");
 		log("\n");
@@ -119,12 +119,12 @@ struct Abc9Pass : public ScriptPass
 		log("        replaced with blanks before the string is passed to ABC.\n");
 		log("\n");
 		log("        if no -script parameter is given, the following scripts are used:\n");
-		log("%s\n", fold_abc9_cmd(RTLIL::constpad.at("abc9.script.default").substr(1,std::string::npos)).c_str());
+		log("%s\n", fold_abc9_cmd(RTLIL::constpad.at("abc9.script.default").substr(1,std::string::npos)));
 		log("\n");
 		log("    -fast\n");
 		log("        use different default scripts that are slightly faster (at the cost\n");
 		log("        of output quality):\n");
-		log("%s\n", fold_abc9_cmd(RTLIL::constpad.at("abc9.script.default.fast").substr(1,std::string::npos)).c_str());
+		log("%s\n", fold_abc9_cmd(RTLIL::constpad.at("abc9.script.default.fast").substr(1,std::string::npos)));
 		log("\n");
 		log("    -D <picoseconds>\n");
 		log("        set delay target. the string {D} in the default scripts above is\n");
diff --git a/passes/techmap/abc9_exe.cc b/passes/techmap/abc9_exe.cc
index 34348fd00..d7a7e3d4a 100644
--- a/passes/techmap/abc9_exe.cc
+++ b/passes/techmap/abc9_exe.cc
@@ -140,7 +140,7 @@ struct abc9_output_filter
 			return;
 		}
 		if (ch == '\n') {
-			log("ABC: %s\n", replace_tempdir(linebuf, tempdir_name, show_tempdir).c_str());
+			log("ABC: %s\n", replace_tempdir(linebuf, tempdir_name, show_tempdir));
 			got_cr = false, linebuf.clear();
 			return;
 		}
@@ -271,14 +271,14 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 		buffer = stringf("%s/lutdefs.txt", tempdir_name);
 		f = fopen(buffer.c_str(), "wt");
 		if (f == NULL)
-			log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
+			log_error("Opening %s for writing failed: %s\n", buffer, strerror(errno));
 		for (int i = 0; i < GetSize(lut_costs); i++)
 			fprintf(f, "%d %d.00 1.00\n", i+1, lut_costs.at(i));
 		fclose(f);
 	}
 
 	buffer = stringf("\"%s\" -s -f %s/abc.script 2>&1", exe_file, tempdir_name);
-	log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, show_tempdir).c_str());
+	log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, show_tempdir));
 
 #ifndef YOSYS_LINK_ABC
 	abc9_output_filter filt(tempdir_name, show_tempdir);
@@ -331,7 +331,7 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 		if (check_file_exists(stringf("%s/output.aig", tempdir_name)))
 			log_warning("ABC: execution of command \"%s\" failed: return code %d.\n", buffer.c_str(), ret);
 		else
-			log_error("ABC: execution of command \"%s\" failed: return code %d.\n", buffer.c_str(), ret);
+			log_error("ABC: execution of command \"%s\" failed: return code %d.\n", buffer, ret);
 	}
 }
 
@@ -352,7 +352,7 @@ struct Abc9ExePass : public Pass {
 #ifdef ABCEXTERNAL
 		log("        use the specified command instead of \"" ABCEXTERNAL "\" to execute ABC.\n");
 #else
-		log("        use the specified command instead of \"<yosys-bindir>/%syosys-abc\" to execute ABC.\n", proc_program_prefix().c_str());
+		log("        use the specified command instead of \"<yosys-bindir>/%syosys-abc\" to execute ABC.\n", proc_program_prefix());
 #endif
 		log("        This can e.g. be used to call a specific version of ABC or a wrapper.\n");
 		log("\n");
@@ -365,12 +365,12 @@ struct Abc9ExePass : public Pass {
 		log("        replaced with blanks before the string is passed to ABC.\n");
 		log("\n");
 		log("        if no -script parameter is given, the following scripts are used:\n");
-		log("%s\n", fold_abc9_cmd(RTLIL::constpad.at("abc9.script.default").substr(1,std::string::npos)).c_str());
+		log("%s\n", fold_abc9_cmd(RTLIL::constpad.at("abc9.script.default").substr(1,std::string::npos)));
 		log("\n");
 		log("    -fast\n");
 		log("        use different default scripts that are slightly faster (at the cost\n");
 		log("        of output quality):\n");
-		log("%s\n", fold_abc9_cmd(RTLIL::constpad.at("abc9.script.default.fast").substr(1,std::string::npos)).c_str());
+		log("%s\n", fold_abc9_cmd(RTLIL::constpad.at("abc9.script.default.fast").substr(1,std::string::npos)));
 		log("\n");
 		log("    -constr <file>\n");
 		log("        pass this file with timing constraints to ABC.\n");
diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index 85a1099ed..91149ac55 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -787,7 +787,7 @@ void prep_xaiger(RTLIL::Module *module, bool dff)
 			for (auto cell_name : it) {
 				auto cell = module->cell(cell_name);
 				log_assert(cell);
-				log("\t%s (%s @ %s)\n", log_id(cell), log_id(cell->type), cell->get_src_attribute().c_str());
+				log("\t%s (%s @ %s)\n", log_id(cell), log_id(cell->type), cell->get_src_attribute());
 			}
 		}
 	}
@@ -1444,7 +1444,7 @@ void reintegrate(RTLIL::Module *module, bool dff_mode)
 	}
 
 	for (auto &it : cell_stats)
-		log("ABC RESULTS:   %15s cells: %8d\n", it.first.c_str(), it.second);
+		log("ABC RESULTS:   %15s cells: %8d\n", it.first, it.second);
 	int in_wires = 0, out_wires = 0;
 
 	// Stitch in mapped_mod's inputs/outputs into module
diff --git a/passes/techmap/attrmap.cc b/passes/techmap/attrmap.cc
index 7f5bfc94f..58ac25f51 100644
--- a/passes/techmap/attrmap.cc
+++ b/passes/techmap/attrmap.cc
@@ -130,14 +130,14 @@ void attrmap_apply(string objname, vector<std::unique_ptr<AttrmapAction>> &actio
 				goto delete_this_attr;
 
 		if (new_attr != attr)
-			log("Changed attribute on %s: %s=%s -> %s=%s\n", objname.c_str(),
+			log("Changed attribute on %s: %s=%s -> %s=%s\n", objname,
 					log_id(attr.first), log_const(attr.second), log_id(new_attr.first), log_const(new_attr.second));
 
 		new_attributes[new_attr.first] = new_attr.second;
 
 		if (0)
 	delete_this_attr:
-			log("Removed attribute on %s: %s=%s\n", objname.c_str(), log_id(attr.first), log_const(attr.second));
+			log("Removed attribute on %s: %s=%s\n", objname, log_id(attr.first), log_const(attr.second));
 	}
 
 	attributes.swap(new_attributes);
diff --git a/passes/techmap/clkbufmap.cc b/passes/techmap/clkbufmap.cc
index a7b96a9c6..7003c6656 100644
--- a/passes/techmap/clkbufmap.cc
+++ b/passes/techmap/clkbufmap.cc
@@ -257,14 +257,14 @@ struct ClkbufmapPass : public Pass {
 						RTLIL::Cell *cell = nullptr;
 						bool is_input = wire->port_input && !inpad_celltype.empty() && module->get_bool_attribute(ID::top);
 						if (!buf_celltype.empty() && (!is_input || buffer_inputs)) {
-							log("Inserting %s on %s.%s[%d].\n", buf_celltype.c_str(), log_id(module), log_id(wire), i);
+							log("Inserting %s on %s.%s[%d].\n", buf_celltype, log_id(module), log_id(wire), i);
 							cell = module->addCell(NEW_ID, RTLIL::escape_id(buf_celltype));
 							iwire = module->addWire(NEW_ID);
 							cell->setPort(RTLIL::escape_id(buf_portname), mapped_wire_bit);
 							cell->setPort(RTLIL::escape_id(buf_portname2), iwire);
 						}
 						if (is_input) {
-							log("Inserting %s on %s.%s[%d].\n", inpad_celltype.c_str(), log_id(module), log_id(wire), i);
+							log("Inserting %s on %s.%s[%d].\n", inpad_celltype, log_id(module), log_id(wire), i);
 							RTLIL::Cell *cell2 = module->addCell(NEW_ID, RTLIL::escape_id(inpad_celltype));
 							if (iwire) {
 								cell2->setPort(RTLIL::escape_id(inpad_portname), iwire);
diff --git a/passes/techmap/clockgate.cc b/passes/techmap/clockgate.cc
index 508e66d23..b834b8f35 100644
--- a/passes/techmap/clockgate.cc
+++ b/passes/techmap/clockgate.cc
@@ -81,7 +81,7 @@ static std::pair<std::optional<ClockGateCell>, std::optional<ClockGateCell>>
 		} else if (icg_kind == "latch_negedge" || starts_with("latch_negedge_")) {
 			clk_pol = false;
 		} else {
-			log("Ignoring ICG primitive %s of kind '%s'\n", cell_name.c_str(), icg_kind.c_str());
+			log("Ignoring ICG primitive %s of kind '%s'\n", cell_name, icg_kind);
 			continue;
 		}
 
@@ -176,11 +176,11 @@ static std::pair<std::optional<ClockGateCell>, std::optional<ClockGateCell>>
 	std::optional<ClockGateCell> pos;
 	std::optional<ClockGateCell> neg;
 	if (best_pos) {
-		log("Selected rising edge ICG %s from Liberty file\n", best_pos->name.c_str());
+		log("Selected rising edge ICG %s from Liberty file\n", best_pos->name);
 		pos.emplace(*best_pos);
 	}
 	if (best_neg) {
-		log("Selected falling edge ICG %s from Liberty file\n", best_neg->name.c_str());
+		log("Selected falling edge ICG %s from Liberty file\n", best_neg->name);
 		neg.emplace(*best_neg);
 	}
 	return std::make_pair(pos, neg);
diff --git a/passes/techmap/dfflegalize.cc b/passes/techmap/dfflegalize.cc
index 9dfc20896..facea2e90 100644
--- a/passes/techmap/dfflegalize.cc
+++ b/passes/techmap/dfflegalize.cc
@@ -1111,7 +1111,7 @@ struct DffLegalizePass : public Pass {
 					pol_r = celltype[13];
 				} else {
 unrecognized:
-					log_error("unrecognized cell type %s.\n", celltype.c_str());
+					log_error("unrecognized cell type %s.\n", celltype);
 				}
 				int mask = 0;
 				int match = 0;
@@ -1140,12 +1140,12 @@ unrecognized:
 					initmask = 0x555;
 				} else if (inittype == "r") {
 					if (srval == 0)
-						log_error("init type r not valid for cell type %s.\n", celltype.c_str());
+						log_error("init type r not valid for cell type %s.\n", celltype);
 					initmask = 0x537;
 				} else if (inittype == "01") {
 					initmask = 0x777;
 				} else {
-					log_error("unrecognized init type %s for cell type %s.\n", inittype.c_str(), celltype.c_str());
+					log_error("unrecognized init type %s for cell type %s.\n", inittype, celltype);
 				}
 				if (srval == '0') {
 					initmask &= 0x0ff;
diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index 70d0f4ef5..062a63ec3 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -36,9 +36,9 @@ static std::map<RTLIL::IdString, cell_mapping> cell_mappings;
 static void logmap(IdString dff)
 {
 	if (cell_mappings.count(dff) == 0) {
-		log("    unmapped dff cell: %s\n", dff.c_str());
+		log("    unmapped dff cell: %s\n", dff);
 	} else {
-		log("    %s %s (", cell_mappings[dff].cell_name.c_str(), dff.substr(1).c_str());
+		log("    %s %s (", cell_mappings[dff].cell_name, dff.substr(1));
 		bool first = true;
 		for (auto &port : cell_mappings[dff].ports) {
 			char arg[3] = { port.second, 0, 0 };
@@ -46,7 +46,7 @@ static void logmap(IdString dff)
 				arg[1] = arg[0] - ('a' - 'A'), arg[0] = '~';
 			else
 				arg[1] = arg[0], arg[0] = ' ';
-			log("%s.%s(%s)", first ? "" : ", ", port.first.c_str(), arg);
+			log("%s.%s(%s)", first ? "" : ", ", port.first, arg);
 			first = false;
 		}
 		log(");\n");
@@ -488,7 +488,7 @@ static void find_cell_sr(std::vector<const LibertyAst *> cells, IdString cell_ty
 
 static void dfflibmap(RTLIL::Design *design, RTLIL::Module *module)
 {
-	log("Mapping DFF cells in module `%s':\n", module->name.c_str());
+	log("Mapping DFF cells in module `%s':\n", module->name);
 
 	dict<SigBit, pool<Cell*>> notmap;
 	SigMap sigmap(module);
@@ -690,7 +690,7 @@ struct DfflibmapPass : public Pass {
 				dfflegalize_cmd += stringf(" -cell %s 01", it.first);
 			dfflegalize_cmd += " t:$_DFF* t:$_SDFF*";
 			if (info_mode) {
-				log("dfflegalize command line: %s\n", dfflegalize_cmd.c_str());
+				log("dfflegalize command line: %s\n", dfflegalize_cmd);
 			} else {
 				Pass::call(design, dfflegalize_cmd);
 			}
diff --git a/passes/techmap/extract.cc b/passes/techmap/extract.cc
index ea6ba5ddb..6527b683e 100644
--- a/passes/techmap/extract.cc
+++ b/passes/techmap/extract.cc
@@ -627,7 +627,7 @@ struct ExtractPass : public Pass {
 			for (auto module : map->modules()) {
 				SubCircuit::Graph mod_graph;
 				std::string graph_name = "needle_" + RTLIL::unescape_id(module->name);
-				log("Creating needle graph %s.\n", graph_name.c_str());
+				log("Creating needle graph %s.\n", graph_name);
 				if (module2graph(mod_graph, module, constports)) {
 					solver.addGraph(graph_name, mod_graph);
 					needle_map[graph_name] = module;
@@ -638,7 +638,7 @@ struct ExtractPass : public Pass {
 		for (auto module : design->modules()) {
 			SubCircuit::Graph mod_graph;
 			std::string graph_name = "haystack_" + RTLIL::unescape_id(module->name);
-			log("Creating haystack graph %s.\n", graph_name.c_str());
+			log("Creating haystack graph %s.\n", graph_name);
 			if (module2graph(mod_graph, module, constports, design, mine_mode ? mine_max_fanout : -1, mine_mode ? &mine_split : nullptr)) {
 				solver.addGraph(graph_name, mod_graph);
 				haystack_map[graph_name] = module;
@@ -654,7 +654,7 @@ struct ExtractPass : public Pass {
 
 			for (auto needle : needle_list)
 			for (auto &haystack_it : haystack_map) {
-				log("Solving for %s in %s.\n", ("needle_" + RTLIL::unescape_id(needle->name)).c_str(), haystack_it.first.c_str());
+				log("Solving for %s in %s.\n", ("needle_" + RTLIL::unescape_id(needle->name)), haystack_it.first);
 				solver.solve(results, "needle_" + RTLIL::unescape_id(needle->name), haystack_it.first, false);
 			}
 			log("Found %d matches.\n", GetSize(results));
@@ -665,11 +665,11 @@ struct ExtractPass : public Pass {
 
 				for (int i = 0; i < int(results.size()); i++) {
 					auto &result = results[i];
-					log("\nMatch #%d: (%s in %s)\n", i, result.needleGraphId.c_str(), result.haystackGraphId.c_str());
+					log("\nMatch #%d: (%s in %s)\n", i, result.needleGraphId, result.haystackGraphId);
 					for (const auto &it : result.mappings) {
-						log("  %s -> %s", it.first.c_str(), it.second.haystackNodeId.c_str());
+						log("  %s -> %s", it.first, it.second.haystackNodeId);
 						for (const auto & it2 : it.second.portMapping)
-							log(" %s:%s", it2.first.c_str(), it2.second.c_str());
+							log(" %s:%s", it2.first, it2.second);
 						log("\n");
 					}
 					RTLIL::Cell *new_cell = replace(needle_map.at(result.needleGraphId), haystack_map.at(result.haystackGraphId), result);
@@ -693,7 +693,7 @@ struct ExtractPass : public Pass {
 				log("\nFrequent SubCircuit with %d nodes and %d matches:\n", int(result.nodes.size()), result.totalMatchesAfterLimits);
 				log("  primary match in %s:", log_id(haystack_map.at(result.graphId)->name));
 				for (auto &node : result.nodes)
-					log(" %s", RTLIL::unescape_id(node.nodeId).c_str());
+					log(" %s", RTLIL::unescape_id(node.nodeId));
 				log("\n");
 				for (auto &it : result.matchesPerGraph)
 					log("  matches in %s: %d\n", log_id(haystack_map.at(it.first)->name), it.second);
@@ -744,7 +744,7 @@ struct ExtractPass : public Pass {
 			rewrite_filename(mine_outfile);
 			f.open(mine_outfile.c_str(), std::ofstream::trunc);
 			if (f.fail())
-				log_error("Can't open output file `%s'.\n", mine_outfile.c_str());
+				log_error("Can't open output file `%s'.\n", mine_outfile);
 			Backend::backend_call(map, &f, mine_outfile, "rtlil");
 			f.close();
 		}
diff --git a/passes/techmap/extract_counter.cc b/passes/techmap/extract_counter.cc
index b780f7df0..c45792f66 100644
--- a/passes/techmap/extract_counter.cc
+++ b/passes/techmap/extract_counter.cc
@@ -847,7 +847,7 @@ struct ExtractCounterPass : public Pass {
 				else if (arg == "no")
 					settings.allow_arst = false;
 				else
-					log_error("Invalid -allow_arst value \"%s\"\n", arg.c_str());
+					log_error("Invalid -allow_arst value \"%s\"\n", arg);
 				continue;
 			}
 
@@ -861,7 +861,7 @@ struct ExtractCounterPass : public Pass {
 				else if (arg == "both")
 					settings.allowed_dirs = 2;
 				else
-					log_error("Invalid -dir value \"%s\"\n", arg.c_str());
+					log_error("Invalid -dir value \"%s\"\n", arg);
 				continue;
 			}
 		}
@@ -893,7 +893,7 @@ struct ExtractCounterPass : public Pass {
 
 			for(auto cpair : cells_to_rename)
 			{
-				//log("Renaming cell %s to %s\n", log_id(cpair.first->name), cpair.second.c_str());
+				//log("Renaming cell %s to %s\n", log_id(cpair.first->name), cpair.second);
 				module->rename(cpair.first, cpair.second);
 			}
 		}
diff --git a/passes/techmap/extract_reduce.cc b/passes/techmap/extract_reduce.cc
index 892e9a364..1ad880be0 100644
--- a/passes/techmap/extract_reduce.cc
+++ b/passes/techmap/extract_reduce.cc
@@ -133,7 +133,7 @@ struct ExtractReducePass : public Pass
 				else
 					continue;
 
-				log("Working on cell %s...\n", cell->name.c_str());
+				log("Working on cell %s...\n", cell->name);
 
 				// If looking for a single chain, follow linearly to the sink
 				pool<Cell*> sinks;
@@ -220,7 +220,7 @@ struct ExtractReducePass : public Pass
 				//We have our list, go act on it
 				for(auto head_cell : sinks)
 				{
-					log("  Head cell is %s\n", head_cell->name.c_str());
+					log("  Head cell is %s\n", head_cell->name);
 
 					//Avoid duplication if we already were covered
 					if(consumed_cells.count(head_cell))
diff --git a/passes/techmap/extractinv.cc b/passes/techmap/extractinv.cc
index 48d9600fa..5050e1464 100644
--- a/passes/techmap/extractinv.cc
+++ b/passes/techmap/extractinv.cc
@@ -111,7 +111,7 @@ struct ExtractinvPass : public Pass {
 						RTLIL::Cell *icell = module->addCell(NEW_ID, RTLIL::escape_id(inv_celltype));
 						icell->setPort(RTLIL::escape_id(inv_portname), SigSpec(iwire, i));
 						icell->setPort(RTLIL::escape_id(inv_portname2), sig[i]);
-						log("Inserting %s on %s.%s.%s[%d].\n", inv_celltype.c_str(), log_id(module), log_id(cell->type), log_id(port.first), i);
+						log("Inserting %s on %s.%s.%s[%d].\n", inv_celltype, log_id(module), log_id(cell->type), log_id(port.first), i);
 						sig[i] = SigBit(iwire, i);
 					}
 				cell->setPort(port.first, sig);
diff --git a/passes/techmap/flowmap.cc b/passes/techmap/flowmap.cc
index 61966195c..7fbe54849 100644
--- a/passes/techmap/flowmap.cc
+++ b/passes/techmap/flowmap.cc
@@ -598,7 +598,7 @@ struct FlowmapWorker
 				continue;
 
 			if (!cell->known())
-				log_error("Cell %s (%s.%s) is unknown.\n", cell->type.c_str(), log_id(module), log_id(cell));
+				log_error("Cell %s (%s.%s) is unknown.\n", cell->type, log_id(module), log_id(cell));
 
 			pool<RTLIL::SigBit> fanout;
 			for (auto conn : cell->connections())
diff --git a/passes/techmap/iopadmap.cc b/passes/techmap/iopadmap.cc
index 322eb7779..d929de300 100644
--- a/passes/techmap/iopadmap.cc
+++ b/passes/techmap/iopadmap.cc
@@ -324,7 +324,7 @@ struct IopadmapPass : public Pass {
 
 						if (wire->port_input)
 						{
-							log("Mapping port %s.%s[%d] using %s.\n", log_id(module), log_id(wire), i, tinoutpad_celltype.c_str());
+							log("Mapping port %s.%s[%d] using %s.\n", log_id(module), log_id(wire), i, tinoutpad_celltype);
 
 							Cell *cell = module->addCell(
 								module->uniquify(stringf("$iopadmap$%s.%s[%d]", log_id(module), log_id(wire), i)),
@@ -348,7 +348,7 @@ struct IopadmapPass : public Pass {
 							if (!tinoutpad_portname_pad.empty())
 								rewrite_bits[wire][i] = make_pair(cell, RTLIL::escape_id(tinoutpad_portname_pad));
 						} else {
-							log("Mapping port %s.%s[%d] using %s.\n", log_id(module), log_id(wire), i, toutpad_celltype.c_str());
+							log("Mapping port %s.%s[%d] using %s.\n", log_id(module), log_id(wire), i, toutpad_celltype);
 
 							Cell *cell = module->addCell(
 								module->uniquify(stringf("$iopadmap$%s.%s[%d]", log_id(module), log_id(wire), i)),
@@ -421,7 +421,7 @@ struct IopadmapPass : public Pass {
 					continue;
 				}
 
-				log("Mapping port %s.%s using %s.\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(wire->name), celltype.c_str());
+				log("Mapping port %s.%s using %s.\n", RTLIL::id2cstr(module->name), RTLIL::id2cstr(wire->name), celltype);
 
 				if (flag_bits)
 				{
diff --git a/passes/techmap/libcache.cc b/passes/techmap/libcache.cc
index e299f43ec..c833a6046 100644
--- a/passes/techmap/libcache.cc
+++ b/passes/techmap/libcache.cc
@@ -117,9 +117,9 @@
 		if (list) {
 			log("Caching is %s by default.\n", LibertyAstCache::instance.cache_by_default ? "enabled" : "disabled");
 			for (auto const &entry : LibertyAstCache::instance.cache_path)
-				log("Caching is %s for `%s'.\n", entry.second ? "enabled" : "disabled", entry.first.c_str());
+				log("Caching is %s for `%s'.\n", entry.second ? "enabled" : "disabled", entry.first);
 			for (auto const &entry : LibertyAstCache::instance.cached)
-				log("Data for `%s' is currently cached.\n", entry.first.c_str());
+				log("Data for `%s' is currently cached.\n", entry.first);
 		} else if (enable || disable) {
 			if (all) {
 				LibertyAstCache::instance.cache_by_default = enable;
diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index b60e0b84b..c89495c62 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -42,7 +42,7 @@ std::shared_ptr<const LibertyAst> LibertyAstCache::cached_ast(const std::string
 	if (it == cached.end())
 		return nullptr;
 	if (verbose)
-		log("Using cached data for liberty file `%s'\n", fname.c_str());
+		log("Using cached data for liberty file `%s'\n", fname);
 	return it->second;
 }
 
@@ -53,7 +53,7 @@ void LibertyAstCache::parsed_ast(const std::string &fname, const std::shared_ptr
 	if (!should_cache)
 		return;
 	if (verbose)
-		log("Caching data for liberty file `%s'\n", fname.c_str());
+		log("Caching data for liberty file `%s'\n", fname);
 	cached.emplace(fname, ast);
 }
 
@@ -671,7 +671,7 @@ void LibertyParser::error(const std::string &str) const
 	std::stringstream ss;
 	ss << "Syntax error in liberty file on line " << line << ".\n";
 	ss << "  " << str << "\n";
-	log_error("%s", ss.str().c_str());
+	log_error("%s", ss.str());
 }
 
 #else
diff --git a/passes/techmap/libparse.h b/passes/techmap/libparse.h
index ee0f3db42..44b5d3d47 100644
--- a/passes/techmap/libparse.h
+++ b/passes/techmap/libparse.h
@@ -204,7 +204,7 @@ namespace Yosys
 			}
 			ast = shared_ast.get();
 			if (!ast) {
-				log_error("No entries found in liberty file `%s'.\n", fname.c_str());
+				log_error("No entries found in liberty file `%s'.\n", fname);
 			}
 		}
 #endif
diff --git a/passes/techmap/techmap.cc b/passes/techmap/techmap.cc
index dd82958fa..2a22258b7 100644
--- a/passes/techmap/techmap.cc
+++ b/passes/techmap/techmap.cc
@@ -247,7 +247,7 @@ struct TechmapWorker
 				portname = positional_ports.at(portname);
 			if (tpl->wire(portname) == nullptr || tpl->wire(portname)->port_id == 0) {
 				if (portname.begins_with("$"))
-					log_error("Can't map port `%s' of cell `%s' to template `%s'!\n", portname.c_str(), cell->name.c_str(), tpl->name.c_str());
+					log_error("Can't map port `%s' of cell `%s' to template `%s'!\n", portname, cell->name, tpl->name);
 				continue;
 			}
 
@@ -562,7 +562,7 @@ struct TechmapWorker
 
 							if (extmapper_name == "wrap") {
 								std::string cmd_string = tpl->attributes.at(ID::techmap_wrap).decode_string();
-								log("Running \"%s\" on wrapper %s.\n", cmd_string.c_str(), log_id(extmapper_module));
+								log("Running \"%s\" on wrapper %s.\n", cmd_string, log_id(extmapper_module));
 								mkdebug.on();
 								Pass::call_on_module(extmapper_design, extmapper_module, cmd_string);
 								log_continue = true;
@@ -580,7 +580,7 @@ struct TechmapWorker
 						auto msg = stringf("Using extmapper %s for cells of type %s.", log_id(extmapper_module), log_id(cell->type));
 						if (!log_msg_cache.count(msg)) {
 							log_msg_cache.insert(msg);
-							log("%s\n", msg.c_str());
+							log("%s\n", msg);
 						}
 						log_debug("%s %s.%s (%s) to %s.\n", mapmsg_prefix.c_str(), log_id(module), log_id(cell), log_id(cell->type), log_id(extmapper_module));
 					}
@@ -589,7 +589,7 @@ struct TechmapWorker
 						auto msg = stringf("Using extmapper %s for cells of type %s.", extmapper_name, log_id(cell->type));
 						if (!log_msg_cache.count(msg)) {
 							log_msg_cache.insert(msg);
-							log("%s\n", msg.c_str());
+							log("%s\n", msg);
 						}
 						log_debug("%s %s.%s (%s) with %s.\n", mapmsg_prefix.c_str(), log_id(module), log_id(cell), log_id(cell->type), extmapper_name.c_str());
 
@@ -951,7 +951,7 @@ struct TechmapWorker
 					auto msg = stringf("Using template %s for cells of type %s.", log_id(tpl), log_id(cell->type));
 					if (!log_msg_cache.count(msg)) {
 						log_msg_cache.insert(msg);
-						log("%s\n", msg.c_str());
+						log("%s\n", msg);
 					}
 					log_debug("%s %s.%s (%s) using %s.\n", mapmsg_prefix.c_str(), log_id(module), log_id(cell), log_id(cell->type), log_id(tpl));
 					techmap_module_worker(design, module, cell, tpl);
diff --git a/passes/tests/raise_error.cc b/passes/tests/raise_error.cc
index 588a40806..7233e78fa 100644
--- a/passes/tests/raise_error.cc
+++ b/passes/tests/raise_error.cc
@@ -85,7 +85,7 @@ struct RaiseErrorPass : public Pass {
 			if (use_stderr) {
 				std::cerr << err_msg << std::endl;
 			} else {
-				log_error("%s\n", err_msg.c_str());
+				log_error("%s\n", err_msg);
 			}
 		}
 
diff --git a/passes/tests/test_autotb.cc b/passes/tests/test_autotb.cc
index bcaf097a1..52cb8e28c 100644
--- a/passes/tests/test_autotb.cc
+++ b/passes/tests/test_autotb.cc
@@ -109,7 +109,7 @@ static void autotest(std::ostream &f, RTLIL::Design *design, int num_iter, int s
 			continue;
 
 		int count_ports = 0;
-		log("Generating test bench for module `%s'.\n", mod->name.c_str());
+		log("Generating test bench for module `%s'.\n", mod->name);
 		for (auto wire : mod->wires()) {
 			if (wire->port_output) {
 				count_ports++;
diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index a08a6ec29..286ef757d 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -722,7 +722,7 @@ static void run_eval_test(RTLIL::Design *design, bool verbose, bool nosat, std::
 		}
 
 		if (verbose)
-			log("EVAL:  %s\n", out_val.as_string().c_str());
+			log("EVAL:  %s\n", out_val.as_string());
 
 		if (!nosat)
 		{
diff --git a/techlibs/coolrunner2/coolrunner2_fixup.cc b/techlibs/coolrunner2/coolrunner2_fixup.cc
index 50710e2bd..2b2249596 100644
--- a/techlibs/coolrunner2/coolrunner2_fixup.cc
+++ b/techlibs/coolrunner2/coolrunner2_fixup.cc
@@ -298,7 +298,7 @@ struct Coolrunner2FixupPass : public Pass {
 					if ((!sig_fed_by_xor[input] && !sig_fed_by_io[input]) ||
 						(sig_fed_by_io[input] && ibuf_out_to_packed_reg_cell[input] != cell))
 					{
-						log("Buffering input to \"%s\"\n", cell->name.c_str());
+						log("Buffering input to \"%s\"\n", cell->name);
 
 						auto xor_to_ff_wire = makexorbuffer(module, input, cell->name.c_str());
 
@@ -320,7 +320,7 @@ struct Coolrunner2FixupPass : public Pass {
 
 					if (!sig_fed_by_pterm[clock] && !sig_fed_by_bufg[clock])
 					{
-						log("Buffering clock to \"%s\"\n", cell->name.c_str());
+						log("Buffering clock to \"%s\"\n", cell->name);
 
 						auto pterm_to_ff_wire = makeptermbuffer(module, clock);
 
@@ -338,7 +338,7 @@ struct Coolrunner2FixupPass : public Pass {
 					{
 						if (!sig_fed_by_pterm[set] && !sig_fed_by_bufgsr[set])
 						{
-							log("Buffering set to \"%s\"\n", cell->name.c_str());
+							log("Buffering set to \"%s\"\n", cell->name);
 
 							auto pterm_to_ff_wire = makeptermbuffer(module, set);
 
@@ -352,7 +352,7 @@ struct Coolrunner2FixupPass : public Pass {
 					{
 						if (!sig_fed_by_pterm[reset] && !sig_fed_by_bufgsr[reset])
 						{
-							log("Buffering reset to \"%s\"\n", cell->name.c_str());
+							log("Buffering reset to \"%s\"\n", cell->name);
 
 							auto pterm_to_ff_wire = makeptermbuffer(module, reset);
 
@@ -369,7 +369,7 @@ struct Coolrunner2FixupPass : public Pass {
 						ce = sigmap(cell->getPort(ID(CE))[0]);
 						if (!sig_fed_by_pterm[ce])
 						{
-							log("Buffering clock enable to \"%s\"\n", cell->name.c_str());
+							log("Buffering clock enable to \"%s\"\n", cell->name);
 
 							auto pterm_to_ff_wire = makeptermbuffer(module, ce);
 
@@ -389,7 +389,7 @@ struct Coolrunner2FixupPass : public Pass {
 					if ((!sig_fed_by_xor[input] && !sig_fed_by_ff[input]) ||
 						packed_reg_out[input])
 					{
-						log("Buffering input to \"%s\"\n", cell->name.c_str());
+						log("Buffering input to \"%s\"\n", cell->name);
 
 						auto xor_to_io_wire = makexorbuffer(module, input, cell->name.c_str());
 
@@ -404,7 +404,7 @@ struct Coolrunner2FixupPass : public Pass {
 						oe = sigmap(cell->getPort(ID::E)[0]);
 						if (!sig_fed_by_pterm[oe] && !sig_fed_by_bufgts[oe])
 						{
-							log("Buffering output enable to \"%s\"\n", cell->name.c_str());
+							log("Buffering output enable to \"%s\"\n", cell->name);
 
 							auto pterm_to_oe_wire = makeptermbuffer(module, oe);
 
diff --git a/techlibs/ice40/ice40_braminit.cc b/techlibs/ice40/ice40_braminit.cc
index 955860740..0d07e2522 100644
--- a/techlibs/ice40/ice40_braminit.cc
+++ b/techlibs/ice40/ice40_braminit.cc
@@ -46,12 +46,12 @@ static void run_ice40_braminit(Module *module)
 			continue;
 
 		/* Open file */
-		log("Processing %s : %s\n", RTLIL::id2cstr(cell->name), init_file.c_str());
+		log("Processing %s : %s\n", RTLIL::id2cstr(cell->name), init_file);
 
 		std::ifstream f;
 		f.open(init_file.c_str());
 		if (f.fail()) {
-			log("Can not open file `%s`.\n", init_file.c_str());
+			log("Can not open file `%s`.\n", init_file);
 			continue;
 		}
 
diff --git a/techlibs/microchip/microchip_dffopt.cc b/techlibs/microchip/microchip_dffopt.cc
index cbd05cb3e..8a13c4325 100644
--- a/techlibs/microchip/microchip_dffopt.cc
+++ b/techlibs/microchip/microchip_dffopt.cc
@@ -294,7 +294,7 @@ struct MicrochipDffOptPass : public Pass {
 					ports += " + S";
 				if (worthy_post_ce)
 					ports += " + CE";
-				log("  Merging D%s LUTs for %s/%s (%d -> %d)\n", ports.c_str(), log_id(cell), log_id(sig_Q.wire),
+				log("  Merging D%s LUTs for %s/%s (%d -> %d)\n", ports, log_id(cell), log_id(sig_Q.wire),
 				    GetSize(lut_d.second), GetSize(final_lut.second));
 
 				// Okay, we're doing it.  Unmap ports.
diff --git a/techlibs/xilinx/xilinx_dffopt.cc b/techlibs/xilinx/xilinx_dffopt.cc
index edd906048..bca3deef9 100644
--- a/techlibs/xilinx/xilinx_dffopt.cc
+++ b/techlibs/xilinx/xilinx_dffopt.cc
@@ -305,7 +305,7 @@ unmap:
 				if (worthy_post_r) ports += " + R";
 				if (worthy_post_s) ports += " + S";
 				if (worthy_post_ce) ports += " + CE";
-				log("  Merging D%s LUTs for %s/%s (%d -> %d)\n", ports.c_str(), log_id(cell), log_id(sig_Q.wire), GetSize(lut_d.second), GetSize(final_lut.second));
+				log("  Merging D%s LUTs for %s/%s (%d -> %d)\n", ports, log_id(cell), log_id(sig_Q.wire), GetSize(lut_d.second), GetSize(final_lut.second));
 
 				// Okay, we're doing it.  Unmap ports.
 				if (worthy_post_r) {

From 727998f6635fc4cd6142d12a41fccedd47be3675 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 12 Sep 2025 00:22:43 +0000
Subject: [PATCH 496/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5da8066db..a22f3fb00 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+52
+YOSYS_VER := 0.57+55
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From b98e54416f912c9e723f2b72084322d560240f92 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 05:29:22 +0000
Subject: [PATCH 497/931] When looking up the IdString table, it can never be
 empty after we've called prepopulate, so remove some dead code.

---
 kernel/rtlil.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 9112ae64b..fc0087442 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -230,11 +230,6 @@ struct RTLIL::IdString
 
 	#ifndef YOSYS_NO_IDS_REFCNT
 		if (global_free_idx_list_.empty()) {
-			if (global_id_storage_.empty()) {
-				global_refcount_storage_.push_back(0);
-				global_id_storage_.push_back((char*)"");
-				global_id_index_[global_id_storage_.back()] = 0;
-			}
 			log_assert(global_id_storage_.size() < 0x40000000);
 			global_free_idx_list_.push_back(global_id_storage_.size());
 			global_id_storage_.push_back(nullptr);
@@ -247,10 +242,6 @@ struct RTLIL::IdString
 		global_id_index_[global_id_storage_.at(idx)] = idx;
 		global_refcount_storage_.at(idx)++;
 	#else
-		if (global_id_storage_.empty()) {
-			global_id_storage_.push_back((char*)"");
-			global_id_index_[global_id_storage_.back()] = 0;
-		}
 		int idx = global_id_storage_.size();
 		global_id_storage_.push_back(strdup(p));
 		global_id_index_[global_id_storage_.back()] = idx;

From 6f0c8f56a3f9ce6dfadd4a483435d0388f5f83ad Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 05:50:18 +0000
Subject: [PATCH 498/931] Convert btorf()/infof() to C++ stringf machinery

---
 backends/btor/btor.cc | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/backends/btor/btor.cc b/backends/btor/btor.cc
index c2b831a44..aa95c512e 100644
--- a/backends/btor/btor.cc
+++ b/backends/btor/btor.cc
@@ -102,20 +102,16 @@ struct BtorWorker
 
 	PrettyJson ywmap_json;
 
-	void btorf(const char *fmt, ...) YS_ATTRIBUTE(format(printf, 2, 3))
+	template <typename... Args>
+	void btorf(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
 	{
-		va_list ap;
-		va_start(ap, fmt);
-		f << indent << vstringf(fmt, ap);
-		va_end(ap);
+		f << indent << fmt.format(args...);
 	}
 
-	void infof(const char *fmt, ...) YS_ATTRIBUTE(format(printf, 2, 3))
+	template <typename... Args>
+	void infof(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
 	{
-		va_list ap;
-		va_start(ap, fmt);
-		info_lines.push_back(vstringf(fmt, ap));
-		va_end(ap);
+		info_lines.push_back(fmt.format(args...));
 	}
 
 	template<typename T>

From ff5177ce8e5255dd34a9af770878da937864aa4f Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 05:53:59 +0000
Subject: [PATCH 499/931] Remove .c_str() from parameters to btorf() and
 infof()

---
 backends/btor/btor.cc | 60 +++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/backends/btor/btor.cc b/backends/btor/btor.cc
index aa95c512e..50ce46bbf 100644
--- a/backends/btor/btor.cc
+++ b/backends/btor/btor.cc
@@ -318,12 +318,12 @@ struct BtorWorker
 				btorf("%d slt %d %d %d\n", nid_b_ltz, sid_bit, nid_b, nid_zero);
 
 				nid = next_nid++;
-				btorf("%d ite %d %d %d %d%s\n", nid, sid, nid_b_ltz, nid_l, nid_r, getinfo(cell).c_str());
+				btorf("%d ite %d %d %d %d%s\n", nid, sid, nid_b_ltz, nid_l, nid_r, getinfo(cell));
 			}
 			else
 			{
 				nid = next_nid++;
-				btorf("%d %s %d %d %d%s\n", nid, btor_op.c_str(), sid, nid_a, nid_b, getinfo(cell).c_str());
+				btorf("%d %s %d %d %d%s\n", nid, btor_op, sid, nid_a, nid_b, getinfo(cell));
 			}
 
 			SigSpec sig = sigmap(cell->getPort(ID::Y));
@@ -364,7 +364,7 @@ struct BtorWorker
 
 			int sid = get_bv_sid(width);
 			int nid = next_nid++;
-			btorf("%d %c%s %d %d %d%s\n", nid, a_signed || b_signed ? 's' : 'u', btor_op.c_str(), sid, nid_a, nid_b, getinfo(cell).c_str());
+			btorf("%d %c%s %d %d %d%s\n", nid, a_signed || b_signed ? 's' : 'u', btor_op, sid, nid_a, nid_b, getinfo(cell));
 
 			SigSpec sig = sigmap(cell->getPort(ID::Y));
 
@@ -390,12 +390,12 @@ struct BtorWorker
 
 			if (cell->type == ID($_ANDNOT_)) {
 				btorf("%d not %d %d\n", nid1, sid, nid_b);
-				btorf("%d and %d %d %d%s\n", nid2, sid, nid_a, nid1, getinfo(cell).c_str());
+				btorf("%d and %d %d %d%s\n", nid2, sid, nid_a, nid1, getinfo(cell));
 			}
 
 			if (cell->type == ID($_ORNOT_)) {
 				btorf("%d not %d %d\n", nid1, sid, nid_b);
-				btorf("%d or %d %d %d%s\n", nid2, sid, nid_a, nid1, getinfo(cell).c_str());
+				btorf("%d or %d %d %d%s\n", nid2, sid, nid_a, nid1, getinfo(cell));
 			}
 
 			SigSpec sig = sigmap(cell->getPort(ID::Y));
@@ -417,13 +417,13 @@ struct BtorWorker
 			if (cell->type == ID($_OAI3_)) {
 				btorf("%d or %d %d %d\n", nid1, sid, nid_a, nid_b);
 				btorf("%d and %d %d %d\n", nid2, sid, nid1, nid_c);
-				btorf("%d not %d %d%s\n", nid3, sid, nid2, getinfo(cell).c_str());
+				btorf("%d not %d %d%s\n", nid3, sid, nid2, getinfo(cell));
 			}
 
 			if (cell->type == ID($_AOI3_)) {
 				btorf("%d and %d %d %d\n", nid1, sid, nid_a, nid_b);
 				btorf("%d or %d %d %d\n", nid2, sid, nid1, nid_c);
-				btorf("%d not %d %d%s\n", nid3, sid, nid2, getinfo(cell).c_str());
+				btorf("%d not %d %d%s\n", nid3, sid, nid2, getinfo(cell));
 			}
 
 			SigSpec sig = sigmap(cell->getPort(ID::Y));
@@ -448,14 +448,14 @@ struct BtorWorker
 				btorf("%d or %d %d %d\n", nid1, sid, nid_a, nid_b);
 				btorf("%d or %d %d %d\n", nid2, sid, nid_c, nid_d);
 				btorf("%d and %d %d %d\n", nid3, sid, nid1, nid2);
-				btorf("%d not %d %d%s\n", nid4, sid, nid3, getinfo(cell).c_str());
+				btorf("%d not %d %d%s\n", nid4, sid, nid3, getinfo(cell));
 			}
 
 			if (cell->type == ID($_AOI4_)) {
 				btorf("%d and %d %d %d\n", nid1, sid, nid_a, nid_b);
 				btorf("%d and %d %d %d\n", nid2, sid, nid_c, nid_d);
 				btorf("%d or %d %d %d\n", nid3, sid, nid1, nid2);
-				btorf("%d not %d %d%s\n", nid4, sid, nid3, getinfo(cell).c_str());
+				btorf("%d not %d %d%s\n", nid4, sid, nid3, getinfo(cell));
 			}
 
 			SigSpec sig = sigmap(cell->getPort(ID::Y));
@@ -487,9 +487,9 @@ struct BtorWorker
 
 			int nid = next_nid++;
 			if (cell->type.in(ID($lt), ID($le), ID($ge), ID($gt))) {
-				btorf("%d %c%s %d %d %d%s\n", nid, a_signed || b_signed ? 's' : 'u', btor_op.c_str(), sid, nid_a, nid_b, getinfo(cell).c_str());
+				btorf("%d %c%s %d %d %d%s\n", nid, a_signed || b_signed ? 's' : 'u', btor_op, sid, nid_a, nid_b, getinfo(cell));
 			} else {
-				btorf("%d %s %d %d %d%s\n", nid, btor_op.c_str(), sid, nid_a, nid_b, getinfo(cell).c_str());
+				btorf("%d %s %d %d %d%s\n", nid, btor_op, sid, nid_a, nid_b, getinfo(cell));
 			}
 
 			SigSpec sig = sigmap(cell->getPort(ID::Y));
@@ -524,7 +524,7 @@ struct BtorWorker
 				log_assert(!btor_op.empty());
 				int sid = get_bv_sid(width);
 				nid = next_nid++;
-				btorf("%d %s %d %d%s\n", nid, btor_op.c_str(), sid, nid_a, getinfo(cell).c_str());
+				btorf("%d %s %d %d%s\n", nid, btor_op, sid, nid_a, getinfo(cell));
 			}
 
 			if (GetSize(sig) < width) {
@@ -564,9 +564,9 @@ struct BtorWorker
 
 			int nid = next_nid++;
 			if (btor_op != "not")
-				btorf("%d %s %d %d %d%s\n", nid, btor_op.c_str(), sid, nid_a, nid_b, getinfo(cell).c_str());
+				btorf("%d %s %d %d %d%s\n", nid, btor_op, sid, nid_a, nid_b, getinfo(cell));
 			else
-				btorf("%d %s %d %d%s\n", nid, btor_op.c_str(), sid, nid_a, getinfo(cell).c_str());
+				btorf("%d %s %d %d%s\n", nid, btor_op, sid, nid_a, getinfo(cell));
 
 			SigSpec sig = sigmap(cell->getPort(ID::Y));
 
@@ -597,11 +597,11 @@ struct BtorWorker
 
 			if (cell->type == ID($reduce_xnor)) {
 				int nid2 = next_nid++;
-				btorf("%d %s %d %d%s\n", nid, btor_op.c_str(), sid, nid_a, getinfo(cell).c_str());
+				btorf("%d %s %d %d%s\n", nid, btor_op, sid, nid_a, getinfo(cell));
 				btorf("%d not %d %d\n", nid2, sid, nid);
 				nid = nid2;
 			} else {
-				btorf("%d %s %d %d%s\n", nid, btor_op.c_str(), sid, nid_a, getinfo(cell).c_str());
+				btorf("%d %s %d %d%s\n", nid, btor_op, sid, nid_a, getinfo(cell));
 			}
 
 			SigSpec sig = sigmap(cell->getPort(ID::Y));
@@ -636,9 +636,9 @@ struct BtorWorker
 				int tmp = nid;
 				nid = next_nid++;
 				btorf("%d ite %d %d %d %d\n", tmp, sid, nid_s, nid_b, nid_a);
-				btorf("%d not %d %d%s\n", nid, sid, tmp, getinfo(cell).c_str());
+				btorf("%d not %d %d%s\n", nid, sid, tmp, getinfo(cell));
 			} else {
-				btorf("%d ite %d %d %d %d%s\n", nid, sid, nid_s, nid_b, nid_a, getinfo(cell).c_str());
+				btorf("%d ite %d %d %d %d%s\n", nid, sid, nid_s, nid_b, nid_a, getinfo(cell));
 			}
 
 			add_nid_sig(nid, sig_y);
@@ -661,7 +661,7 @@ struct BtorWorker
 				int nid_s = get_sig_nid(sig_s.extract(i));
 				int nid2 = next_nid++;
 				if (i == GetSize(sig_s)-1)
-					btorf("%d ite %d %d %d %d%s\n", nid2, sid, nid_s, nid_b, nid, getinfo(cell).c_str());
+					btorf("%d ite %d %d %d %d%s\n", nid2, sid, nid_s, nid_b, nid, getinfo(cell));
 				else
 					btorf("%d ite %d %d %d %d\n", nid2, sid, nid_s, nid_b, nid);
 				nid = nid2;
@@ -749,7 +749,7 @@ struct BtorWorker
 			int sid = get_bv_sid(GetSize(sig_y));
 			int nid = next_nid++;
 
-			btorf("%d state %d%s\n", nid, sid, getinfo(cell).c_str());
+			btorf("%d state %d%s\n", nid, sid, getinfo(cell));
 
 			ywmap_state(sig_y);
 
@@ -772,7 +772,7 @@ struct BtorWorker
 				int one_nid = get_sig_nid(State::S1);
 				int zero_nid = get_sig_nid(State::S0);
 				initstate_nid = next_nid++;
-				btorf("%d state %d%s\n", initstate_nid, sid, getinfo(cell).c_str());
+				btorf("%d state %d%s\n", initstate_nid, sid, getinfo(cell));
 				btorf("%d init %d %d %d\n", next_nid++, sid, initstate_nid, one_nid);
 				btorf("%d next %d %d %d\n", next_nid++, sid, initstate_nid, zero_nid);
 
@@ -1047,7 +1047,7 @@ struct BtorWorker
 						if (consts.count(c) == 0) {
 							int sid = get_bv_sid(GetSize(c));
 							int nid = next_nid++;
-							btorf("%d const %d %s\n", nid, sid, c.as_string().c_str());
+							btorf("%d const %d %s\n", nid, sid, c.as_string());
 							consts[c] = nid;
 							nid_width[nid] = GetSize(c);
 						}
@@ -1211,7 +1211,7 @@ struct BtorWorker
 			int sid = get_bv_sid(GetSize(sig));
 			int nid = next_nid++;
 
-			btorf("%d input %d%s\n", nid, sid, getinfo(wire).c_str());
+			btorf("%d input %d%s\n", nid, sid, getinfo(wire));
 			ywmap_input(wire);
 			add_nid_sig(nid, sig);
 
@@ -1256,7 +1256,7 @@ struct BtorWorker
 			btorf_push(stringf("output %s", log_id(wire)));
 
 			int nid = get_sig_nid(wire);
-			btorf("%d output %d%s\n", next_nid++, nid, getinfo(wire).c_str());
+			btorf("%d output %d%s\n", next_nid++, nid, getinfo(wire));
 
 			btorf_pop(stringf("output %s", log_id(wire)));
 		}
@@ -1298,10 +1298,10 @@ struct BtorWorker
 					bad_properties.push_back(nid_en_and_not_a);
 				} else {
 					if (cover_mode) {
-						infof("bad %d%s\n", nid_en_and_not_a, getinfo(cell, true).c_str());
+						infof("bad %d%s\n", nid_en_and_not_a, getinfo(cell, true));
 					} else {
 						int nid = next_nid++;
-						btorf("%d bad %d%s\n", nid, nid_en_and_not_a, getinfo(cell, true).c_str());
+						btorf("%d bad %d%s\n", nid, nid_en_and_not_a, getinfo(cell, true));
 					}
 				}
 
@@ -1323,7 +1323,7 @@ struct BtorWorker
 					bad_properties.push_back(nid_en_and_a);
 				} else {
 					int nid = next_nid++;
-					btorf("%d bad %d%s\n", nid, nid_en_and_a, getinfo(cell, true).c_str());
+					btorf("%d bad %d%s\n", nid, nid_en_and_a, getinfo(cell, true));
 				}
 
 				btorf_pop(log_id(cell));
@@ -1344,7 +1344,7 @@ struct BtorWorker
 				continue;
 
 			int this_nid = next_nid++;
-			btorf("%d uext %d %d %d%s\n", this_nid, sid, nid, 0, getinfo(wire).c_str());
+			btorf("%d uext %d %d %d%s\n", this_nid, sid, nid, 0, getinfo(wire));
 			if (info_clocks.count(nid))
 				info_clocks[this_nid] |= info_clocks[nid];
 
@@ -1367,7 +1367,7 @@ struct BtorWorker
 				SigSpec sig = sigmap(cell->getPort(ID::D));
 				int nid_q = get_sig_nid(sig);
 				int sid = get_bv_sid(GetSize(sig));
-				btorf("%d next %d %d %d%s\n", next_nid++, sid, nid, nid_q, getinfo(cell).c_str());
+				btorf("%d next %d %d %d%s\n", next_nid++, sid, nid, nid_q, getinfo(cell));
 
 				btorf_pop(stringf("next %s", log_id(cell)));
 			}
@@ -1426,7 +1426,7 @@ struct BtorWorker
 				}
 
 				int nid2 = next_nid++;
-				btorf("%d next %d %d %d%s\n", nid2, sid, nid, nid_head, (mem->cell ? getinfo(mem->cell) : getinfo(mem->mem)).c_str());
+				btorf("%d next %d %d %d%s\n", nid2, sid, nid, nid_head, (mem->cell ? getinfo(mem->cell) : getinfo(mem->mem)));
 
 				btorf_pop(stringf("next %s", log_id(mem->memid)));
 			}

From ad4ef8b775f67c2394779c08bb519cf0db51c0da Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 06:01:32 +0000
Subject: [PATCH 500/931] Make AstNode::input_error use C++ stringf machinery

---
 frontends/ast/ast.cc | 6 ++----
 frontends/ast/ast.h  | 7 ++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 313161fc3..9af355109 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -1922,11 +1922,9 @@ void AstModule::loadconfig() const
 	flag_autowire = autowire;
 }
 
-void AstNode::input_error(const char *format, ...) const
+void AstNode::formatted_input_error(std::string str) const
 {
-	va_list ap;
-	va_start(ap, format);
-	logv_file_error(*location.begin.filename, location.begin.line, format, ap);
+	log_formatted_file_error(*location.begin.filename, location.begin.line, std::move(str));
 }
 
 YOSYS_NAMESPACE_END
diff --git a/frontends/ast/ast.h b/frontends/ast/ast.h
index fdf4d1ec9..fd8ecddd7 100644
--- a/frontends/ast/ast.h
+++ b/frontends/ast/ast.h
@@ -378,7 +378,12 @@ namespace AST
 		AstNode *get_struct_member() const;
 
 		// helper to print errors from simplify/genrtlil code
-		[[noreturn]] void input_error(const char *format, ...) const YS_ATTRIBUTE(format(printf, 2, 3));
+		[[noreturn]] void formatted_input_error(std::string str) const;
+		template <typename... Args>
+		[[noreturn]] void input_error(FmtString<TypeIdentity<Args>...> fmt, const Args &... args) const
+		{
+			formatted_input_error(fmt.format(args...));
+		}
 	};
 
 	// process an AST tree (ast must point to an AST_DESIGN node) and generate RTLIL code

From 733b6f01242ad212cc482b7e936fc527b10c028e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 06:03:05 +0000
Subject: [PATCH 501/931] Remove unnecessary usage of .c_str() in parameters to
 input_error()

---
 frontends/ast/ast.cc      |  6 +--
 frontends/ast/genrtlil.cc | 68 +++++++++++++++----------------
 frontends/ast/simplify.cc | 84 +++++++++++++++++++--------------------
 3 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 9af355109..0d90498f6 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -193,7 +193,7 @@ bool AstNode::get_bool_attribute(RTLIL::IdString id)
 
 	auto& attr = attributes.at(id);
 	if (attr->type != AST_CONSTANT)
-		attr->input_error("Attribute `%s' with non-constant value!\n", id.c_str());
+		attr->input_error("Attribute `%s' with non-constant value!\n", id);
 
 	return attr->integer != 0;
 }
@@ -1143,7 +1143,7 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 	{
 		for (auto& node : ast->children)
 			if (node->type == AST_PARAMETER && param_has_no_default(node.get()))
-				node->input_error("Parameter `%s' has no default value and has not been overridden!\n", node->str.c_str());
+				node->input_error("Parameter `%s' has no default value and has not been overridden!\n", node->str);
 
 		bool blackbox_module = flag_lib;
 
@@ -1256,7 +1256,7 @@ static RTLIL::Module *process_module(RTLIL::Design *design, AstNode *ast, bool d
 		for (auto &attr : ast->attributes) {
 			log_assert((bool)attr.second.get());
 			if (attr.second->type != AST_CONSTANT)
-				ast->input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
+				ast->input_error("Attribute `%s' with non-constant value!\n", attr.first);
 			module->attributes[attr.first] = attr.second->asAttrConst();
 		}
 		for (size_t i = 0; i < ast->children.size(); i++) {
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 896ae9bdb..26819de18 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -56,7 +56,7 @@ static RTLIL::SigSpec uniop2rtlil(AstNode *that, IdString type, int result_width
 	if (gen_attributes)
 		for (auto &attr : that->attributes) {
 			if (attr.second->type != AST_CONSTANT)
-				that->input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
+				that->input_error("Attribute `%s' with non-constant value!\n", attr.first);
 			cell->attributes[attr.first] = attr.second->asAttrConst();
 		}
 
@@ -88,7 +88,7 @@ static void widthExtend(AstNode *that, RTLIL::SigSpec &sig, int width, bool is_s
 	if (that != nullptr)
 		for (auto &attr : that->attributes) {
 			if (attr.second->type != AST_CONSTANT)
-				that->input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
+				that->input_error("Attribute `%s' with non-constant value!\n", attr.first);
 			cell->attributes[attr.first] = attr.second->asAttrConst();
 		}
 
@@ -114,7 +114,7 @@ static RTLIL::SigSpec binop2rtlil(AstNode *that, IdString type, int result_width
 
 	for (auto &attr : that->attributes) {
 		if (attr.second->type != AST_CONSTANT)
-			that->input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
+			that->input_error("Attribute `%s' with non-constant value!\n", attr.first);
 		cell->attributes[attr.first] = attr.second->asAttrConst();
 	}
 
@@ -149,7 +149,7 @@ static RTLIL::SigSpec mux2rtlil(AstNode *that, const RTLIL::SigSpec &cond, const
 
 	for (auto &attr : that->attributes) {
 		if (attr.second->type != AST_CONSTANT)
-			that->input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
+			that->input_error("Attribute `%s' with non-constant value!\n", attr.first);
 		cell->attributes[attr.first] = attr.second->asAttrConst();
 	}
 
@@ -352,7 +352,7 @@ struct AST_INTERNAL::ProcessGenerator
 		set_src_attr(proc, always.get());
 		for (auto &attr : always->attributes) {
 			if (attr.second->type != AST_CONSTANT)
-				always->input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
+				always->input_error("Attribute `%s' with non-constant value!\n", attr.first);
 			proc->attributes[attr.first] = attr.second->asAttrConst();
 		}
 		current_case = &proc->root_case;
@@ -630,7 +630,7 @@ struct AST_INTERNAL::ProcessGenerator
 
 				for (auto &attr : ast->attributes) {
 					if (attr.second->type != AST_CONSTANT)
-						ast->input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
+						ast->input_error("Attribute `%s' with non-constant value!\n", attr.first);
 					sw->attributes[attr.first] = attr.second->asAttrConst();
 				}
 
@@ -1007,7 +1007,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 			}
 		}
 		if (!id_ast)
-			input_error("Failed to resolve identifier %s for width detection!\n", str.c_str());
+			input_error("Failed to resolve identifier %s for width detection!\n", str);
 		if (id_ast->type == AST_PARAMETER || id_ast->type == AST_LOCALPARAM || id_ast->type == AST_ENUM_ITEM) {
 			if (id_ast->children.size() > 1 && id_ast->children[1]->range_valid) {
 				this_width = id_ast->children[1]->range_left - id_ast->children[1]->range_right + 1;
@@ -1017,7 +1017,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 				if (id_ast->children[0]->type == AST_CONSTANT)
 					this_width = id_ast->children[0]->bits.size();
 				else
-					input_error("Failed to detect width for parameter %s!\n", str.c_str());
+					input_error("Failed to detect width for parameter %s!\n", str);
 			}
 			if (children.size() != 0)
 				range = children[0].get();
@@ -1030,7 +1030,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 					// log("---\n");
 					// id_ast->dumpAst(nullptr, "decl> ");
 					// dumpAst(nullptr, "ref> ");
-					input_error("Failed to detect width of signal access `%s'!\n", str.c_str());
+					input_error("Failed to detect width of signal access `%s'!\n", str);
 				}
 			} else {
 				this_width = id_ast->range_left - id_ast->range_right + 1;
@@ -1041,7 +1041,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 			this_width = 32;
 		} else if (id_ast->type == AST_MEMORY) {
 			if (!id_ast->children[0]->range_valid)
-				input_error("Failed to detect width of memory access `%s'!\n", str.c_str());
+				input_error("Failed to detect width of memory access `%s'!\n", str);
 			this_width = id_ast->children[0]->range_left - id_ast->children[0]->range_right + 1;
 			if (children.size() > 1)
 				range = children[1].get();
@@ -1049,7 +1049,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 			auto tmp_range = make_index_range(id_ast);
 			this_width = tmp_range->range_left - tmp_range->range_right + 1;
 		} else
-			input_error("Failed to detect width for identifier %s!\n", str.c_str());
+			input_error("Failed to detect width for identifier %s!\n", str);
 		if (range) {
 			if (range->children.size() == 1)
 				this_width = 1;
@@ -1059,7 +1059,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 				while (left_at_zero_ast->simplify(true, 1, -1, false)) { }
 				while (right_at_zero_ast->simplify(true, 1, -1, false)) { }
 				if (left_at_zero_ast->type != AST_CONSTANT || right_at_zero_ast->type != AST_CONSTANT)
-					input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str.c_str());
+					input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str);
 				this_width = abs(int(left_at_zero_ast->integer - right_at_zero_ast->integer)) + 1;
 			} else
 				this_width = range->range_left - range->range_right + 1;
@@ -1193,7 +1193,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 		if (!id2ast->is_signed)
 			sign_hint = false;
 		if (!id2ast->children[0]->range_valid)
-			input_error("Failed to detect width of memory access `%s'!\n", str.c_str());
+			input_error("Failed to detect width of memory access `%s'!\n", str);
 		this_width = id2ast->children[0]->range_left - id2ast->children[0]->range_right + 1;
 		width_hint = max(width_hint, this_width);
 		break;
@@ -1266,7 +1266,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 			// item expressions.
 			const AstNode *func = current_scope.at(str);
 			if (func->type != AST_FUNCTION)
-				input_error("Function call to %s resolved to something that isn't a function!\n", RTLIL::unescape_id(str).c_str());
+				input_error("Function call to %s resolved to something that isn't a function!\n", RTLIL::unescape_id(str));
 			const AstNode *wire = nullptr;
 			for (const auto& child : func->children)
 				if (child->str == func->str) {
@@ -1302,7 +1302,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 		AstNode *current_scope_ast = current_ast_mod == nullptr ? current_ast : current_ast_mod;
 		for (auto f : log_files)
 			current_scope_ast->dumpAst(f, "verilog-ast> ");
-		input_error("Don't know how to detect sign and width for %s node!\n", type2str(type).c_str());
+		input_error("Don't know how to detect sign and width for %s node!\n", type2str(type));
 
 	}
 
@@ -1406,7 +1406,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 		if (flag_pwires)
 		{
 			if (GetSize(children) < 1 || children[0]->type != AST_CONSTANT)
-				input_error("Parameter `%s' with non-constant value!\n", str.c_str());
+				input_error("Parameter `%s' with non-constant value!\n", str);
 
 			RTLIL::Const val = children[0]->bitsAsConst();
 			RTLIL::IdString id = str;
@@ -1420,7 +1420,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 
 			for (auto &attr : attributes) {
 				if (attr.second->type != AST_CONSTANT)
-					input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
+					input_error("Attribute `%s' with non-constant value!\n", attr.first);
 				wire->attributes[attr.first] = attr.second->asAttrConst();
 			}
 		}
@@ -1429,10 +1429,10 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 	// create an RTLIL::Wire for an AST_WIRE node
 	case AST_WIRE: {
 			if (!range_valid)
-				input_error("Signal `%s' with non-constant width!\n", str.c_str());
+				input_error("Signal `%s' with non-constant width!\n", str);
 
 			if (!(range_left + 1 >= range_right))
-				input_error("Signal `%s' with invalid width range %d!\n", str.c_str(), range_left - range_right + 1);
+				input_error("Signal `%s' with invalid width range %d!\n", str, range_left - range_right + 1);
 
 			RTLIL::IdString id = str;
 			check_unique_id(current_module, id, this, "signal");
@@ -1448,7 +1448,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 
 			for (auto &attr : attributes) {
 				if (attr.second->type != AST_CONSTANT)
-					input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
+					input_error("Attribute `%s' with non-constant value!\n", attr.first);
 				wire->attributes[attr.first] = attr.second->asAttrConst();
 			}
 
@@ -1464,7 +1464,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			log_assert(children[1]->type == AST_RANGE);
 
 			if (!children[0]->range_valid || !children[1]->range_valid)
-				input_error("Memory `%s' with non-constant width or size!\n", str.c_str());
+				input_error("Memory `%s' with non-constant width or size!\n", str);
 
 			RTLIL::Memory *memory = new RTLIL::Memory;
 			set_src_attr(memory, this);
@@ -1482,7 +1482,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 
 			for (auto &attr : attributes) {
 				if (attr.second->type != AST_CONSTANT)
-					input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
+					input_error("Attribute `%s' with non-constant value!\n", attr.first);
 				memory->attributes[attr.first] = attr.second->asAttrConst();
 			}
 		}
@@ -1539,11 +1539,11 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				} else if (flag_autowire)
 					log_file_warning(*location.begin.filename, location.begin.line, "Identifier `%s' is implicitly declared.\n", str.c_str());
 				else
-					input_error("Identifier `%s' is implicitly declared and `default_nettype is set to none.\n", str.c_str());
+					input_error("Identifier `%s' is implicitly declared and `default_nettype is set to none.\n", str);
 			}
 			else if (id2ast->type == AST_PARAMETER || id2ast->type == AST_LOCALPARAM || id2ast->type == AST_ENUM_ITEM) {
 				if (id2ast->children[0]->type != AST_CONSTANT)
-					input_error("Parameter %s does not evaluate to constant value!\n", str.c_str());
+					input_error("Parameter %s does not evaluate to constant value!\n", str);
 				chunk = RTLIL::Const(id2ast->children[0]->bits);
 				goto use_const_chunk;
 			}
@@ -1558,11 +1558,11 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				is_interface = true;
 			}
 			else {
-				input_error("Identifier `%s' doesn't map to any signal!\n", str.c_str());
+				input_error("Identifier `%s' doesn't map to any signal!\n", str);
 			}
 
 			if (id2ast->type == AST_MEMORY)
-				input_error("Identifier `%s' does map to an unexpanded memory!\n", str.c_str());
+				input_error("Identifier `%s' does map to an unexpanded memory!\n", str);
 
 			// If identifier is an interface, create a RTLIL::SigSpec with a dummy wire with a attribute called 'is_interface'
 			// This makes it possible for the hierarchy pass to see what are interface connections and then replace them
@@ -1610,7 +1610,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 					while (left_at_zero_ast->simplify(true, 1, -1, false)) { }
 					while (right_at_zero_ast->simplify(true, 1, -1, false)) { }
 					if (left_at_zero_ast->type != AST_CONSTANT || right_at_zero_ast->type != AST_CONSTANT)
-						input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str.c_str());
+						input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str);
 					int width = abs(int(left_at_zero_ast->integer - right_at_zero_ast->integer)) + 1;
 					auto fake_ast = std::make_unique<AstNode>(children[0]->location, AST_NONE, clone(), children[0]->children.size() >= 2 ?
 							children[0]->children[1]->clone() : children[0]->children[0]->clone());
@@ -2032,7 +2032,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			set_src_attr(cell, this);
 			for (auto &attr : attributes) {
 				if (attr.second->type != AST_CONSTANT)
-					input_error("Attribute `%s' with non-constant value!\n", attr.first.c_str());
+					input_error("Attribute `%s' with non-constant value!\n", attr.first);
 				cell->attributes[attr.first] = attr.second->asAttrConst();
 			}
 			cell->setParam(ID(FLAVOR), flavor);
@@ -2148,7 +2148,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			}
 			for (auto &attr : attributes) {
 				if (attr.second->type != AST_CONSTANT)
-					input_error("Attribute `%s' with non-constant value.\n", attr.first.c_str());
+					input_error("Attribute `%s' with non-constant value.\n", attr.first);
 				cell->attributes[attr.first] = attr.second->asAttrConst();
 			}
 			if (cell->type == ID($specify2)) {
@@ -2203,7 +2203,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 					log_file_warning(*location.begin.filename, location.begin.line, "\n");
 			} else if (str == "$error") {
 				if (sz > 0)
-					input_error("%s.\n", children[0]->str.c_str());
+					input_error("%s.\n", children[0]->str);
 				else
 					input_error("\n");
 			} else if (str == "$fatal") {
@@ -2212,11 +2212,11 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				// dollar_finish(sz ? children[0] : 1);
 				// perhaps create & use log_file_fatal()
 				if (sz > 0)
-					input_error("FATAL: %s.\n", children[0]->str.c_str());
+					input_error("FATAL: %s.\n", children[0]->str);
 				else
 					input_error("FATAL.\n");
 			} else {
-				input_error("Unknown elaboration system task '%s'.\n", str.c_str());
+				input_error("Unknown elaboration system task '%s'.\n", str);
 			}
 		} break;
 
@@ -2245,7 +2245,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				}
 
 				if (width <= 0)
-					input_error("Failed to detect width of %s!\n", RTLIL::unescape_id(str).c_str());
+					input_error("Failed to detect width of %s!\n", RTLIL::unescape_id(str));
 
 				Cell *cell = current_module->addCell(myid, str.substr(1));
 				set_src_attr(cell, this);
@@ -2272,7 +2272,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 	default:
 		for (auto f : log_files)
 			current_ast_mod->dumpAst(f, "verilog-ast> ");
-		input_error("Don't know how to generate RTLIL code for %s node!\n", type2str(type).c_str());
+		input_error("Don't know how to generate RTLIL code for %s node!\n", type2str(type));
 	}
 
 	return RTLIL::SigSpec();
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index bf72a770f..e208a1063 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -250,7 +250,7 @@ static int range_width(AstNode *node, AstNode *rnode)
 {
 	log_assert(rnode->type==AST_RANGE);
 	if (!rnode->range_valid) {
-		node->input_error("Non-constant range in declaration of %s\n", node->str.c_str());
+		node->input_error("Non-constant range in declaration of %s\n", node->str);
 	}
 	// note: range swapping has already been checked for
 	return rnode->range_left - rnode->range_right + 1;
@@ -265,7 +265,7 @@ static int add_dimension(AstNode *node, AstNode *rnode)
 
 [[noreturn]] static void struct_array_packing_error(AstNode *node)
 {
-	node->input_error("Unpacked array in packed struct/union member %s\n", node->str.c_str());
+	node->input_error("Unpacked array in packed struct/union member %s\n", node->str);
 }
 
 static int size_packed_struct(AstNode *snode, int base_offset)
@@ -358,7 +358,7 @@ static int size_packed_struct(AstNode *snode, int base_offset)
 			}
 			else {
 				if (packed_width != width)
-					node->input_error("member %s of a packed union has %d bits, expecting %d\n", node->str.c_str(), width, packed_width);
+					node->input_error("member %s of a packed union has %d bits, expecting %d\n", node->str, width, packed_width);
 			}
 		}
 		else {
@@ -481,7 +481,7 @@ std::unique_ptr<AstNode> AstNode::make_index_range(AstNode *decl_node, bool unpa
 		dim--;  // Step back to the final index / slice
 	}
 	else {
-		input_error("Unsupported range operation for %s\n", str.c_str());
+		input_error("Unsupported range operation for %s\n", str);
 	}
 
 	std::unique_ptr<AstNode> index_range = std::make_unique<AstNode>(rnode->location, AST_RANGE);
@@ -1135,7 +1135,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 								if (current_scope.count(enode->str) == 0)
 									current_scope[enode->str] = enode.get();
 								else
-									input_error("enum item %s already exists in current scope\n", enode->str.c_str());
+									input_error("enum item %s already exists in current scope\n", enode->str);
 							}
 						}
 					}
@@ -1209,7 +1209,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					continue;
 				wires_are_incompatible:
 					if (stage > 1)
-						input_error("Incompatible re-declaration of wire %s.\n", node->str.c_str());
+						input_error("Incompatible re-declaration of wire %s.\n", node->str);
 					continue;
 				}
 				this_wire_scope[node->str] = node;
@@ -1228,7 +1228,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					if (current_scope.count(enode->str) == 0)
 						current_scope[enode->str] = enode.get();
 					else
-						input_error("enum item %s already exists\n", enode->str.c_str());
+						input_error("enum item %s already exists\n", enode->str);
 				}
 			}
 		}
@@ -1268,7 +1268,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					if (current_scope.count(enode->str) == 0)
 						current_scope[enode->str] = enode.get();
 					else
-						input_error("enum item %s already exists in package\n", enode->str.c_str());
+						input_error("enum item %s already exists in package\n", enode->str);
 				}
 			}
 		}
@@ -1561,10 +1561,10 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 				const std::string &type_name = child->children[0]->str;
 				if (!current_scope.count(type_name))
-					input_error("Unknown identifier `%s' used as type name\n", type_name.c_str());
+					input_error("Unknown identifier `%s' used as type name\n", type_name);
 				AstNode *resolved_type_node = current_scope.at(type_name);
 				if (resolved_type_node->type != AST_TYPEDEF)
-					input_error("`%s' does not name a type\n", type_name.c_str());
+					input_error("`%s' does not name a type\n", type_name);
 				log_assert(resolved_type_node->children.size() == 1);
 				auto* template_node = resolved_type_node->children[0].get();
 
@@ -1909,7 +1909,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		}
 
 		if (pos == std::string::npos)
-			input_error("Can't find object for defparam `%s`!\n", RTLIL::unescape_id(paramname).c_str());
+			input_error("Can't find object for defparam `%s`!\n", RTLIL::unescape_id(paramname));
 
 		paramname = "\\" + paramname.substr(pos+1);
 
@@ -1943,11 +1943,11 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			log_assert(children[0]->type == AST_WIRETYPE);
 			auto type_name = children[0]->str;
 			if (!current_scope.count(type_name)) {
-				input_error("Unknown identifier `%s' used as type name\n", type_name.c_str());
+				input_error("Unknown identifier `%s' used as type name\n", type_name);
 			}
 			AstNode *resolved_type_node = current_scope.at(type_name);
 			if (resolved_type_node->type != AST_TYPEDEF)
-				input_error("`%s' does not name a type\n", type_name.c_str());
+				input_error("`%s' does not name a type\n", type_name);
 			log_assert(resolved_type_node->children.size() == 1);
 			auto& template_node = resolved_type_node->children[0];
 
@@ -1985,7 +1985,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 			// Cannot add packed dimensions if unpacked dimensions are already specified.
 			if (add_packed_dimensions && newNode->type == AST_MEMORY)
-				input_error("Cannot extend unpacked type `%s' with packed dimensions\n", type_name.c_str());
+				input_error("Cannot extend unpacked type `%s' with packed dimensions\n", type_name);
 
 			// Add packed dimensions.
 			if (add_packed_dimensions) {
@@ -2030,7 +2030,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			children.insert(children.begin(), std::move(expr));
 
 			if (children[1]->type == AST_MEMORY)
-				input_error("unpacked array type `%s' cannot be used for a parameter\n", children[1]->str.c_str());
+				input_error("unpacked array type `%s' cannot be used for a parameter\n", children[1]->str);
 			fixup_hierarchy_flags();
 			did_something = true;
 		}
@@ -2331,7 +2331,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		}
 		if (current_scope.count(str) == 0) {
 			if (current_ast_mod == nullptr) {
-				input_error("Identifier `%s' is implicitly declared outside of a module.\n", str.c_str());
+				input_error("Identifier `%s' is implicitly declared outside of a module.\n", str);
 			} else if (flag_autowire || str == "\\$global_clock") {
 				auto auto_wire = std::make_unique<AstNode>(location, AST_AUTOWIRE);
 				auto_wire->str = str;
@@ -2339,7 +2339,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				current_ast_mod->children.push_back(std::move(auto_wire));
 				did_something = true;
 			} else {
-				input_error("Identifier `%s' is implicitly declared and `default_nettype is set to none.\n", str.c_str());
+				input_error("Identifier `%s' is implicitly declared and `default_nettype is set to none.\n", str);
 			}
 		}
 		if (id2ast != current_scope[str]) {
@@ -2562,7 +2562,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			}
 
 			if (buf->type != AST_CONSTANT)
-				input_error("Right hand side of 3rd expression of %s for-loop is not constant (%s)!\n", loop_type_str, type2str(buf->type).c_str());
+				input_error("Right hand side of 3rd expression of %s for-loop is not constant (%s)!\n", loop_type_str, type2str(buf->type));
 
 			varbuf->children[0] = std::move(buf);
 		}
@@ -2778,7 +2778,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	if (type == AST_PRIMITIVE)
 	{
 		if (children.size() < 2)
-			input_error("Insufficient number of arguments for primitive `%s'!\n", str.c_str());
+			input_error("Insufficient number of arguments for primitive `%s'!\n", str);
 
 		std::vector<std::unique_ptr<AstNode>> children_list;
 		for (auto& child : children) {
@@ -2792,7 +2792,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		if (str == "bufif0" || str == "bufif1" || str == "notif0" || str == "notif1")
 		{
 			if (children_list.size() != 3)
-				input_error("Invalid number of arguments for primitive `%s'!\n", str.c_str());
+				input_error("Invalid number of arguments for primitive `%s'!\n", str);
 
 			std::vector<RTLIL::State> z_const(1, RTLIL::State::Sz);
 
@@ -2894,7 +2894,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		auto& range = children[0]->children[0];
 
 		if (!try_determine_range_width(range.get(), result_width))
-			input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str.c_str());
+			input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str);
 
 		if (range->children.size() >= 2)
 			shift_expr = range->children[1]->clone();
@@ -3285,7 +3285,7 @@ skip_dynamic_range_lvalue_expansion:;
 				int width;
 
 				if (!try_determine_range_width(the_range.get(), width))
-					input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str.c_str());
+					input_error("Unsupported expression on dynamic range select on signal `%s'!\n", str);
 
 				if (the_range->children.size() >= 2)
 					offset_ast = the_range->children[1]->clone();
@@ -3405,7 +3405,7 @@ skip_dynamic_range_lvalue_expansion:;
 					auto buf = children[1]->clone();
 					while (buf->simplify(true, stage, -1, false)) { }
 					if (buf->type != AST_CONSTANT)
-						input_error("Failed to evaluate system function `%s' with non-constant value.\n", str.c_str());
+						input_error("Failed to evaluate system function `%s' with non-constant value.\n", str);
 
 					num_steps = buf->asInt(true);
 				}
@@ -3516,7 +3516,7 @@ skip_dynamic_range_lvalue_expansion:;
 				auto buf = children[0]->clone();
 				while (buf->simplify(true, stage, width_hint, sign_hint)) { }
 				if (buf->type != AST_CONSTANT)
-					input_error("Failed to evaluate system function `%s' with non-constant value.\n", str.c_str());
+					input_error("Failed to evaluate system function `%s' with non-constant value.\n", str);
 
 				RTLIL::Const arg_value = buf->bitsAsConst();
 				if (arg_value.as_bool())
@@ -3563,7 +3563,7 @@ skip_dynamic_range_lvalue_expansion:;
 					if (id_ast == nullptr && current_scope.count(buf->str))
 						id_ast = current_scope.at(buf->str);
 					if (!id_ast)
-						input_error("Failed to resolve identifier %s for width detection!\n", buf->str.c_str());
+						input_error("Failed to resolve identifier %s for width detection!\n", buf->str);
 
 					if (id_ast->type == AST_WIRE || id_ast->type == AST_MEMORY) {
 						// Check for item in packed struct / union
@@ -3578,7 +3578,7 @@ skip_dynamic_range_lvalue_expansion:;
 						// TODO: IEEE Std 1800-2017 20.7: "If the first argument to an array query function would cause $dimensions to return 0
 						// or if the second argument is out of range, then 'x shall be returned."
 						if (dim < 1 || dim > dims)
-							input_error("Dimension %d out of range in `%s', as it only has %d dimensions!\n", dim, id_ast->str.c_str(), dims);
+							input_error("Dimension %d out of range in `%s', as it only has %d dimensions!\n", dim, id_ast->str, dims);
 
 						expr_dimensions = dims - dim + 1;
 						expr_unpacked_dimensions = std::max(id_ast->unpacked_dimensions - dim + 1, 0);
@@ -3712,9 +3712,9 @@ skip_dynamic_range_lvalue_expansion:;
 					auto& node = children[i];
 					while (node->simplify(true, stage, -1, false)) { }
 					if (node->type != AST_CONSTANT)
-						input_error("Failed to evaluate system function `%s' with non-constant control bit argument.\n", str.c_str());
+						input_error("Failed to evaluate system function `%s' with non-constant control bit argument.\n", str);
 					if (node->bits.size() != 1)
-						input_error("Failed to evaluate system function `%s' with control bit width != 1.\n", str.c_str());
+						input_error("Failed to evaluate system function `%s' with control bit width != 1.\n", str);
 					control_bits.push_back(node->bits[0]);
 				}
 
@@ -3817,7 +3817,7 @@ skip_dynamic_range_lvalue_expansion:;
 			if (current_scope.count(str) == 0)
 				str = try_pop_module_prefix();
 			if (current_scope.count(str) == 0 || current_scope[str]->type != AST_FUNCTION)
-				input_error("Can't resolve function name `%s'.\n", str.c_str());
+				input_error("Can't resolve function name `%s'.\n", str);
 		}
 
 		if (type == AST_TCALL)
@@ -3825,9 +3825,9 @@ skip_dynamic_range_lvalue_expansion:;
 			if (str == "$finish" || str == "$stop")
 			{
 				if (!current_always || current_always->type != AST_INITIAL)
-					input_error("System task `%s' outside initial block is unsupported.\n", str.c_str());
+					input_error("System task `%s' outside initial block is unsupported.\n", str);
 
-				input_error("System task `%s' executed.\n", str.c_str());
+				input_error("System task `%s' executed.\n", str);
 			}
 
 			if (str == "\\$readmemh" || str == "\\$readmemb")
@@ -3839,12 +3839,12 @@ skip_dynamic_range_lvalue_expansion:;
 				auto node_filename = children[0]->clone();
 				while (node_filename->simplify(true, stage, width_hint, sign_hint)) { }
 				if (node_filename->type != AST_CONSTANT)
-					input_error("Failed to evaluate system function `%s' with non-constant 1st argument.\n", str.c_str());
+					input_error("Failed to evaluate system function `%s' with non-constant 1st argument.\n", str);
 
 				auto node_memory = children[1]->clone();
 				while (node_memory->simplify(true, stage, width_hint, sign_hint)) { }
 				if (node_memory->type != AST_IDENTIFIER || node_memory->id2ast == nullptr || node_memory->id2ast->type != AST_MEMORY)
-					input_error("Failed to evaluate system function `%s' with non-memory 2nd argument.\n", str.c_str());
+					input_error("Failed to evaluate system function `%s' with non-memory 2nd argument.\n", str);
 
 				int start_addr = -1, finish_addr = -1;
 
@@ -3852,7 +3852,7 @@ skip_dynamic_range_lvalue_expansion:;
 					auto node_addr = children[2]->clone();
 					while (node_addr->simplify(true, stage, width_hint, sign_hint)) { }
 					if (node_addr->type != AST_CONSTANT)
-						input_error("Failed to evaluate system function `%s' with non-constant 3rd argument.\n", str.c_str());
+						input_error("Failed to evaluate system function `%s' with non-constant 3rd argument.\n", str);
 					start_addr = int(node_addr->asInt(false));
 				}
 
@@ -3860,7 +3860,7 @@ skip_dynamic_range_lvalue_expansion:;
 					auto node_addr = children[3]->clone();
 					while (node_addr->simplify(true, stage, width_hint, sign_hint)) { }
 					if (node_addr->type != AST_CONSTANT)
-						input_error("Failed to evaluate system function `%s' with non-constant 4th argument.\n", str.c_str());
+						input_error("Failed to evaluate system function `%s' with non-constant 4th argument.\n", str);
 					finish_addr = int(node_addr->asInt(false));
 				}
 
@@ -3888,7 +3888,7 @@ skip_dynamic_range_lvalue_expansion:;
 			if (current_scope.count(str) == 0)
 				str = try_pop_module_prefix();
 			if (current_scope.count(str) == 0 || current_scope[str]->type != AST_TASK)
-				input_error("Can't resolve task name `%s'.\n", str.c_str());
+				input_error("Can't resolve task name `%s'.\n", str);
 		}
 
 
@@ -3928,7 +3928,7 @@ skip_dynamic_range_lvalue_expansion:;
 			if (in_param)
 				input_error("Non-constant function call in constant expression.\n");
 			if (require_const_eval)
-				input_error("Function %s can only be called with constant arguments.\n", str.c_str());
+				input_error("Function %s can only be called with constant arguments.\n", str);
 		}
 
 		size_t arg_count = 0;
@@ -4050,7 +4050,7 @@ skip_dynamic_range_lvalue_expansion:;
 									goto tcall_incompatible_wires;
 						} else {
 					tcall_incompatible_wires:
-							input_error("Incompatible re-declaration of wire %s.\n", child->str.c_str());
+							input_error("Incompatible re-declaration of wire %s.\n", child->str);
 						}
 					}
 				}
@@ -4476,7 +4476,7 @@ std::unique_ptr<AstNode> AstNode::readmem(bool is_readmemh, std::string mem_file
 		yosys_input_files.insert(mem_filename);
 	}
 	if (f.fail() || GetSize(mem_filename) == 0)
-		input_error("Can not open file `%s` for %s.\n", mem_filename.c_str(), str.c_str());
+		input_error("Can not open file `%s` for %s.\n", mem_filename, str);
 
 	log_assert(GetSize(memory->children) == 2 && memory->children[1]->type == AST_RANGE && memory->children[1]->range_valid);
 	int range_left =  memory->children[1]->range_left, range_right =  memory->children[1]->range_right;
@@ -4522,7 +4522,7 @@ std::unique_ptr<AstNode> AstNode::readmem(bool is_readmemh, std::string mem_file
 				char *endptr;
 				cursor = strtol(nptr, &endptr, 16);
 				if (!*nptr || *endptr)
-					input_error("Can not parse address `%s` for %s.\n", nptr, str.c_str());
+					input_error("Can not parse address `%s` for %s.\n", nptr, str);
 				continue;
 			}
 
@@ -5421,7 +5421,7 @@ std::unique_ptr<AstNode> AstNode::eval_const_function(AstNode *fcall, bool must_
 			// if this variable has already been declared as an input, check the
 			// sizes match if it already had an explicit size
 			if (variable.arg && variable.explicitly_sized && variable.val.size() != width) {
-				input_error("Incompatible re-declaration of constant function wire %s.\n", stmt->str.c_str());
+				input_error("Incompatible re-declaration of constant function wire %s.\n", stmt->str);
 			}
 			variable.val = RTLIL::Const(RTLIL::State::Sx, width);
 			variable.offset = stmt->range_swapped ? stmt->range_left : stmt->range_right;
@@ -5503,7 +5503,7 @@ std::unique_ptr<AstNode> AstNode::eval_const_function(AstNode *fcall, bool must_
 				if (!range->range_valid) {
 					if (!must_succeed)
 						goto finished;
-					range->input_error("Non-constant range\n%s: ... called from here.\n", fcall->loc_string().c_str());
+					range->input_error("Non-constant range\n%s: ... called from here.\n", fcall->loc_string());
 				}
 				int offset = min(range->range_left, range->range_right);
 				int width = std::abs(range->range_left - range->range_right) + 1;

From 8cd3c069d662d12e727f75bb40bbfdc5d05e0308 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 06:13:13 +0000
Subject: [PATCH 502/931] Use C++ stringf machinery in verilog_error

---
 frontends/verilog/verilog_error.cc | 35 +++++-------------------------
 frontends/verilog/verilog_error.h  | 16 ++++++++++++--
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/frontends/verilog/verilog_error.cc b/frontends/verilog/verilog_error.cc
index 491b8c7f5..b968b3e21 100644
--- a/frontends/verilog/verilog_error.cc
+++ b/frontends/verilog/verilog_error.cc
@@ -32,37 +32,14 @@ USING_YOSYS_NAMESPACE
  */
 
 [[noreturn]]
-static void verr_at(std::string filename, int begin_line, char const *fmt, va_list ap)
+void VERILOG_FRONTEND::formatted_err_at_loc(Location loc, std::string str)
 {
-    char buffer[1024];
-    char *p = buffer;
-    p += vsnprintf(p, buffer + sizeof(buffer) - p, fmt, ap);
-    p += snprintf(p, buffer + sizeof(buffer) - p, "\n");
-    YOSYS_NAMESPACE_PREFIX log_file_error(filename, begin_line, "%s", buffer);
-    exit(1);
+    YOSYS_NAMESPACE_PREFIX log_file_error(loc.begin.filename ? *(loc.begin.filename) : "UNKNOWN", loc.begin.line,
+            "%s\n", std::move(str));
 }
 
-static void vwarn_at(std::string filename, int begin_line, char const *fmt, va_list ap)
+void VERILOG_FRONTEND::formatted_warn_at_loc(Location loc, std::string str)
 {
-    char buffer[1024];
-    char *p = buffer;
-    p += vsnprintf(p, buffer + sizeof(buffer) - p, fmt, ap);
-    p += snprintf(p, buffer + sizeof(buffer) - p, "\n");
-    YOSYS_NAMESPACE_PREFIX log_file_warning(filename, begin_line, "%s", buffer);
+    YOSYS_NAMESPACE_PREFIX log_file_warning(loc.begin.filename ? *(loc.begin.filename) : "UNKNOWN", loc.begin.line,
+            "%s\n", std::move(str));
 }
-
-[[noreturn]]
-void VERILOG_FRONTEND::err_at_loc(Location loc, char const *fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    verr_at(loc.begin.filename ? *(loc.begin.filename) : "UNKNOWN", loc.begin.line, fmt, args);
-}
-void VERILOG_FRONTEND::warn_at_loc(Location loc, char const *fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    vwarn_at(loc.begin.filename ? *(loc.begin.filename) : "UNKNOWN", loc.begin.line, fmt, args);
-    va_end(args);
-}
-
diff --git a/frontends/verilog/verilog_error.h b/frontends/verilog/verilog_error.h
index b36de19b8..ede489b26 100644
--- a/frontends/verilog/verilog_error.h
+++ b/frontends/verilog/verilog_error.h
@@ -10,8 +10,20 @@ YOSYS_NAMESPACE_BEGIN
 namespace VERILOG_FRONTEND
 {
     [[noreturn]]
-    void err_at_loc(Location loc, char const *fmt, ...);
-    void warn_at_loc(Location loc, char const *fmt, ...);
+    void formatted_err_at_loc(Location loc, std::string str);
+    template <typename... Args>
+    [[noreturn]]
+    void err_at_loc(Location loc, FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+    {
+        formatted_err_at_loc(std::move(loc), fmt.format(args...));
+    }
+
+    void formatted_warn_at_loc(Location loc, std::string str);
+    template <typename... Args>
+    void warn_at_loc(Location loc, FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+    {
+        formatted_warn_at_loc(std::move(loc), fmt.format(args...));
+    }
 };
 
 YOSYS_NAMESPACE_END

From f4699e2b10b959cd3700b3509df93b5b147fe7c5 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 06:18:03 +0000
Subject: [PATCH 503/931] Remove unnecessary c_str() calls from
 err_at_loc/warn_at_loc

---
 frontends/verilog/verilog_frontend.cc |  2 +-
 frontends/verilog/verilog_parser.y    | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index 4b4f7ad8d..69313ed3b 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -51,7 +51,7 @@ static std::list<std::vector<std::string>> verilog_defaults_stack;
 static void error_on_dpi_function(AST::AstNode *node)
 {
     if (node->type == AST::AST_DPI_FUNCTION)
-        err_at_loc(node->location, "Found DPI function %s.\n", node->str.c_str());
+        err_at_loc(node->location, "Found DPI function %s.\n", node->str);
     for (auto& child : node->children)
         error_on_dpi_function(child.get());
 }
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index 3db92be01..9168b195a 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -420,7 +420,7 @@
 
 	void frontend_verilog_yy::parser::error(const frontend_verilog_yy::parser::location_type& loc, const std::string& msg)
 	{
-		err_at_loc(loc, "%s", msg.c_str());
+		err_at_loc(loc, "%s", msg);
 	}
 }
 
@@ -772,7 +772,7 @@ module_arg:
 			extra->ast_stack.back()->children.push_back(std::move(node));
 		} else {
 			if (extra->port_stubs.count(*$1) != 0)
-				err_at_loc(@1, "Duplicate module port `%s'.", $1->c_str());
+				err_at_loc(@1, "Duplicate module port `%s'.", *$1);
 			extra->port_stubs[*$1] = ++extra->port_counter;
 		}
 	} module_arg_opt_assignment |
@@ -782,7 +782,7 @@ module_arg:
 		extra->astbuf1->children[0]->str = *$1;
 	} TOK_ID {  /* SV interfaces */
 		if (!mode->sv)
-			err_at_loc(@3, "Interface found in port list (%s). This is not supported unless read_verilog is called with -sv!", $3->c_str());
+			err_at_loc(@3, "Interface found in port list (%s). This is not supported unless read_verilog is called with -sv!", *$3);
 		extra->astbuf2 = extra->astbuf1->clone(); // really only needed if multiple instances of same type.
 		extra->astbuf2->str = *$3;
 		extra->astbuf2->port_id = ++extra->port_counter;
@@ -797,9 +797,9 @@ module_arg:
 		if (range != nullptr)
 			node->children.push_back(std::move(range));
 		if (!node->is_input && !node->is_output)
-			err_at_loc(@4, "Module port `%s' is neither input nor output.", $4->c_str());
+			err_at_loc(@4, "Module port `%s' is neither input nor output.", *$4);
 		if (node->is_reg && node->is_input && !node->is_output && !mode->sv)
-			err_at_loc(@4, "Input port `%s' is declared as register.", $4->c_str());
+			err_at_loc(@4, "Input port `%s' is declared as register.", *$4);
 		append_attr(node.get(), std::move($1));
 		extra->ast_stack.back()->children.push_back(std::move(node));
 	} module_arg_opt_assignment |
@@ -1381,7 +1381,7 @@ specify_item:
 	TOK_ID TOK_LPAREN specify_edge expr specify_condition TOK_COMMA specify_edge expr specify_condition TOK_COMMA specify_triple specify_opt_triple TOK_RPAREN TOK_SEMICOL {
 		if (*$1 != "$setup" && *$1 != "$hold" && *$1 != "$setuphold" && *$1 != "$removal" && *$1 != "$recovery" &&
 				*$1 != "$recrem" && *$1 != "$skew" && *$1 != "$timeskew" && *$1 != "$fullskew" && *$1 != "$nochange")
-			err_at_loc(@1, "Unsupported specify rule type: %s", $1->c_str());
+			err_at_loc(@1, "Unsupported specify rule type: %s", *$1);
 
 		auto src_pen = AstNode::mkconst_int(@3, $3 != 0, false, 1);
 		auto src_pol = AstNode::mkconst_int(@3, $3 == 'p', false, 1);
@@ -2156,21 +2156,21 @@ wire_name:
 				node->port_id = extra->current_function_or_task_port_id++;
 		} else if (extra->ast_stack.back()->type == AST_GENBLOCK) {
 			if (node->is_input || node->is_output)
-				err_at_loc(@1, "Cannot declare module port `%s' within a generate block.", $1->c_str());
+				err_at_loc(@1, "Cannot declare module port `%s' within a generate block.", *$1);
 		} else {
 			if (extra->do_not_require_port_stubs && (node->is_input || node->is_output) && extra->port_stubs.count(*$1) == 0) {
 				extra->port_stubs[*$1] = ++extra->port_counter;
 			}
 			if (extra->port_stubs.count(*$1) != 0) {
 				if (!node->is_input && !node->is_output)
-					err_at_loc(@1, "Module port `%s' is neither input nor output.", $1->c_str());
+					err_at_loc(@1, "Module port `%s' is neither input nor output.", *$1);
 				if (node->is_reg && node->is_input && !node->is_output && !mode->sv)
-					err_at_loc(@1, "Input port `%s' is declared as register.", $1->c_str());
+					err_at_loc(@1, "Input port `%s' is declared as register.", *$1);
 				node->port_id = extra->port_stubs[*$1];
 				extra->port_stubs.erase(*$1);
 			} else {
 				if (node->is_input || node->is_output)
-					err_at_loc(@1, "Module port `%s' is not declared in module header.", $1->c_str());
+					err_at_loc(@1, "Module port `%s' is not declared in module header.", *$1);
 			}
 		}
 		//FIXME: for some reason, TOK_ID has a location which always points to one column *after* the real last column...
@@ -3247,7 +3247,7 @@ basic_expr:
 	} |
 	TOK_LPAREN expr TOK_RPAREN integral_number {
 		if ($4->compare(0, 1, "'") != 0)
-			err_at_loc(@4, "Cast operation must be applied on sized constants e.g. (<expr>)<constval> , while %s is not a sized constant.", $4->c_str());
+			err_at_loc(@4, "Cast operation must be applied on sized constants e.g. (<expr>)<constval> , while %s is not a sized constant.", *$4);
 		ConstParser p{@4};
 		auto val = p.const2ast(*$4, extra->case_type_stack.size() == 0 ? 0 : extra->case_type_stack.back(), !mode->lib);
 		if (val == nullptr)
@@ -3256,7 +3256,7 @@ basic_expr:
 	} |
 	hierarchical_id integral_number {
 		if ($2->compare(0, 1, "'") != 0)
-			err_at_loc(@2, "Cast operation must be applied on sized constants, e.g. <ID>\'d0, while %s is not a sized constant.", $2->c_str());
+			err_at_loc(@2, "Cast operation must be applied on sized constants, e.g. <ID>\'d0, while %s is not a sized constant.", *$2);
 		auto bits = std::make_unique<AstNode>(@$, AST_IDENTIFIER);
 		bits->str = *$1;
 		SET_AST_NODE_LOC(bits.get(), @1, @1);

From f102b259141d78b6b05bf16bb4d28b975d05168f Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 12 Sep 2025 09:27:29 +1200
Subject: [PATCH 504/931] Reapply "Merge pull request #5301 from
 KrystalDelusion/krys/re_5280"

This reverts commit 88eb83a0c3e19c1c1cca42658aeb762abe2ed913.
---
 .github/workflows/extra-builds.yml    |  16 +++-
 .github/workflows/test-build.yml      |  44 ++++++-----
 .github/workflows/test-compile.yml    |  16 +++-
 .github/workflows/test-sanitizers.yml | 109 ++++++++++++++++++++++++++
 .github/workflows/test-verific.yml    |  16 +++-
 passes/memory/memlib.cc               |   2 +-
 passes/memory/memlib.h                |   2 +-
 7 files changed, 171 insertions(+), 34 deletions(-)
 create mode 100644 .github/workflows/test-sanitizers.yml

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 9c15c3383..503145e97 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -1,6 +1,14 @@
 name: Test extra build flows
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre_job:
@@ -11,11 +19,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   vs-prep:
     name: Prepare Visual Studio build
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index f9574594a..16ad98bec 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -1,6 +1,14 @@
 name: Build and run tests
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre_job:
@@ -11,11 +19,12 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
+
   pre_docs_job:
     runs-on: ubuntu-latest
     outputs:
@@ -24,15 +33,16 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on readme changes
           paths_ignore: '["**/README.md"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   build-yosys:
     name: Reusable build
     runs-on: ${{ matrix.os }}
+    # pre_job is a subset of pre_docs_job, so we can always build for pre_docs_job
     needs: pre_docs_job
     if: needs.pre_docs_job.outputs.should_skip != 'true'
     env:
@@ -40,7 +50,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -58,7 +67,6 @@ jobs:
           mkdir build
           cd build
           make -f ../Makefile config-$CC
-          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
           make -f ../Makefile -j$procs ENABLE_LTO=1
 
       - name: Log yosys-config output
@@ -74,7 +82,7 @@ jobs:
       - name: Store build artifact
         uses: actions/upload-artifact@v4
         with:
-          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
+          name: build-${{ matrix.os }}
           path: build.tar
           retention-days: 1
 
@@ -85,12 +93,9 @@ jobs:
     if: needs.pre_job.outputs.should_skip != 'true'
     env:
       CC: clang
-      ASAN_OPTIONS: halt_on_error=1
-      UBSAN_OPTIONS: halt_on_error=1
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -102,11 +107,12 @@ jobs:
         uses: ./.github/actions/setup-build-env
 
       - name: Get iverilog
+        id: get-iverilog
         shell: bash
         run: |
           git clone https://github.com/steveicarus/iverilog.git
           cd iverilog
-          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
+          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
 
       - name: Get vcd2fst
         shell: bash
@@ -123,7 +129,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: .local/
-          key: ${{ matrix.os }}-${IVERILOG_GIT}
+          key: ${{ matrix.os }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
 
       - name: Build iverilog
         if: steps.cache-iverilog.outputs.cache-hit != 'true'
@@ -139,7 +145,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
+          name: build-${{ matrix.os }}
 
       - name: Uncompress build
         shell: bash
@@ -171,7 +177,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        sanitizer: [undefined]
     steps:
       - name: Checkout Yosys
         uses: actions/checkout@v4
@@ -184,7 +189,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
+          name: build-${{ matrix.os }}
 
       - name: Uncompress build
         shell: bash
@@ -209,7 +214,6 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        sanitizer: [undefined, address]
       fail-fast: false
     steps:
       - name: Checkout Yosys
@@ -223,7 +227,7 @@ jobs:
       - name: Download build artifact
         uses: actions/download-artifact@v4
         with:
-          name: build-${{ matrix.os }}-${{ matrix.sanitizer }}
+          name: build-${{ matrix.os }}
 
       - name: Uncompress build
         shell: bash
diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index 95c6ea4c1..45d3d7b90 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -1,6 +1,14 @@
 name: Compiler testing
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre_job:
@@ -11,11 +19,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   test-compile:
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
new file mode 100644
index 000000000..255b9daa5
--- /dev/null
+++ b/.github/workflows/test-sanitizers.yml
@@ -0,0 +1,109 @@
+name: Check clang sanitizers
+
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # ignore PRs due to time needed
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
+
+jobs:
+  pre_job:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@v5
+        with:
+          # don't run on documentation changes
+          paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
+
+  run_san:
+    name: Build and run tests
+    runs-on: ${{ matrix.os }}
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
+    env:
+      CC: clang
+      ASAN_OPTIONS: halt_on_error=1
+      UBSAN_OPTIONS: halt_on_error=1
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        sanitizer: ['undefined,address']
+      fail-fast: false
+    steps:
+      - name: Checkout Yosys
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+          persist-credentials: false
+
+      - name: Setup environment
+        uses: ./.github/actions/setup-build-env
+
+      - name: Get iverilog
+        id: get-iverilog
+        shell: bash
+        run: |
+          git clone https://github.com/steveicarus/iverilog.git
+          cd iverilog
+          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Get vcd2fst
+        shell: bash
+        run: |
+          git clone https://github.com/mmicko/libwave.git
+          mkdir -p ${{ github.workspace }}/.local/
+          cd libwave
+          cmake . -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.local
+          make -j$procs
+          make install
+
+      - name: Cache iverilog
+        id: cache-iverilog
+        uses: actions/cache@v4
+        with:
+          path: .local/
+          key: ${{ matrix.os }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
+
+      - name: Build iverilog
+        if: steps.cache-iverilog.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          mkdir -p ${{ github.workspace }}/.local/
+          cd iverilog
+          autoconf
+          CC=gcc CXX=g++ ./configure --prefix=${{ github.workspace }}/.local
+          make -j$procs
+          make install
+
+      - name: Check iverilog
+        shell: bash
+        run: |
+          iverilog -V
+
+      - name: Build
+        shell: bash
+        run: |
+          make config-$CC
+          echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
+          make -j$procs ENABLE_LTO=1
+
+      - name: Log yosys-config output
+        run: |
+          ./yosys-config || true
+
+      - name: Run tests
+        shell: bash
+        run: |
+          make -j$procs test TARGETS= EXTRA_TARGETS= CONFIG=$CC
+
+      - name: Report errors
+        if: ${{ failure() }}
+        shell: bash
+        run: |
+          find tests/**/*.err -print -exec cat {} \;
diff --git a/.github/workflows/test-verific.yml b/.github/workflows/test-verific.yml
index 013c9f8ca..9af07b920 100644
--- a/.github/workflows/test-verific.yml
+++ b/.github/workflows/test-verific.yml
@@ -1,6 +1,14 @@
 name: Build and run tests with Verific (Linux)
 
-on: [push, pull_request]
+on:
+  # always test main
+  push:
+    branches:
+      - main
+  # test PRs
+  pull_request:
+  # allow triggering tests, ignores skip check
+  workflow_dispatch:
 
 jobs:
   pre-job:
@@ -11,11 +19,11 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v5
         with:
+          # don't run on documentation changes
           paths_ignore: '["**/README.md", "docs/**", "guidelines/**"]'
           # cancel previous builds if a new commit is pushed
-          cancel_others: 'true'
-          # only run on push *or* pull_request, not both
-          concurrent_skipping: 'same_content_newer'
+          # but never cancel main
+          cancel_others: ${{ github.ref != 'refs/heads/main' }}
 
   test-verific:
     needs: pre-job
diff --git a/passes/memory/memlib.cc b/passes/memory/memlib.cc
index fb256e41c..4bb2350d2 100644
--- a/passes/memory/memlib.cc
+++ b/passes/memory/memlib.cc
@@ -880,7 +880,7 @@ struct Parser {
 						}
 					}
 				}
-				var.clk_en = find_single_cap(pdef.clken, cram.options, portopts, "clken");
+				var.clk_en = find_single_cap(pdef.clken, cram.options, portopts, "clken") != nullptr;
 			}
 			const PortWidthDef *wdef = find_single_cap(pdef.width, cram.options, portopts, "width");
 			if (wdef) {
diff --git a/passes/memory/memlib.h b/passes/memory/memlib.h
index 43dec7386..7394baf4e 100644
--- a/passes/memory/memlib.h
+++ b/passes/memory/memlib.h
@@ -109,7 +109,7 @@ struct PortVariant {
 	PortKind kind;
 	int clk_shared;
 	ClkPolKind clk_pol;
-	bool clk_en;
+	bool clk_en = false;
 	bool width_tied;
 	int min_wr_wide_log2;
 	int max_wr_wide_log2;

From 7e1292dd2da13851d2b6df4f24c12d0c48f9b021 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 12 Sep 2025 11:09:26 +1200
Subject: [PATCH 505/931] CI: brew install autoconf for iverilog

---
 .github/workflows/test-build.yml      | 6 ++++++
 .github/workflows/test-sanitizers.yml | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 16ad98bec..65d931797 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -131,6 +131,12 @@ jobs:
           path: .local/
           key: ${{ matrix.os }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
 
+      - name: iverilog macOS deps
+        if: steps.cache-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
+        shell: bash
+        run: |
+          brew install autoconf
+
       - name: Build iverilog
         if: steps.cache-iverilog.outputs.cache-hit != 'true'
         shell: bash
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
index 255b9daa5..2ffd2db15 100644
--- a/.github/workflows/test-sanitizers.yml
+++ b/.github/workflows/test-sanitizers.yml
@@ -70,6 +70,12 @@ jobs:
           path: .local/
           key: ${{ matrix.os }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
 
+      - name: iverilog macOS deps
+        if: steps.cache-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
+        shell: bash
+        run: |
+          brew install autoconf
+
       - name: Build iverilog
         if: steps.cache-iverilog.outputs.cache-hit != 'true'
         shell: bash

From fa02d71f65b39c502c8b8c8dde5a749876ecb6ca Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 Sep 2025 00:20:53 +0000
Subject: [PATCH 506/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a22f3fb00..d565ead16 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+55
+YOSYS_VER := 0.57+72
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 3d2bb1db17e119efbf58134acc089c2b5867a451 Mon Sep 17 00:00:00 2001
From: Xing Guo <higuoxing@gmail.com>
Date: Sat, 13 Sep 2025 11:19:29 +0800
Subject: [PATCH 507/931] verilog_parser: replace manual AST node allocation
 with typed midrule actions

Use Bison's typed midrule actions to construct AST_FCALL nodes
with std::unique_ptr, replacing manual 'new' and extra->ast_stack
management. This improves type safety, ensures proper ownership, and
eliminates potential memory leaks.

Ref: https://www.gnu.org/software/bison/manual/html_node/Typed-Midrule-Actions.html
---
 frontends/verilog/verilog_parser.y | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index d8b0088b9..ef8427679 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -3289,15 +3289,19 @@ basic_expr:
 		$$ = AstNode::mkconst_str(@1, *$1);
 		SET_AST_NODE_LOC($$.get(), @1, @1);
 	} |
-	hierarchical_id attr {
-		// super sketchy! Orphaned pointer in non-owning extra->ast_stack
-		AstNode *node = new AstNode(@1, AST_FCALL);
-		node->str = *$1;
-		extra->ast_stack.push_back(node);
-		SET_AST_NODE_LOC(node, @1, @1);
-		append_attr(node, std::move($2));
+	hierarchical_id attr <ast_t>{
+		// Here we use "Typed Midrule Actions".
+		// https://www.gnu.org/software/bison/manual/html_node/Typed-Midrule-Actions.html
+		auto fcall = std::make_unique<AstNode>(@1, AST_FCALL);
+		AstNode *fcall_node = fcall.get();
+		fcall_node->str = *$1;
+		extra->ast_stack.push_back(fcall_node);
+		SET_AST_NODE_LOC(fcall_node, @1, @1);
+		append_attr(fcall_node, std::move($2));
+		$$ = std::move(fcall);
 	} TOK_LPAREN arg_list optional_comma TOK_RPAREN {
-		$$.reset(extra->ast_stack.back());
+		log_assert($3 != nullptr);
+		$$ = std::move($3);
 		extra->ast_stack.pop_back();
 	} |
 	TOK_TO_SIGNED attr TOK_LPAREN expr TOK_RPAREN {

From 1c422fcb6ed31ab9c5f1491c278cbdb97fc85bc1 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 15 Sep 2025 16:48:56 +0200
Subject: [PATCH 508/931] CODEOWNERS: add myself for read_verilog and AST

---
 CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index ef8c803ed..46d37ad2f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -30,8 +30,8 @@ docs/source/using_yosys/synthesis/abc.rst @KrystalDelusion @Ravenslofty
 # These still override previous lines, so be careful not to
 # accidentally disable any of the above rules.
 
-frontends/verilog/             @zachjs
-frontends/ast/                 @zachjs
+frontends/verilog/             @widlarizer
+frontends/ast/                 @widlarizer
 
 techlibs/intel_alm/            @Ravenslofty
 techlibs/gowin/                @pepijndevos

From 13b3418a7f8cf24bd2706fb8dc8a4530d8ef9e0d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 15 Jul 2025 04:25:07 +0000
Subject: [PATCH 509/931] Split `abc_module()` into `prepare_module()` and
 `run_abc()`

`prepare_module()` will have to run on the main thread.
---
 passes/techmap/abc.cc | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 7d81b52d2..680428096 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -180,8 +180,9 @@ struct AbcModuleState {
 	std::string remap_name(RTLIL::IdString abc_name, RTLIL::Wire **orig_wire = nullptr);
 	void dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edges, pool<int> &workpool, std::vector<int> &in_counts);
 	void handle_loops(AbcSigMap &assign_map, RTLIL::Module *module);
-	void abc_module(RTLIL::Design *design, RTLIL::Module *module, AbcSigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
+	void prepare_module(RTLIL::Design *design, RTLIL::Module *module, AbcSigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
 		bool dff_mode, std::string clk_str);
+	void run_abc();
 	void extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL::Module *module);
 	void finish();
 };
@@ -775,7 +776,7 @@ struct abc_output_filter
 	}
 };
 
-void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, AbcSigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
+void AbcModuleState::prepare_module(RTLIL::Design *design, RTLIL::Module *module, AbcSigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
 	bool dff_mode, std::string clk_str)
 {
 	map_autoidx = autoidx++;
@@ -987,9 +988,12 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 		mark_port(assign_map, srst_sig);
 
 	handle_loops(assign_map, module);
+}
 
-	buffer = stringf("%s/input.blif", tempdir_name);
-	f = fopen(buffer.c_str(), "wt");
+void AbcModuleState::run_abc()
+{
+	std::string buffer = stringf("%s/input.blif", tempdir_name);
+	FILE *f = fopen(buffer.c_str(), "wt");
 	if (f == nullptr)
 		log_error("Opening %s for writing failed: %s\n", buffer, strerror(errno));
 
@@ -1111,8 +1115,6 @@ void AbcModuleState::abc_module(RTLIL::Design *design, RTLIL::Module *module, Ab
 	log_push();
 	if (count_output > 0)
 	{
-		log_header(design, "Executing ABC.\n");
-
 		auto &cell_cost = cmos_cost ? CellCosts::cmos_gate_cost() : CellCosts::default_gate_cost();
 
 		buffer = stringf("%s/stdcells.genlib", tempdir_name);
@@ -1522,8 +1524,6 @@ void AbcModuleState::finish()
 		log("Removing temp directory.\n");
 		remove_directory(tempdir_name);
 	}
-
-	log_pop();
 }
 
 // For every signal that connects cells from different sets, or a cell in a set to a cell not in any set,
@@ -2163,7 +2163,8 @@ struct AbcPass : public Pass {
 				assign_cell_connection_ports(mod, {&cells}, assign_map);
 
 				AbcModuleState state(config, initvals);
-				state.abc_module(design, mod, assign_map, cells, dff_mode, clk_str);
+				state.prepare_module(design, mod, assign_map, cells, dff_mode, clk_str);
+				state.run_abc();
 				state.extract(assign_map, design, mod);
 				state.finish();
 				continue;
@@ -2333,7 +2334,8 @@ struct AbcPass : public Pass {
 				state.arst_sig = assign_map(std::get<5>(it.first));
 				state.srst_polarity = std::get<6>(it.first);
 				state.srst_sig = assign_map(std::get<7>(it.first));
-				state.abc_module(design, mod, assign_map, it.second, !state.clk_sig.empty(), "$");
+				state.prepare_module(design, mod, assign_map, it.second, !state.clk_sig.empty(), "$");
+				state.run_abc();
 				state.extract(assign_map, design, mod);
 				state.finish();
 			}

From 222f457a045e474bcf6712ad167a85d688b55b48 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 15 Jul 2025 05:33:09 +0000
Subject: [PATCH 510/931] Only write out stdcells/lutcosts once for all ABC
 runs

---
 passes/techmap/abc.cc | 141 ++++++++++++++++++++++++------------------
 1 file changed, 82 insertions(+), 59 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 680428096..03417b7f2 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -119,6 +119,7 @@ bool cmos_cost;
 
 struct AbcConfig
 {
+	std::string global_tempdir_name;
 	std::string script_file;
 	std::string exe_file;
 	std::vector<std::string> liberty_files;
@@ -878,9 +879,9 @@ void AbcModuleState::prepare_module(RTLIL::Design *design, RTLIL::Module *module
 			abc_script += stringf("read_constr -v \"%s\"; ", config.constr_file);
 	} else
 	if (!config.lut_costs.empty())
-		abc_script += stringf("read_lut %s/lutdefs.txt; ", tempdir_name);
+		abc_script += stringf("read_lut %s/lutdefs.txt; ", config.global_tempdir_name);
 	else
-		abc_script += stringf("read_library %s/stdcells.genlib; ", tempdir_name);
+		abc_script += stringf("read_library %s/stdcells.genlib; ", config.global_tempdir_name);
 
 	if (!config.script_file.empty()) {
 		const std::string &script_file = config.script_file;
@@ -1112,65 +1113,8 @@ void AbcModuleState::run_abc()
 
 	log("Extracted %d gates and %d wires to a netlist network with %d inputs and %d outputs.\n",
 			count_gates, GetSize(signal_list), count_input, count_output);
-	log_push();
 	if (count_output > 0)
 	{
-		auto &cell_cost = cmos_cost ? CellCosts::cmos_gate_cost() : CellCosts::default_gate_cost();
-
-		buffer = stringf("%s/stdcells.genlib", tempdir_name);
-		f = fopen(buffer.c_str(), "wt");
-		if (f == nullptr)
-			log_error("Opening %s for writing failed: %s\n", buffer, strerror(errno));
-		fprintf(f, "GATE ZERO    1 Y=CONST0;\n");
-		fprintf(f, "GATE ONE     1 Y=CONST1;\n");
-		fprintf(f, "GATE BUF    %d Y=A;                  PIN * NONINV  1 999 1 0 1 0\n", cell_cost.at(ID($_BUF_)));
-		fprintf(f, "GATE NOT    %d Y=!A;                 PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_NOT_)));
-		if (enabled_gates.count("AND"))
-			fprintf(f, "GATE AND    %d Y=A*B;                PIN * NONINV  1 999 1 0 1 0\n", cell_cost.at(ID($_AND_)));
-		if (enabled_gates.count("NAND"))
-			fprintf(f, "GATE NAND   %d Y=!(A*B);             PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_NAND_)));
-		if (enabled_gates.count("OR"))
-			fprintf(f, "GATE OR     %d Y=A+B;                PIN * NONINV  1 999 1 0 1 0\n", cell_cost.at(ID($_OR_)));
-		if (enabled_gates.count("NOR"))
-			fprintf(f, "GATE NOR    %d Y=!(A+B);             PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_NOR_)));
-		if (enabled_gates.count("XOR"))
-			fprintf(f, "GATE XOR    %d Y=(A*!B)+(!A*B);      PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_XOR_)));
-		if (enabled_gates.count("XNOR"))
-			fprintf(f, "GATE XNOR   %d Y=(A*B)+(!A*!B);      PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_XNOR_)));
-		if (enabled_gates.count("ANDNOT"))
-			fprintf(f, "GATE ANDNOT %d Y=A*!B;               PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_ANDNOT_)));
-		if (enabled_gates.count("ORNOT"))
-			fprintf(f, "GATE ORNOT  %d Y=A+!B;               PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_ORNOT_)));
-		if (enabled_gates.count("AOI3"))
-			fprintf(f, "GATE AOI3   %d Y=!((A*B)+C);         PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_AOI3_)));
-		if (enabled_gates.count("OAI3"))
-			fprintf(f, "GATE OAI3   %d Y=!((A+B)*C);         PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_OAI3_)));
-		if (enabled_gates.count("AOI4"))
-			fprintf(f, "GATE AOI4   %d Y=!((A*B)+(C*D));     PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_AOI4_)));
-		if (enabled_gates.count("OAI4"))
-			fprintf(f, "GATE OAI4   %d Y=!((A+B)*(C+D));     PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_OAI4_)));
-		if (enabled_gates.count("MUX"))
-			fprintf(f, "GATE MUX    %d Y=(A*B)+(S*B)+(!S*A); PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_MUX_)));
-		if (enabled_gates.count("NMUX"))
-			fprintf(f, "GATE NMUX   %d Y=!((A*B)+(S*B)+(!S*A)); PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_NMUX_)));
-		if (map_mux4)
-			fprintf(f, "GATE MUX4   %d Y=(!S*!T*A)+(S*!T*B)+(!S*T*C)+(S*T*D); PIN * UNKNOWN 1 999 1 0 1 0\n", 2*cell_cost.at(ID($_MUX_)));
-		if (map_mux8)
-			fprintf(f, "GATE MUX8   %d Y=(!S*!T*!U*A)+(S*!T*!U*B)+(!S*T*!U*C)+(S*T*!U*D)+(!S*!T*U*E)+(S*!T*U*F)+(!S*T*U*G)+(S*T*U*H); PIN * UNKNOWN 1 999 1 0 1 0\n", 4*cell_cost.at(ID($_MUX_)));
-		if (map_mux16)
-			fprintf(f, "GATE MUX16  %d Y=(!S*!T*!U*!V*A)+(S*!T*!U*!V*B)+(!S*T*!U*!V*C)+(S*T*!U*!V*D)+(!S*!T*U*!V*E)+(S*!T*U*!V*F)+(!S*T*U*!V*G)+(S*T*U*!V*H)+(!S*!T*!U*V*I)+(S*!T*!U*V*J)+(!S*T*!U*V*K)+(S*T*!U*V*L)+(!S*!T*U*V*M)+(S*!T*U*V*N)+(!S*T*U*V*O)+(S*T*U*V*P); PIN * UNKNOWN 1 999 1 0 1 0\n", 8*cell_cost.at(ID($_MUX_)));
-		fclose(f);
-
-		if (!config.lut_costs.empty()) {
-			buffer = stringf("%s/lutdefs.txt", tempdir_name);
-			f = fopen(buffer.c_str(), "wt");
-			if (f == nullptr)
-				log_error("Opening %s for writing failed: %s\n", buffer, strerror(errno));
-			for (int i = 0; i < GetSize(config.lut_costs); i++)
-				fprintf(f, "%d %d.00 1.00\n", i+1, config.lut_costs.at(i));
-			fclose(f);
-		}
-
 		buffer = stringf("\"%s\" -s -f %s/abc.script 2>&1", config.exe_file, tempdir_name);
 		log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, config.show_tempdir));
 
@@ -1231,6 +1175,65 @@ void AbcModuleState::run_abc()
 	log("Don't call ABC as there is nothing to map.\n");
 }
 
+void emit_global_input_files(const AbcConfig &config)
+{
+	if (!config.lut_costs.empty()) {
+		std::string buffer = stringf("%s/lutdefs.txt", config.global_tempdir_name.c_str());
+		FILE *f = fopen(buffer.c_str(), "wt");
+		if (f == nullptr)
+			log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
+		for (int i = 0; i < GetSize(config.lut_costs); i++)
+			fprintf(f, "%d %d.00 1.00\n", i+1, config.lut_costs.at(i));
+		fclose(f);
+	} else {
+		auto &cell_cost = cmos_cost ? CellCosts::cmos_gate_cost() : CellCosts::default_gate_cost();
+
+		std::string buffer = stringf("%s/stdcells.genlib", config.global_tempdir_name.c_str());
+		FILE *f = fopen(buffer.c_str(), "wt");
+		if (f == nullptr)
+			log_error("Opening %s for writing failed: %s\n", buffer.c_str(), strerror(errno));
+		fprintf(f, "GATE ZERO    1 Y=CONST0;\n");
+		fprintf(f, "GATE ONE     1 Y=CONST1;\n");
+		fprintf(f, "GATE BUF    %d Y=A;                  PIN * NONINV  1 999 1 0 1 0\n", cell_cost.at(ID($_BUF_)));
+		fprintf(f, "GATE NOT    %d Y=!A;                 PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_NOT_)));
+		if (enabled_gates.count("AND"))
+			fprintf(f, "GATE AND    %d Y=A*B;                PIN * NONINV  1 999 1 0 1 0\n", cell_cost.at(ID($_AND_)));
+		if (enabled_gates.count("NAND"))
+			fprintf(f, "GATE NAND   %d Y=!(A*B);             PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_NAND_)));
+		if (enabled_gates.count("OR"))
+			fprintf(f, "GATE OR     %d Y=A+B;                PIN * NONINV  1 999 1 0 1 0\n", cell_cost.at(ID($_OR_)));
+		if (enabled_gates.count("NOR"))
+			fprintf(f, "GATE NOR    %d Y=!(A+B);             PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_NOR_)));
+		if (enabled_gates.count("XOR"))
+			fprintf(f, "GATE XOR    %d Y=(A*!B)+(!A*B);      PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_XOR_)));
+		if (enabled_gates.count("XNOR"))
+			fprintf(f, "GATE XNOR   %d Y=(A*B)+(!A*!B);      PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_XNOR_)));
+		if (enabled_gates.count("ANDNOT"))
+			fprintf(f, "GATE ANDNOT %d Y=A*!B;               PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_ANDNOT_)));
+		if (enabled_gates.count("ORNOT"))
+			fprintf(f, "GATE ORNOT  %d Y=A+!B;               PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_ORNOT_)));
+		if (enabled_gates.count("AOI3"))
+			fprintf(f, "GATE AOI3   %d Y=!((A*B)+C);         PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_AOI3_)));
+		if (enabled_gates.count("OAI3"))
+			fprintf(f, "GATE OAI3   %d Y=!((A+B)*C);         PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_OAI3_)));
+		if (enabled_gates.count("AOI4"))
+			fprintf(f, "GATE AOI4   %d Y=!((A*B)+(C*D));     PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_AOI4_)));
+		if (enabled_gates.count("OAI4"))
+			fprintf(f, "GATE OAI4   %d Y=!((A+B)*(C+D));     PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_OAI4_)));
+		if (enabled_gates.count("MUX"))
+			fprintf(f, "GATE MUX    %d Y=(A*B)+(S*B)+(!S*A); PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_MUX_)));
+		if (enabled_gates.count("NMUX"))
+			fprintf(f, "GATE NMUX   %d Y=!((A*B)+(S*B)+(!S*A)); PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_NMUX_)));
+		if (map_mux4)
+			fprintf(f, "GATE MUX4   %d Y=(!S*!T*A)+(S*!T*B)+(!S*T*C)+(S*T*D); PIN * UNKNOWN 1 999 1 0 1 0\n", 2*cell_cost.at(ID($_MUX_)));
+		if (map_mux8)
+			fprintf(f, "GATE MUX8   %d Y=(!S*!T*!U*A)+(S*!T*!U*B)+(!S*T*!U*C)+(S*T*!U*D)+(!S*!T*U*E)+(S*!T*U*F)+(!S*T*U*G)+(S*T*U*H); PIN * UNKNOWN 1 999 1 0 1 0\n", 4*cell_cost.at(ID($_MUX_)));
+		if (map_mux16)
+			fprintf(f, "GATE MUX16  %d Y=(!S*!T*!U*!V*A)+(S*!T*!U*!V*B)+(!S*T*!U*!V*C)+(S*T*!U*!V*D)+(!S*!T*U*!V*E)+(S*!T*U*!V*F)+(!S*T*U*!V*G)+(S*T*U*!V*H)+(!S*!T*!U*V*I)+(S*!T*!U*V*J)+(!S*T*!U*V*K)+(S*T*!U*V*L)+(!S*!T*U*V*M)+(S*!T*U*V*N)+(!S*T*U*V*O)+(S*T*U*V*P); PIN * UNKNOWN 1 999 1 0 1 0\n", 8*cell_cost.at(ID($_MUX_)));
+		fclose(f);
+	}
+}
+
 void AbcModuleState::extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL::Module *module)
 {
 	if (!did_run_abc) {
@@ -1811,6 +1814,13 @@ struct AbcPass : public Pass {
 		config.show_tempdir = design->scratchpad_get_bool("abc.showtmp", false);
 		markgroups = design->scratchpad_get_bool("abc.markgroups", markgroups);
 
+		if (config.cleanup)
+			config.global_tempdir_name = get_base_tmpdir() + "/";
+		else
+			config.global_tempdir_name = "_tmp_";
+		config.global_tempdir_name += proc_program_prefix() + "yosys-abc-XXXXXX";
+		config.global_tempdir_name = make_temp_dir(config.global_tempdir_name);
+
 		if (design->scratchpad_get_bool("abc.debug")) {
 			config.cleanup = false;
 			config.show_tempdir = true;
@@ -2139,6 +2149,8 @@ struct AbcPass : public Pass {
 			// enabled_gates.insert("NMUX");
 		}
 
+		emit_global_input_files(config);
+
 		for (auto mod : design->selected_modules())
 		{
 			if (mod->processes.size() > 0) {
@@ -2164,9 +2176,12 @@ struct AbcPass : public Pass {
 
 				AbcModuleState state(config, initvals);
 				state.prepare_module(design, mod, assign_map, cells, dff_mode, clk_str);
+				log_push();
+				log_header(design, "Executing ABC.\n");
 				state.run_abc();
 				state.extract(assign_map, design, mod);
 				state.finish();
+				log_pop();
 				continue;
 			}
 
@@ -2335,12 +2350,20 @@ struct AbcPass : public Pass {
 				state.srst_polarity = std::get<6>(it.first);
 				state.srst_sig = assign_map(std::get<7>(it.first));
 				state.prepare_module(design, mod, assign_map, it.second, !state.clk_sig.empty(), "$");
+				log_push();
+				log_header(design, "Executing ABC.\n");
 				state.run_abc();
 				state.extract(assign_map, design, mod);
 				state.finish();
+				log_pop();
 			}
 		}
 
+		if (config.cleanup) {
+			log("Removing global temp directory.\n");
+			remove_directory(config.global_tempdir_name);
+		}
+
 		log_pop();
 	}
 } AbcPass;

From 38f8165c8079bf9f1e853ef1ff15237aa48d4527 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Wed, 10 Sep 2025 22:53:53 +0000
Subject: [PATCH 511/931] Remove direct RTLIL access from gate_t

---
 passes/techmap/abc.cc | 54 ++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 03417b7f2..a0521e269 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -104,8 +104,10 @@ struct gate_t
 	gate_type_t type;
 	int in1, in2, in3, in4;
 	bool is_port;
-	RTLIL::SigBit bit;
+	bool bit_is_wire;
+	bool bit_is_1;
 	RTLIL::State init;
+	std::string bit_str;
 };
 
 bool map_mux4;
@@ -156,6 +158,7 @@ struct AbcModuleState {
 
 	int map_autoidx = 0;
 	std::vector<gate_t> signal_list;
+	std::vector<RTLIL::SigBit> signal_bits;
 	dict<RTLIL::SigBit, int> signal_map;
 	FfInitVals &initvals;
 	bool had_init = false;
@@ -204,10 +207,13 @@ int AbcModuleState::map_signal(const AbcSigMap &assign_map, RTLIL::SigBit bit, g
 		gate.in3 = -1;
 		gate.in4 = -1;
 		gate.is_port = bit.wire != nullptr && val.is_port;
-		gate.bit = bit;
+		gate.bit_is_wire = bit.wire != nullptr;
+		gate.bit_is_1 = bit == State::S1;
 		gate.init = initvals(bit);
-		signal_list.push_back(gate);
+		gate.bit_str = std::string(log_signal(bit));
 		signal_map[bit] = gate.id;
+		signal_list.push_back(std::move(gate));
+		signal_bits.push_back(bit);
 	}
 
 	gate_t &gate = signal_list[signal_map[bit]];
@@ -463,17 +469,17 @@ std::string AbcModuleState::remap_name(RTLIL::IdString abc_name, RTLIL::Wire **o
 
 			if (sid < GetSize(signal_list))
 			{
-				auto sig = signal_list.at(sid);
-				if (sig.bit.wire != nullptr)
+				const auto &bit = signal_bits.at(sid);
+				if (bit.wire != nullptr)
 				{
-					std::string s = stringf("$abc$%d$%s", map_autoidx, sig.bit.wire->name.c_str()+1);
-					if (sig.bit.wire->width != 1)
-						s += stringf("[%d]", sig.bit.offset);
+					std::string s = stringf("$abc$%d$%s", map_autoidx, bit.wire->name.c_str()+1);
+					if (bit.wire->width != 1)
+						s += stringf("[%d]", bit.offset);
 					if (isnew)
 						s += "_new";
 					s += postfix;
 					if (orig_wire != nullptr)
-						*orig_wire = sig.bit.wire;
+						*orig_wire = bit.wire;
 					return s;
 				}
 			}
@@ -501,7 +507,7 @@ void AbcModuleState::dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edg
 	}
 
 	for (auto n : nodes)
-		fprintf(f, "  ys__n%d [label=\"%s\\nid=%d, count=%d\"%s];\n", n, log_signal(signal_list[n].bit),
+		fprintf(f, "  ys__n%d [label=\"%s\\nid=%d, count=%d\"%s];\n", n, signal_list[n].bit_str.c_str(),
 				n, in_counts[n], workpool.count(n) ? ", shape=box" : "");
 
 	for (auto &e : edges)
@@ -562,7 +568,7 @@ void AbcModuleState::handle_loops(AbcSigMap &assign_map, RTLIL::Module *module)
 		int id = *workpool.begin();
 		workpool.erase(id);
 
-		// log("Removing non-loop node %d from graph: %s\n", id, log_signal(signal_list[id].bit));
+		// log("Removing non-loop node %d from graph: %s\n", id, signal_list[id].bit_str);
 
 		for (int id2 : edges[id]) {
 			log_assert(in_edges_count[id2] > 0);
@@ -582,8 +588,8 @@ void AbcModuleState::handle_loops(AbcSigMap &assign_map, RTLIL::Module *module)
 
 			for (auto &edge_it : edges) {
 				int id2 = edge_it.first;
-				RTLIL::Wire *w1 = signal_list[id1].bit.wire;
-				RTLIL::Wire *w2 = signal_list[id2].bit.wire;
+				RTLIL::Wire *w1 = signal_bits[id1].wire;
+				RTLIL::Wire *w2 = signal_bits[id2].wire;
 				if (w1 == nullptr)
 					id1 = id2;
 				else if (w2 == nullptr)
@@ -605,7 +611,7 @@ void AbcModuleState::handle_loops(AbcSigMap &assign_map, RTLIL::Module *module)
 				continue;
 			}
 
-			log_assert(signal_list[id1].bit.wire != nullptr);
+			log_assert(signal_bits[id1].wire != nullptr);
 
 			std::stringstream sstr;
 			sstr << "$abcloop$" << (autoidx++);
@@ -615,10 +621,10 @@ void AbcModuleState::handle_loops(AbcSigMap &assign_map, RTLIL::Module *module)
 			for (int id2 : edges[id1]) {
 				if (first_line)
 					log("Breaking loop using new signal %s: %s -> %s\n", log_signal(RTLIL::SigSpec(wire)),
-							log_signal(signal_list[id1].bit), log_signal(signal_list[id2].bit));
+							signal_list[id1].bit_str, signal_list[id2].bit_str);
 				else
 					log("                               %*s  %s -> %s\n", int(strlen(log_signal(RTLIL::SigSpec(wire)))), "",
-							log_signal(signal_list[id1].bit), log_signal(signal_list[id2].bit));
+							signal_list[id1].bit_str, signal_list[id2].bit_str);
 				first_line = false;
 			}
 
@@ -641,7 +647,7 @@ void AbcModuleState::handle_loops(AbcSigMap &assign_map, RTLIL::Module *module)
 			}
 			edges[id1].swap(edges[id3]);
 
-			connect(assign_map, module, RTLIL::SigSig(signal_list[id3].bit, signal_list[id1].bit));
+			connect(assign_map, module, RTLIL::SigSig(signal_bits[id3], signal_bits[id1]));
 			dump_loop_graph(dot_f, dot_nr, edges, workpool, in_edges_count);
 		}
 	}
@@ -1006,7 +1012,7 @@ void AbcModuleState::run_abc()
 		if (!si.is_port || si.type != G(NONE))
 			continue;
 		fprintf(f, " ys__n%d", si.id);
-		pi_map[count_input++] = log_signal(si.bit);
+		pi_map[count_input++] = si.bit_str;
 	}
 	if (count_input == 0)
 		fprintf(f, " dummy_input\n");
@@ -1018,17 +1024,17 @@ void AbcModuleState::run_abc()
 		if (!si.is_port || si.type == G(NONE))
 			continue;
 		fprintf(f, " ys__n%d", si.id);
-		po_map[count_output++] = log_signal(si.bit);
+		po_map[count_output++] = si.bit_str;
 	}
 	fprintf(f, "\n");
 
 	for (auto &si : signal_list)
-		fprintf(f, "# ys__n%-5d %s\n", si.id, log_signal(si.bit));
+		fprintf(f, "# ys__n%-5d %s\n", si.id, si.bit_str.c_str());
 
 	for (auto &si : signal_list) {
-		if (si.bit.wire == nullptr) {
+		if (!si.bit_is_wire) {
 			fprintf(f, ".names ys__n%d\n", si.id);
-			if (si.bit == RTLIL::State::S1)
+			if (si.bit_is_1)
 				fprintf(f, "1\n");
 		}
 	}
@@ -1503,12 +1509,12 @@ void AbcModuleState::extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL
 			snprintf(buffer, 100, "\\ys__n%d", si.id);
 			RTLIL::SigSig conn;
 			if (si.type != G(NONE)) {
-				conn.first = si.bit;
+				conn.first = signal_bits[si.id];
 				conn.second = module->wire(remap_name(buffer));
 				out_wires++;
 			} else {
 				conn.first = module->wire(remap_name(buffer));
-				conn.second = si.bit;
+				conn.second = signal_bits[si.id];
 				in_wires++;
 			}
 			connect(assign_map, module, conn);

From 27462da20895706b6a9b362c8daa042a06d222a8 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Sat, 26 Jul 2025 02:45:21 +0000
Subject: [PATCH 512/931] Run ABCs in parallel.

Large circuits can run hundreds or thousands of ABCs in a single AbcPass.
For some circuits, some of those ABC runs can run for hundreds of seconds.
Running ABCs in parallel with each other and in parallel with main-thread
processing (reading and writing BLIF files, copying ABC BLIF output into
the design) can give large speedups.
---
 Makefile              |  14 ++-
 kernel/threading.cc   |  45 +++++++++
 kernel/threading.h    | 159 +++++++++++++++++++++++++++++
 kernel/yosys.cc       |   2 +-
 misc/create_vcxsrc.sh |   1 +
 passes/techmap/abc.cc | 229 ++++++++++++++++++++++++++----------------
 6 files changed, 362 insertions(+), 88 deletions(-)
 create mode 100644 kernel/threading.cc
 create mode 100644 kernel/threading.h

diff --git a/Makefile b/Makefile
index d565ead16..4aae25c3c 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,12 @@ LINK_ABC := 0
 # Needed for environments that can't run executables (i.e. emscripten, wasm)
 DISABLE_SPAWN := 0
 # Needed for environments that don't have proper thread support (i.e. emscripten, wasm--for now)
+ENABLE_THREADS := 1
+ifeq ($(ENABLE_THREADS),1)
 DISABLE_ABC_THREADS := 0
+else
+DISABLE_ABC_THREADS := 1
+endif
 
 # clang sanitizers
 SANITIZER =
@@ -300,6 +305,7 @@ DISABLE_SPAWN := 1
 
 ifeq ($(ENABLE_ABC),1)
 LINK_ABC := 1
+ENABLE_THREADS := 0
 DISABLE_ABC_THREADS := 1
 endif
 
@@ -457,6 +463,11 @@ CXXFLAGS := -Og -DDEBUG $(filter-out $(OPT_LEVEL),$(CXXFLAGS))
 STRIP :=
 endif
 
+ifeq ($(ENABLE_THREADS),1)
+CXXFLAGS += -DYOSYS_ENABLE_THREADS
+LIBS += -lpthread
+endif
+
 ifeq ($(ENABLE_ABC),1)
 CXXFLAGS += -DYOSYS_ENABLE_ABC
 ifeq ($(LINK_ABC),1)
@@ -612,6 +623,7 @@ $(eval $(call add_include_file,kernel/satgen.h))
 $(eval $(call add_include_file,kernel/scopeinfo.h))
 $(eval $(call add_include_file,kernel/sexpr.h))
 $(eval $(call add_include_file,kernel/sigtools.h))
+$(eval $(call add_include_file,kernel/threading.h))
 $(eval $(call add_include_file,kernel/timinginfo.h))
 $(eval $(call add_include_file,kernel/utils.h))
 $(eval $(call add_include_file,kernel/yosys.h))
@@ -638,7 +650,7 @@ OBJS += kernel/log_compat.o
 endif
 OBJS += kernel/binding.o kernel/tclapi.o
 OBJS += kernel/cellaigs.o kernel/celledges.o kernel/cost.o kernel/satgen.o kernel/scopeinfo.o kernel/qcsat.o kernel/mem.o kernel/ffmerge.o kernel/ff.o kernel/yw.o kernel/json.o kernel/fmt.o kernel/sexpr.o
-OBJS += kernel/drivertools.o kernel/functional.o
+OBJS += kernel/drivertools.o kernel/functional.o kernel/threading.o
 ifeq ($(ENABLE_ZLIB),1)
 OBJS += kernel/fstdata.o
 endif
diff --git a/kernel/threading.cc b/kernel/threading.cc
new file mode 100644
index 000000000..49fddaa7c
--- /dev/null
+++ b/kernel/threading.cc
@@ -0,0 +1,45 @@
+#include "kernel/yosys_common.h"
+#include "kernel/threading.h"
+
+YOSYS_NAMESPACE_BEGIN
+
+void DeferredLogs::flush()
+{
+	for (auto &m : logs)
+		if (m.error)
+			YOSYS_NAMESPACE_PREFIX log_error("%s", m.text.c_str());
+		else
+			YOSYS_NAMESPACE_PREFIX log("%s", m.text.c_str());
+}
+
+int ThreadPool::pool_size(int reserved_cores, int max_threads)
+{
+#ifdef YOSYS_ENABLE_THREADS
+	int num_threads = std::min<int>(std::thread::hardware_concurrency() - reserved_cores, max_threads);
+        return std::max(0, num_threads);
+#else
+        return 0;
+#endif
+}
+
+ThreadPool::ThreadPool(int pool_size, std::function<void(int)> b)
+	: body(std::move(b))
+{
+#ifdef YOSYS_ENABLE_THREADS
+        threads.reserve(pool_size);
+        for (int i = 0; i < pool_size; i++)
+                threads.emplace_back([i, this]{ body(i); });
+#else
+        log_assert(pool_size == 0);
+#endif
+}
+
+ThreadPool::~ThreadPool()
+{
+#ifdef YOSYS_ENABLE_THREADS
+	for (auto &t : threads)
+		t.join();
+#endif
+}
+
+YOSYS_NAMESPACE_END
diff --git a/kernel/threading.h b/kernel/threading.h
new file mode 100644
index 000000000..8c08d670c
--- /dev/null
+++ b/kernel/threading.h
@@ -0,0 +1,159 @@
+#include <deque>
+
+#ifdef YOSYS_ENABLE_THREADS
+#include <condition_variable>
+#include <mutex>
+#include <thread>
+#endif
+
+#include "kernel/yosys_common.h"
+#include "kernel/log.h"
+
+#ifndef YOSYS_THREADING_H
+#define YOSYS_THREADING_H
+
+YOSYS_NAMESPACE_BEGIN
+
+// Concurrent queue implementation. Not fast, but simple.
+// Multi-producer, multi-consumer, optionally bounded.
+// When YOSYS_ENABLE_THREADS is not defined, this is just a non-thread-safe non-blocking deque.
+template <typename T>
+class ConcurrentQueue
+{
+public:
+	ConcurrentQueue(int capacity = INT_MAX)
+		: capacity(capacity) {}
+	// Push an element into the queue. If it's at capacity, block until there is room.
+	void push_back(T t)
+	{
+#ifdef YOSYS_ENABLE_THREADS
+		std::unique_lock<std::mutex> lock(mutex);
+		not_full_condition.wait(lock, [this] { return static_cast<int>(contents.size()) < capacity; });
+		if (contents.empty())
+			not_empty_condition.notify_one();
+#endif
+		log_assert(!closed);
+		contents.push_back(std::move(t));
+#ifdef YOSYS_ENABLE_THREADS
+		if (static_cast<int>(contents.size()) < capacity)
+			not_full_condition.notify_one();
+#endif
+	}
+	// Signal that no more elements will be produced. `pop_front()` will return nullopt.
+	void close()
+	{
+#ifdef YOSYS_ENABLE_THREADS
+		std::unique_lock<std::mutex> lock(mutex);
+		not_empty_condition.notify_all();
+#endif
+		closed = true;
+	}
+	// Pop an element from the queue. Blocks until an element is available
+	// or the queue is closed and empty.
+	std::optional<T> pop_front()
+	{
+		return pop_front_internal(true);
+	}
+	// Pop an element from the queue. Does not block, just returns nullopt if the
+	// queue is empty.
+	std::optional<T> try_pop_front()
+	{
+		return pop_front_internal(false);
+	}
+private:
+#ifdef YOSYS_ENABLE_THREADS
+	std::optional<T> pop_front_internal(bool wait)
+	{
+		std::unique_lock<std::mutex> lock(mutex);
+		if (wait) {
+			not_empty_condition.wait(lock, [this] { return !contents.empty() || closed; });
+		}
+#else
+	std::optional<T> pop_front_internal(bool)
+	{
+#endif
+		if (contents.empty())
+			return std::nullopt;
+#ifdef YOSYS_ENABLE_THREADS
+		if (static_cast<int>(contents.size()) == capacity)
+			not_full_condition.notify_one();
+#endif
+		T result = std::move(contents.front());
+		contents.pop_front();
+#ifdef YOSYS_ENABLE_THREADS
+		if (!contents.empty())
+			not_empty_condition.notify_one();
+#endif
+		return std::move(result);
+	}
+
+#ifdef YOSYS_ENABLE_THREADS
+	std::mutex mutex;
+	// Signals one waiter thread when the queue changes and is not full.
+	std::condition_variable not_full_condition;
+	// Signals one waiter thread when the queue changes and is not empty.
+	std::condition_variable not_empty_condition;
+#endif
+	std::deque<T> contents;
+	int capacity;
+	bool closed = false;
+};
+
+class DeferredLogs
+{
+public:
+	template <typename... Args>
+	void log(FmtString<TypeIdentity<Args>...> fmt, Args... args)
+	{
+		logs.push_back({fmt.format(args...), false});
+	}
+	template <typename... Args>
+	void log_error(FmtString<TypeIdentity<Args>...> fmt, Args... args)
+	{
+		logs.push_back({fmt.format(args...), true});
+	}
+	void flush();
+private:
+	struct Message
+	{
+		std::string text;
+		bool error;
+	};
+	std::vector<Message> logs;
+};
+
+class ThreadPool
+{
+public:
+	// Computes the number of worker threads to use.
+	// `reserved_cores` cores are set aside for other threads (e.g. work on the main thread).
+	// `max_threads` --- don't return more workers than this.
+	// The result may be 0.
+	static int pool_size(int reserved_cores, int max_threads);
+
+	// Create a pool of threads running the given closure (parameterized by thread number).
+	// `pool_size` must be the result of a `pool_size()` call.
+	ThreadPool(int pool_size, std::function<void(int)> b);
+	ThreadPool(ThreadPool &&other) = delete;
+	// Waits for all threads to terminate. Make sure those closures return!
+	~ThreadPool();
+
+	// Return the number of threads in the pool.
+	int num_threads() const
+	{
+#ifdef YOSYS_ENABLE_THREADS
+		return threads.size();
+#else
+		return 0;
+#endif
+	}
+private:
+	std::function<void(int)> body;
+#ifdef YOSYS_ENABLE_THREADS
+	std::vector<std::thread> threads;
+#endif
+};
+
+YOSYS_NAMESPACE_END
+
+#endif // YOSYS_THREADING_H
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index dc640fae9..95beca75c 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -177,7 +177,7 @@ int run_command(const std::string &command, std::function<void(const std::string
 
 	int ret = pclose(f);
 	if (ret < 0)
-		return -1;
+		return -2;
 #ifdef _WIN32
 	return ret;
 #else
diff --git a/misc/create_vcxsrc.sh b/misc/create_vcxsrc.sh
index d6800d15e..228003bad 100644
--- a/misc/create_vcxsrc.sh
+++ b/misc/create_vcxsrc.sh
@@ -38,6 +38,7 @@ popd
 } > "$vcxsrc"/YosysVS/YosysVS.vcxproj.new
 
 sed -i 's,</AdditionalIncludeDirectories>,</AdditionalIncludeDirectories>\n      <LanguageStandard>stdcpp17</LanguageStandard>\n      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>,g' "$vcxsrc"/YosysVS/YosysVS.vcxproj.new
+sed -i 's,<PreprocessorDefinitions>,<PreprocessorDefinitions>YOSYS_ENABLE_THREADS;,g' "$vcxsrc"/YosysVS/YosysVS.vcxproj.new
 if [ -f "/usr/include/FlexLexer.h" ] ; then
 	sed -i 's,</AdditionalIncludeDirectories>,;..\\yosys\\libs\\flex</AdditionalIncludeDirectories>,g' "$vcxsrc"/YosysVS/YosysVS.vcxproj.new
 fi
diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index a0521e269..4a65671a2 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -48,6 +48,7 @@
 #include "kernel/ff.h"
 #include "kernel/cost.h"
 #include "kernel/log.h"
+#include "kernel/threading.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -55,6 +56,7 @@
 #include <cerrno>
 #include <sstream>
 #include <climits>
+#include <memory>
 #include <vector>
 
 #ifndef _WIN32
@@ -153,30 +155,41 @@ struct AbcSigVal {
 
 using AbcSigMap = SigValMap<AbcSigVal>;
 
-struct AbcModuleState {
+// Used by off-main-threads. Contains no direct or indirect access to RTLIL.
+struct RunAbcState {
 	const AbcConfig &config;
 
-	int map_autoidx = 0;
+	std::string tempdir_name;
 	std::vector<gate_t> signal_list;
+	bool did_run = false;
+	bool err = false;
+	DeferredLogs logs;
+	dict<int, std::string> pi_map, po_map;
+
+	RunAbcState(const AbcConfig &config) : config(config) {}
+	void run();
+};
+
+struct AbcModuleState {
+	RunAbcState run_abc;
+
+	int map_autoidx = 0;
 	std::vector<RTLIL::SigBit> signal_bits;
 	dict<RTLIL::SigBit, int> signal_map;
 	FfInitVals &initvals;
 	bool had_init = false;
-	bool did_run_abc = false;
 
 	bool clk_polarity = false;
 	bool en_polarity = false;
 	bool arst_polarity = false;
 	bool srst_polarity = false;
 	RTLIL::SigSpec clk_sig, en_sig, arst_sig, srst_sig;
-	dict<int, std::string> pi_map, po_map;
 
 	int undef_bits_lost = 0;
 
-	std::string tempdir_name;
-
 	AbcModuleState(const AbcConfig &config, FfInitVals &initvals)
-		: config(config), initvals(initvals) {}
+		: run_abc(config), initvals(initvals) {}
+	AbcModuleState(AbcModuleState&&) = delete;
 
 	int map_signal(const AbcSigMap &assign_map, RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1);
 	void mark_port(const AbcSigMap &assign_map, RTLIL::SigSpec sig);
@@ -186,7 +199,6 @@ struct AbcModuleState {
 	void handle_loops(AbcSigMap &assign_map, RTLIL::Module *module);
 	void prepare_module(RTLIL::Design *design, RTLIL::Module *module, AbcSigMap &assign_map, const std::vector<RTLIL::Cell*> &cells,
 		bool dff_mode, std::string clk_str);
-	void run_abc();
 	void extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL::Module *module);
 	void finish();
 };
@@ -200,7 +212,7 @@ int AbcModuleState::map_signal(const AbcSigMap &assign_map, RTLIL::SigBit bit, g
 
 	if (signal_map.count(bit) == 0) {
 		gate_t gate;
-		gate.id = signal_list.size();
+		gate.id = run_abc.signal_list.size();
 		gate.type = G(NONE);
 		gate.in1 = -1;
 		gate.in2 = -1;
@@ -212,11 +224,11 @@ int AbcModuleState::map_signal(const AbcSigMap &assign_map, RTLIL::SigBit bit, g
 		gate.init = initvals(bit);
 		gate.bit_str = std::string(log_signal(bit));
 		signal_map[bit] = gate.id;
-		signal_list.push_back(std::move(gate));
+		run_abc.signal_list.push_back(std::move(gate));
 		signal_bits.push_back(bit);
 	}
 
-	gate_t &gate = signal_list[signal_map[bit]];
+	gate_t &gate = run_abc.signal_list[signal_map[bit]];
 
 	if (gate_type != G(NONE))
 		gate.type = gate_type;
@@ -236,7 +248,7 @@ void AbcModuleState::mark_port(const AbcSigMap &assign_map, RTLIL::SigSpec sig)
 {
 	for (auto &bit : assign_map(sig))
 		if (bit.wire != nullptr && signal_map.count(bit) > 0)
-			signal_list[signal_map[bit]].is_port = true;
+			run_abc.signal_list[signal_map[bit]].is_port = true;
 }
 
 bool AbcModuleState::extract_cell(const AbcSigMap &assign_map, RTLIL::Module *module, RTLIL::Cell *cell, bool keepff)
@@ -315,7 +327,7 @@ bool AbcModuleState::extract_cell(const AbcSigMap &assign_map, RTLIL::Module *mo
 		if (keepff) {
 			SigBit bit = ff.sig_q;
 			if (assign_map(bit).wire != nullptr) {
-				signal_list[gate_id].is_port = true;
+				run_abc.signal_list[gate_id].is_port = true;
 			}
 			if (bit.wire != nullptr)
 				bit.wire->attributes[ID::keep] = 1;
@@ -467,7 +479,7 @@ std::string AbcModuleState::remap_name(RTLIL::IdString abc_name, RTLIL::Wire **o
 			size_t postfix_start = abc_sname.find_first_not_of("0123456789");
 			std::string postfix = postfix_start != std::string::npos ? abc_sname.substr(postfix_start) : "";
 
-			if (sid < GetSize(signal_list))
+			if (sid < GetSize(run_abc.signal_list))
 			{
 				const auto &bit = signal_bits.at(sid);
 				if (bit.wire != nullptr)
@@ -507,7 +519,7 @@ void AbcModuleState::dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edg
 	}
 
 	for (auto n : nodes)
-		fprintf(f, "  ys__n%d [label=\"%s\\nid=%d, count=%d\"%s];\n", n, signal_list[n].bit_str.c_str(),
+		fprintf(f, "  ys__n%d [label=\"%s\\nid=%d, count=%d\"%s];\n", n, run_abc.signal_list[n].bit_str.c_str(),
 				n, in_counts[n], workpool.count(n) ? ", shape=box" : "");
 
 	for (auto &e : edges)
@@ -529,7 +541,7 @@ void AbcModuleState::handle_loops(AbcSigMap &assign_map, RTLIL::Module *module)
 	// (Kahn, Arthur B. (1962), "Topological sorting of large networks")
 
 	dict<int, pool<int>> edges;
-	std::vector<int> in_edges_count(signal_list.size());
+	std::vector<int> in_edges_count(run_abc.signal_list.size());
 	pool<int> workpool;
 
 	FILE *dot_f = nullptr;
@@ -538,7 +550,7 @@ void AbcModuleState::handle_loops(AbcSigMap &assign_map, RTLIL::Module *module)
 	// uncomment for troubleshooting the loop detection code
 	// dot_f = fopen("test.dot", "w");
 
-	for (auto &g : signal_list) {
+	for (auto &g : run_abc.signal_list) {
 		if (g.type == G(NONE) || g.type == G(FF) || g.type == G(FF0) || g.type == G(FF1)) {
 			workpool.insert(g.id);
 		} else {
@@ -621,29 +633,29 @@ void AbcModuleState::handle_loops(AbcSigMap &assign_map, RTLIL::Module *module)
 			for (int id2 : edges[id1]) {
 				if (first_line)
 					log("Breaking loop using new signal %s: %s -> %s\n", log_signal(RTLIL::SigSpec(wire)),
-							signal_list[id1].bit_str, signal_list[id2].bit_str);
+							run_abc.signal_list[id1].bit_str, run_abc.signal_list[id2].bit_str);
 				else
 					log("                               %*s  %s -> %s\n", int(strlen(log_signal(RTLIL::SigSpec(wire)))), "",
-							signal_list[id1].bit_str, signal_list[id2].bit_str);
+							run_abc.signal_list[id1].bit_str, run_abc.signal_list[id2].bit_str);
 				first_line = false;
 			}
 
 			int id3 = map_signal(assign_map, RTLIL::SigSpec(wire));
-			signal_list[id1].is_port = true;
-			signal_list[id3].is_port = true;
+			run_abc.signal_list[id1].is_port = true;
+			run_abc.signal_list[id3].is_port = true;
 			log_assert(id3 == int(in_edges_count.size()));
 			in_edges_count.push_back(0);
 			workpool.insert(id3);
 
 			for (int id2 : edges[id1]) {
-				if (signal_list[id2].in1 == id1)
-					signal_list[id2].in1 = id3;
-				if (signal_list[id2].in2 == id1)
-					signal_list[id2].in2 = id3;
-				if (signal_list[id2].in3 == id1)
-					signal_list[id2].in3 = id3;
-				if (signal_list[id2].in4 == id1)
-					signal_list[id2].in4 = id3;
+				if (run_abc.signal_list[id2].in1 == id1)
+					run_abc.signal_list[id2].in1 = id3;
+				if (run_abc.signal_list[id2].in2 == id1)
+					run_abc.signal_list[id2].in2 = id3;
+				if (run_abc.signal_list[id2].in3 == id1)
+					run_abc.signal_list[id2].in3 = id3;
+				if (run_abc.signal_list[id2].in4 == id1)
+					run_abc.signal_list[id2].in4 = id3;
 			}
 			edges[id1].swap(edges[id3]);
 
@@ -724,14 +736,14 @@ std::string replace_tempdir(std::string text, std::string tempdir_name, bool sho
 
 struct abc_output_filter
 {
-	const AbcModuleState &state;
+	RunAbcState &state;
 	bool got_cr;
 	int escape_seq_state;
 	std::string linebuf;
 	std::string tempdir_name;
 	bool show_tempdir;
 
-	abc_output_filter(const AbcModuleState& state, std::string tempdir_name, bool show_tempdir)
+	abc_output_filter(RunAbcState& state, std::string tempdir_name, bool show_tempdir)
 		: state(state), tempdir_name(tempdir_name), show_tempdir(show_tempdir)
 	{
 		got_cr = false;
@@ -759,7 +771,7 @@ struct abc_output_filter
 			return;
 		}
 		if (ch == '\n') {
-			log("ABC: %s\n", replace_tempdir(linebuf, tempdir_name, show_tempdir));
+			state.logs.log("ABC: %s\n", replace_tempdir(linebuf, tempdir_name, show_tempdir));
 			got_cr = false, linebuf.clear();
 			return;
 		}
@@ -772,7 +784,7 @@ struct abc_output_filter
 	{
 		int pi, po;
 		if (sscanf(line.c_str(), "Start-point = pi%d.  End-point = po%d.", &pi, &po) == 2) {
-			log("ABC: Start-point = pi%d (%s).  End-point = po%d (%s).\n",
+			state.logs.log("ABC: Start-point = pi%d (%s).  End-point = po%d (%s).\n",
 					pi, state.pi_map.count(pi) ? state.pi_map.at(pi).c_str() : "???",
 					po, state.po_map.count(po) ? state.po_map.at(po).c_str() : "???");
 			return;
@@ -858,16 +870,17 @@ void AbcModuleState::prepare_module(RTLIL::Design *design, RTLIL::Module *module
 	if (dff_mode && clk_sig.empty())
 		log_cmd_error("Clock domain %s not found.\n", clk_str.c_str());
 
+	const AbcConfig &config = run_abc.config;
 	if (config.cleanup)
-		tempdir_name = get_base_tmpdir() + "/";
+		run_abc.tempdir_name = get_base_tmpdir() + "/";
 	else
-		tempdir_name = "_tmp_";
-	tempdir_name += proc_program_prefix() + "yosys-abc-XXXXXX";
-	tempdir_name = make_temp_dir(tempdir_name);
+		run_abc.tempdir_name = "_tmp_";
+	run_abc.tempdir_name += proc_program_prefix() + "yosys-abc-XXXXXX";
+	run_abc.tempdir_name = make_temp_dir(run_abc.tempdir_name);
 	log_header(design, "Extracting gate netlist of module `%s' to `%s/input.blif'..\n",
-			module->name.c_str(), replace_tempdir(tempdir_name, tempdir_name, config.show_tempdir).c_str());
+			module->name.c_str(), replace_tempdir(run_abc.tempdir_name, run_abc.tempdir_name, config.show_tempdir).c_str());
 
-	std::string abc_script = stringf("read_blif \"%s/input.blif\"; ", tempdir_name);
+	std::string abc_script = stringf("read_blif \"%s/input.blif\"; ", run_abc.tempdir_name);
 
 	if (!config.liberty_files.empty() || !config.genlib_files.empty()) {
 		std::string dont_use_args;
@@ -933,15 +946,15 @@ void AbcModuleState::prepare_module(RTLIL::Design *design, RTLIL::Module *module
 	for (size_t pos = abc_script.find("{S}"); pos != std::string::npos; pos = abc_script.find("{S}", pos))
 		abc_script = abc_script.substr(0, pos) + config.lutin_shared + abc_script.substr(pos+3);
 	if (config.abc_dress)
-		abc_script += stringf("; dress \"%s/input.blif\"", tempdir_name);
-	abc_script += stringf("; write_blif %s/output.blif", tempdir_name);
+		abc_script += stringf("; dress \"%s/input.blif\"", run_abc.tempdir_name);
+	abc_script += stringf("; write_blif %s/output.blif", run_abc.tempdir_name);
 	abc_script = add_echos_to_abc_cmd(abc_script);
 
 	for (size_t i = 0; i+1 < abc_script.size(); i++)
 		if (abc_script[i] == ';' && abc_script[i+1] == ' ')
 			abc_script[i+1] = '\n';
 
-	std::string buffer = stringf("%s/abc.script", tempdir_name);
+	std::string buffer = stringf("%s/abc.script", run_abc.tempdir_name);
 	FILE *f = fopen(buffer.c_str(), "wt");
 	if (f == nullptr)
 		log_error("Opening %s for writing failed: %s\n", buffer, strerror(errno));
@@ -997,12 +1010,15 @@ void AbcModuleState::prepare_module(RTLIL::Design *design, RTLIL::Module *module
 	handle_loops(assign_map, module);
 }
 
-void AbcModuleState::run_abc()
+void RunAbcState::run()
 {
 	std::string buffer = stringf("%s/input.blif", tempdir_name);
 	FILE *f = fopen(buffer.c_str(), "wt");
-	if (f == nullptr)
-		log_error("Opening %s for writing failed: %s\n", buffer, strerror(errno));
+	if (f == nullptr) {
+		logs.log("Opening %s for writing failed: %s\n", buffer, strerror(errno));
+		err = true;
+		return;
+	}
 
 	fprintf(f, ".model netlist\n");
 
@@ -1117,13 +1133,14 @@ void AbcModuleState::run_abc()
 	fprintf(f, ".end\n");
 	fclose(f);
 
-	log("Extracted %d gates and %d wires to a netlist network with %d inputs and %d outputs.\n",
+	logs.log("Extracted %d gates and %d wires to a netlist network with %d inputs and %d outputs.\n",
 			count_gates, GetSize(signal_list), count_input, count_output);
 	if (count_output > 0)
 	{
 		buffer = stringf("\"%s\" -s -f %s/abc.script 2>&1", config.exe_file, tempdir_name);
-		log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, config.show_tempdir));
+		logs.log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, config.show_tempdir));
 
+		errno = 0;
 #ifndef YOSYS_LINK_ABC
 		abc_output_filter filt(*this, tempdir_name, config.show_tempdir);
 		int ret = run_command(buffer, std::bind(&abc_output_filter::next_line, filt, std::placeholders::_1));
@@ -1172,10 +1189,10 @@ void AbcModuleState::run_abc()
 		temp_stdouterr_r.close();
 #endif
 		if (ret != 0) {
-			log_error("ABC: execution of command \"%s\" failed: return code %d.\n", buffer, ret);
+			logs.log_error("ABC: execution of command \"%s\" failed: return code %d (errno=%d).\n", buffer, ret, errno);
 			return;
 		}
-		did_run_abc = true;
+		did_run = true;
 		return;
 	}
 	log("Don't call ABC as there is nothing to map.\n");
@@ -1242,19 +1259,23 @@ void emit_global_input_files(const AbcConfig &config)
 
 void AbcModuleState::extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL::Module *module)
 {
-	if (!did_run_abc) {
+	log_push();
+	log_header(design, "Executed ABC.\n");
+	run_abc.logs.flush();
+	if (!run_abc.did_run) {
+		finish();
 		return;
 	}
 
-	std::string buffer = stringf("%s/%s", tempdir_name, "output.blif");
+	std::string buffer = stringf("%s/%s", run_abc.tempdir_name, "output.blif");
 	std::ifstream ifs;
 	ifs.open(buffer);
 	if (ifs.fail())
 		log_error("Can't open ABC output file `%s'.\n", buffer);
 
-	bool builtin_lib = config.liberty_files.empty() && config.genlib_files.empty();
+	bool builtin_lib = run_abc.config.liberty_files.empty() && run_abc.config.genlib_files.empty();
 	RTLIL::Design *mapped_design = new RTLIL::Design;
-	parse_blif(mapped_design, ifs, builtin_lib ? ID(DFF) : ID(_dff_), false, config.sop_mode);
+	parse_blif(mapped_design, ifs, builtin_lib ? ID(DFF) : ID(_dff_), false, run_abc.config.sop_mode);
 
 	ifs.close();
 
@@ -1503,7 +1524,7 @@ void AbcModuleState::extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL
 	for (auto &it : cell_stats)
 		log("ABC RESULTS:   %15s cells: %8d\n", it.first, it.second);
 	int in_wires = 0, out_wires = 0;
-	for (auto &si : signal_list)
+	for (auto &si : run_abc.signal_list)
 		if (si.is_port) {
 			char buffer[100];
 			snprintf(buffer, 100, "\\ys__n%d", si.id);
@@ -1519,20 +1540,22 @@ void AbcModuleState::extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL
 			}
 			connect(assign_map, module, conn);
 		}
-	log("ABC RESULTS:        internal signals: %8d\n", int(signal_list.size()) - in_wires - out_wires);
+	log("ABC RESULTS:        internal signals: %8d\n", int(run_abc.signal_list.size()) - in_wires - out_wires);
 	log("ABC RESULTS:           input signals: %8d\n", in_wires);
 	log("ABC RESULTS:          output signals: %8d\n", out_wires);
 
 	delete mapped_design;
+	finish();
 }
 
 void AbcModuleState::finish()
 {
-	if (config.cleanup)
+	if (run_abc.config.cleanup)
 	{
 		log("Removing temp directory.\n");
-		remove_directory(tempdir_name);
+		remove_directory(run_abc.tempdir_name);
 	}
+	log_pop();
 }
 
 // For every signal that connects cells from different sets, or a cell in a set to a cell not in any set,
@@ -2182,12 +2205,8 @@ struct AbcPass : public Pass {
 
 				AbcModuleState state(config, initvals);
 				state.prepare_module(design, mod, assign_map, cells, dff_mode, clk_str);
-				log_push();
-				log_header(design, "Executing ABC.\n");
-				state.run_abc();
+				state.run_abc.run();
 				state.extract(assign_map, design, mod);
-				state.finish();
-				log_pop();
 				continue;
 			}
 
@@ -2332,36 +2351,74 @@ struct AbcPass : public Pass {
 			}
 
 			log_header(design, "Summary of detected clock domains:\n");
-			for (auto &it : assigned_cells)
-				log("  %d cells in clk=%s%s, en=%s%s, arst=%s%s, srst=%s%s\n", GetSize(it.second),
-						std::get<0>(it.first) ? "" : "!", log_signal(std::get<1>(it.first)),
-						std::get<2>(it.first) ? "" : "!", log_signal(std::get<3>(it.first)),
-						std::get<4>(it.first) ? "" : "!", log_signal(std::get<5>(it.first)),
-						std::get<6>(it.first) ? "" : "!", log_signal(std::get<7>(it.first)));
-
 			{
 				std::vector<std::vector<RTLIL::Cell*>*> cell_sets;
-				for (auto &it : assigned_cells)
+				for (auto &it : assigned_cells) {
+					log("  %d cells in clk=%s%s, en=%s%s, arst=%s%s, srst=%s%s\n", GetSize(it.second),
+							std::get<0>(it.first) ? "" : "!", log_signal(std::get<1>(it.first)),
+							std::get<2>(it.first) ? "" : "!", log_signal(std::get<3>(it.first)),
+							std::get<4>(it.first) ? "" : "!", log_signal(std::get<5>(it.first)),
+							std::get<6>(it.first) ? "" : "!", log_signal(std::get<7>(it.first)));
 					cell_sets.push_back(&it.second);
+				}
 				assign_cell_connection_ports(mod, cell_sets, assign_map);
 			}
+
+			// Reserve one core for our main thread, and don't create more worker threads
+			// than ABC runs.
+			int max_threads = assigned_cells.size();
+			if (max_threads <= 1) {
+				// Just do everything on the main thread.
+				max_threads = 0;
+			}
+#ifdef YOSYS_LINK_ABC
+			// ABC does't support multithreaded calls so don't call it off the main thread.
+			max_threads = 0;
+#endif
+			int num_worker_threads = ThreadPool::pool_size(1, max_threads);
+			ConcurrentQueue<std::unique_ptr<AbcModuleState>> work_queue(num_worker_threads);
+			ConcurrentQueue<std::unique_ptr<AbcModuleState>> work_finished_queue;
+			int work_finished_count = 0;
+			ThreadPool worker_threads(num_worker_threads, [&](int){
+					while (std::optional<std::unique_ptr<AbcModuleState>> work =
+							work_queue.pop_front()) {
+						// Only the `run_abc` component is safe to touch here!
+						(*work)->run_abc.run();
+						work_finished_queue.push_back(std::move(*work));
+					}
+				});
 			for (auto &it : assigned_cells) {
-				AbcModuleState state(config, initvals);
-				state.clk_polarity = std::get<0>(it.first);
-				state.clk_sig = assign_map(std::get<1>(it.first));
-				state.en_polarity = std::get<2>(it.first);
-				state.en_sig = assign_map(std::get<3>(it.first));
-				state.arst_polarity = std::get<4>(it.first);
-				state.arst_sig = assign_map(std::get<5>(it.first));
-				state.srst_polarity = std::get<6>(it.first);
-				state.srst_sig = assign_map(std::get<7>(it.first));
-				state.prepare_module(design, mod, assign_map, it.second, !state.clk_sig.empty(), "$");
-				log_push();
-				log_header(design, "Executing ABC.\n");
-				state.run_abc();
-				state.extract(assign_map, design, mod);
-				state.finish();
-				log_pop();
+				// Process ABC results that have already finished before queueing another ABC.
+				// This should keep our memory usage down.
+				while (std::optional<std::unique_ptr<AbcModuleState>> work =
+						work_finished_queue.try_pop_front()) {
+					(*work)->extract(assign_map, design, mod);
+					++work_finished_count;
+				}
+				std::unique_ptr<AbcModuleState> state = std::make_unique<AbcModuleState>(config, initvals);
+				state->clk_polarity = std::get<0>(it.first);
+				state->clk_sig = assign_map(std::get<1>(it.first));
+				state->en_polarity = std::get<2>(it.first);
+				state->en_sig = assign_map(std::get<3>(it.first));
+				state->arst_polarity = std::get<4>(it.first);
+				state->arst_sig = assign_map(std::get<5>(it.first));
+				state->srst_polarity = std::get<6>(it.first);
+				state->srst_sig = assign_map(std::get<7>(it.first));
+				state->prepare_module(design, mod, assign_map, it.second, !state->clk_sig.empty(), "$");
+				if (num_worker_threads > 0) {
+					work_queue.push_back(std::move(state));
+				} else {
+					// Just run everything on the main thread.
+					state->run_abc.run();
+					work_finished_queue.push_back(std::move(state));
+				}
+			}
+			work_queue.close();
+			while (work_finished_count < static_cast<int>(assigned_cells.size())) {
+				std::optional<std::unique_ptr<AbcModuleState>> work =
+					work_finished_queue.pop_front();
+				(*work)->extract(assign_map, design, mod);
+				++work_finished_count;
 			}
 		}
 

From ae0ca7578a4450347dc7a545073315f72eaec19a Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 8 Aug 2025 05:26:30 +0000
Subject: [PATCH 513/931] Use a pool of ABC processes.

Doing ABC runs in parallel can actually make things slower when every ABC run requires
spawning an ABC subprocess --- especially when using popen(), which on glibc does not
use vfork(). What seems to happen is that constant fork()ing keeps making the main
process data pages copy-on-write, so the main process code that is setting up each ABC
call takes a lot of minor page-faults, slowing it down.

The solution is pretty straightforward although a little tricky to implement.
We just reuse ABC subprocesses. Instead of passing the ABC script name on the command
line, we spawn an ABC REPL and pipe a command into it to source the script. When that's
done we echo an `ABC_DONE` token instead of exiting. Yosys then puts the ABC process
onto a stack which we can pull from the next time we do an ABC run.

For one of our large designs, this is an additional 5x speedup of the primary AbcPass.
It does 5155 ABC runs, all very small; runtime of the AbcPass goes from 760s to 149s
(not very scientific benchmarking but the effect size is large).
---
 kernel/threading.h    |  27 ++++++
 passes/techmap/abc.cc | 207 +++++++++++++++++++++++++++++++++++++++---
 2 files changed, 221 insertions(+), 13 deletions(-)

diff --git a/kernel/threading.h b/kernel/threading.h
index 8c08d670c..c34abf850 100644
--- a/kernel/threading.h
+++ b/kernel/threading.h
@@ -154,6 +154,33 @@ private:
 #endif
 };
 
+template <class T>
+class ConcurrentStack
+{
+public:
+	void push_back(T &&t) {
+#ifdef YOSYS_ENABLE_THREADS
+		std::lock_guard<std::mutex> lock(mutex);
+#endif
+		contents.push_back(std::move(t));
+	}
+	std::optional<T> try_pop_back() {
+#ifdef YOSYS_ENABLE_THREADS
+		std::lock_guard<std::mutex> lock(mutex);
+#endif
+		if (contents.empty())
+			return std::nullopt;
+		T result = std::move(contents.back());
+		contents.pop_back();
+		return result;
+	}
+private:
+#ifdef YOSYS_ENABLE_THREADS
+	std::mutex mutex;
+#endif
+	std::vector<T> contents;
+};
+
 YOSYS_NAMESPACE_END
 
 #endif // YOSYS_THREADING_H
diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 4a65671a2..82a5124ae 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -59,6 +59,11 @@
 #include <memory>
 #include <vector>
 
+#ifdef __linux__
+#  include <fcntl.h>
+#  include <spawn.h>
+#  include <sys/wait.h>
+#endif
 #ifndef _WIN32
 #  include <unistd.h>
 #  include <dirent.h>
@@ -153,6 +158,121 @@ struct AbcSigVal {
 	}
 };
 
+#if defined(__linux__) && !defined(YOSYS_DISABLE_SPAWN)
+struct AbcProcess
+{
+	pid_t pid;
+	int to_child_pipe;
+	int from_child_pipe;
+
+	AbcProcess() : pid(0), to_child_pipe(-1), from_child_pipe(-1) {}
+	AbcProcess(AbcProcess &&other) {
+		pid = other.pid;
+		to_child_pipe = other.to_child_pipe;
+		from_child_pipe = other.from_child_pipe;
+		other.pid = 0;
+		other.to_child_pipe = other.from_child_pipe = -1;
+	}
+	AbcProcess &operator=(AbcProcess &&other) {
+		if (this != &other) {
+			pid = other.pid;
+			to_child_pipe = other.to_child_pipe;
+			from_child_pipe = other.from_child_pipe;
+			other.pid = 0;
+			other.to_child_pipe = other.from_child_pipe = -1;
+		}
+		return *this;
+	}
+	~AbcProcess() {
+		if (pid == 0)
+			return;
+		if (to_child_pipe >= 0)
+			close(to_child_pipe);
+		int status;
+		int ret = waitpid(pid, &status, 0);
+		if (ret != pid) {
+			log_error("waitpid(%d) failed", pid);
+		}
+		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+			log_error("ABC failed with status %X", status);
+		}
+		if (from_child_pipe >= 0)
+			close(from_child_pipe);
+	}
+};
+
+std::optional<AbcProcess> spawn_abc(const char* abc_exe, DeferredLogs &logs) {
+	// Open pipes O_CLOEXEC so we don't leak any of the fds into racing
+	// fork()s.
+	int to_child_pipe[2];
+	if (pipe2(to_child_pipe, O_CLOEXEC) != 0) {
+		logs.log_error("pipe failed");
+		return std::nullopt;
+	}
+	int from_child_pipe[2];
+	if (pipe2(from_child_pipe, O_CLOEXEC) != 0) {
+		logs.log_error("pipe failed");
+		return std::nullopt;
+	}
+
+	AbcProcess result;
+	result.to_child_pipe = to_child_pipe[1];
+	result.from_child_pipe = from_child_pipe[0];
+	// Allow the child side of the pipes to be inherited.
+	fcntl(to_child_pipe[0], F_SETFD, 0);
+	fcntl(from_child_pipe[1], F_SETFD, 0);
+
+	posix_spawn_file_actions_t file_actions;
+	if (posix_spawn_file_actions_init(&file_actions) != 0) {
+		logs.log_error("posix_spawn_file_actions_init failed");
+		return std::nullopt;
+	}
+
+	if (posix_spawn_file_actions_addclose(&file_actions, to_child_pipe[1]) != 0) {
+		logs.log_error("posix_spawn_file_actions_addclose failed");
+		return std::nullopt;
+	}
+	if (posix_spawn_file_actions_addclose(&file_actions, from_child_pipe[0]) != 0) {
+		logs.log_error("posix_spawn_file_actions_addclose failed");
+		return std::nullopt;
+	}
+	if (posix_spawn_file_actions_adddup2(&file_actions, to_child_pipe[0], STDIN_FILENO) != 0) {
+		logs.log_error("posix_spawn_file_actions_adddup2 failed");
+		return std::nullopt;
+	}
+	if (posix_spawn_file_actions_adddup2(&file_actions, from_child_pipe[1], STDOUT_FILENO) != 0) {
+		logs.log_error("posix_spawn_file_actions_adddup2 failed");
+		return std::nullopt;
+	}
+	if (posix_spawn_file_actions_adddup2(&file_actions, from_child_pipe[1], STDERR_FILENO) != 0) {
+		logs.log_error("posix_spawn_file_actions_adddup2 failed");
+		return std::nullopt;
+	}
+	if (posix_spawn_file_actions_addclose(&file_actions, to_child_pipe[0]) != 0) {
+		logs.log_error("posix_spawn_file_actions_addclose failed");
+		return std::nullopt;
+	}
+	if (posix_spawn_file_actions_addclose(&file_actions, from_child_pipe[1]) != 0) {
+		logs.log_error("posix_spawn_file_actions_addclose failed");
+		return std::nullopt;
+	}
+
+	char arg1[] = "-s";
+	char* argv[] = { strdup(abc_exe), arg1, nullptr };
+	if (0 != posix_spawn(&result.pid, abc_exe, &file_actions, nullptr, argv, environ)) {
+		logs.log_error("posix_spawn %s failed", abc_exe);
+		return std::nullopt;
+	}
+	free(argv[0]);
+	posix_spawn_file_actions_destroy(&file_actions);
+	close(to_child_pipe[0]);
+	close(from_child_pipe[1]);
+	return result;
+}
+#else
+struct AbcProcess {};
+#endif
+
 using AbcSigMap = SigValMap<AbcSigVal>;
 
 // Used by off-main-threads. Contains no direct or indirect access to RTLIL.
@@ -167,7 +287,7 @@ struct RunAbcState {
 	dict<int, std::string> pi_map, po_map;
 
 	RunAbcState(const AbcConfig &config) : config(config) {}
-	void run();
+	void run(ConcurrentStack<AbcProcess> &process_pool);
 };
 
 struct AbcModuleState {
@@ -1010,7 +1130,42 @@ void AbcModuleState::prepare_module(RTLIL::Design *design, RTLIL::Module *module
 	handle_loops(assign_map, module);
 }
 
-void RunAbcState::run()
+bool read_until_abc_done(abc_output_filter &filt, int fd, DeferredLogs &logs) {
+	std::string line;
+	char buf[1024];
+	while (true) {
+		int ret = read(fd, buf, sizeof(buf) - 1);
+		if (ret < 0) {
+			logs.log_error("Failed to read from ABC, errno=%d", errno);
+			return false;
+		}
+		if (ret == 0) {
+			logs.log_error("ABC exited prematurely");
+			return false;
+		}
+		char *start = buf;
+		char *end = buf + ret;
+		while (start < end) {
+			char *p = static_cast<char*>(memchr(start, '\n', end - start));
+			if (p == nullptr) {
+				break;
+			}
+			line.append(start, p + 1 - start);
+			// ABC seems to actually print "ABC_DONE \n", but we probably shouldn't
+			// rely on that extra space being output.
+			if (line.substr(0, 8) == "ABC_DONE") {
+				// Ignore any leftover output, there should only be a prompt perhaps
+				return true;
+			}
+			filt.next_line(line);
+			line.clear();
+			start = p + 1;
+		}
+		line.append(start, end - start);
+	}
+}
+
+void RunAbcState::run(ConcurrentStack<AbcProcess> &process_pool)
 {
 	std::string buffer = stringf("%s/input.blif", tempdir_name);
 	FILE *f = fopen(buffer.c_str(), "wt");
@@ -1137,14 +1292,12 @@ void RunAbcState::run()
 			count_gates, GetSize(signal_list), count_input, count_output);
 	if (count_output > 0)
 	{
-		buffer = stringf("\"%s\" -s -f %s/abc.script 2>&1", config.exe_file, tempdir_name);
-		logs.log("Running ABC command: %s\n", replace_tempdir(buffer, tempdir_name, config.show_tempdir));
+		std::string tmp_script_name = stringf("%s/abc.script", tempdir_name);
+		logs.log("Running ABC script: %s\n", replace_tempdir(tmp_script_name, tempdir_name, config.show_tempdir));
 
 		errno = 0;
-#ifndef YOSYS_LINK_ABC
 		abc_output_filter filt(*this, tempdir_name, config.show_tempdir);
-		int ret = run_command(buffer, std::bind(&abc_output_filter::next_line, filt, std::placeholders::_1));
-#else
+#ifdef YOSYS_LINK_ABC
 		string temp_stdouterr_name = stringf("%s/stdouterr.txt", tempdir_name);
 		FILE *temp_stdouterr_w = fopen(temp_stdouterr_name.c_str(), "w");
 		if (temp_stdouterr_w == NULL)
@@ -1165,7 +1318,6 @@ void RunAbcState::run()
 		fclose(temp_stdouterr_w);
 		// These needs to be mutable, supposedly due to getopt
 		char *abc_argv[5];
-		string tmp_script_name = stringf("%s/abc.script", tempdir_name);
 		abc_argv[0] = strdup(config.exe_file.c_str());
 		abc_argv[1] = strdup("-s");
 		abc_argv[2] = strdup("-f");
@@ -1183,13 +1335,40 @@ void RunAbcState::run()
 		fclose(old_stdout);
 		fclose(old_stderr);
 		std::ifstream temp_stdouterr_r(temp_stdouterr_name);
-		abc_output_filter filt(*this, tempdir_name, config.show_tempdir);
 		for (std::string line; std::getline(temp_stdouterr_r, line); )
 			filt.next_line(line + "\n");
 		temp_stdouterr_r.close();
+#elif defined(__linux__) && !defined(YOSYS_DISABLE_SPAWN)
+		AbcProcess process;
+		if (std::optional<AbcProcess> process_opt = process_pool.try_pop_back()) {
+			process = std::move(process_opt.value());
+		} else if (std::optional<AbcProcess> process_opt = spawn_abc(config.exe_file.c_str(), logs)) {
+			process = std::move(process_opt.value());
+		} else {
+			return;
+		}
+		std::string cmd = stringf(
+				// This makes ABC switch stdout to line buffering, which we need
+				// to see our ABC_DONE message.
+				"set abcout /dev/stdout\n"
+				"empty\n"
+				"source %s\n"
+				"echo \"ABC_DONE\"\n", tmp_script_name);
+		int ret = write(process.to_child_pipe, cmd.c_str(), cmd.size());
+		if (ret != static_cast<int>(cmd.size())) {
+			logs.log_error("write failed");
+			return;
+		}
+		ret = read_until_abc_done(filt, process.from_child_pipe, logs) ? 0 : 1;
+		if (ret == 0) {
+			process_pool.push_back(std::move(process));
+		}
+#else
+		std::string cmd = stringf("\"%s\" -s -f %s/abc.script 2>&1", config.exe_file.c_str(), tempdir_name.c_str());
+		int ret = run_command(cmd, std::bind(&abc_output_filter::next_line, filt, std::placeholders::_1));
 #endif
 		if (ret != 0) {
-			logs.log_error("ABC: execution of command \"%s\" failed: return code %d (errno=%d).\n", buffer, ret, errno);
+			logs.log_error("ABC: execution of script \"%s\" failed: return code %d (errno=%d).\n", tmp_script_name, ret, errno);
 			return;
 		}
 		did_run = true;
@@ -2205,7 +2384,8 @@ struct AbcPass : public Pass {
 
 				AbcModuleState state(config, initvals);
 				state.prepare_module(design, mod, assign_map, cells, dff_mode, clk_str);
-				state.run_abc.run();
+				ConcurrentStack<AbcProcess> process_pool;
+				state.run_abc.run(process_pool);
 				state.extract(assign_map, design, mod);
 				continue;
 			}
@@ -2379,11 +2559,12 @@ struct AbcPass : public Pass {
 			ConcurrentQueue<std::unique_ptr<AbcModuleState>> work_queue(num_worker_threads);
 			ConcurrentQueue<std::unique_ptr<AbcModuleState>> work_finished_queue;
 			int work_finished_count = 0;
+			ConcurrentStack<AbcProcess> process_pool;
 			ThreadPool worker_threads(num_worker_threads, [&](int){
 					while (std::optional<std::unique_ptr<AbcModuleState>> work =
 							work_queue.pop_front()) {
 						// Only the `run_abc` component is safe to touch here!
-						(*work)->run_abc.run();
+						(*work)->run_abc.run(process_pool);
 						work_finished_queue.push_back(std::move(*work));
 					}
 				});
@@ -2409,7 +2590,7 @@ struct AbcPass : public Pass {
 					work_queue.push_back(std::move(state));
 				} else {
 					// Just run everything on the main thread.
-					state->run_abc.run();
+					state->run_abc.run(process_pool);
 					work_finished_queue.push_back(std::move(state));
 				}
 			}

From 9cb3a239cc872e4a4379d00a0191a2760122542e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 15 Sep 2025 23:13:20 +0000
Subject: [PATCH 514/931] Fix `subcircuit` building without `#define _YOSYS_`

We can't use the new stringf functionality with `my_sprintf()` since in some builds
that falls back to C-style varargs.
---
 libs/subcircuit/subcircuit.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/subcircuit/subcircuit.cc b/libs/subcircuit/subcircuit.cc
index 8c8d3d92d..60f27fd55 100644
--- a/libs/subcircuit/subcircuit.cc
+++ b/libs/subcircuit/subcircuit.cc
@@ -411,7 +411,7 @@ class SubCircuit::SolverWorker
 
 		std::string toString() const
 		{
-			return my_stringf("%s[%d]:%s[%d]", fromPort, fromBit, toPort, toBit);
+			return my_stringf("%s[%d]:%s[%d]", fromPort.c_str(), fromBit, toPort.c_str(), toBit);
 		}
 	};
 
@@ -444,7 +444,7 @@ class SubCircuit::SolverWorker
 			std::string str;
 			bool firstPort = true;
 			for (const auto &it : portSizes) {
-				str += my_stringf("%s%s[%d]", firstPort ? "" : ",", it.first, it.second);
+				str += my_stringf("%s%s[%d]", firstPort ? "" : ",", it.first.c_str(), it.second);
 				firstPort = false;
 			}
 			return typeId + "(" + str + ")";

From fe9eed04981a74758a4ab567baa135cbd00bc28d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 16 Sep 2025 00:22:09 +0000
Subject: [PATCH 515/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4aae25c3c..281f5a868 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+72
+YOSYS_VER := 0.57+88
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 8492c49f6cf670c5df50f7a0cbf839b3d85ecae2 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 16 Sep 2025 03:06:17 +0000
Subject: [PATCH 516/931] Remove `string_buf` by making `log_signal()` and
 `log_const()` return `std::string`

We only have to fix one caller in-tree so this probably has very low impact on out-of-tree plugins.

Resolves #5215
---
 kernel/log.cc         | 33 ++++-----------------------------
 kernel/log.h          |  4 ++--
 passes/techmap/abc.cc |  2 +-
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index efdface80..3a44a3ddc 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -68,8 +68,6 @@ int log_debug_suppressed = 0;
 
 vector<int> header_count;
 vector<char*> log_id_cache;
-vector<shared_str> string_buf;
-int string_buf_index = -1;
 
 static struct timeval initial_tv = { 0, 0 };
 static bool next_print_log = false;
@@ -447,8 +445,6 @@ void log_pop()
 {
 	header_count.pop_back();
 	log_id_cache_clear();
-	string_buf.clear();
-	string_buf_index = -1;
 	log_flush();
 }
 
@@ -554,8 +550,6 @@ void log_reset_stack()
 	while (header_count.size() > 1)
 		header_count.pop_back();
 	log_id_cache_clear();
-	string_buf.clear();
-	string_buf_index = -1;
 	log_flush();
 }
 
@@ -580,38 +574,19 @@ void log_dump_val_worker(RTLIL::State v) {
 	log("%s", log_signal(v));
 }
 
-const char *log_signal(const RTLIL::SigSpec &sig, bool autoint)
+std::string log_signal(const RTLIL::SigSpec &sig, bool autoint)
 {
 	std::stringstream buf;
 	RTLIL_BACKEND::dump_sigspec(buf, sig, autoint);
-
-	if (string_buf.size() < 100) {
-		string_buf.push_back(buf.str());
-		return string_buf.back().c_str();
-	} else {
-		if (++string_buf_index == 100)
-			string_buf_index = 0;
-		string_buf[string_buf_index] = buf.str();
-		return string_buf[string_buf_index].c_str();
-	}
+	return buf.str();
 }
 
-const char *log_const(const RTLIL::Const &value, bool autoint)
+std::string log_const(const RTLIL::Const &value, bool autoint)
 {
 	if ((value.flags & RTLIL::CONST_FLAG_STRING) == 0)
 		return log_signal(value, autoint);
 
-	std::string str = "\"" + value.decode_string() + "\"";
-
-	if (string_buf.size() < 100) {
-		string_buf.push_back(str);
-		return string_buf.back().c_str();
-	} else {
-		if (++string_buf_index == 100)
-			string_buf_index = 0;
-		string_buf[string_buf_index] = str;
-		return string_buf[string_buf_index].c_str();
-	}
+	return "\"" + value.decode_string() + "\"";
 }
 
 const char *log_id(const RTLIL::IdString &str)
diff --git a/kernel/log.h b/kernel/log.h
index a136ec7ac..78b202159 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -253,8 +253,8 @@ extern dict<std::string, LogExpectedItem> log_expect_log, log_expect_warning, lo
 extern dict<std::string, LogExpectedItem> log_expect_prefix_log, log_expect_prefix_warning, log_expect_prefix_error;
 void log_check_expected();
 
-const char *log_signal(const RTLIL::SigSpec &sig, bool autoint = true);
-const char *log_const(const RTLIL::Const &value, bool autoint = true);
+std::string log_signal(const RTLIL::SigSpec &sig, bool autoint = true);
+std::string log_const(const RTLIL::Const &value, bool autoint = true);
 const char *log_id(const RTLIL::IdString &id);
 
 template<typename T> static inline const char *log_id(T *obj, const char *nullstr = nullptr) {
diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 82a5124ae..c5bdd6ecf 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -755,7 +755,7 @@ void AbcModuleState::handle_loops(AbcSigMap &assign_map, RTLIL::Module *module)
 					log("Breaking loop using new signal %s: %s -> %s\n", log_signal(RTLIL::SigSpec(wire)),
 							run_abc.signal_list[id1].bit_str, run_abc.signal_list[id2].bit_str);
 				else
-					log("                               %*s  %s -> %s\n", int(strlen(log_signal(RTLIL::SigSpec(wire)))), "",
+					log("                               %*s  %s -> %s\n", int(log_signal(RTLIL::SigSpec(wire)).size()), "",
 							run_abc.signal_list[id1].bit_str, run_abc.signal_list[id2].bit_str);
 				first_line = false;
 			}

From 03127173c66b421df9eda632f5d2bc34e515a96c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 04:33:14 +0000
Subject: [PATCH 517/931] Fix const_iterator postincrement behavior

---
 kernel/rtlil.h                 |  4 ++--
 tests/unit/kernel/rtlilTest.cc | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index fc0087442..0ec7e0954 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -904,8 +904,8 @@ public:
 
 		const_iterator& operator++() { ++idx; return *this; }
 		const_iterator& operator--() { --idx; return *this; }
-		const_iterator& operator++(int) { ++idx; return *this; }
-		const_iterator& operator--(int) { --idx; return *this; }
+		const_iterator operator++(int) { const_iterator result(*this); ++idx; return result; }
+		const_iterator operator--(int) { const_iterator result(*this); --idx; return result; }
 		const_iterator& operator+=(int i) { idx += i; return *this; }
 
 		const_iterator operator+(int add) {
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index cb773202d..b8ac554b1 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -90,6 +90,30 @@ namespace RTLIL {
 
 	}
 
+	TEST_F(KernelRtlilTest, ConstConstIteratorWorks) {
+		const Const c(0x2, 2);
+		Const::const_iterator it = c.begin();
+		ASSERT_NE(it, c.end());
+		EXPECT_EQ(*it, State::S0);
+		++it;
+		ASSERT_NE(it, c.end());
+		EXPECT_EQ(*it, State::S1);
+		++it;
+		EXPECT_EQ(it, c.end());
+	}
+
+	TEST_F(KernelRtlilTest, ConstConstIteratorPreincrement) {
+		const Const c(0x2, 2);
+		Const::const_iterator it = c.begin();
+		EXPECT_EQ(*++it, State::S1);
+	}
+
+	TEST_F(KernelRtlilTest, ConstConstIteratorPostincrement) {
+		const Const c(0x2, 2);
+		Const::const_iterator it = c.begin();
+		EXPECT_EQ(*it++, State::S0);
+	}
+
 	class WireRtlVsHdlIndexConversionTest :
 		public KernelRtlilTest,
 		public testing::WithParamInterface<std::tuple<bool, int, int>>

From 514fb8f9015b2895e61e025e8b57509942adef72 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 04:34:41 +0000
Subject: [PATCH 518/931] Fix Const::const_iterator tag to be
 bidirectional_iterator_tag

---
 kernel/rtlil.cc |  6 +++---
 kernel/rtlil.h  | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 3a8b25d1d..8d7f89650 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -615,11 +615,11 @@ void RTLIL::Const::append(const RTLIL::Const &other) {
 }
 
 RTLIL::State RTLIL::Const::const_iterator::operator*() const {
-	if (auto bv = parent.get_if_bits())
+	if (auto bv = parent->get_if_bits())
 		return (*bv)[idx];
 
-	int char_idx = parent.get_str().size() - idx / 8 - 1;
-	bool bit = (parent.get_str()[char_idx] & (1 << (idx % 8)));
+	int char_idx = parent->get_str().size() - idx / 8 - 1;
+	bool bit = (parent->get_str()[char_idx] & (1 << (idx % 8)));
 	return bit ? State::S1 : State::S0;
 }
 
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 0ec7e0954..e1002fff7 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -888,17 +888,17 @@ public:
 
 	class const_iterator {
 	private:
-		const Const& parent;
+		const Const* parent;
 		size_t idx;
 
 	public:
-		using iterator_category = std::input_iterator_tag;
+		using iterator_category = std::bidirectional_iterator_tag;
 		using value_type = State;
 		using difference_type = std::ptrdiff_t;
 		using pointer = const State*;
 		using reference = const State&;
 
-		const_iterator(const Const& c, size_t i) : parent(c), idx(i) {}
+		const_iterator(const Const& c, size_t i) : parent(&c), idx(i) {}
 
 		State operator*() const;
 
@@ -909,10 +909,10 @@ public:
 		const_iterator& operator+=(int i) { idx += i; return *this; }
 
 		const_iterator operator+(int add) {
-			return const_iterator(parent, idx + add);
+			return const_iterator(*parent, idx + add);
 		}
 		const_iterator operator-(int sub) {
-			return const_iterator(parent, idx - sub);
+			return const_iterator(*parent, idx - sub);
 		}
 		int operator-(const const_iterator& other) {
 			return idx - other.idx;

From 662a3df98713244cc35f0145a98f69f98c4fdb99 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 01:54:41 +0000
Subject: [PATCH 519/931] Update Const API with alternatives to direct use of
 bits()

In particular, `Const::resize()`, `Const::set()`, and `Const::iterator`.
---
 kernel/rtlil.h                 | 81 ++++++++++++++++++++++++++++++++--
 tests/unit/kernel/rtlilTest.cc | 54 +++++++++++++++++++++++
 2 files changed, 131 insertions(+), 4 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index e1002fff7..b7776f378 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -842,13 +842,24 @@ public:
 	Const(const std::string &str);
 	Const(long long val, int width = 32);
 	Const(RTLIL::State bit, int width = 1);
-	Const(const std::vector<RTLIL::State> &bits) : flags(RTLIL::CONST_FLAG_NONE), tag(backing_tag::bits), bits_(bits) {}
+	Const(std::vector<RTLIL::State> bits) : flags(RTLIL::CONST_FLAG_NONE), tag(backing_tag::bits), bits_(std::move(bits)) {}
 	Const(const std::vector<bool> &bits);
 	Const(const RTLIL::Const &other);
 	Const(RTLIL::Const &&other);
 	RTLIL::Const &operator =(const RTLIL::Const &other);
 	~Const();
 
+	struct Builder
+	{
+		Builder() {}
+		Builder(int expected_width) { bits.reserve(expected_width); }
+		void push_back(RTLIL::State b) { bits.push_back(b); }
+		int size() const { return static_cast<int>(bits.size()); }
+		Const build() { return Const(std::move(bits)); }
+	private:
+		std::vector<RTLIL::State> bits;
+	};
+
 	bool operator <(const RTLIL::Const &other) const;
 	bool operator ==(const RTLIL::Const &other) const;
 	bool operator !=(const RTLIL::Const &other) const;
@@ -885,6 +896,12 @@ public:
 	void bitvectorize() const;
 
 	void append(const RTLIL::Const &other);
+	void set(int i, RTLIL::State state) {
+		bits()[i] = state;
+	}
+	void resize(int size, RTLIL::State fill) {
+		bits().resize(size, fill);
+	}
 
 	class const_iterator {
 	private:
@@ -927,12 +944,69 @@ public:
 		}
 	};
 
+	class iterator {
+	private:
+		Const* parent;
+		size_t idx;
+
+	public:
+		class proxy {
+		private:
+			Const* parent;
+			size_t idx;
+		public:
+			proxy(Const* parent, size_t idx) : parent(parent), idx(idx) {}
+			operator State() const { return (*parent)[idx]; }
+			proxy& operator=(State s) { parent->set(idx, s); return *this; }
+			proxy& operator=(const proxy& other) { parent->set(idx, (*other.parent)[other.idx]); return *this; }
+		};
+
+		using iterator_category = std::bidirectional_iterator_tag;
+		using value_type = State;
+		using difference_type = std::ptrdiff_t;
+		using pointer = proxy*;
+		using reference = proxy;
+
+		iterator(Const& c, size_t i) : parent(&c), idx(i) {}
+
+		proxy operator*() const { return proxy(parent, idx); }
+		iterator& operator++() { ++idx; return *this; }
+		iterator& operator--() { --idx; return *this; }
+		iterator operator++(int) { iterator result(*this); ++idx; return result; }
+		iterator operator--(int) { iterator result(*this); --idx; return result; }
+		iterator& operator+=(int i) { idx += i; return *this; }
+
+		iterator operator+(int add) {
+			return iterator(*parent, idx + add);
+		}
+		iterator operator-(int sub) {
+			return iterator(*parent, idx - sub);
+		}
+		int operator-(const iterator& other) {
+			return idx - other.idx;
+		}
+
+		bool operator==(const iterator& other) const {
+			return idx == other.idx;
+		}
+
+		bool operator!=(const iterator& other) const {
+			return !(*this == other);
+		}
+	};
+
 	const_iterator begin() const {
 		return const_iterator(*this, 0);
 	}
 	const_iterator end() const {
 		return const_iterator(*this, size());
 	}
+	iterator begin() {
+		return iterator(*this, 0);
+	}
+	iterator end() {
+		return iterator(*this, size());
+	}
 	State back() const {
 		return *(end() - 1);
 	}
@@ -964,12 +1038,11 @@ public:
 	std::optional<int> as_int_compress(bool is_signed) const;
 
 	void extu(int width) {
-		bits().resize(width, RTLIL::State::S0);
+		resize(width, RTLIL::State::S0);
 	}
 
 	void exts(int width) {
-		bitvectype& bv = bits();
-		bv.resize(width, bv.empty() ? RTLIL::State::Sx : bv.back());
+		resize(width, empty() ? RTLIL::State::Sx : back());
 	}
 
 	[[nodiscard]] Hasher hash_into(Hasher h) const {
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index b8ac554b1..6a5f75a95 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -114,6 +114,60 @@ namespace RTLIL {
 		EXPECT_EQ(*it++, State::S0);
 	}
 
+	TEST_F(KernelRtlilTest, ConstIteratorWorks) {
+		Const c(0x2, 2);
+		Const::iterator it = c.begin();
+		ASSERT_NE(it, c.end());
+		EXPECT_EQ(*it, State::S0);
+		++it;
+		ASSERT_NE(it, c.end());
+		EXPECT_EQ(*it, State::S1);
+		++it;
+		ASSERT_EQ(it, c.end());
+	}
+
+	TEST_F(KernelRtlilTest, ConstIteratorPreincrement) {
+		Const c(0x2, 2);
+		Const::iterator it = c.begin();
+		EXPECT_EQ(*++it, State::S1);
+	}
+
+	TEST_F(KernelRtlilTest, ConstIteratorPostincrement) {
+		Const c(0x2, 2);
+		Const::iterator it = c.begin();
+		EXPECT_EQ(*it++, State::S0);
+	}
+
+	TEST_F(KernelRtlilTest, ConstIteratorWriteWorks) {
+		Const c(0x2, 2);
+		Const::iterator it = c.begin();
+		EXPECT_EQ(*it, State::S0);
+		*it = State::S1;
+		EXPECT_EQ(*it, State::S1);
+	}
+
+	TEST_F(KernelRtlilTest, ConstBuilder) {
+		Const::Builder b;
+		EXPECT_EQ(GetSize(b), 0);
+		b.push_back(S0);
+		EXPECT_EQ(GetSize(b), 1);
+		b.push_back(S1);
+		EXPECT_EQ(GetSize(b), 2);
+		EXPECT_EQ(b.build(), Const(0x2, 2));
+	}
+
+	TEST_F(KernelRtlilTest, ConstSet) {
+		Const c(0x2, 2);
+		c.set(0, S1);
+		EXPECT_EQ(c, Const(0x3, 2));
+	}
+
+	TEST_F(KernelRtlilTest, ConstResize) {
+		Const c(0x2, 2);
+		c.resize(4, S1);
+		EXPECT_EQ(c, Const(0xe, 4));
+	}
+
 	class WireRtlVsHdlIndexConversionTest :
 		public KernelRtlilTest,
 		public testing::WithParamInterface<std::tuple<bool, int, int>>

From 34df6569a69f32ae96ed7b7353f484e9b0346bb2 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 01:55:02 +0000
Subject: [PATCH 520/931] Update backends to avoid bits()

---
 backends/btor/btor.cc               | 16 +++++++++-------
 backends/cxxrtl/cxxrtl_backend.cc   | 15 +++++++++------
 backends/functional/test_generic.cc |  2 +-
 backends/simplec/simplec.cc         |  2 +-
 backends/smt2/smt2.cc               | 12 ++++++------
 backends/verilog/verilog_backend.cc | 12 +++++++-----
 6 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/backends/btor/btor.cc b/backends/btor/btor.cc
index 5fd21717e..bba7249c7 100644
--- a/backends/btor/btor.cc
+++ b/backends/btor/btor.cc
@@ -705,12 +705,13 @@ struct BtorWorker
 				}
 			}
 
-			Const initval;
+			Const::Builder initval_bits(GetSize(sig_q));
 			for (int i = 0; i < GetSize(sig_q); i++)
 				if (initbits.count(sig_q[i]))
-					initval.bits().push_back(initbits.at(sig_q[i]) ? State::S1 : State::S0);
+					initval_bits.push_back(initbits.at(sig_q[i]) ? State::S1 : State::S0);
 				else
-					initval.bits().push_back(State::Sx);
+					initval_bits.push_back(State::Sx);
+			Const initval = initval_bits.build();
 
 			int nid_init_val = -1;
 
@@ -1039,10 +1040,11 @@ struct BtorWorker
 				{
 					if (bit.wire == nullptr)
 					{
-						Const c(bit.data);
-
-						while (i+GetSize(c) < GetSize(sig) && sig[i+GetSize(c)].wire == nullptr)
-							c.bits().push_back(sig[i+GetSize(c)].data);
+						Const::Builder c_bits;
+						c_bits.push_back(bit.data);
+						while (i + GetSize(c_bits) < GetSize(sig) && sig[i + GetSize(c_bits)].wire == nullptr)
+							c_bits.push_back(sig[i + GetSize(c_bits)].data);
+						Const c = c_bits.build();
 
 						if (consts.count(c) == 0) {
 							int sid = get_bv_sid(GetSize(c));
diff --git a/backends/cxxrtl/cxxrtl_backend.cc b/backends/cxxrtl/cxxrtl_backend.cc
index 0c9f6c054..9a7e1383a 100644
--- a/backends/cxxrtl/cxxrtl_backend.cc
+++ b/backends/cxxrtl/cxxrtl_backend.cc
@@ -1668,26 +1668,29 @@ struct CxxrtlWorker {
 						f << signal_temp << " == ";
 						dump_sigspec(compare, /*is_lhs=*/false, for_debug);
 					} else if (compare.is_fully_const()) {
-						RTLIL::Const compare_mask, compare_value;
+						RTLIL::Const::Builder compare_mask_builder(compare.size());
+						RTLIL::Const::Builder compare_value_builder(compare.size());
 						for (auto bit : compare.as_const()) {
 							switch (bit) {
 								case RTLIL::S0:
 								case RTLIL::S1:
-									compare_mask.bits().push_back(RTLIL::S1);
-									compare_value.bits().push_back(bit);
+									compare_mask_builder.push_back(RTLIL::S1);
+									compare_value_builder.push_back(bit);
 									break;
 
 								case RTLIL::Sx:
 								case RTLIL::Sz:
 								case RTLIL::Sa:
-									compare_mask.bits().push_back(RTLIL::S0);
-									compare_value.bits().push_back(RTLIL::S0);
+									compare_mask_builder.push_back(RTLIL::S0);
+									compare_value_builder.push_back(RTLIL::S0);
 									break;
 
 								default:
 									log_assert(false);
 							}
 						}
+						RTLIL::Const compare_mask = compare_mask_builder.build();
+						RTLIL::Const compare_value = compare_value_builder.build();
 						f << "and_uu<" << compare.size() << ">(" << signal_temp << ", ";
 						dump_const(compare_mask);
 						f << ") == ";
@@ -3042,7 +3045,7 @@ struct CxxrtlWorker {
 								if (init == RTLIL::Const()) {
 									init = RTLIL::Const(State::Sx, GetSize(bit.wire));
 								}
-								init.bits()[bit.offset] = port.init_value[i];
+								init.set(bit.offset, port.init_value[i]);
 							}
 						}
 					}
diff --git a/backends/functional/test_generic.cc b/backends/functional/test_generic.cc
index a0474ea2b..c01649a0f 100644
--- a/backends/functional/test_generic.cc
+++ b/backends/functional/test_generic.cc
@@ -105,7 +105,7 @@ struct MemContentsTest {
 				RTLIL::Const values;
 				for(addr_t addr = low; addr <= high; addr++) {
 					RTLIL::Const word(data_dist(rnd), data_width);
-					values.bits().insert(values.bits().end(), word.begin(), word.end());
+					values.append(word);
 				}
 				insert_concatenated(low, values);
 			}
diff --git a/backends/simplec/simplec.cc b/backends/simplec/simplec.cc
index ed981f961..8ebc685f0 100644
--- a/backends/simplec/simplec.cc
+++ b/backends/simplec/simplec.cc
@@ -657,7 +657,7 @@ struct SimplecWorker
 			{
 				SigSpec sig = sigmaps.at(module)(w);
 				Const val = w->attributes.at(ID::init);
-				val.bits().resize(GetSize(sig), State::Sx);
+				val.resize(GetSize(sig), State::Sx);
 
 				for (int i = 0; i < GetSize(sig); i++)
 					if (val[i] == State::S0 || val[i] == State::S1) {
diff --git a/backends/smt2/smt2.cc b/backends/smt2/smt2.cc
index 1d3757463..d80622029 100644
--- a/backends/smt2/smt2.cc
+++ b/backends/smt2/smt2.cc
@@ -1079,14 +1079,14 @@ struct Smt2Worker
 
 				RTLIL::SigSpec sig = sigmap(wire);
 				Const val = wire->attributes.at(ID::init);
-				val.bits().resize(GetSize(sig), State::Sx);
+				val.resize(GetSize(sig), State::Sx);
 				if (bvmode && GetSize(sig) > 1) {
 					Const mask(State::S1, GetSize(sig));
 					bool use_mask = false;
 					for (int i = 0; i < GetSize(sig); i++)
 						if (val[i] != State::S0 && val[i] != State::S1) {
-							val.bits()[i] = State::S0;
-							mask.bits()[i] = State::S0;
+							val.set(i, State::S0);
+							mask.set(i, State::S0);
 							use_mask = true;
 						}
 					if (use_mask)
@@ -1361,10 +1361,10 @@ struct Smt2Worker
 					for (int k = 0; k < GetSize(initword); k++) {
 						if (initword[k] == State::S0 || initword[k] == State::S1) {
 							gen_init_constr = true;
-							initmask.bits()[k] = State::S1;
+							initmask.set(k, State::S1);
 						} else {
-							initmask.bits()[k] = State::S0;
-							initword.bits()[k] = State::S0;
+							initmask.set(k, State::S0);
+							initword.set(k, State::S0);
 						}
 					}
 
diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index 71969f177..b03639b8d 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -327,19 +327,20 @@ void dump_const(std::ostream &f, const RTLIL::Const &data, int width = -1, int o
 
 void dump_reg_init(std::ostream &f, SigSpec sig)
 {
-	Const initval;
 	bool gotinit = false;
 
+	Const::Builder initval_bits(sig.size());
 	for (auto bit : active_sigmap(sig)) {
 		if (active_initdata.count(bit)) {
-			initval.bits().push_back(active_initdata.at(bit));
+			initval_bits.push_back(active_initdata.at(bit));
 			gotinit = true;
 		} else {
-			initval.bits().push_back(State::Sx);
+			initval_bits.push_back(State::Sx);
 		}
 	}
 
 	if (gotinit) {
+		Const initval = initval_bits.build();
 		f << " = ";
 		dump_const(f, initval);
 	}
@@ -767,9 +768,10 @@ void dump_memory(std::ostream &f, std::string indent, Mem &mem)
 					dump_sigspec(os, port.data.extract(sub * mem.width, mem.width));
 					os << stringf(" = %s[", mem_id);;
 					if (port.wide_log2) {
-						Const addr_lo;
+						Const::Builder addr_lo_builder(port.wide_log2);
 						for (int i = 0; i < port.wide_log2; i++)
-							addr_lo.bits().push_back(State(sub >> i & 1));
+							addr_lo_builder.push_back(State(sub >> i & 1));
+						Const addr_lo = addr_lo_builder.build();
 						os << "{";
 						os << temp_id;
 						os << ", ";

From f65ca488ec41500857f041768a200652a5e90189 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 01:55:26 +0000
Subject: [PATCH 521/931] Update frontends to avoid bits()

---
 frontends/aiger/aigerparse.cc  |  2 +-
 frontends/ast/ast.cc           |  4 +++-
 frontends/ast/genrtlil.cc      | 16 +++++++++-------
 frontends/ast/simplify.cc      | 11 +++++++----
 frontends/blif/blifparse.cc    | 23 +++++++++++++----------
 frontends/rtlil/rtlil_parser.y |  7 ++++---
 6 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/frontends/aiger/aigerparse.cc b/frontends/aiger/aigerparse.cc
index db4cb12ba..70d94faff 100644
--- a/frontends/aiger/aigerparse.cc
+++ b/frontends/aiger/aigerparse.cc
@@ -448,7 +448,7 @@ void AigerReader::parse_xaiger()
 					bool success = ce.eval(o);
 					log_assert(success);
 					log_assert(o.wire == nullptr);
-					lut_mask.bits()[gray] = o.data;
+					lut_mask.set(gray, o.data);
 				}
 				RTLIL::Cell *output_cell = module->cell(stringf("$and$aiger%d$%d", aiger_autoidx, rootNodeID));
 				log_assert(output_cell);
diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index b61c0bea9..459b50683 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -1076,8 +1076,10 @@ RTLIL::Const AstNode::realAsConst(int width)
 		bool is_negative = v < 0;
 		if (is_negative)
 			v *= -1;
+		RTLIL::Const::Builder b(width);
 		for (int i = 0; i < width; i++, v /= 2)
-			result.bits().push_back((fmod(floor(v), 2) != 0) ? RTLIL::State::S1 : RTLIL::State::S0);
+			b.push_back((fmod(floor(v), 2) != 0) ? RTLIL::State::S1 : RTLIL::State::S0);
+		result = b.build();
 		if (is_negative)
 			result = const_neg(result, result, false, false, result.size());
 	}
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 41e10cf98..262dda43b 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -732,16 +732,17 @@ struct AST_INTERNAL::ProcessGenerator
 				current_case->actions.push_back(SigSig(en, true));
 
 				RTLIL::SigSpec triggers;
-				RTLIL::Const polarity;
+				RTLIL::Const::Builder polarity_builder;
 				for (auto sync : proc->syncs) {
 					if (sync->type == RTLIL::STp) {
 						triggers.append(sync->signal);
-						polarity.bits().push_back(RTLIL::S1);
+						polarity_builder.push_back(RTLIL::S1);
 					} else if (sync->type == RTLIL::STn) {
 						triggers.append(sync->signal);
-						polarity.bits().push_back(RTLIL::S0);
+						polarity_builder.push_back(RTLIL::S0);
 					}
 				}
+				RTLIL::Const polarity = polarity_builder.build();
 
 				RTLIL::Cell *cell = current_module->addCell(sstr.str(), ID($print));
 				set_src_attr(cell, ast);
@@ -829,16 +830,17 @@ struct AST_INTERNAL::ProcessGenerator
 				current_case->actions.push_back(SigSig(en, true));
 
 				RTLIL::SigSpec triggers;
-				RTLIL::Const polarity;
+				RTLIL::Const::Builder polarity_builder;
 				for (auto sync : proc->syncs) {
 					if (sync->type == RTLIL::STp) {
 						triggers.append(sync->signal);
-						polarity.bits().push_back(RTLIL::S1);
+						polarity_builder.push_back(RTLIL::S1);
 					} else if (sync->type == RTLIL::STn) {
 						triggers.append(sync->signal);
-						polarity.bits().push_back(RTLIL::S0);
+						polarity_builder.push_back(RTLIL::S0);
 					}
 				}
+				RTLIL::Const polarity = polarity_builder.build();
 
 				RTLIL::Cell *cell = current_module->addCell(cellname, ID($check));
 				set_src_attr(cell, ast);
@@ -893,7 +895,7 @@ struct AST_INTERNAL::ProcessGenerator
 				RTLIL::Const priority_mask = RTLIL::Const(0, cur_idx);
 				for (int i = 0; i < portid; i++) {
 					int new_bit = port_map[std::make_pair(memid, i)];
-					priority_mask.bits()[new_bit] = orig_priority_mask[i];
+					priority_mask.set(new_bit, orig_priority_mask[i]);
 				}
 				action.priority_mask = priority_mask;
 				sync->mem_write_actions.push_back(action);
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 7328290ea..2669f83e2 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -4366,7 +4366,7 @@ replace_fcall_later:;
 					log_assert(a.size() == b.size());
 					for (auto i = 0; i < a.size(); i++)
 						if (a[i] != b[i])
-							a.bits()[i] = RTLIL::State::Sx;
+							a.set(i, RTLIL::State::Sx);
 					newNode = mkconst_bits(location, a.to_bits(), sign_hint);
 				} else if (children[1]->isConst() && children[2]->isConst()) {
 					newNode = std::make_unique<AstNode>(location, AST_REALVALUE);
@@ -5368,8 +5368,11 @@ bool AstNode::replace_variables(std::map<std::string, AstNode::varinfo_t> &varia
 		offset -= variables.at(str).offset;
 		if (variables.at(str).range_swapped)
 			offset = -offset;
-		std::vector<RTLIL::State> &var_bits = variables.at(str).val.bits();
-		std::vector<RTLIL::State> new_bits(var_bits.begin() + offset, var_bits.begin() + offset + width);
+		const RTLIL::Const &val = variables.at(str).val;
+		std::vector<RTLIL::State> new_bits;
+		new_bits.reserve(width);
+		for (int i = 0; i < width; i++)
+			new_bits.push_back(val[offset+i]);
 		auto newNode = mkconst_bits(location, new_bits, variables.at(str).is_signed);
 		newNode->cloneInto(*this);
 		return true;
@@ -5513,7 +5516,7 @@ std::unique_ptr<AstNode> AstNode::eval_const_function(AstNode *fcall, bool must_
 					int index = i + offset - v.offset;
 					if (v.range_swapped)
 						index = -index;
-					v.val.bits().at(index) = r.at(i);
+					v.val.set(index, r.at(i));
 				}
 			}
 
diff --git a/frontends/blif/blifparse.cc b/frontends/blif/blifparse.cc
index d63044923..741dd07d6 100644
--- a/frontends/blif/blifparse.cc
+++ b/frontends/blif/blifparse.cc
@@ -149,7 +149,7 @@ void parse_blif(RTLIL::Design *design, std::istream &f, IdString dff_name, bool
 		if (buffer[0] == '.')
 		{
 			if (lutptr) {
-				for (auto &bit : lutptr->bits())
+				for (auto bit : *lutptr)
 					if (bit == RTLIL::State::Sx)
 						bit = lut_default_state;
 				lutptr = NULL;
@@ -321,9 +321,10 @@ void parse_blif(RTLIL::Design *design, std::istream &f, IdString dff_name, bool
 					const_v = Const(str);
 				} else {
 					int n = strlen(v);
-					const_v.bits().resize(n);
+					Const::Builder const_v_builder(n);
 					for (int i = 0; i < n; i++)
-						const_v.bits()[i] = v[n-i-1] != '0' ? State::S1 : State::S0;
+						const_v_builder.push_back(v[n-i-1] != '0' ? State::S1 : State::S0);
+					const_v = const_v_builder.build();
 				}
 				if (!strcmp(cmd, ".attr")) {
 					if (obj_attributes == nullptr) {
@@ -563,21 +564,23 @@ void parse_blif(RTLIL::Design *design, std::istream &f, IdString dff_name, bool
 			log_assert(sopcell->parameters[ID::WIDTH].as_int() == input_len);
 			sopcell->parameters[ID::DEPTH] = sopcell->parameters[ID::DEPTH].as_int() + 1;
 
+			Const::Builder table_bits_builder(input_len * 2);
 			for (int i = 0; i < input_len; i++)
 				switch (input[i]) {
 					case '0':
-						sopcell->parameters[ID::TABLE].bits().push_back(State::S1);
-						sopcell->parameters[ID::TABLE].bits().push_back(State::S0);
+						table_bits_builder.push_back(State::S1);
+						table_bits_builder.push_back(State::S0);
 						break;
 					case '1':
-						sopcell->parameters[ID::TABLE].bits().push_back(State::S0);
-						sopcell->parameters[ID::TABLE].bits().push_back(State::S1);
+						table_bits_builder.push_back(State::S0);
+						table_bits_builder.push_back(State::S1);
 						break;
 					default:
-						sopcell->parameters[ID::TABLE].bits().push_back(State::S0);
-						sopcell->parameters[ID::TABLE].bits().push_back(State::S0);
+						table_bits_builder.push_back(State::S0);
+						table_bits_builder.push_back(State::S0);
 						break;
 				}
+			sopcell->parameters[ID::TABLE].append(table_bits_builder.build());
 
 			if (sopmode == -1) {
 				sopmode = (*output == '1');
@@ -605,7 +608,7 @@ void parse_blif(RTLIL::Design *design, std::istream &f, IdString dff_name, bool
 							goto try_next_value;
 					}
 				}
-				lutptr->bits().at(i) = !strcmp(output, "0") ? RTLIL::State::S0 : RTLIL::State::S1;
+				lutptr->set(i, !strcmp(output, "0") ? RTLIL::State::S0 : RTLIL::State::S1);
 			try_next_value:;
 			}
 
diff --git a/frontends/rtlil/rtlil_parser.y b/frontends/rtlil/rtlil_parser.y
index fc7615364..4f0fb3b97 100644
--- a/frontends/rtlil/rtlil_parser.y
+++ b/frontends/rtlil/rtlil_parser.y
@@ -455,9 +455,10 @@ constant:
 		}
 		while ((int)bits.size() > width)
 			bits.pop_back();
-		$$ = new RTLIL::Const;
-		for (auto it = bits.begin(); it != bits.end(); it++)
-			$$->bits().push_back(*it);
+		RTLIL::Const::Builder builder(bits.size());
+		for (RTLIL::State bit : bits)
+			builder.push_back(bit);
+		$$ = new RTLIL::Const(builder.build());
 		if (is_signed) {
 			$$->flags |= RTLIL::CONST_FLAG_SIGNED;
 		}

From 1b589b065d889cf53e30e53bd58ee5acde68a595 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 03:52:40 +0000
Subject: [PATCH 522/931] Update passes/cmds to avoid bits()

---
 passes/cmds/bugpoint.cc        |  6 +++++-
 passes/cmds/clean_zerowidth.cc |  6 +++---
 passes/cmds/dft_tag.cc         |  6 ++++--
 passes/cmds/setundef.cc        |  8 ++++----
 passes/cmds/splitnets.cc       |  7 ++++---
 passes/cmds/xprop.cc           | 12 ++++++------
 6 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index d48e25d68..8432c27fd 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -405,7 +405,11 @@ struct BugpointPass : public Pass {
 								for (auto it2 = sy->mem_write_actions.begin(); it2 != sy->mem_write_actions.end(); ++it2) {
 									auto &mask = it2->priority_mask;
 									if (GetSize(mask) > i) {
-										mask.bits().erase(mask.bits().begin() + i);
+										RTLIL::Const::Builder new_mask_builder(GetSize(mask) - 1);
+										for (int k = 0; k < GetSize(mask); k++)
+											if (k != i)
+												new_mask_builder.push_back(mask[k]);
+										mask = new_mask_builder.build();
 									}
 								}
 								return design_copy;
diff --git a/passes/cmds/clean_zerowidth.cc b/passes/cmds/clean_zerowidth.cc
index 48a8864c0..021726450 100644
--- a/passes/cmds/clean_zerowidth.cc
+++ b/passes/cmds/clean_zerowidth.cc
@@ -158,11 +158,11 @@ struct CleanZeroWidthPass : public Pass {
 							continue;
 						if (GetSize(memwr.address) == 0)
 							memwr.address = State::S0;
-						Const priority_mask;
+						RTLIL::Const::Builder new_mask_bits(swizzle.size());
 						for (auto x : swizzle) {
-							priority_mask.bits().push_back(memwr.priority_mask[x]);
+							new_mask_bits.push_back(memwr.priority_mask[x]);
 						}
-						memwr.priority_mask = priority_mask;
+						memwr.priority_mask = new_mask_bits.build();
 						swizzle.push_back(i);
 						new_memwr_actions.push_back(memwr);
 					}
diff --git a/passes/cmds/dft_tag.cc b/passes/cmds/dft_tag.cc
index 068b5d7d9..5d9756ca0 100644
--- a/passes/cmds/dft_tag.cc
+++ b/passes/cmds/dft_tag.cc
@@ -884,8 +884,10 @@ struct DftTagWorker {
 	{
 		if (sig_a.is_fully_const()) {
 			auto const_val = sig_a.as_const();
-			for (State& bit : const_val.bits())
-				bit = bit == State::S0 ? State::S1 : bit == State::S1 ? State::S0 : bit;
+			for (auto bit : const_val) {
+				State b = bit;
+				bit = b == State::S0 ? State::S1 : b == State::S1 ? State::S0 : b;
+			}
 			return const_val;
 		}
 		return module->Not(name, sig_a);
diff --git a/passes/cmds/setundef.cc b/passes/cmds/setundef.cc
index c4a555e6a..6d3e30561 100644
--- a/passes/cmds/setundef.cc
+++ b/passes/cmds/setundef.cc
@@ -243,7 +243,7 @@ struct SetundefPass : public Pass {
 			{
 				for (auto *cell : module->selected_cells()) {
 					for (auto &parameter : cell->parameters) {
-						for (auto &bit : parameter.second.bits()) {
+						for (auto bit : parameter.second) {
 							if (bit > RTLIL::State::S1)
 								bit = worker.next_bit();
 						}
@@ -390,12 +390,12 @@ struct SetundefPass : public Pass {
 					for (auto wire : initwires)
 					{
 						Const &initval = wire->attributes[ID::init];
-						initval.bits().resize(GetSize(wire), State::Sx);
+						initval.resize(GetSize(wire), State::Sx);
 
 						for (int i = 0; i < GetSize(wire); i++) {
 							SigBit bit = sigmap(SigBit(wire, i));
 							if (initval[i] == State::Sx && ffbits.count(bit)) {
-								initval.bits()[i] = worker.next_bit();
+								initval.set(i, worker.next_bit());
 								ffbits.erase(bit);
 							}
 						}
@@ -421,7 +421,7 @@ struct SetundefPass : public Pass {
 								continue;
 
 							Const &initval = wire->attributes[ID::init];
-							initval.bits().resize(GetSize(wire), State::Sx);
+							initval.resize(GetSize(wire), State::Sx);
 
 							if (initval.is_fully_undef()) {
 								wire->attributes.erase(ID::init);
diff --git a/passes/cmds/splitnets.cc b/passes/cmds/splitnets.cc
index 9e606dee1..d61a99ec0 100644
--- a/passes/cmds/splitnets.cc
+++ b/passes/cmds/splitnets.cc
@@ -75,10 +75,11 @@ struct SplitnetsWorker
 
 		it = wire->attributes.find(ID::init);
 		if (it != wire->attributes.end()) {
-			Const old_init = it->second, new_init;
+			Const old_init = it->second;
+			RTLIL::Const::Builder new_init_bits_builder(width);
 			for (int i = offset; i < offset+width; i++)
-				new_init.bits().push_back(i < GetSize(old_init) ? old_init.at(i) : State::Sx);
-			new_wire->attributes.emplace(ID::init, new_init);
+				new_init_bits_builder.push_back(i < GetSize(old_init) ? old_init.at(i) : State::Sx);
+			new_wire->attributes.emplace(ID::init, new_init_bits_builder.build());
 		}
 
 		std::vector<RTLIL::SigBit> sigvec = RTLIL::SigSpec(new_wire).to_sigbit_vector();
diff --git a/passes/cmds/xprop.cc b/passes/cmds/xprop.cc
index 186e5eec0..8b2e7ae08 100644
--- a/passes/cmds/xprop.cc
+++ b/passes/cmds/xprop.cc
@@ -828,9 +828,9 @@ struct XpropWorker
 			auto init_q_is_1 = init_q;
 			auto init_q_is_x = init_q;
 
-			for (auto &bit : init_q_is_1.bits())
+			for (auto bit : init_q_is_1)
 				bit = bit == State::S1 ? State::S1 : State::S0;
-			for (auto &bit : init_q_is_x.bits())
+			for (auto bit : init_q_is_x)
 				bit = bit == State::Sx ? State::S1 : State::S0;
 
 			initvals.remove_init(sig_q);
@@ -865,14 +865,14 @@ struct XpropWorker
 					auto init_q_is_x = init_q;
 
 					if (ff.is_anyinit) {
-						for (auto &bit : init_q_is_1.bits())
+						for (auto bit : init_q_is_1)
 							bit = State::Sx;
-						for (auto &bit : init_q_is_x.bits())
+						for (auto bit : init_q_is_x)
 							bit = State::S0;
 					} else {
-						for (auto &bit : init_q_is_1.bits())
+						for (auto bit : init_q_is_1)
 							bit = bit == State::S1 ? State::S1 : State::S0;
-						for (auto &bit : init_q_is_x.bits())
+						for (auto bit : init_q_is_x)
 							bit = bit == State::Sx ? State::S1 : State::S0;
 					}
 

From e1d0c010efffe98d127cf742791f955b95de7b21 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 03:53:05 +0000
Subject: [PATCH 523/931] Update passes/fsm to avoid bits()

---
 passes/fsm/fsm_extract.cc |  2 +-
 passes/fsm/fsm_map.cc     |  2 +-
 passes/fsm/fsm_opt.cc     | 21 ++++++++++-------
 passes/fsm/fsm_recode.cc  |  2 +-
 passes/fsm/fsmdata.h      | 49 ++++++++++++++-------------------------
 5 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/passes/fsm/fsm_extract.cc b/passes/fsm/fsm_extract.cc
index d83cff5cdc..43a797ff4 100644
--- a/passes/fsm/fsm_extract.cc
+++ b/passes/fsm/fsm_extract.cc
@@ -171,7 +171,7 @@ undef_bit_in_next_state:
 			if (tr.ctrl_in.at(it.second) == State::S1 && exclusive_ctrls.count(it.first) != 0)
 				for (auto &dc_bit : exclusive_ctrls.at(it.first))
 					if (ctrl_in_bit_indices.count(dc_bit))
-						tr.ctrl_in.bits().at(ctrl_in_bit_indices.at(dc_bit)) = RTLIL::State::Sa;
+						tr.ctrl_in.set(ctrl_in_bit_indices.at(dc_bit), RTLIL::State::Sa);
 
 		RTLIL::Const log_state_in = RTLIL::Const(RTLIL::State::Sx, fsm_data.state_bits);
 		if (state_in >= 0)
diff --git a/passes/fsm/fsm_map.cc b/passes/fsm/fsm_map.cc
index 8a18d259a..c19edcc88 100644
--- a/passes/fsm/fsm_map.cc
+++ b/passes/fsm/fsm_map.cc
@@ -176,7 +176,7 @@ static void map_fsm(RTLIL::Cell *fsm_cell, RTLIL::Module *module)
 		state_dff->type = ID($adff);
 		state_dff->parameters[ID::ARST_POLARITY] = fsm_cell->parameters[ID::ARST_POLARITY];
 		state_dff->parameters[ID::ARST_VALUE] = fsm_data.state_table[fsm_data.reset_state];
-		for (auto &bit : state_dff->parameters[ID::ARST_VALUE].bits())
+		for (auto bit : state_dff->parameters[ID::ARST_VALUE])
 			if (bit != RTLIL::State::S1)
 				bit = RTLIL::State::S0;
 		state_dff->setPort(ID::ARST, fsm_cell->getPort(ID::ARST));
diff --git a/passes/fsm/fsm_opt.cc b/passes/fsm/fsm_opt.cc
index 99771f90a..b61dec890 100644
--- a/passes/fsm/fsm_opt.cc
+++ b/passes/fsm/fsm_opt.cc
@@ -169,13 +169,16 @@ struct FsmOpt
 
 				for (auto tr : fsm_data.transition_table)
 				{
-					RTLIL::State &si = tr.ctrl_in.bits()[i];
-					RTLIL::State &sj = tr.ctrl_in.bits()[j];
+					RTLIL::State si = tr.ctrl_in[i];
+					RTLIL::State sj = tr.ctrl_in[j];
 
-					if (si > RTLIL::State::S1)
+					if (si > RTLIL::State::S1) {
 						si = sj;
-					else if (sj > RTLIL::State::S1)
+						tr.ctrl_in.set(i, si);
+					} else if (sj > RTLIL::State::S1) {
 						sj = si;
+						tr.ctrl_in.set(j, sj);
+					}
 
 					if (si == sj) {
 						RTLIL::SigSpec tmp(tr.ctrl_in);
@@ -207,8 +210,8 @@ struct FsmOpt
 
 				for (auto tr : fsm_data.transition_table)
 				{
-					RTLIL::State &si = tr.ctrl_in.bits()[i];
-					RTLIL::State &sj = tr.ctrl_out.bits()[j];
+					RTLIL::State si = tr.ctrl_in[i];
+					RTLIL::State sj = tr.ctrl_out[j];
 
 					if (si > RTLIL::State::S1 || si == sj) {
 						RTLIL::SigSpec tmp(tr.ctrl_in);
@@ -240,14 +243,14 @@ struct FsmOpt
 			RTLIL::Const other_pattern = pattern;
 
 			if (pattern[bit] == RTLIL::State::S1)
-				other_pattern.bits()[bit] = RTLIL::State::S0;
+				other_pattern.set(bit, RTLIL::State::S0);
 			else
-				other_pattern.bits()[bit] = RTLIL::State::S1;
+				other_pattern.set(bit, RTLIL::State::S1);
 
 			if (set.count(other_pattern) > 0) {
 				log("  Merging pattern %s and %s from group (%d %d %s).\n", log_signal(pattern), log_signal(other_pattern),
 						tr.state_in, tr.state_out, log_signal(tr.ctrl_out));
-				other_pattern.bits()[bit] = RTLIL::State::Sa;
+				other_pattern.set(bit, RTLIL::State::Sa);
 				new_set.insert(other_pattern);
 				did_something = true;
 				continue;
diff --git a/passes/fsm/fsm_recode.cc b/passes/fsm/fsm_recode.cc
index 8ee03329f..e4cd53a07 100644
--- a/passes/fsm/fsm_recode.cc
+++ b/passes/fsm/fsm_recode.cc
@@ -106,7 +106,7 @@ static void fsm_recode(RTLIL::Cell *cell, RTLIL::Module *module, FILE *fm_set_fs
 
 		if (encoding == "one-hot") {
 			new_code = RTLIL::Const(RTLIL::State::Sa, fsm_data.state_bits);
-			new_code.bits()[state_idx] = RTLIL::State::S1;
+			new_code.set(state_idx, RTLIL::State::S1);
 		} else
 		if (encoding == "binary") {
 			new_code = RTLIL::Const(state_idx, fsm_data.state_bits);
diff --git a/passes/fsm/fsmdata.h b/passes/fsm/fsmdata.h
index 9aa12241e..4d824e136 100644
--- a/passes/fsm/fsmdata.h
+++ b/passes/fsm/fsmdata.h
@@ -45,35 +45,27 @@ struct FsmData
 		cell->parameters[ID::STATE_NUM] = RTLIL::Const(state_table.size());
 		cell->parameters[ID::STATE_NUM_LOG2] = RTLIL::Const(state_num_log2);
 		cell->parameters[ID::STATE_RST] = RTLIL::Const(reset_state);
-		cell->parameters[ID::STATE_TABLE] = RTLIL::Const();
-
-		for (int i = 0; i < int(state_table.size()); i++) {
-			std::vector<RTLIL::State> &bits_table = cell->parameters[ID::STATE_TABLE].bits();
-			std::vector<RTLIL::State> &bits_state = state_table[i].bits();
-			bits_table.insert(bits_table.end(), bits_state.begin(), bits_state.end());
-		}
+		RTLIL::Const cell_state_table;
+		for (const RTLIL::Const &c : state_table)
+			cell_state_table.append(c);
+		cell->parameters[ID::STATE_TABLE] = std::move(cell_state_table);
 
 		cell->parameters[ID::TRANS_NUM] = RTLIL::Const(transition_table.size());
-		cell->parameters[ID::TRANS_TABLE] = RTLIL::Const();
+		RTLIL::Const cell_trans_table;
 		for (int i = 0; i < int(transition_table.size()); i++)
 		{
-			std::vector<RTLIL::State> &bits_table = cell->parameters[ID::TRANS_TABLE].bits();
 			transition_t &tr = transition_table[i];
 
 			RTLIL::Const const_state_in = RTLIL::Const(tr.state_in, state_num_log2);
 			RTLIL::Const const_state_out = RTLIL::Const(tr.state_out, state_num_log2);
-			std::vector<RTLIL::State> &bits_state_in = const_state_in.bits();
-			std::vector<RTLIL::State> &bits_state_out = const_state_out.bits();
-
-			std::vector<RTLIL::State> &bits_ctrl_in = tr.ctrl_in.bits();
-			std::vector<RTLIL::State> &bits_ctrl_out = tr.ctrl_out.bits();
 
 			// append lsb first
-			bits_table.insert(bits_table.end(), bits_ctrl_out.begin(), bits_ctrl_out.end());
-			bits_table.insert(bits_table.end(), bits_state_out.begin(), bits_state_out.end());
-			bits_table.insert(bits_table.end(), bits_ctrl_in.begin(), bits_ctrl_in.end());
-			bits_table.insert(bits_table.end(), bits_state_in.begin(), bits_state_in.end());
+			cell_trans_table.append(tr.ctrl_out);
+			cell_trans_table.append(const_state_out);
+			cell_trans_table.append(tr.ctrl_in);
+			cell_trans_table.append(const_state_in);
 		}
+		cell->parameters[ID::TRANS_TABLE] = std::move(cell_trans_table);
 	}
 
 	void copy_from_cell(RTLIL::Cell *cell)
@@ -95,25 +87,18 @@ struct FsmData
 		const RTLIL::Const &trans_table = cell->parameters[ID::TRANS_TABLE];
 
 		for (int i = 0; i < state_num; i++) {
-			RTLIL::Const state_code;
-			int off_begin = i*state_bits, off_end = off_begin + state_bits;
-			state_code.bits().insert(state_code.bits().begin(), state_table.begin()+off_begin, state_table.begin()+off_end);
+			int off_begin = i*state_bits;
+			RTLIL::Const state_code = state_table.extract(off_begin, state_bits);
 			this->state_table.push_back(state_code);
 		}
 
 		for (int i = 0; i < trans_num; i++)
 		{
-			auto off_ctrl_out = trans_table.begin() + i*(num_inputs+num_outputs+2*state_num_log2);
-			auto off_state_out = off_ctrl_out + num_outputs;
-			auto off_ctrl_in = off_state_out + state_num_log2;
-			auto off_state_in = off_ctrl_in + num_inputs;
-			auto off_end = off_state_in + state_num_log2;
-
-			RTLIL::Const state_in, state_out, ctrl_in, ctrl_out;
-			ctrl_out.bits().insert(ctrl_out.bits().begin(), off_ctrl_out, off_state_out);
-			state_out.bits().insert(state_out.bits().begin(), off_state_out, off_ctrl_in);
-			ctrl_in.bits().insert(ctrl_in.bits().begin(), off_ctrl_in, off_state_in);
-			state_in.bits().insert(state_in.bits().begin(), off_state_in, off_end);
+			int base_offset = i*(num_inputs+num_outputs+2*state_num_log2);
+			RTLIL::Const ctrl_out = trans_table.extract(base_offset, num_outputs);
+			RTLIL::Const state_out = trans_table.extract(base_offset + num_outputs, state_num_log2);
+			RTLIL::Const ctrl_in = trans_table.extract(base_offset + num_outputs + state_num_log2, num_inputs);
+			RTLIL::Const state_in = trans_table.extract(base_offset + num_outputs + state_num_log2 + num_inputs, state_num_log2);
 
 			transition_t tr;
 			tr.state_in = state_in.as_int();

From 23f196a3b894c28927c244ac0c2160830ab1f1e5 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 03:53:14 +0000
Subject: [PATCH 524/931] Update passes/memory to avoid bits()

---
 passes/memory/memory_bram.cc  | 10 +++++-----
 passes/memory/memory_share.cc |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/passes/memory/memory_bram.cc b/passes/memory/memory_bram.cc
index 8ef2c4271..10301b44a 100644
--- a/passes/memory/memory_bram.cc
+++ b/passes/memory/memory_bram.cc
@@ -848,9 +848,9 @@ grow_read_ports:;
 		for (int i = 0; i < mem.width; i++)
 			if (shuffle_map[i] != -1) {
 				module->connect(port.data[shuffle_map[i]], new_data[i]);
-				new_init_value.bits()[i] = port.init_value[shuffle_map[i]];
-				new_arst_value.bits()[i] = port.arst_value[shuffle_map[i]];
-				new_srst_value.bits()[i] = port.srst_value[shuffle_map[i]];
+				new_init_value.set(i, port.init_value[shuffle_map[i]]);
+				new_arst_value.set(i, port.arst_value[shuffle_map[i]]);
+				new_srst_value.set(i, port.srst_value[shuffle_map[i]]);
 			}
 		port.data = new_data;
 		port.init_value = new_init_value;
@@ -887,9 +887,9 @@ grow_read_ports:;
 				for (int i = 0; i < init_size; i++)
 					for (int j = 0; j < bram.dbits; j++)
 						if (init_offset+i < GetSize(initdata) && init_offset+i >= 0)
-							initparam.bits()[i*bram.dbits+j] = initdata[init_offset+i][init_shift+j];
+							initparam.set(i*bram.dbits+j, initdata[init_offset+i][init_shift+j]);
 						else
-							initparam.bits()[i*bram.dbits+j] = State::Sx;
+							initparam.set(i*bram.dbits+j, State::Sx);
 				c->setParam(ID::INIT, initparam);
 			}
 
diff --git a/passes/memory/memory_share.cc b/passes/memory/memory_share.cc
index 6a424952a..fe884772a 100644
--- a/passes/memory/memory_share.cc
+++ b/passes/memory/memory_share.cc
@@ -60,16 +60,17 @@ struct MemoryShareWorker
 	bool merge_rst_value(Mem &mem, Const &res, int wide_log2, const Const &src1, int sub1, const Const &src2, int sub2) {
 		res = Const(State::Sx, mem.width << wide_log2);
 		for (int i = 0; i < GetSize(src1); i++)
-			res.bits()[i + sub1 * mem.width] = src1[i];
+			res.set(i + sub1 * mem.width, src1[i]);
 		for (int i = 0; i < GetSize(src2); i++) {
 			if (src2[i] == State::Sx)
 				continue;
-			auto &dst = res.bits()[i + sub2 * mem.width];
+			int idx = i + sub2 * mem.width;
+			RTLIL::State dst = res[idx];
 			if (dst == src2[i])
 				continue;
 			if (dst != State::Sx)
 				return false;
-			dst = src2[i];
+			res.set(idx, src2[i]);
 		}
 		return true;
 	}

From 5600eb2e5b2640c7966230c7e6cc0e7be454d1b3 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 03:53:23 +0000
Subject: [PATCH 525/931] Update passes/opt to avoid bits()

---
 passes/opt/opt_clean.cc   |  6 +++---
 passes/opt/opt_dff.cc     | 22 +++++++++++++---------
 passes/opt/opt_expr.cc    |  4 ++--
 passes/opt/opt_ffinv.cc   | 15 ++++++++-------
 passes/opt/opt_lut.cc     |  2 +-
 passes/opt/opt_lut_ins.cc |  2 +-
 passes/opt/opt_mem.cc     | 30 +++++++++++++++---------------
 passes/opt/pmux2shiftx.cc | 16 +++++++++-------
 passes/opt/share.cc       | 26 +++++++++++++++++---------
 passes/opt/wreduce.cc     |  4 ++--
 10 files changed, 71 insertions(+), 56 deletions(-)

diff --git a/passes/opt/opt_clean.cc b/passes/opt/opt_clean.cc
index 4dd5ba616..cef2c0dc3 100644
--- a/passes/opt/opt_clean.cc
+++ b/passes/opt/opt_clean.cc
@@ -406,7 +406,7 @@ bool rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos
 		for (int i = 0; i < wire->width; i++) {
 			auto it = init_bits.find(RTLIL::SigBit(wire, i));
 			if (it != init_bits.end()) {
-				val.bits()[i] = it->second;
+				val.set(i, it->second);
 				found = true;
 			}
 		}
@@ -425,7 +425,7 @@ bool rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos
 		if (wire->attributes.count(ID::init))
 			initval = wire->attributes.at(ID::init);
 		if (GetSize(initval) != GetSize(wire))
-			initval.bits().resize(GetSize(wire), State::Sx);
+			initval.resize(GetSize(wire), State::Sx);
 		if (initval.is_fully_undef())
 			wire->attributes.erase(ID::init);
 
@@ -457,7 +457,7 @@ bool rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos
 				if (s1[i] != s2[i]) {
 					if (s2[i] == State::Sx && (initval[i] == State::S0 || initval[i] == State::S1)) {
 						s2[i] = initval[i];
-						initval.bits()[i] = State::Sx;
+						initval.set(i, State::Sx);
 					}
 					new_conn.first.append(s1[i]);
 					new_conn.second.append(s2[i]);
diff --git a/passes/opt/opt_dff.cc b/passes/opt/opt_dff.cc
index 2fb0f947f..a364539e4 100644
--- a/passes/opt/opt_dff.cc
+++ b/passes/opt/opt_dff.cc
@@ -405,27 +405,29 @@ struct OptDffWorker
 				} else if (ff.pol_clr == ff.pol_set) {
 					// Try a more complex conversion to plain async reset.
 					State val_neutral = ff.pol_set ? State::S0 : State::S1;
-					Const val_arst;
 					SigBit sig_arst;
 					if (ff.sig_clr[0] == val_neutral)
 						sig_arst = ff.sig_set[0];
 					else
 						sig_arst = ff.sig_clr[0];
 					bool failed = false;
+					Const::Builder val_arst_builder(ff.width);
 					for (int i = 0; i < ff.width; i++) {
 						if (ff.sig_clr[i] == sig_arst && ff.sig_set[i] == val_neutral)
-							val_arst.bits().push_back(State::S0);
+							val_arst_builder.push_back(State::S0);
 						else if (ff.sig_set[i] == sig_arst && ff.sig_clr[i] == val_neutral)
-							val_arst.bits().push_back(State::S1);
-						else
+							val_arst_builder.push_back(State::S1);
+						else {
 							failed = true;
+							break;
+						}
 					}
 					if (!failed) {
 						log("Converting CLR/SET to ARST on %s (%s) from module %s.\n",
 								log_id(cell), log_id(cell->type), log_id(module));
 						ff.has_sr = false;
 						ff.has_arst = true;
-						ff.val_arst = val_arst;
+						ff.val_arst = val_arst_builder.build();
 						ff.sig_arst = sig_arst;
 						ff.pol_arst = ff.pol_clr;
 						changed = true;
@@ -637,7 +639,7 @@ struct OptDffWorker
 					// Try to merge sync resets.
 					std::map<ctrls_t, std::vector<int>> groups;
 					std::vector<int> remaining_indices;
-					Const val_srst;
+					Const::Builder val_srst_builder(ff.width);
 
 					for (int i = 0 ; i < ff.width; i++) {
 						ctrls_t resets;
@@ -679,16 +681,18 @@ struct OptDffWorker
 							groups[resets].push_back(i);
 						} else
 							remaining_indices.push_back(i);
-						val_srst.bits().push_back(reset_val);
+						val_srst_builder.push_back(reset_val);
 					}
+					Const val_srst = val_srst_builder.build();
 
 					for (auto &it : groups) {
 						FfData new_ff = ff.slice(it.second);
-						new_ff.val_srst = Const();
+						Const::Builder new_val_srst_builder(new_ff.width);
 						for (int i = 0; i < new_ff.width; i++) {
 							int j = it.second[i];
-							new_ff.val_srst.bits().push_back(val_srst[j]);
+							new_val_srst_builder.push_back(val_srst[j]);
 						}
+						new_ff.val_srst = new_val_srst_builder.build();
 						ctrl_t srst = combine_resets(it.first, ff.is_fine);
 
 						new_ff.has_srst = true;
diff --git a/passes/opt/opt_expr.cc b/passes/opt/opt_expr.cc
index e5957df08..86d96ea7a 100644
--- a/passes/opt/opt_expr.cc
+++ b/passes/opt/opt_expr.cc
@@ -83,7 +83,7 @@ void replace_undriven(RTLIL::Module *module, const CellTypes &ct)
 			auto cursor = initbits.find(bit);
 			if (cursor != initbits.end()) {
 				revisit_initwires.insert(cursor->second.first);
-				val.bits()[i] = cursor->second.second;
+				val.set(i, cursor->second.second);
 			}
 		}
 
@@ -101,7 +101,7 @@ void replace_undriven(RTLIL::Module *module, const CellTypes &ct)
 			Const initval = wire->attributes.at(ID::init);
 			for (int i = 0; i < GetSize(initval) && i < GetSize(wire); i++) {
 				if (SigBit(initval[i]) == sig[i])
-					initval.bits()[i] = State::Sx;
+					initval.set(i, State::Sx);
 			}
 			if (initval.is_fully_undef()) {
 				log_debug("Removing init attribute from %s/%s.\n", log_id(module), log_id(wire));
diff --git a/passes/opt/opt_ffinv.cc b/passes/opt/opt_ffinv.cc
index 52e180a20..882221e56 100644
--- a/passes/opt/opt_ffinv.cc
+++ b/passes/opt/opt_ffinv.cc
@@ -96,10 +96,10 @@ struct OptFfInvWorker
 					}
 				}
 				Const mask = lut->getParam(ID::LUT);
-				Const new_mask;
-				for (int j = 0; j < (1 << GetSize(sig_a)); j++) {
-					new_mask.bits().push_back(mask[j ^ flip_mask]);
-				}
+				Const::Builder new_mask_builder(1 << GetSize(sig_a));
+				for (int j = 0; j < (1 << GetSize(sig_a)); j++)
+					new_mask_builder.push_back(mask[j ^ flip_mask]);
+				Const new_mask = new_mask_builder.build();
 				if (GetSize(sig_a) == 1 && new_mask.as_int() == 2) {
 					module->connect(lut->getPort(ID::Y), ff.sig_q);
 					module->remove(lut);
@@ -178,13 +178,14 @@ struct OptFfInvWorker
 
 		if (d_lut->type == ID($lut)) {
 			Const mask = d_lut->getParam(ID::LUT);
-			Const new_mask;
+			Const::Builder new_mask_builder(GetSize(mask));
 			for (int i = 0; i < GetSize(mask); i++) {
 				if (mask[i] == State::S0)
-					new_mask.bits().push_back(State::S1);
+					new_mask_builder.push_back(State::S1);
 				else
-					new_mask.bits().push_back(State::S0);
+					new_mask_builder.push_back(State::S0);
 			}
+			Const new_mask = new_mask_builder.build();
 			d_lut->setParam(ID::LUT, new_mask);
 			if (d_lut->getParam(ID::WIDTH) == 1 && new_mask.as_int() == 2) {
 				module->connect(ff.sig_d, d_lut->getPort(ID::A));
diff --git a/passes/opt/opt_lut.cc b/passes/opt/opt_lut.cc
index 97147fc48..248c3dfe9 100644
--- a/passes/opt/opt_lut.cc
+++ b/passes/opt/opt_lut.cc
@@ -493,7 +493,7 @@ struct OptLutWorker
 							eval_inputs[lutM_new_inputs[i]] = (eval >> i) & 1;
 						}
 						eval_inputs[lutA_output] = evaluate_lut(lutA, eval_inputs);
-						lutM_new_table.bits()[eval] = (RTLIL::State) evaluate_lut(lutB, eval_inputs);
+						lutM_new_table.set(eval, (RTLIL::State) evaluate_lut(lutB, eval_inputs));
 					}
 
 					log_debug("  Cell A truth table: %s.\n", lutA->getParam(ID::LUT).as_string().c_str());
diff --git a/passes/opt/opt_lut_ins.cc b/passes/opt/opt_lut_ins.cc
index 492676ece..9e471c3de 100644
--- a/passes/opt/opt_lut_ins.cc
+++ b/passes/opt/opt_lut_ins.cc
@@ -213,7 +213,7 @@ struct OptLutInsPass : public Pass {
 						}
 						lidx |= val << j;
 					}
-					new_lut.bits()[i] = lut[lidx];
+					new_lut.set(i, lut[lidx]);
 				}
 				// For lattice, and gowin do not replace with a const driver — the nextpnr
 				// packer requires a complete set of LUTs for wide LUT muxes.
diff --git a/passes/opt/opt_mem.cc b/passes/opt/opt_mem.cc
index f8354c960..9c5a6d83e 100644
--- a/passes/opt/opt_mem.cc
+++ b/passes/opt/opt_mem.cc
@@ -175,36 +175,36 @@ struct OptMemPass : public Pass {
 					}
 					for (auto &port: mem.rd_ports) {
 						SigSpec new_data;
-						Const new_init;
-						Const new_arst;
-						Const new_srst;
+						Const::Builder new_init_bits;
+						Const::Builder new_arst_bits;
+						Const::Builder new_srst_bits;
 						for (int sub = 0; sub < (1 << port.wide_log2); sub++) {
 							for (auto i: swizzle) {
 								int bidx = sub * mem.width + i;
 								new_data.append(port.data[bidx]);
-								new_init.bits().push_back(port.init_value[bidx]);
-								new_arst.bits().push_back(port.arst_value[bidx]);
-								new_srst.bits().push_back(port.srst_value[bidx]);
+								new_init_bits.push_back(port.init_value[bidx]);
+								new_arst_bits.push_back(port.arst_value[bidx]);
+								new_srst_bits.push_back(port.srst_value[bidx]);
 							}
 						}
 						port.data = new_data;
-						port.init_value = new_init;
-						port.arst_value = new_arst;
-						port.srst_value = new_srst;
+						port.init_value = new_init_bits.build();
+						port.arst_value = new_arst_bits.build();
+						port.srst_value = new_srst_bits.build();
 					}
 					for (auto &init: mem.inits) {
-						Const new_data;
-						Const new_en;
+						Const::Builder new_data_bits;
 						for (int s = 0; s < GetSize(init.data); s += mem.width) {
 							for (auto i: swizzle) {
-								new_data.bits().push_back(init.data[s + i]);
+								new_data_bits.push_back(init.data[s + i]);
 							}
 						}
+						init.data = new_data_bits.build();
+						Const::Builder new_en_bits;
 						for (auto i: swizzle) {
-							new_en.bits().push_back(init.en[i]);
+							new_en_bits.push_back(init.en[i]);
 						}
-						init.data = new_data;
-						init.en = new_en;
+						init.en = new_en_bits.build();
 					}
 					mem.width = GetSize(swizzle);
 					changed = true;
diff --git a/passes/opt/pmux2shiftx.cc b/passes/opt/pmux2shiftx.cc
index e512a5be1..4a0864df0 100644
--- a/passes/opt/pmux2shiftx.cc
+++ b/passes/opt/pmux2shiftx.cc
@@ -321,11 +321,12 @@ struct Pmux2ShiftxPass : public Pass {
 
 					bits.sort();
 					pair<SigSpec, Const> entry;
-
+					RTLIL::Const::Builder entry_bits_builder(GetSize(bits));
 					for (auto it : bits) {
 						entry.first.append(it.first);
-						entry.second.bits().push_back(it.second);
+						entry_bits_builder.push_back(it.second);
 					}
+					entry.second = entry_bits_builder.build();
 
 					eqdb[sigmap(cell->getPort(ID::Y)[0])] = entry;
 					goto next_cell;
@@ -342,11 +343,12 @@ struct Pmux2ShiftxPass : public Pass {
 
 					bits.sort();
 					pair<SigSpec, Const> entry;
-
+					RTLIL::Const::Builder entry_bits_builder(GetSize(bits));
 					for (auto it : bits) {
 						entry.first.append(it.first);
-						entry.second.bits().push_back(it.second);
+						entry_bits_builder.push_back(it.second);
 					}
+					entry.second = entry_bits_builder.build();
 
 					eqdb[sigmap(cell->getPort(ID::Y)[0])] = entry;
 					goto next_cell;
@@ -591,7 +593,7 @@ struct Pmux2ShiftxPass : public Pass {
 
 							used_src_columns[best_src_col] = true;
 							perm_new_from_old[dst_col] = best_src_col;
-							perm_xormask.bits()[dst_col] = best_inv ? State::S1 : State::S0;
+							perm_xormask.set(dst_col, best_inv ? State::S1 : State::S0);
 						}
 					}
 
@@ -614,7 +616,7 @@ struct Pmux2ShiftxPass : public Pass {
 						Const new_c(State::S0, GetSize(old_c));
 
 						for (int i = 0; i < GetSize(old_c); i++)
-							new_c.bits()[i] = old_c[perm_new_from_old[i]];
+							new_c.set(i, old_c[perm_new_from_old[i]]);
 
 						Const new_c_before_xor = new_c;
 						new_c = const_xor(new_c, perm_xormask, false, false, GetSize(new_c));
@@ -687,7 +689,7 @@ struct Pmux2ShiftxPass : public Pass {
 					if (!full_case) {
 						Const enable_mask(State::S0, max_choice+1);
 						for (auto &it : perm_choices)
-							enable_mask.bits()[it.first.as_int()] = State::S1;
+							enable_mask.set(it.first.as_int(), State::S1);
 						en = module->addWire(NEW_ID);
 						module->addShift(NEW_ID, enable_mask, cmp, en, false, src);
 					}
diff --git a/passes/opt/share.cc b/passes/opt/share.cc
index 1d7ba7d98..307cd299b 100644
--- a/passes/opt/share.cc
+++ b/passes/opt/share.cc
@@ -790,12 +790,13 @@ struct ShareWorker
 		}
 
 		p.first = RTLIL::SigSpec();
-		p.second.bits().clear();
 
+		RTLIL::Const::Builder new_bits(p_bits.size());
 		for (auto &it : p_bits) {
 			p.first.append(it.first);
-			p.second.bits().push_back(it.second);
+			new_bits.push_back(it.second);
 		}
+		p.second = new_bits.build();
 
 		return true;
 	}
@@ -818,9 +819,9 @@ struct ShareWorker
 				auto otherval = val;
 
 				if (otherval[i] == State::S0)
-					otherval.bits()[i] = State::S1;
+					otherval.set(i, State::S1);
 				else if (otherval[i] == State::S1)
-					otherval.bits()[i] = State::S0;
+					otherval.set(i, State::S0);
 				else
 					continue;
 
@@ -829,8 +830,11 @@ struct ShareWorker
 					auto newsig = sig;
 					newsig.remove(i);
 
-					auto newval = val;
-					newval.bits().erase(newval.bits().begin() + i);
+					RTLIL::Const::Builder new_bits(val.size() - 1);
+					for (int j = 0; j < val.size(); ++j)
+						if (j != i)
+							new_bits.push_back(val[j]);
+					RTLIL::Const newval = new_bits.build();
 
 					db[newsig].insert(newval);
 					db[sig].erase(otherval);
@@ -926,7 +930,8 @@ struct ShareWorker
 			if (used_in_a)
 				for (auto p : c_patterns) {
 					for (int i = 0; i < GetSize(sig_s); i++)
-						p.first.append(sig_s[i]), p.second.bits().push_back(RTLIL::State::S0);
+						p.first.append(sig_s[i]);
+					p.second.append(RTLIL::Const(RTLIL::State::S0, GetSize(sig_s)));
 					if (sort_check_activation_pattern(p))
 						if (!insert_capped(activation_patterns_cache[cell], p)) {
 							recursion_state.erase(cell);
@@ -936,7 +941,8 @@ struct ShareWorker
 
 			for (int idx : used_in_b_parts)
 				for (auto p : c_patterns) {
-					p.first.append(sig_s[idx]), p.second.bits().push_back(RTLIL::State::S1);
+					p.first.append(sig_s[idx]);
+					p.second.append(RTLIL::Const(RTLIL::State::S1));
 					if (sort_check_activation_pattern(p))
 					if (!insert_capped(activation_patterns_cache[cell], p)) {
 						recursion_state.erase(cell);
@@ -989,12 +995,14 @@ struct ShareWorker
 		{
 			std::vector<RTLIL::SigBit> p_first = p.first;
 			ssc_pair_t new_p;
+			RTLIL::Const::Builder new_p_second_bits;
 
 			for (int i = 0; i < GetSize(p_first); i++)
 				if (filter_bits.count(p_first[i]) == 0) {
 					new_p.first.append(p_first[i]);
-					new_p.second.bits().push_back(p.second.at(i));
+					new_p_second_bits.push_back(p.second.at(i));
 				}
+			new_p.second = new_p_second_bits.build();
 
 			out.insert(new_p);
 		}
diff --git a/passes/opt/wreduce.cc b/passes/opt/wreduce.cc
index fb30f0195..359c76d42 100644
--- a/passes/opt/wreduce.cc
+++ b/passes/opt/wreduce.cc
@@ -220,10 +220,10 @@ struct WreduceWorker
 
 		// Narrow ARST_VALUE parameter to new size.
 		if (cell->parameters.count(ID::ARST_VALUE)) {
-			rst_value.bits().resize(GetSize(sig_q));
+			rst_value.resize(GetSize(sig_q), State::S0);
 			cell->setParam(ID::ARST_VALUE, rst_value);
 		} else if (cell->parameters.count(ID::SRST_VALUE)) {
-			rst_value.bits().resize(GetSize(sig_q));
+			rst_value.resize(GetSize(sig_q), State::S0);
 			cell->setParam(ID::SRST_VALUE, rst_value);
 		}
 

From 2d5ce8c363ff342f25dfe582318c193b2886f0f0 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 03:53:34 +0000
Subject: [PATCH 526/931] Update passes/proc to avoid bits()

---
 passes/proc/proc_init.cc  | 12 +++++-------
 passes/proc/proc_memwr.cc |  2 +-
 passes/proc/proc_rom.cc   | 12 ++++++------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/passes/proc/proc_init.cc b/passes/proc/proc_init.cc
index 99cacf5fd..3d27eaa9a 100644
--- a/passes/proc/proc_init.cc
+++ b/passes/proc/proc_init.cc
@@ -52,17 +52,15 @@ void proc_init(RTLIL::Module *mod, SigMap &sigmap, RTLIL::Process *proc)
 
 						Const value = valuesig.as_const();
 						Const &wireinit = lhs_c.wire->attributes[ID::init];
-
-						while (GetSize(wireinit) < lhs_c.wire->width)
-							wireinit.bits().push_back(State::Sx);
-
+						if (GetSize(wireinit) < lhs_c.wire->width)
+							wireinit.resize(lhs_c.wire->width, State::Sx);
 						for (int i = 0; i < lhs_c.width; i++) {
-							auto &initbit = wireinit.bits()[i + lhs_c.offset];
+							int index = i + lhs_c.offset;
+							State initbit = wireinit[index];
 							if (initbit != State::Sx && initbit != value[i])
 								log_cmd_error("Conflicting initialization values for %s.\n", log_signal(lhs_c));
-							initbit = value[i];
+							wireinit.set(index, value[i]);
 						}
-
 						log("  Set init value: %s = %s\n", log_signal(lhs_c.wire), log_signal(wireinit));
 					}
 					offset += lhs_c.width;
diff --git a/passes/proc/proc_memwr.cc b/passes/proc/proc_memwr.cc
index 88aea39bb..a5ae0d6d5 100644
--- a/passes/proc/proc_memwr.cc
+++ b/passes/proc/proc_memwr.cc
@@ -39,7 +39,7 @@ void proc_memwr(RTLIL::Module *mod, RTLIL::Process *proc, dict<IdString, int> &n
 			Const priority_mask(State::S0, port_id);
 			for (int i = 0; i < GetSize(prev_port_ids); i++)
 				if (memwr.priority_mask[i] == State::S1)
-					priority_mask.bits()[prev_port_ids[i]] = State::S1;
+					priority_mask.set(prev_port_ids[i], State::S1);
 			prev_port_ids.push_back(port_id);
 
 			RTLIL::Cell *cell = mod->addCell(NEW_ID, ID($memwr_v2));
diff --git a/passes/proc/proc_rom.cc b/passes/proc/proc_rom.cc
index d3b781e60..a7b485194 100644
--- a/passes/proc/proc_rom.cc
+++ b/passes/proc/proc_rom.cc
@@ -97,7 +97,7 @@ struct RomWorker
 						log_debug("rejecting switch: lhs not uniform\n");
 						return;
 					}
-					val.bits()[it2->second] = it.second[i].data;
+					val.set(it2->second, it.second[i].data);
 				}
 			}
 			for (auto bit: val) {
@@ -114,7 +114,7 @@ struct RomWorker
 				}
 				Const c = addr.as_const();
 				while (GetSize(c) && c.back() == State::S0)
-					c.bits().pop_back();
+					c.resize(c.size() - 1, State::S0);
 				if (GetSize(c) > swsigbits)
 					continue;
 				if (GetSize(c) > 30) {
@@ -155,22 +155,22 @@ struct RomWorker
 		Mem mem(module, NEW_ID, GetSize(lhs), 0, 1 << abits);
 		mem.attributes = sw->attributes;
 
-		Const init_data;
+		Const::Builder builder(mem.size * GetSize(lhs));
 		for (int i = 0; i < mem.size; i++) {
 			auto it = vals.find(i);
 			if (it == vals.end()) {
 				log_assert(got_default);
 				for (auto bit: default_val)
-					init_data.bits().push_back(bit);
+					builder.push_back(bit);
 			} else {
 				for (auto bit: it->second)
-					init_data.bits().push_back(bit);
+					builder.push_back(bit);
 			}
 		}
 
 		MemInit init;
 		init.addr = 0;
-		init.data = init_data;
+		init.data = builder.build();
 		init.en = Const(State::S1, GetSize(lhs));
 		mem.inits.push_back(std::move(init));
 

From d1642bf510e02bdcff4acca738a6e459c3662f59 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 03:53:42 +0000
Subject: [PATCH 527/931] Update passes/sat to avoid bits()

---
 passes/sat/eval.cc     |  4 ++--
 passes/sat/formalff.cc |  2 +-
 passes/sat/sat.cc      | 29 ++++++++++++++++++-----------
 passes/sat/sim.cc      | 32 ++++++++++++++------------------
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/passes/sat/eval.cc b/passes/sat/eval.cc
index bde5e1ecb..f71e8124b 100644
--- a/passes/sat/eval.cc
+++ b/passes/sat/eval.cc
@@ -256,7 +256,7 @@ struct VlogHammerReporter
 					for (int j = input_widths[i]-1; j >= 0; j--) {
 						ce.set(RTLIL::SigSpec(wire, j), bits.back());
 						recorded_set_vars.append(RTLIL::SigSpec(wire, j));
-						recorded_set_vals.bits().push_back(bits.back());
+						recorded_set_vars.append(RTLIL::Const(bits.back()));
 						bits.pop_back();
 					}
 					if (module == modules.front()) {
@@ -346,7 +346,7 @@ struct VlogHammerReporter
 				log_error("Pattern %s is to short!\n", pattern);
 			patterns.push_back(sig.as_const());
 			if (invert_pattern) {
-				for (auto &bit : patterns.back().bits())
+				for (auto bit : patterns.back())
 					if (bit == RTLIL::State::S0)
 						bit = RTLIL::State::S1;
 					else if (bit == RTLIL::State::S1)
diff --git a/passes/sat/formalff.cc b/passes/sat/formalff.cc
index 286bf2976..c0b0cfc15 100644
--- a/passes/sat/formalff.cc
+++ b/passes/sat/formalff.cc
@@ -851,7 +851,7 @@ struct FormalFfPass : public Pass {
 						auto before = ff.val_init;
 						for (int i = 0; i < ff.width; i++)
 							if (ff.val_init[i] == State::Sx && !worker.is_initval_used(ff.sig_q[i]))
-								ff.val_init.bits()[i] = State::S0;
+								ff.val_init.set(i, State::S0);
 
 						if (ff.val_init != before) {
 							log("Setting unused undefined initial value of %s.%s (%s) from %s to %s\n",
diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc
index 967cb0472..5216390da 100644
--- a/passes/sat/sat.cc
+++ b/passes/sat/sat.cc
@@ -620,14 +620,18 @@ struct SatHelper
 		int last_timestep = -2;
 		for (auto &info : modelInfo)
 		{
-			RTLIL::Const value;
 			bool found_undef = false;
 
+			RTLIL::Const::Builder value_builder(info.width);
 			for (int i = 0; i < info.width; i++) {
-				value.bits().push_back(modelValues.at(info.offset+i) ? RTLIL::State::S1 : RTLIL::State::S0);
-				if (enable_undef && modelValues.at(modelExpressions.size()/2 + info.offset + i))
-					value.bits().back() = RTLIL::State::Sx, found_undef = true;
+				RTLIL::State bit = modelValues.at(info.offset+i) ? RTLIL::State::S1 : RTLIL::State::S0;
+				if (enable_undef && modelValues.at(modelExpressions.size()/2 + info.offset + i)) {
+					bit = RTLIL::State::Sx;
+					found_undef = true;
+				}
+				value_builder.push_back(bit);
 			}
+			RTLIL::Const value = value_builder.build();
 
 			if (info.timestep != last_timestep) {
 				const char *hline = "---------------------------------------------------------------------------------------------------"
@@ -732,13 +736,14 @@ struct SatHelper
 		int last_timestep = -2;
 		for (auto &info : modelInfo)
 		{
-			RTLIL::Const value;
-
+			RTLIL::Const::Builder value_builder(info.width);
 			for (int i = 0; i < info.width; i++) {
-				value.bits().push_back(modelValues.at(info.offset+i) ? RTLIL::State::S1 : RTLIL::State::S0);
+				RTLIL::State bit = modelValues.at(info.offset+i) ? RTLIL::State::S1 : RTLIL::State::S0;
 				if (enable_undef && modelValues.at(modelExpressions.size()/2 + info.offset + i))
-					value.bits().back() = RTLIL::State::Sx;
+					bit = RTLIL::State::Sx;
+				value_builder.push_back(bit);
 			}
+			RTLIL::Const value = value_builder.build();
 
 			if (info.timestep != last_timestep) {
 				if(last_timestep == 0)
@@ -779,12 +784,14 @@ struct SatHelper
 
 		for (auto &info : modelInfo)
 		{
-			Const value;
+			RTLIL::Const::Builder value_builder(info.width);
 			for (int i = 0; i < info.width; i++) {
-				value.bits().push_back(modelValues.at(info.offset+i) ? RTLIL::State::S1 : RTLIL::State::S0);
+				RTLIL::State bit = modelValues.at(info.offset+i) ? RTLIL::State::S1 : RTLIL::State::S0;
 				if (enable_undef && modelValues.at(modelExpressions.size()/2 + info.offset + i))
-					value.bits().back() = RTLIL::State::Sx;
+					bit = RTLIL::State::Sx;
+				value_builder.push_back(bit);
 			}
+			Const value = value_builder.build();
 
 			wavedata[info.description].first = info.width;
 			wavedata[info.description].second[info.timestep] = value;
diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index 0510bc7df..aadea328f 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -127,16 +127,11 @@ struct SimShared
 	bool initstate = true;
 };
 
-void zinit(State &v)
-{
-	if (v != State::S1)
-		v = State::S0;
-}
-
 void zinit(Const &v)
 {
-	for (auto &bit : v.bits())
-		zinit(bit);
+	for (auto bit : v)
+		if (bit != State::S1)
+			bit = State::S0;
 }
 
 struct SimInstance
@@ -419,16 +414,17 @@ struct SimInstance
 
 	Const get_state(SigSpec sig)
 	{
-		Const value;
+		Const::Builder builder(GetSize(sig));
 
 		for (auto bit : sigmap(sig))
 			if (bit.wire == nullptr)
-				value.bits().push_back(bit.data);
+				builder.push_back(bit.data);
 			else if (state_nets.count(bit))
-				value.bits().push_back(state_nets.at(bit));
+				builder.push_back(state_nets.at(bit));
 			else
-				value.bits().push_back(State::Sz);
+				builder.push_back(State::Sz);
 
+		Const value = builder.build();
 		if (shared->debug)
 			log("[%s] get %s: %s\n", hiername(), log_signal(sig), log_signal(value));
 		return value;
@@ -488,7 +484,7 @@ struct SimInstance
 		for (int i = 0; i < GetSize(data); i++)
 			if (0 <= i+offset && i+offset < state.mem->size * state.mem->width && data[i] != State::Sa)
 				if (state.data[i+offset] != data[i])
-					dirty = true, state.data.bits()[i+offset] = data[i];
+					dirty = true, state.data.set(i+offset, data[i]);
 
 		if (dirty)
 			dirty_memories.insert(memid);
@@ -500,7 +496,7 @@ struct SimInstance
 		if (offset >= state.mem->size * state.mem->width)
 			log_error("Addressing out of bounds bit %d/%d of memory %s\n", offset, state.mem->size * state.mem->width, log_id(memid));
 		if (state.data[offset] != data) {
-			state.data.bits()[offset] = data;
+			state.data.set(offset, data);
 			dirty_memories.insert(memid);
 		}
 	}
@@ -717,10 +713,10 @@ struct SimInstance
 
 				for(int i=0;i<ff.past_d.size();i++) {
 					if (current_clr[i] == (ff_data.pol_clr ? State::S1 : State::S0)) {
-						current_q.bits()[i] = State::S0;
+						current_q.set(i, State::S0);
 					}
 					else if (current_set[i] == (ff_data.pol_set ? State::S1 : State::S0)) {
-						current_q.bits()[i] = State::S1;
+						current_q.set(i, State::S1);
 					}
 				}
 			}
@@ -770,7 +766,7 @@ struct SimInstance
 					if (index >= 0 && index < mem.size)
 						for (int i = 0; i < (mem.width << port.wide_log2); i++)
 							if (enable[i] == State::S1 && mdb.data.at(index*mem.width+i) != data[i]) {
-								mdb.data.bits().at(index*mem.width+i) = data[i];
+								mdb.data.set(index*mem.width+i, data[i]);
 								dirty_memories.insert(mem.memid);
 								did_something = true;
 							}
@@ -971,7 +967,7 @@ struct SimInstance
 				if (w->attributes.count(ID::init) == 0)
 					w->attributes[ID::init] = Const(State::Sx, GetSize(w));
 
-				w->attributes[ID::init].bits()[sig_q[i].offset] = initval[i];
+				w->attributes[ID::init].set(sig_q[i].offset, initval[i]);
 			}
 		}
 

From 8cc86b264355a35c210660d1bb29a0ab0dba23bc Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 03:53:51 +0000
Subject: [PATCH 528/931] Update passes/techmap to avoid bits()

---
 passes/techmap/abc9_ops.cc    | 11 +++++++----
 passes/techmap/dffinit.cc     |  6 +++---
 passes/techmap/dfflegalize.cc |  8 ++++----
 passes/techmap/flowmap.cc     |  2 +-
 passes/techmap/techmap.cc     |  9 +++++----
 passes/techmap/zinit.cc       |  2 +-
 6 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index 91149ac55..069b94204 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -1216,7 +1216,7 @@ void reintegrate(RTLIL::Module *module, bool dff_mode)
 			auto Qi = initmap(Q);
 			auto it = Qi.wire->attributes.find(ID::init);
 			if (it != Qi.wire->attributes.end())
-				it->second.bits()[Qi.offset] = State::Sx;
+				it->second.set(Qi.offset, State::Sx);
 		}
 		else if (cell->type.in(ID($_AND_), ID($_NOT_)))
 			module->remove(cell);
@@ -1526,8 +1526,11 @@ void reintegrate(RTLIL::Module *module, bool dff_mode)
 			log_assert(index < GetSize(A));
 			int i = 0;
 			while (i < GetSize(mask)) {
-				for (int j = 0; j < (1 << index); j++)
-					std::swap(mask.bits()[i+j], mask.bits()[i+j+(1 << index)]);
+				for (int j = 0; j < (1 << index); j++) {
+					State bit = mask[i+j];
+					mask.set(i+j, mask[i+j+(1 << index)]);
+					mask.set(i+j+(1 << index), bit);
+				}
 				i += 1 << (index+1);
 			}
 			A[index] = y_bit;
@@ -1542,7 +1545,7 @@ void reintegrate(RTLIL::Module *module, bool dff_mode)
 		// and get cleaned away
 clone_lut:
 		driver_mask = driver_lut->getParam(ID::LUT);
-		for (auto &b : driver_mask.bits()) {
+		for (auto b : driver_mask) {
 			if (b == RTLIL::State::S0) b = RTLIL::State::S1;
 			else if (b == RTLIL::State::S1) b = RTLIL::State::S0;
 		}
diff --git a/passes/techmap/dffinit.cc b/passes/techmap/dffinit.cc
index ee83105fd..013675c8a 100644
--- a/passes/techmap/dffinit.cc
+++ b/passes/techmap/dffinit.cc
@@ -118,13 +118,13 @@ struct DffinitPass : public Pass {
 					for (int i = 0; i < GetSize(sig); i++) {
 						if (initval[i] == State::Sx)
 							continue;
-						while (GetSize(value) <= i)
-							value.bits().push_back(State::S0);
+						if (GetSize(value) <= i)
+							value.resize(i + 1, State::S0);
 						if (noreinit && value[i] != State::Sx && value[i] != initval[i])
 							log_error("Trying to assign a different init value for %s.%s.%s which technically "
 									"have a conflicted init value.\n",
 									log_id(module), log_id(cell), log_id(it.second));
-						value.bits()[i] = initval[i];
+						value.set(i, initval[i]);
 					}
 
 					if (highlow_mode && GetSize(value) != 0) {
diff --git a/passes/techmap/dfflegalize.cc b/passes/techmap/dfflegalize.cc
index facea2e90..5a622c611 100644
--- a/passes/techmap/dfflegalize.cc
+++ b/passes/techmap/dfflegalize.cc
@@ -869,17 +869,17 @@ struct DffLegalizePass : public Pass {
 			if (ff.has_arst) {
 				if (ff.val_arst[i] == State::Sx) {
 					if (!(supported & (mask << 8)))
-						ff.val_arst.bits()[i] = State::S0;
+						ff.val_arst.set(i, State::S0);
 					if (!(supported & (mask << 4)))
-						ff.val_arst.bits()[i] = State::S1;
+						ff.val_arst.set(i, State::S1);
 				}
 			}
 			if (ff.has_srst) {
 				if (ff.val_srst[i] == State::Sx) {
 					if (!(supported & (mask << 8)))
-						ff.val_srst.bits()[i] = State::S0;
+						ff.val_srst.set(i, State::S0);
 					if (!(supported & (mask << 4)))
-						ff.val_srst.bits()[i] = State::S1;
+						ff.val_srst.set(i, State::S1);
 				}
 			}
 		}
diff --git a/passes/techmap/flowmap.cc b/passes/techmap/flowmap.cc
index 7fbe54849..f5f225a9b 100644
--- a/passes/techmap/flowmap.cc
+++ b/passes/techmap/flowmap.cc
@@ -1401,7 +1401,7 @@ struct FlowmapWorker
 					          log_signal(node), log_signal(undef), env.c_str());
 				}
 
-				lut_table.bits()[i] = value.as_bool() ? State::S1 : State::S0;
+				lut_table.set(i, value.as_bool() ? State::S1 : State::S0);
 				ce.pop();
 			}
 
diff --git a/passes/techmap/techmap.cc b/passes/techmap/techmap.cc
index 2a22258b7..30b8e17ab 100644
--- a/passes/techmap/techmap.cc
+++ b/passes/techmap/techmap.cc
@@ -680,15 +680,16 @@ struct TechmapWorker
 
 					for (auto &conn : cell->connections())
 						if (tpl->avail_parameters.count(stringf("\\_TECHMAP_CONNMAP_%s_", log_id(conn.first))) != 0) {
-							RTLIL::Const value;
-							for (auto &bit : sigmap(conn.second)) {
+							SigSpec sm = sigmap(conn.second);
+							RTLIL::Const::Builder builder(GetSize(sm) * bits);
+							for (auto &bit : sm) {
 								int val = unique_bit_id.at(bit);
 								for (int i = 0; i < bits; i++) {
-									value.bits().push_back((val & 1) != 0 ? State::S1 : State::S0);
+									builder.push_back((val & 1) != 0 ? State::S1 : State::S0);
 									val = val >> 1;
 								}
 							}
-							parameters.emplace(stringf("\\_TECHMAP_CONNMAP_%s_", log_id(conn.first)), value);
+							parameters.emplace(stringf("\\_TECHMAP_CONNMAP_%s_", log_id(conn.first)), builder.build());
 						}
 				}
 
diff --git a/passes/techmap/zinit.cc b/passes/techmap/zinit.cc
index bf049eab7..38936e64d 100644
--- a/passes/techmap/zinit.cc
+++ b/passes/techmap/zinit.cc
@@ -76,7 +76,7 @@ struct ZinitPass : public Pass {
 					if (ff.val_init[i] == State::S1)
 						bits.insert(i);
 					else if (ff.val_init[i] != State::S0 && all_mode)
-						ff.val_init.bits()[i] = State::S0;
+						ff.val_init.set(i, State::S0);
 				}
 				ff.flip_bits(bits);
 				ff.emit();

From 159ca3ba569d5e850c8610f9a458ae39d0570e6d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 03:54:00 +0000
Subject: [PATCH 529/931] Update passes/tests to avoid bits()

---
 passes/tests/test_cell.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index 286ef757d..75a63b2e0 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -641,15 +641,16 @@ static void run_eval_test(RTLIL::Design *design, bool verbose, bool nosat, std::
 			if (!gold_wire->port_input)
 				continue;
 
-			RTLIL::Const in_value;
+			RTLIL::Const::Builder in_value_builder(GetSize(gold_wire));
 			for (int i = 0; i < GetSize(gold_wire); i++)
-				in_value.bits().push_back(xorshift32(2) ? State::S1 : State::S0);
+				in_value_builder.push_back(xorshift32(2) ? State::S1 : State::S0);
+			RTLIL::Const in_value = in_value_builder.build();
 
 			if (xorshift32(4) == 0) {
 				int inv_chance = 1 + xorshift32(8);
 				for (int i = 0; i < GetSize(gold_wire); i++)
 					if (xorshift32(inv_chance) == 0)
-						in_value.bits()[i] = RTLIL::Sx;
+						in_value.set(i, RTLIL::Sx);
 			}
 
 			if (verbose)

From 7f247fb1256ceca143575127169678eee1d1e1af Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 03:54:13 +0000
Subject: [PATCH 530/931] Update passes/hierarchy to avoid bits()

---
 passes/hierarchy/submod.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/passes/hierarchy/submod.cc b/passes/hierarchy/submod.cc
index d77d65359..486d21920 100644
--- a/passes/hierarchy/submod.cc
+++ b/passes/hierarchy/submod.cc
@@ -79,7 +79,7 @@ struct SubmodWorker
 				flag_wire(c.wire, create, set_int_used, set_ext_driven, set_ext_used);
 				if (set_int_driven)
 					for (int i = c.offset; i < c.offset+c.width; i++) {
-						wire_flags.at(c.wire).is_int_driven.bits()[i] = State::S1;
+						wire_flags.at(c.wire).is_int_driven.set(i, State::S1);
 						flag_found_something = true;
 					}
 			}
@@ -185,8 +185,8 @@ struct SubmodWorker
 					auto it = sig[i].wire->attributes.find(ID::init);
 					if (it != sig[i].wire->attributes.end()) {
 						auto jt = new_wire->attributes.insert(std::make_pair(ID::init, Const(State::Sx, GetSize(sig)))).first;
-						jt->second.bits()[i] = it->second[sig[i].offset];
-						it->second.bits()[sig[i].offset] = State::Sx;
+						jt->second.set(i, it->second[sig[i].offset]);
+						it->second.set(sig[i].offset, State::Sx);
 					}
 				}
 			}

From 6dc9a8bacfdb9f5c63a420b1aa12afd0f3387301 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 01:55:47 +0000
Subject: [PATCH 531/931] Update kernel to avoid bits()

---
 kernel/bitpattern.h   |  2 +-
 kernel/calc.cc        | 92 +++++++++++++++++++------------------------
 kernel/celltypes.h    |  8 ++--
 kernel/consteval.h    |  4 +-
 kernel/drivertools.cc |  9 ++---
 kernel/ff.cc          | 31 +++++++++++----
 kernel/ffinit.h       | 10 ++---
 kernel/ffmerge.cc     | 24 +++++------
 kernel/macc.h         |  2 +-
 kernel/mem.cc         | 73 ++++++++++++++++++++++------------
 kernel/mem.h          |  6 ++-
 kernel/rtlil.cc       |  2 +-
 kernel/tclapi.cc      |  7 ++--
 kernel/yw.cc          |  3 +-
 14 files changed, 151 insertions(+), 122 deletions(-)

diff --git a/kernel/bitpattern.h b/kernel/bitpattern.h
index 0e12e6dce..e2071436c 100644
--- a/kernel/bitpattern.h
+++ b/kernel/bitpattern.h
@@ -100,7 +100,7 @@ struct BitPatternPool
 	bits_t sig2bits(RTLIL::SigSpec sig)
 	{
 		bits_t bits;
-		bits.bitdata = sig.as_const().bits();
+		bits.bitdata = sig.as_const().to_bits();
 		for (auto &b : bits.bitdata)
 			if (b > RTLIL::State::S1)
 				b = RTLIL::State::Sa;
diff --git a/kernel/calc.cc b/kernel/calc.cc
index f08c97396..9b0885db9 100644
--- a/kernel/calc.cc
+++ b/kernel/calc.cc
@@ -33,10 +33,7 @@ static void extend_u0(RTLIL::Const &arg, int width, bool is_signed)
 	if (arg.size() > 0 && is_signed)
 		padding = arg.back();
 
-	while (GetSize(arg) < width)
-		arg.bits().push_back(padding);
-
-	arg.bits().resize(width);
+	arg.resize(width, padding);
 }
 
 static BigInteger const2big(const RTLIL::Const &val, bool as_signed, int &undef_bit_pos)
@@ -79,12 +76,12 @@ static RTLIL::Const big2const(const BigInteger &val, int result_len, int undef_b
 		{
 			mag--;
 			for (auto i = 0; i < result_len; i++)
-				result.bits()[i] = mag.getBit(i) ? RTLIL::State::S0 : RTLIL::State::S1;
+				result.set(i, mag.getBit(i) ? RTLIL::State::S0 : RTLIL::State::S1);
 		}
 		else
 		{
 			for (auto i = 0; i < result_len; i++)
-				result.bits()[i] = mag.getBit(i) ? RTLIL::State::S1 : RTLIL::State::S0;
+				result.set(i, mag.getBit(i) ? RTLIL::State::S1 : RTLIL::State::S0);
 		}
 	}
 
@@ -140,11 +137,11 @@ RTLIL::Const RTLIL::const_not(const RTLIL::Const &arg1, const RTLIL::Const&, boo
 	RTLIL::Const result(RTLIL::State::Sx, result_len);
 	for (auto i = 0; i < result_len; i++) {
 		if (i >= GetSize(arg1_ext))
-			result.bits()[i] = RTLIL::State::S0;
-		else if (arg1_ext.bits()[i] == RTLIL::State::S0)
-			result.bits()[i] = RTLIL::State::S1;
-		else if (arg1_ext.bits()[i] == RTLIL::State::S1)
-			result.bits()[i] = RTLIL::State::S0;
+			result.set(i, RTLIL::State::S0);
+		else if (arg1_ext[i] == RTLIL::State::S0)
+			result.set(i, RTLIL::State::S1);
+		else if (arg1_ext[i] == RTLIL::State::S1)
+			result.set(i, RTLIL::State::S0);
 	}
 
 	return result;
@@ -161,9 +158,9 @@ static RTLIL::Const logic_wrapper(RTLIL::State(*logic_func)(RTLIL::State, RTLIL:
 
 	RTLIL::Const result(RTLIL::State::Sx, result_len);
 	for (auto i = 0; i < result_len; i++) {
-		RTLIL::State a = i < GetSize(arg1) ? arg1.bits()[i] : RTLIL::State::S0;
-		RTLIL::State b = i < GetSize(arg2) ? arg2.bits()[i] : RTLIL::State::S0;
-		result.bits()[i] = logic_func(a, b);
+		RTLIL::State a = i < GetSize(arg1) ? arg1[i] : RTLIL::State::S0;
+		RTLIL::State b = i < GetSize(arg2) ? arg2[i] : RTLIL::State::S0;
+		result.set(i, logic_func(a, b));
 	}
 
 	return result;
@@ -197,8 +194,8 @@ static RTLIL::Const logic_reduce_wrapper(RTLIL::State initial, RTLIL::State(*log
 		temp = logic_func(temp, arg1[i]);
 
 	RTLIL::Const result(temp);
-	while (GetSize(result) < result_len)
-		result.bits().push_back(RTLIL::State::S0);
+	if (GetSize(result) < result_len)
+		result.resize(result_len, RTLIL::State::S0);
 	return result;
 }
 
@@ -222,9 +219,9 @@ RTLIL::Const RTLIL::const_reduce_xnor(const RTLIL::Const &arg1, const RTLIL::Con
 	RTLIL::Const buffer = logic_reduce_wrapper(RTLIL::State::S0, logic_xor, arg1, result_len);
 	if (!buffer.empty()) {
 		if (buffer.front() == RTLIL::State::S0)
-			buffer.bits().front() = RTLIL::State::S1;
+			buffer.set(0, RTLIL::State::S1);
 		else if (buffer.front() == RTLIL::State::S1)
-			buffer.bits().front() = RTLIL::State::S0;
+			buffer.set(0, RTLIL::State::S0);
 	}
 	return buffer;
 }
@@ -239,9 +236,8 @@ RTLIL::Const RTLIL::const_logic_not(const RTLIL::Const &arg1, const RTLIL::Const
 	int undef_bit_pos_a = -1;
 	BigInteger a = const2big(arg1, signed1, undef_bit_pos_a);
 	RTLIL::Const result(a.isZero() ? undef_bit_pos_a >= 0 ? RTLIL::State::Sx : RTLIL::State::S1 : RTLIL::State::S0);
-
-	while (GetSize(result) < result_len)
-		result.bits().push_back(RTLIL::State::S0);
+	if (GetSize(result) < result_len)
+		result.resize(result_len, RTLIL::State::S0);
 	return result;
 }
 
@@ -254,9 +250,8 @@ RTLIL::Const RTLIL::const_logic_and(const RTLIL::Const &arg1, const RTLIL::Const
 	RTLIL::State bit_a = a.isZero() ? undef_bit_pos_a >= 0 ? RTLIL::State::Sx : RTLIL::State::S0 : RTLIL::State::S1;
 	RTLIL::State bit_b = b.isZero() ? undef_bit_pos_b >= 0 ? RTLIL::State::Sx : RTLIL::State::S0 : RTLIL::State::S1;
 	RTLIL::Const result(logic_and(bit_a, bit_b));
-
-	while (GetSize(result) < result_len)
-		result.bits().push_back(RTLIL::State::S0);
+	if (GetSize(result) < result_len)
+		result.resize(result_len, RTLIL::State::S0);
 	return result;
 }
 
@@ -269,9 +264,8 @@ RTLIL::Const RTLIL::const_logic_or(const RTLIL::Const &arg1, const RTLIL::Const
 	RTLIL::State bit_a = a.isZero() ? undef_bit_pos_a >= 0 ? RTLIL::State::Sx : RTLIL::State::S0 : RTLIL::State::S1;
 	RTLIL::State bit_b = b.isZero() ? undef_bit_pos_b >= 0 ? RTLIL::State::Sx : RTLIL::State::S0 : RTLIL::State::S1;
 	RTLIL::Const result(logic_or(bit_a, bit_b));
-
-	while (GetSize(result) < result_len)
-		result.bits().push_back(RTLIL::State::S0);
+	if (GetSize(result) < result_len)
+		result.resize(result_len, RTLIL::State::S0);
 	return result;
 }
 
@@ -295,11 +289,11 @@ static RTLIL::Const const_shift_worker(const RTLIL::Const &arg1, const RTLIL::Co
 	for (int i = 0; i < result_len; i++) {
 		BigInteger pos = BigInteger(i) + offset;
 		if (pos < 0)
-			result.bits()[i] = vacant_bits;
+			result.set(i, vacant_bits);
 		else if (pos >= BigInteger(GetSize(arg1)))
-			result.bits()[i] = sign_ext ? arg1.back() : vacant_bits;
+			result.set(i, sign_ext ? arg1.back() : vacant_bits);
 		else
-			result.bits()[i] = arg1[pos.toInt()];
+			result.set(i, arg1[pos.toInt()]);
 	}
 
 	return result;
@@ -346,9 +340,8 @@ RTLIL::Const RTLIL::const_lt(const RTLIL::Const &arg1, const RTLIL::Const &arg2,
 	int undef_bit_pos = -1;
 	bool y = const2big(arg1, signed1, undef_bit_pos) < const2big(arg2, signed2, undef_bit_pos);
 	RTLIL::Const result(undef_bit_pos >= 0 ? RTLIL::State::Sx : y ? RTLIL::State::S1 : RTLIL::State::S0);
-
-	while (GetSize(result) < result_len)
-		result.bits().push_back(RTLIL::State::S0);
+	if (GetSize(result) < result_len)
+		result.resize(result_len, RTLIL::State::S0);
 	return result;
 }
 
@@ -357,9 +350,8 @@ RTLIL::Const RTLIL::const_le(const RTLIL::Const &arg1, const RTLIL::Const &arg2,
 	int undef_bit_pos = -1;
 	bool y = const2big(arg1, signed1, undef_bit_pos) <= const2big(arg2, signed2, undef_bit_pos);
 	RTLIL::Const result(undef_bit_pos >= 0 ? RTLIL::State::Sx : y ? RTLIL::State::S1 : RTLIL::State::S0);
-
-	while (GetSize(result) < result_len)
-		result.bits().push_back(RTLIL::State::S0);
+	if (GetSize(result) < result_len)
+		result.resize(result_len, RTLIL::State::S0);
 	return result;
 }
 
@@ -383,7 +375,7 @@ RTLIL::Const RTLIL::const_eq(const RTLIL::Const &arg1, const RTLIL::Const &arg2,
 			matched_status = RTLIL::State::Sx;
 	}
 
-	result.bits().front() = matched_status;
+	result.set(0, matched_status);
 	return result;
 }
 
@@ -391,9 +383,9 @@ RTLIL::Const RTLIL::const_ne(const RTLIL::Const &arg1, const RTLIL::Const &arg2,
 {
 	RTLIL::Const result = RTLIL::const_eq(arg1, arg2, signed1, signed2, result_len);
 	if (result.front() == RTLIL::State::S0)
-		result.bits().front() = RTLIL::State::S1;
+		result.set(0, RTLIL::State::S1);
 	else if (result.front() == RTLIL::State::S1)
-		result.bits().front() = RTLIL::State::S0;
+		result.set(0, RTLIL::State::S0);
 	return result;
 }
 
@@ -412,7 +404,7 @@ RTLIL::Const RTLIL::const_eqx(const RTLIL::Const &arg1, const RTLIL::Const &arg2
 			return result;
 	}
 
-	result.bits().front() = RTLIL::State::S1;
+	result.set(0, RTLIL::State::S1);
 	return result;
 }
 
@@ -420,9 +412,9 @@ RTLIL::Const RTLIL::const_nex(const RTLIL::Const &arg1, const RTLIL::Const &arg2
 {
 	RTLIL::Const result = RTLIL::const_eqx(arg1, arg2, signed1, signed2, result_len);
 	if (result.front() == RTLIL::State::S0)
-		result.bits().front() = RTLIL::State::S1;
+		result.set(0, RTLIL::State::S1);
 	else if (result.front() == RTLIL::State::S1)
-		result.bits().front() = RTLIL::State::S0;
+		result.set(0, RTLIL::State::S0);
 	return result;
 }
 
@@ -431,9 +423,8 @@ RTLIL::Const RTLIL::const_ge(const RTLIL::Const &arg1, const RTLIL::Const &arg2,
 	int undef_bit_pos = -1;
 	bool y = const2big(arg1, signed1, undef_bit_pos) >= const2big(arg2, signed2, undef_bit_pos);
 	RTLIL::Const result(undef_bit_pos >= 0 ? RTLIL::State::Sx : y ? RTLIL::State::S1 : RTLIL::State::S0);
-
-	while (GetSize(result) < result_len)
-		result.bits().push_back(RTLIL::State::S0);
+	if (GetSize(result) < result_len)
+		result.resize(result_len, RTLIL::State::S0);
 	return result;
 }
 
@@ -442,9 +433,8 @@ RTLIL::Const RTLIL::const_gt(const RTLIL::Const &arg1, const RTLIL::Const &arg2,
 	int undef_bit_pos = -1;
 	bool y = const2big(arg1, signed1, undef_bit_pos) > const2big(arg2, signed2, undef_bit_pos);
 	RTLIL::Const result(undef_bit_pos >= 0 ? RTLIL::State::Sx : y ? RTLIL::State::S1 : RTLIL::State::S0);
-
-	while (GetSize(result) < result_len)
-		result.bits().push_back(RTLIL::State::S0);
+	if (GetSize(result) < result_len)
+		result.resize(result_len, RTLIL::State::S0);
 	return result;
 }
 
@@ -628,7 +618,7 @@ RTLIL::Const RTLIL::const_mux(const RTLIL::Const &arg1, const RTLIL::Const &arg2
 	RTLIL::Const ret = arg1;
 	for (auto i = 0; i < ret.size(); i++)
 		if (ret[i] != arg2[i])
-			ret.bits()[i] = State::Sx;
+			ret.set(i, State::Sx);
 	return ret;
 }
 
@@ -703,7 +693,7 @@ RTLIL::Const RTLIL::const_bweqx(const RTLIL::Const &arg1, const RTLIL::Const &ar
 	log_assert(arg2.size() == arg1.size());
 	RTLIL::Const result(RTLIL::State::S0, arg1.size());
 	for (auto i = 0; i < arg1.size(); i++)
-		result.bits()[i] = arg1[i] == arg2[i] ? State::S1 : State::S0;
+		result.set(i, arg1[i] == arg2[i] ? State::S1 : State::S0);
 
 	return result;
 }
@@ -715,7 +705,7 @@ RTLIL::Const RTLIL::const_bwmux(const RTLIL::Const &arg1, const RTLIL::Const &ar
 	RTLIL::Const result(RTLIL::State::Sx, arg1.size());
 	for (auto i = 0; i < arg1.size(); i++) {
 		if (arg3[i] != State::Sx || arg1[i] == arg2[i])
-			result.bits()[i] = arg3[i] == State::S1 ? arg2[i] : arg1[i];
+			result.set(i, arg3[i] == State::S1 ? arg2[i] : arg1[i]);
 	}
 
 	return result;
diff --git a/kernel/celltypes.h b/kernel/celltypes.h
index f08a695e9..469017029 100644
--- a/kernel/celltypes.h
+++ b/kernel/celltypes.h
@@ -328,7 +328,7 @@ struct CellTypes
 
 	static RTLIL::Const eval_not(RTLIL::Const v)
 	{
-		for (auto &bit : v.bits())
+		for (auto bit : v)
 			if (bit == State::S0) bit = State::S1;
 			else if (bit == State::S1) bit = State::S0;
 		return v;
@@ -421,16 +421,14 @@ struct CellTypes
 	static RTLIL::Const eval(RTLIL::Cell *cell, const RTLIL::Const &arg1, const RTLIL::Const &arg2, bool *errp = nullptr)
 	{
 		if (cell->type == ID($slice)) {
-			RTLIL::Const ret;
 			int width = cell->parameters.at(ID::Y_WIDTH).as_int();
 			int offset = cell->parameters.at(ID::OFFSET).as_int();
-			ret.bits().insert(ret.bits().end(), arg1.begin()+offset, arg1.begin()+offset+width);
-			return ret;
+			return arg1.extract(offset, width);
 		}
 
 		if (cell->type == ID($concat)) {
 			RTLIL::Const ret = arg1;
-			ret.bits().insert(ret.bits().end(), arg2.begin(), arg2.end());
+			ret.append(arg2);
 			return ret;
 		}
 
diff --git a/kernel/consteval.h b/kernel/consteval.h
index adcf86f8a..b13c7ea5c 100644
--- a/kernel/consteval.h
+++ b/kernel/consteval.h
@@ -115,7 +115,7 @@ struct ConstEval
 
 				for (int i = 0; i < GetSize(coval); i++) {
 					carry = (sig_g[i] == State::S1) || (sig_p[i] == RTLIL::S1 && carry);
-					coval.bits()[i] = carry ? State::S1 : State::S0;
+					coval.set(i, carry ? State::S1 : State::S0);
 				}
 
 				set(sig_co, coval);
@@ -249,7 +249,7 @@ struct ConstEval
 
 			for (int i = 0; i < GetSize(val_y); i++)
 				if (val_y[i] == RTLIL::Sx)
-					val_x.bits()[i] = RTLIL::Sx;
+					val_x.set(i, RTLIL::Sx);
 
 			set(sig_y, val_y);
 			set(sig_x, val_x);
diff --git a/kernel/drivertools.cc b/kernel/drivertools.cc
index 6290f4470..90bfb0ee7 100644
--- a/kernel/drivertools.cc
+++ b/kernel/drivertools.cc
@@ -260,7 +260,7 @@ bool DriveChunkMultiple::try_append(DriveBitMultiple const &bit)
 		switch (single.type())
 		{
 			case DriveType::CONSTANT: {
-				single.constant().bits().push_back(constant);
+				single.constant().append(RTLIL::Const(constant));
 			} break;
 			case DriveType::WIRE: {
 				single.wire().width += 1;
@@ -295,8 +295,7 @@ bool DriveChunkMultiple::try_append(DriveChunkMultiple const &chunk)
 		switch (single.type())
 		{
 			case DriveType::CONSTANT: {
-				auto &bits = single.constant().bits();
-				bits.insert(bits.end(), constant.bits().begin(), constant.bits().end());
+				single.constant().append(constant);
 			} break;
 			case DriveType::WIRE: {
 				single.wire().width += width;
@@ -349,7 +348,7 @@ bool DriveChunk::try_append(DriveBit const &bit)
 			none_ += 1;
 			return true;
 		case DriveType::CONSTANT:
-			constant_.bits().push_back(bit.constant());
+			constant_.append(RTLIL::Const(bit.constant()));
 			return true;
 		case DriveType::WIRE:
 			return wire_.try_append(bit.wire());
@@ -375,7 +374,7 @@ bool DriveChunk::try_append(DriveChunk const &chunk)
 			none_ += chunk.none_;
 			return true;
 		case DriveType::CONSTANT:
-			constant_.bits().insert(constant_.bits().end(), chunk.constant_.begin(), chunk.constant_.end());
+			constant_.append(chunk.constant_);
 			return true;
 		case DriveType::WIRE:
 			return wire_.try_append(chunk.wire());
diff --git a/kernel/ff.cc b/kernel/ff.cc
index 8b38b84cb..a72e6a65c 100644
--- a/kernel/ff.cc
+++ b/kernel/ff.cc
@@ -287,6 +287,16 @@ FfData FfData::slice(const std::vector<int> &bits) {
 	res.pol_clr = pol_clr;
 	res.pol_set = pol_set;
 	res.attributes = attributes;
+	std::optional<Const::Builder> arst_bits;
+	if (has_arst)
+		arst_bits.emplace(bits.size());
+	std::optional<Const::Builder> srst_bits;
+	if (has_srst)
+		srst_bits.emplace(bits.size());
+	std::optional<Const::Builder> init_bits;
+	if (initvals)
+		init_bits.emplace(bits.size());
+
 	for (int i : bits) {
 		res.sig_q.append(sig_q[i]);
 		if (has_clk || has_gclk)
@@ -298,12 +308,19 @@ FfData FfData::slice(const std::vector<int> &bits) {
 			res.sig_set.append(sig_set[i]);
 		}
 		if (has_arst)
-			res.val_arst.bits().push_back(val_arst[i]);
+			arst_bits->push_back(val_arst[i]);
 		if (has_srst)
-			res.val_srst.bits().push_back(val_srst[i]);
+			srst_bits->push_back(val_srst[i]);
 		if (initvals)
-			res.val_init.bits().push_back(val_init[i]);
+			init_bits->push_back(val_init[i]);
 	}
+
+	if (has_arst)
+		res.val_arst = arst_bits->build();
+	if (has_srst)
+		res.val_srst = srst_bits->build();
+	if (initvals)
+		res.val_init = init_bits->build();
 	res.width = GetSize(res.sig_q);
 	return res;
 }
@@ -688,10 +705,10 @@ void FfData::flip_rst_bits(const pool<int> &bits) {
 
 	for (auto bit: bits) {
 		if (has_arst)
-			val_arst.bits()[bit] = invert(val_arst[bit]);
+			val_arst.set(bit, invert(val_arst[bit]));
 		if (has_srst)
-			val_srst.bits()[bit] = invert(val_srst[bit]);
-		val_init.bits()[bit] = invert(val_init[bit]);
+			val_srst.set(bit, invert(val_srst[bit]));
+		val_init.set(bit, invert(val_init[bit]));
 	}
 }
 
@@ -760,7 +777,7 @@ void FfData::flip_bits(const pool<int> &bits) {
 
 		Const mask = Const(State::S0, width);
 		for (auto bit: bits)
-			mask.bits()[bit] = State::S1;
+			mask.set(bit, State::S1);
 
 		if (has_clk || has_gclk)
 			sig_d = module->Xor(NEW_ID, sig_d, mask);
diff --git a/kernel/ffinit.h b/kernel/ffinit.h
index 66c13b68f..920fba307 100644
--- a/kernel/ffinit.h
+++ b/kernel/ffinit.h
@@ -74,10 +74,10 @@ struct FfInitVals
 
 	RTLIL::Const operator()(const RTLIL::SigSpec &sig) const
 	{
-		RTLIL::Const res;
+		RTLIL::Const::Builder res_bits(GetSize(sig));
 		for (auto bit : sig)
-			res.bits().push_back((*this)(bit));
-		return res;
+			res_bits.push_back((*this)(bit));
+		return res_bits.build();
 	}
 
 	void set_init(RTLIL::SigBit bit, RTLIL::State val)
@@ -93,12 +93,12 @@ struct FfInitVals
 		initbits[mbit] = std::make_pair(val,abit);
 		auto it2 = abit.wire->attributes.find(ID::init);
 		if (it2 != abit.wire->attributes.end()) {
-			it2->second.bits()[abit.offset] = val;
+			it2->second.set(abit.offset, val);
 			if (it2->second.is_fully_undef())
 				abit.wire->attributes.erase(it2);
 		} else if (val != State::Sx) {
 			Const cval(State::Sx, GetSize(abit.wire));
-			cval.bits()[abit.offset] = val;
+			cval.set(abit.offset, val);
 			abit.wire->attributes[ID::init] = cval;
 		}
 	}
diff --git a/kernel/ffmerge.cc b/kernel/ffmerge.cc
index 3b361c1c2..632cba05c 100644
--- a/kernel/ffmerge.cc
+++ b/kernel/ffmerge.cc
@@ -42,9 +42,9 @@ bool FfMergeHelper::find_output_ff(RTLIL::SigSpec sig, FfData &ff, pool<std::pai
 			ff.sig_d.append(bit);
 			ff.sig_clr.append(State::Sx);
 			ff.sig_set.append(State::Sx);
-			ff.val_init.bits().push_back(State::Sx);
-			ff.val_srst.bits().push_back(State::Sx);
-			ff.val_arst.bits().push_back(State::Sx);
+			ff.val_init.append(RTLIL::Const(State::Sx));
+			ff.val_srst.append(RTLIL::Const(State::Sx));
+			ff.val_arst.append(RTLIL::Const(State::Sx));
 			continue;
 		}
 
@@ -147,9 +147,9 @@ bool FfMergeHelper::find_output_ff(RTLIL::SigSpec sig, FfData &ff, pool<std::pai
 		ff.sig_q.append(cur_ff.sig_q[idx]);
 		ff.sig_clr.append(ff.has_sr ? cur_ff.sig_clr[idx] : State::S0);
 		ff.sig_set.append(ff.has_sr ? cur_ff.sig_set[idx] : State::S0);
-		ff.val_arst.bits().push_back(ff.has_arst ? cur_ff.val_arst[idx] : State::Sx);
-		ff.val_srst.bits().push_back(ff.has_srst ? cur_ff.val_srst[idx] : State::Sx);
-		ff.val_init.bits().push_back(cur_ff.val_init[idx]);
+		ff.val_arst.append(RTLIL::Const(ff.has_arst ? cur_ff.val_arst[idx] : State::Sx));
+		ff.val_srst.append(RTLIL::Const(ff.has_srst ? cur_ff.val_srst[idx] : State::Sx));
+		ff.val_init.append(RTLIL::Const(cur_ff.val_init[idx]));
 		found = true;
 	}
 
@@ -174,9 +174,9 @@ bool FfMergeHelper::find_input_ff(RTLIL::SigSpec sig, FfData &ff, pool<std::pair
 			// These two will be fixed up later.
 			ff.sig_clr.append(State::Sx);
 			ff.sig_set.append(State::Sx);
-			ff.val_init.bits().push_back(bit.data);
-			ff.val_srst.bits().push_back(bit.data);
-			ff.val_arst.bits().push_back(bit.data);
+			ff.val_init.append(RTLIL::Const(bit.data));
+			ff.val_srst.append(RTLIL::Const(bit.data));
+			ff.val_arst.append(RTLIL::Const(bit.data));
 			continue;
 		}
 
@@ -274,9 +274,9 @@ bool FfMergeHelper::find_input_ff(RTLIL::SigSpec sig, FfData &ff, pool<std::pair
 		ff.sig_q.append(cur_ff.sig_q[idx]);
 		ff.sig_clr.append(ff.has_sr ? cur_ff.sig_clr[idx] : State::S0);
 		ff.sig_set.append(ff.has_sr ? cur_ff.sig_set[idx] : State::S0);
-		ff.val_arst.bits().push_back(ff.has_arst ? cur_ff.val_arst[idx] : State::Sx);
-		ff.val_srst.bits().push_back(ff.has_srst ? cur_ff.val_srst[idx] : State::Sx);
-		ff.val_init.bits().push_back(cur_ff.val_init[idx]);
+		ff.val_arst.append(RTLIL::Const(ff.has_arst ? cur_ff.val_arst[idx] : State::Sx));
+		ff.val_srst.append(RTLIL::Const(ff.has_srst ? cur_ff.val_srst[idx] : State::Sx));
+		ff.val_init.append(RTLIL::Const(cur_ff.val_init[idx]));
 		found = true;
 	}
 
diff --git a/kernel/macc.h b/kernel/macc.h
index ceda1dceb..b4c58d20b 100644
--- a/kernel/macc.h
+++ b/kernel/macc.h
@@ -262,7 +262,7 @@ struct Macc
 
 	bool eval(RTLIL::Const &result) const
 	{
-		for (auto &bit : result.bits())
+		for (auto bit : result)
 			bit = State::S0;
 
 		for (auto &port : terms)
diff --git a/kernel/mem.cc b/kernel/mem.cc
index f614a1f81..02d12dea4 100644
--- a/kernel/mem.cc
+++ b/kernel/mem.cc
@@ -131,9 +131,6 @@ void Mem::emit() {
 		cell->parameters[ID::WIDTH] = Const(width);
 		cell->parameters[ID::OFFSET] = Const(start_offset);
 		cell->parameters[ID::SIZE] = Const(size);
-		Const rd_wide_continuation, rd_clk_enable, rd_clk_polarity, rd_transparency_mask, rd_collision_x_mask;
-		Const wr_wide_continuation, wr_clk_enable, wr_clk_polarity, wr_priority_mask;
-		Const rd_ce_over_srst, rd_arst_value, rd_srst_value, rd_init_value;
 		SigSpec rd_clk, rd_en, rd_addr, rd_data;
 		SigSpec wr_clk, wr_en, wr_addr, wr_data;
 		SigSpec rd_arst, rd_srst;
@@ -147,6 +144,15 @@ void Mem::emit() {
 		for (int i = 0; i < GetSize(wr_ports); i++)
 			for (int j = 0; j < (1 << wr_ports[i].wide_log2); j++)
 				wr_port_xlat.push_back(i);
+		Const::Builder rd_wide_continuation_builder;
+		Const::Builder rd_clk_enable_builder;
+		Const::Builder rd_clk_polarity_builder;
+		Const::Builder rd_transparency_mask_builder;
+		Const::Builder rd_collision_x_mask_builder;
+		Const::Builder rd_ce_over_srst_builder;
+		Const::Builder rd_arst_value_builder;
+		Const::Builder rd_srst_value_builder;
+		Const::Builder rd_init_value_builder;
 		for (auto &port : rd_ports) {
 			for (auto attr: port.attributes)
 				if (!cell->has_attribute(attr.first))
@@ -157,10 +163,10 @@ void Mem::emit() {
 			}
 			for (int sub = 0; sub < (1 << port.wide_log2); sub++)
 			{
-				rd_wide_continuation.bits().push_back(State(sub != 0));
-				rd_clk_enable.bits().push_back(State(port.clk_enable));
-				rd_clk_polarity.bits().push_back(State(port.clk_polarity));
-				rd_ce_over_srst.bits().push_back(State(port.ce_over_srst));
+				rd_wide_continuation_builder.push_back(State(sub != 0));
+				rd_clk_enable_builder.push_back(State(port.clk_enable));
+				rd_clk_polarity_builder.push_back(State(port.clk_polarity));
+				rd_ce_over_srst_builder.push_back(State(port.ce_over_srst));
 				rd_clk.append(port.clk);
 				rd_arst.append(port.arst);
 				rd_srst.append(port.srst);
@@ -170,18 +176,27 @@ void Mem::emit() {
 				rd_addr.append(addr);
 				log_assert(GetSize(addr) == abits);
 				for (auto idx : wr_port_xlat) {
-					rd_transparency_mask.bits().push_back(State(bool(port.transparency_mask[idx])));
-					rd_collision_x_mask.bits().push_back(State(bool(port.collision_x_mask[idx])));
+					rd_transparency_mask_builder.push_back(State(bool(port.transparency_mask[idx])));
+					rd_collision_x_mask_builder.push_back(State(bool(port.collision_x_mask[idx])));
 				}
 			}
 			rd_data.append(port.data);
 			for (auto bit : port.arst_value)
-				rd_arst_value.bits().push_back(bit);
+				rd_arst_value_builder.push_back(bit);
 			for (auto bit : port.srst_value)
-				rd_srst_value.bits().push_back(bit);
+				rd_srst_value_builder.push_back(bit);
 			for (auto bit : port.init_value)
-				rd_init_value.bits().push_back(bit);
+				rd_init_value_builder.push_back(bit);
 		}
+		Const rd_wide_continuation = rd_wide_continuation_builder.build();
+		Const rd_clk_enable = rd_clk_enable_builder.build();
+		Const rd_clk_polarity = rd_clk_polarity_builder.build();
+		Const rd_transparency_mask = rd_transparency_mask_builder.build();
+		Const rd_collision_x_mask = rd_collision_x_mask_builder.build();
+		Const rd_ce_over_srst = rd_ce_over_srst_builder.build();
+		Const rd_arst_value = rd_arst_value_builder.build();
+		Const rd_srst_value = rd_srst_value_builder.build();
+		Const rd_init_value = rd_init_value_builder.build();
 		if (rd_ports.empty()) {
 			rd_wide_continuation = State::S0;
 			rd_clk_enable = State::S0;
@@ -212,6 +227,10 @@ void Mem::emit() {
 		cell->setPort(ID::RD_SRST, rd_srst);
 		cell->setPort(ID::RD_ADDR, rd_addr);
 		cell->setPort(ID::RD_DATA, rd_data);
+		Const::Builder wr_wide_continuation_builder;
+		Const::Builder wr_clk_enable_builder;
+		Const::Builder wr_clk_polarity_builder;
+		Const::Builder wr_priority_mask_builder;
 		for (auto &port : wr_ports) {
 			for (auto attr: port.attributes)
 				if (!cell->has_attribute(attr.first))
@@ -222,12 +241,12 @@ void Mem::emit() {
 			}
 			for (int sub = 0; sub < (1 << port.wide_log2); sub++)
 			{
-				wr_wide_continuation.bits().push_back(State(sub != 0));
-				wr_clk_enable.bits().push_back(State(port.clk_enable));
-				wr_clk_polarity.bits().push_back(State(port.clk_polarity));
+				wr_wide_continuation_builder.push_back(State(sub != 0));
+				wr_clk_enable_builder.push_back(State(port.clk_enable));
+				wr_clk_polarity_builder.push_back(State(port.clk_polarity));
 				wr_clk.append(port.clk);
 				for (auto idx : wr_port_xlat)
-					wr_priority_mask.bits().push_back(State(bool(port.priority_mask[idx])));
+					wr_priority_mask_builder.push_back(State(bool(port.priority_mask[idx])));
 				SigSpec addr = port.sub_addr(sub);
 				addr.extend_u0(abits, false);
 				wr_addr.append(addr);
@@ -236,6 +255,10 @@ void Mem::emit() {
 			wr_en.append(port.en);
 			wr_data.append(port.data);
 		}
+		Const wr_wide_continuation = wr_wide_continuation_builder.build();
+		Const wr_clk_enable = wr_clk_enable_builder.build();
+		Const wr_clk_polarity = wr_clk_polarity_builder.build();
+		Const wr_priority_mask = wr_priority_mask_builder.build();
 		if (wr_ports.empty()) {
 			wr_wide_continuation = State::S0;
 			wr_clk_enable = State::S0;
@@ -414,7 +437,7 @@ void Mem::coalesce_inits() {
 			if (!init.en.is_fully_ones()) {
 				for (int i = 0; i < GetSize(init.data); i++)
 					if (init.en[i % width] != State::S1)
-						init.data.bits()[i] = State::Sx;
+						init.data.set(i, State::Sx);
 				init.en = Const(State::S1, width);
 			}
 			continue;
@@ -427,7 +450,7 @@ void Mem::coalesce_inits() {
 			log_assert(offset + GetSize(init.data) <= GetSize(cdata));
 			for (int i = 0; i < GetSize(init.data); i++)
 				if (init.en[i % width] == State::S1)
-					cdata.bits()[i+offset] = init.data[i];
+					cdata.set(i+offset, init.data[i]);
 			init.removed = true;
 		}
 		MemInit new_init;
@@ -446,7 +469,7 @@ Const Mem::get_init_data() const {
 		int offset = (init.addr.as_int() - start_offset) * width;
 		for (int i = 0; i < GetSize(init.data); i++)
 			if (0 <= i+offset && i+offset < GetSize(init_data) && init.en[i % width] == State::S1)
-				init_data.bits()[i+offset] = init.data[i];
+				init_data.set(i+offset, init.data[i]);
 	}
 	return init_data;
 }
@@ -1700,7 +1723,7 @@ MemContents::MemContents(Mem *mem) :
 				RTLIL::Const previous = (*this)[addr + i];
 				for(int j = 0; j < _data_width; j++)
 					if(init.en[j] != State::S1)
-						data.bits()[_data_width * i + j] = previous[j];
+						data.set(_data_width * i + j, previous[j]);
 			}
 			insert_concatenated(init.addr.as_int(), data);
 		}
@@ -1846,7 +1869,7 @@ std::map<MemContents::addr_t, RTLIL::Const>::iterator MemContents::_reserve_rang
 		// we have two different ranges touching at either end, we need to merge them
 		auto upper_end = _range_end(upper_it);
 		// make range bigger (maybe reserve here instead of resize?)
-		lower_it->second.bits().resize(_range_offset(lower_it, upper_end), State::Sx);
+		lower_it->second.resize(_range_offset(lower_it, upper_end), State::Sx);
 		// copy only the data beyond our range
 		std::copy(_range_data(upper_it, end_addr), _range_data(upper_it, upper_end), _range_data(lower_it, end_addr));
 		// keep lower_it, but delete upper_it
@@ -1854,16 +1877,16 @@ std::map<MemContents::addr_t, RTLIL::Const>::iterator MemContents::_reserve_rang
 		return lower_it;
 	} else if (lower_touch) {
 		// we have a range to the left, just make it bigger and delete any other that may exist.
-		lower_it->second.bits().resize(_range_offset(lower_it, end_addr), State::Sx);
+		lower_it->second.resize(_range_offset(lower_it, end_addr), State::Sx);
 		// keep lower_it and upper_it
 		_values.erase(std::next(lower_it), upper_it);
 		return lower_it;
 	} else if (upper_touch) {
 		// we have a range to the right, we need to expand it
 		// since we need to erase and reinsert to a new address, steal the data
-		RTLIL::Const data = std::move(upper_it->second);
 		// note that begin_addr is not in upper_it, otherwise the whole range covered check would have tripped
-		data.bits().insert(data.bits().begin(), (_range_begin(upper_it) - begin_addr) * _data_width, State::Sx);
+		RTLIL::Const data(State::Sx, (_range_begin(upper_it) - begin_addr) * _data_width);
+		data.append(std::move(upper_it->second));
 		// delete lower_it and upper_it, then reinsert
 		_values.erase(lower_it, std::next(upper_it));
 		return _values.emplace(begin_addr, std::move(data)).first;
@@ -1886,7 +1909,7 @@ void MemContents::insert_concatenated(addr_t addr, RTLIL::Const const &values) {
 	std::fill(to_begin + values.size(), to_begin + words * _data_width, State::S0);
 }
 
-std::vector<State>::iterator MemContents::_range_write(std::vector<State>::iterator it, RTLIL::Const const &word) {
+RTLIL::Const::iterator MemContents::_range_write(RTLIL::Const::iterator it, RTLIL::Const const &word) {
 	auto from_end = word.size() <= _data_width ? word.end() : word.begin() + _data_width;
 	auto to_end = std::copy(word.begin(), from_end, it);
 	auto it_next = std::next(it, _data_width);
diff --git a/kernel/mem.h b/kernel/mem.h
index a06f44bd8..b35ea52c7 100644
--- a/kernel/mem.h
+++ b/kernel/mem.h
@@ -255,11 +255,13 @@ private:
 	// return the offset the addr would have in the range at `it`
 	size_t _range_offset(std::map<addr_t, RTLIL::Const>::iterator it, addr_t addr) const { return (addr - it->first) * _data_width; }
 	// assuming _range_contains(it, addr), return an iterator pointing to the data at addr
-	std::vector<State>::iterator _range_data(std::map<addr_t, RTLIL::Const>::iterator it, addr_t addr) { return it->second.bits().begin() + _range_offset(it, addr); }
+	RTLIL::Const::iterator _range_data(std::map<addr_t, RTLIL::Const>::iterator it, addr_t addr) {
+		return RTLIL::Const::iterator(it->second, _range_offset(it, addr));
+	}
 	// internal version of reserve_range that returns an iterator to the range
 	std::map<addr_t, RTLIL::Const>::iterator _reserve_range(addr_t begin_addr, addr_t end_addr);
 	// write a single word at addr, return iterator to next word
-	std::vector<State>::iterator _range_write(std::vector<State>::iterator it, RTLIL::Const const &data);
+	RTLIL::Const::iterator _range_write(RTLIL::Const::iterator it, RTLIL::Const const &data);
 public:
 	class range {
 		int _data_width;
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 8d7f89650..62f7ae4f7 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -486,7 +486,7 @@ int RTLIL::Const::get_min_size(bool is_signed) const
 void RTLIL::Const::compress(bool is_signed)
 {
 	auto idx = get_min_size(is_signed);
-	bits().erase(bits().begin() + idx, bits().end());
+	resize(idx, RTLIL::State::S0);
 }
 
 std::optional<int> RTLIL::Const::as_int_compress(bool is_signed) const
diff --git a/kernel/tclapi.cc b/kernel/tclapi.cc
index 4bdb680ac..729d06ca0 100644
--- a/kernel/tclapi.cc
+++ b/kernel/tclapi.cc
@@ -214,18 +214,19 @@ bool mp_int_to_const(mp_int *a, Const &b, bool is_signed)
 	buf.resize(mp_unsigned_bin_size(a));
 	mp_to_unsigned_bin(a, buf.data());
 
-	b.bits().reserve(mp_count_bits(a) + is_signed);
+	Const::Builder b_bits(mp_count_bits(a) + is_signed);
 	for (int i = 0; i < mp_count_bits(a);) {
 		for (int j = 0; j < 8 && i < mp_count_bits(a); j++, i++) {
 			bool bv = ((buf.back() & (1 << j)) != 0) ^ negative;
-			b.bits().push_back(bv ? RTLIL::S1 : RTLIL::S0);
+			b_bits.push_back(bv ? RTLIL::S1 : RTLIL::S0);
 		}
 		buf.pop_back();
 	}
 
 	if (is_signed) {
-		b.bits().push_back(negative ? RTLIL::S1 : RTLIL::S0);
+		b_bits.push_back(negative ? RTLIL::S1 : RTLIL::S0);
 	}
+	b = b_bits.build();
 
 	return true;
 }
diff --git a/kernel/yw.cc b/kernel/yw.cc
index daad53380..560f7dd38 100644
--- a/kernel/yw.cc
+++ b/kernel/yw.cc
@@ -185,7 +185,6 @@ RTLIL::Const ReadWitness::get_bits(int t, int bits_offset, int width) const
 	const std::string &bits = steps[t].bits;
 
 	RTLIL::Const result(State::Sa, width);
-	result.bits().reserve(width);
 
 	int read_begin = GetSize(bits) - 1 - bits_offset;
 	int read_end = max(-1, read_begin - width);
@@ -200,7 +199,7 @@ RTLIL::Const ReadWitness::get_bits(int t, int bits_offset, int width) const
 			default:
 				log_abort();
 		}
-		result.bits()[j] = bit;
+		result.set(j, bit);
 	}
 
 	return result;

From 09b493cfcd6ec79320e9a1f660b93ebd6a80085e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 01:55:56 +0000
Subject: [PATCH 532/931] Update techlibs to avoid bits()

---
 techlibs/gatemate/gatemate_foldinv.cc  |  4 ++--
 techlibs/greenpak4/greenpak4_dffinv.cc |  8 ++++----
 techlibs/microchip/microchip_dffopt.cc |  2 +-
 techlibs/microchip/microchip_dsp.cc    |  4 ++--
 techlibs/quicklogic/ql_dsp_simd.cc     |  6 ++----
 techlibs/xilinx/xilinx_dffopt.cc       |  6 +++---
 techlibs/xilinx/xilinx_dsp.cc          |  8 ++++----
 techlibs/xilinx/xilinx_srl.cc          | 10 ++++------
 8 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/techlibs/gatemate/gatemate_foldinv.cc b/techlibs/gatemate/gatemate_foldinv.cc
index cce5d2c4f..1af6a8987 100644
--- a/techlibs/gatemate/gatemate_foldinv.cc
+++ b/techlibs/gatemate/gatemate_foldinv.cc
@@ -82,7 +82,7 @@ struct FoldInvWorker {
         Const result(State::S0, GetSize(lut));
         for (int i = 0; i < GetSize(lut); i++) {
             int j = i ^ (1 << bit);
-            result.bits()[j] = lut[i];
+            result.set(j, lut[i]);
         }
         return result;
     }
@@ -91,7 +91,7 @@ struct FoldInvWorker {
     {
         Const result(State::S0, GetSize(lut));
         for (int i = 0; i < GetSize(lut); i++)
-            result.bits()[i] = (lut[i] == State::S1) ? State::S0 : State::S1;
+            result.set(i, (lut[i] == State::S1) ? State::S0 : State::S1);
         return result;
     }
 
diff --git a/techlibs/greenpak4/greenpak4_dffinv.cc b/techlibs/greenpak4/greenpak4_dffinv.cc
index 37f6d8d9b..4f60a5c37 100644
--- a/techlibs/greenpak4/greenpak4_dffinv.cc
+++ b/techlibs/greenpak4/greenpak4_dffinv.cc
@@ -36,9 +36,9 @@ void invert_gp_dff(Cell *cell, bool invert_input)
 		Const initval = cell->getParam(ID::INIT);
 		if (GetSize(initval) >= 1) {
 			if (initval[0] == State::S0)
-				initval.bits()[0] = State::S1;
+				initval.set(0, State::S1);
 			else if (initval[0] == State::S1)
-				initval.bits()[0] = State::S0;
+				initval.set(0, State::S0);
 			cell->setParam(ID::INIT, initval);
 		}
 
@@ -47,9 +47,9 @@ void invert_gp_dff(Cell *cell, bool invert_input)
 			Const srmode = cell->getParam(ID(SRMODE));
 			if (GetSize(srmode) >= 1) {
 				if (srmode[0] == State::S0)
-					srmode.bits()[0] = State::S1;
+					srmode.set(0, State::S1);
 				else if (srmode[0] == State::S1)
-					srmode.bits()[0] = State::S0;
+					srmode.set(0, State::S0);
 				cell->setParam(ID(SRMODE), srmode);
 			}
 		}
diff --git a/techlibs/microchip/microchip_dffopt.cc b/techlibs/microchip/microchip_dffopt.cc
index 8a13c4325..98e2f17a7 100644
--- a/techlibs/microchip/microchip_dffopt.cc
+++ b/techlibs/microchip/microchip_dffopt.cc
@@ -93,7 +93,7 @@ bool merge_lut(LutData &result, const LutData &data, const LutData select, bool
 			int lut_idx = i >> idx_data & ((1 << GetSize(data.second)) - 1);
 			new_bit = data.first[lut_idx] == State::S1;
 		}
-		result.first.bits()[i] = new_bit ? State::S1 : State::S0;
+		result.first.set(i, new_bit ? State::S1 : State::S0);
 	}
 	return true;
 }
diff --git a/techlibs/microchip/microchip_dsp.cc b/techlibs/microchip/microchip_dsp.cc
index 3dfcb8905..df7093bc5 100644
--- a/techlibs/microchip/microchip_dsp.cc
+++ b/techlibs/microchip/microchip_dsp.cc
@@ -128,7 +128,7 @@ void microchip_dsp_pack(microchip_dsp_pm &pm)
 					continue;
 				for (int i = c.offset; i < c.offset + c.width; i++) {
 					log_assert(it->second[i] == State::S0 || it->second[i] == State::Sx);
-					it->second.bits()[i] = State::Sx;
+					it->second.set(i, State::Sx);
 				}
 			}
 		};
@@ -244,7 +244,7 @@ void microchip_dsp_packC(microchip_dsp_CREG_pm &pm)
 					continue;
 				for (int i = c.offset; i < c.offset + c.width; i++) {
 					log_assert(it->second[i] == State::S0 || it->second[i] == State::Sx);
-					it->second.bits()[i] = State::Sx;
+					it->second.set(i, State::Sx);
 				}
 			}
 		};
diff --git a/techlibs/quicklogic/ql_dsp_simd.cc b/techlibs/quicklogic/ql_dsp_simd.cc
index fdd2de406..cd509ce7f 100644
--- a/techlibs/quicklogic/ql_dsp_simd.cc
+++ b/techlibs/quicklogic/ql_dsp_simd.cc
@@ -200,10 +200,8 @@ struct QlDspSimdPass : public Pass {
 						auto val_a = dsp_a->getParam(it);
 						auto val_b = dsp_b->getParam(it);
 
-						mode_bits.bits().insert(mode_bits.bits().end(),
-							val_a.begin(), val_a.end());
-						mode_bits.bits().insert(mode_bits.bits().end(),
-							val_b.begin(), val_b.end());
+						mode_bits.append(val_a);
+						mode_bits.append(val_b);
 					}
 
 					// Enable the fractured mode by connecting the control
diff --git a/techlibs/xilinx/xilinx_dffopt.cc b/techlibs/xilinx/xilinx_dffopt.cc
index bca3deef9..8a6d3e015 100644
--- a/techlibs/xilinx/xilinx_dffopt.cc
+++ b/techlibs/xilinx/xilinx_dffopt.cc
@@ -92,7 +92,7 @@ bool merge_lut(LutData &result, const LutData &data, const LutData select, bool
 			int lut_idx = i >> idx_data & ((1 << GetSize(data.second)) - 1);
 			new_bit = data.first[lut_idx] == State::S1;
 		}
-		result.first.bits()[i] = new_bit ? State::S1 : State::S0;
+		result.first.set(i, new_bit ? State::S1 : State::S0);
 	}
 	return true;
 }
@@ -211,8 +211,8 @@ lut_sigin_done:
 				Cell *cell_d = it_D->second.second;
 				if (cell->hasParam(ID(IS_D_INVERTED)) && cell->getParam(ID(IS_D_INVERTED)).as_bool()) {
 					// Flip all bits in the LUT.
-					for (int i = 0; i < GetSize(lut_d.first); i++)
-						lut_d.first.bits()[i] = (lut_d.first[i] == State::S1) ? State::S0 : State::S1;
+					for (auto bit : lut_d.first)
+						bit = (bit == State::S1) ? State::S0 : State::S1;
 				}
 
 				LutData lut_d_post_ce;
diff --git a/techlibs/xilinx/xilinx_dsp.cc b/techlibs/xilinx/xilinx_dsp.cc
index f95930a90..22e6bce5b 100644
--- a/techlibs/xilinx/xilinx_dsp.cc
+++ b/techlibs/xilinx/xilinx_dsp.cc
@@ -343,7 +343,7 @@ void xilinx_dsp_pack(xilinx_dsp_pm &pm)
 			// Since B is an exact power of 2, subtract 1
 			//   by inverting all bits up until hitting
 			//   that one hi bit
-			for (auto &b : B.bits())
+			for (auto b : B)
 				if (b == State::S0) b = State::S1;
 				else if (b == State::S1) {
 					b = State::S0;
@@ -392,7 +392,7 @@ void xilinx_dsp_pack(xilinx_dsp_pm &pm)
 					continue;
 				for (int i = c.offset; i < c.offset+c.width; i++) {
 					log_assert(it->second[i] == State::S0 || it->second[i] == State::Sx);
-					it->second.bits()[i] = State::Sx;
+					it->second.set(i, State::Sx);
 				}
 			}
 		};
@@ -579,7 +579,7 @@ void xilinx_dsp48a_pack(xilinx_dsp48a_pm &pm)
 					continue;
 				for (int i = c.offset; i < c.offset+c.width; i++) {
 					log_assert(it->second[i] == State::S0 || it->second[i] == State::Sx);
-					it->second.bits()[i] = State::Sx;
+					it->second.set(i, State::Sx);
 				}
 			}
 		};
@@ -702,7 +702,7 @@ void xilinx_dsp_packC(xilinx_dsp_CREG_pm &pm)
 					continue;
 				for (int i = c.offset; i < c.offset+c.width; i++) {
 					log_assert(it->second[i] == State::S0 || it->second[i] == State::Sx);
-					it->second.bits()[i] = State::Sx;
+					it->second.set(i, State::Sx);
 				}
 			}
 		};
diff --git a/techlibs/xilinx/xilinx_srl.cc b/techlibs/xilinx/xilinx_srl.cc
index 32a0064a6..2c23f8f42 100644
--- a/techlibs/xilinx/xilinx_srl.cc
+++ b/techlibs/xilinx/xilinx_srl.cc
@@ -40,9 +40,8 @@ void run_fixed(xilinx_srl_pm &pm)
 			log_assert(Q.wire);
 			auto it = Q.wire->attributes.find(ID::init);
 			if (it != Q.wire->attributes.end()) {
-				auto &i = it->second.bits()[Q.offset];
-				initval.append(i);
-				i = State::Sx;
+				initval.append(it->second[Q.offset]);
+				it->second.set(Q.offset, State::Sx);
 			}
 			else
 				initval.append(State::Sx);
@@ -121,9 +120,8 @@ void run_variable(xilinx_srl_pm &pm)
 			log_assert(Q.wire);
 			auto it = Q.wire->attributes.find(ID::init);
 			if (it != Q.wire->attributes.end()) {
-				auto &i = it->second.bits()[Q.offset];
-				initval.append(i);
-				i = State::Sx;
+				initval.append(it->second[Q.offset]);
+				it->second.set(Q.offset, State::Sx);
 			}
 			else
 				initval.append(State::Sx);

From 9493292690544ad6f0dc76ddcd04d8e677e2211a Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 01:56:27 +0000
Subject: [PATCH 533/931] Update tests to avoid bits()

---
 tests/unit/kernel/rtlilTest.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index 6a5f75a95..a9b7c3ada 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -80,10 +80,10 @@ namespace RTLIL {
 			EXPECT_EQ(i, 16);
 			EXPECT_TRUE(cs1.is_str());
 
-			// It can be mutated with the bits() view
-			// and decays into unpacked
-			for (auto& bit : cs1.bits()) {
-				bit = State::Sx;
+			// It can be mutated via bit iteration and decays into unpacked
+			// when an non-defined bit is set.
+			for (auto b : cs1) {
+				b = State::Sx;
 			}
 			EXPECT_TRUE(cs1.is_bits());
 		}

From 1e244cd78acc6695154f925369ac1109e5e249ed Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 05:21:21 +0000
Subject: [PATCH 534/931] Deprecate Const::bits()

---
 kernel/rtlil.cc | 2 +-
 kernel/rtlil.h  | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 62f7ae4f7..22467fa8e 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -378,7 +378,7 @@ bool RTLIL::Const::operator !=(const RTLIL::Const &other) const
 	return !(*this == other);
 }
 
-std::vector<RTLIL::State>& RTLIL::Const::bits()
+std::vector<RTLIL::State>& RTLIL::Const::bits_internal()
 {
 	bitvectorize();
 	return get_bits();
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index b7776f378..02c8190dc 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -837,6 +837,8 @@ private:
 
 	bitvectype& get_bits() const;
 	std::string& get_str() const;
+	std::vector<RTLIL::State>& bits_internal();
+
 public:
 	Const() : flags(RTLIL::CONST_FLAG_NONE), tag(backing_tag::bits), bits_(std::vector<RTLIL::State>()) {}
 	Const(const std::string &str);
@@ -864,7 +866,8 @@ public:
 	bool operator ==(const RTLIL::Const &other) const;
 	bool operator !=(const RTLIL::Const &other) const;
 
-	std::vector<RTLIL::State>& bits();
+	[[deprecated]]
+	std::vector<RTLIL::State>& bits() { return bits_internal(); }
 	bool as_bool() const;
 
 	// Convert the constant value to a C++ int.
@@ -897,10 +900,10 @@ public:
 
 	void append(const RTLIL::Const &other);
 	void set(int i, RTLIL::State state) {
-		bits()[i] = state;
+		bits_internal()[i] = state;
 	}
 	void resize(int size, RTLIL::State fill) {
-		bits().resize(size, fill);
+		bits_internal().resize(size, fill);
 	}
 
 	class const_iterator {

From 61caa5e042ecb59770b2e3bcafdda60bc094cbb2 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 28 Aug 2025 06:00:50 +0000
Subject: [PATCH 535/931] Deprecate Const::bitvectorize()

---
 kernel/rtlil.cc | 26 +++++++++++++-------------
 kernel/rtlil.h  |  7 +++++--
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 22467fa8e..0afe2a3c0 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -380,7 +380,7 @@ bool RTLIL::Const::operator !=(const RTLIL::Const &other) const
 
 std::vector<RTLIL::State>& RTLIL::Const::bits_internal()
 {
-	bitvectorize();
+	bitvectorize_internal();
 	return get_bits();
 }
 
@@ -394,7 +394,7 @@ std::vector<RTLIL::State> RTLIL::Const::to_bits() const
 
 bool RTLIL::Const::as_bool() const
 {
-	bitvectorize();
+	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 	for (size_t i = 0; i < bv.size(); i++)
 		if (bv[i] == State::S1)
@@ -404,7 +404,7 @@ bool RTLIL::Const::as_bool() const
 
 int RTLIL::Const::as_int(bool is_signed) const
 {
-	bitvectorize();
+	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 	int32_t ret = 0;
 	for (size_t i = 0; i < bv.size() && i < 32; i++)
@@ -496,7 +496,7 @@ std::optional<int> RTLIL::Const::as_int_compress(bool is_signed) const
 
 std::string RTLIL::Const::as_string(const char* any) const
 {
-	bitvectorize();
+	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 	std::string ret;
 	ret.reserve(bv.size());
@@ -534,7 +534,7 @@ std::string RTLIL::Const::decode_string() const
 	if (auto str = get_if_str())
 		return *str;
 
-	bitvectorize();
+	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 	const int n = GetSize(bv);
 	const int n_over_8 = n / 8;
@@ -583,7 +583,7 @@ bool RTLIL::Const::empty() const {
 	}
 }
 
-void RTLIL::Const::bitvectorize() const {
+void RTLIL::Const::bitvectorize_internal() const {
 	if (tag == backing_tag::bits)
 		return;
 
@@ -609,7 +609,7 @@ void RTLIL::Const::bitvectorize() const {
 }
 
 void RTLIL::Const::append(const RTLIL::Const &other) {
-	bitvectorize();
+	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 	bv.insert(bv.end(), other.begin(), other.end());
 }
@@ -625,7 +625,7 @@ RTLIL::State RTLIL::Const::const_iterator::operator*() const {
 
 bool RTLIL::Const::is_fully_zero() const
 {
-	bitvectorize();
+	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 	cover("kernel.rtlil.const.is_fully_zero");
 
@@ -638,7 +638,7 @@ bool RTLIL::Const::is_fully_zero() const
 
 bool RTLIL::Const::is_fully_ones() const
 {
-	bitvectorize();
+	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 	cover("kernel.rtlil.const.is_fully_ones");
 
@@ -653,7 +653,7 @@ bool RTLIL::Const::is_fully_def() const
 {
 	cover("kernel.rtlil.const.is_fully_def");
 
-	bitvectorize();
+	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 
 	for (const auto &bit : bv)
@@ -667,7 +667,7 @@ bool RTLIL::Const::is_fully_undef() const
 {
 	cover("kernel.rtlil.const.is_fully_undef");
 
-	bitvectorize();
+	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 
 	for (const auto &bit : bv)
@@ -681,7 +681,7 @@ bool RTLIL::Const::is_fully_undef_x_only() const
 {
 	cover("kernel.rtlil.const.is_fully_undef_x_only");
 
-	bitvectorize();
+	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 
 	for (const auto &bit : bv)
@@ -695,7 +695,7 @@ bool RTLIL::Const::is_onehot(int *pos) const
 {
 	cover("kernel.rtlil.const.is_onehot");
 
-	bitvectorize();
+	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 
 	bool found = false;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 02c8190dc..0691ac2a6 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -838,6 +838,7 @@ private:
 	bitvectype& get_bits() const;
 	std::string& get_str() const;
 	std::vector<RTLIL::State>& bits_internal();
+	void bitvectorize_internal() const;
 
 public:
 	Const() : flags(RTLIL::CONST_FLAG_NONE), tag(backing_tag::bits), bits_(std::vector<RTLIL::State>()) {}
@@ -866,8 +867,11 @@ public:
 	bool operator ==(const RTLIL::Const &other) const;
 	bool operator !=(const RTLIL::Const &other) const;
 
-	[[deprecated]]
+	[[deprecated("Don't use direct access to the internal std::vector<State>, that's an implementation detail.")]]
 	std::vector<RTLIL::State>& bits() { return bits_internal(); }
+	[[deprecated("Don't call bitvectorize() directly, it's an implementation detail.")]]
+	void bitvectorize() const { bitvectorize_internal(); }
+
 	bool as_bool() const;
 
 	// Convert the constant value to a C++ int.
@@ -896,7 +900,6 @@ public:
 	std::string decode_string() const;
 	int size() const;
 	bool empty() const;
-	void bitvectorize() const;
 
 	void append(const RTLIL::Const &other);
 	void set(int i, RTLIL::State state) {

From b06085ab6c3db59254c0bd2d8dbbf02775b296e1 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 03:08:31 +0000
Subject: [PATCH 536/931] Make Const::Const(long long) constructor use packed
 bits internally if possible

---
 kernel/rtlil.cc                | 25 +++++++++++++++++++++++++
 kernel/rtlil.h                 |  3 ++-
 tests/unit/kernel/rtlilTest.cc | 25 +++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 0afe2a3c0..b07468e12 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -257,9 +257,34 @@ RTLIL::Const::Const(const std::string &str)
 	tag = backing_tag::string;
 }
 
+RTLIL::Const::Const(long long val) // default width 32
+{
+	flags = RTLIL::CONST_FLAG_NONE;
+	char bytes[] = {
+		(char)(val >> 24), (char)(val >> 16), (char)(val >> 8), (char)val
+	};
+	new ((void*)&str_) std::string(bytes, 4);
+	tag = backing_tag::string;
+}
+
 RTLIL::Const::Const(long long val, int width)
 {
 	flags = RTLIL::CONST_FLAG_NONE;
+	if ((width & 7) == 0) {
+		new ((void*)&str_) std::string();
+		tag = backing_tag::string;
+		std::string& str = get_str();
+		int bytes = width >> 3;
+		signed char sign_byte = val < 0 ? -1 : 0;
+		str.resize(bytes, sign_byte);
+		bytes = std::min<int>(bytes, sizeof(val));
+		for (int i = 0; i < bytes; i++) {
+			str[str.size() - 1 - i] = val;
+			val = val >> 8;
+		}
+		return;
+	}
+
 	new ((void*)&bits_) bitvectype();
 	tag = backing_tag::bits;
 	bitvectype& bv = get_bits();
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 0691ac2a6..6bb6f1fe1 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -843,7 +843,8 @@ private:
 public:
 	Const() : flags(RTLIL::CONST_FLAG_NONE), tag(backing_tag::bits), bits_(std::vector<RTLIL::State>()) {}
 	Const(const std::string &str);
-	Const(long long val, int width = 32);
+	Const(long long val); // default width is 32
+	Const(long long val, int width);
 	Const(RTLIL::State bit, int width = 1);
 	Const(std::vector<RTLIL::State> bits) : flags(RTLIL::CONST_FLAG_NONE), tag(backing_tag::bits), bits_(std::move(bits)) {}
 	Const(const std::vector<bool> &bits);
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index a9b7c3ada..0b7fbfd37 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -88,6 +88,31 @@ namespace RTLIL {
 			EXPECT_TRUE(cs1.is_bits());
 		}
 
+		{
+			Const c(0x12345678);
+			EXPECT_TRUE(c.is_str());
+			EXPECT_EQ(c.as_int(), 0x12345678);
+		}
+
+		{
+			Const c(0xab, 8);
+			EXPECT_TRUE(c.is_str());
+			EXPECT_EQ(c.as_int(), 0xab);
+		}
+
+		{
+			Const c(0x12345678, 80);
+			EXPECT_TRUE(c.is_str());
+			EXPECT_EQ(c.as_int(), 0x12345678);
+			EXPECT_EQ(c[79], S0);
+		}
+
+		{
+			Const c(-1, 80);
+			EXPECT_TRUE(c.is_str());
+			EXPECT_EQ(c.as_int(), -1);
+			EXPECT_EQ(c[79], S1);
+		}
 	}
 
 	TEST_F(KernelRtlilTest, ConstConstIteratorWorks) {

From b597ad777e6ab306f82e3cfa521454f29a8c19c5 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 03:09:19 +0000
Subject: [PATCH 537/931] Make Const::as_bool and Const::as_int work with
 packed bits without decaying to vector<State>

---
 kernel/rtlil.cc                | 34 +++++++++++++++++++++++++---------
 tests/unit/kernel/rtlilTest.cc | 11 +++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index b07468e12..1228e738f 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -419,7 +419,13 @@ std::vector<RTLIL::State> RTLIL::Const::to_bits() const
 
 bool RTLIL::Const::as_bool() const
 {
-	bitvectorize_internal();
+	if (is_str()) {
+		for (char ch : get_str())
+			if (ch != 0)
+				return true;
+		return false;
+	}
+
 	bitvectype& bv = get_bits();
 	for (size_t i = 0; i < bv.size(); i++)
 		if (bv[i] == State::S1)
@@ -429,15 +435,25 @@ bool RTLIL::Const::as_bool() const
 
 int RTLIL::Const::as_int(bool is_signed) const
 {
-	bitvectorize_internal();
-	bitvectype& bv = get_bits();
 	int32_t ret = 0;
-	for (size_t i = 0; i < bv.size() && i < 32; i++)
+	if (const std::string *s = get_if_str()) {
+		int size = GetSize(*s);
+		// Ignore any bytes after the first 4 since bits beyond 32 are truncated.
+		for (int i = std::min(4, size); i > 0; i--)
+			ret |= static_cast<unsigned char>((*s)[size - i]) << ((i - 1) * 8);
+		// If is_signed and the string is shorter than 4 bytes then apply sign extension.
+		if (is_signed && size > 0 && size < 4 && ((*s)[0] & 0x80))
+			ret |= -1 << size*8;
+		return ret;
+	}
+
+	const bitvectype& bv = get_bits();
+	int significant_bits = std::min(GetSize(bv), 32);
+	for (int i = 0; i < significant_bits; i++)
 		if (bv[i] == State::S1)
 			ret |= 1 << i;
-	if (is_signed && bv.back() == State::S1)
-		for (size_t i = bv.size(); i < 32; i++)
-			ret |= 1 << i;
+	if (is_signed && significant_bits > 0 && significant_bits < 32 && bv.back() == State::S1 )
+		ret |= -1 << significant_bits;
 	return ret;
 }
 
@@ -457,7 +473,7 @@ bool RTLIL::Const::convertible_to_int(bool is_signed) const
 	if (size == 32) {
 		if (is_signed)
 			return true;
-		return get_bits().at(31) != State::S1;
+		return back() != State::S1;
 	}
 
 	return false;
@@ -478,7 +494,7 @@ int RTLIL::Const::as_int_saturating(bool is_signed) const
 
 		const auto min_size = get_min_size(is_signed);
 		log_assert(min_size > 0);
-		const auto neg = get_bits().at(min_size - 1);
+		const auto neg = (*this)[min_size - 1];
 		return neg ? std::numeric_limits<int>::min() : std::numeric_limits<int>::max();
 	}
 	return as_int(is_signed);
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index 0b7fbfd37..99ddf44cc 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -92,12 +92,14 @@ namespace RTLIL {
 			Const c(0x12345678);
 			EXPECT_TRUE(c.is_str());
 			EXPECT_EQ(c.as_int(), 0x12345678);
+			EXPECT_TRUE(c.is_str());
 		}
 
 		{
 			Const c(0xab, 8);
 			EXPECT_TRUE(c.is_str());
 			EXPECT_EQ(c.as_int(), 0xab);
+			EXPECT_TRUE(c.is_str());
 		}
 
 		{
@@ -105,6 +107,7 @@ namespace RTLIL {
 			EXPECT_TRUE(c.is_str());
 			EXPECT_EQ(c.as_int(), 0x12345678);
 			EXPECT_EQ(c[79], S0);
+			EXPECT_TRUE(c.is_str());
 		}
 
 		{
@@ -112,6 +115,14 @@ namespace RTLIL {
 			EXPECT_TRUE(c.is_str());
 			EXPECT_EQ(c.as_int(), -1);
 			EXPECT_EQ(c[79], S1);
+			EXPECT_TRUE(c.is_str());
+		}
+
+		{
+			Const c(1 << 24);
+			EXPECT_TRUE(c.is_str());
+			EXPECT_TRUE(c.as_bool());
+			EXPECT_TRUE(c.is_str());
 		}
 	}
 

From 9ad83cc67b0e1a1f1bbf181a64f2a37450410dab Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 03:29:44 +0000
Subject: [PATCH 538/931] Fast path for Const::operator==

---
 kernel/rtlil.cc                |  5 +++++
 tests/unit/kernel/rtlilTest.cc | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 1228e738f..f0653e91a 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -388,6 +388,11 @@ bool RTLIL::Const::operator<(const RTLIL::Const &other) const
 
 bool RTLIL::Const::operator ==(const RTLIL::Const &other) const
 {
+	if (is_str() && other.is_str())
+		return get_str() == other.get_str();
+	if (is_bits() && other.is_bits())
+		return get_bits() == other.get_bits();
+
 	if (size() != other.size())
 		return false;
 
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index 99ddf44cc..b2b2e7076 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -204,6 +204,24 @@ namespace RTLIL {
 		EXPECT_EQ(c, Const(0xe, 4));
 	}
 
+	TEST_F(KernelRtlilTest, ConstEqualStr) {
+		EXPECT_EQ(Const("abc"), Const("abc"));
+		EXPECT_NE(Const("abc"), Const("def"));
+	}
+
+	TEST_F(KernelRtlilTest, ConstEqualBits) {
+		std::vector<State> v1 = {S0, S1};
+		std::vector<State> v2 = {S1, S0};
+		EXPECT_EQ(Const(v1), Const(v1));
+		EXPECT_NE(Const(v1), Const(v2));
+	}
+
+	TEST_F(KernelRtlilTest, ConstEqualStrBits) {
+		std::vector<State> v1 = {S0, S0, S0, S0, S0, S1, S0, S0};
+		EXPECT_EQ(Const(v1), Const(" "));
+		EXPECT_NE(Const(v1), Const("a"));
+	}
+
 	class WireRtlVsHdlIndexConversionTest :
 		public KernelRtlilTest,
 		public testing::WithParamInterface<std::tuple<bool, int, int>>

From 1a367b907cd5ddb8a0d28457ad9e6f2e3cfb3105 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 03:34:17 +0000
Subject: [PATCH 539/931] Use fast path for 32-bit Const integer constructor in
 more places

---
 frontends/json/jsonparse.cc          | 2 +-
 frontends/rtlil/rtlil_parser.y       | 2 +-
 frontends/verific/verific.cc         | 8 ++++----
 kernel/rtlil.h                       | 3 ++-
 techlibs/ice40/ice40_dsp.cc          | 2 +-
 techlibs/quicklogic/ql_bram_merge.cc | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontends/json/jsonparse.cc b/frontends/json/jsonparse.cc
index f2faa669b..743ac5d9e 100644
--- a/frontends/json/jsonparse.cc
+++ b/frontends/json/jsonparse.cc
@@ -258,7 +258,7 @@ Const json_parse_attr_param_value(JsonNode *node)
 		}
 	} else
 	if (node->type == 'N') {
-		value = Const(node->data_number, 32);
+		value = Const(node->data_number);
 		if (node->data_number < 0)
 			value.flags |= RTLIL::CONST_FLAG_SIGNED;
 	} else
diff --git a/frontends/rtlil/rtlil_parser.y b/frontends/rtlil/rtlil_parser.y
index 4f0fb3b97..2b8d7b7ab 100644
--- a/frontends/rtlil/rtlil_parser.y
+++ b/frontends/rtlil/rtlil_parser.y
@@ -465,7 +465,7 @@ constant:
 		free($1);
 	} |
 	TOK_INT {
-		$$ = new RTLIL::Const($1, 32);
+		$$ = new RTLIL::Const($1);
 	} |
 	TOK_STRING {
 		$$ = new RTLIL::Const($1);
diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 9e3436c14..8bb34582e 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -267,13 +267,13 @@ static const RTLIL::Const extract_vhdl_bit_vector(std::string &val, std::string
 static const RTLIL::Const extract_vhdl_integer(std::string &val)
 {
 	char *end;
-	return RTLIL::Const((int)std::strtol(val.c_str(), &end, 10), 32);
+	return RTLIL::Const((int)std::strtol(val.c_str(), &end, 10));
 }
 
 static const RTLIL::Const extract_vhdl_char(std::string &val)
 {
 	if (val.size()==3 && val[0]=='\"' && val.back()=='\"')
-		return RTLIL::Const((int)val[1], 32);
+		return RTLIL::Const((int)val[1]);
 	log_error("Error parsing VHDL character.\n");
 }
 
@@ -311,7 +311,7 @@ static const  RTLIL::Const extract_vhdl_const(const char *value, bool output_sig
 	} else if ((value[0] == '-' || (value[0] >= '0' && value[0] <= '9')) &&
 			((decimal = std::strtol(value, &end, 10)), !end[0])) {
 		is_signed = output_signed;
-		c = RTLIL::Const((int)decimal, 32);
+		c = RTLIL::Const((int)decimal);
 	} else if (val == "false") {
 		c = RTLIL::Const::from_string("0");
 	} else if (val == "true") {
@@ -344,7 +344,7 @@ static const  RTLIL::Const extract_verilog_const(const char *value, bool allow_s
 	} else if ((value[0] == '-' || (value[0] >= '0' && value[0] <= '9')) &&
 			((decimal = std::strtol(value, &end, 10)), !end[0])) {
 		is_signed = output_signed;
-		c = RTLIL::Const((int)decimal, 32);
+		c = RTLIL::Const((int)decimal);
 	} else if (allow_string) {
 		c = RTLIL::Const(val);
 	} else {
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 6bb6f1fe1..fca32508d 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1112,7 +1112,8 @@ struct RTLIL::SigChunk
 	SigChunk(RTLIL::Wire *wire) : wire(wire), width(GetSize(wire)), offset(0) {}
 	SigChunk(RTLIL::Wire *wire, int offset, int width = 1) : wire(wire), width(width), offset(offset) {}
 	SigChunk(const std::string &str) : SigChunk(RTLIL::Const(str)) {}
-	SigChunk(int val, int width = 32) : SigChunk(RTLIL::Const(val, width)) {}
+	SigChunk(int val) /*default width 32*/ : SigChunk(RTLIL::Const(val)) {}
+	SigChunk(int val, int width) : SigChunk(RTLIL::Const(val, width)) {}
 	SigChunk(RTLIL::State bit, int width = 1) : SigChunk(RTLIL::Const(bit, width)) {}
 	SigChunk(const RTLIL::SigBit &bit);
 
diff --git a/techlibs/ice40/ice40_dsp.cc b/techlibs/ice40/ice40_dsp.cc
index 3f00028c3..995cdb97e 100644
--- a/techlibs/ice40/ice40_dsp.cc
+++ b/techlibs/ice40/ice40_dsp.cc
@@ -82,7 +82,7 @@ void create_ice40_dsp(ice40_dsp_pm &pm)
 
 	SigSpec CD = st.sigCD;
 	if (CD.empty())
-		CD = RTLIL::Const(0, 32);
+		CD = RTLIL::Const(0);
 	else
 		log_assert(GetSize(CD) == 32);
 
diff --git a/techlibs/quicklogic/ql_bram_merge.cc b/techlibs/quicklogic/ql_bram_merge.cc
index bed1ba572..7b99d74e5 100644
--- a/techlibs/quicklogic/ql_bram_merge.cc
+++ b/techlibs/quicklogic/ql_bram_merge.cc
@@ -45,7 +45,7 @@ struct QlBramMergeWorker {
 		{
 			if(cell->type != split_cell_type) continue;
 			if(!cell->hasParam(ID(OPTION_SPLIT))) continue;
-			if(cell->getParam(ID(OPTION_SPLIT)) != RTLIL::Const(1, 32)) continue;
+			if(cell->getParam(ID(OPTION_SPLIT)) != RTLIL::Const(1)) continue;
 			mergeable_groups[get_key(cell)].insert(cell);
 		}
 	}

From 67a274ed1f499cec716f4f9a2f163786a85c62ae Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 03:48:16 +0000
Subject: [PATCH 540/931] Optimize Const::hash_into to hash packed bits
 efficiently

---
 kernel/rtlil.cc                | 34 ++++++++++++++++++++++++++++++++++
 kernel/rtlil.h                 |  7 +------
 tests/unit/kernel/rtlilTest.cc | 12 ++++++++++++
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index f0653e91a..f2ac1dee8 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -760,6 +760,40 @@ bool RTLIL::Const::is_onehot(int *pos) const
 	return found;
 }
 
+Hasher RTLIL::Const::hash_into(Hasher h) const
+{
+	if (auto str = get_if_str())
+		return hashlib::hash_ops<std::string>::hash_into(*str, h);
+
+	// If the bits are all 0/1, hash packed bits using the string hash.
+	// Otherwise hash the leading packed bits with the rest of the bits individually.
+	bitvectype &bv = get_bits();
+	int size = GetSize(bv);
+	std::string packed;
+	int packed_size = (size + 7) >> 3;
+	packed.resize(packed_size, 0);
+	for (int bi = 0; bi < packed_size; ++bi) {
+		char ch = 0;
+		int end = std::min((bi + 1)*8, size);
+		for (int i = bi*8; i < end; ++i) {
+			RTLIL::State b = bv[i];
+			if (b > RTLIL::State::S1) {
+				// Hash the packed bits we've seen so far, plus the remaining bits.
+				h = hashlib::hash_ops<std::string>::hash_into(packed, h);
+				h = hashlib::hash_ops<char>::hash_into(ch, h);
+				for (; i < size; ++i) {
+					h = hashlib::hash_ops<RTLIL::State>::hash_into(bv[i], h);
+				}
+				h.eat(size);
+				return h;
+			}
+			ch |= static_cast<int>(b) << (i & 7);
+		}
+		packed[packed_size - 1 - bi] = ch;
+	}
+	return hashlib::hash_ops<std::string>::hash_into(packed, h);
+}
+
 RTLIL::Const RTLIL::Const::extract(int offset, int len, RTLIL::State padding) const {
 	bitvectype ret_bv;
 	ret_bv.reserve(len);
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index fca32508d..f4c84dbfa 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1052,12 +1052,7 @@ public:
 		resize(width, empty() ? RTLIL::State::Sx : back());
 	}
 
-	[[nodiscard]] Hasher hash_into(Hasher h) const {
-		h.eat(size());
-		for (auto b : *this)
-			h.eat(b);
-		return h;
-	}
+	[[nodiscard]] Hasher hash_into(Hasher h) const;
 };
 
 struct RTLIL::AttrObject
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index b2b2e7076..4d8736ea3 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -222,6 +222,18 @@ namespace RTLIL {
 		EXPECT_NE(Const(v1), Const("a"));
 	}
 
+	static Hasher::hash_t hash(const Const &c) {
+		Hasher h;
+		h = c.hash_into(h);
+		return h.yield();
+	}
+
+	TEST_F(KernelRtlilTest, ConstEqualHashStrBits) {
+		std::vector<State> v1 = {S0, S0, S0, S0, S0, S1, S0, S0};
+		EXPECT_EQ(hash(Const(v1)), hash(Const(" ")));
+		EXPECT_NE(hash(Const(v1)), hash(Const("a")));
+	}
+
 	class WireRtlVsHdlIndexConversionTest :
 		public KernelRtlilTest,
 		public testing::WithParamInterface<std::tuple<bool, int, int>>

From f61e3377a93623934f5368f57ad3286050d155c4 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 04:13:23 +0000
Subject: [PATCH 541/931] Hash strings 8 bytes at a time

---
 kernel/hashlib.h | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index 92188a220..c95ce1e7b 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -168,8 +168,17 @@ struct hash_ops {
 		} else if constexpr (std::is_pointer_v<T>) {
 			return hash_ops<uintptr_t>::hash_into((uintptr_t) a, h);
 		} else if constexpr (std::is_same_v<T, std::string>) {
-			for (auto c : a)
-				h.hash32(c);
+			int size = a.size();
+			int i = 0;
+			while (i + 8 < size) {
+				uint64_t v;
+				memcpy(&v, a.data() + i, 8);
+				h.hash64(v);
+				i += 8;
+			}
+			uint64_t v = 0;
+			memcpy(&v, a.data() + i, size - i);
+			h.hash64(v);
 			return h;
 		} else {
 			return a.hash_into(h);

From cb1186aac52a5797e2f5f4ccde3f47b34f4bc7d6 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 04:40:22 +0000
Subject: [PATCH 542/931] Make Const::as_string work without reducing packed
 bits to vector<State>

---
 kernel/rtlil.cc                | 19 +++++++++----------
 tests/unit/kernel/rtlilTest.cc |  7 +++++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index f2ac1dee8..7a65a6db6 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -542,18 +542,17 @@ std::optional<int> RTLIL::Const::as_int_compress(bool is_signed) const
 
 std::string RTLIL::Const::as_string(const char* any) const
 {
-	bitvectorize_internal();
-	bitvectype& bv = get_bits();
+	int sz = size();
 	std::string ret;
-	ret.reserve(bv.size());
-	for (size_t i = bv.size(); i > 0; i--)
-		switch (bv[i-1]) {
-			case S0: ret += "0"; break;
-			case S1: ret += "1"; break;
-			case Sx: ret += "x"; break;
-			case Sz: ret += "z"; break;
+	ret.reserve(sz);
+	for (int i = sz - 1; i >= 0; --i)
+		switch ((*this)[i]) {
+			case S0: ret.push_back('0'); break;
+			case S1: ret.push_back('1'); break;
+			case Sx: ret.push_back('x'); break;
+			case Sz: ret.push_back('z'); break;
 			case Sa: ret += any; break;
-			case Sm: ret += "m"; break;
+			case Sm: ret.push_back('m'); break;
 		}
 	return ret;
 }
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index 4d8736ea3..366d022de 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -124,6 +124,13 @@ namespace RTLIL {
 			EXPECT_TRUE(c.as_bool());
 			EXPECT_TRUE(c.is_str());
 		}
+
+		{
+			Const c(0x2, 8);
+			EXPECT_TRUE(c.is_str());
+			EXPECT_EQ(c.as_string(), "00000010");
+			EXPECT_TRUE(c.is_str());
+		}
 	}
 
 	TEST_F(KernelRtlilTest, ConstConstIteratorWorks) {

From caaf9a4400e7feb7764120c05a31e57a4c571ff7 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 04:42:52 +0000
Subject: [PATCH 543/931] Const::decode_string() doesn't need to call
 bitvectorize

---
 kernel/rtlil.cc                |  1 -
 tests/unit/kernel/rtlilTest.cc | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 7a65a6db6..7530644ec 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -579,7 +579,6 @@ std::string RTLIL::Const::decode_string() const
 	if (auto str = get_if_str())
 		return *str;
 
-	bitvectorize_internal();
 	bitvectype& bv = get_bits();
 	const int n = GetSize(bv);
 	const int n_over_8 = n / 8;
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index 366d022de..5f8c0dd06 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -131,6 +131,32 @@ namespace RTLIL {
 			EXPECT_EQ(c.as_string(), "00000010");
 			EXPECT_TRUE(c.is_str());
 		}
+
+		{
+			Const c(" ");
+			EXPECT_TRUE(c.is_str());
+			EXPECT_EQ(c.decode_string(), " ");
+			EXPECT_TRUE(c.is_str());
+		}
+
+		{
+			Const c(" ");
+			EXPECT_TRUE(c.is_str());
+			EXPECT_EQ(c.decode_string(), " ");
+			EXPECT_TRUE(c.is_str());
+		}
+
+		{
+			std::vector<State> v = {S0, S0, S0, S0, S0, S1, S0, S0};
+			Const c(v);
+			EXPECT_EQ(c.decode_string(), " ");
+		}
+
+		{
+			std::vector<State> v = {S0, S0, S0, S0, S0, S1, S0, Sx};
+			Const c(v);
+			EXPECT_EQ(c.decode_string(), " ");
+		}
 	}
 
 	TEST_F(KernelRtlilTest, ConstConstIteratorWorks) {

From 29810f1e7ccb8e934e372d0ec91a987c4c051249 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 04:50:35 +0000
Subject: [PATCH 544/931] Make Const::is_*() functions work on packed bits
 without decaying to vector<State>

---
 kernel/rtlil.cc                | 44 ++++++++++------
 tests/unit/kernel/rtlilTest.cc | 91 ++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+), 15 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 7530644ec..7ced8fba6 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -669,10 +669,17 @@ RTLIL::State RTLIL::Const::const_iterator::operator*() const {
 
 bool RTLIL::Const::is_fully_zero() const
 {
-	bitvectorize_internal();
-	bitvectype& bv = get_bits();
 	cover("kernel.rtlil.const.is_fully_zero");
 
+	if (auto str = get_if_str()) {
+		for (char ch : *str)
+			if (ch != 0)
+				return false;
+		return true;
+	}
+
+	bitvectype& bv = get_bits();
+
 	for (const auto &bit : bv)
 		if (bit != RTLIL::State::S0)
 			return false;
@@ -682,10 +689,16 @@ bool RTLIL::Const::is_fully_zero() const
 
 bool RTLIL::Const::is_fully_ones() const
 {
-	bitvectorize_internal();
-	bitvectype& bv = get_bits();
 	cover("kernel.rtlil.const.is_fully_ones");
 
+	if (auto str = get_if_str()) {
+		for (char ch : *str)
+			if (ch != (char)0xff)
+				return false;
+		return true;
+	}
+
+	bitvectype& bv = get_bits();
 	for (const auto &bit : bv)
 		if (bit != RTLIL::State::S1)
 			return false;
@@ -697,9 +710,10 @@ bool RTLIL::Const::is_fully_def() const
 {
 	cover("kernel.rtlil.const.is_fully_def");
 
-	bitvectorize_internal();
-	bitvectype& bv = get_bits();
+	if (is_str())
+		return true;
 
+	bitvectype& bv = get_bits();
 	for (const auto &bit : bv)
 		if (bit != RTLIL::State::S0 && bit != RTLIL::State::S1)
 			return false;
@@ -711,9 +725,10 @@ bool RTLIL::Const::is_fully_undef() const
 {
 	cover("kernel.rtlil.const.is_fully_undef");
 
-	bitvectorize_internal();
-	bitvectype& bv = get_bits();
+	if (auto str = get_if_str())
+		return str->empty();
 
+	bitvectype& bv = get_bits();
 	for (const auto &bit : bv)
 		if (bit != RTLIL::State::Sx && bit != RTLIL::State::Sz)
 			return false;
@@ -725,9 +740,10 @@ bool RTLIL::Const::is_fully_undef_x_only() const
 {
 	cover("kernel.rtlil.const.is_fully_undef_x_only");
 
-	bitvectorize_internal();
-	bitvectype& bv = get_bits();
+	if (auto str = get_if_str())
+		return str->empty();
 
+	bitvectype& bv = get_bits();
 	for (const auto &bit : bv)
 		if (bit != RTLIL::State::Sx)
 			return false;
@@ -739,12 +755,10 @@ bool RTLIL::Const::is_onehot(int *pos) const
 {
 	cover("kernel.rtlil.const.is_onehot");
 
-	bitvectorize_internal();
-	bitvectype& bv = get_bits();
-
 	bool found = false;
-	for (int i = 0; i < GetSize(*this); i++) {
-		auto &bit = bv[i];
+	int size = GetSize(*this);
+	for (int i = 0; i < size; i++) {
+		State bit = (*this)[i];
 		if (bit != RTLIL::State::S0 && bit != RTLIL::State::S1)
 			return false;
 		if (bit == RTLIL::State::S1) {
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index 5f8c0dd06..97cc936de 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -157,6 +157,50 @@ namespace RTLIL {
 			Const c(v);
 			EXPECT_EQ(c.decode_string(), " ");
 		}
+
+		{
+			Const c(" ");
+			EXPECT_TRUE(c.is_str());
+			EXPECT_FALSE(c.is_fully_zero());
+			EXPECT_TRUE(c.is_str());
+		}
+
+		{
+			Const c(" ");
+			EXPECT_TRUE(c.is_str());
+			EXPECT_FALSE(c.is_fully_ones());
+			EXPECT_TRUE(c.is_str());
+		}
+
+		{
+			Const c(" ");
+			EXPECT_TRUE(c.is_str());
+			EXPECT_TRUE(c.is_fully_def());
+			EXPECT_TRUE(c.is_str());
+		}
+
+		{
+			Const c(" ");
+			EXPECT_TRUE(c.is_str());
+			EXPECT_FALSE(c.is_fully_undef());
+			EXPECT_TRUE(c.is_str());
+		}
+
+		{
+			Const c(" ");
+			EXPECT_TRUE(c.is_str());
+			EXPECT_FALSE(c.is_fully_undef_x_only());
+			EXPECT_TRUE(c.is_str());
+		}
+
+		{
+			Const c(" ");
+			EXPECT_TRUE(c.is_str());
+			int pos;
+			EXPECT_TRUE(c.is_onehot(&pos));
+			EXPECT_EQ(pos, 5);
+			EXPECT_TRUE(c.is_str());
+		}
 	}
 
 	TEST_F(KernelRtlilTest, ConstConstIteratorWorks) {
@@ -267,6 +311,53 @@ namespace RTLIL {
 		EXPECT_NE(hash(Const(v1)), hash(Const("a")));
 	}
 
+	TEST_F(KernelRtlilTest, ConstIsFullyZero) {
+		EXPECT_TRUE(Const(0, 8).is_fully_zero());
+		EXPECT_FALSE(Const(8, 8).is_fully_zero());
+		EXPECT_TRUE(Const().is_fully_zero());
+	}
+
+	TEST_F(KernelRtlilTest, ConstIsFullyOnes) {
+		EXPECT_TRUE(Const(0xf, 4).is_fully_ones());
+		EXPECT_FALSE(Const(3, 4).is_fully_ones());
+		EXPECT_TRUE(Const().is_fully_ones());
+	}
+
+	TEST_F(KernelRtlilTest, ConstIsFullyDef) {
+		EXPECT_TRUE(Const(0xf, 4).is_fully_def());
+		std::vector<State> v1 = {S0, Sx};
+		EXPECT_FALSE(Const(v1).is_fully_def());
+		EXPECT_TRUE(Const().is_fully_def());
+	}
+
+	TEST_F(KernelRtlilTest, ConstIsFullyUndef) {
+		std::vector<State> v1 = {S0, Sx};
+		EXPECT_FALSE(Const(v1).is_fully_undef());
+		EXPECT_TRUE(Const(Sz, 2).is_fully_undef());
+		EXPECT_TRUE(Const().is_fully_undef());
+	}
+
+	TEST_F(KernelRtlilTest, ConstIsFullyUndefXOnly) {
+		std::vector<State> v1 = {Sx, Sz};
+		EXPECT_FALSE(Const(v1).is_fully_undef_x_only());
+		EXPECT_TRUE(Const(Sx, 2).is_fully_undef_x_only());
+		EXPECT_TRUE(Const().is_fully_undef_x_only());
+	}
+
+	TEST_F(KernelRtlilTest, ConstIsOnehot) {
+		int pos;
+		EXPECT_TRUE(Const(0x80, 8).is_onehot(&pos));
+		EXPECT_EQ(pos, 7);
+		EXPECT_FALSE(Const(0x82, 8).is_onehot(&pos));
+		EXPECT_FALSE(Const(0, 8).is_onehot(&pos));
+		EXPECT_TRUE(Const(1, 1).is_onehot(&pos));
+		EXPECT_EQ(pos, 0);
+		EXPECT_FALSE(Const(Sx, 1).is_onehot(&pos));
+		std::vector<State> v1 = {Sx, S1};
+		EXPECT_FALSE(Const(v1).is_onehot(&pos));
+		EXPECT_FALSE(Const().is_onehot(&pos));
+	}
+
 	class WireRtlVsHdlIndexConversionTest :
 		public KernelRtlilTest,
 		public testing::WithParamInterface<std::tuple<bool, int, int>>

From fee2b8992c526fde3a502db2cbd9fb3b614536c8 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 29 Aug 2025 05:56:19 +0000
Subject: [PATCH 545/931] Stop using `mutable` in `Const`.

Now that we only call `bitvectorize()` in non-const methods, we can move the casting-away-const to only happen
in `bitvectorize()`, which is deprecated so only some plugins (maybe) are using it.

This means `const` `Const` methods don't change the underlying data, which means
they'll be safe to use from multiple threads if/when we want to do that.
---
 kernel/rtlil.cc | 36 +++++++++++++++++++++++-------------
 kernel/rtlil.h  | 22 +++++++++++++---------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 7ced8fba6..035701cb9 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -240,12 +240,22 @@ const pool<IdString> &RTLIL::builtin_ff_cell_types() {
 
 #define check(condition) log_assert(condition && "malformed Const union")
 
-Const::bitvectype& Const::get_bits() const {
+const Const::bitvectype& Const::get_bits() const {
 	check(is_bits());
 	return *get_if_bits();
 }
 
-std::string& Const::get_str() const {
+const std::string& Const::get_str() const {
+	check(is_str());
+	return *get_if_str();
+}
+
+Const::bitvectype& Const::get_bits() {
+	check(is_bits());
+	return *get_if_bits();
+}
+
+std::string& Const::get_str() {
 	check(is_str());
 	return *get_if_str();
 }
@@ -431,7 +441,7 @@ bool RTLIL::Const::as_bool() const
 		return false;
 	}
 
-	bitvectype& bv = get_bits();
+	const bitvectype& bv = get_bits();
 	for (size_t i = 0; i < bv.size(); i++)
 		if (bv[i] == State::S1)
 			return true;
@@ -448,7 +458,7 @@ int RTLIL::Const::as_int(bool is_signed) const
 			ret |= static_cast<unsigned char>((*s)[size - i]) << ((i - 1) * 8);
 		// If is_signed and the string is shorter than 4 bytes then apply sign extension.
 		if (is_signed && size > 0 && size < 4 && ((*s)[0] & 0x80))
-			ret |= -1 << size*8;
+			ret |= UINT32_MAX << size*8;
 		return ret;
 	}
 
@@ -458,7 +468,7 @@ int RTLIL::Const::as_int(bool is_signed) const
 		if (bv[i] == State::S1)
 			ret |= 1 << i;
 	if (is_signed && significant_bits > 0 && significant_bits < 32 && bv.back() == State::S1 )
-		ret |= -1 << significant_bits;
+		ret |= UINT32_MAX << significant_bits;
 	return ret;
 }
 
@@ -579,7 +589,7 @@ std::string RTLIL::Const::decode_string() const
 	if (auto str = get_if_str())
 		return *str;
 
-	bitvectype& bv = get_bits();
+	const bitvectype& bv = get_bits();
 	const int n = GetSize(bv);
 	const int n_over_8 = n / 8;
 	std::string s;
@@ -627,7 +637,7 @@ bool RTLIL::Const::empty() const {
 	}
 }
 
-void RTLIL::Const::bitvectorize_internal() const {
+void RTLIL::Const::bitvectorize_internal() {
 	if (tag == backing_tag::bits)
 		return;
 
@@ -678,7 +688,7 @@ bool RTLIL::Const::is_fully_zero() const
 		return true;
 	}
 
-	bitvectype& bv = get_bits();
+	const bitvectype& bv = get_bits();
 
 	for (const auto &bit : bv)
 		if (bit != RTLIL::State::S0)
@@ -698,7 +708,7 @@ bool RTLIL::Const::is_fully_ones() const
 		return true;
 	}
 
-	bitvectype& bv = get_bits();
+	const bitvectype& bv = get_bits();
 	for (const auto &bit : bv)
 		if (bit != RTLIL::State::S1)
 			return false;
@@ -713,7 +723,7 @@ bool RTLIL::Const::is_fully_def() const
 	if (is_str())
 		return true;
 
-	bitvectype& bv = get_bits();
+	const bitvectype& bv = get_bits();
 	for (const auto &bit : bv)
 		if (bit != RTLIL::State::S0 && bit != RTLIL::State::S1)
 			return false;
@@ -728,7 +738,7 @@ bool RTLIL::Const::is_fully_undef() const
 	if (auto str = get_if_str())
 		return str->empty();
 
-	bitvectype& bv = get_bits();
+	const bitvectype& bv = get_bits();
 	for (const auto &bit : bv)
 		if (bit != RTLIL::State::Sx && bit != RTLIL::State::Sz)
 			return false;
@@ -743,7 +753,7 @@ bool RTLIL::Const::is_fully_undef_x_only() const
 	if (auto str = get_if_str())
 		return str->empty();
 
-	bitvectype& bv = get_bits();
+	const bitvectype& bv = get_bits();
 	for (const auto &bit : bv)
 		if (bit != RTLIL::State::Sx)
 			return false;
@@ -779,7 +789,7 @@ Hasher RTLIL::Const::hash_into(Hasher h) const
 
 	// If the bits are all 0/1, hash packed bits using the string hash.
 	// Otherwise hash the leading packed bits with the rest of the bits individually.
-	bitvectype &bv = get_bits();
+	const bitvectype &bv = get_bits();
 	int size = GetSize(bv);
 	std::string packed;
 	int packed_size = (size + 7) >> 3;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index f4c84dbfa..6b4bc0c7d 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -822,23 +822,27 @@ private:
 	using bitvectype = std::vector<RTLIL::State>;
 	enum class backing_tag: bool { bits, string };
 	// Do not access the union or tag even in Const methods unless necessary
-	mutable backing_tag tag;
+	backing_tag tag;
 	union {
-		mutable bitvectype bits_;
-		mutable std::string str_;
+		bitvectype bits_;
+		std::string str_;
 	};
 
 	// Use these private utilities instead
 	bool is_bits() const { return tag == backing_tag::bits; }
 	bool is_str() const { return tag == backing_tag::string; }
 
-	bitvectype* get_if_bits() const { return is_bits() ? &bits_ : NULL; }
-	std::string* get_if_str() const { return is_str() ? &str_ : NULL; }
+	bitvectype* get_if_bits() { return is_bits() ? &bits_ : NULL; }
+	std::string* get_if_str() { return is_str() ? &str_ : NULL; }
+	const bitvectype* get_if_bits() const { return is_bits() ? &bits_ : NULL; }
+	const std::string* get_if_str() const { return is_str() ? &str_ : NULL; }
 
-	bitvectype& get_bits() const;
-	std::string& get_str() const;
+	bitvectype& get_bits();
+	std::string& get_str();
+	const bitvectype& get_bits() const;
+	const std::string& get_str() const;
 	std::vector<RTLIL::State>& bits_internal();
-	void bitvectorize_internal() const;
+	void bitvectorize_internal();
 
 public:
 	Const() : flags(RTLIL::CONST_FLAG_NONE), tag(backing_tag::bits), bits_(std::vector<RTLIL::State>()) {}
@@ -871,7 +875,7 @@ public:
 	[[deprecated("Don't use direct access to the internal std::vector<State>, that's an implementation detail.")]]
 	std::vector<RTLIL::State>& bits() { return bits_internal(); }
 	[[deprecated("Don't call bitvectorize() directly, it's an implementation detail.")]]
-	void bitvectorize() const { bitvectorize_internal(); }
+	void bitvectorize() const { const_cast<Const*>(this)->bitvectorize_internal(); }
 
 	bool as_bool() const;
 

From 11b829ba70f61a5c59abae8e4b6feec34000b74f Mon Sep 17 00:00:00 2001
From: rhanqtl <my@rhanqtl.com>
Date: Thu, 4 Sep 2025 23:19:11 +0800
Subject: [PATCH 546/931] fix(parse): #5234 adjust width of rhs according to
 lhs

---
 kernel/rtlil.cc               |  6 +++++-
 tests/sat/fminit_noexpand.ys  | 10 ++++++++++
 tests/sat/fminit_seq_width.ys | 17 +++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 tests/sat/fminit_noexpand.ys
 create mode 100644 tests/sat/fminit_seq_width.ys

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 035701cb9..586262f97 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5974,7 +5974,11 @@ bool RTLIL::SigSpec::parse_rhs(const RTLIL::SigSpec &lhs, RTLIL::SigSpec &sig, R
 		}
 	}
 
-	return parse(sig, module, str);
+	if (!parse(sig, module, str))
+		return false;
+	if (sig.width_ > lhs.width_)
+		sig.remove(lhs.width_, sig.width_ - lhs.width_);
+	return true;
 }
 
 RTLIL::CaseRule::~CaseRule()
diff --git a/tests/sat/fminit_noexpand.ys b/tests/sat/fminit_noexpand.ys
new file mode 100644
index 000000000..a271c3c59
--- /dev/null
+++ b/tests/sat/fminit_noexpand.ys
@@ -0,0 +1,10 @@
+read_verilog -sv <<EOF
+module thing(input [2:0] in, output reg [2:0] out);
+    assign out = in;
+endmodule
+EOF
+
+select -assert-count 0 t:$eq
+fminit -set out 1'b1
+select -assert-count 1 t:$eq
+select -assert-count 1 t:$eq r:A_WIDTH=1 %i
diff --git a/tests/sat/fminit_seq_width.ys b/tests/sat/fminit_seq_width.ys
new file mode 100644
index 000000000..ea19a94e3
--- /dev/null
+++ b/tests/sat/fminit_seq_width.ys
@@ -0,0 +1,17 @@
+read_verilog -sv -formal <<EOF
+module counter(input clk, input [2:0] rst, input [0:3] rst_val, output logic is_full);
+    logic [1:0] ctr;
+
+    always @(posedge clk)
+        if (rst)
+            ctr <= 0;
+        else
+            ctr <= ctr+1;
+
+    assign is_full = (ctr == 2'b11);
+endmodule
+EOF
+
+hierarchy -check -top counter
+prep -top counter
+fminit -seq rst 0,1,2'b11,2'sb11,rst_val

From 430adb3b59d58513c64fe47129c6fe2b33fb0b9a Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 28 Aug 2025 18:10:00 +0200
Subject: [PATCH 547/931] write_rtlil: don't sort

---
 backends/rtlil/rtlil_backend.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/backends/rtlil/rtlil_backend.cc b/backends/rtlil/rtlil_backend.cc
index cb17432b1..d7de67bfc 100644
--- a/backends/rtlil/rtlil_backend.cc
+++ b/backends/rtlil/rtlil_backend.cc
@@ -456,8 +456,6 @@ struct RTLILBackend : public Backend {
 		}
 		extra_args(f, filename, args, argidx);
 
-		design->sort();
-
 		log("Output filename: %s\n", filename);
 
 		*f << stringf("# Generated by %s\n", yosys_maybe_version());

From d6d1f16c4340279f14a8d752d2af1ce3ec5b1707 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 2 Sep 2025 18:21:30 +0200
Subject: [PATCH 548/931] hashlib: add insertion order const iterator

---
 kernel/hashlib.h | 18 ++++++++++++++----
 kernel/utils.h   | 11 +++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index c95ce1e7b..ed329bba6 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -569,13 +569,16 @@ public:
 		int index;
 		const_iterator(const dict *ptr, int index) : ptr(ptr), index(index) { }
 	public:
-		typedef std::forward_iterator_tag iterator_category;
+		typedef std::bidirectional_iterator_tag iterator_category;
 		typedef std::pair<K, T> value_type;
 		typedef ptrdiff_t difference_type;
-		typedef std::pair<K, T>* pointer;
-		typedef std::pair<K, T>& reference;
+		typedef const std::pair<K, T>* pointer;
+		typedef const std::pair<K, T>& reference;
 		const_iterator() { }
 		const_iterator operator++() { index--; return *this; }
+		const_iterator operator++(int) { const_iterator tmp = *this; index--; return tmp; }
+		const_iterator operator--() { index++; return *this; }
+		const_iterator operator--(int) { const_iterator tmp = *this; index++; return tmp; }
 		const_iterator operator+=(int amt) { index -= amt; return *this; }
 		bool operator<(const const_iterator &other) const { return index > other.index; }
 		bool operator==(const const_iterator &other) const { return index == other.index; }
@@ -609,6 +612,13 @@ public:
 		const std::pair<K, T> *operator->() const { return &ptr->entries[index].udata; }
 		operator const_iterator() const { return const_iterator(ptr, index); }
 	};
+	using reverse_iterator = std::reverse_iterator<const_iterator>;
+	reverse_iterator rbegin() const {
+		return std::make_reverse_iterator(end());
+	}
+	reverse_iterator rend() const {
+		return std::make_reverse_iterator(begin());
+	}
 
 	constexpr dict()
 	{
@@ -858,7 +868,7 @@ public:
 
 	const_iterator begin() const { return const_iterator(this, int(entries.size())-1); }
 	const_iterator element(int n) const { return const_iterator(this, int(entries.size())-1-n); }
-	const_iterator end() const { return const_iterator(nullptr, -1); }
+	const_iterator end() const { return const_iterator(this, -1); }
 };
 
 template<typename K, typename OPS>
diff --git a/kernel/utils.h b/kernel/utils.h
index 6c9fe36a5..5c739aceb 100644
--- a/kernel/utils.h
+++ b/kernel/utils.h
@@ -21,6 +21,7 @@
 // do not depend on any other components of yosys (except stuff like log_*).
 
 #include "kernel/yosys.h"
+#include <iterator>
 
 #ifndef UTILS_H
 #define UTILS_H
@@ -276,6 +277,16 @@ inline int ceil_log2(int x)
 #endif
 }
 
+template <typename T>
+auto reversed(const T& container) {
+    struct reverse_view {
+        const T& cont;
+        auto begin() const { return cont.rbegin(); }
+        auto end() const { return cont.rend(); }
+    };
+    return reverse_view{container};
+}
+
 YOSYS_NAMESPACE_END
 
 #endif

From e11ea42af0e1e3dc1efbfb4f053b268e48b91175 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 2 Sep 2025 18:21:42 +0200
Subject: [PATCH 549/931] raise_error: whitespace

---
 passes/tests/raise_error.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/tests/raise_error.cc b/passes/tests/raise_error.cc
index 7233e78fa..b21ec7d1d 100644
--- a/passes/tests/raise_error.cc
+++ b/passes/tests/raise_error.cc
@@ -47,7 +47,7 @@ struct RaiseErrorPass : public Pass {
 		extra_args(args, argidx, design, true);
 
 		RTLIL::NamedObject *err_obj = nullptr;
-		
+
 		for (auto mod : design->all_selected_modules()) {
 			if (mod->has_attribute(ID::raise_error)) {
 				err_obj = mod->clone();

From 68ad52c6ae9b75ccab3681e2bc90ef97269b9cdc Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 2 Sep 2025 18:22:03 +0200
Subject: [PATCH 550/931] bugpoint: don't sort

---
 passes/cmds/bugpoint.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index 8432c27fd..897dd8459 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -122,8 +122,6 @@ struct BugpointPass : public Pass {
 
 	int run_yosys(RTLIL::Design *design, string runner, string yosys_cmd, string yosys_arg, string suffix, bool catch_err)
 	{
-		design->sort();
-
 		string bugpoint_file = "bugpoint-case";
 		if (suffix.size())
 			bugpoint_file += stringf(".%.8s", suffix);

From 1328a33e829923b544a57d70215b8717c6dbab8a Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 2 Sep 2025 18:22:35 +0200
Subject: [PATCH 551/931] write_rtlil: dump in insertion order

---
 backends/rtlil/rtlil_backend.cc | 148 ++++++++++++++------------------
 backends/rtlil/rtlil_backend.h  |   1 +
 2 files changed, 64 insertions(+), 85 deletions(-)

diff --git a/backends/rtlil/rtlil_backend.cc b/backends/rtlil/rtlil_backend.cc
index d7de67bfc..8402d3e3d 100644
--- a/backends/rtlil/rtlil_backend.cc
+++ b/backends/rtlil/rtlil_backend.cc
@@ -24,12 +24,23 @@
 
 #include "rtlil_backend.h"
 #include "kernel/yosys.h"
+#include "kernel/utils.h"
 #include <errno.h>
+#include <iterator>
 
 USING_YOSYS_NAMESPACE
 using namespace RTLIL_BACKEND;
 YOSYS_NAMESPACE_BEGIN
 
+void RTLIL_BACKEND::dump_attributes(std::ostream &f, std::string indent, const RTLIL::AttrObject *obj)
+{
+	for (const auto& [name, value] : reversed(obj->attributes)) {
+		f << stringf("%s" "attribute %s ", indent, name);
+		dump_const(f, value);
+		f << stringf("\n");
+	}
+}
+
 void RTLIL_BACKEND::dump_const(std::ostream &f, const RTLIL::Const &data, int width, int offset, bool autoint)
 {
 	if (width < 0)
@@ -110,8 +121,8 @@ void RTLIL_BACKEND::dump_sigspec(std::ostream &f, const RTLIL::SigSpec &sig, boo
 		dump_sigchunk(f, sig.as_chunk(), autoint);
 	} else {
 		f << stringf("{ ");
-		for (auto it = sig.chunks().rbegin(); it != sig.chunks().rend(); ++it) {
-			dump_sigchunk(f, *it, false);
+		for (const auto& chunk : reversed(sig.chunks())) {
+			dump_sigchunk(f, chunk, false);
 			f << stringf(" ");
 		}
 		f << stringf("}");
@@ -120,14 +131,10 @@ void RTLIL_BACKEND::dump_sigspec(std::ostream &f, const RTLIL::SigSpec &sig, boo
 
 void RTLIL_BACKEND::dump_wire(std::ostream &f, std::string indent, const RTLIL::Wire *wire)
 {
-	for (auto &it : wire->attributes) {
-		f << stringf("%s" "attribute %s ", indent, it.first);
-		dump_const(f, it.second);
-		f << stringf("\n");
-	}
+	dump_attributes(f, indent, wire);
 	if (wire->driverCell_) {
 		f << stringf("%s" "# driver %s %s\n", indent,
-				wire->driverCell()->name.c_str(), wire->driverPort().c_str());
+				wire->driverCell()->name, wire->driverPort());
 	}
 	f << stringf("%s" "wire ", indent);
 	if (wire->width != 1)
@@ -149,11 +156,7 @@ void RTLIL_BACKEND::dump_wire(std::ostream &f, std::string indent, const RTLIL::
 
 void RTLIL_BACKEND::dump_memory(std::ostream &f, std::string indent, const RTLIL::Memory *memory)
 {
-	for (auto &it : memory->attributes) {
-		f << stringf("%s" "attribute %s ", indent, it.first);
-		dump_const(f, it.second);
-		f << stringf("\n");
-	}
+	dump_attributes(f, indent, memory);
 	f << stringf("%s" "memory ", indent);
 	if (memory->width != 1)
 		f << stringf("width %d ", memory->width);
@@ -166,23 +169,19 @@ void RTLIL_BACKEND::dump_memory(std::ostream &f, std::string indent, const RTLIL
 
 void RTLIL_BACKEND::dump_cell(std::ostream &f, std::string indent, const RTLIL::Cell *cell)
 {
-	for (auto &it : cell->attributes) {
-		f << stringf("%s" "attribute %s ", indent, it.first);
-		dump_const(f, it.second);
-		f << stringf("\n");
-	}
+	dump_attributes(f, indent, cell);
 	f << stringf("%s" "cell %s %s\n", indent, cell->type, cell->name);
-	for (auto &it : cell->parameters) {
+	for (const auto& [name, param] : reversed(cell->parameters)) {
 		f << stringf("%s  parameter%s%s %s ", indent,
-				(it.second.flags & RTLIL::CONST_FLAG_SIGNED) != 0 ? " signed" : "",
-				(it.second.flags & RTLIL::CONST_FLAG_REAL) != 0 ? " real" : "",
-				it.first.c_str());
-		dump_const(f, it.second);
+				(param.flags & RTLIL::CONST_FLAG_SIGNED) != 0 ? " signed" : "",
+				(param.flags & RTLIL::CONST_FLAG_REAL) != 0 ? " real" : "",
+				name);
+		dump_const(f, param);
 		f << stringf("\n");
 	}
-	for (auto &it : cell->connections()) {
-		f << stringf("%s  connect %s ", indent, it.first);
-		dump_sigspec(f, it.second);
+	for (const auto& [port, sig] : reversed(cell->connections_)) {
+		f << stringf("%s  connect %s ", indent, port);
+		dump_sigspec(f, sig);
 		f << stringf("\n");
 	}
 	f << stringf("%s" "end\n", indent);
@@ -190,47 +189,38 @@ void RTLIL_BACKEND::dump_cell(std::ostream &f, std::string indent, const RTLIL::
 
 void RTLIL_BACKEND::dump_proc_case_body(std::ostream &f, std::string indent, const RTLIL::CaseRule *cs)
 {
-	for (auto it = cs->actions.begin(); it != cs->actions.end(); ++it)
-	{
+	for (const auto& [lhs, rhs] : cs->actions) {
 		f << stringf("%s" "assign ", indent);
-		dump_sigspec(f, it->first);
+		dump_sigspec(f, lhs);
 		f << stringf(" ");
-		dump_sigspec(f, it->second);
+		dump_sigspec(f, rhs);
 		f << stringf("\n");
 	}
 
-	for (auto it = cs->switches.begin(); it != cs->switches.end(); ++it)
-		dump_proc_switch(f, indent, *it);
+	for (const auto& sw : cs->switches)
+		dump_proc_switch(f, indent, sw);
 }
 
 void RTLIL_BACKEND::dump_proc_switch(std::ostream &f, std::string indent, const RTLIL::SwitchRule *sw)
 {
-	for (auto it = sw->attributes.begin(); it != sw->attributes.end(); ++it) {
-		f << stringf("%s" "attribute %s ", indent, it->first);
-		dump_const(f, it->second);
-		f << stringf("\n");
-	}
+	dump_attributes(f, indent, sw);
 
 	f << stringf("%s" "switch ", indent);
 	dump_sigspec(f, sw->signal);
 	f << stringf("\n");
 
-	for (auto it = sw->cases.begin(); it != sw->cases.end(); ++it)
+	for (const auto case_ : sw->cases)
 	{
-		for (auto ait = (*it)->attributes.begin(); ait != (*it)->attributes.end(); ++ait) {
-			f << stringf("%s  attribute %s ", indent, ait->first);
-			dump_const(f, ait->second);
-			f << stringf("\n");
-		}
+		dump_attributes(f, indent, case_);
 		f << stringf("%s  case ", indent);
-		for (size_t i = 0; i < (*it)->compare.size(); i++) {
+		for (size_t i = 0; i < case_->compare.size(); i++) {
 			if (i > 0)
 				f << stringf(" , ");
-			dump_sigspec(f, (*it)->compare[i]);
+			dump_sigspec(f, case_->compare[i]);
 		}
 		f << stringf("\n");
 
-		dump_proc_case_body(f, indent + "    ", *it);
+		dump_proc_case_body(f, indent + "    ", case_);
 	}
 
 	f << stringf("%s" "end\n", indent);
@@ -253,20 +243,16 @@ void RTLIL_BACKEND::dump_proc_sync(std::ostream &f, std::string indent, const RT
 	case RTLIL::STi: f << stringf("init\n"); break;
 	}
 
-	for (auto &it: sy->actions) {
+	for (const auto& [lhs, rhs] : sy->actions) {
 		f << stringf("%s  update ", indent);
-		dump_sigspec(f, it.first);
+		dump_sigspec(f, lhs);
 		f << stringf(" ");
-		dump_sigspec(f, it.second);
+		dump_sigspec(f, rhs);
 		f << stringf("\n");
 	}
 
 	for (auto &it: sy->mem_write_actions) {
-		for (auto it2 = it.attributes.begin(); it2 != it.attributes.end(); ++it2) {
-			f << stringf("%s  attribute %s ", indent, it2->first);
-			dump_const(f, it2->second);
-			f << stringf("\n");
-		}
+		dump_attributes(f, indent, &it);
 		f << stringf("%s  memwr %s ", indent, it.memid);
 		dump_sigspec(f, it.address);
 		f << stringf(" ");
@@ -281,15 +267,11 @@ void RTLIL_BACKEND::dump_proc_sync(std::ostream &f, std::string indent, const RT
 
 void RTLIL_BACKEND::dump_proc(std::ostream &f, std::string indent, const RTLIL::Process *proc)
 {
-	for (auto it = proc->attributes.begin(); it != proc->attributes.end(); ++it) {
-		f << stringf("%s" "attribute %s ", indent, it->first);
-		dump_const(f, it->second);
-		f << stringf("\n");
-	}
+	dump_attributes(f, indent, proc);
 	f << stringf("%s" "process %s\n", indent, proc->name);
 	dump_proc_case_body(f, indent + "  ", &proc->root_case);
-	for (auto it = proc->syncs.begin(); it != proc->syncs.end(); ++it)
-		dump_proc_sync(f, indent + "  ", *it);
+	for (auto* sync : proc->syncs)
+		dump_proc_sync(f, indent + "  ", sync);
 	f << stringf("%s" "end\n", indent);
 }
 
@@ -309,11 +291,7 @@ void RTLIL_BACKEND::dump_module(std::ostream &f, std::string indent, RTLIL::Modu
 
 	if (print_header)
 	{
-		for (auto it = module->attributes.begin(); it != module->attributes.end(); ++it) {
-			f << stringf("%s" "attribute %s ", indent, it->first);
-			dump_const(f, it->second);
-			f << stringf("\n");
-		}
+		dump_attributes(f, indent, module);
 
 		f << stringf("%s" "module %s\n", indent, module->name);
 
@@ -335,40 +313,40 @@ void RTLIL_BACKEND::dump_module(std::ostream &f, std::string indent, RTLIL::Modu
 
 	if (print_body)
 	{
-		for (auto it : module->wires())
-			if (!only_selected || design->selected(module, it)) {
+		for (const auto& [_, wire] : reversed(module->wires_))
+			if (!only_selected || design->selected(module, wire)) {
 				if (only_selected)
 					f << stringf("\n");
-				dump_wire(f, indent + "  ", it);
+				dump_wire(f, indent + "  ", wire);
 			}
 
-		for (auto it : module->memories)
-			if (!only_selected || design->selected(module, it.second)) {
+		for (const auto& [_, mem] : reversed(module->memories))
+			if (!only_selected || design->selected(module, mem)) {
 				if (only_selected)
 					f << stringf("\n");
-				dump_memory(f, indent + "  ", it.second);
+				dump_memory(f, indent + "  ", mem);
 			}
 
-		for (auto it : module->cells())
-			if (!only_selected || design->selected(module, it)) {
+		for (const auto& [_, cell] : reversed(module->cells_))
+			if (!only_selected || design->selected(module, cell)) {
 				if (only_selected)
 					f << stringf("\n");
-				dump_cell(f, indent + "  ", it);
+				dump_cell(f, indent + "  ", cell);
 			}
 
-		for (auto it : module->processes)
-			if (!only_selected || design->selected(module, it.second)) {
+		for (const auto& [_, process] : reversed(module->processes))
+			if (!only_selected || design->selected(module, process)) {
 				if (only_selected)
 					f << stringf("\n");
-				dump_proc(f, indent + "  ", it.second);
+				dump_proc(f, indent + "  ", process);
 			}
 
 		bool first_conn_line = true;
-		for (auto it = module->connections().begin(); it != module->connections().end(); ++it) {
+		for (const auto& [lhs, rhs] : module->connections()) {
 			bool show_conn = !only_selected || design->selected_whole_module(module->name);
 			if (!show_conn) {
-				RTLIL::SigSpec sigs = it->first;
-				sigs.append(it->second);
+				RTLIL::SigSpec sigs = lhs;
+				sigs.append(rhs);
 				for (auto &c : sigs.chunks()) {
 					if (c.wire == NULL || !design->selected(module, c.wire))
 						continue;
@@ -378,7 +356,7 @@ void RTLIL_BACKEND::dump_module(std::ostream &f, std::string indent, RTLIL::Modu
 			if (show_conn) {
 				if (only_selected && first_conn_line)
 					f << stringf("\n");
-				dump_conn(f, indent + "  ", it->first, it->second);
+				dump_conn(f, indent + "  ", lhs, rhs);
 				first_conn_line = false;
 			}
 		}
@@ -394,7 +372,7 @@ void RTLIL_BACKEND::dump_design(std::ostream &f, RTLIL::Design *design, bool onl
 
 	if (!flag_m) {
 		int count_selected_mods = 0;
-		for (auto module : design->modules()) {
+		for (auto* module : design->modules()) {
 			if (design->selected_whole_module(module->name))
 				flag_m = true;
 			if (design->selected(module))
@@ -410,7 +388,7 @@ void RTLIL_BACKEND::dump_design(std::ostream &f, RTLIL::Design *design, bool onl
 		f << stringf("autoidx %d\n", autoidx);
 	}
 
-	for (auto module : design->modules()) {
+	for (const auto& [_, module] : reversed(design->modules_)) {
 		if (!only_selected || design->selected(module)) {
 			if (only_selected)
 				f << stringf("\n");
@@ -526,7 +504,7 @@ struct DumpPass : public Pass {
 		if (!empty) {
 			rewrite_filename(filename);
 			std::ofstream *ff = new std::ofstream;
-			ff->open(filename.c_str(), append ? std::ofstream::app : std::ofstream::trunc);
+			ff->open(filename, append ? std::ofstream::app : std::ofstream::trunc);
 			if (ff->fail()) {
 				delete ff;
 				log_error("Can't open file `%s' for writing: %s\n", filename, strerror(errno));
diff --git a/backends/rtlil/rtlil_backend.h b/backends/rtlil/rtlil_backend.h
index 35829729c..dd7347def 100644
--- a/backends/rtlil/rtlil_backend.h
+++ b/backends/rtlil/rtlil_backend.h
@@ -31,6 +31,7 @@
 YOSYS_NAMESPACE_BEGIN
 
 namespace RTLIL_BACKEND {
+	void dump_attributes(std::ostream &f, std::string indent, const RTLIL::AttrObject *obj);
 	void dump_const(std::ostream &f, const RTLIL::Const &data, int width = -1, int offset = 0, bool autoint = true);
 	void dump_sigchunk(std::ostream &f, const RTLIL::SigChunk &chunk, bool autoint = true);
 	void dump_sigspec(std::ostream &f, const RTLIL::SigSpec &sig, bool autoint = true);

From 118c1890b10f8849f720ad27c817e735f9175f3c Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 2 Sep 2025 18:22:59 +0200
Subject: [PATCH 552/931] raise_error: don't rely on module ordering in test

---
 tests/bugpoint/raise_error.ys | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/bugpoint/raise_error.ys b/tests/bugpoint/raise_error.ys
index 8fb10eb96..79127deff 100644
--- a/tests/bugpoint/raise_error.ys
+++ b/tests/bugpoint/raise_error.ys
@@ -22,34 +22,37 @@ logger -check-expected
 
 # raise_error with int exits with status
 design -load read
+setattr -mod -unset raise_error def other
+dump
 bugpoint -suffix error -yosys ../../yosys -command raise_error -expect-return 7
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 top
 
 # raise_error -always still uses 'raise_error' attribute if possible
 design -load read
+setattr -mod -unset raise_error def other
 bugpoint -suffix error -yosys ../../yosys -command "raise_error -always" -expect-return 7
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 top
 
 # raise_error with string prints message and exits with 1
 design -load read
-rename top abc
+setattr -mod -unset raise_error top def
 bugpoint -suffix error -yosys ../../yosys -command raise_error -grep "help me" -expect-return 1
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 other
 
 # raise_error with no value exits with 1
 design -load read
-rename def zzy
+setattr -mod -unset raise_error top
 delete other
 bugpoint -suffix error -yosys ../../yosys -command raise_error -expect-return 1
 select -assert-mod-count 1 =*
-select -assert-mod-count 1 zzy
+select -assert-mod-count 1 def
 
 # raise_error -stderr prints to stderr and exits with 1
 design -load read
-rename top abc
+setattr -mod -unset raise_error top def
 bugpoint -suffix error -yosys ../../yosys -command "raise_error -stderr" -err-grep "help me" -expect-return 1
 select -assert-mod-count 1 =*
 select -assert-mod-count 1 other

From bcc69d5f6ed5c0292c6c7c279cfbf3785358b246 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 2 Sep 2025 19:19:57 +0200
Subject: [PATCH 553/931] write_rtlil: add -sort to match old behavior

---
 backends/rtlil/rtlil_backend.cc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/backends/rtlil/rtlil_backend.cc b/backends/rtlil/rtlil_backend.cc
index 8402d3e3d..d607be837 100644
--- a/backends/rtlil/rtlil_backend.cc
+++ b/backends/rtlil/rtlil_backend.cc
@@ -416,10 +416,14 @@ struct RTLILBackend : public Backend {
 		log("    -selected\n");
 		log("        only write selected parts of the design.\n");
 		log("\n");
+		log("    -sort\n");
+		log("        sort design in-place (used to be default).\n");
+		log("\n");
 	}
 	void execute(std::ostream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		bool selected = false;
+		bool do_sort = false;
 
 		log_header(design, "Executing RTLIL backend.\n");
 
@@ -430,12 +434,19 @@ struct RTLILBackend : public Backend {
 				selected = true;
 				continue;
 			}
+			if (arg == "-sort") {
+				do_sort = true;
+				continue;
+			}
 			break;
 		}
 		extra_args(f, filename, args, argidx);
 
 		log("Output filename: %s\n", filename);
 
+		if (do_sort)
+			design->sort();
+
 		*f << stringf("# Generated by %s\n", yosys_maybe_version());
 		RTLIL_BACKEND::dump_design(*f, design, selected, true, false);
 	}

From 4215f3c13418e2e3f649e1d6175861a97bdd4701 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 2 Sep 2025 19:50:15 +0200
Subject: [PATCH 554/931] rtlil: add textual roundtrip test

---
 Makefile                                |    1 +
 tests/rtlil/.gitignore                  |    2 +
 tests/rtlil/everything.v                |   40 +
 tests/rtlil/roundtrip-text.ref.il       |  283 ++++++
 tests/rtlil/roundtrip-text.sh           |   30 +
 tests/rtlil/roundtrip-text.synth.ref.il | 1194 +++++++++++++++++++++++
 tests/rtlil/run-test.sh                 |    4 +
 7 files changed, 1554 insertions(+)
 create mode 100644 tests/rtlil/.gitignore
 create mode 100644 tests/rtlil/everything.v
 create mode 100644 tests/rtlil/roundtrip-text.ref.il
 create mode 100644 tests/rtlil/roundtrip-text.sh
 create mode 100644 tests/rtlil/roundtrip-text.synth.ref.il
 create mode 100755 tests/rtlil/run-test.sh

diff --git a/Makefile b/Makefile
index 281f5a868..51c0015fd 100644
--- a/Makefile
+++ b/Makefile
@@ -889,6 +889,7 @@ MK_TEST_DIRS += tests/sim
 MK_TEST_DIRS += tests/svtypes
 MK_TEST_DIRS += tests/techmap
 MK_TEST_DIRS += tests/various
+MK_TEST_DIRS += tests/rtlil
 ifeq ($(ENABLE_VERIFIC),1)
 ifneq ($(YOSYS_NOVERIFIC),1)
 MK_TEST_DIRS += tests/verific
diff --git a/tests/rtlil/.gitignore b/tests/rtlil/.gitignore
new file mode 100644
index 000000000..e1661c060
--- /dev/null
+++ b/tests/rtlil/.gitignore
@@ -0,0 +1,2 @@
+*.tmp.il
+*.tmp.il.bak
\ No newline at end of file
diff --git a/tests/rtlil/everything.v b/tests/rtlil/everything.v
new file mode 100644
index 000000000..666d630c2
--- /dev/null
+++ b/tests/rtlil/everything.v
@@ -0,0 +1,40 @@
+module alu(
+	input clk,
+	input [7:0] A,
+	input [7:0] B,
+	input [3:0] operation,
+	output reg [7:0] result,
+	output reg CF,
+	output reg ZF,
+	output reg SF
+);
+
+	localparam ALU_OP_ADD = 4'b0000;
+	localparam ALU_OP_SUB = 4'b0001;
+
+	reg [8:0] tmp;
+
+	always @(posedge clk)
+	begin
+		case (operation)
+			ALU_OP_ADD :
+				tmp = A + B;
+			ALU_OP_SUB :
+				tmp = A - B;
+		endcase
+
+		CF <= tmp[8];
+		ZF <= tmp[7:0] == 0;
+		SF <= tmp[7];
+
+		result <= tmp[7:0];
+	end
+endmodule
+
+module foo(
+    input [7:0] a, input [7:0] b, output [7:0] y
+);
+    wire [7:0] bb;
+    assign b = bb;
+    assign y = a + bb;
+endmodule
diff --git a/tests/rtlil/roundtrip-text.ref.il b/tests/rtlil/roundtrip-text.ref.il
new file mode 100644
index 000000000..d67cb3626
--- /dev/null
+++ b/tests/rtlil/roundtrip-text.ref.il
@@ -0,0 +1,283 @@
+autoidx 15
+attribute \src "everything.v:1.1-32.10"
+attribute \cells_not_processed 1
+module \alu
+  attribute \src "everything.v:2.8-2.11"
+  wire input 1 \clk
+  attribute \src "everything.v:3.14-3.15"
+  wire width 8 input 2 \A
+  attribute \src "everything.v:4.14-4.15"
+  wire width 8 input 3 \B
+  attribute \src "everything.v:5.14-5.23"
+  wire width 4 input 4 \operation
+  attribute \src "everything.v:6.19-6.25"
+  wire width 8 output 5 \result
+  attribute \src "everything.v:7.13-7.15"
+  wire output 6 \CF
+  attribute \src "everything.v:8.13-8.15"
+  wire output 7 \ZF
+  attribute \src "everything.v:9.13-9.15"
+  wire output 8 \SF
+  attribute \src "everything.v:15.12-15.15"
+  wire width 9 \tmp
+  attribute \src "everything.v:17.2-31.5"
+  wire width 8 $0\result[7:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire $0\CF[0:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire $0\ZF[0:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire $0\SF[0:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire width 9 $0\tmp[8:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire width 9 $1\tmp[8:0]
+  attribute \src "everything.v:21.11-21.16"
+  wire width 9 $add$everything.v:21$2_Y
+  attribute \src "everything.v:23.11-23.16"
+  wire width 9 $sub$everything.v:23$3_Y
+  attribute \src "everything.v:27.9-27.22"
+  wire $eq$everything.v:27$4_Y
+  attribute \src "everything.v:21.11-21.16"
+  cell $add $add$everything.v:21$2
+    parameter \A_SIGNED 0
+    parameter \B_SIGNED 0
+    parameter \A_WIDTH 8
+    parameter \B_WIDTH 8
+    parameter \Y_WIDTH 9
+    connect \A \A
+    connect \B \B
+    connect \Y $add$everything.v:21$2_Y
+  end
+  attribute \src "everything.v:23.11-23.16"
+  cell $sub $sub$everything.v:23$3
+    parameter \A_SIGNED 0
+    parameter \B_SIGNED 0
+    parameter \A_WIDTH 8
+    parameter \B_WIDTH 8
+    parameter \Y_WIDTH 9
+    connect \A \A
+    connect \B \B
+    connect \Y $sub$everything.v:23$3_Y
+  end
+  attribute \src "everything.v:27.9-27.22"
+  cell $eq $eq$everything.v:27$4
+    parameter \A_SIGNED 0
+    parameter \B_SIGNED 0
+    parameter \A_WIDTH 8
+    parameter \B_WIDTH 32
+    parameter \Y_WIDTH 1
+    connect \A $1\tmp[8:0] [7:0]
+    connect \B 0
+    connect \Y $eq$everything.v:27$4_Y
+  end
+  attribute \src "everything.v:17.2-31.5"
+  process $proc$everything.v:17$1
+    assign { } { }
+    assign { } { }
+    assign { } { }
+    assign { } { }
+    assign { } { }
+    assign $0\tmp[8:0] $1\tmp[8:0]
+    assign $0\CF[0:0] $1\tmp[8:0] [8]
+    assign $0\ZF[0:0] $eq$everything.v:27$4_Y
+    assign $0\SF[0:0] $1\tmp[8:0] [7]
+    assign $0\result[7:0] $1\tmp[8:0] [7:0]
+    attribute \src "everything.v:19.3-24.10"
+    switch \operation
+    attribute \src "everything.v:19.19-19.19"
+      case 4'0000
+        assign { } { }
+        assign $1\tmp[8:0] $add$everything.v:21$2_Y
+    attribute \src "everything.v:21.17-21.17"
+      case 4'0001
+        assign { } { }
+        assign $1\tmp[8:0] $sub$everything.v:23$3_Y
+      case 
+        assign $1\tmp[8:0] \tmp
+    end
+    sync posedge \clk
+      update \result $0\result[7:0]
+      update \CF $0\CF[0:0]
+      update \ZF $0\ZF[0:0]
+      update \SF $0\SF[0:0]
+      update \tmp $0\tmp[8:0]
+  end
+end
+attribute \src "everything.v:34.1-40.10"
+attribute \cells_not_processed 1
+module \foo
+  attribute \src "everything.v:35.17-35.18"
+  wire width 8 input 1 \a
+  attribute \src "everything.v:35.32-35.33"
+  wire width 8 input 2 \b
+  attribute \src "everything.v:35.48-35.49"
+  wire width 8 output 3 \y
+  attribute \src "everything.v:37.16-37.18"
+  wire width 8 \bb
+  attribute \src "everything.v:39.16-39.22"
+  wire width 8 $add$everything.v:39$5_Y
+  attribute \src "everything.v:39.16-39.22"
+  cell $add $add$everything.v:39$5
+    parameter \A_SIGNED 0
+    parameter \B_SIGNED 0
+    parameter \A_WIDTH 8
+    parameter \B_WIDTH 8
+    parameter \Y_WIDTH 8
+    connect \A \a
+    connect \B \bb
+    connect \Y $add$everything.v:39$5_Y
+  end
+  connect \b \bb
+  connect \y $add$everything.v:39$5_Y
+end
+attribute \cells_not_processed 1
+attribute \src "everything.v:1.1-32.10"
+module \zzz
+  attribute \src "everything.v:27.9-27.22"
+  wire $eq$everything.v:27$4_Y
+  attribute \src "everything.v:23.11-23.16"
+  wire width 9 $sub$everything.v:23$3_Y
+  attribute \src "everything.v:21.11-21.16"
+  wire width 9 $add$everything.v:21$2_Y
+  attribute \src "everything.v:17.2-31.5"
+  wire width 9 $1\tmp[8:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire width 9 $0\tmp[8:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire $0\SF[0:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire $0\ZF[0:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire $0\CF[0:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire width 8 $0\result[7:0]
+  attribute \src "everything.v:15.12-15.15"
+  wire width 9 \tmp
+  attribute \src "everything.v:9.13-9.15"
+  wire output 8 \SF
+  attribute \src "everything.v:8.13-8.15"
+  wire output 7 \ZF
+  attribute \src "everything.v:7.13-7.15"
+  wire output 6 \CF
+  attribute \src "everything.v:6.19-6.25"
+  wire width 8 output 5 \result
+  attribute \src "everything.v:5.14-5.23"
+  wire width 4 input 4 \operation
+  attribute \src "everything.v:4.14-4.15"
+  wire width 8 input 3 \B
+  attribute \src "everything.v:3.14-3.15"
+  wire width 8 input 2 \A
+  attribute \src "everything.v:2.8-2.11"
+  wire input 1 \clk
+  wire $procmux$8_CMP
+  wire width 9 $procmux$7_Y
+  wire $procmux$9_CMP
+  attribute \src "everything.v:27.9-27.22"
+  cell $logic_not $eq$everything.v:27$4
+    parameter \A_SIGNED 0
+    parameter \Y_WIDTH 1
+    parameter \A_WIDTH 8
+    connect \A $1\tmp[8:0] [7:0]
+    connect \Y $eq$everything.v:27$4_Y
+  end
+  attribute \src "everything.v:23.11-23.16"
+  cell $sub $sub$everything.v:23$3
+    parameter \A_SIGNED 0
+    parameter \B_SIGNED 0
+    parameter \A_WIDTH 8
+    parameter \B_WIDTH 8
+    parameter \Y_WIDTH 9
+    connect \A \A
+    connect \B \B
+    connect \Y $sub$everything.v:23$3_Y
+  end
+  attribute \src "everything.v:21.11-21.16"
+  cell $add $add$everything.v:21$2
+    parameter \A_SIGNED 0
+    parameter \B_SIGNED 0
+    parameter \A_WIDTH 8
+    parameter \B_WIDTH 8
+    parameter \Y_WIDTH 9
+    connect \A \A
+    connect \B \B
+    connect \Y $add$everything.v:21$2_Y
+  end
+  attribute \src "everything.v:19.3-24.10"
+  attribute \full_case 1
+  cell $eq $procmux$8_CMP0
+    parameter \A_SIGNED 0
+    parameter \B_SIGNED 0
+    parameter \A_WIDTH 4
+    parameter \B_WIDTH 4
+    parameter \Y_WIDTH 1
+    connect \A \operation
+    connect \B 4'0001
+    connect \Y $procmux$8_CMP
+  end
+  attribute \src "everything.v:19.3-24.10"
+  attribute \full_case 1
+  cell $pmux $procmux$7
+    parameter \WIDTH 9
+    parameter \S_WIDTH 2
+    connect \A \tmp
+    connect \B { $add$everything.v:21$2_Y $sub$everything.v:23$3_Y }
+    connect \S { $procmux$9_CMP $procmux$8_CMP }
+    connect \Y $procmux$7_Y
+  end
+  attribute \src "everything.v:19.3-24.10"
+  attribute \full_case 1
+  cell $logic_not $procmux$9_CMP0
+    parameter \A_SIGNED 0
+    parameter \Y_WIDTH 1
+    parameter \A_WIDTH 4
+    connect \A \operation
+    connect \Y $procmux$9_CMP
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $dff $procdff$10
+    parameter \WIDTH 8
+    parameter \CLK_POLARITY 1'1
+    connect \D $procmux$7_Y [7:0]
+    connect \Q \result
+    connect \CLK \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $dff $procdff$11
+    parameter \WIDTH 1
+    parameter \CLK_POLARITY 1'1
+    connect \D $procmux$7_Y [8]
+    connect \Q \CF
+    connect \CLK \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $dff $procdff$12
+    parameter \WIDTH 1
+    parameter \CLK_POLARITY 1'1
+    connect \D $eq$everything.v:27$4_Y
+    connect \Q \ZF
+    connect \CLK \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $dff $procdff$13
+    parameter \WIDTH 1
+    parameter \CLK_POLARITY 1'1
+    connect \D $procmux$7_Y [7]
+    connect \Q \SF
+    connect \CLK \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $dff $procdff$14
+    parameter \WIDTH 9
+    parameter \CLK_POLARITY 1'1
+    connect \D $procmux$7_Y
+    connect \Q \tmp
+    connect \CLK \clk
+  end
+  connect $0\result[7:0] $1\tmp[8:0] [7:0]
+  connect $0\SF[0:0] $1\tmp[8:0] [7]
+  connect $0\ZF[0:0] $eq$everything.v:27$4_Y
+  connect $0\CF[0:0] $1\tmp[8:0] [8]
+  connect $0\tmp[8:0] $1\tmp[8:0]
+  connect $1\tmp[8:0] $procmux$7_Y
+end
diff --git a/tests/rtlil/roundtrip-text.sh b/tests/rtlil/roundtrip-text.sh
new file mode 100644
index 000000000..7dd0327ca
--- /dev/null
+++ b/tests/rtlil/roundtrip-text.sh
@@ -0,0 +1,30 @@
+set -euo pipefail
+YS=../../yosys
+
+# write_rtlil and dump are equivalent
+$YS -p "read_verilog -sv everything.v; copy alu zzz; proc zzz; dump -o roundtrip-text.dump.tmp.il; write_rtlil roundtrip-text.write.tmp.il"
+sed '/^$/d' -i.bak roundtrip-text.dump.tmp.il
+sed '/^$/d' -i.bak roundtrip-text.write.tmp.il
+# Trim first line ("Generated by Yosys ...")
+tail -n +2 roundtrip-text.write.tmp.il > roundtrip-text.write-nogen.tmp.il
+diff roundtrip-text.dump.tmp.il roundtrip-text.write-nogen.tmp.il
+diff roundtrip-text.dump.tmp.il roundtrip-text.ref.il
+
+# Loading and writing it out again doesn't change the RTLIL
+$YS -p "read_rtlil roundtrip-text.dump.tmp.il; write_rtlil roundtrip-text.reload.tmp.il"
+sed '/^$/d' -i.bak roundtrip-text.reload.tmp.il
+tail -n +2 roundtrip-text.reload.tmp.il > roundtrip-text.reload-nogen.tmp.il
+diff roundtrip-text.dump.tmp.il roundtrip-text.reload-nogen.tmp.il
+
+# Hashing differences don't change the RTLIL
+$YS --hash-seed=2345678 -p "read_rtlil roundtrip-text.dump.tmp.il; write_rtlil roundtrip-text.reload-hash.tmp.il"
+sed '/^$/d' -i.bak roundtrip-text.reload-hash.tmp.il
+tail -n +2 roundtrip-text.reload-hash.tmp.il > roundtrip-text.reload-hash-nogen.tmp.il
+diff roundtrip-text.dump.tmp.il roundtrip-text.reload-hash-nogen.tmp.il
+
+echo "Without ABC, we don't get any irreproducibility and can pin that"
+echo "Has this test case started failing for you? Consider updating the reference"
+$YS -p "read_verilog -sv everything.v; synth -noabc; write_rtlil roundtrip-text.synth.tmp.il"
+sed '/^$/d' -i.bak roundtrip-text.synth.tmp.il
+tail -n +2 roundtrip-text.synth.tmp.il > roundtrip-text.synth-nogen.tmp.il
+diff roundtrip-text.synth-nogen.tmp.il roundtrip-text.synth.ref.il
diff --git a/tests/rtlil/roundtrip-text.synth.ref.il b/tests/rtlil/roundtrip-text.synth.ref.il
new file mode 100644
index 000000000..04b27b1c1
--- /dev/null
+++ b/tests/rtlil/roundtrip-text.synth.ref.il
@@ -0,0 +1,1194 @@
+autoidx 511
+attribute \src "everything.v:34.1-40.10"
+module \foo
+  attribute \src "everything.v:35.48-35.49"
+  wire width 8 output 3 \y
+  attribute \src "everything.v:37.16-37.18"
+  wire width 8 \bb
+  attribute \src "everything.v:35.32-35.33"
+  wire width 8 input 2 \b
+  attribute \src "everything.v:35.17-35.18"
+  wire width 8 input 1 \a
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$150_Y
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$147_Y
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$173_Y
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$170_Y
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$167_Y
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$164_Y
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$151_Y
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$148_Y
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$155_Y
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$149_Y
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$146_Y
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$143_Y
+  attribute \unused_bits "7"
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:214.23-214.24"
+  attribute \force_downto 1
+  wire width 8 $auto$alumacc.cc:495:replace_alu$21.lcu.G
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:270.23-270.24"
+  attribute \force_downto 1
+  wire width 8 $auto$alumacc.cc:495:replace_alu$21.X
+  attribute \unused_bits "7"
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:274.23-274.25"
+  attribute \force_downto 1
+  wire width 8 $auto$alumacc.cc:495:replace_alu$21.CO
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$219
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [6]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$173_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [6]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$218
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [4]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$170_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [4]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$217
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [2]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$167_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [2]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$216
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [5]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$164_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$150_Y
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$213
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [3]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$155_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$147_Y
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$211
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$150_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$149_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [5]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$210
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$147_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$146_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [3]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$209
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [1]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$143_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [1]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$207
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$173_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [5]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [6]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$206
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$170_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [3]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [4]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$205
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$167_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [1]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [2]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$204
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$164_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [3]
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$151_Y
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$201
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$151_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$21.X [4]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [5]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$200
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$148_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$21.X [2]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [3]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$197
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$155_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [1]
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$148_Y
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$195
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$149_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$21.lcu.G [4]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [5]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$194
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$146_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$21.lcu.G [2]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [3]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$193
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$143_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [0]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [1]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$138
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [6]
+    connect \B \b [6]
+    connect \A \a [6]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$137
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [5]
+    connect \B \b [5]
+    connect \A \a [5]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$136
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [4]
+    connect \B \b [4]
+    connect \A \a [4]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$135
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [3]
+    connect \B \b [3]
+    connect \A \a [3]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$134
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [2]
+    connect \B \b [2]
+    connect \A \a [2]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$133
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [1]
+    connect \B \b [1]
+    connect \A \a [1]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$132
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [0]
+    connect \B \b [0]
+    connect \A \a [0]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$131
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [7]
+    connect \B \b [7]
+    connect \A \a [7]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$130
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [6]
+    connect \B \b [6]
+    connect \A \a [6]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$129
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [5]
+    connect \B \b [5]
+    connect \A \a [5]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$128
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [4]
+    connect \B \b [4]
+    connect \A \a [4]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$127
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [3]
+    connect \B \b [3]
+    connect \A \a [3]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$126
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [2]
+    connect \B \b [2]
+    connect \A \a [2]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$125
+    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [1]
+    connect \B \b [1]
+    connect \A \a [1]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$124
+    connect \Y \y [0]
+    connect \B \b [0]
+    connect \A \a [0]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$122
+    connect \Y \y [7]
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [6]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [7]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$121
+    connect \Y \y [6]
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [5]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [6]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$120
+    connect \Y \y [5]
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [4]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [5]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$119
+    connect \Y \y [4]
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [3]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [4]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$118
+    connect \Y \y [3]
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [2]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [3]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$117
+    connect \Y \y [2]
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [1]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [2]
+  end
+  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$116
+    connect \Y \y [1]
+    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [0]
+    connect \A $auto$alumacc.cc:495:replace_alu$21.X [1]
+  end
+  connect $auto$alumacc.cc:495:replace_alu$21.X [0] \y [0]
+  connect $auto$alumacc.cc:495:replace_alu$21.lcu.G [0] $auto$alumacc.cc:495:replace_alu$21.CO [0]
+  connect \bb \b
+end
+attribute \src "everything.v:1.1-32.10"
+module \alu
+  attribute \src "everything.v:15.12-15.15"
+  wire width 9 \tmp
+  attribute \src "everything.v:6.19-6.25"
+  wire width 8 output 5 \result
+  attribute \src "everything.v:5.14-5.23"
+  wire width 4 input 4 \operation
+  attribute \src "everything.v:2.8-2.11"
+  wire input 1 \clk
+  attribute \src "everything.v:8.13-8.15"
+  wire output 7 \ZF
+  attribute \src "everything.v:9.13-9.15"
+  wire output 8 \SF
+  attribute \src "everything.v:7.13-7.15"
+  wire output 6 \CF
+  attribute \src "everything.v:4.14-4.15"
+  wire width 8 input 3 \B
+  attribute \src "everything.v:3.14-3.15"
+  wire width 8 input 2 \A
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:270.26-270.27"
+  attribute \force_downto 1
+  wire width 9 $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:274.23-274.25"
+  attribute \force_downto 1
+  wire width 9 $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.21-279.23"
+  attribute \force_downto 1
+  wire width 9 $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$347_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$341_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$338_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$335_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$361_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$358_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$355_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$352_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$349_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$346_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$343_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$340_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$337_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$334_Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$331_Y
+  wire $procmux$9_CMP
+  wire $procmux$8_CMP
+  wire $auto$simplemap.cc:254:simplemap_eqne$247
+  wire $auto$simplemap.cc:166:logic_reduce$268
+  wire width 2 $auto$simplemap.cc:166:logic_reduce$265
+  wire $auto$simplemap.cc:166:logic_reduce$235
+  wire width 2 $auto$simplemap.cc:166:logic_reduce$232
+  wire width 4 $auto$simplemap.cc:166:logic_reduce$227
+  wire width 2 $auto$simplemap.cc:125:simplemap_reduce$249
+  wire $auto$rtlil.cc:3196:NotGate$497
+  wire $auto$opt_dff.cc:247:make_patterns_logic$505
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:214.23-214.24"
+  attribute \force_downto 1
+  wire width 9 $auto$alumacc.cc:495:replace_alu$18.lcu.G
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:270.26-270.27"
+  attribute \force_downto 1
+  wire width 9 $auto$alumacc.cc:495:replace_alu$18.Y
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:270.23-270.24"
+  attribute \force_downto 1
+  wire width 9 $auto$alumacc.cc:495:replace_alu$18.X
+  attribute \unused_bits "8"
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:274.23-274.25"
+  attribute \force_downto 1
+  wire width 9 $auto$alumacc.cc:495:replace_alu$18.CO
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.21-279.23"
+  attribute \force_downto 1
+  wire width 9 $auto$alumacc.cc:495:replace_alu$18.BB
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:268.22-268.23"
+  attribute \force_downto 1
+  wire width 9 $auto$alumacc.cc:495:replace_alu$18.B
+  attribute \src "everything.v:17.2-31.5"
+  wire width 8 $0\result[7:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire $0\ZF[0:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire $0\SF[0:0]
+  attribute \src "everything.v:17.2-31.5"
+  wire $0\CF[0:0]
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$481
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [6]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [5]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$480
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [4]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$479
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [2]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$478
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [5]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
+    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$477
+    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
+    connect \B $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$476
+    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [7]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$475
+    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [5]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$474
+    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [3]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$473
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [8]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
+    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$471
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
+    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$467
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [1]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$427
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [7]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [6]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [7]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$426
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [6]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [5]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$425
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [5]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [4]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [5]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$424
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [4]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$423
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [3]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [2]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [3]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$422
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [2]
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$421
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [1]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [1]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$418
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [6]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$361_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [6]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$417
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [4]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$358_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [4]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$416
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [2]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$355_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [2]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$415
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [5]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$352_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$338_Y
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$414
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [7]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$349_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$347_Y
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$413
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$347_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$346_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$341_Y
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$412
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [3]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$343_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$335_Y
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$411
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$341_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$340_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [7]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$410
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$338_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$337_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [5]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$409
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$335_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$334_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [3]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$408
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [1]
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$331_Y
+    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [1]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:231.10-231.28"
+  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$407
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [0]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.X [0]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [0]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$405
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$361_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [5]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [6]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$404
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$358_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [4]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$403
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$355_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [1]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [2]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$402
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$352_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$401
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$400
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.X [6]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [7]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$399
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.X [4]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [5]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$398
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.X [2]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [3]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$397
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$349_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$396
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$346_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$338_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$395
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$343_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [1]
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$394
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$340_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.lcu.G [6]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [7]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$393
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$337_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.lcu.G [4]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [5]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$392
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$334_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.lcu.G [2]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [3]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$391
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$331_Y
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [0]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [1]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$326
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [7]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [7]
+    connect \A \A [7]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$325
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [6]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [6]
+    connect \A \A [6]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$324
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [5]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [5]
+    connect \A \A [5]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$323
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [4]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [4]
+    connect \A \A [4]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$322
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [3]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [3]
+    connect \A \A [3]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$321
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [2]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [2]
+    connect \A \A [2]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$320
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [1]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [1]
+    connect \A \A [1]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$319
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [0]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
+    connect \A \A [0]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$317
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [7]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [7]
+    connect \A \A [7]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$316
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [6]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [6]
+    connect \A \A [6]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$315
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [5]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [5]
+    connect \A \A [5]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$314
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [4]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [4]
+    connect \A \A [4]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$313
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [3]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [3]
+    connect \A \A [3]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$312
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [2]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [2]
+    connect \A \A [2]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$311
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [1]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [1]
+    connect \A \A [1]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$310
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [0]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
+    connect \A \A [0]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$308
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [8]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [7]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.BB [8]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$307
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [7]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [6]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [7]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$306
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [6]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [5]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [6]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$305
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [5]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [4]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [5]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$304
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [4]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [4]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$303
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [3]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [2]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [3]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$302
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [2]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [1]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [2]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$301
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [1]
+    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [0]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [1]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$464
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [7]
+    connect \A \B [7]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$463
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
+    connect \A \B [6]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$462
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [5]
+    connect \A \B [5]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$461
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
+    connect \A \B [4]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$460
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [3]
+    connect \A \B [3]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$459
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
+    connect \A \B [2]
+  end
+  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$458
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [1]
+    connect \A \B [1]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$384
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [8]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.B [8]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$383
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [7]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.B [7]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$382
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [6]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.B [6]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$381
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [5]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.B [5]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$380
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [4]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.B [4]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$379
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [3]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.B [3]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$378
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [2]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.B [2]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$377
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [1]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.B [1]
+  end
+  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$376
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [0]
+    connect \A \B [0]
+  end
+  attribute \src 0'x
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$299
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [8]
+    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [8]
+    connect \A 1'0
+  end
+  attribute \src 0'x
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$298
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [7]
+    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [7]
+    connect \A \B [7]
+  end
+  attribute \src 0'x
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$297
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [6]
+    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [6]
+    connect \A \B [6]
+  end
+  attribute \src 0'x
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$296
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [5]
+    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [5]
+    connect \A \B [5]
+  end
+  attribute \src 0'x
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$295
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [4]
+    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [4]
+    connect \A \B [4]
+  end
+  attribute \src 0'x
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$294
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [3]
+    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [3]
+    connect \A \B [3]
+  end
+  attribute \src 0'x
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$293
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [2]
+    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [2]
+    connect \A \B [2]
+  end
+  attribute \src 0'x
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$292
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [1]
+    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
+    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [1]
+    connect \A \B [1]
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$264
+    connect \Y $0\CF[0:0]
+    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
+    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [8]
+    connect \A 1'x
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$263
+    connect \Y $0\SF[0:0]
+    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
+    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [7]
+    connect \A \tmp [7]
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$262
+    connect \Y $0\result[7:0] [6]
+    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
+    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [6]
+    connect \A \tmp [6]
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$261
+    connect \Y $0\result[7:0] [5]
+    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
+    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [5]
+    connect \A \tmp [5]
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$260
+    connect \Y $0\result[7:0] [4]
+    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
+    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [4]
+    connect \A \tmp [4]
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$259
+    connect \Y $0\result[7:0] [3]
+    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
+    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [3]
+    connect \A \tmp [3]
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$258
+    connect \Y $0\result[7:0] [2]
+    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
+    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [2]
+    connect \A \tmp [2]
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$257
+    connect \Y $0\result[7:0] [1]
+    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
+    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [1]
+    connect \A \tmp [1]
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$256
+    connect \Y $0\result[7:0] [0]
+    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
+    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [0]
+    connect \A \tmp [0]
+  end
+  attribute \src "everything.v:19.19-19.19|everything.v:19.3-24.10"
+  cell $_NOT_ $auto$simplemap.cc:204:simplemap_lognot$270
+    connect \Y $procmux$9_CMP
+    connect \A $auto$simplemap.cc:166:logic_reduce$268
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_NOT_ $auto$simplemap.cc:204:simplemap_lognot$255
+    connect \Y $procmux$8_CMP
+    connect \A $auto$simplemap.cc:254:simplemap_eqne$247
+  end
+  attribute \src "everything.v:27.9-27.22"
+  cell $_NOT_ $auto$simplemap.cc:204:simplemap_lognot$237
+    connect \Y $0\ZF[0:0]
+    connect \A $auto$simplemap.cc:166:logic_reduce$235
+  end
+  attribute \src "everything.v:19.19-19.19|everything.v:19.3-24.10"
+  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$269
+    connect \Y $auto$simplemap.cc:166:logic_reduce$268
+    connect \B $auto$simplemap.cc:125:simplemap_reduce$249 [1]
+    connect \A $auto$simplemap.cc:166:logic_reduce$265 [0]
+  end
+  attribute \src "everything.v:19.19-19.19|everything.v:19.3-24.10"
+  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$267
+    connect \Y $auto$simplemap.cc:125:simplemap_reduce$249 [1]
+    connect \B \operation [3]
+    connect \A \operation [2]
+  end
+  attribute \src "everything.v:19.19-19.19|everything.v:19.3-24.10"
+  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$266
+    connect \Y $auto$simplemap.cc:166:logic_reduce$265 [0]
+    connect \B \operation [1]
+    connect \A \operation [0]
+  end
+  attribute \src "everything.v:27.9-27.22"
+  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$236
+    connect \Y $auto$simplemap.cc:166:logic_reduce$235
+    connect \B $auto$simplemap.cc:166:logic_reduce$232 [1]
+    connect \A $auto$simplemap.cc:166:logic_reduce$232 [0]
+  end
+  attribute \src "everything.v:27.9-27.22"
+  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$234
+    connect \Y $auto$simplemap.cc:166:logic_reduce$232 [1]
+    connect \B $auto$simplemap.cc:166:logic_reduce$227 [3]
+    connect \A $auto$simplemap.cc:166:logic_reduce$227 [2]
+  end
+  attribute \src "everything.v:27.9-27.22"
+  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$233
+    connect \Y $auto$simplemap.cc:166:logic_reduce$232 [0]
+    connect \B $auto$simplemap.cc:166:logic_reduce$227 [1]
+    connect \A $auto$simplemap.cc:166:logic_reduce$227 [0]
+  end
+  attribute \src "everything.v:27.9-27.22"
+  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$231
+    connect \Y $auto$simplemap.cc:166:logic_reduce$227 [3]
+    connect \B $0\SF[0:0]
+    connect \A $0\result[7:0] [6]
+  end
+  attribute \src "everything.v:27.9-27.22"
+  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$230
+    connect \Y $auto$simplemap.cc:166:logic_reduce$227 [2]
+    connect \B $0\result[7:0] [5]
+    connect \A $0\result[7:0] [4]
+  end
+  attribute \src "everything.v:27.9-27.22"
+  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$229
+    connect \Y $auto$simplemap.cc:166:logic_reduce$227 [1]
+    connect \B $0\result[7:0] [3]
+    connect \A $0\result[7:0] [2]
+  end
+  attribute \src "everything.v:27.9-27.22"
+  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$228
+    connect \Y $auto$simplemap.cc:166:logic_reduce$227 [0]
+    connect \B $0\result[7:0] [1]
+    connect \A $0\result[7:0] [0]
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_OR_ $auto$simplemap.cc:134:simplemap_reduce$253
+    connect \Y $auto$simplemap.cc:254:simplemap_eqne$247
+    connect \B $auto$simplemap.cc:125:simplemap_reduce$249 [1]
+    connect \A $auto$simplemap.cc:125:simplemap_reduce$249 [0]
+  end
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
+  cell $_OR_ $auto$simplemap.cc:134:simplemap_reduce$250
+    connect \Y $auto$simplemap.cc:125:simplemap_reduce$249 [0]
+    connect \B \operation [1]
+    connect \A $auto$rtlil.cc:3196:NotGate$497
+  end
+  attribute \src 0'x
+  cell $_OR_ $auto$simplemap.cc:134:simplemap_reduce$226
+    connect \Y $auto$opt_dff.cc:247:make_patterns_logic$505
+    connect \B $procmux$9_CMP
+    connect \A $procmux$8_CMP
+  end
+  cell $_NOT_ $auto$opt_expr.cc:617:replace_const_cells$502
+    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [8]
+    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [8]
+  end
+  cell $_NOT_ $auto$opt_expr.cc:617:replace_const_cells$500
+    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [0]
+    connect \A $auto$alumacc.cc:495:replace_alu$18.X [0]
+  end
+  cell $_NOT_ $auto$opt_expr.cc:617:replace_const_cells$496
+    connect \Y $auto$rtlil.cc:3196:NotGate$497
+    connect \A \operation [0]
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $_DFFE_PP_ $auto$ff.cc:266:slice$504
+    connect \Q \CF
+    connect \E $auto$opt_dff.cc:247:make_patterns_logic$505
+    connect \D $0\CF[0:0]
+    connect \C \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $_DFF_P_ $auto$ff.cc:266:slice$289
+    connect \Q \tmp [7]
+    connect \D $0\SF[0:0]
+    connect \C \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $_DFF_P_ $auto$ff.cc:266:slice$288
+    connect \Q \tmp [6]
+    connect \D $0\result[7:0] [6]
+    connect \C \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $_DFF_P_ $auto$ff.cc:266:slice$287
+    connect \Q \tmp [5]
+    connect \D $0\result[7:0] [5]
+    connect \C \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $_DFF_P_ $auto$ff.cc:266:slice$286
+    connect \Q \tmp [4]
+    connect \D $0\result[7:0] [4]
+    connect \C \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $_DFF_P_ $auto$ff.cc:266:slice$285
+    connect \Q \tmp [3]
+    connect \D $0\result[7:0] [3]
+    connect \C \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $_DFF_P_ $auto$ff.cc:266:slice$284
+    connect \Q \tmp [2]
+    connect \D $0\result[7:0] [2]
+    connect \C \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $_DFF_P_ $auto$ff.cc:266:slice$283
+    connect \Q \tmp [1]
+    connect \D $0\result[7:0] [1]
+    connect \C \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $_DFF_P_ $auto$ff.cc:266:slice$282
+    connect \Q \tmp [0]
+    connect \D $0\result[7:0] [0]
+    connect \C \clk
+  end
+  attribute \src "everything.v:17.2-31.5"
+  cell $_DFF_P_ $auto$ff.cc:266:slice$280
+    connect \Q \ZF
+    connect \D $0\ZF[0:0]
+    connect \C \clk
+  end
+  connect $0\result[7:0] [7] $0\SF[0:0]
+  connect $auto$alumacc.cc:495:replace_alu$18.B [0] \B [0]
+  connect $auto$alumacc.cc:495:replace_alu$18.X [8] $auto$alumacc.cc:495:replace_alu$18.BB [8]
+  connect $auto$alumacc.cc:495:replace_alu$18.lcu.G [8] 1'0
+  connect $auto$simplemap.cc:166:logic_reduce$265 [1] $auto$simplemap.cc:125:simplemap_reduce$249 [1]
+  connect { $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [8] $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [0] } { 1'1 $auto$alumacc.cc:495:replace_alu$18.BB [0] }
+  connect { $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [7] $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [0] } { $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [8] $auto$alumacc.cc:495:replace_alu$18.BB [0] }
+  connect $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [0] \B [0]
+  connect \SF \tmp [7]
+  connect \result \tmp [7:0]
+  connect \tmp [8] \CF
+end
diff --git a/tests/rtlil/run-test.sh b/tests/rtlil/run-test.sh
new file mode 100755
index 000000000..70b282a9a
--- /dev/null
+++ b/tests/rtlil/run-test.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -eu
+source ../gen-tests-makefile.sh
+generate_mk --bash

From fdbdd193c1245a4fc3ecbf70bac26d18a11e3b75 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 2 Sep 2025 19:56:28 +0200
Subject: [PATCH 555/931] rtlil: add roundtrip test for design -stash and
 design -save, fix #5321

---
 kernel/rtlil.cc                   | 1 +
 tests/rtlil/roundtrip-design.sh   | 8 ++++++++
 tests/rtlil/roundtrip-text.ref.il | 6 +++---
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 tests/rtlil/roundtrip-design.sh

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 035701cb9..050fc6bd1 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5993,6 +5993,7 @@ RTLIL::CaseRule *RTLIL::CaseRule::clone() const
 	RTLIL::CaseRule *new_caserule = new RTLIL::CaseRule;
 	new_caserule->compare = compare;
 	new_caserule->actions = actions;
+	new_caserule->attributes = attributes;
 	for (auto &it : switches)
 		new_caserule->switches.push_back(it->clone());
 	return new_caserule;
diff --git a/tests/rtlil/roundtrip-design.sh b/tests/rtlil/roundtrip-design.sh
new file mode 100644
index 000000000..beacddd8f
--- /dev/null
+++ b/tests/rtlil/roundtrip-design.sh
@@ -0,0 +1,8 @@
+set -euo pipefail
+YS=../../yosys
+
+$YS -p "read_verilog -sv everything.v; write_rtlil roundtrip-design-push.tmp.il; design -push; design -pop; write_rtlil roundtrip-design-pop.tmp.il"
+diff roundtrip-design-push.tmp.il roundtrip-design-pop.tmp.il
+
+$YS -p "read_verilog -sv everything.v; write_rtlil roundtrip-design-save.tmp.il; design -save foo; design -load foo; write_rtlil roundtrip-design-load.tmp.il"
+diff roundtrip-design-save.tmp.il roundtrip-design-load.tmp.il
diff --git a/tests/rtlil/roundtrip-text.ref.il b/tests/rtlil/roundtrip-text.ref.il
index d67cb3626..cc45f53dd 100644
--- a/tests/rtlil/roundtrip-text.ref.il
+++ b/tests/rtlil/roundtrip-text.ref.il
@@ -203,7 +203,7 @@ module \zzz
     connect \B \B
     connect \Y $add$everything.v:21$2_Y
   end
-  attribute \src "everything.v:19.3-24.10"
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
   attribute \full_case 1
   cell $eq $procmux$8_CMP0
     parameter \A_SIGNED 0
@@ -215,7 +215,7 @@ module \zzz
     connect \B 4'0001
     connect \Y $procmux$8_CMP
   end
-  attribute \src "everything.v:19.3-24.10"
+  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
   attribute \full_case 1
   cell $pmux $procmux$7
     parameter \WIDTH 9
@@ -225,7 +225,7 @@ module \zzz
     connect \S { $procmux$9_CMP $procmux$8_CMP }
     connect \Y $procmux$7_Y
   end
-  attribute \src "everything.v:19.3-24.10"
+  attribute \src "everything.v:19.19-19.19|everything.v:19.3-24.10"
   attribute \full_case 1
   cell $logic_not $procmux$9_CMP0
     parameter \A_SIGNED 0

From 70e681ba7ddcb3e1ee8fb6eb748252a8c63f6148 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 2 Sep 2025 20:36:31 +0200
Subject: [PATCH 556/931] rtlil: move test temporary files to temp directory

---
 tests/rtlil/.gitignore          |  3 +--
 tests/rtlil/roundtrip-design.sh | 10 +++++----
 tests/rtlil/roundtrip-text.sh   | 38 +++++++++++++++++----------------
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/tests/rtlil/.gitignore b/tests/rtlil/.gitignore
index e1661c060..abe251a76 100644
--- a/tests/rtlil/.gitignore
+++ b/tests/rtlil/.gitignore
@@ -1,2 +1 @@
-*.tmp.il
-*.tmp.il.bak
\ No newline at end of file
+/temp
\ No newline at end of file
diff --git a/tests/rtlil/roundtrip-design.sh b/tests/rtlil/roundtrip-design.sh
index beacddd8f..018e363c7 100644
--- a/tests/rtlil/roundtrip-design.sh
+++ b/tests/rtlil/roundtrip-design.sh
@@ -1,8 +1,10 @@
 set -euo pipefail
 YS=../../yosys
 
-$YS -p "read_verilog -sv everything.v; write_rtlil roundtrip-design-push.tmp.il; design -push; design -pop; write_rtlil roundtrip-design-pop.tmp.il"
-diff roundtrip-design-push.tmp.il roundtrip-design-pop.tmp.il
+mkdir -p temp
 
-$YS -p "read_verilog -sv everything.v; write_rtlil roundtrip-design-save.tmp.il; design -save foo; design -load foo; write_rtlil roundtrip-design-load.tmp.il"
-diff roundtrip-design-save.tmp.il roundtrip-design-load.tmp.il
+$YS -p "read_verilog -sv everything.v; write_rtlil temp/roundtrip-design-push.il; design -push; design -pop; write_rtlil temp/roundtrip-design-pop.il"
+diff temp/roundtrip-design-push.il temp/roundtrip-design-pop.il
+
+$YS -p "read_verilog -sv everything.v; write_rtlil temp/roundtrip-design-save.il; design -save foo; design -load foo; write_rtlil temp/roundtrip-design-load.il"
+diff temp/roundtrip-design-save.il temp/roundtrip-design-load.il
diff --git a/tests/rtlil/roundtrip-text.sh b/tests/rtlil/roundtrip-text.sh
index 7dd0327ca..45db7ee72 100644
--- a/tests/rtlil/roundtrip-text.sh
+++ b/tests/rtlil/roundtrip-text.sh
@@ -1,30 +1,32 @@
 set -euo pipefail
 YS=../../yosys
 
+mkdir -p temp
+
 # write_rtlil and dump are equivalent
-$YS -p "read_verilog -sv everything.v; copy alu zzz; proc zzz; dump -o roundtrip-text.dump.tmp.il; write_rtlil roundtrip-text.write.tmp.il"
-sed '/^$/d' -i.bak roundtrip-text.dump.tmp.il
-sed '/^$/d' -i.bak roundtrip-text.write.tmp.il
+$YS -p "read_verilog -sv everything.v; copy alu zzz; proc zzz; dump -o temp/roundtrip-text.dump.il; write_rtlil temp/roundtrip-text.write.il"
+sed '/^$/d' -i.bak temp/roundtrip-text.dump.il
+sed '/^$/d' -i.bak temp/roundtrip-text.write.il
 # Trim first line ("Generated by Yosys ...")
-tail -n +2 roundtrip-text.write.tmp.il > roundtrip-text.write-nogen.tmp.il
-diff roundtrip-text.dump.tmp.il roundtrip-text.write-nogen.tmp.il
-diff roundtrip-text.dump.tmp.il roundtrip-text.ref.il
+tail -n +2 temp/roundtrip-text.write.il > temp/roundtrip-text.write-nogen.il
+diff temp/roundtrip-text.dump.il temp/roundtrip-text.write-nogen.il
+diff temp/roundtrip-text.dump.il roundtrip-text.ref.il
 
 # Loading and writing it out again doesn't change the RTLIL
-$YS -p "read_rtlil roundtrip-text.dump.tmp.il; write_rtlil roundtrip-text.reload.tmp.il"
-sed '/^$/d' -i.bak roundtrip-text.reload.tmp.il
-tail -n +2 roundtrip-text.reload.tmp.il > roundtrip-text.reload-nogen.tmp.il
-diff roundtrip-text.dump.tmp.il roundtrip-text.reload-nogen.tmp.il
+$YS -p "read_rtlil temp/roundtrip-text.dump.il; write_rtlil temp/roundtrip-text.reload.il"
+sed '/^$/d' -i.bak temp/roundtrip-text.reload.il
+tail -n +2 temp/roundtrip-text.reload.il > temp/roundtrip-text.reload-nogen.il
+diff temp/roundtrip-text.dump.il temp/roundtrip-text.reload-nogen.il
 
 # Hashing differences don't change the RTLIL
-$YS --hash-seed=2345678 -p "read_rtlil roundtrip-text.dump.tmp.il; write_rtlil roundtrip-text.reload-hash.tmp.il"
-sed '/^$/d' -i.bak roundtrip-text.reload-hash.tmp.il
-tail -n +2 roundtrip-text.reload-hash.tmp.il > roundtrip-text.reload-hash-nogen.tmp.il
-diff roundtrip-text.dump.tmp.il roundtrip-text.reload-hash-nogen.tmp.il
+$YS --hash-seed=2345678 -p "read_rtlil temp/roundtrip-text.dump.il; write_rtlil temp/roundtrip-text.reload-hash.il"
+sed '/^$/d' -i.bak temp/roundtrip-text.reload-hash.il
+tail -n +2 temp/roundtrip-text.reload-hash.il > temp/roundtrip-text.reload-hash-nogen.il
+diff temp/roundtrip-text.dump.il temp/roundtrip-text.reload-hash-nogen.il
 
 echo "Without ABC, we don't get any irreproducibility and can pin that"
 echo "Has this test case started failing for you? Consider updating the reference"
-$YS -p "read_verilog -sv everything.v; synth -noabc; write_rtlil roundtrip-text.synth.tmp.il"
-sed '/^$/d' -i.bak roundtrip-text.synth.tmp.il
-tail -n +2 roundtrip-text.synth.tmp.il > roundtrip-text.synth-nogen.tmp.il
-diff roundtrip-text.synth-nogen.tmp.il roundtrip-text.synth.ref.il
+$YS -p "read_verilog -sv everything.v; synth -noabc; write_rtlil temp/roundtrip-text.synth.il"
+sed '/^$/d' -i.bak temp/roundtrip-text.synth.il
+tail -n +2 temp/roundtrip-text.synth.il > temp/roundtrip-text.synth-nogen.il
+diff temp/roundtrip-text.synth-nogen.il roundtrip-text.synth.ref.il

From 175e024033e06f1696a52488e33811b194c9c1b3 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 2 Sep 2025 20:43:52 +0200
Subject: [PATCH 557/931] functional: in test, rely less on wreduce doing a
 perfect job

---
 tests/functional/test_functional.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/functional/test_functional.py b/tests/functional/test_functional.py
index 7a09966d8..d4ebc3484 100644
--- a/tests/functional/test_functional.py
+++ b/tests/functional/test_functional.py
@@ -24,7 +24,7 @@ def compile_cpp(in_path, out_path, args):
     run(['g++', '-g', '-std=c++17'] + args + [str(in_path), '-o', str(out_path)])
 
 def yosys_synth(verilog_file, rtlil_file):
-    yosys(f"read_verilog {quote(verilog_file)} ; prep ; write_rtlil {quote(rtlil_file)}")
+    yosys(f"read_verilog {quote(verilog_file)} ; prep ; setundef -undriven ; write_rtlil {quote(rtlil_file)}")
 
 # simulate an rtlil file with yosys, comparing with a given vcd file, and writing out the yosys simulation results into a second vcd file
 def yosys_sim(rtlil_file, vcd_reference_file, vcd_out_file, preprocessing = ""):
@@ -91,4 +91,4 @@ def test_print_graph(tmp_path):
     tb_file = base_path / 'tests/functional/picorv32_tb.v'
     cpu_file = base_path / 'tests/functional/picorv32.v'
     # currently we only check that we can print the graph without getting an error, not that it prints anything sensibl
-    yosys(f"read_verilog {quote(tb_file)} {quote(cpu_file)}; prep -top gold; flatten; clk2fflogic; test_generic")
+    yosys(f"read_verilog {quote(tb_file)} {quote(cpu_file)}; prep -top gold; setundef -undriven ; flatten; clk2fflogic; test_generic")

From 73747f6928591a93c723beec1060bd8f1a85cf56 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 3 Sep 2025 01:57:17 +0200
Subject: [PATCH 558/931] read_verilog: add -relativeshare for synthesis
 reproducibility testing

---
 frontends/verilog/verilog_frontend.cc | 17 +++++++++++++++
 passes/techmap/techmap.cc             |  9 ++++++++
 techlibs/common/synth.cc              | 30 ++++++++++++++++++++-------
 techlibs/fabulous/synth_fabulous.cc   |  2 +-
 tests/functional/test_functional.py   |  4 ++--
 5 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index 231891271..0b5e93a19 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -229,6 +229,10 @@ struct VerilogFrontend : public Frontend {
 		log("        add 'dir' to the directories which are used when searching include\n");
 		log("        files\n");
 		log("\n");
+		log("    -relativeshare\n");
+		log("        use paths relative to share directory for source locations\n");
+		log("        where possible (experimental).\n");
+		log("\n");
 		log("The command 'verilog_defaults' can be used to register default options for\n");
 		log("subsequent calls to 'read_verilog'.\n");
 		log("\n");
@@ -273,6 +277,7 @@ struct VerilogFrontend : public Frontend {
 		bool flag_nowb = false;
 		bool flag_nosynthesis = false;
 		bool flag_yydebug = false;
+		bool flag_relative_share = false;
 		define_map_t defines_map;
 
 		std::list<std::string> include_dirs;
@@ -450,6 +455,11 @@ struct VerilogFrontend : public Frontend {
 				attributes.push_back(RTLIL::escape_id(args[++argidx]));
 				continue;
 			}
+			if (arg == "-relativeshare") {
+				flag_relative_share = true;
+				log_experimental("read_verilog -relativeshare");
+				continue;
+			}
 			if (arg == "-D" && argidx+1 < args.size()) {
 				std::string name = args[++argidx], value;
 				size_t equal = name.find('=');
@@ -490,6 +500,13 @@ struct VerilogFrontend : public Frontend {
 		log("Parsing %s%s input from `%s' to AST representation.\n",
 				parse_mode.formal ? "formal " : "", parse_mode.sv ? "SystemVerilog" : "Verilog", filename.c_str());
 
+		log("verilog frontend filename %s\n", filename.c_str());
+		if (flag_relative_share) {
+			auto share_path = proc_share_dirname();
+			if (filename.substr(0, share_path.length()) == share_path)
+				filename = std::string("+/") + filename.substr(share_path.length());
+			log("new filename %s\n", filename.c_str());
+		}
 		AST::sv_mode_but_global_and_used_for_literally_one_condition = parse_mode.sv;
 		std::string code_after_preproc;
 
diff --git a/passes/techmap/techmap.cc b/passes/techmap/techmap.cc
index 30b8e17ab..281a8795a 100644
--- a/passes/techmap/techmap.cc
+++ b/passes/techmap/techmap.cc
@@ -1032,6 +1032,10 @@ struct TechmapPass : public Pass {
 		log("    -dont_map <celltype>\n");
 		log("        leave the given cell type unmapped by ignoring any mapping rules for it\n");
 		log("\n");
+		log("    -relativeshare\n");
+		log("        use paths relative to share directory for source locations\n");
+		log("        where possible (experimental).\n");
+		log("\n");
 		log("When a module in the map file has the 'techmap_celltype' attribute set, it will\n");
 		log("match cells with a type that match the text value of this attribute. Otherwise\n");
 		log("the module name will be used to match the cell.  Multiple space-separated cell\n");
@@ -1185,6 +1189,11 @@ struct TechmapPass : public Pass {
 				verilog_frontend += " -I " + args[++argidx];
 				continue;
 			}
+			if (args[argidx] == "-relativeshare") {
+				verilog_frontend += " -relativeshare";
+				log_experimental("techmap -relativeshare");
+				continue;
+			}
 			if (args[argidx] == "-assert") {
 				worker.assert_mode = true;
 				continue;
diff --git a/techlibs/common/synth.cc b/techlibs/common/synth.cc
index 9c85fbbc7..0dbb7cbec 100644
--- a/techlibs/common/synth.cc
+++ b/techlibs/common/synth.cc
@@ -98,13 +98,17 @@ struct SynthPass : public ScriptPass {
 		log("        mapping library in the `techmap` step. this option can be\n");
 		log("        repeated.\n");
 		log("\n");
+		log("    -relativeshare\n");
+		log("        use paths relative to share directory for source locations\n");
+		log("        where possible (experimental).\n");
+		log("\n");
 		log("The following commands are executed by this synthesis command:\n");
 		help_script();
 		log("\n");
 	}
 
 	string top_module, fsm_opts, memory_opts, abc;
-	bool autotop, flatten, noalumacc, nofsm, noabc, noshare, flowmap, booth, hieropt;
+	bool autotop, flatten, noalumacc, nofsm, noabc, noshare, flowmap, booth, hieropt, relative_share;
 	int lut;
 	std::vector<std::string> techmap_maps;
 
@@ -124,6 +128,7 @@ struct SynthPass : public ScriptPass {
 		flowmap = false;
 		booth = false;
 		hieropt = false;
+		relative_share = false;
 		abc = "abc";
 		techmap_maps.clear();
 	}
@@ -211,6 +216,11 @@ struct SynthPass : public ScriptPass {
 				hieropt = true;
 				continue;
 			}
+			if (args[argidx] == "-relativeshare") {
+				relative_share = true;
+				log_experimental("synth -relativeshare");
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
@@ -239,6 +249,10 @@ struct SynthPass : public ScriptPass {
 		else
 			hieropt_flag = hieropt ? " -hier" : "";
 
+		std::string techmap_cmd = "techmap";
+		if (relative_share)
+			techmap_cmd += " -relativeshare";
+
 		if (check_label("begin")) {
 			if (help_mode) {
 				run("hierarchy -check [-top <top> | -auto-top]");
@@ -268,9 +282,9 @@ struct SynthPass : public ScriptPass {
 			run("peepopt");
 			run("opt_clean");
 			if (help_mode)
-				run("techmap -map +/cmp2lut.v -map +/cmp2lcu.v", " (if -lut)");
+				run(techmap_cmd + " -map +/cmp2lut.v -map +/cmp2lcu.v", " (if -lut)");
 			else if (lut)
-				run(stringf("techmap -map +/cmp2lut.v -map +/cmp2lcu.v -D LUT_WIDTH=%d", lut));
+				run(stringf("%s -map +/cmp2lut.v -map +/cmp2lcu.v -D LUT_WIDTH=%d", techmap_cmd, lut));
 			if (booth || help_mode)
 				run("booth", "    (if -booth)");
 			if (!noalumacc)
@@ -287,22 +301,22 @@ struct SynthPass : public ScriptPass {
 			run("memory_map");
 			run("opt -full");
 			if (help_mode) {
-				run("techmap", "                  (unless -extra-map)");	
-				run("techmap -map +/techmap.v -map <inject>", "  (if -extra-map)");
+				run(techmap_cmd, "                  (unless -extra-map)");	
+				run(techmap_cmd + " -map +/techmap.v -map <inject>", "  (if -extra-map)");
 			} else {
 				std::string techmap_opts;
 				if (!techmap_maps.empty())
 					techmap_opts += " -map +/techmap.v";
 				for (auto fn : techmap_maps)
 					techmap_opts += stringf(" -map %s", fn);
-				run("techmap" + techmap_opts);
+				run(techmap_cmd + techmap_opts);
 			}
 			if (help_mode) {
-				run("techmap -map +/gate2lut.v", "(if -noabc and -lut)");
+				run(techmap_cmd + " -map +/gate2lut.v", "(if -noabc and -lut)");
 				run("clean; opt_lut", "           (if -noabc and -lut)");
 				run("flowmap -maxlut K", "        (if -flowmap and -lut)");
 			} else if (noabc && lut) {
-				run(stringf("techmap -map +/gate2lut.v -D LUT_WIDTH=%d", lut));
+				run(stringf("%s -map +/gate2lut.v -D LUT_WIDTH=%d", techmap_cmd, lut));
 				run("clean; opt_lut");
 			} else if (flowmap) {
 				run(stringf("flowmap -maxlut %d", lut));
diff --git a/techlibs/fabulous/synth_fabulous.cc b/techlibs/fabulous/synth_fabulous.cc
index 0e6553fa1..60f2a6816 100644
--- a/techlibs/fabulous/synth_fabulous.cc
+++ b/techlibs/fabulous/synth_fabulous.cc
@@ -69,7 +69,7 @@ struct SynthPass : public ScriptPass
 		log("        use the specified Verilog file for extra primitives (can be specified multiple\n");
 		log("        times).\n");
 		log("\n");
-		log("    -extra-map <techamp.v>\n");
+		log("    -extra-map <techmap.v>\n");
 		log("        use the specified Verilog file for extra techmap rules (can be specified multiple\n");
 		log("        times).\n");
 		log("\n");
diff --git a/tests/functional/test_functional.py b/tests/functional/test_functional.py
index d4ebc3484..e4c78a1fb 100644
--- a/tests/functional/test_functional.py
+++ b/tests/functional/test_functional.py
@@ -24,7 +24,7 @@ def compile_cpp(in_path, out_path, args):
     run(['g++', '-g', '-std=c++17'] + args + [str(in_path), '-o', str(out_path)])
 
 def yosys_synth(verilog_file, rtlil_file):
-    yosys(f"read_verilog {quote(verilog_file)} ; prep ; setundef -undriven ; write_rtlil {quote(rtlil_file)}")
+    yosys(f"read_verilog {quote(verilog_file)} ; prep ; setundef -undriven -undef ; write_rtlil {quote(rtlil_file)}")
 
 # simulate an rtlil file with yosys, comparing with a given vcd file, and writing out the yosys simulation results into a second vcd file
 def yosys_sim(rtlil_file, vcd_reference_file, vcd_out_file, preprocessing = ""):
@@ -91,4 +91,4 @@ def test_print_graph(tmp_path):
     tb_file = base_path / 'tests/functional/picorv32_tb.v'
     cpu_file = base_path / 'tests/functional/picorv32.v'
     # currently we only check that we can print the graph without getting an error, not that it prints anything sensibl
-    yosys(f"read_verilog {quote(tb_file)} {quote(cpu_file)}; prep -top gold; setundef -undriven ; flatten; clk2fflogic; test_generic")
+    yosys(f"read_verilog {quote(tb_file)} {quote(cpu_file)}; prep -top gold; setundef -undriven -undef ; flatten; clk2fflogic; test_generic")

From 7e6126f7533c313b61dada458764c6d822e7f3ca Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 3 Sep 2025 01:58:08 +0200
Subject: [PATCH 559/931] rtlil: fix roundtrip test by eliminating absolute
 paths from src attributes with -relativeshare

---
 tests/rtlil/roundtrip-text.sh           |   2 +-
 tests/rtlil/roundtrip-text.synth.ref.il | 562 ++++++++++++------------
 2 files changed, 282 insertions(+), 282 deletions(-)

diff --git a/tests/rtlil/roundtrip-text.sh b/tests/rtlil/roundtrip-text.sh
index 45db7ee72..c475a9d9a 100644
--- a/tests/rtlil/roundtrip-text.sh
+++ b/tests/rtlil/roundtrip-text.sh
@@ -26,7 +26,7 @@ diff temp/roundtrip-text.dump.il temp/roundtrip-text.reload-hash-nogen.il
 
 echo "Without ABC, we don't get any irreproducibility and can pin that"
 echo "Has this test case started failing for you? Consider updating the reference"
-$YS -p "read_verilog -sv everything.v; synth -noabc; write_rtlil temp/roundtrip-text.synth.il"
+$YS -p "read_verilog -sv everything.v; synth -relativeshare -noabc; write_rtlil temp/roundtrip-text.synth.il"
 sed '/^$/d' -i.bak temp/roundtrip-text.synth.il
 tail -n +2 temp/roundtrip-text.synth.il > temp/roundtrip-text.synth-nogen.il
 diff temp/roundtrip-text.synth-nogen.il roundtrip-text.synth.ref.il
diff --git a/tests/rtlil/roundtrip-text.synth.ref.il b/tests/rtlil/roundtrip-text.synth.ref.il
index 04b27b1c1..ab48affc6 100644
--- a/tests/rtlil/roundtrip-text.synth.ref.il
+++ b/tests/rtlil/roundtrip-text.synth.ref.il
@@ -9,276 +9,276 @@ module \foo
   wire width 8 input 2 \b
   attribute \src "everything.v:35.17-35.18"
   wire width 8 input 1 \a
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$150_Y
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$147_Y
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$173_Y
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$170_Y
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$167_Y
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$164_Y
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$151_Y
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$148_Y
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$155_Y
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$149_Y
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$146_Y
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$143_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$150_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$147_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$173_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$170_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$167_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$164_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$151_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$148_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$155_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$149_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$146_Y
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$143_Y
   attribute \unused_bits "7"
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:214.23-214.24"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:214.23-214.24"
   attribute \force_downto 1
   wire width 8 $auto$alumacc.cc:495:replace_alu$21.lcu.G
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:270.23-270.24"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:270.23-270.24"
   attribute \force_downto 1
   wire width 8 $auto$alumacc.cc:495:replace_alu$21.X
   attribute \unused_bits "7"
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:274.23-274.25"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:274.23-274.25"
   attribute \force_downto 1
   wire width 8 $auto$alumacc.cc:495:replace_alu$21.CO
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$219
     connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [6]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$173_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$173_Y
     connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [6]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$218
     connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [4]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$170_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$170_Y
     connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [4]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$217
     connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [2]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$167_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$167_Y
     connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [2]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$216
     connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [5]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$164_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$150_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$164_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$150_Y
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$213
     connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [3]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$155_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$147_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$155_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$147_Y
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$211
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$150_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$149_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$150_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$149_Y
     connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [5]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$210
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$147_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$146_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$147_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$146_Y
     connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [3]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$209
     connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [1]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$143_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$143_Y
     connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [1]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$207
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$173_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$173_Y
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [5]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [6]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$206
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$170_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$170_Y
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [3]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [4]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$205
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$167_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$167_Y
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [1]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [2]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$204
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$164_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$164_Y
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [3]
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$151_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$151_Y
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$201
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$151_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$151_Y
     connect \B $auto$alumacc.cc:495:replace_alu$21.X [4]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [5]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$200
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$148_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$148_Y
     connect \B $auto$alumacc.cc:495:replace_alu$21.X [2]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [3]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$197
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$155_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$155_Y
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [1]
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$148_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$148_Y
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$195
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$149_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$149_Y
     connect \B $auto$alumacc.cc:495:replace_alu$21.lcu.G [4]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [5]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$194
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$146_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$146_Y
     connect \B $auto$alumacc.cc:495:replace_alu$21.lcu.G [2]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [3]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$193
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$143_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$143_Y
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [0]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [1]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$138
     connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [6]
     connect \B \b [6]
     connect \A \a [6]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$137
     connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [5]
     connect \B \b [5]
     connect \A \a [5]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$136
     connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [4]
     connect \B \b [4]
     connect \A \a [4]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$135
     connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [3]
     connect \B \b [3]
     connect \A \a [3]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$134
     connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [2]
     connect \B \b [2]
     connect \A \a [2]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$133
     connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [1]
     connect \B \b [1]
     connect \A \a [1]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$132
     connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [0]
     connect \B \b [0]
     connect \A \a [0]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$131
     connect \Y $auto$alumacc.cc:495:replace_alu$21.X [7]
     connect \B \b [7]
     connect \A \a [7]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$130
     connect \Y $auto$alumacc.cc:495:replace_alu$21.X [6]
     connect \B \b [6]
     connect \A \a [6]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$129
     connect \Y $auto$alumacc.cc:495:replace_alu$21.X [5]
     connect \B \b [5]
     connect \A \a [5]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$128
     connect \Y $auto$alumacc.cc:495:replace_alu$21.X [4]
     connect \B \b [4]
     connect \A \a [4]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$127
     connect \Y $auto$alumacc.cc:495:replace_alu$21.X [3]
     connect \B \b [3]
     connect \A \a [3]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$126
     connect \Y $auto$alumacc.cc:495:replace_alu$21.X [2]
     connect \B \b [2]
     connect \A \a [2]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$125
     connect \Y $auto$alumacc.cc:495:replace_alu$21.X [1]
     connect \B \b [1]
     connect \A \a [1]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$124
     connect \Y \y [0]
     connect \B \b [0]
     connect \A \a [0]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$122
     connect \Y \y [7]
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [6]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [7]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$121
     connect \Y \y [6]
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [5]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [6]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$120
     connect \Y \y [5]
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [4]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [5]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$119
     connect \Y \y [4]
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [3]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [4]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$118
     connect \Y \y [3]
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [2]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [3]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$117
     connect \Y \y [2]
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [1]
     connect \A $auto$alumacc.cc:495:replace_alu$21.X [2]
   end
-  attribute \src "everything.v:39.16-39.22|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$116
     connect \Y \y [1]
     connect \B $auto$alumacc.cc:495:replace_alu$21.CO [0]
@@ -308,61 +308,61 @@ module \alu
   wire width 8 input 3 \B
   attribute \src "everything.v:3.14-3.15"
   wire width 8 input 2 \A
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
-  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
-  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
-  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
-  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:270.26-270.27"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
+  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$348_Y
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
+  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$342_Y
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
+  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$339_Y
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
+  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$336_Y
+  attribute \src "+/techmap.v:270.26-270.27"
   attribute \force_downto 1
   wire width 9 $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:274.23-274.25"
+  attribute \src "+/techmap.v:274.23-274.25"
   attribute \force_downto 1
   wire width 9 $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.21-279.23"
+  attribute \src "+/techmap.v:279.21-279.23"
   attribute \force_downto 1
   wire width 9 $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$347_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$341_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$338_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$335_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$361_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$358_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$355_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$352_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$349_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$346_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$343_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$340_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$337_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$334_Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$331_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$347_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$341_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$338_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$335_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$361_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$358_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$355_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$352_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$348_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$342_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$339_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$336_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$349_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$346_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$343_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$340_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$337_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$334_Y
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
+  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$331_Y
   wire $procmux$9_CMP
   wire $procmux$8_CMP
   wire $auto$simplemap.cc:254:simplemap_eqne$247
@@ -374,23 +374,23 @@ module \alu
   wire width 2 $auto$simplemap.cc:125:simplemap_reduce$249
   wire $auto$rtlil.cc:3196:NotGate$497
   wire $auto$opt_dff.cc:247:make_patterns_logic$505
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:214.23-214.24"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:214.23-214.24"
   attribute \force_downto 1
   wire width 9 $auto$alumacc.cc:495:replace_alu$18.lcu.G
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:270.26-270.27"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:270.26-270.27"
   attribute \force_downto 1
   wire width 9 $auto$alumacc.cc:495:replace_alu$18.Y
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:270.23-270.24"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:270.23-270.24"
   attribute \force_downto 1
   wire width 9 $auto$alumacc.cc:495:replace_alu$18.X
   attribute \unused_bits "8"
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:274.23-274.25"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:274.23-274.25"
   attribute \force_downto 1
   wire width 9 $auto$alumacc.cc:495:replace_alu$18.CO
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.21-279.23"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.21-279.23"
   attribute \force_downto 1
   wire width 9 $auto$alumacc.cc:495:replace_alu$18.BB
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:268.22-268.23"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:268.22-268.23"
   attribute \force_downto 1
   wire width 9 $auto$alumacc.cc:495:replace_alu$18.B
   attribute \src "everything.v:17.2-31.5"
@@ -401,496 +401,496 @@ module \alu
   wire $0\SF[0:0]
   attribute \src "everything.v:17.2-31.5"
   wire $0\CF[0:0]
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$481
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [6]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [5]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$480
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [4]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$479
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [2]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$478
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [5]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
-    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$339_Y
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$477
-    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
-    connect \B $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
-    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$348_Y
+    connect \B $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$339_Y
+    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$342_Y
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$476
-    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$342_Y
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [7]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$475
-    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$339_Y
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [5]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$474
-    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
+    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$336_Y
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [3]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$473
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [8]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
-    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
+    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$348_Y
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$471
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
-    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
+    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$336_Y
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$467
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [1]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$427
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [7]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [6]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [7]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$426
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [6]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [5]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$425
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [5]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [4]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [5]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$424
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [4]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$423
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [3]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [2]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [3]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$422
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [2]
     connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$421
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [1]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
     connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [1]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$418
     connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [6]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$361_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$361_Y
     connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [6]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$417
     connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [4]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$358_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$358_Y
     connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [4]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$416
     connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [2]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$355_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$355_Y
     connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [2]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.12-248.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$415
     connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [5]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$352_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$338_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$352_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$338_Y
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$414
     connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [7]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$349_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$347_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$349_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$347_Y
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$413
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$347_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$346_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$341_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$347_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$346_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$341_Y
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$412
     connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [3]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$343_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$335_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$343_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$335_Y
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$411
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$341_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$340_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$341_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$340_Y
     connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [7]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$410
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$338_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$337_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$338_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$337_Y
     connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [5]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$409
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$335_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$334_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$335_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$334_Y
     connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [3]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.12-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$408
     connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [1]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$331_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$331_Y
     connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [1]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:231.10-231.28"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:231.10-231.28"
   cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$407
     connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [0]
     connect \B $auto$alumacc.cc:495:replace_alu$18.X [0]
     connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [0]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$405
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$361_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$361_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [5]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [6]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$404
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$358_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$358_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [4]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$403
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$355_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$355_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [1]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [2]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:248.19-248.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$402
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:248$352_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$352_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$339_Y
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$401
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$348_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$339_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$342_Y
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$400
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$342_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.X [6]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [7]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$399
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$339_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$339_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.X [4]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [5]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:241.12-241.34"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$398
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$336_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.X [2]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [3]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$397
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$349_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$349_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$348_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$348_Y
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$396
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$346_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$/home/emil/pulls/yosys/share/techmap.v:240$338_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$342_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$346_Y
+    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$338_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$342_Y
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$395
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$343_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$343_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [1]
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:241$336_Y
+    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$336_Y
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$394
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$340_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$340_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.lcu.G [6]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [7]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$393
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$337_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$337_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.lcu.G [4]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [5]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$392
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$334_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$334_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.lcu.G [2]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [3]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.27-286.69|/home/emil/pulls/yosys/share/techmap.v:240.19-240.41"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$391
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$/home/emil/pulls/yosys/share/techmap.v:240$331_Y
+    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$331_Y
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [0]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [1]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$326
     connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [7]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [7]
     connect \A \A [7]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$325
     connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [6]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [6]
     connect \A \A [6]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$324
     connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [5]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [5]
     connect \A \A [5]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$323
     connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [4]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [4]
     connect \A \A [4]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$322
     connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [3]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [3]
     connect \A \A [3]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$321
     connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [2]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [2]
     connect \A \A [2]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$320
     connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [1]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [1]
     connect \A \A [1]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:286.42-286.49"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
   cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$319
     connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [0]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
     connect \A \A [0]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$317
     connect \Y $auto$alumacc.cc:495:replace_alu$18.X [7]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [7]
     connect \A \A [7]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$316
     connect \Y $auto$alumacc.cc:495:replace_alu$18.X [6]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [6]
     connect \A \A [6]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$315
     connect \Y $auto$alumacc.cc:495:replace_alu$18.X [5]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [5]
     connect \A \A [5]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$314
     connect \Y $auto$alumacc.cc:495:replace_alu$18.X [4]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [4]
     connect \A \A [4]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$313
     connect \Y $auto$alumacc.cc:495:replace_alu$18.X [3]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [3]
     connect \A \A [3]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$312
     connect \Y $auto$alumacc.cc:495:replace_alu$18.X [2]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [2]
     connect \A \A [2]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$311
     connect \Y $auto$alumacc.cc:495:replace_alu$18.X [1]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [1]
     connect \A \A [1]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:288.13-288.20"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$310
     connect \Y $auto$alumacc.cc:495:replace_alu$18.X [0]
     connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
     connect \A \A [0]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$308
     connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [8]
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [7]
     connect \A $auto$alumacc.cc:495:replace_alu$18.BB [8]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$307
     connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [7]
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [6]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [7]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$306
     connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [6]
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [5]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [6]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$305
     connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [5]
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [4]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [5]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$304
     connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [4]
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [4]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$303
     connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [3]
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [2]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [3]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$302
     connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [2]
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [1]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [2]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:289.13-289.25"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
   cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$301
     connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [1]
     connect \B $auto$alumacc.cc:495:replace_alu$18.CO [0]
     connect \A $auto$alumacc.cc:495:replace_alu$18.X [1]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$464
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [7]
     connect \A \B [7]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$463
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
     connect \A \B [6]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$462
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [5]
     connect \A \B [5]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$461
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
     connect \A \B [4]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$460
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [3]
     connect \A \B [3]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$459
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
     connect \A \B [2]
   end
-  attribute \src "/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$458
     connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [1]
     connect \A \B [1]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$384
     connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [8]
     connect \A $auto$alumacc.cc:495:replace_alu$18.B [8]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$383
     connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [7]
     connect \A $auto$alumacc.cc:495:replace_alu$18.B [7]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$382
     connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [6]
     connect \A $auto$alumacc.cc:495:replace_alu$18.B [6]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$381
     connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [5]
     connect \A $auto$alumacc.cc:495:replace_alu$18.B [5]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$380
     connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [4]
     connect \A $auto$alumacc.cc:495:replace_alu$18.B [4]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$379
     connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [3]
     connect \A $auto$alumacc.cc:495:replace_alu$18.B [3]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$378
     connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [2]
     connect \A $auto$alumacc.cc:495:replace_alu$18.B [2]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$377
     connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [1]
     connect \A $auto$alumacc.cc:495:replace_alu$18.B [1]
   end
-  attribute \src "everything.v:23.11-23.16|/home/emil/pulls/yosys/share/techmap.v:279.31-279.37"
+  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
   cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$376
     connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [0]
     connect \A \B [0]

From 85bcdee23248b258f164e0cf3dad5afc4bd81199 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 3 Sep 2025 15:42:57 +0200
Subject: [PATCH 560/931] rtlil: fix roundtrip test on macOS due to sed
 non-POSIX non-sense

---
 tests/rtlil/roundtrip-text.sh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/rtlil/roundtrip-text.sh b/tests/rtlil/roundtrip-text.sh
index c475a9d9a..7a979879c 100644
--- a/tests/rtlil/roundtrip-text.sh
+++ b/tests/rtlil/roundtrip-text.sh
@@ -3,10 +3,17 @@ YS=../../yosys
 
 mkdir -p temp
 
+# non-POSIX sed -i inconsistency workaround
+remove_empty_lines() {
+    local file="$1"
+    sed '/^$/d' "$file" > temp/tmp
+    mv temp/tmp "$file"
+}
+
 # write_rtlil and dump are equivalent
 $YS -p "read_verilog -sv everything.v; copy alu zzz; proc zzz; dump -o temp/roundtrip-text.dump.il; write_rtlil temp/roundtrip-text.write.il"
-sed '/^$/d' -i.bak temp/roundtrip-text.dump.il
-sed '/^$/d' -i.bak temp/roundtrip-text.write.il
+remove_empty_lines temp/roundtrip-text.dump.il
+remove_empty_lines temp/roundtrip-text.write.il
 # Trim first line ("Generated by Yosys ...")
 tail -n +2 temp/roundtrip-text.write.il > temp/roundtrip-text.write-nogen.il
 diff temp/roundtrip-text.dump.il temp/roundtrip-text.write-nogen.il
@@ -14,19 +21,19 @@ diff temp/roundtrip-text.dump.il roundtrip-text.ref.il
 
 # Loading and writing it out again doesn't change the RTLIL
 $YS -p "read_rtlil temp/roundtrip-text.dump.il; write_rtlil temp/roundtrip-text.reload.il"
-sed '/^$/d' -i.bak temp/roundtrip-text.reload.il
+remove_empty_lines temp/roundtrip-text.reload.il
 tail -n +2 temp/roundtrip-text.reload.il > temp/roundtrip-text.reload-nogen.il
 diff temp/roundtrip-text.dump.il temp/roundtrip-text.reload-nogen.il
 
 # Hashing differences don't change the RTLIL
 $YS --hash-seed=2345678 -p "read_rtlil temp/roundtrip-text.dump.il; write_rtlil temp/roundtrip-text.reload-hash.il"
-sed '/^$/d' -i.bak temp/roundtrip-text.reload-hash.il
+remove_empty_lines temp/roundtrip-text.reload-hash.il
 tail -n +2 temp/roundtrip-text.reload-hash.il > temp/roundtrip-text.reload-hash-nogen.il
 diff temp/roundtrip-text.dump.il temp/roundtrip-text.reload-hash-nogen.il
 
 echo "Without ABC, we don't get any irreproducibility and can pin that"
 echo "Has this test case started failing for you? Consider updating the reference"
 $YS -p "read_verilog -sv everything.v; synth -relativeshare -noabc; write_rtlil temp/roundtrip-text.synth.il"
-sed '/^$/d' -i.bak temp/roundtrip-text.synth.il
+remove_empty_lines temp/roundtrip-text.synth.il
 tail -n +2 temp/roundtrip-text.synth.il > temp/roundtrip-text.synth-nogen.il
 diff temp/roundtrip-text.synth-nogen.il roundtrip-text.synth.ref.il

From 5ac6858f26cef9bf49c8434e7fc8208530e33dba Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 16 Sep 2025 22:59:08 +0000
Subject: [PATCH 561/931] Remove .c_str() from log_cmd_error() and
 log_file_error() parameters

---
 backends/aiger2/aiger.cc                |  2 +-
 backends/cxxrtl/cxxrtl_backend.cc       |  4 +--
 frontends/ast/ast.cc                    |  2 +-
 frontends/ast/genrtlil.cc               |  4 +--
 frontends/ast/simplify.cc               |  2 +-
 frontends/rpc/rpc_frontend.cc           | 14 ++++----
 frontends/verific/verific.cc            | 16 ++++-----
 frontends/verilog/const2ast.cc          |  2 +-
 frontends/verilog/preproc.cc            |  2 +-
 kernel/fmt.cc                           | 14 ++++----
 kernel/gzip.cc                          |  6 ++--
 kernel/register.cc                      | 10 +++---
 passes/cmds/abstract.cc                 |  4 +--
 passes/cmds/add.cc                      |  2 +-
 passes/cmds/connect.cc                  | 10 +++---
 passes/cmds/connwrappers.cc             |  4 +--
 passes/cmds/copy.cc                     |  4 +--
 passes/cmds/cover.cc                    |  2 +-
 passes/cmds/design.cc                   |  8 ++---
 passes/cmds/exec.cc                     |  8 ++---
 passes/cmds/glift.cc                    |  2 +-
 passes/cmds/logger.cc                   |  8 ++---
 passes/cmds/plugin.cc                   |  4 +--
 passes/cmds/rename.cc                   |  6 ++--
 passes/cmds/select.cc                   | 14 ++++----
 passes/cmds/setattr.cc                  |  2 +-
 passes/cmds/setenv.cc                   |  2 +-
 passes/cmds/show.cc                     |  2 +-
 passes/cmds/stat.cc                     |  4 +--
 passes/cmds/tee.cc                      |  2 +-
 passes/cmds/viz.cc                      |  2 +-
 passes/equiv/equiv_add.cc               |  8 ++---
 passes/equiv/equiv_make.cc              | 14 ++++----
 passes/hierarchy/hierarchy.cc           |  6 ++--
 passes/hierarchy/submod.cc              |  2 +-
 passes/opt/opt_lut.cc                   |  2 +-
 passes/opt/opt_lut_ins.cc               |  2 +-
 passes/pmgen/test_pmgen.cc              |  2 +-
 passes/sat/eval.cc                      | 16 ++++-----
 passes/sat/miter.cc                     | 14 ++++----
 passes/sat/mutate.cc                    |  2 +-
 passes/sat/qbfsat.cc                    |  8 ++---
 passes/sat/sat.cc                       | 44 ++++++++++++-------------
 passes/sat/sim.cc                       |  2 +-
 passes/techmap/abc.cc                   |  4 +--
 passes/techmap/cellmatch.cc             |  2 +-
 passes/techmap/constmap.cc              |  4 +--
 passes/techmap/extract.cc               |  2 +-
 passes/tests/test_cell.cc               |  4 +--
 techlibs/fabulous/synth_fabulous.cc     |  2 +-
 techlibs/greenpak4/synth_greenpak4.cc   |  2 +-
 techlibs/ice40/synth_ice40.cc           |  2 +-
 techlibs/intel/synth_intel.cc           |  2 +-
 techlibs/lattice/synth_lattice.cc       |  2 +-
 techlibs/microchip/synth_microchip.cc   |  2 +-
 techlibs/nanoxplore/synth_nanoxplore.cc |  2 +-
 techlibs/nexus/synth_nexus.cc           |  2 +-
 techlibs/quicklogic/synth_quicklogic.cc |  2 +-
 techlibs/xilinx/synth_xilinx.cc         |  2 +-
 59 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/backends/aiger2/aiger.cc b/backends/aiger2/aiger.cc
index c7ed3b81f..bf7497bb5 100644
--- a/backends/aiger2/aiger.cc
+++ b/backends/aiger2/aiger.cc
@@ -1446,7 +1446,7 @@ struct XAiger2Backend : Backend {
 		if (!map_filename.empty()) {
 			writer.map_file.open(map_filename);
 			if (!writer.map_file)
-				log_cmd_error("Failed to open '%s' for writing\n", map_filename.c_str());
+				log_cmd_error("Failed to open '%s' for writing\n", map_filename);
 		}
 
 		design->bufNormalize(true);
diff --git a/backends/cxxrtl/cxxrtl_backend.cc b/backends/cxxrtl/cxxrtl_backend.cc
index 9a7e1383a..48710aff8 100644
--- a/backends/cxxrtl/cxxrtl_backend.cc
+++ b/backends/cxxrtl/cxxrtl_backend.cc
@@ -1533,7 +1533,7 @@ struct CxxrtlWorker {
 			}
 		// Internal cells
 		} else if (is_internal_cell(cell->type)) {
-			log_cmd_error("Unsupported internal cell `%s'.\n", cell->type.c_str());
+			log_cmd_error("Unsupported internal cell `%s'.\n", cell->type);
 		// User cells
 		} else if (for_debug) {
 			// Outlines are called on demand when computing the value of a debug item. Nothing to do here.
@@ -3803,7 +3803,7 @@ struct CxxrtlBackend : public Backend {
 			if (args[argidx] == "-print-output" && argidx+1 < args.size()) {
 				worker.print_output = args[++argidx];
 				if (!(worker.print_output == "std::cout" || worker.print_output == "std::cerr")) {
-					log_cmd_error("Invalid output stream \"%s\".\n", worker.print_output.c_str());
+					log_cmd_error("Invalid output stream \"%s\".\n", worker.print_output);
 					worker.print_output = "std::cout";
 				}
 				continue;
diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 459b50683..488775d2c 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -1446,7 +1446,7 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool nodisplay, bool dump
 			if (design->has(child->str)) {
 				RTLIL::Module *existing_mod = design->module(child->str);
 				if (!nooverwrite && !overwrite && !existing_mod->get_blackbox_attribute()) {
-					log_file_error(*child->location.begin.filename, child->location.begin.line, "Re-definition of module `%s'!\n", child->str.c_str());
+					log_file_error(*child->location.begin.filename, child->location.begin.line, "Re-definition of module `%s'!\n", child->str);
 				} else if (nooverwrite) {
 					log("Ignoring re-definition of module `%s' at %s.\n",
 							child->str.c_str(), child->loc_string().c_str());
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 262dda43b..5fd478ff3 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -795,7 +795,7 @@ struct AST_INTERNAL::ProcessGenerator
 					fmt.append_literal("\n");
 				fmt.emit_rtlil(cell);
 			} else if (!ast->str.empty()) {
-				log_file_error(*ast->location.begin.filename, ast->location.begin.line, "Found unsupported invocation of system task `%s'!\n", ast->str.c_str());
+				log_file_error(*ast->location.begin.filename, ast->location.begin.line, "Found unsupported invocation of system task `%s'!\n", ast->str);
 			}
 			break;
 
@@ -846,7 +846,7 @@ struct AST_INTERNAL::ProcessGenerator
 				set_src_attr(cell, ast);
 				for (auto &attr : ast->attributes) {
 					if (attr.second->type != AST_CONSTANT)
-						log_file_error(*ast->location.begin.filename, ast->location.begin.line, "Attribute `%s' with non-constant value!\n", attr.first.c_str());
+						log_file_error(*ast->location.begin.filename, ast->location.begin.line, "Attribute `%s' with non-constant value!\n", attr.first);
 					cell->attributes[attr.first] = attr.second->asAttrConst();
 				}
 				cell->setParam(ID::FLAVOR, flavor);
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 2669f83e2..0df09030c 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -164,7 +164,7 @@ Fmt AstNode::processFormat(int stage, bool sformat_like, int default_base, size_
 			log_file_info(*location.begin.filename, location.begin.line, "Skipping system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
 			return Fmt();
 		} else {
-			log_file_error(*location.begin.filename, location.begin.line, "Failed to evaluate system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
+			log_file_error(*location.begin.filename, location.begin.line, "Failed to evaluate system task `%s' with non-constant argument at position %zu.\n", str, index + 1);
 		}
 		args.push_back(arg);
 	}
diff --git a/frontends/rpc/rpc_frontend.cc b/frontends/rpc/rpc_frontend.cc
index df64ecd2f..80a6aae6d 100644
--- a/frontends/rpc/rpc_frontend.cc
+++ b/frontends/rpc/rpc_frontend.cc
@@ -91,9 +91,9 @@ struct RpcServer {
 		std::string error;
 		Json json_response = Json::parse(response, error);
 		if (json_response.is_null())
-			log_cmd_error("parsing JSON failed: %s\n", error.c_str());
+			log_cmd_error("parsing JSON failed: %s\n", error);
 		if (json_response["error"].is_string())
-			log_cmd_error("RPC frontend returned an error: %s\n", json_response["error"].string_value().c_str());
+			log_cmd_error("RPC frontend returned an error: %s\n", json_response["error"].string_value());
 		return json_response;
 	}
 
@@ -111,7 +111,7 @@ struct RpcServer {
 			}
 		} else is_valid = false;
 		if (!is_valid)
-			log_cmd_error("RPC frontend returned malformed response: %s\n", response.dump().c_str());
+			log_cmd_error("RPC frontend returned malformed response: %s\n", response.dump());
 		return modules;
 	}
 
@@ -149,7 +149,7 @@ struct RpcServer {
 			source = response["source"].string_value();
 		else is_valid = false;
 		if (!is_valid)
-			log_cmd_error("RPC frontend returned malformed response: %s\n", response.dump().c_str());
+			log_cmd_error("RPC frontend returned malformed response: %s\n", response.dump());
 		return std::make_pair(frontend, source);
 	}
 };
@@ -202,7 +202,7 @@ struct RpcModule : RTLIL::Module {
 				}
 			}
 			if (!found_derived_top)
-				log_cmd_error("RPC frontend did not return requested module `%s`!\n", stripped_name.c_str());
+				log_cmd_error("RPC frontend did not return requested module `%s`!\n", stripped_name);
 
 			for (auto module : derived_design->modules())
 				for (auto cell : module->cells())
@@ -256,7 +256,7 @@ struct HandleRpcServer : RpcServer {
 		do {
 			DWORD data_written;
 			if (!WriteFile(hsend, &data[offset], data.length() - offset, &data_written, /*lpOverlapped=*/NULL))
-				log_cmd_error("WriteFile failed: %s\n", get_last_error_str().c_str());
+				log_cmd_error("WriteFile failed: %s\n", get_last_error_str());
 			offset += data_written;
 		} while(offset < (ssize_t)data.length());
 	}
@@ -268,7 +268,7 @@ struct HandleRpcServer : RpcServer {
 			data.resize(data.length() + 1024);
 			DWORD data_read;
 			if (!ReadFile(hrecv, &data[offset], data.length() - offset, &data_read, /*lpOverlapped=*/NULL))
-				log_cmd_error("ReadFile failed: %s\n", get_last_error_str().c_str());
+				log_cmd_error("ReadFile failed: %s\n", get_last_error_str());
 			offset += data_read;
 			data.resize(offset);
 			size_t term_pos = data.find('\n', offset);
diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 8bb34582e..91af38ccd 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -1469,7 +1469,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 
 	if (design->has(module_name)) {
 		if (!nl->IsOperator() && !is_blackbox(nl))
-			log_cmd_error("Re-definition of module `%s'.\n", netlist_name.c_str());
+			log_cmd_error("Re-definition of module `%s'.\n", netlist_name);
 		return;
 	}
 
@@ -3824,7 +3824,7 @@ struct VerificPass : public Pass {
 				add_units_to_map(map, work, flag_lib);
 				std::string filename = frontent_rewrite(args, argidx, tmp_files);
 				if (!vhdl_file::Analyze(filename.c_str(), work.c_str(), vhdl_file::VHDL_87))
-					log_cmd_error("Reading `%s' in VHDL_87 mode failed.\n", filename.c_str());
+					log_cmd_error("Reading `%s' in VHDL_87 mode failed.\n", filename);
 				set_units_to_blackbox(map, work, flag_lib);
 			}
 			verific_import_pending = true;
@@ -3849,7 +3849,7 @@ struct VerificPass : public Pass {
 				add_units_to_map(map, work, flag_lib);
 				std::string filename = frontent_rewrite(args, argidx, tmp_files);
 				if (!vhdl_file::Analyze(filename.c_str(), work.c_str(), vhdl_file::VHDL_93))
-					log_cmd_error("Reading `%s' in VHDL_93 mode failed.\n", filename.c_str());
+					log_cmd_error("Reading `%s' in VHDL_93 mode failed.\n", filename);
 				set_units_to_blackbox(map, work, flag_lib);
 			}
 			verific_import_pending = true;
@@ -3874,7 +3874,7 @@ struct VerificPass : public Pass {
 				add_units_to_map(map, work, flag_lib);
 				std::string filename = frontent_rewrite(args, argidx, tmp_files);
 				if (!vhdl_file::Analyze(filename.c_str(), work.c_str(), vhdl_file::VHDL_2K))
-					log_cmd_error("Reading `%s' in VHDL_2K mode failed.\n", filename.c_str());
+					log_cmd_error("Reading `%s' in VHDL_2K mode failed.\n", filename);
 				set_units_to_blackbox(map, work, flag_lib);
 			}
 			verific_import_pending = true;
@@ -3899,7 +3899,7 @@ struct VerificPass : public Pass {
 				add_units_to_map(map, work, flag_lib);
 				std::string filename = frontent_rewrite(args, argidx, tmp_files);
 				if (!vhdl_file::Analyze(filename.c_str(), work.c_str(), vhdl_file::VHDL_2019))
-					log_cmd_error("Reading `%s' in VHDL_2019 mode failed.\n", filename.c_str());
+					log_cmd_error("Reading `%s' in VHDL_2019 mode failed.\n", filename);
 				set_units_to_blackbox(map, work, flag_lib);
 			}
 			verific_import_pending = true;
@@ -3924,7 +3924,7 @@ struct VerificPass : public Pass {
 				add_units_to_map(map, work, flag_lib);
 				std::string filename = frontent_rewrite(args, argidx, tmp_files);
 				if (!vhdl_file::Analyze(filename.c_str(), work.c_str(), vhdl_file::VHDL_2008))
-					log_cmd_error("Reading `%s' in VHDL_2008 mode failed.\n", filename.c_str());
+					log_cmd_error("Reading `%s' in VHDL_2008 mode failed.\n", filename);
 				set_units_to_blackbox(map, work, flag_lib);
 			}
 			verific_import_pending = true;
@@ -3938,7 +3938,7 @@ struct VerificPass : public Pass {
 			while (argidx < GetSize(args)) {
 				std::string filename = frontent_rewrite(args, argidx, tmp_files);
 				if (!edif.Read(filename.c_str()))
-					log_cmd_error("Reading `%s' in EDIF mode failed.\n", filename.c_str());
+					log_cmd_error("Reading `%s' in EDIF mode failed.\n", filename);
 			}
 			goto check_error;
 		}
@@ -3961,7 +3961,7 @@ struct VerificPass : public Pass {
 			while (argidx < GetSize(args)) {
 				std::string filename = frontent_rewrite(args, argidx, tmp_files);
 				if (!synlib_file::Read(filename.c_str(), is_work_set ? work.c_str() : nullptr))
-					log_cmd_error("Reading `%s' in LIBERTY mode failed.\n", filename.c_str());
+					log_cmd_error("Reading `%s' in LIBERTY mode failed.\n", filename);
 				SynlibLibrary *lib = synlib_file::GetLastLibraryAnalyzed();
 				if (lib && flag_lib) {
 					MapIter mi ;
diff --git a/frontends/verilog/const2ast.cc b/frontends/verilog/const2ast.cc
index 9b197b356..661b4ef96 100644
--- a/frontends/verilog/const2ast.cc
+++ b/frontends/verilog/const2ast.cc
@@ -45,7 +45,7 @@ using namespace AST;
 using namespace VERILOG_FRONTEND;
 
 void ConstParser::log_maybe_loc_error(std::string msg) {
-	log_file_error(*loc.begin.filename, loc.begin.line, "%s", msg.c_str());
+	log_file_error(*loc.begin.filename, loc.begin.line, "%s", msg);
 }
 
 void ConstParser::log_maybe_loc_warn(std::string msg) {
diff --git a/frontends/verilog/preproc.cc b/frontends/verilog/preproc.cc
index 8674758ab..1858edc97 100644
--- a/frontends/verilog/preproc.cc
+++ b/frontends/verilog/preproc.cc
@@ -741,7 +741,7 @@ read_define(const std::string &filename,
 		defines_map.add(name, value, (state == 2) ? &args : nullptr);
 		global_defines_cache.add(name, value, (state == 2) ? &args : nullptr);
 	} else {
-		log_file_error(filename, 0, "Invalid name for macro definition: >>%s<<.\n", name.c_str());
+		log_file_error(filename, 0, "Invalid name for macro definition: >>%s<<.\n", name);
 	}
 }
 
diff --git a/kernel/fmt.cc b/kernel/fmt.cc
index 6e9f2924a..200e7e5ce 100644
--- a/kernel/fmt.cc
+++ b/kernel/fmt.cc
@@ -401,11 +401,11 @@ void Fmt::parse_verilog(const std::vector<VerilogFmtArg> &args, bool sformat_lik
 								part = {};
 							}
 							if (++i == fmt.size()) {
-								log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with incomplete format specifier in argument %zu.\n", task_name.c_str(), fmtarg - args.begin() + 1);
+								log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with incomplete format specifier in argument %zu.\n", task_name, fmtarg - args.begin() + 1);
 							}
 
 							if (++arg == args.end()) {
-								log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with fewer arguments than the format specifiers in argument %zu require.\n", task_name.c_str(), fmtarg - args.begin() + 1);
+								log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with fewer arguments than the format specifiers in argument %zu require.\n", task_name, fmtarg - args.begin() + 1);
 							}
 							part.sig = arg->sig;
 							part.signed_ = arg->signed_;
@@ -420,7 +420,7 @@ void Fmt::parse_verilog(const std::vector<VerilogFmtArg> &args, bool sformat_lik
 								} else break;
 							}
 							if (i == fmt.size()) {
-								log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with incomplete format specifier in argument %zu.\n", task_name.c_str(), fmtarg - args.begin() + 1);
+								log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with incomplete format specifier in argument %zu.\n", task_name, fmtarg - args.begin() + 1);
 							}
 
 							bool has_leading_zero = false, has_width = false;
@@ -465,15 +465,15 @@ void Fmt::parse_verilog(const std::vector<VerilogFmtArg> &args, bool sformat_lik
 										if (!has_width && !has_leading_zero)
 											part.width = 20;
 									} else {
-										log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with format character `%c' in argument %zu, but the argument is not $time or $realtime.\n", task_name.c_str(), fmt[i], fmtarg - args.begin() + 1);
+										log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with format character `%c' in argument %zu, but the argument is not $time or $realtime.\n", task_name, fmt[i], fmtarg - args.begin() + 1);
 									}
 								} else {
-									log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with unrecognized format character `%c' in argument %zu.\n", task_name.c_str(), fmt[i], fmtarg - args.begin() + 1);
+									log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with unrecognized format character `%c' in argument %zu.\n", task_name, fmt[i], fmtarg - args.begin() + 1);
 								}
 								break;
 							}
 							if (i == fmt.size()) {
-								log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with incomplete format specifier in argument %zu.\n", task_name.c_str(), fmtarg - args.begin() + 1);
+								log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with incomplete format specifier in argument %zu.\n", task_name, fmtarg - args.begin() + 1);
 							}
 
 							if (part.padding == '\0') {
@@ -486,7 +486,7 @@ void Fmt::parse_verilog(const std::vector<VerilogFmtArg> &args, bool sformat_lik
 							}
 
 							if (part.type == FmtPart::INTEGER && part.base != 10 && part.sign != FmtPart::MINUS)
-								log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with invalid format specifier in argument %zu.\n", task_name.c_str(), fmtarg - args.begin() + 1);
+								log_file_error(fmtarg->filename, fmtarg->first_line, "System task `%s' called with invalid format specifier in argument %zu.\n", task_name, fmtarg - args.begin() + 1);
 
 							if (part.base != 10)
 								part.signed_ = false;
diff --git a/kernel/gzip.cc b/kernel/gzip.cc
index d19c06579..433c35902 100644
--- a/kernel/gzip.cc
+++ b/kernel/gzip.cc
@@ -103,11 +103,11 @@ gzip_istream::ibuf::~ibuf() {
 // Never returns nullptr or failed state istream*
 std::istream* uncompressed(const std::string filename, std::ios_base::openmode mode) {
 	if (!check_file_exists(filename))
-		log_cmd_error("File `%s' not found or is a directory\n", filename.c_str());
+		log_cmd_error("File `%s' not found or is a directory\n", filename);
 	std::ifstream* f = new std::ifstream();
 	f->open(filename, mode);
 	if (f->fail())
-		log_cmd_error("Can't open input file `%s' for reading: %s\n", filename.c_str(), strerror(errno));
+		log_cmd_error("Can't open input file `%s' for reading: %s\n", filename, strerror(errno));
 	// Check for gzip magic
 	unsigned char magic[3];
 	int n = 0;
@@ -131,7 +131,7 @@ std::istream* uncompressed(const std::string filename, std::ios_base::openmode m
 		log_assert(ok && "Failed to open gzipped file.\n");
 		return s;
 #else
-		log_cmd_error("File `%s' is a gzip file, but Yosys is compiled without zlib.\n", filename.c_str());
+		log_cmd_error("File `%s' is a gzip file, but Yosys is compiled without zlib.\n", filename);
 #endif // YOSYS_ENABLE_ZLIB
 	} else {
 		f->clear();
diff --git a/kernel/register.cc b/kernel/register.cc
index 4afd7ada3..36e312968 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -262,7 +262,7 @@ void Pass::call(RTLIL::Design *design, std::vector<std::string> args)
 	}
 
 	if (pass_register.count(args[0]) == 0)
-		log_cmd_error("No such command: %s (type 'help' for a command overview)\n", args[0].c_str());
+		log_cmd_error("No such command: %s (type 'help' for a command overview)\n", args[0]);
 
 	if (pass_register[args[0]]->experimental_flag)
 		log_experimental(args[0]);
@@ -521,7 +521,7 @@ void Frontend::frontend_call(RTLIL::Design *design, std::istream *f, std::string
 	if (args.size() == 0)
 		return;
 	if (frontend_register.count(args[0]) == 0)
-		log_cmd_error("No such frontend: %s\n", args[0].c_str());
+		log_cmd_error("No such frontend: %s\n", args[0]);
 
 	if (f != NULL) {
 		auto state = frontend_register[args[0]]->pre_execute();
@@ -596,7 +596,7 @@ void Backend::extra_args(std::ostream *&f, std::string &filename, std::vector<st
 			gzip_ostream *gf = new gzip_ostream;
 			if (!gf->open(filename)) {
 				delete gf;
-				log_cmd_error("Can't open output file `%s' for writing: %s\n", filename.c_str(), strerror(errno));
+				log_cmd_error("Can't open output file `%s' for writing: %s\n", filename, strerror(errno));
 			}
 			yosys_output_files.insert(filename);
 			f = gf;
@@ -609,7 +609,7 @@ void Backend::extra_args(std::ostream *&f, std::string &filename, std::vector<st
 			yosys_output_files.insert(filename);
 			if (ff->fail()) {
 				delete ff;
-				log_cmd_error("Can't open output file `%s' for writing: %s\n", filename.c_str(), strerror(errno));
+				log_cmd_error("Can't open output file `%s' for writing: %s\n", filename, strerror(errno));
 			}
 			f = ff;
 		}
@@ -641,7 +641,7 @@ void Backend::backend_call(RTLIL::Design *design, std::ostream *f, std::string f
 	if (args.size() == 0)
 		return;
 	if (backend_register.count(args[0]) == 0)
-		log_cmd_error("No such backend: %s\n", args[0].c_str());
+		log_cmd_error("No such backend: %s\n", args[0]);
 
 	size_t orig_sel_stack_pos = design->selection_stack.size();
 
diff --git a/passes/cmds/abstract.cc b/passes/cmds/abstract.cc
index e475ba71c..88f07a5aa 100644
--- a/passes/cmds/abstract.cc
+++ b/passes/cmds/abstract.cc
@@ -53,7 +53,7 @@ struct Slice {
 	}
 
 	static void syntax_error(const std::string &slice) {
-		log_cmd_error("Invalid slice '%s', expected '<first>:<last>' or '<single>'", slice.c_str());
+		log_cmd_error("Invalid slice '%s', expected '<first>:<last>' or '<single>'", slice);
 	}
 
 	std::string to_string() const {
@@ -494,7 +494,7 @@ struct AbstractPass : public Pass {
 					case Enable::ActiveHigh: {
 						Wire *enable_wire = mod->wire("\\" + enable_name);
 						if (!enable_wire)
-							log_cmd_error("Enable wire %s not found in module %s\n", enable_name.c_str(), mod->name.c_str());
+							log_cmd_error("Enable wire %s not found in module %s\n", enable_name, mod->name);
 						if (GetSize(enable_wire) != 1)
 							log_cmd_error("Enable wire %s must have width 1 but has width %d in module %s\n",
 									enable_name.c_str(), GetSize(enable_wire), mod->name.c_str());
diff --git a/passes/cmds/add.cc b/passes/cmds/add.cc
index 0d395f043..1011a093c 100644
--- a/passes/cmds/add.cc
+++ b/passes/cmds/add.cc
@@ -77,7 +77,7 @@ static void add_wire(RTLIL::Design *design, RTLIL::Module *module, std::string n
 			wire = nullptr;
 
 		if (wire == nullptr)
-			log_cmd_error("Found incompatible object with same name in module %s!\n", module->name.c_str());
+			log_cmd_error("Found incompatible object with same name in module %s!\n", module->name);
 
 		log("Module %s already has such an object.\n", module->name);
 	}
diff --git a/passes/cmds/connect.cc b/passes/cmds/connect.cc
index 65292ef92..c6d3320ea 100644
--- a/passes/cmds/connect.cc
+++ b/passes/cmds/connect.cc
@@ -150,9 +150,9 @@ struct ConnectPass : public Pass {
 
 			RTLIL::SigSpec sig_lhs, sig_rhs;
 			if (!RTLIL::SigSpec::parse_sel(sig_lhs, design, module, set_lhs))
-				log_cmd_error("Failed to parse set lhs expression `%s'.\n", set_lhs.c_str());
+				log_cmd_error("Failed to parse set lhs expression `%s'.\n", set_lhs);
 			if (!RTLIL::SigSpec::parse_rhs(sig_lhs, sig_rhs, module, set_rhs))
-				log_cmd_error("Failed to parse set rhs expression `%s'.\n", set_rhs.c_str());
+				log_cmd_error("Failed to parse set rhs expression `%s'.\n", set_rhs);
 
 			sigmap.apply(sig_lhs);
 			sigmap.apply(sig_rhs);
@@ -173,7 +173,7 @@ struct ConnectPass : public Pass {
 
 			RTLIL::SigSpec sig;
 			if (!RTLIL::SigSpec::parse_sel(sig, design, module, unset_expr))
-				log_cmd_error("Failed to parse unset expression `%s'.\n", unset_expr.c_str());
+				log_cmd_error("Failed to parse unset expression `%s'.\n", unset_expr);
 
 			sigmap.apply(sig);
 			unset_drivers(design, module, sigmap, sig);
@@ -185,11 +185,11 @@ struct ConnectPass : public Pass {
 				log_cmd_error("Can't use -port together with -nounset.\n");
 
 			if (module->cell(RTLIL::escape_id(port_cell)) == nullptr)
-				log_cmd_error("Can't find cell %s.\n", port_cell.c_str());
+				log_cmd_error("Can't find cell %s.\n", port_cell);
 
 			RTLIL::SigSpec sig;
 			if (!RTLIL::SigSpec::parse_sel(sig, design, module, port_expr))
-				log_cmd_error("Failed to parse port expression `%s'.\n", port_expr.c_str());
+				log_cmd_error("Failed to parse port expression `%s'.\n", port_expr);
 
 			if (!flag_assert) {
 				module->cell(RTLIL::escape_id(port_cell))->setPort(RTLIL::escape_id(port_port), sigmap(sig));
diff --git a/passes/cmds/connwrappers.cc b/passes/cmds/connwrappers.cc
index dbe23ccf1..5677c666d 100644
--- a/passes/cmds/connwrappers.cc
+++ b/passes/cmds/connwrappers.cc
@@ -42,7 +42,7 @@ struct ConnwrappersWorker
 		decl_celltypes.insert(key.first);
 
 		if (decls.count(key))
-			log_cmd_error("Duplicate port decl: %s %s\n", celltype.c_str(), portname.c_str());
+			log_cmd_error("Duplicate port decl: %s %s\n", celltype, portname);
 
 		portdecl_t decl;
 		decl.widthparam = RTLIL::escape_id(widthparam);
@@ -57,7 +57,7 @@ struct ConnwrappersWorker
 		decl_celltypes.insert(key.first);
 
 		if (decls.count(key))
-			log_cmd_error("Duplicate port decl: %s %s\n", celltype.c_str(), portname.c_str());
+			log_cmd_error("Duplicate port decl: %s %s\n", celltype, portname);
 
 		portdecl_t decl;
 		decl.widthparam = RTLIL::escape_id(widthparam);
diff --git a/passes/cmds/copy.cc b/passes/cmds/copy.cc
index e3fb3a0e6..5a5835a43 100644
--- a/passes/cmds/copy.cc
+++ b/passes/cmds/copy.cc
@@ -45,10 +45,10 @@ struct CopyPass : public Pass {
 		std::string trg_name = RTLIL::escape_id(args[2]);
 
 		if (design->module(src_name) == nullptr)
-			log_cmd_error("Can't find source module %s.\n", src_name.c_str());
+			log_cmd_error("Can't find source module %s.\n", src_name);
 
 		if (design->module(trg_name) != nullptr)
-			log_cmd_error("Target module name %s already exists.\n", trg_name.c_str());
+			log_cmd_error("Target module name %s already exists.\n", trg_name);
 
 		RTLIL::Module *new_mod = design->module(src_name)->clone();
 		new_mod->name = trg_name;
diff --git a/passes/cmds/cover.cc b/passes/cmds/cover.cc
index bab00c287..7f217329c 100644
--- a/passes/cmds/cover.cc
+++ b/passes/cmds/cover.cc
@@ -118,7 +118,7 @@ struct CoverPass : public Pass {
 				if (f == NULL) {
 					for (auto f : out_files)
 						fclose(f);
-					log_cmd_error("Can't create file %s%s.\n", args[argidx-1] == "-d" ? "in directory " : "", args[argidx].c_str());
+					log_cmd_error("Can't create file %s%s.\n", args[argidx-1] == "-d" ? "in directory " : "", args[argidx]);
 				}
 				out_files.push_back(f);
 				continue;
diff --git a/passes/cmds/design.cc b/passes/cmds/design.cc
index 59cd39c98..ddbd98bfd 100644
--- a/passes/cmds/design.cc
+++ b/passes/cmds/design.cc
@@ -165,13 +165,13 @@ struct DesignPass : public Pass {
 				got_mode = true;
 				load_name = args[++argidx];
 				if (saved_designs.count(load_name) == 0)
-					log_cmd_error("No saved design '%s' found!\n", load_name.c_str());
+					log_cmd_error("No saved design '%s' found!\n", load_name);
 				continue;
 			}
 			if (!got_mode && args[argidx] == "-copy-from" && argidx+1 < args.size()) {
 				got_mode = true;
 				if (saved_designs.count(args[++argidx]) == 0)
-					log_cmd_error("No saved design '%s' found!\n", args[argidx].c_str());
+					log_cmd_error("No saved design '%s' found!\n", args[argidx]);
 				copy_from_design = saved_designs.at(args[argidx]);
 				copy_to_design = design;
 				continue;
@@ -188,7 +188,7 @@ struct DesignPass : public Pass {
 				got_mode = true;
 				import_mode = true;
 				if (saved_designs.count(args[++argidx]) == 0)
-					log_cmd_error("No saved design '%s' found!\n", args[argidx].c_str());
+					log_cmd_error("No saved design '%s' found!\n", args[argidx]);
 				copy_from_design = saved_designs.at(args[argidx]);
 				copy_to_design = design;
 				as_name = args[argidx];
@@ -202,7 +202,7 @@ struct DesignPass : public Pass {
 				got_mode = true;
 				delete_name = args[++argidx];
 				if (saved_designs.count(delete_name) == 0)
-					log_cmd_error("No saved design '%s' found!\n", delete_name.c_str());
+					log_cmd_error("No saved design '%s' found!\n", delete_name);
 				continue;
 			}
 			break;
diff --git a/passes/cmds/exec.cc b/passes/cmds/exec.cc
index b346fc95d..ff1ef11ff 100644
--- a/passes/cmds/exec.cc
+++ b/passes/cmds/exec.cc
@@ -127,7 +127,7 @@ struct ExecPass : public Pass {
 						x.re = YS_REGEX_COMPILE(args[argidx]);
 						expect_stdout.push_back(x);
 					} catch (const std::regex_error& e) {
-						log_cmd_error("Error in regex expression '%s' !\n", args[argidx].c_str());
+						log_cmd_error("Error in regex expression '%s' !\n", args[argidx]);
 					}
 				} else if (args[argidx] == "-not-expect-stdout") {
 					flag_expect_stdout = true;
@@ -142,11 +142,11 @@ struct ExecPass : public Pass {
 						x.polarity = false;
 						expect_stdout.push_back(x);
 					} catch (const std::regex_error& e) {
-						log_cmd_error("Error in regex expression '%s' !\n", args[argidx].c_str());
+						log_cmd_error("Error in regex expression '%s' !\n", args[argidx]);
 					}
 
 				} else
-					log_cmd_error("Unknown option \"%s\" or \"--\" doesn\'t precede command.\n", args[argidx].c_str());
+					log_cmd_error("Unknown option \"%s\" or \"--\" doesn\'t precede command.\n", args[argidx]);
 			}
 		}
 
@@ -201,7 +201,7 @@ struct ExecPass : public Pass {
 		if (flag_expect_stdout)
 			for (auto &x : expect_stdout)
 				if (x.polarity ^ x.matched)
-					log_cmd_error("Command stdout did%s have a line matching given regex \"%s\".\n", (x.polarity? " not" : ""), x.str.c_str());
+					log_cmd_error("Command stdout did%s have a line matching given regex \"%s\".\n", (x.polarity? " not" : ""), x.str);
 
 		log_pop();
 	}
diff --git a/passes/cmds/glift.cc b/passes/cmds/glift.cc
index d7264d392..d906c241d 100644
--- a/passes/cmds/glift.cc
+++ b/passes/cmds/glift.cc
@@ -184,7 +184,7 @@ private:
 
 		for(auto &cell : module->cells().to_vector()) {
 			if (!cell->type.in(ID($_AND_), ID($_NAND_), ID($_OR_), ID($_NOR_), ID($_XOR_), ID($_XNOR_), ID($_MUX_), ID($_NMUX_), ID($_NOT_), ID($anyconst), ID($allconst), ID($assume), ID($assert)) && module->design->module(cell->type) == nullptr) {
-				log_cmd_error("Unsupported cell type \"%s\" found.  Run `techmap` first.\n", cell->type.c_str());
+				log_cmd_error("Unsupported cell type \"%s\" found.  Run `techmap` first.\n", cell->type);
 			}
 			if (cell->type.in(ID($_AND_), ID($_NAND_), ID($_OR_), ID($_NOR_))) {
 				const unsigned int A = 0, B = 1, Y = 2;
diff --git a/passes/cmds/logger.cc b/passes/cmds/logger.cc
index 37240bb7e..cab4ab81c 100644
--- a/passes/cmds/logger.cc
+++ b/passes/cmds/logger.cc
@@ -112,7 +112,7 @@ struct LoggerPass : public Pass {
 					log_warn_regexes.push_back(YS_REGEX_COMPILE(pattern));
 				}
 				catch (const std::regex_error& e) {
-					log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str());
+					log_cmd_error("Error in regex expression '%s' !\n", pattern);
 				}
 				continue;
 			}
@@ -124,7 +124,7 @@ struct LoggerPass : public Pass {
 					log_nowarn_regexes.push_back(YS_REGEX_COMPILE(pattern));
 				}
 				catch (const std::regex_error& e) {
-					log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str());
+					log_cmd_error("Error in regex expression '%s' !\n", pattern);
 				}
 				continue;
 			}
@@ -136,7 +136,7 @@ struct LoggerPass : public Pass {
 					log_werror_regexes.push_back(YS_REGEX_COMPILE(pattern));
 				}
 				catch (const std::regex_error& e) {
-					log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str());
+					log_cmd_error("Error in regex expression '%s' !\n", pattern);
 				}
 				continue;
 			}
@@ -188,7 +188,7 @@ struct LoggerPass : public Pass {
 					else log_abort();
 				}
 				catch (const std::regex_error& e) {
-					log_cmd_error("Error in regex expression '%s' !\n", pattern.c_str());
+					log_cmd_error("Error in regex expression '%s' !\n", pattern);
 				}
 				continue;
 			}
diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index 6c7921d53..afa830552 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -70,7 +70,7 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
 				if(module_p == NULL)
 				{
 					PyErr_Print();
-					log_cmd_error("Can't load python module `%s'\n", full_path.filename().c_str());
+					log_cmd_error("Can't load python module `%s'\n", full_path.filename());
 					return;
 				}
 				loaded_python_plugins[orig_filename] = module_p;
@@ -100,7 +100,7 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
 			}
 
 			if (hdl == NULL)
-				log_cmd_error("Can't load module `%s': %s\n", filename.c_str(), dlerror());
+				log_cmd_error("Can't load module `%s': %s\n", filename, dlerror());
 
 			loaded_plugins[orig_filename] = hdl;
 			Pass::init_register();
diff --git a/passes/cmds/rename.cc b/passes/cmds/rename.cc
index c4bb7135e..078ffb769 100644
--- a/passes/cmds/rename.cc
+++ b/passes/cmds/rename.cc
@@ -31,7 +31,7 @@ static void rename_in_module(RTLIL::Module *module, std::string from_name, std::
 	to_name = RTLIL::escape_id(to_name);
 
 	if (module->count_id(to_name))
-		log_cmd_error("There is already an object `%s' in module `%s'.\n", to_name.c_str(), module->name.c_str());
+		log_cmd_error("There is already an object `%s' in module `%s'.\n", to_name, module->name);
 
 	RTLIL::Wire *wire_to_rename = module->wire(from_name);
 	RTLIL::Cell *cell_to_rename = module->cell(from_name);
@@ -55,7 +55,7 @@ static void rename_in_module(RTLIL::Module *module, std::string from_name, std::
 		return;
 	}
 
-	log_cmd_error("Object `%s' not found!\n", from_name.c_str());
+	log_cmd_error("Object `%s' not found!\n", from_name);
 }
 
 static std::string derive_name_from_src(const std::string &src, int counter)
@@ -632,7 +632,7 @@ struct RenamePass : public Pass {
 					log("Renaming module %s to %s.\n", module_to_rename->name, to_name);
 					design->rename(module_to_rename, to_name);
 				} else
-					log_cmd_error("Object `%s' not found!\n", from_name.c_str());
+					log_cmd_error("Object `%s' not found!\n", from_name);
 			}
 		}
 	}
diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc
index 7fcf5cfcd..469e36ef1 100644
--- a/passes/cmds/select.cc
+++ b/passes/cmds/select.cc
@@ -592,7 +592,7 @@ static void select_op_expand(RTLIL::Design *design, const std::string &arg, char
 
 	while (pos < int(arg.size())) {
 		if (arg[pos] != ':' || pos+1 == int(arg.size()))
-			log_cmd_error("Syntax error in expand operator '%s'.\n", arg.c_str());
+			log_cmd_error("Syntax error in expand operator '%s'.\n", arg);
 		pos++;
 		if (arg[pos] == '+' || arg[pos] == '-') {
 			expand_rule_t rule;
@@ -617,7 +617,7 @@ static void select_op_expand(RTLIL::Design *design, const std::string &arg, char
 						for (auto i2 : i1.second)
 							limits.insert(i2);
 					} else
-						log_cmd_error("Selection %s is not defined!\n", RTLIL::unescape_id(str).c_str());
+						log_cmd_error("Selection %s is not defined!\n", RTLIL::unescape_id(str));
 				} else
 					limits.insert(RTLIL::escape_id(str));
 			}
@@ -804,7 +804,7 @@ static void select_stmt(RTLIL::Design *design, std::string arg, bool disable_emp
 				log_cmd_error("Must have at least one element on the stack for operator %%coe.\n");
 			select_op_expand(design, arg, 'o', true);
 		} else
-			log_cmd_error("Unknown selection operator '%s'.\n", arg.c_str());
+			log_cmd_error("Unknown selection operator '%s'.\n", arg);
 		if (work_stack.size() >= 1)
 			select_filter_active_mod(design, work_stack.back());
 		return;
@@ -815,7 +815,7 @@ static void select_stmt(RTLIL::Design *design, std::string arg, bool disable_emp
 		if (design->selection_vars.count(set_name) > 0)
 			work_stack.push_back(design->selection_vars[set_name]);
 		else
-			log_cmd_error("Selection @%s is not defined!\n", RTLIL::unescape_id(set_name).c_str());
+			log_cmd_error("Selection @%s is not defined!\n", RTLIL::unescape_id(set_name));
 		select_filter_active_mod(design, work_stack.back());
 		return;
 	}
@@ -934,7 +934,7 @@ static void select_stmt(RTLIL::Design *design, std::string arg, bool disable_emp
 			if (arg_memb.compare(2, 1, "@") == 0) {
 				std::string set_name = RTLIL::escape_id(arg_memb.substr(3));
 				if (!design->selection_vars.count(set_name))
-					log_cmd_error("Selection @%s is not defined!\n", RTLIL::unescape_id(set_name).c_str());
+					log_cmd_error("Selection @%s is not defined!\n", RTLIL::unescape_id(set_name));
 
 				auto &muster = design->selection_vars[set_name];
 				for (auto cell : mod->cells())
@@ -1428,7 +1428,7 @@ struct SelectPass : public Pass {
 				continue;
 			}
 			if (arg.size() > 0 && arg[0] == '-')
-				log_cmd_error("Unknown option %s.\n", arg.c_str());
+				log_cmd_error("Unknown option %s.\n", arg);
 			bool disable_empty_warning = count_mode || assert_none || assert_any || (assert_modcount != -1) ||
 											(assert_count != -1) || (assert_max != -1) || (assert_min != -1);
 			select_stmt(design, arg, disable_empty_warning);
@@ -1762,7 +1762,7 @@ struct CdPass : public Pass {
 			return;
 		}
 
-		log_cmd_error("No such module `%s' found!\n", RTLIL::unescape_id(modname).c_str());
+		log_cmd_error("No such module `%s' found!\n", RTLIL::unescape_id(modname));
 	}
 } CdPass;
 
diff --git a/passes/cmds/setattr.cc b/passes/cmds/setattr.cc
index f590c2fa9..25d8fd34c 100644
--- a/passes/cmds/setattr.cc
+++ b/passes/cmds/setattr.cc
@@ -39,7 +39,7 @@ struct setunset_t
 		} else {
 			RTLIL::SigSpec sig_value;
 			if (!RTLIL::SigSpec::parse(sig_value, nullptr, set_value))
-				log_cmd_error("Can't decode value '%s'!\n", set_value.c_str());
+				log_cmd_error("Can't decode value '%s'!\n", set_value);
 			value = sig_value.as_const();
 		}
 	}
diff --git a/passes/cmds/setenv.cc b/passes/cmds/setenv.cc
index 850d7c961..90eeab702 100644
--- a/passes/cmds/setenv.cc
+++ b/passes/cmds/setenv.cc
@@ -52,7 +52,7 @@ struct SetenvPass : public Pass {
 		_putenv_s(name.c_str(), value.c_str());
 #else
 		if (setenv(name.c_str(), value.c_str(), 1))
-			log_cmd_error("Invalid name \"%s\".\n", name.c_str());
+			log_cmd_error("Invalid name \"%s\".\n", name);
 #endif
 		
 	}
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index c2d446162..d0d9c0f85 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -926,7 +926,7 @@ struct ShowPass : public Pass {
 		if (f == nullptr) {
 			for (auto lib : libs)
 				delete lib;
-			log_cmd_error("Can't open dot file `%s' for writing.\n", dot_file.c_str());
+			log_cmd_error("Can't open dot file `%s' for writing.\n", dot_file);
 		}
 		ShowWorker worker(f, design, libs, colorSeed, flag_width, flag_wireshape, flag_signed, flag_stretch, flag_enum, flag_abbreviate, flag_notitle, flag_href, color_selections, label_selections, colorattr);
 		fclose(f);
diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 1b9e6106c..6e46ab5e2 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -949,7 +949,7 @@ struct StatPass : public Pass {
 			}
 			if (args[argidx] == "-top" && argidx + 1 < args.size()) {
 				if (design->module(RTLIL::escape_id(args[argidx + 1])) == nullptr)
-					log_cmd_error("Can't find module %s.\n", args[argidx + 1].c_str());
+					log_cmd_error("Can't find module %s.\n", args[argidx + 1]);
 				top_mod = design->module(RTLIL::escape_id(args[++argidx]));
 				continue;
 			}
@@ -969,7 +969,7 @@ struct StatPass : public Pass {
 			log_header(design, "Printing statistics.\n");
 
 		if (techname != "" && techname != "xilinx" && techname != "cmos" && !json_mode)
-			log_cmd_error("Unsupported technology: '%s'\n", techname.c_str());
+			log_cmd_error("Unsupported technology: '%s'\n", techname);
 
 		if (json_mode) {
 			log("{\n");
diff --git a/passes/cmds/tee.cc b/passes/cmds/tee.cc
index fbd42e311..cef94b9ce 100644
--- a/passes/cmds/tee.cc
+++ b/passes/cmds/tee.cc
@@ -83,7 +83,7 @@ struct TeePass : public Pass {
 				if (f == NULL) {
 					for (auto cf : files_to_close)
 						fclose(cf);
-					log_cmd_error("Can't create file %s.\n", args[argidx].c_str());
+					log_cmd_error("Can't create file %s.\n", args[argidx]);
 				}
 				log_files.push_back(f);
 				files_to_close.push_back(f);
diff --git a/passes/cmds/viz.cc b/passes/cmds/viz.cc
index fd45d6ba0..e3b09d029 100644
--- a/passes/cmds/viz.cc
+++ b/passes/cmds/viz.cc
@@ -994,7 +994,7 @@ struct VizPass : public Pass {
 			if (f != nullptr) return;
 			f = fopen(dot_file.c_str(), "w");
 			if (f == nullptr)
-				log_cmd_error("Can't open dot file `%s' for writing.\n", dot_file.c_str());
+				log_cmd_error("Can't open dot file `%s' for writing.\n", dot_file);
 		};
 		for (auto module : modlist) {
 			VizWorker worker(module, config);
diff --git a/passes/equiv/equiv_add.cc b/passes/equiv/equiv_add.cc
index 1bcd4a887..4deef6e32 100644
--- a/passes/equiv/equiv_add.cc
+++ b/passes/equiv/equiv_add.cc
@@ -64,7 +64,7 @@ struct EquivAddPass : public Pass {
 					log_warning("Can't find gold cell '%s'.\n", args[2].c_str());
 					return;
 				}
-				log_cmd_error("Can't find gold cell '%s'.\n", args[2].c_str());
+				log_cmd_error("Can't find gold cell '%s'.\n", args[2]);
 			}
 
 			if (gate_cell == nullptr) {
@@ -72,7 +72,7 @@ struct EquivAddPass : public Pass {
 					log_warning("Can't find gate cell '%s'.\n", args[3].c_str());
 					return;
 				}
-				log_cmd_error("Can't find gate cell '%s'.\n", args[3].c_str());
+				log_cmd_error("Can't find gate cell '%s'.\n", args[3]);
 			}
 
 			for (auto conn : gold_cell->connections())
@@ -129,7 +129,7 @@ struct EquivAddPass : public Pass {
 					log_warning("Error in gate signal: %s\n", args[2].c_str());
 					return;
 				}
-				log_cmd_error("Error in gate signal: %s\n", args[2].c_str());
+				log_cmd_error("Error in gate signal: %s\n", args[2]);
 			}
 
 			if (!SigSpec::parse_rhs(gate_signal, gold_signal, module, args[1])) {
@@ -137,7 +137,7 @@ struct EquivAddPass : public Pass {
 					log_warning("Error in gold signal: %s\n", args[1].c_str());
 					return;
 				}
-				log_cmd_error("Error in gold signal: %s\n", args[1].c_str());
+				log_cmd_error("Error in gold signal: %s\n", args[1]);
 			}
 
 			log_assert(GetSize(gold_signal) == GetSize(gate_signal));
diff --git a/passes/equiv/equiv_make.cc b/passes/equiv/equiv_make.cc
index e15e510be..bae7452f7 100644
--- a/passes/equiv/equiv_make.cc
+++ b/passes/equiv/equiv_make.cc
@@ -47,7 +47,7 @@ struct EquivMakeWorker
 		{
 			std::ifstream f(fn);
 			if (f.fail())
-				log_cmd_error("Can't open blacklist file '%s'!\n", fn.c_str());
+				log_cmd_error("Can't open blacklist file '%s'!\n", fn);
 
 			string line, token;
 			while (std::getline(f, line)) {
@@ -67,7 +67,7 @@ struct EquivMakeWorker
 		{
 			std::ifstream f(fn);
 			if (f.fail())
-				log_cmd_error("Can't open encfile '%s'!\n", fn.c_str());
+				log_cmd_error("Can't open encfile '%s'!\n", fn);
 
 			dict<Const, Const> *ed = nullptr;
 			string line, token;
@@ -81,7 +81,7 @@ struct EquivMakeWorker
 					IdString modname = RTLIL::escape_id(next_token(line));
 					IdString signame = RTLIL::escape_id(next_token(line));
 					if (encdata.count(signame))
-						log_cmd_error("Re-definition of signal '%s' in encfile '%s'!\n", signame.c_str(), fn.c_str());
+						log_cmd_error("Re-definition of signal '%s' in encfile '%s'!\n", signame, fn);
 					encdata[signame] = dict<Const, Const>();
 					ed = &encdata[signame];
 					continue;
@@ -94,7 +94,7 @@ struct EquivMakeWorker
 					continue;
 				}
 
-				log_cmd_error("Syntax error in encfile '%s'!\n", fn.c_str());
+				log_cmd_error("Syntax error in encfile '%s'!\n", fn);
 			}
 		}
 	}
@@ -492,13 +492,13 @@ struct EquivMakePass : public Pass {
 		worker.equiv_mod = design->module(RTLIL::escape_id(args[argidx+2]));
 
 		if (worker.gold_mod == nullptr)
-			log_cmd_error("Can't find gold module %s.\n", args[argidx].c_str());
+			log_cmd_error("Can't find gold module %s.\n", args[argidx]);
 
 		if (worker.gate_mod == nullptr)
-			log_cmd_error("Can't find gate module %s.\n", args[argidx+1].c_str());
+			log_cmd_error("Can't find gate module %s.\n", args[argidx+1]);
 
 		if (worker.equiv_mod != nullptr)
-			log_cmd_error("Equiv module %s already exists.\n", args[argidx+2].c_str());
+			log_cmd_error("Equiv module %s already exists.\n", args[argidx+2]);
 
 		if (worker.gold_mod->has_memories() || worker.gold_mod->has_processes())
 			log_cmd_error("Gold module contains memories or processes. Run 'memory' or 'proc' respectively.\n");
diff --git a/passes/hierarchy/hierarchy.cc b/passes/hierarchy/hierarchy.cc
index 6fec628c2..f670d1fd2 100644
--- a/passes/hierarchy/hierarchy.cc
+++ b/passes/hierarchy/hierarchy.cc
@@ -957,7 +957,7 @@ struct HierarchyPass : public Pass {
 				for (auto &para : parameters) {
 					SigSpec sig_value;
 					if (!RTLIL::SigSpec::parse(sig_value, NULL, para.second))
-						log_cmd_error("Can't decode value '%s'!\n", para.second.c_str());
+						log_cmd_error("Can't decode value '%s'!\n", para.second);
 					top_parameters[RTLIL::escape_id(para.first)] = sig_value.as_const();
 				}
 			}
@@ -991,7 +991,7 @@ struct HierarchyPass : public Pass {
 			}
 #endif
 			if (top_mod == NULL)
-				log_cmd_error("Module `%s' not found!\n", load_top_mod.c_str());
+				log_cmd_error("Module `%s' not found!\n", load_top_mod);
 		} else {
 #ifdef YOSYS_ENABLE_VERIFIC
 			if (verific_import_pending)
@@ -1045,7 +1045,7 @@ struct HierarchyPass : public Pass {
 			for (auto &para : parameters) {
 				SigSpec sig_value;
 				if (!RTLIL::SigSpec::parse(sig_value, NULL, para.second))
-					log_cmd_error("Can't decode value '%s'!\n", para.second.c_str());
+					log_cmd_error("Can't decode value '%s'!\n", para.second);
 				top_parameters[RTLIL::escape_id(para.first)] = sig_value.as_const();
 			}
 
diff --git a/passes/hierarchy/submod.cc b/passes/hierarchy/submod.cc
index 486d21920..f979e7acc 100644
--- a/passes/hierarchy/submod.cc
+++ b/passes/hierarchy/submod.cc
@@ -408,7 +408,7 @@ struct SubmodPass : public Pass {
 			RTLIL::Module *module = nullptr;
 			for (auto mod : design->selected_modules()) {
 				if (module != nullptr)
-					log_cmd_error("More than one module selected: %s %s\n", module->name.c_str(), mod->name.c_str());
+					log_cmd_error("More than one module selected: %s %s\n", module->name, mod->name);
 				module = mod;
 			}
 			if (module == nullptr)
diff --git a/passes/opt/opt_lut.cc b/passes/opt/opt_lut.cc
index 248c3dfe9..37ae38225 100644
--- a/passes/opt/opt_lut.cc
+++ b/passes/opt/opt_lut.cc
@@ -555,7 +555,7 @@ struct OptLutPass : public Pass {
 			{
 				std::string tech = args[++argidx];
 				if (tech != "ice40")
-					log_cmd_error("Unsupported -tech argument: %s\n", tech.c_str());
+					log_cmd_error("Unsupported -tech argument: %s\n", tech);
 
 				dlogic = {{
 					ID(SB_CARRY),
diff --git a/passes/opt/opt_lut_ins.cc b/passes/opt/opt_lut_ins.cc
index 9e471c3de..fa8eb563b 100644
--- a/passes/opt/opt_lut_ins.cc
+++ b/passes/opt/opt_lut_ins.cc
@@ -59,7 +59,7 @@ struct OptLutInsPass : public Pass {
 		extra_args(args, argidx, design);
 
 		if (techname != "" && techname != "xilinx" && techname != "lattice" && techname != "ecp5" && techname != "gowin")
-			log_cmd_error("Unsupported technology: '%s'\n", techname.c_str());
+			log_cmd_error("Unsupported technology: '%s'\n", techname);
 
 		for (auto module : design->selected_modules())
 		{
diff --git a/passes/pmgen/test_pmgen.cc b/passes/pmgen/test_pmgen.cc
index 892500850..f6d6a3f93 100644
--- a/passes/pmgen/test_pmgen.cc
+++ b/passes/pmgen/test_pmgen.cc
@@ -238,7 +238,7 @@ struct TestPmgenPass : public Pass {
 		if (pattern == "xilinx_srl.variable")
 			return GENERATE_PATTERN(xilinx_srl_pm, variable);
 
-		log_cmd_error("Unknown pattern: %s\n", pattern.c_str());
+		log_cmd_error("Unknown pattern: %s\n", pattern);
 	}
 
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
diff --git a/passes/sat/eval.cc b/passes/sat/eval.cc
index f71e8124b..b0eaaca22 100644
--- a/passes/sat/eval.cc
+++ b/passes/sat/eval.cc
@@ -94,11 +94,11 @@ struct BruteForceEquivChecker
 				continue;
 
 			if (mod2->wire(w->name) == nullptr)
-				log_cmd_error("Port %s in module 1 has no counterpart in module 2!\n", w->name.c_str());
+				log_cmd_error("Port %s in module 1 has no counterpart in module 2!\n", w->name);
 
 			RTLIL::Wire *w2 = mod2->wire(w->name);
 			if (w->width != w2->width || w->port_input != w2->port_input || w->port_output != w2->port_output)
-				log_cmd_error("Port %s in module 1 does not match its counterpart in module 2!\n", w->name.c_str());
+				log_cmd_error("Port %s in module 1 does not match its counterpart in module 2!\n", w->name);
 
 			if (w->port_input) {
 				mod1_inputs.append(w);
@@ -454,11 +454,11 @@ struct EvalPass : public Pass {
 		for (auto &it : sets) {
 			RTLIL::SigSpec lhs, rhs;
 			if (!RTLIL::SigSpec::parse_sel(lhs, design, module, it.first))
-				log_cmd_error("Failed to parse lhs set expression `%s'.\n", it.first.c_str());
+				log_cmd_error("Failed to parse lhs set expression `%s'.\n", it.first);
 			if (!RTLIL::SigSpec::parse_rhs(lhs, rhs, module, it.second))
-				log_cmd_error("Failed to parse rhs set expression `%s'.\n", it.second.c_str());
+				log_cmd_error("Failed to parse rhs set expression `%s'.\n", it.second);
 			if (!rhs.is_fully_const())
-				log_cmd_error("Right-hand-side set expression `%s' is not constant.\n", it.second.c_str());
+				log_cmd_error("Right-hand-side set expression `%s' is not constant.\n", it.second);
 			if (lhs.size() != rhs.size())
 				log_cmd_error("Set expression with different lhs and rhs sizes: %s (%s, %d bits) vs. %s (%s, %d bits)\n",
 						it.first.c_str(), log_signal(lhs), lhs.size(), it.second.c_str(), log_signal(rhs), rhs.size());
@@ -476,7 +476,7 @@ struct EvalPass : public Pass {
 			for (auto &it : shows) {
 				RTLIL::SigSpec signal, value, undef;
 				if (!RTLIL::SigSpec::parse_sel(signal, design, module, it))
-					log_cmd_error("Failed to parse show expression `%s'.\n", it.c_str());
+					log_cmd_error("Failed to parse show expression `%s'.\n", it);
 				value = signal;
 				if (set_undef) {
 					while (!ce.eval(value, undef)) {
@@ -502,14 +502,14 @@ struct EvalPass : public Pass {
 			for (auto &it : shows) {
 				RTLIL::SigSpec sig;
 				if (!RTLIL::SigSpec::parse_sel(sig, design, module, it))
-					log_cmd_error("Failed to parse show expression `%s'.\n", it.c_str());
+					log_cmd_error("Failed to parse show expression `%s'.\n", it);
 				signal.append(sig);
 			}
 
 			for (auto &it : tables) {
 				RTLIL::SigSpec sig;
 				if (!RTLIL::SigSpec::parse_sel(sig, design, module, it))
-					log_cmd_error("Failed to parse table expression `%s'.\n", it.c_str());
+					log_cmd_error("Failed to parse table expression `%s'.\n", it);
 				tabsigs.append(sig);
 			}
 
diff --git a/passes/sat/miter.cc b/passes/sat/miter.cc
index 9bcf25547..55a41909d 100644
--- a/passes/sat/miter.cc
+++ b/passes/sat/miter.cc
@@ -76,11 +76,11 @@ void create_miter_equiv(struct Pass *that, std::vector<std::string> args, RTLIL:
 	RTLIL::IdString miter_name = RTLIL::escape_id(args[argidx++]);
 
 	if (design->module(gold_name) == nullptr)
-		log_cmd_error("Can't find gold module %s!\n", gold_name.c_str());
+		log_cmd_error("Can't find gold module %s!\n", gold_name);
 	if (design->module(gate_name) == nullptr)
-		log_cmd_error("Can't find gate module %s!\n", gate_name.c_str());
+		log_cmd_error("Can't find gate module %s!\n", gate_name);
 	if (design->module(miter_name) != nullptr)
-		log_cmd_error("There is already a module %s!\n", miter_name.c_str());
+		log_cmd_error("There is already a module %s!\n", miter_name);
 
 	RTLIL::Module *gold_module = design->module(gold_name);
 	RTLIL::Module *gate_module = design->module(gate_name);
@@ -105,7 +105,7 @@ void create_miter_equiv(struct Pass *that, std::vector<std::string> args, RTLIL:
 			goto match_gold_port_error;
 		continue;
 	match_gold_port_error:
-		log_cmd_error("No matching port in gate module was found for %s!\n", gold_wire->name.c_str());
+		log_cmd_error("No matching port in gate module was found for %s!\n", gold_wire->name);
 	}
 
 	for (auto gate_wire : gate_module->wires()) {
@@ -125,7 +125,7 @@ void create_miter_equiv(struct Pass *that, std::vector<std::string> args, RTLIL:
 			goto match_gate_port_error;
 		continue;
 	match_gate_port_error:
-		log_cmd_error("No matching port in gold module was found for %s!\n", gate_wire->name.c_str());
+		log_cmd_error("No matching port in gold module was found for %s!\n", gate_wire->name);
 	}
 
 	log("Creating miter cell \"%s\" with gold cell \"%s\" and gate cell \"%s\".\n", RTLIL::id2cstr(miter_name), RTLIL::id2cstr(gold_name), RTLIL::id2cstr(gate_name));
@@ -322,9 +322,9 @@ void create_miter_assert(struct Pass *that, std::vector<std::string> args, RTLIL
 	IdString miter_name = argidx < args.size() ? RTLIL::escape_id(args[argidx++]) : "";
 
 	if (design->module(module_name) == nullptr)
-		log_cmd_error("Can't find module %s!\n", module_name.c_str());
+		log_cmd_error("Can't find module %s!\n", module_name);
 	if (!miter_name.empty() && design->module(miter_name) != nullptr)
-		log_cmd_error("There is already a module %s!\n", miter_name.c_str());
+		log_cmd_error("There is already a module %s!\n", miter_name);
 
 	Module *module = design->module(module_name);
 
diff --git a/passes/sat/mutate.cc b/passes/sat/mutate.cc
index 58d932f20..79ffcd88d 100644
--- a/passes/sat/mutate.cc
+++ b/passes/sat/mutate.cc
@@ -989,7 +989,7 @@ struct MutatePass : public Pass {
 			return;
 		}
 
-		log_cmd_error("Invalid mode: %s\n", opts.mode.c_str());
+		log_cmd_error("Invalid mode: %s\n", opts.mode);
 	}
 } MutatePass;
 
diff --git a/passes/sat/qbfsat.cc b/passes/sat/qbfsat.cc
index 20cee7956..ad28884f7 100644
--- a/passes/sat/qbfsat.cc
+++ b/passes/sat/qbfsat.cc
@@ -87,7 +87,7 @@ void specialize_from_file(RTLIL::Module *module, const std::string &file) {
 		if (!std::regex_search(buf, bit_m, hole_bit_assn_regex)) {
 			bit_assn = false;
 			if (!std::regex_search(buf, m, hole_assn_regex))
-				log_cmd_error("solution file is not formatted correctly: \"%s\"\n", buf.c_str());
+				log_cmd_error("solution file is not formatted correctly: \"%s\"\n", buf);
 		}
 
 		std::string hole_loc = bit_assn? bit_m[1].str() : m[1].str();
@@ -108,7 +108,7 @@ void specialize_from_file(RTLIL::Module *module, const std::string &file) {
 			pool<std::string> hole_loc_pool(locs.begin(), locs.end());
 			auto hole_cell_it = anyconst_loc_to_cell.find(hole_loc_pool);
 			if (hole_cell_it == anyconst_loc_to_cell.end())
-				log_cmd_error("cannot find matching wire name or $anyconst cell location for hole spec \"%s\"\n", buf.c_str());
+				log_cmd_error("cannot find matching wire name or $anyconst cell location for hole spec \"%s\"\n", buf);
 
 			RTLIL::Cell *hole_cell = hole_cell_it->second;
 			hole_sigbit = hole_cell->getPort(ID::Y)[hole_bit];
@@ -420,7 +420,7 @@ QbfSolveOptions parse_args(const std::vector<std::string> &args) {
 				else if (args[opt.argidx+1] == "cvc5")
 					opt.solver = opt.Solver::CVC5;
 				else
-					log_cmd_error("Unknown solver \"%s\".\n", args[opt.argidx+1].c_str());
+					log_cmd_error("Unknown solver \"%s\".\n", args[opt.argidx+1]);
 				opt.argidx++;
 			}
 			continue;
@@ -457,7 +457,7 @@ QbfSolveOptions parse_args(const std::vector<std::string> &args) {
 					opt.oflag = opt.OptimizationLevel::O2;
 				break;
 				default:
-					log_cmd_error("unknown argument %s\n", args[opt.argidx].c_str());
+					log_cmd_error("unknown argument %s\n", args[opt.argidx]);
 			}
 			continue;
 		}
diff --git a/passes/sat/sat.cc b/passes/sat/sat.cc
index 5216390da..90b85d709 100644
--- a/passes/sat/sat.cc
+++ b/passes/sat/sat.cc
@@ -106,9 +106,9 @@ struct SatHelper
 			RTLIL::SigSpec lhs, rhs;
 
 			if (!RTLIL::SigSpec::parse_sel(lhs, design, module, s.first))
-				log_cmd_error("Failed to parse lhs set expression `%s'.\n", s.first.c_str());
+				log_cmd_error("Failed to parse lhs set expression `%s'.\n", s.first);
 			if (!RTLIL::SigSpec::parse_rhs(lhs, rhs, module, s.second))
-				log_cmd_error("Failed to parse rhs set expression `%s'.\n", s.second.c_str());
+				log_cmd_error("Failed to parse rhs set expression `%s'.\n", s.second);
 			show_signal_pool.add(sigmap(lhs));
 			show_signal_pool.add(sigmap(rhs));
 
@@ -127,9 +127,9 @@ struct SatHelper
 			RTLIL::SigSpec lhs, rhs;
 
 			if (!RTLIL::SigSpec::parse_sel(lhs, design, module, s.first))
-				log_cmd_error("Failed to parse lhs set expression `%s'.\n", s.first.c_str());
+				log_cmd_error("Failed to parse lhs set expression `%s'.\n", s.first);
 			if (!RTLIL::SigSpec::parse_rhs(lhs, rhs, module, s.second))
-				log_cmd_error("Failed to parse rhs set expression `%s'.\n", s.second.c_str());
+				log_cmd_error("Failed to parse rhs set expression `%s'.\n", s.second);
 			show_signal_pool.add(sigmap(lhs));
 			show_signal_pool.add(sigmap(rhs));
 
@@ -148,7 +148,7 @@ struct SatHelper
 			RTLIL::SigSpec lhs;
 
 			if (!RTLIL::SigSpec::parse_sel(lhs, design, module, s))
-				log_cmd_error("Failed to parse lhs set expression `%s'.\n", s.c_str());
+				log_cmd_error("Failed to parse lhs set expression `%s'.\n", s);
 			show_signal_pool.add(sigmap(lhs));
 
 			log("Import unset-constraint for this timestep: %s\n", log_signal(lhs));
@@ -167,28 +167,28 @@ struct SatHelper
 		for (auto &s : sets_def) {
 			RTLIL::SigSpec sig;
 			if (!RTLIL::SigSpec::parse_sel(sig, design, module, s))
-				log_cmd_error("Failed to parse set-def expression `%s'.\n", s.c_str());
+				log_cmd_error("Failed to parse set-def expression `%s'.\n", s);
 			sets_def_undef[0].insert(sig);
 		}
 
 		for (auto &s : sets_any_undef) {
 			RTLIL::SigSpec sig;
 			if (!RTLIL::SigSpec::parse_sel(sig, design, module, s))
-				log_cmd_error("Failed to parse set-def expression `%s'.\n", s.c_str());
+				log_cmd_error("Failed to parse set-def expression `%s'.\n", s);
 			sets_def_undef[1].insert(sig);
 		}
 
 		for (auto &s : sets_all_undef) {
 			RTLIL::SigSpec sig;
 			if (!RTLIL::SigSpec::parse_sel(sig, design, module, s))
-				log_cmd_error("Failed to parse set-def expression `%s'.\n", s.c_str());
+				log_cmd_error("Failed to parse set-def expression `%s'.\n", s);
 			sets_def_undef[2].insert(sig);
 		}
 
 		for (auto &s : sets_def_at[timestep]) {
 			RTLIL::SigSpec sig;
 			if (!RTLIL::SigSpec::parse_sel(sig, design, module, s))
-				log_cmd_error("Failed to parse set-def expression `%s'.\n", s.c_str());
+				log_cmd_error("Failed to parse set-def expression `%s'.\n", s);
 			sets_def_undef[0].insert(sig);
 			sets_def_undef[1].erase(sig);
 			sets_def_undef[2].erase(sig);
@@ -197,7 +197,7 @@ struct SatHelper
 		for (auto &s : sets_any_undef_at[timestep]) {
 			RTLIL::SigSpec sig;
 			if (!RTLIL::SigSpec::parse_sel(sig, design, module, s))
-				log_cmd_error("Failed to parse set-def expression `%s'.\n", s.c_str());
+				log_cmd_error("Failed to parse set-def expression `%s'.\n", s);
 			sets_def_undef[0].erase(sig);
 			sets_def_undef[1].insert(sig);
 			sets_def_undef[2].erase(sig);
@@ -206,7 +206,7 @@ struct SatHelper
 		for (auto &s : sets_all_undef_at[timestep]) {
 			RTLIL::SigSpec sig;
 			if (!RTLIL::SigSpec::parse_sel(sig, design, module, s))
-				log_cmd_error("Failed to parse set-def expression `%s'.\n", s.c_str());
+				log_cmd_error("Failed to parse set-def expression `%s'.\n", s);
 			sets_def_undef[0].erase(sig);
 			sets_def_undef[1].erase(sig);
 			sets_def_undef[2].insert(sig);
@@ -295,9 +295,9 @@ struct SatHelper
 				RTLIL::SigSpec lhs, rhs;
 
 				if (!RTLIL::SigSpec::parse_sel(lhs, design, module, s.first))
-					log_cmd_error("Failed to parse lhs set expression `%s'.\n", s.first.c_str());
+					log_cmd_error("Failed to parse lhs set expression `%s'.\n", s.first);
 				if (!RTLIL::SigSpec::parse_rhs(lhs, rhs, module, s.second))
-					log_cmd_error("Failed to parse rhs set expression `%s'.\n", s.second.c_str());
+					log_cmd_error("Failed to parse rhs set expression `%s'.\n", s.second);
 				show_signal_pool.add(sigmap(lhs));
 				show_signal_pool.add(sigmap(rhs));
 
@@ -362,9 +362,9 @@ struct SatHelper
 				RTLIL::SigSpec lhs, rhs;
 
 				if (!RTLIL::SigSpec::parse_sel(lhs, design, module, s.first))
-					log_cmd_error("Failed to parse lhs proof expression `%s'.\n", s.first.c_str());
+					log_cmd_error("Failed to parse lhs proof expression `%s'.\n", s.first);
 				if (!RTLIL::SigSpec::parse_rhs(lhs, rhs, module, s.second))
-					log_cmd_error("Failed to parse rhs proof expression `%s'.\n", s.second.c_str());
+					log_cmd_error("Failed to parse rhs proof expression `%s'.\n", s.second);
 				show_signal_pool.add(sigmap(lhs));
 				show_signal_pool.add(sigmap(rhs));
 
@@ -390,9 +390,9 @@ struct SatHelper
 				RTLIL::SigSpec lhs, rhs;
 
 				if (!RTLIL::SigSpec::parse_sel(lhs, design, module, s.first))
-					log_cmd_error("Failed to parse lhs proof-x expression `%s'.\n", s.first.c_str());
+					log_cmd_error("Failed to parse lhs proof-x expression `%s'.\n", s.first);
 				if (!RTLIL::SigSpec::parse_rhs(lhs, rhs, module, s.second))
-					log_cmd_error("Failed to parse rhs proof-x expression `%s'.\n", s.second.c_str());
+					log_cmd_error("Failed to parse rhs proof-x expression `%s'.\n", s.second);
 				show_signal_pool.add(sigmap(lhs));
 				show_signal_pool.add(sigmap(rhs));
 
@@ -540,7 +540,7 @@ struct SatHelper
 			for (auto &s : shows) {
 				RTLIL::SigSpec sig;
 				if (!RTLIL::SigSpec::parse_sel(sig, design, module, s))
-					log_cmd_error("Failed to parse show expression `%s'.\n", s.c_str());
+					log_cmd_error("Failed to parse show expression `%s'.\n", s);
 				log("Import show expression: %s\n", log_signal(sig));
 				modelSig.append(sig);
 			}
@@ -670,7 +670,7 @@ struct SatHelper
 		rewrite_filename(vcd_file_name);
 		FILE *f = fopen(vcd_file_name.c_str(), "w");
 		if (!f)
-			log_cmd_error("Can't open output file `%s' for writing: %s\n", vcd_file_name.c_str(), strerror(errno));
+			log_cmd_error("Can't open output file `%s' for writing: %s\n", vcd_file_name, strerror(errno));
 
 		log("Dumping SAT model to VCD file %s\n", vcd_file_name);
 
@@ -775,7 +775,7 @@ struct SatHelper
 		rewrite_filename(json_file_name);
 		FILE *f = fopen(json_file_name.c_str(), "w");
 		if (!f)
-			log_cmd_error("Can't open output file `%s' for writing: %s\n", json_file_name.c_str(), strerror(errno));
+			log_cmd_error("Can't open output file `%s' for writing: %s\n", json_file_name, strerror(errno));
 
 		log("Dumping SAT model to WaveJSON file '%s'.\n", json_file_name);
 
@@ -1535,7 +1535,7 @@ struct SatPass : public Pass {
 							rewrite_filename(cnf_file_name);
 							FILE *f = fopen(cnf_file_name.c_str(), "w");
 							if (!f)
-								log_cmd_error("Can't open output file `%s' for writing: %s\n", cnf_file_name.c_str(), strerror(errno));
+								log_cmd_error("Can't open output file `%s' for writing: %s\n", cnf_file_name, strerror(errno));
 
 							log("Dumping CNF to file `%s'.\n", cnf_file_name);
 							cnf_file_name.clear();
@@ -1639,7 +1639,7 @@ struct SatPass : public Pass {
 				rewrite_filename(cnf_file_name);
 				FILE *f = fopen(cnf_file_name.c_str(), "w");
 				if (!f)
-					log_cmd_error("Can't open output file `%s' for writing: %s\n", cnf_file_name.c_str(), strerror(errno));
+					log_cmd_error("Can't open output file `%s' for writing: %s\n", cnf_file_name, strerror(errno));
 
 				log("Dumping CNF to file `%s'.\n", cnf_file_name);
 				cnf_file_name.clear();
diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index aadea328f..56b207a58 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -2887,7 +2887,7 @@ struct SimPass : public Pass {
 			} else if (filename_trim.size() > 3 && filename_trim.compare(filename_trim.size()-3, std::string::npos, ".yw") == 0) {
 				worker.run_cosim_yw_witness(top_mod, append);
 			} else {
-				log_cmd_error("Unhandled extension for simulation input file `%s`.\n", worker.sim_filename.c_str());
+				log_cmd_error("Unhandled extension for simulation input file `%s`.\n", worker.sim_filename);
 			}
 		}
 
diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index c5bdd6ecf..9cd02b455 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -988,7 +988,7 @@ void AbcModuleState::prepare_module(RTLIL::Design *design, RTLIL::Module *module
 	}
 
 	if (dff_mode && clk_sig.empty())
-		log_cmd_error("Clock domain %s not found.\n", clk_str.c_str());
+		log_cmd_error("Clock domain %s not found.\n", clk_str);
 
 	const AbcConfig &config = run_abc.config;
 	if (config.cleanup)
@@ -2322,7 +2322,7 @@ struct AbcPass : public Pass {
 				if (g_arg_from_cmd)
 					cmd_error(args, g_argidx, stringf("Unsupported gate type: %s", g));
 				else
-					log_cmd_error("Unsupported gate type: %s", g.c_str());
+					log_cmd_error("Unsupported gate type: %s", g);
 			ok_gate:
 				gate_list.push_back(g);
 			ok_alias:
diff --git a/passes/techmap/cellmatch.cc b/passes/techmap/cellmatch.cc
index a2a4c4b2c..ce1a75193 100644
--- a/passes/techmap/cellmatch.cc
+++ b/passes/techmap/cellmatch.cc
@@ -173,7 +173,7 @@ struct CellmatchPass : Pass {
 				derive_luts = true;
 			} else if (args[argidx] == "-lib" && argidx + 1 < args.size()) {
 				if (!saved_designs.count(args[++argidx]))
-					log_cmd_error("No design '%s' found!\n", args[argidx].c_str());
+					log_cmd_error("No design '%s' found!\n", args[argidx]);
 				lib = saved_designs.at(args[argidx]);
 			} else {
 				break;
diff --git a/passes/techmap/constmap.cc b/passes/techmap/constmap.cc
index f0757403d..6d18b8494 100644
--- a/passes/techmap/constmap.cc
+++ b/passes/techmap/constmap.cc
@@ -82,7 +82,7 @@ struct ConstmapPass : public Pass {
 				}
 			}
 			if (!has_port)
-				log_cmd_error("Cell type '%s' does not have port '%s'.\n", celltype.c_str(), cell_portname.c_str());
+				log_cmd_error("Cell type '%s' does not have port '%s'.\n", celltype, cell_portname);
 
 			bool has_param = false;
 			for (auto &p : existing->avail_parameters){
@@ -91,7 +91,7 @@ struct ConstmapPass : public Pass {
 			}
 
 			if (!has_param)
-				log_cmd_error("Cell type '%s' does not have parameter '%s'.\n", celltype.c_str(), cell_paramname.c_str());
+				log_cmd_error("Cell type '%s' does not have parameter '%s'.\n", celltype, cell_paramname);
 		}
 
 
diff --git a/passes/techmap/extract.cc b/passes/techmap/extract.cc
index 6527b683e..7461e21d8 100644
--- a/passes/techmap/extract.cc
+++ b/passes/techmap/extract.cc
@@ -605,7 +605,7 @@ struct ExtractPass : public Pass {
 					f.open(filename.c_str());
 					if (f.fail()) {
 						delete map;
-						log_cmd_error("Can't open map file `%s'.\n", filename.c_str());
+						log_cmd_error("Can't open map file `%s'.\n", filename);
 					}
 					Frontend::frontend_call(map, &f, filename, (filename.size() > 3 && filename.compare(filename.size()-3, std::string::npos, ".il") == 0 ? "rtlil" : "verilog"));
 					f.close();
diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index 75a63b2e0..f882aa356 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -958,7 +958,7 @@ struct TestCellPass : public Pass {
 			if (args[argidx] == "-vlog" && argidx+1 < GetSize(args)) {
 				vlog_file.open(args[++argidx], std::ios_base::trunc);
 				if (!vlog_file.is_open())
-					log_cmd_error("Failed to open output file `%s'.\n", args[argidx].c_str());
+					log_cmd_error("Failed to open output file `%s'.\n", args[argidx]);
 				continue;
 			}
 			if (args[argidx] == "-bloat" && argidx+1 < GetSize(args)) {
@@ -1079,7 +1079,7 @@ struct TestCellPass : public Pass {
 		for (; argidx < GetSize(args); argidx++)
 		{
 			if (args[argidx].rfind("-", 0) == 0)
-				log_cmd_error("Unexpected option: %s\n", args[argidx].c_str());
+				log_cmd_error("Unexpected option: %s\n", args[argidx]);
 
 			if (args[argidx] == "all") {
 				for (auto &it : cell_types)
diff --git a/techlibs/fabulous/synth_fabulous.cc b/techlibs/fabulous/synth_fabulous.cc
index 0e6553fa1..3b95ff91e 100644
--- a/techlibs/fabulous/synth_fabulous.cc
+++ b/techlibs/fabulous/synth_fabulous.cc
@@ -236,7 +236,7 @@ struct SynthPass : public ScriptPass
 			if (args[argidx] == "-carry") {
 				carry_mode = args[++argidx];
 				if (carry_mode != "none" && carry_mode != "ha")
-					log_cmd_error("Unsupported carry style: %s\n", carry_mode.c_str());
+					log_cmd_error("Unsupported carry style: %s\n", carry_mode);
 				continue;
 			}
 			if (args[argidx] == "-noflatten") {
diff --git a/techlibs/greenpak4/synth_greenpak4.cc b/techlibs/greenpak4/synth_greenpak4.cc
index 99fe45dc4..fa52ecfc6 100644
--- a/techlibs/greenpak4/synth_greenpak4.cc
+++ b/techlibs/greenpak4/synth_greenpak4.cc
@@ -123,7 +123,7 @@ struct SynthGreenPAK4Pass : public ScriptPass
 			log_cmd_error("This command only operates on fully selected designs!\n");
 
 		if (part != "SLG46140V" && part != "SLG46620V" && part != "SLG46621V")
-			log_cmd_error("Invalid part name: '%s'\n", part.c_str());
+			log_cmd_error("Invalid part name: '%s'\n", part);
 
 		log_header(design, "Executing SYNTH_GREENPAK4 pass.\n");
 		log_push();
diff --git a/techlibs/ice40/synth_ice40.cc b/techlibs/ice40/synth_ice40.cc
index d433c0408..0a4144451 100644
--- a/techlibs/ice40/synth_ice40.cc
+++ b/techlibs/ice40/synth_ice40.cc
@@ -265,7 +265,7 @@ struct SynthIce40Pass : public ScriptPass
 		if (!design->full_selection())
 			log_cmd_error("This command only operates on fully selected designs!\n");
 		if (device_opt != "hx" && device_opt != "lp" && device_opt !="u")
-			log_cmd_error("Invalid or no device specified: '%s'\n", device_opt.c_str());
+			log_cmd_error("Invalid or no device specified: '%s'\n", device_opt);
 
 		if (abc9 && retime)
 			log_cmd_error("-retime option not currently compatible with -abc9!\n");
diff --git a/techlibs/intel/synth_intel.cc b/techlibs/intel/synth_intel.cc
index af0717235..d3202d5cb 100644
--- a/techlibs/intel/synth_intel.cc
+++ b/techlibs/intel/synth_intel.cc
@@ -174,7 +174,7 @@ struct SynthIntelPass : public ScriptPass {
 		    family_opt != "cycloneiv" &&
 		    family_opt != "cycloneive" &&
 		    family_opt != "cyclone10lp")
-			log_cmd_error("Invalid or no family specified: '%s'\n", family_opt.c_str());
+			log_cmd_error("Invalid or no family specified: '%s'\n", family_opt);
 
 		log_header(design, "Executing SYNTH_INTEL pass.\n");
 		log_push();
diff --git a/techlibs/lattice/synth_lattice.cc b/techlibs/lattice/synth_lattice.cc
index e1df20dd7..b13c22518 100644
--- a/techlibs/lattice/synth_lattice.cc
+++ b/techlibs/lattice/synth_lattice.cc
@@ -306,7 +306,7 @@ struct SynthLatticePass : public ScriptPass
 				family == "lifmd" ||
 				family == "lifmdf") {*/
 		} else
-			log_cmd_error("Invalid Lattice -family setting: '%s'.\n", family.c_str());
+			log_cmd_error("Invalid Lattice -family setting: '%s'.\n", family);
 
 		if (!design->full_selection())
 			log_cmd_error("This command only operates on fully selected designs!\n");
diff --git a/techlibs/microchip/synth_microchip.cc b/techlibs/microchip/synth_microchip.cc
index 77cedcd1f..e1d3c393a 100644
--- a/techlibs/microchip/synth_microchip.cc
+++ b/techlibs/microchip/synth_microchip.cc
@@ -234,7 +234,7 @@ struct SynthMicrochipPass : public ScriptPass {
 		if (family == "polarfire") {
 			lut_size = 4;
 		} else {
-			log_cmd_error("Invalid Microchip -family setting: '%s'.\n", family.c_str());
+			log_cmd_error("Invalid Microchip -family setting: '%s'.\n", family);
 		}
 
 		if (!design->full_selection())
diff --git a/techlibs/nanoxplore/synth_nanoxplore.cc b/techlibs/nanoxplore/synth_nanoxplore.cc
index a8f4a05d1..3445ea1be 100644
--- a/techlibs/nanoxplore/synth_nanoxplore.cc
+++ b/techlibs/nanoxplore/synth_nanoxplore.cc
@@ -218,7 +218,7 @@ struct SynthNanoXplorePass : public ScriptPass
 		} else if (family == "large") {
 			postfix = "_l";
 		} else 
-			log_cmd_error("Invalid NanoXplore -family setting: '%s'.\n", family.c_str());
+			log_cmd_error("Invalid NanoXplore -family setting: '%s'.\n", family);
 
 		if (!design->full_selection())
 			log_cmd_error("This command only operates on fully selected designs!\n");
diff --git a/techlibs/nexus/synth_nexus.cc b/techlibs/nexus/synth_nexus.cc
index 83abd156a..c0df06a21 100644
--- a/techlibs/nexus/synth_nexus.cc
+++ b/techlibs/nexus/synth_nexus.cc
@@ -249,7 +249,7 @@ struct SynthNexusPass : public ScriptPass
 	{
 
 		if (family != "lifcl" && family != "lfd2nx")
-			log_cmd_error("Invalid Nexus -family setting: '%s'.\n", family.c_str());
+			log_cmd_error("Invalid Nexus -family setting: '%s'.\n", family);
 
 		if (check_label("begin"))
 		{
diff --git a/techlibs/quicklogic/synth_quicklogic.cc b/techlibs/quicklogic/synth_quicklogic.cc
index 84f9c48a7..ade6f944c 100644
--- a/techlibs/quicklogic/synth_quicklogic.cc
+++ b/techlibs/quicklogic/synth_quicklogic.cc
@@ -176,7 +176,7 @@ struct SynthQuickLogicPass : public ScriptPass {
 			log_cmd_error("This command only operates on fully selected designs!\n");
 
 		if (family != "pp3" && family != "qlf_k6n10f")
-			log_cmd_error("Invalid family specified: '%s'\n", family.c_str());
+			log_cmd_error("Invalid family specified: '%s'\n", family);
 
 		if (abc9 && design->scratchpad_get_int("abc9.D", 0) == 0) {
 			log_warning("delay target has not been set via SDC or scratchpad; assuming 12 MHz clock.\n");
diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index 4e422c5cd..20b8c98c3 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -310,7 +310,7 @@ struct SynthXilinxPass : public ScriptPass
 			lut_size = 4;
 			widelut_size = 6;
 		} else
-			log_cmd_error("Invalid Xilinx -family setting: '%s'.\n", family.c_str());
+			log_cmd_error("Invalid Xilinx -family setting: '%s'.\n", family);
 
 		if (widemux != 0 && lut_size != 6)
 			log_cmd_error("-widemux is not currently supported for LUT4-based architectures.\n");

From d1fd6de6da916cc3fbb64c962d94236e02568e71 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 16 Sep 2025 23:00:42 +0000
Subject: [PATCH 562/931] Remove .c_str() calls from parameters to log_header()

---
 frontends/ast/ast.cc                  | 2 +-
 frontends/liberty/liberty.cc          | 2 +-
 frontends/rpc/rpc_frontend.cc         | 2 +-
 frontends/verilog/verilog_frontend.cc | 2 +-
 kernel/register.cc                    | 2 +-
 passes/cmds/exec.cc                   | 2 +-
 passes/cmds/logcmd.cc                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 488775d2c..4a16abee9 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -1822,7 +1822,7 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 		return modname;
 
 	if (!quiet)
-		log_header(design, "Executing AST frontend in derive mode using pre-parsed AST for module `%s'.\n", stripped_name.c_str());
+		log_header(design, "Executing AST frontend in derive mode using pre-parsed AST for module `%s'.\n", stripped_name);
 	loadconfig();
 
 	pool<IdString> rewritten;
diff --git a/frontends/liberty/liberty.cc b/frontends/liberty/liberty.cc
index 72ad8b2b7..80553347c 100644
--- a/frontends/liberty/liberty.cc
+++ b/frontends/liberty/liberty.cc
@@ -537,7 +537,7 @@ struct LibertyFrontend : public Frontend {
 		if (flag_wb && flag_lib)
 			log_error("-wb and -lib cannot be specified together!\n");
 
-		log_header(design, "Executing Liberty frontend: %s\n", filename.c_str());
+		log_header(design, "Executing Liberty frontend: %s\n", filename);
 
 		LibertyParser parser(*f, filename);
 		int cell_count = 0;
diff --git a/frontends/rpc/rpc_frontend.cc b/frontends/rpc/rpc_frontend.cc
index 80a6aae6d..625b2c0e8 100644
--- a/frontends/rpc/rpc_frontend.cc
+++ b/frontends/rpc/rpc_frontend.cc
@@ -163,7 +163,7 @@ struct RpcModule : RTLIL::Module {
 			stripped_name = stripped_name.substr(9);
 		log_assert(stripped_name[0] == '\\');
 
-		log_header(design, "Executing RPC frontend `%s' for module `%s'.\n", server->name.c_str(), stripped_name.c_str());
+		log_header(design, "Executing RPC frontend `%s' for module `%s'.\n", server->name, stripped_name);
 
 		std::string parameter_info;
 		for (auto &param : parameters) {
diff --git a/frontends/verilog/verilog_frontend.cc b/frontends/verilog/verilog_frontend.cc
index 231891271..2bdaf40ce 100644
--- a/frontends/verilog/verilog_frontend.cc
+++ b/frontends/verilog/verilog_frontend.cc
@@ -485,7 +485,7 @@ struct VerilogFrontend : public Frontend {
 
 		extra_args(f, filename, args, argidx);
 
-		log_header(design, "Executing Verilog-2005 frontend: %s\n", filename.c_str());
+		log_header(design, "Executing Verilog-2005 frontend: %s\n", filename);
 
 		log("Parsing %s%s input from `%s' to AST representation.\n",
 				parse_mode.formal ? "formal " : "", parse_mode.sv ? "SystemVerilog" : "Verilog", filename.c_str());
diff --git a/kernel/register.cc b/kernel/register.cc
index 36e312968..fe67cc35c 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -199,7 +199,7 @@ void Pass::call(RTLIL::Design *design, std::string command)
 		while (!cmd_buf.empty() && (cmd_buf.back() == ' ' || cmd_buf.back() == '\t' ||
 				cmd_buf.back() == '\r' || cmd_buf.back() == '\n'))
 			cmd_buf.resize(cmd_buf.size()-1);
-		log_header(design, "Shell command: %s\n", cmd_buf.c_str());
+		log_header(design, "Shell command: %s\n", cmd_buf);
 		int retCode = run_command(cmd_buf);
 		if (retCode != 0)
 			log_cmd_error("Shell command returned error code %d.\n", retCode);
diff --git a/passes/cmds/exec.cc b/passes/cmds/exec.cc
index ff1ef11ff..ea82ff908 100644
--- a/passes/cmds/exec.cc
+++ b/passes/cmds/exec.cc
@@ -150,7 +150,7 @@ struct ExecPass : public Pass {
 			}
 		}
 
-		log_header(design, "Executing command \"%s\".\n", cmd.c_str());
+		log_header(design, "Executing command \"%s\".\n", cmd);
 		log_push();
 
 		fflush(stdout);
diff --git a/passes/cmds/logcmd.cc b/passes/cmds/logcmd.cc
index 57759fc90..dd2d708d8 100644
--- a/passes/cmds/logcmd.cc
+++ b/passes/cmds/logcmd.cc
@@ -107,7 +107,7 @@ struct LogPass : public Pass {
 		if (to_stderr) fprintf(stderr, "%s%s", text.c_str(), line_end);
 		if (to_log) {
 			if (!header) log("%s%s", text, line_end);
-			else log_header(design, "%s%s", text.c_str(), line_end);
+			else log_header(design, "%s%s", text, line_end);
 		}
 	}
 } LogPass;

From a7c46f7b4afc182af11b6f6ffb7a166d60fe7997 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 16 Sep 2025 23:02:16 +0000
Subject: [PATCH 563/931] Remove .c_str() calls from parameters to
 log_warning()/log_warning_noprefix()

---
 backends/edif/edif.cc           |  2 +-
 backends/firrtl/firrtl.cc       |  6 +++---
 frontends/ast/simplify.cc       |  8 ++++----
 frontends/verific/verific.cc    |  4 ++--
 frontends/verific/verificsva.cc |  2 +-
 kernel/log.cc                   |  4 ++--
 kernel/register.cc              |  2 +-
 kernel/tclapi.cc                |  2 +-
 passes/cmds/check.cc            |  6 +++---
 passes/cmds/select.cc           |  8 ++++----
 passes/cmds/stat.cc             |  4 ++--
 passes/cmds/timeest.cc          |  2 +-
 passes/equiv/equiv_add.cc       |  8 ++++----
 passes/fsm/fsm_detect.cc        |  2 +-
 passes/hierarchy/hierarchy.cc   |  2 +-
 passes/hierarchy/submod.cc      |  4 ++--
 passes/memory/memlib.cc         |  2 +-
 passes/opt/opt_clean.cc         |  2 +-
 passes/sat/qbfsat.cc            |  2 +-
 passes/sat/sim.cc               | 24 ++++++++++++------------
 passes/techmap/abc9_exe.cc      |  2 +-
 passes/techmap/libparse.cc      |  4 ++--
 passes/tests/test_cell.cc       |  2 +-
 techlibs/intel/synth_intel.cc   |  2 +-
 techlibs/xilinx/synth_xilinx.cc |  2 +-
 25 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/backends/edif/edif.cc b/backends/edif/edif.cc
index 83d0afaf3..d1be0b37f 100644
--- a/backends/edif/edif.cc
+++ b/backends/edif/edif.cc
@@ -513,7 +513,7 @@ struct EdifBackend : public Backend {
 				if (sig.wire == NULL && sig != RTLIL::State::S0 && sig != RTLIL::State::S1) {
 					if (sig == RTLIL::State::Sx) {
 						for (auto &ref : it.second)
-							log_warning("Exporting x-bit on %s as zero bit.\n", ref.first.c_str());
+							log_warning("Exporting x-bit on %s as zero bit.\n", ref.first);
 						sig = RTLIL::State::S0;
 					} else if (sig == RTLIL::State::Sz) {
 						continue;
diff --git a/backends/firrtl/firrtl.cc b/backends/firrtl/firrtl.cc
index e54b46e63..577d95ad7 100644
--- a/backends/firrtl/firrtl.cc
+++ b/backends/firrtl/firrtl.cc
@@ -465,7 +465,7 @@ struct FirrtlWorker
 		// If there is no instance for this, just return.
 		if (instModule == NULL)
 		{
-			log_warning("No instance for %s.%s\n", cell_type.c_str(), cell_name.c_str());
+			log_warning("No instance for %s.%s\n", cell_type, cell_name);
 			return;
 		}
 
@@ -490,7 +490,7 @@ struct FirrtlWorker
 				const SigSpec *sinkSig = nullptr;
 				switch (dir) {
 					case FD_INOUT:
-						log_warning("Instance port connection %s.%s is INOUT; treating as OUT\n", cell_type.c_str(), log_signal(it->second));
+						log_warning("Instance port connection %s.%s is INOUT; treating as OUT\n", cell_type, log_signal(it->second));
 						YS_FALLTHROUGH
 					case FD_OUT:
 						sourceExpr = firstName;
@@ -498,7 +498,7 @@ struct FirrtlWorker
 						sinkSig = &secondSig;
 						break;
 					case FD_NODIRECTION:
-						log_warning("Instance port connection %s.%s is NODIRECTION; treating as IN\n", cell_type.c_str(), log_signal(it->second));
+						log_warning("Instance port connection %s.%s is NODIRECTION; treating as IN\n", cell_type, log_signal(it->second));
 						YS_FALLTHROUGH
 					case FD_IN:
 						sourceExpr = secondExpr;
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 0df09030c..9b679d0aa 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -974,7 +974,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 						message += stringf("%s%s", first_element ? " See " : ", ", place);
 						first_element = false;
 					}
-					log_warning("%s\n", message.c_str());
+					log_warning("%s\n", message);
 				}
 
 			silent_activate:
@@ -1144,7 +1144,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 					i--; // Adjust index since we removed an element
 				} else {
 					// If we can't find the package, just remove the import node to avoid errors later
-					log_warning("Package `%s' not found for import, removing import statement\n", child->str.c_str());
+					log_warning("Package `%s' not found for import, removing import statement\n", child->str);
 					children.erase(children.begin() + i);
 					i--; // Adjust index since we removed an element
 				}
@@ -1438,7 +1438,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			if ((type == AST_ASSIGN_LE || type == AST_ASSIGN_EQ) && children[0]->id2ast->is_logic)
 				children[0]->id2ast->is_reg = true; // if logic type is used in a block asignment
 			if ((type == AST_ASSIGN_LE || type == AST_ASSIGN_EQ) && !children[0]->id2ast->is_reg)
-				log_warning("wire '%s' is assigned in a block at %s.\n", children[0]->str.c_str(), loc_string().c_str());
+				log_warning("wire '%s' is assigned in a block at %s.\n", children[0]->str, loc_string());
 			if (type == AST_ASSIGN && children[0]->id2ast->is_reg) {
 				bool is_rand_reg = false;
 				if (children[1]->type == AST_FCALL) {
@@ -1452,7 +1452,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 						is_rand_reg = true;
 				}
 				if (!is_rand_reg)
-					log_warning("reg '%s' is assigned in a continuous assignment at %s.\n", children[0]->str.c_str(), loc_string().c_str());
+					log_warning("reg '%s' is assigned in a continuous assignment at %s.\n", children[0]->str, loc_string());
 			}
 			children[0]->was_checked = true;
 		}
diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 91af38ccd..279b0dd52 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -141,7 +141,7 @@ void msg_func(msg_type_t msg_type, const char *message_id, linefile_type linefil
 #endif
 	} else {
 		if (msg_type == VERIFIC_ERROR || msg_type == VERIFIC_WARNING || msg_type == VERIFIC_PROGRAM_ERROR)
-			log_warning_noprefix("%s%s\n", message_prefix.c_str(), message.c_str());
+			log_warning_noprefix("%s%s\n", message_prefix, message);
 		else
 			log("%s%s\n", message_prefix, message);
 	}
@@ -4098,7 +4098,7 @@ struct VerificPass : public Pass {
 					unsigned new_insertion = parameters.Insert(key.c_str(), value.c_str(),
 											   1 /* force_overwrite */);
 					if (!new_insertion)
-						log_warning_noprefix("-chparam %s already specified: overwriting.\n", key.c_str());
+						log_warning_noprefix("-chparam %s already specified: overwriting.\n", key);
 					continue;
 				}
 				if (args[argidx] == "-V") {
diff --git a/frontends/verific/verificsva.cc b/frontends/verific/verificsva.cc
index cc5f07004..3908947eb 100644
--- a/frontends/verific/verificsva.cc
+++ b/frontends/verific/verificsva.cc
@@ -1025,7 +1025,7 @@ struct VerificSvaImporter
 	{
 		if (!importer->mode_keep)
 			log_error("%s", errmsg);
-		log_warning("%s", errmsg.c_str());
+		log_warning("%s", errmsg);
 		throw ParserErrorException();
 	}
 
diff --git a/kernel/log.cc b/kernel/log.cc
index 3a44a3ddc..0085980b1 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -187,7 +187,7 @@ static void logv_string(std::string_view format, std::string str) {
 			if (!linebuffer.empty() && linebuffer.back() == '\n') {
 				for (auto &re : log_warn_regexes)
 					if (std::regex_search(linebuffer, re))
-						log_warning("Found log message matching -W regex:\n%s", str.c_str());
+						log_warning("Found log message matching -W regex:\n%s", str);
 
 				for (auto &[_, item] : log_expect_log)
 					if (std::regex_search(linebuffer, item.pattern))
@@ -704,7 +704,7 @@ dict<std::string, std::pair<std::string, int>> get_coverage_data()
 
 	for (auto &it : extra_coverage_data) {
 		if (coverage_data.count(it.first))
-			log_warning("found duplicate coverage id \"%s\".\n", it.first.c_str());
+			log_warning("found duplicate coverage id \"%s\".\n", it.first);
 		coverage_data[it.first].first = it.second.first;
 		coverage_data[it.first].second += it.second.second;
 	}
diff --git a/kernel/register.cc b/kernel/register.cc
index fe67cc35c..9436b540a 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -972,7 +972,7 @@ struct HelpPass : public Pass {
 		}
 		for (auto &it : cell_help_messages.cell_help) {
 			if (cells.count(it.first) == 0) {
-				log_warning("Found cell model '%s' without matching cell type.\n", it.first.c_str());
+				log_warning("Found cell model '%s' without matching cell type.\n", it.first);
 			}
 		}
 
diff --git a/kernel/tclapi.cc b/kernel/tclapi.cc
index 729d06ca0..a2ebaffa2 100644
--- a/kernel/tclapi.cc
+++ b/kernel/tclapi.cc
@@ -137,7 +137,7 @@ static int tcl_yosys_cmd(ClientData, Tcl_Interp *interp, int argc, const char *a
 		if (err.empty()) {
 			Tcl_SetObjResult(interp, json_to_tcl(interp, json));
 		} else
-			log_warning("Ignoring result.json scratchpad value due to parse error: %s\n", err.c_str());
+			log_warning("Ignoring result.json scratchpad value due to parse error: %s\n", err);
 	} else if ((result = scratchpad.find("result.string")) != scratchpad.end()) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(result->second.data(), result->second.size()));
 	}
diff --git a/passes/cmds/check.cc b/passes/cmds/check.cc
index b532b4527..9f72d90f7 100644
--- a/passes/cmds/check.cc
+++ b/passes/cmds/check.cc
@@ -323,7 +323,7 @@ struct CheckPass : public Pass {
 					string message = stringf("Drivers conflicting with a constant %s driver:\n", log_signal(state));
 					for (auto str : wire_drivers[state])
 						message += stringf("    %s\n", str);
-					log_warning("%s", message.c_str());
+					log_warning("%s", message);
 					counter++;
 				}
 
@@ -332,7 +332,7 @@ struct CheckPass : public Pass {
 					string message = stringf("multiple conflicting drivers for %s.%s:\n", log_id(module), log_signal(it.first));
 					for (auto str : it.second)
 						message += stringf("    %s\n", str);
-					log_warning("%s", message.c_str());
+					log_warning("%s", message);
 					counter++;
 				}
 
@@ -418,7 +418,7 @@ struct CheckPass : public Pass {
 
 					prev = bit;
 				}
-				log_warning("%s", message.c_str());
+				log_warning("%s", message);
 				counter++;
 			}
 
diff --git a/passes/cmds/select.cc b/passes/cmds/select.cc
index 469e36ef1..6da15c19a 100644
--- a/passes/cmds/select.cc
+++ b/passes/cmds/select.cc
@@ -658,7 +658,7 @@ static void select_op_expand(RTLIL::Design *design, const std::string &arg, char
 	}
 
 	if (rem_objects == 0)
-		log_warning("reached configured limit at `%s'.\n", arg.c_str());
+		log_warning("reached configured limit at `%s'.\n", arg);
 }
 
 static void select_filter_active_mod(RTLIL::Design *design, RTLIL::Selection &sel)
@@ -1002,14 +1002,14 @@ static void select_stmt(RTLIL::Design *design, std::string arg, bool disable_emp
 		if (it.second == false && !disable_empty_warning) {
 			std::string selection_str = select_blackboxes ? "=" : "";
 			selection_str += it.first;
-			log_warning("Selection \"%s\" did not match any module.\n", selection_str.c_str());
+			log_warning("Selection \"%s\" did not match any module.\n", selection_str);
 		}
 	}
 	for (auto &it : arg_memb_found) {
 		if (it.second == false && !disable_empty_warning) {
 			std::string selection_str = select_blackboxes ? "=" : "";
 			selection_str += it.first;
-			log_warning("Selection \"%s\" did not match any object.\n", selection_str.c_str());
+			log_warning("Selection \"%s\" did not match any object.\n", selection_str);
 		}
 	}
 }
@@ -1451,7 +1451,7 @@ struct SelectPass : public Pass {
 			while (std::getline(f, line)) {
 				size_t slash_pos = line.find('/');
 				if (slash_pos == string::npos) {
-					log_warning("Ignoring line without slash in 'select -read': %s\n", line.c_str());
+					log_warning("Ignoring line without slash in 'select -read': %s\n", line);
 					continue;
 				}
 				IdString mod_name = RTLIL::escape_id(line.substr(0, slash_pos));
diff --git a/passes/cmds/stat.cc b/passes/cmds/stat.cc
index 6e46ab5e2..61135e066 100644
--- a/passes/cmds/stat.cc
+++ b/passes/cmds/stat.cc
@@ -228,7 +228,7 @@ struct statdata_t {
 							cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
 
 						} else {
-							log_warning("too small single_parameter_area %s width: %d size: %d\n", cell_type.c_str(), max_width,
+							log_warning("too small single_parameter_area %s width: %d size: %d\n", cell_type, max_width,
 							       (int)cell_data.single_parameter_area.size());
 							cell_area.at(cell_type).area = cell_data.single_parameter_area.back();
 							cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
@@ -274,7 +274,7 @@ struct statdata_t {
 									  cell_data.double_parameter_area.at(width_a - 1).at(width_b - 1);
 									cell_area.at(cell_type).is_sequential = cell_data.is_sequential;
 								} else {
-									log_warning("too small double_parameter_area %s, width_a: %d, width_b: %d, size_a: %d, size_b: %d\n", cell_type.c_str(),
+									log_warning("too small double_parameter_area %s, width_a: %d, width_b: %d, size_a: %d, size_b: %d\n", cell_type,
 									       width_a, width_b, (int)cell_data.double_parameter_area.size(),
 									       (int)cell_data.double_parameter_area.at(width_a - 1).size());
 									cell_area.at(cell_type).area = cell_data.double_parameter_area.back().back();
diff --git a/passes/cmds/timeest.cc b/passes/cmds/timeest.cc
index 86a529520..b878050da 100644
--- a/passes/cmds/timeest.cc
+++ b/passes/cmds/timeest.cc
@@ -403,7 +403,7 @@ struct TimeestPass : Pass {
 
 		for (auto m : d->selected_modules()) {
 			if (!m->wire(RTLIL::escape_id(clk))) {
-				log_warning("No domain '%s' in module %s\n", clk.c_str(), log_id(m));
+				log_warning("No domain '%s' in module %s\n", clk, log_id(m));
 				continue;
 			}
 
diff --git a/passes/equiv/equiv_add.cc b/passes/equiv/equiv_add.cc
index 4deef6e32..b3c97fa80 100644
--- a/passes/equiv/equiv_add.cc
+++ b/passes/equiv/equiv_add.cc
@@ -61,7 +61,7 @@ struct EquivAddPass : public Pass {
 
 			if (gold_cell == nullptr) {
 				if (try_mode) {
-					log_warning("Can't find gold cell '%s'.\n", args[2].c_str());
+					log_warning("Can't find gold cell '%s'.\n", args[2]);
 					return;
 				}
 				log_cmd_error("Can't find gold cell '%s'.\n", args[2]);
@@ -69,7 +69,7 @@ struct EquivAddPass : public Pass {
 
 			if (gate_cell == nullptr) {
 				if (try_mode) {
-					log_warning("Can't find gate cell '%s'.\n", args[3].c_str());
+					log_warning("Can't find gate cell '%s'.\n", args[3]);
 					return;
 				}
 				log_cmd_error("Can't find gate cell '%s'.\n", args[3]);
@@ -126,7 +126,7 @@ struct EquivAddPass : public Pass {
 
 			if (!SigSpec::parse(gate_signal, module, args[2])) {
 				if (try_mode) {
-					log_warning("Error in gate signal: %s\n", args[2].c_str());
+					log_warning("Error in gate signal: %s\n", args[2]);
 					return;
 				}
 				log_cmd_error("Error in gate signal: %s\n", args[2]);
@@ -134,7 +134,7 @@ struct EquivAddPass : public Pass {
 
 			if (!SigSpec::parse_rhs(gate_signal, gold_signal, module, args[1])) {
 				if (try_mode) {
-					log_warning("Error in gold signal: %s\n", args[1].c_str());
+					log_warning("Error in gold signal: %s\n", args[1]);
 					return;
 				}
 				log_cmd_error("Error in gold signal: %s\n", args[1]);
diff --git a/passes/fsm/fsm_detect.cc b/passes/fsm/fsm_detect.cc
index 86d654cc4..9cffbf95a 100644
--- a/passes/fsm/fsm_detect.cc
+++ b/passes/fsm/fsm_detect.cc
@@ -225,7 +225,7 @@ static void detect_fsm(RTLIL::Wire *wire, bool ignore_self_reset=false)
 		if (!warnings.empty()) {
 			string warnmsg = stringf("Regarding the user-specified fsm_encoding attribute on %s.%s:\n", log_id(wire->module), log_id(wire));
 			for (auto w : warnings) warnmsg += "    " + w;
-			log_warning("%s", warnmsg.c_str());
+			log_warning("%s", warnmsg);
 		} else {
 			log("FSM state register %s.%s already has fsm_encoding attribute.\n", log_id(wire->module), log_id(wire));
 		}
diff --git a/passes/hierarchy/hierarchy.cc b/passes/hierarchy/hierarchy.cc
index f670d1fd2..a7f86c3f0 100644
--- a/passes/hierarchy/hierarchy.cc
+++ b/passes/hierarchy/hierarchy.cc
@@ -937,7 +937,7 @@ struct HierarchyPass : public Pass {
 				const std::string &value = args[++argidx];
 				auto r = parameters.emplace(key, value);
 				if (!r.second) {
-					log_warning("-chparam %s already specified: overwriting.\n", key.c_str());
+					log_warning("-chparam %s already specified: overwriting.\n", key);
 					r.first->second = value;
 				}
 				continue;
diff --git a/passes/hierarchy/submod.cc b/passes/hierarchy/submod.cc
index f979e7acc..bf135386c 100644
--- a/passes/hierarchy/submod.cc
+++ b/passes/hierarchy/submod.cc
@@ -95,7 +95,7 @@ struct SubmodWorker
 				for (auto &conn : cell->connections())
 					flag_signal(conn.second, true, ct.cell_output(cell->type, conn.first), ct.cell_input(cell->type, conn.first), false, false);
 			} else {
-				log_warning("Port directions for cell %s (%s) are unknown. Assuming inout for all ports.\n", cell->name.c_str(), cell->type.c_str());
+				log_warning("Port directions for cell %s (%s) are unknown. Assuming inout for all ports.\n", cell->name, cell->type);
 				for (auto &conn : cell->connections())
 					flag_signal(conn.second, true, true, true, false, false);
 			}
@@ -111,7 +111,7 @@ struct SubmodWorker
 				for (auto &conn : cell->connections())
 					flag_signal(conn.second, false, false, false, true, true);
 				if (flag_found_something)
-					log_warning("Port directions for cell %s (%s) are unknown. Assuming inout for all ports.\n", cell->name.c_str(), cell->type.c_str());
+					log_warning("Port directions for cell %s (%s) are unknown. Assuming inout for all ports.\n", cell->name, cell->type);
 			}
 		}
 
diff --git a/passes/memory/memlib.cc b/passes/memory/memlib.cc
index 216b750fd..11c9f9074 100644
--- a/passes/memory/memlib.cc
+++ b/passes/memory/memlib.cc
@@ -1097,7 +1097,7 @@ Library MemLibrary::parse_library(const std::vector<std::string> &filenames, con
 		Parser(file, res, defines, defines_unused);
 	}
 	for (auto def: defines_unused) {
-		log_warning("define %s not used in the library.\n", def.c_str());
+		log_warning("define %s not used in the library.\n", def);
 	}
 	return res;
 }
diff --git a/passes/opt/opt_clean.cc b/passes/opt/opt_clean.cc
index cef2c0dc3..b9df09ea6 100644
--- a/passes/opt/opt_clean.cc
+++ b/passes/opt/opt_clean.cc
@@ -233,7 +233,7 @@ void rmunused_module_cells(Module *module, bool verbose)
 	for (auto it : driver_driver_logs) {
 		if (used_raw_bits.count(it.first))
 			for (auto msg : it.second)
-				log_warning("%s\n", msg.c_str());
+				log_warning("%s\n", msg);
 	}
 }
 
diff --git a/passes/sat/qbfsat.cc b/passes/sat/qbfsat.cc
index ad28884f7..b011227e2 100644
--- a/passes/sat/qbfsat.cc
+++ b/passes/sat/qbfsat.cc
@@ -233,7 +233,7 @@ QbfSolutionType call_qbf_solver(RTLIL::Module *mod, const QbfSolveOptions &opt,
 		ret.stdout_lines.push_back(line.substr(0, line.size()-1)); //don't include trailing newline
 		auto warning_pos = line.find(smtbmc_warning);
 		if (warning_pos != std::string::npos)
-			log_warning("%s", line.substr(warning_pos + smtbmc_warning.size() + 1).c_str());
+			log_warning("%s", line.substr(warning_pos + smtbmc_warning.size() + 1));
 		else
 			if (opt.show_smtbmc && !quiet)
 				log("smtbmc output: %s", line);
diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index 56b207a58..1b653a218 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -256,7 +256,7 @@ struct SimInstance
 			if ((shared->fst) && !(shared->hide_internal && wire->name[0] == '$')) {
 				fstHandle id = shared->fst->getHandle(scope + "." + RTLIL::unescape_id(wire->name));
 				if (id==0 && wire->name.isPublic())
-					log_warning("Unable to find wire %s in input file.\n", (scope + "." + RTLIL::unescape_id(wire->name)).c_str());
+					log_warning("Unable to find wire %s in input file.\n", (scope + "." + RTLIL::unescape_id(wire->name)));
 				fst_handles[wire] = id;
 			}
 
@@ -927,7 +927,7 @@ struct SimInstance
 					if (shared->serious_asserts)
 						log_error("Assertion %s.%s (%s) failed.\n", hiername(), log_id(cell), label);
 					else
-						log_warning("Assertion %s.%s (%s) failed.\n", hiername().c_str(), log_id(cell), label.c_str());
+						log_warning("Assertion %s.%s (%s) failed.\n", hiername(), log_id(cell), label);
 				}
 			}
 		}
@@ -1244,7 +1244,7 @@ struct SimInstance
 			Const fst_val = Const::from_string(shared->fst->valueOf(item.second));
 			Const sim_val = get_state(item.first);
 			if (sim_val.size()!=fst_val.size()) {
-				log_warning("Signal '%s.%s' size is different in gold and gate.\n", scope.c_str(), log_id(item.first));
+				log_warning("Signal '%s.%s' size is different in gold and gate.\n", scope, log_id(item.first));
 				continue;
 			}
 			if (shared->sim_mode == SimulationMode::sim) {
@@ -1252,7 +1252,7 @@ struct SimInstance
 			} else if (shared->sim_mode == SimulationMode::gate && !fst_val.is_fully_def()) { // FST data contains X
 				for(int i=0;i<fst_val.size();i++) {
 					if (fst_val[i]!=State::Sx && fst_val[i]!=sim_val[i]) {
-						log_warning("Signal '%s.%s' in file %s in simulation %s\n", scope.c_str(), log_id(item.first), log_signal(fst_val), log_signal(sim_val));
+						log_warning("Signal '%s.%s' in file %s in simulation %s\n", scope, log_id(item.first), log_signal(fst_val), log_signal(sim_val));
 						retVal = true;
 						break;
 					}
@@ -1260,14 +1260,14 @@ struct SimInstance
 			} else if (shared->sim_mode == SimulationMode::gold && !sim_val.is_fully_def()) { // sim data contains X
 				for(int i=0;i<sim_val.size();i++) {
 					if (sim_val[i]!=State::Sx && fst_val[i]!=sim_val[i]) {
-						log_warning("Signal '%s.%s' in file %s in simulation %s\n", scope.c_str(), log_id(item.first), log_signal(fst_val), log_signal(sim_val));
+						log_warning("Signal '%s.%s' in file %s in simulation %s\n", scope, log_id(item.first), log_signal(fst_val), log_signal(sim_val));
 						retVal = true;
 						break;
 					}
 				}
 			} else {
 				if (fst_val!=sim_val) {
-					log_warning("Signal '%s.%s' in file %s in simulation '%s'\n", scope.c_str(), log_id(item.first), log_signal(fst_val), log_signal(sim_val));
+					log_warning("Signal '%s.%s' in file %s in simulation '%s'\n", scope, log_id(item.first), log_signal(fst_val), log_signal(sim_val));
 					retVal = true;
 				}
 			}
@@ -1607,7 +1607,7 @@ struct SimWorker : SimShared
 				escaped_s = RTLIL::escape_id(cell_name(symbol));
 				Cell *c = topmod->cell(escaped_s);
 				if (!c)
-					log_warning("Wire/cell %s not present in module %s\n",symbol.c_str(),log_id(topmod));
+					log_warning("Wire/cell %s not present in module %s\n",symbol,log_id(topmod));
 
 				if (c->is_mem_cell()) {
 					std::string memid = c->parameters.at(ID::MEMID).decode_string();
@@ -1873,7 +1873,7 @@ struct SimWorker : SimShared
 						log("witness hierarchy: found wire %s\n", path.str());
 					bool inserted = hierarchy.paths.emplace(path, {instance, item.wire, {}, INT_MIN}).second;
 					if (!inserted)
-						log_warning("Yosys witness path `%s` is ambiguous in this design\n", path.str().c_str());
+						log_warning("Yosys witness path `%s` is ambiguous in this design\n", path.str());
 				}
 			} else if (item.mem) {
 				auto it = mem_paths.find(path);
@@ -1890,7 +1890,7 @@ struct SimWorker : SimShared
 							continue;
 						bool inserted = hierarchy.paths.emplace(word_path, {instance, nullptr, item.mem->memid, addr}).second;
 						if (!inserted)
-							log_warning("Yosys witness path `%s` is ambiguous in this design\n", path.str().c_str());
+							log_warning("Yosys witness path `%s` is ambiguous in this design\n", path.str());
 					}
 				}
 			}
@@ -1899,7 +1899,7 @@ struct SimWorker : SimShared
 
 		for (auto &path : paths)
 			if (!hierarchy.paths.count(path))
-				log_warning("Yosys witness path `%s` was not found in this design, ignoring\n", path.str().c_str());
+				log_warning("Yosys witness path `%s` was not found in this design, ignoring\n", path.str());
 
 		dict<IdPath, dict<int, bool>> clock_inputs;
 
@@ -1922,7 +1922,7 @@ struct SimWorker : SimShared
 
 					for (int t = 0; t < GetSize(yw.steps); t++) {
 						if (yw.get_bits(t, clock_bits_offset, 1) != expected)
-							log_warning("Yosys witness trace has an unexpected value for the clock input `%s` in step %d.\n", signal.path.str().c_str(), t);
+							log_warning("Yosys witness trace has an unexpected value for the clock input `%s` in step %d.\n", signal.path.str(), t);
 					}
 				}
 			}
@@ -2000,7 +2000,7 @@ struct SimWorker : SimShared
 		YwHierarchy hierarchy = prepare_yw_hierarchy(yw);
 
 		if (yw.steps.empty()) {
-			log_warning("Yosys witness file `%s` contains no time steps\n", yw.filename.c_str());
+			log_warning("Yosys witness file `%s` contains no time steps\n", yw.filename);
 		} else {
 			top->set_initstate_outputs(initstate ? State::S1 : State::S0);
 			set_yw_state(yw, hierarchy, 0);
diff --git a/passes/techmap/abc9_exe.cc b/passes/techmap/abc9_exe.cc
index d7a7e3d4a..ac723fdbb 100644
--- a/passes/techmap/abc9_exe.cc
+++ b/passes/techmap/abc9_exe.cc
@@ -329,7 +329,7 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 #endif
 	if (ret != 0) {
 		if (check_file_exists(stringf("%s/output.aig", tempdir_name)))
-			log_warning("ABC: execution of command \"%s\" failed: return code %d.\n", buffer.c_str(), ret);
+			log_warning("ABC: execution of command \"%s\" failed: return code %d.\n", buffer, ret);
 		else
 			log_error("ABC: execution of command \"%s\" failed: return code %d.\n", buffer, ret);
 	}
diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index c89495c62..7d4fd77ad 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -191,7 +191,7 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 		s.next();
 		lhs = parse(s);
 		if (s.peek() != ')') {
-			log_warning("expected ')' instead of '%c' while parsing Liberty expression '%s'\n", s.peek(), s.full_expr().c_str());
+			log_warning("expected ')' instead of '%c' while parsing Liberty expression '%s'\n", s.peek(), s.full_expr());
 			return lhs;
 		}
 		s.next();
@@ -200,7 +200,7 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 		lhs.kind = Kind::NOT;
 		lhs.children.push_back(parse(s, 7));
 	} else {
-		log_warning("unrecognised character '%c' while parsing Liberty expression '%s'\n", c, s.full_expr().c_str());
+		log_warning("unrecognised character '%c' while parsing Liberty expression '%s'\n", c, s.full_expr());
 		return lhs;
 	}
 
diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index f882aa356..9603956a8 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -1192,7 +1192,7 @@ struct TestCellPass : public Pass {
 									worst_abs = num_cells - num_cells_estimate;
 									worst_rel = (float)(num_cells - num_cells_estimate) / (float)num_cells_estimate;
 								}
-								log_warning("Upper bound violated for %s: %d > %d\n", cell_type.c_str(), num_cells, num_cells_estimate);
+								log_warning("Upper bound violated for %s: %d > %d\n", cell_type, num_cells, num_cells_estimate);
 							}
 						}
 					}
diff --git a/techlibs/intel/synth_intel.cc b/techlibs/intel/synth_intel.cc
index d3202d5cb..e02885cd0 100644
--- a/techlibs/intel/synth_intel.cc
+++ b/techlibs/intel/synth_intel.cc
@@ -242,7 +242,7 @@ struct SynthIntelPass : public ScriptPass {
 				run("memory_bram -rules +/intel/common/brams_m9k.txt", "(if applicable for family)");
 				run("techmap -map +/intel/common/brams_map_m9k.v", "(if applicable for family)");
 			} else {
-				log_warning("BRAM mapping is not currently supported for %s.\n", family_opt.c_str());
+				log_warning("BRAM mapping is not currently supported for %s.\n", family_opt);
 			}
 		}
 
diff --git a/techlibs/xilinx/synth_xilinx.cc b/techlibs/xilinx/synth_xilinx.cc
index 20b8c98c3..46b30573c 100644
--- a/techlibs/xilinx/synth_xilinx.cc
+++ b/techlibs/xilinx/synth_xilinx.cc
@@ -316,7 +316,7 @@ struct SynthXilinxPass : public ScriptPass
 			log_cmd_error("-widemux is not currently supported for LUT4-based architectures.\n");
 
 		if (lut_size != 6) {
-			log_warning("Shift register inference not yet supported for family %s.\n", family.c_str());
+			log_warning("Shift register inference not yet supported for family %s.\n", family);
 			nosrl = true;
 		}
 

From 548deba259e8f58ed2704ee237347a965b0b8b26 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 16 Sep 2025 23:03:45 +0000
Subject: [PATCH 564/931] Remove .c_str() calls from parameters to
 log_file_warning()

---
 frontends/ast/genrtlil.cc      | 4 ++--
 frontends/ast/simplify.cc      | 4 ++--
 frontends/verilog/const2ast.cc | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 5fd478ff3..84f2f9d73 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -1539,7 +1539,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 				if (dynamic_cast<RTLIL::Binding*>(current_module)) {
 					/* nothing to do here */
 				} else if (flag_autowire)
-					log_file_warning(*location.begin.filename, location.begin.line, "Identifier `%s' is implicitly declared.\n", str.c_str());
+					log_file_warning(*location.begin.filename, location.begin.line, "Identifier `%s' is implicitly declared.\n", str);
 				else
 					input_error("Identifier `%s' is implicitly declared and `default_nettype is set to none.\n", str);
 			}
@@ -2200,7 +2200,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 					log_file_info(*location.begin.filename, location.begin.line, "\n");
 			} else if (str == "$warning") {
 				if (sz > 0)
-					log_file_warning(*location.begin.filename, location.begin.line, "%s.\n", children[0]->str.c_str());
+					log_file_warning(*location.begin.filename, location.begin.line, "%s.\n", children[0]->str);
 				else
 					log_file_warning(*location.begin.filename, location.begin.line, "\n");
 			} else if (str == "$error") {
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 9b679d0aa..d4e78b730 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1032,7 +1032,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 	// note that $display, $finish, and $stop are used for synthesis-time DRC so they're not in this list
 	if ((type == AST_FCALL || type == AST_TCALL) && (str == "$strobe" || str == "$monitor" || str == "$time" ||
 			str == "$dumpfile" || str == "$dumpvars" || str == "$dumpon" || str == "$dumpoff" || str == "$dumpall")) {
-		log_file_warning(*location.begin.filename, location.begin.line, "Ignoring call to system %s %s.\n", type == AST_FCALL ? "function" : "task", str.c_str());
+		log_file_warning(*location.begin.filename, location.begin.line, "Ignoring call to system %s %s.\n", type == AST_FCALL ? "function" : "task", str);
 		delete_children();
 		str = std::string();
 	}
@@ -1042,7 +1042,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		 str == "$write"   || str == "$writeb"   || str == "$writeh"   || str == "$writeo"))
 	{
 		if (!current_always) {
-			log_file_warning(*location.begin.filename, location.begin.line, "System task `%s' outside initial or always block is unsupported.\n", str.c_str());
+			log_file_warning(*location.begin.filename, location.begin.line, "System task `%s' outside initial or always block is unsupported.\n", str);
 			delete_children();
 			str = std::string();
 		} else {
diff --git a/frontends/verilog/const2ast.cc b/frontends/verilog/const2ast.cc
index 661b4ef96..573af336b 100644
--- a/frontends/verilog/const2ast.cc
+++ b/frontends/verilog/const2ast.cc
@@ -49,7 +49,7 @@ void ConstParser::log_maybe_loc_error(std::string msg) {
 }
 
 void ConstParser::log_maybe_loc_warn(std::string msg) {
-	log_file_warning(*loc.begin.filename, loc.begin.line, "%s", msg.c_str());
+	log_file_warning(*loc.begin.filename, loc.begin.line, "%s", msg);
 }
 
 // divide an arbitrary length decimal number by two and return the rest

From d276529d46c747b1ba8c4b5f038067f6264c5ee2 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 16 Sep 2025 23:06:28 +0000
Subject: [PATCH 565/931] Remove .c_str() calls from parameters to
 log_file_info()

---
 frontends/ast/genrtlil.cc | 2 +-
 frontends/ast/simplify.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 84f2f9d73..7518e4a3e 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -2195,7 +2195,7 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 			int sz = children.size();
 			if (str == "$info") {
 				if (sz > 0)
-					log_file_info(*location.begin.filename, location.begin.line, "%s.\n", children[0]->str.c_str());
+					log_file_info(*location.begin.filename, location.begin.line, "%s.\n", children[0]->str);
 				else
 					log_file_info(*location.begin.filename, location.begin.line, "\n");
 			} else if (str == "$warning") {
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index d4e78b730..d249bc8ad 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -161,7 +161,7 @@ Fmt AstNode::processFormat(int stage, bool sformat_like, int default_base, size_
 			arg.sig = node_arg->bitsAsConst();
 			arg.signed_ = node_arg->is_signed;
 		} else if (may_fail) {
-			log_file_info(*location.begin.filename, location.begin.line, "Skipping system task `%s' with non-constant argument at position %zu.\n", str.c_str(), index + 1);
+			log_file_info(*location.begin.filename, location.begin.line, "Skipping system task `%s' with non-constant argument at position %zu.\n", str, index + 1);
 			return Fmt();
 		} else {
 			log_file_error(*location.begin.filename, location.begin.line, "Failed to evaluate system task `%s' with non-constant argument at position %zu.\n", str, index + 1);

From a1141f1a4c68a2d70829aedc412c2b257734f944 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 16 Sep 2025 23:12:14 +0000
Subject: [PATCH 566/931] Remove some unnecessary .c_str() calls to the result
 of unescape_id()

---
 backends/aiger2/aiger.cc  |  2 +-
 frontends/ast/genrtlil.cc |  8 ++++----
 frontends/ast/simplify.cc | 30 +++++++++++++++---------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/backends/aiger2/aiger.cc b/backends/aiger2/aiger.cc
index bf7497bb5..6aea97fda 100644
--- a/backends/aiger2/aiger.cc
+++ b/backends/aiger2/aiger.cc
@@ -1012,7 +1012,7 @@ struct XAigerWriter : AigerWriter {
 
 			for (auto box : minfo.found_blackboxes) {
 				log_debug(" - %s.%s (type %s): ", cursor.path().c_str(),
-						  RTLIL::unescape_id(box->name).c_str(),
+						  RTLIL::unescape_id(box->name),
 						  log_id(box->type));
 
 				Module *box_module = design->module(box->type), *box_derived;
diff --git a/frontends/ast/genrtlil.cc b/frontends/ast/genrtlil.cc
index 7518e4a3e..c26750c98 100644
--- a/frontends/ast/genrtlil.cc
+++ b/frontends/ast/genrtlil.cc
@@ -1241,7 +1241,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 				while (children[0]->simplify(true, 1, -1, false) == true) { }
 				if (children[0]->type != AST_CONSTANT)
 					input_error("System function %s called with non-const argument!\n",
-							RTLIL::unescape_id(str).c_str());
+							RTLIL::unescape_id(str));
 				width_hint = max(width_hint, int(children[0]->asInt(true)));
 			}
 			break;
@@ -1291,7 +1291,7 @@ void AstNode::detectSignWidthWorker(int &width_hint, bool &sign_hint, bool *foun
 				while (right->simplify(true, 1, -1, false)) { }
 				if (left->type != AST_CONSTANT || right->type != AST_CONSTANT)
 					input_error("Function %s has non-constant width!",
-							RTLIL::unescape_id(str).c_str());
+							RTLIL::unescape_id(str));
 				result_width = abs(int(left->asInt(true) - right->asInt(true)));
 			}
 			width_hint = max(width_hint, result_width);
@@ -2237,12 +2237,12 @@ RTLIL::SigSpec AstNode::genRTLIL(int width_hint, bool sign_hint)
 
 				if (GetSize(children) > 1)
 					input_error("System function %s got %d arguments, expected 1 or 0.\n",
-							RTLIL::unescape_id(str).c_str(), GetSize(children));
+							RTLIL::unescape_id(str), GetSize(children));
 
 				if (GetSize(children) == 1) {
 					if (children[0]->type != AST_CONSTANT)
 						input_error("System function %s called with non-const argument!\n",
-								RTLIL::unescape_id(str).c_str());
+								RTLIL::unescape_id(str));
 					width = children[0]->asInt(true);
 				}
 
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index d249bc8ad..cf9d7443e 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1915,7 +1915,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 
 		if (current_scope.at(modname)->type != AST_CELL)
 			input_error("Defparam argument `%s . %s` does not match a cell!\n",
-					RTLIL::unescape_id(modname).c_str(), RTLIL::unescape_id(paramname).c_str());
+					RTLIL::unescape_id(modname), RTLIL::unescape_id(paramname));
 
 		auto paraset = std::make_unique<AstNode>(location, AST_PARASET, children[1]->clone(), GetSize(children) > 2 ? children[2]->clone() : nullptr);
 		paraset->str = paramname;
@@ -3394,11 +3394,11 @@ skip_dynamic_range_lvalue_expansion:;
 
 				if (GetSize(children) != 1 && GetSize(children) != 2)
 					input_error("System function %s got %d arguments, expected 1 or 2.\n",
-							RTLIL::unescape_id(str).c_str(), int(children.size()));
+							RTLIL::unescape_id(str), int(children.size()));
 
 				if (!current_always_clocked)
 					input_error("System function %s is only allowed in clocked blocks.\n",
-							RTLIL::unescape_id(str).c_str());
+							RTLIL::unescape_id(str));
 
 				if (GetSize(children) == 2)
 				{
@@ -3469,11 +3469,11 @@ skip_dynamic_range_lvalue_expansion:;
 			{
 				if (GetSize(children) != 1)
 					input_error("System function %s got %d arguments, expected 1.\n",
-							RTLIL::unescape_id(str).c_str(), int(children.size()));
+							RTLIL::unescape_id(str), int(children.size()));
 
 				if (!current_always_clocked)
 					input_error("System function %s is only allowed in clocked blocks.\n",
-							RTLIL::unescape_id(str).c_str());
+							RTLIL::unescape_id(str));
 
 				auto present = children.at(0)->clone();
 				auto past = clone();
@@ -3511,7 +3511,7 @@ skip_dynamic_range_lvalue_expansion:;
 			{
 				if (children.size() != 1)
 					input_error("System function %s got %d arguments, expected 1.\n",
-							RTLIL::unescape_id(str).c_str(), int(children.size()));
+							RTLIL::unescape_id(str), int(children.size()));
 
 				auto buf = children[0]->clone();
 				while (buf->simplify(true, stage, width_hint, sign_hint)) { }
@@ -3538,11 +3538,11 @@ skip_dynamic_range_lvalue_expansion:;
 				if (str == "\\$dimensions" || str == "\\$unpacked_dimensions" || str == "\\$bits") {
 					if (children.size() != 1)
 						input_error("System function %s got %d arguments, expected 1.\n",
-								RTLIL::unescape_id(str).c_str(), int(children.size()));
+								RTLIL::unescape_id(str), int(children.size()));
 				} else {
 					if (children.size() != 1 && children.size() != 2)
 						input_error("System function %s got %d arguments, expected 1 or 2.\n",
-							RTLIL::unescape_id(str).c_str(), int(children.size()));
+							RTLIL::unescape_id(str), int(children.size()));
 					if (children.size() == 2) {
 						auto buf = children[1]->clone();
 						// Evaluate constant expression
@@ -3634,18 +3634,18 @@ skip_dynamic_range_lvalue_expansion:;
 				if (func_with_two_arguments) {
 					if (children.size() != 2)
 						input_error("System function %s got %d arguments, expected 2.\n",
-								RTLIL::unescape_id(str).c_str(), int(children.size()));
+								RTLIL::unescape_id(str), int(children.size()));
 				} else {
 					if (children.size() != 1)
 						input_error("System function %s got %d arguments, expected 1.\n",
-								RTLIL::unescape_id(str).c_str(), int(children.size()));
+								RTLIL::unescape_id(str), int(children.size()));
 				}
 
 				if (children.size() >= 1) {
 					while (children[0]->simplify(true, stage, width_hint, sign_hint)) { }
 					if (!children[0]->isConst())
 						input_error("Failed to evaluate system function `%s' with non-constant argument.\n",
-								RTLIL::unescape_id(str).c_str());
+								RTLIL::unescape_id(str));
 					int child_width_hint = width_hint;
 					bool child_sign_hint = sign_hint;
 					children[0]->detectSignWidth(child_width_hint, child_sign_hint);
@@ -3656,7 +3656,7 @@ skip_dynamic_range_lvalue_expansion:;
 					while (children[1]->simplify(true, stage, width_hint, sign_hint)) { }
 					if (!children[1]->isConst())
 						input_error("Failed to evaluate system function `%s' with non-constant argument.\n",
-								RTLIL::unescape_id(str).c_str());
+								RTLIL::unescape_id(str));
 					int child_width_hint = width_hint;
 					bool child_sign_hint = sign_hint;
 					children[1]->detectSignWidth(child_width_hint, child_sign_hint);
@@ -3703,7 +3703,7 @@ skip_dynamic_range_lvalue_expansion:;
 			if (str == "\\$countbits") {
 				if (children.size() < 2)
 					input_error("System function %s got %d arguments, expected at least 2.\n",
-							RTLIL::unescape_id(str).c_str(), int(children.size()));
+							RTLIL::unescape_id(str), int(children.size()));
 
 				std::vector<RTLIL::State> control_bits;
 
@@ -3760,7 +3760,7 @@ skip_dynamic_range_lvalue_expansion:;
 			if (str == "\\$countones" || str == "\\$isunknown" || str == "\\$onehot" || str == "\\$onehot0") {
 				if (children.size() != 1)
 					input_error("System function %s got %d arguments, expected 1.\n",
-							RTLIL::unescape_id(str).c_str(), int(children.size()));
+							RTLIL::unescape_id(str), int(children.size()));
 
 				auto countbits = clone();
 				countbits->str = "\\$countbits";
@@ -3834,7 +3834,7 @@ skip_dynamic_range_lvalue_expansion:;
 			{
 				if (GetSize(children) < 2 || GetSize(children) > 4)
 					input_error("System function %s got %d arguments, expected 2-4.\n",
-							RTLIL::unescape_id(str).c_str(), int(children.size()));
+							RTLIL::unescape_id(str), int(children.size()));
 
 				auto node_filename = children[0]->clone();
 				while (node_filename->simplify(true, stage, width_hint, sign_hint)) { }

From f80be49fa16dc331039f0148a8282f6bfc08e170 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 16 Sep 2025 23:14:11 +0000
Subject: [PATCH 567/931] Remove unnecessary .c_str() in EDIF_ macros

---
 backends/edif/edif.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backends/edif/edif.cc b/backends/edif/edif.cc
index d1be0b37f..61d6ee254 100644
--- a/backends/edif/edif.cc
+++ b/backends/edif/edif.cc
@@ -30,9 +30,9 @@
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
-#define EDIF_DEF(_id) edif_names(RTLIL::unescape_id(_id), true).c_str()
-#define EDIF_DEFR(_id, _ren, _bl, _br) edif_names(RTLIL::unescape_id(_id), true, _ren, _bl, _br).c_str()
-#define EDIF_REF(_id) edif_names(RTLIL::unescape_id(_id), false).c_str()
+#define EDIF_DEF(_id) edif_names(RTLIL::unescape_id(_id), true)
+#define EDIF_DEFR(_id, _ren, _bl, _br) edif_names(RTLIL::unescape_id(_id), true, _ren, _bl, _br)
+#define EDIF_REF(_id) edif_names(RTLIL::unescape_id(_id), false)
 
 struct EdifNames
 {

From 64ffcbc3944b5b8fe9b53ad63dd415c9af13e34b Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 16 Sep 2025 23:26:01 +0000
Subject: [PATCH 568/931] Deprecate logv_file_error()

---
 kernel/log.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/log.h b/kernel/log.h
index 78b202159..16bf96de8 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -119,6 +119,7 @@ extern int log_make_debug;
 extern int log_force_debug;
 extern int log_debug_suppressed;
 
+[[deprecated]]
 [[noreturn]] void logv_file_error(const string &filename, int lineno, const char *format, va_list ap);
 
 void set_verific_logging(void (*cb)(int msg_type, const char *message_id, const char* file_path, unsigned int left_line, unsigned int left_col, unsigned int right_line, unsigned int right_col, const char *msg));

From 5e550ddc3085c1bf524517e45f30b6c4f3ee248f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Sep 2025 00:22:59 +0000
Subject: [PATCH 569/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 281f5a868..ef63f23ad 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+88
+YOSYS_VER := 0.57+125
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From d24488d3a5539895a652a44ba7f1863c2dc2ef3e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Wed, 17 Sep 2025 03:23:52 +0000
Subject: [PATCH 570/931] Instead of using builtin_ff_cell_types() directly, go
 through a method Cell::is_builtin_ff()

---
 backends/verilog/verilog_backend.cc |  8 ++++----
 kernel/celledges.cc                 |  2 +-
 kernel/cost.cc                      |  2 +-
 kernel/ffmerge.cc                   |  2 +-
 kernel/functional.cc                |  2 +-
 kernel/rtlil.cc                     | 10 +++++++++-
 kernel/rtlil.h                      |  2 ++
 kernel/satgen.cc                    |  2 +-
 passes/cmds/check.cc                |  4 ++--
 passes/cmds/clean_zerowidth.cc      |  2 +-
 passes/cmds/dft_tag.cc              |  4 ++--
 passes/cmds/future.cc               |  2 +-
 passes/cmds/setundef.cc             |  2 +-
 passes/cmds/timeest.cc              |  2 +-
 passes/cmds/xprop.cc                |  4 ++--
 passes/equiv/equiv_induct.cc        |  2 +-
 passes/equiv/equiv_simple.cc        |  4 ++--
 passes/opt/opt_clean.cc             |  2 +-
 passes/opt/opt_dff.cc               |  4 ++--
 passes/opt/opt_ffinv.cc             |  2 +-
 passes/opt/opt_merge.cc             |  6 +++---
 passes/sat/async2sync.cc            |  2 +-
 passes/sat/clk2fflogic.cc           |  2 +-
 passes/sat/fmcombine.cc             |  2 +-
 passes/sat/formalff.cc              | 16 ++++++++--------
 passes/sat/sim.cc                   |  4 ++--
 passes/techmap/abc.cc               |  4 ++--
 passes/techmap/abc9_ops.cc          |  2 +-
 passes/techmap/clockgate.cc         |  2 +-
 passes/techmap/dfflegalize.cc       |  4 ++--
 passes/techmap/dffunmap.cc          |  2 +-
 passes/techmap/zinit.cc             |  2 +-
 32 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index b03639b8d..aea29f710 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -970,7 +970,7 @@ void dump_cell_expr_port(std::ostream &f, RTLIL::Cell *cell, std::string port, b
 
 std::string cellname(RTLIL::Cell *cell)
 {
-	if (!norename && cell->name[0] == '$' && RTLIL::builtin_ff_cell_types().count(cell->type) && cell->hasPort(ID::Q) && !cell->type.in(ID($ff), ID($_FF_)))
+	if (!norename && cell->name[0] == '$' && cell->is_builtin_ff() && cell->hasPort(ID::Q) && !cell->type.in(ID($ff), ID($_FF_)))
 	{
 		RTLIL::SigSpec sig = cell->getPort(ID::Q);
 		if (GetSize(sig) != 1 || sig.is_fully_const())
@@ -1498,7 +1498,7 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		return true;
 	}
 
-	if (RTLIL::builtin_ff_cell_types().count(cell->type))
+	if (cell->is_builtin_ff())
 	{
 		FfData ff(nullptr, cell);
 
@@ -1976,7 +1976,7 @@ void dump_cell(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		}
 	}
 
-	if (siminit && RTLIL::builtin_ff_cell_types().count(cell->type) && cell->hasPort(ID::Q) && !cell->type.in(ID($ff), ID($_FF_))) {
+	if (siminit && cell->is_builtin_ff() && cell->hasPort(ID::Q) && !cell->type.in(ID($ff), ID($_FF_))) {
 		std::stringstream ss;
 		dump_reg_init(ss, cell->getPort(ID::Q));
 		if (!ss.str().empty()) {
@@ -2334,7 +2334,7 @@ void dump_module(std::ostream &f, std::string indent, RTLIL::Module *module)
 				continue;
 			}
 
-			if (!RTLIL::builtin_ff_cell_types().count(cell->type) || !cell->hasPort(ID::Q) || cell->type.in(ID($ff), ID($_FF_)))
+			if (!cell->is_builtin_ff() || !cell->hasPort(ID::Q) || cell->type.in(ID($ff), ID($_FF_)))
 				continue;
 
 			RTLIL::SigSpec sig = cell->getPort(ID::Q);
diff --git a/kernel/celledges.cc b/kernel/celledges.cc
index 8e52d0380..c39ced95a 100644
--- a/kernel/celledges.cc
+++ b/kernel/celledges.cc
@@ -447,7 +447,7 @@ bool YOSYS_NAMESPACE_PREFIX AbstractCellEdgesDatabase::add_edges_from_cell(RTLIL
 		return true;
 	}
 
-	if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+	if (cell->is_builtin_ff()) {
 		ff_op(this, cell);
 		return true;
 	}
diff --git a/kernel/cost.cc b/kernel/cost.cc
index 985220f14..29787fa52 100644
--- a/kernel/cost.cc
+++ b/kernel/cost.cc
@@ -145,7 +145,7 @@ unsigned int CellCosts::get(RTLIL::Cell *cell)
 	if (design_ && design_->module(cell->type) && cell->parameters.empty()) {
 		log_debug("%s is a module, recurse\n", cell->name.c_str());
 		return get(design_->module(cell->type));
-	} else if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+	} else if (cell->is_builtin_ff()) {
 		log_assert(cell->hasPort(ID::Q) && "Weird flip flop");
 		log_debug("%s is ff\n", cell->name.c_str());
 		return cell->getParam(ID::WIDTH).as_int();
diff --git a/kernel/ffmerge.cc b/kernel/ffmerge.cc
index 632cba05c..709549e4d 100644
--- a/kernel/ffmerge.cc
+++ b/kernel/ffmerge.cc
@@ -335,7 +335,7 @@ void FfMergeHelper::set(FfInitVals *initvals_, RTLIL::Module *module_)
 	}
 
 	for (auto cell : module->cells()) {
-		if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+		if (cell->is_builtin_ff()) {
 			if (cell->hasPort(ID::D)) {
 				SigSpec d = (*sigmap)(cell->getPort(ID::D));
 				for (int i = 0; i < GetSize(d); i++)
diff --git a/kernel/functional.cc b/kernel/functional.cc
index 75c9b580b..2a1bf598a 100644
--- a/kernel/functional.cc
+++ b/kernel/functional.cc
@@ -605,7 +605,7 @@ private:
 			}
 			Node node = handle_memory(mem);
 			factory.update_pending(cell_outputs.at({cell, ID(RD_DATA)}), node);
-		} else if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+		} else if (cell->is_builtin_ff()) {
 			FfData ff(&ff_initvals, cell);
 			if (!ff.has_gclk)
 				log_error("The design contains a %s flip-flop at %s. This is not supported by the functional backend. "
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 586262f97..2d29dab9f 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -87,7 +87,7 @@ static_assert(check_well_known_id_order());
 
 dict<std::string, std::string> RTLIL::constpad;
 
-const pool<IdString> &RTLIL::builtin_ff_cell_types() {
+static const pool<IdString> &builtin_ff_cell_types_internal() {
 	static const pool<IdString> res = {
 		ID($sr),
 		ID($ff),
@@ -238,6 +238,10 @@ const pool<IdString> &RTLIL::builtin_ff_cell_types() {
 	return res;
 }
 
+const pool<IdString> &RTLIL::builtin_ff_cell_types() {
+	return builtin_ff_cell_types_internal();
+}
+
 #define check(condition) log_assert(condition && "malformed Const union")
 
 const Const::bitvectype& Const::get_bits() const {
@@ -4497,6 +4501,10 @@ bool RTLIL::Cell::is_mem_cell() const
 	return type.in(ID($mem), ID($mem_v2)) || has_memid();
 }
 
+bool RTLIL::Cell::is_builtin_ff() const {
+	return builtin_ff_cell_types_internal().count(type) > 0;
+}
+
 RTLIL::SigChunk::SigChunk(const RTLIL::SigBit &bit)
 {
 	wire = bit.wire;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 6b4bc0c7d..2d7bf9a9c 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -556,6 +556,7 @@ template <> struct IDMacroHelper<-1> {
 namespace RTLIL {
 	extern dict<std::string, std::string> constpad;
 
+	[[deprecated("Call cell->is_builtin_ff() instead")]]
 	const pool<IdString> &builtin_ff_cell_types();
 
 	static inline std::string escape_id(const std::string &str) {
@@ -2147,6 +2148,7 @@ public:
 
 	bool has_memid() const;
 	bool is_mem_cell() const;
+	bool is_builtin_ff() const;
 };
 
 struct RTLIL::CaseRule : public RTLIL::AttrObject
diff --git a/kernel/satgen.cc b/kernel/satgen.cc
index 7885eccf8..f2c1e00c2 100644
--- a/kernel/satgen.cc
+++ b/kernel/satgen.cc
@@ -1202,7 +1202,7 @@ bool SatGen::importCell(RTLIL::Cell *cell, int timestep)
 		return true;
 	}
 
-	if (timestep > 0 && (RTLIL::builtin_ff_cell_types().count(cell->type) || cell->type == ID($anyinit)))
+	if (timestep > 0 && (cell->is_builtin_ff() || cell->type == ID($anyinit)))
 	{
 		FfData ff(nullptr, cell);
 
diff --git a/passes/cmds/check.cc b/passes/cmds/check.cc
index b532b4527..44dbdf28e 100644
--- a/passes/cmds/check.cc
+++ b/passes/cmds/check.cc
@@ -285,7 +285,7 @@ struct CheckPass : public Pass {
 				}
 
 				if (yosys_celltypes.cell_evaluable(cell->type) || cell->type.in(ID($mem_v2), ID($memrd), ID($memrd_v2)) \
-						|| RTLIL::builtin_ff_cell_types().count(cell->type)) {
+						|| cell->is_builtin_ff()) {
 					if (!edges_db.add_edges_from_cell(cell))
 						coarsened_cells.insert(cell);
 				}
@@ -426,7 +426,7 @@ struct CheckPass : public Pass {
 			{
 				for (auto cell : module->cells())
 				{
-					if (RTLIL::builtin_ff_cell_types().count(cell->type) == 0)
+					if (cell->is_builtin_ff() == 0)
 						continue;
 
 					for (auto bit : sigmap(cell->getPort(ID::Q)))
diff --git a/passes/cmds/clean_zerowidth.cc b/passes/cmds/clean_zerowidth.cc
index 021726450..d48d3a958 100644
--- a/passes/cmds/clean_zerowidth.cc
+++ b/passes/cmds/clean_zerowidth.cc
@@ -73,7 +73,7 @@ struct CleanZeroWidthPass : public Pass {
 							cell->unsetPort(it.first);
 						}
 					}
-				} else if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+				} else if (cell->is_builtin_ff()) {
 					// Coarse FF cells: remove if WIDTH == 0 (no outputs).
 					// This will also trigger on fine cells, so use the Q port
 					// width instead of actual WIDTH parameter.
diff --git a/passes/cmds/dft_tag.cc b/passes/cmds/dft_tag.cc
index 5d9756ca0..0a306d113 100644
--- a/passes/cmds/dft_tag.cc
+++ b/passes/cmds/dft_tag.cc
@@ -430,7 +430,7 @@ struct DftTagWorker {
 			return;
 		}
 
-		if (RTLIL::builtin_ff_cell_types().count(cell->type) || cell->type == ID($anyinit)) {
+		if (cell->is_builtin_ff() || cell->type == ID($anyinit)) {
 			FfData ff(&initvals, cell);
 
 			if (ff.has_clk || ff.has_gclk)
@@ -686,7 +686,7 @@ struct DftTagWorker {
 			return;
 		}
 
-		if (RTLIL::builtin_ff_cell_types().count(cell->type) || cell->type == ID($anyinit)) {
+		if (cell->is_builtin_ff() || cell->type == ID($anyinit)) {
 			FfData ff(&initvals, cell);
 			// TODO handle some more variants
 			if ((ff.has_clk || ff.has_gclk) && !ff.has_ce && !ff.has_aload && !ff.has_srst && !ff.has_arst && !ff.has_sr) {
diff --git a/passes/cmds/future.cc b/passes/cmds/future.cc
index 5dcf46bcf..81cc86bff 100644
--- a/passes/cmds/future.cc
+++ b/passes/cmds/future.cc
@@ -85,7 +85,7 @@ struct FutureWorker {
 		if (found_driver->second.size() > 1)
 			log_error("Found multiple drivers for future_ff target signal %s\n", log_signal(bit));
 		auto driver = *found_driver->second.begin();
-		if (!RTLIL::builtin_ff_cell_types().count(driver.cell->type) && driver.cell->type != ID($anyinit))
+		if (!driver.cell->is_builtin_ff() && driver.cell->type != ID($anyinit))
 			log_error("Driver for future_ff target signal %s has non-FF cell type %s\n", log_signal(bit), log_id(driver.cell->type));
 
 		FfData ff(&initvals, driver.cell);
diff --git a/passes/cmds/setundef.cc b/passes/cmds/setundef.cc
index 6d3e30561..5d2ccfcc8 100644
--- a/passes/cmds/setundef.cc
+++ b/passes/cmds/setundef.cc
@@ -364,7 +364,7 @@ struct SetundefPass : public Pass {
 
 				for (auto cell : module->cells())
 				{
-					if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+					if (!cell->is_builtin_ff())
 						continue;
 
 					for (auto bit : sigmap(cell->getPort(ID::Q)))
diff --git a/passes/cmds/timeest.cc b/passes/cmds/timeest.cc
index 86a529520..75356610c 100644
--- a/passes/cmds/timeest.cc
+++ b/passes/cmds/timeest.cc
@@ -88,7 +88,7 @@ struct EstimateSta {
 
 		for (auto cell : m->cells()) {
 			SigSpec launch, sample;
-			if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+			if (cell->is_builtin_ff()) {
 				// collect launch and sample points for FF cell
 				FfData ff(nullptr, cell);
 				if (!ff.has_clk) {
diff --git a/passes/cmds/xprop.cc b/passes/cmds/xprop.cc
index 8b2e7ae08..7291bb859 100644
--- a/passes/cmds/xprop.cc
+++ b/passes/cmds/xprop.cc
@@ -302,7 +302,7 @@ struct XpropWorker
 			return;
 		}
 
-		if (RTLIL::builtin_ff_cell_types().count(cell->type) || cell->type == ID($anyinit)) {
+		if (cell->is_builtin_ff() || cell->type == ID($anyinit)) {
 			FfData ff(&initvals, cell);
 
 			if (cell->type != ID($anyinit))
@@ -853,7 +853,7 @@ struct XpropWorker
 			return;
 		}
 
-		if (RTLIL::builtin_ff_cell_types().count(cell->type) || cell->type == ID($anyinit)) {
+		if (cell->is_builtin_ff() || cell->type == ID($anyinit)) {
 			FfData ff(&initvals, cell);
 
 			if ((ff.has_clk || ff.has_gclk) && !ff.has_ce && !ff.has_aload && !ff.has_srst && !ff.has_arst && !ff.has_sr) {
diff --git a/passes/equiv/equiv_induct.cc b/passes/equiv/equiv_induct.cc
index 1995be3cd..e1a3a7990 100644
--- a/passes/equiv/equiv_induct.cc
+++ b/passes/equiv/equiv_induct.cc
@@ -56,7 +56,7 @@ struct EquivInductWorker
 
 		for (auto cell : cells) {
 			if (!satgen.importCell(cell, step) && !cell_warn_cache.count(cell)) {
-				if (RTLIL::builtin_ff_cell_types().count(cell->type))
+				if (cell->is_builtin_ff())
 					log_warning("No SAT model available for async FF cell %s (%s).  Consider running `async2sync` or `clk2fflogic` first.\n", log_id(cell), log_id(cell->type));
 				else
 					log_warning("No SAT model available for cell %s (%s).\n", log_id(cell), log_id(cell->type));
diff --git a/passes/equiv/equiv_simple.cc b/passes/equiv/equiv_simple.cc
index 9e3076077..97f95ac63 100644
--- a/passes/equiv/equiv_simple.cc
+++ b/passes/equiv/equiv_simple.cc
@@ -93,7 +93,7 @@ struct EquivSimpleWorker
 			for (auto &conn : cell->connections())
 				if (yosys_celltypes.cell_input(cell->type, conn.first))
 					for (auto bit : model.sigmap(conn.second)) {
-						if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+						if (cell->is_builtin_ff()) {
 							if (!conn.first.in(ID::CLK, ID::C))
 								next_seed.insert(bit);
 						} else
@@ -231,7 +231,7 @@ struct EquivSimpleWorker
 
 	static void report_missing_model(Cell* cell)
 	{
-		if (RTLIL::builtin_ff_cell_types().count(cell->type))
+		if (cell->is_builtin_ff())
 			log_cmd_error("No SAT model available for async FF cell %s (%s).  Consider running `async2sync` or `clk2fflogic` first.\n", log_id(cell), log_id(cell->type));
 		else
 			log_cmd_error("No SAT model available for cell %s (%s).\n", log_id(cell), log_id(cell->type));
diff --git a/passes/opt/opt_clean.cc b/passes/opt/opt_clean.cc
index cef2c0dc3..68a2156fb 100644
--- a/passes/opt/opt_clean.cc
+++ b/passes/opt/opt_clean.cc
@@ -206,7 +206,7 @@ void rmunused_module_cells(Module *module, bool verbose)
 		if (verbose)
 			log_debug("  removing unused `%s' cell `%s'.\n", cell->type.c_str(), cell->name.c_str());
 		module->design->scratchpad_set_bool("opt.did_something", true);
-		if (RTLIL::builtin_ff_cell_types().count(cell->type))
+		if (cell->is_builtin_ff())
 			ffinit.remove_init(cell->getPort(ID::Q));
 		module->remove(cell);
 		count_rm_cells++;
diff --git a/passes/opt/opt_dff.cc b/passes/opt/opt_dff.cc
index a364539e4..04bcec835 100644
--- a/passes/opt/opt_dff.cc
+++ b/passes/opt/opt_dff.cc
@@ -89,7 +89,7 @@ struct OptDffWorker
 				}
 			}
 
-			if (module->design->selected(module, cell) && RTLIL::builtin_ff_cell_types().count(cell->type))
+			if (module->design->selected(module, cell) && cell->is_builtin_ff())
 				dff_cells.push_back(cell);
 		}
 
@@ -802,7 +802,7 @@ struct OptDffWorker
 
 		bool did_something = false;
 		for (auto cell : module->selected_cells()) {
-			if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+			if (!cell->is_builtin_ff())
 				continue;
 			FfData ff(&initvals, cell);
 
diff --git a/passes/opt/opt_ffinv.cc b/passes/opt/opt_ffinv.cc
index 882221e56..42d6da49b 100644
--- a/passes/opt/opt_ffinv.cc
+++ b/passes/opt/opt_ffinv.cc
@@ -209,7 +209,7 @@ struct OptFfInvWorker
 		std::vector<Cell *> ffs;
 
 		for (Cell *cell : module->selected_cells())
-			if (RTLIL::builtin_ff_cell_types().count(cell->type))
+			if (cell->is_builtin_ff())
 				ffs.push_back(cell);
 
 		for (Cell *cell : ffs) {
diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index fbfdb9b63..1cb499740 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -110,7 +110,7 @@ struct OptMergeWorker
 				comm.eat(hash_ops<std::pair<IdString, SigSpec>>::hash(port, assign_map(sig)));
 			}
 			h = comm.hash_into(h);
-			if (RTLIL::builtin_ff_cell_types().count(cell->type))
+			if (cell->is_builtin_ff())
 				h = initvals(cell->getPort(ID::Q)).hash_into(h);
 		}
 		return h;
@@ -153,7 +153,7 @@ struct OptMergeWorker
 
 		for (const auto &it : cell1->connections_) {
 			if (cell1->output(it.first)) {
-				if (it.first == ID::Q && RTLIL::builtin_ff_cell_types().count(cell1->type)) {
+				if (it.first == ID::Q && cell1->is_builtin_ff()) {
 					// For the 'Q' output of state elements,
 					//   use the (* init *) attribute value
 					conn1[it.first] = initvals(it.second);
@@ -201,7 +201,7 @@ struct OptMergeWorker
 
 	bool has_dont_care_initval(const RTLIL::Cell *cell)
 	{
-		if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+		if (!cell->is_builtin_ff())
 			return false;
 
 		return !initvals(cell->getPort(ID::Q)).is_fully_def();
diff --git a/passes/sat/async2sync.cc b/passes/sat/async2sync.cc
index e86a78d81..eb3b154b2 100644
--- a/passes/sat/async2sync.cc
+++ b/passes/sat/async2sync.cc
@@ -129,7 +129,7 @@ struct Async2syncPass : public Pass {
 					continue;
 				}
 
-				if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+				if (!cell->is_builtin_ff())
 					continue;
 
 				FfData ff(&initvals, cell);
diff --git a/passes/sat/clk2fflogic.cc b/passes/sat/clk2fflogic.cc
index db1eaad4b..dd94dd0d7 100644
--- a/passes/sat/clk2fflogic.cc
+++ b/passes/sat/clk2fflogic.cc
@@ -275,7 +275,7 @@ struct Clk2fflogicPass : public Pass {
 					continue;
 				}
 
-				if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+				if (!cell->is_builtin_ff())
 					continue;
 
 				FfData ff(&initvals, cell);
diff --git a/passes/sat/fmcombine.cc b/passes/sat/fmcombine.cc
index 2d31822c4..505526c14 100644
--- a/passes/sat/fmcombine.cc
+++ b/passes/sat/fmcombine.cc
@@ -118,7 +118,7 @@ struct FmcombineWorker
 					Cell *gold = import_prim_cell(cell, "_gold");
 					Cell *gate = import_prim_cell(cell, "_gate");
 					if (opts.initeq) {
-						if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+						if (cell->is_builtin_ff()) {
 							SigSpec gold_q = gold->getPort(ID::Q);
 							SigSpec gate_q = gate->getPort(ID::Q);
 							SigSpec en = module->Initstate(NEW_ID);
diff --git a/passes/sat/formalff.cc b/passes/sat/formalff.cc
index c0b0cfc15..452e0e59b 100644
--- a/passes/sat/formalff.cc
+++ b/passes/sat/formalff.cc
@@ -92,7 +92,7 @@ struct InitValWorker
 		ModWalker::PortBit portbit = *portbits.begin();
 		RTLIL::Cell *cell = portbit.cell;
 
-		if (RTLIL::builtin_ff_cell_types().count(cell->type))
+		if (cell->is_builtin_ff())
 		{
 			FfData ff(&initvals, cell);
 
@@ -224,7 +224,7 @@ struct InitValWorker
 
 		for (auto portbit : portbits) {
 			RTLIL::Cell *cell = portbit.cell;
-			if (!cell->type.in(ID($mux), ID($and), ID($or), ID($mem_v2)) && !RTLIL::builtin_ff_cell_types().count(cell->type)) {
+			if (!cell->type.in(ID($mux), ID($and), ID($or), ID($mem_v2)) && !cell->is_builtin_ff()) {
 				return true;
 			}
 		}
@@ -232,7 +232,7 @@ struct InitValWorker
 		for (auto portbit : portbits)
 		{
 			RTLIL::Cell *cell = portbit.cell;
-			if (RTLIL::builtin_ff_cell_types().count(cell->type))
+			if (cell->is_builtin_ff())
 			{
 				FfData ff(&initvals, cell);
 				if (ff.has_aload || ff.has_sr || ff.has_arst || ff.has_gclk || !ff.has_clk)
@@ -641,7 +641,7 @@ struct FormalFfPass : public Pass {
 				pool<SigBit> input_bits;
 				pool<pair<SigBit, bool>> input_clk_bits;
 				for (auto cell : module->selected_cells()) {
-					if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+					if (cell->is_builtin_ff()) {
 						FfData ff(&initvals, cell);
 						if (!ff.has_clk)
 							continue;
@@ -743,7 +743,7 @@ struct FormalFfPass : public Pass {
 
 						auto gate_driver = *found->second.begin();
 
-						if (!RTLIL::builtin_ff_cell_types().count(gate_driver.cell->type)) {
+						if (!gate_driver.cell->is_builtin_ff()) {
 							log_debug("non FF driver for gate enable %s.%s of gated clk bit %s.%s\n", log_id(module),
 								  log_signal(SigSpec(gate_enable)), log_id(module), log_signal(SigSpec(clk)));
 							continue;
@@ -784,7 +784,7 @@ struct FormalFfPass : public Pass {
 							log_debug("rewriting cell %s.%s (%s)\n", log_id(module), log_id(clocked_cell),
 								  log_id(clocked_cell->type));
 
-							if (RTLIL::builtin_ff_cell_types().count(clocked_cell->type)) {
+							if (clocked_cell->is_builtin_ff()) {
 
 								FfData ff(&initvals, clocked_cell);
 								log_assert(ff.has_clk);
@@ -836,7 +836,7 @@ struct FormalFfPass : public Pass {
 
 				for (auto cell : module->selected_cells())
 				{
-					if (RTLIL::builtin_ff_cell_types().count(cell->type))
+					if (cell->is_builtin_ff())
 					{
 						FfData ff(&worker.initvals, cell);
 						if (ff.has_aload || ff.has_sr || ff.has_arst || ff.val_init.is_fully_def())
@@ -883,7 +883,7 @@ struct FormalFfPass : public Pass {
 					continue;
 				}
 
-				if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+				if (!cell->is_builtin_ff())
 					continue;
 
 				FfData ff(&initvals, cell);
diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index aadea328f..69c8367c2 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -308,7 +308,7 @@ struct SimInstance
 					}
 			}
 
-			if (RTLIL::builtin_ff_cell_types().count(cell->type) || cell->type == ID($anyinit)) {
+			if (cell->is_builtin_ff() || cell->type == ID($anyinit)) {
 				FfData ff_data(nullptr, cell);
 				ff_state_t ff;
 				ff.past_d = Const(State::Sx, ff_data.width);
@@ -1017,7 +1017,7 @@ struct SimInstance
 		dict<Wire*,bool> registers;
 		for (auto cell : module->cells())
 		{
-			if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+			if (cell->is_builtin_ff()) {
 				FfData ff_data(nullptr, cell);
 				SigSpec q = sigmap(ff_data.sig_q);
 				if (q.is_wire() && signal_database.count(q.as_wire()) != 0) {
diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index c5bdd6ecf..9ec5e7aae 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -373,7 +373,7 @@ void AbcModuleState::mark_port(const AbcSigMap &assign_map, RTLIL::SigSpec sig)
 
 bool AbcModuleState::extract_cell(const AbcSigMap &assign_map, RTLIL::Module *module, RTLIL::Cell *cell, bool keepff)
 {
-	if (RTLIL::builtin_ff_cell_types().count(cell->type)) {
+	if (cell->is_builtin_ff()) {
 		FfData ff(&initvals, cell);
 		gate_type_t type = G(FF);
 		if (!ff.has_clk)
@@ -2427,7 +2427,7 @@ struct AbcPass : public Pass {
 					}
 				}
 
-				if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+				if (!cell->is_builtin_ff())
 					continue;
 
 				FfData ff(&initvals, cell);
diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index 069b94204..9a9f7dcb5 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -224,7 +224,7 @@ void prep_hier(RTLIL::Design *design, bool dff_mode)
 				}
 				else if (derived_module->get_bool_attribute(ID::abc9_box)) {
 					for (auto derived_cell : derived_module->cells())
-						if (derived_cell->is_mem_cell() || RTLIL::builtin_ff_cell_types().count(derived_cell->type)) {
+						if (derived_cell->is_mem_cell() || derived_cell->is_builtin_ff()) {
 							derived_module->set_bool_attribute(ID::abc9_box, false);
 							derived_module->set_bool_attribute(ID::abc9_bypass);
 							break;
diff --git a/passes/techmap/clockgate.cc b/passes/techmap/clockgate.cc
index b834b8f35..f4e0b0f03 100644
--- a/passes/techmap/clockgate.cc
+++ b/passes/techmap/clockgate.cc
@@ -333,7 +333,7 @@ struct ClockgatePass : public Pass {
 		int gated_flop_count = 0;
 		for (auto module : design->selected_unboxed_whole_modules()) {
 			for (auto cell : module->cells()) {
-				if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+				if (!cell->is_builtin_ff())
 					continue;
 
 				FfData ff(nullptr, cell);
diff --git a/passes/techmap/dfflegalize.cc b/passes/techmap/dfflegalize.cc
index 5a622c611..dc29750c8 100644
--- a/passes/techmap/dfflegalize.cc
+++ b/passes/techmap/dfflegalize.cc
@@ -1196,7 +1196,7 @@ unrecognized:
 				srst_used.clear();
 
 				for (auto cell : module->cells()) {
-					if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+					if (!cell->is_builtin_ff())
 						continue;
 
 					FfData ff(&initvals, cell);
@@ -1208,7 +1208,7 @@ unrecognized:
 			}
 			for (auto cell : module->selected_cells())
 			{
-				if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+				if (!cell->is_builtin_ff())
 					continue;
 				FfData ff(&initvals, cell);
 				legalize_ff(ff);
diff --git a/passes/techmap/dffunmap.cc b/passes/techmap/dffunmap.cc
index 8703bf1a0..020597c4b 100644
--- a/passes/techmap/dffunmap.cc
+++ b/passes/techmap/dffunmap.cc
@@ -74,7 +74,7 @@ struct DffunmapPass : public Pass {
 
 			for (auto cell : mod->selected_cells())
 			{
-				if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+				if (!cell->is_builtin_ff())
 					continue;
 
 				FfData ff(&initvals, cell);
diff --git a/passes/techmap/zinit.cc b/passes/techmap/zinit.cc
index 38936e64d..809651ebd 100644
--- a/passes/techmap/zinit.cc
+++ b/passes/techmap/zinit.cc
@@ -63,7 +63,7 @@ struct ZinitPass : public Pass {
 
 			for (auto cell : module->selected_cells())
 			{
-				if (!RTLIL::builtin_ff_cell_types().count(cell->type))
+				if (!cell->is_builtin_ff())
 					continue;
 
 				FfData ff(&initvals, cell);

From 2d81726459ed15d360d30c75bab8e552b38568a9 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 16 Sep 2025 13:59:15 +0200
Subject: [PATCH 571/931] write_xaiger2: Fix output port mapping when opaque
 boxes are present

---
 backends/aiger2/aiger.cc | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/backends/aiger2/aiger.cc b/backends/aiger2/aiger.cc
index c7ed3b81f..36365927c 100644
--- a/backends/aiger2/aiger.cc
+++ b/backends/aiger2/aiger.cc
@@ -903,6 +903,16 @@ struct XAigerWriter : AigerWriter {
 	typedef std::pair<SigBit, HierCursor> HierBit;
 	std::vector<HierBit> pos;
 	std::vector<HierBit> pis;
+
+    // * The aiger output port sequence is COs (inputs to modeled boxes),
+    //   inputs to opaque boxes, then module outputs. COs going first is
+    //   required by abc.
+    // * proper_pos_counter counts ports which follow after COs
+    // * The mapping file `pseudopo` and `po` statements use indexing relative
+    //   to the first port following COs.
+    // * If a module output is directly driven by an opaque box, the emission
+    //   of the po statement in the mapping file is skipped. This is done to
+    //   aid re-integration of the mapped result.
 	int proper_pos_counter = 0;
 
 	pool<SigBit> driven_by_opaque_box;
@@ -937,7 +947,7 @@ struct XAigerWriter : AigerWriter {
 		lit_counter += 2;
 	}
 
-	void append_box_ports(Cell *box, HierCursor &cursor, bool inputs)
+	void append_opaque_box_ports(Cell *box, HierCursor &cursor, bool inputs)
 	{
 		for (auto &conn : box->connections_) {
 			bool is_input = box->input(conn.first);
@@ -955,13 +965,14 @@ struct XAigerWriter : AigerWriter {
 						continue;
 					}
 
+					// Inputs to opaque boxes are proper POs as far as abc is concerned
 					if (map_file.is_open()) {
 						log_assert(cursor.is_top());
-						map_file << "pseudopo " << proper_pos_counter++ << " " << bitp
+						map_file << "pseudopo " << proper_pos_counter << " " << bitp
 							<< " " << box->name.c_str()
 							<< " " << conn.first.c_str() << "\n";
 					}
-
+					proper_pos_counter++;
 					pos.push_back(std::make_pair(bit, cursor));
 
 					if (mapping_prep)
@@ -1038,7 +1049,7 @@ struct XAigerWriter : AigerWriter {
 		});
 
 		for (auto [cursor, box, def] : opaque_boxes)
-			append_box_ports(box, cursor, false);
+			append_opaque_box_ports(box, cursor, false);
 
 		holes_module = design->addModule(NEW_ID);
 		std::vector<RTLIL::Wire *> holes_pis;
@@ -1086,6 +1097,8 @@ struct XAigerWriter : AigerWriter {
 							bit = RTLIL::Sx;
 						}
 
+						// Nonopaque box inputs come first and are not part of
+						// the PO numbering used by the mapping file.
 						pos.push_back(std::make_pair(bit, cursor));
 					}
 					boxes_co_num += port->width;
@@ -1138,7 +1151,7 @@ struct XAigerWriter : AigerWriter {
 		}
 
 		for (auto [cursor, box, def] : opaque_boxes)
-			append_box_ports(box, cursor, true);
+			append_opaque_box_ports(box, cursor, true);
 
 		write_be32(h_buffer, 1);
 		write_be32(h_buffer, pis.size());
@@ -1195,10 +1208,14 @@ struct XAigerWriter : AigerWriter {
 		for (auto w : top->wires())
 		if (w->port_output)
 		for (int i = 0; i < w->width; i++) {
+			// When a module output is directly driven by an opaque box, we
+			// don't emit it to the mapping file to aid re-integration, but we
+			// do emit a proper PO.
 			if (map_file.is_open() && !driven_by_opaque_box.count(SigBit(w, i))) {
-				map_file << "po " << proper_pos_counter++ << " " << i
+				map_file << "po " << proper_pos_counter << " " << i
 							<< " " << w->name.c_str() << "\n";
 			}
+			proper_pos_counter++;
 			pos.push_back(std::make_pair(SigBit(w, i), HierCursor{}));
 		}
 

From 22423b97c10ebae511867b07262cb837f385870c Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Thu, 14 Aug 2025 16:13:43 +0200
Subject: [PATCH 572/931] kernel: Add RTLIL::PortDir for a combined input and
 output flag

---
 kernel/celltypes.h | 10 ++++++++++
 kernel/rtlil.cc    | 16 ++++++++++++++++
 kernel/rtlil.h     |  8 ++++++++
 3 files changed, 34 insertions(+)

diff --git a/kernel/celltypes.h b/kernel/celltypes.h
index 469017029..34592192f 100644
--- a/kernel/celltypes.h
+++ b/kernel/celltypes.h
@@ -320,6 +320,16 @@ struct CellTypes
 		return it != cell_types.end() && it->second.inputs.count(port) != 0;
 	}
 
+	RTLIL::PortDir cell_port_dir(RTLIL::IdString type, RTLIL::IdString port) const
+	{
+		auto it = cell_types.find(type);
+		if (it == cell_types.end())
+			return RTLIL::PD_UNKNOWN;
+		bool is_input = it->second.inputs.count(port);
+		bool is_output = it->second.outputs.count(port);
+		return RTLIL::PortDir(is_input + is_output * 2);
+	}
+
 	bool cell_evaluable(const RTLIL::IdString &type) const
 	{
 		auto it = cell_types.find(type);
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 2d29dab9f..4e94b8cc1 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -4376,6 +4376,22 @@ bool RTLIL::Cell::output(const RTLIL::IdString& portname) const
 	return false;
 }
 
+RTLIL::PortDir RTLIL::Cell::port_dir(const RTLIL::IdString& portname) const
+{
+	if (yosys_celltypes.cell_known(type))
+		return yosys_celltypes.cell_port_dir(type, portname);
+	if (module && module->design) {
+		RTLIL::Module *m = module->design->module(type);
+		if (m == nullptr)
+			return PortDir::PD_UNKNOWN;
+		RTLIL::Wire *w = m->wire(portname);
+		if (w == nullptr)
+			return PortDir::PD_UNKNOWN;
+		return PortDir(w->port_input + w->port_output * 2);
+	}
+	return PortDir::PD_UNKNOWN;
+}
+
 bool RTLIL::Cell::hasParam(const RTLIL::IdString& paramname) const
 {
 	return parameters.count(paramname) != 0;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 2d7bf9a9c..4c3e2182e 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -91,6 +91,13 @@ namespace RTLIL
 		STATIC_ID_END,
 	};
 
+	enum PortDir : unsigned char  {
+		PD_UNKNOWN = 0,
+		PD_INPUT = 1,
+		PD_OUTPUT = 2,
+		PD_INOUT = 3
+	};
+
 	struct Const;
 	struct AttrObject;
 	struct NamedObject;
@@ -2123,6 +2130,7 @@ public:
 	bool known() const;
 	bool input(const RTLIL::IdString &portname) const;
 	bool output(const RTLIL::IdString &portname) const;
+	PortDir port_dir(const RTLIL::IdString &portname) const;
 
 	// access cell parameters
 	bool hasParam(const RTLIL::IdString &paramname) const;

From c4f435569f6c8d3649ed82d5d2e2588f94b0b6c5 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Wed, 3 Sep 2025 15:29:08 +0200
Subject: [PATCH 573/931] kernel: Add known_driver method to Wire/SigSpec

---
 kernel/rtlil.cc | 9 +++++++++
 kernel/rtlil.h  | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 4e94b8cc1..5f8e6ad66 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5534,6 +5534,15 @@ bool RTLIL::SigSpec::is_chunk() const
 	return GetSize(chunks_) == 1;
 }
 
+bool RTLIL::SigSpec::known_driver() const
+{
+	pack();
+	for (auto &chunk : chunks_)
+		if (chunk.is_wire() && !chunk.wire->known_driver())
+			return false;
+	return true;
+}
+
 bool RTLIL::SigSpec::is_fully_const() const
 {
 	cover("kernel.rtlil.sigspec.is_fully_const");
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 4c3e2182e..15154eb64 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1329,6 +1329,8 @@ public:
 	bool is_chunk() const;
 	inline bool is_bit() const { return width_ == 1; }
 
+	bool known_driver() const;
+
 	bool is_fully_const() const;
 	bool is_fully_zero() const;
 	bool is_fully_ones() const;
@@ -2059,6 +2061,8 @@ public:
 	int width, start_offset, port_id;
 	bool port_input, port_output, upto, is_signed;
 
+	bool known_driver() const { return driverCell_ != nullptr; }
+
 	RTLIL::Cell *driverCell() const    { log_assert(driverCell_); return driverCell_; };
 	RTLIL::IdString driverPort() const { log_assert(driverCell_); return driverPort_; };
 

From 1251e92e3a988b33f2075118071f4454247041d6 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Wed, 3 Sep 2025 15:26:33 +0200
Subject: [PATCH 574/931] Add `$input_port` and `$connect` cell types

---
 kernel/celltypes.h        |  2 ++
 kernel/rtlil.cc           | 13 +++++++++++++
 techlibs/common/simlib.v  | 23 +++++++++++++++++++++++
 techlibs/common/techmap.v | 25 +++++++++++++++++++++++++
 4 files changed, 63 insertions(+)

diff --git a/kernel/celltypes.h b/kernel/celltypes.h
index 34592192f..2c3535eac 100644
--- a/kernel/celltypes.h
+++ b/kernel/celltypes.h
@@ -111,6 +111,8 @@ struct CellTypes
 		setup_type(ID($original_tag), {ID::A}, {ID::Y});
 		setup_type(ID($future_ff), {ID::A}, {ID::Y});
 		setup_type(ID($scopeinfo), {}, {});
+		setup_type(ID($input_port), {}, {ID::Y});
+		setup_type(ID($connect), {ID::A, ID::B}, {});
 	}
 
 	void setup_internals_eval()
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 5f8e6ad66..3858a3372 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -2451,6 +2451,19 @@ namespace {
 				check_expected();
 				return;
 			}
+			if (cell->type.in(ID($input_port))) {
+				param(ID::WIDTH);
+				port(ID::Y, param(ID::WIDTH));
+				check_expected();
+				return;
+			}
+			if (cell->type.in(ID($connect))) {
+				param(ID::WIDTH);
+				port(ID::A, param(ID::WIDTH));
+				port(ID::B, param(ID::WIDTH));
+				check_expected();
+				return;
+			}
 			/*
 			 * Checklist for adding internal cell types
 			 * ========================================
diff --git a/techlibs/common/simlib.v b/techlibs/common/simlib.v
index 6e39aa60a..096df07b9 100644
--- a/techlibs/common/simlib.v
+++ b/techlibs/common/simlib.v
@@ -3216,3 +3216,26 @@ module \$scopeinfo ();
 parameter TYPE = "";
 
 endmodule
+
+// --------------------------------------------------------
+//* group wire
+module \$connect (A, B);
+
+parameter WIDTH = 0;
+
+inout [WIDTH-1:0] A;
+inout [WIDTH-1:0] B;
+
+tran connect[WIDTH-1:0] (A, B);
+
+endmodule
+
+// --------------------------------------------------------
+//* group wire
+module \$input_port (Y);
+
+parameter WIDTH = 0;
+
+inout [WIDTH-1:0] Y;
+
+endmodule
diff --git a/techlibs/common/techmap.v b/techlibs/common/techmap.v
index fdf11904b..7a9ad7693 100644
--- a/techlibs/common/techmap.v
+++ b/techlibs/common/techmap.v
@@ -647,3 +647,28 @@ module _90_lut;
 endmodule
 `endif
 
+
+// --------------------------------------------------------
+// Bufnorm helpers
+// --------------------------------------------------------
+
+(* techmap_celltype = "$connect" *)
+module \$connect (A, B);
+
+parameter WIDTH = 0;
+
+inout [WIDTH-1:0] A;
+inout [WIDTH-1:0] B;
+
+assign A = B; // RTLIL assignments are not inherently directed
+
+endmodule
+
+(* techmap_celltype = "$input_port" *)
+module \$input_port (Y);
+
+parameter WIDTH = 0;
+
+inout [WIDTH-1:0] Y; // This cell is just a maker, so we leave Y undriven
+
+endmodule

From d88d6fce87442dc3a020fd770a1952f6cedbb192 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Wed, 3 Sep 2025 15:34:51 +0200
Subject: [PATCH 575/931] kernel: Rewrite bufNormalize

This is a complete rewrite of the RTLIL-kernel-side bufnorm code. This
is done to support inout ports and undirected connections as well as to
allow removal of cells while in bufnorm mode.

This doesn't yet update the (experimental) `bufnorm` pass, so to
manually test the new kernel functionality, it is important to only use
`bufnorm -update` and `bufnorm -reset` which rely entirely on the kernel
functionality. Other modes of the `bufnorm` pass may still fail in the
presence of inout ports or undirected connections.
---
 Makefile                |   1 +
 kernel/rtlil.cc         | 211 ++-----------
 kernel/rtlil.h          |   7 +-
 kernel/rtlil_bufnorm.cc | 679 ++++++++++++++++++++++++++++++++++++++++
 tests/various/aiger2.ys |   2 +
 5 files changed, 716 insertions(+), 184 deletions(-)
 create mode 100644 kernel/rtlil_bufnorm.cc

diff --git a/Makefile b/Makefile
index ef63f23ad..3e0849c09 100644
--- a/Makefile
+++ b/Makefile
@@ -644,6 +644,7 @@ $(eval $(call add_include_file,frontends/blif/blifparse.h))
 $(eval $(call add_include_file,backends/rtlil/rtlil_backend.h))
 
 OBJS += kernel/driver.o kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o kernel/yosys.o kernel/io.o kernel/gzip.o
+OBJS += kernel/rtlil_bufnorm.o
 OBJS += kernel/log_help.o
 ifeq ($(ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS),1)
 OBJS += kernel/log_compat.o
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 3858a3372..4f34d6f7b 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -2844,7 +2844,13 @@ void RTLIL::Module::remove(RTLIL::Cell *cell)
 	log_assert(cells_.count(cell->name) != 0);
 	log_assert(refcount_cells_ == 0);
 	cells_.erase(cell->name);
-	delete cell;
+	if (design && design->flagBufferedNormalized && buf_norm_cell_queue.count(cell)) {
+		cell->type.clear();
+		cell->name.clear();
+		pending_deleted_cells.insert(cell);
+	} else {
+		delete cell;
+	}
 }
 
 void RTLIL::Module::remove(RTLIL::Process *process)
@@ -3019,6 +3025,14 @@ void RTLIL::Module::fixup_ports()
 
 	std::sort(all_ports.begin(), all_ports.end(), fixup_ports_compare);
 
+	if (design && design->flagBufferedNormalized) {
+		for (auto &w : wires_)
+			if (w.second->driverCell_ && w.second->driverCell_->type == ID($input_port))
+				buf_norm_wire_queue.insert(w.second);
+
+		buf_norm_wire_queue.insert(all_ports.begin(), all_ports.end());
+	}
+
 	ports.clear();
 	for (size_t i = 0; i < all_ports.size(); i++) {
 		ports.push_back(all_ports[i]->name);
@@ -4163,188 +4177,7 @@ bool RTLIL::Cell::hasPort(const RTLIL::IdString& portname) const
 	return connections_.count(portname) != 0;
 }
 
-void RTLIL::Cell::unsetPort(const RTLIL::IdString& portname)
-{
-	RTLIL::SigSpec signal;
-	auto conn_it = connections_.find(portname);
-
-	if (conn_it != connections_.end())
-	{
-		for (auto mon : module->monitors)
-			mon->notify_connect(this, conn_it->first, conn_it->second, signal);
-
-		if (module->design)
-			for (auto mon : module->design->monitors)
-				mon->notify_connect(this, conn_it->first, conn_it->second, signal);
-
-		if (yosys_xtrace) {
-			log("#X# Unconnect %s.%s.%s\n", log_id(this->module), log_id(this), log_id(portname));
-			log_backtrace("-X- ", yosys_xtrace-1);
-		}
-
-		connections_.erase(conn_it);
-	}
-}
-
-void RTLIL::Design::bufNormalize(bool enable)
-{
-	if (!enable)
-	{
-		if (!flagBufferedNormalized)
-			return;
-
-		for (auto module : modules()) {
-			module->bufNormQueue.clear();
-			for (auto wire : module->wires()) {
-				wire->driverCell_ = nullptr;
-				wire->driverPort_ = IdString();
-			}
-		}
-
-		flagBufferedNormalized = false;
-		return;
-	}
-
-	if (!flagBufferedNormalized)
-	{
-		for (auto module : modules())
-		{
-			for (auto cell : module->cells())
-			for (auto &conn : cell->connections()) {
-				if (!cell->output(conn.first) || GetSize(conn.second) == 0)
-					continue;
-				if (conn.second.is_wire()) {
-					Wire *wire = conn.second.as_wire();
-					log_assert(wire->driverCell_ == nullptr);
-					wire->driverCell_ = cell;
-					wire->driverPort_ = conn.first;
-				} else {
-					pair<RTLIL::Cell*, RTLIL::IdString> key(cell, conn.first);
-					module->bufNormQueue.insert(key);
-				}
-			}
-		}
-
-		flagBufferedNormalized = true;
-	}
-
-	for (auto module : modules())
-		module->bufNormalize();
-}
-
-void RTLIL::Module::bufNormalize()
-{
-	if (!design->flagBufferedNormalized)
-		return;
-
-	while (GetSize(bufNormQueue) || !connections_.empty())
-	{
-		pool<pair<RTLIL::Cell*, RTLIL::IdString>> queue;
-		bufNormQueue.swap(queue);
-
-		pool<Wire*> outWires;
-		for (auto &conn : connections())
-		for (auto &chunk : conn.first.chunks())
-			if (chunk.wire) outWires.insert(chunk.wire);
-
-		SigMap sigmap(this);
-		new_connections({});
-
-		for (auto &key : queue)
-		{
-			Cell *cell = key.first;
-			const IdString &portname = key.second;
-			const SigSpec &sig = cell->getPort(portname);
-			if (GetSize(sig) == 0) continue;
-
-			if (sig.is_wire()) {
-				Wire *wire = sig.as_wire();
-				if (wire->driverCell_) {
-					log_error("Conflict between %s %s in module %s\n",
-										log_id(cell), log_id(wire->driverCell_), log_id(this));
-				}
-				log_assert(wire->driverCell_ == nullptr);
-				wire->driverCell_ = cell;
-				wire->driverPort_ = portname;
-				continue;
-			}
-
-			for (auto &chunk : sig.chunks())
-				if (chunk.wire) outWires.insert(chunk.wire);
-
-			Wire *wire = addWire(NEW_ID, GetSize(sig));
-			sigmap.add(sig, wire);
-			cell->setPort(portname, wire);
-
-			// FIXME: Move init attributes from old 'sig' to new 'wire'
-		}
-
-		for (auto wire : outWires)
-		{
-			SigSpec outsig = wire, insig = sigmap(wire);
-			for (int i = 0; i < GetSize(wire); i++)
-				if (insig[i] == outsig[i])
-					insig[i] = State::Sx;
-			addBuf(NEW_ID, insig, outsig);
-		}
-	}
-}
-
-void RTLIL::Cell::setPort(const RTLIL::IdString& portname, RTLIL::SigSpec signal)
-{
-	auto r = connections_.insert(portname);
-	auto conn_it = r.first;
-	if (!r.second && conn_it->second == signal)
-		return;
-
-	for (auto mon : module->monitors)
-		mon->notify_connect(this, conn_it->first, conn_it->second, signal);
-
-	if (module->design)
-		for (auto mon : module->design->monitors)
-			mon->notify_connect(this, conn_it->first, conn_it->second, signal);
-
-	if (yosys_xtrace) {
-		log("#X# Connect %s.%s.%s = %s (%d)\n", log_id(this->module), log_id(this), log_id(portname), log_signal(signal), GetSize(signal));
-		log_backtrace("-X- ", yosys_xtrace-1);
-	}
-
-	while (module->design && module->design->flagBufferedNormalized && output(portname))
-	{
-		pair<RTLIL::Cell*, RTLIL::IdString> key(this, portname);
-
-		if (conn_it->second.is_wire()) {
-			Wire *w = conn_it->second.as_wire();
-			if (w->driverCell_ == this && w->driverPort_ == portname) {
-				w->driverCell_ = nullptr;
-				w->driverPort_ = IdString();
-			}
-		}
-
-		if (GetSize(signal) == 0) {
-			module->bufNormQueue.erase(key);
-			break;
-		}
-
-		if (!signal.is_wire()) {
-			module->bufNormQueue.insert(key);
-			break;
-		}
-
-		Wire *w = signal.as_wire();
-		if (w->driverCell_ != nullptr) {
-			pair<RTLIL::Cell*, RTLIL::IdString> other_key(w->driverCell_, w->driverPort_);
-			module->bufNormQueue.insert(other_key);
-		}
-		w->driverCell_ = this;
-		w->driverPort_ = portname;
-
-		module->bufNormQueue.erase(key);
-		break;
-	}
-
-	conn_it->second = std::move(signal);
-}
+// bufnorm
 
 const RTLIL::SigSpec &RTLIL::Cell::getPort(const RTLIL::IdString& portname) const
 {
@@ -5638,6 +5471,18 @@ bool RTLIL::SigSpec::has_const() const
 	return false;
 }
 
+bool RTLIL::SigSpec::has_const(State state) const
+{
+	cover("kernel.rtlil.sigspec.has_const");
+
+	pack();
+	for (auto it = chunks_.begin(); it != chunks_.end(); it++)
+		if (it->width > 0 && it->wire == NULL && std::find(it->data.begin(), it->data.end(), state) != it->data.end())
+			return true;
+	return false;
+}
+
+
 bool RTLIL::SigSpec::has_marked_bits() const
 {
 	cover("kernel.rtlil.sigspec.has_marked_bits");
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 15154eb64..096d1dfcf 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1337,6 +1337,7 @@ public:
 	bool is_fully_def() const;
 	bool is_fully_undef() const;
 	bool has_const() const;
+	bool has_const(State state) const;
 	bool has_marked_bits() const;
 	bool is_onehot(int *pos = nullptr) const;
 
@@ -1728,7 +1729,11 @@ public:
 	std::vector<RTLIL::IdString> ports;
 	void fixup_ports();
 
-	pool<pair<RTLIL::Cell*, RTLIL::IdString>> bufNormQueue;
+	pool<RTLIL::Cell *> buf_norm_cell_queue;
+	pool<pair<RTLIL::Cell *, RTLIL::IdString>> buf_norm_cell_port_queue;
+	pool<RTLIL::Wire *> buf_norm_wire_queue;
+	pool<RTLIL::Cell *> pending_deleted_cells;
+	dict<RTLIL::Wire *, pool<RTLIL::Cell *>> buf_norm_connect_index;
 	void bufNormalize();
 
 	template<typename T> void rewrite_sigspecs(T &functor);
diff --git a/kernel/rtlil_bufnorm.cc b/kernel/rtlil_bufnorm.cc
new file mode 100644
index 000000000..6d619d9e6
--- /dev/null
+++ b/kernel/rtlil_bufnorm.cc
@@ -0,0 +1,679 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#include "kernel/yosys.h"
+#include "kernel/sigtools.h"
+#include "kernel/modtools.h"
+
+#include <string.h>
+#include <algorithm>
+#include <optional>
+
+YOSYS_NAMESPACE_BEGIN
+
+
+void RTLIL::Design::bufNormalize(bool enable)
+{
+	if (!enable)
+	{
+		if (!flagBufferedNormalized)
+			return;
+
+		for (auto module : modules()) {
+			module->buf_norm_cell_queue.clear();
+			module->buf_norm_wire_queue.clear();
+			module->buf_norm_cell_port_queue.clear();
+			for (auto wire : module->wires()) {
+				wire->driverCell_ = nullptr;
+				wire->driverPort_ = IdString();
+			}
+		}
+
+		flagBufferedNormalized = false;
+		return;
+	}
+
+	if (!flagBufferedNormalized)
+	{
+		for (auto module : modules())
+		{
+			// When entering buf normalized mode, we need the first module-level bufNormalize
+			// call to know about all drivers, about all module ports (whether represented by
+			// a cell or not) and about all used but undriven wires (whether represented by a
+			// cell or not). We ensure this by enqueing all cell output ports and all wires.
+
+			for (auto cell : module->cells())
+			for (auto &conn : cell->connections()) {
+				if (GetSize(conn.second) == 0 || (cell->port_dir(conn.first) != RTLIL::PD_OUTPUT && cell->port_dir(conn.first) != RTLIL::PD_INOUT))
+					continue;
+				module->buf_norm_cell_queue.insert(cell);
+				module->buf_norm_cell_port_queue.emplace(cell, conn.first);
+			}
+			for (auto wire : module->wires())
+				module->buf_norm_wire_queue.insert(wire);
+
+		}
+
+		flagBufferedNormalized = true;
+	}
+
+	for (auto module : modules())
+		module->bufNormalize();
+}
+
+struct bit_drive_data_t {
+	int drivers = 0;
+	int inout = 0;
+	int users = 0;
+};
+
+typedef ModWalker::PortBit PortBit;
+
+void RTLIL::Module::bufNormalize()
+{
+	// Since this is kernel code, we only log with yosys_xtrace set to not get
+	// in the way when using `debug` to debug specific passes.q
+#define xlog(...) do { if (yosys_xtrace) log("#X [bufnorm] " __VA_ARGS__); } while (0)
+
+	if (!design->flagBufferedNormalized)
+		return;
+
+	if (!buf_norm_cell_queue.empty() || !buf_norm_wire_queue.empty() || !connections_.empty())
+	{
+		// Ensure that every enqueued input port is represented by a cell
+		for (auto wire : buf_norm_wire_queue) {
+			if (wire->port_input && !wire->port_output) {
+				if (wire->driverCell_ != nullptr && wire->driverCell_->type != ID($input_port)) {
+					wire->driverCell_ = nullptr;
+					wire->driverPort_.clear();
+				}
+				if (wire->driverCell_ == nullptr) {
+					Cell *input_port_cell = addCell(NEW_ID, ID($input_port));
+					input_port_cell->setParam(ID::WIDTH, GetSize(wire));
+					input_port_cell->setPort(ID::Y, wire); // this hits the fast path that doesn't mutate the queues
+				}
+			}
+		}
+
+		// Next we will temporarily undo buf normalization locally for
+		// everything enqueued. This means we will turn $buf and $connect back
+		// into connections. When doing this we also need to enqueue the other
+		// end of $buf and $connect cells, so we use a queue and do this until
+		// reaching a fixed point.
+
+		// While doing this, we will also discover all drivers fully connected
+		// to enqueued wires. We keep track of which wires are driven by a
+		// unique and full cell ports (in which case the wire can stay
+		// connected to the port) and which cell ports will need to be
+		// reconnected to a fresh intermediate wire to re-normalize the module.
+
+		idict<Wire *> wire_queue_entries; // Ordered queue of wires to process
+		int wire_queue_pos = 0; // Index up to which we processed the wires
+
+		// Wires with their unique driving cell port. If we know a wire is
+		// driven by multiple (potential) drivers, this is indicated by a
+		// nullptr as cell.
+		dict<Wire *, std::pair<Cell *, IdString>> direct_driven_wires;
+
+		// Set of non-unique or driving cell ports for each processed wire.
+		dict<Wire *, pool<std::pair<Cell *, IdString>>> direct_driven_wires_conflicts;
+
+		// Set of cell ports that need a fresh intermediate wire.
+		pool<std::pair<Cell *, IdString>> pending_ports;
+
+		// This helper will be called for every output/inout cell port that is
+		// already enqueued or becomes reachable when denormalizing $buf or
+		// $connect cells.
+		auto enqueue_cell_port = [&](Cell *cell, IdString port) {
+			xlog("processing cell port %s.%s\n", log_id(cell), log_id(port));
+
+			// An empty cell type means the cell got removed
+			if (cell->type.empty())
+				return;
+
+
+			SigSpec const &sig = cell->getPort(port);
+			if (cell->type == ID($input_port)) {
+				// If an `$input_port` cell isn't fully connected to a full
+				// input port wire, we remove it since the wires are still the
+				// canonical source of module ports and the `$input_port` cells
+				// are just helpers to simplfiy the bufnorm invariant.
+				log_assert(port == ID::Y);
+				if (!sig.is_wire()) {
+					buf_norm_cell_queue.insert(cell);
+					remove(cell);
+					return;
+				}
+
+				Wire *w = sig.as_wire();
+				if (!w->port_input || w->port_output) {
+					buf_norm_cell_queue.insert(cell);
+					remove(cell);
+					return;
+				}
+				w->driverCell_ = cell;
+				w->driverPort_ = ID::Y;
+			} else if (cell->type == ID($buf) && cell->attributes.empty() && !cell->name.isPublic()) {
+				// For a plain `$buf` cell, we enqueue all wires on its input
+				// side, bypass it using module level connections (skipping 'z
+				// bits) and then remove the cell. Eventually the module level
+				// connections will turn back into `$buf` and `$connect` cells,
+				// but since we also need to handle externally added module
+				// level connections, turning everything into connections first
+				// simplifies the logic for doing so.
+
+				// TODO: We could defer removing the $buf cells here, and
+				// re-use them in case we would create a new identical cell
+				// later.
+				log_assert(port == ID::Y);
+				SigSpec sig_a = cell->getPort(ID::A);
+				SigSpec sig_y = sig;
+
+				for (auto const &s : {sig_a, sig})
+					for (auto const &chunk : s.chunks())
+						if (chunk.wire)
+							wire_queue_entries(chunk.wire);
+
+				if (sig_a.has_const(State::Sz)) {
+					SigSpec new_a;
+					SigSpec new_y;
+					for (int i = 0; i < GetSize(sig_a); ++i) {
+						SigBit b = sig_a[i];
+						if (b == State::Sz)
+							continue;
+						new_a.append(b);
+						new_y.append(sig_y[i]);
+					}
+					sig_a = std::move(new_a);
+					sig_y = std::move(new_y);
+				}
+
+				if (!sig_y.empty())
+					connect(sig_y, sig_a);
+				buf_norm_cell_queue.insert(cell);
+				remove(cell);
+				return;
+			}
+
+			// Make sure all wires of the cell port are enqueued, ensuring we
+			// detect other connected drivers (output and inout).
+			for (auto const &chunk : sig.chunks())
+				if (chunk.wire)
+					wire_queue_entries(chunk.wire);
+
+			if (sig.is_wire()) {
+				// If the full cell port is connected to a full wire, we might be
+				// able to keep that connection if this is a unique output port driving that wire
+				Wire *w = sig.as_wire();
+
+				// We try to store the current port as unique driver, if this
+				// succeeds we're done with the port.
+				auto [found, inserted] = direct_driven_wires.emplace(w, {cell, port});
+				if (inserted || (found->second.first == cell && found->second.second == port))
+					return;
+
+				// When this failed, we store this port as a conflict. If we
+				// had already stored a candidate for a unique driver, we also
+				// move it to the conflicts, leaving a nullptr marker.
+
+				auto &conflicts = direct_driven_wires_conflicts[w];
+				if (Cell *other_cell = found->second.first) {
+					if (other_cell->type == ID($input_port)) {
+						// Multiple input port cells
+						log_assert(cell->type != ID($input_port));
+					} else {
+						pending_ports.insert(found->second);
+						conflicts.emplace(found->second);
+						found->second = {nullptr, {}};
+					}
+				}
+				if (cell->type == ID($input_port)) {
+					found->second = {cell, port};
+				} else {
+					conflicts.emplace(cell, port);
+				}
+			}
+
+			// Adds this port to the ports that need a fresh intermediate wire.
+			// For full wires uniquely driven by a full output port, this isn't
+			// reached due to the `return` above.
+			pending_ports.emplace(cell, port);
+		};
+
+		// We process all explicitly enqueued cell ports (clearing the module level queue).
+		for (auto const &[cell, port_name] : buf_norm_cell_port_queue)
+			enqueue_cell_port(cell, port_name);
+		buf_norm_cell_port_queue.clear();
+
+		// And enqueue all wires for `$buf`/`$connect` processing (clearing the module level queue).
+		for (auto wire : buf_norm_wire_queue)
+			wire_queue_entries(wire);
+		buf_norm_wire_queue.clear();
+
+		// We also enqueue all wires that saw newly added module level connections.
+		for (auto &[a, b] : connections_)
+			for (auto &sig : {a, b})
+				for (auto const &chunk : sig.chunks())
+					if (chunk.wire)
+						wire_queue_entries(chunk.wire);
+
+		// We then process all wires by processing known driving cell ports
+		// (previously buf normalized) and following all `$connect` cells (that
+		// have a dedicated module level index while the design is in buf
+		// normalized mode).
+		while (wire_queue_pos < GetSize(wire_queue_entries)) {
+			auto wire = wire_queue_entries[wire_queue_pos++];
+			xlog("processing wire %s\n", log_id(wire));
+
+			if (wire->driverCell_) {
+				Cell *cell = wire->driverCell_;
+				IdString port = wire->driverPort_;
+				enqueue_cell_port(cell, port);
+			}
+
+			while (true) {
+				auto found = buf_norm_connect_index.find(wire);
+				if (found == buf_norm_connect_index.end())
+					break;
+				while (!found->second.empty()) {
+					Cell *connect_cell = *found->second.begin();
+					log_assert(connect_cell->type == ID($connect));
+					SigSpec const &sig_a = connect_cell->getPort(ID::A);
+					SigSpec const &sig_b = connect_cell->getPort(ID::B);
+					xlog("found $connect cell %s: %s <-> %s\n", log_id(connect_cell), log_signal(sig_a), log_signal(sig_b));
+					for (auto &side : {sig_a, sig_b})
+						for (auto chunk : side.chunks())
+							if (chunk.wire)
+								wire_queue_entries(chunk.wire);
+					connect(sig_a, sig_b);
+					buf_norm_cell_queue.insert(connect_cell);
+					remove(connect_cell);
+				}
+			}
+		}
+
+		// At this point we know all cell ports and wires that need to be
+		// re-normalized and know their connectivity is represented by module
+		// level connections.
+
+		// As a first step for re-normalization we add all require intermediate
+		// wires for cell output and inout ports.
+		for (auto &[cell, port] : pending_ports) {
+			SigSpec const &sig = cell->getPort(port);
+			Wire *w = addWire(NEW_ID, GetSize(sig));
+
+			// We update the module level connections, `direct_driven_wires`
+			// and `direct_driven_wires_conflicts` in such a way that they
+			// correspond to what you would get if the intermediate wires had
+			// been in place from the beginning.
+			connect(sig, w);
+			auto port_dir = cell->port_dir(port);
+			if (port_dir == RTLIL::PD_INOUT || port_dir == RTLIL::PD_UNKNOWN) {
+				direct_driven_wires.emplace(w, {nullptr, {}});
+				direct_driven_wires_conflicts[w].emplace(cell, port);
+			} else {
+				direct_driven_wires.emplace(w, {cell, port});
+			}
+
+			cell->setPort(port, w);
+			wire_queue_entries(w);
+		}
+
+		// At this point we're done with creating wires and know which ones are
+		// fully driven by full output ports of existing cells.
+
+		// First we clear the bufnorm data for all processed wires, all of
+		// these will be reassigned later, but we use `driverCell_ == nullptr`
+		// to keep track of the wires that we still have to update.
+		for (auto wire : wire_queue_entries) {
+			wire->driverCell_ = nullptr;
+			wire->driverPort_.clear();
+		}
+
+		// For the unique output cell ports fully connected to a full wire, we
+		// can update the bufnorm data right away. For all other wires we will
+		// have to create new `$buf` cells.
+		for (auto const &[wire, cellport] : direct_driven_wires) {
+			wire->driverCell_ = cellport.first;
+			wire->driverPort_ = cellport.second;
+		}
+
+
+		// To create fresh `$buf` cells for all remaining wires, we need to
+		// process the module level connectivity to figure out what the input
+		// of those `$buf` cells should be and to figure out whether we need
+		// any `$connect` cells to represent bidirectional inout connections
+		// (or driver conflicts).
+
+		if (yosys_xtrace)
+			for (auto const &[lhs, rhs] : connections_)
+				xlog("connection %s <-> %s\n", log_signal(lhs), log_signal(rhs));
+
+
+		// We transfer the connectivity into a sigmap and then clear the module
+		// level connections. This forgets about the structure of module level
+		// connections, but bufnorm only guarantees that the connectivity as
+		// maintained by a `SigMap` is preserved.
+		SigMap sigmap(this);
+		new_connections({});
+
+		pool<SigBit> conflicted;
+		pool<SigBit> driven;
+
+		// We iterate over all direct driven wires and try to make that wire's
+		// sigbits the representative sigbit for the net. We do a second pass
+		// to detect conflicts to then remove the conflicts from `driven`.
+		for (bool check : {false, true}) {
+			for (auto const &[wire, cellport] : direct_driven_wires) {
+				if (cellport.first == nullptr)
+					continue;
+				auto const &[cell, port] = cellport;
+
+				SigSpec z_mask;
+				if (cell->type == ID($buf))
+					z_mask = cell->getPort(ID::A);
+
+				for (int i = 0; i != GetSize(wire); ++i) {
+					SigBit driver = SigBit(wire, i);
+					if (!z_mask.empty() && z_mask[i] == State::Sz)
+						continue;
+					if (check) {
+						SigBit repr = sigmap(driver);
+						if (repr != driver)
+							conflicted.insert(repr);
+						else
+							driven.insert(repr);
+					} else {
+						sigmap.database.promote(driver);
+					}
+				}
+			}
+		}
+
+		// Ensure that module level inout ports are directly driven or
+		// connected using `$connect` cells and never `$buf`fered.
+		for (auto wire : wire_queue_entries) {
+			if (!wire->port_input || !wire->port_output)
+				continue;
+			for (int i = 0; i != GetSize(wire); ++i) {
+				SigBit driver = SigBit(wire, i);
+				SigBit repr = sigmap(driver);
+				if (driver != repr)
+					driven.erase(repr);
+			}
+		}
+
+		for (auto &bit : conflicted)
+			driven.erase(bit);
+
+		// Module level bitwise connections not representable by `$buf` cells
+		pool<pair<SigBit, SigBit>> undirected_connections;
+
+		// Starts out empty but is updated with the connectivity realized by freshly added `$buf` cells
+		SigMap buf_connected;
+
+		// For every enqueued wire, we compute a SigSpec of representative
+		// drivers. If there are any bits without a unique driver we represent
+		// that with `Sz`. If there are multiple drivers for a net, they become
+		// connected via `$connect` cells but every wire of the net has the
+		// corresponding bit still driven by a buffered `Sz`.
+		for (auto wire : wire_queue_entries) {
+			SigSpec wire_drivers;
+			for (int i = 0; i < GetSize(wire); ++i) {
+				SigBit bit(wire, i);
+				SigBit mapped = sigmap(bit);
+				xlog("bit %s -> mapped %s\n", log_signal(bit), log_signal(mapped));
+
+
+				buf_connected.apply(bit);
+				buf_connected.add(bit, mapped);
+				buf_connected.database.promote(mapped);
+
+				if (wire->driverCell_ == nullptr) {
+					if (!mapped.is_wire() || driven.count(mapped)) {
+						wire_drivers.append(mapped);
+						continue;
+					} else {
+						wire_drivers.append(State::Sz);
+					}
+				}
+
+				if (bit < mapped)
+					undirected_connections.emplace(bit, mapped);
+				else if (mapped < bit)
+					undirected_connections.emplace(mapped, bit);
+			}
+
+			if (wire->driverCell_ == nullptr) {
+				xlog("wire %s drivers %s\n", log_id(wire), log_signal(wire_drivers));
+				addBuf(NEW_ID, wire_drivers, wire);
+			}
+		}
+
+		// Finally we group the bitwise connections to emit word-level $connect cells
+
+		static auto sort_key = [](std::pair<SigBit, SigBit> const &p) {
+			int first_offset = p.first.is_wire() ? p.first.offset : 0;
+			int second_offset = p.second.is_wire() ? p.second.offset : 0;
+			return std::make_tuple(p.first.wire, p.second.wire, first_offset - second_offset, p);
+		};
+
+		undirected_connections.sort([](std::pair<SigBit, SigBit> const &p, std::pair<SigBit, SigBit> const &q) {
+			return sort_key(p) < sort_key(q);
+		});
+
+		SigSpec tmp_a, tmp_b;
+
+		for (auto &[bit_a, bit_b] : undirected_connections) {
+			tmp_a.append(bit_a);
+			tmp_b.append(bit_b);
+		}
+
+		xlog("LHS: %s\n", log_signal(tmp_a));
+		xlog("RHS: %s\n", log_signal(tmp_b));
+
+
+		SigSpec sig_a, sig_b;
+		SigBit next_a, next_b;
+
+		auto emit_connect_cell = [&]() {
+			if (sig_a.empty())
+				return;
+			xlog("connect %s <-> %s\n", log_signal(sig_a), log_signal(sig_b));
+			Cell *connect_cell = addCell(NEW_ID, ID($connect));
+			connect_cell->setParam(ID::WIDTH, GetSize(sig_a));
+			connect_cell->setPort(ID::A, sig_a);
+			connect_cell->setPort(ID::B, sig_b);
+			sig_a = SigSpec();
+			sig_b = SigSpec();
+		};
+
+		for (auto &[bit_a, bit_b] : undirected_connections) {
+			if (bit_a == bit_b)
+				continue;
+			if (bit_a != next_a || bit_b != next_b)
+				emit_connect_cell();
+
+			sig_a.append(bit_a);
+			sig_b.append(bit_b);
+			next_a = bit_a;
+			next_b = bit_b;
+			if (next_a.is_wire())
+				next_a.offset++;
+			if (next_b.is_wire())
+				next_b.offset++;
+
+		}
+		emit_connect_cell();
+
+		buf_norm_cell_queue.clear();
+
+		log_assert(buf_norm_cell_port_queue.empty());
+		log_assert(buf_norm_wire_queue.empty());
+		log_assert(connections_.empty());
+	}
+
+	for (auto cell : pending_deleted_cells) {
+		delete cell;
+	}
+	pending_deleted_cells.clear();
+}
+
+void RTLIL::Cell::unsetPort(const RTLIL::IdString& portname)
+{
+	RTLIL::SigSpec signal;
+	auto conn_it = connections_.find(portname);
+
+	if (conn_it != connections_.end())
+	{
+		for (auto mon : module->monitors)
+			mon->notify_connect(this, conn_it->first, conn_it->second, signal);
+
+		if (module->design)
+			for (auto mon : module->design->monitors)
+				mon->notify_connect(this, conn_it->first, conn_it->second, signal);
+
+		if (yosys_xtrace) {
+			log("#X# Unconnect %s.%s.%s\n", log_id(this->module), log_id(this), log_id(portname));
+			log_backtrace("-X- ", yosys_xtrace-1);
+		}
+
+		if (module->design && module->design->flagBufferedNormalized) {
+			if (conn_it->second.is_wire()) {
+				Wire *w = conn_it->second.as_wire();
+				if (w->driverCell_ == this && w->driverPort_ == portname) {
+					w->driverCell_ = nullptr;
+					w->driverPort_ = IdString();
+					module->buf_norm_wire_queue.insert(w);
+				}
+			}
+
+			if (type == ID($connect)) {
+				for (auto &[port, sig] : connections_) {
+					for (auto &chunk : sig.chunks()) {
+						if (!chunk.wire)
+							continue;
+						auto it = module->buf_norm_connect_index.find(chunk.wire);
+						if (it == module->buf_norm_connect_index.end())
+							continue;
+						it->second.erase(this);
+						if (it->second.empty())
+							module->buf_norm_connect_index.erase(it);
+					}
+				}
+				connections_.erase(conn_it);
+				for (auto &[port, sig] : connections_) {
+					for (auto &chunk : sig.chunks()) {
+						if (!chunk.wire)
+							continue;
+						module->buf_norm_connect_index[chunk.wire].insert(this);
+					}
+				}
+				return;
+			}
+		}
+
+		connections_.erase(conn_it);
+	}
+}
+
+void RTLIL::Cell::setPort(const RTLIL::IdString& portname, RTLIL::SigSpec signal)
+{
+	auto r = connections_.insert(portname);
+	auto conn_it = r.first;
+	if (!r.second && conn_it->second == signal)
+		return;
+
+	for (auto mon : module->monitors)
+		mon->notify_connect(this, conn_it->first, conn_it->second, signal);
+
+	if (module->design)
+		for (auto mon : module->design->monitors)
+			mon->notify_connect(this, conn_it->first, conn_it->second, signal);
+
+	if (yosys_xtrace) {
+		log("#X# Connect %s.%s.%s = %s (%d)\n", log_id(this->module), log_id(this), log_id(portname), log_signal(signal), GetSize(signal));
+		log_backtrace("-X- ", yosys_xtrace-1);
+	}
+
+	if (module->design && module->design->flagBufferedNormalized)
+	{
+		// We eagerly clear a driver that got disconnected by changing this port connection
+		if (conn_it->second.is_wire()) {
+			Wire *w = conn_it->second.as_wire();
+			if (w->driverCell_ == this && w->driverPort_ == portname) {
+				w->driverCell_ = nullptr;
+				w->driverPort_ = IdString();
+				module->buf_norm_wire_queue.insert(w);
+			}
+		}
+
+		auto dir = port_dir(portname);
+		// This is a fast path that handles connecting a full driverless wire to an output port,
+		// everything else is goes through the bufnorm queues and is handled during the next
+		// bufNormalize call
+		if ((dir == RTLIL::PD_OUTPUT || dir == RTLIL::PD_INOUT) && signal.is_wire()) {
+			Wire *w = signal.as_wire();
+			if (w->driverCell_ == nullptr) {
+				w->driverCell_ = this;
+				w->driverPort_ = portname;
+
+				conn_it->second = std::move(signal);
+				return;
+			}
+		}
+
+		if (dir == RTLIL::PD_OUTPUT || dir == RTLIL::PD_INOUT) {
+			module->buf_norm_cell_queue.insert(this);
+			module->buf_norm_cell_port_queue.emplace(this, portname);
+		} else {
+			for (auto &chunk : signal.chunks())
+				if (chunk.wire != nullptr && chunk.wire->driverCell_ == nullptr)
+					module->buf_norm_wire_queue.insert(chunk.wire);
+		}
+
+		if (type == ID($connect)) {
+			for (auto &[port, sig] : connections_) {
+				for (auto &chunk : sig.chunks()) {
+					if (!chunk.wire)
+						continue;
+					auto it = module->buf_norm_connect_index.find(chunk.wire);
+					if (it == module->buf_norm_connect_index.end())
+						continue;
+					it->second.erase(this);
+					if (it->second.empty())
+						module->buf_norm_connect_index.erase(it);
+				}
+			}
+			conn_it->second = std::move(signal);
+			for (auto &[port, sig] : connections_) {
+				for (auto &chunk : sig.chunks()) {
+					if (!chunk.wire)
+						continue;
+					module->buf_norm_connect_index[chunk.wire].insert(this);
+				}
+			}
+			return;
+		}
+	}
+	conn_it->second = std::move(signal);
+
+}
+
+YOSYS_NAMESPACE_END
diff --git a/tests/various/aiger2.ys b/tests/various/aiger2.ys
index d2b024d2f..6f6958141 100644
--- a/tests/various/aiger2.ys
+++ b/tests/various/aiger2.ys
@@ -157,6 +157,7 @@ splitnets -ports
 copy test gold
 flatten gold
 techmap submodule1
+opt_clean
 select test
 write_aiger2 -flatten aiger2_ops.aig
 select -clear
@@ -216,6 +217,7 @@ prep -top top
 techmap t:$add
 
 splitnets -ports top
+opt_clean
 write_aiger2 -flatten aiger2_flatten.aig
 flatten
 rename top gold

From 5f79a6e868118bb9f91a3d72f23621a5b1f40f90 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Wed, 3 Sep 2025 15:36:42 +0200
Subject: [PATCH 576/931] Clean up $buf with 'z inputs, $input_port and
 $connect cells

This ensures that entering and leaving bufnorm followed by `opt_clean`
is equivalent to just running `opt_clean`.

Also make sure that 'z-$buf cells get techmapped in a compatible way.
---
 passes/opt/opt_clean.cc     | 29 +++++++++++++++++++++++++++--
 passes/techmap/simplemap.cc | 17 ++++++++++++++++-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/passes/opt/opt_clean.cc b/passes/opt/opt_clean.cc
index d9bd4c027..a254dc915 100644
--- a/passes/opt/opt_clean.cc
+++ b/passes/opt/opt_clean.cc
@@ -600,15 +600,40 @@ void rmunused_module(RTLIL::Module *module, bool purge_mode, bool verbose, bool
 		log("Finding unused cells or wires in module %s..\n", module->name);
 
 	std::vector<RTLIL::Cell*> delcells;
-	for (auto cell : module->cells())
+	for (auto cell : module->cells()) {
 		if (cell->type.in(ID($pos), ID($_BUF_), ID($buf)) && !cell->has_keep_attr()) {
 			bool is_signed = cell->type == ID($pos) && cell->getParam(ID::A_SIGNED).as_bool();
 			RTLIL::SigSpec a = cell->getPort(ID::A);
 			RTLIL::SigSpec y = cell->getPort(ID::Y);
 			a.extend_u0(GetSize(y), is_signed);
-			module->connect(y, a);
+
+			if (a.has_const(State::Sz)) {
+				SigSpec new_a;
+				SigSpec new_y;
+				for (int i = 0; i < GetSize(a); ++i) {
+					SigBit b = a[i];
+					if (b == State::Sz)
+						continue;
+					new_a.append(b);
+					new_y.append(y[i]);
+				}
+				a = std::move(new_a);
+				y = std::move(new_y);
+			}
+			if (!y.empty())
+				module->connect(y, a);
+			delcells.push_back(cell);
+		} else if (cell->type.in(ID($connect)) && !cell->has_keep_attr()) {
+			RTLIL::SigSpec a = cell->getPort(ID::A);
+			RTLIL::SigSpec b = cell->getPort(ID::B);
+			if (a.has_const() && !b.has_const())
+				std::swap(a, b);
+			module->connect(a, b);
+			delcells.push_back(cell);
+		} else if (cell->type.in(ID($input_port)) && !cell->has_keep_attr()) {
 			delcells.push_back(cell);
 		}
+	}
 	for (auto cell : delcells) {
 		if (verbose)
 			log_debug("  removing buffer cell `%s': %s = %s\n", cell->name.c_str(),
diff --git a/passes/techmap/simplemap.cc b/passes/techmap/simplemap.cc
index b23985770..ddfd7e03e 100644
--- a/passes/techmap/simplemap.cc
+++ b/passes/techmap/simplemap.cc
@@ -47,7 +47,22 @@ void simplemap_buf(RTLIL::Module *module, RTLIL::Cell *cell)
 	RTLIL::SigSpec sig_a = cell->getPort(ID::A);
 	RTLIL::SigSpec sig_y = cell->getPort(ID::Y);
 
-	module->connect(RTLIL::SigSig(sig_y, sig_a));
+	if (sig_a.has_const(State::Sz)) {
+		SigSpec new_a;
+		SigSpec new_y;
+		for (int i = 0; i < GetSize(sig_a); ++i) {
+			SigBit b = sig_a[i];
+			if (b == State::Sz)
+				continue;
+			new_a.append(b);
+			new_y.append(sig_y[i]);
+		}
+		sig_a = std::move(new_a);
+		sig_y = std::move(new_y);
+	}
+
+	if (!sig_y.empty())
+		module->connect(RTLIL::SigSig(sig_y, sig_a));
 }
 
 void simplemap_pos(RTLIL::Module *module, RTLIL::Cell *cell)

From 4918f37be3787045709ce9bd68bcaf25417632e1 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 16 Sep 2025 14:01:15 +0200
Subject: [PATCH 577/931] write_aiger2: Treat inout ports as output ports

With the previous bufnorm implementation inout ports were not supported
at all, so this didn't matter, but with the new bufnorm implementation
they need to be treated as output ports.
---
 backends/aiger2/aiger.cc | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/backends/aiger2/aiger.cc b/backends/aiger2/aiger.cc
index 956e9c43a..fad73ba9b 100644
--- a/backends/aiger2/aiger.cc
+++ b/backends/aiger2/aiger.cc
@@ -566,7 +566,7 @@ struct Index {
 		}
 
 		Lit ret;
-		if (!bit.wire->port_input) {
+		if (!bit.wire->port_input || bit.wire->port_output) {
 			// an output of a cell
 			Cell *driver = bit.wire->driverCell();
 
@@ -618,7 +618,7 @@ struct Index {
 
 		if (!cursor) {
 			log_assert(bit.wire->module == top);
-			log_assert(bit.wire->port_input);
+			log_assert(bit.wire->port_input && !bit.wire->port_output);
 			return lits[top_minfo->windices[bit.wire] + bit.offset];
 		} else {
 			log_assert(bit.wire->module == cursor->leaf_module(*this));
@@ -723,7 +723,7 @@ struct AigerWriter : Index<AigerWriter, unsigned int, 0, 1> {
 		for (auto id : top->ports) {
 		Wire *w = top->wire(id);
 		log_assert(w);
-		if (w->port_input)
+		if (w->port_input && !w->port_output)
 		for (int i = 0; i < w->width; i++) {
 			pi_literal(SigBit(w, i)) = lit_counter;
 			inputs.push_back(SigBit(w, i));
@@ -828,7 +828,7 @@ struct XAigerAnalysis : Index<XAigerAnalysis, int, 0, 0> {
 	{
 		log_assert(cursor.is_top()); // TOOD: fix analyzer to work with hierarchy
 
-		if (bit.wire->port_input)
+		if (bit.wire->port_input && !bit.wire->port_output)
 			return false;
 
 		Cell *driver = bit.wire->driverCell();
@@ -838,7 +838,7 @@ struct XAigerAnalysis : Index<XAigerAnalysis, int, 0, 0> {
 
 		int max = 1;
 		for (auto wire : mod->wires())
-		if (wire->port_input)
+		if (wire->port_input && !wire->port_output)
 		for (int i = 0; i < wire->width; i++) {
 			int ilevel = visit(cursor, driver->getPort(wire->name)[i]);
 			max = std::max(max, ilevel + 1);
@@ -858,7 +858,7 @@ struct XAigerAnalysis : Index<XAigerAnalysis, int, 0, 0> {
 		for (auto id : top->ports) {
 			Wire *w = top->wire(id);
 			log_assert(w);
-			if (w->port_input)
+			if (w->port_input && !w->port_output)
 			for (int i = 0; i < w->width; i++)
 				pi_literal(SigBit(w, i)) = 0;
 		}
@@ -868,7 +868,7 @@ struct XAigerAnalysis : Index<XAigerAnalysis, int, 0, 0> {
 			Module *def = design->module(box->type);
 			if (!(def && def->has_attribute(ID::abc9_box_id)))
 			for (auto &conn : box->connections_)
-			if (box->output(conn.first))
+			if (box->port_dir(conn.first) != RTLIL::PD_INPUT)
 			for (auto bit : conn.second)
 				pi_literal(bit, &cursor) = 0;
 		}
@@ -883,7 +883,7 @@ struct XAigerAnalysis : Index<XAigerAnalysis, int, 0, 0> {
 			Module *def = design->module(box->type);
 			if (!(def && def->has_attribute(ID::abc9_box_id)))
 			for (auto &conn : box->connections_)
-			if (box->input(conn.first))
+			if (box->port_dir(conn.first) == RTLIL::PD_INPUT)
 			for (auto bit : conn.second)
 				(void) eval_po(bit);
 		}
@@ -950,12 +950,7 @@ struct XAigerWriter : AigerWriter {
 	void append_opaque_box_ports(Cell *box, HierCursor &cursor, bool inputs)
 	{
 		for (auto &conn : box->connections_) {
-			bool is_input = box->input(conn.first);
-			bool is_output = box->output(conn.first);
-
-			if (!(is_input || is_output) || (is_input && is_output))
-				log_error("Ambiguous port direction on %s/%s\n",
-						  log_id(box->type), log_id(conn.first));
+			bool is_input = box->port_dir(conn.first) == RTLIL::PD_INPUT;
 
 			if (is_input && inputs) {
 				int bitp = 0;
@@ -980,10 +975,10 @@ struct XAigerWriter : AigerWriter {
 
 					bitp++;
 				}
-			} else if (is_output && !inputs) { 
+			} else if (!is_input && !inputs) {
 				for (auto &bit : conn.second) {
-					if (!bit.wire || bit.wire->port_input)
-						log_error("Bad connection");
+					if (!bit.wire || (bit.wire->port_input && !bit.wire->port_output))
+						log_error("Bad connection %s/%s ~ %s\n", log_id(box), log_id(conn.first), log_signal(conn.second));
 
 
 					ensure_pi(bit, cursor);
@@ -1119,7 +1114,7 @@ struct XAigerWriter : AigerWriter {
 						holes_pi_idx++;
 					}
 					holes_wb->setPort(port_id, in_conn);
-				} else if (port->port_output && !port->port_input) {
+				} else if (port->port_output) {
 					// primary
 					for (int i = 0; i < port->width; i++) {
 						SigBit bit;
@@ -1172,7 +1167,7 @@ struct XAigerWriter : AigerWriter {
 				log_assert(port);
 				if (port->port_input && !port->port_output) {
 					box_co_num += port->width;
-				} else if (port->port_output && !port->port_input) {
+				} else if (port->port_output) {
 					box_ci_num += port->width;
 				} else {
 					log_abort();
@@ -1195,7 +1190,7 @@ struct XAigerWriter : AigerWriter {
 		reset_counters();
 
 		for (auto w : top->wires())
-		if (w->port_input)
+		if (w->port_input && !w->port_output)
 		for (int i = 0; i < w->width; i++)
 			ensure_pi(SigBit(w, i));
 

From 47b3ee8c8bafb5e1fc8f884b28eaf474e0a8ae8b Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 16 Sep 2025 14:02:32 +0200
Subject: [PATCH 578/931] write_aiger2: Ignore the $input_port cell during
 indexing.

The $input_port cell is added by the bufnorm code to simplify handling
of input ports for new code that uses bufnorm, but the aiger2 backend
does already handle input ports separately, so we just ignore those.
---
 backends/aiger2/aiger.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backends/aiger2/aiger.cc b/backends/aiger2/aiger.cc
index fad73ba9b..05714bc2e 100644
--- a/backends/aiger2/aiger.cc
+++ b/backends/aiger2/aiger.cc
@@ -91,7 +91,7 @@ struct Index {
 		int pos = index_wires(info, m);
 
 		for (auto cell : m->cells()) {
-			if (cell->type.in(KNOWN_OPS) || cell->type.in(ID($scopeinfo), ID($specify2), ID($specify3)))
+			if (cell->type.in(KNOWN_OPS) || cell->type.in(ID($scopeinfo), ID($specify2), ID($specify3), ID($input_port)))
 				continue;
 
 			Module *submodule = m->design->module(cell->type);

From 4f239b536bafd8f358c9b08600f1146bcb6f6120 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 16 Sep 2025 13:40:12 +0200
Subject: [PATCH 579/931] abc_new: Hide buffered 'z drivers from
 read/write_xaiger2

With the updated bufnorm code, buffered 'z drivers are used as anchor
points for undirected connections. These are currently not supported by
read/write_xaiger2, so we temporarily replace those by roughly
equivalent $tribuf cells which will be handled as blackboxes that
properly roundtrip through the xaiger2 front and backend.
---
 passes/techmap/abc9_ops.cc | 82 +++++++++++++++++++++++++++++++++++++-
 passes/techmap/abc_new.cc  |  2 +
 2 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index 9a9f7dcb5..ecba519bf 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -1566,6 +1566,70 @@ clone_lut:
 	design->remove(mapped_mod);
 }
 
+
+static void replace_zbufs(Design *design)
+{
+	design->bufNormalize(true);
+	std::vector<Cell *> zbufs;
+
+	for (auto mod : design->modules()) {
+		zbufs.clear();
+		for (auto cell : mod->cells()) {
+			if (cell->type != ID($buf))
+				continue;
+			auto &sig = cell->getPort(ID::A);
+			for (int i = 0; i < GetSize(sig); ++i) {
+				if (sig[i] == State::Sz) {
+					zbufs.push_back(cell);
+					break;
+				}
+			}
+		}
+
+		for (auto cell : zbufs) {
+			auto sig = cell->getPort(ID::A);
+			for (int i = 0; i < GetSize(sig); ++i) {
+				if (sig[i] == State::Sz) {
+					Wire *w = mod->addWire(NEW_ID);
+					Cell *ud = mod->addCell(NEW_ID, ID($tribuf));
+					ud->set_bool_attribute(ID(aiger2_zbuf));
+					ud->setParam(ID::WIDTH, 1);
+					ud->setPort(ID::Y, w);
+					ud->setPort(ID::EN, State::S0);
+					ud->setPort(ID::A, State::S0);
+					sig[i] = w;
+				}
+			}
+			log("XXX %s -> %s\n", log_signal(cell->getPort(ID::A)), log_signal(sig));
+			cell->setPort(ID::A, sig);
+		}
+
+		mod->bufNormalize();
+	}
+}
+
+
+
+static void restore_zbufs(Design *design)
+{
+	std::vector<Cell *> to_remove;
+
+	for (auto mod : design->modules()) {
+		to_remove.clear();
+		for (auto cell : mod->cells())
+			if (cell->type == ID($tribuf) && cell->has_attribute(ID(aiger2_zbuf)))
+				to_remove.push_back(cell);
+
+		for (auto cell : to_remove) {
+			SigSpec sig_y = cell->getPort(ID::Y);
+			mod->addBuf(NEW_ID, Const(State::Sz, GetSize(sig_y)), sig_y);
+			mod->remove(cell);
+		}
+		mod->bufNormalize();
+	}
+}
+
+
 struct Abc9OpsPass : public Pass {
 	Abc9OpsPass() : Pass("abc9_ops", "helper functions for ABC9") { }
 	void help() override
@@ -1668,6 +1732,8 @@ struct Abc9OpsPass : public Pass {
 		bool prep_lut_mode = false;
 		bool prep_box_mode = false;
 		bool reintegrate_mode = false;
+		bool replace_zbufs_mode = false;
+		bool restore_zbufs_mode = false;
 		bool dff_mode = false;
 		std::string write_lut_dst;
 		int maxlut = 0;
@@ -1754,16 +1820,30 @@ struct Abc9OpsPass : public Pass {
 				dff_mode = true;
 				continue;
 			}
+			if (arg == "-replace_zbufs") {
+				replace_zbufs_mode = true;
+				valid = true;
+				continue;
+			}
+			if (arg == "-restore_zbufs") {
+				restore_zbufs_mode = true;
+				valid = true;
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
 
 		if (!valid)
-			log_cmd_error("At least one of -check, -break_scc, -prep_{delays,xaiger,dff[123],lut,box}, -write_{lut,box}, -reintegrate must be specified.\n");
+			log_cmd_error("At least one of -check, -break_scc, -prep_{delays,xaiger,dff[123],lut,box}, -write_{lut,box}, -reintegrate, -{replace,restore}_zbufs must be specified.\n");
 
 		if (dff_mode && !check_mode && !prep_hier_mode && !prep_delays_mode && !prep_xaiger_mode && !reintegrate_mode)
 			log_cmd_error("'-dff' option is only relevant for -prep_{hier,delay,xaiger} or -reintegrate.\n");
 
+		if (replace_zbufs_mode)
+			replace_zbufs(design);
+		if (restore_zbufs_mode)
+			restore_zbufs(design);
 		if (check_mode)
 			check(design, dff_mode);
 		if (prep_hier_mode)
diff --git a/passes/techmap/abc_new.cc b/passes/techmap/abc_new.cc
index 286ab4d5b..c48295916 100644
--- a/passes/techmap/abc_new.cc
+++ b/passes/techmap/abc_new.cc
@@ -169,10 +169,12 @@ struct AbcNewPass : public ScriptPass {
 				}
 
 				run(stringf("  abc9_ops -write_box %s/input.box", tmpdir));
+				run("  abc9_ops -replace_zbufs");
 				run(stringf("  write_xaiger2 -mapping_prep -map2 %s/input.map2 %s/input.xaig", tmpdir, tmpdir));
 				run(stringf("  abc9_exe %s -cwd %s -box %s/input.box", exe_options, tmpdir, tmpdir));
 				run(stringf("  read_xaiger2 -sc_mapping -module_name %s -map2 %s/input.map2 %s/output.aig",
 							modname.c_str(), tmpdir.c_str(), tmpdir.c_str()));
+				run("  abc9_ops -restore_zbufs");
 
 				if (!help_mode && mod->has_attribute(ID(abc9_script))) {
 					if (script_save.empty())

From 79e05a195db710f52778ee38f45ed338d14f691e Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 16 Sep 2025 15:49:36 +0200
Subject: [PATCH 580/931] verilog: Bufnorm cell backend and frontend support

This makes the Verilog backend handle the $connect and $input_port
cells. This represents the undirected $connect cell using the `tran`
primitive, so we also extend the frontend to support this.
---
 backends/verilog/verilog_backend.cc | 50 +++++++++++++++++++++++++++++
 frontends/ast/simplify.cc           | 26 ++++++++++-----
 frontends/verilog/verilog_lexer.l   |  2 +-
 3 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index aea29f710..c747aa901 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -1099,6 +1099,33 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 	}
 
 	if (cell->type.in(ID($_BUF_), ID($buf))) {
+		if (cell->type == ID($buf) && cell->getPort(ID::A).has_const(State::Sz)) {
+			RTLIL::SigSpec a = cell->getPort(ID::A);
+			RTLIL::SigSpec y = cell->getPort(ID::Y);
+			a.extend_u0(GetSize(y));
+
+			if (a.has_const(State::Sz)) {
+				SigSpec new_a;
+				SigSpec new_y;
+				for (int i = 0; i < GetSize(a); ++i) {
+					SigBit b = a[i];
+					if (b == State::Sz)
+						continue;
+					new_a.append(b);
+					new_y.append(y[i]);
+				}
+				a = std::move(new_a);
+				y = std::move(new_y);
+			}
+			if (!y.empty()) {
+				f << stringf("%s" "assign ", indent);
+				dump_sigspec(f, y);
+				f << stringf(" = ");
+				dump_sigspec(f, a);
+				f << stringf(";\n");
+			}
+			return true;
+		}
 		f << stringf("%s" "assign ", indent);
 		dump_sigspec(f, cell->getPort(ID::Y));
 		f << stringf(" = ");
@@ -1498,6 +1525,29 @@ bool dump_cell_expr(std::ostream &f, std::string indent, RTLIL::Cell *cell)
 		return true;
 	}
 
+	if (cell->type == ID($input_port))
+		return true;
+
+	if (cell->type == ID($connect))
+	{
+		int width = cell->getParam(ID::WIDTH).as_int() ;
+		if (width == 1) {
+			f << stringf("%s" "tran(", indent);
+			dump_sigspec(f, cell->getPort(ID::A));
+			f << stringf(", ");
+			dump_sigspec(f, cell->getPort(ID::B));
+			f << stringf(");\n");
+		} else {
+			auto tran_id = next_auto_id();
+			f << stringf("%s" "tran %s[%d:0](", indent, tran_id, width - 1);
+			dump_sigspec(f, cell->getPort(ID::A));
+			f << stringf(", ");
+			dump_sigspec(f, cell->getPort(ID::B));
+			f << stringf(");\n");
+		}
+		return true;
+	}
+
 	if (cell->is_builtin_ff())
 	{
 		FfData ff(nullptr, cell);
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index cf9d7443e..81018e137 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -2756,19 +2756,24 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		newNode = std::make_unique<AstNode>(location, AST_GENBLOCK);
 		int num = max(children.at(0)->range_left, children.at(0)->range_right) - min(children.at(0)->range_left, children.at(0)->range_right) + 1;
 
+		if (this->children.at(1)->type == AST_PRIMITIVE) {
+			// Move the range to the AST_PRIMITIVE node and replace this with the AST_PRIMITIVE node handled below
+			newNode = std::move(this->children.at(1));
+			newNode->range_left = this->children.at(0)->range_left;
+			newNode->range_right = this->children.at(0)->range_right;
+			newNode->range_valid = true;
+			goto apply_newNode;
+		}
+
 		for (int i = 0; i < num; i++) {
 			int idx = children.at(0)->range_left > children.at(0)->range_right ? children.at(0)->range_right + i : children.at(0)->range_right - i;
 			auto new_cell_owned = children.at(1)->clone();
 			auto* new_cell = new_cell_owned.get();
 			newNode->children.push_back(std::move(new_cell_owned));
 			new_cell->str += stringf("[%d]", idx);
-			if (new_cell->type == AST_PRIMITIVE) {
-				input_error("Cell arrays of primitives are currently not supported.\n");
-			} else {
-				this->dumpAst(NULL, "    ");
-				log_assert(new_cell->children.at(0)->type == AST_CELLTYPE);
-				new_cell->children.at(0)->str = stringf("$array:%d:%d:%s", i, num, new_cell->children.at(0)->str);
-			}
+
+			log_assert(new_cell->children.at(0)->type == AST_CELLTYPE);
+			new_cell->children.at(0)->str = stringf("$array:%d:%d:%s", i, num, new_cell->children.at(0)->str);
 		}
 
 		goto apply_newNode;
@@ -2789,6 +2794,11 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 		}
 		children.clear();
 
+		// TODO handle bit-widths of primitives and support cell arrays for more primitives
+
+		if (range_valid && str != "tran")
+			input_error("Cell arrays of primitives are currently not supported.\n");
+
 		if (str == "bufif0" || str == "bufif1" || str == "notif0" || str == "notif1")
 		{
 			if (children_list.size() != 3)
@@ -2817,7 +2827,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			fixup_hierarchy_flags();
 			did_something = true;
 		}
-		else if (str == "buf" || str == "not")
+		else if (str == "buf" || str == "not" || str == "tran")
 		{
 			auto& input = children_list.back();
 			if (str == "not")
diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l
index c6d2ed992..62a7f7bbb 100644
--- a/frontends/verilog/verilog_lexer.l
+++ b/frontends/verilog/verilog_lexer.l
@@ -493,7 +493,7 @@ TIME_SCALE_SUFFIX [munpf]?s
 
 \"{3}(\"{0,2}([^\\"]|\\.|\\\n))*\"{3}	{ return process_str(yytext + 3, yyleng - 6, true, out_loc); }
 
-and|nand|or|nor|xor|xnor|not|buf|bufif0|bufif1|notif0|notif1 {
+and|nand|or|nor|xor|xnor|not|buf|bufif0|bufif1|notif0|notif1|tran {
 	auto val = std::make_unique<std::string>(YYText());
 	return parser::make_TOK_PRIMITIVE(std::move(val), out_loc);
 }

From 5b099abda4e05af0830d840ee6bd144ec6047b78 Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Wed, 17 Sep 2025 16:02:04 +0100
Subject: [PATCH 581/931] help: fix memory leak for -dump-cells-json

---
 kernel/register.cc | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/kernel/register.cc b/kernel/register.cc
index 9436b540a..bd12dcc38 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -956,13 +956,7 @@ struct HelpPass : public Pass {
 			auto name = it.first.str();
 			if (cell_help_messages.contains(name)) {
 				auto cell_help = cell_help_messages.get(name);
-				if (groups.count(cell_help.group) != 0) {
-					auto group_cells = &groups.at(cell_help.group);
-					group_cells->push_back(name);
-				} else {
-					auto group_cells = new vector<string>(1, name);
-					groups.emplace(cell_help.group, *group_cells);
-				}
+				groups[cell_help.group].emplace_back(name);
 				auto cell_pair = pair<SimHelper, CellType>(cell_help, it.second);
 				cells.emplace(name, cell_pair);
 			} else {

From a686c5a73c71c238ce5ac25baac84af10932a997 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 18 Sep 2025 00:22:24 +0000
Subject: [PATCH 582/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3e0849c09..1a5ecf35b 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+125
+YOSYS_VER := 0.57+148
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 96f87aa2d43aab7c21293cbc32c2699ca0a36276 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 18 Sep 2025 12:59:12 +0200
Subject: [PATCH 583/931] simplemap: fix src attribute transfer

---
 passes/techmap/simplemap.cc | 44 +++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/passes/techmap/simplemap.cc b/passes/techmap/simplemap.cc
index ddfd7e03e..86ff5c149 100644
--- a/passes/techmap/simplemap.cc
+++ b/passes/techmap/simplemap.cc
@@ -18,6 +18,7 @@
  */
 
 #include "simplemap.h"
+#include "backends/rtlil/rtlil_backend.h"
 #include "kernel/sigtools.h"
 #include "kernel/ff.h"
 #include <stdlib.h>
@@ -27,6 +28,14 @@
 USING_YOSYS_NAMESPACE
 YOSYS_NAMESPACE_BEGIN
 
+static void transfer_attr (Cell* to, const Cell* from, const IdString& attr) {
+	if (from->has_attribute(attr))
+		to->attributes[attr] = from->attributes.at(attr);
+}
+static void transfer_src (Cell* to, const Cell* from) {
+	transfer_attr(to, from, ID::src);
+}
+
 void simplemap_not(RTLIL::Module *module, RTLIL::Cell *cell)
 {
 	RTLIL::SigSpec sig_a = cell->getPort(ID::A);
@@ -36,7 +45,7 @@ void simplemap_not(RTLIL::Module *module, RTLIL::Cell *cell)
 
 	for (int i = 0; i < GetSize(sig_y); i++) {
 		RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_NOT_));
-		gate->attributes[ID::src] = cell->attributes[ID::src];
+		transfer_src(gate, cell);
 		gate->setPort(ID::A, sig_a[i]);
 		gate->setPort(ID::Y, sig_y[i]);
 	}
@@ -96,7 +105,7 @@ void simplemap_bitop(RTLIL::Module *module, RTLIL::Cell *cell)
 
 	for (int i = 0; i < GetSize(sig_y); i++) {
 		RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type);
-		gate->attributes[ID::src] = cell->attributes[ID::src];
+		transfer_src(gate, cell);
 		gate->setPort(ID::A, sig_a[i]);
 		gate->setPort(ID::B, sig_b[i]);
 		gate->setPort(ID::Y, sig_y[i]);
@@ -147,11 +156,14 @@ void simplemap_reduce(RTLIL::Module *module, RTLIL::Cell *cell)
 			}
 
 			RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type);
-			gate->attributes[ID::src] = cell->attributes[ID::src];
+			log("huh\n");
+			RTLIL_BACKEND::dump_cell(std::cout, "", cell);
+			transfer_src(gate, cell);
 			gate->setPort(ID::A, sig_a[i]);
 			gate->setPort(ID::B, sig_a[i+1]);
 			gate->setPort(ID::Y, sig_t[i/2]);
 			last_output_cell = gate;
+			RTLIL_BACKEND::dump_cell(std::cout, "", gate);
 		}
 
 		sig_a = sig_t;
@@ -160,7 +172,7 @@ void simplemap_reduce(RTLIL::Module *module, RTLIL::Cell *cell)
 	if (cell->type == ID($reduce_xnor)) {
 		RTLIL::SigSpec sig_t = module->addWire(NEW_ID);
 		RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_NOT_));
-		gate->attributes[ID::src] = cell->attributes[ID::src];
+		transfer_src(gate, cell);
 		gate->setPort(ID::A, sig_a);
 		gate->setPort(ID::Y, sig_t);
 		last_output_cell = gate;
@@ -188,7 +200,7 @@ static void logic_reduce(RTLIL::Module *module, RTLIL::SigSpec &sig, RTLIL::Cell
 			}
 
 			RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_OR_));
-			gate->attributes[ID::src] = cell->attributes[ID::src];
+			transfer_src(gate, cell);
 			gate->setPort(ID::A, sig[i]);
 			gate->setPort(ID::B, sig[i+1]);
 			gate->setPort(ID::Y, sig_t[i/2]);
@@ -217,7 +229,7 @@ void simplemap_lognot(RTLIL::Module *module, RTLIL::Cell *cell)
 	}
 
 	RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_NOT_));
-	gate->attributes[ID::src] = cell->attributes[ID::src];
+	transfer_src(gate, cell);
 	gate->setPort(ID::A, sig_a);
 	gate->setPort(ID::Y, sig_y);
 }
@@ -246,7 +258,7 @@ void simplemap_logbin(RTLIL::Module *module, RTLIL::Cell *cell)
 	log_assert(!gate_type.empty());
 
 	RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type);
-	gate->attributes[ID::src] = cell->attributes[ID::src];
+	transfer_src(gate, cell);
 	gate->setPort(ID::A, sig_a);
 	gate->setPort(ID::B, sig_b);
 	gate->setPort(ID::Y, sig_y);
@@ -262,20 +274,20 @@ void simplemap_eqne(RTLIL::Module *module, RTLIL::Cell *cell)
 
 	RTLIL::SigSpec xor_out = module->addWire(NEW_ID, max(GetSize(sig_a), GetSize(sig_b)));
 	RTLIL::Cell *xor_cell = module->addXor(NEW_ID, sig_a, sig_b, xor_out, is_signed);
-	xor_cell->attributes[ID::src] = cell->attributes[ID::src];
+	transfer_src(xor_cell, cell);
 	simplemap_bitop(module, xor_cell);
 	module->remove(xor_cell);
 
 	RTLIL::SigSpec reduce_out = is_ne ? sig_y : module->addWire(NEW_ID);
 	RTLIL::Cell *reduce_cell = module->addReduceOr(NEW_ID, xor_out, reduce_out);
-	reduce_cell->attributes[ID::src] = cell->attributes[ID::src];
+	transfer_src(reduce_cell, cell);
 	simplemap_reduce(module, reduce_cell);
 	module->remove(reduce_cell);
 
 	if (!is_ne) {
 		RTLIL::Cell *not_cell = module->addLogicNot(NEW_ID, reduce_out, sig_y);
-		not_cell->attributes[ID::src] = cell->attributes[ID::src];
-                simplemap_lognot(module, not_cell);
+		transfer_src(not_cell, cell);
+		simplemap_lognot(module, not_cell);
 		module->remove(not_cell);
 	}
 }
@@ -288,7 +300,7 @@ void simplemap_mux(RTLIL::Module *module, RTLIL::Cell *cell)
 
 	for (int i = 0; i < GetSize(sig_y); i++) {
 		RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_MUX_));
-		gate->attributes[ID::src] = cell->attributes[ID::src];
+		transfer_src(gate, cell);
 		gate->setPort(ID::A, sig_a[i]);
 		gate->setPort(ID::B, sig_b[i]);
 		gate->setPort(ID::S, cell->getPort(ID::S));
@@ -305,7 +317,7 @@ void simplemap_bwmux(RTLIL::Module *module, RTLIL::Cell *cell)
 
 	for (int i = 0; i < GetSize(sig_y); i++) {
 		RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_MUX_));
-		gate->attributes[ID::src] = cell->attributes[ID::src];
+		transfer_src(gate, cell);
 		gate->setPort(ID::A, sig_a[i]);
 		gate->setPort(ID::B, sig_b[i]);
 		gate->setPort(ID::S, sig_s[i]);
@@ -321,7 +333,7 @@ void simplemap_tribuf(RTLIL::Module *module, RTLIL::Cell *cell)
 
 	for (int i = 0; i < GetSize(sig_y); i++) {
 		RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_TBUF_));
-		gate->attributes[ID::src] = cell->attributes[ID::src];
+		transfer_src(gate, cell);
 		gate->setPort(ID::A, sig_a[i]);
 		gate->setPort(ID::E, sig_e);
 		gate->setPort(ID::Y, sig_y[i]);
@@ -339,7 +351,7 @@ void simplemap_bmux(RTLIL::Module *module, RTLIL::Cell *cell)
 		for (int i = 0; i < GetSize(new_data); i += width) {
 			for (int k = 0; k < width; k++) {
 				RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_MUX_));
-				gate->attributes[ID::src] = cell->attributes[ID::src];
+				transfer_src(gate, cell);
 				gate->setPort(ID::A, data[i*2+k]);
 				gate->setPort(ID::B, data[i*2+width+k]);
 				gate->setPort(ID::S, sel[idx]);
@@ -362,7 +374,7 @@ void simplemap_lut(RTLIL::Module *module, RTLIL::Cell *cell)
 		SigSpec new_lut_data = module->addWire(NEW_ID, GetSize(lut_data)/2);
 		for (int i = 0; i < GetSize(lut_data); i += 2) {
 			RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_MUX_));
-			gate->attributes[ID::src] = cell->attributes[ID::src];
+			transfer_src(gate, cell);
 			gate->setPort(ID::A, lut_data[i]);
 			gate->setPort(ID::B, lut_data[i+1]);
 			gate->setPort(ID::S, lut_ctrl[idx]);

From 042aff7c77ae9b7766e6e530e4427f07471bc287 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 19 Sep 2025 11:39:24 +1200
Subject: [PATCH 584/931] Bump test-compile to gcc-14 as newest

---
 .github/workflows/test-compile.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index 45d3d7b90..7c18c7ba0 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -42,7 +42,7 @@ jobs:
           - 'gcc-10'
           # newest, make sure to update maximum standard step to match
           - 'clang-19'
-          - 'gcc-13'
+          - 'gcc-14'
         include:
           # macOS x86
           - os: macos-13
@@ -81,7 +81,7 @@ jobs:
 
       # maximum standard, only on newest compilers
       - name: Build C++20
-        if: ${{ matrix.compiler == 'clang-19' || matrix.compiler == 'gcc-13' }}
+        if: ${{ matrix.compiler == 'clang-19' || matrix.compiler == 'gcc-14' }}
         shell: bash
         run: |
           make config-$CC_SHORT

From 19667dd6f11e21320b1913d38fc316e7adcd36e4 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 29 Aug 2025 11:35:16 +1200
Subject: [PATCH 585/931] CI: Don't use self-hosted runner on forks

---
 .github/workflows/prepare-docs.yml | 2 +-
 .github/workflows/test-build.yml   | 2 +-
 .github/workflows/test-verific.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/prepare-docs.yml b/.github/workflows/prepare-docs.yml
index a02febb3b..17d37d08c 100644
--- a/.github/workflows/prepare-docs.yml
+++ b/.github/workflows/prepare-docs.yml
@@ -26,7 +26,7 @@ jobs:
     # docs builds are needed for anything on main, any tagged versions, and any tag
     # or branch starting with docs-preview
     needs: check_docs_rebuild
-    if: ${{ needs.check_docs_rebuild.outputs.should_skip != 'true' }}
+    if: ${{ needs.check_docs_rebuild.outputs.should_skip != 'true' && github.repository == 'YosysHQ/Yosys' }}
     runs-on: [self-hosted, linux, x64, fast]
     steps:
       - name: Checkout Yosys
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 65d931797..d7f2073fe 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -253,7 +253,7 @@ jobs:
     name: Try build docs
     runs-on: [self-hosted, linux, x64, fast]
     needs: [pre_docs_job]
-    if: needs.pre_docs_job.outputs.should_skip != 'true'
+    if: ${{ needs.pre_docs_job.outputs.should_skip != 'true' && github.repository == 'YosysHQ/Yosys' }}
     strategy:
       matrix:
         docs-target: [html, latexpdf]
diff --git a/.github/workflows/test-verific.yml b/.github/workflows/test-verific.yml
index 9af07b920..c2e4228c4 100644
--- a/.github/workflows/test-verific.yml
+++ b/.github/workflows/test-verific.yml
@@ -27,7 +27,7 @@ jobs:
 
   test-verific:
     needs: pre-job
-    if: needs.pre-job.outputs.should_skip != 'true'
+    if: ${{ needs.pre-job.outputs.should_skip != 'true' && github.repository == 'YosysHQ/Yosys' }}
     runs-on: [self-hosted, linux, x64, fast]
     steps:
       - name: Checkout Yosys

From 4fe21dd652ec58255927ef8977553301e05ef604 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 16 Sep 2025 04:16:11 +0000
Subject: [PATCH 586/931] Reduce hashops verbiage in OptMergePass

---
 kernel/hashlib.h        |  8 ++++++--
 passes/opt/opt_merge.cc | 13 ++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index 92188a220..70e9736f7 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -114,7 +114,7 @@ public:
 		return;
 	}
 	[[nodiscard]]
-	hash_t yield() {
+	hash_t yield() const {
 		return (hash_t)state;
 	}
 
@@ -373,7 +373,11 @@ public:
 	commutative_hash() {
 		buckets.fill(0);
 	}
-	void eat(Hasher h) {
+	template <typename T>
+	void eat(const T &obj) {
+		eat(hash_ops<T>::hash(obj));
+	}
+	void eat(const Hasher &h) {
 		Hasher::hash_t v = h.yield();
 		size_t index = v & (buckets.size() - 1);
 		buckets[index] += v;
diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index fbfdb9b63..ded0e7360 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -33,6 +33,9 @@
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
+template <typename T, typename U>
+inline Hasher hash_pair(const T &t, const U &u) { return hash_ops<std::pair<T, U>>::hash(t, u); }
+
 struct OptMergeWorker
 {
 	RTLIL::Design *design;
@@ -51,7 +54,7 @@ struct OptMergeWorker
 
 		hashlib::commutative_hash comm;
 		for (int i = 0; i < s_width; i++)
-			comm.eat(hash_ops<std::pair<SigBit, SigSpec>>::hash({sig_s[i], sig_b.extract(i*width, width)}));
+			comm.eat(hash_pair(sig_s[i], sig_b.extract(i*width, width)));
 
 		return comm.hash_into(h);
 	}
@@ -86,8 +89,8 @@ struct OptMergeWorker
 		if (cell->type.in(ID($and), ID($or), ID($xor), ID($xnor), ID($add), ID($mul),
 				ID($logic_and), ID($logic_or), ID($_AND_), ID($_OR_), ID($_XOR_))) {
 			hashlib::commutative_hash comm;
-			comm.eat(hash_ops<RTLIL::SigSpec>::hash(assign_map(cell->getPort(ID::A))));
-			comm.eat(hash_ops<RTLIL::SigSpec>::hash(assign_map(cell->getPort(ID::B))));
+			comm.eat(assign_map(cell->getPort(ID::A)));
+			comm.eat(assign_map(cell->getPort(ID::B)));
 			h = comm.hash_into(h);
 		} else if (cell->type.in(ID($reduce_xor), ID($reduce_xnor))) {
 			SigSpec a = assign_map(cell->getPort(ID::A));
@@ -107,7 +110,7 @@ struct OptMergeWorker
 			for (const auto& [port, sig] : cell->connections()) {
 				if (cell->output(port))
 					continue;
-				comm.eat(hash_ops<std::pair<IdString, SigSpec>>::hash(port, assign_map(sig)));
+				comm.eat(hash_pair(port, assign_map(sig)));
 			}
 			h = comm.hash_into(h);
 			if (RTLIL::builtin_ff_cell_types().count(cell->type))
@@ -120,7 +123,7 @@ struct OptMergeWorker
 	{
 		hashlib::commutative_hash comm;
 		for (const auto& param : cell->parameters) {
-			comm.eat(hash_ops<std::pair<IdString, Const>>::hash(param));
+			comm.eat(param);
 		}
 		return comm.hash_into(h);
 	}

From 0d8c21129fb2d988752e0d9624aa54454e76bdb5 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 19 Sep 2025 16:23:26 +0200
Subject: [PATCH 587/931] rtlil: remove textual RTLIL reference tests for ease
 of maintenance

---
 tests/rtlil/roundtrip-text.ref.il       |  283 ------
 tests/rtlil/roundtrip-text.sh           |    8 -
 tests/rtlil/roundtrip-text.synth.ref.il | 1194 -----------------------
 3 files changed, 1485 deletions(-)
 delete mode 100644 tests/rtlil/roundtrip-text.ref.il
 delete mode 100644 tests/rtlil/roundtrip-text.synth.ref.il

diff --git a/tests/rtlil/roundtrip-text.ref.il b/tests/rtlil/roundtrip-text.ref.il
deleted file mode 100644
index cc45f53dd..000000000
--- a/tests/rtlil/roundtrip-text.ref.il
+++ /dev/null
@@ -1,283 +0,0 @@
-autoidx 15
-attribute \src "everything.v:1.1-32.10"
-attribute \cells_not_processed 1
-module \alu
-  attribute \src "everything.v:2.8-2.11"
-  wire input 1 \clk
-  attribute \src "everything.v:3.14-3.15"
-  wire width 8 input 2 \A
-  attribute \src "everything.v:4.14-4.15"
-  wire width 8 input 3 \B
-  attribute \src "everything.v:5.14-5.23"
-  wire width 4 input 4 \operation
-  attribute \src "everything.v:6.19-6.25"
-  wire width 8 output 5 \result
-  attribute \src "everything.v:7.13-7.15"
-  wire output 6 \CF
-  attribute \src "everything.v:8.13-8.15"
-  wire output 7 \ZF
-  attribute \src "everything.v:9.13-9.15"
-  wire output 8 \SF
-  attribute \src "everything.v:15.12-15.15"
-  wire width 9 \tmp
-  attribute \src "everything.v:17.2-31.5"
-  wire width 8 $0\result[7:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire $0\CF[0:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire $0\ZF[0:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire $0\SF[0:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire width 9 $0\tmp[8:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire width 9 $1\tmp[8:0]
-  attribute \src "everything.v:21.11-21.16"
-  wire width 9 $add$everything.v:21$2_Y
-  attribute \src "everything.v:23.11-23.16"
-  wire width 9 $sub$everything.v:23$3_Y
-  attribute \src "everything.v:27.9-27.22"
-  wire $eq$everything.v:27$4_Y
-  attribute \src "everything.v:21.11-21.16"
-  cell $add $add$everything.v:21$2
-    parameter \A_SIGNED 0
-    parameter \B_SIGNED 0
-    parameter \A_WIDTH 8
-    parameter \B_WIDTH 8
-    parameter \Y_WIDTH 9
-    connect \A \A
-    connect \B \B
-    connect \Y $add$everything.v:21$2_Y
-  end
-  attribute \src "everything.v:23.11-23.16"
-  cell $sub $sub$everything.v:23$3
-    parameter \A_SIGNED 0
-    parameter \B_SIGNED 0
-    parameter \A_WIDTH 8
-    parameter \B_WIDTH 8
-    parameter \Y_WIDTH 9
-    connect \A \A
-    connect \B \B
-    connect \Y $sub$everything.v:23$3_Y
-  end
-  attribute \src "everything.v:27.9-27.22"
-  cell $eq $eq$everything.v:27$4
-    parameter \A_SIGNED 0
-    parameter \B_SIGNED 0
-    parameter \A_WIDTH 8
-    parameter \B_WIDTH 32
-    parameter \Y_WIDTH 1
-    connect \A $1\tmp[8:0] [7:0]
-    connect \B 0
-    connect \Y $eq$everything.v:27$4_Y
-  end
-  attribute \src "everything.v:17.2-31.5"
-  process $proc$everything.v:17$1
-    assign { } { }
-    assign { } { }
-    assign { } { }
-    assign { } { }
-    assign { } { }
-    assign $0\tmp[8:0] $1\tmp[8:0]
-    assign $0\CF[0:0] $1\tmp[8:0] [8]
-    assign $0\ZF[0:0] $eq$everything.v:27$4_Y
-    assign $0\SF[0:0] $1\tmp[8:0] [7]
-    assign $0\result[7:0] $1\tmp[8:0] [7:0]
-    attribute \src "everything.v:19.3-24.10"
-    switch \operation
-    attribute \src "everything.v:19.19-19.19"
-      case 4'0000
-        assign { } { }
-        assign $1\tmp[8:0] $add$everything.v:21$2_Y
-    attribute \src "everything.v:21.17-21.17"
-      case 4'0001
-        assign { } { }
-        assign $1\tmp[8:0] $sub$everything.v:23$3_Y
-      case 
-        assign $1\tmp[8:0] \tmp
-    end
-    sync posedge \clk
-      update \result $0\result[7:0]
-      update \CF $0\CF[0:0]
-      update \ZF $0\ZF[0:0]
-      update \SF $0\SF[0:0]
-      update \tmp $0\tmp[8:0]
-  end
-end
-attribute \src "everything.v:34.1-40.10"
-attribute \cells_not_processed 1
-module \foo
-  attribute \src "everything.v:35.17-35.18"
-  wire width 8 input 1 \a
-  attribute \src "everything.v:35.32-35.33"
-  wire width 8 input 2 \b
-  attribute \src "everything.v:35.48-35.49"
-  wire width 8 output 3 \y
-  attribute \src "everything.v:37.16-37.18"
-  wire width 8 \bb
-  attribute \src "everything.v:39.16-39.22"
-  wire width 8 $add$everything.v:39$5_Y
-  attribute \src "everything.v:39.16-39.22"
-  cell $add $add$everything.v:39$5
-    parameter \A_SIGNED 0
-    parameter \B_SIGNED 0
-    parameter \A_WIDTH 8
-    parameter \B_WIDTH 8
-    parameter \Y_WIDTH 8
-    connect \A \a
-    connect \B \bb
-    connect \Y $add$everything.v:39$5_Y
-  end
-  connect \b \bb
-  connect \y $add$everything.v:39$5_Y
-end
-attribute \cells_not_processed 1
-attribute \src "everything.v:1.1-32.10"
-module \zzz
-  attribute \src "everything.v:27.9-27.22"
-  wire $eq$everything.v:27$4_Y
-  attribute \src "everything.v:23.11-23.16"
-  wire width 9 $sub$everything.v:23$3_Y
-  attribute \src "everything.v:21.11-21.16"
-  wire width 9 $add$everything.v:21$2_Y
-  attribute \src "everything.v:17.2-31.5"
-  wire width 9 $1\tmp[8:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire width 9 $0\tmp[8:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire $0\SF[0:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire $0\ZF[0:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire $0\CF[0:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire width 8 $0\result[7:0]
-  attribute \src "everything.v:15.12-15.15"
-  wire width 9 \tmp
-  attribute \src "everything.v:9.13-9.15"
-  wire output 8 \SF
-  attribute \src "everything.v:8.13-8.15"
-  wire output 7 \ZF
-  attribute \src "everything.v:7.13-7.15"
-  wire output 6 \CF
-  attribute \src "everything.v:6.19-6.25"
-  wire width 8 output 5 \result
-  attribute \src "everything.v:5.14-5.23"
-  wire width 4 input 4 \operation
-  attribute \src "everything.v:4.14-4.15"
-  wire width 8 input 3 \B
-  attribute \src "everything.v:3.14-3.15"
-  wire width 8 input 2 \A
-  attribute \src "everything.v:2.8-2.11"
-  wire input 1 \clk
-  wire $procmux$8_CMP
-  wire width 9 $procmux$7_Y
-  wire $procmux$9_CMP
-  attribute \src "everything.v:27.9-27.22"
-  cell $logic_not $eq$everything.v:27$4
-    parameter \A_SIGNED 0
-    parameter \Y_WIDTH 1
-    parameter \A_WIDTH 8
-    connect \A $1\tmp[8:0] [7:0]
-    connect \Y $eq$everything.v:27$4_Y
-  end
-  attribute \src "everything.v:23.11-23.16"
-  cell $sub $sub$everything.v:23$3
-    parameter \A_SIGNED 0
-    parameter \B_SIGNED 0
-    parameter \A_WIDTH 8
-    parameter \B_WIDTH 8
-    parameter \Y_WIDTH 9
-    connect \A \A
-    connect \B \B
-    connect \Y $sub$everything.v:23$3_Y
-  end
-  attribute \src "everything.v:21.11-21.16"
-  cell $add $add$everything.v:21$2
-    parameter \A_SIGNED 0
-    parameter \B_SIGNED 0
-    parameter \A_WIDTH 8
-    parameter \B_WIDTH 8
-    parameter \Y_WIDTH 9
-    connect \A \A
-    connect \B \B
-    connect \Y $add$everything.v:21$2_Y
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  attribute \full_case 1
-  cell $eq $procmux$8_CMP0
-    parameter \A_SIGNED 0
-    parameter \B_SIGNED 0
-    parameter \A_WIDTH 4
-    parameter \B_WIDTH 4
-    parameter \Y_WIDTH 1
-    connect \A \operation
-    connect \B 4'0001
-    connect \Y $procmux$8_CMP
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  attribute \full_case 1
-  cell $pmux $procmux$7
-    parameter \WIDTH 9
-    parameter \S_WIDTH 2
-    connect \A \tmp
-    connect \B { $add$everything.v:21$2_Y $sub$everything.v:23$3_Y }
-    connect \S { $procmux$9_CMP $procmux$8_CMP }
-    connect \Y $procmux$7_Y
-  end
-  attribute \src "everything.v:19.19-19.19|everything.v:19.3-24.10"
-  attribute \full_case 1
-  cell $logic_not $procmux$9_CMP0
-    parameter \A_SIGNED 0
-    parameter \Y_WIDTH 1
-    parameter \A_WIDTH 4
-    connect \A \operation
-    connect \Y $procmux$9_CMP
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $dff $procdff$10
-    parameter \WIDTH 8
-    parameter \CLK_POLARITY 1'1
-    connect \D $procmux$7_Y [7:0]
-    connect \Q \result
-    connect \CLK \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $dff $procdff$11
-    parameter \WIDTH 1
-    parameter \CLK_POLARITY 1'1
-    connect \D $procmux$7_Y [8]
-    connect \Q \CF
-    connect \CLK \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $dff $procdff$12
-    parameter \WIDTH 1
-    parameter \CLK_POLARITY 1'1
-    connect \D $eq$everything.v:27$4_Y
-    connect \Q \ZF
-    connect \CLK \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $dff $procdff$13
-    parameter \WIDTH 1
-    parameter \CLK_POLARITY 1'1
-    connect \D $procmux$7_Y [7]
-    connect \Q \SF
-    connect \CLK \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $dff $procdff$14
-    parameter \WIDTH 9
-    parameter \CLK_POLARITY 1'1
-    connect \D $procmux$7_Y
-    connect \Q \tmp
-    connect \CLK \clk
-  end
-  connect $0\result[7:0] $1\tmp[8:0] [7:0]
-  connect $0\SF[0:0] $1\tmp[8:0] [7]
-  connect $0\ZF[0:0] $eq$everything.v:27$4_Y
-  connect $0\CF[0:0] $1\tmp[8:0] [8]
-  connect $0\tmp[8:0] $1\tmp[8:0]
-  connect $1\tmp[8:0] $procmux$7_Y
-end
diff --git a/tests/rtlil/roundtrip-text.sh b/tests/rtlil/roundtrip-text.sh
index 7a979879c..35417cff7 100644
--- a/tests/rtlil/roundtrip-text.sh
+++ b/tests/rtlil/roundtrip-text.sh
@@ -17,7 +17,6 @@ remove_empty_lines temp/roundtrip-text.write.il
 # Trim first line ("Generated by Yosys ...")
 tail -n +2 temp/roundtrip-text.write.il > temp/roundtrip-text.write-nogen.il
 diff temp/roundtrip-text.dump.il temp/roundtrip-text.write-nogen.il
-diff temp/roundtrip-text.dump.il roundtrip-text.ref.il
 
 # Loading and writing it out again doesn't change the RTLIL
 $YS -p "read_rtlil temp/roundtrip-text.dump.il; write_rtlil temp/roundtrip-text.reload.il"
@@ -30,10 +29,3 @@ $YS --hash-seed=2345678 -p "read_rtlil temp/roundtrip-text.dump.il; write_rtlil
 remove_empty_lines temp/roundtrip-text.reload-hash.il
 tail -n +2 temp/roundtrip-text.reload-hash.il > temp/roundtrip-text.reload-hash-nogen.il
 diff temp/roundtrip-text.dump.il temp/roundtrip-text.reload-hash-nogen.il
-
-echo "Without ABC, we don't get any irreproducibility and can pin that"
-echo "Has this test case started failing for you? Consider updating the reference"
-$YS -p "read_verilog -sv everything.v; synth -relativeshare -noabc; write_rtlil temp/roundtrip-text.synth.il"
-remove_empty_lines temp/roundtrip-text.synth.il
-tail -n +2 temp/roundtrip-text.synth.il > temp/roundtrip-text.synth-nogen.il
-diff temp/roundtrip-text.synth-nogen.il roundtrip-text.synth.ref.il
diff --git a/tests/rtlil/roundtrip-text.synth.ref.il b/tests/rtlil/roundtrip-text.synth.ref.il
deleted file mode 100644
index ab48affc6..000000000
--- a/tests/rtlil/roundtrip-text.synth.ref.il
+++ /dev/null
@@ -1,1194 +0,0 @@
-autoidx 511
-attribute \src "everything.v:34.1-40.10"
-module \foo
-  attribute \src "everything.v:35.48-35.49"
-  wire width 8 output 3 \y
-  attribute \src "everything.v:37.16-37.18"
-  wire width 8 \bb
-  attribute \src "everything.v:35.32-35.33"
-  wire width 8 input 2 \b
-  attribute \src "everything.v:35.17-35.18"
-  wire width 8 input 1 \a
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$150_Y
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$147_Y
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$173_Y
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$170_Y
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$167_Y
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$164_Y
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$151_Y
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$148_Y
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$155_Y
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$149_Y
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$146_Y
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$143_Y
-  attribute \unused_bits "7"
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:214.23-214.24"
-  attribute \force_downto 1
-  wire width 8 $auto$alumacc.cc:495:replace_alu$21.lcu.G
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:270.23-270.24"
-  attribute \force_downto 1
-  wire width 8 $auto$alumacc.cc:495:replace_alu$21.X
-  attribute \unused_bits "7"
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:274.23-274.25"
-  attribute \force_downto 1
-  wire width 8 $auto$alumacc.cc:495:replace_alu$21.CO
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$219
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [6]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$173_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [6]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$218
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [4]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$170_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [4]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$217
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [2]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$167_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [2]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$216
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [5]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$164_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$150_Y
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$213
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [3]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$155_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$147_Y
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$211
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$150_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$149_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [5]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$210
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$or$+/techmap.v:240$147_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$146_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [3]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$209
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [1]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$143_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$21.lcu.G [1]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$207
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$173_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [5]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [6]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$206
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$170_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [3]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [4]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$205
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$167_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [1]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [2]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$204
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:248$164_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [3]
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$151_Y
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$201
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$151_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$21.X [4]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [5]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$200
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$148_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$21.X [2]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [3]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$197
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$155_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [1]
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:241$148_Y
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$195
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$149_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$21.lcu.G [4]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [5]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$194
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$146_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$21.lcu.G [2]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [3]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$193
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$21.lcu.$and$+/techmap.v:240$143_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [0]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [1]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$138
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [6]
-    connect \B \b [6]
-    connect \A \a [6]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$137
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [5]
-    connect \B \b [5]
-    connect \A \a [5]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$136
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [4]
-    connect \B \b [4]
-    connect \A \a [4]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$135
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [3]
-    connect \B \b [3]
-    connect \A \a [3]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$134
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [2]
-    connect \B \b [2]
-    connect \A \a [2]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$133
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.lcu.G [1]
-    connect \B \b [1]
-    connect \A \a [1]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$132
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.CO [0]
-    connect \B \b [0]
-    connect \A \a [0]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$131
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [7]
-    connect \B \b [7]
-    connect \A \a [7]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$130
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [6]
-    connect \B \b [6]
-    connect \A \a [6]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$129
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [5]
-    connect \B \b [5]
-    connect \A \a [5]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$128
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [4]
-    connect \B \b [4]
-    connect \A \a [4]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$127
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [3]
-    connect \B \b [3]
-    connect \A \a [3]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$126
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [2]
-    connect \B \b [2]
-    connect \A \a [2]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$125
-    connect \Y $auto$alumacc.cc:495:replace_alu$21.X [1]
-    connect \B \b [1]
-    connect \A \a [1]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$124
-    connect \Y \y [0]
-    connect \B \b [0]
-    connect \A \a [0]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$122
-    connect \Y \y [7]
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [6]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [7]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$121
-    connect \Y \y [6]
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [5]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [6]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$120
-    connect \Y \y [5]
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [4]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [5]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$119
-    connect \Y \y [4]
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [3]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [4]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$118
-    connect \Y \y [3]
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [2]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [3]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$117
-    connect \Y \y [2]
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [1]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [2]
-  end
-  attribute \src "everything.v:39.16-39.22|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$116
-    connect \Y \y [1]
-    connect \B $auto$alumacc.cc:495:replace_alu$21.CO [0]
-    connect \A $auto$alumacc.cc:495:replace_alu$21.X [1]
-  end
-  connect $auto$alumacc.cc:495:replace_alu$21.X [0] \y [0]
-  connect $auto$alumacc.cc:495:replace_alu$21.lcu.G [0] $auto$alumacc.cc:495:replace_alu$21.CO [0]
-  connect \bb \b
-end
-attribute \src "everything.v:1.1-32.10"
-module \alu
-  attribute \src "everything.v:15.12-15.15"
-  wire width 9 \tmp
-  attribute \src "everything.v:6.19-6.25"
-  wire width 8 output 5 \result
-  attribute \src "everything.v:5.14-5.23"
-  wire width 4 input 4 \operation
-  attribute \src "everything.v:2.8-2.11"
-  wire input 1 \clk
-  attribute \src "everything.v:8.13-8.15"
-  wire output 7 \ZF
-  attribute \src "everything.v:9.13-9.15"
-  wire output 8 \SF
-  attribute \src "everything.v:7.13-7.15"
-  wire output 6 \CF
-  attribute \src "everything.v:4.14-4.15"
-  wire width 8 input 3 \B
-  attribute \src "everything.v:3.14-3.15"
-  wire width 8 input 2 \A
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$348_Y
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$342_Y
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$339_Y
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  wire $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$336_Y
-  attribute \src "+/techmap.v:270.26-270.27"
-  attribute \force_downto 1
-  wire width 9 $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y
-  attribute \src "+/techmap.v:274.23-274.25"
-  attribute \force_downto 1
-  wire width 9 $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO
-  attribute \src "+/techmap.v:279.21-279.23"
-  attribute \force_downto 1
-  wire width 9 $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$347_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$341_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$338_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$335_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$361_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$358_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$355_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$352_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$348_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$342_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$339_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$336_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$349_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$346_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$343_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$340_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$337_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$334_Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  wire $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$331_Y
-  wire $procmux$9_CMP
-  wire $procmux$8_CMP
-  wire $auto$simplemap.cc:254:simplemap_eqne$247
-  wire $auto$simplemap.cc:166:logic_reduce$268
-  wire width 2 $auto$simplemap.cc:166:logic_reduce$265
-  wire $auto$simplemap.cc:166:logic_reduce$235
-  wire width 2 $auto$simplemap.cc:166:logic_reduce$232
-  wire width 4 $auto$simplemap.cc:166:logic_reduce$227
-  wire width 2 $auto$simplemap.cc:125:simplemap_reduce$249
-  wire $auto$rtlil.cc:3196:NotGate$497
-  wire $auto$opt_dff.cc:247:make_patterns_logic$505
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:214.23-214.24"
-  attribute \force_downto 1
-  wire width 9 $auto$alumacc.cc:495:replace_alu$18.lcu.G
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:270.26-270.27"
-  attribute \force_downto 1
-  wire width 9 $auto$alumacc.cc:495:replace_alu$18.Y
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:270.23-270.24"
-  attribute \force_downto 1
-  wire width 9 $auto$alumacc.cc:495:replace_alu$18.X
-  attribute \unused_bits "8"
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:274.23-274.25"
-  attribute \force_downto 1
-  wire width 9 $auto$alumacc.cc:495:replace_alu$18.CO
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.21-279.23"
-  attribute \force_downto 1
-  wire width 9 $auto$alumacc.cc:495:replace_alu$18.BB
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:268.22-268.23"
-  attribute \force_downto 1
-  wire width 9 $auto$alumacc.cc:495:replace_alu$18.B
-  attribute \src "everything.v:17.2-31.5"
-  wire width 8 $0\result[7:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire $0\ZF[0:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire $0\SF[0:0]
-  attribute \src "everything.v:17.2-31.5"
-  wire $0\CF[0:0]
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$481
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [6]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [5]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
-  end
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$480
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [4]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
-  end
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$479
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [2]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
-  end
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$478
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [5]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
-    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$339_Y
-  end
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$477
-    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$348_Y
-    connect \B $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$339_Y
-    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$342_Y
-  end
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$476
-    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$342_Y
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [7]
-  end
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$475
-    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$339_Y
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [5]
-  end
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$474
-    connect \Y $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$336_Y
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [3]
-  end
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$473
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [8]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
-    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$348_Y
-  end
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$471
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
-    connect \A $techmap$techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.lcu.$and$+/techmap.v:241$336_Y
-  end
-  attribute \src "+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$467
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [1]
-  end
-  attribute \src "+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$427
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [7]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [6]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [7]
-  end
-  attribute \src "+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$426
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [6]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [5]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
-  end
-  attribute \src "+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$425
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [5]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [4]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [5]
-  end
-  attribute \src "+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$424
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [4]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [3]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
-  end
-  attribute \src "+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$423
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [3]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [2]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [3]
-  end
-  attribute \src "+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$422
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [2]
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [1]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
-  end
-  attribute \src "+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$421
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [1]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [1]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$418
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [6]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$361_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [6]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$417
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [4]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$358_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [4]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$416
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [2]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$355_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [2]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.12-248.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$415
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [5]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$352_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$338_Y
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$414
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [7]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$349_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$347_Y
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$413
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$347_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$346_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$341_Y
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$412
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [3]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$343_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$335_Y
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$411
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$341_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$340_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [7]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$410
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$338_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$337_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [5]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$409
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$335_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$334_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [3]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.12-240.41"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$408
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [1]
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$331_Y
-    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [1]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:231.10-231.28"
-  cell $_OR_ $auto$simplemap.cc:83:simplemap_bitop$407
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.CO [0]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.X [0]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.lcu.G [0]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$405
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$361_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [5]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [6]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$404
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$358_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [4]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$403
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$355_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [1]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [2]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:248.19-248.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$402
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:248$352_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$339_Y
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$401
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$348_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$339_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$342_Y
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$400
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$342_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.X [6]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [7]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$399
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$339_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.X [4]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [5]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:241.12-241.34"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$398
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$336_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.X [2]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [3]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$397
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$349_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$348_Y
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$396
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$346_Y
-    connect \B $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$or$+/techmap.v:240$338_Y
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$342_Y
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$395
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$343_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [1]
-    connect \A $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:241$336_Y
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$394
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$340_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.lcu.G [6]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [7]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$393
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$337_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.lcu.G [4]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [5]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$392
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$334_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.lcu.G [2]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [3]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.27-286.69|+/techmap.v:240.19-240.41"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$391
-    connect \Y $techmap$auto$alumacc.cc:495:replace_alu$18.lcu.$and$+/techmap.v:240$331_Y
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [0]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [1]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$326
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [7]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [7]
-    connect \A \A [7]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$325
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [6]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [6]
-    connect \A \A [6]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$324
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [5]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [5]
-    connect \A \A [5]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$323
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [4]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [4]
-    connect \A \A [4]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$322
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [3]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [3]
-    connect \A \A [3]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$321
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [2]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [2]
-    connect \A \A [2]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$320
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [1]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [1]
-    connect \A \A [1]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:286.42-286.49"
-  cell $_AND_ $auto$simplemap.cc:83:simplemap_bitop$319
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.lcu.G [0]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
-    connect \A \A [0]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$317
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [7]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [7]
-    connect \A \A [7]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$316
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [6]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [6]
-    connect \A \A [6]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$315
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [5]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [5]
-    connect \A \A [5]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$314
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [4]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [4]
-    connect \A \A [4]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$313
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [3]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [3]
-    connect \A \A [3]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$312
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [2]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [2]
-    connect \A \A [2]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$311
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [1]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [1]
-    connect \A \A [1]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:288.13-288.20"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$310
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.X [0]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.BB [0]
-    connect \A \A [0]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$308
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [8]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [7]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.BB [8]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$307
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [7]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [6]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [7]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$306
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [6]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [5]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [6]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$305
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [5]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [4]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [5]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$304
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [4]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [3]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [4]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$303
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [3]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [2]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [3]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$302
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [2]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [1]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [2]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:289.13-289.25"
-  cell $_XOR_ $auto$simplemap.cc:83:simplemap_bitop$301
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [1]
-    connect \B $auto$alumacc.cc:495:replace_alu$18.CO [0]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [1]
-  end
-  attribute \src "+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$464
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [7]
-    connect \A \B [7]
-  end
-  attribute \src "+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$463
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [6]
-    connect \A \B [6]
-  end
-  attribute \src "+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$462
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [5]
-    connect \A \B [5]
-  end
-  attribute \src "+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$461
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [4]
-    connect \A \B [4]
-  end
-  attribute \src "+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$460
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [3]
-    connect \A \B [3]
-  end
-  attribute \src "+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$459
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [2]
-    connect \A \B [2]
-  end
-  attribute \src "+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$458
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [1]
-    connect \A \B [1]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$384
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [8]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.B [8]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$383
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [7]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.B [7]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$382
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [6]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.B [6]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$381
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [5]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.B [5]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$380
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [4]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.B [4]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$379
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [3]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.B [3]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$378
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [2]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.B [2]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$377
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [1]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.B [1]
-  end
-  attribute \src "everything.v:23.11-23.16|+/techmap.v:279.31-279.37"
-  cell $_NOT_ $auto$simplemap.cc:38:simplemap_not$376
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.BB [0]
-    connect \A \B [0]
-  end
-  attribute \src 0'x
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$299
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [8]
-    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [8]
-    connect \A 1'0
-  end
-  attribute \src 0'x
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$298
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [7]
-    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [7]
-    connect \A \B [7]
-  end
-  attribute \src 0'x
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$297
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [6]
-    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [6]
-    connect \A \B [6]
-  end
-  attribute \src 0'x
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$296
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [5]
-    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [5]
-    connect \A \B [5]
-  end
-  attribute \src 0'x
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$295
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [4]
-    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [4]
-    connect \A \B [4]
-  end
-  attribute \src 0'x
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$294
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [3]
-    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [3]
-    connect \A \B [3]
-  end
-  attribute \src 0'x
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$293
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [2]
-    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [2]
-    connect \A \B [2]
-  end
-  attribute \src 0'x
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$292
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.B [1]
-    connect \S $auto$simplemap.cc:254:simplemap_eqne$247
-    connect \B $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [1]
-    connect \A \B [1]
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$264
-    connect \Y $0\CF[0:0]
-    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
-    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [8]
-    connect \A 1'x
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$263
-    connect \Y $0\SF[0:0]
-    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
-    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [7]
-    connect \A \tmp [7]
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$262
-    connect \Y $0\result[7:0] [6]
-    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
-    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [6]
-    connect \A \tmp [6]
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$261
-    connect \Y $0\result[7:0] [5]
-    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
-    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [5]
-    connect \A \tmp [5]
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$260
-    connect \Y $0\result[7:0] [4]
-    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
-    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [4]
-    connect \A \tmp [4]
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$259
-    connect \Y $0\result[7:0] [3]
-    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
-    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [3]
-    connect \A \tmp [3]
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$258
-    connect \Y $0\result[7:0] [2]
-    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
-    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [2]
-    connect \A \tmp [2]
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$257
-    connect \Y $0\result[7:0] [1]
-    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
-    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [1]
-    connect \A \tmp [1]
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_MUX_ $auto$simplemap.cc:275:simplemap_mux$256
-    connect \Y $0\result[7:0] [0]
-    connect \S $auto$opt_dff.cc:247:make_patterns_logic$505
-    connect \B $auto$alumacc.cc:495:replace_alu$18.Y [0]
-    connect \A \tmp [0]
-  end
-  attribute \src "everything.v:19.19-19.19|everything.v:19.3-24.10"
-  cell $_NOT_ $auto$simplemap.cc:204:simplemap_lognot$270
-    connect \Y $procmux$9_CMP
-    connect \A $auto$simplemap.cc:166:logic_reduce$268
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_NOT_ $auto$simplemap.cc:204:simplemap_lognot$255
-    connect \Y $procmux$8_CMP
-    connect \A $auto$simplemap.cc:254:simplemap_eqne$247
-  end
-  attribute \src "everything.v:27.9-27.22"
-  cell $_NOT_ $auto$simplemap.cc:204:simplemap_lognot$237
-    connect \Y $0\ZF[0:0]
-    connect \A $auto$simplemap.cc:166:logic_reduce$235
-  end
-  attribute \src "everything.v:19.19-19.19|everything.v:19.3-24.10"
-  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$269
-    connect \Y $auto$simplemap.cc:166:logic_reduce$268
-    connect \B $auto$simplemap.cc:125:simplemap_reduce$249 [1]
-    connect \A $auto$simplemap.cc:166:logic_reduce$265 [0]
-  end
-  attribute \src "everything.v:19.19-19.19|everything.v:19.3-24.10"
-  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$267
-    connect \Y $auto$simplemap.cc:125:simplemap_reduce$249 [1]
-    connect \B \operation [3]
-    connect \A \operation [2]
-  end
-  attribute \src "everything.v:19.19-19.19|everything.v:19.3-24.10"
-  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$266
-    connect \Y $auto$simplemap.cc:166:logic_reduce$265 [0]
-    connect \B \operation [1]
-    connect \A \operation [0]
-  end
-  attribute \src "everything.v:27.9-27.22"
-  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$236
-    connect \Y $auto$simplemap.cc:166:logic_reduce$235
-    connect \B $auto$simplemap.cc:166:logic_reduce$232 [1]
-    connect \A $auto$simplemap.cc:166:logic_reduce$232 [0]
-  end
-  attribute \src "everything.v:27.9-27.22"
-  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$234
-    connect \Y $auto$simplemap.cc:166:logic_reduce$232 [1]
-    connect \B $auto$simplemap.cc:166:logic_reduce$227 [3]
-    connect \A $auto$simplemap.cc:166:logic_reduce$227 [2]
-  end
-  attribute \src "everything.v:27.9-27.22"
-  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$233
-    connect \Y $auto$simplemap.cc:166:logic_reduce$232 [0]
-    connect \B $auto$simplemap.cc:166:logic_reduce$227 [1]
-    connect \A $auto$simplemap.cc:166:logic_reduce$227 [0]
-  end
-  attribute \src "everything.v:27.9-27.22"
-  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$231
-    connect \Y $auto$simplemap.cc:166:logic_reduce$227 [3]
-    connect \B $0\SF[0:0]
-    connect \A $0\result[7:0] [6]
-  end
-  attribute \src "everything.v:27.9-27.22"
-  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$230
-    connect \Y $auto$simplemap.cc:166:logic_reduce$227 [2]
-    connect \B $0\result[7:0] [5]
-    connect \A $0\result[7:0] [4]
-  end
-  attribute \src "everything.v:27.9-27.22"
-  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$229
-    connect \Y $auto$simplemap.cc:166:logic_reduce$227 [1]
-    connect \B $0\result[7:0] [3]
-    connect \A $0\result[7:0] [2]
-  end
-  attribute \src "everything.v:27.9-27.22"
-  cell $_OR_ $auto$simplemap.cc:175:logic_reduce$228
-    connect \Y $auto$simplemap.cc:166:logic_reduce$227 [0]
-    connect \B $0\result[7:0] [1]
-    connect \A $0\result[7:0] [0]
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_OR_ $auto$simplemap.cc:134:simplemap_reduce$253
-    connect \Y $auto$simplemap.cc:254:simplemap_eqne$247
-    connect \B $auto$simplemap.cc:125:simplemap_reduce$249 [1]
-    connect \A $auto$simplemap.cc:125:simplemap_reduce$249 [0]
-  end
-  attribute \src "everything.v:21.17-21.17|everything.v:19.3-24.10"
-  cell $_OR_ $auto$simplemap.cc:134:simplemap_reduce$250
-    connect \Y $auto$simplemap.cc:125:simplemap_reduce$249 [0]
-    connect \B \operation [1]
-    connect \A $auto$rtlil.cc:3196:NotGate$497
-  end
-  attribute \src 0'x
-  cell $_OR_ $auto$simplemap.cc:134:simplemap_reduce$226
-    connect \Y $auto$opt_dff.cc:247:make_patterns_logic$505
-    connect \B $procmux$9_CMP
-    connect \A $procmux$8_CMP
-  end
-  cell $_NOT_ $auto$opt_expr.cc:617:replace_const_cells$502
-    connect \Y $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [8]
-    connect \A $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [8]
-  end
-  cell $_NOT_ $auto$opt_expr.cc:617:replace_const_cells$500
-    connect \Y $auto$alumacc.cc:495:replace_alu$18.Y [0]
-    connect \A $auto$alumacc.cc:495:replace_alu$18.X [0]
-  end
-  cell $_NOT_ $auto$opt_expr.cc:617:replace_const_cells$496
-    connect \Y $auto$rtlil.cc:3196:NotGate$497
-    connect \A \operation [0]
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $_DFFE_PP_ $auto$ff.cc:266:slice$504
-    connect \Q \CF
-    connect \E $auto$opt_dff.cc:247:make_patterns_logic$505
-    connect \D $0\CF[0:0]
-    connect \C \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $_DFF_P_ $auto$ff.cc:266:slice$289
-    connect \Q \tmp [7]
-    connect \D $0\SF[0:0]
-    connect \C \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $_DFF_P_ $auto$ff.cc:266:slice$288
-    connect \Q \tmp [6]
-    connect \D $0\result[7:0] [6]
-    connect \C \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $_DFF_P_ $auto$ff.cc:266:slice$287
-    connect \Q \tmp [5]
-    connect \D $0\result[7:0] [5]
-    connect \C \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $_DFF_P_ $auto$ff.cc:266:slice$286
-    connect \Q \tmp [4]
-    connect \D $0\result[7:0] [4]
-    connect \C \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $_DFF_P_ $auto$ff.cc:266:slice$285
-    connect \Q \tmp [3]
-    connect \D $0\result[7:0] [3]
-    connect \C \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $_DFF_P_ $auto$ff.cc:266:slice$284
-    connect \Q \tmp [2]
-    connect \D $0\result[7:0] [2]
-    connect \C \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $_DFF_P_ $auto$ff.cc:266:slice$283
-    connect \Q \tmp [1]
-    connect \D $0\result[7:0] [1]
-    connect \C \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $_DFF_P_ $auto$ff.cc:266:slice$282
-    connect \Q \tmp [0]
-    connect \D $0\result[7:0] [0]
-    connect \C \clk
-  end
-  attribute \src "everything.v:17.2-31.5"
-  cell $_DFF_P_ $auto$ff.cc:266:slice$280
-    connect \Q \ZF
-    connect \D $0\ZF[0:0]
-    connect \C \clk
-  end
-  connect $0\result[7:0] [7] $0\SF[0:0]
-  connect $auto$alumacc.cc:495:replace_alu$18.B [0] \B [0]
-  connect $auto$alumacc.cc:495:replace_alu$18.X [8] $auto$alumacc.cc:495:replace_alu$18.BB [8]
-  connect $auto$alumacc.cc:495:replace_alu$18.lcu.G [8] 1'0
-  connect $auto$simplemap.cc:166:logic_reduce$265 [1] $auto$simplemap.cc:125:simplemap_reduce$249 [1]
-  connect { $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [8] $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.BB [0] } { 1'1 $auto$alumacc.cc:495:replace_alu$18.BB [0] }
-  connect { $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [7] $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [0] } { $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.CO [8] $auto$alumacc.cc:495:replace_alu$18.BB [0] }
-  connect $techmap$auto$opt_share.cc:199:merge_operators$24.$auto$alumacc.cc:495:replace_alu$238.Y [0] \B [0]
-  connect \SF \tmp [7]
-  connect \result \tmp [7:0]
-  connect \tmp [8] \CF
-end

From 6b3a7e244037e891dc98774845516b2a1b0c1840 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 20 Sep 2025 00:21:36 +0000
Subject: [PATCH 588/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1a5ecf35b..720fd6323 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+148
+YOSYS_VER := 0.57+153
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 9fa27dae3cc68205eab8d9d06302ace2bc6ddf41 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Sat, 13 Sep 2025 17:15:24 +0300
Subject: [PATCH 589/931] hotfix: fix new log functions being incompatible with
 pyosys

Modify python wrapper generator script with corner-case handlers such that functions that start with `log_formatted` have the format string coerced to `"%s"` and also have an alias without the `_formatted` part.
---
 misc/py_wrap_generator.py | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/misc/py_wrap_generator.py b/misc/py_wrap_generator.py
index ef0862587..e695d1ef0 100644
--- a/misc/py_wrap_generator.py
+++ b/misc/py_wrap_generator.py
@@ -71,7 +71,7 @@ keyword_aliases = {
 
 #These can be used without any explicit conversion
 primitive_types = ["void", "bool", "int", "double", "size_t", "std::string",
-		"string", "State", "char_p", "std::source_location", "source_location"]
+		"string", "string_view", "std::string_view", "State", "char_p", "std::source_location", "source_location"]
 
 from enum import Enum
 
@@ -557,6 +557,7 @@ class Attribute:
 	default_value = None
 	pos = None
 	pos_counter = 0
+	coerce_arg = None
 
 	def __init__(self, wtype, varname, is_const = False, default_value = None):
 		self.wtype = wtype
@@ -566,7 +567,7 @@ class Attribute:
 		self.container = None
 
 	@staticmethod
-	def from_string(str_def, containing_file, line_number):
+	def from_string(str_def, containing_file, line_number, *, owner_fn_name=""):
 		if len(str_def) < 3:
 			return None
 		orig = str_def
@@ -630,6 +631,14 @@ class Attribute:
 			else:
 				arg.wtype.attr_type = attr_types.amp
 				arg.varname = arg.varname[1:]
+
+		# special exception: format strings
+		if arg.wtype.name in ["std::string_view", "string_view"]:
+			if arg.varname == "format":
+				arg.coerce_arg = '"%s"'
+			elif arg.varname == "prefix" and "warning" in owner_fn_name:
+				arg.coerce_arg = '"Warning: "'
+
 		return arg
 
 	#Generates the varname. If the attribute has no name in the header file,
@@ -1391,7 +1400,7 @@ class WFunction:
 		for i, arg in enumerate(args):
 			if arg.strip() == "...":
 				continue
-			parsed = Attribute.from_string(arg.strip(), containing_file, line_number)
+			parsed = Attribute.from_string(arg.strip(), containing_file, line_number, owner_fn_name=func.name)
 			if parsed == None:
 				return None
 			# Only allow std::source_location as defaulted last argument, and
@@ -1431,6 +1440,8 @@ class WFunction:
 			text += "static "
 		text += self.ret_type.gen_text() + " " + self.alias + "("
 		for arg in self.args:
+			if arg.coerce_arg:
+				continue
 			text += arg.gen_listitem()
 			text += ", "
 		if len(self.args) > 0:
@@ -1497,6 +1508,8 @@ class WFunction:
 			text += self.member_of.name + "::"
 		text += self.alias + "("
 		for arg in self.args:
+			if arg.coerce_arg:
+				continue
 			text += arg.gen_listitem()
 			text += ", "
 		if len(self.args) > 0:
@@ -1516,13 +1529,14 @@ class WFunction:
 			if self.ret_type.name in classnames:
 				text += self.ret_type.name + "::get_py_obj("
 		if self.member_of == None:
-			text += "::" + self.namespace + "::" + self.alias + "("
+			text += "::" + self.namespace + "::" + self.name + "("
 		elif self.is_static:
 			text += self.member_of.namespace + "::" + self.member_of.name + "::" + self.name + "("
 		else:
 			text += "this->get_cpp_obj()->" + self.name + "("
 		for arg in self.args:
-			text += arg.gen_call() + ", "
+			text += arg.coerce_arg or arg.gen_call()
+			text += ", "
 		if len(self.args) > 0:
 			text = text[:-2]
 		if self.ret_type.name in classnames:
@@ -1639,6 +1653,8 @@ class WFunction:
 			else:
 				text += "(" + self.member_of.name + "::*)("
 			for a in self.args:
+				if a.coerce_arg:
+					continue
 				text += a.gen_listitem_hash() + ", "
 			if len(self.args) > 0:
 				text = text[0:-2] + f"){self.gen_post_qualifiers(True)}>"
@@ -2122,6 +2138,16 @@ def parse_header(source):
 				if class_ == None:
 					debug("\tFound unowned function \"" + candidate.name + "\" in namespace " + concat_namespace(namespaces),2)
 					unowned_functions.append(candidate)
+
+					# generate log aliases
+					if candidate.name.startswith("log_formatted"):
+						alias = candidate.name.replace("log_formatted", "log")
+						if alias == "log_string":
+							alias = "log"
+						copied_candidate = copy.copy(candidate)
+						copied_candidate.alias = alias
+						unowned_functions.append(copied_candidate)
+
 				else:
 					debug("\t\tFound function \"" + candidate.name + "\" of class \"" + class_[0].name + "\" in namespace " + concat_namespace(namespaces),2)
 					class_[0].found_funs.append(candidate)
@@ -2359,6 +2385,8 @@ def gen_wrappers(filename, debug_level_ = 0):
 #include <boost/iostreams/stream.hpp>
 USING_YOSYS_NAMESPACE
 
+using std::string_view;
+
 namespace YOSYS_PYTHON {
 
 	[[noreturn]] static void log_python_exception_as_error() {

From 1fa5ceee8c57347b9a834ecd3f4a80cf343f91fa Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Mon, 15 Sep 2025 17:02:11 +0300
Subject: [PATCH 590/931] pyosys: restore remaining log functions

Co-authored-by: George Rennie <19538554+georgerennie@users.noreply.github.com>
---
 kernel/log.h              | 5 +++++
 misc/py_wrap_generator.py | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/kernel/log.h b/kernel/log.h
index 78b202159..bd5788758 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -153,6 +153,11 @@ inline void log_warning(FmtString<TypeIdentity<Args>...> fmt, const Args &... ar
 {
 	log_formatted_warning("Warning: ", fmt.format(args...));
 }
+
+inline void log_formatted_warning_noprefix(std::string str)
+{
+	log_formatted_warning("", str);
+}
 template <typename... Args>
 inline void log_warning_noprefix(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
 {
diff --git a/misc/py_wrap_generator.py b/misc/py_wrap_generator.py
index e695d1ef0..aa1406f9b 100644
--- a/misc/py_wrap_generator.py
+++ b/misc/py_wrap_generator.py
@@ -632,12 +632,17 @@ class Attribute:
 				arg.wtype.attr_type = attr_types.amp
 				arg.varname = arg.varname[1:]
 
-		# special exception: format strings
+		# handle string views
 		if arg.wtype.name in ["std::string_view", "string_view"]:
-			if arg.varname == "format":
+			if arg.varname == "format" and owner_fn_name.startswith("log_"):
+				# coerce format strings to "%s" (not bridgable)
 				arg.coerce_arg = '"%s"'
 			elif arg.varname == "prefix" and "warning" in owner_fn_name:
+				# coerce warning prefix to "warning:"
 				arg.coerce_arg = '"Warning: "'
+			else:
+				# boost::python can't bridge string views, so just copy them
+				arg.wtype.name = "string"
 
 		return arg
 

From d60dc93e9223e33b635194ed5efc49c4fb89fc49 Mon Sep 17 00:00:00 2001
From: YRabbit <rabbit@yrabbit.cyou>
Date: Sat, 20 Sep 2025 11:01:25 +1000
Subject: [PATCH 591/931] Gowin. Renaming inputs of the DCS primitive.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The dynamic clock selection (DCS) primitive has undergone changes with
the release of the GW5A series—the CLK0,1,2,3 inputs are now
CLKIN0,1,2,3, but only for GW5A series chips.

There are no functional changes, only renaming.

Here we are transferring the description of the DCS primitive from
general to specialized files for each chip series.

We have also fixed a bug in the generation script that caused the loss
of primitive parameters. Fortunately, this only affected the
analog-to-digital converter, which has not yet been implemented.

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
---
 techlibs/gowin/cells_sim.v       |  8 ---
 techlibs/gowin/cells_xtra.py     |  4 +-
 techlibs/gowin/cells_xtra_gw1n.v |  7 +++
 techlibs/gowin/cells_xtra_gw2a.v | 12 +++++
 techlibs/gowin/cells_xtra_gw5a.v | 84 ++++++++++++++++++++++++++++++++
 5 files changed, 105 insertions(+), 10 deletions(-)

diff --git a/techlibs/gowin/cells_sim.v b/techlibs/gowin/cells_sim.v
index 58a2f52e6..5e6083426 100644
--- a/techlibs/gowin/cells_sim.v
+++ b/techlibs/gowin/cells_sim.v
@@ -1958,14 +1958,6 @@ parameter FREQ_DIV = 100;
 parameter REGULATOR_EN = 1'b0;
 endmodule
 
-(* blackbox *)
-module DCS (CLK0, CLK1, CLK2, CLK3, CLKSEL, SELFORCE, CLKOUT);
-input CLK0, CLK1, CLK2, CLK3, SELFORCE;
-input [3:0] CLKSEL;
-output CLKOUT;
-parameter DCS_MODE = "RISING";
-endmodule
-
 (* blackbox *)
 module EMCU (
   input          FCLK,
diff --git a/techlibs/gowin/cells_xtra.py b/techlibs/gowin/cells_xtra.py
index 7a7c9ac0a..01416268a 100644
--- a/techlibs/gowin/cells_xtra.py
+++ b/techlibs/gowin/cells_xtra.py
@@ -25,7 +25,7 @@ _skip = { # These are already described, no need to extract them from the vendor
           'OSCO', 'OSCW', 'OSCZ', 'OSER10', 'OSER16', 'OSER10', 'OSER4',
           'OSER8', 'OVIDEO', 'PLLVR', 'RAM16S1', 'RAM16S2', 'RAM16S4',
           'RAM16SDP1', 'RAM16SDP2', 'RAM16SDP4', 'rPLL', 'SDP',
-          'SDPX9', 'SP', 'SPX9', 'TBUF', 'TLVDS_OBUF', 'VCC', 'DCS', 'EMCU',
+          'SDPX9', 'SP', 'SPX9', 'TBUF', 'TLVDS_OBUF', 'VCC', 'EMCU',
           # These are not planned for implementation
           'MUX2_MUX8', 'MUX2_MUX16', 'MUX2_MUX32', 'MUX4', 'MUX8', 'MUX16',
           'MUX32', 'DL', 'DLE', 'DLC', 'DLCE', 'DLP', 'DLPE', 'DLN', 'DLNE',
@@ -50,7 +50,7 @@ def xtract_cells_decl(dir, fout):
                     fout.write('\n')
                 if l.rstrip()[-1] != ';':
                     state = State.IN_MODULE_MULTILINE
-            elif l.startswith('parameter') and state == State.IN_MODULE:
+            elif l.lstrip().startswith('parameter') and state == State.IN_MODULE:
                 fout.write(l)
                 if l.rstrip()[-1] == ',':
                     state = State.IN_PARAMETER
diff --git a/techlibs/gowin/cells_xtra_gw1n.v b/techlibs/gowin/cells_xtra_gw1n.v
index abf2c0493..436fda0fa 100644
--- a/techlibs/gowin/cells_xtra_gw1n.v
+++ b/techlibs/gowin/cells_xtra_gw1n.v
@@ -1109,6 +1109,13 @@ parameter IDLE    =  4'd0,
 		  RD_S2   =  4'd12;
 endmodule
 
+module DCS (...);
+input CLK0, CLK1, CLK2, CLK3, SELFORCE;
+input [3:0] CLKSEL;
+output CLKOUT;
+  parameter DCS_MODE = "RISING";  
+endmodule
+
 module DQCE (...);
 input CLKIN;
 input CE;
diff --git a/techlibs/gowin/cells_xtra_gw2a.v b/techlibs/gowin/cells_xtra_gw2a.v
index 5c365f8da..4df48ab64 100644
--- a/techlibs/gowin/cells_xtra_gw2a.v
+++ b/techlibs/gowin/cells_xtra_gw2a.v
@@ -1082,6 +1082,11 @@ input RLOADN, RMOVE, RDIR, WLOADN, WMOVE, WDIR, HOLD;
 output DQSR90, DQSW0, DQSW270; 
 output [2:0] RPOINT, WPOINT;
 output RVALID,RBURST, RFLAG, WFLAG;
+    parameter FIFO_MODE_SEL = 1'b0; 
+    parameter RD_PNTR = 3'b000; 
+    parameter DQS_MODE = "X1"; 
+    parameter HWL = "false";     
+    parameter GSREN = "false"; 
 endmodule
 
 module DLLDLY (...);
@@ -1095,6 +1100,13 @@ parameter DLY_SIGN = 1'b0;
 parameter DLY_ADJ = 0; 
 endmodule
 
+module DCS (...);
+input CLK0, CLK1, CLK2, CLK3, SELFORCE;
+input [3:0] CLKSEL;
+output CLKOUT;
+  parameter DCS_MODE = "RISING";  
+endmodule
+
 module DQCE (...);
 input CLKIN;
 input CE;
diff --git a/techlibs/gowin/cells_xtra_gw5a.v b/techlibs/gowin/cells_xtra_gw5a.v
index c82f6af25..b4df1f33e 100644
--- a/techlibs/gowin/cells_xtra_gw5a.v
+++ b/techlibs/gowin/cells_xtra_gw5a.v
@@ -1143,6 +1143,13 @@ input CE;
 output CLKOUT;
 endmodule
 
+module DCS (...);
+input CLKIN0, CLKIN1, CLKIN2, CLKIN3, SELFORCE;
+input [3:0] CLKSEL;
+output CLKOUT;
+parameter DCS_MODE = "RISING";  
+endmodule
+
 module DDRDLL (...);
 input CLKIN;
 input STOP;
@@ -1714,18 +1721,94 @@ input LOAD;
 endmodule
 
 module ADCLRC (...);
+  parameter DYN_BKEN = "FALSE";
+  parameter BUF_SERDES_Q1_EN = 3'b000;    
+  parameter BUF_BK2_EN       = 6'b000000; 
+  parameter BUF_BK3_EN       = 6'b000000; 
+  parameter BUF_BK4_EN       = 6'b000000; 
+  parameter BUF_BK5_EN       = 6'b000000; 
+  parameter BUF_BK10_EN      = 5'b00000;  
+  parameter BUF_BK11_EN      = 5'b00000;  
+  parameter CLK_SEL          = 1'b0;      
+  parameter PIOCLK_SEL       = 1'b0;      
+  parameter VSEN_CTL         = 3'b000;    
+  parameter VSEN_CTL_SEL     = 1'b0;      
+  parameter ADC_MODE      = 1'b0;      
+  parameter DIV_CTL       = 2'd0;      
+  parameter SAMPLE_CNT_SEL   = 3'd4;      
+  parameter RATE_CHANGE_CTRL = 3'd4;      
 endmodule
 
 module ADCULC (...);
+  parameter DYN_BKEN = "FALSE";
+  parameter BUF_VCC_EN       = 1'b0;      
+  parameter BUF_VCCM_EN      = 1'b0;      
+  parameter BUF_MIPI_M0_EN   = 3'b000;    
+  parameter BUF_MIPI_M1_EN   = 3'b000;    
+  parameter BUF_SERDES_Q0_EN = 3'b000;    
+  parameter BUF_BK6_EN       = 6'b000000; 
+  parameter BUF_BK7_EN       = 6'b000000; 
+  parameter CLK_SEL          = 1'b0;      
+  parameter PIOCLK_SEL       = 1'b0;      
+  parameter VSEN_CTL         = 3'b000;    
+  parameter VSEN_CTL_SEL     = 1'b0;      
+  parameter ADC_MODE      = 1'b0;      
+  parameter DIV_CTL          = 2'd0;      
+  parameter SAMPLE_CNT_SEL   = 3'd4;      
+  parameter RATE_CHANGE_CTRL = 3'd4;      
 endmodule
 
 module ADC (...);
+  parameter CLK_SEL         = 1'b0;      
+  parameter DIV_CTL         = 2'd0;      
+  parameter BUF_EN          = 12'b000000000000; 
+  parameter BUF_BK0_VREF_EN = 1'b0;  
+  parameter BUF_BK1_VREF_EN = 1'b0;  
+  parameter BUF_BK2_VREF_EN = 1'b0;  
+  parameter BUF_BK3_VREF_EN = 1'b0;  
+  parameter BUF_BK4_VREF_EN = 1'b0;  
+  parameter BUF_BK5_VREF_EN = 1'b0;  
+  parameter BUF_BK6_VREF_EN = 1'b0;  
+  parameter BUF_BK7_VREF_EN = 1'b0;  
+  parameter CSR_ADC_MODE      = 1'b1;       
+  parameter CSR_VSEN_CTRL        = 3'd0;       
+  parameter CSR_SAMPLE_CNT_SEL   = 3'd4;       
+  parameter CSR_RATE_CHANGE_CTRL = 3'd4;       
+  parameter CSR_FSCAL            = 10'd730;    
+  parameter CSR_OFFSET           = -12'd1180;  
 endmodule
 
 module ADC_SAR (...);
+  parameter BUF_EN = 29'b0;    
+  parameter CLK_SEL        = 1'b1;     
+  parameter DIV_CTL        = 2'd2;     
+  parameter ADC_EN_SEL     = 1'b0;     
+  parameter PHASE_SEL      = 1'b0;     
+  parameter CSR_ADC_MODE         = 1'b1;          
+  parameter CSR_VSEN_CTRL        = 3'd0;       
+  parameter CSR_SAMPLE_CNT_SEL   = 3'd4;       
+  parameter CSR_RATE_CHANGE_CTRL = 3'd4;       
+  parameter CSR_FSCAL            = 10'd730;    
+  parameter CSR_OFFSET           = -12'd1180;  
+  parameter ADC_CLK_DIV        = 2'b00;     
+  parameter ADC_CLKDIV_EN      = 1'b0;     
+  parameter CLK_SRC_SEL        = 1'b1;     
+  parameter VREF_BUF_EN        = 1'b1;     
+  parameter COUNT_LEN          = 5'b10100; 
+  parameter DAC_SAMPLE_END     = 5'b10010; 
+  parameter DAC_SAMPLE_START   = 5'b01101; 
+  parameter SH_SAMPLE_END      = 5'b01011; 
+  parameter SH_SAMPLE_START    = 5'b00001; 
+  parameter AUTO_CHOP_EN       = 1'b0;     
+  parameter CHOP_CLK_DIV       = 4'b0;     
 endmodule
 
 module LICD (...);
+    parameter   STAGE_NUM = 2'b00;        
+    parameter   ENCDEC_NUM = 2'b00;       
+    parameter   CODE_WIDTH = 2'b00;       
+    parameter   INTERLEAVE_EN = 3'b000;   
+    parameter   INTERLEAVE_MODE = 3'b000;  
 endmodule
 
 module MIPI_DPHY (...);
@@ -2456,6 +2539,7 @@ parameter EQ_ZLD_LN2 = 4'b1000;
 endmodule
 
 module GTR12_QUAD (...);
+    parameter POSITION = "Q0";
 endmodule
 
 module GTR12_UPAR (...);

From b9dc5784119d5ca95847324a64f5a57d9aa66f22 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 21 Sep 2025 00:25:14 +0000
Subject: [PATCH 592/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 720fd6323..4d1a94bc2 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+153
+YOSYS_VER := 0.57+157
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 2de641d051f2246f1cea94dab8a452a7afa4c8d9 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 22 Sep 2025 04:50:36 +0000
Subject: [PATCH 593/931] Don't redirect spawned ABCs' stderr to our pipe.

popen() doesn't do this and we should emulate the behavior of popen() as much as possible.
---
 passes/techmap/abc.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index c17f85afd..06b30b9b3 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -244,10 +244,6 @@ std::optional<AbcProcess> spawn_abc(const char* abc_exe, DeferredLogs &logs) {
 		logs.log_error("posix_spawn_file_actions_adddup2 failed");
 		return std::nullopt;
 	}
-	if (posix_spawn_file_actions_adddup2(&file_actions, from_child_pipe[1], STDERR_FILENO) != 0) {
-		logs.log_error("posix_spawn_file_actions_adddup2 failed");
-		return std::nullopt;
-	}
 	if (posix_spawn_file_actions_addclose(&file_actions, to_child_pipe[0]) != 0) {
 		logs.log_error("posix_spawn_file_actions_addclose failed");
 		return std::nullopt;

From 4fc782ef2b7212b5484c418b72b229e15a62604d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 22 Sep 2025 04:35:48 +0000
Subject: [PATCH 594/931] Make ABC_DONE detection more robust.

1) Change token from ABC_DONE to YOSYS_ABC_DONE to be a bit more robust against false matches.
2) Emit the token from the sourced script so that we don't have to worry about it showing up in the echoing
of the command as it executes. It will only appear in ABC stdout when it executes, i.e. when
our script has completed.
3) `set abcout` doesn't actually switch ABC to line buffering on stdout, since HAVE_SETVBUF is not actually
set in ABC builds in general. So stop using that. ABC does the necessary flushing when
`source` has finished.
---
 passes/techmap/abc.cc | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 06b30b9b3..ff0aa2975 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -1065,6 +1065,9 @@ void AbcModuleState::prepare_module(RTLIL::Design *design, RTLIL::Module *module
 		abc_script += stringf("; dress \"%s/input.blif\"", run_abc.tempdir_name);
 	abc_script += stringf("; write_blif %s/output.blif", run_abc.tempdir_name);
 	abc_script = add_echos_to_abc_cmd(abc_script);
+#if defined(__linux__) && !defined(YOSYS_DISABLE_SPAWN)
+	abc_script += "; echo \"YOSYS_ABC_DONE\"\n";
+#endif
 
 	for (size_t i = 0; i+1 < abc_script.size(); i++)
 		if (abc_script[i] == ';' && abc_script[i+1] == ' ')
@@ -1147,9 +1150,7 @@ bool read_until_abc_done(abc_output_filter &filt, int fd, DeferredLogs &logs) {
 				break;
 			}
 			line.append(start, p + 1 - start);
-			// ABC seems to actually print "ABC_DONE \n", but we probably shouldn't
-			// rely on that extra space being output.
-			if (line.substr(0, 8) == "ABC_DONE") {
+			if (line.substr(0, 14) == "YOSYS_ABC_DONE") {
 				// Ignore any leftover output, there should only be a prompt perhaps
 				return true;
 			}
@@ -1344,12 +1345,8 @@ void RunAbcState::run(ConcurrentStack<AbcProcess> &process_pool)
 			return;
 		}
 		std::string cmd = stringf(
-				// This makes ABC switch stdout to line buffering, which we need
-				// to see our ABC_DONE message.
-				"set abcout /dev/stdout\n"
 				"empty\n"
-				"source %s\n"
-				"echo \"ABC_DONE\"\n", tmp_script_name);
+				"source %s\n", tmp_script_name);
 		int ret = write(process.to_child_pipe, cmd.c_str(), cmd.size());
 		if (ret != static_cast<int>(cmd.size())) {
 			logs.log_error("write failed");

From 7f6fae1f666b2891d1649aa37a07f06df010f9d9 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 19 Sep 2025 04:01:52 +0000
Subject: [PATCH 595/931] Extract ABC results in the order of `assigned_cells`.

Currently the order of extraction can vary based on which ABC runs finish first. That's
nondeterministic, therefore bad. Instead, force the processing to happen in the same order
as `assigned_cells`, i.e. the same order we use when not using parallelism. This should
make everything deterministic.

Note that we still allow ABC runs to complete out of order. Out-of-order results are
just not extracted until all the previous runs have completed and their results
extracted.
---
 passes/techmap/abc.cc | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index c17f85afd..e3426df17 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -293,6 +293,7 @@ struct RunAbcState {
 struct AbcModuleState {
 	RunAbcState run_abc;
 
+	int state_index;
 	int map_autoidx = 0;
 	std::vector<RTLIL::SigBit> signal_bits;
 	dict<RTLIL::SigBit, int> signal_map;
@@ -307,8 +308,8 @@ struct AbcModuleState {
 
 	int undef_bits_lost = 0;
 
-	AbcModuleState(const AbcConfig &config, FfInitVals &initvals)
-		: run_abc(config), initvals(initvals) {}
+	AbcModuleState(const AbcConfig &config, FfInitVals &initvals, int state_index)
+		: run_abc(config), state_index(state_index), initvals(initvals) {}
 	AbcModuleState(AbcModuleState&&) = delete;
 
 	int map_signal(const AbcSigMap &assign_map, RTLIL::SigBit bit, gate_type_t gate_type = G(NONE), int in1 = -1, int in2 = -1, int in3 = -1, int in4 = -1);
@@ -2382,7 +2383,7 @@ struct AbcPass : public Pass {
 				std::vector<RTLIL::Cell*> cells = mod->selected_cells();
 				assign_cell_connection_ports(mod, {&cells}, assign_map);
 
-				AbcModuleState state(config, initvals);
+				AbcModuleState state(config, initvals, 0);
 				state.prepare_module(design, mod, assign_map, cells, dff_mode, clk_str);
 				ConcurrentStack<AbcProcess> process_pool;
 				state.run_abc.run(process_pool);
@@ -2558,7 +2559,6 @@ struct AbcPass : public Pass {
 			int num_worker_threads = ThreadPool::pool_size(1, max_threads);
 			ConcurrentQueue<std::unique_ptr<AbcModuleState>> work_queue(num_worker_threads);
 			ConcurrentQueue<std::unique_ptr<AbcModuleState>> work_finished_queue;
-			int work_finished_count = 0;
 			ConcurrentStack<AbcProcess> process_pool;
 			ThreadPool worker_threads(num_worker_threads, [&](int){
 					while (std::optional<std::unique_ptr<AbcModuleState>> work =
@@ -2568,15 +2568,25 @@ struct AbcPass : public Pass {
 						work_finished_queue.push_back(std::move(*work));
 					}
 				});
+			int state_index = 0;
+			int next_state_index_to_process = 0;
+			std::vector<std::unique_ptr<AbcModuleState>> work_finished_by_index;
+			work_finished_by_index.resize(assigned_cells.size());
+			int work_finished_count = 0;
 			for (auto &it : assigned_cells) {
-				// Process ABC results that have already finished before queueing another ABC.
-				// This should keep our memory usage down.
+				// Make sure we process the results in the order we expect. When we can
+				// process results before the next ABC run, do so, to keep memory usage low(er).
 				while (std::optional<std::unique_ptr<AbcModuleState>> work =
 						work_finished_queue.try_pop_front()) {
-					(*work)->extract(assign_map, design, mod);
+					work_finished_by_index[(*work)->state_index] = std::move(*work);
 					++work_finished_count;
 				}
-				std::unique_ptr<AbcModuleState> state = std::make_unique<AbcModuleState>(config, initvals);
+				while (work_finished_by_index[next_state_index_to_process] != nullptr) {
+					work_finished_by_index[next_state_index_to_process]->extract(assign_map, design, mod);
+					work_finished_by_index[next_state_index_to_process] = nullptr;
+					++next_state_index_to_process;
+				}
+				std::unique_ptr<AbcModuleState> state = std::make_unique<AbcModuleState>(config, initvals, state_index++);
 				state->clk_polarity = std::get<0>(it.first);
 				state->clk_sig = assign_map(std::get<1>(it.first));
 				state->en_polarity = std::get<2>(it.first);
@@ -2595,12 +2605,17 @@ struct AbcPass : public Pass {
 				}
 			}
 			work_queue.close();
-			while (work_finished_count < static_cast<int>(assigned_cells.size())) {
+			while (work_finished_count < GetSize(assigned_cells)) {
 				std::optional<std::unique_ptr<AbcModuleState>> work =
 					work_finished_queue.pop_front();
-				(*work)->extract(assign_map, design, mod);
+				work_finished_by_index[(*work)->state_index] = std::move(*work);
 				++work_finished_count;
 			}
+			while (next_state_index_to_process < GetSize(work_finished_by_index)) {
+				work_finished_by_index[next_state_index_to_process]->extract(assign_map, design, mod);
+				work_finished_by_index[next_state_index_to_process] = nullptr;
+				++next_state_index_to_process;
+			}
 		}
 
 		if (config.cleanup) {

From 93dca50b91ab78b98215216825f58870ddd344a2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 23 Sep 2025 00:22:45 +0000
Subject: [PATCH 596/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1a5d8a093..02f8fa0e9 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+157
+YOSYS_VER := 0.57+178
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 6f7cd637cb36ccecf7d2928ffef7c5a285fa7df1 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 23 Sep 2025 15:02:45 +1200
Subject: [PATCH 597/931] CI: Check repo for YosysHQ specific jobs

Prevents unintended bumps on the flake.lock and Yosys version on forks (provided the forks synchronize their main after this gets merged).
Update version.yml to use the same style of `if` on the job, rather than on specific actions.
Wheels will still build as a cron job, but won't try to upload if it's a fork.
---
 .github/workflows/update-flake-lock.yml | 1 +
 .github/workflows/version.yml           | 8 +++-----
 .github/workflows/wheels.yml            | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
index de7ef04d6..b32498baf 100644
--- a/.github/workflows/update-flake-lock.yml
+++ b/.github/workflows/update-flake-lock.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   lockfile:
+    if: github.repository == 'YosysHQ/Yosys'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
index 26dcba4a4..78d34db46 100644
--- a/.github/workflows/version.yml
+++ b/.github/workflows/version.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   bump-version:
+    if: github.repository == 'YosysHQ/Yosys'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -18,11 +19,8 @@ jobs:
       - name: Take last commit
         id: log
         run: echo "message=$(git log --no-merges -1 --oneline)" >> $GITHUB_OUTPUT
-      - name: Take repository
-        id: repo
-        run: echo "message=$GITHUB_REPOSITORY" >> $GITHUB_OUTPUT
       - name: Bump version
-        if: "!contains(steps.log.outputs.message, 'Bump version') && contains(steps.repo.outputs.message, 'YosysHQ/yosys')"
+        if: ${{ !contains(steps.log.outputs.message, 'Bump version') }}
         run: |
           make bumpversion
           git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
@@ -30,7 +28,7 @@ jobs:
           git add Makefile
           git commit -m "Bump version"
       - name: Push changes # push the output folder to your repo
-        if: "!contains(steps.log.outputs.message, 'Bump version') && contains(steps.repo.outputs.message, 'YosysHQ/yosys')"
+        if: ${{ !contains(steps.log.outputs.message, 'Bump version') }}
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 41d9183fc..2a5b7e024 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -124,6 +124,7 @@ jobs:
           path: ./wheelhouse/*.whl
   upload_wheels:
     name: Upload Wheels
+    if: github.repository == 'YosysHQ/Yosys'
     runs-on: ubuntu-latest
     # Specifying a GitHub environment is optional, but strongly encouraged
     environment: pypi

From effc52fedccca3659f225f3c72f07abc19eeec44 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 23 Sep 2025 03:25:16 +0000
Subject: [PATCH 598/931] Make `ID::` constants be `StaticIdString`s for better
 optimization.

Their internal indexes will be known at compile time, like we already support for the `ID()` macro.
---
 kernel/rtlil.cc | 2 +-
 kernel/rtlil.h  | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 7d53fdd32..35776746d 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -46,7 +46,7 @@ int RTLIL::IdString::last_created_idx_[8];
 int RTLIL::IdString::last_created_idx_ptr_;
 #endif
 
-#define X(N) const RTLIL::IdString RTLIL::ID::N(RTLIL::StaticId::N);
+#define X(_id) const RTLIL::IdString RTLIL::IDInternal::_id(RTLIL::StaticId::_id);
 #include "kernel/constids.inc"
 #undef X
 
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 096d1dfcf..88594859a 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -495,9 +495,14 @@ inline bool RTLIL::IdString::operator!=(const RTLIL::StaticIdString &rhs) const
 }
 
 namespace RTLIL {
-	namespace ID {
+	namespace IDInternal {
 #define X(_id) extern const IdString _id;
 #include "kernel/constids.inc"
+#undef X
+	}
+	namespace ID {
+#define X(_id) constexpr StaticIdString _id(StaticId::_id, IDInternal::_id);
+#include "kernel/constids.inc"
 #undef X
 	}
 }
@@ -508,7 +513,7 @@ struct IdTableEntry {
 };
 
 constexpr IdTableEntry IdTable[] = {
-#define X(_id) {#_id, RTLIL::StaticIdString(RTLIL::StaticId::_id, RTLIL::ID::_id)},
+#define X(_id) {#_id, ID::_id},
 #include "kernel/constids.inc"
 #undef X
 };

From 1e5f920dbddd94a762d07b5dc94a16a3e8c38f89 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 22 Sep 2025 22:04:17 +0000
Subject: [PATCH 599/931] Remove .c_str() from parameters to log_debug()

---
 backends/aiger2/aiger.cc       |  2 +-
 frontends/aiger/aigerparse.cc  |  2 +-
 frontends/rpc/rpc_frontend.cc  |  4 ++--
 kernel/cost.cc                 | 20 ++++++++++----------
 kernel/fstdata.cc              |  4 ++--
 passes/cmds/abstract.cc        |  4 ++--
 passes/cmds/box_derive.cc      |  2 +-
 passes/cmds/linecoverage.cc    |  4 ++--
 passes/memory/memory_libmap.cc | 26 +++++++++++++-------------
 passes/opt/opt_clean.cc        |  8 ++++----
 passes/opt/opt_lut.cc          | 14 +++++++-------
 passes/opt/opt_merge.cc        |  6 +++---
 passes/techmap/clockgate.cc    |  8 ++++----
 passes/techmap/dfflibmap.cc    | 12 ++++++------
 passes/techmap/techmap.cc      | 10 +++++-----
 passes/tests/test_cell.cc      |  2 +-
 techlibs/quicklogic/ql_ioff.cc |  6 +++---
 17 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/backends/aiger2/aiger.cc b/backends/aiger2/aiger.cc
index 05714bc2e..b63e51bde 100644
--- a/backends/aiger2/aiger.cc
+++ b/backends/aiger2/aiger.cc
@@ -1017,7 +1017,7 @@ struct XAigerWriter : AigerWriter {
 			auto &minfo = cursor.leaf_minfo(*this);
 
 			for (auto box : minfo.found_blackboxes) {
-				log_debug(" - %s.%s (type %s): ", cursor.path().c_str(),
+				log_debug(" - %s.%s (type %s): ", cursor.path(),
 						  RTLIL::unescape_id(box->name),
 						  log_id(box->type));
 
diff --git a/frontends/aiger/aigerparse.cc b/frontends/aiger/aigerparse.cc
index 70d94faff..4df37c0cd 100644
--- a/frontends/aiger/aigerparse.cc
+++ b/frontends/aiger/aigerparse.cc
@@ -476,7 +476,7 @@ void AigerReader::parse_xaiger()
 		else if (c == 'n') {
 			parse_xaiger_literal(f);
 			f >> s;
-			log_debug("n: '%s'\n", s.c_str());
+			log_debug("n: '%s'\n", s);
 		}
 		else if (c == 'h') {
 			f.ignore(sizeof(uint32_t));
diff --git a/frontends/rpc/rpc_frontend.cc b/frontends/rpc/rpc_frontend.cc
index 625b2c0e8..c21867b30 100644
--- a/frontends/rpc/rpc_frontend.cc
+++ b/frontends/rpc/rpc_frontend.cc
@@ -83,11 +83,11 @@ struct RpcServer {
 		std::string request;
 		json_request.dump(request);
 		request += '\n';
-		log_debug("RPC frontend request: %s", request.c_str());
+		log_debug("RPC frontend request: %s", request);
 		write(request);
 
 		std::string response = read();
-		log_debug("RPC frontend response: %s", response.c_str());
+		log_debug("RPC frontend response: %s", response);
 		std::string error;
 		Json json_response = Json::parse(response, error);
 		if (json_response.is_null())
diff --git a/kernel/cost.cc b/kernel/cost.cc
index 29787fa52..4942823d3 100644
--- a/kernel/cost.cc
+++ b/kernel/cost.cc
@@ -143,14 +143,14 @@ unsigned int CellCosts::get(RTLIL::Cell *cell)
 		return 1;
 
 	if (design_ && design_->module(cell->type) && cell->parameters.empty()) {
-		log_debug("%s is a module, recurse\n", cell->name.c_str());
+		log_debug("%s is a module, recurse\n", cell->name);
 		return get(design_->module(cell->type));
 	} else if (cell->is_builtin_ff()) {
 		log_assert(cell->hasPort(ID::Q) && "Weird flip flop");
-		log_debug("%s is ff\n", cell->name.c_str());
+		log_debug("%s is ff\n", cell->name);
 		return cell->getParam(ID::WIDTH).as_int();
 	} else if (cell->type.in(ID($mem), ID($mem_v2))) {
-		log_debug("%s is mem\n", cell->name.c_str());
+		log_debug("%s is mem\n", cell->name);
 		return cell->getParam(ID::WIDTH).as_int() * cell->getParam(ID::SIZE).as_int();
 	} else if (y_coef(cell->type)) {
 		// linear with Y_WIDTH or WIDTH
@@ -159,23 +159,23 @@ unsigned int CellCosts::get(RTLIL::Cell *cell)
 		int width = cell->getParam(param).as_int();
 		if (cell->type == ID($demux))
 			width <<= cell->getParam(ID::S_WIDTH).as_int();
-		log_debug("%s Y*coef %d * %d\n", cell->name.c_str(), width, y_coef(cell->type));
+		log_debug("%s Y*coef %d * %d\n", cell->name, width, y_coef(cell->type));
 		return width * y_coef(cell->type);
 	} else if (sum_coef(cell->type)) {
 		// linear with sum of port widths
 		unsigned int sum = port_width_sum(cell);
-		log_debug("%s sum*coef %d * %d\n", cell->name.c_str(), sum, sum_coef(cell->type));
+		log_debug("%s sum*coef %d * %d\n", cell->name, sum, sum_coef(cell->type));
 		return sum * sum_coef(cell->type);
 	} else if (max_inp_coef(cell->type)) {
 		// linear with largest input width
 		unsigned int max = max_inp_width(cell);
-		log_debug("%s max*coef %d * %d\n", cell->name.c_str(), max, max_inp_coef(cell->type));
+		log_debug("%s max*coef %d * %d\n", cell->name, max, max_inp_coef(cell->type));
 		return max * max_inp_coef(cell->type);
 	} else if (is_div_mod(cell->type) || cell->type == ID($mul)) {
 		// quadratic with sum of port widths
 		unsigned int sum = port_width_sum(cell);
 		unsigned int coef = cell->type == ID($mul) ? 3 : 5;
-		log_debug("%s coef*(sum**2) %d * %d\n", cell->name.c_str(), coef, sum * sum);
+		log_debug("%s coef*(sum**2) %d * %d\n", cell->name, coef, sum * sum);
 		return coef * sum * sum;
 	} else if (cell->type.in(ID($macc), ID($macc_v2))) {
 		// quadratic per term
@@ -196,15 +196,15 @@ unsigned int CellCosts::get(RTLIL::Cell *cell)
 	} else if (cell->type == ID($lut)) {
 		int width = cell->getParam(ID::WIDTH).as_int();
 		unsigned int cost = 1U << (unsigned int)width;
-		log_debug("%s is 2**%d\n", cell->name.c_str(), width);
+		log_debug("%s is 2**%d\n", cell->name, width);
 		return cost;
 	} else if (cell->type == ID($sop)) {
 		int width = cell->getParam(ID::WIDTH).as_int();
 		int depth = cell->getParam(ID::DEPTH).as_int();
-		log_debug("%s is (2*%d + 1)*%d\n", cell->name.c_str(), width, depth);
+		log_debug("%s is (2*%d + 1)*%d\n", cell->name, width, depth);
 		return (2 * width + 1) * depth;
 	} else if (is_free(cell->type)) {
-		log_debug("%s is free\n", cell->name.c_str());
+		log_debug("%s is free\n", cell->name);
 		return 0;
 	}
 	// TODO: $fsm
diff --git a/kernel/fstdata.cc b/kernel/fstdata.cc
index cc558d418..f0f00181c 100644
--- a/kernel/fstdata.cc
+++ b/kernel/fstdata.cc
@@ -162,7 +162,7 @@ void FstData::extractVarNames()
 					char *endptr;
 					int mem_addr = strtol(addr.c_str(), &endptr, 16);
 					if (*endptr) {
-						log_debug("Error parsing memory address in : %s\n", clean_name.c_str());
+						log_debug("Error parsing memory address in : %s\n", clean_name);
 					} else {
 						memory_to_handle[var.scope+"."+mem_cell][mem_addr] = var.id;
 					}
@@ -176,7 +176,7 @@ void FstData::extractVarNames()
 					char *endptr;
 					int mem_addr = strtol(addr.c_str(), &endptr, 10);
 					if (*endptr) {
-						log_debug("Error parsing memory address in : %s\n", clean_name.c_str());
+						log_debug("Error parsing memory address in : %s\n", clean_name);
 					} else {
 						memory_to_handle[var.scope+"."+mem_cell][mem_addr] = var.id;
 					}
diff --git a/passes/cmds/abstract.cc b/passes/cmds/abstract.cc
index 88f07a5aa..2ea71268b 100644
--- a/passes/cmds/abstract.cc
+++ b/passes/cmds/abstract.cc
@@ -156,9 +156,9 @@ dict<SigBit, std::vector<SelReason>> gather_selected_reps(Module* mod, const std
 void explain_selections(const std::vector<SelReason>& reasons) {
 	for (std::variant<Wire*, Cell*> reason : reasons) {
 		if (Cell** cell_reason = std::get_if<Cell*>(&reason))
-			log_debug("\tcell %s\n", (*cell_reason)->name.c_str());
+			log_debug("\tcell %s\n", (*cell_reason)->name);
 		else if (Wire** wire_reason = std::get_if<Wire*>(&reason))
-			log_debug("\twire %s\n", (*wire_reason)->name.c_str());
+			log_debug("\twire %s\n", (*wire_reason)->name);
 		else
 			log_assert(false && "insane reason variant\n");
 	}
diff --git a/passes/cmds/box_derive.cc b/passes/cmds/box_derive.cc
index da698b04d..a0faacc9a 100644
--- a/passes/cmds/box_derive.cc
+++ b/passes/cmds/box_derive.cc
@@ -96,7 +96,7 @@ struct BoxDerivePass : Pass {
 				IdString derived_type = base->derive(d, cell->parameters);
 				Module *derived = d->module(derived_type);
 				log_assert(derived && "Failed to derive module\n");
-				log_debug("derived %s\n", derived_type.c_str());
+				log_debug("derived %s\n", derived_type);
 
 				if (!naming_attr.empty() && derived->has_attribute(naming_attr)) {
 					IdString new_name = RTLIL::escape_id(derived->get_string_attribute(naming_attr));
diff --git a/passes/cmds/linecoverage.cc b/passes/cmds/linecoverage.cc
index 6898f33f5..26adcce76 100644
--- a/passes/cmds/linecoverage.cc
+++ b/passes/cmds/linecoverage.cc
@@ -95,7 +95,7 @@ struct CoveragePass : public Pass {
 		{
 			log_debug("Module %s:\n", log_id(module));
 			for (auto wire: module->wires()) {
-				log_debug("%s\t%s\t%s\n", module->selected(wire) ? "*" : " ", wire->get_src_attribute().c_str(), log_id(wire->name));
+				log_debug("%s\t%s\t%s\n", module->selected(wire) ? "*" : " ", wire->get_src_attribute(), log_id(wire->name));
 				for (auto src: wire->get_strpool_attribute(ID::src)) {
 					auto filename = extract_src_filename(src);
 					if (filename.empty()) continue;
@@ -109,7 +109,7 @@ struct CoveragePass : public Pass {
 				}
 			}
 			for (auto cell: module->cells()) {
-				log_debug("%s\t%s\t%s\n", module->selected(cell) ? "*" : " ", cell->get_src_attribute().c_str(), log_id(cell->name));
+				log_debug("%s\t%s\t%s\n", module->selected(cell) ? "*" : " ", cell->get_src_attribute(), log_id(cell->name));
 				for (auto src: cell->get_strpool_attribute(ID::src)) {
 					auto filename = extract_src_filename(src);
 					if (filename.empty()) continue;
diff --git a/passes/memory/memory_libmap.cc b/passes/memory/memory_libmap.cc
index 0fb4608b1..c3c10363b 100644
--- a/passes/memory/memory_libmap.cc
+++ b/passes/memory/memory_libmap.cc
@@ -392,7 +392,7 @@ void MemMapping::dump_configs(int stage) {
 void MemMapping::dump_config(MemConfig &cfg) {
 	log_debug("- %s:\n", log_id(cfg.def->id));
 	for (auto &it: cfg.def->options)
-		log_debug("  - option %s %s\n", it.first.c_str(), log_const(it.second));
+		log_debug("  - option %s %s\n", it.first, log_const(it.second));
 	log_debug("  - emulation score: %d\n", cfg.score_emu);
 	log_debug("  - replicates (for ports): %d\n", cfg.repl_port);
 	log_debug("  - replicates (for data): %d\n", cfg.repl_d);
@@ -403,7 +403,7 @@ void MemMapping::dump_config(MemConfig &cfg) {
 	for (int x: cfg.def->dbits)
 		os << " " << x;
 	std::string dbits_s = os.str();
-	log_debug("  - abits %d dbits%s\n", cfg.def->abits, dbits_s.c_str());
+	log_debug("  - abits %d dbits%s\n", cfg.def->abits, dbits_s);
 	if (cfg.def->byte != 0)
 		log_debug("  - byte width %d\n", cfg.def->byte);
 	log_debug("  - chosen base width %d\n", cfg.def->dbits[cfg.base_width_log2]);
@@ -414,25 +414,25 @@ void MemMapping::dump_config(MemConfig &cfg) {
 		else
 			os << " " << x;
 	std::string swizzle_s = os.str();
-	log_debug("  - swizzle%s\n", swizzle_s.c_str());
+	log_debug("  - swizzle%s\n", swizzle_s);
 	os.str("");
 	for (int i = 0; (1 << i) <= cfg.hard_wide_mask; i++)
 		if (cfg.hard_wide_mask & 1 << i)
 			os << " " << i;
 	std::string wide_s = os.str();
 	if (cfg.hard_wide_mask)
-		log_debug("  - hard wide bits%s\n", wide_s.c_str());
+		log_debug("  - hard wide bits%s\n", wide_s);
 	if (cfg.emu_read_first)
 		log_debug("  - emulate read-first behavior\n");
 	for (int i = 0; i < GetSize(mem.wr_ports); i++) {
 		auto &pcfg = cfg.wr_ports[i];
 		if (pcfg.rd_port == -1)
-			log_debug("  - write port %d: port group %s\n", i, cfg.def->port_groups[pcfg.port_group].names[0].c_str());
+			log_debug("  - write port %d: port group %s\n", i, cfg.def->port_groups[pcfg.port_group].names[0]);
 		else
-			log_debug("  - write port %d: port group %s (shared with read port %d)\n", i, cfg.def->port_groups[pcfg.port_group].names[0].c_str(), pcfg.rd_port);
+			log_debug("  - write port %d: port group %s (shared with read port %d)\n", i, cfg.def->port_groups[pcfg.port_group].names[0], pcfg.rd_port);
 
 		for (auto &it: pcfg.def->options)
-			log_debug("    - option %s %s\n", it.first.c_str(), log_const(it.second));
+			log_debug("    - option %s %s\n", it.first, log_const(it.second));
 		if (cfg.def->width_mode == WidthMode::PerPort) {
 			std::stringstream os;
 			for (int i = pcfg.def->min_wr_wide_log2; i <= pcfg.def->max_wr_wide_log2; i++)
@@ -441,7 +441,7 @@ void MemMapping::dump_config(MemConfig &cfg) {
 			const char *note = "";
 			if (pcfg.rd_port != -1)
 				note = pcfg.def->width_tied ? " (tied)" : " (independent)";
-			log_debug("    - widths%s%s\n", widths_s.c_str(), note);
+			log_debug("    - widths%s%s\n", widths_s, note);
 		}
 		for (auto i: pcfg.emu_prio)
 			log_debug("    - emulate priority over write port %d\n", i);
@@ -449,11 +449,11 @@ void MemMapping::dump_config(MemConfig &cfg) {
 	for (int i = 0; i < GetSize(mem.rd_ports); i++) {
 		auto &pcfg = cfg.rd_ports[i];
 		if (pcfg.wr_port == -1)
-			log_debug("  - read port %d: port group %s\n", i, cfg.def->port_groups[pcfg.port_group].names[0].c_str());
+			log_debug("  - read port %d: port group %s\n", i, cfg.def->port_groups[pcfg.port_group].names[0]);
 		else
-			log_debug("  - read port %d: port group %s (shared with write port %d)\n", i, cfg.def->port_groups[pcfg.port_group].names[0].c_str(), pcfg.wr_port);
+			log_debug("  - read port %d: port group %s (shared with write port %d)\n", i, cfg.def->port_groups[pcfg.port_group].names[0], pcfg.wr_port);
 		for (auto &it: pcfg.def->options)
-			log_debug("    - option %s %s\n", it.first.c_str(), log_const(it.second));
+			log_debug("    - option %s %s\n", it.first, log_const(it.second));
 		if (cfg.def->width_mode == WidthMode::PerPort) {
 			std::stringstream os;
 			for (int i = pcfg.def->min_rd_wide_log2; i <= pcfg.def->max_rd_wide_log2; i++)
@@ -462,7 +462,7 @@ void MemMapping::dump_config(MemConfig &cfg) {
 			const char *note = "";
 			if (pcfg.wr_port != -1)
 				note = pcfg.def->width_tied ? " (tied)" : " (independent)";
-			log_debug("    - widths%s%s\n", widths_s.c_str(), note);
+			log_debug("    - widths%s%s\n", widths_s, note);
 		}
 		if (pcfg.emu_sync)
 			log_debug("    - emulate data register\n");
@@ -2242,7 +2242,7 @@ struct MemoryLibMapPass : public Pass {
 				if (!map.logic_ok) {
 					if (map.cfgs.empty()) {
 						log_debug("Rejected candidates for mapping memory %s.%s:\n", log_id(module->name), log_id(mem.memid));
-						log_debug("%s", map.rejected_cfg_debug_msgs.c_str());
+						log_debug("%s", map.rejected_cfg_debug_msgs);
 						log_error("no valid mapping found for memory %s.%s\n", log_id(module->name), log_id(mem.memid));
 					}
 					idx = 0;
diff --git a/passes/opt/opt_clean.cc b/passes/opt/opt_clean.cc
index a254dc915..dc3f015cd 100644
--- a/passes/opt/opt_clean.cc
+++ b/passes/opt/opt_clean.cc
@@ -204,7 +204,7 @@ void rmunused_module_cells(Module *module, bool verbose)
 
 	for (auto cell : unused) {
 		if (verbose)
-			log_debug("  removing unused `%s' cell `%s'.\n", cell->type.c_str(), cell->name.c_str());
+			log_debug("  removing unused `%s' cell `%s'.\n", cell->type, cell->name);
 		module->design->scratchpad_set_bool("opt.did_something", true);
 		if (cell->is_builtin_ff())
 			ffinit.remove_init(cell->getPort(ID::Q));
@@ -215,7 +215,7 @@ void rmunused_module_cells(Module *module, bool verbose)
 	for (auto it : mem_unused)
 	{
 		if (verbose)
-			log_debug("  removing unused memory `%s'.\n", it.c_str());
+			log_debug("  removing unused memory `%s'.\n", it);
 		delete module->memories.at(it);
 		module->memories.erase(it);
 	}
@@ -496,7 +496,7 @@ bool rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos
 	int del_temp_wires_count = 0;
 	for (auto wire : del_wires_queue) {
 		if (ys_debug() || (check_public_name(wire->name) && verbose))
-			log_debug("  removing unused non-port wire %s.\n", wire->name.c_str());
+			log_debug("  removing unused non-port wire %s.\n", wire->name);
 		else
 			del_temp_wires_count++;
 	}
@@ -636,7 +636,7 @@ void rmunused_module(RTLIL::Module *module, bool purge_mode, bool verbose, bool
 	}
 	for (auto cell : delcells) {
 		if (verbose)
-			log_debug("  removing buffer cell `%s': %s = %s\n", cell->name.c_str(),
+			log_debug("  removing buffer cell `%s': %s = %s\n", cell->name,
 					log_signal(cell->getPort(ID::Y)), log_signal(cell->getPort(ID::A)));
 		module->remove(cell);
 	}
diff --git a/passes/opt/opt_lut.cc b/passes/opt/opt_lut.cc
index 37ae38225..c0a017748 100644
--- a/passes/opt/opt_lut.cc
+++ b/passes/opt/opt_lut.cc
@@ -162,7 +162,7 @@ struct OptLutWorker
 					{
 						if (lut_width <= dlogic_conn.first)
 						{
-							log_debug("  LUT has illegal connection to %s cell %s.%s.\n", lut_dlogic.second->type.c_str(), log_id(module), log_id(lut_dlogic.second));
+							log_debug("  LUT has illegal connection to %s cell %s.%s.\n", lut_dlogic.second->type, log_id(module), log_id(lut_dlogic.second));
 							log_debug("    LUT input A[%d] not present.\n", dlogic_conn.first);
 							legal = false;
 							break;
@@ -173,8 +173,8 @@ struct OptLutWorker
 
 						if (sigmap(lut_input[dlogic_conn.first]) != sigmap(lut_dlogic.second->getPort(dlogic_conn.second)[0]))
 						{
-							log_debug("  LUT has illegal connection to %s cell %s.%s.\n", lut_dlogic.second->type.c_str(), log_id(module), log_id(lut_dlogic.second));
-							log_debug("    LUT input A[%d] (wire %s) not connected to %s port %s (wire %s).\n", dlogic_conn.first, log_signal(lut_input[dlogic_conn.first]), lut_dlogic.second->type.c_str(), dlogic_conn.second.c_str(), log_signal(lut_dlogic.second->getPort(dlogic_conn.second)));
+							log_debug("  LUT has illegal connection to %s cell %s.%s.\n", lut_dlogic.second->type, log_id(module), log_id(lut_dlogic.second));
+							log_debug("    LUT input A[%d] (wire %s) not connected to %s port %s (wire %s).\n", dlogic_conn.first, log_signal(lut_input[dlogic_conn.first]), lut_dlogic.second->type, dlogic_conn.second, log_signal(lut_dlogic.second->getPort(dlogic_conn.second)));
 							legal = false;
 							break;
 						}
@@ -182,7 +182,7 @@ struct OptLutWorker
 
 					if (legal)
 					{
-						log_debug("  LUT has legal connection to %s cell %s.%s.\n", lut_dlogic.second->type.c_str(), log_id(module), log_id(lut_dlogic.second));
+						log_debug("  LUT has legal connection to %s cell %s.%s.\n", lut_dlogic.second->type, log_id(module), log_id(lut_dlogic.second));
 						lut_legal_dlogics.insert(lut_dlogic);
 						for (auto &dlogic_conn : dlogic_map)
 							lut_dlogic_inputs.insert(dlogic_conn.first);
@@ -496,9 +496,9 @@ struct OptLutWorker
 						lutM_new_table.set(eval, (RTLIL::State) evaluate_lut(lutB, eval_inputs));
 					}
 
-					log_debug("  Cell A truth table: %s.\n", lutA->getParam(ID::LUT).as_string().c_str());
-					log_debug("  Cell B truth table: %s.\n", lutB->getParam(ID::LUT).as_string().c_str());
-					log_debug("  Merged truth table: %s.\n", lutM_new_table.as_string().c_str());
+					log_debug("  Cell A truth table: %s.\n", lutA->getParam(ID::LUT).as_string());
+					log_debug("  Cell B truth table: %s.\n", lutB->getParam(ID::LUT).as_string());
+					log_debug("  Merged truth table: %s.\n", lutM_new_table.as_string());
 
 					lutM->setParam(ID::LUT, lutM_new_table);
 					lutM->setPort(ID::A, lutM_new_inputs);
diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index 1cb499740..541459c27 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -300,11 +300,11 @@ struct OptMergeWorker
 					}
 
 					did_something = true;
-					log_debug("  Cell `%s' is identical to cell `%s'.\n", cell->name.c_str(), other_cell->name.c_str());
+					log_debug("  Cell `%s' is identical to cell `%s'.\n", cell->name, other_cell->name);
 					for (auto &it : cell->connections()) {
 						if (cell->output(it.first)) {
 							RTLIL::SigSpec other_sig = other_cell->getPort(it.first);
-							log_debug("    Redirecting output %s: %s = %s\n", it.first.c_str(),
+							log_debug("    Redirecting output %s: %s = %s\n", it.first,
 									log_signal(it.second), log_signal(other_sig));
 							Const init = initvals(other_sig);
 							initvals.remove_init(it.second);
@@ -314,7 +314,7 @@ struct OptMergeWorker
 							initvals.set_init(other_sig, init);
 						}
 					}
-					log_debug("    Removing %s cell `%s' from module `%s'.\n", cell->type.c_str(), cell->name.c_str(), module->name.c_str());
+					log_debug("    Removing %s cell `%s' from module `%s'.\n", cell->type, cell->name, module->name);
 					module->remove(cell);
 					total_count++;
 				}
diff --git a/passes/techmap/clockgate.cc b/passes/techmap/clockgate.cc
index f4e0b0f03..7c6ca5551 100644
--- a/passes/techmap/clockgate.cc
+++ b/passes/techmap/clockgate.cc
@@ -85,7 +85,7 @@ static std::pair<std::optional<ClockGateCell>, std::optional<ClockGateCell>>
 			continue;
 		}
 
-		log_debug("maybe valid icg: %s\n", cell_name.c_str());
+		log_debug("maybe valid icg: %s\n", cell_name);
 		ClockGateCell icg_interface;
 		icg_interface.name = RTLIL::escape_id(cell_name);
 
@@ -162,9 +162,9 @@ static std::pair<std::optional<ClockGateCell>, std::optional<ClockGateCell>>
 			winning = cost < goal;
 
 			if (winning)
-				log_debug("%s beats %s\n", icg_interface.name.c_str(), icg_to_beat->name.c_str());
+				log_debug("%s beats %s\n", icg_interface.name, icg_to_beat->name);
 		} else {
-			log_debug("%s is the first of its polarity\n", icg_interface.name.c_str());
+			log_debug("%s is the first of its polarity\n", icg_interface.name);
 			winning = true;
 		}
 		if (winning) {
@@ -395,7 +395,7 @@ struct ClockgatePass : public Pass {
 				if (!it->second.new_net)
 					continue;
 
-				log_debug("Fix up FF %s\n", cell->name.c_str());
+				log_debug("Fix up FF %s\n", cell->name);
 				// Now we start messing with the design
 				ff.has_ce = false;
 				// Construct the clock gate
diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index 062a63ec3..f3b96aeec 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -117,11 +117,11 @@ static bool parse_next_state(const LibertyAst *cell, const LibertyAst *attr, std
 	// the next_state variable isn't just a pin name; perhaps this is an enable?
 	auto helper = LibertyExpression::Lexer(expr);
 	auto tree = LibertyExpression::parse(helper);
-	// log_debug("liberty expression:\n%s\n", tree.str().c_str());
+	// log_debug("liberty expression:\n%s\n", tree.str());
 
 	if (tree.kind == LibertyExpression::Kind::EMPTY) {
 		if (!warned_cells.count(cell_name)) {
-			log_debug("Invalid expression '%s' in next_state attribute of cell '%s' - skipping.\n", expr.c_str(), cell_name.c_str());
+			log_debug("Invalid expression '%s' in next_state attribute of cell '%s' - skipping.\n", expr, cell_name);
 			warned_cells.insert(cell_name);
 		}
 		return false;
@@ -140,7 +140,7 @@ static bool parse_next_state(const LibertyAst *cell, const LibertyAst *attr, std
 	// position that gives better diagnostics here.
 	if (!pin_names.count(ff_output)) {
 		if (!warned_cells.count(cell_name)) {
-			log_debug("Inference failed on expression '%s' in next_state attribute of cell '%s' because it does not contain ff output '%s' - skipping.\n", expr.c_str(), cell_name.c_str(), ff_output.c_str());
+			log_debug("Inference failed on expression '%s' in next_state attribute of cell '%s' because it does not contain ff output '%s' - skipping.\n", expr, cell_name, ff_output);
 			warned_cells.insert(cell_name);
 		}
 		return false;
@@ -189,7 +189,7 @@ static bool parse_next_state(const LibertyAst *cell, const LibertyAst *attr, std
 	}
 
 	if (!warned_cells.count(cell_name)) {
-		log_debug("Inference failed on expression '%s' in next_state attribute of cell '%s' because it does not evaluate to an enable flop - skipping.\n", expr.c_str(), cell_name.c_str());
+		log_debug("Inference failed on expression '%s' in next_state attribute of cell '%s' because it does not evaluate to an enable flop - skipping.\n", expr, cell_name);
 		warned_cells.insert(cell_name);
 	}
 	return false;
@@ -225,10 +225,10 @@ static bool parse_pin(const LibertyAst *cell, const LibertyAst *attr, std::strin
        For now, we'll simply produce a warning to let the user know something is up.
 	*/
 	if (pin_name.find_first_of("^*|&") == std::string::npos) {
-		log_debug("Malformed liberty file - cannot find pin '%s' in cell '%s' - skipping.\n", pin_name.c_str(), cell->args[0].c_str());
+		log_debug("Malformed liberty file - cannot find pin '%s' in cell '%s' - skipping.\n", pin_name, cell->args[0]);
 	}
 	else {
-		log_debug("Found unsupported expression '%s' in pin attribute of cell '%s' - skipping.\n", pin_name.c_str(), cell->args[0].c_str());
+		log_debug("Found unsupported expression '%s' in pin attribute of cell '%s' - skipping.\n", pin_name, cell->args[0]);
 	}
 
 	return false;
diff --git a/passes/techmap/techmap.cc b/passes/techmap/techmap.cc
index 281a8795a..b49a40704 100644
--- a/passes/techmap/techmap.cc
+++ b/passes/techmap/techmap.cc
@@ -582,7 +582,7 @@ struct TechmapWorker
 							log_msg_cache.insert(msg);
 							log("%s\n", msg);
 						}
-						log_debug("%s %s.%s (%s) to %s.\n", mapmsg_prefix.c_str(), log_id(module), log_id(cell), log_id(cell->type), log_id(extmapper_module));
+						log_debug("%s %s.%s (%s) to %s.\n", mapmsg_prefix, log_id(module), log_id(cell), log_id(cell->type), log_id(extmapper_module));
 					}
 					else
 					{
@@ -591,7 +591,7 @@ struct TechmapWorker
 							log_msg_cache.insert(msg);
 							log("%s\n", msg);
 						}
-						log_debug("%s %s.%s (%s) with %s.\n", mapmsg_prefix.c_str(), log_id(module), log_id(cell), log_id(cell->type), extmapper_name.c_str());
+						log_debug("%s %s.%s (%s) with %s.\n", mapmsg_prefix, log_id(module), log_id(cell), log_id(cell->type), extmapper_name);
 
 						if (extmapper_name == "simplemap") {
 							if (simplemap_mappers.count(cell->type) == 0)
@@ -943,7 +943,7 @@ struct TechmapWorker
 						module_queue.insert(m);
 					}
 
-					log_debug("%s %s.%s to imported %s.\n", mapmsg_prefix.c_str(), log_id(module), log_id(cell), log_id(m_name));
+					log_debug("%s %s.%s to imported %s.\n", mapmsg_prefix, log_id(module), log_id(cell), log_id(m_name));
 					cell->type = m_name;
 					cell->parameters.clear();
 				}
@@ -954,7 +954,7 @@ struct TechmapWorker
 						log_msg_cache.insert(msg);
 						log("%s\n", msg);
 					}
-					log_debug("%s %s.%s (%s) using %s.\n", mapmsg_prefix.c_str(), log_id(module), log_id(cell), log_id(cell->type), log_id(tpl));
+					log_debug("%s %s.%s (%s) using %s.\n", mapmsg_prefix, log_id(module), log_id(cell), log_id(cell->type), log_id(tpl));
 					techmap_module_worker(design, module, cell, tpl);
 					cell = nullptr;
 				}
@@ -1285,7 +1285,7 @@ struct TechmapPass : public Pass {
 			std::string maps = "";
 			for (auto &map : i.second)
 				maps += stringf(" %s", log_id(map));
-			log_debug("    %s:%s\n", log_id(i.first), maps.c_str());
+			log_debug("    %s:%s\n", log_id(i.first), maps);
 		}
 		log_debug("\n");
 
diff --git a/passes/tests/test_cell.cc b/passes/tests/test_cell.cc
index 9603956a8..73af155bd 100644
--- a/passes/tests/test_cell.cc
+++ b/passes/tests/test_cell.cc
@@ -1185,7 +1185,7 @@ struct TestCellPass : public Pass {
 							// Expected to run once
 							int num_cells_estimate = costs.get(uut);
 							if (num_cells <= num_cells_estimate) {
-								log_debug("Correct upper bound for %s: %d <= %d\n", cell_type.c_str(), num_cells, num_cells_estimate);
+								log_debug("Correct upper bound for %s: %d <= %d\n", cell_type, num_cells, num_cells_estimate);
 							} else {
 								failed++;
 								if (worst_abs < num_cells - num_cells_estimate) {
diff --git a/techlibs/quicklogic/ql_ioff.cc b/techlibs/quicklogic/ql_ioff.cc
index 87b62e855..5574ef4a0 100644
--- a/techlibs/quicklogic/ql_ioff.cc
+++ b/techlibs/quicklogic/ql_ioff.cc
@@ -42,7 +42,7 @@ struct QlIoffPass : public Pass {
 
 		for (auto cell : module->selected_cells()) {
 			if (cell->type.in(ID(dffsre), ID(sdffsre))) {
-				log_debug("Checking cell %s.\n", cell->name.c_str());
+				log_debug("Checking cell %s.\n", cell->name);
 				bool e_const = cell->getPort(ID::E).is_fully_ones();
 				bool r_const = cell->getPort(ID::R).is_fully_ones();
 				bool s_const = cell->getPort(ID::S).is_fully_ones();
@@ -55,7 +55,7 @@ struct QlIoffPass : public Pass {
 				SigSpec d = cell->getPort(ID::D);
 				log_assert(GetSize(d) == 1);
 				if (modwalker.has_inputs(d)) {
-					log_debug("Cell %s is potentially eligible for promotion to input IOFF.\n", cell->name.c_str());
+					log_debug("Cell %s is potentially eligible for promotion to input IOFF.\n", cell->name);
 					// check that d_sig has no other consumers
 					pool<ModWalker::PortBit> portbits;
 					modwalker.get_consumers(portbits, d);
@@ -70,7 +70,7 @@ struct QlIoffPass : public Pass {
 				SigSpec q = cell->getPort(ID::Q);
 				log_assert(GetSize(q) == 1);
 				if (modwalker.has_outputs(q) && !modwalker.has_consumers(q)) {
-					log_debug("Cell %s is potentially eligible for promotion to output IOFF.\n", cell->name.c_str());
+					log_debug("Cell %s is potentially eligible for promotion to output IOFF.\n", cell->name);
 					for (SigBit bit : output_bit_aliases[modwalker.sigmap(q)]) {
 						log_assert(bit.is_wire());
 						output_ffs[bit.wire][bit.offset] = cell;

From 398e5d4bf0b02cda6c404c5820d73ed2ce9cc84d Mon Sep 17 00:00:00 2001
From: George Rennie <georgerennie@gmail.com>
Date: Tue, 23 Sep 2025 14:34:20 +0100
Subject: [PATCH 600/931] docs typo: -dump-cmds-json

---
 docs/source/cmd/index_internal.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/cmd/index_internal.rst b/docs/source/cmd/index_internal.rst
index bfb369dde..ab9c13aba 100644
--- a/docs/source/cmd/index_internal.rst
+++ b/docs/source/cmd/index_internal.rst
@@ -67,7 +67,7 @@ The ``formatted_help()`` method
 Dumping command help to json
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-- `help -dump-cells-json cmds.json`
+- `help -dump-cmds-json cmds.json`
 
   + generates a ``ContentListing`` for each command registered in Yosys
   + tries to parse unformatted ``Pass::help()`` output if

From d30f7847d84f015f0f71895f3586fe7da4eb5520 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 7 Apr 2025 13:16:49 +0200
Subject: [PATCH 601/931] techmap: map $alu to $fa instead of relying on
 extract_fa

---
 techlibs/common/techmap.v | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/techlibs/common/techmap.v b/techlibs/common/techmap.v
index 7a9ad7693..c3364e628 100644
--- a/techlibs/common/techmap.v
+++ b/techlibs/common/techmap.v
@@ -283,9 +283,16 @@ module _90_alu (A, B, CI, BI, X, Y, CO);
 	\$pos #(.A_SIGNED(A_SIGNED), .A_WIDTH(A_WIDTH), .Y_WIDTH(Y_WIDTH)) A_conv (.A(A), .Y(A_buf));
 	\$pos #(.A_SIGNED(B_SIGNED), .A_WIDTH(B_WIDTH), .Y_WIDTH(Y_WIDTH)) B_conv (.A(B), .Y(B_buf));
 
-	\$lcu #(.WIDTH(Y_WIDTH)) lcu (.P(X), .G(AA & BB), .CI(CI), .CO(CO));
+	(* force_downto *)
+	wire [Y_WIDTH-1:0] P;
+	wire [Y_WIDTH-1:0] G;
+	wire [Y_WIDTH-1:0] Cnull;
+	assign Cnull = 1'b0;
 
-	assign X = AA ^ BB;
+	\$fa #(.WIDTH(Y_WIDTH)) fa (.A(AA), .B(BB), .C(Cnull), .X(G), .Y(P));
+	\$lcu #(.WIDTH(Y_WIDTH)) lcu (.P(P), .G(G), .CI(CI), .CO(CO));
+
+	assign X = P;
 	assign Y = X ^ {CO, CI};
 endmodule
 

From fcc3d7132d39ab9e03a927b72c55ebdfbfcd270d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miodrag=20Milanovi=C4=87?= <mmicko@gmail.com>
Date: Tue, 23 Sep 2025 17:10:18 +0200
Subject: [PATCH 602/931] Fix building and running unit tests (#5374)

* Fix building and running unit tests

* Enable unit tests

* Add gtest always

* test-sanitizers.yml: Use makefile.conf

* proper test setup

* make it run on macOS

* Run libyosys build only for unit tests after testing is done

* Disable LTO on public CI

---------

Co-authored-by: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
---
 .github/actions/setup-build-env/action.yml |  2 +-
 .github/workflows/prepare-docs.yml         |  2 +-
 .github/workflows/test-build.yml           |  2 +-
 .github/workflows/test-sanitizers.yml      |  9 +++--
 .github/workflows/test-verific.yml         |  5 +++
 Brewfile                                   |  1 +
 tests/unit/Makefile                        | 42 +++++++++++++++++-----
 tests/unit/kernel/rtlilTest.cc             |  3 ++
 8 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 1c2386b06..e4bc8ec58 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -8,7 +8,7 @@ runs:
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install gperf build-essential bison flex libfl-dev libreadline-dev gawk tcl-dev libffi-dev git graphviz xdot pkg-config python3 libboost-system-dev libboost-python-dev libboost-filesystem-dev zlib1g-dev libbz2-dev
+        sudo apt-get install gperf build-essential bison flex libfl-dev libreadline-dev gawk tcl-dev libffi-dev git graphviz xdot pkg-config python3 libboost-system-dev libboost-python-dev libboost-filesystem-dev zlib1g-dev libbz2-dev libgtest-dev
 
     - name: Install macOS Dependencies
       if: runner.os == 'macOS'
diff --git a/.github/workflows/prepare-docs.yml b/.github/workflows/prepare-docs.yml
index 17d37d08c..f19b1c7af 100644
--- a/.github/workflows/prepare-docs.yml
+++ b/.github/workflows/prepare-docs.yml
@@ -48,7 +48,7 @@ jobs:
           echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 1" >> Makefile.conf
           echo "ENABLE_CCACHE := 1" >> Makefile.conf
           echo "ENABLE_HELP_SOURCE := 1" >> Makefile.conf
-          make -j$procs ENABLE_LTO=1
+          make -j$procs
 
       - name: Prepare docs
         shell: bash
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index d7f2073fe..2d4a7a6c8 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -67,7 +67,7 @@ jobs:
           mkdir build
           cd build
           make -f ../Makefile config-$CC
-          make -f ../Makefile -j$procs ENABLE_LTO=1
+          make -f ../Makefile -j$procs
 
       - name: Log yosys-config output
         run: |
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
index 2ffd2db15..9c0f6d746 100644
--- a/.github/workflows/test-sanitizers.yml
+++ b/.github/workflows/test-sanitizers.yml
@@ -97,7 +97,7 @@ jobs:
         run: |
           make config-$CC
           echo 'SANITIZER = ${{ matrix.sanitizer }}' >> Makefile.conf
-          make -j$procs ENABLE_LTO=1
+          make -j$procs
 
       - name: Log yosys-config output
         run: |
@@ -106,10 +106,15 @@ jobs:
       - name: Run tests
         shell: bash
         run: |
-          make -j$procs test TARGETS= EXTRA_TARGETS= CONFIG=$CC
+          make -j$procs test TARGETS= EXTRA_TARGETS=
 
       - name: Report errors
         if: ${{ failure() }}
         shell: bash
         run: |
           find tests/**/*.err -print -exec cat {} \;
+
+      - name: Run unit tests
+        shell: bash
+        run: |
+          make -j$procs unit-test ENABLE_LIBYOSYS=1
diff --git a/.github/workflows/test-verific.yml b/.github/workflows/test-verific.yml
index c2e4228c4..503d6c31b 100644
--- a/.github/workflows/test-verific.yml
+++ b/.github/workflows/test-verific.yml
@@ -78,3 +78,8 @@ jobs:
         if: ${{ github.ref == 'refs/heads/main' }}
         run: |
           make -C sby run_ci
+
+      - name: Run unit tests
+        shell: bash
+        run: |
+          make -j$procs unit-test ENABLE_LTO=1 ENABLE_LIBYOSYS=1
diff --git a/Brewfile b/Brewfile
index 7ed3fb906..c90434e62 100644
--- a/Brewfile
+++ b/Brewfile
@@ -11,3 +11,4 @@ brew "bash"
 brew "boost-python3"
 brew "llvm@20"
 brew "lld"
+brew "googletest"
diff --git a/tests/unit/Makefile b/tests/unit/Makefile
index 48635eb0d..eee60ef9f 100644
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
@@ -1,11 +1,27 @@
-GTESTFLAG := -lgtest -lgtest_main
-RPATH := -Wl,-rpath
-EXTRAFLAGS := -lyosys -pthreads
+UNAME_S := $(shell uname -s)
+
+# GoogleTest flags
+GTEST_PREFIX := $(shell brew --prefix googletest 2>/dev/null)
+ifeq ($(GTEST_PREFIX),)
+  GTEST_CXXFLAGS :=
+  GTEST_LDFLAGS := -lgtest -lgtest_main
+else
+  GTEST_CXXFLAGS := -I$(GTEST_PREFIX)/include
+  GTEST_LDFLAGS := -L$(GTEST_PREFIX)/lib -lgtest -lgtest_main
+endif
+
+ifeq ($(UNAME_S),Darwin)
+  RPATH = -Wl,-rpath,$(ROOTPATH)
+else
+  RPATH = -Wl,-rpath=$(ROOTPATH)
+endif
+
+EXTRAFLAGS := -lyosys -pthread
 
 OBJTEST := objtest
 BINTEST := bintest
 
-ALLTESTFILE := $(shell find -name '*Test.cc' -printf '%P ')
+ALLTESTFILE := $(shell find . -name '*Test.cc' | sed 's|^\./||' | tr '\n' ' ')
 TESTDIRS := $(sort $(dir $(ALLTESTFILE)))
 TESTS := $(addprefix $(BINTEST)/, $(basename $(ALLTESTFILE:%Test.cc=%Test.o)))
 
@@ -15,16 +31,26 @@ TESTS := $(addprefix $(BINTEST)/, $(basename $(ALLTESTFILE:%Test.cc=%Test.o)))
 all: prepare $(TESTS) run-tests
 
 $(BINTEST)/%: $(OBJTEST)/%.o
-	$(CXX) -L$(ROOTPATH) $(RPATH)=$(ROOTPATH) $(LINKFLAGS) -o $@ $^ $(LIBS) \
-		$(GTESTFLAG) $(EXTRAFLAGS)
+	$(CXX) -L$(ROOTPATH) $(RPATH) $(LINKFLAGS) -o $@ $^ $(LIBS) \
+		$(GTEST_LDFLAGS) $(EXTRAFLAGS)
 
 $(OBJTEST)/%.o: $(basename $(subst $(OBJTEST),.,%)).cc
-	$(CXX) -o $@ -c -I$(ROOTPATH) $(CPPFLAGS) $(CXXFLAGS) $^
+	$(CXX) -o $@ -c -I$(ROOTPATH) $(CPPFLAGS) $(CXXFLAGS) $(GTEST_CXXFLAGS) $^
 
 .PHONY: prepare run-tests clean
 
 run-tests: $(TESTS)
-	$(subst Test ,Test&& ,$^)
+ifeq ($(UNAME_S),Darwin)
+	@for t in $^; do \
+		echo "Running $$t"; \
+		DYLD_LIBRARY_PATH=$(ROOTPATH) $$t || exit 1; \
+	done
+else
+	@for t in $^; do \
+		echo "Running $$t"; \
+		$$t || exit 1; \
+	done
+endif
 
 prepare:
 	mkdir -p $(addprefix $(BINTEST)/,$(TESTDIRS))
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index 97cc936de..557355ed9 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -20,6 +20,9 @@ namespace RTLIL {
 		KernelRtlilTest() {
 			if (log_files.empty()) log_files.emplace_back(stdout);
 		}
+		virtual void SetUp() override {
+			IdString::ensure_prepopulated();
+		}
 	};
 
 	TEST_F(KernelRtlilTest, ConstAssignCompare)

From 9409a11be46ae1d582c0c92b7b50fd2ea2092278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Tue, 23 Sep 2025 19:25:55 +0200
Subject: [PATCH 603/931] CONTRIBUTING: don't mention dead slack, add link to
 dev jf doc

---
 CONTRIBUTING.md | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 74f9ab10d..6e7b8f221 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -61,13 +61,10 @@ merge; please do not use these labels if you are not a maintainer.
 # Asking questions
 
 If you have a question about how to use Yosys, please ask on our [discussions
-page](https://github.com/YosysHQ/yosys/discussions) or in our [community
-slack](https://join.slack.com/t/yosyshq/shared_invite/zt-1aopkns2q-EiQ97BeQDt_pwvE41sGSuA).
-The slack is also a great place to ask questions about developing or
+page](https://github.com/YosysHQ/yosys/discussions) or in our [Discourse forum](https://yosyshq.discourse.group/).
+The Discourse is also a great place to ask questions about developing or
 contributing to Yosys.
 
-We have open dev 'jour fixe' (JF) meetings where developers from YosysHQ and the
+We have open [dev 'jour fixe' (JF) meetings](https://docs.google.com/document/d/1SapA6QAsJcsgwsdKJDgnGR2mr97pJjV4eeXg_TVJhRU/edit?usp=sharing) where developers from YosysHQ and the
 community come together to discuss open issues and PRs.  This is also a good
-place to talk to us about how to implement larger PRs.  Please join the
-community slack if you would like to join the next meeting, the link is
-available in the description of the #devel-discuss channel.
+place to talk to us about how to implement larger PRs.

From 6527cc2134c818b0084a47c82e664c8d198725dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Tue, 23 Sep 2025 20:03:50 +0200
Subject: [PATCH 604/931] gowin: fix test

---
 tests/arch/gowin/mux.ys | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/arch/gowin/mux.ys b/tests/arch/gowin/mux.ys
index d5978f4ea..2ca973520 100644
--- a/tests/arch/gowin/mux.ys
+++ b/tests/arch/gowin/mux.ys
@@ -32,8 +32,8 @@ proc
 equiv_opt -assert -map +/gowin/cells_sim.v synth_gowin # equivalency check
 design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design)
 cd mux8 # Constrain all select calls below inside the top module
-select -assert-count 1 t:LUT1
-select -assert-count 10 t:LUT3
+select -assert-count 3 t:LUT1
+select -assert-count 2 t:LUT3
 select -assert-count 1 t:LUT4
 select -assert-count 5 t:MUX2_LUT5
 select -assert-count 2 t:MUX2_LUT6

From 3f4b6dc5d31d8f790ad4d5fb7696f10f77d3362e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Tue, 23 Sep 2025 20:34:08 +0200
Subject: [PATCH 605/931] Support multiple lib files in abc9_exe

---
 passes/techmap/abc9_exe.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/passes/techmap/abc9_exe.cc b/passes/techmap/abc9_exe.cc
index ac723fdbb..4449065f8 100644
--- a/passes/techmap/abc9_exe.cc
+++ b/passes/techmap/abc9_exe.cc
@@ -181,8 +181,10 @@ void abc9_module(RTLIL::Design *design, std::string script_file, std::string exe
 		for (std::string dont_use_cell : dont_use_cells) {
 			dont_use_args += stringf("-X \"%s\" ", dont_use_cell);
 		}
+		bool first_lib = true;
 		for (std::string liberty_file : liberty_files) {
-			abc9_script += stringf("read_lib %s -w \"%s\" ; ", dont_use_args, liberty_file);
+			abc9_script += stringf("read_lib %s %s -w \"%s\" ; ", dont_use_args, first_lib ? "" : "-m", liberty_file);
+			first_lib = false;
 		}
 		if (!constr_file.empty())
 			abc9_script += stringf("read_constr -v \"%s\"; ", constr_file);

From 0a17205a955eb9eb95c2e89764d354b82bfc22f4 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Wed, 17 Sep 2025 22:27:16 +0000
Subject: [PATCH 606/931] Fix off-by-one error in bounds check

---
 kernel/rtlil.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 7d53fdd32..3c6843aaa 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -4399,7 +4399,7 @@ RTLIL::SigChunk RTLIL::SigChunk::extract(int offset, int length) const
 RTLIL::SigBit RTLIL::SigChunk::operator[](int offset) const
 {
 	log_assert(offset >= 0);
-	log_assert(offset <= width);
+	log_assert(offset < width);
 	RTLIL::SigBit ret;
 	if (wire) {
 		ret.wire = wire;

From e9aacd8a0593009b469a1933873bedd49caacaef Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 23 Sep 2025 23:26:47 +0000
Subject: [PATCH 607/931] Move `OptMerge` cell filtering logic to happen while
 building the cell vector.

This code is quite confusing because there are two "is the cell known" filters
applied, one while building the cell vector and one after building the cell
vector, and they're subtly different. I'm preserving the actual behaviour here
but it looks like there is, or was, a bug here.
---
 passes/opt/opt_merge.cc | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index 1cb499740..a59807be1 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -249,10 +249,15 @@ struct OptMergeWorker
 					// mem can have an excessively large parameter holding the init data
 					continue;
 				}
+				if (cell->type == ID($scopeinfo))
+					continue;
 				if (mode_keepdc && has_dont_care_initval(cell))
 					continue;
-				if (ct.cell_known(cell->type) || (mode_share_all && cell->known()))
-					cells.push_back(cell);
+				if (!cell->known())
+					continue;
+				if (!mode_share_all && !ct.cell_known(cell->type))
+					continue;
+				cells.push_back(cell);
 			}
 
 			did_something = false;
@@ -281,12 +286,6 @@ struct OptMergeWorker
 
 			for (auto cell : cells)
 			{
-				if ((!mode_share_all && !ct.cell_known(cell->type)) || !cell->known())
-					continue;
-
-				if (cell->type == ID($scopeinfo))
-					continue;
-
 				auto [cell_in_map, inserted] = known_cells.insert(cell);
 				if (!inserted) {
 					// We've failed to insert since we already have an equivalent cell

From ef22c6ee735ee22f50a1bd6c6430c618cc8afc51 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 24 Sep 2025 00:22:58 +0000
Subject: [PATCH 608/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 02f8fa0e9..406a6d196 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+178
+YOSYS_VER := 0.57+198
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 6de21a8999bb44e3b845a0aafeca3e672408577b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Wed, 24 Sep 2025 11:07:26 +0200
Subject: [PATCH 609/931] CONTRIBUTING: prefer Discourse over GitHub
 Discussions

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6e7b8f221..403292b0b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -60,8 +60,8 @@ merge; please do not use these labels if you are not a maintainer.
 
 # Asking questions
 
-If you have a question about how to use Yosys, please ask on our [discussions
-page](https://github.com/YosysHQ/yosys/discussions) or in our [Discourse forum](https://yosyshq.discourse.group/).
+If you have a question about how to use Yosys, please ask on our [Discourse forum](https://yosyshq.discourse.group/) or in our [discussions
+page](https://github.com/YosysHQ/yosys/discussions).
 The Discourse is also a great place to ask questions about developing or
 contributing to Yosys.
 

From 161cdd349c591c24ee8be069f3015b14163bd5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Wed, 24 Sep 2025 11:30:29 +0200
Subject: [PATCH 610/931] io: add append_globbed to resolve globs in regular
 pass arguments

---
 kernel/io.cc | 7 +++++++
 kernel/io.h  | 1 +
 2 files changed, 8 insertions(+)

diff --git a/kernel/io.cc b/kernel/io.cc
index 4c593501c..9e9eb9fb0 100644
--- a/kernel/io.cc
+++ b/kernel/io.cc
@@ -384,6 +384,13 @@ std::string escape_filename_spaces(const std::string& filename)
 	return out;
 }
 
+void append_globbed(std::vector<std::string>& paths, std::string pattern)
+{
+	rewrite_filename(pattern);
+	std::vector<std::string> globbed = glob_filename(pattern);
+	copy(globbed.begin(), globbed.end(), back_inserter(paths));
+}
+
 void format_emit_unescaped(std::string &result, std::string_view fmt)
 {
 	result.reserve(result.size() + fmt.size());
diff --git a/kernel/io.h b/kernel/io.h
index 2ad0a6466..b3922bef0 100644
--- a/kernel/io.h
+++ b/kernel/io.h
@@ -469,6 +469,7 @@ bool is_absolute_path(std::string filename);
 void remove_directory(std::string dirname);
 bool create_directory(const std::string& dirname);
 std::string escape_filename_spaces(const std::string& filename);
+void append_globbed(std::vector<std::string>& paths, std::string pattern);
 
 YOSYS_NAMESPACE_END
 

From a28c0c632b399f239ad3d0aa3d4a1197bfde9fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Wed, 24 Sep 2025 11:30:49 +0200
Subject: [PATCH 611/931] clockgate: support liberty filename globbing

---
 passes/techmap/clockgate.cc | 4 +---
 tests/techmap/clockgate.ys  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/passes/techmap/clockgate.cc b/passes/techmap/clockgate.cc
index 7c6ca5551..b68e5d93d 100644
--- a/passes/techmap/clockgate.cc
+++ b/passes/techmap/clockgate.cc
@@ -290,9 +290,7 @@ struct ClockgatePass : public Pass {
 				continue;
 			}
 			if (args[argidx] == "-liberty" && argidx+1 < args.size()) {
-				std::string liberty_file = args[++argidx];
-				rewrite_filename(liberty_file);
-				liberty_files.push_back(liberty_file);
+				append_globbed(liberty_files, args[++argidx]);
 				continue;
 			}
 			if (args[argidx] == "-dont_use" && argidx+1 < args.size()) {
diff --git a/tests/techmap/clockgate.ys b/tests/techmap/clockgate.ys
index da0f9dc42..c28852ef8 100644
--- a/tests/techmap/clockgate.ys
+++ b/tests/techmap/clockgate.ys
@@ -194,7 +194,7 @@ select -assert-count 1 t:\\pdk_icg
 #------------------------------------------------------------------------------
 
 design -load before
-clockgate -liberty clockgate.lib
+clockgate -liberty c*ckgate.lib
 
 # rising edge ICGs
 select -module dffe_00 -assert-count 0 t:\\pos_small

From 856a387aad0377a85c1bf24427c37149d2d0acaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Wed, 24 Sep 2025 11:30:57 +0200
Subject: [PATCH 612/931] dfflibmap: support liberty filename globbing

---
 passes/techmap/dfflibmap.cc | 4 +---
 tests/techmap/dfflibmap.ys  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index f3b96aeec..f2bd16082 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -609,9 +609,7 @@ struct DfflibmapPass : public Pass {
 		{
 			std::string arg = args[argidx];
 			if (arg == "-liberty" && argidx+1 < args.size()) {
-				std::string liberty_file = args[++argidx];
-				rewrite_filename(liberty_file);
-				liberty_files.push_back(liberty_file);
+				append_globbed(liberty_files, args[++argidx]);
 				continue;
 			}
 			if (arg == "-prepare") {
diff --git a/tests/techmap/dfflibmap.ys b/tests/techmap/dfflibmap.ys
index 822d87a36..303daee48 100644
--- a/tests/techmap/dfflibmap.ys
+++ b/tests/techmap/dfflibmap.ys
@@ -23,7 +23,7 @@ read_liberty -lib dfflibmap.lib
 equiv_opt -map dfflibmap-sim.v -assert -multiclock dfflibmap -liberty dfflibmap.lib
 equiv_opt -map dfflibmap-sim.v -assert -multiclock dfflibmap -prepare -liberty dfflibmap.lib
 
-dfflibmap -prepare -liberty dfflibmap.lib
+dfflibmap -prepare -liberty dffl*bmap.lib
 equiv_opt -map dfflibmap-sim.v -assert -multiclock dfflibmap -map-only -liberty dfflibmap.lib
 
 design -load orig

From 4508676e678af683991a7c3a37a997dca309dad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Wed, 24 Sep 2025 11:31:06 +0200
Subject: [PATCH 613/931] libcache: support liberty filename globbing

---
 passes/techmap/libcache.cc | 4 +---
 tests/liberty/libcache.ys  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/passes/techmap/libcache.cc b/passes/techmap/libcache.cc
index c833a6046..e4326c49f 100644
--- a/passes/techmap/libcache.cc
+++ b/passes/techmap/libcache.cc
@@ -96,9 +96,7 @@
 				quiet = true;
 				continue;
 			}
-			std::string fname = args[argidx];
-			rewrite_filename(fname);
-			paths.push_back(fname);
+			append_globbed(paths, args[argidx]);
 			break;
 		}
 		int modes = enable + disable + purge + list + verbose + quiet;
diff --git a/tests/liberty/libcache.ys b/tests/liberty/libcache.ys
index 04257aa92..8132b3f11 100644
--- a/tests/liberty/libcache.ys
+++ b/tests/liberty/libcache.ys
@@ -1,5 +1,5 @@
 libcache -verbose
-libcache -enable busdef.lib
+libcache -enable bus*f.lib
 
 logger -expect log "Caching is disabled by default." 1
 logger -expect log "Caching is enabled for `busdef.lib'." 1

From 904d49c6d818897bb4c854e64c6c395861146e0d Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 23 Sep 2025 14:38:15 +0200
Subject: [PATCH 614/931] abc9_ops: Remove temporary debug log message

I missed this when adding the -replace_zbufs option.
---
 passes/techmap/abc9_ops.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index ecba519bf..2e762d7b9 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -1600,7 +1600,6 @@ static void replace_zbufs(Design *design)
 					sig[i] = w;
 				}
 			}
-			log("XXX %s -> %s\n", log_signal(cell->getPort(ID::A)), log_signal(sig));
 			cell->setPort(ID::A, sig);
 		}
 

From 71882debe78cda10a963b89404ac4decbedca8f2 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Wed, 24 Sep 2025 13:15:36 +0200
Subject: [PATCH 615/931] simplemap: Remove leftover debug output

---
 passes/techmap/simplemap.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/passes/techmap/simplemap.cc b/passes/techmap/simplemap.cc
index 86ff5c149..938ed5355 100644
--- a/passes/techmap/simplemap.cc
+++ b/passes/techmap/simplemap.cc
@@ -18,7 +18,6 @@
  */
 
 #include "simplemap.h"
-#include "backends/rtlil/rtlil_backend.h"
 #include "kernel/sigtools.h"
 #include "kernel/ff.h"
 #include <stdlib.h>
@@ -156,14 +155,11 @@ void simplemap_reduce(RTLIL::Module *module, RTLIL::Cell *cell)
 			}
 
 			RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type);
-			log("huh\n");
-			RTLIL_BACKEND::dump_cell(std::cout, "", cell);
 			transfer_src(gate, cell);
 			gate->setPort(ID::A, sig_a[i]);
 			gate->setPort(ID::B, sig_a[i+1]);
 			gate->setPort(ID::Y, sig_t[i/2]);
 			last_output_cell = gate;
-			RTLIL_BACKEND::dump_cell(std::cout, "", gate);
 		}
 
 		sig_a = sig_t;

From 86a46b9e5c122a4f6463390e8e9bbac8f48f4bea Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 23 Sep 2025 14:19:30 +0200
Subject: [PATCH 616/931] log: Flush stdout before printing a fatal error to
 stderr

This hasn't been an issue when using -l to redirect or when stdout is
line buffered, explaining how we didn't notice this earlier, but for
`yosys ... > log` that extra flush is required to ensure all messages
preceding the fatal error are flushed.
---
 kernel/log.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index 0085980b1..af083860a 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -331,10 +331,12 @@ static void log_error_with_prefix(std::string_view prefix, std::string str)
 	if (log_errfile != NULL)
 		log_files.push_back(log_errfile);
 
-	if (log_error_stderr)
+	if (log_error_stderr) {
+		log_flush(); // Make sure we flush stdout before replacing it with stderr
 		for (auto &f : log_files)
 			if (f == stdout)
 				f = stderr;
+	}
 
 	log_last_error = std::move(str);
 	log("%s%s", prefix, log_last_error);

From 2dce50516b218b28a34b838810709fa0ee24d256 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 23 Sep 2025 14:26:53 +0200
Subject: [PATCH 617/931] log: Print static message as fatal error for
 YOSYS_ABORT

---
 kernel/log.cc         | 5 +++++
 kernel/yosys_common.h | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index af083860a..34e56f8ac 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -407,6 +407,11 @@ void log_abort_internal(const char *file, int line)
 	log_error("Abort in %s:%d.\n", file, line);
 }
 
+void log_yosys_abort_message(std::string_view file, int line, std::string_view func, std::string_view message)
+{
+	log_error("Abort in %s:%d (%s): %s\n", file, line, func, message);
+}
+
 void log_formatted_cmd_error(std::string str)
 {
 	if (log_cmd_error_throw) {
diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index fd84dd74e..d69e02a59 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -142,7 +142,12 @@
 #define YOSYS_CONSTEVAL constexpr
 #endif
 
-#define YOSYS_ABORT(s) abort()
+#define YOSYS_ABORT(s) YOSYS_NAMESPACE_PREFIX log_yosys_abort_message(__FILE__, __LINE__, __FUNCTION__, s)
+
+// This has to precede including "kernel/io.h"
+YOSYS_NAMESPACE_BEGIN
+[[noreturn]] void log_yosys_abort_message(std::string_view file, int line, std::string_view func, std::string_view message);
+YOSYS_NAMESPACE_END
 
 #include "kernel/io.h"
 

From 83dd99efb7971d212b3538bf05d92140393aed7d Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Wed, 24 Sep 2025 18:47:54 +0200
Subject: [PATCH 618/931] verific: New `-sva-continue-on-error` import option

This option allows you to process a design that includes unsupported
SVA. Unsupported SVA gets imported as formal cells using 'x inputs and
with the `unsupported_sva` attribute set. This allows you to get a
complete list of defined properties or to check only a supported subset
of properties. To ensure no properties are unintentionally skipped for
actual verification, even in cases where `-sva-continue-on-error` is
used by default to read and inspect a design, `hierarchy -simcheck` and
`hierarchy -smtcheck` (run by SBY) now ensure that no `unsupported_sva`
property cells remain in the design.
---
 frontends/verific/verific.cc            | 26 ++++++++++---
 frontends/verific/verific.h             |  6 ++-
 frontends/verific/verificsva.cc         | 51 ++++++++++++++++---------
 passes/hierarchy/hierarchy.cc           | 19 +++++++++
 tests/verific/sva_continue_on_err.ys    | 38 ++++++++++++++++++
 tests/verific/sva_no_continue_on_err.ys |  9 +++++
 6 files changed, 124 insertions(+), 25 deletions(-)
 create mode 100644 tests/verific/sva_continue_on_err.ys
 create mode 100644 tests/verific/sva_no_continue_on_err.ys

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 279b0dd52..b2b85641f 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -200,8 +200,8 @@ YosysStreamCallBackHandler verific_read_cb;
 
 // ==================================================================
 
-VerificImporter::VerificImporter(bool mode_gates, bool mode_keep, bool mode_nosva, bool mode_names, bool mode_verific, bool mode_autocover, bool mode_fullinit) :
-		mode_gates(mode_gates), mode_keep(mode_keep), mode_nosva(mode_nosva),
+VerificImporter::VerificImporter(bool mode_gates, bool mode_keep, bool mode_nosva, bool mode_sva_continue, bool mode_names, bool mode_verific, bool mode_autocover, bool mode_fullinit) :
+		mode_gates(mode_gates), mode_keep(mode_keep), mode_nosva(mode_nosva), mode_sva_continue(mode_sva_continue),
 		mode_names(mode_names), mode_verific(mode_verific), mode_autocover(mode_autocover),
 		mode_fullinit(mode_fullinit)
 {
@@ -2316,6 +2316,12 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 				wire->attributes.erase(ID::init);
 		}
 	}
+
+	if (num_sva_continue) {
+		log_warning("Encountered %d items containing unsupported SVA!\n", num_sva_continue);
+		log_warning("Unsupported SVA imported as 'x and marked using the `unsupported_sva' attribute due to -sva-continue-on-err.\n");
+	}
+	num_sva_continue = 0;
 }
 
 // ==================================================================
@@ -3051,7 +3057,7 @@ std::string verific_import(Design *design, const std::map<std::string,std::strin
 		auto it = nl_todo.begin();
 		Netlist *nl = it->second;
 		if (nl_done.count(it->first) == 0) {
-			VerificImporter importer(false, false, false, false, false, false, false);
+			VerificImporter importer(false, false, false, false, false, false, false, false);
 			nl_done[it->first] = it->second;
 			importer.import_netlist(design, nl, nl_todo, top_mod_names.count(nl->CellBaseName()));
 		}
@@ -3288,6 +3294,11 @@ struct VerificPass : public Pass {
 		log("  -nosva\n");
 		log("    Ignore SVA properties, do not infer checker logic.\n");
 		log("\n");
+		log("  -sva-continue-on-err\n");
+		log("    Turns unsupported SVA from an error into a warning. Properties are imported\n");
+		log("    with their trigger condition replaced with 'x and with an `unsupported_sva'\n");
+		log("    attribute to produce a later error in SBY if they remain in the design.\n");
+		log("\n");
 		log("  -L <int>\n");
 		log("    Maximum number of ctrl bits for SVA checker FSMs (default=16).\n");
 		log("\n");
@@ -4033,7 +4044,8 @@ struct VerificPass : public Pass {
 		{
 			std::map<std::string,Netlist*> nl_todo, nl_done;
 			bool mode_all = false, mode_gates = false, mode_keep = false;
-			bool mode_nosva = false, mode_names = false, mode_verific = false;
+			bool mode_nosva = false, mode_sva_continue = false;
+			bool mode_names = false, mode_verific = false;
 			bool mode_autocover = false, mode_fullinit = false;
 			bool flatten = false, extnets = false, mode_cells = false;
 			bool split_complex_ports = true;
@@ -4071,6 +4083,10 @@ struct VerificPass : public Pass {
 					mode_nosva = true;
 					continue;
 				}
+				if (args[argidx] == "-sva-continue-on-err") {
+					mode_sva_continue = true;
+					continue;
+				}
 				if (args[argidx] == "-L" && argidx+1 < GetSize(args)) {
 					verific_sva_fsm_limit = atoi(args[++argidx].c_str());
 					continue;
@@ -4201,7 +4217,7 @@ struct VerificPass : public Pass {
 				auto it = nl_todo.begin();
 				Netlist *nl = it->second;
 				if (nl_done.count(it->first) == 0) {
-					VerificImporter importer(mode_gates, mode_keep, mode_nosva,
+					VerificImporter importer(mode_gates, mode_keep, mode_nosva, mode_sva_continue,
 							mode_names, mode_verific, mode_autocover, mode_fullinit);
 					nl_done[it->first] = it->second;
 					importer.import_netlist(design, nl, nl_todo, top_mod_names.count(nl->CellBaseName()));
diff --git a/frontends/verific/verific.h b/frontends/verific/verific.h
index 4e9c7a305..f33a380f7 100644
--- a/frontends/verific/verific.h
+++ b/frontends/verific/verific.h
@@ -73,10 +73,12 @@ struct VerificImporter
 	std::map<Verific::Net*, Verific::Net*> sva_posedge_map;
 	pool<Verific::Net*> any_all_nets;
 
-	bool mode_gates, mode_keep, mode_nosva, mode_names, mode_verific;
+	bool mode_gates, mode_keep, mode_nosva, mode_sva_continue, mode_names, mode_verific;
 	bool mode_autocover, mode_fullinit;
 
-	VerificImporter(bool mode_gates, bool mode_keep, bool mode_nosva, bool mode_names, bool mode_verific, bool mode_autocover, bool mode_fullinit);
+	int num_sva_continue = 0;
+
+	VerificImporter(bool mode_gates, bool mode_keep, bool mode_nosva, bool mode_sva_continue, bool mode_names, bool mode_verific, bool mode_autocover, bool mode_fullinit);
 
 	RTLIL::SigBit net_map_at(Verific::Net *net);
 
diff --git a/frontends/verific/verificsva.cc b/frontends/verific/verificsva.cc
index 3908947eb..9757f07f2 100644
--- a/frontends/verific/verificsva.cc
+++ b/frontends/verific/verificsva.cc
@@ -1023,7 +1023,7 @@ struct VerificSvaImporter
 
 	[[noreturn]] void parser_error(std::string errmsg)
 	{
-		if (!importer->mode_keep)
+		if (!importer->mode_keep && !importer->mode_sva_continue)
 			log_error("%s", errmsg);
 		log_warning("%s", errmsg);
 		throw ParserErrorException();
@@ -1710,30 +1710,30 @@ struct VerificSvaImporter
 
 	void import()
 	{
-		try
-		{
-			module = importer->module;
-			netlist = root->Owner();
+		module = importer->module;
+		netlist = root->Owner();
 
-			if (verific_verbose)
-				log("  importing SVA property at root cell %s (%s) at %s:%d.\n", root->Name(), root->View()->Owner()->Name(),
-						LineFile::GetFileName(root->Linefile()), LineFile::GetLineNo(root->Linefile()));
+		if (verific_verbose)
+			log("  importing SVA property at root cell %s (%s) at %s:%d.\n", root->Name(), root->View()->Owner()->Name(),
+					LineFile::GetFileName(root->Linefile()), LineFile::GetLineNo(root->Linefile()));
 
-			bool is_user_declared = root->IsUserDeclared();
+		bool is_user_declared = root->IsUserDeclared();
 
-			// FIXME
-			if (!is_user_declared) {
-				const char *name = root->Name();
-				for (int i = 0; name[i]; i++) {
-					if (i ? (name[i] < '0' || name[i] > '9') : (name[i] != 'i')) {
-						is_user_declared = true;
-						break;
-					}
+		// FIXME
+		if (!is_user_declared) {
+			const char *name = root->Name();
+			for (int i = 0; name[i]; i++) {
+				if (i ? (name[i] < '0' || name[i] > '9') : (name[i] != 'i')) {
+					is_user_declared = true;
+					break;
 				}
 			}
+		}
 
-			RTLIL::IdString root_name = module->uniquify(importer->mode_names || is_user_declared ? RTLIL::escape_id(root->Name()) : NEW_ID);
+		RTLIL::IdString root_name = module->uniquify(importer->mode_names || is_user_declared ? RTLIL::escape_id(root->Name()) : NEW_ID);
 
+		try
+		{
 			// parse SVA sequence into trigger signal
 
 			clocking = VerificClocking(importer, root->GetInput(), true);
@@ -1836,6 +1836,21 @@ struct VerificSvaImporter
 		}
 		catch (ParserErrorException)
 		{
+			if (importer->mode_sva_continue) {
+
+				RTLIL::Cell *c = nullptr;
+
+				if (mode_assert) c = module->addAssert(root_name, State::Sx, State::Sx);
+				if (mode_assume) c = module->addAssume(root_name, State::Sx, State::Sx);
+				if (mode_cover) c = module->addCover(root_name, State::Sx, State::Sx);
+
+				if (c) {
+					importer->import_attributes(c->attributes, root);
+					c->set_bool_attribute(ID(unsupported_sva));
+				}
+
+				importer->num_sva_continue++;
+			}
 		}
 	}
 };
diff --git a/passes/hierarchy/hierarchy.cc b/passes/hierarchy/hierarchy.cc
index a7f86c3f0..b3edcef94 100644
--- a/passes/hierarchy/hierarchy.cc
+++ b/passes/hierarchy/hierarchy.cc
@@ -1149,6 +1149,25 @@ struct HierarchyPass : public Pass {
 				}
 		}
 
+		if (flag_simcheck || flag_smtcheck) {
+			for (auto mod : design->modules()) {
+				for (auto cell : mod->cells()) {
+					if (!cell->type.in(ID($check), ID($assert), ID($assume), ID($live), ID($fair), ID($cover)))
+						continue;
+					if (!cell->has_attribute(ID(unsupported_sva)))
+						continue;
+
+					auto src = cell->get_src_attribute();
+
+					if (!src.empty())
+						src += ": ";
+
+					log_error("%sProperty `%s' in module `%s' uses unsupported SVA constructs. See frontend warnings for details, run `delete */a:unsupported_sva' to ignore.\n",
+						src, log_id(cell->name), log_id(mod->name));
+				}
+			}
+		}
+
 		if (!keep_positionals)
 		{
 			std::set<RTLIL::Module*> pos_mods;
diff --git a/tests/verific/sva_continue_on_err.ys b/tests/verific/sva_continue_on_err.ys
new file mode 100644
index 000000000..4cd603f74
--- /dev/null
+++ b/tests/verific/sva_continue_on_err.ys
@@ -0,0 +1,38 @@
+verific -sv <<EOF
+module top(input clk, input a, input b);
+
+    prop_supported: assert property (@(posedge clk) a ##1 b |=> b);
+    prop_unsupported1: assert property (@(posedge clk) a ##1 b #=# b);
+    prop_unsupported2: assert property (@(posedge clk) a ##1 @(posedge b) ##1 a);
+
+    sequence local_var_seq;
+        logic v;
+        (1, v = a) ##1 b ##1 (v == a);
+    endsequence
+
+    prop_unsupported3: assert property (@(posedge clk) local_var_seq);
+
+endmodule
+EOF
+
+logger -expect warning "Mixed clocking is currently not supported" 1
+logger -expect warning "Verific SVA primitive sva_non_overlapped_followed_by .* is currently unsupported in this context" 1
+logger -expect warning "SVA sequences with local variable assignments are currently not supported" 1
+logger -expect warning "Encountered 3 items containing unsupported SVA" 1
+verific -import -sva-continue-on-err top
+logger -check-expected
+
+select -assert-count 4 top/t:$assert
+select -assert-count 4 top/a:unsupported_sva top/prop_supported %% top/t:$assert %i
+
+select -assert-count 3 top/a:unsupported_sva
+select -assert-count 3 top/a:unsupported_sva top/prop_unsupported* %i
+select -assert-count 1 top/a:unsupported_sva top/prop_unsupported1 %i
+select -assert-count 1 top/a:unsupported_sva top/prop_unsupported2 %i
+select -assert-count 1 top/a:unsupported_sva top/prop_unsupported3 %i
+select -assert-count 0 top/a:unsupported_sva top/prop_supported %i
+select -assert-count 1 top/prop_supported
+
+logger -expect error "uses unsupported SVA constructs." 1
+hierarchy -smtcheck -top top
+logger -check-expected
diff --git a/tests/verific/sva_no_continue_on_err.ys b/tests/verific/sva_no_continue_on_err.ys
new file mode 100644
index 000000000..5a0a59a81
--- /dev/null
+++ b/tests/verific/sva_no_continue_on_err.ys
@@ -0,0 +1,9 @@
+
+verific -sv <<EOF
+module top(input clk, input a, input b);
+    prop_unsupported: assert property (@(posedge clk) a ##1 @(posedge b) ##1 a);
+endmodule;
+EOF
+
+logger -expect error "Mixed clocking is currently not supported" 1
+verific -import top

From 3f29cd7f4ede44092c0a2b2a3e20d32c642c6a49 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 25 Sep 2025 00:22:44 +0000
Subject: [PATCH 619/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 406a6d196..45b3a09f3 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+198
+YOSYS_VER := 0.57+212
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 1c73011e7e8236c88157d37bd22a456b47c459d1 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 25 Sep 2025 03:04:17 +0000
Subject: [PATCH 620/931] Swap SigSpecs using std::swap with moves

---
 kernel/rtlil.h          | 6 +++++-
 passes/opt/opt_merge.cc | 9 +++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 88594859a..e240cf885 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1244,7 +1244,8 @@ private:
 public:
 	SigSpec() : width_(0), hash_(0) {}
 	SigSpec(std::initializer_list<RTLIL::SigSpec> parts);
-
+	SigSpec(const SigSpec &) = default;
+	SigSpec(SigSpec &&) = default;
 	SigSpec(const RTLIL::Const &value);
 	SigSpec(RTLIL::Const &&value);
 	SigSpec(const RTLIL::SigChunk &chunk);
@@ -1261,6 +1262,9 @@ public:
 	SigSpec(const std::set<RTLIL::SigBit> &bits);
 	explicit SigSpec(bool bit);
 
+	SigSpec &operator=(const SigSpec &rhs) = default;
+	SigSpec &operator=(SigSpec &&rhs) = default;
+
 	inline const std::vector<RTLIL::SigChunk> &chunks() const { pack(); return chunks_; }
 	inline const std::vector<RTLIL::SigBit> &bits() const { inline_unpack(); return bits_; }
 
diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index 541459c27..e1c3f0269 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -25,6 +25,7 @@
 #include "libs/sha1/sha1.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <algorithm>
 #include <set>
 #include <unordered_map>
 #include <array>
@@ -173,14 +174,10 @@ struct OptMergeWorker
 		if (cell1->type == ID($and) || cell1->type == ID($or) || cell1->type == ID($xor) || cell1->type == ID($xnor) || cell1->type == ID($add) || cell1->type == ID($mul) ||
 				cell1->type == ID($logic_and) || cell1->type == ID($logic_or) || cell1->type == ID($_AND_) || cell1->type == ID($_OR_) || cell1->type == ID($_XOR_)) {
 			if (conn1.at(ID::A) < conn1.at(ID::B)) {
-				RTLIL::SigSpec tmp = conn1[ID::A];
-				conn1[ID::A] = conn1[ID::B];
-				conn1[ID::B] = tmp;
+				std::swap(conn1[ID::A], conn1[ID::B]);
 			}
 			if (conn2.at(ID::A) < conn2.at(ID::B)) {
-				RTLIL::SigSpec tmp = conn2[ID::A];
-				conn2[ID::A] = conn2[ID::B];
-				conn2[ID::B] = tmp;
+				std::swap(conn2[ID::A], conn2[ID::B]);
 			}
 		} else
 		if (cell1->type == ID($reduce_xor) || cell1->type == ID($reduce_xnor)) {

From 4d209c187d02cb858701a1b4777d73c90cb80592 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Wed, 17 Sep 2025 02:52:30 +0000
Subject: [PATCH 621/931] Switch OptMergeWorker cell type switching to use
 IdString::in()

---
 passes/opt/opt_merge.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/passes/opt/opt_merge.cc b/passes/opt/opt_merge.cc
index e1c3f0269..13b1cb293 100644
--- a/passes/opt/opt_merge.cc
+++ b/passes/opt/opt_merge.cc
@@ -171,8 +171,8 @@ struct OptMergeWorker
 			}
 		}
 
-		if (cell1->type == ID($and) || cell1->type == ID($or) || cell1->type == ID($xor) || cell1->type == ID($xnor) || cell1->type == ID($add) || cell1->type == ID($mul) ||
-				cell1->type == ID($logic_and) || cell1->type == ID($logic_or) || cell1->type == ID($_AND_) || cell1->type == ID($_OR_) || cell1->type == ID($_XOR_)) {
+		if (cell1->type.in(ID($and), ID($or), ID($xor), ID($xnor), ID($add), ID($mul),
+				ID($logic_and), ID($logic_or), ID($_AND_), ID($_OR_), ID($_XOR_))) {
 			if (conn1.at(ID::A) < conn1.at(ID::B)) {
 				std::swap(conn1[ID::A], conn1[ID::B]);
 			}
@@ -180,11 +180,11 @@ struct OptMergeWorker
 				std::swap(conn2[ID::A], conn2[ID::B]);
 			}
 		} else
-		if (cell1->type == ID($reduce_xor) || cell1->type == ID($reduce_xnor)) {
+		if (cell1->type.in(ID($reduce_xor), ID($reduce_xnor))) {
 			conn1[ID::A].sort();
 			conn2[ID::A].sort();
 		} else
-		if (cell1->type == ID($reduce_and) || cell1->type == ID($reduce_or) || cell1->type == ID($reduce_bool)) {
+		if (cell1->type.in(ID($reduce_and), ID($reduce_or), ID($reduce_bool))) {
 			conn1[ID::A].sort_and_unify();
 			conn2[ID::A].sort_and_unify();
 		} else

From 0eb93c80e6048668cf2b63fad97ea572c2aa998e Mon Sep 17 00:00:00 2001
From: Ethan Sifferman <ethan@sifferman.dev>
Date: Wed, 24 Sep 2025 20:50:47 -0700
Subject: [PATCH 622/931] added ifndef SIMLIB_NOCONNECT

---
 techlibs/common/simlib.v | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/techlibs/common/simlib.v b/techlibs/common/simlib.v
index 096df07b9..977b8bbf9 100644
--- a/techlibs/common/simlib.v
+++ b/techlibs/common/simlib.v
@@ -3219,6 +3219,8 @@ endmodule
 
 // --------------------------------------------------------
 //* group wire
+`ifndef SIMLIB_NOCONNECT
+
 module \$connect (A, B);
 
 parameter WIDTH = 0;
@@ -3230,6 +3232,7 @@ tran connect[WIDTH-1:0] (A, B);
 
 endmodule
 
+`endif
 // --------------------------------------------------------
 //* group wire
 module \$input_port (Y);

From b94b39cd40a7341528bfc1bc7b7f8492c45cc99d Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 28 Aug 2023 16:47:59 +0200
Subject: [PATCH 623/931] Special DP16KD model is required

---
 techlibs/lattice/cells_bb_ecp5.v  | 198 ---------------------------
 techlibs/lattice/cells_sim_ecp5.v | 217 ++++++++++++++++++++++++++++++
 techlibs/lattice/cells_xtra.py    |   7 +-
 3 files changed, 218 insertions(+), 204 deletions(-)

diff --git a/techlibs/lattice/cells_bb_ecp5.v b/techlibs/lattice/cells_bb_ecp5.v
index 20a8134c3..1b1b9a1f4 100644
--- a/techlibs/lattice/cells_bb_ecp5.v
+++ b/techlibs/lattice/cells_bb_ecp5.v
@@ -17,204 +17,6 @@ module SGSR (...);
     input CLK;
 endmodule
 
-(* blackbox *)
-module DP16KD (...);
-    parameter CLKAMUX = "CLKA";
-    parameter CLKBMUX = "CLKB";
-    parameter DATA_WIDTH_A = 18;
-    parameter DATA_WIDTH_B = 18;
-    parameter REGMODE_A = "NOREG";
-    parameter REGMODE_B = "NOREG";
-    parameter RESETMODE = "SYNC";
-    parameter ASYNC_RESET_RELEASE = "SYNC";
-    parameter WRITEMODE_A = "NORMAL";
-    parameter WRITEMODE_B = "NORMAL";
-    parameter CSDECODE_A = "0b000";
-    parameter CSDECODE_B = "0b000";
-    parameter GSR = "ENABLED";
-    parameter INITVAL_00 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_01 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_02 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_03 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_04 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_05 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_06 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_07 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_08 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_09 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_0A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_0B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_0C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_0D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_0E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_0F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_10 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_11 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_12 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_13 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_14 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_15 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_16 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_17 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_18 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_19 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_1A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_1B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_1C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_1D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_1E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_1F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_20 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_21 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_22 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_23 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_24 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_25 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_26 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_27 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_28 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_29 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_2A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_2B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_2C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_2D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_2E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_2F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_30 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_31 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_32 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_33 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_34 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_35 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_36 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_37 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_38 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_39 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_3A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_3B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_3C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_3D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_3E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INITVAL_3F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-    parameter INIT_DATA = "STATIC";
-    input DIA17;
-    input DIA16;
-    input DIA15;
-    input DIA14;
-    input DIA13;
-    input DIA12;
-    input DIA11;
-    input DIA10;
-    input DIA9;
-    input DIA8;
-    input DIA7;
-    input DIA6;
-    input DIA5;
-    input DIA4;
-    input DIA3;
-    input DIA2;
-    input DIA1;
-    input DIA0;
-    input ADA13;
-    input ADA12;
-    input ADA11;
-    input ADA10;
-    input ADA9;
-    input ADA8;
-    input ADA7;
-    input ADA6;
-    input ADA5;
-    input ADA4;
-    input ADA3;
-    input ADA2;
-    input ADA1;
-    input ADA0;
-    input CEA;
-    input OCEA;
-    input CLKA;
-    input WEA;
-    input CSA2;
-    input CSA1;
-    input CSA0;
-    input RSTA;
-    input DIB17;
-    input DIB16;
-    input DIB15;
-    input DIB14;
-    input DIB13;
-    input DIB12;
-    input DIB11;
-    input DIB10;
-    input DIB9;
-    input DIB8;
-    input DIB7;
-    input DIB6;
-    input DIB5;
-    input DIB4;
-    input DIB3;
-    input DIB2;
-    input DIB1;
-    input DIB0;
-    input ADB13;
-    input ADB12;
-    input ADB11;
-    input ADB10;
-    input ADB9;
-    input ADB8;
-    input ADB7;
-    input ADB6;
-    input ADB5;
-    input ADB4;
-    input ADB3;
-    input ADB2;
-    input ADB1;
-    input ADB0;
-    input CEB;
-    input OCEB;
-    input CLKB;
-    input WEB;
-    input CSB2;
-    input CSB1;
-    input CSB0;
-    input RSTB;
-    output DOA17;
-    output DOA16;
-    output DOA15;
-    output DOA14;
-    output DOA13;
-    output DOA12;
-    output DOA11;
-    output DOA10;
-    output DOA9;
-    output DOA8;
-    output DOA7;
-    output DOA6;
-    output DOA5;
-    output DOA4;
-    output DOA3;
-    output DOA2;
-    output DOA1;
-    output DOA0;
-    output DOB17;
-    output DOB16;
-    output DOB15;
-    output DOB14;
-    output DOB13;
-    output DOB12;
-    output DOB11;
-    output DOB10;
-    output DOB9;
-    output DOB8;
-    output DOB7;
-    output DOB6;
-    output DOB5;
-    output DOB4;
-    output DOB3;
-    output DOB2;
-    output DOB1;
-    output DOB0;
-endmodule
-
 (* blackbox *)
 module PDPW16KD (...);
     parameter CLKRMUX = "CLKR";
diff --git a/techlibs/lattice/cells_sim_ecp5.v b/techlibs/lattice/cells_sim_ecp5.v
index 9439e3a5b..41836e58f 100644
--- a/techlibs/lattice/cells_sim_ecp5.v
+++ b/techlibs/lattice/cells_sim_ecp5.v
@@ -1,6 +1,223 @@
 `include "common_sim.vh"
 `include "ccu2c_sim.vh"
 
+(* blackbox *)
+module DP16KD(
+  input DIA17, DIA16, DIA15, DIA14, DIA13, DIA12, DIA11, DIA10, DIA9, DIA8, DIA7, DIA6, DIA5, DIA4, DIA3, DIA2, DIA1, DIA0,
+  input ADA13, ADA12, ADA11, ADA10, ADA9, ADA8, ADA7, ADA6, ADA5, ADA4, ADA3, ADA2, ADA1, ADA0,
+  input CEA, OCEA, CLKA, WEA, RSTA,
+  input CSA2, CSA1, CSA0,
+  output DOA17, DOA16, DOA15, DOA14, DOA13, DOA12, DOA11, DOA10, DOA9, DOA8, DOA7, DOA6, DOA5, DOA4, DOA3, DOA2, DOA1, DOA0,
+
+  input DIB17, DIB16, DIB15, DIB14, DIB13, DIB12, DIB11, DIB10, DIB9, DIB8, DIB7, DIB6, DIB5, DIB4, DIB3, DIB2, DIB1, DIB0,
+  input ADB13, ADB12, ADB11, ADB10, ADB9, ADB8, ADB7, ADB6, ADB5, ADB4, ADB3, ADB2, ADB1, ADB0,
+  input CEB, OCEB, CLKB, WEB, RSTB,
+  input CSB2, CSB1, CSB0,
+  output DOB17, DOB16, DOB15, DOB14, DOB13, DOB12, DOB11, DOB10, DOB9, DOB8, DOB7, DOB6, DOB5, DOB4, DOB3, DOB2, DOB1, DOB0
+);
+	parameter DATA_WIDTH_A = 18;
+	parameter DATA_WIDTH_B = 18;
+
+	parameter REGMODE_A = "NOREG";
+	parameter REGMODE_B = "NOREG";
+
+	parameter RESETMODE = "SYNC";
+	parameter ASYNC_RESET_RELEASE = "SYNC";
+
+	parameter CSDECODE_A = "0b000";
+	parameter CSDECODE_B = "0b000";
+
+	parameter WRITEMODE_A = "NORMAL";
+	parameter WRITEMODE_B = "NORMAL";
+
+	parameter DIA17MUX = "DIA17";
+	parameter DIA16MUX = "DIA16";
+	parameter DIA15MUX = "DIA15";
+	parameter DIA14MUX = "DIA14";
+	parameter DIA13MUX = "DIA13";
+	parameter DIA12MUX = "DIA12";
+	parameter DIA11MUX = "DIA11";
+	parameter DIA10MUX = "DIA10";
+	parameter DIA9MUX = "DIA9";
+	parameter DIA8MUX = "DIA8";
+	parameter DIA7MUX = "DIA7";
+	parameter DIA6MUX = "DIA6";
+	parameter DIA5MUX = "DIA5";
+	parameter DIA4MUX = "DIA4";
+	parameter DIA3MUX = "DIA3";
+	parameter DIA2MUX = "DIA2";
+	parameter DIA1MUX = "DIA1";
+	parameter DIA0MUX = "DIA0";
+	parameter ADA13MUX = "ADA13";
+	parameter ADA12MUX = "ADA12";
+	parameter ADA11MUX = "ADA11";
+	parameter ADA10MUX = "ADA10";
+	parameter ADA9MUX = "ADA9";
+	parameter ADA8MUX = "ADA8";
+	parameter ADA7MUX = "ADA7";
+	parameter ADA6MUX = "ADA6";
+	parameter ADA5MUX = "ADA5";
+	parameter ADA4MUX = "ADA4";
+	parameter ADA3MUX = "ADA3";
+	parameter ADA2MUX = "ADA2";
+	parameter ADA1MUX = "ADA1";
+	parameter ADA0MUX = "ADA0";
+	parameter CEAMUX = "CEA";
+	parameter OCEAMUX = "OCEA";
+	parameter CLKAMUX = "CLKA";
+	parameter WEAMUX = "WEA";
+	parameter RSTAMUX = "RSTA";
+	parameter CSA2MUX = "CSA2";
+	parameter CSA1MUX = "CSA1";
+	parameter CSA0MUX = "CSA0";
+	parameter DOA17MUX = "DOA17";
+	parameter DOA16MUX = "DOA16";
+	parameter DOA15MUX = "DOA15";
+	parameter DOA14MUX = "DOA14";
+	parameter DOA13MUX = "DOA13";
+	parameter DOA12MUX = "DOA12";
+	parameter DOA11MUX = "DOA11";
+	parameter DOA10MUX = "DOA10";
+	parameter DOA9MUX = "DOA9";
+	parameter DOA8MUX = "DOA8";
+	parameter DOA7MUX = "DOA7";
+	parameter DOA6MUX = "DOA6";
+	parameter DOA5MUX = "DOA5";
+	parameter DOA4MUX = "DOA4";
+	parameter DOA3MUX = "DOA3";
+	parameter DOA2MUX = "DOA2";
+	parameter DOA1MUX = "DOA1";
+	parameter DOA0MUX = "DOA0";
+	parameter DIB17MUX = "DIB17";
+	parameter DIB16MUX = "DIB16";
+	parameter DIB15MUX = "DIB15";
+	parameter DIB14MUX = "DIB14";
+	parameter DIB13MUX = "DIB13";
+	parameter DIB12MUX = "DIB12";
+	parameter DIB11MUX = "DIB11";
+	parameter DIB10MUX = "DIB10";
+	parameter DIB9MUX = "DIB9";
+	parameter DIB8MUX = "DIB8";
+	parameter DIB7MUX = "DIB7";
+	parameter DIB6MUX = "DIB6";
+	parameter DIB5MUX = "DIB5";
+	parameter DIB4MUX = "DIB4";
+	parameter DIB3MUX = "DIB3";
+	parameter DIB2MUX = "DIB2";
+	parameter DIB1MUX = "DIB1";
+	parameter DIB0MUX = "DIB0";
+	parameter ADB13MUX = "ADB13";
+	parameter ADB12MUX = "ADB12";
+	parameter ADB11MUX = "ADB11";
+	parameter ADB10MUX = "ADB10";
+	parameter ADB9MUX = "ADB9";
+	parameter ADB8MUX = "ADB8";
+	parameter ADB7MUX = "ADB7";
+	parameter ADB6MUX = "ADB6";
+	parameter ADB5MUX = "ADB5";
+	parameter ADB4MUX = "ADB4";
+	parameter ADB3MUX = "ADB3";
+	parameter ADB2MUX = "ADB2";
+	parameter ADB1MUX = "ADB1";
+	parameter ADB0MUX = "ADB0";
+	parameter CEBMUX = "CEB";
+	parameter OCEBMUX = "OCEB";
+	parameter CLKBMUX = "CLKB";
+	parameter WEBMUX = "WEB";
+	parameter RSTBMUX = "RSTB";
+	parameter CSB2MUX = "CSB2";
+	parameter CSB1MUX = "CSB1";
+	parameter CSB0MUX = "CSB0";
+	parameter DOB17MUX = "DOB17";
+	parameter DOB16MUX = "DOB16";
+	parameter DOB15MUX = "DOB15";
+	parameter DOB14MUX = "DOB14";
+	parameter DOB13MUX = "DOB13";
+	parameter DOB12MUX = "DOB12";
+	parameter DOB11MUX = "DOB11";
+	parameter DOB10MUX = "DOB10";
+	parameter DOB9MUX = "DOB9";
+	parameter DOB8MUX = "DOB8";
+	parameter DOB7MUX = "DOB7";
+	parameter DOB6MUX = "DOB6";
+	parameter DOB5MUX = "DOB5";
+	parameter DOB4MUX = "DOB4";
+	parameter DOB3MUX = "DOB3";
+	parameter DOB2MUX = "DOB2";
+	parameter DOB1MUX = "DOB1";
+	parameter DOB0MUX = "DOB0";
+
+	parameter WID = 0;
+
+	parameter GSR = "ENABLED";
+
+	parameter INITVAL_00 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_01 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_02 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_03 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_04 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_05 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_06 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_07 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_08 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_09 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_0A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_0B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_0C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_0D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_0E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_0F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_10 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_11 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_12 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_13 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_14 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_15 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_16 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_17 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_18 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_19 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_1A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_1B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_1C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_1D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_1E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_1F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_20 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_21 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_22 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_23 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_24 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_25 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_26 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_27 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_28 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_29 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_2A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_2B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_2C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_2D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_2E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_2F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_30 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_31 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_32 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_33 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_34 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_35 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_36 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_37 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_38 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_39 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_3A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_3B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_3C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_3D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_3E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INITVAL_3F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
+	parameter INIT_DATA = "STATIC";
+endmodule
+
 `ifndef NO_INCLUDES
 
 `include "cells_ff.vh"
diff --git a/techlibs/lattice/cells_xtra.py b/techlibs/lattice/cells_xtra.py
index 5531fd2b2..3199e2263 100644
--- a/techlibs/lattice/cells_xtra.py
+++ b/techlibs/lattice/cells_xtra.py
@@ -121,12 +121,7 @@ devices = [
         #Cell("XOR3"),
         #Cell("XOR4"),
         #Cell("XOR5"),
-        Cell("DP16KD", extra_params={
-            # Optional clock inverters, present in prjtrellis data but
-            # not in Diamond bb models.
-            "CLKAMUX": "CLKA",
-            "CLKBMUX": "CLKB",
-        }),
+        #Cell("DP16KD"),
         Cell("PDPW16KD", extra_params={
             # Optional clock inverters, present in prjtrellis data but
             # not in Diamond bb models.

From cfe53b7395da3310301efebd43c37e1b631a7e41 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 28 Aug 2023 16:48:31 +0200
Subject: [PATCH 624/931] Move diamond tests

---
 techlibs/{ecp5 => lattice}/tests/.gitignore          | 0
 techlibs/{ecp5 => lattice}/tests/test_diamond_ffs.py | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename techlibs/{ecp5 => lattice}/tests/.gitignore (100%)
 rename techlibs/{ecp5 => lattice}/tests/test_diamond_ffs.py (100%)

diff --git a/techlibs/ecp5/tests/.gitignore b/techlibs/lattice/tests/.gitignore
similarity index 100%
rename from techlibs/ecp5/tests/.gitignore
rename to techlibs/lattice/tests/.gitignore
diff --git a/techlibs/ecp5/tests/test_diamond_ffs.py b/techlibs/lattice/tests/test_diamond_ffs.py
similarity index 100%
rename from techlibs/ecp5/tests/test_diamond_ffs.py
rename to techlibs/lattice/tests/test_diamond_ffs.py

From e7ac2374996fb6f2bdb95d352f82ac6ba2d00cff Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 28 Aug 2023 16:48:48 +0200
Subject: [PATCH 625/931] Delete synth_ecp5

---
 techlibs/ecp5/Makefile.inc     |  15 -
 techlibs/ecp5/arith_map.v      |  90 ----
 techlibs/ecp5/brams.txt        |  52 --
 techlibs/ecp5/brams_map.v      | 489 -------------------
 techlibs/ecp5/cells_bb.v       | 850 ---------------------------------
 techlibs/ecp5/cells_ff.vh      |  40 --
 techlibs/ecp5/cells_io.vh      |  14 -
 techlibs/ecp5/cells_map.v      | 191 --------
 techlibs/ecp5/cells_sim.v      | 681 --------------------------
 techlibs/ecp5/dsp_map.v        |  17 -
 techlibs/ecp5/latches_map.v    |  11 -
 techlibs/ecp5/lutrams.txt      |  12 -
 techlibs/ecp5/lutrams_map.v    |  30 --
 techlibs/ecp5/synth_ecp5.cc    | 457 ------------------
 techlibs/lattice/common_sim.vh |   2 +-
 15 files changed, 1 insertion(+), 2950 deletions(-)
 delete mode 100644 techlibs/ecp5/Makefile.inc
 delete mode 100644 techlibs/ecp5/arith_map.v
 delete mode 100644 techlibs/ecp5/brams.txt
 delete mode 100644 techlibs/ecp5/brams_map.v
 delete mode 100644 techlibs/ecp5/cells_bb.v
 delete mode 100644 techlibs/ecp5/cells_ff.vh
 delete mode 100644 techlibs/ecp5/cells_io.vh
 delete mode 100644 techlibs/ecp5/cells_map.v
 delete mode 100644 techlibs/ecp5/cells_sim.v
 delete mode 100644 techlibs/ecp5/dsp_map.v
 delete mode 100644 techlibs/ecp5/latches_map.v
 delete mode 100644 techlibs/ecp5/lutrams.txt
 delete mode 100644 techlibs/ecp5/lutrams_map.v
 delete mode 100644 techlibs/ecp5/synth_ecp5.cc

diff --git a/techlibs/ecp5/Makefile.inc b/techlibs/ecp5/Makefile.inc
deleted file mode 100644
index a1c9bfc52..000000000
--- a/techlibs/ecp5/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-
-OBJS += techlibs/ecp5/synth_ecp5.o
-
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/cells_ff.vh))
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/cells_io.vh))
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/cells_map.v))
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/cells_sim.v))
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/cells_bb.v))
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/lutrams_map.v))
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/lutrams.txt))
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/brams_map.v))
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/brams.txt))
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/arith_map.v))
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/latches_map.v))
-$(eval $(call add_share_file,share/ecp5,techlibs/ecp5/dsp_map.v))
diff --git a/techlibs/ecp5/arith_map.v b/techlibs/ecp5/arith_map.v
deleted file mode 100644
index 9334785ae..000000000
--- a/techlibs/ecp5/arith_map.v
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *  yosys -- Yosys Open SYnthesis Suite
- *
- *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
- *  Copyright (C) 2018  gatecat <gatecat@ds0.me>
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-(* techmap_celltype = "$alu" *)
-module _80_ecp5_alu (A, B, CI, BI, X, Y, CO);
-	parameter A_SIGNED = 0;
-	parameter B_SIGNED = 0;
-	parameter A_WIDTH = 1;
-	parameter B_WIDTH = 1;
-	parameter Y_WIDTH = 1;
-
-	(* force_downto *)
-	input [A_WIDTH-1:0] A;
-	(* force_downto *)
-	input [B_WIDTH-1:0] B;
-	(* force_downto *)
-	output [Y_WIDTH-1:0] X, Y;
-
-	input CI, BI;
-	(* force_downto *)
-	output [Y_WIDTH-1:0] CO;
-
-	wire _TECHMAP_FAIL_ = Y_WIDTH <= 4;
-
-	(* force_downto *)
-	wire [Y_WIDTH-1:0] A_buf, B_buf;
-	\$pos #(.A_SIGNED(A_SIGNED), .A_WIDTH(A_WIDTH), .Y_WIDTH(Y_WIDTH)) A_conv (.A(A), .Y(A_buf));
-	\$pos #(.A_SIGNED(B_SIGNED), .A_WIDTH(B_WIDTH), .Y_WIDTH(Y_WIDTH)) B_conv (.A(B), .Y(B_buf));
-
-	function integer round_up2;
-		input integer N;
-		begin
-			round_up2 = ((N + 1) / 2) * 2;
-		end
-	endfunction
-
-	localparam Y_WIDTH2 = round_up2(Y_WIDTH);
-
-	(* force_downto *)
-	wire [Y_WIDTH2-1:0] AA = A_buf;
-	(* force_downto *)
-	wire [Y_WIDTH2-1:0] BB = BI ? ~B_buf : B_buf;
-	(* force_downto *)
-	wire [Y_WIDTH2-1:0] BX = B_buf;
-	(* force_downto *)
-	wire [Y_WIDTH2-1:0] C = {CO, CI};
-	(* force_downto *)
-	wire [Y_WIDTH2-1:0] FCO, Y1;
-
-	genvar i;
-	generate for (i = 0; i < Y_WIDTH2; i = i + 2) begin:slice
-		CCU2C #(
-			.INIT0(16'b1001011010101010),
-			.INIT1(16'b1001011010101010),
-			.INJECT1_0("NO"),
-			.INJECT1_1("NO")
-	   ) ccu2c_i (
-			.CIN(C[i]),
-			.A0(AA[i]), .B0(BX[i]), .C0(BI), .D0(1'b1),
-			.A1(AA[i+1]), .B1(BX[i+1]), .C1(BI), .D1(1'b1),
-			.S0(Y[i]), .S1(Y1[i]),
-			.COUT(FCO[i])
-		);
-
-		assign CO[i] = (AA[i] && BB[i]) || (C[i] && (AA[i] || BB[i]));
-		if (i+1 < Y_WIDTH) begin
-			assign CO[i+1] = FCO[i];
-			assign Y[i+1] = Y1[i];
-		end
-	end endgenerate
-
-	assign X = AA ^ BB;
-endmodule
diff --git a/techlibs/ecp5/brams.txt b/techlibs/ecp5/brams.txt
deleted file mode 100644
index db28a40d7..000000000
--- a/techlibs/ecp5/brams.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-ram block $__ECP5_DP16KD_ {
-	abits 14;
-	widths 1 2 4 9 18 per_port;
-	byte 9;
-	cost 128;
-	init no_undef;
-	port srsw "A" "B" {
-		clock anyedge;
-		clken;
-		wrbe_separate;
-		portoption "WRITEMODE" "NORMAL" {
-			rdwr no_change;
-		}
-		portoption "WRITEMODE" "WRITETHROUGH" {
-			rdwr new;
-		}
-		portoption "WRITEMODE" "READBEFOREWRITE" {
-			rdwr old;
-		}
-		option "RESETMODE" "SYNC" {
-			rdsrst zero ungated block_wr;
-		}
-		option "RESETMODE" "ASYNC" {
-			rdarst zero;
-		}
-		rdinit zero;
-	}
-}
-
-ram block $__ECP5_PDPW16KD_ {
-	abits 14;
-	widths 1 2 4 9 18 36 per_port;
-	byte 9;
-	cost 128;
-	init no_undef;
-	port sr "R" {
-		clock anyedge;
-		clken;
-		option "RESETMODE" "SYNC" {
-			rdsrst zero ungated;
-		}
-		option "RESETMODE" "ASYNC" {
-			rdarst zero;
-		}
-		rdinit zero;
-	}
-	port sw "W" {
-		width 36;
-		clock anyedge;
-		clken;
-	}
-}
diff --git a/techlibs/ecp5/brams_map.v b/techlibs/ecp5/brams_map.v
deleted file mode 100644
index 22e6e068e..000000000
--- a/techlibs/ecp5/brams_map.v
+++ /dev/null
@@ -1,489 +0,0 @@
-module $__ECP5_DP16KD_ (...);
-
-parameter INIT = 0;
-parameter OPTION_RESETMODE = "SYNC";
-
-parameter PORT_A_WIDTH = 18;
-parameter PORT_A_WR_BE_WIDTH = 2;
-parameter PORT_A_CLK_POL = 1;
-parameter PORT_A_OPTION_WRITEMODE = "NORMAL";
-
-input PORT_A_CLK;
-input PORT_A_CLK_EN;
-input PORT_A_WR_EN;
-input PORT_A_RD_SRST;
-input PORT_A_RD_ARST;
-input [13:0] PORT_A_ADDR;
-input [PORT_A_WR_BE_WIDTH-1:0] PORT_A_WR_BE;
-input [PORT_A_WIDTH-1:0] PORT_A_WR_DATA;
-output [PORT_A_WIDTH-1:0] PORT_A_RD_DATA;
-
-parameter PORT_B_WIDTH = 18;
-parameter PORT_B_WR_BE_WIDTH = 2;
-parameter PORT_B_CLK_POL = 1;
-parameter PORT_B_OPTION_WRITEMODE = "NORMAL";
-
-input PORT_B_CLK;
-input PORT_B_CLK_EN;
-input PORT_B_WR_EN;
-input PORT_B_RD_SRST;
-input PORT_B_RD_ARST;
-input [13:0] PORT_B_ADDR;
-input [PORT_B_WR_BE_WIDTH-1:0] PORT_B_WR_BE;
-input [PORT_B_WIDTH-1:0] PORT_B_WR_DATA;
-output [PORT_B_WIDTH-1:0] PORT_B_RD_DATA;
-
-function [319:0] init_slice;
-	input integer idx;
-	integer i, j;
-	init_slice = 0;
-	for (i = 0; i < 16; i = i + 1) begin
-		init_slice[i*20+:18] = INIT[(idx * 16 + i) * 18+:18];
-	end
-endfunction
-
-wire [17:0] DOA;
-wire [17:0] DOB;
-wire [17:0] DIA = PORT_A_WR_DATA;
-wire [17:0] DIB = PORT_B_WR_DATA;
-
-assign PORT_A_RD_DATA = DOA;
-assign PORT_B_RD_DATA = DOB;
-
-DP16KD #(
-	.INITVAL_00(init_slice('h00)),
-	.INITVAL_01(init_slice('h01)),
-	.INITVAL_02(init_slice('h02)),
-	.INITVAL_03(init_slice('h03)),
-	.INITVAL_04(init_slice('h04)),
-	.INITVAL_05(init_slice('h05)),
-	.INITVAL_06(init_slice('h06)),
-	.INITVAL_07(init_slice('h07)),
-	.INITVAL_08(init_slice('h08)),
-	.INITVAL_09(init_slice('h09)),
-	.INITVAL_0A(init_slice('h0a)),
-	.INITVAL_0B(init_slice('h0b)),
-	.INITVAL_0C(init_slice('h0c)),
-	.INITVAL_0D(init_slice('h0d)),
-	.INITVAL_0E(init_slice('h0e)),
-	.INITVAL_0F(init_slice('h0f)),
-	.INITVAL_10(init_slice('h10)),
-	.INITVAL_11(init_slice('h11)),
-	.INITVAL_12(init_slice('h12)),
-	.INITVAL_13(init_slice('h13)),
-	.INITVAL_14(init_slice('h14)),
-	.INITVAL_15(init_slice('h15)),
-	.INITVAL_16(init_slice('h16)),
-	.INITVAL_17(init_slice('h17)),
-	.INITVAL_18(init_slice('h18)),
-	.INITVAL_19(init_slice('h19)),
-	.INITVAL_1A(init_slice('h1a)),
-	.INITVAL_1B(init_slice('h1b)),
-	.INITVAL_1C(init_slice('h1c)),
-	.INITVAL_1D(init_slice('h1d)),
-	.INITVAL_1E(init_slice('h1e)),
-	.INITVAL_1F(init_slice('h1f)),
-	.INITVAL_20(init_slice('h20)),
-	.INITVAL_21(init_slice('h21)),
-	.INITVAL_22(init_slice('h22)),
-	.INITVAL_23(init_slice('h23)),
-	.INITVAL_24(init_slice('h24)),
-	.INITVAL_25(init_slice('h25)),
-	.INITVAL_26(init_slice('h26)),
-	.INITVAL_27(init_slice('h27)),
-	.INITVAL_28(init_slice('h28)),
-	.INITVAL_29(init_slice('h29)),
-	.INITVAL_2A(init_slice('h2a)),
-	.INITVAL_2B(init_slice('h2b)),
-	.INITVAL_2C(init_slice('h2c)),
-	.INITVAL_2D(init_slice('h2d)),
-	.INITVAL_2E(init_slice('h2e)),
-	.INITVAL_2F(init_slice('h2f)),
-	.INITVAL_30(init_slice('h30)),
-	.INITVAL_31(init_slice('h31)),
-	.INITVAL_32(init_slice('h32)),
-	.INITVAL_33(init_slice('h33)),
-	.INITVAL_34(init_slice('h34)),
-	.INITVAL_35(init_slice('h35)),
-	.INITVAL_36(init_slice('h36)),
-	.INITVAL_37(init_slice('h37)),
-	.INITVAL_38(init_slice('h38)),
-	.INITVAL_39(init_slice('h39)),
-	.INITVAL_3A(init_slice('h3a)),
-	.INITVAL_3B(init_slice('h3b)),
-	.INITVAL_3C(init_slice('h3c)),
-	.INITVAL_3D(init_slice('h3d)),
-	.INITVAL_3E(init_slice('h3e)),
-	.INITVAL_3F(init_slice('h3f)),
-	.DATA_WIDTH_A(PORT_A_WIDTH),
-	.DATA_WIDTH_B(PORT_B_WIDTH),
-	.REGMODE_A("NOREG"),
-	.REGMODE_B("NOREG"),
-	.RESETMODE(OPTION_RESETMODE),
-	.ASYNC_RESET_RELEASE(OPTION_RESETMODE),
-	.CSDECODE_A("0b000"),
-	.CSDECODE_B("0b000"),
-	.CLKAMUX(PORT_A_CLK_POL ? "CLKA" : "INV"),
-	.CLKBMUX(PORT_B_CLK_POL ? "CLKB" : "INV"),
-	.WRITEMODE_A(PORT_A_OPTION_WRITEMODE),
-	.WRITEMODE_B(PORT_B_OPTION_WRITEMODE),
-	.GSR("AUTO")
-) _TECHMAP_REPLACE_ (
-	.CLKA(PORT_A_CLK),
-	.WEA(PORT_A_WIDTH == 18 ? PORT_A_WR_EN : (PORT_A_WR_EN | PORT_A_WR_BE[0])),
-	.CEA(PORT_A_CLK_EN),
-	.OCEA(1'b1),
-	.RSTA(OPTION_RESETMODE == "SYNC" ? PORT_A_RD_SRST : PORT_A_RD_ARST),
-	.CSA0(1'b0),
-	.CSA1(1'b0),
-	.CSA2(1'b0),
-	.ADA0(PORT_A_WIDTH == 18 ? PORT_A_WR_BE[0] : PORT_A_ADDR[0]),
-	.ADA1(PORT_A_WIDTH == 18 ? PORT_A_WR_BE[1] : PORT_A_ADDR[1]),
-	.ADA2(PORT_A_ADDR[2]),
-	.ADA3(PORT_A_ADDR[3]),
-	.ADA4(PORT_A_ADDR[4]),
-	.ADA5(PORT_A_ADDR[5]),
-	.ADA6(PORT_A_ADDR[6]),
-	.ADA7(PORT_A_ADDR[7]),
-	.ADA8(PORT_A_ADDR[8]),
-	.ADA9(PORT_A_ADDR[9]),
-	.ADA10(PORT_A_ADDR[10]),
-	.ADA11(PORT_A_ADDR[11]),
-	.ADA12(PORT_A_ADDR[12]),
-	.ADA13(PORT_A_ADDR[13]),
-	.DIA0(DIA[0]),
-	.DIA1(DIA[1]),
-	.DIA2(DIA[2]),
-	.DIA3(DIA[3]),
-	.DIA4(DIA[4]),
-	.DIA5(DIA[5]),
-	.DIA6(DIA[6]),
-	.DIA7(DIA[7]),
-	.DIA8(DIA[8]),
-	.DIA9(DIA[9]),
-	.DIA10(DIA[10]),
-	.DIA11(DIA[11]),
-	.DIA12(DIA[12]),
-	.DIA13(DIA[13]),
-	.DIA14(DIA[14]),
-	.DIA15(DIA[15]),
-	.DIA16(DIA[16]),
-	.DIA17(DIA[17]),
-	.DOA0(DOA[0]),
-	.DOA1(DOA[1]),
-	.DOA2(DOA[2]),
-	.DOA3(DOA[3]),
-	.DOA4(DOA[4]),
-	.DOA5(DOA[5]),
-	.DOA6(DOA[6]),
-	.DOA7(DOA[7]),
-	.DOA8(DOA[8]),
-	.DOA9(DOA[9]),
-	.DOA10(DOA[10]),
-	.DOA11(DOA[11]),
-	.DOA12(DOA[12]),
-	.DOA13(DOA[13]),
-	.DOA14(DOA[14]),
-	.DOA15(DOA[15]),
-	.DOA16(DOA[16]),
-	.DOA17(DOA[17]),
-
-	.CLKB(PORT_B_CLK),
-	.WEB(PORT_B_WIDTH == 18 ? PORT_B_WR_EN : (PORT_B_WR_EN | PORT_B_WR_BE[0])),
-	.CEB(PORT_B_CLK_EN),
-	.OCEB(1'b1),
-	.RSTB(OPTION_RESETMODE == "SYNC" ? PORT_B_RD_SRST : PORT_B_RD_ARST),
-	.CSB0(1'b0),
-	.CSB1(1'b0),
-	.CSB2(1'b0),
-	.ADB0(PORT_B_WIDTH == 18 ? PORT_B_WR_BE[0] : PORT_B_ADDR[0]),
-	.ADB1(PORT_B_WIDTH == 18 ? PORT_B_WR_BE[1] : PORT_B_ADDR[1]),
-	.ADB2(PORT_B_ADDR[2]),
-	.ADB3(PORT_B_ADDR[3]),
-	.ADB4(PORT_B_ADDR[4]),
-	.ADB5(PORT_B_ADDR[5]),
-	.ADB6(PORT_B_ADDR[6]),
-	.ADB7(PORT_B_ADDR[7]),
-	.ADB8(PORT_B_ADDR[8]),
-	.ADB9(PORT_B_ADDR[9]),
-	.ADB10(PORT_B_ADDR[10]),
-	.ADB11(PORT_B_ADDR[11]),
-	.ADB12(PORT_B_ADDR[12]),
-	.ADB13(PORT_B_ADDR[13]),
-	.DIB0(DIB[0]),
-	.DIB1(DIB[1]),
-	.DIB2(DIB[2]),
-	.DIB3(DIB[3]),
-	.DIB4(DIB[4]),
-	.DIB5(DIB[5]),
-	.DIB6(DIB[6]),
-	.DIB7(DIB[7]),
-	.DIB8(DIB[8]),
-	.DIB9(DIB[9]),
-	.DIB10(DIB[10]),
-	.DIB11(DIB[11]),
-	.DIB12(DIB[12]),
-	.DIB13(DIB[13]),
-	.DIB14(DIB[14]),
-	.DIB15(DIB[15]),
-	.DIB16(DIB[16]),
-	.DIB17(DIB[17]),
-	.DOB0(DOB[0]),
-	.DOB1(DOB[1]),
-	.DOB2(DOB[2]),
-	.DOB3(DOB[3]),
-	.DOB4(DOB[4]),
-	.DOB5(DOB[5]),
-	.DOB6(DOB[6]),
-	.DOB7(DOB[7]),
-	.DOB8(DOB[8]),
-	.DOB9(DOB[9]),
-	.DOB10(DOB[10]),
-	.DOB11(DOB[11]),
-	.DOB12(DOB[12]),
-	.DOB13(DOB[13]),
-	.DOB14(DOB[14]),
-	.DOB15(DOB[15]),
-	.DOB16(DOB[16]),
-	.DOB17(DOB[17]),
-);
-
-endmodule
-
-
-module $__ECP5_PDPW16KD_ (...);
-
-parameter INIT = 0;
-parameter OPTION_RESETMODE = "SYNC";
-
-parameter PORT_R_WIDTH = 36;
-parameter PORT_R_CLK_POL = 1;
-
-input PORT_R_CLK;
-input PORT_R_CLK_EN;
-input PORT_R_RD_SRST;
-input PORT_R_RD_ARST;
-input [13:0] PORT_R_ADDR;
-output [PORT_R_WIDTH-1:0] PORT_R_RD_DATA;
-
-parameter PORT_W_WIDTH = 36;
-parameter PORT_W_WR_EN_WIDTH = 4;
-parameter PORT_W_CLK_POL = 1;
-
-input PORT_W_CLK;
-input PORT_W_CLK_EN;
-input [13:0] PORT_W_ADDR;
-input [PORT_W_WR_EN_WIDTH-1:0] PORT_W_WR_EN;
-input [PORT_W_WIDTH-1:0] PORT_W_WR_DATA;
-
-function [319:0] init_slice;
-	input integer idx;
-	integer i, j;
-	init_slice = 0;
-	for (i = 0; i < 16; i = i + 1) begin
-		init_slice[i*20+:18] = INIT[(idx * 16 + i) * 18+:18];
-	end
-endfunction
-
-wire [35:0] DI = PORT_W_WR_DATA;
-wire [35:0] DO;
-
-assign PORT_R_RD_DATA = PORT_R_WIDTH == 36 ? DO : DO[35:18];
-
-DP16KD #(
-	.INITVAL_00(init_slice('h00)),
-	.INITVAL_01(init_slice('h01)),
-	.INITVAL_02(init_slice('h02)),
-	.INITVAL_03(init_slice('h03)),
-	.INITVAL_04(init_slice('h04)),
-	.INITVAL_05(init_slice('h05)),
-	.INITVAL_06(init_slice('h06)),
-	.INITVAL_07(init_slice('h07)),
-	.INITVAL_08(init_slice('h08)),
-	.INITVAL_09(init_slice('h09)),
-	.INITVAL_0A(init_slice('h0a)),
-	.INITVAL_0B(init_slice('h0b)),
-	.INITVAL_0C(init_slice('h0c)),
-	.INITVAL_0D(init_slice('h0d)),
-	.INITVAL_0E(init_slice('h0e)),
-	.INITVAL_0F(init_slice('h0f)),
-	.INITVAL_10(init_slice('h10)),
-	.INITVAL_11(init_slice('h11)),
-	.INITVAL_12(init_slice('h12)),
-	.INITVAL_13(init_slice('h13)),
-	.INITVAL_14(init_slice('h14)),
-	.INITVAL_15(init_slice('h15)),
-	.INITVAL_16(init_slice('h16)),
-	.INITVAL_17(init_slice('h17)),
-	.INITVAL_18(init_slice('h18)),
-	.INITVAL_19(init_slice('h19)),
-	.INITVAL_1A(init_slice('h1a)),
-	.INITVAL_1B(init_slice('h1b)),
-	.INITVAL_1C(init_slice('h1c)),
-	.INITVAL_1D(init_slice('h1d)),
-	.INITVAL_1E(init_slice('h1e)),
-	.INITVAL_1F(init_slice('h1f)),
-	.INITVAL_20(init_slice('h20)),
-	.INITVAL_21(init_slice('h21)),
-	.INITVAL_22(init_slice('h22)),
-	.INITVAL_23(init_slice('h23)),
-	.INITVAL_24(init_slice('h24)),
-	.INITVAL_25(init_slice('h25)),
-	.INITVAL_26(init_slice('h26)),
-	.INITVAL_27(init_slice('h27)),
-	.INITVAL_28(init_slice('h28)),
-	.INITVAL_29(init_slice('h29)),
-	.INITVAL_2A(init_slice('h2a)),
-	.INITVAL_2B(init_slice('h2b)),
-	.INITVAL_2C(init_slice('h2c)),
-	.INITVAL_2D(init_slice('h2d)),
-	.INITVAL_2E(init_slice('h2e)),
-	.INITVAL_2F(init_slice('h2f)),
-	.INITVAL_30(init_slice('h30)),
-	.INITVAL_31(init_slice('h31)),
-	.INITVAL_32(init_slice('h32)),
-	.INITVAL_33(init_slice('h33)),
-	.INITVAL_34(init_slice('h34)),
-	.INITVAL_35(init_slice('h35)),
-	.INITVAL_36(init_slice('h36)),
-	.INITVAL_37(init_slice('h37)),
-	.INITVAL_38(init_slice('h38)),
-	.INITVAL_39(init_slice('h39)),
-	.INITVAL_3A(init_slice('h3a)),
-	.INITVAL_3B(init_slice('h3b)),
-	.INITVAL_3C(init_slice('h3c)),
-	.INITVAL_3D(init_slice('h3d)),
-	.INITVAL_3E(init_slice('h3e)),
-	.INITVAL_3F(init_slice('h3f)),
-	.DATA_WIDTH_A(PORT_W_WIDTH),
-	.DATA_WIDTH_B(PORT_R_WIDTH),
-	.REGMODE_A("NOREG"),
-	.REGMODE_B("NOREG"),
-	.RESETMODE(OPTION_RESETMODE),
-	.ASYNC_RESET_RELEASE(OPTION_RESETMODE),
-	.CSDECODE_A("0b000"),
-	.CSDECODE_B("0b000"),
-	.CLKAMUX(PORT_W_CLK_POL ? "CLKA" : "INV"),
-	.CLKBMUX(PORT_R_CLK_POL ? "CLKB" : "INV"),
-	.GSR("AUTO")
-) _TECHMAP_REPLACE_ (
-	.CLKA(PORT_W_CLK),
-	.WEA(PORT_W_WIDTH >= 18 ? 1'b1 : PORT_W_WR_EN[0]),
-	.CEA(PORT_W_CLK_EN),
-	.OCEA(1'b0),
-	.RSTA(1'b0),
-	.CSA0(1'b0),
-	.CSA1(1'b0),
-	.CSA2(1'b0),
-	.ADA0(PORT_W_WIDTH >= 18 ? PORT_W_WR_EN[0] : PORT_W_ADDR[0]),
-	.ADA1(PORT_W_WIDTH >= 18 ? PORT_W_WR_EN[1] : PORT_W_ADDR[1]),
-	.ADA2(PORT_W_WIDTH >= 36 ? PORT_W_WR_EN[2] : PORT_W_ADDR[2]),
-	.ADA3(PORT_W_WIDTH >= 36 ? PORT_W_WR_EN[3] : PORT_W_ADDR[3]),
-	.ADA4(PORT_W_ADDR[4]),
-	.ADA5(PORT_W_ADDR[5]),
-	.ADA6(PORT_W_ADDR[6]),
-	.ADA7(PORT_W_ADDR[7]),
-	.ADA8(PORT_W_ADDR[8]),
-	.ADA9(PORT_W_ADDR[9]),
-	.ADA10(PORT_W_ADDR[10]),
-	.ADA11(PORT_W_ADDR[11]),
-	.ADA12(PORT_W_ADDR[12]),
-	.ADA13(PORT_W_ADDR[13]),
-	.DIA0(DI[0]),
-	.DIA1(DI[1]),
-	.DIA2(DI[2]),
-	.DIA3(DI[3]),
-	.DIA4(DI[4]),
-	.DIA5(DI[5]),
-	.DIA6(DI[6]),
-	.DIA7(DI[7]),
-	.DIA8(DI[8]),
-	.DIA9(DI[9]),
-	.DIA10(DI[10]),
-	.DIA11(DI[11]),
-	.DIA12(DI[12]),
-	.DIA13(DI[13]),
-	.DIA14(DI[14]),
-	.DIA15(DI[15]),
-	.DIA16(DI[16]),
-	.DIA17(DI[17]),
-	.DIB0(DI[18]),
-	.DIB1(DI[19]),
-	.DIB2(DI[20]),
-	.DIB3(DI[21]),
-	.DIB4(DI[22]),
-	.DIB5(DI[23]),
-	.DIB6(DI[24]),
-	.DIB7(DI[25]),
-	.DIB8(DI[26]),
-	.DIB9(DI[27]),
-	.DIB10(DI[28]),
-	.DIB11(DI[29]),
-	.DIB12(DI[30]),
-	.DIB13(DI[31]),
-	.DIB14(DI[32]),
-	.DIB15(DI[33]),
-	.DIB16(DI[34]),
-	.DIB17(DI[35]),
-
-	.CLKB(PORT_R_CLK),
-	.WEB(1'b0),
-	.CEB(PORT_R_CLK_EN),
-	.OCEB(1'b1),
-	.RSTB(OPTION_RESETMODE == "SYNC" ? PORT_R_RD_SRST : PORT_R_RD_ARST),
-	.CSB0(1'b0),
-	.CSB1(1'b0),
-	.CSB2(1'b0),
-	.ADB0(PORT_R_ADDR[0]),
-	.ADB1(PORT_R_ADDR[1]),
-	.ADB2(PORT_R_ADDR[2]),
-	.ADB3(PORT_R_ADDR[3]),
-	.ADB4(PORT_R_ADDR[4]),
-	.ADB5(PORT_R_ADDR[5]),
-	.ADB6(PORT_R_ADDR[6]),
-	.ADB7(PORT_R_ADDR[7]),
-	.ADB8(PORT_R_ADDR[8]),
-	.ADB9(PORT_R_ADDR[9]),
-	.ADB10(PORT_R_ADDR[10]),
-	.ADB11(PORT_R_ADDR[11]),
-	.ADB12(PORT_R_ADDR[12]),
-	.ADB13(PORT_R_ADDR[13]),
-	.DOA0(DO[0]),
-	.DOA1(DO[1]),
-	.DOA2(DO[2]),
-	.DOA3(DO[3]),
-	.DOA4(DO[4]),
-	.DOA5(DO[5]),
-	.DOA6(DO[6]),
-	.DOA7(DO[7]),
-	.DOA8(DO[8]),
-	.DOA9(DO[9]),
-	.DOA10(DO[10]),
-	.DOA11(DO[11]),
-	.DOA12(DO[12]),
-	.DOA13(DO[13]),
-	.DOA14(DO[14]),
-	.DOA15(DO[15]),
-	.DOA16(DO[16]),
-	.DOA17(DO[17]),
-	.DOB0(DO[18]),
-	.DOB1(DO[19]),
-	.DOB2(DO[20]),
-	.DOB3(DO[21]),
-	.DOB4(DO[22]),
-	.DOB5(DO[23]),
-	.DOB6(DO[24]),
-	.DOB7(DO[25]),
-	.DOB8(DO[26]),
-	.DOB9(DO[27]),
-	.DOB10(DO[28]),
-	.DOB11(DO[29]),
-	.DOB12(DO[30]),
-	.DOB13(DO[31]),
-	.DOB14(DO[32]),
-	.DOB15(DO[33]),
-	.DOB16(DO[34]),
-	.DOB17(DO[35]),
-);
-
-endmodule
diff --git a/techlibs/ecp5/cells_bb.v b/techlibs/ecp5/cells_bb.v
deleted file mode 100644
index 316671f3c..000000000
--- a/techlibs/ecp5/cells_bb.v
+++ /dev/null
@@ -1,850 +0,0 @@
-// ECP5 Blackbox cells
-// FIXME: Create sim models
-
-(* blackbox *)
-module MULT18X18D(
-	input A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17,
-	input B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15, B16, B17,
-	input C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15, C16, C17,
-	input SIGNEDA, SIGNEDB, SOURCEA, SOURCEB,
-	input CLK0, CLK1, CLK2, CLK3,
-	input CE0, CE1, CE2, CE3,
-	input RST0, RST1, RST2, RST3,
-	input SRIA0, SRIA1, SRIA2, SRIA3, SRIA4, SRIA5, SRIA6, SRIA7, SRIA8, SRIA9, SRIA10, SRIA11, SRIA12, SRIA13, SRIA14, SRIA15, SRIA16, SRIA17,
-	input SRIB0, SRIB1, SRIB2, SRIB3, SRIB4, SRIB5, SRIB6, SRIB7, SRIB8, SRIB9, SRIB10, SRIB11, SRIB12, SRIB13, SRIB14, SRIB15, SRIB16, SRIB17,
-	output SROA0, SROA1, SROA2, SROA3, SROA4, SROA5, SROA6, SROA7, SROA8, SROA9, SROA10, SROA11, SROA12, SROA13, SROA14, SROA15, SROA16, SROA17,
-	output SROB0, SROB1, SROB2, SROB3, SROB4, SROB5, SROB6, SROB7, SROB8, SROB9, SROB10, SROB11, SROB12, SROB13, SROB14, SROB15, SROB16, SROB17,
-	output ROA0, ROA1, ROA2, ROA3, ROA4, ROA5, ROA6, ROA7, ROA8, ROA9, ROA10, ROA11, ROA12, ROA13, ROA14, ROA15, ROA16, ROA17,
-	output ROB0, ROB1, ROB2, ROB3, ROB4, ROB5, ROB6, ROB7, ROB8, ROB9, ROB10, ROB11, ROB12, ROB13, ROB14, ROB15, ROB16, ROB17,
-	output ROC0, ROC1, ROC2, ROC3, ROC4, ROC5, ROC6, ROC7, ROC8, ROC9, ROC10, ROC11, ROC12, ROC13, ROC14, ROC15, ROC16, ROC17,
-	output P0, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22, P23, P24, P25, P26, P27, P28, P29, P30, P31, P32, P33, P34, P35,
-	output SIGNEDP
-);
-	parameter REG_INPUTA_CLK = "NONE";
-	parameter REG_INPUTA_CE = "CE0";
-	parameter REG_INPUTA_RST = "RST0";
-	parameter REG_INPUTB_CLK = "NONE";
-	parameter REG_INPUTB_CE = "CE0";
-	parameter REG_INPUTB_RST = "RST0";
-	parameter REG_INPUTC_CLK = "NONE";
-	parameter REG_INPUTC_CE = "CE0";
-	parameter REG_INPUTC_RST = "RST0";
-	parameter REG_PIPELINE_CLK = "NONE";
-	parameter REG_PIPELINE_CE = "CE0";
-	parameter REG_PIPELINE_RST = "RST0";
-	parameter REG_OUTPUT_CLK = "NONE";
-	parameter REG_OUTPUT_CE = "CE0";
-	parameter REG_OUTPUT_RST = "RST0";
-	parameter [127:0] CLK0_DIV = "ENABLED";
-	parameter [127:0] CLK1_DIV = "ENABLED";
-	parameter [127:0] CLK2_DIV = "ENABLED";
-	parameter [127:0] CLK3_DIV = "ENABLED";
-	parameter HIGHSPEED_CLK = "NONE";
-	parameter [127:0] GSR = "ENABLED";
-	parameter CAS_MATCH_REG = "FALSE";
-	parameter [127:0] SOURCEB_MODE = "B_SHIFT";
-	parameter [127:0] MULT_BYPASS = "DISABLED";
-	parameter [127:0] RESETMODE = "SYNC";
-endmodule
-
-(* blackbox *)
-module ALU54B(
-	input CLK0, CLK1, CLK2, CLK3,
-	input CE0, CE1, CE2, CE3,
-	input RST0, RST1, RST2, RST3,
-	input SIGNEDIA, SIGNEDIB, SIGNEDCIN,
-	input A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, A16, A17, A18, A19, A20, A21, A22, A23, A24, A25, A26, A27, A28, A29, A30, A31, A32, A33, A34, A35,
-	input B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15, B16, B17, B18, B19, B20, B21, B22, B23, B24, B25, B26, B27, B28, B29, B30, B31, B32, B33, B34, B35,
-	input C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15, C16, C17, C18, C19, C20, C21, C22, C23, C24, C25, C26, C27, C28, C29, C30, C31, C32, C33, C34, C35, C36, C37, C38, C39, C40, C41, C42, C43, C44, C45, C46, C47, C48, C49, C50, C51, C52, C53,
-	input CFB0, CFB1, CFB2, CFB3, CFB4, CFB5, CFB6, CFB7, CFB8, CFB9, CFB10, CFB11, CFB12, CFB13, CFB14, CFB15, CFB16, CFB17, CFB18, CFB19, CFB20, CFB21, CFB22, CFB23, CFB24, CFB25, CFB26, CFB27, CFB28, CFB29, CFB30, CFB31, CFB32, CFB33, CFB34, CFB35, CFB36, CFB37, CFB38, CFB39, CFB40, CFB41, CFB42, CFB43, CFB44, CFB45, CFB46, CFB47, CFB48, CFB49, CFB50, CFB51, CFB52, CFB53,
-	input MA0, MA1, MA2, MA3, MA4, MA5, MA6, MA7, MA8, MA9, MA10, MA11, MA12, MA13, MA14, MA15, MA16, MA17, MA18, MA19, MA20, MA21, MA22, MA23, MA24, MA25, MA26, MA27, MA28, MA29, MA30, MA31, MA32, MA33, MA34, MA35,
-	input MB0, MB1, MB2, MB3, MB4, MB5, MB6, MB7, MB8, MB9, MB10, MB11, MB12, MB13, MB14, MB15, MB16, MB17, MB18, MB19, MB20, MB21, MB22, MB23, MB24, MB25, MB26, MB27, MB28, MB29, MB30, MB31, MB32, MB33, MB34, MB35,
-	input CIN0, CIN1, CIN2, CIN3, CIN4, CIN5, CIN6, CIN7, CIN8, CIN9, CIN10, CIN11, CIN12, CIN13, CIN14, CIN15, CIN16, CIN17, CIN18, CIN19, CIN20, CIN21, CIN22, CIN23, CIN24, CIN25, CIN26, CIN27, CIN28, CIN29, CIN30, CIN31, CIN32, CIN33, CIN34, CIN35, CIN36, CIN37, CIN38, CIN39, CIN40, CIN41, CIN42, CIN43, CIN44, CIN45, CIN46, CIN47, CIN48, CIN49, CIN50, CIN51, CIN52, CIN53,
-	input OP0, OP1, OP2, OP3, OP4, OP5, OP6, OP7, OP8, OP9, OP10,
-	output R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, R13, R14, R15, R16, R17, R18, R19, R20, R21, R22, R23, R24, R25, R26, R27, R28, R29, R30, R31, R32, R33, R34, R35, R36, R37, R38, R39, R40, R41, R42, R43, R44, R45, R46, R47, R48, R49, R50, R51, R52, R53,
-	output CO0, CO1, CO2, CO3, CO4, CO5, CO6, CO7, CO8, CO9, CO10, CO11, CO12, CO13, CO14, CO15, CO16, CO17, CO18, CO19, CO20, CO21, CO22, CO23, CO24, CO25, CO26, CO27, CO28, CO29, CO30, CO31, CO32, CO33, CO34, CO35, CO36, CO37, CO38, CO39, CO40, CO41, CO42, CO43, CO44, CO45, CO46, CO47, CO48, CO49, CO50, CO51, CO52, CO53,
-	output EQZ, EQZM, EQOM, EQPAT, EQPATB,
-	output OVER, UNDER, OVERUNDER,
-	output SIGNEDR
-);
-	parameter REG_INPUTC0_CLK = "NONE";
-	parameter REG_INPUTC0_CE = "CE0";
-	parameter REG_INPUTC0_RST = "RST0";
-	parameter REG_INPUTC1_CLK = "NONE";
-	parameter REG_INPUTC1_CE = "CE0";
-	parameter REG_INPUTC1_RST = "RST0";
-	parameter REG_OPCODEOP0_0_CLK = "NONE";
-	parameter REG_OPCODEOP0_0_CE = "CE0";
-	parameter REG_OPCODEOP0_0_RST = "RST0";
-	parameter REG_OPCODEOP1_0_CLK = "NONE";
-	parameter REG_OPCODEOP0_1_CLK = "NONE";
-	parameter REG_OPCODEOP0_1_CE = "CE0";
-	parameter REG_OPCODEOP0_1_RST = "RST0";
-	parameter REG_OPCODEOP1_1_CLK = "NONE";
-	parameter REG_OPCODEIN_0_CLK = "NONE";
-	parameter REG_OPCODEIN_0_CE = "CE0";
-	parameter REG_OPCODEIN_0_RST = "RST0";
-	parameter REG_OPCODEIN_1_CLK = "NONE";
-	parameter REG_OPCODEIN_1_CE = "CE0";
-	parameter REG_OPCODEIN_1_RST = "RST0";
-	parameter REG_OUTPUT0_CLK = "NONE";
-	parameter REG_OUTPUT0_CE = "CE0";
-	parameter REG_OUTPUT0_RST = "RST0";
-	parameter REG_OUTPUT1_CLK = "NONE";
-	parameter REG_OUTPUT1_CE = "CE0";
-	parameter REG_OUTPUT1_RST = "RST0";
-	parameter REG_FLAG_CLK = "NONE";
-	parameter REG_FLAG_CE = "CE0";
-	parameter REG_FLAG_RST = "RST0";
-	parameter REG_INPUTCFB_CLK = "NONE";
-	parameter REG_INPUTCFB_CE = "CE0";
-	parameter REG_INPUTCFB_RST = "RST0";
-	parameter [127:0] MCPAT_SOURCE = "STATIC";
-	parameter [127:0] MASKPAT_SOURCE = "STATIC";
-	parameter MASK01 = "0x00000000000000";
-	parameter [127:0] CLK0_DIV = "ENABLED";
-	parameter [127:0] CLK1_DIV = "ENABLED";
-	parameter [127:0] CLK2_DIV = "ENABLED";
-	parameter [127:0] CLK3_DIV = "ENABLED";
-	parameter MCPAT = "0x00000000000000";
-	parameter MASKPAT = "0x00000000000000";
-	parameter RNDPAT = "0x00000000000000";
-	parameter [127:0] GSR = "ENABLED";
-	parameter [127:0] RESETMODE = "SYNC";
-	parameter MULT9_MODE = "DISABLED";
-	parameter FORCE_ZERO_BARREL_SHIFT = "DISABLED";
-	parameter LEGACY = "DISABLED";
-endmodule
-
-(* blackbox *)
-module EHXPLLL (
-	input CLKI, CLKFB,
-	input PHASESEL1, PHASESEL0, PHASEDIR, PHASESTEP, PHASELOADREG,
-	input STDBY, PLLWAKESYNC,
-	input RST, ENCLKOP, ENCLKOS, ENCLKOS2, ENCLKOS3,
-	output CLKOP, CLKOS, CLKOS2, CLKOS3,
-	output LOCK, INTLOCK,
-	output REFCLK, CLKINTFB
-);
-	parameter CLKI_DIV = 1;
-	parameter CLKFB_DIV = 1;
-	parameter CLKOP_DIV = 8;
-	parameter CLKOS_DIV = 8;
-	parameter CLKOS2_DIV = 8;
-	parameter CLKOS3_DIV = 8;
-	parameter CLKOP_ENABLE = "ENABLED";
-	parameter CLKOS_ENABLE = "DISABLED";
-	parameter CLKOS2_ENABLE = "DISABLED";
-	parameter CLKOS3_ENABLE = "DISABLED";
-	parameter CLKOP_CPHASE = 0;
-	parameter CLKOS_CPHASE = 0;
-	parameter CLKOS2_CPHASE = 0;
-	parameter CLKOS3_CPHASE = 0;
-	parameter CLKOP_FPHASE = 0;
-	parameter CLKOS_FPHASE = 0;
-	parameter CLKOS2_FPHASE = 0;
-	parameter CLKOS3_FPHASE = 0;
-	parameter FEEDBK_PATH = "CLKOP";
-	parameter CLKOP_TRIM_POL = "RISING";
-	parameter CLKOP_TRIM_DELAY = 0;
-	parameter CLKOS_TRIM_POL = "RISING";
-	parameter CLKOS_TRIM_DELAY = 0;
-	parameter OUTDIVIDER_MUXA = "DIVA";
-	parameter OUTDIVIDER_MUXB = "DIVB";
-	parameter OUTDIVIDER_MUXC = "DIVC";
-	parameter OUTDIVIDER_MUXD = "DIVD";
-	parameter PLL_LOCK_MODE = 0;
-	parameter PLL_LOCK_DELAY = 200;
-	parameter STDBY_ENABLE = "DISABLED";
-	parameter REFIN_RESET = "DISABLED";
-	parameter SYNC_ENABLE = "DISABLED";
-	parameter INT_LOCK_STICKY = "ENABLED";
-	parameter DPHASE_SOURCE = "DISABLED";
-	parameter PLLRST_ENA = "DISABLED";
-	parameter INTFB_WAKE = "DISABLED";
-endmodule
-
-(* blackbox *)
-module DTR(
-	input STARTPULSE,
-	output DTROUT7, DTROUT6, DTROUT5, DTROUT4, DTROUT3, DTROUT2, DTROUT1, DTROUT0
-);
-endmodule
-
-(* blackbox *)
-module OSCG(
-	output OSC
-);
-parameter DIV = 128;
-endmodule
-
-(* blackbox *) (* keep *)
-module USRMCLK(
-	input USRMCLKI, USRMCLKTS,
-	output USRMCLKO
-);
-endmodule
-
-(* blackbox *) (* keep *)
-module JTAGG(
-	(* iopad_external_pin *)
-	input TCK, 
-	(* iopad_external_pin *)
-	input TMS, 
-	(* iopad_external_pin *)
-	input TDI,
-	input JTDO2, JTDO1,
-	(* iopad_external_pin *)
-	output TDO,
-	output JTDI, JTCK, JRTI2, JRTI1,
-	output JSHIFT, JUPDATE, JRSTN, JCE2, JCE1
-);
-parameter ER1 = "ENABLED";
-parameter ER2 = "ENABLED";
-endmodule
-
-(* blackbox *)
-module DELAYF(
-	input A, LOADN, MOVE, DIRECTION,
-	output Z, CFLAG
-);
-	parameter DEL_MODE = "USER_DEFINED";
-	parameter DEL_VALUE = 0;
-endmodule
-
-(* blackbox *)
-module DELAYG(
-	input A,
-	output Z
-);
-	parameter DEL_MODE = "USER_DEFINED";
-	parameter DEL_VALUE = 0;
-endmodule
-
-(* blackbox *)
-module IDDRX1F(
-	input D, SCLK, RST,
-	output Q0, Q1
-);
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module IDDRX2F(
-	input D, SCLK, ECLK, RST, ALIGNWD,
-	output Q0, Q1, Q2, Q3
-);
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module IDDR71B(
-	input D, SCLK, ECLK, RST, ALIGNWD,
-	output Q0, Q1, Q2, Q3, Q4, Q5, Q6
-);
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module IDDRX2DQA(
-	input D, DQSR90, ECLK, SCLK, RST,
-	input RDPNTR2, RDPNTR1, RDPNTR0, WRPNTR2, WRPNTR1, WRPNTR0,
-	output Q0, Q1, Q2, Q3, QWL
-);
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module ODDRX1F(
-	input SCLK, RST, D0, D1,
-	output Q
-);
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module ODDRX2F(
-	input SCLK, ECLK, RST, D0, D1, D2, D3,
-	output Q
-);
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module ODDR71B(
-	input SCLK, ECLK, RST, D0, D1, D2, D3, D4, D5, D6,
-	output Q
-);
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module OSHX2A(
-	input D0, D1, RST, ECLK, SCLK,
-	output Q
-);
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module ODDRX2DQA(
-	input D0, D1, D2, D3, RST, ECLK, SCLK, DQSW270,
-	output Q
-);
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module ODDRX2DQSB(
-	input D0, D1, D2, D3, RST, ECLK, SCLK, DQSW,
-	output Q
-);
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module TSHX2DQA(
-	input T0, T1, SCLK, ECLK, DQSW270, RST,
-	output Q
-);
-	parameter GSR = "ENABLED";
-	parameter REGSET = "SET";
-endmodule
-
-(* blackbox *)
-module TSHX2DQSA(
-	input T0, T1, SCLK, ECLK, DQSW, RST,
-	output Q
-);
-	parameter GSR = "ENABLED";
-	parameter REGSET = "SET";
-endmodule
-
-(* blackbox *)
-module DQSBUFM(
-	input DQSI, READ1, READ0, READCLKSEL2, READCLKSEL1, READCLKSEL0, DDRDEL,
-	input ECLK, SCLK,
-	input DYNDELAY7, DYNDELAY6, DYNDELAY5, DYNDELAY4,
-	input DYNDELAY3, DYNDELAY2, DYNDELAY1, DYNDELAY0, 
-	input RST, RDLOADN, RDMOVE, RDDIRECTION, WRLOADN, WRMOVE, WRDIRECTION, PAUSE,
-	output DQSR90, DQSW, DQSW270,
-	output RDPNTR2, RDPNTR1, RDPNTR0, WRPNTR2, WRPNTR1, WRPNTR0,
-	output DATAVALID, BURSTDET, RDCFLAG, WRCFLAG
-);
-	parameter DQS_LI_DEL_ADJ = "FACTORYONLY";
-	parameter DQS_LI_DEL_VAL = 0;
-	parameter DQS_LO_DEL_ADJ = "FACTORYONLY";
-	parameter DQS_LO_DEL_VAL = 0;
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module DDRDLLA(
-	input CLK, RST, UDDCNTLN, FREEZE,
-	output LOCK, DDRDEL, DCNTL7, DCNTL6, DCNTL5, DCNTL4, DCNTL3, DCNTL2, DCNTL1, DCNTL0
-);
-	parameter FORCE_MAX_DELAY = "NO";
-	parameter GSR = "ENABLED";
-endmodule
-
-(* blackbox *)
-module DLLDELD(
-	input A, DDRDEL, LOADN, MOVE, DIRECTION,
-	output Z, CFLAG
-);
-	parameter DEL_ADJ = "PLUS";
-	parameter DEL_VAL = 0;
-endmodule
-
-(* blackbox *)
-module CLKDIVF(
-	input CLKI, RST, ALIGNWD,
-	output CDIVX
-);
-	parameter GSR = "DISABLED";
-	parameter DIV = "2.0";
-endmodule
-
-(* blackbox *)
-module ECLKSYNCB(
-	input ECLKI, STOP,
-	output ECLKO
-);
-endmodule
-
-(* blackbox *)
-module ECLKBRIDGECS(
-	input CLK0, CLK1, SEL,
-	output ECSOUT
-);
-endmodule
-
-(* blackbox *)
-module DCCA(
-	input CLKI, CE,
-	output CLKO
-);
-endmodule
-
-(* blackbox *)
-module DCSC(
-	input CLK1, CLK0,
-	input SEL1, SEL0,
-	input MODESEL,
-	output DCSOUT
-);
-	parameter DCSMODE = "POS";
-endmodule
-
-(* blackbox *) (* keep *)
-module DCUA(
-	(* iopad_external_pin *)
-	input CH0_HDINP,
-	(* iopad_external_pin *)
-	input CH1_HDINP,
-	(* iopad_external_pin *)
-	input CH0_HDINN,
-	(* iopad_external_pin *)
-	input CH1_HDINN,
-	input D_TXBIT_CLKP_FROM_ND, D_TXBIT_CLKN_FROM_ND, D_SYNC_ND, D_TXPLL_LOL_FROM_ND,
-	input CH0_RX_REFCLK, CH1_RX_REFCLK, CH0_FF_RXI_CLK, CH1_FF_RXI_CLK, CH0_FF_TXI_CLK, CH1_FF_TXI_CLK, CH0_FF_EBRD_CLK, CH1_FF_EBRD_CLK,
-	input CH0_FF_TX_D_0, CH1_FF_TX_D_0, CH0_FF_TX_D_1, CH1_FF_TX_D_1, CH0_FF_TX_D_2, CH1_FF_TX_D_2, CH0_FF_TX_D_3, CH1_FF_TX_D_3,
-	input CH0_FF_TX_D_4, CH1_FF_TX_D_4, CH0_FF_TX_D_5, CH1_FF_TX_D_5, CH0_FF_TX_D_6, CH1_FF_TX_D_6, CH0_FF_TX_D_7, CH1_FF_TX_D_7,
-	input CH0_FF_TX_D_8, CH1_FF_TX_D_8, CH0_FF_TX_D_9, CH1_FF_TX_D_9, CH0_FF_TX_D_10, CH1_FF_TX_D_10, CH0_FF_TX_D_11, CH1_FF_TX_D_11,
-	input CH0_FF_TX_D_12, CH1_FF_TX_D_12, CH0_FF_TX_D_13, CH1_FF_TX_D_13, CH0_FF_TX_D_14, CH1_FF_TX_D_14, CH0_FF_TX_D_15, CH1_FF_TX_D_15,
-	input CH0_FF_TX_D_16, CH1_FF_TX_D_16, CH0_FF_TX_D_17, CH1_FF_TX_D_17, CH0_FF_TX_D_18, CH1_FF_TX_D_18, CH0_FF_TX_D_19, CH1_FF_TX_D_19,
-	input CH0_FF_TX_D_20, CH1_FF_TX_D_20, CH0_FF_TX_D_21, CH1_FF_TX_D_21, CH0_FF_TX_D_22, CH1_FF_TX_D_22, CH0_FF_TX_D_23, CH1_FF_TX_D_23,
-	input CH0_FFC_EI_EN, CH1_FFC_EI_EN, CH0_FFC_PCIE_DET_EN, CH1_FFC_PCIE_DET_EN, CH0_FFC_PCIE_CT, CH1_FFC_PCIE_CT, CH0_FFC_SB_INV_RX, CH1_FFC_SB_INV_RX,
-	input CH0_FFC_ENABLE_CGALIGN, CH1_FFC_ENABLE_CGALIGN, CH0_FFC_SIGNAL_DETECT, CH1_FFC_SIGNAL_DETECT, CH0_FFC_FB_LOOPBACK, CH1_FFC_FB_LOOPBACK, CH0_FFC_SB_PFIFO_LP, CH1_FFC_SB_PFIFO_LP,
-	input CH0_FFC_PFIFO_CLR, CH1_FFC_PFIFO_CLR, CH0_FFC_RATE_MODE_RX, CH1_FFC_RATE_MODE_RX, CH0_FFC_RATE_MODE_TX, CH1_FFC_RATE_MODE_TX, CH0_FFC_DIV11_MODE_RX, CH1_FFC_DIV11_MODE_RX, CH0_FFC_RX_GEAR_MODE, CH1_FFC_RX_GEAR_MODE, CH0_FFC_TX_GEAR_MODE, CH1_FFC_TX_GEAR_MODE,
-	input CH0_FFC_DIV11_MODE_TX, CH1_FFC_DIV11_MODE_TX, CH0_FFC_LDR_CORE2TX_EN, CH1_FFC_LDR_CORE2TX_EN, CH0_FFC_LANE_TX_RST, CH1_FFC_LANE_TX_RST, CH0_FFC_LANE_RX_RST, CH1_FFC_LANE_RX_RST,
-	input CH0_FFC_RRST, CH1_FFC_RRST, CH0_FFC_TXPWDNB, CH1_FFC_TXPWDNB, CH0_FFC_RXPWDNB, CH1_FFC_RXPWDNB, CH0_LDR_CORE2TX, CH1_LDR_CORE2TX,
-	input D_SCIWDATA0, D_SCIWDATA1, D_SCIWDATA2, D_SCIWDATA3, D_SCIWDATA4, D_SCIWDATA5, D_SCIWDATA6, D_SCIWDATA7,
-	input D_SCIADDR0, D_SCIADDR1, D_SCIADDR2, D_SCIADDR3, D_SCIADDR4, D_SCIADDR5, D_SCIENAUX, D_SCISELAUX,
-	input CH0_SCIEN, CH1_SCIEN, CH0_SCISEL, CH1_SCISEL, D_SCIRD, D_SCIWSTN, D_CYAWSTN, D_FFC_SYNC_TOGGLE,
-	input D_FFC_DUAL_RST, D_FFC_MACRO_RST, D_FFC_MACROPDB, D_FFC_TRST, CH0_FFC_CDR_EN_BITSLIP, CH1_FFC_CDR_EN_BITSLIP, D_SCAN_ENABLE, D_SCAN_IN_0,
-	input D_SCAN_IN_1, D_SCAN_IN_2, D_SCAN_IN_3, D_SCAN_IN_4, D_SCAN_IN_5, D_SCAN_IN_6, D_SCAN_IN_7, D_SCAN_MODE,
-	input D_SCAN_RESET, D_CIN0, D_CIN1, D_CIN2, D_CIN3, D_CIN4, D_CIN5, D_CIN6,D_CIN7, D_CIN8, D_CIN9, D_CIN10, D_CIN11,
-	output CH0_HDOUTP, CH1_HDOUTP, CH0_HDOUTN, CH1_HDOUTN, D_TXBIT_CLKP_TO_ND, D_TXBIT_CLKN_TO_ND, D_SYNC_PULSE2ND, D_TXPLL_LOL_TO_ND,
-	output CH0_FF_RX_F_CLK, CH1_FF_RX_F_CLK, CH0_FF_RX_H_CLK, CH1_FF_RX_H_CLK, CH0_FF_TX_F_CLK, CH1_FF_TX_F_CLK, CH0_FF_TX_H_CLK, CH1_FF_TX_H_CLK,
-	output CH0_FF_RX_PCLK, CH1_FF_RX_PCLK, CH0_FF_TX_PCLK, CH1_FF_TX_PCLK, CH0_FF_RX_D_0, CH1_FF_RX_D_0, CH0_FF_RX_D_1, CH1_FF_RX_D_1,
-	output CH0_FF_RX_D_2, CH1_FF_RX_D_2, CH0_FF_RX_D_3, CH1_FF_RX_D_3, CH0_FF_RX_D_4, CH1_FF_RX_D_4, CH0_FF_RX_D_5, CH1_FF_RX_D_5,
-	output CH0_FF_RX_D_6, CH1_FF_RX_D_6, CH0_FF_RX_D_7, CH1_FF_RX_D_7, CH0_FF_RX_D_8, CH1_FF_RX_D_8, CH0_FF_RX_D_9, CH1_FF_RX_D_9,
-	output CH0_FF_RX_D_10, CH1_FF_RX_D_10, CH0_FF_RX_D_11, CH1_FF_RX_D_11, CH0_FF_RX_D_12, CH1_FF_RX_D_12, CH0_FF_RX_D_13, CH1_FF_RX_D_13,
-	output CH0_FF_RX_D_14, CH1_FF_RX_D_14, CH0_FF_RX_D_15, CH1_FF_RX_D_15, CH0_FF_RX_D_16, CH1_FF_RX_D_16, CH0_FF_RX_D_17, CH1_FF_RX_D_17,
-	output CH0_FF_RX_D_18, CH1_FF_RX_D_18, CH0_FF_RX_D_19, CH1_FF_RX_D_19, CH0_FF_RX_D_20, CH1_FF_RX_D_20, CH0_FF_RX_D_21, CH1_FF_RX_D_21,
-	output CH0_FF_RX_D_22, CH1_FF_RX_D_22, CH0_FF_RX_D_23, CH1_FF_RX_D_23, CH0_FFS_PCIE_DONE, CH1_FFS_PCIE_DONE, CH0_FFS_PCIE_CON, CH1_FFS_PCIE_CON,
-	output CH0_FFS_RLOS, CH1_FFS_RLOS, CH0_FFS_LS_SYNC_STATUS, CH1_FFS_LS_SYNC_STATUS, CH0_FFS_CC_UNDERRUN, CH1_FFS_CC_UNDERRUN, CH0_FFS_CC_OVERRUN, CH1_FFS_CC_OVERRUN,
-	output CH0_FFS_RXFBFIFO_ERROR, CH1_FFS_RXFBFIFO_ERROR, CH0_FFS_TXFBFIFO_ERROR, CH1_FFS_TXFBFIFO_ERROR, CH0_FFS_RLOL, CH1_FFS_RLOL, CH0_FFS_SKP_ADDED, CH1_FFS_SKP_ADDED,
-	output CH0_FFS_SKP_DELETED, CH1_FFS_SKP_DELETED, CH0_LDR_RX2CORE, CH1_LDR_RX2CORE, D_SCIRDATA0, D_SCIRDATA1, D_SCIRDATA2, D_SCIRDATA3,
-	output D_SCIRDATA4, D_SCIRDATA5, D_SCIRDATA6, D_SCIRDATA7, D_SCIINT, D_SCAN_OUT_0, D_SCAN_OUT_1, D_SCAN_OUT_2, D_SCAN_OUT_3, D_SCAN_OUT_4, D_SCAN_OUT_5, D_SCAN_OUT_6, D_SCAN_OUT_7,
-	output D_COUT0, D_COUT1, D_COUT2, D_COUT3, D_COUT4, D_COUT5, D_COUT6, D_COUT7, D_COUT8, D_COUT9, D_COUT10, D_COUT11, D_COUT12, D_COUT13, D_COUT14, D_COUT15, D_COUT16, D_COUT17, D_COUT18, D_COUT19,
-
-	input  D_REFCLKI,
-	output D_FFS_PLOL
-);
-	parameter CH0_AUTO_CALIB_EN = "0b0";
-	parameter CH0_AUTO_FACQ_EN = "0b0";
-	parameter CH0_BAND_THRESHOLD = "0b000000";
-	parameter CH0_CALIB_CK_MODE = "0b0";
-	parameter CH0_CC_MATCH_1 = "0b0000000000";
-	parameter CH0_CC_MATCH_2 = "0b0000000000";
-	parameter CH0_CC_MATCH_3 = "0b0000000000";
-	parameter CH0_CC_MATCH_4 = "0b0000000000";
-	parameter CH0_CDR_CNT4SEL = "0b00";
-	parameter CH0_CDR_CNT8SEL = "0b00";
-	parameter CH0_CTC_BYPASS = "0b0";
-	parameter CH0_DCOATDCFG = "0b00";
-	parameter CH0_DCOATDDLY = "0b00";
-	parameter CH0_DCOBYPSATD = "0b0";
-	parameter CH0_DCOCALDIV = "0b000";
-	parameter CH0_DCOCTLGI = "0b000";
-	parameter CH0_DCODISBDAVOID = "0b0";
-	parameter CH0_DCOFLTDAC = "0b00";
-	parameter CH0_DCOFTNRG = "0b000";
-	parameter CH0_DCOIOSTUNE = "0b000";
-	parameter CH0_DCOITUNE = "0b00";
-	parameter CH0_DCOITUNE4LSB = "0b000";
-	parameter CH0_DCOIUPDNX2 = "0b0";
-	parameter CH0_DCONUOFLSB = "0b000";
-	parameter CH0_DCOSCALEI = "0b00";
-	parameter CH0_DCOSTARTVAL = "0b000";
-	parameter CH0_DCOSTEP = "0b00";
-	parameter CH0_DEC_BYPASS = "0b0";
-	parameter CH0_ENABLE_CG_ALIGN = "0b0";
-	parameter CH0_ENC_BYPASS = "0b0";
-	parameter CH0_FF_RX_F_CLK_DIS = "0b0";
-	parameter CH0_FF_RX_H_CLK_EN = "0b0";
-	parameter CH0_FF_TX_F_CLK_DIS = "0b0";
-	parameter CH0_FF_TX_H_CLK_EN = "0b0";
-	parameter CH0_GE_AN_ENABLE = "0b0";
-	parameter CH0_INVERT_RX = "0b0";
-	parameter CH0_INVERT_TX = "0b0";
-	parameter CH0_LDR_CORE2TX_SEL = "0b0";
-	parameter CH0_LDR_RX2CORE_SEL = "0b0";
-	parameter CH0_LEQ_OFFSET_SEL = "0b0";
-	parameter CH0_LEQ_OFFSET_TRIM = "0b000";
-	parameter CH0_LSM_DISABLE = "0b0";
-	parameter CH0_MATCH_2_ENABLE = "0b0";
-	parameter CH0_MATCH_4_ENABLE = "0b0";
-	parameter CH0_MIN_IPG_CNT = "0b00";
-	parameter CH0_PCIE_EI_EN = "0b0";
-	parameter CH0_PCIE_MODE = "0b0";
-	parameter CH0_PCS_DET_TIME_SEL = "0b00";
-	parameter CH0_PDEN_SEL = "0b0";
-	parameter CH0_PRBS_ENABLE = "0b0";
-	parameter CH0_PRBS_LOCK = "0b0";
-	parameter CH0_PRBS_SELECTION = "0b0";
-	parameter CH0_RATE_MODE_RX = "0b0";
-	parameter CH0_RATE_MODE_TX = "0b0";
-	parameter CH0_RCV_DCC_EN = "0b0";
-	parameter CH0_REG_BAND_OFFSET = "0b0000";
-	parameter CH0_REG_BAND_SEL = "0b000000";
-	parameter CH0_REG_IDAC_EN = "0b0";
-	parameter CH0_REG_IDAC_SEL = "0b0000000000";
-	parameter CH0_REQ_EN = "0b0";
-	parameter CH0_REQ_LVL_SET = "0b00";
-	parameter CH0_RIO_MODE = "0b0";
-	parameter CH0_RLOS_SEL = "0b0";
-	parameter CH0_RPWDNB = "0b0";
-	parameter CH0_RTERM_RX = "0b00000";
-	parameter CH0_RTERM_TX = "0b00000";
-	parameter CH0_RXIN_CM = "0b00";
-	parameter CH0_RXTERM_CM = "0b00";
-	parameter CH0_RX_DCO_CK_DIV = "0b000";
-	parameter CH0_RX_DIV11_SEL = "0b0";
-	parameter CH0_RX_GEAR_BYPASS = "0b0";
-	parameter CH0_RX_GEAR_MODE = "0b0";
-	parameter CH0_RX_LOS_CEQ = "0b00";
-	parameter CH0_RX_LOS_EN = "0b0";
-	parameter CH0_RX_LOS_HYST_EN = "0b0";
-	parameter CH0_RX_LOS_LVL = "0b000";
-	parameter CH0_RX_RATE_SEL = "0b0000";
-	parameter CH0_RX_SB_BYPASS = "0b0";
-	parameter CH0_SB_BYPASS = "0b0";
-	parameter CH0_SEL_SD_RX_CLK = "0b0";
-	parameter CH0_TDRV_DAT_SEL = "0b00";
-	parameter CH0_TDRV_POST_EN = "0b0";
-	parameter CH0_TDRV_PRE_EN = "0b0";
-	parameter CH0_TDRV_SLICE0_CUR = "0b000";
-	parameter CH0_TDRV_SLICE0_SEL = "0b00";
-	parameter CH0_TDRV_SLICE1_CUR = "0b000";
-	parameter CH0_TDRV_SLICE1_SEL = "0b00";
-	parameter CH0_TDRV_SLICE2_CUR = "0b00";
-	parameter CH0_TDRV_SLICE2_SEL = "0b00";
-	parameter CH0_TDRV_SLICE3_CUR = "0b00";
-	parameter CH0_TDRV_SLICE3_SEL = "0b00";
-	parameter CH0_TDRV_SLICE4_CUR = "0b00";
-	parameter CH0_TDRV_SLICE4_SEL = "0b00";
-	parameter CH0_TDRV_SLICE5_CUR = "0b00";
-	parameter CH0_TDRV_SLICE5_SEL = "0b00";
-	parameter CH0_TPWDNB = "0b0";
-	parameter CH0_TX_CM_SEL = "0b00";
-	parameter CH0_TX_DIV11_SEL = "0b0";
-	parameter CH0_TX_GEAR_BYPASS = "0b0";
-	parameter CH0_TX_GEAR_MODE = "0b0";
-	parameter CH0_TX_POST_SIGN = "0b0";
-	parameter CH0_TX_PRE_SIGN = "0b0";
-	parameter CH0_UC_MODE = "0b0";
-	parameter CH0_UDF_COMMA_A = "0b0000000000";
-	parameter CH0_UDF_COMMA_B = "0b0000000000";
-	parameter CH0_UDF_COMMA_MASK = "0b0000000000";
-	parameter CH0_WA_BYPASS = "0b0";
-	parameter CH0_WA_MODE = "0b0";
-	parameter CH1_AUTO_CALIB_EN = "0b0";
-	parameter CH1_AUTO_FACQ_EN = "0b0";
-	parameter CH1_BAND_THRESHOLD = "0b000000";
-	parameter CH1_CALIB_CK_MODE = "0b0";
-	parameter CH1_CC_MATCH_1 = "0b0000000000";
-	parameter CH1_CC_MATCH_2 = "0b0000000000";
-	parameter CH1_CC_MATCH_3 = "0b0000000000";
-	parameter CH1_CC_MATCH_4 = "0b0000000000";
-	parameter CH1_CDR_CNT4SEL = "0b00";
-	parameter CH1_CDR_CNT8SEL = "0b00";
-	parameter CH1_CTC_BYPASS = "0b0";
-	parameter CH1_DCOATDCFG = "0b00";
-	parameter CH1_DCOATDDLY = "0b00";
-	parameter CH1_DCOBYPSATD = "0b0";
-	parameter CH1_DCOCALDIV = "0b000";
-	parameter CH1_DCOCTLGI = "0b000";
-	parameter CH1_DCODISBDAVOID = "0b0";
-	parameter CH1_DCOFLTDAC = "0b00";
-	parameter CH1_DCOFTNRG = "0b000";
-	parameter CH1_DCOIOSTUNE = "0b000";
-	parameter CH1_DCOITUNE = "0b00";
-	parameter CH1_DCOITUNE4LSB = "0b000";
-	parameter CH1_DCOIUPDNX2 = "0b0";
-	parameter CH1_DCONUOFLSB = "0b000";
-	parameter CH1_DCOSCALEI = "0b00";
-	parameter CH1_DCOSTARTVAL = "0b000";
-	parameter CH1_DCOSTEP = "0b00";
-	parameter CH1_DEC_BYPASS = "0b0";
-	parameter CH1_ENABLE_CG_ALIGN = "0b0";
-	parameter CH1_ENC_BYPASS = "0b0";
-	parameter CH1_FF_RX_F_CLK_DIS = "0b0";
-	parameter CH1_FF_RX_H_CLK_EN = "0b0";
-	parameter CH1_FF_TX_F_CLK_DIS = "0b0";
-	parameter CH1_FF_TX_H_CLK_EN = "0b0";
-	parameter CH1_GE_AN_ENABLE = "0b0";
-	parameter CH1_INVERT_RX = "0b0";
-	parameter CH1_INVERT_TX = "0b0";
-	parameter CH1_LDR_CORE2TX_SEL = "0b0";
-	parameter CH1_LDR_RX2CORE_SEL = "0b0";
-	parameter CH1_LEQ_OFFSET_SEL = "0b0";
-	parameter CH1_LEQ_OFFSET_TRIM = "0b000";
-	parameter CH1_LSM_DISABLE = "0b0";
-	parameter CH1_MATCH_2_ENABLE = "0b0";
-	parameter CH1_MATCH_4_ENABLE = "0b0";
-	parameter CH1_MIN_IPG_CNT = "0b00";
-	parameter CH1_PCIE_EI_EN = "0b0";
-	parameter CH1_PCIE_MODE = "0b0";
-	parameter CH1_PCS_DET_TIME_SEL = "0b00";
-	parameter CH1_PDEN_SEL = "0b0";
-	parameter CH1_PRBS_ENABLE = "0b0";
-	parameter CH1_PRBS_LOCK = "0b0";
-	parameter CH1_PRBS_SELECTION = "0b0";
-	parameter CH1_RATE_MODE_RX = "0b0";
-	parameter CH1_RATE_MODE_TX = "0b0";
-	parameter CH1_RCV_DCC_EN = "0b0";
-	parameter CH1_REG_BAND_OFFSET = "0b0000";
-	parameter CH1_REG_BAND_SEL = "0b000000";
-	parameter CH1_REG_IDAC_EN = "0b0";
-	parameter CH1_REG_IDAC_SEL = "0b0000000000";
-	parameter CH1_REQ_EN = "0b0";
-	parameter CH1_REQ_LVL_SET = "0b00";
-	parameter CH1_RIO_MODE = "0b0";
-	parameter CH1_RLOS_SEL = "0b0";
-	parameter CH1_RPWDNB = "0b0";
-	parameter CH1_RTERM_RX = "0b00000";
-	parameter CH1_RTERM_TX = "0b00000";
-	parameter CH1_RXIN_CM = "0b00";
-	parameter CH1_RXTERM_CM = "0b00";
-	parameter CH1_RX_DCO_CK_DIV = "0b000";
-	parameter CH1_RX_DIV11_SEL = "0b0";
-	parameter CH1_RX_GEAR_BYPASS = "0b0";
-	parameter CH1_RX_GEAR_MODE = "0b0";
-	parameter CH1_RX_LOS_CEQ = "0b00";
-	parameter CH1_RX_LOS_EN = "0b0";
-	parameter CH1_RX_LOS_HYST_EN = "0b0";
-	parameter CH1_RX_LOS_LVL = "0b000";
-	parameter CH1_RX_RATE_SEL = "0b0000";
-	parameter CH1_RX_SB_BYPASS = "0b0";
-	parameter CH1_SB_BYPASS = "0b0";
-	parameter CH1_SEL_SD_RX_CLK = "0b0";
-	parameter CH1_TDRV_DAT_SEL = "0b00";
-	parameter CH1_TDRV_POST_EN = "0b0";
-	parameter CH1_TDRV_PRE_EN = "0b0";
-	parameter CH1_TDRV_SLICE0_CUR = "0b000";
-	parameter CH1_TDRV_SLICE0_SEL = "0b00";
-	parameter CH1_TDRV_SLICE1_CUR = "0b000";
-	parameter CH1_TDRV_SLICE1_SEL = "0b00";
-	parameter CH1_TDRV_SLICE2_CUR = "0b00";
-	parameter CH1_TDRV_SLICE2_SEL = "0b00";
-	parameter CH1_TDRV_SLICE3_CUR = "0b00";
-	parameter CH1_TDRV_SLICE3_SEL = "0b00";
-	parameter CH1_TDRV_SLICE4_CUR = "0b00";
-	parameter CH1_TDRV_SLICE4_SEL = "0b00";
-	parameter CH1_TDRV_SLICE5_CUR = "0b00";
-	parameter CH1_TDRV_SLICE5_SEL = "0b00";
-	parameter CH1_TPWDNB = "0b0";
-	parameter CH1_TX_CM_SEL = "0b00";
-	parameter CH1_TX_DIV11_SEL = "0b0";
-	parameter CH1_TX_GEAR_BYPASS = "0b0";
-	parameter CH1_TX_GEAR_MODE = "0b0";
-	parameter CH1_TX_POST_SIGN = "0b0";
-	parameter CH1_TX_PRE_SIGN = "0b0";
-	parameter CH1_UC_MODE = "0b0";
-	parameter CH1_UDF_COMMA_A = "0b0000000000";
-	parameter CH1_UDF_COMMA_B = "0b0000000000";
-	parameter CH1_UDF_COMMA_MASK = "0b0000000000";
-	parameter CH1_WA_BYPASS = "0b0";
-	parameter CH1_WA_MODE = "0b0";
-	parameter D_BITCLK_FROM_ND_EN = "0b0";
-	parameter D_BITCLK_LOCAL_EN = "0b0";
-	parameter D_BITCLK_ND_EN = "0b0";
-	parameter D_BUS8BIT_SEL = "0b0";
-	parameter D_CDR_LOL_SET = "0b00";
-	parameter D_CMUSETBIASI = "0b00";
-	parameter D_CMUSETI4CPP = "0b0000";
-	parameter D_CMUSETI4CPZ = "0b0000";
-	parameter D_CMUSETI4VCO = "0b00";
-	parameter D_CMUSETICP4P = "0b00";
-	parameter D_CMUSETICP4Z = "0b000";
-	parameter D_CMUSETINITVCT = "0b00";
-	parameter D_CMUSETISCL4VCO = "0b000";
-	parameter D_CMUSETP1GM = "0b000";
-	parameter D_CMUSETP2AGM = "0b000";
-	parameter D_CMUSETZGM = "0b000";
-	parameter D_DCO_CALIB_TIME_SEL = "0b00";
-	parameter D_HIGH_MARK = "0b0000";
-	parameter D_IB_PWDNB = "0b0";
-	parameter D_ISETLOS = "0b00000000";
-	parameter D_LOW_MARK = "0b0000";
-	parameter D_MACROPDB = "0b0";
-	parameter D_PD_ISET = "0b00";
-	parameter D_PLL_LOL_SET = "0b00";
-	parameter D_REFCK_MODE = "0b000";
-	parameter D_REQ_ISET = "0b000";
-	parameter D_RG_EN = "0b0";
-	parameter D_RG_SET = "0b00";
-	parameter D_SETICONST_AUX = "0b00";
-	parameter D_SETICONST_CH = "0b00";
-	parameter D_SETIRPOLY_AUX = "0b00";
-	parameter D_SETIRPOLY_CH = "0b00";
-	parameter D_SETPLLRC = "0b000000";
-	parameter D_SYNC_LOCAL_EN = "0b0";
-	parameter D_SYNC_ND_EN = "0b0";
-	parameter D_TXPLL_PWDNB = "0b0";
-	parameter D_TX_VCO_CK_DIV = "0b000";
-	parameter D_XGE_MODE = "0b0";
-
-// These parameters don't do anything but are
-// needed for compatibility with Diamond
-	parameter D_TX_MAX_RATE = "2.5";
-	parameter D_RX_MAX_RATE = "2.5";
-	parameter CH0_TXAMPLITUDE = "0d1300";
-	parameter CH1_TXAMPLITUDE = "0d1300";
-	parameter CH0_PROTOCOL = "8B10B";
-	parameter CH1_PROTOCOL = "8B10B";
-	parameter CH0_CDR_MAX_RATE = "2.5";
-	parameter CH1_CDR_MAX_RATE = "2.5";
-	parameter CH0_TXDEPRE = "DISABLED";
-	parameter CH1_TXDEPRE = "DISABLED";
-	parameter CH0_TXDEPOST = "DISABLED";
-	parameter CH1_TXDEPOST = "DISABLED";
-endmodule
-
-(* blackbox *)
-module EXTREFB (
-	(* iopad_external_pin *)
-	input REFCLKP,
-	(* iopad_external_pin *)
-	input REFCLKN,
-	output REFCLKO
-);
-	parameter REFCK_PWDNB = "0b0";
-	parameter REFCK_RTERM = "0b0";
-	parameter REFCK_DCBIAS_EN = "0b0";
-endmodule
-
-(* blackbox *)
-module PCSCLKDIV (
-	input CLKI, RST, SEL2, SEL1, SEL0,
-	output CDIV1, CDIVX
-);
-	parameter GSR = "DISABLED";
-endmodule
-
-// Note: this module is not marked keep as we want it swept away in synth (sim use only)
-(* blackbox *)
-module PUR (
-	input PUR
-);
-	parameter RST_PULSE = 1;
-endmodule
-
-(* blackbox, keep *)
-module GSR (
-	input GSR
-);
-endmodule
-
-(* blackbox, keep *)
-module SGSR (
-	input GSR, CLK
-);
-endmodule
-
-
-(* blackbox *)
-module PDPW16KD (
-	input DI35, DI34, DI33, DI32, DI31, DI30, DI29, DI28, DI27, DI26, DI25, DI24, DI23, DI22, DI21, DI20, DI19, DI18,
-	input DI17, DI16, DI15, DI14, DI13, DI12, DI11, DI10, DI9, DI8, DI7, DI6, DI5, DI4, DI3, DI2, DI1, DI0,
-	input ADW8, ADW7, ADW6, ADW5, ADW4, ADW3, ADW2, ADW1, ADW0,
-	input BE3,  BE2,  BE1, BE0, CEW, CLKW, CSW2, CSW1, CSW0,
-	input ADR13, ADR12, ADR11, ADR10, ADR9, ADR8, ADR7, ADR6, ADR5, ADR4, ADR3, ADR2, ADR1, ADR0,
-	input CER, OCER, CLKR, CSR2, CSR1, CSR0, RST,
-	output DO35, DO34, DO33, DO32, DO31, DO30, DO29, DO28, DO27, DO26, DO25, DO24, DO23, DO22, DO21, DO20, DO19, DO18,
-	output DO17, DO16, DO15, DO14, DO13, DO12, DO11, DO10, DO9, DO8, DO7, DO6, DO5, DO4, DO3, DO2, DO1, DO0
-);
-	parameter DATA_WIDTH_W = 36;
-	parameter DATA_WIDTH_R = 36;
-	parameter GSR = "ENABLED";
-
-	parameter REGMODE = "NOREG";
-
-	parameter RESETMODE = "SYNC";
-	parameter ASYNC_RESET_RELEASE = "SYNC";
-
-	parameter CSDECODE_W = "0b000";
-	parameter CSDECODE_R = "0b000";
-
-	parameter INITVAL_00 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_01 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_02 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_03 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_04 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_05 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_06 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_07 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_08 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_09 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_10 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_11 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_12 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_13 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_14 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_15 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_16 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_17 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_18 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_19 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_20 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_21 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_22 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_23 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_24 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_25 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_26 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_27 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_28 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_29 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_30 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_31 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_32 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_33 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_34 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_35 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_36 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_37 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_38 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_39 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INIT_DATA = "STATIC";
-	parameter CLKWMUX = "CLKW";
-	parameter CLKRMUX = "CLKR";
-
-endmodule
diff --git a/techlibs/ecp5/cells_ff.vh b/techlibs/ecp5/cells_ff.vh
deleted file mode 100644
index 6b745f391..000000000
--- a/techlibs/ecp5/cells_ff.vh
+++ /dev/null
@@ -1,40 +0,0 @@
-// Diamond flip-flops
-module FD1P3AX(input     D, SP, CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))        _TECHMAP_REPLACE_ (.CLK(CK), .LSR(|0), .CE(SP), .DI(D), .Q(Q)); endmodule
-module FD1P3AY(input     D, SP, CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"),   .SRMODE("ASYNC"))        _TECHMAP_REPLACE_ (.CLK(CK), .LSR(|0), .CE(SP), .DI(D), .Q(Q)); endmodule
-module FD1P3BX(input PD, D, SP, CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"),   .SRMODE("ASYNC"))        _TECHMAP_REPLACE_ (.CLK(CK), .LSR(PD), .CE(SP), .DI(D), .Q(Q)); endmodule
-module FD1P3DX(input CD, D, SP, CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))        _TECHMAP_REPLACE_ (.CLK(CK), .LSR(CD), .CE(SP), .DI(D), .Q(Q)); endmodule
-module FD1P3IX(input CD, D, SP, CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(CK), .LSR(CD), .CE(SP), .DI(D), .Q(Q)); endmodule
-module FD1P3JX(input PD, D, SP, CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"),   .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(CK), .LSR(PD), .CE(SP), .DI(D), .Q(Q)); endmodule
-module FD1S3AX(input     D,     CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("1"),  .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))        _TECHMAP_REPLACE_ (.CLK(CK), .LSR(|0),          .DI(D), .Q(Q)); endmodule
-module FD1S3AY(input     D,     CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("1"),  .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"),   .SRMODE("ASYNC"))        _TECHMAP_REPLACE_ (.CLK(CK), .LSR(|0),          .DI(D), .Q(Q)); endmodule
-module FD1S3BX(input PD, D,     CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("1"),  .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"),   .SRMODE("ASYNC"))        _TECHMAP_REPLACE_ (.CLK(CK), .LSR(PD),          .DI(D), .Q(Q)); endmodule
-module FD1S3DX(input CD, D,     CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("1"),  .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))        _TECHMAP_REPLACE_ (.CLK(CK), .LSR(CD),          .DI(D), .Q(Q)); endmodule
-module FD1S3IX(input CD, D,     CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("1"),  .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(CK), .LSR(CD),          .DI(D), .Q(Q)); endmodule
-module FD1S3JX(input PD, D,     CK, output Q); parameter GSR = "ENABLED"; TRELLIS_FF #(.GSR(GSR), .CEMUX("1"),  .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"),   .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(CK), .LSR(PD),          .DI(D), .Q(Q)); endmodule
-
-// TODO: Diamond latches
-// module FL1P3AY(); endmodule
-// module FL1P3AZ(); endmodule
-// module FL1P3BX(); endmodule
-// module FL1P3DX(); endmodule
-// module FL1P3IY(); endmodule
-// module FL1P3JY(); endmodule
-// module FL1S3AX(); endmodule
-// module FL1S3AY(); endmodule
-
-// Diamond I/O registers
-module IFS1P3BX(input PD, D, SP, SCLK, output Q); parameter GSR = "ENABLED"; (* syn_useioff, ioff_dir="input" *) TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"),   .SRMODE("ASYNC"))       _TECHMAP_REPLACE_ (.CLK(SCLK), .LSR(PD), .CE(SP), .DI(D), .Q(Q)); endmodule
-module IFS1P3DX(input CD, D, SP, SCLK, output Q); parameter GSR = "ENABLED"; (* syn_useioff, ioff_dir="input" *) TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))       _TECHMAP_REPLACE_ (.CLK(SCLK), .LSR(CD), .CE(SP), .DI(D), .Q(Q)); endmodule
-module IFS1P3IX(input CD, D, SP, SCLK, output Q); parameter GSR = "ENABLED"; (* syn_useioff, ioff_dir="input" *) TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("LSR_OVER_CE")) _TECHMAP_REPLACE_ (.CLK(SCLK), .LSR(CD), .CE(SP), .DI(D), .Q(Q)); endmodule
-module IFS1P3JX(input PD, D, SP, SCLK, output Q); parameter GSR = "ENABLED"; (* syn_useioff, ioff_dir="input" *) TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"),   .SRMODE("LSR_OVER_CE")) _TECHMAP_REPLACE_ (.CLK(SCLK), .LSR(PD), .CE(SP), .DI(D), .Q(Q)); endmodule
-
-module OFS1P3BX(input PD, D, SP, SCLK, output Q); parameter GSR = "ENABLED"; (* syn_useioff, ioff_dir="output" *) TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"),   .SRMODE("ASYNC"))       _TECHMAP_REPLACE_ (.CLK(SCLK), .LSR(PD), .CE(SP), .DI(D), .Q(Q)); endmodule
-module OFS1P3DX(input CD, D, SP, SCLK, output Q); parameter GSR = "ENABLED"; (* syn_useioff, ioff_dir="output" *) TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))       _TECHMAP_REPLACE_ (.CLK(SCLK), .LSR(CD), .CE(SP), .DI(D), .Q(Q)); endmodule
-module OFS1P3IX(input CD, D, SP, SCLK, output Q); parameter GSR = "ENABLED"; (* syn_useioff, ioff_dir="output" *) TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("LSR_OVER_CE")) _TECHMAP_REPLACE_ (.CLK(SCLK), .LSR(CD), .CE(SP), .DI(D), .Q(Q)); endmodule
-module OFS1P3JX(input PD, D, SP, SCLK, output Q); parameter GSR = "ENABLED"; (* syn_useioff, ioff_dir="output" *) TRELLIS_FF #(.GSR(GSR), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"),   .SRMODE("LSR_OVER_CE")) _TECHMAP_REPLACE_ (.CLK(SCLK), .LSR(PD), .CE(SP), .DI(D), .Q(Q)); endmodule
-
-// TODO: Diamond I/O latches
-// module IFS1S1B(input PD, D, SCLK, output Q); endmodule
-// module IFS1S1D(input CD, D, SCLK, output Q); endmodule
-// module IFS1S1I(input PD, D, SCLK, output Q); endmodule
-// module IFS1S1J(input CD, D, SCLK, output Q); endmodule
diff --git a/techlibs/ecp5/cells_io.vh b/techlibs/ecp5/cells_io.vh
deleted file mode 100644
index 220460c44..000000000
--- a/techlibs/ecp5/cells_io.vh
+++ /dev/null
@@ -1,14 +0,0 @@
-// Diamond I/O buffers
-module IB   ((* iopad_external_pin *) input I,     output O); (* PULLMODE="NONE" *) TRELLIS_IO #(.DIR("INPUT"))  _TECHMAP_REPLACE_ (.B(I), .O(O)); endmodule
-module IBPU ((* iopad_external_pin *) input I,     output O); (* PULLMODE="UP"   *) TRELLIS_IO #(.DIR("INPUT"))  _TECHMAP_REPLACE_ (.B(I), .O(O)); endmodule
-module IBPD ((* iopad_external_pin *) input I,     output O); (* PULLMODE="DOWN" *) TRELLIS_IO #(.DIR("INPUT"))  _TECHMAP_REPLACE_ (.B(I), .O(O)); endmodule
-module OB   (input I,     (* iopad_external_pin *) output O); (* PULLMODE="NONE" *) TRELLIS_IO #(.DIR("OUTPUT")) _TECHMAP_REPLACE_ (.B(O), .I(I)); endmodule
-module OBZ  (input I, T,  (* iopad_external_pin *) output O); (* PULLMODE="NONE" *) TRELLIS_IO #(.DIR("OUTPUT")) _TECHMAP_REPLACE_ (.B(O), .I(I), .T(T)); endmodule
-module OBZPU(input I, T,  (* iopad_external_pin *) output O); (* PULLMODE="UP"   *) TRELLIS_IO #(.DIR("OUTPUT")) _TECHMAP_REPLACE_ (.B(O), .I(I), .T(T)); endmodule
-module OBZPD(input I, T,  (* iopad_external_pin *) output O); (* PULLMODE="DOWN" *) TRELLIS_IO #(.DIR("OUTPUT")) _TECHMAP_REPLACE_ (.B(O), .I(I), .T(T)); endmodule
-module OBCO (input I,     output OT, OC); OLVDS olvds (.A(I), .Z(OT), .ZN(OC)); endmodule
-module BB   (input I, T,  output O, (* iopad_external_pin *) inout B); (* PULLMODE="NONE" *) TRELLIS_IO #(.DIR("BIDIR")) _TECHMAP_REPLACE_ (.B(B), .I(I), .O(O), .T(T)); endmodule
-module BBPU (input I, T,  output O, (* iopad_external_pin *) inout B); (* PULLMODE="UP"   *) TRELLIS_IO #(.DIR("BIDIR")) _TECHMAP_REPLACE_ (.B(B), .I(I), .O(O), .T(T)); endmodule
-module BBPD (input I, T,  output O, (* iopad_external_pin *) inout B); (* PULLMODE="DOWN" *) TRELLIS_IO #(.DIR("BIDIR")) _TECHMAP_REPLACE_ (.B(B), .I(I), .O(O), .T(T)); endmodule
-module ILVDS(input A, AN, (* iopad_external_pin *) output Z    ); TRELLIS_IO #(.DIR("INPUT"))  _TECHMAP_REPLACE_ (.B(A), .O(Z)); endmodule
-module OLVDS(input A,     (* iopad_external_pin *) output Z, output ZN); TRELLIS_IO #(.DIR("OUTPUT")) _TECHMAP_REPLACE_ (.B(Z), .I(A)); endmodule
diff --git a/techlibs/ecp5/cells_map.v b/techlibs/ecp5/cells_map.v
deleted file mode 100644
index 4944ece45..000000000
--- a/techlibs/ecp5/cells_map.v
+++ /dev/null
@@ -1,191 +0,0 @@
-module  \$_DFF_N_ (input D, C, output Q);
-    parameter _TECHMAP_WIREINIT_Q_ = 1'bx;
-    generate if (_TECHMAP_WIREINIT_Q_ === 1'b1)
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("SET"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(1'b0), .DI(D), .Q(Q));
-    else
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("RESET"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(1'b0), .DI(D), .Q(Q));
-    endgenerate
-    wire _TECHMAP_REMOVEINIT_Q_ = 1'b1;
-endmodule
-
-module  \$_DFF_P_ (input D, C, output Q);
-    parameter _TECHMAP_WIREINIT_Q_ = 1'bx;
-    generate if (_TECHMAP_WIREINIT_Q_ === 1'b1)
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(1'b0), .DI(D), .Q(Q));
-    else
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(1'b0), .DI(D), .Q(Q));
-    endgenerate
-    wire _TECHMAP_REMOVEINIT_Q_ = 1'b1;
-endmodule
-
-module  \$_DFFE_NN_ (input D, C, E, output Q);
-    parameter _TECHMAP_WIREINIT_Q_ = 1'bx;
-    generate if (_TECHMAP_WIREINIT_Q_ === 1'b1)
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("SET"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(1'b0), .DI(D), .Q(Q));
-    else
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("RESET"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(1'b0), .DI(D), .Q(Q));
-    endgenerate
-    wire _TECHMAP_REMOVEINIT_Q_ = 1'b1;
-endmodule
-
-module  \$_DFFE_PN_ (input D, C, E, output Q);
-    parameter _TECHMAP_WIREINIT_Q_ = 1'bx;
-    generate if (_TECHMAP_WIREINIT_Q_ === 1'b1)
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(1'b0), .DI(D), .Q(Q));
-    else
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(1'b0), .DI(D), .Q(Q));
-    endgenerate
-    wire _TECHMAP_REMOVEINIT_Q_ = 1'b1;
-endmodule
-
-module  \$_DFFE_NP_ (input D, C, E, output Q);
-    parameter _TECHMAP_WIREINIT_Q_ = 1'bx;
-    generate if (_TECHMAP_WIREINIT_Q_ === 1'b1)
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("SET"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(1'b0), .DI(D), .Q(Q));
-    else
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("RESET"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(1'b0), .DI(D), .Q(Q));
-    endgenerate
-    wire _TECHMAP_REMOVEINIT_Q_ = 1'b1;
-endmodule
-
-module  \$_DFFE_PP_ (input D, C, E, output Q);
-    parameter _TECHMAP_WIREINIT_Q_ = 1'bx;
-    generate if (_TECHMAP_WIREINIT_Q_ === 1'b1)
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(1'b0), .DI(D), .Q(Q));
-    else
-        TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(1'b0), .DI(D), .Q(Q));
-    endgenerate
-    wire _TECHMAP_REMOVEINIT_Q_ = 1'b1;
-endmodule
-
-module  \$_DFF_NP0_ (input D, C, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_DFF_NP1_ (input D, C, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_DFF_PP0_ (input D, C, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_DFF_PP1_ (input D, C, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-
-module  \$_SDFF_NP0_ (input D, C, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_SDFF_NP1_ (input D, C, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_SDFF_PP0_ (input D, C, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_SDFF_PP1_ (input D, C, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("1"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-
-module  \$_DFFE_NP0P_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_DFFE_NP1P_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_DFFE_PP0P_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_DFFE_PP1P_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-
-module  \$_DFFE_NP0N_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_DFFE_NP1N_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_DFFE_PP0N_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_DFFE_PP1N_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-
-module  \$_SDFFE_NP0P_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_SDFFE_NP1P_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_SDFFE_PP0P_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_SDFFE_PP1P_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-
-module  \$_SDFFE_NP0N_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_SDFFE_NP1N_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("INV"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_SDFFE_PP0N_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-module  \$_SDFFE_PP1N_ (input D, C, E, R, output Q); TRELLIS_FF #(.GSR("AUTO"), .CEMUX("INV"), .CLKMUX("CLK"), .LSRMUX("LSR"), .REGSET("SET"), .SRMODE("LSR_OVER_CE"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(R), .DI(D), .Q(Q)); wire _TECHMAP_REMOVEINIT_Q_ = 1'b1; endmodule
-
-module \$_ALDFF_NP_ (input C, L, AD, D, output Q); TRELLIS_FF #(.GSR("DISABLED"), .CEMUX("1"), .CLKMUX("INV"), .LSRMODE("PRLD"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(L), .DI(D), .M(AD), .Q(Q)); endmodule
-module \$_ALDFF_PP_ (input C, L, AD, D, output Q); TRELLIS_FF #(.GSR("DISABLED"), .CEMUX("1"), .CLKMUX("CLK"), .LSRMODE("PRLD"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .LSR(L), .DI(D), .M(AD), .Q(Q)); endmodule
-
-module \$_ALDFFE_NPN_ (input C, E, L, AD, D, output Q); TRELLIS_FF #(.GSR("DISABLED"), .CEMUX("INV"), .CLKMUX("INV"), .LSRMODE("PRLD"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(L), .DI(D), .M(AD), .Q(Q)); endmodule
-module \$_ALDFFE_NPP_ (input C, E, L, AD, D, output Q); TRELLIS_FF #(.GSR("DISABLED"), .CEMUX("CE"), .CLKMUX("INV"), .LSRMODE("PRLD"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(L), .DI(D), .M(AD), .Q(Q)); endmodule
-module \$_ALDFFE_PPN_ (input C, E, L, AD, D, output Q); TRELLIS_FF #(.GSR("DISABLED"), .CEMUX("INV"), .CLKMUX("CLK"), .LSRMODE("PRLD"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(L), .DI(D), .M(AD), .Q(Q)); endmodule
-module \$_ALDFFE_PPP_ (input C, E, L, AD, D, output Q); TRELLIS_FF #(.GSR("DISABLED"), .CEMUX("CE"), .CLKMUX("CLK"), .LSRMODE("PRLD"), .LSRMUX("LSR"), .REGSET("RESET"), .SRMODE("ASYNC"))  _TECHMAP_REPLACE_ (.CLK(C), .CE(E), .LSR(L), .DI(D), .M(AD), .Q(Q)); endmodule
-
-`include "cells_ff.vh"
-`include "cells_io.vh"
-
-`ifndef NO_LUT
-module \$lut (A, Y);
-    parameter WIDTH = 0;
-    parameter LUT = 0;
-
-    (* force_downto *)
-    input [WIDTH-1:0] A;
-    output Y;
-
-    generate
-        if (WIDTH == 1) begin
-            localparam [15:0] INIT = {{8{LUT[1]}}, {8{LUT[0]}}};
-            LUT4 #(.INIT(INIT)) _TECHMAP_REPLACE_ (.Z(Y),
-                .A(1'b0), .B(1'b0), .C(1'b0), .D(A[0]));
-        end else
-        if (WIDTH == 2) begin
-            localparam [15:0] INIT = {{4{LUT[3]}}, {4{LUT[2]}}, {4{LUT[1]}}, {4{LUT[0]}}};
-            LUT4 #(.INIT(INIT)) _TECHMAP_REPLACE_ (.Z(Y),
-                .A(1'b0), .B(1'b0), .C(A[0]), .D(A[1]));
-        end else
-        if (WIDTH == 3) begin
-            localparam [15:0] INIT = {{2{LUT[7]}}, {2{LUT[6]}}, {2{LUT[5]}}, {2{LUT[4]}}, {2{LUT[3]}}, {2{LUT[2]}}, {2{LUT[1]}}, {2{LUT[0]}}};
-            LUT4 #(.INIT(INIT)) _TECHMAP_REPLACE_ (.Z(Y),
-                .A(1'b0), .B(A[0]), .C(A[1]), .D(A[2]));
-        end else
-        if (WIDTH == 4) begin
-            LUT4 #(.INIT(LUT)) _TECHMAP_REPLACE_ (.Z(Y),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-        `ifndef NO_PFUMUX
-        end else
-        if (WIDTH == 5) begin
-            wire f0, f1;
-            LUT4 #(.INIT(LUT[15: 0])) lut0 (.Z(f0),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-            LUT4 #(.INIT(LUT[31:16])) lut1 (.Z(f1),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-            PFUMX mux5(.ALUT(f1), .BLUT(f0), .C0(A[4]), .Z(Y));
-        end else
-        if (WIDTH == 6) begin
-            wire f0, f1, f2, f3, g0, g1;
-            LUT4 #(.INIT(LUT[15: 0])) lut0 (.Z(f0),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-            LUT4 #(.INIT(LUT[31:16])) lut1 (.Z(f1),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-
-            LUT4 #(.INIT(LUT[47:32])) lut2 (.Z(f2),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-            LUT4 #(.INIT(LUT[63:48])) lut3 (.Z(f3),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-
-            PFUMX mux50(.ALUT(f1), .BLUT(f0), .C0(A[4]), .Z(g0));
-            PFUMX mux51(.ALUT(f3), .BLUT(f2), .C0(A[4]), .Z(g1));
-            L6MUX21 mux6 (.D0(g0), .D1(g1), .SD(A[5]), .Z(Y));
-        end else
-        if (WIDTH == 7) begin
-            wire f0, f1, f2, f3, f4, f5, f6, f7, g0, g1, g2, g3, h0, h1;
-            LUT4 #(.INIT(LUT[15: 0])) lut0 (.Z(f0),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-            LUT4 #(.INIT(LUT[31:16])) lut1 (.Z(f1),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-
-            LUT4 #(.INIT(LUT[47:32])) lut2 (.Z(f2),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-            LUT4 #(.INIT(LUT[63:48])) lut3 (.Z(f3),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-
-            LUT4 #(.INIT(LUT[79:64])) lut4 (.Z(f4),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-            LUT4 #(.INIT(LUT[95:80])) lut5 (.Z(f5),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-
-            LUT4 #(.INIT(LUT[111: 96])) lut6 (.Z(f6),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-            LUT4 #(.INIT(LUT[127:112])) lut7 (.Z(f7),
-                .A(A[0]), .B(A[1]), .C(A[2]), .D(A[3]));
-
-            PFUMX mux50(.ALUT(f1), .BLUT(f0), .C0(A[4]), .Z(g0));
-            PFUMX mux51(.ALUT(f3), .BLUT(f2), .C0(A[4]), .Z(g1));
-            PFUMX mux52(.ALUT(f5), .BLUT(f4), .C0(A[4]), .Z(g2));
-            PFUMX mux53(.ALUT(f7), .BLUT(f6), .C0(A[4]), .Z(g3));
-            L6MUX21 mux60 (.D0(g0), .D1(g1), .SD(A[5]), .Z(h0));
-            L6MUX21 mux61 (.D0(g2), .D1(g3), .SD(A[5]), .Z(h1));
-            L6MUX21 mux7  (.D0(h0), .D1(h1), .SD(A[6]), .Z(Y));
-        `endif
-        end else begin
-            wire _TECHMAP_FAIL_ = 1;
-        end
-    endgenerate
-endmodule
-`endif
diff --git a/techlibs/ecp5/cells_sim.v b/techlibs/ecp5/cells_sim.v
deleted file mode 100644
index eec211d6b..000000000
--- a/techlibs/ecp5/cells_sim.v
+++ /dev/null
@@ -1,681 +0,0 @@
-// ---------------------------------------
-
-(* abc9_lut=1, lib_whitebox *)
-module LUT4(input A, B, C, D, output Z);
-    parameter [15:0] INIT = 16'h0000;
-    wire [7:0] s3 = D ?     INIT[15:8] :     INIT[7:0];
-    wire [3:0] s2 = C ?       s3[ 7:4] :       s3[3:0];
-    wire [1:0] s1 = B ?       s2[ 3:2] :       s2[1:0];
-    assign Z =      A ?          s1[1] :         s1[0];
-    specify
-        (A => Z) = 141;
-        (B => Z) = 275;
-        (C => Z) = 379;
-        (D => Z) = 379;
-    endspecify
-endmodule
-
-// This is a placeholder for ABC9 to extract the area/delay
-//   cost of 5-input LUTs and is not intended to be instantiated
-// LUT5 = 2x LUT4 + PFUMX
-(* abc9_lut=2 *)
-module \$__ABC9_LUT5 (input M0, D, C, B, A, output Z);
-    specify
-        (M0 => Z) = 151;
-        (D => Z) = 239;
-        (C => Z) = 373;
-        (B => Z) = 477;
-        (A => Z) = 477;
-    endspecify
-endmodule
-
-// This is a placeholder for ABC9 to extract the area/delay
-//   of 6-input LUTs and is not intended to be instantiated
-// LUT6 = 2x LUT5 + MUX2
-(* abc9_lut=4 *)
-module \$__ABC9_LUT6 (input M1, M0, D, C, B, A, output Z);
-    specify
-        (M1 => Z) = 148;
-        (M0 => Z) = 292;
-        (D => Z) = 380;
-        (C => Z) = 514;
-        (B => Z) = 618;
-        (A => Z) = 618;
-    endspecify
-endmodule
-
-// This is a placeholder for ABC9 to extract the area/delay
-//   of 7-input LUTs and is not intended to be instantiated
-// LUT7 = 2x LUT6 + MUX2
-(* abc9_lut=8 *)
-module \$__ABC9_LUT7 (input M2, M1, M0, D, C, B, A, output Z);
-    specify
-        (M2 => Z) = 148;
-        (M1 => Z) = 289;
-        (M0 => Z) = 433;
-        (D => Z) = 521;
-        (C => Z) = 655;
-        (B => Z) = 759;
-        (A => Z) = 759;
-    endspecify
-endmodule
-
-// ---------------------------------------
-(* abc9_box, lib_whitebox *)
-module L6MUX21 (input D0, D1, SD, output Z);
-	assign Z = SD ? D1 : D0;
-	specify
-		(D0 => Z) = 140;
-		(D1 => Z) = 141;
-		(SD => Z) = 148;
-	endspecify
-endmodule
-
-// ---------------------------------------
-(* abc9_box, lib_whitebox *)
-module CCU2C(
-	(* abc9_carry *)
-	input  CIN,
-	input  A0, B0, C0, D0, A1, B1, C1, D1,
-	output S0, S1,
-	(* abc9_carry *)
-	output COUT
-);
-	parameter [15:0] INIT0 = 16'h0000;
-	parameter [15:0] INIT1 = 16'h0000;
-	parameter INJECT1_0 = "YES";
-	parameter INJECT1_1 = "YES";
-
-	// First half
-	wire LUT4_0, LUT2_0;
-	LUT4 #(.INIT(INIT0)) lut4_0(.A(A0), .B(B0), .C(C0), .D(D0), .Z(LUT4_0));
-	LUT2 #(.INIT(INIT0[3:0])) lut2_0(.A(A0), .B(B0), .Z(LUT2_0));
-	wire gated_cin_0 = (INJECT1_0 == "YES") ? 1'b0 : CIN;
-	assign S0 = LUT4_0 ^ gated_cin_0;
-
-	wire gated_lut2_0 = (INJECT1_0 == "YES") ? 1'b0 : LUT2_0;
-	wire cout_0 = (~LUT4_0 & gated_lut2_0) | (LUT4_0 & CIN);
-
-	// Second half
-	wire LUT4_1, LUT2_1;
-	LUT4 #(.INIT(INIT1)) lut4_1(.A(A1), .B(B1), .C(C1), .D(D1), .Z(LUT4_1));
-	LUT2 #(.INIT(INIT1[3:0])) lut2_1(.A(A1), .B(B1), .Z(LUT2_1));
-	wire gated_cin_1 = (INJECT1_1 == "YES") ? 1'b0 : cout_0;
-	assign S1 = LUT4_1 ^ gated_cin_1;
-
-	wire gated_lut2_1 = (INJECT1_1 == "YES") ? 1'b0 : LUT2_1;
-	assign COUT = (~LUT4_1 & gated_lut2_1) | (LUT4_1 & cout_0);
-
-	specify
-		(A0 => S0) = 379;
-		(B0 => S0) = 379;
-		(C0 => S0) = 275;
-		(D0 => S0) = 141;
-		(CIN => S0) = 257;
-		(A0 => S1) = 630;
-		(B0 => S1) = 630;
-		(C0 => S1) = 526;
-		(D0 => S1) = 392;
-		(A1 => S1) = 379;
-		(B1 => S1) = 379;
-		(C1 => S1) = 275;
-		(D1 => S1) = 141;
-		(CIN => S1) = 273;
-		(A0 => COUT) = 516;
-		(B0 => COUT) = 516;
-		(C0 => COUT) = 412;
-		(D0 => COUT) = 278;
-		(A1 => COUT) = 516;
-		(B1 => COUT) = 516;
-		(C1 => COUT) = 412;
-		(D1 => COUT) = 278;
-		(CIN => COUT) = 43;
-	endspecify
-endmodule
-
-// ---------------------------------------
-
-module TRELLIS_RAM16X2 (
-	input DI0, DI1,
-	input WAD0, WAD1, WAD2, WAD3,
-	input WRE, WCK,
-	input RAD0, RAD1, RAD2, RAD3,
-	output DO0, DO1
-);
-	parameter WCKMUX = "WCK";
-	parameter WREMUX = "WRE";
-	parameter INITVAL_0 = 16'h0000;
-	parameter INITVAL_1 = 16'h0000;
-
-	reg [1:0] mem[15:0];
-
-	integer i;
-	initial begin
-		for (i = 0; i < 16; i = i + 1)
-			mem[i] <= {INITVAL_1[i], INITVAL_0[i]};
-	end
-
-	wire muxwck = (WCKMUX == "INV") ? ~WCK : WCK;
-
-	reg muxwre;
-	always @(*)
-		case (WREMUX)
-			"1": muxwre = 1'b1;
-			"0": muxwre = 1'b0;
-			"INV": muxwre = ~WRE;
-			default: muxwre = WRE;
-		endcase
-
-
-	always @(posedge muxwck)
-		if (muxwre)
-			mem[{WAD3, WAD2, WAD1, WAD0}] <= {DI1, DI0};
-
-	assign {DO1, DO0} = mem[{RAD3, RAD2, RAD1, RAD0}];
-endmodule
-
-// ---------------------------------------
-(* abc9_box, lib_whitebox *)
-module PFUMX (input ALUT, BLUT, C0, output Z);
-	assign Z = C0 ? ALUT : BLUT;
-	specify
-		(ALUT => Z) = 98;
-		(BLUT => Z) = 98;
-		(C0 => Z) = 151;
-	endspecify
-endmodule
-
-// ---------------------------------------
-(* abc9_box, lib_whitebox *)
-module TRELLIS_DPR16X4 (
-	input  [3:0] DI,
-	input  [3:0] WAD,
-	input        WRE,
-	input        WCK,
-	input  [3:0] RAD,
-	output [3:0] DO
-);
-	parameter WCKMUX = "WCK";
-	parameter WREMUX = "WRE";
-	parameter [63:0] INITVAL = 64'h0000000000000000;
-
-	reg [3:0] mem[15:0];
-
-	integer i;
-	initial begin
-		for (i = 0; i < 16; i = i + 1)
-			mem[i] <= INITVAL[4*i +: 4];
-	end
-
-	wire muxwck = (WCKMUX == "INV") ? ~WCK : WCK;
-
-	reg muxwre;
-	always @(*)
-		case (WREMUX)
-			"1": muxwre = 1'b1;
-			"0": muxwre = 1'b0;
-			"INV": muxwre = ~WRE;
-			default: muxwre = WRE;
-		endcase
-
-	always @(posedge muxwck)
-		if (muxwre)
-			mem[WAD] <= DI;
-
-	assign DO = mem[RAD];
-
-	specify
-		// TODO
-		(RAD *> DO) = 0;
-	endspecify
-endmodule
-
-// ---------------------------------------
-
-(* abc9_box, lib_whitebox *)
-module DPR16X4C (
-		input [3:0] DI,
-		input WCK, WRE,
-		input [3:0] RAD,
-		input [3:0] WAD,
-		output [3:0] DO
-);
-	// For legacy Lattice compatibility, INITIVAL is a hex
-	// string rather than a numeric parameter
-	parameter INITVAL = "0x0000000000000000";
-
-	function [63:0] convert_initval;
-		input [143:0] hex_initval;
-		reg done;
-		reg [63:0] temp;
-		reg [7:0] char;
-		integer i;
-		begin
-			done = 1'b0;
-			temp = 0;
-			for (i = 0; i < 16; i = i + 1) begin
-				if (!done) begin
-					char = hex_initval[8*i +: 8];
-					if (char == "x") begin
-						done = 1'b1;
-					end else begin
-						if (char >= "0" && char <= "9")
-							temp[4*i +: 4] = char - "0";
-						else if (char >= "A" && char <= "F")
-							temp[4*i +: 4] = 10 + char - "A";
-						else if (char >= "a" && char <= "f")
-							temp[4*i +: 4] = 10 + char - "a";
-					end
-				end
-			end
-			convert_initval = temp;
-		end
-	endfunction
-
-	localparam conv_initval = convert_initval(INITVAL);
-
-	reg [3:0] ram[0:15];
-	integer i;
-	initial begin
-		for (i = 0; i < 15; i = i + 1) begin
-			ram[i] <= conv_initval[4*i +: 4];
-		end
-	end
-
-	always @(posedge WCK)
-		if (WRE)
-			ram[WAD] <= DI;
-
-	assign DO = ram[RAD];
-
-	specify
-		// TODO
-		(RAD *> DO) = 0;
-	endspecify
-endmodule
-
-// ---------------------------------------
-
-(* lib_whitebox *)
-module LUT2(input A, B, output Z);
-    parameter [3:0] INIT = 4'h0;
-    wire [1:0] s1 = B ?     INIT[ 3:2] :     INIT[1:0];
-    assign Z =      A ?          s1[1] :         s1[0];
-endmodule
-
-// ---------------------------------------
-
-`ifdef YOSYS
-(* abc9_flop=(SRMODE != "ASYNC"), abc9_box=(SRMODE == "ASYNC"), lib_whitebox *)
-`endif
-module TRELLIS_FF(input CLK, LSR, CE, DI, M, output reg Q);
-	parameter GSR = "ENABLED";
-	parameter [127:0] CEMUX = "1";
-	parameter CLKMUX = "CLK";
-	parameter LSRMUX = "LSR";
-	parameter SRMODE = "LSR_OVER_CE";
-	parameter REGSET = "RESET";
-	parameter [127:0] LSRMODE = "LSR";
-
-	wire muxce;
-	generate
-		case (CEMUX)
-			"1": assign muxce = 1'b1;
-			"0": assign muxce = 1'b0;
-			"INV": assign muxce = ~CE;
-			default: assign muxce = CE;
-		endcase
-	endgenerate
-
-	wire muxlsr = (LSRMUX == "INV") ? ~LSR : LSR;
-	wire muxclk = (CLKMUX == "INV") ? ~CLK : CLK;
-	wire srval;
-	generate
-		if (LSRMODE == "PRLD")
-			assign srval = M;
-		else
-			assign srval = (REGSET == "SET") ? 1'b1 : 1'b0;
-	endgenerate
-
-	initial Q = srval;
-
-	generate
-		if (SRMODE == "ASYNC") begin
-			always @(posedge muxclk, posedge muxlsr)
-				if (muxlsr)
-					Q <= srval;
-				else if (muxce)
-					Q <= DI;
-		end else begin
-			always @(posedge muxclk)
-				if (muxlsr)
-					Q <= srval;
-				else if (muxce)
-					Q <= DI;
-		end
-	endgenerate
-
-	specify
-		$setup(DI, negedge CLK &&& CLKMUX == "INV", 0);
-		$setup(CE, negedge CLK &&& CLKMUX == "INV", 0);
-		$setup(LSR, negedge CLK &&& CLKMUX == "INV", 0);
-		$setup(DI, posedge CLK &&& CLKMUX != "INV", 0);
-		$setup(CE, posedge CLK &&& CLKMUX != "INV", 0);
-		$setup(LSR, posedge CLK &&& CLKMUX != "INV", 0);
-`ifndef YOSYS
-		if (SRMODE == "ASYNC" && muxlsr && CLKMUX == "INV") (negedge CLK => (Q : srval)) = 0;
-		if (SRMODE == "ASYNC" && muxlsr && CLKMUX != "INV") (posedge CLK => (Q : srval)) = 0;
-`else
-		if (SRMODE == "ASYNC" && muxlsr) (LSR => Q) = 0; 	// Technically, this should be an edge sensitive path
-									// but for facilitating a bypass box, let's pretend it's
-									// a simple path
-`endif
-		if (!muxlsr && muxce && CLKMUX == "INV") (negedge CLK => (Q : DI)) = 0;
-		if (!muxlsr && muxce && CLKMUX != "INV") (posedge CLK => (Q : DI)) = 0;
-	endspecify
-endmodule
-
-// ---------------------------------------
-(* keep *)
-module TRELLIS_IO(
-	(* iopad_external_pin *)
-	inout B,
-	input I,
-	input T,
-	output O
-);
-	parameter DIR = "INPUT";
-	reg T_pd;
-	always @(*) if (T === 1'bz) T_pd = 1'b0; else T_pd = T;
-
-	generate
-		if (DIR == "INPUT") begin
-			assign B = 1'bz;
-			assign O = B;
-		end else if (DIR == "OUTPUT") begin
-			assign B = T_pd ? 1'bz : I;
-			assign O = 1'bx;
-		end else if (DIR == "BIDIR") begin
-			assign B = T_pd ? 1'bz : I;
-			assign O = B;
-		end else begin
-			ERROR_UNKNOWN_IO_MODE error();
-		end
-	endgenerate
-
-endmodule
-
-// ---------------------------------------
-
-module INV(input A, output Z);
-	assign Z = !A;
-endmodule
-
-// ---------------------------------------
-
-module TRELLIS_COMB(
-	input A, B, C, D, M,
-	input FCI, F1, FXA, FXB,
-	input WD,
-	input WAD0, WAD1, WAD2, WAD3,
-	input WRE, WCK,
-	output F, FCO, OFX
-);
-	parameter MODE = "LOGIC";
-	parameter INITVAL = 16'h0;
-	parameter CCU2_INJECT1 = "NO";
-	parameter WREMUX = "WRE";
-	parameter IS_Z1 = 1'b0;
-
-	generate
-		if (MODE == "LOGIC") begin: mode_logic
-			LUT4 #(.INIT(INITVAL)) lut4 (.A(A), .B(B), .C(C), .D(D), .Z(F));
-		end else if (MODE == "CCU2") begin: mode_ccu2
-			wire l4o, l2o;
-			LUT4 #(.INIT(INITVAL)) lut4_0(.A(A), .B(B), .C(C), .D(D), .Z(l4o));
-			LUT2 #(.INIT(INITVAL[3:0])) lut2_0(.A(A), .B(B), .Z(l2o));
-			wire gated_cin_0 = (CCU2_INJECT1 == "YES") ? 1'b0 : FCI;
-			assign F = l4o ^ gated_cin_0;
-			wire gated_lut2_0 = (CCU2_INJECT1 == "YES") ? 1'b0 : l2o;
-			wire FCO = (~l4o & gated_lut2_0) | (l4o & FCI);
-		end else if (MODE == "DPRAM") begin: mode_dpram
-			reg [15:0] ram = INITVAL;
-			always @(posedge WCK)
-				if (WRE)
-					ram[{WAD3, WAD2, WAD1, WAD0}] <= WD;
-			assign F = ram[{A, C, B, D}];
-		end else begin
-			$error("unsupported COMB mode %s", MODE);
-		end
-
- 		if (IS_Z1)
-			L6MUX21 lutx_mux (.D0(FXA), .D1(FXB), .SD(M), .Z(OFX));
-		else
-			PFUMX lut5_mux (.ALUT(F1), .BLUT(F), .C0(M), .Z(OFX));
-	endgenerate
-
-endmodule
-
-(* blackbox *)
-module DP16KD(
-  input DIA17, DIA16, DIA15, DIA14, DIA13, DIA12, DIA11, DIA10, DIA9, DIA8, DIA7, DIA6, DIA5, DIA4, DIA3, DIA2, DIA1, DIA0,
-  input ADA13, ADA12, ADA11, ADA10, ADA9, ADA8, ADA7, ADA6, ADA5, ADA4, ADA3, ADA2, ADA1, ADA0,
-  input CEA, OCEA, CLKA, WEA, RSTA,
-  input CSA2, CSA1, CSA0,
-  output DOA17, DOA16, DOA15, DOA14, DOA13, DOA12, DOA11, DOA10, DOA9, DOA8, DOA7, DOA6, DOA5, DOA4, DOA3, DOA2, DOA1, DOA0,
-
-  input DIB17, DIB16, DIB15, DIB14, DIB13, DIB12, DIB11, DIB10, DIB9, DIB8, DIB7, DIB6, DIB5, DIB4, DIB3, DIB2, DIB1, DIB0,
-  input ADB13, ADB12, ADB11, ADB10, ADB9, ADB8, ADB7, ADB6, ADB5, ADB4, ADB3, ADB2, ADB1, ADB0,
-  input CEB, OCEB, CLKB, WEB, RSTB,
-  input CSB2, CSB1, CSB0,
-  output DOB17, DOB16, DOB15, DOB14, DOB13, DOB12, DOB11, DOB10, DOB9, DOB8, DOB7, DOB6, DOB5, DOB4, DOB3, DOB2, DOB1, DOB0
-);
-	parameter DATA_WIDTH_A = 18;
-	parameter DATA_WIDTH_B = 18;
-
-	parameter REGMODE_A = "NOREG";
-	parameter REGMODE_B = "NOREG";
-
-	parameter RESETMODE = "SYNC";
-	parameter ASYNC_RESET_RELEASE = "SYNC";
-
-	parameter CSDECODE_A = "0b000";
-	parameter CSDECODE_B = "0b000";
-
-	parameter WRITEMODE_A = "NORMAL";
-	parameter WRITEMODE_B = "NORMAL";
-
-	parameter DIA17MUX = "DIA17";
-	parameter DIA16MUX = "DIA16";
-	parameter DIA15MUX = "DIA15";
-	parameter DIA14MUX = "DIA14";
-	parameter DIA13MUX = "DIA13";
-	parameter DIA12MUX = "DIA12";
-	parameter DIA11MUX = "DIA11";
-	parameter DIA10MUX = "DIA10";
-	parameter DIA9MUX = "DIA9";
-	parameter DIA8MUX = "DIA8";
-	parameter DIA7MUX = "DIA7";
-	parameter DIA6MUX = "DIA6";
-	parameter DIA5MUX = "DIA5";
-	parameter DIA4MUX = "DIA4";
-	parameter DIA3MUX = "DIA3";
-	parameter DIA2MUX = "DIA2";
-	parameter DIA1MUX = "DIA1";
-	parameter DIA0MUX = "DIA0";
-	parameter ADA13MUX = "ADA13";
-	parameter ADA12MUX = "ADA12";
-	parameter ADA11MUX = "ADA11";
-	parameter ADA10MUX = "ADA10";
-	parameter ADA9MUX = "ADA9";
-	parameter ADA8MUX = "ADA8";
-	parameter ADA7MUX = "ADA7";
-	parameter ADA6MUX = "ADA6";
-	parameter ADA5MUX = "ADA5";
-	parameter ADA4MUX = "ADA4";
-	parameter ADA3MUX = "ADA3";
-	parameter ADA2MUX = "ADA2";
-	parameter ADA1MUX = "ADA1";
-	parameter ADA0MUX = "ADA0";
-	parameter CEAMUX = "CEA";
-	parameter OCEAMUX = "OCEA";
-	parameter CLKAMUX = "CLKA";
-	parameter WEAMUX = "WEA";
-	parameter RSTAMUX = "RSTA";
-	parameter CSA2MUX = "CSA2";
-	parameter CSA1MUX = "CSA1";
-	parameter CSA0MUX = "CSA0";
-	parameter DOA17MUX = "DOA17";
-	parameter DOA16MUX = "DOA16";
-	parameter DOA15MUX = "DOA15";
-	parameter DOA14MUX = "DOA14";
-	parameter DOA13MUX = "DOA13";
-	parameter DOA12MUX = "DOA12";
-	parameter DOA11MUX = "DOA11";
-	parameter DOA10MUX = "DOA10";
-	parameter DOA9MUX = "DOA9";
-	parameter DOA8MUX = "DOA8";
-	parameter DOA7MUX = "DOA7";
-	parameter DOA6MUX = "DOA6";
-	parameter DOA5MUX = "DOA5";
-	parameter DOA4MUX = "DOA4";
-	parameter DOA3MUX = "DOA3";
-	parameter DOA2MUX = "DOA2";
-	parameter DOA1MUX = "DOA1";
-	parameter DOA0MUX = "DOA0";
-	parameter DIB17MUX = "DIB17";
-	parameter DIB16MUX = "DIB16";
-	parameter DIB15MUX = "DIB15";
-	parameter DIB14MUX = "DIB14";
-	parameter DIB13MUX = "DIB13";
-	parameter DIB12MUX = "DIB12";
-	parameter DIB11MUX = "DIB11";
-	parameter DIB10MUX = "DIB10";
-	parameter DIB9MUX = "DIB9";
-	parameter DIB8MUX = "DIB8";
-	parameter DIB7MUX = "DIB7";
-	parameter DIB6MUX = "DIB6";
-	parameter DIB5MUX = "DIB5";
-	parameter DIB4MUX = "DIB4";
-	parameter DIB3MUX = "DIB3";
-	parameter DIB2MUX = "DIB2";
-	parameter DIB1MUX = "DIB1";
-	parameter DIB0MUX = "DIB0";
-	parameter ADB13MUX = "ADB13";
-	parameter ADB12MUX = "ADB12";
-	parameter ADB11MUX = "ADB11";
-	parameter ADB10MUX = "ADB10";
-	parameter ADB9MUX = "ADB9";
-	parameter ADB8MUX = "ADB8";
-	parameter ADB7MUX = "ADB7";
-	parameter ADB6MUX = "ADB6";
-	parameter ADB5MUX = "ADB5";
-	parameter ADB4MUX = "ADB4";
-	parameter ADB3MUX = "ADB3";
-	parameter ADB2MUX = "ADB2";
-	parameter ADB1MUX = "ADB1";
-	parameter ADB0MUX = "ADB0";
-	parameter CEBMUX = "CEB";
-	parameter OCEBMUX = "OCEB";
-	parameter CLKBMUX = "CLKB";
-	parameter WEBMUX = "WEB";
-	parameter RSTBMUX = "RSTB";
-	parameter CSB2MUX = "CSB2";
-	parameter CSB1MUX = "CSB1";
-	parameter CSB0MUX = "CSB0";
-	parameter DOB17MUX = "DOB17";
-	parameter DOB16MUX = "DOB16";
-	parameter DOB15MUX = "DOB15";
-	parameter DOB14MUX = "DOB14";
-	parameter DOB13MUX = "DOB13";
-	parameter DOB12MUX = "DOB12";
-	parameter DOB11MUX = "DOB11";
-	parameter DOB10MUX = "DOB10";
-	parameter DOB9MUX = "DOB9";
-	parameter DOB8MUX = "DOB8";
-	parameter DOB7MUX = "DOB7";
-	parameter DOB6MUX = "DOB6";
-	parameter DOB5MUX = "DOB5";
-	parameter DOB4MUX = "DOB4";
-	parameter DOB3MUX = "DOB3";
-	parameter DOB2MUX = "DOB2";
-	parameter DOB1MUX = "DOB1";
-	parameter DOB0MUX = "DOB0";
-
-	parameter WID = 0;
-
-	parameter GSR = "ENABLED";
-
-	parameter INITVAL_00 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_01 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_02 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_03 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_04 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_05 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_06 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_07 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_08 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_09 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_0F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_10 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_11 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_12 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_13 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_14 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_15 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_16 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_17 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_18 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_19 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_1F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_20 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_21 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_22 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_23 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_24 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_25 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_26 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_27 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_28 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_29 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_2F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_30 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_31 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_32 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_33 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_34 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_35 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_36 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_37 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_38 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_39 = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3A = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3B = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3C = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3D = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3E = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INITVAL_3F = 320'h00000000000000000000000000000000000000000000000000000000000000000000000000000000;
-	parameter INIT_DATA = "STATIC";
-endmodule
-
-`ifndef NO_INCLUDES
-
-`include "cells_ff.vh"
-`include "cells_io.vh"
-
-`endif
diff --git a/techlibs/ecp5/dsp_map.v b/techlibs/ecp5/dsp_map.v
deleted file mode 100644
index df54d1d9f..000000000
--- a/techlibs/ecp5/dsp_map.v
+++ /dev/null
@@ -1,17 +0,0 @@
-module \$__MUL18X18 (input [17:0] A, input [17:0] B, output [35:0] Y);
-
-	parameter A_WIDTH = 18;
-	parameter B_WIDTH = 18;
-	parameter Y_WIDTH = 36;
-	parameter A_SIGNED = 0;
-	parameter B_SIGNED = 0;
-
-	MULT18X18D _TECHMAP_REPLACE_ (
-		.A0(A[0]), .A1(A[1]), .A2(A[2]), .A3(A[3]), .A4(A[4]), .A5(A[5]), .A6(A[6]), .A7(A[7]), .A8(A[8]), .A9(A[9]), .A10(A[10]), .A11(A[11]), .A12(A[12]), .A13(A[13]), .A14(A[14]), .A15(A[15]), .A16(A[16]), .A17(A[17]),
-		.B0(B[0]), .B1(B[1]), .B2(B[2]), .B3(B[3]), .B4(B[4]), .B5(B[5]), .B6(B[6]), .B7(B[7]), .B8(B[8]), .B9(B[9]), .B10(B[10]), .B11(B[11]), .B12(B[12]), .B13(B[13]), .B14(B[14]), .B15(B[15]), .B16(B[16]), .B17(B[17]),
-		.C17(1'b0), .C16(1'b0), .C15(1'b0), .C14(1'b0), .C13(1'b0), .C12(1'b0), .C11(1'b0), .C10(1'b0), .C9(1'b0), .C8(1'b0), .C7(1'b0), .C6(1'b0), .C5(1'b0), .C4(1'b0), .C3(1'b0), .C2(1'b0), .C1(1'b0), .C0(1'b0),
-		.SIGNEDA(A_SIGNED ? 1'b1 : 1'b0), .SIGNEDB(B_SIGNED ? 1'b1 : 1'b0), .SOURCEA(1'b0), .SOURCEB(1'b0),
-
-		.P0(Y[0]), .P1(Y[1]), .P2(Y[2]), .P3(Y[3]), .P4(Y[4]), .P5(Y[5]), .P6(Y[6]), .P7(Y[7]), .P8(Y[8]), .P9(Y[9]), .P10(Y[10]), .P11(Y[11]), .P12(Y[12]), .P13(Y[13]), .P14(Y[14]), .P15(Y[15]), .P16(Y[16]), .P17(Y[17]), .P18(Y[18]), .P19(Y[19]), .P20(Y[20]), .P21(Y[21]), .P22(Y[22]), .P23(Y[23]), .P24(Y[24]), .P25(Y[25]), .P26(Y[26]), .P27(Y[27]), .P28(Y[28]), .P29(Y[29]), .P30(Y[30]), .P31(Y[31]), .P32(Y[32]), .P33(Y[33]), .P34(Y[34]), .P35(Y[35])
-	);
-endmodule
diff --git a/techlibs/ecp5/latches_map.v b/techlibs/ecp5/latches_map.v
deleted file mode 100644
index c28f88cf7..000000000
--- a/techlibs/ecp5/latches_map.v
+++ /dev/null
@@ -1,11 +0,0 @@
-module \$_DLATCH_N_ (E, D, Q);
-  wire [1023:0] _TECHMAP_DO_ = "simplemap; opt";
-  input E, D;
-  output Q = !E ? D : Q;
-endmodule
-
-module \$_DLATCH_P_ (E, D, Q);
-  wire [1023:0] _TECHMAP_DO_ = "simplemap; opt";
-  input E, D;
-  output Q = E ? D : Q;
-endmodule
diff --git a/techlibs/ecp5/lutrams.txt b/techlibs/ecp5/lutrams.txt
deleted file mode 100644
index ea42d4fcb..000000000
--- a/techlibs/ecp5/lutrams.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-ram distributed $__TRELLIS_DPR16X4_ {
-	abits 4;
-	width 4;
-	cost 4;
-	init any;
-	prune_rom;
-	port sw "W" {
-		clock anyedge;
-	}
-	port ar "R" {
-	}
-}
diff --git a/techlibs/ecp5/lutrams_map.v b/techlibs/ecp5/lutrams_map.v
deleted file mode 100644
index 3cb325f04..000000000
--- a/techlibs/ecp5/lutrams_map.v
+++ /dev/null
@@ -1,30 +0,0 @@
-module $__TRELLIS_DPR16X4_(...);
-
-parameter INIT = 64'bx;
-parameter PORT_W_CLK_POL = 1;
-
-input PORT_W_CLK;
-input [3:0] PORT_W_ADDR;
-input [3:0] PORT_W_WR_DATA;
-input PORT_W_WR_EN;
-
-input [3:0] PORT_R_ADDR;
-output [3:0] PORT_R_RD_DATA;
-
-localparam WCKMUX = PORT_W_CLK_POL ? "WCK" : "INV";
-
-TRELLIS_DPR16X4 #(
-	.INITVAL(INIT),
-	.WCKMUX(WCKMUX),
-	.WREMUX("WRE")
-) _TECHMAP_REPLACE_ (
-	.RAD(PORT_R_ADDR),
-	.DO(PORT_R_RD_DATA),
-
-	.WAD(PORT_W_ADDR),
-	.DI(PORT_W_WR_DATA),
-	.WCK(PORT_W_CLK),
-	.WRE(PORT_W_WR_EN)
-);
-
-endmodule
diff --git a/techlibs/ecp5/synth_ecp5.cc b/techlibs/ecp5/synth_ecp5.cc
deleted file mode 100644
index 8960df70c..000000000
--- a/techlibs/ecp5/synth_ecp5.cc
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- *  yosys -- Yosys Open SYnthesis Suite
- *
- *  Copyright (C) 2012 Claire Xenia Wolf <claire@yosyshq.com>
- *  Copyright (C) 2018 gatecat <gatecat@ds0.me>
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "kernel/register.h"
-#include "kernel/celltypes.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
-
-USING_YOSYS_NAMESPACE
-PRIVATE_NAMESPACE_BEGIN
-
-struct SynthEcp5Pass : public ScriptPass
-{
-	SynthEcp5Pass() : ScriptPass("synth_ecp5", "synthesis for ECP5 FPGAs") { }
-
-	void on_register() override
-	{
-		RTLIL::constpad["synth_ecp5.abc9.W"] = "300";
-	}
-
-	void help() override
-	{
-		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
-		log("\n");
-		log("    synth_ecp5 [options]\n");
-		log("\n");
-		log("This command runs synthesis for ECP5 FPGAs.\n");
-		log("\n");
-		log("    -top <module>\n");
-		log("        use the specified module as top module\n");
-		log("\n");
-		log("    -blif <file>\n");
-		log("        write the design to the specified BLIF file. writing of an output file\n");
-		log("        is omitted if this parameter is not specified.\n");
-		log("\n");
-		log("    -edif <file>\n");
-		log("        write the design to the specified EDIF file. writing of an output file\n");
-		log("        is omitted if this parameter is not specified.\n");
-		log("\n");
-		log("    -json <file>\n");
-		log("        write the design to the specified JSON file. writing of an output file\n");
-		log("        is omitted if this parameter is not specified.\n");
-		log("\n");
-		log("    -run <from_label>:<to_label>\n");
-		log("        only run the commands between the labels (see below). an empty\n");
-		log("        from label is synonymous to 'begin', and empty to label is\n");
-		log("        synonymous to the end of the command list.\n");
-		log("\n");
-		log("    -noflatten\n");
-		log("        do not flatten design before synthesis\n");
-		log("\n");
-		log("    -dff\n");
-		log("        run 'abc'/'abc9' with -dff option\n");
-		log("\n");
-		log("    -retime\n");
-		log("        run 'abc' with '-dff -D 1' options\n");
-		log("\n");
-		log("    -noccu2\n");
-		log("        do not use CCU2 cells in output netlist\n");
-		log("\n");
-		log("    -nodffe\n");
-		log("        do not use flipflops with CE in output netlist\n");
-		log("\n");
-		log("    -nobram\n");
-		log("        do not use block RAM cells in output netlist\n");
-		log("\n");
-		log("    -nolutram\n");
-		log("        do not use LUT RAM cells in output netlist\n");
-		log("\n");
-		log("    -nowidelut\n");
-		log("        do not use PFU muxes to implement LUTs larger than LUT4s\n");
-		log("\n");
-		log("    -asyncprld\n");
-		log("        use async PRLD mode to implement ALDFF (EXPERIMENTAL)\n");
-		log("\n");
-		log("    -abc2\n");
-		log("        run two passes of 'abc' for slightly improved logic density\n");
-		log("\n");
-		log("    -noabc9\n");
-		log("        disable use of new ABC9 flow\n");
-		log("\n");
-		log("    -vpr\n");
-		log("        generate an output netlist (and BLIF file) suitable for VPR\n");
-		log("        (this feature is experimental and incomplete)\n");
-		log("\n");
-		log("    -iopad\n");
-		log("        insert IO buffers\n");
-		log("\n");
-		log("    -nodsp\n");
-		log("        do not map multipliers to MULT18X18D\n");
-		log("\n");
-		log("    -no-rw-check\n");
-		log("        marks all recognized read ports as \"return don't-care value on\n");
-		log("        read/write collision\" (same result as setting the no_rw_check\n");
-		log("        attribute on all memories).\n");
-		log("\n");
-		log("\n");
-		log("The following commands are executed by this synthesis command:\n");
-		help_script();
-		log("\n");
-	}
-
-	string top_opt, blif_file, edif_file, json_file;
-	bool noccu2, nodffe, nobram, nolutram, nowidelut, asyncprld, flatten, dff, retime, abc2, abc9, iopad, nodsp, vpr, no_rw_check;
-
-	void clear_flags() override
-	{
-		top_opt = "-auto-top";
-		blif_file = "";
-		edif_file = "";
-		json_file = "";
-		noccu2 = false;
-		nodffe = false;
-		nobram = false;
-		nolutram = false;
-		nowidelut = false;
-		asyncprld = false;
-		flatten = true;
-		dff = false;
-		retime = false;
-		abc2 = false;
-		vpr = false;
-		abc9 = true;
-		iopad = false;
-		nodsp = false;
-		no_rw_check = false;
-	}
-
-	void execute(std::vector<std::string> args, RTLIL::Design *design) override
-	{
-		string run_from, run_to;
-		clear_flags();
-
-		size_t argidx;
-		for (argidx = 1; argidx < args.size(); argidx++)
-		{
-			if (args[argidx] == "-top" && argidx+1 < args.size()) {
-				top_opt = "-top " + args[++argidx];
-				continue;
-			}
-			if (args[argidx] == "-blif" && argidx+1 < args.size()) {
-				blif_file = args[++argidx];
-				continue;
-			}
-			if (args[argidx] == "-edif" && argidx+1 < args.size()) {
-				edif_file = args[++argidx];
-				continue;
-			}
-			if (args[argidx] == "-json" && argidx+1 < args.size()) {
-				json_file = args[++argidx];
-				continue;
-			}
-			if (args[argidx] == "-run" && argidx+1 < args.size()) {
-				size_t pos = args[argidx+1].find(':');
-				if (pos == std::string::npos)
-					break;
-				run_from = args[++argidx].substr(0, pos);
-				run_to = args[argidx].substr(pos+1);
-				continue;
-			}
-			if (args[argidx] == "-flatten") {
-				flatten = true;
-				continue;
-			}
-			if (args[argidx] == "-noflatten") {
-				flatten = false;
-				continue;
-			}
-			if (args[argidx] == "-dff") {
-				dff = true;
-				continue;
-			}
-			if (args[argidx] == "-retime") {
-				retime = true;
-				continue;
-			}
-			if (args[argidx] == "-noccu2") {
-				noccu2 = true;
-				continue;
-			}
-			if (args[argidx] == "-nodffe") {
-				nodffe = true;
-				continue;
-			}
-			if (args[argidx] == "-nobram") {
-				nobram = true;
-				continue;
-			}
-			if (args[argidx] == "-asyncprld") {
-				asyncprld = true;
-				continue;
-			}
-			if (args[argidx] == "-nolutram" || /*deprecated alias*/ args[argidx] == "-nodram") {
-				nolutram = true;
-				continue;
-			}
-			if (args[argidx] == "-nowidelut" || /*deprecated alias*/ args[argidx] == "-nomux") {
-				nowidelut = true;
-				continue;
-			}
-			if (args[argidx] == "-abc2") {
-				abc2 = true;
-				continue;
-			}
-			if (args[argidx] == "-vpr") {
-				vpr = true;
-				continue;
-			}
-			if (args[argidx] == "-abc9") {
-				// removed, ABC9 is on by default.
-				continue;
-			}
-			if (args[argidx] == "-noabc9") {
-				abc9 = false;
-				continue;
-			}
-			if (args[argidx] == "-iopad") {
-				iopad = true;
-				continue;
-			}
-			if (args[argidx] == "-nodsp") {
-				nodsp = true;
-				continue;
-			}
-			if (args[argidx] == "-no-rw-check") {
-				no_rw_check = true;
-				continue;
-			}
-			break;
-		}
-		extra_args(args, argidx, design);
-
-		if (!design->full_selection())
-			log_cmd_error("This command only operates on fully selected designs!\n");
-
-		if (abc9 && retime)
-				log_cmd_error("-retime option not currently compatible with -abc9!\n");
-
-		log_header(design, "Executing SYNTH_ECP5 pass.\n");
-		log_push();
-
-		run_script(design, run_from, run_to);
-
-		log_pop();
-	}
-
-	void script() override
-	{
-		std::string no_rw_check_opt = "";
-		if (no_rw_check)
-			no_rw_check_opt = " -no-rw-check";
-		if (help_mode)
-			no_rw_check_opt = " [-no-rw-check]";
-
-		if (check_label("begin"))
-		{
-			run("read_verilog -lib -specify +/ecp5/cells_sim.v +/ecp5/cells_bb.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
-		}
-
-		if (check_label("coarse"))
-		{
-			run("proc");
-			if (flatten || help_mode)
-				run("flatten");
-			run("tribuf -logic");
-			run("deminout");
-			run("opt_expr");
-			run("opt_clean");
-			run("check");
-			run("opt -nodffe -nosdff");
-			run("fsm");
-			run("opt");
-			run("wreduce");
-			run("peepopt");
-			run("opt_clean");
-			run("share");
-			run("techmap -map +/cmp2lut.v -D LUT_WIDTH=4");
-			run("opt_expr");
-			run("opt_clean");
-			if (!nodsp) {
-				run("techmap -map +/mul2dsp.v -map +/ecp5/dsp_map.v -D DSP_A_MAXWIDTH=18 -D DSP_B_MAXWIDTH=18  -D DSP_A_MINWIDTH=2 -D DSP_B_MINWIDTH=2  -D DSP_NAME=$__MUL18X18", "(unless -nodsp)");
-				run("chtype -set $mul t:$__soft_mul", "(unless -nodsp)");
-			}
-			run("alumacc");
-			run("opt");
-			run("memory -nomap" + no_rw_check_opt);
-			run("opt_clean");
-		}
-
-		if (check_label("map_ram"))
-		{
-			std::string args = "";
-			if (help_mode)
-				args += " [-no-auto-block] [-no-auto-distributed]";
-			else {
-				if (nobram)
-					args += " -no-auto-block";
-				if (nolutram)
-					args += " -no-auto-distributed";
-			}
-			run("memory_libmap -lib +/ecp5/lutrams.txt -lib +/ecp5/brams.txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
-			run("techmap -map +/ecp5/lutrams_map.v -map +/ecp5/brams_map.v");
-		}
-
-		if (check_label("map_ffram"))
-		{
-			run("opt -fast -mux_undef -undriven -fine");
-			run("memory_map");
-			run("opt -undriven -fine");
-		}
-
-		if (check_label("map_gates"))
-		{
-			if (noccu2)
-				run("techmap");
-			else
-				run("techmap -map +/techmap.v -map +/ecp5/arith_map.v");
-			if (help_mode || iopad) {
-				run("iopadmap -bits -outpad OB I:O -inpad IB O:I -toutpad OBZ ~T:I:O -tinoutpad BB ~T:O:I:B A:top", "(only if '-iopad')");
-				run("attrmvcp -attr src -attr LOC t:OB %x:+[O] t:OBZ %x:+[O] t:BB %x:+[B]");
-				run("attrmvcp -attr src -attr LOC -driven t:IB %x:+[I]");
-			}
-			run("opt -fast");
-			if (retime || help_mode)
-				run("abc -dff -D 1", "(only if -retime)");
-		}
-
-		if (check_label("map_ffs"))
-		{
-			run("opt_clean");
-			std::string dfflegalize_args = " -cell $_DFF_?_ 01 -cell $_DFF_?P?_ r -cell $_SDFF_?P?_ r";
-			if (help_mode) {
-				dfflegalize_args += " [-cell $_DFFE_??_ 01 -cell $_DFFE_?P??_ r -cell $_SDFFE_?P??_ r]";
-			} else if (!nodffe) {
-				dfflegalize_args += " -cell $_DFFE_??_ 01 -cell $_DFFE_?P??_ r -cell $_SDFFE_?P??_ r";
-			}
-			if (help_mode) {
-				dfflegalize_args += " [-cell $_ALDFF_?P_ x -cell $_ALDFFE_?P?_ x] [-cell $_DLATCH_?_ x]";
-			} else if (asyncprld) {
-				dfflegalize_args += " -cell $_ALDFF_?P_ x -cell $_ALDFFE_?P?_ x";
-			} else {
-				dfflegalize_args += " -cell $_DLATCH_?_ x";
-			}
-			run("dfflegalize" + dfflegalize_args, "($_ALDFF_*_ only if -asyncprld, $_DLATCH_* only if not -asyncprld, $_*DFFE_* only if not -nodffe)");
-			if ((abc9 && dff) || help_mode)
-				run("zinit -all w:* t:$_DFF_?_ t:$_DFFE_??_ t:$_SDFF*", "(only if -abc9 and -dff)");
-			run("techmap -D NO_LUT -map +/ecp5/cells_map.v");
-			run("opt_expr -undriven -mux_undef");
-			run("simplemap");
-			run("lattice_gsr");
-			run("attrmvcp -copy -attr syn_useioff");
-			run("opt_clean");
-		}
-
-		if (check_label("map_luts"))
-		{
-			if (abc2 || help_mode)
-				run("abc", "      (only if -abc2)");
-			if (!asyncprld || help_mode)
-				run("techmap -map +/ecp5/latches_map.v", "(skip if -asyncprld)");
-
-			if (abc9) {
-				std::string abc9_opts;
-				if (nowidelut)
-					abc9_opts += " -maxlut 4";
-				std::string k = "synth_ecp5.abc9.W";
-				if (active_design && active_design->scratchpad.count(k))
-					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k));
-				else
-					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k));
-				if (nowidelut)
-					abc9_opts += " -maxlut 4";
-				if (dff)
-					abc9_opts += " -dff";
-				run("abc9" + abc9_opts);
-			} else {
-				std::string abc_args = " -dress";
-				if (nowidelut)
-					abc_args += " -lut 4";
-				else
-					abc_args += " -lut 4:7";
-				if (dff)
-					abc_args += " -dff";
-				run("abc" + abc_args);
-			}
-			run("clean");
-		}
-
-		if (check_label("map_cells"))
-		{
-			if (help_mode)
-				run("techmap -map +/ecp5/cells_map.v", "(skip if -vpr)");
-			else if (!vpr)
-				run("techmap -map +/ecp5/cells_map.v");
-			run("opt_lut_ins -tech lattice");
-			run("clean");
-		}
-
-		if (check_label("check"))
-		{
-			run("autoname");
-			run("hierarchy -check");
-			run("stat");
-			run("check -noinit");
-			run("blackbox =A:whitebox");
-		}
-
-		if (check_label("blif"))
-		{
-			if (!blif_file.empty() || help_mode) {
-				if (vpr || help_mode) {
-					run(stringf("opt_clean -purge"),
-							"                                 (vpr mode)");
-					run(stringf("write_blif -attr -cname -conn -param %s",
-							help_mode ? "<file-name>" : blif_file.c_str()),
-							" (vpr mode)");
-				}
-				if (!vpr)
-					run(stringf("write_blif -gates -attr -param %s",
-							help_mode ? "<file-name>" : blif_file.c_str()),
-							"       (non-vpr mode)");
-			}
-		}
-
-		if (check_label("edif"))
-		{
-			if (!edif_file.empty() || help_mode)
-				run(stringf("write_edif %s", help_mode ? "<file-name>" : edif_file));
-		}
-
-		if (check_label("json"))
-		{
-			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
-		}
-	}
-} SynthEcp5Pass;
-
-PRIVATE_NAMESPACE_END
diff --git a/techlibs/lattice/common_sim.vh b/techlibs/lattice/common_sim.vh
index 2f8e1db1a..fe479cc5a 100644
--- a/techlibs/lattice/common_sim.vh
+++ b/techlibs/lattice/common_sim.vh
@@ -324,7 +324,7 @@ module TRELLIS_IO(
 );
 	parameter DIR = "INPUT";
 	reg T_pd;
-	always @(*) if (T === 1'bz) T_pd <= 1'b0; else T_pd <= T;
+	always @(*) if (T === 1'bz) T_pd = 1'b0; else T_pd = T;
 
 	generate
 		if (DIR == "INPUT") begin

From 4a7f94f1c16cc70fdc1b47b95c9735002f1a22fe Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 28 Aug 2023 16:50:25 +0200
Subject: [PATCH 626/931] Enable synth_ecp5 wrapper and copy sim files for
 backwards compatibility

---
 Makefile                          | 7 +++++++
 techlibs/lattice/Makefile.inc     | 8 ++++++++
 techlibs/lattice/synth_lattice.cc | 2 --
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 02f8fa0e9..6a0c1d058 100644
--- a/Makefile
+++ b/Makefile
@@ -561,6 +561,13 @@ $(subst //,/,$(1)/$(notdir $(2))): $(2)
 	$$(Q) cp "$(YOSYS_SRC)"/$(2) $(subst //,/,$(1)/$(notdir $(2)))
 endef
 
+define add_share_file_and_rename
+EXTRA_TARGETS += $(subst //,/,$(1)/$(3))
+$(subst //,/,$(1)/$(3)): $(2)
+	$$(P) mkdir -p $(1)
+	$$(Q) cp "$(YOSYS_SRC)"/$(2) $(subst //,/,$(1)/$(3))
+endef
+
 define add_gen_share_file
 EXTRA_TARGETS += $(subst //,/,$(1)/$(notdir $(2)))
 $(subst //,/,$(1)/$(notdir $(2))): $(2)
diff --git a/techlibs/lattice/Makefile.inc b/techlibs/lattice/Makefile.inc
index fd9ec2ed5..7cb034f4e 100644
--- a/techlibs/lattice/Makefile.inc
+++ b/techlibs/lattice/Makefile.inc
@@ -26,3 +26,11 @@ $(eval $(call add_share_file,share/lattice,techlibs/lattice/arith_map_ccu2c.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/arith_map_ccu2d.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/latches_map.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/dsp_map_18x18.v))
+
+
+$(eval $(call add_share_file,share/ecp5,techlibs/lattice/cells_ff.vh))
+$(eval $(call add_share_file,share/ecp5,techlibs/lattice/cells_io.vh))
+$(eval $(call add_share_file,share/ecp5,techlibs/lattice/common_sim.vh))
+$(eval $(call add_share_file,share/ecp5,techlibs/lattice/ccu2c_sim.vh))
+$(eval $(call add_share_file_and_rename,share/ecp5,techlibs/lattice/cells_sim_ecp5.v,cells_sim.v))
+$(eval $(call add_share_file_and_rename,share/ecp5,techlibs/lattice/cells_bb_ecp5.v,cells_bb.v))
diff --git a/techlibs/lattice/synth_lattice.cc b/techlibs/lattice/synth_lattice.cc
index b13c22518..f08970118 100644
--- a/techlibs/lattice/synth_lattice.cc
+++ b/techlibs/lattice/synth_lattice.cc
@@ -500,7 +500,6 @@ struct SynthLatticePass : public ScriptPass
 	}
 } SynthLatticePass;
 
-/*
 struct SynthEcp5Pass : public Pass
 {
 	SynthEcp5Pass() : Pass("synth_ecp5", "synthesis for ECP5 FPGAs") { }
@@ -515,6 +514,5 @@ struct SynthEcp5Pass : public Pass
 		Pass::call(design, args);
 	}
 } SynthEcp5Pass;
-*/
 
 PRIVATE_NAMESPACE_END

From 47a2215fe03663b955cd4337d5bfa2dfac51deab Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 29 Aug 2023 12:32:19 +0200
Subject: [PATCH 627/931] Update filenames and location for test script

---
 techlibs/lattice/tests/test_diamond_ffs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/techlibs/lattice/tests/test_diamond_ffs.py b/techlibs/lattice/tests/test_diamond_ffs.py
index 1ed85ce8b..8243b55da 100644
--- a/techlibs/lattice/tests/test_diamond_ffs.py
+++ b/techlibs/lattice/tests/test_diamond_ffs.py
@@ -77,6 +77,6 @@ end
 	print("    endtask", file=f)
 	print("endmodule", file=f)
 
-diamond_models = "/usr/local/diamond/3.10_x64/cae_library/simulation/verilog/ecp5u"
-subprocess.call(["iverilog", "-s", "testbench", "-o", "work_ff/testbench", "-Dmixed_hdl", "-DNO_INCLUDES", "-y", diamond_models, "work_ff/cells_ff_gate.v", "../cells_sim.v", "work_ff/testbench.v"])
+diamond_models = "/usr/local/diamond/3.12/cae_library/simulation/verilog/ecp5u"
+subprocess.call(["iverilog", "-s", "testbench", "-o", "work_ff/testbench", "-Dmixed_hdl", "-DNO_INCLUDES", "-I..", "-y", diamond_models, "work_ff/cells_ff_gate.v", "../cells_sim_ecp5.v", "work_ff/testbench.v"])
 subprocess.call(["vvp", "work_ff/testbench"])

From faf82a5ff5cadefc79c1ca7c6811f2ebbccba0af Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 29 Aug 2023 13:12:44 +0200
Subject: [PATCH 628/931] Add help message for synth_ecp5

---
 techlibs/lattice/synth_lattice.cc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/techlibs/lattice/synth_lattice.cc b/techlibs/lattice/synth_lattice.cc
index f08970118..15524608b 100644
--- a/techlibs/lattice/synth_lattice.cc
+++ b/techlibs/lattice/synth_lattice.cc
@@ -504,6 +504,18 @@ struct SynthEcp5Pass : public Pass
 {
 	SynthEcp5Pass() : Pass("synth_ecp5", "synthesis for ECP5 FPGAs") { }
 
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    synth_ecp5 [options]\n");
+		log("\n");
+		log("This command runs synthesis for ECP5 FPGAs.\n");
+		log("\n");
+		log("This is wrapper pass, for details take a look at help message for synth_lattice.\n");
+		log("\n");
+	}
+
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		args[0] = "synth_lattice";

From 4b9e4bfae92d43c0c9392d9601aa84d0894c7381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miodrag=20Milanovi=C4=87?= <mmicko@gmail.com>
Date: Mon, 13 Nov 2023 17:06:39 +0100
Subject: [PATCH 629/931] Update techlibs/lattice/synth_lattice.cc

Co-authored-by: Lofty <dan.ravensloft@gmail.com>
---
 techlibs/lattice/synth_lattice.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/techlibs/lattice/synth_lattice.cc b/techlibs/lattice/synth_lattice.cc
index 15524608b..15ab686a6 100644
--- a/techlibs/lattice/synth_lattice.cc
+++ b/techlibs/lattice/synth_lattice.cc
@@ -512,7 +512,7 @@ struct SynthEcp5Pass : public Pass
 		log("\n");
 		log("This command runs synthesis for ECP5 FPGAs.\n");
 		log("\n");
-		log("This is wrapper pass, for details take a look at help message for synth_lattice.\n");
+		log("This is a wrapper pass, for details take a look at help message for synth_lattice.\n");
 		log("\n");
 	}
 

From 58f9531bfbcd7ee643f0ae954fecdaac3f461734 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 14 Nov 2023 12:23:53 +0100
Subject: [PATCH 630/931] enable ABC9 by default except for XO2/3/3D

---
 techlibs/lattice/synth_lattice.cc | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/techlibs/lattice/synth_lattice.cc b/techlibs/lattice/synth_lattice.cc
index 15ab686a6..8edd9096e 100644
--- a/techlibs/lattice/synth_lattice.cc
+++ b/techlibs/lattice/synth_lattice.cc
@@ -113,8 +113,8 @@ struct SynthLatticePass : public ScriptPass
 		log("    -abc2\n");
 		log("        run two passes of 'abc' for slightly improved logic density\n");
 		log("\n");
-		log("    -abc9\n");
-		log("        use new ABC9 flow (EXPERIMENTAL)\n");
+		log("    -noabc9\n");
+		log("        disable use of new ABC9 flow\n");
 		log("\n");
 		log("    -iopad\n");
 		log("        insert IO buffers\n");
@@ -158,7 +158,7 @@ struct SynthLatticePass : public ScriptPass
 		dff = false;
 		retime = false;
 		abc2 = false;
-		abc9 = false;
+		abc9 = true;
 		iopad = false;
 		nodsp = false;
 		no_rw_check = false;
@@ -173,6 +173,7 @@ struct SynthLatticePass : public ScriptPass
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		string run_from, run_to;
+		bool force_abc9 = false;
 		bool force_widelut = false;
 		clear_flags();
 
@@ -254,7 +255,13 @@ struct SynthLatticePass : public ScriptPass
 				continue;
 			}
 			if (args[argidx] == "-abc9") {
-				abc9 = true;
+				// removed, ABC9 is on by default.
+				force_abc9 = true;
+				continue;
+			}
+			if (args[argidx] == "-noabc9") {
+				force_abc9 = true;
+				abc9 = false;
 				continue;
 			}
 			if (args[argidx] == "-iopad") {
@@ -295,6 +302,7 @@ struct SynthLatticePass : public ScriptPass
 			brams_map = "_8kc";
 			have_dsp = false;
 			if (!force_widelut) nowidelut = true;
+			if (!force_abc9) abc9 = false;
 /*		} else if (family == "xo" ||
 				family == "pm") {
 		} else if (family == "xp" ||

From fef6bdae6cda277a022381c2f325ba374a94f377 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 26 Sep 2025 11:05:50 +1200
Subject: [PATCH 631/931] autoname.cc: Return number of renames

Was previously the number of proposed renames, but since renames can be skipped this causes the final count to differ from the number of actually renamed objects.
Check counts in `tests/various/autoname.ys`.
---
 passes/cmds/autoname.cc   | 5 ++++-
 tests/various/autoname.ys | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/passes/cmds/autoname.cc b/passes/cmds/autoname.cc
index d2ff568c3..1ad2eab3c 100644
--- a/passes/cmds/autoname.cc
+++ b/passes/cmds/autoname.cc
@@ -81,6 +81,7 @@ int autoname_worker(Module *module, const dict<Wire*, unsigned int>& wire_score)
 		}
 	}
 
+	int count = 0;
 	// compare against double best score for following comparisons so we don't
 	// pre-empt a future iteration
 	best_name.score *= 2;
@@ -91,6 +92,7 @@ int autoname_worker(Module *module, const dict<Wire*, unsigned int>& wire_score)
 		IdString n = module->uniquify(IdString(it.second.name));
 		log_debug("Rename cell %s in %s to %s.\n", log_id(it.first), log_id(module), log_id(n));
 		module->rename(it.first, n);
+		count++;
 	}
 
 	for (auto &it : proposed_wire_names) {
@@ -99,9 +101,10 @@ int autoname_worker(Module *module, const dict<Wire*, unsigned int>& wire_score)
 		IdString n = module->uniquify(IdString(it.second.name));
 		log_debug("Rename wire %s in %s to %s.\n", log_id(it.first), log_id(module), log_id(n));
 		module->rename(it.first, n);
+		count++;
 	}
 
-	return proposed_cell_names.size() + proposed_wire_names.size();
+	return count;
 }
 
 struct AutonamePass : public Pass {
diff --git a/tests/various/autoname.ys b/tests/various/autoname.ys
index 29ca81bbe..fccecb1c2 100644
--- a/tests/various/autoname.ys
+++ b/tests/various/autoname.ys
@@ -18,6 +18,7 @@ module \top
 end
 EOT
 logger -expect log "Rename cell .name in top to y_.and_Y" 1
+logger -expect log "Renamed 1 objects" 1
 debug autoname
 logger -check-expected
 
@@ -42,6 +43,7 @@ module \top
 end
 EOT
 logger -expect log "Rename cell .name in top to ab_.or_A" 1
+logger -expect log "Renamed 1 objects" 1
 debug autoname
 logger -check-expected
 
@@ -78,6 +80,7 @@ end
 EOT
 logger -expect log "Rename cell .name in top to bcd_.and_B" 1
 logger -expect log "Rename cell .name2 in top to c_has_a_long_name_.or_B" 1
+logger -expect log "Renamed 2 objects" 1
 debug autoname
 logger -check-expected
 
@@ -113,6 +116,7 @@ end
 EOT
 logger -expect log "Rename cell .name in top to y_.and_Y" 1
 logger -expect log "Rename cell .name2 in top to y_.and_Y_1" 1
+logger -expect log "Renamed 2 objects" 1
 debug autoname
 logger -check-expected
 
@@ -174,6 +178,7 @@ EOT
 # wires are named for being cell outputs
 logger -expect log "Rename wire .d in top to or_Y" 1
 logger -expect log "Rename cell .name2 in top to or_Y_.or_B" 1
+logger -expect log "Renamed 2 objects" 1
 debug autoname t:$or
 logger -check-expected
 
@@ -186,5 +191,6 @@ logger -expect log "Rename cell .name3 in top to or_Y_.or_B_Y_.and_B" 1
 # $c gets shortest name, since the cell driving it doesn't have known port
 # directions
 logger -expect log "Rename wire .c in top to or_Y_.or_B_A" 1
+logger -expect log "Renamed 4 objects" 1
 debug autoname
 logger -check-expected

From 941ba3b7454a2f2ccaf8fdf70489e5c3f4136195 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 26 Sep 2025 11:27:17 +1200
Subject: [PATCH 632/931] autoname.ys: Extra check for rename order

Disabling comparison with best score will cause this check to fail.  Preferred names will not be possible if $name2 has not yet been renamed.
---
 tests/various/autoname.ys | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tests/various/autoname.ys b/tests/various/autoname.ys
index fccecb1c2..7df1571b2 100644
--- a/tests/various/autoname.ys
+++ b/tests/various/autoname.ys
@@ -175,6 +175,8 @@ module \top
   end
 end
 EOT
+design -save order_test
+
 # wires are named for being cell outputs
 logger -expect log "Rename wire .d in top to or_Y" 1
 logger -expect log "Rename cell .name2 in top to or_Y_.or_B" 1
@@ -186,11 +188,18 @@ logger -check-expected
 logger -expect log "Rename cell .name in top to a_.__unknown_A" 1
 # another output wire
 logger -expect log "Rename wire .e in top to or_Y_.or_B_Y" 1
-# $name3 named for lowest fanout wire (otherwise a_$__unknown_A_Y_$and_A)
-logger -expect log "Rename cell .name3 in top to or_Y_.or_B_Y_.and_B" 1
-# $c gets shortest name, since the cell driving it doesn't have known port
-# directions
-logger -expect log "Rename wire .c in top to or_Y_.or_B_A" 1
 logger -expect log "Renamed 4 objects" 1
 debug autoname
 logger -check-expected
+
+# don't rename prematurely (some objects should be named after $name2)
+design -load order_test
+
+# $c gets shortest name, since the cell driving it doesn't have known port
+# directions (otherwise a_$__unknown_A_Y)
+logger -expect log "Rename wire .c in top to or_Y_.or_B_A" 1
+# $name3 named for lowest fanout wire (otherwise a_$__unknown_A_Y_$and_A)
+logger -expect log "Rename cell .name3 in top to or_Y_.or_B_Y_.and_B" 1
+logger -expect log "Renamed 6 objects" 1
+debug autoname
+logger -check-expected

From 6a5d9567472363019065410d05f47bc6169c8598 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 26 Sep 2025 00:22:24 +0000
Subject: [PATCH 633/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 45b3a09f3..7a2e8419b 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+212
+YOSYS_VER := 0.57+218
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From ce5d04a42f865bc45612260d16ec994f20b626ad Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Fri, 26 Sep 2025 18:39:32 +0200
Subject: [PATCH 634/931] hierarchy: Suggest more specific command to skip
 unsupported SVA

---
 passes/hierarchy/hierarchy.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/hierarchy/hierarchy.cc b/passes/hierarchy/hierarchy.cc
index b3edcef94..ea68add18 100644
--- a/passes/hierarchy/hierarchy.cc
+++ b/passes/hierarchy/hierarchy.cc
@@ -1162,7 +1162,7 @@ struct HierarchyPass : public Pass {
 					if (!src.empty())
 						src += ": ";
 
-					log_error("%sProperty `%s' in module `%s' uses unsupported SVA constructs. See frontend warnings for details, run `delete */a:unsupported_sva' to ignore.\n",
+					log_error("%sProperty `%s' in module `%s' uses unsupported SVA constructs. See frontend warnings for details, run `chformal -remove a:unsupported_sva' to ignore.\n",
 						src, log_id(cell->name), log_id(mod->name));
 				}
 			}

From 714603bf69e68273b005bc868f30d05c1740ccb0 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 31 Aug 2023 13:17:21 +0200
Subject: [PATCH 635/931] synth_nexus to synth_lattice

---
 techlibs/lattice/Makefile.inc                 |  22 +-
 .../arith_map.v => lattice/arith_map_nexus.v} |   0
 .../brams_map.v => lattice/brams_map_nexus.v} |   0
 .../brams.txt => lattice/brams_nexus.txt}     |   0
 .../cells_xtra.v => lattice/cells_bb_nexus.v} |   0
 .../cells_map.v => lattice/cells_map_nexus.v} |   0
 .../{cells_map.v => cells_map_trellis.v}      |   0
 .../cells_sim.v => lattice/cells_sim_nexus.v} |   0
 .../cells_xtra_nexus.py}                      |   4 +-
 .../dsp_map.v => lattice/dsp_map_nexus.v}     |   0
 .../lrams_map.v => lattice/lrams_map_nexus.v} |   0
 .../lrams.txt => lattice/lrams_nexus.txt}     |   0
 .../lutrams_map_nexus.v}                      |   0
 .../{lutrams_map.v => lutrams_map_trellis.v}  |   0
 .../lutrams.txt => lattice/lutrams_nexus.txt} |   0
 .../{lutrams.txt => lutrams_trellis.txt}      |   0
 techlibs/{nexus => lattice}/parse_init.vh     |   0
 techlibs/lattice/synth_lattice.cc             | 163 +++++--
 techlibs/nexus/Makefile.inc                   |  16 -
 techlibs/nexus/latches_map.v                  |  11 -
 techlibs/nexus/synth_nexus.cc                 | 419 ------------------
 21 files changed, 158 insertions(+), 477 deletions(-)
 rename techlibs/{nexus/arith_map.v => lattice/arith_map_nexus.v} (100%)
 rename techlibs/{nexus/brams_map.v => lattice/brams_map_nexus.v} (100%)
 rename techlibs/{nexus/brams.txt => lattice/brams_nexus.txt} (100%)
 rename techlibs/{nexus/cells_xtra.v => lattice/cells_bb_nexus.v} (100%)
 rename techlibs/{nexus/cells_map.v => lattice/cells_map_nexus.v} (100%)
 rename techlibs/lattice/{cells_map.v => cells_map_trellis.v} (100%)
 rename techlibs/{nexus/cells_sim.v => lattice/cells_sim_nexus.v} (100%)
 rename techlibs/{nexus/cells_xtra.py => lattice/cells_xtra_nexus.py} (98%)
 rename techlibs/{nexus/dsp_map.v => lattice/dsp_map_nexus.v} (100%)
 rename techlibs/{nexus/lrams_map.v => lattice/lrams_map_nexus.v} (100%)
 rename techlibs/{nexus/lrams.txt => lattice/lrams_nexus.txt} (100%)
 rename techlibs/{nexus/lutrams_map.v => lattice/lutrams_map_nexus.v} (100%)
 rename techlibs/lattice/{lutrams_map.v => lutrams_map_trellis.v} (100%)
 rename techlibs/{nexus/lutrams.txt => lattice/lutrams_nexus.txt} (100%)
 rename techlibs/lattice/{lutrams.txt => lutrams_trellis.txt} (100%)
 rename techlibs/{nexus => lattice}/parse_init.vh (100%)
 delete mode 100644 techlibs/nexus/Makefile.inc
 delete mode 100644 techlibs/nexus/latches_map.v
 delete mode 100644 techlibs/nexus/synth_nexus.cc

diff --git a/techlibs/lattice/Makefile.inc b/techlibs/lattice/Makefile.inc
index 7cb034f4e..9084472cf 100644
--- a/techlibs/lattice/Makefile.inc
+++ b/techlibs/lattice/Makefile.inc
@@ -4,28 +4,40 @@ OBJS += techlibs/lattice/lattice_gsr.o
 
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_ff.vh))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_io.vh))
-$(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_map.v))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_map_trellis.v))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_map_nexus.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/common_sim.vh))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/parse_init.vh))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/ccu2d_sim.vh))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/ccu2c_sim.vh))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_sim_ecp5.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_sim_xo2.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_sim_xo3.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_sim_xo3d.v))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_sim_nexus.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_bb_ecp5.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_bb_xo2.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_bb_xo3.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_bb_xo3d.v))
-$(eval $(call add_share_file,share/lattice,techlibs/lattice/lutrams_map.v))
-$(eval $(call add_share_file,share/lattice,techlibs/lattice/lutrams.txt))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/cells_bb_nexus.v))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/lutrams_map_trellis.v))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/lutrams_trellis.txt))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/lutrams_map_nexus.v))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/lutrams_nexus.txt))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/lrams_map_nexus.v))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/lrams_nexus.txt))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/brams_map_16kd.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/brams_16kd.txt))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/brams_map_8kc.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/brams_8kc.txt))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/brams_map_nexus.v))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/brams_nexus.txt))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/arith_map_ccu2c.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/arith_map_ccu2d.v))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/arith_map_nexus.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/latches_map.v))
 $(eval $(call add_share_file,share/lattice,techlibs/lattice/dsp_map_18x18.v))
+$(eval $(call add_share_file,share/lattice,techlibs/lattice/dsp_map_nexus.v))
 
 
 $(eval $(call add_share_file,share/ecp5,techlibs/lattice/cells_ff.vh))
@@ -34,3 +46,7 @@ $(eval $(call add_share_file,share/ecp5,techlibs/lattice/common_sim.vh))
 $(eval $(call add_share_file,share/ecp5,techlibs/lattice/ccu2c_sim.vh))
 $(eval $(call add_share_file_and_rename,share/ecp5,techlibs/lattice/cells_sim_ecp5.v,cells_sim.v))
 $(eval $(call add_share_file_and_rename,share/ecp5,techlibs/lattice/cells_bb_ecp5.v,cells_bb.v))
+
+$(eval $(call add_share_file,share/nexus,techlibs/lattice/parse_init.vh))
+$(eval $(call add_share_file_and_rename,share/nexus,techlibs/lattice/cells_sim_nexus.v,cells_sim.v))
+$(eval $(call add_share_file_and_rename,share/nexus,techlibs/lattice/cells_bb_nexus.v,cells_xtra.v))
diff --git a/techlibs/nexus/arith_map.v b/techlibs/lattice/arith_map_nexus.v
similarity index 100%
rename from techlibs/nexus/arith_map.v
rename to techlibs/lattice/arith_map_nexus.v
diff --git a/techlibs/nexus/brams_map.v b/techlibs/lattice/brams_map_nexus.v
similarity index 100%
rename from techlibs/nexus/brams_map.v
rename to techlibs/lattice/brams_map_nexus.v
diff --git a/techlibs/nexus/brams.txt b/techlibs/lattice/brams_nexus.txt
similarity index 100%
rename from techlibs/nexus/brams.txt
rename to techlibs/lattice/brams_nexus.txt
diff --git a/techlibs/nexus/cells_xtra.v b/techlibs/lattice/cells_bb_nexus.v
similarity index 100%
rename from techlibs/nexus/cells_xtra.v
rename to techlibs/lattice/cells_bb_nexus.v
diff --git a/techlibs/nexus/cells_map.v b/techlibs/lattice/cells_map_nexus.v
similarity index 100%
rename from techlibs/nexus/cells_map.v
rename to techlibs/lattice/cells_map_nexus.v
diff --git a/techlibs/lattice/cells_map.v b/techlibs/lattice/cells_map_trellis.v
similarity index 100%
rename from techlibs/lattice/cells_map.v
rename to techlibs/lattice/cells_map_trellis.v
diff --git a/techlibs/nexus/cells_sim.v b/techlibs/lattice/cells_sim_nexus.v
similarity index 100%
rename from techlibs/nexus/cells_sim.v
rename to techlibs/lattice/cells_sim_nexus.v
diff --git a/techlibs/nexus/cells_xtra.py b/techlibs/lattice/cells_xtra_nexus.py
similarity index 98%
rename from techlibs/nexus/cells_xtra.py
rename to techlibs/lattice/cells_xtra_nexus.py
index 6ced76950..c7be64cef 100644
--- a/techlibs/nexus/cells_xtra.py
+++ b/techlibs/lattice/cells_xtra_nexus.py
@@ -280,7 +280,7 @@ if __name__ == '__main__':
     for device, cells in devices:
         xtract_cells_decl(device, cells, dirs, out)
 
-    with open('cells_xtra.v', 'w') as f:
-        f.write('// Created by cells_xtra.py from Lattice models\n')
+    with open('cells_bb_nexus.v', 'w') as f:
+        f.write('// Created by cells_xtra_nexus.py from Lattice models\n')
         f.write('\n')
         f.write(out.getvalue())
diff --git a/techlibs/nexus/dsp_map.v b/techlibs/lattice/dsp_map_nexus.v
similarity index 100%
rename from techlibs/nexus/dsp_map.v
rename to techlibs/lattice/dsp_map_nexus.v
diff --git a/techlibs/nexus/lrams_map.v b/techlibs/lattice/lrams_map_nexus.v
similarity index 100%
rename from techlibs/nexus/lrams_map.v
rename to techlibs/lattice/lrams_map_nexus.v
diff --git a/techlibs/nexus/lrams.txt b/techlibs/lattice/lrams_nexus.txt
similarity index 100%
rename from techlibs/nexus/lrams.txt
rename to techlibs/lattice/lrams_nexus.txt
diff --git a/techlibs/nexus/lutrams_map.v b/techlibs/lattice/lutrams_map_nexus.v
similarity index 100%
rename from techlibs/nexus/lutrams_map.v
rename to techlibs/lattice/lutrams_map_nexus.v
diff --git a/techlibs/lattice/lutrams_map.v b/techlibs/lattice/lutrams_map_trellis.v
similarity index 100%
rename from techlibs/lattice/lutrams_map.v
rename to techlibs/lattice/lutrams_map_trellis.v
diff --git a/techlibs/nexus/lutrams.txt b/techlibs/lattice/lutrams_nexus.txt
similarity index 100%
rename from techlibs/nexus/lutrams.txt
rename to techlibs/lattice/lutrams_nexus.txt
diff --git a/techlibs/lattice/lutrams.txt b/techlibs/lattice/lutrams_trellis.txt
similarity index 100%
rename from techlibs/lattice/lutrams.txt
rename to techlibs/lattice/lutrams_trellis.txt
diff --git a/techlibs/nexus/parse_init.vh b/techlibs/lattice/parse_init.vh
similarity index 100%
rename from techlibs/nexus/parse_init.vh
rename to techlibs/lattice/parse_init.vh
diff --git a/techlibs/lattice/synth_lattice.cc b/techlibs/lattice/synth_lattice.cc
index 8edd9096e..744beb650 100644
--- a/techlibs/lattice/synth_lattice.cc
+++ b/techlibs/lattice/synth_lattice.cc
@@ -35,13 +35,32 @@ struct SynthLatticePass : public ScriptPass
 		RTLIL::constpad["synth_lattice.abc9.W"] = "300";
 	}
 
+	struct DSPRule {
+		int a_maxwidth;
+		int b_maxwidth;
+		int a_minwidth;
+		int b_minwidth;
+		std::string prim;
+	};
+
+	const std::vector<DSPRule> dsp_rules_nexus = {
+		{36, 36, 22, 22, "$__NX_MUL36X36"},
+		{36, 18, 22, 10, "$__NX_MUL36X18"},
+		{18, 18, 10,  4, "$__NX_MUL18X18"},
+		{18, 18,  4, 10, "$__NX_MUL18X18"},
+		{ 9,  9,  4,  4, "$__NX_MUL9X9"},
+	};
+	const std::vector<DSPRule> dsp_rules_ecp5 = {
+		{18, 18,  2,  2, "$__MUL18X18"},
+	};
+
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
 		log("    synth_lattice [options]\n");
 		log("\n");
-		log("This command runs synthesis for Lattice FPGAs (excluding iCE40 and Nexus).\n");
+		log("This command runs synthesis for Lattice FPGAs (excluding iCE40).\n");
 		log("\n");
 		log("    -top <module>\n");
 		log("        use the specified module as top module\n");
@@ -54,6 +73,8 @@ struct SynthLatticePass : public ScriptPass
 		log("        - xo2: MachXO2\n");
 		log("        - xo3: MachXO3L/LF\n");
 		log("        - xo3d: MachXO3D\n");
+		log("        - lifcl: CrossLink-NX\n");
+		log("        - lfd2nx: Certus-NX\n");
 		//log("        - xo: MachXO (EXPERIMENTAL)\n");
 		//log("        - pm: Platform Manager (EXPERIMENTAL)\n");
 		//log("        - pm2: Platform Manager 2 (EXPERIMENTAL)\n");
@@ -118,9 +139,13 @@ struct SynthLatticePass : public ScriptPass
 		log("\n");
 		log("    -iopad\n");
 		log("        insert IO buffers\n");
+		log("        (by default enabled on Nexus FPGAs)\n");
+		log("\n");
+		log("    -noiopad\n");
+		log("        do not insert IO buffers\n");
 		log("\n");
 		log("    -nodsp\n");
-		log("        do not map multipliers to MULT18X18D\n");
+		log("        do not infer DSP multipliers\n");
 		log("\n");
 		log("    -no-rw-check\n");
 		log("        marks all recognized read ports as \"return don't-care value on\n");
@@ -140,7 +165,9 @@ struct SynthLatticePass : public ScriptPass
 	string top_opt, edif_file, json_file, family;
 	bool noccu2, nodffe, nobram, nolutram, nowidelut, asyncprld, flatten, dff, retime, abc2, abc9, iopad, nodsp, no_rw_check, have_dsp;
 	bool cmp2softlogic;
-	string postfix, arith_map, brams_map, dsp_map;
+	string postfix, arith_map, brams_map, dsp_map, cells_map, map_ram_default, widelut_abc;
+	bool is_nexus;
+	std::vector<DSPRule> dsp_rules;
 
 	void clear_flags() override
 	{
@@ -168,6 +195,10 @@ struct SynthLatticePass : public ScriptPass
 		dsp_map = "";
 		have_dsp = false;
 		cmp2softlogic = false;
+		is_nexus = false;
+		map_ram_default = "";
+		cells_map = "";
+		widelut_abc = "4:7";
 	}
 
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
@@ -175,6 +206,7 @@ struct SynthLatticePass : public ScriptPass
 		string run_from, run_to;
 		bool force_abc9 = false;
 		bool force_widelut = false;
+		bool force_iopad = false;
 		clear_flags();
 
 		size_t argidx;
@@ -266,6 +298,12 @@ struct SynthLatticePass : public ScriptPass
 			}
 			if (args[argidx] == "-iopad") {
 				iopad = true;
+				force_iopad = true;
+				continue;
+			}
+			if (args[argidx] == "-noiopad") {
+				iopad = false;
+				force_iopad = true;
 				continue;
 			}
 			if (args[argidx] == "-nodsp") {
@@ -292,7 +330,9 @@ struct SynthLatticePass : public ScriptPass
 			arith_map = "_ccu2c";
 			brams_map = "_16kd";
 			dsp_map = "_18x18";
+			dsp_rules = dsp_rules_ecp5;
 			have_dsp = true;
+			cells_map = "_trellis";
 		} else if (family == "xo2" ||
 				family == "xo3" ||
 				family == "xo3d" /* ||
@@ -300,9 +340,24 @@ struct SynthLatticePass : public ScriptPass
 			postfix = "_" + family;
 			arith_map = "_ccu2d";
 			brams_map = "_8kc";
+			cells_map = "_trellis";
 			have_dsp = false;
 			if (!force_widelut) nowidelut = true;
 			if (!force_abc9) abc9 = false;
+		} else if (family == "lifcl" ||
+			family == "lfd2nx") {
+			is_nexus = true;
+			postfix = "_nexus";
+			arith_map = "_nexus";
+			brams_map = "_nexus";
+			dsp_map = "_nexus";
+			dsp_rules = dsp_rules_nexus;
+			have_dsp = true;
+			map_ram_default = " -no-auto-huge";
+			cells_map = "_nexus";
+			widelut_abc = "4:5";
+			if (!force_iopad) iopad = true;
+			if (!force_abc9) abc9 = false;
 /*		} else if (family == "xo" ||
 				family == "pm") {
 		} else if (family == "xp" ||
@@ -366,9 +421,17 @@ struct SynthLatticePass : public ScriptPass
 			run("techmap -map +/cmp2lut.v -D LUT_WIDTH=4");
 			run("opt_expr");
 			run("opt_clean");
-			if (have_dsp && !nodsp) {
-				run("techmap -map +/mul2dsp.v -map +/lattice/dsp_map" + dsp_map + ".v -D DSP_A_MAXWIDTH=18 -D DSP_B_MAXWIDTH=18  -D DSP_A_MINWIDTH=2 -D DSP_B_MINWIDTH=2  -D DSP_NAME=$__MUL18X18", "(unless -nodsp)");
-				run("chtype -set $mul t:$__soft_mul", "(unless -nodsp)");
+
+			if (help_mode) {
+				run("techmap -map +/mul2dsp.v [...]", "(unless -nodsp)");
+				run("techmap -map +/lattice/dsp_map" + dsp_map + ".v", "(unless -nodsp)");
+			} else if (have_dsp && !nodsp) {
+				for (const auto &rule : dsp_rules) {
+					run(stringf("techmap -map +/mul2dsp.v -D DSP_A_MAXWIDTH=%d -D DSP_B_MAXWIDTH=%d -D DSP_A_MINWIDTH=%d -D DSP_B_MINWIDTH=%d -D DSP_NAME=%s",
+						rule.a_maxwidth, rule.b_maxwidth, rule.a_minwidth, rule.b_minwidth, rule.prim));
+					run("chtype -set $mul t:$__soft_mul");
+				}
+				run("techmap -map +/lattice/dsp_map" + dsp_map + ".v");
 			}
 			if (family == "xo3" || help_mode)
 				run("booth", "(only if '-family xo3')");
@@ -380,7 +443,7 @@ struct SynthLatticePass : public ScriptPass
 
 		if (check_label("map_ram"))
 		{
-			std::string args = "";
+			std::string args = map_ram_default;
 			if (help_mode)
 				args += " [-no-auto-block] [-no-auto-distributed]";
 			else {
@@ -389,8 +452,13 @@ struct SynthLatticePass : public ScriptPass
 				if (nolutram)
 					args += " -no-auto-distributed";
 			}
-			run("memory_libmap -lib +/lattice/lutrams.txt -lib +/lattice/brams" + brams_map + ".txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
-			run("techmap -map +/lattice/lutrams_map.v -map +/lattice/brams_map" + brams_map + ".v");
+			if (!is_nexus) {
+				run("memory_libmap -lib +/lattice/lutrams" + cells_map + ".txt -lib +/lattice/brams" + brams_map + ".txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
+				run("techmap -map +/lattice/lutrams_map" + cells_map + ".v -map +/lattice/brams_map" + brams_map + ".v");
+			} else {
+				run("memory_libmap -lib +/lattice/lutrams" + cells_map + ".txt -lib +/lattice/brams" + brams_map + ".txt -lib +/lattice/lrams_nexus.txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
+				run("techmap -map +/lattice/lutrams_map" + cells_map + ".v -map +/lattice/brams_map" + brams_map + ".v -map +/lattice/lrams_map_nexus.v");
+			}
 		}
 
 		if (check_label("map_ffram"))
@@ -419,27 +487,37 @@ struct SynthLatticePass : public ScriptPass
 		if (check_label("map_ffs"))
 		{
 			run("opt_clean");
-			std::string dfflegalize_args = " -cell $_DFF_?_ 01 -cell $_DFF_?P?_ r -cell $_SDFF_?P?_ r";
-			if (help_mode) {
-				dfflegalize_args += " [-cell $_DFFE_??_ 01 -cell $_DFFE_?P??_ r -cell $_SDFFE_?P??_ r]";
-			} else if (!nodffe) {
-				dfflegalize_args += " -cell $_DFFE_??_ 01 -cell $_DFFE_?P??_ r -cell $_SDFFE_?P??_ r";
-			}
-			if (help_mode) {
-				dfflegalize_args += " [-cell $_ALDFF_?P_ x -cell $_ALDFFE_?P?_ x] [-cell $_DLATCH_?_ x]";
-			} else if (asyncprld) {
-				dfflegalize_args += " -cell $_ALDFF_?P_ x -cell $_ALDFFE_?P?_ x";
+			if (!is_nexus) {
+				std::string dfflegalize_args = " -cell $_DFF_?_ 01 -cell $_DFF_?P?_ r -cell $_SDFF_?P?_ r";
+				if (help_mode) {
+					dfflegalize_args += " [-cell $_DFFE_??_ 01 -cell $_DFFE_?P??_ r -cell $_SDFFE_?P??_ r]";
+				} else if (!nodffe) {
+					dfflegalize_args += " -cell $_DFFE_??_ 01 -cell $_DFFE_?P??_ r -cell $_SDFFE_?P??_ r";
+				}
+				if (help_mode) {
+					dfflegalize_args += " [-cell $_ALDFF_?P_ x -cell $_ALDFFE_?P?_ x] [-cell $_DLATCH_?_ x]";
+				} else if (asyncprld) {
+					dfflegalize_args += " -cell $_ALDFF_?P_ x -cell $_ALDFFE_?P?_ x";
+				} else {
+					dfflegalize_args += " -cell $_DLATCH_?_ x";
+				}
+				run("dfflegalize" + dfflegalize_args, "($_ALDFF_*_ only if -asyncprld, $_DLATCH_* only if not -asyncprld, $_*DFFE_* only if not -nodffe)");
 			} else {
-				dfflegalize_args += " -cell $_DLATCH_?_ x";
+				std::string dfflegalize_args = " -cell $_DFF_P_ 01 -cell $_DFF_PP?_ r -cell $_SDFF_PP?_ r -cell $_DLATCH_?_ x";
+				if (help_mode) {
+					dfflegalize_args += " [-cell $_DFFE_PP_ 01 -cell $_DFFE_PP?P_ r -cell $_SDFFE_PP?P_ r]";
+				} else if (!nodffe) {
+					dfflegalize_args += " -cell $_DFFE_PP_ 01 -cell $_DFFE_PP?P_ r -cell $_SDFFE_PP?P_ r";
+				}
+				run("dfflegalize" + dfflegalize_args, "($_*DFFE_* only if not -nodffe)");
 			}
-			run("dfflegalize" + dfflegalize_args, "($_ALDFF_*_ only if -asyncprld, $_DLATCH_* only if not -asyncprld, $_*DFFE_* only if not -nodffe)");
 			run("opt_merge");
 			if ((abc9 && dff) || help_mode)
 				run("zinit -all w:* t:$_DFF_?_ t:$_DFFE_??_ t:$_SDFF*", "(only if -abc9 and -dff)");
-			run("techmap -D NO_LUT -map +/lattice/cells_map.v");
+			run("techmap -D NO_LUT -map +/lattice/cells_map" + cells_map + ".v");
 			run("opt_expr -undriven -mux_undef");
 			run("simplemap");
-			run("lattice_gsr");
+			if (!is_nexus) run("lattice_gsr");
 			run("attrmvcp -copy -attr syn_useioff");
 			run("opt_clean");
 		}
@@ -470,7 +548,7 @@ struct SynthLatticePass : public ScriptPass
 				if (nowidelut)
 					abc_args += " -lut 4";
 				else
-					abc_args += " -lut 4:7";
+					abc_args += " -lut " + widelut_abc;
 				if (dff)
 					abc_args += " -dff";
 				run("abc" + abc_args);
@@ -480,8 +558,14 @@ struct SynthLatticePass : public ScriptPass
 
 		if (check_label("map_cells"))
 		{
-			run("techmap -map +/lattice/cells_map.v");
-			run("opt_lut_ins -tech lattice");
+			run("techmap -map +/lattice/cells_map" + cells_map + ".v");
+			if (is_nexus) {
+				// This is needed for Radiant, but perhaps not optimal for nextpnr...
+				run("setundef -zero");
+				run("hilomap -singleton -hicell VHI Z -locell VLO Z");
+			} else {
+				run("opt_lut_ins -tech lattice");
+			}
 			run("clean");
 		}
 
@@ -508,6 +592,33 @@ struct SynthLatticePass : public ScriptPass
 	}
 } SynthLatticePass;
 
+struct SynthNexusPass : public Pass
+{
+	SynthNexusPass() : Pass("synth_nexus", "synthesis for Nexus FPGAs") { }
+
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    synth_nexus [options]\n");
+		log("\n");
+		log("This command runs synthesis for Nexus FPGAs.\n");
+		log("\n");
+		log("This is a wrapper pass, for details take a look at help message for synth_lattice.\n");
+		log("\n");
+	}
+
+	void execute(std::vector<std::string> args, RTLIL::Design *design) override
+	{
+		args[0] = "synth_lattice";
+		args.insert(args.begin()+1, std::string());
+		args.insert(args.begin()+1, std::string());
+		args[1] = "-family";
+		args[2] = "lifcl";
+		Pass::call(design, args);
+	}
+} SynthNexusPass;
+
 struct SynthEcp5Pass : public Pass
 {
 	SynthEcp5Pass() : Pass("synth_ecp5", "synthesis for ECP5 FPGAs") { }
diff --git a/techlibs/nexus/Makefile.inc b/techlibs/nexus/Makefile.inc
deleted file mode 100644
index 8121d1d8a..000000000
--- a/techlibs/nexus/Makefile.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-OBJS += techlibs/nexus/synth_nexus.o
-
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/cells_map.v))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/cells_sim.v))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/parse_init.vh))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/cells_xtra.v))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/lutrams_map.v))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/lutrams.txt))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/brams_map.v))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/brams.txt))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/lrams_map.v))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/lrams.txt))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/arith_map.v))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/latches_map.v))
-$(eval $(call add_share_file,share/nexus,techlibs/nexus/dsp_map.v))
-
diff --git a/techlibs/nexus/latches_map.v b/techlibs/nexus/latches_map.v
deleted file mode 100644
index c28f88cf7..000000000
--- a/techlibs/nexus/latches_map.v
+++ /dev/null
@@ -1,11 +0,0 @@
-module \$_DLATCH_N_ (E, D, Q);
-  wire [1023:0] _TECHMAP_DO_ = "simplemap; opt";
-  input E, D;
-  output Q = !E ? D : Q;
-endmodule
-
-module \$_DLATCH_P_ (E, D, Q);
-  wire [1023:0] _TECHMAP_DO_ = "simplemap; opt";
-  input E, D;
-  output Q = E ? D : Q;
-endmodule
diff --git a/techlibs/nexus/synth_nexus.cc b/techlibs/nexus/synth_nexus.cc
deleted file mode 100644
index c0df06a21..000000000
--- a/techlibs/nexus/synth_nexus.cc
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- *  yosys -- Yosys Open SYnthesis Suite
- *
- *  Copyright (C) 2020 gatecat <gatecat@ds0.me>
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-#include "kernel/register.h"
-#include "kernel/celltypes.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
-
-USING_YOSYS_NAMESPACE
-PRIVATE_NAMESPACE_BEGIN
-
-struct SynthNexusPass : public ScriptPass
-{
-	SynthNexusPass() : ScriptPass("synth_nexus", "synthesis for Lattice Nexus FPGAs") { }
-
-	void on_register() override
-	{
-		RTLIL::constpad["synth_nexus.abc9.W"] = "300";
-	}
-
-	void help() override
-	{
-		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
-		log("\n");
-		log("    synth_nexus [options]\n");
-		log("\n");
-		log("This command runs synthesis for Lattice Nexus FPGAs.\n");
-		log("\n");
-		log("    -top <module>\n");
-		log("        use the specified module as top module\n");
-		log("\n");
-		log("    -family <device>\n");
-		log("        run synthesis for the specified Nexus device\n");
-		log("        supported values: lifcl, lfd2nx\n");
-		log("\n");
-		log("    -json <file>\n");
-		log("        write the design to the specified JSON file. writing of an output file\n");
-		log("        is omitted if this parameter is not specified.\n");
-		log("\n");
-		log("    -vm <file>\n");
-		log("        write the design to the specified structural Verilog file. writing of\n");
-		log("        an output file is omitted if this parameter is not specified.\n");
-		log("\n");
-		log("    -run <from_label>:<to_label>\n");
-		log("        only run the commands between the labels (see below). an empty\n");
-		log("        from label is synonymous to 'begin', and empty to label is\n");
-		log("        synonymous to the end of the command list.\n");
-		log("\n");
-		log("    -noflatten\n");
-		log("        do not flatten design before synthesis\n");
-		log("\n");
-		log("    -dff\n");
-		log("        run 'abc'/'abc9' with -dff option\n");
-		log("\n");
-		log("    -retime\n");
-		log("        run 'abc' with '-dff -D 1' options\n");
-		log("\n");
-		log("    -noccu2\n");
-		log("        do not use CCU2 cells in output netlist\n");
-		log("\n");
-		log("    -nodffe\n");
-		log("        do not use flipflops with CE in output netlist\n");
-		log("\n");
-		log("    -nolram\n");
-		log("        do not use large RAM cells in output netlist\n");
-		log("        note that large RAM must be explicitly requested with a (* lram *)\n");
-		log("        attribute on the memory.\n");
-		log("\n");
-		log("    -nobram\n");
-		log("        do not use block RAM cells in output netlist\n");
-		log("\n");
-		log("    -nolutram\n");
-		log("        do not use LUT RAM cells in output netlist\n");
-		log("\n");
-		log("    -nowidelut\n");
-		log("        do not use PFU muxes to implement LUTs larger than LUT4s\n");
-		log("\n");
-		log("    -noiopad\n");
-		log("        do not insert IO buffers\n");
-		log("\n");
-		log("    -nodsp\n");
-		log("        do not infer DSP multipliers\n");
-		log("\n");
-		log("    -abc9\n");
-		log("        use new ABC9 flow (EXPERIMENTAL)\n");
-		log("\n");
-		log("The following commands are executed by this synthesis command:\n");
-		help_script();
-		log("\n");
-	}
-
-	string top_opt, json_file, vm_file, family;
-	bool noccu2, nodffe, nolram, nobram, nolutram, nowidelut, noiopad, nodsp, flatten, dff, retime, abc9;
-
-	void clear_flags() override
-	{
-		top_opt = "-auto-top";
-		family = "lifcl";
-		json_file = "";
-		vm_file = "";
-		noccu2 = false;
-		nodffe = false;
-		nolram = false;
-		nobram = false;
-		nolutram = false;
-		nowidelut = false;
-		noiopad = false;
-		nodsp = false;
-		flatten = true;
-		dff = false;
-		retime = false;
-	}
-
-	void execute(std::vector<std::string> args, RTLIL::Design *design) override
-	{
-		string run_from, run_to;
-		clear_flags();
-
-		size_t argidx;
-		for (argidx = 1; argidx < args.size(); argidx++)
-		{
-			if (args[argidx] == "-top" && argidx+1 < args.size()) {
-				top_opt = "-top " + args[++argidx];
-				continue;
-			}
-			if (args[argidx] == "-json" && argidx+1 < args.size()) {
-				json_file = args[++argidx];
-				continue;
-			}
-			if (args[argidx] == "-vm" && argidx+1 < args.size()) {
-				vm_file = args[++argidx];
-				continue;
-			}
-			if (args[argidx] == "-run" && argidx+1 < args.size()) {
-				size_t pos = args[argidx+1].find(':');
-				if (pos == std::string::npos)
-					break;
-				run_from = args[++argidx].substr(0, pos);
-				run_to = args[argidx].substr(pos+1);
-				continue;
-			}
-			if ((args[argidx] == "-family") && argidx+1 < args.size()) {
-				family = args[++argidx];
-				continue;
-			}
-			if (args[argidx] == "-flatten") {
-				flatten = true;
-				continue;
-			}
-			if (args[argidx] == "-noflatten") {
-				flatten = false;
-				continue;
-			}
-			if (args[argidx] == "-dff") {
-				dff = true;
-				continue;
-			}
-			if (args[argidx] == "-nodsp") {
-				nodsp = true;
-				continue;
-			}
-			if (args[argidx] == "-retime") {
-				retime = true;
-				continue;
-			}
-			if (args[argidx] == "-noccu2") {
-				noccu2 = true;
-				continue;
-			}
-			if (args[argidx] == "-nodffe") {
-				nodffe = true;
-				continue;
-			}
-			if (args[argidx] == "-nolram") {
-				nolram = true;
-				continue;
-			}
-			if (args[argidx] == "-nobram") {
-				nobram = true;
-				continue;
-			}
-			if (args[argidx] == "-nolutram") {
-				nolutram = true;
-				continue;
-			}
-			if (args[argidx] == "-nowidelut") {
-				nowidelut = true;
-				continue;
-			}
-			if (args[argidx] == "-noiopad") {
-				noiopad = true;
-				continue;
-			}
-			if (args[argidx] == "-abc9") {
-				abc9 = true;
-				continue;
-			}
-			break;
-		}
-		extra_args(args, argidx, design);
-
-		if (!design->full_selection())
-			log_cmd_error("This command only operates on fully selected designs!\n");
-
-		if (abc9 && retime)
-				log_cmd_error("-retime option not currently compatible with -abc9!\n");
-
-		log_header(design, "Executing SYNTH_NEXUS pass.\n");
-		log_push();
-
-		run_script(design, run_from, run_to);
-
-		log_pop();
-	}
-
-	struct DSPRule {
-		int a_maxwidth;
-		int b_maxwidth;
-		int a_minwidth;
-		int b_minwidth;
-		std::string prim;
-	};
-
-	const std::vector<DSPRule> dsp_rules = {
-		{36, 36, 22, 22, "$__NX_MUL36X36"},
-		{36, 18, 22, 10, "$__NX_MUL36X18"},
-		{18, 18, 10,  4, "$__NX_MUL18X18"},
-		{18, 18,  4, 10, "$__NX_MUL18X18"},
-		{ 9,  9,  4,  4, "$__NX_MUL9X9"},
-	};
-
-	void script() override
-	{
-
-		if (family != "lifcl" && family != "lfd2nx")
-			log_cmd_error("Invalid Nexus -family setting: '%s'.\n", family);
-
-		if (check_label("begin"))
-		{
-			run("read_verilog -lib -specify +/nexus/cells_sim.v +/nexus/cells_xtra.v");
-			run(stringf("hierarchy -check %s", help_mode ? "-top <top>" : top_opt));
-		}
-
-		if (check_label("coarse"))
-		{
-			run("proc");
-			if (flatten || help_mode)
-				run("flatten");
-			run("tribuf -logic");
-			run("deminout");
-			run("opt_expr");
-			run("opt_clean");
-			run("check");
-			run("opt -nodffe -nosdff");
-			run("fsm");
-			run("opt");
-			run("wreduce");
-			run("peepopt");
-			run("opt_clean");
-			run("share");
-			run("techmap -map +/cmp2lut.v -D LUT_WIDTH=4");
-			run("opt_expr");
-			run("opt_clean");
-
-			if (help_mode) {
-				run("techmap -map +/mul2dsp.v [...]", "(unless -nodsp)");
-				run("techmap -map +/nexus/dsp_map.v", "(unless -nodsp)");
-			} else if (!nodsp) {
-				for (const auto &rule : dsp_rules) {
-					run(stringf("techmap -map +/mul2dsp.v -D DSP_A_MAXWIDTH=%d -D DSP_B_MAXWIDTH=%d -D DSP_A_MINWIDTH=%d -D DSP_B_MINWIDTH=%d -D DSP_NAME=%s",
-						rule.a_maxwidth, rule.b_maxwidth, rule.a_minwidth, rule.b_minwidth, rule.prim.c_str()));
-					run("chtype -set $mul t:$__soft_mul");
-				}
-				run("techmap -map +/nexus/dsp_map.v");
-			}
-
-			run("alumacc");
-			run("opt");
-			run("memory -nomap");
-			run("opt_clean");
-		}
-
-		if (check_label("map_ram"))
-		{
-			std::string args = "";
-			args += " -no-auto-huge";
-			if (help_mode)
-				args += " [-no-auto-block] [-no-auto-distributed]";
-			else {
-				if (nobram)
-					args += " -no-auto-block";
-				if (nolutram)
-					args += " -no-auto-distributed";
-			}
-			run("memory_libmap -lib +/nexus/lutrams.txt -lib +/nexus/brams.txt -lib +/nexus/lrams.txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
-			run("techmap -map +/nexus/lutrams_map.v -map +/nexus/brams_map.v -map +/nexus/lrams_map.v");
-		}
-
-		if (check_label("map_ffram"))
-		{
-			run("opt -fast -mux_undef -undriven -fine");
-			run("memory_map");
-			run("opt -undriven -fine");
-		}
-
-		if (check_label("map_gates"))
-		{
-			if (noccu2)
-				run("techmap");
-			else
-				run("techmap -map +/techmap.v -map +/nexus/arith_map.v");
-			if (help_mode || !noiopad)
-				run("iopadmap -bits -outpad OB I:O -inpad IB O:I -toutpad OBZ ~T:I:O -tinoutpad BB ~T:O:I:B A:top", "(skip if '-noiopad')");
-			run("opt -fast");
-			if (retime || help_mode)
-				run("abc -dff -D 1", "(only if -retime)");
-		}
-
-		if (check_label("map_ffs"))
-		{
-			run("opt_clean");
-			std::string dfflegalize_args = " -cell $_DFF_P_ 01 -cell $_DFF_PP?_ r -cell $_SDFF_PP?_ r -cell $_DLATCH_?_ x";
-			if (help_mode) {
-				dfflegalize_args += " [-cell $_DFFE_PP_ 01 -cell $_DFFE_PP?P_ r -cell $_SDFFE_PP?P_ r]";
-			} else if (!nodffe) {
-				dfflegalize_args += " -cell $_DFFE_PP_ 01 -cell $_DFFE_PP?P_ r -cell $_SDFFE_PP?P_ r";
-			}
-			run("dfflegalize" + dfflegalize_args, "($_*DFFE_* only if not -nodffe)");
-			if ((abc9 && dff) || help_mode)
-				run("zinit -all w:* t:$_DFF_?_ t:$_DFFE_??_ t:$_SDFF*", "(only if -abc9 and -dff");
-			run("techmap -D NO_LUT -map +/nexus/cells_map.v");
-			run("opt_expr -undriven -mux_undef");
-			run("simplemap");
-			run("attrmvcp -copy -attr syn_useioff");
-			run("opt_clean");
-		}
-
-		if (check_label("map_luts"))
-		{
-			run("techmap -map +/nexus/latches_map.v");
-
-			if (abc9) {
-				std::string abc9_opts;
-				if (nowidelut)
-					abc9_opts += " -maxlut 4";
-				std::string k = "synth_nexus.abc9.W";
-				if (active_design && active_design->scratchpad.count(k))
-					abc9_opts += stringf(" -W %s", active_design->scratchpad_get_string(k));
-				else
-					abc9_opts += stringf(" -W %s", RTLIL::constpad.at(k));
-				if (nowidelut)
-					abc9_opts += " -maxlut 4";
-				if (dff)
-					abc9_opts += " -dff";
-				run("abc9" + abc9_opts);
-			} else {
-				std::string abc_args = " -dress";
-				if (nowidelut)
-					abc_args += " -lut 4";
-				else
-					abc_args += " -lut 4:5";
-				if (dff)
-					abc_args += " -dff";
-				run("abc" + abc_args);
-			}
-			run("clean");
-		}
-
-		if (check_label("map_cells"))
-		{
-			run("techmap -map +/nexus/cells_map.v");
-
-			// This is needed for Radiant, but perhaps not optimal for nextpnr...
-			run("setundef -zero");
-
-			run("hilomap -singleton -hicell VHI Z -locell VLO Z");
-			run("clean");
-		}
-
-		if (check_label("check"))
-		{
-			run("autoname");
-			run("hierarchy -check");
-			run("stat");
-			run("check -noinit");
-			run("blackbox =A:whitebox");
-		}
-
-		if (check_label("json"))
-		{
-			if (!json_file.empty() || help_mode)
-				run(stringf("write_json %s", help_mode ? "<file-name>" : json_file));
-		}
-
-		if (check_label("vm"))
-		{
-			if (!vm_file.empty() || help_mode)
-				run(stringf("write_verilog %s", help_mode ? "<file-name>" : vm_file));
-		}
-	}
-} SynthNexusPass;
-
-PRIVATE_NAMESPACE_END

From 4bb4b6c66288b463bd551068a89eded3fc2ae264 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Fri, 26 Sep 2025 18:42:00 +0200
Subject: [PATCH 636/931] verific: Extend -sva-continue-on-err to handle FSM
 explosion

This also rolls back any added cells and wires, since we might have
added a lot of helper logic by the point we detect this.
---
 frontends/verific/verificsva.cc               | 34 +++++++++++++++++--
 .../verific/sva_continue_on_err_explosion.ys  | 31 +++++++++++++++++
 2 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 tests/verific/sva_continue_on_err_explosion.ys

diff --git a/frontends/verific/verificsva.cc b/frontends/verific/verificsva.cc
index 9757f07f2..50e0049ae 100644
--- a/frontends/verific/verificsva.cc
+++ b/frontends/verific/verificsva.cc
@@ -124,6 +124,7 @@ struct SvaFsm
 {
 	Module *module;
 	VerificClocking clocking;
+	std::function<void (std::string)> parser_error;
 
 	SigBit trigger_sig = State::S1, disable_sig;
 	SigBit throughout_sig = State::S1;
@@ -148,6 +149,7 @@ struct SvaFsm
 		module = clking.module;
 		clocking = clking;
 		trigger_sig = trig;
+		parser_error = [](std::string msg){ log_error("%s", msg); };
 
 		startNode = createNode();
 		acceptNode = createNode();
@@ -475,8 +477,8 @@ struct SvaFsm
 				dump();
 				log("      ctrl signal: %s\n", log_signal(dnode.ctrl));
 			}
-			log_error("SVA DFSM state ctrl signal has %d (>%d) bits. Stopping to prevent exponential design size explosion.\n",
-					GetSize(dnode.ctrl), verific_sva_fsm_limit);
+			parser_error(stringf("SVA DFSM state ctrl signal has %d (>%d) bits. Stopping to prevent exponential design size explosion.\n",
+					GetSize(dnode.ctrl), verific_sva_fsm_limit));
 		}
 
 		for (unsigned long long i = 0; i < (1ull << GetSize(dnode.ctrl)); i++)
@@ -1260,6 +1262,7 @@ struct VerificSvaImporter
 		if (inst->Type() == PRIM_SVA_FIRST_MATCH)
 		{
 			SvaFsm match_fsm(clocking);
+			match_fsm.parser_error = [&](std::string msg) { this->parser_error(msg); };
 			match_fsm.createLink(parse_sequence(match_fsm, match_fsm.createStartNode(), inst->GetInput()), match_fsm.acceptNode);
 
 			int node = fsm.createNode();
@@ -1426,12 +1429,15 @@ struct VerificSvaImporter
 		if (inst->Type() == PRIM_SVA_SEQ_AND || inst->Type() == PRIM_SVA_AND)
 		{
 			SvaFsm fsm1(clocking);
+			fsm1.parser_error = [&](std::string msg) { this->parser_error(msg); };
 			fsm1.createLink(parse_sequence(fsm1, fsm1.createStartNode(), inst->GetInput1()), fsm1.acceptNode);
 
 			SvaFsm fsm2(clocking);
+			fsm2.parser_error = [&](std::string msg) { this->parser_error(msg); };
 			fsm2.createLink(parse_sequence(fsm2, fsm2.createStartNode(), inst->GetInput2()), fsm2.acceptNode);
 
 			SvaFsm combined_fsm(clocking);
+			combined_fsm.parser_error = [&](std::string msg) { this->parser_error(msg); };
 			fsm1.getDFsm(combined_fsm, combined_fsm.createStartNode(), -1, combined_fsm.acceptNode);
 			fsm2.getDFsm(combined_fsm, combined_fsm.createStartNode(), -1, combined_fsm.acceptNode);
 
@@ -1456,6 +1462,7 @@ struct VerificSvaImporter
 		if (inst->Type() == PRIM_SVA_INTERSECT || inst->Type() == PRIM_SVA_WITHIN)
 		{
 			SvaFsm intersect_fsm(clocking);
+			intersect_fsm.parser_error = [&](std::string msg) { this->parser_error(msg); };
 
 			if (inst->Type() == PRIM_SVA_INTERSECT)
 			{
@@ -1562,6 +1569,7 @@ struct VerificSvaImporter
 			int node;
 
 			SvaFsm antecedent_fsm(clocking, trig);
+			antecedent_fsm.parser_error = [&](std::string msg) { this->parser_error(msg); };
 			node = parse_sequence(antecedent_fsm, antecedent_fsm.createStartNode(), antecedent_net);
 			if (inst->Type() == PRIM_SVA_NON_OVERLAPPED_IMPLICATION) {
 				int next_node = antecedent_fsm.createNode();
@@ -1623,6 +1631,7 @@ struct VerificSvaImporter
 			int node;
 
 			SvaFsm antecedent_fsm(clocking, trig);
+			antecedent_fsm.parser_error = [&](std::string msg) { this->parser_error(msg); };
 			node = parse_sequence(antecedent_fsm, antecedent_fsm.createStartNode(), antecedent_net);
 			if (inst->Type() == PRIM_SVA_NON_OVERLAPPED_IMPLICATION || inst->Type() == PRIM_SVA_NON_OVERLAPPED_FOLLOWED_BY) {
 				int next_node = antecedent_fsm.createNode();
@@ -1677,6 +1686,7 @@ struct VerificSvaImporter
 			}
 
 			SvaFsm consequent_fsm(clocking, antecedent_match);
+			consequent_fsm.parser_error = [&](std::string msg) { this->parser_error(msg); };
 			node = parse_sequence(consequent_fsm, consequent_fsm.createStartNode(), consequent_net);
 			consequent_fsm.createLink(node, consequent_fsm.acceptNode);
 
@@ -1696,6 +1706,7 @@ struct VerificSvaImporter
 			}
 
 			SvaFsm fsm(clocking, trig);
+			fsm.parser_error = [&](std::string msg) { this->parser_error(msg); };
 			int node = parse_sequence(fsm, fsm.createStartNode(), net);
 			fsm.createLink(node, fsm.acceptNode);
 
@@ -1713,6 +1724,10 @@ struct VerificSvaImporter
 		module = importer->module;
 		netlist = root->Owner();
 
+		int initial_cell_count = GetSize(module->cells_);
+		int initial_wire_count = GetSize(module->wires_);
+		int initial_connection_count = GetSize(module->connections_);
+
 		if (verific_verbose)
 			log("  importing SVA property at root cell %s (%s) at %s:%d.\n", root->Name(), root->View()->Owner()->Name(),
 					LineFile::GetFileName(root->Linefile()), LineFile::GetLineNo(root->Linefile()));
@@ -1838,6 +1853,21 @@ struct VerificSvaImporter
 		{
 			if (importer->mode_sva_continue) {
 
+				std::vector<Cell *> remove_cells;
+				pool<Wire *> remove_wires;
+
+				for (int i = 0, end = GetSize(module->cells_) - initial_cell_count; i != end; ++i)
+					remove_cells.push_back(module->cells_.element(i)->second);
+
+				for (int i = 0, end = GetSize(module->wires_) - initial_wire_count; i != end; ++i)
+					remove_wires.emplace(module->wires_.element(i)->second);
+
+				for (auto cell : remove_cells)
+					module->remove(cell);
+				module->remove(remove_wires);
+
+				module->connections_.resize(initial_connection_count);
+
 				RTLIL::Cell *c = nullptr;
 
 				if (mode_assert) c = module->addAssert(root_name, State::Sx, State::Sx);
diff --git a/tests/verific/sva_continue_on_err_explosion.ys b/tests/verific/sva_continue_on_err_explosion.ys
new file mode 100644
index 000000000..c96ad0140
--- /dev/null
+++ b/tests/verific/sva_continue_on_err_explosion.ys
@@ -0,0 +1,31 @@
+verific -sv <<EOF
+module top(input clk, input a, input b);
+
+    prop_supported1: assert property (@(posedge clk) a ##1 b |=> b);
+
+    prop_exploding: assert property (@(posedge clk)
+        ((a [*7] ##1 b)  [*11]) and
+        ((a [*11] ##1 b) [*7]) and
+        ((a [*13] ##1 b) [*5]) and
+        ((a [*5] ##1 b) [*13])
+    );
+
+    prop_supported2: assert property (@(posedge clk) a [*5] ##1 b |=> b);
+
+endmodule
+EOF
+
+logger -expect warning "Stopping to prevent exponential design size explosion." 1
+verific -import -sva-continue-on-err top
+logger -check-expected
+
+select -assert-count 3 top/t:$assert
+select -assert-count 1 top/a:unsupported_sva top/prop_exploding %% top/t:$assert %i
+
+select -assert-count 0 top/a:unsupported_sva top/prop_supported1 %i
+select -assert-count 0 top/a:unsupported_sva top/prop_supported2 %i
+select -assert-count 2 top/prop_supported*
+
+logger -expect error "uses unsupported SVA constructs." 1
+hierarchy -smtcheck -top top
+logger -check-expected

From 4b6b254e314cf0bd1191706900a2358e8503e2db Mon Sep 17 00:00:00 2001
From: Akash Levy <akash@silimate.com>
Date: Sun, 28 Sep 2025 01:37:30 -0700
Subject: [PATCH 637/931] pyosys cannot parse header with omitted function args

---
 kernel/rtlil.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index e240cf885..5271a3111 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1244,8 +1244,8 @@ private:
 public:
 	SigSpec() : width_(0), hash_(0) {}
 	SigSpec(std::initializer_list<RTLIL::SigSpec> parts);
-	SigSpec(const SigSpec &) = default;
-	SigSpec(SigSpec &&) = default;
+	SigSpec(const SigSpec &value) = default;
+	SigSpec(SigSpec &&value) = default;
 	SigSpec(const RTLIL::Const &value);
 	SigSpec(RTLIL::Const &&value);
 	SigSpec(const RTLIL::SigChunk &chunk);

From 9396e5e5fe40f90e44498597ae4df4cc391561e1 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 23 Sep 2025 14:40:22 +0200
Subject: [PATCH 638/931] portarcs: Ignore all bufnorm helper cells

The `portarcs` pass was already ignoring `$buf` cells when loading
timing data, but now bufnorm will also emit `$input_port` and `$connect`
helper cells, which need to be ignored as well.
---
 passes/cmds/portarcs.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/passes/cmds/portarcs.cc b/passes/cmds/portarcs.cc
index 36870489a..8cc5d1236 100644
--- a/passes/cmds/portarcs.cc
+++ b/passes/cmds/portarcs.cc
@@ -124,7 +124,8 @@ struct PortarcsPass : Pass {
 				TopoSort<SigBit> sort;
 
 				for (auto cell : m->cells())
-				if (cell->type != ID($buf)) {
+				// Ignore all bufnorm helper cells
+				if (!cell->type.in(ID($buf), ID($input_port), ID($connect))) {
 					auto tdata = tinfo.find(cell->type);
 					if (tdata == tinfo.end())
 						log_cmd_error("Missing timing data for module '%s'.\n", log_id(cell->type));

From 90669ab4eba25878ee592b80bc4ba5f79386b81c Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 23 Sep 2025 14:44:13 +0200
Subject: [PATCH 639/931] aiger2: Only fail for reachable undirected bufnorm
 helper cells

The aiger2 backend checks for unsupported cells during indexing. This
causes it to fail when `$connect` or `$tribuf` (as workaround for
missing 'z-$buf support) cells are present in the module.

Since bufnorm adds these cells automatically, it is very easy to end up
with them due to unconnected wires or e.g. `$specify` cells, which do
not pose an actual problem for the backend, since it will never
encounter those during a traversal.

With this, we ignore them during indexing and only produce an actual error
message if we reach such a cell during the traversal.
---
 backends/aiger2/aiger.cc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/backends/aiger2/aiger.cc b/backends/aiger2/aiger.cc
index b63e51bde..41e1b91c1 100644
--- a/backends/aiger2/aiger.cc
+++ b/backends/aiger2/aiger.cc
@@ -105,6 +105,13 @@ struct Index {
 				if (allow_blackboxes) {
 					info.found_blackboxes.insert(cell);	
 				} else {
+					// Even if we don't allow blackboxes these might still be
+					// present outside of any traversed input cones, so we
+					// can't bail at this point. If they are hit by a traversal
+					// (which can only really happen with $tribuf not
+					// $connect), we can still detect this as an error later.
+					if (cell->type == ID($connect) || (cell->type == ID($tribuf) && cell->has_attribute(ID(aiger2_zbuf))))
+						continue;
 					if (!submodule || submodule->get_blackbox_attribute())
 						log_error("Unsupported cell type: %s (%s in %s)\n",
 								  log_id(cell->type), log_id(cell), log_id(m));
@@ -483,7 +490,8 @@ struct Index {
 		{
 			Design *design = index.design;
 			auto &minfo = leaf_minfo(index);
-			log_assert(minfo.suboffsets.count(cell));
+			if (!minfo.suboffsets.count(cell))
+				log_error("Reached unsupport cell %s (%s in %s)\n", log_id(cell->type), log_id(cell), log_id(cell->module));
 			Module *def = design->module(cell->type);
 			log_assert(def);
 			levels.push_back(Level(index.modules.at(def), cell));

From cbc1055517b6936de34332c480da9e7a9aae658f Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 23 Sep 2025 21:54:55 +0200
Subject: [PATCH 640/931] opt_clean: Fix debug output when cleaning up bufnorm
 cells

---
 passes/opt/opt_clean.cc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/passes/opt/opt_clean.cc b/passes/opt/opt_clean.cc
index dc3f015cd..996a9b3c9 100644
--- a/passes/opt/opt_clean.cc
+++ b/passes/opt/opt_clean.cc
@@ -635,9 +635,17 @@ void rmunused_module(RTLIL::Module *module, bool purge_mode, bool verbose, bool
 		}
 	}
 	for (auto cell : delcells) {
-		if (verbose)
-			log_debug("  removing buffer cell `%s': %s = %s\n", cell->name,
-					log_signal(cell->getPort(ID::Y)), log_signal(cell->getPort(ID::A)));
+		if (verbose) {
+			if (cell->type == ID($connect))
+				log_debug("  removing connect cell `%s': %s <-> %s\n", cell->name,
+						log_signal(cell->getPort(ID::A)), log_signal(cell->getPort(ID::B)));
+			else if (cell->type == ID($input_port))
+				log_debug("  removing input port marker cell `%s': %s\n", cell->name,
+						log_signal(cell->getPort(ID::Y)));
+			else
+				log_debug("  removing buffer cell `%s': %s = %s\n", cell->name,
+						log_signal(cell->getPort(ID::Y)), log_signal(cell->getPort(ID::A)));
+		}
 		module->remove(cell);
 	}
 	if (!delcells.empty())

From 86fb2f16f7863634e1df9e692520656fa55a36a7 Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 23 Sep 2025 14:28:10 +0200
Subject: [PATCH 641/931] bufnorm: Refactor and fix incremental bufNormalize

This fixes some edge cases the previous version didn't handle properly
by simplifying the logic of determining directly driven wires and
representatives to use as buffer inputs.
---
 kernel/rtlil.cc                    |   7 +
 kernel/rtlil_bufnorm.cc            | 224 ++++++++++++++---------------
 tests/various/bufnorm_opt_clean.ys | 154 ++++++++++++++++++++
 3 files changed, 270 insertions(+), 115 deletions(-)
 create mode 100644 tests/various/bufnorm_opt_clean.ys

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index e9d051de8..8daf2c821 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -2829,6 +2829,13 @@ void RTLIL::Module::remove(const pool<RTLIL::Wire*> &wires)
 	delete_wire_worker.wires_p = &wires;
 	rewrite_sigspecs2(delete_wire_worker);
 
+	if (design->flagBufferedNormalized) {
+		for (auto wire : wires) {
+			buf_norm_wire_queue.erase(wire);
+			buf_norm_connect_index.erase(wire);
+		}
+	}
+
 	for (auto &it : wires) {
 		log_assert(wires_.count(it->name) != 0);
 		wires_.erase(it->name);
diff --git a/kernel/rtlil_bufnorm.cc b/kernel/rtlil_bufnorm.cc
index 6d619d9e6..d0561f880 100644
--- a/kernel/rtlil_bufnorm.cc
+++ b/kernel/rtlil_bufnorm.cc
@@ -43,6 +43,7 @@ void RTLIL::Design::bufNormalize(bool enable)
 				wire->driverCell_ = nullptr;
 				wire->driverPort_ = IdString();
 			}
+			module->buf_norm_connect_index.clear();
 		}
 
 		flagBufferedNormalized = false;
@@ -126,15 +127,19 @@ void RTLIL::Module::bufNormalize()
 		idict<Wire *> wire_queue_entries; // Ordered queue of wires to process
 		int wire_queue_pos = 0; // Index up to which we processed the wires
 
-		// Wires with their unique driving cell port. If we know a wire is
-		// driven by multiple (potential) drivers, this is indicated by a
-		// nullptr as cell.
+		// Wires with their unique driving cell port. We pick the first driver
+		// we encounter, with the exception that we ensure that a module input
+		// port can only get $input_port drivers and that $input_port drivers
+		// cannot drive any other modules. If we reject an $input_port driver
+		// because it's not driving an input port or because there already is
+		// another $input_port driver for the same port, we also delete that
+		// $input_port cell.
 		dict<Wire *, std::pair<Cell *, IdString>> direct_driven_wires;
 
-		// Set of non-unique or driving cell ports for each processed wire.
-		dict<Wire *, pool<std::pair<Cell *, IdString>>> direct_driven_wires_conflicts;
-
-		// Set of cell ports that need a fresh intermediate wire.
+		// Set of cell ports that need a fresh intermediate wire. These are all
+		// cell ports that drive non-full-wire sigspecs, cell ports driving
+		// module input ports, and cell ports driving wires that are already
+		// driven.
 		pool<std::pair<Cell *, IdString>> pending_ports;
 
 		// This helper will be called for every output/inout cell port that is
@@ -149,27 +154,14 @@ void RTLIL::Module::bufNormalize()
 
 
 			SigSpec const &sig = cell->getPort(port);
-			if (cell->type == ID($input_port)) {
-				// If an `$input_port` cell isn't fully connected to a full
-				// input port wire, we remove it since the wires are still the
-				// canonical source of module ports and the `$input_port` cells
-				// are just helpers to simplfiy the bufnorm invariant.
-				log_assert(port == ID::Y);
-				if (!sig.is_wire()) {
-					buf_norm_cell_queue.insert(cell);
-					remove(cell);
-					return;
-				}
 
-				Wire *w = sig.as_wire();
-				if (!w->port_input || w->port_output) {
-					buf_norm_cell_queue.insert(cell);
-					remove(cell);
-					return;
-				}
-				w->driverCell_ = cell;
-				w->driverPort_ = ID::Y;
-			} else if (cell->type == ID($buf) && cell->attributes.empty() && !cell->name.isPublic()) {
+			// Make sure all wires of the cell port are enqueued, ensuring we
+			// detect other connected drivers (output and inout).
+			for (auto chunk : sig.chunks())
+				if (chunk.is_wire())
+					wire_queue_entries(chunk.wire);
+
+			if (cell->type == ID($buf) && cell->attributes.empty() && !cell->name.isPublic()) {
 				// For a plain `$buf` cell, we enqueue all wires on its input
 				// side, bypass it using module level connections (skipping 'z
 				// bits) and then remove the cell. Eventually the module level
@@ -206,47 +198,40 @@ void RTLIL::Module::bufNormalize()
 
 				if (!sig_y.empty())
 					connect(sig_y, sig_a);
+				remove(cell);
+				log_assert(GetSize(buf_norm_wire_queue) <= 1);
+				buf_norm_wire_queue.clear();
+				return;
+			} else if (cell->type == ID($input_port)) {
+				log_assert(port == ID::Y);
+				if (sig.is_wire()) {
+					Wire *w = sig.as_wire();
+					if (w->port_input && !w->port_output) {
+						// An $input_port cell can only drive a full wire module input port
+						auto [found, inserted] = direct_driven_wires.emplace(w, {cell, port});
+						if (!inserted || (found->second.first == cell && found->second.second == port))
+							return;
+					}
+				}
+
+				// If an `$input_port` cell isn't driving a full
+				// input port wire, we remove it since the wires are still the
+				// canonical source of module ports
+
 				buf_norm_cell_queue.insert(cell);
 				remove(cell);
+				log_assert(GetSize(buf_norm_wire_queue) <= 1);
+				buf_norm_wire_queue.clear();
 				return;
 			}
 
-			// Make sure all wires of the cell port are enqueued, ensuring we
-			// detect other connected drivers (output and inout).
-			for (auto const &chunk : sig.chunks())
-				if (chunk.wire)
-					wire_queue_entries(chunk.wire);
-
 			if (sig.is_wire()) {
-				// If the full cell port is connected to a full wire, we might be
-				// able to keep that connection if this is a unique output port driving that wire
 				Wire *w = sig.as_wire();
-
-				// We try to store the current port as unique driver, if this
-				// succeeds we're done with the port.
-				auto [found, inserted] = direct_driven_wires.emplace(w, {cell, port});
-				if (inserted || (found->second.first == cell && found->second.second == port))
-					return;
-
-				// When this failed, we store this port as a conflict. If we
-				// had already stored a candidate for a unique driver, we also
-				// move it to the conflicts, leaving a nullptr marker.
-
-				auto &conflicts = direct_driven_wires_conflicts[w];
-				if (Cell *other_cell = found->second.first) {
-					if (other_cell->type == ID($input_port)) {
-						// Multiple input port cells
-						log_assert(cell->type != ID($input_port));
-					} else {
-						pending_ports.insert(found->second);
-						conflicts.emplace(found->second);
-						found->second = {nullptr, {}};
-					}
-				}
-				if (cell->type == ID($input_port)) {
-					found->second = {cell, port};
-				} else {
-					conflicts.emplace(cell, port);
+				if (!w->port_input || w->port_output) {
+					// If the full cell port is connected to a full non-input-port wire, pick it as driver
+					auto [found, inserted] = direct_driven_wires.emplace(w, {cell, port});
+					if (inserted || (found->second.first == cell && found->second.second == port))
+						return;
 				}
 			}
 
@@ -256,16 +241,22 @@ void RTLIL::Module::bufNormalize()
 			pending_ports.emplace(cell, port);
 		};
 
+		// We enqueue all enqueued wires for `$buf`/`$connect` processing (clearing the module level queue).
+		for (auto wire : buf_norm_wire_queue)
+			wire_queue_entries(wire);
+		buf_norm_wire_queue.clear();
+
+		// Only after clearing the `buf_norm_wire_queue` are we allowed to call
+		// enqueue_cell_port, since we're using assertions to check against
+		// unintended wires being enqueued into `buf_norm_wire_queue` that
+		// would prevent us from restoring the bufnorm invariants in a single
+		// pass.
+
 		// We process all explicitly enqueued cell ports (clearing the module level queue).
 		for (auto const &[cell, port_name] : buf_norm_cell_port_queue)
 			enqueue_cell_port(cell, port_name);
 		buf_norm_cell_port_queue.clear();
 
-		// And enqueue all wires for `$buf`/`$connect` processing (clearing the module level queue).
-		for (auto wire : buf_norm_wire_queue)
-			wire_queue_entries(wire);
-		buf_norm_wire_queue.clear();
-
 		// We also enqueue all wires that saw newly added module level connections.
 		for (auto &[a, b] : connections_)
 			for (auto &sig : {a, b})
@@ -302,8 +293,11 @@ void RTLIL::Module::bufNormalize()
 							if (chunk.wire)
 								wire_queue_entries(chunk.wire);
 					connect(sig_a, sig_b);
+
 					buf_norm_cell_queue.insert(connect_cell);
 					remove(connect_cell);
+					log_assert(GetSize(buf_norm_wire_queue) <= 2);
+					buf_norm_wire_queue.clear();
 				}
 			}
 		}
@@ -315,6 +309,9 @@ void RTLIL::Module::bufNormalize()
 		// As a first step for re-normalization we add all require intermediate
 		// wires for cell output and inout ports.
 		for (auto &[cell, port] : pending_ports) {
+			log_assert(cell->type != ID($input_port));
+			log_assert(!cell->type.empty());
+			log_assert(!pending_deleted_cells.count(cell));
 			SigSpec const &sig = cell->getPort(port);
 			Wire *w = addWire(NEW_ID, GetSize(sig));
 
@@ -323,16 +320,9 @@ void RTLIL::Module::bufNormalize()
 			// correspond to what you would get if the intermediate wires had
 			// been in place from the beginning.
 			connect(sig, w);
-			auto port_dir = cell->port_dir(port);
-			if (port_dir == RTLIL::PD_INOUT || port_dir == RTLIL::PD_UNKNOWN) {
-				direct_driven_wires.emplace(w, {nullptr, {}});
-				direct_driven_wires_conflicts[w].emplace(cell, port);
-			} else {
-				direct_driven_wires.emplace(w, {cell, port});
-			}
-
-			cell->setPort(port, w);
-			wire_queue_entries(w);
+			direct_driven_wires.emplace(w, {cell, port});
+			cell->setPort(port, w); // Hits the fast path that doesn't enqueue w
+			wire_queue_entries(w); // Needed so we pick up the sig <-> w connection
 		}
 
 		// At this point we're done with creating wires and know which ones are
@@ -346,7 +336,7 @@ void RTLIL::Module::bufNormalize()
 			wire->driverPort_.clear();
 		}
 
-		// For the unique output cell ports fully connected to a full wire, we
+		// For the unique driving cell ports fully connected to a full wire, we
 		// can update the bufnorm data right away. For all other wires we will
 		// have to create new `$buf` cells.
 		for (auto const &[wire, cellport] : direct_driven_wires) {
@@ -373,54 +363,55 @@ void RTLIL::Module::bufNormalize()
 		SigMap sigmap(this);
 		new_connections({});
 
-		pool<SigBit> conflicted;
-		pool<SigBit> driven;
-
-		// We iterate over all direct driven wires and try to make that wire's
-		// sigbits the representative sigbit for the net. We do a second pass
-		// to detect conflicts to then remove the conflicts from `driven`.
-		for (bool check : {false, true}) {
+		// We pick SigMap representatives by prioritizing input ports over
+		// driven wires over other/unknown wires.
+		for (bool input_ports : {false, true}) {
 			for (auto const &[wire, cellport] : direct_driven_wires) {
-				if (cellport.first == nullptr)
-					continue;
-				auto const &[cell, port] = cellport;
-
-				SigSpec z_mask;
-				if (cell->type == ID($buf))
-					z_mask = cell->getPort(ID::A);
-
-				for (int i = 0; i != GetSize(wire); ++i) {
-					SigBit driver = SigBit(wire, i);
-					if (!z_mask.empty() && z_mask[i] == State::Sz)
-						continue;
-					if (check) {
-						SigBit repr = sigmap(driver);
-						if (repr != driver)
-							conflicted.insert(repr);
-						else
-							driven.insert(repr);
-					} else {
+				if ((wire->port_input && !wire->port_output) == input_ports) {
+					for (int i = 0; i != GetSize(wire); ++i) {
+						SigBit driver = SigBit(wire, i);
 						sigmap.database.promote(driver);
 					}
 				}
 			}
 		}
 
-		// Ensure that module level inout ports are directly driven or
-		// connected using `$connect` cells and never `$buf`fered.
-		for (auto wire : wire_queue_entries) {
-			if (!wire->port_input || !wire->port_output)
-				continue;
+		// All three pool<SigBit> below are in terms of sigmapped bits
+		// Bits that are known to have a unique driver that is an unconditional driver or one or more inout drivers
+		pool<SigBit> driven;
+		// Bits that have multiple unconditional drivers, this forces the use of `$connect`
+		pool<SigBit> conflicted;
+		// Bits that are driven by an inout driver
+		pool<SigBit> weakly_driven;
+
+		for (auto const &[wire, cellport] : direct_driven_wires) {
+			auto const &[cell, port] = cellport;
 			for (int i = 0; i != GetSize(wire); ++i) {
-				SigBit driver = SigBit(wire, i);
-				SigBit repr = sigmap(driver);
-				if (driver != repr)
-					driven.erase(repr);
+				SigBit driver = sigmap(SigBit(wire, i));
+				if (cell->type == ID($tribuf) || cell->port_dir(port) == RTLIL::PD_INOUT) {
+					// We add inout drivers to `driven` in a separate loop below
+					weakly_driven.insert(driver);
+				} else {
+					// We remove driver conflicts from `driven` in a separate loop below
+					bool inserted = driven.insert(driver).second;
+					if (!inserted)
+						conflicted.insert(driver);
+				}
 			}
 		}
 
-		for (auto &bit : conflicted)
-			driven.erase(bit);
+		// If a wire has one or more inout drivers and an unconditional driver, that's still a conflict
+		for (auto driver : weakly_driven)
+			if (!driven.insert(driver).second)
+				conflicted.insert(driver);
+
+		// This only leaves the drivers matching `driven`'s definition above
+		for (auto driver : conflicted)
+			driven.erase(driver);
+
+		// Having picked representatives and checked whether they are unique
+		// drivers, we can turn the connecitivty of our sigmap back into $buf
+		// and $connect cells.
 
 		// Module level bitwise connections not representable by `$buf` cells
 		pool<pair<SigBit, SigBit>> undirected_connections;
@@ -561,6 +552,8 @@ void RTLIL::Cell::unsetPort(const RTLIL::IdString& portname)
 					w->driverCell_ = nullptr;
 					w->driverPort_ = IdString();
 					module->buf_norm_wire_queue.insert(w);
+				} else if (w->driverCell_) {
+					log_assert(w->driverCell_->getPort(w->driverPort_) == w);
 				}
 			}
 
@@ -630,7 +623,8 @@ void RTLIL::Cell::setPort(const RTLIL::IdString& portname, RTLIL::SigSpec signal
 		// bufNormalize call
 		if ((dir == RTLIL::PD_OUTPUT || dir == RTLIL::PD_INOUT) && signal.is_wire()) {
 			Wire *w = signal.as_wire();
-			if (w->driverCell_ == nullptr) {
+			if (w->driverCell_ == nullptr && (
+						(w->port_input && !w->port_output) == (type == ID($input_port)))) {
 				w->driverCell_ = this;
 				w->driverPort_ = portname;
 
diff --git a/tests/various/bufnorm_opt_clean.ys b/tests/various/bufnorm_opt_clean.ys
new file mode 100644
index 000000000..e1036f920
--- /dev/null
+++ b/tests/various/bufnorm_opt_clean.ys
@@ -0,0 +1,154 @@
+
+read_aiger <<EOF
+aag 124 11 9 2 104
+2
+4
+6
+8
+10
+12
+14
+16
+18
+20
+22
+24 42
+26 57
+28 58
+30 68
+32 86
+34 113
+36 114
+38 105
+40 133
+228
+248
+42 26 5
+44 35 33
+46 36 3
+48 46 44
+50 36 31
+52 28 25
+54 53 50
+56 55 49
+58 38 25
+60 40 28
+62 60 25
+64 37 30
+66 64 24
+68 66 62
+70 29 7
+72 40 37
+74 7 2
+76 74 73
+78 76 12
+80 78 71
+82 76 13
+84 83 14
+86 84 80
+88 34 31
+90 89 58
+92 40 37
+94 39 26
+96 94 93
+98 96 91
+100 98 14
+102 39 6
+104 40 27
+106 104 103
+108 107 55
+110 109 98
+112 110 100
+114 24 10
+116 26 8
+118 7 5
+120 119 117
+122 5 3
+124 27 25
+126 125 123
+128 126 120
+130 129 83
+132 131 111
+134 48 12
+136 121 48
+138 137 135
+140 139 130
+142 138 81
+144 114 91
+146 145 57
+148 38 29
+150 148 25
+152 151 48
+154 153 69
+156 155 147
+158 157 143
+160 159 140
+162 147 81
+164 163 86
+166 165 21
+168 167 161
+170 169 22
+172 113 19
+174 133 113
+176 174 172
+178 108 83
+180 179 155
+182 181 19
+184 182 140
+186 185 177
+188 112 21
+190 189 176
+192 146 140
+194 192 164
+196 112 86
+198 196 165
+200 198 194
+202 181 156
+204 145 83
+206 205 17
+208 178 138
+210 209 206
+212 140 132
+214 212 210
+216 214 202
+218 194 161
+220 218 216
+222 220 201
+224 222 190
+226 224 186
+228 226 170
+230 167 157
+232 182 172
+234 193 21
+236 235 232
+238 202 197
+240 238 185
+242 238 188
+244 242 240
+246 244 237
+248 246 231
+c
+aigfuzz -s -1 1145242652
+seed 1145242652
+fuzzer layers
+depth 9
+width 19
+input fraction 13%
+latch fraction 84%
+lower fraction 20%
+monotonicity -1
+and closure
+EOF
+
+bufnorm -update
+
+delete -output o:* %R1
+opt_clean
+bufnorm -update
+
+delete -output o:* %R1
+tee -q debug opt_clean
+bufnorm -update
+
+bufnorm -reset
+opt_clean

From ffe2f7a16d3f9c26c66347e19810aaccfae28989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Mon, 29 Sep 2025 12:26:43 +0200
Subject: [PATCH 642/931] opt_hier: Fix two optimizations conflicting

Fix a conflict between the following two:

 * propagation of tied-together inputs in
 * propagation of unused inputs out
---
 passes/opt/opt_hier.cc | 19 ++++++++++++++-----
 tests/opt/bug5398.ys   | 23 +++++++++++++++++++++++
 2 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 tests/opt/bug5398.ys

diff --git a/passes/opt/opt_hier.cc b/passes/opt/opt_hier.cc
index a8df78dc1..06103b4be 100644
--- a/passes/opt/opt_hier.cc
+++ b/passes/opt/opt_hier.cc
@@ -310,7 +310,7 @@ struct UsageData {
 		refine_tie_togethers(inputs);
 	}
 
-	bool apply_changes() {
+	bool apply_changes(ModuleIndex &index) {
 		bool did_something = false;
 
 		if (module->get_blackbox_attribute()) {
@@ -374,8 +374,16 @@ struct UsageData {
 		// Propagate tied-together inputs
 		dict<SigBit, SigBit> ties;
 		for (auto group : tie_together_inputs) {
-			for (int i = 1; i < group.size(); i++)
-				ties[group[i]] = group[0];
+			// Only consider used inputs for a tie-together group.
+			// ModuleIndex::apply_changes might have disconnected
+			// unused inputs.
+			SigSpec filtered_group;
+			for (auto bit : group) {
+				if (index.used.check(bit))
+					filtered_group.append(bit);
+			}
+			for (int i = 1; i < filtered_group.size(); i++)
+				ties[filtered_group[i]] = filtered_group[0];
 		}
 		SigPool applied_ties;
 		auto ties_rewrite = [&](SigSpec &signal) {
@@ -449,12 +457,13 @@ struct OptHierPass : Pass {
 
 		bool did_something = false;
 		for (auto module : d->selected_modules(RTLIL::SELECT_WHOLE_ONLY, RTLIL::SB_UNBOXED_CMDERR)) {
+			ModuleIndex &parent_index = indices.at(module->name);
+
 			if (usage_datas.count(module->name)) {
 				log_debug("Applying usage data changes to %s\n", log_id(module));
-				did_something |= usage_datas.at(module->name).apply_changes();
+				did_something |= usage_datas.at(module->name).apply_changes(parent_index);
 			}
 
-			ModuleIndex &parent_index = indices.at(module->name);
 			for (auto cell : module->cells()) {
 				if (indices.count(cell->type)) {
 					log_debug("Applying changes to instance %s of %s in %s\n", log_id(cell), log_id(cell->type), log_id(module));
diff --git a/tests/opt/bug5398.ys b/tests/opt/bug5398.ys
new file mode 100644
index 000000000..93c5a2d52
--- /dev/null
+++ b/tests/opt/bug5398.ys
@@ -0,0 +1,23 @@
+read_verilog <<EOF
+module tag_2x4(
+  input        R0_clk,
+  input        W0_clk,
+  output       x,
+);
+  assign x = !W0_clk;
+endmodule
+
+module top(input clock, output x, output flag);
+  tag_2x4 tag_ext(
+    .R0_clk  (clock),
+    .W0_clk  (clock),
+    .x       (x)
+  );
+  assign flag = x ^ clock;
+endmodule
+EOF
+
+hierarchy -top top
+opt_hier
+flatten
+sat -verify -prove flag 1

From a9318db2faabf04e7783e88f1dcdbcc968221657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Mon, 29 Sep 2025 12:26:54 +0200
Subject: [PATCH 643/931] opt_hier: Adjust messages

---
 passes/opt/opt_hier.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/passes/opt/opt_hier.cc b/passes/opt/opt_hier.cc
index 06103b4be..5c3b09b31 100644
--- a/passes/opt/opt_hier.cc
+++ b/passes/opt/opt_hier.cc
@@ -144,12 +144,12 @@ struct ModuleIndex {
 			}
 
 			if (nunused > 0) {
-				log("Disconnected %d input bits of instance '%s' of '%s' in '%s'\n",
+				log("Disconnected %d input bits of instance '%s' (type '%s') in '%s'\n",
 					nunused, log_id(instantiation), log_id(instantiation->type), log_id(parent.module));
 				changed = true;
 			}
 			if (nconstants > 0) {
-				log("Substituting constant for %d output bits of instance '%s' of '%s' in '%s'\n",
+				log("Substituting constant for %d output bits of instance '%s' (type '%s') in '%s'\n",
 					nconstants, log_id(instantiation), log_id(instantiation->type), log_id(parent.module));
 				changed = true;
 			}

From acf3a6606ffef050f903c5c9e2d0cfcd2709fdac Mon Sep 17 00:00:00 2001
From: Akash Levy <akash@silimate.com>
Date: Sun, 28 Sep 2025 07:25:25 -0700
Subject: [PATCH 644/931] Small gitignore fixes

---
 .gitignore | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitignore b/.gitignore
index cac630d7c..47f758a9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 ## user config
 /Makefile.conf
 
+## homebrew
+/Brewfile.lock.json
+
 ## build artifacts
 # compiler intermediate files
 *.o
@@ -11,6 +14,12 @@
 *.gcno
 *.so.dSYM/
 
+## test artifacts
+**/run-test.mk
+*.err
+*.log
+*.tmp
+
 # compiler output files
 /kernel/version_*.cc
 /share

From 4c17ac5ac2c97943166c788f5f25bd6b47158376 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 29 Sep 2025 23:03:29 +0200
Subject: [PATCH 645/931] .github: suggest Discourse in PR template

---
 .github/PULL_REQUEST_TEMPLATE.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 82daf609d..7eccdec3b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,9 @@
+_If your work is part of a larger effort, please discuss your general plans on [Discourse](https://yosyshq.discourse.group/) first to align your vision with maintainers._
+
 _What are the reasons/motivation for this change?_
 
 _Explain how this is achieved._
 
-_If applicable, please suggest to reviewers how they can test the change._
+_Make sure your change comes with tests. If not possible, share how a reviewer might evaluate it._
+
+_These template prompts can be deleted when you're done responding to them_
\ No newline at end of file

From b2adaeec6949e7318a269de00337d3fc1c5652d6 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 29 Sep 2025 23:03:54 +0200
Subject: [PATCH 646/931] .github: replace Slack and GitHub Discussions with
 Discourse in issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.yml      | 5 ++---
 .github/ISSUE_TEMPLATE/docs_report.yml     | 3 +--
 .github/ISSUE_TEMPLATE/feature_request.yml | 9 ++++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index e4c776ed9..f754d16c7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -6,15 +6,14 @@ body:
     attributes:
       value: >
 
-        If you have a general question, please ask it in the [Discussions](https://github.com/YosysHQ/yosys/discussions) area
-        or join our [IRC Channel](https://web.libera.chat/#yosys) or [Community Slack](https://join.slack.com/t/yosyshq/shared_invite/zt-1aopkns2q-EiQ97BeQDt_pwvE41sGSuA).
+        If you have a general question, please ask it on the [Discourse forum](https://yosyshq.discourse.group/).
 
 
         If you have a feature request, please fill out the appropriate issue form, this form is for bugs and/or regressions.
 
 
         Please contact [YosysHQ GmbH](https://www.yosyshq.com/) if you need
-        commercial support for Yosys.
+        commercial support or work done for Yosys.
 
   - type: input
     id: yosys_version
diff --git a/.github/ISSUE_TEMPLATE/docs_report.yml b/.github/ISSUE_TEMPLATE/docs_report.yml
index aa65c63b9..c3ad2f7cc 100644
--- a/.github/ISSUE_TEMPLATE/docs_report.yml
+++ b/.github/ISSUE_TEMPLATE/docs_report.yml
@@ -6,8 +6,7 @@ body:
     attributes:
       value: >
 
-        If you have a general question, please ask it in the [Discussions](https://github.com/YosysHQ/yosys/discussions) area
-        or join our [IRC Channel](https://web.libera.chat/#yosys) or [Community Slack](https://join.slack.com/t/yosyshq/shared_invite/zt-1aopkns2q-EiQ97BeQDt_pwvE41sGSuA).
+        If you have a general question, please ask it on the [Discourse forum](https://yosyshq.discourse.group/).
 
 
         If you have found a bug in Yosys, or in building the documentation,
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index c521b5296..49d86f341 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,18 +1,17 @@
 name: Feature Request
-description: "Submit a feature request for Yosys" 
+description: "Submit a feature request for Yosys"
 labels: ["feature-request"]
 body:
   - type: markdown
     attributes:
       value: >
 
-        If you have a general question, please ask it in the [Discussions](https://github.com/YosysHQ/yosys/discussions) area
-        or join our [IRC Channel](https://web.libera.chat/#yosys) or [Community Slack](https://join.slack.com/t/yosyshq/shared_invite/zt-1aopkns2q-EiQ97BeQDt_pwvE41sGSuA).
-        
+        If you have a general question, please ask it on the [Discourse forum](https://yosyshq.discourse.group/).
+
 
         If you have a bug report, please fill out the appropriate issue form, this form is for feature requests.
 
-        
+
         Please contact [YosysHQ GmbH](https://www.yosyshq.com/) if you need
         commercial support or work done for Yosys.
 

From b86cc0d9b3bfbea3afcd98881b20ab3026131437 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 29 Sep 2025 23:20:06 +0200
Subject: [PATCH 647/931] docs: replace Slack with Discourse in extensions
 writing guide

---
 docs/source/yosys_internals/extending_yosys/extensions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/yosys_internals/extending_yosys/extensions.rst b/docs/source/yosys_internals/extending_yosys/extensions.rst
index d30dd2bae..44b1edabc 100644
--- a/docs/source/yosys_internals/extending_yosys/extensions.rst
+++ b/docs/source/yosys_internals/extending_yosys/extensions.rst
@@ -9,7 +9,7 @@ Writing extensions
 .. todo:: update to use :file:`/code_examples/extensions/test*.log`
 
 This chapter contains some bits and pieces of information about programming
-yosys extensions. Don't be afraid to ask questions on the YosysHQ Slack.
+yosys extensions. Don't be afraid to ask questions on the Yosys HQ Discourse.
 
 .. todo:: mention coding guide
 

From 5fd2aecd90ff36bffeb5a4cebc7cfb61d862e877 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Sep 2025 00:23:05 +0000
Subject: [PATCH 648/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7a2e8419b..317dbeb9b 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+218
+YOSYS_VER := 0.57+244
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From e6fa0223c80d3d4f81d22e582be390c4aafaf971 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 30 Sep 2025 08:44:31 +0200
Subject: [PATCH 649/931] Force linking log_compat when extensions are linked

---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index 317dbeb9b..91f596258 100644
--- a/Makefile
+++ b/Makefile
@@ -530,8 +530,12 @@ ifeq ($(ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS),1)
 VERIFIC_COMPONENTS += extensions
 CXXFLAGS += -DYOSYSHQ_VERIFIC_EXTENSIONS
 else
+# YosysHQ flavor of Verific always needs extensions linked
+# if disabled it will just not be invoked but parts
+# are required for it to initialize properly
 ifneq ($(wildcard $(VERIFIC_DIR)/extensions),)
 VERIFIC_COMPONENTS += extensions
+OBJS += kernel/log_compat.o
 endif
 endif
 CXXFLAGS += $(patsubst %,-I$(VERIFIC_DIR)/%,$(VERIFIC_COMPONENTS)) -DYOSYS_ENABLE_VERIFIC

From dc7764e2473d5e9c9adcf80052173fc97246ecfe Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 30 Sep 2025 11:03:19 +0200
Subject: [PATCH 650/931] .github: typos

---
 .github/PULL_REQUEST_TEMPLATE.md                           | 2 +-
 docs/source/yosys_internals/extending_yosys/extensions.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7eccdec3b..d8d929f3f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,4 +6,4 @@ _Explain how this is achieved._
 
 _Make sure your change comes with tests. If not possible, share how a reviewer might evaluate it._
 
-_These template prompts can be deleted when you're done responding to them_
\ No newline at end of file
+_These template prompts can be deleted when you're done responding to them._
\ No newline at end of file
diff --git a/docs/source/yosys_internals/extending_yosys/extensions.rst b/docs/source/yosys_internals/extending_yosys/extensions.rst
index 44b1edabc..74a7d72d6 100644
--- a/docs/source/yosys_internals/extending_yosys/extensions.rst
+++ b/docs/source/yosys_internals/extending_yosys/extensions.rst
@@ -9,7 +9,7 @@ Writing extensions
 .. todo:: update to use :file:`/code_examples/extensions/test*.log`
 
 This chapter contains some bits and pieces of information about programming
-yosys extensions. Don't be afraid to ask questions on the Yosys HQ Discourse.
+yosys extensions. Don't be afraid to ask questions on the YosysHQ Discourse.
 
 .. todo:: mention coding guide
 

From 6b43fca8df94590f2b75f8ef8c76445517af878d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 04:57:08 +0000
Subject: [PATCH 651/931] Make the Const string constructor take the string by
 value and move it into the const

---
 kernel/rtlil.cc | 4 ++--
 kernel/rtlil.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 8daf2c821..adcc5f41c 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -264,10 +264,10 @@ std::string& Const::get_str() {
 	return *get_if_str();
 }
 
-RTLIL::Const::Const(const std::string &str)
+RTLIL::Const::Const(std::string str)
 {
 	flags = RTLIL::CONST_FLAG_STRING;
-	new ((void*)&str_) std::string(str);
+	new ((void*)&str_) std::string(std::move(str));
 	tag = backing_tag::string;
 }
 
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 5271a3111..74a57e554 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -859,7 +859,7 @@ private:
 
 public:
 	Const() : flags(RTLIL::CONST_FLAG_NONE), tag(backing_tag::bits), bits_(std::vector<RTLIL::State>()) {}
-	Const(const std::string &str);
+	Const(std::string str);
 	Const(long long val); // default width is 32
 	Const(long long val, int width);
 	Const(RTLIL::State bit, int width = 1);

From 39c6e06e3d6581d12a8d82def2669fa92cedc9a6 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 04:58:39 +0000
Subject: [PATCH 652/931] Add an IdString(std::string_view) constructor for
 efficiency when we already know the string length

---
 kernel/rtlil.h | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 74a57e554..a24a82f55 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -209,10 +209,15 @@ struct RTLIL::IdString
 	}
 
 	static int get_reference(const char *p)
+	{
+		return get_reference(std::string_view(p));
+	}
+
+	static int get_reference(std::string_view p)
 	{
 		log_assert(destruct_guard_ok);
 
-		auto it = global_id_index_.find((char*)p);
+		auto it = global_id_index_.find(p);
 		if (it != global_id_index_.end()) {
 	#ifndef YOSYS_NO_IDS_REFCNT
 			global_refcount_storage_.at(it->second)++;
@@ -226,14 +231,13 @@ struct RTLIL::IdString
 
 		ensure_prepopulated();
 
-		if (!p[0])
+		if (p.empty())
 			return 0;
 
 		log_assert(p[0] == '$' || p[0] == '\\');
-		log_assert(p[1] != 0);
-		for (const char *c = p; *c; c++)
-			if ((unsigned)*c <= (unsigned)' ')
-				log_error("Found control character or space (0x%02x) in string '%s' which is not allowed in RTLIL identifiers\n", *c, p);
+		for (char ch : p)
+			if ((unsigned)ch <= (unsigned)' ')
+				log_error("Found control character or space (0x%02x) in string '%s' which is not allowed in RTLIL identifiers\n", ch, std::string(p).c_str());
 
 	#ifndef YOSYS_NO_IDS_REFCNT
 		if (global_free_idx_list_.empty()) {
@@ -245,8 +249,11 @@ struct RTLIL::IdString
 
 		int idx = global_free_idx_list_.back();
 		global_free_idx_list_.pop_back();
-		global_id_storage_.at(idx) = strdup(p);
-		global_id_index_[global_id_storage_.at(idx)] = idx;
+		char* buf = static_cast<char*>(malloc(p.size() + 1));
+		memcpy(buf, p.data(), p.size());
+		buf[p.size()] = 0;
+		global_id_storage_.at(idx) = buf;
+		global_id_index_.insert(it, {std::string_view(buf, p.size()), idx});
 		global_refcount_storage_.at(idx)++;
 	#else
 		int idx = global_id_storage_.size();
@@ -255,7 +262,7 @@ struct RTLIL::IdString
 	#endif
 
 		if (yosys_xtrace) {
-			log("#X# New IdString '%s' with index %d.\n", p, idx);
+			log("#X# New IdString '%s' with index %d.\n", global_id_storage_.at(idx), idx);
 			log_backtrace("-X- ", yosys_xtrace-1);
 		}
 
@@ -322,7 +329,8 @@ struct RTLIL::IdString
 	inline IdString(const char *str) : index_(get_reference(str)) { }
 	inline IdString(const IdString &str) : index_(get_reference(str.index_)) { }
 	inline IdString(IdString &&str) : index_(str.index_) { str.index_ = 0; }
-	inline IdString(const std::string &str) : index_(get_reference(str.c_str())) { }
+	inline IdString(const std::string &str) : index_(get_reference(std::string_view(str))) { }
+	inline IdString(std::string_view str) : index_(get_reference(str)) { }
 	inline IdString(StaticId id) : index_(static_cast<short>(id)) {}
 	inline ~IdString() { put_reference(index_); }
 

From 86d8dd6224628609b703f811e41dd0d282d8a6d0 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 04:59:20 +0000
Subject: [PATCH 653/931] Add a moving assignment operator for IdString to
 avoid refcount churn

---
 kernel/rtlil.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index a24a82f55..794cabd70 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -339,6 +339,12 @@ struct RTLIL::IdString
 		index_ = get_reference(rhs.index_);
 	}
 
+	inline void operator=(IdString &&rhs) {
+		put_reference(index_);
+		index_ = rhs.index_;
+		rhs.index_ = 0;
+	}
+
 	inline void operator=(const char *rhs) {
 		IdString id(rhs);
 		*this = id;

From db3d9a1baf567b6e005265ad97aff4b34ad6f89e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 05:01:50 +0000
Subject: [PATCH 654/931] When adding named elements to an RTLIL::Module,
 std::move the name to avoid refcount churn

---
 kernel/rtlil.cc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index adcc5f41c..40c23f163 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -3050,7 +3050,7 @@ void RTLIL::Module::fixup_ports()
 RTLIL::Wire *RTLIL::Module::addWire(RTLIL::IdString name, int width)
 {
 	RTLIL::Wire *wire = new RTLIL::Wire;
-	wire->name = name;
+	wire->name = std::move(name);
 	wire->width = width;
 	add(wire);
 	return wire;
@@ -3058,7 +3058,7 @@ RTLIL::Wire *RTLIL::Module::addWire(RTLIL::IdString name, int width)
 
 RTLIL::Wire *RTLIL::Module::addWire(RTLIL::IdString name, const RTLIL::Wire *other)
 {
-	RTLIL::Wire *wire = addWire(name);
+	RTLIL::Wire *wire = addWire(std::move(name));
 	wire->width = other->width;
 	wire->start_offset = other->start_offset;
 	wire->port_id = other->port_id;
@@ -3073,7 +3073,7 @@ RTLIL::Wire *RTLIL::Module::addWire(RTLIL::IdString name, const RTLIL::Wire *oth
 RTLIL::Cell *RTLIL::Module::addCell(RTLIL::IdString name, RTLIL::IdString type)
 {
 	RTLIL::Cell *cell = new RTLIL::Cell;
-	cell->name = name;
+	cell->name = std::move(name);
 	cell->type = type;
 	add(cell);
 	return cell;
@@ -3081,7 +3081,7 @@ RTLIL::Cell *RTLIL::Module::addCell(RTLIL::IdString name, RTLIL::IdString type)
 
 RTLIL::Cell *RTLIL::Module::addCell(RTLIL::IdString name, const RTLIL::Cell *other)
 {
-	RTLIL::Cell *cell = addCell(name, other->type);
+	RTLIL::Cell *cell = addCell(std::move(name), other->type);
 	cell->connections_ = other->connections_;
 	cell->parameters = other->parameters;
 	cell->attributes = other->attributes;
@@ -3091,7 +3091,7 @@ RTLIL::Cell *RTLIL::Module::addCell(RTLIL::IdString name, const RTLIL::Cell *oth
 RTLIL::Memory *RTLIL::Module::addMemory(RTLIL::IdString name, const RTLIL::Memory *other)
 {
 	RTLIL::Memory *mem = new RTLIL::Memory;
-	mem->name = name;
+	mem->name = std::move(name);
 	mem->width = other->width;
 	mem->start_offset = other->start_offset;
 	mem->size = other->size;
@@ -3103,7 +3103,7 @@ RTLIL::Memory *RTLIL::Module::addMemory(RTLIL::IdString name, const RTLIL::Memor
 RTLIL::Process *RTLIL::Module::addProcess(RTLIL::IdString name)
 {
 	RTLIL::Process *proc = new RTLIL::Process;
-	proc->name = name;
+	proc->name = std::move(name);
 	add(proc);
 	return proc;
 }
@@ -3111,7 +3111,7 @@ RTLIL::Process *RTLIL::Module::addProcess(RTLIL::IdString name)
 RTLIL::Process *RTLIL::Module::addProcess(RTLIL::IdString name, const RTLIL::Process *other)
 {
 	RTLIL::Process *proc = other->clone();
-	proc->name = name;
+	proc->name = std::move(name);
 	add(proc);
 	return proc;
 }

From 7f550468ead3a3b097a339ffb23fce9a73435fe2 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 05:02:52 +0000
Subject: [PATCH 655/931] Update RTLIL text representation docs

---
 docs/source/appendix/rtlil_text.rst | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/docs/source/appendix/rtlil_text.rst b/docs/source/appendix/rtlil_text.rst
index b1bc9c582..352b1af2e 100644
--- a/docs/source/appendix/rtlil_text.rst
+++ b/docs/source/appendix/rtlil_text.rst
@@ -63,6 +63,10 @@ significant bit first. Bits may be any of:
 -  ``m``: A marked bit (internal use only)
 -  ``-``: A don't care value
 
+When the bit representation has fewer bits than the width, it is padded to the width with
+the most significant explicit bit, or ``0`` if the most significant explicit bit is ``1``,
+or ``x`` if there are no explicit bits.
+
 An *integer* is simply a signed integer value in decimal format. **Warning:**
 Integer constants are limited to 32 bits. That is, they may only be in the range
 :math:`[-2147483648, 2147483648)`. Integers outside this range will result in an
@@ -133,6 +137,7 @@ wires, memories, cells, processes, and connections.
     <module>            ::= <attr-stmt>* <module-stmt> <module-body> <module-end-stmt>
     <module-stmt>       ::= module <id> <eol>
     <module-body>       ::= (<param-stmt> 
+                         |   <conn-stmt>
                          |   <wire> 
                          |   <memory> 
                          |   <cell> 
@@ -170,6 +175,11 @@ See :ref:`sec:rtlil_sigspec` for an overview of signal specifications.
                |  <sigspec> [ <integer> (:<integer>)? ] 
                |  { <sigspec>* }
 
+When a ``<wire-id>`` is specified, the wire must have been previously declared.
+
+When a signal slice is specified, the left-hand integer must be greather than or
+equal to the right-hand integer.
+
 Connections
 ^^^^^^^^^^^
 
@@ -268,7 +278,7 @@ may have zero or more attributes.
 .. code:: BNF
 
     <switch>            ::= <switch-stmt> <case>* <switch-end-stmt>
-    <switch-stmt>        := <attr-stmt>* switch <sigspec> <eol>
+    <switch-stmt>       ::= <attr-stmt>* switch <sigspec> <eol>
     <case>              ::= <attr-stmt>* <case-stmt> <case-body>
     <case-stmt>         ::= case <compare>? <eol>
     <compare>           ::= <sigspec> (, <sigspec>)*
@@ -295,3 +305,4 @@ be:
                      |  sync always <eol>
     <sync-type>     ::= low | high | posedge | negedge | edge
     <update-stmt>   ::= update <dest-sigspec> <src-sigspec> <eol>
+                     |  <attr-stmt>* memwr <id> <sigspec> <sigspec> <sigspec> <constant> <eol>

From 01eaaa4b902117f5819f076f7daaa0be0d48093d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 1 Oct 2025 00:26:18 +0000
Subject: [PATCH 656/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 91f596258..54ad13d7c 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+244
+YOSYS_VER := 0.57+254
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From ac4cb5e460f200c71f2bf7dd826404f87b9db340 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 12 Sep 2025 05:04:06 +0000
Subject: [PATCH 657/931] Implement a handwritten recursive-descent RTLIL
 parser with minimal copying

---
 frontends/rtlil/Makefile.inc      |  18 -
 frontends/rtlil/rtlil_frontend.cc | 783 ++++++++++++++++++++++++++++--
 frontends/rtlil/rtlil_frontend.h  |  52 --
 frontends/rtlil/rtlil_lexer.l     | 150 ------
 frontends/rtlil/rtlil_parser.y    | 525 --------------------
 5 files changed, 755 insertions(+), 773 deletions(-)
 delete mode 100644 frontends/rtlil/rtlil_frontend.h
 delete mode 100644 frontends/rtlil/rtlil_lexer.l
 delete mode 100644 frontends/rtlil/rtlil_parser.y

diff --git a/frontends/rtlil/Makefile.inc b/frontends/rtlil/Makefile.inc
index d0c0cfcf8..4649507f7 100644
--- a/frontends/rtlil/Makefile.inc
+++ b/frontends/rtlil/Makefile.inc
@@ -1,19 +1 @@
-
-GENFILES += frontends/rtlil/rtlil_parser.tab.cc
-GENFILES += frontends/rtlil/rtlil_parser.tab.hh
-GENFILES += frontends/rtlil/rtlil_parser.output
-GENFILES += frontends/rtlil/rtlil_lexer.cc
-
-frontends/rtlil/rtlil_parser.tab.cc: frontends/rtlil/rtlil_parser.y
-	$(Q) mkdir -p $(dir $@)
-	$(P) $(BISON) -o $@ -d -r all -b frontends/rtlil/rtlil_parser $<
-
-frontends/rtlil/rtlil_parser.tab.hh: frontends/rtlil/rtlil_parser.tab.cc
-
-frontends/rtlil/rtlil_lexer.cc: frontends/rtlil/rtlil_lexer.l
-	$(Q) mkdir -p $(dir $@)
-	$(P) flex -o frontends/rtlil/rtlil_lexer.cc $<
-
-OBJS += frontends/rtlil/rtlil_parser.tab.o frontends/rtlil/rtlil_lexer.o
 OBJS += frontends/rtlil/rtlil_frontend.o
-
diff --git a/frontends/rtlil/rtlil_frontend.cc b/frontends/rtlil/rtlil_frontend.cc
index e8d6ac9c9..d7511055b 100644
--- a/frontends/rtlil/rtlil_frontend.cc
+++ b/frontends/rtlil/rtlil_frontend.cc
@@ -17,27 +17,762 @@
  *
  *  ---
  *
- *  A very simple and straightforward frontend for the RTLIL text
- *  representation.
+ *  A handwritten recursive-descent parser for the RTLIL text representation.
  *
  */
 
-#include "rtlil_frontend.h"
 #include "kernel/register.h"
 #include "kernel/log.h"
-
-void rtlil_frontend_yyerror(char const *s)
-{
-	YOSYS_NAMESPACE_PREFIX log_error("Parser error in line %d: %s\n", rtlil_frontend_yyget_lineno(), s);
-}
-
-void rtlil_frontend_yywarning(char const *s)
-{
-	YOSYS_NAMESPACE_PREFIX log_warning("In line %d: %s\n", rtlil_frontend_yyget_lineno(), s);
-}
+#include "kernel/utils.h"
+#include <charconv>
+#include <deque>
+#include <optional>
 
 YOSYS_NAMESPACE_BEGIN
 
+struct RTLILFrontendWorker {
+	std::istream *f = nullptr;
+	RTLIL::Design *design;
+	bool flag_nooverwrite = false;
+	bool flag_overwrite = false;
+	bool flag_lib = false;
+
+	int line_num;
+	std::string line_buf;
+	// Substring of line_buf. Always newline-terminated, thus never empty.
+	std::string_view line;
+
+	RTLIL::Module *current_module;
+	dict<RTLIL::IdString, RTLIL::Const> attrbuf;
+	std::vector<std::vector<RTLIL::SwitchRule*>*> switch_stack;
+	std::vector<RTLIL::CaseRule*> case_stack;
+
+	template <typename... Args>
+	[[noreturn]]
+	void error(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+	{
+		log_error("Parser error in line %d: %s\n", line_num, fmt.format(args...));
+	}
+
+	template <typename... Args>
+	void warning(FmtString<TypeIdentity<Args>...> fmt, const Args &... args)
+	{
+		log_warning("In line %d: %s\n", line_num, fmt.format(args...));
+	}
+
+	// May return an empty line if the stream is not good().
+	void advance_to_next_nonempty_line()
+	{
+		if (!f->good()) {
+			line = "\n";
+			return;
+		}
+		while (true) {
+			std::getline(*f, line_buf);
+			line_num++;
+			if (line_buf.empty() || line_buf[line_buf.size() - 1] != '\n')
+				line_buf += '\n';
+			line = line_buf;
+			consume_whitespace_and_comments();
+			if (line[0] != '\n' || !f->good())
+				break;
+		}
+	}
+
+	void consume_whitespace_and_comments()
+	{
+		while (true) {
+			switch (line[0]) {
+			case ' ':
+			case '\t':
+				line = line.substr(1);
+				break;
+			case '#':
+				line = "\n";
+				return;
+			default:
+				return;
+			}
+		}
+	}
+
+	bool try_parse_keyword(std::string_view keyword)
+	{
+		int keyword_size = keyword.size();
+		if (keyword != line.substr(0, keyword_size))
+			return false;
+		// This index is safe because `line` is always newline-terminated
+		// and `keyword` never contains a newline.
+		char ch = line[keyword_size];
+		if (ch >= 'a' && ch <= 'z')
+			return false;
+		line = line.substr(keyword_size);
+		consume_whitespace_and_comments();
+		return true;
+	}
+
+	std::string error_token()
+	{
+		std::string result;
+		for (char ch : line) {
+			if (ch == '\n' || ch == ' ' || ch == '\t')
+				break;
+			result += ch;
+		}
+		return result;
+	}
+
+	void expect_keyword(std::string_view keyword)
+	{
+		if (!try_parse_keyword(keyword))
+			error("Expected token `%s', got `%s'.", keyword, error_token());
+	}
+
+	bool try_parse_char(char ch)
+	{
+		if (line[0] != ch)
+			return false;
+		line = line.substr(1);
+		consume_whitespace_and_comments();
+		return true;
+	}
+
+	void expect_char(char ch)
+	{
+		if (!try_parse_char(ch))
+			error("Expected `%c', got `%s'.", ch, error_token());
+	}
+
+	bool try_parse_eol()
+	{
+		if (line[0] != '\n')
+			return false;
+		advance_to_next_nonempty_line();
+		return true;
+	}
+
+	void expect_eol()
+	{
+		if (!try_parse_eol())
+			error("Expected EOL, got `%s'.", error_token());
+	}
+
+	std::optional<RTLIL::IdString> try_parse_id()
+	{
+		char ch = line[0];
+		if (ch != '\\' && ch != '$')
+			return std::nullopt;
+		int idx = 1;
+		while (true) {
+			ch = line[idx];
+			if (ch <= ' ' && (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r'))
+				break;
+			++idx;
+		}
+		IdString result(line.substr(0, idx));
+		line = line.substr(idx);
+		consume_whitespace_and_comments();
+		return result;
+	}
+
+	RTLIL::IdString parse_id()
+	{
+		std::optional<RTLIL::IdString> id = try_parse_id();
+		if (!id.has_value())
+			error("Expected ID, got `%s'.", error_token());
+		return std::move(*id);
+	}
+
+	long long parse_integer()
+	{
+		long long result = parse_integer_alone();
+		consume_whitespace_and_comments();
+		return result;
+	}
+
+	long long parse_integer_alone()
+	{
+		int idx = 0;
+		if (line[idx] == '-')
+			++idx;
+		while (true) {
+			char ch = line[idx];
+			if (ch < '0' || ch > '9')
+				break;
+			++idx;
+		}
+		long long result;
+		if (std::from_chars(line.data(), line.data() + idx, result, 10).ec != std::errc{})
+			error("Invalid integer `%s'.", error_token());
+		line = line.substr(idx);
+		return result;
+	}
+
+	std::string parse_string()
+	{
+		if (line[0] != '\"')
+			error("Expected string, got `%s'.", error_token());
+		std::string str;
+		int idx = 1;
+		while (true) {
+			int start_idx = idx;
+			char ch;
+			while (true) {
+				ch = line[idx];
+				if (ch == '"' || ch == '\n' || ch == '\\' || ch == 0)
+					break;
+				++idx;
+			}
+			str.append(line.data() + start_idx, line.data() + idx);
+			++idx;
+			if (ch == '"')
+				break;
+			if (ch == 0)
+				error("Null byte in string literal: `%s'.", line);
+			if (ch == '\n')
+				error("Unterminated string literal: `%s'.", line);
+			ch = line[idx++];
+			if (ch == 'n') {
+				ch = '\n';
+			} else if (ch == 't') {
+				ch = '\t';
+			} else if (ch >= '0' && ch <= '7') {
+				int v = ch - '0';
+				char next_ch = line[idx + 1];
+				if (next_ch >= '0' && next_ch <= '7') {
+					++idx;
+					v = v*8 + (next_ch - '0');
+					next_ch = line[idx + 1];
+					if (next_ch >= '0' && next_ch <= '7') {
+						++idx;
+						v = v*8 + (next_ch - '0');
+					}
+				}
+				ch = v;
+			}
+			str += ch;
+		}
+		line = line.substr(idx);
+		consume_whitespace_and_comments();
+		return str;
+	}
+
+	RTLIL::Const parse_const()
+	{
+		if (line[0] == '"')
+			return RTLIL::Const(parse_string());
+
+		bool negative_value = line[0] == '-';
+		long long width = parse_integer_alone();
+		// Can't test value<0 here because we need to stop parsing after '-0'
+		if (negative_value || line[0] != '\'') {
+			if (width < INT_MIN || width > INT_MAX)
+				error("Integer %lld out of range in `%s'.", width, error_token());
+			consume_whitespace_and_comments();
+			return RTLIL::Const(width);
+		}
+
+		int idx = 1;
+		bool is_signed = line[1] == 's';
+		if (is_signed)
+			++idx;
+
+		std::vector<RTLIL::State> bits;
+		bits.reserve(width);
+		while (true) {
+			RTLIL::State bit;
+			switch (line[idx]) {
+			case '0': bit = RTLIL::S0; break;
+			case '1': bit = RTLIL::S1; break;
+			case 'x': bit = RTLIL::Sx; break;
+			case 'z': bit = RTLIL::Sz; break;
+			case 'm': bit = RTLIL::Sm; break;
+			case '-': bit = RTLIL::Sa; break;
+			default: goto done;
+			}
+			bits.push_back(bit);
+			++idx;
+		}
+		done:
+		std::reverse(bits.begin(), bits.end());
+
+		if (GetSize(bits) > width)
+			bits.resize(width);
+		else if (GetSize(bits) < width) {
+			RTLIL::State extbit = RTLIL::Sx;
+			if (!bits.empty()) {
+				extbit = bits.back();
+				if (extbit == RTLIL::S1)
+					extbit = RTLIL::S0;
+			}
+			bits.resize(width, extbit);
+		}
+
+		RTLIL::Const val(std::move(bits));
+		if (is_signed)
+			val.flags |= RTLIL::CONST_FLAG_SIGNED;
+		line = line.substr(idx);
+		consume_whitespace_and_comments();
+		return val;
+	}
+
+	RTLIL::SigSpec parse_sigspec()
+	{
+		if (try_parse_char('{')) {
+			std::vector<SigSpec> parts;
+			while (!try_parse_char('}'))
+				parts.push_back(parse_sigspec());
+			RTLIL::SigSpec sig;
+			for (auto it = parts.rbegin(); it != parts.rend(); ++it)
+				sig.append(std::move(*it));
+			return sig;
+		}
+
+		RTLIL::SigSpec sig;
+
+		// We could add a special path for parsing IdStrings that must already exist,
+		// as here.
+		// We don't need to addref/release in this case.
+		std::optional<RTLIL::IdString> id = try_parse_id();
+		if (id.has_value()) {
+			RTLIL::Wire *wire = current_module->wire(*id);
+			if (wire == nullptr)
+				error("Wire `%s' not found.", *id);
+			sig = RTLIL::SigSpec(wire);
+		} else {
+			sig = RTLIL::SigSpec(parse_const());
+		}
+
+		while (try_parse_char('[')) {
+			int left = parse_integer();
+			if (left >= sig.size() || left < 0)
+				error("bit index %d out of range", left);
+			if (try_parse_char(':')) {
+				int right = parse_integer();
+				if (right < 0)
+					error("bit index %d out of range", right);
+				if (left < right)
+					error("invalid slice [%d:%d]", left, right);
+				sig = sig.extract(right, left-right+1);
+			} else {
+				sig = sig.extract(left);
+			}
+			expect_char(']');
+		}
+
+		return sig;
+	}
+
+	void parse_module()
+	{
+		RTLIL::IdString module_name = parse_id();
+		expect_eol();
+
+		bool delete_current_module = false;
+		if (design->has(module_name)) {
+			RTLIL::Module *existing_mod = design->module(module_name);
+			if (!flag_overwrite && (flag_lib || (attrbuf.count(ID::blackbox) && attrbuf.at(ID::blackbox).as_bool()))) {
+				log("Ignoring blackbox re-definition of module %s.\n", module_name);
+				delete_current_module = true;
+			} else if (!flag_nooverwrite && !flag_overwrite && !existing_mod->get_bool_attribute(ID::blackbox)) {
+				error("RTLIL error: redefinition of module %s.", module_name);
+			} else if (flag_nooverwrite) {
+				log("Ignoring re-definition of module %s.\n", module_name);
+				delete_current_module = true;
+			} else {
+				log("Replacing existing%s module %s.\n", existing_mod->get_bool_attribute(ID::blackbox) ? " blackbox" : "", module_name);
+				design->remove(existing_mod);
+			}
+		}
+
+		current_module = new RTLIL::Module;
+		current_module->name = std::move(module_name);
+		current_module->attributes = std::move(attrbuf);
+		if (!delete_current_module)
+			design->add(current_module);
+
+		while (true)
+		{
+			if (try_parse_keyword("attribute")) {
+				parse_attribute();
+				continue;
+			}
+			if (try_parse_keyword("parameter")) {
+				parse_parameter();
+				continue;
+			}
+			if (try_parse_keyword("connect")) {
+				parse_connect();
+				continue;
+			}
+			if (try_parse_keyword("wire")) {
+				parse_wire();
+				continue;
+			}
+			if (try_parse_keyword("cell")) {
+				parse_cell();
+				continue;
+			}
+			if (try_parse_keyword("memory")) {
+				parse_memory();
+				continue;
+			}
+			if (try_parse_keyword("process")) {
+				parse_process();
+				continue;
+			}
+			if (try_parse_keyword("end")) {
+				expect_eol();
+				break;
+			}
+			error("Unexpected token in module body: %s", error_token());
+		}
+
+		if (attrbuf.size() != 0)
+			error("dangling attribute");
+		current_module->fixup_ports();
+		if (delete_current_module)
+			delete current_module;
+		else if (flag_lib)
+			current_module->makeblackbox();
+		current_module = nullptr;
+	}
+
+	void parse_attribute()
+	{
+		RTLIL::IdString id = parse_id();
+		RTLIL::Const c = parse_const();
+		attrbuf.insert({std::move(id), std::move(c)});
+		expect_eol();
+	}
+
+	void parse_parameter()
+	{
+		RTLIL::IdString id = parse_id();
+		current_module->avail_parameters(id);
+		if (try_parse_eol())
+			return;
+		RTLIL::Const c = parse_const();
+		current_module->parameter_default_values.insert({std::move(id), std::move(c)});
+		expect_eol();
+	}
+
+	void parse_wire()
+	{
+		RTLIL::Wire *wire;
+		int width = 1;
+		int start_offset = 0;
+		int port_id = 0;
+		bool port_input = false;
+		bool port_output = false;
+		bool upto = false;
+		bool is_signed = false;
+
+		while (true)
+		{
+			std::optional<RTLIL::IdString> id = try_parse_id();
+			if (id.has_value()) {
+				if (current_module->wire(*id) != nullptr)
+					error("RTLIL error: redefinition of wire %s.", *id);
+				wire = current_module->addWire(std::move(*id));
+				break;
+			}
+			if (try_parse_keyword("width"))
+				width = parse_integer();
+			else if (try_parse_keyword("upto"))
+				upto = true;
+			else if (try_parse_keyword("signed"))
+				is_signed = true;
+			else if (try_parse_keyword("offset"))
+				start_offset = parse_integer();
+			else if (try_parse_keyword("input")) {
+				port_id = parse_integer();
+				port_input = true;
+			} else if (try_parse_keyword("output")) {
+				port_id = parse_integer();
+				port_output = true;
+			} else if (try_parse_keyword("inout")) {
+				port_id = parse_integer();
+				port_input = true;
+				port_output = true;
+			} else if (try_parse_eol())
+				error("Missing wire ID");
+			else
+				error("Unexpected wire option: %s", error_token());
+		}
+
+		wire->attributes = std::move(attrbuf);
+		wire->width = width;
+		wire->upto = upto;
+		wire->start_offset = start_offset;
+		wire->is_signed = is_signed;
+		wire->port_id = port_id;
+		wire->port_input = port_input;
+		wire->port_output = port_output;
+		expect_eol();
+	}
+
+	void parse_memory()
+	{
+		RTLIL::Memory *memory = new RTLIL::Memory;
+		memory->attributes = std::move(attrbuf);
+
+		int width = 1;
+		int start_offset = 0;
+		int size = 0;
+		while (true)
+		{
+			std::optional<RTLIL::IdString> id = try_parse_id();
+			if (id.has_value()) {
+				if (current_module->memories.count(*id) != 0)
+					error("RTLIL error: redefinition of memory %s.", *id);
+				memory->name = std::move(*id);
+				break;
+			}
+			if (try_parse_keyword("width"))
+				width = parse_integer();
+			else if (try_parse_keyword("size"))
+				size = parse_integer();
+			else if (try_parse_keyword("offset"))
+				start_offset = parse_integer();
+			else if (try_parse_eol())
+				error("Missing memory ID");
+			else
+				error("Unexpected memory option: %s", error_token());
+		}
+		memory->width = width;
+		memory->start_offset = start_offset;
+		memory->size = size;
+		current_module->memories.insert({memory->name, memory});
+		expect_eol();
+	}
+
+	void parse_cell()
+	{
+		RTLIL::IdString cell_type = parse_id();
+		RTLIL::IdString cell_name = parse_id();
+		expect_eol();
+
+		if (current_module->cell(cell_name) != nullptr)
+			error("RTLIL error: redefinition of cell %s.", cell_name);
+		RTLIL::Cell *cell = current_module->addCell(cell_name, cell_type);
+		cell->attributes = std::move(attrbuf);
+
+		while (true)
+		{
+			if (try_parse_keyword("parameter")) {
+				bool is_signed = false;
+				bool is_real = false;
+				if (try_parse_keyword("signed")) {
+					is_signed = true;
+				} else if (try_parse_keyword("real")) {
+					is_real = true;
+				}
+				RTLIL::IdString param_name = parse_id();
+				RTLIL::Const val = parse_const();
+				if (is_signed)
+					val.flags |= RTLIL::CONST_FLAG_SIGNED;
+				if (is_real)
+					val.flags |= RTLIL::CONST_FLAG_REAL;
+				cell->parameters.insert({std::move(param_name), std::move(val)});
+				expect_eol();
+			} else if (try_parse_keyword("connect")) {
+				RTLIL::IdString port_name = parse_id();
+				if (cell->hasPort(port_name))
+					error("RTLIL error: redefinition of cell port %s.", port_name);
+				cell->setPort(std::move(port_name), parse_sigspec());
+				expect_eol();
+			} else if (try_parse_keyword("end")) {
+				expect_eol();
+				break;
+			} else {
+				error("Unexpected token in cell body: %s", error_token());
+			}
+		}
+	}
+
+	void parse_connect()
+	{
+		if (attrbuf.size() != 0)
+			error("dangling attribute");
+		RTLIL::SigSpec s1 = parse_sigspec();
+		RTLIL::SigSpec s2 = parse_sigspec();
+		current_module->connect(std::move(s1), std::move(s2));
+		expect_eol();
+	}
+
+	void parse_case_body(RTLIL::CaseRule *current_case)
+	{
+		while (true)
+		{
+			if (try_parse_keyword("attribute"))
+				parse_attribute();
+			else if (try_parse_keyword("switch"))
+				parse_switch();
+			else if (try_parse_keyword("assign")) {
+				if (attrbuf.size() != 0)
+					error("dangling attribute");
+				// See https://github.com/YosysHQ/yosys/pull/4765 for discussion on this
+				// warning
+				if (!switch_stack.back()->empty())
+					warning("case rule assign statements after switch statements may cause unexpected behaviour. "
+						"The assign statement is reordered to come before all switch statements.");
+				RTLIL::SigSpec s1 = parse_sigspec();
+				RTLIL::SigSpec s2 = parse_sigspec();
+				current_case->actions.push_back(RTLIL::SigSig(std::move(s1), std::move(s2)));
+				expect_eol();
+			} else
+				return;
+		}
+	}
+
+	void parse_switch()
+	{
+		RTLIL::SwitchRule *rule = new RTLIL::SwitchRule;
+		rule->signal = parse_sigspec();
+		rule->attributes = std::move(attrbuf);
+		switch_stack.back()->push_back(rule);
+		expect_eol();
+
+		while (true) {
+			if (try_parse_keyword("attribute")) {
+				parse_attribute();
+				continue;
+			}
+
+			if (try_parse_keyword("end")) {
+				expect_eol();
+				break;
+			}
+
+			expect_keyword("case");
+			RTLIL::CaseRule *case_rule = new RTLIL::CaseRule;
+			case_rule->attributes = std::move(attrbuf);
+			rule->cases.push_back(case_rule);
+			switch_stack.push_back(&case_rule->switches);
+			case_stack.push_back(case_rule);
+
+			if (!try_parse_eol()) {
+				while (true) {
+					case_rule->compare.push_back(parse_sigspec());
+					if (try_parse_eol())
+						break;
+					expect_char(',');
+				}
+			}
+
+			parse_case_body(case_rule);
+
+			switch_stack.pop_back();
+			case_stack.pop_back();
+		}
+	}
+
+	void parse_process()
+	{
+		RTLIL::IdString proc_name = parse_id();
+		expect_eol();
+
+		if (current_module->processes.count(proc_name) != 0)
+			error("RTLIL error: redefinition of process %s.", proc_name);
+		RTLIL::Process *proc = current_module->addProcess(std::move(proc_name));
+		proc->attributes = std::move(attrbuf);
+
+		switch_stack.clear();
+		switch_stack.push_back(&proc->root_case.switches);
+		case_stack.clear();
+		case_stack.push_back(&proc->root_case);
+
+		parse_case_body(&proc->root_case);
+
+		while (try_parse_keyword("sync"))
+		{
+			RTLIL::SyncRule *rule = new RTLIL::SyncRule;
+
+			if (try_parse_keyword("low")) rule->type = RTLIL::ST0;
+			else if (try_parse_keyword("high")) rule->type = RTLIL::ST1;
+			else if (try_parse_keyword("posedge")) rule->type = RTLIL::STp;
+			else if (try_parse_keyword("negedge")) rule->type = RTLIL::STn;
+			else if (try_parse_keyword("edge")) rule->type = RTLIL::STe;
+			else if (try_parse_keyword("always")) rule->type = RTLIL::STa;
+			else if (try_parse_keyword("global")) rule->type = RTLIL::STg;
+			else if (try_parse_keyword("init")) rule->type = RTLIL::STi;
+			else error("Unexpected sync type: %s", error_token());
+
+			if (rule->type != RTLIL::STa && rule->type != RTLIL::STg && rule->type != RTLIL::STi)
+				rule->signal = parse_sigspec();
+			proc->syncs.push_back(rule);
+			expect_eol();
+
+			bool attributes_in_update_list = false;
+			while (true)
+			{
+				if (try_parse_keyword("update")) {
+					RTLIL::SigSpec s1 = parse_sigspec();
+					RTLIL::SigSpec s2 = parse_sigspec();
+					rule->actions.push_back(RTLIL::SigSig(std::move(s1), std::move(s2)));
+					expect_eol();
+					continue;
+				}
+
+				if (try_parse_keyword("attribute")) {
+					attributes_in_update_list = true;
+					parse_attribute();
+					continue;
+				}
+
+				if (!try_parse_keyword("memwr"))
+					break;
+
+				RTLIL::MemWriteAction act;
+				act.attributes = std::move(attrbuf);
+				act.memid = parse_id();
+				act.address = parse_sigspec();
+				act.data = parse_sigspec();
+				act.enable = parse_sigspec();
+				act.priority_mask = parse_const();
+				rule->mem_write_actions.push_back(std::move(act));
+				expect_eol();
+			}
+			// The old parser allowed dangling attributes before a "sync" to carry through
+			// the "sync", so we will too, for now.
+			if (attributes_in_update_list && attrbuf.size() > 0)
+				error("dangling attribute");
+		}
+
+		expect_keyword("end");
+		expect_eol();
+	}
+
+	RTLILFrontendWorker(RTLIL::Design *design) : design(design) {}
+
+	void parse(std::istream *f)
+	{
+		this->f = f;
+		line_num = 0;
+		advance_to_next_nonempty_line();
+		while (f->good())
+		{
+			if (try_parse_keyword("attribute")) {
+				parse_attribute();
+				continue;
+			}
+			if (try_parse_keyword("module")) {
+				parse_module();
+				continue;
+			}
+			if (try_parse_keyword("autoidx")) {
+				autoidx = std::max<int>(autoidx, parse_integer());
+				expect_eol();
+				continue;
+			}
+			error("Unexpected token: %s", error_token());
+		}
+		if (attrbuf.size() != 0)
+			error("dangling attribute");
+	}
+};
+
 struct RTLILFrontend : public Frontend {
 	RTLILFrontend() : Frontend("rtlil", "read modules from RTLIL file") { }
 	void help() override
@@ -63,9 +798,7 @@ struct RTLILFrontend : public Frontend {
 	}
 	void execute(std::istream *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design) override
 	{
-		RTLIL_FRONTEND::flag_nooverwrite = false;
-		RTLIL_FRONTEND::flag_overwrite = false;
-		RTLIL_FRONTEND::flag_lib = false;
+		RTLILFrontendWorker worker(design);
 
 		log_header(design, "Executing RTLIL frontend.\n");
 
@@ -73,17 +806,17 @@ struct RTLILFrontend : public Frontend {
 		for (argidx = 1; argidx < args.size(); argidx++) {
 			std::string arg = args[argidx];
 			if (arg == "-nooverwrite") {
-				RTLIL_FRONTEND::flag_nooverwrite = true;
-				RTLIL_FRONTEND::flag_overwrite = false;
+				worker.flag_nooverwrite = true;
+				worker.flag_overwrite = false;
 				continue;
 			}
 			if (arg == "-overwrite") {
-				RTLIL_FRONTEND::flag_nooverwrite = false;
-				RTLIL_FRONTEND::flag_overwrite = true;
+				worker.flag_nooverwrite = false;
+				worker.flag_overwrite = true;
 				continue;
 			}
 			if (arg == "-lib") {
-				RTLIL_FRONTEND::flag_lib = true;
+				worker.flag_lib = true;
 				continue;
 			}
 			break;
@@ -92,14 +825,8 @@ struct RTLILFrontend : public Frontend {
 
 		log("Input filename: %s\n", filename);
 
-		RTLIL_FRONTEND::lexin = f;
-		RTLIL_FRONTEND::current_design = design;
-		rtlil_frontend_yydebug = false;
-		rtlil_frontend_yyrestart(NULL);
-		rtlil_frontend_yyparse();
-		rtlil_frontend_yylex_destroy();
+		worker.parse(f);
 	}
 } RTLILFrontend;
 
 YOSYS_NAMESPACE_END
-
diff --git a/frontends/rtlil/rtlil_frontend.h b/frontends/rtlil/rtlil_frontend.h
deleted file mode 100644
index 31cfb80b4..000000000
--- a/frontends/rtlil/rtlil_frontend.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  yosys -- Yosys Open SYnthesis Suite
- *
- *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *  ---
- *
- *  A very simple and straightforward frontend for the RTLIL text
- *  representation.
- *
- */
-
-#ifndef RTLIL_FRONTEND_H
-#define RTLIL_FRONTEND_H
-
-#include "kernel/yosys.h"
-
-YOSYS_NAMESPACE_BEGIN
-
-namespace RTLIL_FRONTEND {
-	extern std::istream *lexin;
-	extern RTLIL::Design *current_design;
-	extern bool flag_nooverwrite;
-	extern bool flag_overwrite;
-	extern bool flag_lib;
-}
-
-YOSYS_NAMESPACE_END
-
-extern int rtlil_frontend_yydebug;
-int rtlil_frontend_yylex(void);
-void rtlil_frontend_yyerror(char const *s);
-void rtlil_frontend_yywarning(char const *s);
-void rtlil_frontend_yyrestart(FILE *f);
-int rtlil_frontend_yyparse(void);
-int rtlil_frontend_yylex_destroy(void);
-int rtlil_frontend_yyget_lineno(void);
-
-#endif
-
diff --git a/frontends/rtlil/rtlil_lexer.l b/frontends/rtlil/rtlil_lexer.l
deleted file mode 100644
index c374dd395..000000000
--- a/frontends/rtlil/rtlil_lexer.l
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- *  yosys -- Yosys Open SYnthesis Suite
- *
- *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *  ---
- *
- *  A very simple and straightforward frontend for the RTLIL text
- *  representation.
- *
- */
-
-%{
-
-#ifdef __clang__
-// bison generates code using the 'register' storage class specifier
-#pragma clang diagnostic ignored "-Wdeprecated-register"
-#endif
-
-#include <cstdlib>
-#include "frontends/rtlil/rtlil_frontend.h"
-#include "rtlil_parser.tab.hh"
-
-USING_YOSYS_NAMESPACE
-
-#define YY_INPUT(buf,result,max_size) \
-	result = readsome(*RTLIL_FRONTEND::lexin, buf, max_size)
-
-%}
-
-%option yylineno
-%option noyywrap
-%option nounput
-%option prefix="rtlil_frontend_yy"
-
-%x STRING
-
-%%
-
-"autoidx"	{ return TOK_AUTOIDX; }
-"module"	{ return TOK_MODULE; }
-"attribute"	{ return TOK_ATTRIBUTE; }
-"parameter"	{ return TOK_PARAMETER; }
-"signed"	{ return TOK_SIGNED; }
-"real"		{ return TOK_REAL; }
-"wire"		{ return TOK_WIRE; }
-"memory"	{ return TOK_MEMORY; }
-"width"		{ return TOK_WIDTH; }
-"upto"		{ return TOK_UPTO; }
-"offset"	{ return TOK_OFFSET; }
-"size"		{ return TOK_SIZE; }
-"input"		{ return TOK_INPUT; }
-"output"	{ return TOK_OUTPUT; }
-"inout"		{ return TOK_INOUT; }
-"cell"		{ return TOK_CELL; }
-"connect"	{ return TOK_CONNECT; }
-"switch"	{ return TOK_SWITCH; }
-"case"		{ return TOK_CASE; }
-"assign"	{ return TOK_ASSIGN; }
-"sync"		{ return TOK_SYNC; }
-"low"		{ return TOK_LOW; }
-"high"		{ return TOK_HIGH; }
-"posedge"	{ return TOK_POSEDGE; }
-"negedge"	{ return TOK_NEGEDGE; }
-"edge"		{ return TOK_EDGE; }
-"always"	{ return TOK_ALWAYS; }
-"global"	{ return TOK_GLOBAL; }
-"init"		{ return TOK_INIT; }
-"update"	{ return TOK_UPDATE; }
-"memwr"		{ return TOK_MEMWR; }
-"process"	{ return TOK_PROCESS; }
-"end"		{ return TOK_END; }
-
-[a-z]+		{ return TOK_INVALID; }
-
-"\\"[^ \t\r\n]+		{ rtlil_frontend_yylval.string = strdup(yytext); return TOK_ID; }
-"$"[^ \t\r\n]+		{ rtlil_frontend_yylval.string = strdup(yytext); return TOK_ID; }
-
-[0-9]+'s?[01xzm-]*	{ rtlil_frontend_yylval.string = strdup(yytext); return TOK_VALUE; }
--?[0-9]+		{
-	char *end = nullptr;
-	errno = 0;
-	long value = strtol(yytext, &end, 10);
-	log_assert(end == yytext + strlen(yytext));
-	if (errno == ERANGE)
-		return TOK_INVALID; // literal out of range of long
-	if (value < INT_MIN || value > INT_MAX)
-		return TOK_INVALID; // literal out of range of int (relevant mostly for LP64 platforms)
-	rtlil_frontend_yylval.integer = value;
-	return TOK_INT;
-}
-
-\"		{ BEGIN(STRING); }
-<STRING>\\.	{ yymore(); }
-<STRING>\"	{
-	BEGIN(0);
-	char *yystr = strdup(yytext);
-	yystr[strlen(yytext) - 1] = 0;
-	int i = 0, j = 0;
-	while (yystr[i]) {
-		if (yystr[i] == '\\' && yystr[i + 1]) {
-			i++;
-			if (yystr[i] == 'n')
-				yystr[i] = '\n';
-			else if (yystr[i] == 't')
-				yystr[i] = '\t';
-			else if ('0' <= yystr[i] && yystr[i] <= '7') {
-				yystr[i] = yystr[i] - '0';
-				if ('0' <= yystr[i + 1] && yystr[i + 1] <= '7') {
-					yystr[i + 1] = yystr[i] * 8 + yystr[i + 1] - '0';
-					i++;
-				}
-				if ('0' <= yystr[i + 1] && yystr[i + 1] <= '7') {
-					yystr[i + 1] = yystr[i] * 8 + yystr[i + 1] - '0';
-					i++;
-				}
-			}
-		}
-		yystr[j++] = yystr[i++];
-	}
-	yystr[j] = 0;
-	rtlil_frontend_yylval.string = yystr;
-	return TOK_STRING;
-}
-<STRING>.	{ yymore(); }
-
-"#"[^\n]*	/* ignore comments */
-[ \t]		/* ignore non-newline whitespaces */
-[\r\n]+		{ return TOK_EOL; }
-
-.               { return *yytext; }
-
-%%
-
-// this is a hack to avoid the 'yyinput defined but not used' error msgs
-void *rtlil_frontend_avoid_input_warnings() {
-	return (void*)&yyinput;
-}
diff --git a/frontends/rtlil/rtlil_parser.y b/frontends/rtlil/rtlil_parser.y
deleted file mode 100644
index 2b8d7b7ab..000000000
--- a/frontends/rtlil/rtlil_parser.y
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- *  yosys -- Yosys Open SYnthesis Suite
- *
- *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *  ---
- *
- *  A very simple and straightforward frontend for the RTLIL text
- *  representation.
- *
- */
-
-%require "3.0"
-
-%{
-#include <list>
-#include "frontends/rtlil/rtlil_frontend.h"
-YOSYS_NAMESPACE_BEGIN
-namespace RTLIL_FRONTEND {
-	std::istream *lexin;
-	RTLIL::Design *current_design;
-	RTLIL::Module *current_module;
-	RTLIL::Wire *current_wire;
-	RTLIL::Memory *current_memory;
-	RTLIL::Cell *current_cell;
-	RTLIL::Process *current_process;
-	std::vector<std::vector<RTLIL::SwitchRule*>*> switch_stack;
-	std::vector<RTLIL::CaseRule*> case_stack;
-	dict<RTLIL::IdString, RTLIL::Const> attrbuf;
-	bool flag_nooverwrite, flag_overwrite, flag_lib;
-	bool delete_current_module;
-}
-using namespace RTLIL_FRONTEND;
-YOSYS_NAMESPACE_END
-USING_YOSYS_NAMESPACE
-%}
-
-%define api.prefix {rtlil_frontend_yy}
-
-/* The union is defined in the header, so we need to provide all the
- * includes it requires
- */
-%code requires {
-#include <string>
-#include <vector>
-#include "frontends/rtlil/rtlil_frontend.h"
-}
-
-%union {
-	char *string;
-	int integer;
-	YOSYS_NAMESPACE_PREFIX RTLIL::Const *data;
-	YOSYS_NAMESPACE_PREFIX RTLIL::SigSpec *sigspec;
-	std::vector<YOSYS_NAMESPACE_PREFIX RTLIL::SigSpec> *rsigspec;
-}
-
-%token <string> TOK_ID TOK_VALUE TOK_STRING
-%token <integer> TOK_INT
-%token TOK_AUTOIDX TOK_MODULE TOK_WIRE TOK_WIDTH TOK_INPUT TOK_OUTPUT TOK_INOUT
-%token TOK_CELL TOK_CONNECT TOK_SWITCH TOK_CASE TOK_ASSIGN TOK_SYNC
-%token TOK_LOW TOK_HIGH TOK_POSEDGE TOK_NEGEDGE TOK_EDGE TOK_ALWAYS TOK_GLOBAL TOK_INIT
-%token TOK_UPDATE TOK_MEMWR TOK_PROCESS TOK_END TOK_INVALID TOK_EOL TOK_OFFSET
-%token TOK_PARAMETER TOK_ATTRIBUTE TOK_MEMORY TOK_SIZE TOK_SIGNED TOK_REAL TOK_UPTO
-
-%type <rsigspec> sigspec_list_reversed
-%type <sigspec> sigspec sigspec_list
-%type <integer> sync_type
-%type <data> constant
-
-%expect 0
-%debug
-
-%%
-
-input:
-	optional_eol {
-		attrbuf.clear();
-	} design {
-		if (attrbuf.size() != 0)
-			rtlil_frontend_yyerror("dangling attribute");
-	};
-
-EOL:
-	optional_eol TOK_EOL;
-
-optional_eol:
-	optional_eol TOK_EOL | /* empty */;
-
-design:
-	design module |
-	design attr_stmt |
-	design autoidx_stmt |
-	/* empty */;
-
-module:
-	TOK_MODULE TOK_ID EOL {
-		delete_current_module = false;
-		if (current_design->has($2)) {
-			RTLIL::Module *existing_mod = current_design->module($2);
-			if (!flag_overwrite && (flag_lib || (attrbuf.count(ID::blackbox) && attrbuf.at(ID::blackbox).as_bool()))) {
-				log("Ignoring blackbox re-definition of module %s.\n", $2);
-				delete_current_module = true;
-			} else if (!flag_nooverwrite && !flag_overwrite && !existing_mod->get_bool_attribute(ID::blackbox)) {
-				rtlil_frontend_yyerror(stringf("RTLIL error: redefinition of module %s.", $2).c_str());
-			} else if (flag_nooverwrite) {
-				log("Ignoring re-definition of module %s.\n", $2);
-				delete_current_module = true;
-			} else {
-				log("Replacing existing%s module %s.\n", existing_mod->get_bool_attribute(ID::blackbox) ? " blackbox" : "", $2);
-				current_design->remove(existing_mod);
-			}
-		}
-		current_module = new RTLIL::Module;
-		current_module->name = $2;
-		current_module->attributes = attrbuf;
-		if (!delete_current_module)
-			current_design->add(current_module);
-		attrbuf.clear();
-		free($2);
-	} module_body TOK_END {
-		if (attrbuf.size() != 0)
-			rtlil_frontend_yyerror("dangling attribute");
-		current_module->fixup_ports();
-		if (delete_current_module)
-			delete current_module;
-		else if (flag_lib)
-			current_module->makeblackbox();
-		current_module = nullptr;
-	} EOL;
-
-module_body:
-	module_body module_stmt |
-	/* empty */;
-
-module_stmt:
-	param_stmt | param_defval_stmt | attr_stmt | wire_stmt | memory_stmt | cell_stmt | proc_stmt | conn_stmt;
-
-param_stmt:
-	TOK_PARAMETER TOK_ID EOL {
-		current_module->avail_parameters($2);
-		free($2);
-	};
-
-param_defval_stmt:
-	TOK_PARAMETER TOK_ID constant EOL {
-		current_module->avail_parameters($2);
-		current_module->parameter_default_values[$2] = *$3;
-		delete $3;
-		free($2);
-	};
-
-attr_stmt:
-	TOK_ATTRIBUTE TOK_ID constant EOL {
-		attrbuf[$2] = *$3;
-		delete $3;
-		free($2);
-	};
-
-autoidx_stmt:
-	TOK_AUTOIDX TOK_INT EOL {
-		autoidx = max(autoidx, $2);
-	};
-
-wire_stmt:
-	TOK_WIRE {
-		current_wire = current_module->addWire("$__rtlil_frontend_tmp__");
-		current_wire->attributes = attrbuf;
-		attrbuf.clear();
-	} wire_options TOK_ID EOL {
-		if (current_module->wire($4) != nullptr)
-			rtlil_frontend_yyerror(stringf("RTLIL error: redefinition of wire %s.", $4).c_str());
-		current_module->rename(current_wire, $4);
-		free($4);
-	};
-
-wire_options:
-	wire_options TOK_WIDTH TOK_INT {
-		current_wire->width = $3;
-	} |
-	wire_options TOK_WIDTH TOK_INVALID {
-		rtlil_frontend_yyerror("RTLIL error: invalid wire width");
-	} |
-	wire_options TOK_UPTO {
-		current_wire->upto = true;
-	} |
-	wire_options TOK_SIGNED {
-		current_wire->is_signed = true;
-	} |
-	wire_options TOK_OFFSET TOK_INT {
-		current_wire->start_offset = $3;
-	} |
-	wire_options TOK_INPUT TOK_INT {
-		current_wire->port_id = $3;
-		current_wire->port_input = true;
-		current_wire->port_output = false;
-	} |
-	wire_options TOK_OUTPUT TOK_INT {
-		current_wire->port_id = $3;
-		current_wire->port_input = false;
-		current_wire->port_output = true;
-	} |
-	wire_options TOK_INOUT TOK_INT {
-		current_wire->port_id = $3;
-		current_wire->port_input = true;
-		current_wire->port_output = true;
-	} |
-	/* empty */;
-
-memory_stmt:
-	TOK_MEMORY {
-		current_memory = new RTLIL::Memory;
-		current_memory->attributes = attrbuf;
-		attrbuf.clear();
-	} memory_options TOK_ID EOL {
-		if (current_module->memories.count($4) != 0)
-			rtlil_frontend_yyerror(stringf("RTLIL error: redefinition of memory %s.", $4).c_str());
-		current_memory->name = $4;
-		current_module->memories[$4] = current_memory;
-		free($4);
-	};
-
-memory_options:
-	memory_options TOK_WIDTH TOK_INT {
-		current_memory->width = $3;
-	} |
-	memory_options TOK_SIZE TOK_INT {
-		current_memory->size = $3;
-	} |
-	memory_options TOK_OFFSET TOK_INT {
-		current_memory->start_offset = $3;
-	} |
-	/* empty */;
-
-cell_stmt:
-	TOK_CELL TOK_ID TOK_ID EOL {
-		if (current_module->cell($3) != nullptr)
-			rtlil_frontend_yyerror(stringf("RTLIL error: redefinition of cell %s.", $3).c_str());
-		current_cell = current_module->addCell($3, $2);
-		current_cell->attributes = attrbuf;
-		attrbuf.clear();
-		free($2);
-		free($3);
-	} cell_body TOK_END EOL;
-
-cell_body:
-	cell_body TOK_PARAMETER TOK_ID constant EOL {
-		current_cell->parameters[$3] = *$4;
-		free($3);
-		delete $4;
-	} |
-	cell_body TOK_PARAMETER TOK_SIGNED TOK_ID constant EOL {
-		current_cell->parameters[$4] = *$5;
-		current_cell->parameters[$4].flags |= RTLIL::CONST_FLAG_SIGNED;
-		free($4);
-		delete $5;
-	} |
-	cell_body TOK_PARAMETER TOK_REAL TOK_ID constant EOL {
-		current_cell->parameters[$4] = *$5;
-		current_cell->parameters[$4].flags |= RTLIL::CONST_FLAG_REAL;
-		free($4);
-		delete $5;
-	} |
-	cell_body TOK_CONNECT TOK_ID sigspec EOL {
-		if (current_cell->hasPort($3))
-			rtlil_frontend_yyerror(stringf("RTLIL error: redefinition of cell port %s.", $3).c_str());
-		current_cell->setPort($3, *$4);
-		delete $4;
-		free($3);
-	} |
-	/* empty */;
-
-proc_stmt:
-	TOK_PROCESS TOK_ID EOL {
-		if (current_module->processes.count($2) != 0)
-			rtlil_frontend_yyerror(stringf("RTLIL error: redefinition of process %s.", $2).c_str());
-		current_process = current_module->addProcess($2);
-		current_process->attributes = attrbuf;
-		switch_stack.clear();
-		switch_stack.push_back(&current_process->root_case.switches);
-		case_stack.clear();
-		case_stack.push_back(&current_process->root_case);
-		attrbuf.clear();
-		free($2);
-	} case_body sync_list TOK_END EOL;
-
-switch_stmt:
-	TOK_SWITCH sigspec EOL {
-		RTLIL::SwitchRule *rule = new RTLIL::SwitchRule;
-		rule->signal = *$2;
-		rule->attributes = attrbuf;
-		switch_stack.back()->push_back(rule);
-		attrbuf.clear();
-		delete $2;
-	} attr_list switch_body TOK_END EOL;
-
-attr_list:
-	/* empty */ |
-	attr_list attr_stmt;
-
-switch_body:
-	switch_body TOK_CASE {
-		RTLIL::CaseRule *rule = new RTLIL::CaseRule;
-		rule->attributes = attrbuf;
-		switch_stack.back()->back()->cases.push_back(rule);
-		switch_stack.push_back(&rule->switches);
-		case_stack.push_back(rule);
-		attrbuf.clear();
-	} compare_list EOL case_body {
-		switch_stack.pop_back();
-		case_stack.pop_back();
-	} |
-	/* empty */;
-
-compare_list:
-	sigspec {
-		case_stack.back()->compare.push_back(*$1);
-		delete $1;
-	} |
-	compare_list ',' sigspec {
-		case_stack.back()->compare.push_back(*$3);
-		delete $3;
-	} |
-	/* empty */;
-
-case_body:
-	case_body attr_stmt |
-	case_body switch_stmt |
-	case_body assign_stmt |
-	/* empty */;
-
-assign_stmt:
-	TOK_ASSIGN sigspec sigspec EOL {
-		if (attrbuf.size() != 0)
-			rtlil_frontend_yyerror("dangling attribute");
-
-		// See https://github.com/YosysHQ/yosys/pull/4765 for discussion on this
-		// warning
-		if (!switch_stack.back()->empty()) {
-			rtlil_frontend_yywarning(
-				"case rule assign statements after switch statements may cause unexpected behaviour. "
-				"The assign statement is reordered to come before all switch statements."
-			);
-		}
-
-		case_stack.back()->actions.push_back(RTLIL::SigSig(*$2, *$3));
-		delete $2;
-		delete $3;
-	};
-
-sync_list:
-	sync_list TOK_SYNC sync_type sigspec EOL {
-		RTLIL::SyncRule *rule = new RTLIL::SyncRule;
-		rule->type = RTLIL::SyncType($3);
-		rule->signal = *$4;
-		current_process->syncs.push_back(rule);
-		delete $4;
-	} update_list |
-	sync_list TOK_SYNC TOK_ALWAYS EOL {
-		RTLIL::SyncRule *rule = new RTLIL::SyncRule;
-		rule->type = RTLIL::SyncType::STa;
-		rule->signal = RTLIL::SigSpec();
-		current_process->syncs.push_back(rule);
-	} update_list |
-	sync_list TOK_SYNC TOK_GLOBAL EOL {
-		RTLIL::SyncRule *rule = new RTLIL::SyncRule;
-		rule->type = RTLIL::SyncType::STg;
-		rule->signal = RTLIL::SigSpec();
-		current_process->syncs.push_back(rule);
-	} update_list |
-	sync_list TOK_SYNC TOK_INIT EOL {
-		RTLIL::SyncRule *rule = new RTLIL::SyncRule;
-		rule->type = RTLIL::SyncType::STi;
-		rule->signal = RTLIL::SigSpec();
-		current_process->syncs.push_back(rule);
-	} update_list |
-	/* empty */;
-
-sync_type:
-	TOK_LOW { $$ = RTLIL::ST0; } |
-	TOK_HIGH { $$ = RTLIL::ST1; } |
-	TOK_POSEDGE { $$ = RTLIL::STp; } |
-	TOK_NEGEDGE { $$ = RTLIL::STn; } |
-	TOK_EDGE { $$ = RTLIL::STe; };
-
-update_list:
-	update_list TOK_UPDATE sigspec sigspec EOL {
-		current_process->syncs.back()->actions.push_back(RTLIL::SigSig(*$3, *$4));
-		delete $3;
-		delete $4;
-	} |
-	update_list attr_list TOK_MEMWR TOK_ID sigspec sigspec sigspec constant EOL {
-		RTLIL::MemWriteAction act;
-		act.attributes = attrbuf;
-		act.memid = $4;
-		act.address = *$5;
-		act.data = *$6;
-		act.enable = *$7;
-		act.priority_mask = *$8;
-		current_process->syncs.back()->mem_write_actions.push_back(std::move(act));
-		attrbuf.clear();
-		free($4);
-		delete $5;
-		delete $6;
-		delete $7;
-		delete $8;
-	} |
-	/* empty */;
-
-constant:
-	TOK_VALUE {
-		char *ep;
-		int width = strtol($1, &ep, 10);
-		bool is_signed = false;
-		if (*ep == '\'') {
-			ep++;
-		}
-		if (*ep == 's') {
-			is_signed = true;
-			ep++;
-		}
-		std::list<RTLIL::State> bits;
-		while (*ep != 0) {
-			RTLIL::State bit = RTLIL::Sx;
-			switch (*ep) {
-			case '0': bit = RTLIL::S0; break;
-			case '1': bit = RTLIL::S1; break;
-			case 'x': bit = RTLIL::Sx; break;
-			case 'z': bit = RTLIL::Sz; break;
-			case '-': bit = RTLIL::Sa; break;
-			case 'm': bit = RTLIL::Sm; break;
-			}
-			bits.push_front(bit);
-			ep++;
-		}
-
-		if (bits.size() == 0)
-			bits.push_back(RTLIL::Sx);
-		while ((int)bits.size() < width) {
-			RTLIL::State bit = bits.back();
-			if (bit == RTLIL::S1)
-				bit = RTLIL::S0;
-			bits.push_back(bit);
-		}
-		while ((int)bits.size() > width)
-			bits.pop_back();
-		RTLIL::Const::Builder builder(bits.size());
-		for (RTLIL::State bit : bits)
-			builder.push_back(bit);
-		$$ = new RTLIL::Const(builder.build());
-		if (is_signed) {
-			$$->flags |= RTLIL::CONST_FLAG_SIGNED;
-		}
-		free($1);
-	} |
-	TOK_INT {
-		$$ = new RTLIL::Const($1);
-	} |
-	TOK_STRING {
-		$$ = new RTLIL::Const($1);
-		free($1);
-	};
-
-sigspec:
-	constant {
-		$$ = new RTLIL::SigSpec(*$1);
-		delete $1;
-	} |
-	TOK_ID {
-		if (current_module->wire($1) == nullptr)
-			rtlil_frontend_yyerror(stringf("RTLIL error: wire %s not found", $1).c_str());
-		$$ = new RTLIL::SigSpec(current_module->wire($1));
-		free($1);
-	} |
-	sigspec '[' TOK_INT ']' {
-		if ($3 >= $1->size() || $3 < 0)
-			rtlil_frontend_yyerror("bit index out of range");
-		$$ = new RTLIL::SigSpec($1->extract($3));
-		delete $1;
-	} |
-	sigspec '[' TOK_INT ':' TOK_INT ']' {
-		if ($3 >= $1->size() || $3 < 0 || $3 < $5)
-			rtlil_frontend_yyerror("invalid slice");
-		$$ = new RTLIL::SigSpec($1->extract($5, $3 - $5 + 1));
-		delete $1;
-	} |
-	'{' sigspec_list '}' {
-		$$ = $2;
-	};
-
-sigspec_list_reversed:
-	sigspec_list_reversed sigspec {
-		$$->push_back(*$2);
-		delete $2;
-	} |
-	/* empty */ {
-		$$ = new std::vector<RTLIL::SigSpec>;
-	};
-
-sigspec_list: sigspec_list_reversed {
-		$$ = new RTLIL::SigSpec;
-		for (auto it = $1->rbegin(); it != $1->rend(); it++)
-			$$->append(*it);
-		delete $1;
-	};
-
-conn_stmt:
-	TOK_CONNECT sigspec sigspec EOL {
-		if (attrbuf.size() != 0)
-			rtlil_frontend_yyerror("dangling attribute");
-		current_module->connect(*$2, *$3);
-		delete $2;
-		delete $3;
-	};

From 915ad949f9fb0dd9286da8e052c9cbb5233348e3 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 16 Sep 2025 01:17:45 +0000
Subject: [PATCH 658/931] Limit the maximum size of parsed RTLIL constants to 1
 Gb.

Without this check it's trivially easy to crash Yosys with a tiny RTLIL input
by specifying a constant with very large width. Fuzz testers love hitting this
over and over again.
---
 frontends/rtlil/rtlil_frontend.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontends/rtlil/rtlil_frontend.cc b/frontends/rtlil/rtlil_frontend.cc
index d7511055b..b54cd8f14 100644
--- a/frontends/rtlil/rtlil_frontend.cc
+++ b/frontends/rtlil/rtlil_frontend.cc
@@ -31,6 +31,10 @@
 YOSYS_NAMESPACE_BEGIN
 
 struct RTLILFrontendWorker {
+	// Forbid constants of more than 1 Gb.
+	// This will help us not explode on malicious RTLIL.
+	static constexpr int MAX_CONST_WIDTH = 1024 * 1024 * 1024;
+
 	std::istream *f = nullptr;
 	RTLIL::Design *design;
 	bool flag_nooverwrite = false;
@@ -267,7 +271,7 @@ struct RTLILFrontendWorker {
 		// Can't test value<0 here because we need to stop parsing after '-0'
 		if (negative_value || line[0] != '\'') {
 			if (width < INT_MIN || width > INT_MAX)
-				error("Integer %lld out of range in `%s'.", width, error_token());
+				error("Integer %lld out of range before `%s'.", width, error_token());
 			consume_whitespace_and_comments();
 			return RTLIL::Const(width);
 		}
@@ -278,6 +282,8 @@ struct RTLILFrontendWorker {
 			++idx;
 
 		std::vector<RTLIL::State> bits;
+		if (width > MAX_CONST_WIDTH)
+			error("Constant width %lld out of range before `%s`.", width, error_token());
 		bits.reserve(width);
 		while (true) {
 			RTLIL::State bit;

From d45223976ab4e9ed4b7d3d1973d3379d89d54e6c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Wed, 1 Oct 2025 02:47:47 +0000
Subject: [PATCH 659/931] Optimize `IdString::empty()`

I actually saw this take 0.6% of the time in an `opt_clean` pass (under Module::check()).
Trivial issue, but the fix is also trivial and simple.
---
 kernel/rtlil.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 5271a3111..9f636c5a2 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -411,7 +411,7 @@ struct RTLIL::IdString
 	}
 
 	bool empty() const {
-		return c_str()[0] == 0;
+		return index_ == 0;
 	}
 
 	void clear() {

From d5beb65d306116147f104f750089c660255c1eb5 Mon Sep 17 00:00:00 2001
From: Ethan Sifferman <ethan@sifferman.dev>
Date: Wed, 1 Oct 2025 10:19:25 -0700
Subject: [PATCH 660/931] added SIMLIB_VERILATOR_COMPAT

---
 techlibs/common/simlib.v | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/techlibs/common/simlib.v b/techlibs/common/simlib.v
index 977b8bbf9..e0fb9fbfa 100644
--- a/techlibs/common/simlib.v
+++ b/techlibs/common/simlib.v
@@ -31,6 +31,14 @@
  *
  */
 
+// If using Verilator, define SIMLIB_VERILATOR_COMPAT
+`ifdef SIMLIB_VERILATOR_COMPAT
+ /* verilator lint_save */
+ /* verilator lint_off DEFOVERRIDE */
+ `define SIMLIB_NOCONNECT
+ /* verilator lint_restore */
+`endif
+
 // --------------------------------------------------------
 //* ver 2
 //* title Bit-wise inverter

From f7120e9c2a922ef5e4520abd681816aa00c91bca Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 00:22:09 +0000
Subject: [PATCH 661/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 54ad13d7c..ca589ff91 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+254
+YOSYS_VER := 0.57+260
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 88be7283532237b71c1777a9953bb1aab260321a Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Sun, 21 Sep 2025 22:36:27 +0300
Subject: [PATCH 662/931] pyosys: rewrite using pybind11

- Rewrite all Python features to use the pybind11 library instead of boost::python.
  Unlike boost::python, pybind11 is a header-only library that is just included by Pyosys code, saving a lot of compile time on wheels.
- Factor out as much "translation" code from the generator into proper C++ files
- Fix running the embedded interpreter not supporting "from pyosys import libyosys as ys" like wheels
- Move Python-related elements to `pyosys` directory at the root of the repo
- Slight shift in bridging semantics:
  - Containers are declared as "opaque types" and are passed by reference to Python - many methods have been implemented to make them feel right at home without the overhead/ambiguity of copying to Python and then copying back after mutation
  - Monitor/Pass use "trampoline" pattern to support virual methods overridable in Python: virtual methods no longer require `py_` prefix
- Create really short test set for pyosys that just exercises basic functionality
---
 .github/workflows/wheels.yml                  |   14 +-
 .github/workflows/wheels/cibw_before_build.sh |   21 -
 CODEOWNERS                                    |    3 +-
 Makefile                                      |   30 +-
 docs/source/yosys_internals/hashing.rst       |    2 +-
 examples/python-api/pass.py                   |   22 +-
 kernel/driver.cc                              |   29 +-
 kernel/yosys.cc                               |   25 +-
 kernel/yosys_common.h                         |    3 +
 misc/py_wrap_generator.py                     | 2549 -----------------
 passes/cmds/plugin.cc                         |   34 +-
 pyosys/.gitignore                             |    1 +
 {misc => pyosys}/__init__.py                  |    1 +
 pyosys/generator.py                           | 2039 +++++++++++++
 pyosys/hashlib.h                              |  275 ++
 pyosys/wrappers_tpl.cc                        |  248 ++
 pyproject.toml                                |    6 +
 setup.py                                      |   43 +-
 tests/pyosys/run_tests.py                     |   39 +
 tests/pyosys/spm.cut.v.gz                     |  Bin 0 -> 5294 bytes
 tests/pyosys/test_data_read.py                |   45 +
 tests/pyosys/test_dict.py                     |   13 +
 tests/pyosys/test_idict.py                    |   31 +
 tests/pyosys/test_import.py                   |    3 +
 tests/pyosys/test_monitor.py                  |   22 +
 tests/pyosys/test_pass.py                     |   34 +
 tests/pyosys/test_script.py                   |   21 +
 27 files changed, 2879 insertions(+), 2674 deletions(-)
 delete mode 100644 misc/py_wrap_generator.py
 create mode 100644 pyosys/.gitignore
 rename {misc => pyosys}/__init__.py (99%)
 create mode 100644 pyosys/generator.py
 create mode 100644 pyosys/hashlib.h
 create mode 100644 pyosys/wrappers_tpl.cc
 create mode 100644 pyproject.toml
 create mode 100644 tests/pyosys/run_tests.py
 create mode 100644 tests/pyosys/spm.cut.v.gz
 create mode 100644 tests/pyosys/test_data_read.py
 create mode 100644 tests/pyosys/test_dict.py
 create mode 100644 tests/pyosys/test_idict.py
 create mode 100644 tests/pyosys/test_import.py
 create mode 100644 tests/pyosys/test_monitor.py
 create mode 100644 tests/pyosys/test_pass.py
 create mode 100644 tests/pyosys/test_script.py

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 2a5b7e024..b561b5d32 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -55,11 +55,6 @@ jobs:
           submodules: true
           persist-credentials: false
       - uses: actions/setup-python@v5
-      - name: Get Boost Source
-        shell: bash
-        run: |
-          mkdir -p boost
-          curl -L https://github.com/boostorg/boost/releases/download/boost-1.86.0/boost-1.86.0-b2-nodocs.tar.gz | tar --strip-components=1 -xzC boost
       - name: Get FFI
         shell: bash
         run: |
@@ -103,21 +98,16 @@ jobs:
           CIBW_BEFORE_ALL: bash ./.github/workflows/wheels/cibw_before_all.sh
           CIBW_ENVIRONMENT: >
             OPTFLAGS=-O3
-            CXXFLAGS=-I./boost/pfx/include
-            LINKFLAGS=-L./boost/pfx/lib
             PKG_CONFIG_PATH=./ffi/pfx/lib/pkgconfig
-            makeFlags='BOOST_PYTHON_LIB=./boost/pfx/lib/libboost_python*.a'
             PATH="$PWD/bison/src:$PATH"
           CIBW_ENVIRONMENT_MACOS: >
             OPTFLAGS=-O3
-            CXXFLAGS=-I./boost/pfx/include
-            LINKFLAGS=-L./boost/pfx/lib
             PKG_CONFIG_PATH=./ffi/pfx/lib/pkgconfig
             MACOSX_DEPLOYMENT_TARGET=11
-            makeFlags='BOOST_PYTHON_LIB=./boost/pfx/lib/libboost_python*.a CONFIG=clang'
+            makeFlags='CONFIG=clang'
             PATH="$PWD/bison/src:$PATH"
           CIBW_BEFORE_BUILD: bash ./.github/workflows/wheels/cibw_before_build.sh
-          CIBW_TEST_COMMAND: python3 {project}/tests/arch/ecp5/add_sub.py
+          CIBW_TEST_COMMAND: python3 {project}/tests/pyosys/run_tests.py python3
       - uses: actions/upload-artifact@v4
         with:
           name: python-wheels-${{ matrix.os.runner }}
diff --git a/.github/workflows/wheels/cibw_before_build.sh b/.github/workflows/wheels/cibw_before_build.sh
index 018b0e0df..4e81688d0 100644
--- a/.github/workflows/wheels/cibw_before_build.sh
+++ b/.github/workflows/wheels/cibw_before_build.sh
@@ -11,24 +11,3 @@ if [ "$(uname)" != "Linux" ]; then
 fi
 python3 --version
 python3-config --includes
-
-# Build boost
-cd ./boost
-## Delete the artefacts from previous builds (if any)
-rm -rf ./pfx
-## Bootstrap bjam
-./bootstrap.sh --prefix=./pfx
-## Build Boost against current version of Python, only for
-## static linkage (Boost is statically linked because system boost packages
-## wildly vary in versions, including the libboost_python3 version)
-./b2\
-    -j$(getconf _NPROCESSORS_ONLN 2>/dev/null || sysctl -n hw.ncpu)\
-    --prefix=./pfx\
-    --with-filesystem\
-    --with-system\
-    --with-python\
-    cxxflags="$(python3-config --includes) -std=c++17 -fPIC"\
-    cflags="$(python3-config --includes) -fPIC"\
-    link=static\
-    variant=release\
-    install
diff --git a/CODEOWNERS b/CODEOWNERS
index 46d37ad2f..4617c39bb 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -38,7 +38,8 @@ techlibs/gowin/                @pepijndevos
 techlibs/gatemate/             @pu-cc
 
 # pyosys
-misc/*.py                      @btut
+pyosys/*                       @donn
+setup.py                       @donn
 
 backends/firrtl                @ucbjrl @azidar
 
diff --git a/Makefile b/Makefile
index ca589ff91..c9cbd0810 100644
--- a/Makefile
+++ b/Makefile
@@ -133,10 +133,6 @@ LINKFLAGS += -rdynamic
 ifneq ($(shell :; command -v brew),)
 BREW_PREFIX := $(shell brew --prefix)/opt
 $(info $$BREW_PREFIX is [${BREW_PREFIX}])
-ifeq ($(ENABLE_PYOSYS),1)
-CXXFLAGS += -I$(BREW_PREFIX)/boost/include
-LINKFLAGS += -L$(BREW_PREFIX)/boost/lib -L$(BREW_PREFIX)/boost-python3/lib
-endif
 CXXFLAGS += -I$(BREW_PREFIX)/readline/include -I$(BREW_PREFIX)/flex/include
 LINKFLAGS += -L$(BREW_PREFIX)/readline/lib -L$(BREW_PREFIX)/flex/lib
 PKG_CONFIG_PATH := $(BREW_PREFIX)/libffi/lib/pkgconfig:$(PKG_CONFIG_PATH)
@@ -353,26 +349,14 @@ ifeq ($(ENABLE_PYOSYS),1)
 LINKFLAGS += $(filter-out -l%,$(shell $(PYTHON_CONFIG) --ldflags))
 LIBS += $(shell $(PYTHON_CONFIG) --libs)
 EXE_LIBS += $(filter-out $(LIBS),$(shell $(PYTHON_CONFIG_FOR_EXE) --libs))
+PYBIND11_INCLUDE ?= $(shell $(PYTHON_EXECUTABLE) -m pybind11 --includes)
+CXXFLAGS += -I$(PYBIND11_INCLUDE) -DWITH_PYTHON
 CXXFLAGS += $(shell $(PYTHON_CONFIG) --includes) -DWITH_PYTHON
 
-# Detect name of boost_python library. Some distros use boost_python-py<version>, other boost_python<version>, some only use the major version number, some a concatenation of major and minor version numbers
-CHECK_BOOST_PYTHON = (echo "int main(int argc, char ** argv) {return 0;}" | $(CXX) -xc -o /dev/null $(LINKFLAGS) $(EXE_LIBS) $(LIBS) -l$(1) - > /dev/null 2>&1 && echo "-l$(1)")
-BOOST_PYTHON_LIB ?= $(shell \
-	$(call CHECK_BOOST_PYTHON,boost_python-py$(subst .,,$(PYTHON_VERSION))) || \
-	$(call CHECK_BOOST_PYTHON,boost_python-py$(PYTHON_MAJOR_VERSION)) || \
-	$(call CHECK_BOOST_PYTHON,boost_python$(subst .,,$(PYTHON_VERSION))) || \
-	$(call CHECK_BOOST_PYTHON,boost_python$(PYTHON_MAJOR_VERSION)) \
-)
-
-ifeq ($(BOOST_PYTHON_LIB),)
-$(error BOOST_PYTHON_LIB could not be detected. Please define manually)
-endif
-
-LIBS += $(BOOST_PYTHON_LIB) -lboost_system -lboost_filesystem
-PY_WRAPPER_FILE = kernel/python_wrappers
+PY_WRAPPER_FILE = pyosys/wrappers
 OBJS += $(PY_WRAPPER_FILE).o
-PY_GEN_SCRIPT= py_wrap_generator
-PY_WRAP_INCLUDES := $(shell $(PYTHON_EXECUTABLE) -c "from misc import $(PY_GEN_SCRIPT); $(PY_GEN_SCRIPT).print_includes()")
+PY_GEN_SCRIPT = pyosys/generator.py
+PY_WRAP_INCLUDES := $(shell $(PYTHON_EXECUTABLE) $(PY_GEN_SCRIPT) --print-includes)
 endif # ENABLE_PYOSYS
 
 ifeq ($(ENABLE_READLINE),1)
@@ -779,9 +763,9 @@ endif
 	$(P) cat $< | grep -E -v "#[ ]*(include|error)" | $(CXX) $(CXXFLAGS) -x c++ -o $@ -E -P -
 
 ifeq ($(ENABLE_PYOSYS),1)
-$(PY_WRAPPER_FILE).cc: misc/$(PY_GEN_SCRIPT).py $(PY_WRAP_INCLUDES)
+$(PY_WRAPPER_FILE).cc: $(PY_GEN_SCRIPT) pyosys/wrappers_tpl.cc $(PY_WRAP_INCLUDES) pyosys/hashlib.h
 	$(Q) mkdir -p $(dir $@)
-	$(P) $(PYTHON_EXECUTABLE) -c "from misc import $(PY_GEN_SCRIPT); $(PY_GEN_SCRIPT).gen_wrappers(\"$(PY_WRAPPER_FILE).cc\")"
+	$(P) $(PYTHON_EXECUTABLE) $(PY_GEN_SCRIPT) $(PY_WRAPPER_FILE).cc
 endif
 
 %.o: %.cpp
diff --git a/docs/source/yosys_internals/hashing.rst b/docs/source/yosys_internals/hashing.rst
index 1993e617a..1255f6f7c 100644
--- a/docs/source/yosys_internals/hashing.rst
+++ b/docs/source/yosys_internals/hashing.rst
@@ -36,7 +36,7 @@ The main characteristics are:
    all compilers, standard libraries and architectures.
 
 In addition to ``dict<K, T>`` and ``pool<T>`` there is also an ``idict<K>`` that
-creates a bijective map from ``K`` to the integers. For example:
+creates a bijective map from ``K`` to incrementing integers. For example:
 
 ::
 
diff --git a/examples/python-api/pass.py b/examples/python-api/pass.py
index dbef0a13f..d87e09078 100755
--- a/examples/python-api/pass.py
+++ b/examples/python-api/pass.py
@@ -1,22 +1,25 @@
 #!/usr/bin/python3
 
-import libyosys as ys
+from pyosys import libyosys as ys
+
+from pathlib import Path
 
 import matplotlib.pyplot as plt
-import numpy as np
+
+__file_dir__ = Path(__file__).absolute().parent
 
 class CellStatsPass(ys.Pass):
 
     def __init__(self):
         super().__init__("cell_stats", "Shows cell stats as plot")
 
-    def py_help(self):
+    def help(self):
         ys.log("This pass uses the matplotlib library to display cell stats\n")
 
-    def py_execute(self, args, design):
+    def execute(self, args, design):
         ys.log_header(design, "Plotting cell stats\n")
         cell_stats = {}
-        for module in design.selected_whole_modules_warn():
+        for module in design.all_selected_whole_modules():
             for cell in module.selected_cells():
                 if cell.type.str() in cell_stats:
                     cell_stats[cell.type.str()] += 1
@@ -29,4 +32,11 @@ class CellStatsPass(ys.Pass):
     def py_clear_flags(self):
         ys.log("Clear Flags - CellStatsPass\n")
 
-p = CellStatsPass()
+p = CellStatsPass() # register
+
+if __name__ == "__main__":
+    design = ys.Design()
+    ys.run_pass(f"read_verilog {__file_dir__.parents[1] / 'tests' / 'simple' / 'fiedler-cooley.v'}", design)
+    ys.run_pass("prep", design)
+    ys.run_pass("opt -full", design)
+    ys.run_pass("cell_stats", design)
diff --git a/kernel/driver.cc b/kernel/driver.cc
index bbe4e46f3..a27c0a00f 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -92,8 +92,9 @@ int main(int argc, char **argv)
 	yosys_banner();
 	yosys_setup();
 #ifdef WITH_PYTHON
-	PyRun_SimpleString(("sys.path.append(\""+proc_self_dirname()+"\")").c_str());
-	PyRun_SimpleString(("sys.path.append(\""+proc_share_dirname()+"plugins\")").c_str());
+	py::object sys = py::module_::import("sys");
+	sys.attr("path").attr("append")(proc_self_dirname());
+	sys.attr("path").attr("append")(proc_share_dirname());
 #endif
 
 	if (argc == 2)
@@ -516,8 +517,9 @@ int main(int argc, char **argv)
 
 	yosys_setup();
 #ifdef WITH_PYTHON
-	PyRun_SimpleString(("sys.path.append(\""+proc_self_dirname()+"\")").c_str());
-	PyRun_SimpleString(("sys.path.append(\""+proc_share_dirname()+"plugins\")").c_str());
+	py::object sys = py::module_::import("sys");
+	sys.attr("path").attr("append")(proc_self_dirname());
+	sys.attr("path").attr("append")(proc_share_dirname());
 #endif
 	log_error_atexit = yosys_atexit;
 
@@ -567,21 +569,18 @@ int main(int argc, char **argv)
 #endif
 		} else if (scriptfile_python) {
 #ifdef WITH_PYTHON
-			PyObject *sys = PyImport_ImportModule("sys");
+			py::list new_argv;
 			int py_argc = special_args.size() + 1;
-			PyObject *new_argv = PyList_New(py_argc);
-			PyList_SetItem(new_argv, 0, PyUnicode_FromString(scriptfile.c_str()));
+			new_argv.append(scriptfile);
 			for (int i = 1; i < py_argc; ++i)
-				PyList_SetItem(new_argv, i, PyUnicode_FromString(special_args[i - 1].c_str()));
+				new_argv.append(special_args[i - 1]);
 
-			PyObject *old_argv = PyObject_GetAttrString(sys, "argv");
-			PyObject_SetAttrString(sys, "argv", new_argv);
-			Py_DECREF(old_argv);
+			py::setattr(sys, "argv", new_argv);
 
-			PyObject *py_path = PyUnicode_FromString(scriptfile.c_str());
-			PyObject_SetAttrString(sys, "_yosys_script_path", py_path);
-			Py_DECREF(py_path);
-			PyRun_SimpleString("import os, sys; sys.path.insert(0, os.path.dirname(os.path.abspath(sys._yosys_script_path)))");
+			py::object Path = py::module_::import("pathlib").attr("Path");
+			py::object scriptfile_python_path = Path(scriptfile).attr("parent");
+
+			sys.attr("path").attr("insert")(0, py::str(scriptfile_python_path));
 
 			FILE *scriptfp = fopen(scriptfile.c_str(), "r");
 			if (scriptfp == nullptr) {
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 95beca75c..9cab12bf6 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -64,13 +64,8 @@
 #endif
 
 #ifdef WITH_PYTHON
-#if PY_MAJOR_VERSION >= 3
-#   define INIT_MODULE PyInit_libyosys
-    extern "C" PyObject* INIT_MODULE();
-#else
-#   define INIT_MODULE initlibyosys
-	extern "C" void INIT_MODULE();
-#endif
+extern "C" PyObject* PyInit_libyosys();
+extern "C" PyObject* PyInit_pyosys();
 #include <signal.h>
 #endif
 
@@ -189,6 +184,17 @@ int run_command(const std::string &command, std::function<void(const std::string
 bool already_setup = false;
 bool already_shutdown = false;
 
+#ifdef WITH_PYTHON
+// Include pyosys as a module so 'from pyosys import libyosys' also works
+// in interpreter mode.
+//
+// This should not affect using wheels as the dylib has to actually be called
+// pyosys.so for this module to be interacted with at all.
+PYBIND11_MODULE(pyosys, m) {
+	m.add_object("libyosys", m.import("libyosys"));
+}
+#endif
+
 void yosys_setup()
 {
 	if(already_setup)
@@ -199,11 +205,12 @@ void yosys_setup()
 	IdString::ensure_prepopulated();
 
 #ifdef WITH_PYTHON
-	// With Python 3.12, calling PyImport_AppendInittab on an already
+	// Starting Python 3.12, calling PyImport_AppendInittab on an already
 	// initialized platform fails (such as when libyosys is imported
 	// from a Python interpreter)
 	if (!Py_IsInitialized()) {
-		PyImport_AppendInittab((char*)"libyosys", INIT_MODULE);
+		PyImport_AppendInittab((char*)"libyosys", PyInit_libyosys);
+		PyImport_AppendInittab((char*)"pyosys", PyInit_pyosys);
 		Py_Initialize();
 		PyRun_SimpleString("import sys");
 		signal(SIGINT, SIG_DFL);
diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index d69e02a59..3a74611a1 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -55,6 +55,9 @@
 
 #ifdef WITH_PYTHON
 #include <Python.h>
+#include <pybind11/pybind11.h>
+
+namespace py = pybind11;
 #endif
 
 #ifndef _YOSYS_
diff --git a/misc/py_wrap_generator.py b/misc/py_wrap_generator.py
deleted file mode 100644
index aa1406f9b..000000000
--- a/misc/py_wrap_generator.py
+++ /dev/null
@@ -1,2549 +0,0 @@
-#
-#  yosys -- Yosys Open SYnthesis Suite
-#
-#  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
-#
-#  Permission to use, copy, modify, and/or distribute this software for any
-#  purpose with or without fee is hereby granted, provided that the above
-#  copyright notice and this permission notice appear in all copies.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-#  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-#  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-#  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-#  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-#  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-#  Author Benedikt Tutzer
-#
-
-import copy
-
-#Map c++ operator Syntax to Python functions
-wrappable_operators = {
-		"<" : "__lt__",
-		"==": "__eq__",
-		"!=": "__ne__",
-		"+" : "__add__",
-		"-" : "__sub__",
-		"*" : "__mul__",
-		"/" : "__div__",
-		"()": "__call__"
-	}
-
-#Restrict certain strings from being function names in Python
-keyword_aliases = {
-		"in" : "in_",
-		"False" : "False_",
-		"None" : "None_",
-		"True" : "True_",
-		"and" : "and_",
-		"as" : "as_",
-		"assert" : "assert_",
-		"break" : "break_",
-		"class" : "class_",
-		"continue" : "continue_",
-		"def" : "def_",
-		"del" : "del_",
-		"elif" : "elif_",
-		"else" : "else_",
-		"except" : "except_",
-		"for" : "for_",
-		"from" : "from_",
-		"global" : "global_",
-		"if" : "if_",
-		"import" : "import_",
-		"in" : "in_",
-		"is" : "is_",
-		"lambda" : "lambda_",
-		"nonlocal" : "nonlocal_",
-		"not" : "not_",
-		"or" : "or_",
-		"pass" : "pass_",
-		"raise" : "raise_",
-		"return" : "return_",
-		"try" : "try_",
-		"while" : "while_",
-		"with" : "with_",
-		"yield" : "yield_"
-	}
-
-#These can be used without any explicit conversion
-primitive_types = ["void", "bool", "int", "double", "size_t", "std::string",
-		"string", "string_view", "std::string_view", "State", "char_p", "std::source_location", "source_location"]
-
-from enum import Enum
-
-#Ways to link between Python- and C++ Objects
-class link_types(Enum):
-	global_list = 1		#Manage a global list of objects in C++, the Python
-						#object contains a key to find the corresponding C++
-						#object and a Pointer to the object to verify it is
-						#still the same, making collisions unlikely to happen
-	ref_copy = 2		#The Python object contains a copy of the C++ object.
-						#The C++ object is deleted when the Python object gets
-						#deleted
-	pointer = 3			#The Python Object contains a pointer to it's C++
-						#counterpart
-	derive = 4			#The Python-Wrapper is derived from the C++ object.
-
-class attr_types(Enum):
-	star = "*"
-	amp = "&"
-	ampamp = "&&"
-	default = ""
-
-#For source-files
-class Source:
-	name = ""
-	classes = []
-
-	def __init__(self, name, classes):
-		self.name = name
-		self.classes = classes
-
-#Splits a list by the given delimiter, without splitting strings inside
-#pointy-brackets (< and >)
-def split_list(str_def, delim):
-	str_def = str_def.strip()
-	if len(str_def) == 0:
-		return []
-	if str_def.count(delim) == 0:
-		return [str_def]
-	if str_def.count("<") == 0:
-		return str_def.split(delim)
-	if str_def.find("<") < str_def.find(" "):
-		closing = find_closing(str_def[str_def.find("<")+1:], "<", ">") + str_def.find("<")
-		comma = str_def[closing:].find(delim)
-		if comma == -1:
-			return [str_def]
-		comma = closing  + comma
-	else:
-		comma = str_def.find(delim)
-	rest = split_list(str_def[comma+1:], delim)
-	ret = [str_def[:comma]]
-	if rest != None and len(rest) != 0:
-		ret.extend(rest)
-	return ret
-
-#Represents a Type
-class WType:
-	name = ""
-	cont = None
-	attr_type = attr_types.default
-
-	def __init__(self, name = "", cont = None, attr_type = attr_types.default):
-		self.name = name
-		self.cont = cont
-		self.attr_type = attr_type
-
-	#Python type-string
-	def gen_text(self):
-		text = self.name
-		if self.name in enum_names:
-			text = enum_by_name(self.name).namespace + "::" + self.name
-		if self.cont != None:
-			return known_containers[self.name].typename
-		return text
-
-	#C++ type-string
-	def gen_text_cpp(self):
-		postfix = ""
-		if self.attr_type == attr_types.star:
-			postfix = "*"
-		if self.name in primitive_types:
-			return self.name + postfix
-		if self.name in enum_names:
-			return enum_by_name(self.name).namespace + "::" + self.name + postfix
-		if self.name in classnames:
-			return class_by_name(self.name).namespace + "::" + self.name + postfix
-		text = self.name
-		if self.cont != None:
-			text += "<"
-			for a in self.cont.args:
-				text += a.gen_text_cpp() + ", "
-			text = text[:-2]
-			text += ">"
-		return text
-
-	@staticmethod
-	def from_string(str_def, containing_file, line_number):
-		str_def = str_def.strip()
-		if len(str_def) == 0:
-			return None
-		str_def = str_def.replace("RTLIL::SigSig", "std::pair<SigSpec, SigSpec>").replace("SigSig", "std::pair<SigSpec, SigSpec>")
-		t = WType()
-		t.name = ""
-		t.cont = None
-		t.attr_type = attr_types.default
-		if str_def.find("<") != -1:# and str_def.find("<") < str_def.find(" "):
-			str_def = str_def.replace("const ", "")
-
-			candidate = WContainer.from_string(str_def, containing_file, line_number)
-			if candidate == None:
-				return None
-			t.name = str_def[:str_def.find("<")]
-
-			if t.name.count("*") + t.name.count("&") > 1:
-				return None
-
-			if t.name.count("*") == 1 or str_def[0] == '*' or str_def[-1] == '*':
-				t.attr_type = attr_types.star
-				t.name = t.name.replace("*","")
-			elif t.name.count("&&") == 1:
-				t.attr_type = attr_types.ampamp
-				t.name = t.name.replace("&&","")
-			elif t.name.count("&") == 1 or str_def[0] == '&' or str_def[-1] == '&':
-				t.attr_type = attr_types.amp
-				t.name = t.name.replace("&","")
-
-			t.cont = candidate
-			if(t.name not in known_containers):
-				return None
-			return t
-
-		prefix = ""
-
-		if str.startswith(str_def, "const "):
-			if "char_p" in str_def:
-				prefix = "const "
-			str_def = str_def[6:]
-		if str.startswith(str_def, "unsigned "):
-			prefix = "unsigned " + prefix
-			str_def = str_def[9:]
-		while str.startswith(str_def, "long "):
-			prefix= "long " + prefix
-			str_def = str_def[5:]
-		while str.startswith(str_def, "short "):
-			prefix = "short " + prefix
-			str_def = str_def[6:]
-
-		str_def = str_def.split("::")[-1]
-
-		if str_def.count("*") + str_def.count("&") >= 2:
-			return None
-
-		if str_def.count("*") == 1:
-			t.attr_type = attr_types.star
-			str_def = str_def.replace("*","")
-		elif str_def.count("&&") == 1:
-			t.attr_type = attr_types.ampamp
-			str_def = str_def.replace("&&","")
-		elif str_def.count("&") == 1:
-			t.attr_type = attr_types.amp
-			str_def = str_def.replace("&","")
-
-		if len(str_def) > 0 and str_def.split("::")[-1] not in primitive_types and str_def.split("::")[-1] not in classnames and str_def.split("::")[-1] not in enum_names:
-			return None
-
-		if str_def.count(" ") == 0:
-			t.name = (prefix + str_def).replace("char_p", "char *")
-			t.cont = None
-			return t
-		return None
-
-#Represents a container-type
-class WContainer:
-	name = ""
-	args = []
-
-	def from_string(str_def, containing_file, line_number):
-		if str_def == None or len(str_def) < 4:
-			return None
-		cont = WContainer()
-		cont.name = str_def[:str_def.find("<")]
-		str_def = str_def[str_def.find("<")+1:find_closing(str_def, "<", ">")]
-		cont.args = []
-		for arg in split_list(str_def, ","):
-			candidate = WType.from_string(arg.strip(), containing_file, line_number)
-			if candidate == None:
-				return None
-			if candidate.name == "void":
-				return None
-			cont.args.append(candidate)
-		return cont
-
-#Translators between Python and C++ containers
-#Base Type
-class Translator:
-	tmp_cntr = 0
-	typename = "DefaultType"
-	orig_name = "DefaultCpp"
-
-	@classmethod
-	def gen_type(c, types):
-		return "\nImplement a function that outputs the c++ type of this container here\n"
-
-	@classmethod
-	def translate(c, varname, types, prefix):
-		return "\nImplement a function translating a python container to a c++ container here\n"
-
-	@classmethod
-	def translate_cpp(c, varname, types, prefix, ref):
-		return "\nImplement a function translating a c++ container to a python container here\n"
-
-#Translates list-types (vector, pool, set), that only differ in their name and
-#the name of the insertion function
-class PythonListTranslator(Translator):
-	typename = "boost::python::list"
-	insert_name = "Default"
-
-	#generate the c++ type string
-	@classmethod
-	def gen_type(c, types):
-		text = c.orig_name + "<"
-		if types[0].name in primitive_types:
-			text += types[0].name
-		elif types[0].name in known_containers:
-			text += known_containers[types[0].name].gen_type(types[0].cont.args)
-		else:
-			text += class_by_name(types[0].name).namespace + "::" + types[0].name
-			if types[0].attr_type == attr_types.star:
-				text += "*"
-		text += ">"
-		return text
-
-	#Generate C++ code to translate from a boost::python::list
-	@classmethod
-	def translate(c, varname, types, prefix):
-		text  = prefix + c.gen_type(types) + " " + varname + "___tmp;"
-		cntr_name = "cntr_" + str(Translator.tmp_cntr)
-		Translator.tmp_cntr = Translator.tmp_cntr + 1
-		text += prefix + "for(int " + cntr_name + " = 0; " + cntr_name + " < len(" + varname + "); " + cntr_name + "++)"
-		text += prefix + "{"
-		tmp_name = "tmp_" + str(Translator.tmp_cntr)
-		Translator.tmp_cntr = Translator.tmp_cntr + 1
-		if types[0].name in known_containers:
-			text += prefix + "\t" + known_containers[types[0].name].typename + " " + tmp_name + " = boost::python::extract<" + known_containers[types[0].name].typename + ">(" + varname + "[" + cntr_name + "]);"
-			text += known_containers[types[0].name].translate(tmp_name, types[0].cont.args, prefix+"\t")
-			tmp_name = tmp_name + "___tmp"
-			text += prefix + "\t" + varname + "___tmp" + c.insert_name + "(" + tmp_name + ");"
-		elif types[0].name in classnames:
-			text += prefix + "\t" + types[0].name + "* " + tmp_name + " = boost::python::extract<" + types[0].name + "*>(" + varname + "[" + cntr_name + "]);"
-			if types[0].attr_type == attr_types.star:
-				text += prefix + "\t" + varname + "___tmp" + c.insert_name + "(" + tmp_name + "->get_cpp_obj());"
-			else:
-				text += prefix + "\t" + varname + "___tmp" + c.insert_name + "(*" + tmp_name + "->get_cpp_obj());"
-		else:
-			text += prefix + "\t" + types[0].name + " " + tmp_name + " = boost::python::extract<" + types[0].name + ">(" + varname + "[" + cntr_name + "]);"
-			text += prefix + "\t" + varname + "___tmp" + c.insert_name + "(" + tmp_name + ");"
-		text += prefix + "}"
-		return text
-
-	#Generate C++ code to translate to a boost::python::list
-	@classmethod
-	def translate_cpp(c, varname, types, prefix, ref):
-		text  = prefix + c.typename + " " + varname + "___tmp;"
-		tmp_name = "tmp_" + str(Translator.tmp_cntr)
-		Translator.tmp_cntr = Translator.tmp_cntr + 1
-		if ref:
-			text += prefix + "for(auto " + tmp_name + " : *" + varname + ")"
-		else:
-			text += prefix + "for(auto " + tmp_name + " : " + varname + ")"
-		text += prefix + "{"
-		if types[0].name in classnames:
-			if types[0].attr_type == attr_types.star:
-				text += prefix + "\t" + varname + "___tmp.append(" + types[0].name + "::get_py_obj(" + tmp_name + "));"
-			else:
-				text += prefix + "\t" + varname + "___tmp.append(*" + types[0].name + "::get_py_obj(&" + tmp_name + "));"
-		elif types[0].name in known_containers:
-			text += known_containers[types[0].name].translate_cpp(tmp_name, types[0].cont.args, prefix + "\t", types[0].attr_type == attr_types.star)
-			text += prefix + "\t" + varname + "___tmp.append(" + tmp_name + "___tmp);"
-		else:
-			text += prefix + "\t" + varname + "___tmp.append(" + tmp_name + ");"
-		text += prefix + "}"
-		return text
-
-class IDictTranslator(PythonListTranslator):
-	typename = "boost::python::list"
-	orig_name = "idict"
-	insert_name = ""
-
-#Sub-type for std::set
-class SetTranslator(PythonListTranslator):
-	insert_name = ".insert"
-	orig_name = "std::set"
-
-#Sub-type for std::vector
-class VectorTranslator(PythonListTranslator):
-	insert_name = ".push_back"
-	orig_name = "std::vector"
-
-#Sub-type for pool
-class PoolTranslator(PythonListTranslator):
-	insert_name = ".insert"
-	orig_name = "pool"
-
-#Sub-type for ObjRange
-class ObjRangeTranslator(PythonListTranslator):
-	orig_name = "RTLIL::ObjRange"
-
-#Translates dict-types (dict, std::map), that only differ in their name and
-#the name of the insertion function
-class PythonDictTranslator(Translator):
-	typename = "boost::python::dict"
-	insert_name = "Default"
-
-	@classmethod
-	def gen_type(c, types):
-		text = c.orig_name + "<"
-		if types[0].name in primitive_types:
-			text += types[0].name
-		elif types[0].name in known_containers:
-			text += known_containers[types[0].name].gen_type(types[0].cont.args)
-		else:
-			text += class_by_name(types[0].name).namespace + "::" + types[0].name
-			if types[0].attr_type == attr_types.star:
-				text += "*"
-		text += ", "
-		if types[1].name in primitive_types:
-			text += types[1].name
-		elif types[1].name in known_containers:
-			text += known_containers[types[1].name].gen_type(types[1].cont.args)
-		else:
-			text += class_by_name(types[1].name).namespace + "::" + types[1].name
-			if types[1].attr_type == attr_types.star:
-				text += "*"
-		text += ">"
-		return text
-
-	#Generate c++ code to translate from a boost::python::dict
-	@classmethod
-	def translate(c, varname, types, prefix):
-		text  = prefix + c.gen_type(types) + " " + varname + "___tmp;"
-		text += prefix + "boost::python::list " + varname + "_keylist = " + varname + ".keys();"
-		cntr_name = "cntr_" + str(Translator.tmp_cntr)
-		Translator.tmp_cntr = Translator.tmp_cntr + 1
-		text += prefix + "for(int " + cntr_name + " = 0; " + cntr_name + " < len(" + varname + "_keylist); " + cntr_name + "++)"
-		text += prefix + "{"
-		key_tmp_name = "key_tmp_" + str(Translator.tmp_cntr)
-		val_tmp_name = "val_tmp_" + str(Translator.tmp_cntr)
-		Translator.tmp_cntr = Translator.tmp_cntr + 1
-
-		if types[0].name in known_containers:
-			text += prefix + "\t" + known_containers[types[0].name].typename + " " + key_tmp_name + " = boost::python::extract<" + known_containers[types[0].name].typename + ">(" + varname + "_keylist[ " + cntr_name + " ]);"
-			text += known_containers[types[0].name].translate(key_tmp_name, types[0].cont.args, prefix+"\t")
-			key_tmp_name = key_tmp_name + "___tmp"
-		elif types[0].name in classnames:
-			text += prefix + "\t" + types[0].name + "* " + key_tmp_name + " = boost::python::extract<" + types[0].name + "*>(" + varname + "_keylist[ " + cntr_name + " ]);"
-		else:
-			text += prefix + "\t" + types[0].name + " " + key_tmp_name + " = boost::python::extract<" + types[0].name + ">(" + varname + "_keylist[ " + cntr_name + " ]);"
-
-		if types[1].name in known_containers:
-			text += prefix + "\t" + known_containers[types[1].name].typename + " " + val_tmp_name + " = boost::python::extract<" + known_containers[types[1].name].typename + ">(" + varname + "[" + varname + "_keylist[ " + cntr_name + " ]]);"
-			text += known_containers[types[1].name].translate(val_tmp_name, types[1].cont.args, prefix+"\t")
-			val_tmp_name = val_tmp_name + "___tmp"
-		elif types[1].name in classnames:
-			text += prefix + "\t" + types[1].name + "* " + val_tmp_name + " = boost::python::extract<" + types[1].name + "*>(" + varname + "[" + varname + "_keylist[ " + cntr_name + " ]]);"
-		else:
-			text += prefix + "\t" + types[1].name + " " + val_tmp_name + " = boost::python::extract<" + types[1].name + ">(" + varname + "[" + varname + "_keylist[ " + cntr_name + " ]]);"
-
-		text += prefix + "\t" + varname + "___tmp." + c.insert_name + "(std::pair<" + types[0].gen_text_cpp() + ", " + types[1].gen_text_cpp() + ">("
-
-		if types[0].name not in classnames:
-			text += key_tmp_name
-		else:
-			if types[0].attr_type != attr_types.star:
-				text += "*"
-			text += key_tmp_name + "->get_cpp_obj()"
-
-		text += ", "
-		if types[1].name not in classnames:
-			text += val_tmp_name
-		else:
-			if types[1].attr_type != attr_types.star:
-				text += "*"
-			text += val_tmp_name + "->get_cpp_obj()"
-		text += "));\n" + prefix + "}"
-		return text
-
-	#Generate c++ code to translate to a boost::python::dict
-	@classmethod
-	def translate_cpp(c, varname, types, prefix, ref):
-		text  = prefix + c.typename + " " + varname + "___tmp;"
-		tmp_name = "tmp_" + str(Translator.tmp_cntr)
-		Translator.tmp_cntr = Translator.tmp_cntr + 1
-		if ref:
-			text += prefix + "for(auto " + tmp_name + " : *" + varname + ")"
-		else:
-			text += prefix + "for(auto " + tmp_name + " : " + varname + ")"
-		text += prefix + "{"
-		if types[1].name in known_containers:
-			text += prefix + "\tauto " + tmp_name + "_second = " + tmp_name + ".second;"
-			text += known_containers[types[1].name].translate_cpp(tmp_name + "_second", types[1].cont.args, prefix + "\t", types[1].attr_type == attr_types.star)
-
-		if types[0].name in classnames:
-			text += prefix + "\t" + varname + "___tmp[" + types[0].name + "::get_py_obj(" + tmp_name + ".first)] = "
-		elif types[0].name not in known_containers:
-			text += prefix + "\t" + varname + "___tmp[" + tmp_name + ".first] = "
-
-		if types[1].name in classnames:
-			if types[1].attr_type == attr_types.star:
-				text += types[1].name + "::get_py_obj(" + tmp_name + ".second);"
-			else:
-				text += "*" + types[1].name + "::get_py_obj(&" + tmp_name + ".second);"
-		elif types[1].name in known_containers:
-			text += tmp_name + "_second___tmp;"
-		else:
-			text += tmp_name + ".second;"
-		text += prefix + "}"
-		return text
-
-#Sub-type for dict
-class DictTranslator(PythonDictTranslator):
-	insert_name = "insert"
-	orig_name = "dict"
-
-#Sub_type for std::map
-class MapTranslator(PythonDictTranslator):
-	insert_name = "insert"
-	orig_name = "std::map"
-
-#Translator for std::pair. Derived from PythonDictTranslator because the
-#gen_type function is the same (because both have two template parameters)
-class TupleTranslator(PythonDictTranslator):
-	typename = "boost::python::tuple"
-	orig_name = "std::pair"
-
-	#Generate c++ code to translate from a boost::python::tuple
-	@classmethod
-	def translate(c, varname, types, prefix):
-		text  = prefix + types[0].name + " " + varname + "___tmp_0 = boost::python::extract<" + types[0].name + ">(" + varname + "[0]);"
-		text += prefix + types[1].name + " " + varname + "___tmp_1 = boost::python::extract<" + types[1].name + ">(" + varname + "[1]);"
-		text += prefix + TupleTranslator.gen_type(types) + " " + varname + "___tmp("
-		if types[0].name.split(" ")[-1] in primitive_types:
-			text += varname + "___tmp_0, "
-		else:
-			text += "*" + varname + "___tmp_0.get_cpp_obj(), "
-		if types[1].name.split(" ")[-1] in primitive_types:
-			text += varname + "___tmp_1);"
-		else:
-			text += "*" + varname + "___tmp_1.get_cpp_obj());"
-		return text
-
-	#Generate c++ code to translate to a boost::python::tuple
-	@classmethod
-	def translate_cpp(c, varname, types, prefix, ref):
-		# if the tuple is a pair of SigSpecs (aka SigSig), then we need
-		# to call get_py_obj() on each item in the tuple
-		if types[0].name in classnames:
-			first_var = types[0].name + "::get_py_obj(" + varname + ".first)"
-		else:
-			first_var = varname + ".first"
-		if types[1].name in classnames:
-			second_var = types[1].name + "::get_py_obj(" + varname + ".second)"
-		else:
-			second_var = varname + ".second"
-		text  = prefix + TupleTranslator.typename + " " + varname + "___tmp = boost::python::make_tuple(" + first_var + ", " + second_var + ");"
-		return text
-
-#Associate the Translators with their c++ type
-known_containers = {
-	"std::set"        : SetTranslator,
-	"std::vector"     : VectorTranslator,
-	"pool"            : PoolTranslator,
-	"idict"           : IDictTranslator,
-	"dict"            : DictTranslator,
-	"std::pair"       : TupleTranslator,
-	"std::map"        : MapTranslator,
-	"RTLIL::ObjRange" : ObjRangeTranslator
-}
-
-class Attribute:
-	wtype = None
-	varname = None
-	is_const = False
-	default_value = None
-	pos = None
-	pos_counter = 0
-	coerce_arg = None
-
-	def __init__(self, wtype, varname, is_const = False, default_value = None):
-		self.wtype = wtype
-		self.varname = varname
-		self.is_const = is_const
-		self.default_value = None
-		self.container = None
-
-	@staticmethod
-	def from_string(str_def, containing_file, line_number, *, owner_fn_name=""):
-		if len(str_def) < 3:
-			return None
-		orig = str_def
-		arg = Attribute(None, None)
-		prefix = ""
-		arg.wtype = None
-		arg.varname = None
-		arg.is_const = False
-		arg.default_value = None
-		arg.container = None
-		if str.startswith(str_def, "const "):
-			arg.is_const = True
-			str_def = str_def[6:]
-		if str.startswith(str_def, "unsigned "):
-			prefix = "unsigned "
-			str_def = str_def[9:]
-		while str.startswith(str_def, "long "):
-			prefix= "long " + prefix
-			str_def = str_def[5:]
-		while str.startswith(str_def, "short "):
-			prefix = "short " + prefix
-			str_def = str_def[6:]
-
-		if str_def.find("<") != -1 and str_def.find("<") < str_def.find(" "):
-			closing = find_closing(str_def[str_def.find("<"):], "<", ">") + str_def.find("<") + 1
-			arg.wtype = WType.from_string(str_def[:closing].strip(), containing_file, line_number)
-			str_def = str_def[closing+1:]
-		else:
-			if str_def.count(" ") > 0:
-				arg.wtype = WType.from_string(prefix + str_def[:str_def.find(" ")].strip(), containing_file, line_number)
-				str_def = str_def[str_def.find(" ")+1:]
-			else:
-				arg.wtype = WType.from_string(prefix + str_def.strip(), containing_file, line_number)
-				str_def = ""
-				arg.varname = ""
-
-		if arg.wtype == None:
-			return None
-		if str_def.count("=") == 0:
-			arg.varname = str_def.strip()
-			if arg.varname.find(" ") > 0:
-				return None
-		else:
-			arg.varname = str_def[:str_def.find("=")].strip()
-			if arg.varname.find(" ") > 0:
-				return None
-			str_def = str_def[str_def.find("=")+1:].strip()
-			arg.default_value = str_def[arg.varname.find("=")+1:].strip()
-		if len(arg.varname) == 0:
-			arg.varname = None
-			return arg
-		if arg.varname[0] == '*':
-			arg.wtype.attr_type = attr_types.star
-			arg.varname = arg.varname[1:]
-		elif arg.varname[0] == '&':
-			if arg.wtype.attr_type != attr_types.default:
-				return None
-			if arg.varname[1] == '&':
-				arg.wtype.attr_type = attr_types.ampamp
-				arg.varname = arg.varname[2:]
-			else:
-				arg.wtype.attr_type = attr_types.amp
-				arg.varname = arg.varname[1:]
-
-		# handle string views
-		if arg.wtype.name in ["std::string_view", "string_view"]:
-			if arg.varname == "format" and owner_fn_name.startswith("log_"):
-				# coerce format strings to "%s" (not bridgable)
-				arg.coerce_arg = '"%s"'
-			elif arg.varname == "prefix" and "warning" in owner_fn_name:
-				# coerce warning prefix to "warning:"
-				arg.coerce_arg = '"Warning: "'
-			else:
-				# boost::python can't bridge string views, so just copy them
-				arg.wtype.name = "string"
-
-		return arg
-
-	#Generates the varname. If the attribute has no name in the header file,
-	#a name is generated
-	def gen_varname(self):
-		if self.varname != None:
-			return self.varname
-		if self.wtype.name == "void":
-			return ""
-		if self.pos == None:
-			self.pos = Attribute.pos_counter
-			Attribute.pos_counter = Attribute.pos_counter + 1
-		return "gen_varname_" + str(self.pos)
-
-	#Generates the text for the function headers with wrapper types
-	def gen_listitem(self):
-		prefix = ""
-		if self.is_const:
-			prefix = "const "
-		if self.wtype.name in classnames:
-			return prefix + self.wtype.name + "* " + self.gen_varname()
-		if self.wtype.name in known_containers:
-			return prefix + known_containers[self.wtype.name].typename + " " + self.gen_varname()
-		return prefix + self.wtype.name + " " + self.gen_varname()
-
-	#Generates the test for the function headers with c++ types
-	def gen_listitem_cpp(self):
-		prefix = ""
-		if self.is_const:
-			prefix = "const "
-		infix = ""
-		if self.wtype.attr_type == attr_types.star:
-			infix = "*"
-		elif self.wtype.attr_type == attr_types.amp:
-			infix = "&"
-		elif self.wtype.attr_type == attr_types.ampamp:
-			infix = "&&"
-		if self.wtype.name in known_containers:
-			return prefix + known_containers[self.wtype.name].gen_type(self.wtype.cont.args) + " " + infix + self.gen_varname()
-		if self.wtype.name in classnames:
-			return prefix + class_by_name(self.wtype.name).namespace + "::" + self.wtype.name + " " + infix + self.gen_varname()
-		return prefix + self.wtype.name + " " + infix + self.gen_varname()
-
-	#Generates the listitem withtout the varname, so the signature can be
-	#compared
-	def gen_listitem_hash(self):
-		prefix = ""
-		if self.is_const:
-			prefix = "const "
-		if self.wtype.name in classnames:
-			return prefix + self.wtype.name + "* "
-		if self.wtype.name in known_containers:
-			return known_containers[self.wtype.name].typename
-		return prefix + self.wtype.name
-
-	#Generate Translation code for the attribute
-	def gen_translation(self):
-		if self.wtype.name in known_containers:
-			return known_containers[self.wtype.name].translate(self.gen_varname(), self.wtype.cont.args, "\n\t\t")
-		return ""
-
-	#Generate Translation code from c++ for the attribute
-	def gen_translation_cpp(self):
-		if self.wtype.name in known_containers:
-			return known_containers[self.wtype.name].translate_cpp(self.gen_varname(), self.wtype.cont.args, "\n\t\t", self.wtype.attr_type == attr_types.star)
-		return ""
-
-	#Generate Text for the call
-	def gen_call(self):
-		ret = self.gen_varname()
-		if self.wtype.name in known_containers:
-			if self.wtype.attr_type == attr_types.star:
-				return "&" + ret + "___tmp"
-			return ret + "___tmp"
-		if self.wtype.name in classnames:
-			if self.wtype.attr_type != attr_types.star:
-				ret = "*" + ret
-			return ret + "->get_cpp_obj()"
-		if self.wtype.name == "char *" and self.gen_varname() in ["format", "fmt"]:
-			return "\"%s\", " + self.gen_varname()
-		if self.wtype.attr_type == attr_types.star:
-			return "&" + ret
-		return ret
-
-	def gen_call_cpp(self):
-		ret = self.gen_varname()
-		if self.wtype.name.split(" ")[-1] in primitive_types or self.wtype.name in enum_names:
-			if self.wtype.attr_type == attr_types.star:
-				return "&" + ret
-			return ret
-		if self.wtype.name not in classnames:
-			if self.wtype.attr_type == attr_types.star:
-				return "&" + ret + "___tmp"
-			return ret + "___tmp"
-		if self.wtype.attr_type != attr_types.star:
-			ret = "*" + ret
-		return self.wtype.name + "::get_py_obj(" + self.gen_varname()  + ")"
-
-	#Generate cleanup code
-	def gen_cleanup(self):
-		if self.wtype.name in primitive_types or self.wtype.name in classnames or self.wtype.name in enum_names or not self.wtype.attr_type == attr_types.star or (self.wtype.name in known_containers and self.wtype.attr_type == attr_types.star):
-			return ""
-		return "\n\t\tdelete " + self.gen_varname() + "___tmp;"
-
-class WClass:
-	name = None
-	namespace = None
-	link_type = None
-	base_class = None
-	id_ = None
-	string_id = None
-	hash_id = None
-	needs_clone = False
-	found_funs = []
-	found_vars = []
-	found_constrs = []
-
-	def __init__(self, name, link_type, id_, string_id = None, hash_id = None, needs_clone = False):
-		self.name = name
-		self.namespace = None
-		self.base_class = None
-		self.link_type = link_type
-		self.id_ = id_
-		self.string_id = string_id
-		self.hash_id = hash_id
-		self.needs_clone = needs_clone
-		self.found_funs = []
-		self.found_vars = []
-		self.found_constrs = []
-
-	def printable_constrs(self):
-		ret = 0
-		for con in self.found_constrs:
-			if not con.protected:
-				ret += 1
-		return ret
-
-	def gen_decl(self, filename):
-		long_name = self.namespace + "::" + self.name
-
-		text = "\n\t// WRAPPED from " + filename
-		text += "\n\tstruct " + self.name
-		if self.link_type == link_types.derive:
-			text += " : public " + self.namespace + "::" + self.name
-		text += "\n\t{\n"
-
-		if self.link_type != link_types.derive:
-
-			text += "\t\t" + long_name + "* ref_obj;\n"
-
-			if self.link_type == link_types.ref_copy or self.link_type == link_types.pointer:
-				text += "\n\t\t" + long_name + "* get_cpp_obj() const\n\t\t{\n\t\t\treturn ref_obj;\n\t\t}\n"
-			elif self.link_type == link_types.global_list:
-				text += "\t\t" + self.id_.wtype.name + " " + self.id_.varname + ";\n"
-				text += "\n\t\t" + long_name + "* get_cpp_obj() const\n\t\t{"
-				text += "\n\t\t\t" + long_name + "* ret = " + long_name + "::get_all_" + self.name.lower() + "s()->at(this->" + self.id_.varname + ");"
-				text += "\n\t\t\tif(ret != NULL && ret == this->ref_obj)"
-				text += "\n\t\t\t\treturn ret;"
-				text += "\n\t\t\tthrow std::runtime_error(\"" + self.name + "'s c++ object does not exist anymore.\");"
-				text += "\n\t\t\treturn NULL;"
-				text += "\n\t\t}\n"
-
-			#if self.link_type != link_types.pointer:
-			text += "\n\t\tstatic " + self.name + "* get_py_obj(" + long_name + "* ref)\n\t\t{"
-			text += "\n\t\t\tif(ref == nullptr){"
-			text += "\n\t\t\t\tthrow std::runtime_error(\"" + self.name + " does not exist.\");"
-			text += "\n\t\t\t}"
-			text += "\n\t\t\t" + self.name + "* ret = (" + self.name + "*)malloc(sizeof(" + self.name + "));"
-			if self.link_type == link_types.pointer:
-				text += "\n\t\t\tret->ref_obj = ref;"
-			if self.link_type == link_types.ref_copy:
-				if self.needs_clone:
-					text += "\n\t\t\tret->ref_obj = ref->clone();"
-				else:
-					text += "\n\t\t\tret->ref_obj = new "+long_name+"(*ref);"
-			if self.link_type == link_types.global_list:
-				text += "\n\t\t\tret->ref_obj = ref;"
-				text += "\n\t\t\tret->" + self.id_.varname + " = ret->ref_obj->" + self.id_.varname + ";"
-			text += "\n\t\t\treturn ret;"
-			text += "\n\t\t}\n"
-
-			if self.link_type == link_types.ref_copy:
-				text += "\n\t\tstatic " + self.name + "* get_py_obj(" + long_name + " ref)\n\t\t{"
-				text += "\n\t\t\t" + self.name + "* ret = (" + self.name + "*)malloc(sizeof(" + self.name + "));"
-				if self.needs_clone:
-					text += "\n\t\t\tret->ref_obj = ref.clone();"
-				else:
-					text += "\n\t\t\tret->ref_obj = new "+long_name+"(ref);"
-				text += "\n\t\t\treturn ret;"
-				text += "\n\t\t}\n"
-
-			for con in self.found_constrs:
-				text += con.gen_decl()
-			if self.base_class is not None:
-				text += "\n\t\tvirtual ~" + self.name + "() { };"
-			for var in self.found_vars:
-				text += var.gen_decl()
-			for fun in self.found_funs:
-				text += fun.gen_decl()
-
-
-		if self.link_type == link_types.derive:
-			duplicates = {}
-			for fun in self.found_funs:
-				if fun.name in duplicates:
-					fun.gen_alias()
-					duplicates[fun.name].gen_alias()
-				else:
-					duplicates[fun.name] = fun
-
-			text += "\n\t\t" + long_name + "* get_cpp_obj() const\n\t\t{\n\t\t\treturn (" + self.namespace + "::" + self.name +"*)this;\n\t\t}\n"
-			text += "\n\t\tstatic " + self.name + "* get_py_obj(" + long_name + "* ref)\n\t\t{"
-			text += "\n\t\t\treturn (" + self.name + "*)ref;"
-			text += "\n\t\t}\n"
-
-			for con in self.found_constrs:
-				text += con.gen_decl_derive()
-			for var in self.found_vars:
-				text += var.gen_decl()
-			for fun in self.found_funs:
-				text += fun.gen_decl_virtual()
-
-		if self.hash_id != None:
-			text += "\n\t\tunsigned int get_hash_py()"
-			text += "\n\t\t{"
-			suffix = f"->{self.hash_id}" if self.hash_id else f"->{self.hash_id}"
-			if self.hash_id == "":
-				text += f"\n\t\t\treturn run_hash(*(get_cpp_obj()));"
-			else:
-				text += f"\n\t\t\treturn run_hash(get_cpp_obj()->{self.hash_id});"
-			text += "\n\t\t}"
-
-		text += "\n\t};\n"
-
-		if self.link_type == link_types.derive:
-			text += "\n\tstruct " + self.name + "Wrap : " + self.name + ", boost::python::wrapper<" + self.name + ">"
-			text += "\n\t{"
-
-			for con in self.found_constrs:
-				text += con.gen_decl_wrapperclass()
-			for fun in self.found_funs:
-				text += fun.gen_default_impl()
-
-			text += "\n\t};"
-
-		text += "\n\tstd::ostream &operator<<(std::ostream &ostr, const " + self.name + " &ref)"
-		text += "\n\t{"
-		text += "\n\t\tostr << \"" + self.name
-		if self.string_id != None:
-			text +=" \\\"\""
-			text += " << ref.get_cpp_obj()->" + self.string_id
-			text += " << \"\\\"\""
-		else:
-			text += " at \" << ref.get_cpp_obj()"
-		text += ";"
-		text += "\n\t\treturn ostr;"
-		text += "\n\t}"
-		text += "\n"
-
-		return text
-
-	def gen_funs(self, filename):
-		text = ""
-		if self.link_type != link_types.derive:
-			for con in self.found_constrs:
-				text += con.gen_def()
-			for var in self.found_vars:
-				text += var.gen_def()
-			for fun in self.found_funs:
-				text += fun.gen_def()
-		else:
-			for var in self.found_vars:
-				text += var.gen_def()
-			for fun in self.found_funs:
-				text += fun.gen_def_virtual()
-		return text
-
-	def gen_boost_py_body(self):
-		text = ""
-		if self.printable_constrs() == 0 or not self.contains_default_constr():
-			text += ", no_init"
-		text += ")"
-		text += "\n\t\t\t.def(boost::python::self_ns::str(boost::python::self_ns::self))"
-		text += "\n\t\t\t.def(boost::python::self_ns::repr(boost::python::self_ns::self))"
-		for con in self.found_constrs:
-			text += con.gen_boost_py()
-		for var in self.found_vars:
-			text += var.gen_boost_py()
-		static_funs = []
-		for fun in self.found_funs:
-			text += fun.gen_boost_py()
-			if fun.is_static and fun.alias not in static_funs:
-				static_funs.append(fun.alias)
-		for fun in static_funs:
-			text += "\n\t\t\t.staticmethod(\"" + fun + "\")"
-
-		if self.hash_id != None:
-			text += "\n\t\t\t.def(\"__hash__\", &" + self.name + "::get_hash_py)"
-		text += "\n\t\t\t;\n"
-		return text
-
-	def gen_boost_py(self):
-		body = self.gen_boost_py_body()
-		base_info = ""
-		if self.base_class is not None:
-			base_info = ", bases<" + (self.base_class.name) + ">"
-
-		if self.link_type == link_types.derive:
-			text = "\n\t\tclass_<" + self.name + base_info + ">(\"Cpp" + self.name + "\""
-			text += body
-			text += "\n\t\tclass_<" + self.name
-			text += "Wrap, boost::noncopyable"
-			text += ">(\"" + self.name + "\""
-			text += body
-		else:
-			text = "\n\t\tclass_<" + self.name + base_info + ">(\"" + self.name + "\""
-			text += body
-		return text
-
-
-	def contains_default_constr(self):
-		for c in self.found_constrs:
-			if len(c.args) == 0:
-				return True
-		return False
-
-#CONFIGURE HEADER-FILES TO BE PARSED AND CLASSES EXPECTED IN THEM HERE
-
-sources = [
-	Source("kernel/celltypes",[
-		WClass("CellType", link_types.pointer, None, None, "type", True),
-		WClass("CellTypes", link_types.pointer, None, None, None, True)
-		]
-		),
-	Source("kernel/consteval",[
-		WClass("ConstEval", link_types.pointer, None, None, None, True)
-		]
-		),
-	Source("kernel/log",[]),
-	Source("kernel/register",[
-		WClass("Pass", link_types.derive, None, None, None, True),
-		]
-		),
-	Source("kernel/rtlil",[
-		WClass("IdString", link_types.ref_copy, None, "str()", ""),
-		WClass("Const", link_types.ref_copy, None, "as_string()", ""),
-		WClass("AttrObject", link_types.ref_copy, None, None, None),
-		WClass("NamedObject", link_types.ref_copy, None, None, None),
-		WClass("Selection", link_types.ref_copy, None, None, None),
-		WClass("Monitor", link_types.derive, None, None, None),
-		WClass("CaseRule",link_types.ref_copy, None, None, None, True),
-		WClass("SwitchRule",link_types.ref_copy, None, None, None, True),
-		WClass("SyncRule", link_types.ref_copy, None, None, None, True),
-		WClass("Process",  link_types.ref_copy, None, "name.c_str()", "name"),
-		WClass("SigChunk", link_types.ref_copy, None, None, None),
-		WClass("SigBit", link_types.ref_copy, None, None, ""),
-		WClass("SigSpec", link_types.ref_copy, None, None, ""),
-		WClass("Cell", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", ""),
-		WClass("Wire", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", ""),
-		WClass("Memory", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", ""),
-		WClass("Module", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "name.c_str()", ""),
-		WClass("Design", link_types.global_list, Attribute(WType("unsigned int"), "hashidx_"), "hashidx_", "")
-		]
-		),
-	#Source("kernel/satgen",[
-	#	]
-	#	),
-	#Source("libs/ezsat/ezsat",[
-	#	]
-	#	),
-	#Source("libs/ezsat/ezminisat",[
-	#	]
-	#	),
-	Source("kernel/sigtools",[
-		WClass("SigMap", link_types.pointer, None, None, None, True)
-		]
-		),
-	Source("kernel/yosys",[
-		]
-		),
-	Source("kernel/cost",[])
-	]
-
-blacklist_methods = ["YOSYS_NAMESPACE::Pass::run_register", "YOSYS_NAMESPACE::Module::Pow"]
-
-enum_names = ["State","SyncType","ConstFlags"]
-
-enums = [] #Do not edit
-glbls = []
-
-unowned_functions = []
-
-classnames = []
-for source in sources:
-	for wclass in source.classes:
-		classnames.append(wclass.name)
-
-def class_by_name(name):
-	for source in sources:
-		for wclass in source.classes:
-			if wclass.name == name:
-				return wclass
-	return None
-
-def enum_by_name(name):
-	for e in enums:
-		if e.name == name:
-			return e
-	return None
-
-def find_closing(text, open_tok, close_tok):
-	if text.find(open_tok) == -1 or text.find(close_tok) <= text.find(open_tok):
-		return text.find(close_tok)
-	return text.find(close_tok) + find_closing(text[text.find(close_tok)+1:], open_tok, close_tok) + 1
-
-def unpretty_string(s):
-	s = s.strip()
-	while s.find("  ") != -1:
-		s = s.replace("  "," ")
-	while s.find("\t") != -1:
-		s = s.replace("\t"," ")
-	s = s.replace(" (","(")
-	return s
-
-class WEnum:
-	name = None
-	namespace = None
-	values = []
-
-	def from_string(str_def, namespace, line_number):
-		str_def = str_def.strip()
-		if not str.startswith(str_def, "enum "):
-			return None
-		if str_def.count(";") != 1:
-			return None
-		str_def = str_def[5:]
-		enum = WEnum()
-		split = str_def.split(":")
-		if(len(split) != 2):
-			return None
-		enum.name = split[0].strip()
-		if enum.name not in enum_names:
-			return None
-		str_def = split[1]
-		if str_def.count("{") != str_def.count("}") != 1:
-			return None
-		if len(str_def) < str_def.find("}")+2 or str_def[str_def.find("}")+1] != ';':
-			return None
-		str_def = str_def.split("{")[-1].split("}")[0]
-		enum.values = []
-		for val in str_def.split(','):
-			enum.values.append(val.strip().split('=')[0].strip())
-		enum.namespace = namespace
-		return enum
-
-	def gen_boost_py(self):
-		text = "\n\t\tenum_<" + self.namespace + "::" + self.name + ">(\"" + self.name + "\")\n"
-		for value in self.values:
-			text += "\t\t\t.value(\"" + value + "\"," + self.namespace + "::" + value + ")\n"
-		text += "\t\t\t;\n"
-		return text
-
-	def __str__(self):
-		ret = "Enum " + self.namespace + "::" + self.name + "(\n"
-		for val in self.values:
-			ret = ret + "\t" + val + "\n"
-		return ret + ")"
-
-	def __repr__(self):
-		return __str__(self)
-
-class WConstructor:
-	orig_text = None
-	args = []
-	containing_file = None
-	member_of = None
-	duplicate = False
-	protected = False
-
-	def __init__(self, containing_file, class_):
-		self.orig_text = "Auto generated default constructor"
-		self.args = []
-		self.containing_file = containing_file
-		self.member_of = class_
-		self.protected = False
-
-	def from_string(str_def, containing_file, class_, line_number, protected = False):
-		if class_ == None:
-			return None
-		if str_def.count("delete;") > 0:
-			return None
-		con = WConstructor(containing_file, class_)
-		con.orig_text = str_def
-		con.args = []
-		con.duplicate = False
-		con.protected = protected
-		if str.startswith(str_def, "inline "):
-			str_def = str_def[7:]
-		if not str.startswith(str_def, class_.name + "("):
-			return None
-		str_def = str_def[len(class_.name)+1:]
-		found = find_closing(str_def, "(", ")")
-		if found == -1:
-			return None
-		str_def = str_def[0:found].strip()
-		if len(str_def) == 0:
-			return con
-		args = split_list(str_def, ",")
-		for i, arg in enumerate(args):
-			parsed = Attribute.from_string(arg.strip(), containing_file, line_number)
-			if parsed == None:
-				return None
-			# Only allow std::source_location as defaulted last argument, and
-			# don't append so it takes default value
-			if parsed.wtype.name in ["std::source_location", "source_location"]:
-				if parsed.default_value is None or i != len(args) - 1:
-					debug("std::source_location not defaulted last arg of " + class_.name + " is unsupported", 2)
-					return None
-				continue
-			con.args.append(parsed)
-		return con
-
-	def gen_decl(self):
-		if self.duplicate or self.protected:
-			return ""
-		text =  "\n\t\t// WRAPPED from \"" + self.orig_text.replace("\n"," ") + "\" in " + self.containing_file
-		text += "\n\t\t" + self.member_of.name + "("
-		for arg in self.args:
-			text += arg.gen_listitem() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += ");\n"
-		return text
-
-	def gen_decl_derive(self):
-		if self.duplicate or self.protected:
-			return ""
-		text =  "\n\t\t// WRAPPED from \"" + self.orig_text.replace("\n"," ") + "\" in " + self.containing_file
-		text += "\n\t\t" + self.member_of.name + "("
-		for arg in self.args:
-			text += arg.gen_listitem() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += ")"
-		if len(self.args) == 0:
-			return text + "{}"
-		text += " : "
-		text += self.member_of.namespace + "::" + self.member_of.name + "("
-		for arg in self.args:
-			text += arg.gen_call() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += "){}\n"
-		return text
-
-	def gen_decl_wrapperclass(self):
-		if self.duplicate or self.protected:
-			return ""
-		text =  "\n\t\t// WRAPPED from \"" + self.orig_text.replace("\n"," ") + "\" in " + self.containing_file
-		text += "\n\t\t" + self.member_of.name + "Wrap("
-		for arg in self.args:
-			text += arg.gen_listitem() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += ")"
-		if len(self.args) == 0:
-			return text + "{}"
-		text += " : "
-		text += self.member_of.name + "("
-		for arg in self.args:
-			text += arg.gen_call() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += "){}\n"
-		return text
-
-	def gen_decl_hash_py(self):
-		text = self.member_of.name + "("
-		for arg in self.args:
-			text += arg.gen_listitem_hash() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += ");"
-		return text
-
-	def gen_def(self):
-		if self.duplicate or self.protected:
-			return ""
-		text = "\n\t// WRAPPED from \"" + self.orig_text.replace("\n"," ") + "\" in " + self.containing_file
-		text += "\n\t" + self.member_of.name + "::" + self.member_of.name + "("
-		for arg in self.args:
-			text += arg.gen_listitem() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text +=")\n\t{"
-		for arg in self.args:
-			text += arg.gen_translation()
-		if self.member_of.link_type != link_types.derive:
-			text += "\n\t\tthis->ref_obj = new " + self.member_of.namespace + "::" + self.member_of.name + "("
-		for arg in self.args:
-			text += arg.gen_call() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		if self.member_of.link_type != link_types.derive:
-			text += ");"
-		if self.member_of.link_type == link_types.global_list:
-			text += "\n\t\tthis->" + self.member_of.id_.varname + " = this->ref_obj->" + self.member_of.id_.varname + ";"
-		for arg in self.args:
-			text += arg.gen_cleanup()
-		text += "\n\t}\n"
-		return text
-
-	def gen_boost_py(self):
-		if self.duplicate or self.protected or len(self.args) == 0:
-			return ""
-		text  = "\n\t\t\t.def(init"
-		text += "<"
-		for a in self.args:
-			text += a.gen_listitem_hash() + ", "
-		text = text[0:-2] + ">())"
-		return text
-
-class WFunction:
-	orig_text = None
-	is_static = False
-	is_inline = False
-	is_virtual = False
-	ret_attr_type = attr_types.default
-	is_operator = False
-	ret_type = None
-	name = None
-	alias = None
-	args = []
-	containing_file = None
-	member_of = None
-	duplicate = False
-	namespace = ""
-
-	def from_string(str_def, containing_file, class_, line_number, namespace):
-		if str_def.count("delete;") > 0:
-			return None
-		func = WFunction()
-		func.is_static = False
-		func.is_inline = False
-		func.is_virtual = False
-		func.is_const = False
-		func.ret_attr_type = attr_types.default
-		func.is_operator = False
-		func.member_of = None
-		func.orig_text = str_def
-		func.args = []
-		func.containing_file = containing_file
-		func.member_of = class_
-		func.duplicate = False
-		func.namespace = namespace
-		str_def = str_def.replace("operator ","operator")
-
-		# remove attributes from the start
-		if str.startswith(str_def, "[[") and "]]" in str_def:
-			str_def = str_def[str_def.find("]]")+2:]
-
-		if str.startswith(str_def, "static "):
-			func.is_static = True
-			str_def = str_def[7:]
-		else:
-			func.is_static = False
-		if str.startswith(str_def, "inline "):
-			func.is_inline = True
-			str_def = str_def[7:]
-		else:
-			func.is_inline = False
-		if str.startswith(str_def, "virtual "):
-			func.is_virtual = True
-			str_def = str_def[8:]
-		else:
-			func.is_virtual = False
-
-		if str_def.count(" ") == 0:
-			return None
-
-		parts = split_list(str_def.strip(), " ")
-
-		prefix = ""
-		i = 0
-		for part in parts:
-			if part in ["unsigned", "long", "short", "const"]:
-				prefix += part + " "
-				i += 1
-			else:
-				break
-		parts = parts[i:]
-
-		if len(parts) <= 1:
-			return None
-
-		func.ret_type = WType.from_string(prefix + parts[0], containing_file, line_number)
-
-		if func.ret_type == None:
-			return None
-
-		str_def = parts[1]
-		for part in parts[2:]:
-			str_def = str_def + " " + part
-
-		found = str_def.find("(")
-		if found == -1 or (str_def.find(" ") != -1 and found > str_def.find(" ")):
-			return None
-		func.name = str_def[:found]
-		str_def = str_def[found:]
-		if func.name.find("operator") != -1 and str.startswith(str_def, "()("):
-				func.name += "()"
-				str_def = str_def[2:]
-		str_def = str_def[1:]
-		if func.name.find("operator") != -1:
-			func.is_operator = True
-		if func.name.find("*") == 0:
-			func.name = func.name.replace("*", "")
-			func.ret_type.attr_type = attr_types.star
-		if func.name.find("&&") == 0:
-			func.name = func.name.replace("&&", "")
-			func.ret_type.attr_type = attr_types.ampamp
-		if func.name.find("&") == 0:
-			func.name = func.name.replace("&", "")
-			func.ret_type.attr_type = attr_types.amp
-
-		found = find_closing(str_def, "(", ")")
-		if found == -1:
-			return None
-
-		post_qualifiers = str_def[found + 1:].lstrip().replace("{", " {") + " "
-		if post_qualifiers.startswith("const "):
-			func.is_const = True
-
-		str_def = str_def[0:found]
-		if func.name in blacklist_methods:
-			return None
-		if func.namespace != None and func.namespace != "":
-			if (func.namespace + "::" + func.name) in blacklist_methods:
-				return None
-			if func.member_of != None:
-				if (func.namespace + "::" + func.member_of.name + "::" + func.name) in blacklist_methods:
-					return None
-		if func.is_operator and func.name.replace(" ","").replace("operator","").split("::")[-1] not in wrappable_operators:
-			return None
-
-		testname = func.name
-		if func.is_operator:
-			testname = testname[:testname.find("operator")]
-		if testname.count(")") != 0 or testname.count("(") != 0 or testname.count("~") != 0 or testname.count(";") != 0 or testname.count(">") != 0 or testname.count("<") != 0 or testname.count("throw") != 0:
-			return None
-
-		func.alias = func.name
-		if func.name in keyword_aliases:
-			func.alias = keyword_aliases[func.name]
-		str_def = str_def[:found].strip()
-		if(len(str_def) == 0):
-			return func
-		args = split_list(str_def, ",")
-		for i, arg in enumerate(args):
-			if arg.strip() == "...":
-				continue
-			parsed = Attribute.from_string(arg.strip(), containing_file, line_number, owner_fn_name=func.name)
-			if parsed == None:
-				return None
-			# Only allow std::source_location as defaulted last argument, and
-			# don't append so it takes default value
-			if parsed.wtype.name in ["std::source_location", "source_location"]:
-				if parsed.default_value is None or i != len(args) - 1:
-					debug("std::source_location not defaulted last arg of " + func.name + " is unsupported", 2)
-					return None
-				continue
-			func.args.append(parsed)
-		return func
-
-	@property
-	def mangled_name(self):
-		mangled_typename = lambda code: code.replace("::", "_").replace("<","_").replace(">","_") \
-										   .replace(" ","").replace("*","").replace(",","")
-
-		return self.name + "".join(
-			f"__{mangled_typename(arg.wtype.gen_text_cpp())}" for arg in self.args
-		)
-
-	def gen_alias(self):
-		self.alias = self.mangled_name
-
-	def gen_post_qualifiers(self, derived=False):
-		if self.member_of != None and self.member_of.link_type == link_types.derive and self.is_virtual and derived:
-			# we drop the qualifiers when deriving callbacks to be implemented in Python
-			return ''
-		return ' const' if self.is_const else ''
-
-	def gen_decl(self):
-		if self.duplicate:
-			return ""
-		text =  "\n\t\t// WRAPPED from \"" + self.orig_text.replace("\n"," ") + "\" in " + self.containing_file
-		text += "\n\t\t"
-		if self.is_static:
-			text += "static "
-		text += self.ret_type.gen_text() + " " + self.alias + "("
-		for arg in self.args:
-			if arg.coerce_arg:
-				continue
-			text += arg.gen_listitem()
-			text += ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += f"){self.gen_post_qualifiers()};\n"
-		return text
-
-	def gen_decl_virtual(self):
-		if self.duplicate:
-			return ""
-		if not self.is_virtual:
-			return self.gen_decl()
-		text =  "\n\t\t// WRAPPED from \"" + self.orig_text.replace("\n"," ") + "\" in " + self.containing_file
-		text += "\n\t\tvirtual "
-		if self.is_static:
-			text += "static "
-		text += self.ret_type.gen_text() + " py_" + self.alias + "("
-		for arg in self.args:
-			text += arg.gen_listitem()
-			text += ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += ")"
-		if len(self.args) == 0 and self.ret_type.name == "void":
-			text += "{}"
-		else:
-			text += "\n\t\t{"
-			for arg in self.args:
-				text += "\n\t\t\t(void)" + arg.gen_varname() + ";"
-			if self.ret_type.name == "void":
-				pass
-			elif self.ret_type.name == "bool":
-				text += "\n\t\t\treturn false;"
-			else:
-				raise NotImplementedError(self.ret_type.name)
-			text += "\n\t\t}\n"
-		text += "\n\t\tvirtual "
-		if self.is_static:
-			text += "static "
-		text += self.ret_type.gen_text() + " " + self.name + "("
-		for arg in self.args:
-			text += arg.gen_listitem_cpp()
-			text += ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += f"){self.gen_post_qualifiers()} override;\n"
-		return text
-
-	def gen_decl_hash_py(self):
-		text = self.ret_type.gen_text() + " " + self.alias + "("
-		for arg in self.args:
-			text += arg.gen_listitem_hash() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += ");"
-		return text
-
-	def gen_def(self):
-		if self.duplicate:
-			return ""
-		text  = "\n\t// WRAPPED from \"" + self.orig_text.replace("\n"," ") + "\" in " + self.containing_file
-		text += "\n\t" + self.ret_type.gen_text() + " "
-		if self.member_of != None:
-			text += self.member_of.name + "::"
-		text += self.alias + "("
-		for arg in self.args:
-			if arg.coerce_arg:
-				continue
-			text += arg.gen_listitem()
-			text += ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += f"){self.gen_post_qualifiers()}\n\t{{"
-		for arg in self.args:
-			text += arg.gen_translation()
-		text += "\n\t\t"
-		if self.ret_type.name != "void":
-			if self.ret_type.name in known_containers:
-				text += self.ret_type.gen_text_cpp()
-			else:
-				text += self.ret_type.gen_text()
-			if self.ret_type.name in classnames or (self.ret_type.name in known_containers and self.ret_type.attr_type == attr_types.star):
-				text += "*"
-			text += " ret_ = "
-			if self.ret_type.name in classnames:
-				text += self.ret_type.name + "::get_py_obj("
-		if self.member_of == None:
-			text += "::" + self.namespace + "::" + self.name + "("
-		elif self.is_static:
-			text += self.member_of.namespace + "::" + self.member_of.name + "::" + self.name + "("
-		else:
-			text += "this->get_cpp_obj()->" + self.name + "("
-		for arg in self.args:
-			text += arg.coerce_arg or arg.gen_call()
-			text += ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		if self.ret_type.name in classnames:
-			text += ")"
-		text += ");"
-		for arg in self.args:
-			text += arg.gen_cleanup()
-		if self.ret_type.name != "void":
-			if self.ret_type.name in classnames:
-				text += "\n\t\treturn *ret_;"
-			elif self.ret_type.name in known_containers:
-				text += known_containers[self.ret_type.name].translate_cpp("ret_", self.ret_type.cont.args, "\n\t\t", self.ret_type.attr_type == attr_types.star)
-				text += "\n\t\treturn ret____tmp;"
-			else:
-				text += "\n\t\treturn ret_;"
-		text += "\n\t}\n"
-		return text
-
-	def gen_def_virtual(self):
-		if self.duplicate:
-			return ""
-		if not self.is_virtual:
-			return self.gen_def()
-		text =  "\n\t// WRAPPED from \"" + self.orig_text.replace("\n"," ") + "\" in " + self.containing_file
-		text += "\n\t"
-		if self.is_static:
-			text += "static "
-		text += self.ret_type.gen_text() + " " + self.member_of.name + "::" + self.name + "("
-		for arg in self.args:
-			text += arg.gen_listitem_cpp()
-			text += ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += f"){self.gen_post_qualifiers()}\n\t{{"
-		for arg in self.args:
-			text += arg.gen_translation_cpp()
-		return_stmt = "return " if self.ret_type.name != "void" else ""
-		text += f"\n\t\t{return_stmt}"
-		if self.member_of == None:
-			text += "::" + self.namespace + "::" + self.alias + "("
-		elif self.is_static:
-			text += self.member_of.namespace + "::" + self.member_of.name + "::" + self.name + "("
-		else:
-			text += f"const_cast<{self.member_of.name}*>(this)->py_" + self.alias + "("
-		for arg in self.args:
-			text += arg.gen_call_cpp() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		if self.ret_type.name in classnames:
-			text += ")"
-		text += ");"
-		for arg in self.args:
-			text += arg.gen_cleanup()
-		text += "\n\t}\n"
-		return text
-
-	def gen_default_impl(self):
-		if self.duplicate:
-			return ""
-		if not self.is_virtual:
-			return ""
-		text = "\n\n\t\t" + self.ret_type.gen_text() + " py_" + self.alias + "("
-		for arg in self.args:
-			text += arg.gen_listitem() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-
-		call_string = "py_" + self.alias + "("
-		for arg in self.args:
-			call_string += arg.gen_varname() + ", "
-		if len(self.args) > 0:
-			call_string = call_string[0:-2]
-		call_string += ");"
-
-		return_stmt = "return " if self.ret_type.name != "void" else ""
-
-		text += ")\n\t\t{"
-		text += "\n\t\t\tif (boost::python::override py_" + self.alias + " = this->get_override(\"py_" + self.alias + "\")) {"
-		text += "\n\t\t\t\ttry {"
-		text += f"\n\t\t\t\t\t{return_stmt}" + call_string
-		text += "\n\t\t\t\t} catch (boost::python::error_already_set &) {"
-		text += "\n\t\t\t\t\tlog_python_exception_as_error();"
-		text += "\n\t\t\t\t}"
-		text += "\n\t\t\t} else {"
-		text += f"\n\t\t\t\t{return_stmt}" + self.member_of.name + "::" + call_string
-		text += "\n\t\t\t}"
-		text += "\n\t\t}"
-
-		text += "\n\n\t\t" + self.ret_type.gen_text() + " default_py_" + self.alias + "("
-		for arg in self.args:
-			text += arg.gen_listitem() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += f")\n\t\t{{"
-		text += f"\n\t\t\t{return_stmt}this->" + self.member_of.name + "::" + call_string
-		text += "\n\t\t}"
-		return text
-
-
-	def gen_boost_py(self):
-		if self.duplicate:
-			return ""
-		if self.member_of == None:
-			text = "\n\t\tdef"
-		else:
-			text = "\n\t\t\t.def"
-		if len(self.args) > -1:
-			if self.ret_type.name in known_containers:
-				text += "<" + known_containers[self.ret_type.name].typename + " "
-			else:
-				text += "<" + self.ret_type.name + " "
-			if self.member_of == None or self.is_static:
-				text += "(*)("
-			else:
-				text += "(" + self.member_of.name + "::*)("
-			for a in self.args:
-				if a.coerce_arg:
-					continue
-				text += a.gen_listitem_hash() + ", "
-			if len(self.args) > 0:
-				text = text[0:-2] + f"){self.gen_post_qualifiers(True)}>"
-			else:
-				text += f"void){self.gen_post_qualifiers(True)}>"
-
-		if self.is_operator:
-			text += "(\"" + wrappable_operators[self.name.replace("operator","")] + "\""
-		else:
-			if self.member_of != None and self.member_of.link_type == link_types.derive and self.is_virtual:
-				text += "(\"py_" + self.alias + "\""
-			else:
-				text += "(\"" + self.alias + "\""
-		if self.member_of != None:
-			text += ", &" + self.member_of.name + "::"
-			if self.member_of.link_type == link_types.derive and self.is_virtual:
-				text += "py_" + self.alias
-				text += ", &" + self.member_of.name + "Wrap::default_py_" + self.alias
-			else:
-				text += self.alias
-
-			text += ")"
-		else:
-			text += ", " + "YOSYS_PYTHON::" + self.alias + ");"
-		return text
-
-class WMember:
-	orig_text = None
-	wtype = attr_types.default
-	name = None
-	containing_file = None
-	member_of = None
-	namespace = ""
-	is_const = False
-
-	def from_string(str_def, containing_file, class_, line_number, namespace):
-		member = WMember()
-		member.orig_text = str_def
-		member.wtype = None
-		member.name = ""
-		member.containing_file = containing_file
-		member.member_of = class_
-		member.namespace = namespace
-		member.is_const = False
-
-		if str.startswith(str_def, "const "):
-			member.is_const = True
-			str_def = str_def[6:]
-
-		if str_def.count(" ") == 0:
-			return None
-
-		parts = split_list(str_def.strip(), " ")
-
-		prefix = ""
-		i = 0
-		for part in parts:
-			if part in ["unsigned", "long", "short"]:
-				prefix += part + " "
-				i += 1
-			else:
-				break
-		parts = parts[i:]
-
-		if len(parts) <= 1:
-			return None
-
-		member.wtype = WType.from_string(prefix + parts[0], containing_file, line_number)
-
-		if member.wtype == None:
-			return None
-
-		str_def = parts[1]
-		for part in parts[2:]:
-			str_def = str_def + " " + part
-
-		if str_def.find("(") != -1 or str_def.find(")") != -1 or str_def.find("{") != -1 or str_def.find("}") != -1:
-			return None
-
-		found = str_def.find(";")
-		if found == -1:
-			return None
-
-		found_eq = str_def.find("=")
-		if found_eq != -1:
-			found = found_eq
-
-		member.name = str_def[:found]
-		str_def = str_def[found+1:]
-		if member.name.find("*") == 0:
-			member.name = member.name.replace("*", "")
-			member.wtype.attr_type = attr_types.star
-		if member.name.find("&&") == 0:
-			member.name = member.name.replace("&&", "")
-			member.wtype.attr_type = attr_types.ampamp
-		if member.name.find("&") == 0:
-			member.name = member.name.replace("&", "")
-			member.wtype.attr_type = attr_types.amp
-
-		if(len(str_def.strip()) != 0):
-			return None
-
-		if len(member.name.split(",")) > 1:
-			member_list = []
-			for name in member.name.split(","):
-				name = name.strip();
-				member_list.append(WMember())
-				member_list[-1].orig_text = member.orig_text
-				member_list[-1].wtype = member.wtype
-				member_list[-1].name = name
-				member_list[-1].containing_file = member.containing_file
-				member_list[-1].member_of = member.member_of
-				member_list[-1].namespace = member.namespace
-				member_list[-1].is_const = member.is_const
-			return member_list
-
-		return member
-
-	def gen_decl(self):
-		text = "\n\t\t" + self.wtype.gen_text() + " get_var_py_" + self.name + "();\n"
-		if self.is_const:
-			return text
-		if self.wtype.name in classnames:
-			text += "\n\t\tvoid set_var_py_" + self.name + "(" + self.wtype.gen_text() + " *rhs);\n"
-		else:
-			text += "\n\t\tvoid set_var_py_" + self.name + "(" + self.wtype.gen_text() + " rhs);\n"
-		return text
-
-	def gen_def(self):
-		text = "\n\t" + self.wtype.gen_text() + " " + self.member_of.name +"::get_var_py_" + self.name + "()"
-		text += "\n\t{\n\t\t"
-		if self.wtype.attr_type == attr_types.star:
-			text += "if(this->get_cpp_obj()->" + self.name + " == NULL)\n\t\t\t"
-			text += "throw std::runtime_error(\"Member \\\"" + self.name + "\\\" is NULL\");\n\t\t"
-		if self.wtype.name in known_containers:
-			text += self.wtype.gen_text_cpp()
-		else:
-			text += self.wtype.gen_text()
-
-		if self.wtype.name in classnames or (self.wtype.name in known_containers and self.wtype.attr_type == attr_types.star):
-			text += "*"
-		text += " ret_ = "
-		if self.wtype.name in classnames:
-			text += self.wtype.name + "::get_py_obj("
-			if self.wtype.attr_type != attr_types.star:
-				text += "&"
-		text += "this->get_cpp_obj()->" + self.name
-		if self.wtype.name in classnames:
-			text += ")"
-		text += ";"
-
-		if self.wtype.name in classnames:
-			text += "\n\t\treturn *ret_;"
-		elif self.wtype.name in known_containers:
-			text += known_containers[self.wtype.name].translate_cpp("ret_", self.wtype.cont.args, "\n\t\t", self.wtype.attr_type == attr_types.star)
-			text += "\n\t\treturn ret____tmp;"
-		else:
-			text += "\n\t\treturn ret_;"
-		text += "\n\t}\n"
-
-		if self.is_const:
-			return text
-
-		ret = Attribute(self.wtype, "rhs");
-
-		if self.wtype.name in classnames:
-			text += "\n\tvoid " + self.member_of.name+ "::set_var_py_" + self.name + "(" + self.wtype.gen_text() + " *rhs)"
-		else:
-			text += "\n\tvoid " + self.member_of.name+ "::set_var_py_" + self.name + "(" + self.wtype.gen_text() + " rhs)"
-		text += "\n\t{"
-		text += ret.gen_translation()
-		text += "\n\t\tthis->get_cpp_obj()->" + self.name + " = " + ret.gen_call() + ";"
-		text += "\n\t}\n"
-
-		return text;
-
-	def gen_boost_py(self):
-		text = "\n\t\t\t.add_property(\"" + self.name + "\", &" + self.member_of.name + "::get_var_py_" + self.name
-		if not self.is_const:
-			text += ", &" + self.member_of.name + "::set_var_py_" + self.name
-		text += ")"
-		return text
-
-class WGlobal:
-	orig_text = None
-	wtype = attr_types.default
-	name = None
-	containing_file = None
-	namespace = ""
-	is_const = False
-
-	def from_string(str_def, containing_file, line_number, namespace):
-		glbl = WGlobal()
-		glbl.orig_text = str_def
-		glbl.wtype = None
-		glbl.name = ""
-		glbl.containing_file = containing_file
-		glbl.namespace = namespace
-		glbl.is_const = False
-
-		if not str.startswith(str_def, "extern"):
-			return None
-		str_def = str_def[7:]
-
-		if str.startswith(str_def, "const "):
-			glbl.is_const = True
-			str_def = str_def[6:]
-
-		if str_def.count(" ") == 0:
-			return None
-
-		parts = split_list(str_def.strip(), " ")
-
-		prefix = ""
-		i = 0
-		for part in parts:
-			if part in ["unsigned", "long", "short"]:
-				prefix += part + " "
-				i += 1
-			else:
-				break
-		parts = parts[i:]
-
-		if len(parts) <= 1:
-			return None
-
-		glbl.wtype = WType.from_string(prefix + parts[0], containing_file, line_number)
-
-		if glbl.wtype == None:
-			return None
-
-		str_def = parts[1]
-		for part in parts[2:]:
-			str_def = str_def + " " + part
-
-		if str_def.find("(") != -1 or str_def.find(")") != -1 or str_def.find("{") != -1 or str_def.find("}") != -1:
-			return None
-
-		found = str_def.find(";")
-		if found == -1:
-			return None
-
-		found_eq = str_def.find("=")
-		if found_eq != -1:
-			found = found_eq
-
-		glbl.name = str_def[:found]
-		str_def = str_def[found+1:]
-		if glbl.name.find("*") == 0:
-			glbl.name = glbl.name.replace("*", "")
-			glbl.wtype.attr_type = attr_types.star
-		if glbl.name.find("&&") == 0:
-			glbl.name = glbl.name.replace("&&", "")
-			glbl.wtype.attr_type = attr_types.ampamp
-		if glbl.name.find("&") == 0:
-			glbl.name = glbl.name.replace("&", "")
-			glbl.wtype.attr_type = attr_types.amp
-
-		if(len(str_def.strip()) != 0):
-			return None
-
-		if len(glbl.name.split(",")) > 1:
-			glbl_list = []
-			for name in glbl.name.split(","):
-				name = name.strip();
-				glbl_list.append(WGlobal())
-				glbl_list[-1].orig_text = glbl.orig_text
-				glbl_list[-1].wtype = glbl.wtype
-				glbl_list[-1].name = name
-				glbl_list[-1].containing_file = glbl.containing_file
-				glbl_list[-1].namespace = glbl.namespace
-				glbl_list[-1].is_const = glbl.is_const
-			return glbl_list
-
-		return glbl
-
-	def gen_def(self):
-		text = "\n\t"
-		if self.is_const:
-			text += "const "
-		text += self.wtype.gen_text() + " get_var_py_" + self.name + "()"
-		text += "\n\t{\n\t\t"
-		if self.wtype.attr_type == attr_types.star:
-			text += "if(" + self.namespace + "::" + self.name + " == NULL)\n\t\t\t"
-			text += "throw std::runtime_error(\"" + self.namespace + "::" + self.name + " is NULL\");\n\t\t"
-		if self.wtype.name in known_containers:
-			text += self.wtype.gen_text_cpp()
-		else:
-			if self.is_const:
-				text += "const "
-			text += self.wtype.gen_text()
-
-		if self.wtype.name in classnames or (self.wtype.name in known_containers and self.wtype.attr_type == attr_types.star):
-			text += "*"
-		text += " ret_ = "
-		if self.wtype.name in classnames:
-			text += self.wtype.name + "::get_py_obj("
-			if self.wtype.attr_type != attr_types.star:
-				text += "&"
-		text += self.namespace + "::" + self.name
-		if self.wtype.name in classnames:
-			text += ")"
-		text += ";"
-
-		if self.wtype.name in classnames:
-			text += "\n\t\treturn *ret_;"
-		elif self.wtype.name in known_containers:
-			text += known_containers[self.wtype.name].translate_cpp("ret_", self.wtype.cont.args, "\n\t\t", self.wtype.attr_type == attr_types.star)
-			text += "\n\t\treturn ret____tmp;"
-		else:
-			text += "\n\t\treturn ret_;"
-		text += "\n\t}\n"
-
-		if self.is_const:
-			return text
-
-		ret = Attribute(self.wtype, "rhs");
-
-		if self.wtype.name in classnames:
-			text += "\n\tvoid set_var_py_" + self.name + "(" + self.wtype.gen_text() + " *rhs)"
-		else:
-			text += "\n\tvoid set_var_py_" + self.name + "(" + self.wtype.gen_text() + " rhs)"
-		text += "\n\t{"
-		text += ret.gen_translation()
-		text += "\n\t\t" + self.namespace + "::" + self.name + " = " + ret.gen_call() + ";"
-		text += "\n\t}\n"
-
-		return text;
-
-	def gen_boost_py(self):
-		text = "\n\t\t\t.add_static_property(\"" + self.name + "\", &" + "YOSYS_PYTHON::get_var_py_" + self.name
-		if not self.is_const:
-			text += ", &YOSYS_PYTHON::set_var_py_" + self.name
-		text += ")"
-		return text
-
-def concat_namespace(tuple_list):
-	if len(tuple_list) == 0:
-		return ""
-	ret = ""
-	for namespace in tuple_list:
-		ret += "::" + namespace[0]
-	return ret[2:]
-
-def calc_ident(text):
-	if len(text) == 0 or text[0] != ' ':
-		return 0
-	return calc_ident(text[1:]) + 1
-
-def assure_length(text, length, left = False):
-	if len(text) > length:
-		return text[:length]
-	if left:
-		return text + " "*(length - len(text))
-	return " "*(length - len(text)) + text
-
-def nesting_delta(s):
-	return s.count("{") - s.count("}")
-
-def parse_header(source):
-	debug("Parsing " + source.name + ".pyh",1)
-	source_file = open(source.name + ".pyh", "r")
-
-	source_text = []
-	in_line = source_file.readline()
-
-	namespaces = []
-
-	while(in_line):
-		if(len(in_line)>1):
-			source_text.append(in_line.replace("char *", "char_p ").replace("char* ", "char_p "))
-		in_line = source_file.readline()
-
-	i = 0
-
-	namespaces = []
-	classes = []
-	private_segment = False
-
-	while i < len(source_text):
-		line = source_text[i].replace("YOSYS_NAMESPACE_BEGIN", "                    namespace YOSYS_NAMESPACE{").replace("YOSYS_NAMESPACE_END","                    }")
-		ugly_line = unpretty_string(line)
-		debug(f"READ:>> {line}", 2)
-
-		# for anonymous unions, ignore union enclosure by skipping start line and replacing end line with new line
-		if 'union {' in line:
-			j = i+1
-			while j < len(source_text):
-				union_line = source_text[j]
-				if '};' in union_line:
-					source_text[j] = '\n'
-					break
-				j += 1
-			if j != len(source_text):
-				i += 1
-				continue
-
-		if str.startswith(ugly_line, "namespace "):# and ugly_line.find("std") == -1 and ugly_line.find("__") == -1:
-			namespace_name = ugly_line[10:].replace("{","").strip()
-			namespaces.append((namespace_name, ugly_line.count("{")))
-			debug("-----NAMESPACE " + concat_namespace(namespaces) + "-----",3)
-			i += 1
-			continue
-
-		if len(namespaces) != 0:
-			namespaces[-1] = (namespaces[-1][0], namespaces[-1][1] + nesting_delta(ugly_line))
-			if namespaces[-1][1] == 0:
-				debug("-----END NAMESPACE " + concat_namespace(namespaces) + "-----",3)
-				namespaces.pop()
-				i += 1
-				continue
-
-		if (str.startswith(ugly_line, "struct ") or str.startswith(ugly_line, "class")) and ugly_line.count(";") == 0:
-			# Opening a record declaration which isn't a forward declaration
-			struct_name = ugly_line.split(" ")[1].split("::")[-1]
-			impl_namespaces = ugly_line.split(" ")[1].split("::")[:-1]
-			complete_namespace = concat_namespace(namespaces)
-			for namespace in impl_namespaces:
-				complete_namespace += "::" + namespace
-			debug("\tFound " + struct_name + " in " + complete_namespace,2)
-
-			base_class_name = None
-			if len(ugly_line.split(" : ")) > 1: # class is derived
-				deriv_str = ugly_line.split(" : ")[1]
-				if len(deriv_str.split("::")) > 1: # namespace of base class is given
-					base_class_name = deriv_str.split("::", 1)[1]
-				else:
-					base_class_name = deriv_str.split(" ")[0]
-				debug("\t  " + struct_name + " is derived from " + base_class_name,2)
-			base_class = class_by_name(base_class_name)
-
-			c = (class_by_name(struct_name), ugly_line.count("{"))#calc_ident(line))
-			debug(f"switch to {struct_name} in namespace {namespaces}", 2)
-			if struct_name in classnames:
-				c[0].namespace = complete_namespace
-				c[0].base_class = base_class
-			classes.append(c)
-			i += 1
-			continue
-
-		if len(classes):
-			c = (classes[-1][0], classes[-1][1] + nesting_delta(ugly_line))
-			classes[-1] = c
-			if c[1] == 0:
-				if c[0] == None:
-					debug("\tExiting unknown class", 3)
-				else:
-					debug("\tExiting class " + c[0].name, 3)
-				classes.pop()
-				private_segment = False
-				i += 1
-				continue
-
-		class_ = classes[-1] if classes else None
-
-		if class_ != None and (line.find("private:") != -1 or line.find("protected:") != -1):
-			private_segment = True
-			i += 1
-			continue
-		if class_ != None and line.find("public:") != -1:
-			private_segment = False
-			i += 1
-			continue
-
-		candidate = None
-
-		if private_segment and class_ != None and class_[0] != None:
-			candidate = WConstructor.from_string(ugly_line, source.name, class_[0], i, True)
-			if candidate != None:
-				debug("\t\tFound constructor of class \"" + class_[0].name + "\" in namespace " + concat_namespace(namespaces),2)
-				class_[0].found_constrs.append(candidate)
-				i += 1
-				continue
-
-		if not private_segment and (class_ == None or class_[0] != None):
-			if class_ != None:
-				candidate = WFunction.from_string(ugly_line, source.name, class_[0], i, concat_namespace(namespaces))
-			else:
-				candidate = WFunction.from_string(ugly_line, source.name, None, i, concat_namespace(namespaces))
-			if candidate != None and candidate.name.find("::") == -1:
-				if class_ == None:
-					debug("\tFound unowned function \"" + candidate.name + "\" in namespace " + concat_namespace(namespaces),2)
-					unowned_functions.append(candidate)
-
-					# generate log aliases
-					if candidate.name.startswith("log_formatted"):
-						alias = candidate.name.replace("log_formatted", "log")
-						if alias == "log_string":
-							alias = "log"
-						copied_candidate = copy.copy(candidate)
-						copied_candidate.alias = alias
-						unowned_functions.append(copied_candidate)
-
-				else:
-					debug("\t\tFound function \"" + candidate.name + "\" of class \"" + class_[0].name + "\" in namespace " + concat_namespace(namespaces),2)
-					class_[0].found_funs.append(candidate)
-			else:
-				candidate = WEnum.from_string(ugly_line, concat_namespace(namespaces), i)
-				if candidate != None:
-					enums.append(candidate)
-					debug("\tFound enum \"" + candidate.name + "\" in namespace " + concat_namespace(namespaces),2)
-				elif class_ != None and class_[1] == 1:
-					candidate = WConstructor.from_string(ugly_line, source.name, class_[0], i)
-					if candidate != None:
-						debug("\t\tFound constructor of class \"" + class_[0].name + "\" in namespace " + concat_namespace(namespaces),2)
-						class_[0].found_constrs.append(candidate)
-					else:
-						candidate = WMember.from_string(ugly_line, source.name, class_[0], i, concat_namespace(namespaces))
-						if candidate != None:
-							if type(candidate) == list:
-								for c in candidate:
-									debug("\t\tFound member \"" + c.name + "\" of class \"" + class_[0].name + "\" of type \"" + c.wtype.name + "\"", 2)
-								class_[0].found_vars.extend(candidate)
-							else:
-								debug("\t\tFound member \"" + candidate.name + "\" of class \"" + class_[0].name + "\" of type \"" + candidate.wtype.name + "\"", 2)
-								class_[0].found_vars.append(candidate)
-				if candidate == None and class_ == None:
-					candidate = WGlobal.from_string(ugly_line, source.name, i, concat_namespace(namespaces))
-					if candidate != None:
-						if type(candidate) == list:
-							for c in candidate:
-								glbls.append(c)
-								debug("\tFound global \"" + c.name + "\" in namespace " + concat_namespace(namespaces), 2)
-						else:
-							glbls.append(candidate)
-							debug("\tFound global \"" + candidate.name + "\" in namespace " + concat_namespace(namespaces), 2)
-
-			j = i
-			line = unpretty_string(line)
-			while candidate == None and j+1 < len(source_text) and  line.count(';') <= 1 and line.count("(") >= line.count(")"):
-				j += 1
-				line = line + "\n" + unpretty_string(source_text[j])
-				if class_ != None:
-					candidate = WFunction.from_string(ugly_line, source.name, class_[0], i, concat_namespace(namespaces))
-				else:
-					candidate = WFunction.from_string(ugly_line, source.name, None, i, concat_namespace(namespaces))
-				if candidate != None and candidate.name.find("::") == -1:
-					if class_ == None:
-						debug("\tFound unowned function \"" + candidate.name + "\" in namespace " + concat_namespace(namespaces),2)
-						unowned_functions.append(candidate)
-					else:
-						debug("\t\tFound function \"" + candidate.name + "\" of class \"" + class_[0].name + "\" in namespace " + concat_namespace(namespaces),2)
-						class_[0].found_funs.append(candidate)
-					continue
-				candidate = WEnum.from_string(line, concat_namespace(namespaces), i)
-				if candidate != None:
-					enums.append(candidate)
-					debug("\tFound enum \"" + candidate.name + "\" in namespace " + concat_namespace(namespaces),2)
-					continue
-				if class_ != None:
-					candidate = WConstructor.from_string(line, source.name, class_[0], i)
-					if candidate != None:
-						debug("\t\tFound constructor of class \"" + class_[0].name + "\" in namespace " + concat_namespace(namespaces),2)
-						class_[0].found_constrs.append(candidate)
-						continue
-				if class_ == None:
-					candidate = WGlobal.from_string(line, source.name, i, concat_namespace(namespaces))
-					if candidate != None:
-						if type(candidate) == list:
-							for c in candidate:
-								glbls.append(c)
-								debug("\tFound global \"" + c.name + "\" in namespace " + concat_namespace(namespaces), 2)
-						else:
-							glbls.append(candidate)
-							debug("\tFound global \"" + candidate.name + "\" in namespace " + concat_namespace(namespaces), 2)
-						continue
-		if candidate != None:
-			while i < j:
-				i += 1
-				line = source_text[i].replace("YOSYS_NAMESPACE_BEGIN", "                    namespace YOSYS_NAMESPACE{").replace("YOSYS_NAMESPACE_END","                    }")
-				ugly_line = unpretty_string(line)
-				if len(namespaces) != 0:
-					namespaces[-1] = (namespaces[-1][0], namespaces[-1][1] + nesting_delta(ugly_line))
-					if namespaces[-1][1] == 0:
-						debug("-----END NAMESPACE " + concat_namespace(namespaces) + "-----",3)
-						namespaces.pop()
-				if len(classes):
-					c = (classes[-1][0] , classes[-1][1] + nesting_delta(ugly_line))
-					classes[-1] = c
-					if c[1] == 0:
-						if c[0] == None:
-							debug("\tExiting unknown class", 3)
-						else:
-							debug("\tExiting class " + c[0].name, 3)
-						classes.pop()
-						private_segment = False
-			i += 1
-		else:
-			i += 1
-
-def debug(message, level):
-	if level <= debug.debug_level:
-		print(message)
-
-def expand_function(f):
-	fun_list = []
-	arg_list = []
-	for arg in f.args:
-		if arg.default_value != None and (arg.wtype.name.split(" ")[-1] in primitive_types or arg.wtype.name in enum_names or (arg.wtype.name in classnames and arg.default_value == "nullptr")):
-			fi = copy.deepcopy(f)
-			fi.args = copy.deepcopy(arg_list)
-			fun_list.append(fi)
-		arg_list.append(arg)
-	fun_list.append(f)
-	return fun_list
-
-def expand_functions():
-	global unowned_functions
-	new_funs = []
-	for fun in unowned_functions:
-		new_funs.extend(expand_function(fun))
-	unowned_functions = new_funs
-	for source in sources:
-		for class_ in source.classes:
-			new_funs = []
-			for fun in class_.found_funs:
-				new_funs.extend(expand_function(fun))
-			class_.found_funs = new_funs
-
-def inherit_members():
-	for source in sources:
-		for class_ in source.classes:
-			if class_.base_class:
-				base_funs = copy.deepcopy(class_.base_class.found_funs)
-				for fun in base_funs:
-					fun.member_of = class_
-					fun.namespace = class_.namespace
-				base_vars = copy.deepcopy(class_.base_class.found_vars)
-				for var in base_vars:
-					var.member_of = class_
-					var.namespace = class_.namespace
-				class_.found_funs.extend(base_funs)
-				class_.found_vars.extend(base_vars)
-
-def clean_duplicates():
-	for source in sources:
-		for class_ in source.classes:
-			known_decls = {}
-			for fun in class_.found_funs:
-				if fun.gen_decl_hash_py() in known_decls:
-					debug("Multiple declarations of " + fun.gen_decl_hash_py(),3)
-
-					other = known_decls[fun.gen_decl_hash_py()]
-					if fun.mangled_name == other.mangled_name:
-						fun.duplicate = True
-						debug("Disabled \"" + fun.gen_decl_hash_py() + "\"", 3)
-						continue
-
-					other.gen_alias()
-					fun.gen_alias()
-				else:
-					known_decls[fun.gen_decl_hash_py()] = fun
-			known_decls = []
-			for con in class_.found_constrs:
-				if con.gen_decl_hash_py() in known_decls:
-					debug("Multiple declarations of " + con.gen_decl_hash_py(),3)
-					con.duplicate = True
-				else:
-					known_decls.append(con.gen_decl_hash_py())
-	known_decls = []
-	for fun in unowned_functions:
-		if fun.gen_decl_hash_py() in known_decls:
-			debug("Multiple declarations of " + fun.gen_decl_hash_py(),3)
-			fun.duplicate = True
-		else:
-			known_decls.append(fun.gen_decl_hash_py())
-
-def gen_wrappers(filename, debug_level_ = 0):
-	debug.debug_level = debug_level_
-	for source in sources:
-		parse_header(source)
-
-	expand_functions()
-	inherit_members()
-	clean_duplicates()
-
-	import shutil
-	import math
-	col = shutil.get_terminal_size((80,20)).columns
-	debug("-"*col, 1)
-	debug("-"*math.floor((col-7)/2)+"SUMMARY"+"-"*math.ceil((col-7)/2), 1)
-	debug("-"*col, 1)
-	for source in sources:
-		for class_ in source.classes:
-			debug("Class " + assure_length(class_.name, len(max(classnames, key=len)), True) + " contains " + assure_length(str(len(class_.found_vars)), 3, False) + " member variables, "+ assure_length(str(len(class_.found_funs)), 3, False) + " methods and " + assure_length(str(len(class_.found_constrs)), 2, False) + " constructors", 1)
-			if len(class_.found_constrs) == 0:
-				class_.found_constrs.append(WConstructor(source.name, class_))
-	debug(str(len(unowned_functions)) + " functions are unowned", 1)
-	debug(str(len(unowned_functions)) + " global variables", 1)
-	for enum in enums:
-		debug("Enum " + assure_length(enum.name, len(max(enum_names, key=len)), True) + " contains " + assure_length(str(len(enum.values)), 2, False) + " values", 1)
-	debug("-"*col, 1)
-	wrapper_file = open(filename, "w+")
-	wrapper_file.write(
-"""/*
- *  yosys -- Yosys Open SYnthesis Suite
- *
- *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *  This is a generated file and can be overwritten by make
- */
-
-#ifdef WITH_PYTHON
-""")
-	for source in sources:
-		wrapper_file.write("#include \""+source.name+".h\"\n")
-	wrapper_file.write("""
-#include <boost/python/module.hpp>
-#include <boost/python/class.hpp>
-#include <boost/python/wrapper.hpp>
-#include <boost/python/call.hpp>
-#include <boost/python.hpp>
-#include <iosfwd> // std::streamsize
-#include <iostream>
-#include <boost/iostreams/concepts.hpp>	// boost::iostreams::sink
-#include <boost/iostreams/stream.hpp>
-USING_YOSYS_NAMESPACE
-
-using std::string_view;
-
-namespace YOSYS_PYTHON {
-
-	[[noreturn]] static void log_python_exception_as_error() {
-		PyErr_Print();
-		log_error("Python interpreter encountered an exception.\\n");
-	}
-
-	struct YosysStatics{};
-""")
-
-	for source in sources:
-		for wclass in source.classes:
-			wrapper_file.write("\n\tstruct " + wclass.name + ";")
-
-	wrapper_file.write("\n")
-
-	for source in sources:
-		for wclass in source.classes:
-			wrapper_file.write(wclass.gen_decl(source.name))
-
-	wrapper_file.write("\n")
-
-	for source in sources:
-		for wclass in source.classes:
-			wrapper_file.write(wclass.gen_funs(source.name))
-
-	for fun in unowned_functions:
-		wrapper_file.write(fun.gen_def())
-
-	for glbl in glbls:
-		wrapper_file.write(glbl.gen_def())
-
-	wrapper_file.write("""	struct Initializer
-	{
-		Initializer() {
-			if(!Yosys::yosys_already_setup())
-			{
-				Yosys::log_streams.push_back(&std::cout);
-				Yosys::log_error_stderr = true;
-				Yosys::yosys_setup();
-			}
-		}
-
-		Initializer(Initializer const &) {}
-
-		~Initializer() {
-			Yosys::yosys_shutdown();
-		}
-	};
-
-
-	/// source: https://stackoverflow.com/questions/26033781/converting-python-io-object-to-stdostream-when-using-boostpython?noredirect=1&lq=1
-	/// @brief Type that implements the Boost.IOStream's Sink and Flushable
-	///        concept for writing data to Python object that support:
-	///          n = object.write(str) # n = None or bytes written
-	///          object.flush()        # if flush exists, then it is callable
-	class PythonOutputDevice
-	{
-	public:
-
-		// This class models both the Sink and Flushable concepts.
-		struct category
-			: boost::iostreams::sink_tag,
-				boost::iostreams::flushable_tag
-		{};
-
-		explicit
-		PythonOutputDevice(boost::python::object object)
-			: object_(object)
-		{}
-
-	// Sink concept.
-	public:
-
-		typedef char char_type;
-
-		std::streamsize write(const char* buffer, std::streamsize buffer_size)
-		{
-			namespace python = boost::python;
-			// Copy the buffer to a python string.
-			python::str data(buffer, buffer_size);
-
-			// Invoke write on the python object, passing in the data.	The following
-			// is equivalent to:
-			//	 n = object_.write(data)
-			python::extract<std::streamsize> bytes_written(
-				object_.attr("write")(data));
-
-			// Per the Sink concept, return the number of bytes written.	If the
-			// Python return value provides a numeric result, then use it.	Otherwise,
-			// such as the case of a File object, use the buffer_size.
-			return bytes_written.check()
-				? bytes_written
-				: buffer_size;
-		}
-
-	// Flushable concept.
-	public:
-
-		bool flush()
-		{
-			// If flush exists, then call it.
-			boost::python::object flush = object_.attr("flush");
-			if (!flush.is_none())
-			{
-				flush();
-			}
-
-			// Always return true.	If an error occurs, an exception should be thrown.
-				return true;
-		}
-
-	private:
-		boost::python::object object_;
-	};
-
-	/// @brief Use an auxiliary function to adapt the legacy function.
-	void log_to_stream(boost::python::object object)
-	{
-		// Create an ostream that delegates to the python object.
-		boost::iostreams::stream<PythonOutputDevice>* output = new boost::iostreams::stream<PythonOutputDevice>(object);
-		Yosys::log_streams.insert(Yosys::log_streams.begin(), output);
-	};
-
-
-	BOOST_PYTHON_MODULE(libyosys)
-	{
-		using namespace boost::python;
-
-		class_<Initializer>("Initializer");
-		scope().attr("_hidden") = new Initializer();
-
-		def("log_to_stream", &log_to_stream);
-""")
-
-	for enum in enums:
-		wrapper_file.write(enum.gen_boost_py())
-
-	for source in sources:
-		for wclass in source.classes:
-			wrapper_file.write(wclass.gen_boost_py())
-
-	for fun in unowned_functions:
-		wrapper_file.write(fun.gen_boost_py())
-
-	wrapper_file.write("\n\n\t\tclass_<YosysStatics>(\"Yosys\")\n")
-	for glbl in glbls:
-		wrapper_file.write(glbl.gen_boost_py())
-	wrapper_file.write("\t\t;\n")
-
-	wrapper_file.write("\n\t}\n}\n#endif")
-
-def print_includes():
-	for source in sources:
-		print(source.name + ".pyh")
diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index afa830552..e1e888a85 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -24,12 +24,6 @@
 #  include <dlfcn.h>
 #endif
 
-#ifdef WITH_PYTHON
-#  include <boost/algorithm/string/predicate.hpp>
-#  include <Python.h>
-#  include <boost/filesystem.hpp>
-#endif
-
 YOSYS_NAMESPACE_BEGIN
 
 std::map<std::string, void*> loaded_plugins;
@@ -57,23 +51,23 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
 
 	if (!is_loaded) {
 		// Check if we're loading a python script
-		if(filename.find(".py") != std::string::npos)
-		{
+		if (filename.rfind(".py") != std::string::npos) {
 			#ifdef WITH_PYTHON
-				boost::filesystem::path full_path(filename);
-				std::string path(full_path.parent_path().c_str());
-				filename = full_path.filename().c_str();
-				filename = filename.substr(0,filename.size()-3);
-				PyRun_SimpleString(("sys.path.insert(0,\""+path+"\")").c_str());
-				PyErr_Print();
-				PyObject *module_p = PyImport_ImportModule(filename.c_str());
-				if(module_p == NULL)
-				{
-					PyErr_Print();
-					log_cmd_error("Can't load python module `%s'\n", full_path.filename());
+				py::object Path = py::module_::import("pathlib").attr("Path");
+				py::object full_path = Path(py::cast(filename));
+				py::object plugin_python_path = full_path.attr("parent");
+				auto basename = py::cast<std::string>(full_path.attr("stem"));
+
+				py::object sys = py::module_::import("sys");
+				sys.attr("path").attr("insert")(0, py::str(plugin_python_path));
+
+				try {
+					auto module_container = py::module_::import(basename.c_str());
+					loaded_python_plugins[orig_filename] = module_container.ptr();
+				} catch (py::error_already_set &e) {
+					log_cmd_error("Can't load python module `%s': %s\n", basename, e.what());
 					return;
 				}
-				loaded_python_plugins[orig_filename] = module_p;
 				Pass::init_register();
 			#else
 				log_error(
diff --git a/pyosys/.gitignore b/pyosys/.gitignore
new file mode 100644
index 000000000..f9fbdf4f6
--- /dev/null
+++ b/pyosys/.gitignore
@@ -0,0 +1 @@
+wrappers.cc
diff --git a/misc/__init__.py b/pyosys/__init__.py
similarity index 99%
rename from misc/__init__.py
rename to pyosys/__init__.py
index d74e3f5bd..4622464da 100644
--- a/misc/__init__.py
+++ b/pyosys/__init__.py
@@ -1,3 +1,4 @@
+
 import os
 import sys
 
diff --git a/pyosys/generator.py b/pyosys/generator.py
new file mode 100644
index 000000000..ebe89737e
--- /dev/null
+++ b/pyosys/generator.py
@@ -0,0 +1,2039 @@
+#!/usr/bin/env python3
+#  yosys -- Yosys Open SYnthesis Suite
+#
+#  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
+#
+#  Permission to use, copy, modify, and/or distribute this software for any
+#  purpose with or without fee is hereby granted, provided that the above
+#  copyright notice and this permission notice appear in all copies.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+#  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+#  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+#  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+#  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+#  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+#  Author: Benedikt Tutzer
+#  Modified for pybind11 by: Mohamed Gaber
+
+import argparse
+import copy
+from enum import Enum
+from io import StringIO
+from pathlib import Path
+from functools import wraps
+from typing import ClassVar, Optional
+
+__file_dir__ = Path(__file__).absolute().parent
+
+
+def autostring(fn):
+	@wraps(fn)
+	def wrapper(*args, **kwargs):
+		if "stream" not in kwargs:
+			stream = StringIO()
+			fn(*args, stream=stream, **kwargs)
+			return stream.getvalue()
+		else:
+			fn(*args, **kwargs)
+
+	return wrapper
+
+
+# Map c++ operator Syntax to Python functions
+wrappable_operators = {
+	"<": "__lt__",
+	"==": "__eq__",
+	"!=": "__ne__",
+	"+": "__add__",
+	"-": "__sub__",
+	"*": "__mul__",
+	"/": "__div__",
+	"()": "__call__",
+}
+
+# Restrict certain strings from being function names in Python
+keyword_aliases = {
+	"in": "in_",
+	"False": "False_",
+	"None": "None_",
+	"True": "True_",
+	"and": "and_",
+	"as": "as_",
+	"assert": "assert_",
+	"break": "break_",
+	"class": "class_",
+	"continue": "continue_",
+	"def": "def_",
+	"del": "del_",
+	"elif": "elif_",
+	"else": "else_",
+	"except": "except_",
+	"for": "for_",
+	"from": "from_",
+	"global": "global_",
+	"if": "if_",
+	"import": "import_",
+	"in": "in_",
+	"is": "is_",
+	"lambda": "lambda_",
+	"nonlocal": "nonlocal_",
+	"not": "not_",
+	"or": "or_",
+	"pass": "pass_",
+	"raise": "raise_",
+	"return": "return_",
+	"try": "try_",
+	"while": "while_",
+	"with": "with_",
+	"yield": "yield_",
+}
+
+# These can be used without any explicit conversion
+autocast_types = {
+	"void": "void",
+	"bool": "bool",
+	"int": "int",
+	"double": "double",
+	"size_t": "size_t",
+	"std::string": "std::string",
+	"string": "string",
+	"char_p": "char_p",
+	"std::source_location": "std::source_location",
+	"source_location": "source_location",
+	"State": "RTLIL::State",
+	# trampoline types
+	"Pass": "RTLIL::Pass",
+	"Monitor": "RTLIL::Monitor",
+}
+
+def strip_std_prefix(str_in):
+	# removesuffix is python 3.9+
+	std_namespace = "std::"
+	if str_in.startswith(std_namespace):
+		return str_in[len(std_namespace):]
+	return str_in
+
+
+# Ways to link between Python- and C++ Objects
+class link_types(Enum):
+	global_list = 1  # Identical to pointer, kept for historical reasons
+	ref_copy = 2  # Copy
+	pointer = 3  # The Python Object contains a pointer to its C++
+	# counterpart
+	derive = 4  # Identical to ref_copy, kept for historical reasons
+
+
+class attr_types(Enum):
+	star = "*"
+	amp = "&"
+	ampamp = "&&"
+	default = ""
+
+
+# For source-files
+class Source:
+	name = ""
+	classes = []
+
+	def __init__(self, name, classes):
+		self.name = name
+		self.classes = classes
+
+
+# Splits a list by the given delimiter, without splitting strings inside
+# pointy-brackets (< and >)
+def split_list(str_def, delim):
+	str_def = str_def.strip()
+	if len(str_def) == 0:
+		return []
+	if str_def.count(delim) == 0:
+		return [str_def]
+	if str_def.count("<") == 0:
+		return str_def.split(delim)
+	if str_def.find("<") < str_def.find(" "):
+		closing = find_closing(
+			str_def[str_def.find("<") + 1 :], "<", ">"
+		) + str_def.find("<")
+		comma = str_def[closing:].find(delim)
+		if comma == -1:
+			return [str_def]
+		comma = closing + comma
+	else:
+		comma = str_def.find(delim)
+	rest = split_list(str_def[comma + 1 :], delim)
+	ret = [str_def[:comma]]
+	if rest != None and len(rest) != 0:
+		ret.extend(rest)
+	return ret
+
+
+# Represents a Type
+class WType:
+	name = ""
+	cont = None
+	attr_type = attr_types.default
+
+	def __init__(self, name="", cont=None, attr_type=attr_types.default):
+		self.name = name
+		self.cont = cont
+		self.attr_type = attr_type
+
+	# Python type-string
+	def gen_text(self):
+		text = self.name
+		if self.name in enum_names:
+			text = enum_by_name(self.name).namespace + "::" + self.name
+		if self.cont != None:
+			return self.cont.gen_identifier()
+		return text
+
+	# C++ type-string
+	def gen_text_cpp(self):
+		postfix = ""
+		if self.attr_type == attr_types.star:
+			postfix = " *"
+		elif self.attr_type == attr_types.amp:
+			postfix = " &"
+		elif self.attr_type == attr_types.ampamp:
+			postfix = " &&"
+		if self.name in classnames:
+			return class_by_name(self.name).namespace + "::" + self.name + postfix
+		if self.name in enum_names:
+			return enum_by_name(self.name).namespace + "::" + self.name + postfix
+		if self.name in autocast_types:
+			return autocast_types[self.name] + postfix
+		text = self.name
+		if self.cont != None:
+			text += "<"
+			for a in self.cont.args:
+				text += a.gen_text_cpp() + ", "
+			text = text[:-2]
+			text += ">"
+		return text
+
+	@staticmethod
+	def from_string(str_def, containing_file, line_number):
+		str_def = str_def.strip()
+		if len(str_def) == 0:
+			return None
+		str_def = str_def.replace(
+			"RTLIL::SigSig", "std::pair<SigSpec, SigSpec>"
+		).replace("SigSig", "std::pair<SigSpec, SigSpec>")
+		t = WType()
+		t.name = ""
+		t.cont = None
+		t.attr_type = attr_types.default
+		if str_def.find("<") != -1:  # and str_def.find("<") < str_def.find(" "):
+			str_def = str_def.replace("const ", "")
+
+			candidate = WContainer.from_string(str_def, containing_file, line_number)
+			if candidate == None:
+				return None
+			t.name = str_def[: str_def.find("<")]
+
+			if t.name.count("*") + t.name.count("&") > 1:
+				return None
+
+			if t.name.count("*") == 1 or str_def[0] == "*" or str_def[-1] == "*":
+				t.attr_type = attr_types.star
+				t.name = t.name.replace("*", "")
+			elif t.name.count("&&") == 1:
+				t.attr_type = attr_types.ampamp
+				t.name = t.name.replace("&&", "")
+			elif t.name.count("&") == 1 or str_def[0] == "&" or str_def[-1] == "&":
+				t.attr_type = attr_types.amp
+				t.name = t.name.replace("&", "")
+
+			t.cont = candidate
+			if t.name not in known_containers:
+				return None
+			return t
+
+		prefix = ""
+
+		if str.startswith(str_def, "const "):
+			if "char_p" in str_def:
+				prefix = "const "
+			str_def = str_def[6:]
+		if str.startswith(str_def, "unsigned "):
+			prefix = "unsigned " + prefix
+			str_def = str_def[9:]
+		while str.startswith(str_def, "long "):
+			prefix = "long " + prefix
+			str_def = str_def[5:]
+		while str.startswith(str_def, "short "):
+			prefix = "short " + prefix
+			str_def = str_def[6:]
+
+		str_def = str_def.split("::")[-1]
+
+		if str_def.count("*") + str_def.count("&") >= 2:
+			return None
+
+		if str_def.count("*") == 1:
+			t.attr_type = attr_types.star
+			str_def = str_def.replace("*", "")
+		elif str_def.count("&&") == 1:
+			t.attr_type = attr_types.ampamp
+			str_def = str_def.replace("&&", "")
+		elif str_def.count("&") == 1:
+			t.attr_type = attr_types.amp
+			str_def = str_def.replace("&", "")
+
+		if (
+			len(str_def) > 0
+			and str_def.split("::")[-1] not in autocast_types
+			and str_def.split("::")[-1] not in classnames
+			and str_def.split("::")[-1] not in enum_names
+		):
+			return None
+
+		if str_def.count(" ") == 0:
+			t.name = (prefix + str_def).replace("char_p", "char *")
+			t.cont = None
+			return t
+		return None
+
+	def gen_identifier(self):
+		if self.cont:
+			return self.cont.gen_identifier()
+		return self.name.title()
+
+	def as_wclass(self) -> Optional["WClass"]:
+		return class_by_name(self.name)
+
+	def __repr__(self):
+		return f"{self.__class__.__qualname__}(**{repr(self.__dict__)})"
+
+
+# Associate the "Translators" with their c++ type
+known_containers = {
+	"std::set",
+	"std::vector",
+	"std::map",
+	"std::pair",
+	"pool",
+	"idict",
+	"dict",
+	"RTLIL::ObjRange"
+}
+
+# Represents a container-type
+class WContainer:
+	name = ""
+	args = []
+
+	def from_string(str_def, containing_file, line_number):
+		if str_def == None or len(str_def) < 4:
+			return None
+		cont = WContainer()
+		cont.name = str_def[: str_def.find("<")]
+		str_def = str_def[str_def.find("<") + 1 : find_closing(str_def, "<", ">")]
+		cont.args = []
+		for arg in split_list(str_def, ","):
+			candidate = WType.from_string(arg.strip(), containing_file, line_number)
+			if candidate == None:
+				return None
+			if candidate.name == "void":
+				return None
+			cont.args.append(candidate)
+		return cont
+
+	# generate the c++ type string
+	def gen_type_cpp(self):
+		tpl_args = []
+		for arg in self.args:
+			postfix = (arg.attr_type == attr_types.star) * " *"
+			if arg.name in autocast_types:
+				tpl_args.append(autocast_types[arg.name] + postfix)
+			elif arg.name in known_containers:
+				tpl_args.append(arg.cont.gen_type_cpp())
+			else:
+				tpl_args.append(arg.as_wclass().fully_qualified_name() + postfix)
+		return f'{self.name}<{ ", ".join(tpl_args) }>'
+
+	def gen_identifier(self):
+		container = strip_std_prefix(self.name).title()
+
+		if container == "Dict":
+			assert len(self.args) == 2
+			return f"{self.args[0].gen_identifier()}To{self.args[1].gen_identifier()}{container}"
+
+		args = []
+		for arg in self.args:
+			arg_name = arg.name.title()
+			if arg.cont:
+				arg_name = arg.cont.gen_identifier()
+			args.append(arg_name)
+		args.append(container)
+		result = "".join(args)
+		if result == "SigspecSigspecPair":
+			return "SigSig"
+		return result
+
+	@autostring
+	def gen_boost_py(self, *, stream):
+		bind_fn = "py::bind_" + strip_std_prefix(self.name)
+		tpl_args = [self.gen_type_cpp()]
+		if bind_fn != "py::bind_vector":
+			# using custom bind function, can't use ::value so need more
+			# template arguments
+			for arg in self.args:
+				postfix = (arg.attr_type == attr_types.star) * " *"
+				if arg.name in autocast_types:
+					tpl_args.append(autocast_types[arg.name] + postfix)
+				elif arg.name in known_containers:
+					tpl_args.append(arg.cont.gen_type_cpp())
+				else:
+					tpl_args.append(arg.as_wclass().fully_qualified_name() + postfix)
+		if bind_fn == "py::bind_set":
+			bind_fn = "py::bind_pool"
+		stream.write(f'\t\t{bind_fn}<{",".join(tpl_args)}>(m, "{self.gen_identifier()}");\n')
+
+	def __repr__(self):
+		return f"{self.__class__.__qualname__}(**{repr(self.__dict__)})"
+
+
+class Attribute:
+	wtype = None
+	varname = None
+	is_const = False
+	default_value = None
+	pos = None
+	pos_counter = 0
+
+	def __init__(self, wtype, varname, is_const=False, default_value=None):
+		self.wtype = wtype
+		self.varname = varname
+		self.is_const = is_const
+		self.default_value = None
+		self.container = None
+
+	@staticmethod
+	def from_string(str_def, containing_file, line_number):
+		if len(str_def) < 3:
+			return None
+		orig = str_def
+		arg = Attribute(None, None)
+		prefix = ""
+		arg.wtype = None
+		arg.varname = None
+		arg.is_const = False
+		arg.default_value = None
+		arg.container = None
+		if str.startswith(str_def, "const "):
+			arg.is_const = True
+			str_def = str_def[6:]
+		if str.startswith(str_def, "unsigned "):
+			prefix = "unsigned "
+			str_def = str_def[9:]
+		while str.startswith(str_def, "long "):
+			prefix = "long " + prefix
+			str_def = str_def[5:]
+		while str.startswith(str_def, "short "):
+			prefix = "short " + prefix
+			str_def = str_def[6:]
+
+		if str_def.find("<") != -1 and str_def.find("<") < str_def.find(" "):
+			closing = (
+				find_closing(str_def[str_def.find("<") :], "<", ">")
+				+ str_def.find("<")
+				+ 1
+			)
+			arg.wtype = WType.from_string(
+				str_def[:closing].strip(), containing_file, line_number
+			)
+			str_def = str_def[closing + 1 :]
+		else:
+			if str_def.count(" ") > 0:
+				arg.wtype = WType.from_string(
+					prefix + str_def[: str_def.find(" ")].strip(),
+					containing_file,
+					line_number,
+				)
+				str_def = str_def[str_def.find(" ") + 1 :]
+			else:
+				arg.wtype = WType.from_string(
+					prefix + str_def.strip(), containing_file, line_number
+				)
+				str_def = ""
+				arg.varname = ""
+
+		if arg.wtype == None:
+			return None
+		if str_def.count("=") == 0:
+			arg.varname = str_def.strip()
+			if arg.varname.find(" ") > 0:
+				return None
+		else:
+			arg.varname = str_def[: str_def.find("=")].strip()
+			if arg.varname.find(" ") > 0:
+				return None
+			str_def = str_def[str_def.find("=") + 1 :].strip()
+			arg.default_value = str_def[arg.varname.find("=") + 1 :].strip()
+		if len(arg.varname) == 0:
+			arg.varname = None
+			return arg
+		if arg.varname[0] == "*":
+			arg.wtype.attr_type = attr_types.star
+			arg.varname = arg.varname[1:]
+		elif arg.varname[0] == "&":
+			if arg.wtype.attr_type != attr_types.default:
+				return None
+			if arg.varname[1] == "&":
+				arg.wtype.attr_type = attr_types.ampamp
+				arg.varname = arg.varname[2:]
+			else:
+				arg.wtype.attr_type = attr_types.amp
+				arg.varname = arg.varname[1:]
+		return arg
+
+	# Generates the varname. If the attribute has no name in the header file,
+	# a name is generated
+	def gen_varname(self):
+		if self.varname != None:
+			return self.varname
+		if self.wtype.name == "void":
+			return ""
+		if self.pos == None:
+			self.pos = Attribute.pos_counter
+			Attribute.pos_counter = Attribute.pos_counter + 1
+		return "gen_varname_" + str(self.pos)
+
+	# Generates the test for the function headers with c++ types
+	def gen_listitem_cpp(self, include_varname=True):
+		postfix = self.gen_varname() * include_varname
+		prefix = ""
+		if self.is_const:
+			prefix = "const "
+		infix = ""
+		if self.wtype.attr_type == attr_types.star:
+			infix = "*"
+		elif self.wtype.attr_type == attr_types.amp:
+			infix = "&"
+		elif self.wtype.attr_type == attr_types.ampamp:
+			infix = "&&"
+		if self.wtype.name in known_containers:
+			return (
+				prefix
+				+ self.wtype.cont.gen_type_cpp()
+				+ " "
+				+ infix
+				+ postfix
+			)
+		if self.wtype.name in classnames:
+			return (
+				prefix
+				+ class_by_name(self.wtype.name).namespace
+				+ "::"
+				+ self.wtype.name
+				+ " "
+				+ infix
+				+ postfix
+			)
+		return prefix + self.wtype.name + " " + infix + postfix
+
+	def gen_listitem_pyarg(self):
+		default = ""
+		if self.default_value is not None:
+			default = f" = {self.default_value}"
+		return f'py::arg("{self.varname}"){default}'
+
+	# Generates the listitem withtout the varname, so the signature can be
+	# compared
+	def gen_listitem_hash(self):
+		prefix = ""
+		if self.is_const:
+			prefix = "const "
+		if self.wtype.name in classnames:
+			return prefix + self.wtype.name + "* "
+		if self.wtype.name in known_containers:
+			return self.wtype.cont.gen_identifier()
+		return prefix + self.wtype.name
+
+
+class WClass:
+	name = None
+	namespace = None
+	link_type = None
+	base_class = None
+	id_ = None
+	string_id = None
+	hash_id = None
+	needs_clone = False
+	found_funs = []
+	found_vars = []
+	found_constrs = []
+
+	def __init__(
+		self,
+		name,
+		link_type,
+		*,
+		id_=None,
+		string_id=None,
+		hash_id=None,
+		needs_clone=False,
+	):
+		self.name = name
+		self.namespace = None
+		self.base_class = None
+		self.link_type = link_type
+		self.id_ = id_
+		self.string_id = string_id
+		self.hash_id = hash_id
+		self.needs_clone = needs_clone
+		self.found_funs = []
+		self.found_vars = []
+		self.found_constrs = []
+
+	@autostring
+	def gen_boost_py(self, *, stream):
+		name_qualified = f"{self.namespace}::{self.name}"
+		tpl_args = [name_qualified]
+		if self.link_type in [link_types.pointer, link_types.global_list]:
+			tpl_args.append(f"std::unique_ptr<{name_qualified}, py::nodelete>")
+		stream.write(f'\t\tpy::class_<{", ".join(tpl_args)}>(m, "{self.name}")\n')
+		for con in self.found_constrs:
+			# HACK: skip move constructors
+			if "&&" in con.orig_text:
+				continue
+			con.gen_boost_py(stream=stream)
+		for fun in sorted(self.found_funs, key=lambda f: (f.is_operator, f.name)):
+			fun.gen_boost_py(stream=stream)
+		if self.string_id:
+			stream.write(
+				f'\t\t\t.def("__str__", [](const {name_qualified} &self){{ return self.{self.string_id}; }})\n'
+			)
+		if self.hash_id:
+			hash_member = f".{self.hash_id}" if self.hash_id != "" else ""
+			stream.write(
+				f'\t\t\t.def("__hash__", [](const {name_qualified} &self){{ return run_hash(self{hash_member}); }})\n'
+			)
+		for var in self.found_vars:
+			var.gen_boost_py(stream=stream)
+		stream.write("\t\t;\n")
+
+	def fully_qualified_name(self) -> str:
+		return f"{self.namespace}::{self.name}"
+
+	def __repr__(self):
+		return f"{self.__class__.__qualname__}({repr(self.__dict__)})"
+
+
+# CONFIGURE HEADER-FILES TO BE PARSED AND CLASSES EXPECTED IN THEM HERE
+
+sources = [
+	Source(
+		"kernel/celltypes",
+		[
+			WClass("CellType", link_types.ref_copy, hash_id="type", needs_clone=True),
+			WClass("CellTypes", link_types.ref_copy, needs_clone=True),
+		],
+	),
+	Source(
+		"kernel/consteval", [WClass("ConstEval", link_types.ref_copy, needs_clone=True)]
+	),
+	Source("kernel/log", []),
+	Source(
+		"kernel/register",
+		[
+			# WClass("Pass", link_types.derive, needs_clone=True), # Manual mapping because of virtual method
+		],
+	),
+	Source(
+		"kernel/rtlil",
+		[
+			WClass("IdString", link_types.ref_copy, string_id="str()", hash_id="str()"),
+			WClass("Const", link_types.ref_copy, string_id="as_string()"),
+			WClass("AttrObject", link_types.ref_copy),
+			WClass("NamedObject", link_types.ref_copy),
+			WClass("Selection", link_types.ref_copy),
+			#WClass("Monitor", link_types.derive), # Moved to tpl for virtual methods
+			WClass("CaseRule", link_types.ref_copy, needs_clone=True),
+			WClass("SwitchRule", link_types.ref_copy, needs_clone=True),
+			WClass("SyncRule", link_types.ref_copy, needs_clone=True),
+			WClass(
+				"Process", link_types.pointer, string_id="name.c_str()", hash_id="name"
+			),
+			WClass("SigChunk", link_types.ref_copy),
+			WClass("SigBit", link_types.ref_copy, hash_id=""),
+			WClass("SigSpec", link_types.ref_copy, hash_id=""),
+			WClass(
+				"Cell",
+				link_types.global_list,
+				id_=Attribute(WType("unsigned int"), "hashidx_"),
+				string_id="name.c_str()",
+				hash_id="",
+			),
+			WClass(
+				"Wire",
+				link_types.global_list,
+				id_=Attribute(WType("unsigned int"), "hashidx_"),
+				string_id="name.c_str()",
+				hash_id="",
+			),
+			WClass(
+				"Memory",
+				link_types.global_list,
+				id_=Attribute(WType("unsigned int"), "hashidx_"),
+				string_id="name.c_str()",
+				hash_id="",
+			),
+			WClass(
+				"Module",
+				link_types.global_list,
+				id_=Attribute(WType("unsigned int"), "hashidx_"),
+				string_id="name.c_str()",
+				hash_id="",
+			),
+			WClass(
+				"Design",
+				link_types.ref_copy,
+				id_=Attribute(WType("unsigned int"), "hashidx_"),
+				string_id="hashidx_",
+				hash_id="",
+			),
+		],
+	),
+	# Source("kernel/satgen",[
+	# 	]
+	# 	),
+	# Source("libs/ezsat/ezsat",[
+	# 	]
+	# 	),
+	# Source("libs/ezsat/ezminisat",[
+	# 	]
+	# 	),
+	Source(
+		"kernel/sigtools", [WClass("SigMap", link_types.ref_copy, needs_clone=True)]
+	),
+	Source("kernel/yosys", []),
+	Source("kernel/cost", []),
+]
+
+blacklist_methods = [
+	"YOSYS_NAMESPACE::Pass::run_register",
+	"YOSYS_NAMESPACE::Module::Pow",
+	"YOSYS_NAMESPACE::RTLIL::Design::selected_whole_modules",
+	"YOSYS_NAMESPACE::RTLIL::AttrObject::get_blackbox_attribute"
+]
+
+enum_names = ["State", "SyncType", "ConstFlags"]
+
+enums = []  # Do not edit
+glbls = []
+
+unowned_functions = []
+
+classnames = []
+for source in sources:
+	for wclass in source.classes:
+		classnames.append(wclass.name)
+
+
+def class_by_name(name):
+	for source in sources:
+		for wclass in source.classes:
+			if wclass.name == name:
+				return wclass
+	return None
+
+
+def enum_by_name(name):
+	for e in enums:
+		if e.name == name:
+			return e
+	return None
+
+
+def find_closing(text, open_tok, close_tok):
+	if text.find(open_tok) == -1 or text.find(close_tok) <= text.find(open_tok):
+		return text.find(close_tok)
+	return (
+		text.find(close_tok)
+		+ find_closing(text[text.find(close_tok) + 1 :], open_tok, close_tok)
+		+ 1
+	)
+
+
+def unpretty_string(s):
+	s = s.strip()
+	while s.find("  ") != -1:
+		s = s.replace("  ", " ")
+	while s.find("\t") != -1:
+		s = s.replace("\t", " ")
+	s = s.replace(" (", "(")
+	return s
+
+
+class WEnum:
+	name = None
+	namespace = None
+	values = []
+
+	def from_string(str_def, namespace, line_number):
+		str_def = str_def.strip()
+		if not str.startswith(str_def, "enum "):
+			return None
+		if str_def.count(";") != 1:
+			return None
+		str_def = str_def[5:]
+		enum = WEnum()
+		split = str_def.split(":")
+		if len(split) != 2:
+			return None
+		enum.name = split[0].strip()
+		if enum.name not in enum_names:
+			return None
+		str_def = split[1]
+		if str_def.count("{") != str_def.count("}") != 1:
+			return None
+		if (
+			len(str_def) < str_def.find("}") + 2
+			or str_def[str_def.find("}") + 1] != ";"
+		):
+			return None
+		str_def = str_def.split("{")[-1].split("}")[0]
+		enum.values = []
+		for val in str_def.split(","):
+			enum.values.append(val.strip().split("=")[0].strip())
+		enum.namespace = namespace
+		return enum
+
+	@autostring
+	def gen_boost_py(self, *, stream):
+		stream.write(
+			f'\t\tpy::native_enum<{self.namespace}::{self.name}>(m, "{self.name}", "enum.Enum")\n'
+		)
+		for value in self.values:
+			stream.write(f'\t\t\t.value("{value}", {self.namespace}::{value})\n')
+		stream.write("\t\t\t.finalize();\n")
+
+	def __str__(self):
+		ret = "Enum " + self.namespace + "::" + self.name + "(\n"
+		for val in self.values:
+			ret = ret + "\t" + val + "\n"
+		return ret + ")"
+
+
+class WConstructor:
+	orig_text = None
+	args = []
+	containing_file = None
+	member_of = None
+	duplicate = False
+	protected = False
+
+	def __init__(self, containing_file, class_):
+		self.orig_text = "Auto generated default constructor"
+		self.args = []
+		self.containing_file = containing_file
+		self.member_of = class_
+		self.protected = False
+
+	def from_string(str_def, containing_file, class_, line_number, protected=False):
+		if class_ == None:
+			return None
+		if str_def.count("delete;") > 0:
+			return None
+		con = WConstructor(containing_file, class_)
+		con.orig_text = str_def
+		con.args = []
+		con.duplicate = False
+		con.protected = protected
+		if str.startswith(str_def, "inline "):
+			str_def = str_def[7:]
+		if not str.startswith(str_def, class_.name + "("):
+			return None
+		str_def = str_def[len(class_.name) + 1 :]
+		found = find_closing(str_def, "(", ")")
+		if found == -1:
+			return None
+		str_def = str_def[0:found].strip()
+		if len(str_def) == 0:
+			return con
+		args = split_list(str_def, ",")
+		for i, arg in enumerate(args):
+			parsed = Attribute.from_string(arg.strip(), containing_file, line_number)
+			if parsed == None:
+				return None
+			# Only allow std::source_location as defaulted last argument, and
+			# don't append so it takes default value
+			if parsed.wtype.name in ["std::source_location", "source_location"]:
+				if parsed.default_value is None or i != len(args) - 1:
+					debug(
+						"std::source_location not defaulted last arg of "
+						+ class_.name
+						+ " is unsupported",
+						2,
+					)
+					return None
+				continue
+			con.args.append(parsed)
+		return con
+
+	def gen_decl_hash_py(self):
+		text = self.member_of.name + "("
+		for arg in self.args:
+			text += arg.gen_listitem_hash() + ", "
+		if len(self.args) > 0:
+			text = text[:-2]
+		text += ");"
+		return text
+
+	def overload_params(self):
+		return ", ".join([a.gen_listitem_cpp(include_varname=False) for a in self.args])
+
+	@autostring
+	def gen_boost_py(self, *, stream):
+		if self.duplicate or self.protected:
+			return
+		stream.write(f"\t\t\t.def(py::init<{self.overload_params()}>())\n")
+
+
+class WFunction:
+	orig_text = None
+	is_static = False
+	is_inline = False
+	is_virtual = False
+	is_const = False
+	ret_attr_type = attr_types.default
+	is_operator = False
+	ret_type = None
+	name = None
+	alias = None
+	args = []
+	containing_file = None
+	member_of = None
+	duplicate = False
+	namespace = ""
+
+	def from_string(str_def, containing_file, class_, line_number, namespace):
+		if str_def.count("delete;") > 0:
+			return None
+		func = WFunction()
+		func.is_static = False
+		func.is_inline = False
+		func.is_virtual = False
+		func.is_const = False
+		func.ret_attr_type = attr_types.default
+		func.is_operator = False
+		func.member_of = None
+		func.orig_text = str_def
+		func.args = []
+		func.containing_file = containing_file
+		func.member_of = class_
+		func.duplicate = False
+		func.namespace = namespace
+		str_def = str_def.replace("operator ", "operator")
+
+		# remove attributes from the start
+		if str.startswith(str_def, "[[") and "]]" in str_def:
+			str_def = str_def[str_def.find("]]") + 2 :]
+
+		if str.startswith(str_def, "static "):
+			func.is_static = True
+			str_def = str_def[7:]
+		else:
+			func.is_static = False
+		if str.startswith(str_def, "inline "):
+			func.is_inline = True
+			str_def = str_def[7:]
+		else:
+			func.is_inline = False
+		if str.startswith(str_def, "virtual "):
+			func.is_virtual = True
+			str_def = str_def[8:]
+		else:
+			func.is_virtual = False
+
+		if str_def.count(" ") == 0:
+			return None
+
+		parts = split_list(str_def.strip(), " ")
+
+		prefix = ""
+		i = 0
+		for part in parts:
+			if part in ["unsigned", "long", "short", "const"]:
+				prefix += part + " "
+				i += 1
+			else:
+				break
+		parts = parts[i:]
+
+		if len(parts) <= 1:
+			return None
+
+		func.ret_type = WType.from_string(
+			prefix + parts[0], containing_file, line_number
+		)
+
+		if func.ret_type == None:
+			return None
+
+		str_def = parts[1]
+		for part in parts[2:]:
+			str_def = str_def + " " + part
+
+		found = str_def.find("(")
+		if found == -1 or (str_def.find(" ") != -1 and found > str_def.find(" ")):
+			return None
+		func.name = str_def[:found]
+		str_def = str_def[found:]
+		if func.name.find("operator") != -1 and str.startswith(str_def, "()("):
+			func.name += "()"
+			str_def = str_def[2:]
+		str_def = str_def[1:]
+		if func.name.find("operator") != -1:
+			func.is_operator = True
+		if func.name.find("*") == 0:
+			func.name = func.name.replace("*", "")
+			func.ret_type.attr_type = attr_types.star
+		if func.name.find("&&") == 0:
+			func.name = func.name.replace("&&", "")
+			func.ret_type.attr_type = attr_types.ampamp
+		if func.name.find("&") == 0:
+			func.name = func.name.replace("&", "")
+			func.ret_type.attr_type = attr_types.amp
+
+		found = find_closing(str_def, "(", ")")
+		if found == -1:
+			return None
+
+		post_qualifiers = str_def[found + 1 :].lstrip()
+		if post_qualifiers.startswith("const"):
+			func.is_const = True
+
+		str_def = str_def[0:found]
+		if func.name in blacklist_methods:
+			return None
+		if func.namespace != None and func.namespace != "":
+			if (func.namespace + "::" + func.name) in blacklist_methods:
+				return None
+			if func.member_of != None:
+				if (
+					func.namespace + "::" + func.member_of.name + "::" + func.name
+				) in blacklist_methods:
+					return None
+		if (
+			func.is_operator
+			and func.name.replace(" ", "").replace("operator", "").split("::")[-1]
+			not in wrappable_operators
+		):
+			return None
+
+		testname = func.name
+		if func.is_operator:
+			testname = testname[: testname.find("operator")]
+		if (
+			testname.count(")") != 0
+			or testname.count("(") != 0
+			or testname.count("~") != 0
+			or testname.count(";") != 0
+			or testname.count(">") != 0
+			or testname.count("<") != 0
+			or testname.count("throw") != 0
+		):
+			return None
+
+		func.alias = func.name
+		if func.name in keyword_aliases:
+			func.alias = keyword_aliases[func.name]
+		str_def = str_def[:found].strip()
+		if len(str_def) == 0:
+			return func
+		args = split_list(str_def, ",")
+		for i, arg in enumerate(args):
+			if arg.strip() == "...":
+				continue
+			parsed = Attribute.from_string(arg.strip(), containing_file, line_number)
+			if parsed == None:
+				return None
+			# Only allow std::source_location as defaulted last argument, and
+			# don't append so it takes default value
+			if parsed.wtype.name in ["std::source_location", "source_location"]:
+				if parsed.default_value is None or i != len(args) - 1:
+					debug(
+						"std::source_location not defaulted last arg of "
+						+ func.name
+						+ " is unsupported",
+						2,
+					)
+					return None
+				continue
+			func.args.append(parsed)
+		# handle (void) parameter declarations
+		if len(func.args) == 1 and func.args[0].wtype.name == "void":
+			func.args = []
+		return func
+
+	@property
+	def mangled_name(self):
+		mangled_typename = (
+			lambda code: code.replace("::", "_")
+			.replace("<", "_")
+			.replace(">", "_")
+			.replace(" ", "")
+			.replace("*", "")
+			.replace(",", "")
+		)
+
+		return self.name + "".join(
+			f"__{mangled_typename(arg.wtype.gen_text_cpp())}" for arg in self.args
+		)
+
+	def gen_alias(self):
+		self.alias = self.mangled_name
+
+	def gen_post_qualifiers(self, derived=False):
+		if (
+			self.member_of != None
+			and self.member_of.link_type == link_types.derive
+			and self.is_virtual
+			and derived
+		):
+			# we drop the qualifiers when deriving callbacks to be implemented in Python
+			return ""
+		return " const" if self.is_const else ""
+
+	def gen_decl_hash_py(self):
+		text = self.ret_type.gen_text() + " " + self.alias + "("
+		for arg in self.args:
+			text += arg.gen_listitem_hash() + ", "
+		if len(self.args) > 0:
+			text = text[:-2]
+		text += ");"
+		return text
+
+	def overload_params(self):
+		return ", ".join([a.gen_listitem_cpp(False) for a in self.args])
+
+	def py_args(self):
+		return ", ".join([a.gen_listitem_pyarg() for a in self.args])
+
+	def wrapper_params(self):
+		return ", ".join([a.gen_listitem_cpp() for a in self.args])
+
+	def wrapper_args(self):
+		varnames = []
+		for a in self.args:
+			if a.varname == "format":
+				# HACK: handle format strings (by ignoring the format part)
+				varnames.extend(['"%s"', "format"])
+			else:
+				varnames.append(a.varname)
+		return ", ".join(varnames)
+
+	@autostring
+	def gen_boost_py(self, *, stream):
+		if self.duplicate:
+			return
+
+		fully_qualify = False
+		if self.member_of is not None and (
+			(self.member_of.name == "IdString" and self.name == "in")
+			or (self.member_of.name == "Design" and self.name == "selection")
+		):
+			fully_qualify = True
+
+		# HACK: skip methods with inline-related nonsense
+		if self.alias in [
+			"log_id",
+			"log_dump_val_worker",
+			"log_dump_args_worker",
+			"GetSize",
+		]:
+			return
+
+		prefix = "\t\tm"
+		ns = self.namespace
+		if self.member_of:
+			prefix = "\t\t\t"
+			ns = self.member_of.fully_qualified_name()
+
+		stream.write(f"{prefix}.def")
+		if self.member_of and self.is_static:
+			stream.write("_static")
+		stream.write("(")
+
+		if self.is_operator:
+			stream.write(f"py::self {self.name[len('operator'):]} py::self")
+		else:
+			stream.write(f'"{self.alias}", ')
+			# HACK: wrap variadics by only allowing a string
+			if "..." in self.orig_text:
+				stream.write(
+					f"[]({self.wrapper_params()}) {{ {self.namespace}::{self.name}({self.wrapper_args()}); }}"
+				)
+			else:
+
+				# HACK: Some of these needs special handling, i.e., a FULL
+				# overload disambiguation. Not sure why. Something to do with
+				# inlines and overloads.
+				#
+				# In theory, this disambiguation should work for everything but
+				# WType doesn't properly retain const return types yet.
+				if fully_qualify:
+					stream.write(
+						f"static_cast < {self.ret_type.gen_text_cpp()} ({ns}::*)({self.overload_params()}) {self.gen_post_qualifiers()} >("
+					)
+				elif not len(self.args) == 0:
+					stream.write(f"py::overload_cast<{self.overload_params()}>(")
+				stream.write(f"&{ns}::{self.name}")
+				if fully_qualify:
+					stream.write(")")
+				elif not len(self.args) == 0:
+					if self.is_const:
+						stream.write(f", py::const_")
+					stream.write(")")
+		py_args = self.py_args()
+		if len(py_args):
+			stream.write(", ")
+			stream.write(py_args)
+		stream.write(")\n" if self.member_of is not None else ");\n")
+
+	def __repr__(self):
+		return f"{self.__class__.__qualname__}({repr(self.__dict__)})"
+
+
+class WMember:
+	opaque_containers: ClassVar[dict] = dict()
+	orig_text = None
+	wtype = attr_types.default
+	name = None
+	containing_file = None
+	member_of = None
+	namespace = ""
+	is_const = False
+
+	def from_string(str_def, containing_file, class_, line_number, namespace):
+		member = WMember()
+		member.orig_text = str_def
+		member.wtype = None
+		member.name = ""
+		member.containing_file = containing_file
+		member.member_of = class_
+		member.namespace = namespace
+		member.is_const = False
+
+		if str.startswith(str_def, "const "):
+			member.is_const = True
+			str_def = str_def[6:]
+
+		if str_def.count(" ") == 0:
+			return None
+
+		parts = split_list(str_def.strip(), " ")
+
+		prefix = ""
+		i = 0
+		for part in parts:
+			if part in ["unsigned", "long", "short"]:
+				prefix += part + " "
+				i += 1
+			else:
+				break
+		parts = parts[i:]
+
+		if len(parts) <= 1:
+			return None
+
+		member.wtype = WType.from_string(
+			prefix + parts[0], containing_file, line_number
+		)
+
+		if member.wtype == None:
+			return None
+
+		str_def = parts[1]
+		for part in parts[2:]:
+			str_def = str_def + " " + part
+
+		if (
+			str_def.find("(") != -1
+			or str_def.find(")") != -1
+			or str_def.find("{") != -1
+			or str_def.find("}") != -1
+		):
+			return None
+
+		found = str_def.find(";")
+		if found == -1:
+			return None
+
+		found_eq = str_def.find("=")
+		if found_eq != -1:
+			found = found_eq
+
+		member.name = str_def[:found]
+		str_def = str_def[found + 1 :]
+		if member.name.find("*") == 0:
+			member.name = member.name.replace("*", "")
+			member.wtype.attr_type = attr_types.star
+		if member.name.find("&&") == 0:
+			member.name = member.name.replace("&&", "")
+			member.wtype.attr_type = attr_types.ampamp
+		if member.name.find("&") == 0:
+			member.name = member.name.replace("&", "")
+			member.wtype.attr_type = attr_types.amp
+
+		if len(str_def.strip()) != 0:
+			return None
+
+		if len(member.name.split(",")) > 1:
+			member_list = []
+			for name in member.name.split(","):
+				name = name.strip()
+				member_list.append(WMember())
+				member_list[-1].orig_text = member.orig_text
+				member_list[-1].wtype = member.wtype
+				member_list[-1].name = name
+				member_list[-1].containing_file = member.containing_file
+				member_list[-1].member_of = member.member_of
+				member_list[-1].namespace = member.namespace
+				member_list[-1].is_const = member.is_const
+			return member_list
+
+		if member.wtype.cont:
+			WMember.opaque_containers[member.wtype.gen_identifier()] = member.wtype
+
+		return member
+
+	@autostring
+	def gen_boost_py(self, *, stream):
+		if False and self.wtype.attr_type == attr_types.default:
+			property_type = self.wtype.gen_text_cpp()
+			stream.write(f'\t\t\t.def_property("{self.name}",\n')
+			stream.write(f'\t\t\t\t[]({self.member_of.fully_qualified_name()} &o) -> {property_type}&  {{ return o.{self.name}; }},\n')
+			stream.write(f'\t\t\t\t[]({self.member_of.fully_qualified_name()} &o, {property_type} const &p) {{ o.{self.name} = p; }},\n')
+			stream.write(f'\t\t\t\tpy::return_value_policy::reference_internal\n')
+			stream.write(f'\t\t\t)\n')
+		else:
+			meth = "def_readonly" if self.is_const else "def_readwrite"
+			stream.write(
+				f'\t\t\t.{meth}("{self.name}", &{self.member_of.fully_qualified_name()}::{self.name})\n'
+			)
+
+	def __repr__(self):
+		return f"{self.__class__.__qualname__}({repr(self.__dict__)})"
+
+
+class WGlobal:
+	orig_text = None
+	wtype = attr_types.default
+	name = None
+	containing_file = None
+	namespace = ""
+	is_const = False
+
+	def from_string(str_def, containing_file, line_number, namespace):
+		glbl = WGlobal()
+		glbl.orig_text = str_def
+		glbl.wtype = None
+		glbl.name = ""
+		glbl.containing_file = containing_file
+		glbl.namespace = namespace
+		glbl.is_const = False
+
+		if not str.startswith(str_def, "extern"):
+			return None
+		str_def = str_def[7:]
+
+		if str.startswith(str_def, "const "):
+			glbl.is_const = True
+			str_def = str_def[6:]
+
+		if str_def.count(" ") == 0:
+			return None
+
+		parts = split_list(str_def.strip(), " ")
+
+		prefix = ""
+		i = 0
+		for part in parts:
+			if part in ["unsigned", "long", "short"]:
+				prefix += part + " "
+				i += 1
+			else:
+				break
+		parts = parts[i:]
+
+		if len(parts) <= 1:
+			return None
+
+		glbl.wtype = WType.from_string(prefix + parts[0], containing_file, line_number)
+
+		if glbl.wtype == None:
+			return None
+
+		str_def = parts[1]
+		for part in parts[2:]:
+			str_def = str_def + " " + part
+
+		if (
+			str_def.find("(") != -1
+			or str_def.find(")") != -1
+			or str_def.find("{") != -1
+			or str_def.find("}") != -1
+		):
+			return None
+
+		found = str_def.find(";")
+		if found == -1:
+			return None
+
+		found_eq = str_def.find("=")
+		if found_eq != -1:
+			found = found_eq
+
+		glbl.name = str_def[:found]
+		str_def = str_def[found + 1 :]
+		if glbl.name.find("*") == 0:
+			glbl.name = glbl.name.replace("*", "")
+			glbl.wtype.attr_type = attr_types.star
+		if glbl.name.find("&&") == 0:
+			glbl.name = glbl.name.replace("&&", "")
+			glbl.wtype.attr_type = attr_types.ampamp
+		if glbl.name.find("&") == 0:
+			glbl.name = glbl.name.replace("&", "")
+			glbl.wtype.attr_type = attr_types.amp
+
+		if len(str_def.strip()) != 0:
+			return None
+
+		if len(glbl.name.split(",")) > 1:
+			glbl_list = []
+			for name in glbl.name.split(","):
+				name = name.strip()
+				glbl_list.append(WGlobal())
+				glbl_list[-1].orig_text = glbl.orig_text
+				glbl_list[-1].wtype = glbl.wtype
+				glbl_list[-1].name = name
+				glbl_list[-1].containing_file = glbl.containing_file
+				glbl_list[-1].namespace = glbl.namespace
+				glbl_list[-1].is_const = glbl.is_const
+			return glbl_list
+
+		return glbl
+
+	@autostring
+	def gen_boost_py(self, *, stream):
+		args = [
+			f'"{self.name}"',
+		]
+		meth = "def_readonly_static"
+		if not self.is_const:
+			meth = "def_readwrite_static"
+		args.append(f"&{self.namespace}::{self.name}")
+		stream.write(f'\t\t\t.{meth}({", ".join(args)})\n')
+
+
+def concat_namespace(tuple_list):
+	if len(tuple_list) == 0:
+		return ""
+	ret = ""
+	for namespace in tuple_list:
+		ret += "::" + namespace[0]
+	return ret[2:]
+
+
+def calc_ident(text):
+	if len(text) == 0 or text[0] != " ":
+		return 0
+	return calc_ident(text[1:]) + 1
+
+
+def assure_length(text, length, left=False):
+	if len(text) > length:
+		return text[:length]
+	if left:
+		return text + " " * (length - len(text))
+	return " " * (length - len(text)) + text
+
+
+def nesting_delta(s):
+	return s.count("{") - s.count("}")
+
+
+def parse_header(source):
+	debug("Parsing " + source.name + ".pyh", 1)
+	source_file = open(source.name + ".pyh", "r")
+
+	source_text = []
+	in_line = source_file.readline()
+
+	namespaces = []
+
+	while in_line:
+		if len(in_line) > 1:
+			source_text.append(
+				in_line.replace("char *", "char_p ").replace("char* ", "char_p ")
+			)
+		in_line = source_file.readline()
+
+	i = 0
+
+	namespaces = []
+	classes = []
+	private_segment = False
+
+	while i < len(source_text):
+		line = (
+			source_text[i]
+			.replace(
+				"YOSYS_NAMESPACE_BEGIN",
+				"                    namespace YOSYS_NAMESPACE{",
+			)
+			.replace("YOSYS_NAMESPACE_END", "                    }")
+		)
+		ugly_line = unpretty_string(line)
+		debug(f"READ:>> {line}", 2)
+
+		# for anonymous unions, ignore union enclosure by skipping start line and replacing end line with new line
+		if "union {" in line:
+			j = i + 1
+			while j < len(source_text):
+				union_line = source_text[j]
+				if "};" in union_line:
+					source_text[j] = "\n"
+					break
+				j += 1
+			if j != len(source_text):
+				i += 1
+				continue
+
+		if str.startswith(
+			ugly_line, "namespace "
+		):  # and ugly_line.find("std") == -1 and ugly_line.find("__") == -1:
+			namespace_name = ugly_line[10:].replace("{", "").strip()
+			namespaces.append((namespace_name, ugly_line.count("{")))
+			debug("-----NAMESPACE " + concat_namespace(namespaces) + "-----", 3)
+			i += 1
+			continue
+
+		if len(namespaces) != 0:
+			namespaces[-1] = (
+				namespaces[-1][0],
+				namespaces[-1][1] + nesting_delta(ugly_line),
+			)
+			if namespaces[-1][1] == 0:
+				debug("-----END NAMESPACE " + concat_namespace(namespaces) + "-----", 3)
+				namespaces.pop()
+				i += 1
+				continue
+
+		if (
+			str.startswith(ugly_line, "struct ") or str.startswith(ugly_line, "class")
+		) and ugly_line.count(";") == 0:
+			# Opening a record declaration which isn't a forward declaration
+			struct_name = ugly_line.split(" ")[1].split("::")[-1]
+			impl_namespaces = ugly_line.split(" ")[1].split("::")[:-1]
+			complete_namespace = concat_namespace(namespaces)
+			for namespace in impl_namespaces:
+				complete_namespace += "::" + namespace
+			debug("\tFound " + struct_name + " in " + complete_namespace, 2)
+
+			base_class_name = None
+			if len(ugly_line.split(" : ")) > 1:  # class is derived
+				deriv_str = ugly_line.split(" : ")[1]
+				if len(deriv_str.split("::")) > 1:  # namespace of base class is given
+					base_class_name = deriv_str.split("::", 1)[1]
+				else:
+					base_class_name = deriv_str.split(" ")[0]
+				debug("\t  " + struct_name + " is derived from " + base_class_name, 2)
+			base_class = class_by_name(base_class_name)
+
+			c = (class_by_name(struct_name), ugly_line.count("{"))  # calc_ident(line))
+			debug(f"switch to {struct_name} in namespace {namespaces}", 2)
+			if struct_name in classnames:
+				c[0].namespace = complete_namespace
+				c[0].base_class = base_class
+			classes.append(c)
+			i += 1
+			continue
+
+		if len(classes):
+			c = (classes[-1][0], classes[-1][1] + nesting_delta(ugly_line))
+			classes[-1] = c
+			if c[1] == 0:
+				if c[0] == None:
+					debug("\tExiting unknown class", 3)
+				else:
+					debug("\tExiting class " + c[0].name, 3)
+				classes.pop()
+				private_segment = False
+				i += 1
+				continue
+
+		class_ = classes[-1] if classes else None
+
+		if class_ != None and (
+			line.find("private:") != -1 or line.find("protected:") != -1
+		):
+			private_segment = True
+			i += 1
+			continue
+		if class_ != None and line.find("public:") != -1:
+			private_segment = False
+			i += 1
+			continue
+
+		candidate = None
+
+		if private_segment and class_ != None and class_[0] != None:
+			candidate = WConstructor.from_string(
+				ugly_line, source.name, class_[0], i, True
+			)
+			if candidate != None:
+				debug(
+					'\t\tFound constructor of class "'
+					+ class_[0].name
+					+ '" in namespace '
+					+ concat_namespace(namespaces),
+					2,
+				)
+				class_[0].found_constrs.append(candidate)
+				i += 1
+				continue
+
+		if not private_segment and (class_ == None or class_[0] != None):
+			if class_ != None:
+				candidate = WFunction.from_string(
+					ugly_line, source.name, class_[0], i, concat_namespace(namespaces)
+				)
+			else:
+				candidate = WFunction.from_string(
+					ugly_line, source.name, None, i, concat_namespace(namespaces)
+				)
+			if candidate != None and candidate.name.find("::") == -1:
+				if class_ == None:
+					debug(
+						'\tFound unowned function "'
+						+ candidate.name
+						+ '" in namespace '
+						+ concat_namespace(namespaces),
+						2,
+					)
+					unowned_functions.append(candidate)
+				else:
+					debug(
+						'\t\tFound function "'
+						+ candidate.name
+						+ '" of class "'
+						+ class_[0].name
+						+ '" in namespace '
+						+ concat_namespace(namespaces),
+						2,
+					)
+					class_[0].found_funs.append(candidate)
+			else:
+				candidate = WEnum.from_string(
+					ugly_line, concat_namespace(namespaces), i
+				)
+				if candidate != None:
+					enums.append(candidate)
+					debug(
+						'\tFound enum "'
+						+ candidate.name
+						+ '" in namespace '
+						+ concat_namespace(namespaces),
+						2,
+					)
+				elif class_ != None and class_[1] == 1:
+					candidate = WConstructor.from_string(
+						ugly_line, source.name, class_[0], i
+					)
+					if candidate != None:
+						debug(
+							'\t\tFound constructor of class "'
+							+ class_[0].name
+							+ '" in namespace '
+							+ concat_namespace(namespaces),
+							2,
+						)
+						class_[0].found_constrs.append(candidate)
+					else:
+						candidate = WMember.from_string(
+							ugly_line,
+							source.name,
+							class_[0],
+							i,
+							concat_namespace(namespaces),
+						)
+						if candidate != None:
+							if type(candidate) == list:
+								for c in candidate:
+									debug(
+										'\t\tFound member "'
+										+ c.name
+										+ '" of class "'
+										+ class_[0].name
+										+ '" of type "'
+										+ c.wtype.name
+										+ '"',
+										2,
+									)
+								class_[0].found_vars.extend(candidate)
+							else:
+								debug(
+									'\t\tFound member "'
+									+ candidate.name
+									+ '" of class "'
+									+ class_[0].name
+									+ '" of type "'
+									+ candidate.wtype.name
+									+ '"',
+									2,
+								)
+								class_[0].found_vars.append(candidate)
+				if candidate == None and class_ == None:
+					candidate = WGlobal.from_string(
+						ugly_line, source.name, i, concat_namespace(namespaces)
+					)
+					if candidate != None:
+						if type(candidate) == list:
+							for c in candidate:
+								glbls.append(c)
+								debug(
+									'\tFound global "'
+									+ c.name
+									+ '" in namespace '
+									+ concat_namespace(namespaces),
+									2,
+								)
+						else:
+							glbls.append(candidate)
+							debug(
+								'\tFound global "'
+								+ candidate.name
+								+ '" in namespace '
+								+ concat_namespace(namespaces),
+								2,
+							)
+
+			j = i
+			line = unpretty_string(line)
+			while (
+				candidate == None
+				and j + 1 < len(source_text)
+				and line.count(";") <= 1
+				and line.count("(") >= line.count(")")
+			):
+				j += 1
+				line = line + "\n" + unpretty_string(source_text[j])
+				if class_ != None:
+					candidate = WFunction.from_string(
+						ugly_line,
+						source.name,
+						class_[0],
+						i,
+						concat_namespace(namespaces),
+					)
+				else:
+					candidate = WFunction.from_string(
+						ugly_line, source.name, None, i, concat_namespace(namespaces)
+					)
+				if candidate != None and candidate.name.find("::") == -1:
+					if class_ == None:
+						debug(
+							'\tFound unowned function "'
+							+ candidate.name
+							+ '" in namespace '
+							+ concat_namespace(namespaces),
+							2,
+						)
+						unowned_functions.append(candidate)
+					else:
+						debug(
+							'\t\tFound function "'
+							+ candidate.name
+							+ '" of class "'
+							+ class_[0].name
+							+ '" in namespace '
+							+ concat_namespace(namespaces),
+							2,
+						)
+						class_[0].found_funs.append(candidate)
+					continue
+				candidate = WEnum.from_string(line, concat_namespace(namespaces), i)
+				if candidate != None:
+					enums.append(candidate)
+					debug(
+						'\tFound enum "'
+						+ candidate.name
+						+ '" in namespace '
+						+ concat_namespace(namespaces),
+						2,
+					)
+					continue
+				if class_ != None:
+					candidate = WConstructor.from_string(
+						line, source.name, class_[0], i
+					)
+					if candidate != None:
+						debug(
+							'\t\tFound constructor of class "'
+							+ class_[0].name
+							+ '" in namespace '
+							+ concat_namespace(namespaces),
+							2,
+						)
+						class_[0].found_constrs.append(candidate)
+						continue
+				if class_ == None:
+					candidate = WGlobal.from_string(
+						line, source.name, i, concat_namespace(namespaces)
+					)
+					if candidate != None:
+						if type(candidate) == list:
+							for c in candidate:
+								glbls.append(c)
+								debug(
+									'\tFound global "'
+									+ c.name
+									+ '" in namespace '
+									+ concat_namespace(namespaces),
+									2,
+								)
+						else:
+							glbls.append(candidate)
+							debug(
+								'\tFound global "'
+								+ candidate.name
+								+ '" in namespace '
+								+ concat_namespace(namespaces),
+								2,
+							)
+						continue
+		if candidate != None:
+			while i < j:
+				i += 1
+				line = (
+					source_text[i]
+					.replace(
+						"YOSYS_NAMESPACE_BEGIN",
+						"                    namespace YOSYS_NAMESPACE{",
+					)
+					.replace("YOSYS_NAMESPACE_END", "                    }")
+				)
+				ugly_line = unpretty_string(line)
+				if len(namespaces) != 0:
+					namespaces[-1] = (
+						namespaces[-1][0],
+						namespaces[-1][1] + nesting_delta(ugly_line),
+					)
+					if namespaces[-1][1] == 0:
+						debug(
+							"-----END NAMESPACE "
+							+ concat_namespace(namespaces)
+							+ "-----",
+							3,
+						)
+						namespaces.pop()
+				if len(classes):
+					c = (classes[-1][0], classes[-1][1] + nesting_delta(ugly_line))
+					classes[-1] = c
+					if c[1] == 0:
+						if c[0] == None:
+							debug("\tExiting unknown class", 3)
+						else:
+							debug("\tExiting class " + c[0].name, 3)
+						classes.pop()
+						private_segment = False
+			i += 1
+		else:
+			i += 1
+
+
+def debug(message, level):
+	if level <= debug.debug_level:
+		print(message)
+
+
+def expand_functions():
+	global unowned_functions
+	new_funs = []
+	for fun in unowned_functions:
+		new_funs.append(fun)
+	unowned_functions = new_funs
+	for source in sources:
+		for class_ in source.classes:
+			new_funs = []
+			for fun in class_.found_funs:
+				new_funs.append(fun)
+			class_.found_funs = new_funs
+
+
+def inherit_members():
+	for source in sources:
+		for class_ in source.classes:
+			if class_.base_class:
+				base_funs = copy.deepcopy(class_.base_class.found_funs)
+				for fun in base_funs:
+					fun.member_of = class_
+					fun.namespace = class_.namespace
+				base_vars = copy.deepcopy(class_.base_class.found_vars)
+				for var in base_vars:
+					var.member_of = class_
+					var.namespace = class_.namespace
+				class_.found_funs.extend(base_funs)
+				class_.found_vars.extend(base_vars)
+
+
+def clean_duplicates():
+	for source in sources:
+		for class_ in source.classes:
+			known_decls = {}
+			for fun in class_.found_funs:
+				if fun.gen_decl_hash_py() in known_decls:
+					debug("Multiple declarations of " + fun.gen_decl_hash_py(), 3)
+
+					other = known_decls[fun.gen_decl_hash_py()]
+					if fun.mangled_name == other.mangled_name:
+						fun.duplicate = True
+						debug('Disabled "' + fun.gen_decl_hash_py() + '"', 3)
+						continue
+
+					other.gen_alias()
+					fun.gen_alias()
+				else:
+					known_decls[fun.gen_decl_hash_py()] = fun
+			known_decls = []
+			for con in class_.found_constrs:
+				if con.gen_decl_hash_py() in known_decls:
+					debug("Multiple declarations of " + con.gen_decl_hash_py(), 3)
+					con.duplicate = True
+				else:
+					known_decls.append(con.gen_decl_hash_py())
+	known_decls = []
+	for fun in unowned_functions:
+		if fun.gen_decl_hash_py() in known_decls:
+			debug("Multiple declarations of " + fun.gen_decl_hash_py(), 3)
+			fun.duplicate = True
+		else:
+			known_decls.append(fun.gen_decl_hash_py())
+
+
+def gen_wrappers(filename, debug_level_=0):
+	filename = Path(filename)
+
+	debug.debug_level = debug_level_
+	for source in sources:
+		parse_header(source)
+
+	expand_functions()
+	inherit_members()
+	clean_duplicates()
+
+	import shutil
+	import math
+
+	col = shutil.get_terminal_size((80, 20)).columns
+	debug("-" * col, 1)
+	debug(
+		"-" * math.floor((col - 7) / 2) + "SUMMARY" + "-" * math.ceil((col - 7) / 2), 1
+	)
+	debug("-" * col, 1)
+	for source in sources:
+		for class_ in source.classes:
+			debug(
+				"Class "
+				+ assure_length(class_.name, len(max(classnames, key=len)), True)
+				+ " contains "
+				+ assure_length(str(len(class_.found_vars)), 3, False)
+				+ " member variables, "
+				+ assure_length(str(len(class_.found_funs)), 3, False)
+				+ " methods and "
+				+ assure_length(str(len(class_.found_constrs)), 2, False)
+				+ " constructors",
+				1,
+			)
+			if len(class_.found_constrs) == 0:
+				class_.found_constrs.append(WConstructor(source.name, class_))
+	debug(str(len(unowned_functions)) + " functions are unowned", 1)
+	debug(str(len(unowned_functions)) + " global variables", 1)
+	for enum in enums:
+		debug(
+			"Enum "
+			+ assure_length(enum.name, len(max(enum_names, key=len)), True)
+			+ " contains "
+			+ assure_length(str(len(enum.values)), 2, False)
+			+ " values",
+			1,
+		)
+	debug("-" * col, 1)
+
+	tpl = __file_dir__ / "wrappers_tpl.cc"
+	with open(tpl, encoding="utf8") as f, open(
+		filename, "w", encoding="utf8"
+	) as wrapper_file:
+		do_line_directive = True
+		for i, line in enumerate(f):
+			if do_line_directive:
+				wrapper_file.write(f'#line {i + 1} "{tpl}"\n')
+				do_line_directive = False
+			if "<!-- generated includes -->" in line:
+				for source in sources:
+					wrapper_file.write(f'#include "{source.name}.h"\n')
+				do_line_directive = True
+			elif "<!-- generated top-level code -->" in line:
+				wrapper_file.write("// Opaque Container Declaration\n")
+				for i, (container_identifier, container) in enumerate(WMember.opaque_containers.items()):
+					wrapper_file.write(f"using {container_identifier} = {container.gen_text_cpp()};\n")
+					wrapper_file.write(f'PYBIND11_MAKE_OPAQUE({container_identifier})\n')
+				wrapper_file.write("\n")
+				do_line_directive = True
+			elif "<!-- generated YOSYS_PYTHON namespace-level code -->" in line:
+				do_line_directive = True
+			elif "<!-- generated pymod-level code -->" in line:
+				wrapper_file.write("\t\t// Opaque Container Binding\n")
+				for container in WMember.opaque_containers.values():
+					container.cont.gen_boost_py(stream=wrapper_file)
+				wrapper_file.write("\n")
+
+				wrapper_file.write("\t\t// Enums\n")
+				for enum in enums:
+					enum.gen_boost_py(stream=wrapper_file)
+				wrapper_file.write("\n")
+
+				wrapper_file.write("\t\t// Classes\n")
+				for source in sources:
+					for wclass in source.classes:
+						wclass.gen_boost_py(stream=wrapper_file)
+				wrapper_file.write("\n")
+
+				wrapper_file.write("\t\t// Global Functions\n")
+				for fun in sorted(unowned_functions, key=lambda x: x.alias):
+					fun.gen_boost_py(stream=wrapper_file)
+				wrapper_file.write("\n")
+
+				wrapper_file.write("\t\t// Global Variables\n")
+				wrapper_file.write('\t\tpy::class_<YosysStatics>(m, "Yosys")\n')
+				for glbl in sorted(glbls, key=lambda x: (not x.is_const, x.name)):
+					glbl.gen_boost_py(stream=wrapper_file)
+				wrapper_file.write("\t\t\t;\n")
+				do_line_directive = True
+			else:
+				wrapper_file.write(line)
+
+
+def print_includes():
+	for source in sources:
+		print(source.name + ".pyh")
+
+
+if __name__ == "__main__":
+	ap = argparse.ArgumentParser()
+	ap.add_argument("--print-includes", action="store_true")
+	ap.add_argument("--debug", default=0, type=int)
+	ap.add_argument("output", nargs="?")
+	ns = ap.parse_args()
+	if ns.print_includes:
+		print_includes()
+		exit(0)
+	gen_wrappers(ns.output, ns.debug)
diff --git a/pyosys/hashlib.h b/pyosys/hashlib.h
new file mode 100644
index 000000000..e8ace90c8
--- /dev/null
+++ b/pyosys/hashlib.h
@@ -0,0 +1,275 @@
+// -------------------------------------------------------
+// Written by Mohamed Gaber in 2025 <me@donn.website>
+// Based on kernel/hashlib.h by Claire Xenia Wolf <claire@yosyshq.com>
+// -------------------------------------------------------
+// This header is free and unencumbered software released into the public domain.
+//
+// Anyone is free to copy, modify, publish, use, compile, sell, or
+// distribute this software, either in source code form or as a compiled
+// binary, for any purpose, commercial or non-commercial, and by any
+// means.
+//
+// In jurisdictions that recognize copyright laws, the author or authors
+// of this software dedicate any and all copyright interest in the
+// software to the public domain. We make this dedication for the benefit
+// of the public at large and to the detriment of our heirs and
+// successors. We intend this dedication to be an overt act of
+// relinquishment in perpetuity of all present and future rights to this
+// software under copyright law.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+// OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// For more information, please refer to <https://unlicense.org/>
+// -------------------------------------------------------
+//
+// pybind11 bridging headers for hashlib template
+//
+// These are various binding functions that expose hashlib templates as opaque
+// types (https://pybind11.readthedocs.io/en/latest/advanced/cast/stl.html#making-opaque-types).
+//
+// Opaque types cross language barries by reference, not value. This allows
+// things like mutating containers that are class properties.
+//
+// All methods should be vaguely in the same order as the python reference
+// https://docs.python.org/3/library/stdtypes.html
+//
+#include <optional> // optional maps cleanest to methods that accept None in Python
+
+#include <pybind11/pybind11.h> // base
+#include <pybind11/stl.h> // std::optional
+#include <pybind11/operators.h> // easier operator binding
+
+#include "kernel/hashlib.h"
+
+namespace pybind11 {
+
+template<typename T>
+struct is_pointer { static const bool value = false; };
+template<typename T>
+struct is_pointer<T*> { static const bool value = true; };
+
+bool is_mapping(object obj) {
+	object mapping = module_::import("collections.abc").attr("Mapping");
+	return isinstance(obj, mapping);
+}
+
+
+// also used for std::set because the semantics are close enough
+template <typename C, typename T>
+void bind_pool(module &m, const char *name_cstr) {
+	std::string {name_cstr};
+
+	class_<C>(m, name_cstr)
+		.def(init<>())
+		.def("__len__", [](const C &s){ return (size_t)s.size(); })
+		.def("__contains__", [](const C &s, const T &v){ return s.count(v); })
+		.def("__delitem__", [](C &s, const T &v) {
+			auto n = s.erase(v);
+			if (n == 0) throw key_error(str(cast(v)));
+		})
+		// TODO: disjoint, subset, union, intersection, difference, symdif
+		.def("copy", [](const C &s) {
+			return new C(s);
+		})
+		.def("update", [](C &s, iterable iterable) {
+			for (auto item: iterable) {
+				s.insert(item.cast<T>());
+			}
+		})
+		.def("add", [](C &s, const T &v){ s.insert(v); })
+		.def("remove", [](C &s, const T &v){
+			auto n = s.erase(v);
+			if (n == 0) throw key_error(str(cast(v)));
+		})
+		.def("discard", [](C &s, const T &v){ s.erase(v); })
+		.def("clear", [](C &s){ s.clear(); })
+		.def("pop", [](C &s){
+			if (s.size() == 0) {
+				throw key_error("empty pool");
+			}
+			auto result = *s.begin();
+			s.erase(result);
+			return result;
+		})
+		.def("__bool__", [](const C &s) { return s.size() != 0; })
+		.def("__iter__", [](const C &s){
+			return make_iterator(s.begin(), s.end());
+		}, keep_alive<0,1>())
+		.def("__repr__", [name_cstr](const C &s){
+			return std::string("<") + name_cstr + " size=" + std::to_string(s.size()) + ">";
+		});
+}
+
+template <typename C, typename K, typename V>
+void update_dict(C *target, iterable &iterable_or_mapping) {
+	if (is_mapping(iterable_or_mapping)) {
+		for (const auto &key: iterable_or_mapping) {
+			(*target)[cast<K>(key)] = cast<V>(iterable_or_mapping[key]);
+		}
+	} else {
+		for (const auto &pair: iterable_or_mapping) {
+			if (len(pair) != 2) {
+				throw value_error(str("iterable element %s has more than two elements").format(str(pair)));
+			}
+			(*target)[cast<K>(pair[cast(0)])] = cast<V>(pair[cast(1)]);
+		}
+	}
+}
+
+template <typename C, typename K, typename V>
+void bind_dict(module &m, const char *name_cstr) {
+	std::string {name_cstr};
+
+	class_<C>(m, name_cstr)
+		.def(init<>())
+		.def("__len__", [](const C &s){ return (size_t)s.size(); })
+		.def("__getitem__", [](const C &s, const K &k) { return s.at(k); })
+		.def("__setitem__", [](C &s, const K &k, const V &v) { s[k] = v; })
+		.def("__delitem__", [](C &s, const K &k) {
+			auto n = s.erase(k);
+			if (n == 0) throw key_error("remove: key not found");
+		})
+		.def("__contains__", [](const C &s, const K &k) { return s.count(k) != 0; })
+		.def("__iter__", [](const C &s){
+			return make_key_iterator(s.begin(), s.end());
+		}, keep_alive<0,1>())
+		.def("clear", [](C &s){ s.clear(); })
+		.def("copy", [](const C &s) {
+			return new C(s);
+		})
+		.def("get", [](const C &s, const K& k, std::optional<const V> &default_) {
+			if (default_.has_value()) {
+				return s.at(k, *default_);
+			} else {
+				return s.at(k);
+			}
+		}, arg("key"), arg("default") = std::nullopt)
+		.def("items", [](const C &s){
+			return make_iterator(s.begin(), s.end());
+		}, keep_alive<0,1>())
+		.def("keys", [](const C &s){
+			return make_key_iterator(s.begin(), s.end());
+		}, keep_alive<0,1>())
+		.def("pop", [](const C &s, const K& k, std::optional<const V> &default_) {
+			if (default_.has_value()) {
+				return s.at(k, *default_);
+			} else {
+				return s.at(k);
+			}
+		}, arg("key"), arg("default") = std::nullopt)
+		.def("popitem", [name_cstr](args _) { throw std::runtime_error(std::string(name_cstr) + " is not an ordered dictionary"); })
+		.def("setdefault", [name_cstr](C &s, const K& k, std::optional<const V> &default_) {
+			auto it = s.find(k);
+			if (it != s.end()) {
+				return it->second;
+			}
+			if (default_.has_value()) {
+				s[k] = *default_;
+				return *default_;
+			}
+			 // if pointer, nullptr can be our default
+			if constexpr (is_pointer<V>::value) {
+				s[k] = nullptr;
+				return (V)nullptr;
+			}
+			// TODO: std::optional? do we care?
+			throw type_error(std::string("the value type of ") + name_cstr + " is not nullable");
+		}, arg("key"), arg("default") = std::nullopt)
+		.def("update", [](C &s, iterable iterable_or_mapping) {
+			update_dict<C, K, V>(&s, iterable_or_mapping);
+		}, arg("iterable_or_mapping"))
+		.def("values", [](const C &s){
+			return make_value_iterator(s.begin(), s.end());
+		}, keep_alive<0,1>())
+		.def("__or__", [](const C &s, iterable iterable_or_mapping) {
+			auto result = new C(s);
+			update_dict<C, K, V>(result, iterable_or_mapping);
+			return result;
+		})
+		.def("__ior__", [](C &s, iterable iterable_or_mapping) {
+			update_dict<C, K, V>(&s, iterable_or_mapping);
+			return s;
+		})
+		.def("__bool__", [](const C &s) { return s.size() != 0; })
+		.def("__repr__", [name_cstr](const C &s){
+			return std::string("<") + name_cstr + " size=" + std::to_string(s.size()) + ">";
+		});
+}
+
+// idict is a special bijection and doesn't map cleanly to dict
+//
+// it's cleanest, despite the inconsistency with __getitem__, to just think of
+// the hashable as key and the integer as value
+template <typename C, typename K>
+void bind_idict(module &m, const char *name_cstr) {
+	std::string {name_cstr};
+
+	auto cls = class_<C>(m, name_cstr)
+		.def(init<>())
+		.def("__len__", [](const C &s){ return (size_t)s.size(); })
+		.def("__getitem__", [](const C &s, int v) { return s[v]; })
+		.def("__call__", [](C &s, const K &k) { return s(k); })
+		.def("__contains__", [](const C &s, const K &k) {
+			return s.count(k) != 0;
+		})
+		.def("__iter__", [](const C &s){
+			return make_iterator(s.begin(), s.end());
+		}, keep_alive<0,1>())
+		.def("clear", [](C &s) {
+			s.clear();
+		})
+		.def("copy", [](const C &s) {
+			return new C(s);
+		})
+		.def("get", [](const C &s, const K& k, std::optional<int> &default_) {
+			if (default_.has_value()) {
+				return s.at(k, *default_);
+			} else {
+				return s.at(k);
+			}
+		}, arg("key"), arg("default") = std::nullopt)
+		.def("keys", [](const C &s){
+			return make_iterator(s.begin(), s.end());
+		})
+		.def("values", [](args _){
+			throw type_error("idicts do not support iteration on the integers");
+		})
+		.def("items", [](args _){
+			throw type_error("idicts do not support pairwise iteration");
+		})
+		.def("update", [](C &s, iterable iterable) {
+			for (auto &e: iterable) {
+				s(cast<K>(e));
+			}
+		})
+		.def("__or__", [](const C &s, iterable iterable) {
+			auto result = new C(s);
+			for (auto &e: iterable) {
+				(*result)(cast<K>(e));
+			}
+			return result;
+		})
+		.def("__ior__", [](C &s, iterable iterable) {
+			for (auto &e: iterable) {
+				s(cast<K>(e));
+			}
+			return s;
+		})
+		.def("__bool__", [](const C &s) { return s.size() != 0; })
+		.def("__repr__", [name_cstr](const C &s){
+			return std::string("<") + name_cstr + " size=" + std::to_string(s.size()) + ">";
+		});
+
+	for (const char *mutator: {"__setitem__", "__delitem__", "pop", "popitem", "setdefault"}) {
+		cls.def(mutator, [](args _) {
+			throw type_error("idicts do not support arbitrary element mutation");
+		});
+	}
+}
+}; // namespace pybind11
diff --git a/pyosys/wrappers_tpl.cc b/pyosys/wrappers_tpl.cc
new file mode 100644
index 000000000..e921ae17a
--- /dev/null
+++ b/pyosys/wrappers_tpl.cc
@@ -0,0 +1,248 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2012  Claire Xenia Wolf <claire@yosyshq.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifdef WITH_PYTHON
+
+// <!-- generated includes -->
+
+#include <pybind11/stl_bind.h>
+#include <pybind11/native_enum.h>
+#include "pyosys/hashlib.h"
+
+USING_YOSYS_NAMESPACE
+
+// <!-- generated top-level code -->
+
+namespace YOSYS_PYTHON {
+
+	[[noreturn]] static void log_python_exception_as_error() {
+		PyErr_Print();
+		log_error("Python interpreter encountered an exception.\\n");
+	}
+
+	struct YosysStatics{};
+
+	// <!-- generated YOSYS_PYTHON namespace-level code -->
+
+	// Trampolines for Classes with Python-Overridable Virtual Methods
+	// https://pybind11.readthedocs.io/en/stable/advanced/classes.html#overriding-virtual-functions-in-python
+	class PassTrampoline : public Pass {
+	public:
+		using Pass::Pass;
+
+		void help() override {
+			PYBIND11_OVERRIDE(void, Pass, help);
+		}
+
+		bool formatted_help() override {
+			PYBIND11_OVERRIDE(bool, Pass, formatted_help);
+		}
+
+		void clear_flags() override {
+			PYBIND11_OVERRIDE(void, Pass, clear_flags);
+		}
+
+		void execute(std::vector<std::string> args, RTLIL::Design *design) override {
+			PYBIND11_OVERRIDE_PURE(
+				void,
+				Pass,
+				execute,
+				args,
+				design
+			);
+		}
+
+		void on_register() override {
+			PYBIND11_OVERRIDE(void, Pass, on_register);
+		}
+
+		void on_shutdown() override {
+			PYBIND11_OVERRIDE(void, Pass, on_shutdown);
+		}
+
+		bool replace_existing_pass() const override {
+			PYBIND11_OVERRIDE(
+				bool,
+				Pass,
+				replace_existing_pass
+			);
+		}
+	};
+
+	class MonitorTrampoline : public RTLIL::Monitor {
+	public:
+		using RTLIL::Monitor::Monitor;
+
+		void notify_module_add(RTLIL::Module *module) override {
+			PYBIND11_OVERRIDE(
+				void,
+				RTLIL::Monitor,
+				notify_module_add,
+				module
+			);
+		}
+
+		void notify_module_del(RTLIL::Module *module) override {
+			PYBIND11_OVERRIDE(
+				void,
+				RTLIL::Monitor,
+				notify_module_del,
+				module
+			);
+		}
+
+		void notify_connect(
+			RTLIL::Cell *cell,
+			const RTLIL::IdString &port,
+			const RTLIL::SigSpec &old_sig,
+			const RTLIL::SigSpec &sig
+		) override {
+			PYBIND11_OVERRIDE(
+				void,
+				RTLIL::Monitor,
+				notify_connect,
+				cell,
+				port,
+				old_sig,
+				sig
+			);
+		}
+
+		void notify_connect(
+			RTLIL::Module *module,
+			const RTLIL::SigSig &sigsig
+		) override {
+			PYBIND11_OVERRIDE(
+				void,
+				RTLIL::Monitor,
+				notify_connect,
+				module,
+				sigsig
+			);
+		}
+
+		void notify_connect(
+			RTLIL::Module *module,
+			const std::vector<RTLIL::SigSig> &sigsig_vec
+		) override {
+			PYBIND11_OVERRIDE(
+				void,
+				RTLIL::Monitor,
+				notify_connect,
+				module,
+				sigsig_vec
+			);
+		}
+
+		void notify_blackout(
+			RTLIL::Module *module
+		) override {
+			PYBIND11_OVERRIDE(
+				void,
+				RTLIL::Monitor,
+				notify_blackout,
+				module
+			);
+		}
+	};
+
+	/// @brief Use an auxiliary function to adapt the legacy function.
+	void log_to_stream(py::object object)
+	{
+		// TODO
+	};
+
+	PYBIND11_MODULE(libyosys, m) {
+		// this code is run on import
+		m.doc() = "python access to libyosys";
+
+		if (!yosys_already_setup()) {
+			log_streams.push_back(&std::cout);
+			log_error_stderr = true;
+			yosys_setup();
+
+			// Cleanup
+			m.add_object("_cleanup_handle", py::capsule([](){
+				yosys_shutdown();
+			}));
+		}
+
+		m.def("log_to_stream", &log_to_stream, "pipes yosys logs to a Python stream");
+
+		// Trampoline Classes
+		py::class_<Pass, YOSYS_PYTHON::PassTrampoline, std::unique_ptr<Pass, py::nodelete>>(m, "Pass")
+			.def(py::init([](std::string name, std::string short_help) {
+				auto created = new YOSYS_PYTHON::PassTrampoline(name, short_help);
+				Pass::init_register();
+				return created;
+			}), py::arg("name"), py::arg("short_help"))
+			.def("help", &Pass::help)
+			.def("formatted_help", &Pass::formatted_help)
+			.def("execute", &Pass::execute)
+			.def("clear_flags", &Pass::clear_flags)
+			.def("on_register", &Pass::on_register)
+			.def("on_shutdown", &Pass::on_shutdown)
+			.def("replace_existing_pass", &Pass::replace_existing_pass)
+			.def("experimental", &Pass::experimental)
+			.def("internal", &Pass::internal)
+			.def("pre_execute", &Pass::pre_execute)
+			.def("post_execute", &Pass::post_execute)
+			.def("cmd_log_args", &Pass::cmd_log_args)
+			.def("cmd_error", &Pass::cmd_error)
+			.def("extra_args", &Pass::extra_args)
+			.def("call", py::overload_cast<RTLIL::Design *,std::string>(&Pass::call))
+			.def("call", py::overload_cast<RTLIL::Design *,std::vector<std::string>>(&Pass::call))
+		;
+
+		py::class_<RTLIL::Monitor, YOSYS_PYTHON::MonitorTrampoline>(m, "Monitor")
+			.def(py::init([]() {
+				return new YOSYS_PYTHON::MonitorTrampoline();
+			}))
+			.def("notify_module_add", &RTLIL::Monitor::notify_module_add)
+			.def("notify_module_del", &RTLIL::Monitor::notify_module_del)
+			.def(
+				"notify_connect",
+				py::overload_cast<
+					RTLIL::Cell *,
+					const RTLIL::IdString &,
+					const RTLIL::SigSpec &,
+					const RTLIL::SigSpec &
+				>(&RTLIL::Monitor::notify_connect)
+			)
+			.def(
+				"notify_connect",
+				py::overload_cast<
+					RTLIL::Module *,
+					const RTLIL::SigSig &
+				>(&RTLIL::Monitor::notify_connect)
+			)
+			.def(
+				"notify_connect",
+				py::overload_cast<
+					RTLIL::Module *,
+					const std::vector<RTLIL::SigSig> &
+				>(&RTLIL::Monitor::notify_connect)
+			)
+			.def("notify_blackout", &RTLIL::Monitor::notify_blackout)
+		;
+
+		// <!-- generated pymod-level code -->
+	};
+};
+
+#endif // WITH_PYTHON
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 000000000..caa620528
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "pybind11>=3,<4",
+]
+build-backend = "setuptools.build_meta"
diff --git a/setup.py b/setup.py
index 4a6ef5af9..59c1c4b33 100644
--- a/setup.py
+++ b/setup.py
@@ -16,18 +16,19 @@ import os
 import re
 import shlex
 import shutil
+from pathlib import Path
 from setuptools import setup, Extension
-from setuptools.command.build_ext import build_ext
 
-__dir__ = os.path.dirname(os.path.abspath(__file__))
+import pybind11
+from pybind11.setup_helpers import build_ext
+
+__yosys_root__ = Path(__file__).parent
 
 yosys_version_rx = re.compile(r"YOSYS_VER\s*:=\s*([\w\-\+\.]+)")
 
-version = yosys_version_rx.search(
-    open(os.path.join(__dir__, "Makefile"), encoding="utf8").read()
-)[1].replace(
-    "+", "."
-)  # Convert to patch version
+with open(__yosys_root__ / "Makefile", encoding="utf8") as f:
+    # Extract and convert + to patch version
+    version = yosys_version_rx.search(f.read())[1].replace("+", ".")
 
 
 class libyosys_so_ext(Extension):
@@ -38,7 +39,13 @@ class libyosys_so_ext(Extension):
             "libyosys.so",
             [],
         )
+
+        # when iterating locally, you probably want to set this variable
+        # to avoid mass rebuilds bec of pybind11's include path changing
+        pybind_include = os.getenv("_FORCE_PYBIND_INCLUDE", pybind11.get_include())
+
         self.args = [
+            f"PYBIND11_INCLUDE={pybind_include}",
             "ENABLE_PYOSYS=1",
             # Would need to be installed separately by the user
             "ENABLE_TCL=0",
@@ -73,22 +80,23 @@ class libyosys_so_ext(Extension):
                 *self.args,
             ]
         )
-        build_path = os.path.dirname(os.path.dirname(bext.get_ext_fullpath(self.name)))
-        pyosys_path = os.path.join(build_path, "pyosys")
+        ext_fullpath = Path(bext.get_ext_fullpath(self.name))
+        build_path = ext_fullpath.parents[1]
+        pyosys_path = build_path / "pyosys"
         os.makedirs(pyosys_path, exist_ok=True)
 
         # libyosys.so
-        target = os.path.join(pyosys_path, os.path.basename(self.name))
+        target = pyosys_path / self.name
         shutil.copy(self.name, target)
-        bext.spawn(["strip", "-S", target])
+        bext.spawn(["strip", "-S", str(target)])
 
         # yosys-abc
-        yosys_abc_target = os.path.join(pyosys_path, "yosys-abc")
+        yosys_abc_target = pyosys_path / "yosys-abc"
         shutil.copy("yosys-abc", yosys_abc_target)
-        bext.spawn(["strip", "-S", yosys_abc_target])
+        bext.spawn(["strip", "-S", str(yosys_abc_target)])
 
         # share directory
-        share_target = os.path.join(pyosys_path, "share")
+        share_target = pyosys_path / "share"
         try:
             shutil.rmtree(share_target)
         except FileNotFoundError:
@@ -104,14 +112,16 @@ class custom_build_ext(build_ext):
         return ext.custom_build(self)
 
 
+with open(__yosys_root__ / "README.md", encoding="utf8") as f:
+    long_description = f.read()
+
 setup(
     name="pyosys",
     packages=["pyosys"],
     version=version,
     description="Python access to libyosys",
-    long_description=open(os.path.join(__dir__, "README.md")).read(),
+    long_description=long_description,
     long_description_content_type="text/markdown",
-    install_requires=["wheel", "setuptools"],
     license="MIT",
     classifiers=[
         "Programming Language :: Python :: 3",
@@ -119,7 +129,6 @@ setup(
         "Operating System :: POSIX :: Linux",
         "Operating System :: MacOS :: MacOS X",
     ],
-    package_dir={"pyosys": "misc"},
     python_requires=">=3.8",
     ext_modules=[libyosys_so_ext()],
     cmdclass={
diff --git a/tests/pyosys/run_tests.py b/tests/pyosys/run_tests.py
new file mode 100644
index 000000000..953462c4f
--- /dev/null
+++ b/tests/pyosys/run_tests.py
@@ -0,0 +1,39 @@
+from pathlib import Path
+import shutil
+import subprocess
+import sys
+
+__file_dir__ = Path(__file__).absolute().parent
+
+if len(sys.argv) != 2:
+	print(f"Usage: {sys.argv[0]} {sys.argv[1]}")
+	exit(64)
+
+binary = []
+if sys.argv[1] in ["yosys"]:
+	binary = [__file_dir__.parents[1] / "yosys", "-Qy"]
+else:
+	binary = [sys.argv[1]]
+
+tests = __file_dir__.glob("test_*.py")
+errors = False
+log_dir = __file_dir__ / "logs"
+try:
+	shutil.rmtree(log_dir)
+except FileNotFoundError:
+	pass
+for test in tests:
+	print(f"* {test.name} ", end="")
+	log_dir.mkdir(parents=True, exist_ok=True)
+	log = log_dir / (test.stem + ".log")
+	result = subprocess.run([
+		*binary,
+		test
+	], stdout=open(log, "w"), stderr=subprocess.STDOUT)
+	if result.returncode == 0:
+		print("OK!")
+	else:
+		print(f"FAILED: {log}")
+		errors = True
+if errors:
+	exit(1)
diff --git a/tests/pyosys/spm.cut.v.gz b/tests/pyosys/spm.cut.v.gz
new file mode 100644
index 0000000000000000000000000000000000000000..44791a035e534f1fc9ebdfc4c47bb0849bff1da8
GIT binary patch
literal 5294
zcmbu92{hFGzsJSc8Oo9ed0H^WWGhj&glt)|W@p5MFvvEHC9*HcRtY1?I)fq2DBC2G
zr4$+K7)ugkLNb=I+?k%|-2Z*feeOB;{_i=T^E%(p=lgztKflj+e!uxWorB}r?`_^p
zEWv^P@;5_6<inWCot*<DTY{oVu1W!)CK{*qYEBD$IpxBBh5roo>RuqPI{(iXTU_Bc
z8gINxO*nZ-wA}JGB!E@M%c6%cUcP1xW+!Y%10Q!BbblwozQfv`HKv_b<x9e2U&X>>
z#!S6lubRa)M^9<)!J%QJ5B&n_rWQ6cO+&Kd8y-?8ramsF_YZz@if%93?sF;VA101G
zOmF!;W~aZ{$m?rHc*pKua_nIfZDf_$LsW>_pM5h*BbRhctw<c~Zhlz`2@iUO&?4?H
zOceyiP;tcBLGpfyR@Sb@@{g+iGL@_ejaxseddsXNih*TTY8mYZJ1U|Z-UDSt2CfIK
z2bevhh`b+&=K)q!|Gsw9aU7VY;z_DlnaqnWZ2YUpPV!URRyq7n-=(bfUFz)G;-vSx
zRo;ltixwpY&Jv*!pTAlZ8kkC4hzRK`8^=A0PXDhkjL4gQ>T{DS_Xo-Sf5JuD+i}$o
z?LpMc=K)30^DAPD%|RFSa{o%aNdIl$lO#jaA6M;bx1eS=2INJTt%xl&w;jC9lKzJs
zMoG9a;M6~%M{ZkJS(hs3LDFHMb7it8b{B)#+3LWNU}1~H>3@8#&xHGT`+{5$>uM>Z
zk}l8TC%Vbj9V*NvN4GQZUI48#Yrn+}azyFRoM)8KcrR8h$eMlJAXk*_%yZ@vp+8HY
zwM%h>oKa>o!OSHB+eP?AfYz@Pca+P_26M^r?N<CEtCqrAMBE^w#Leu=za5W14ro8Q
z#u}%<5q0IylHtsmxGaFyvF*PvSha+=?PhMqW&LgO6n~txU1sfSoB~&r#Y{T0tKjyp
zlH{6HoC0T*&+G8Rjd|DDn1QE<YAPLNqA%MZ(?3<=!{;m?-FE9M1+!Nax%b@#XH{rC
z`jJ-6RKfh1%S~3Mg2UwK<I{>))4*(285JTX4eqk>)hQLHAEl*L11gR^Hg=OOtuEgN
zlkyFK6%X8v+Br>rQ}q0pcf?9xiPaC}p?+l22ucU%xEVgoa*PfgtN^B1kb(OYfFCH4
zf&Yz+$Ir_{on_J<O2=>GAMjzeV|3_a&tr;(7|5p36^RV|n=*+w%F%H;ET9Mg*1&^-
zM9R@IiEIXhum)}jJqE1D{(nNwG30#;9fDYp8$yQx%Q55~3g<W-Mo<JZ7UaP|B17}<
z3U#on9g;HBHW{r26S37NNq`E;$@FYL<Hj}-u!#}&_?huM4}_BCqZ~g4{YG#v)%}^G
z)VNEAhgA-x+Yri-_5N~nGGsZX3`ZhECRxaEaQ%|0FdTyaI=Huj2SYqL$%`S%_^IN<
z?lMq@Au>(!Hqw#V8OGwL`i=oEhUV`=s>Tm0_Okj$)^O~qJaAQ(9q3=*;Z#I)(TY;1
z{cJfLvpG&(jcGZU96^yN)@8AKqldfm2Yr*<xWZ(b!eMam{^G+!Vzaxgd;wKzvi-}%
z!zh}ix9d}?6wEb^a;-YLI-(o9*ju+(Pt_Rzr+7iUO^Kk#t--4Z*@^R?kSSD+rpi)e
zB1+-%$awgE;ChaWm#e&l#9+OAdo*G?w626i)X-cGh}4SBuE@Vudw467X@H;keC!8`
z^G43S4<WM!5*p_LgJ?HJO&)CWYakQ@5%J@@ONIvOicE2_jlP*di0tvRb;Q5kQcRFY
zQcO67cH_|G`TRy(SHzo@Wm7SbkA)99Bg8ZHh94m^$Dh<3e~PO3Od?4+;Z&`gp(c+e
zhc1ULQ-~IcDmeu-YIgqQGdb)tSqM;9<__}|^$VAXRP#>`nW+2LL|J0Qi6Nhsr^DDv
zMuZtwQqs&Ok-y?pF&3ickN6e;Cj&7*`4j-cq*k&TsYXc(nW+8NL|$Tq*pScY@Eno{
zSUr=*K~=_p;&i#1Pv6npC-;)>@7AWcn$seORG&pbI!A}wkSn~^(`nx}mFqzfx@ox6
zaLqPyFY*3_PrQojK6TBmHM03twF}X<{(Jh3EZ2v}ug$M7ZFXxMSjSSWP$L)Lw{?Nq
zhV7j5GT&C}m#r^-JUh;}Duy0p_Zxgsy7-)S!H?FjhTZSZpv+c!%~xy;jxO@uSiI~~
zQsQbC91C;Z64~7#_U_d^k5vLm4P;f)por77)PRRE8$T}RiG9WOlS&2<LzmlIcgOT@
zhX;jIgk?_Y+P|QQ2`yGi4_q!DK+MuEuEgKv5>IDO=5yi65A*N&K1|%lwK=mL0y|x!
z<K?ujkcH8)Za{yu4n(cj6P`b=k?>%mG<3eyw4BT<`5sd@^GJ8bK-bsB-9C{pQo0%H
z{l?q-JvZ3H`>yB&Q)&4b9bXrjMmb+s+UIjk*c0}mndpdu&d%UWLsRh*g4@86nRWcG
z8pfLa0U7^x9sg9iIw<p89kmKGM8G)k_})sskeQs1OB~U$3l*s!4$yy)u>Z414PDKJ
zDyYFcMs^*Cnw~>jaHEvYp_d+E9{Z3*$$1x4ROW9*`d+_>QYxHtVBTp;y9va<i^l-)
zW3rgHgt*X9Hw1GDi?8?>2r7H?WY>DtN0?lRO9$=lN9>tN$N02&Nv7FyK~WBOmDt@p
zG{@MV$RkavSgtW_t^nb*N~27Ou2UA5@6_W4V>^nm69RJm=xCGNO{F?s@n9x>+XN{l
ztbDNvnx(J?KY{F8#5>3oqebo2UmrtQds7HQOQGrP31PRA2=}JE&z8QJyj6MZU8Rk9
zFo(WyVl>C{T<>GqCIX?9k{Wf?;Vd#o)PcRU_#PL9@S|78rorc7ci0#Go4-%^Z|1&k
zY>vALeEqHl!*|75+uk)<<#Q>em+q2zlHnlY$gHVVb1uyBnheUL*1mTl+c8tB3FgS@
zspKnm@hgAES)OYgPR=^^b-H5YkJJRMWCE0P6T4Wxdk2uMDeFTda2YRM9uGV0<=raD
zn6$m3RMP;Q4?Q3T(t4X;#orF4^^Q<Ls#7uNfU+_uY>9YN$%+yMG>;`*w|z<WA^mKg
z{hk{%X)Kejs!2ges7^=y2xVPZ{+f#_G>5hBd?}5$42Tf_iM;n}e!Y+k%Bb<>ZV(I5
z+{s)J(0g&@Ch}mNkXw%e-M}H8h>^GFYe9S?xi%;edmAV`kDvDbJt!-CA<V6(&^+em
zMz5|1{rxzyHvb;vI%-x2)7p8p^M$@8aSJpww_Li@)st|+ueQk0-c|QJI;M3?5G!Ps
zKt=(7b+M`<OS|HbQN+j}^R<;sp;ps&*3ryO$S$^$Pk5MIkstmYwu87%-^0`f%Kr6U
zv~CJ6clM6fg6PgYI2o)x`z!`GU%DCc`Gz{wcl?>PDb`tKXZ?fKn5_zQ<ntXR^F#Q2
z>T+Z6XeP*271>EoFze3<rboog4TQ{^cGT6crcUaJzonTqt*fhB&tdtK*RcX4iB?sU
zW~DIoM0#>%_Stgaow{L*b0&`c(pMAx9h2U`2UD^6rd6H1A{#%ma79(}g*wFBT%rBo
z3|tXMpEQbYc#x}UoDvb-Z?t66BqjiDo$nG;HybPPR+a9Azey!`f<N<CURNz*B&C6t
zv|~p^%?w^h!Gp&I^To#gu=8mpb&2&?q^M%vV}{@zspQ7g<rsmHeQD8ERV8X+6XsY`
z;gkiG=%4~tt;a@h8P5}?r)^bc-}|z>)!3gWR@gl>wGJ<=`mXW`jsv@oKbvl+J60^V
z>VxRl6eU2OAa&8t1;ZePYw2Tb8JC#m_kVe|=pNNi^c|h?FP|0MIccT_(MQEpw+izz
z`~$+CuE$tSjRkZv)^qeVnj2I@Gj-Z3gtw9e8v-rE)s>WsRxBoqhrV_iO$rQ~*-Hdm
zD$mT%Z3I^oKi8NJHV$3t3LQ)(BL%XyiY(__)Hvi|;cBv8xK-gB-=U^7=?6W9W<HLa
z9&6HA#zzJpHCho~d`0dG9Zl_NG3$c`ZK^y7>KV4!YVg^30J@rG>X;SLx}K*3i_p0O
zqyH@`PDM1j<1UUCgX+}HgPJ!y@`-abCk?)76x;-i!=~lx{DlJo(o^3QgIa=c&5ic0
zZ4hZ-I1)W3Cqe#Th5pk+-?0hr)|*-j8K@I!iRfsy_#SCOs{;X5OIF_U&a(v|MCqS0
zPk0G>Oi6<L-3r}8Z$<M6>S?wJK%9ob)xKhTV5IYPO<<E2^P|a==3!)H(2A9E;J_)7
z@0aZxyfg^=m3CVtbAgAwvWT}MW>>pTm=`(-CGY$!{5m}QHjzN(Y`xg`a+1}4%uub;
z@4I(EjUf?Hs%vPNq_<I%Vj5rm<B=vmcFI#r`H1n*c-T<+dVb?noR;>nftU0j6F3j?
zd_ju}dQ!9*S#H8e3R_){kela>Up8pMU+Q6}{($KfJF(#oES_9C9L!w~k0beZ=uf3|
zoj&FbS1^>;c4tcc!Ey+d1ZIEJ=D33aJk_vv7fEIpzs{#{F{jI753qt*2=@{T0u=FW
z8^hTw4_tisx~_QSl}z)UIi=0KwaI;-iEeCVVP^sEg}!B$WWEm&jNr>jX^5i)p3nKQ
z$jzNIcbtdh1-hr7!=H*&S%A?rbC_O77)+;_t}okCSUFhkb7)U1NddcswuA=_#SI^`
z7!4yQlrsR`HiK^Lva8w)q-;E}Tqrz1UR&Gogg1)XS_GApsSBKMWI7VGd9to=*d!_F
zN%P!6^KU8ajKYM~i=^x)&CB_Bex<82fTGiNYWA8bD1)GAK1U0u&5wYO1g42y<hv(L
za}rss9EQG3J|oCTm9(z1rsa5HZ3h-Zvii>fNMFs|Nq$>qs15S!g$$NZp$@9^ojaIg
z94PA9W~gKpdRucL9*~!R-JWET1Gl!_bN9c(Jk)oxb|QE-DO)BHr3K=d=(B5X_cFWg
zxbB<I%9#SWxv&eATd%4c^K`v`=he9?6g6aoepKC<Ffv>3{%A@$S)EJ2KCdoP*x=)@
ztns2uIZEE|C_u%XvJ3R&PU~DYJf;VNhNzr*`KqHuL$xLN#?RK6En03eiuUHP1rBfC
zpM`C0hi(n3Z}43<>mGYEQmX>LdzU035wy14Z+;PeadvjW(n_*_3xaTTIrNQS(}PZ2
z8=m_VK*MRRn!>viP$tR}()Oi=${}V-{^dR=itWOwY_;wm^Vl5u4$s!6y_ZA`>nmv*
z4MXfUh&|IY32YB@?SX7!SwJ*epVe2ZrCjku`O*b+!`sJ$`Cy*go|yGV-F>pYcJ@l9
zLqA1rh3$-#>^!Z=(AIpLA&l&}a)eJLFN70q3^TQXy^wHmvgZ}GmBL9wOzWY%%%~hk
zt76AYgJN6Twj`V0TA!SXQA}i<P_S?8+tJr<^9`7Mn`FCmD?Hb*#bcK@%d+ThPS3>G
zYB<p>?mDysFXSuX;4F^O7lLtzQ3eatMa1o@(T$cupie>-ZOUy)BOK^Qj<noeAR9YD
z4uy8?wvS2lVKgrW*bdb0+b0LGIVN-G*=9Dvgep%7SAcvXSy4ue2W#l7B|v%dZ9Ivx
zA9Bx{7|`eNZG#DUISaF)rf!{Zv9Pxx)XwRB=u|curjPGta~op&azt&Vtg(jPrl2Cx
zM}gi(Dvmyu-GVJSFt4wM(W6tiqL%(#7dYrw(yfMLBgmD}<u6|)E*UW<WTjtD^M~5F
z(0*^SFyv)7V{BQ1obBy&@|36@E&~f|$Z<4bOx(a&IV}?KuRNPV)AOg?8SR9AnL=T_
zXh(fVoL#RR_FvKk0=}`l)&cDyY~C4o{2PT>cuA_hst*+>b<MHCuva#%bB)Wa!6iG#
z%6j25{&sn-?K2O-Y{k}iE40nCF9J3@${1@Oh!A*O&qc)LHJAXlyq#L(Bx+aDWRsR>
zavH)@KO^WX2#(ORk>EXRF~N1!SmKi;qevD2M+nwvh}t2WM!+%=f=?A&2^=*+Y*JY|
z(dHMf@A_WM*WjWng$|f2a|}vd9<n`ic~kwxVy$!SaST_Hu|%S57TW_!|EpZa60E=4
zkS*?Ls1@ncc9WK89M<pcw5B{%m1DoLqHyrLIBz7^VhXY|=vif8*b-PgB$BK0DYElu
zO=aNpGFbdWBp2u<va_My9iS+N_hWi~WPt7Oi}TuST}&ct%ud?r0zB`&;JJs0hsQl=
zW@jb?TnoZVo#2{&UlxWA_6WFibE(u4<zts??>A4iIEZYUomXT*SjvCH1AB^ECu)Iu
iM^_(Fv>?ZgTU5hGU03U44{mSFt_EJpjj<_UV)_p!;ECJ-

literal 0
HcmV?d00001

diff --git a/tests/pyosys/test_data_read.py b/tests/pyosys/test_data_read.py
new file mode 100644
index 000000000..08b6695c2
--- /dev/null
+++ b/tests/pyosys/test_data_read.py
@@ -0,0 +1,45 @@
+from pyosys import libyosys as ys
+from pathlib import Path
+
+__file_dir__ = Path(__file__).absolute().parent
+
+d = ys.Design()
+
+ys.run_pass(f"read_verilog {__file_dir__ / 'spm.cut.v.gz'}", d)
+ys.run_pass("hierarchy -top spm", d)
+
+name_by_tv_location = []
+name_by_au_location = []
+
+# test both dictionary mapping and equiv operators working fine
+module = None
+print(d.modules_)
+for idstr, module_obj in d.modules_.items():
+	if idstr != ys.IdString("\\spm"):
+		continue
+	if idstr.str() != "\\spm":
+		continue
+	module = module_obj
+	break
+
+assert module == d.top_module(), "top module search failed"
+for name in module.ports:
+	wire = module.wires_[name]
+	name_str = name.str()
+	if name_str.endswith(".d"):  # single reg output, in au
+		name_by_au_location.append(name_str[1:-2])
+	elif name_str.endswith(".q"):  # single reg input, in tv
+		name_by_tv_location.append(name_str[1:-2])
+	else:  # port/boundary scan
+		frm = wire.start_offset + wire.width
+		to = wire.start_offset
+		for i in range(frm - 1, to - 1, -1):
+			bit_name = name_str[1:] + f"\\[{i}\\]"
+			if wire.port_input:
+				name_by_tv_location.append(bit_name)
+			elif wire.port_output:
+				name_by_au_location.append(bit_name)
+
+assert name_by_tv_location == ['x\\[0\\]', 'a\\[31\\]', 'a\\[30\\]', 'a\\[29\\]', 'a\\[28\\]', 'a\\[27\\]', 'a\\[26\\]', 'a\\[25\\]', 'a\\[24\\]', 'a\\[23\\]', 'a\\[22\\]', 'a\\[21\\]', 'a\\[20\\]', 'a\\[19\\]', 'a\\[18\\]', 'a\\[17\\]', 'a\\[16\\]', 'a\\[15\\]', 'a\\[14\\]', 'a\\[13\\]', 'a\\[12\\]', 'a\\[11\\]', 'a\\[10\\]', 'a\\[9\\]', 'a\\[8\\]', 'a\\[7\\]', 'a\\[6\\]', 'a\\[5\\]', 'a\\[4\\]', 'a\\[3\\]', 'a\\[2\\]', 'a\\[1\\]', 'a\\[0\\]', '_315_', '_314_', '_313_', '_312_', '_311_', '_310_', '_309_', '_308_', '_307_', '_306_', '_305_', '_304_', '_303_', '_302_', '_301_', '_300_', '_299_', '_298_', '_297_', '_296_', '_295_', '_294_', '_293_', '_292_', '_291_', '_290_', '_289_', '_288_', '_287_', '_286_', '_285_', '_284_', '_283_', '_282_', '_281_', '_280_', '_279_', '_278_', '_277_', '_276_', '_275_', '_274_', '_273_', '_272_', '_271_', '_270_', '_269_', '_268_', '_267_', '_266_', '_265_', '_264_', '_263_', '_262_', '_261_', '_260_', '_259_', '_258_', '_257_', '_256_', '_255_', '_254_', '_253_', '_252_'], "failed to extract test vector register locations"
+assert name_by_au_location == ['y\\[0\\]', '_315_', '_314_', '_313_', '_312_', '_311_', '_310_', '_309_', '_308_', '_307_', '_306_', '_305_', '_304_', '_303_', '_302_', '_301_', '_300_', '_299_', '_298_', '_297_', '_296_', '_295_', '_294_', '_293_', '_292_', '_291_', '_290_', '_289_', '_288_', '_287_', '_286_', '_285_', '_284_', '_283_', '_282_', '_281_', '_280_', '_279_', '_278_', '_277_', '_276_', '_275_', '_274_', '_273_', '_272_', '_271_', '_270_', '_269_', '_268_', '_267_', '_266_', '_265_', '_264_', '_263_', '_262_', '_261_', '_260_', '_259_', '_258_', '_257_', '_256_', '_255_', '_254_', '_253_', '_252_'], "failed to extract golden output register locations"
+print("ok!")
diff --git a/tests/pyosys/test_dict.py b/tests/pyosys/test_dict.py
new file mode 100644
index 000000000..81e7b5516
--- /dev/null
+++ b/tests/pyosys/test_dict.py
@@ -0,0 +1,13 @@
+from pyosys import libyosys as ys
+
+my_dict = ys.StringToStringDict()
+my_dict["foo"] = "bar"
+my_dict.update([("first", "second")])
+my_dict.update({"key": "value"})
+for key, value in my_dict.items():
+    print(key, value)
+
+new_dict = my_dict | {"tomato": "tomato"}
+del new_dict["foo"]
+assert set(my_dict.keys()) == {"first", "key", "foo"}
+assert set(new_dict.keys()) == {"first", "key", "tomato"}
diff --git a/tests/pyosys/test_idict.py b/tests/pyosys/test_idict.py
new file mode 100644
index 000000000..fd04f4b8c
--- /dev/null
+++ b/tests/pyosys/test_idict.py
@@ -0,0 +1,31 @@
+from pyosys import libyosys as ys
+
+my_idict = ys.IdstringIdict()
+print(my_idict(ys.IdString("\\hello")))
+print(my_idict(ys.IdString("\\world")))
+print(my_idict.get(ys.IdString("\\world")))
+try:
+	print(my_idict.get(ys.IdString("\\dummy")))
+except IndexError as e:
+	print(f"{repr(e)}")
+print(my_idict[0])
+print(my_idict[1])
+try:
+	print(my_idict[2])
+except IndexError as e:
+	print(f"{repr(e)}")
+
+for i in my_idict:
+	print(i)
+
+current_len = len(my_idict)
+assert current_len == 2, "copy"
+
+my_copy = my_idict.copy()
+my_copy(ys.IdString("\\copy"))
+assert len(my_idict) == current_len, "copy seemed to have mutate original idict"
+assert len(my_copy) == current_len + 1, "copy not behaving as expected"
+
+current_copy_len = len(my_copy)
+my_copy |= (ys.IdString(e) for e in ("\\the", "\\world")) # 1 new element
+assert len(my_copy) == current_copy_len + 1, "or operator returned unexpected result"
diff --git a/tests/pyosys/test_import.py b/tests/pyosys/test_import.py
new file mode 100644
index 000000000..48e911033
--- /dev/null
+++ b/tests/pyosys/test_import.py
@@ -0,0 +1,3 @@
+from pyosys import libyosys as ys
+
+ys.log("Hello, world!")
diff --git a/tests/pyosys/test_monitor.py b/tests/pyosys/test_monitor.py
new file mode 100644
index 000000000..2eefdad60
--- /dev/null
+++ b/tests/pyosys/test_monitor.py
@@ -0,0 +1,22 @@
+from pyosys import libyosys as ys
+from pathlib import Path
+
+__file_dir__ = Path(__file__).absolute().parent
+
+d = ys.Design()
+
+class Monitor(ys.Monitor):
+	def __init__(self):
+		super().__init__()
+		self.mods = []
+
+	def notify_module_add(self, mod):
+		self.mods.append(mod.name.str())
+
+m = Monitor()
+d.monitors.add(m)
+
+ys.run_pass(f"read_verilog {__file_dir__ / 'spm.cut.v.gz'}", d)
+ys.run_pass("hierarchy -top spm", d)
+
+assert m.mods == ["\\spm"]
diff --git a/tests/pyosys/test_pass.py b/tests/pyosys/test_pass.py
new file mode 100644
index 000000000..d8174d4fc
--- /dev/null
+++ b/tests/pyosys/test_pass.py
@@ -0,0 +1,34 @@
+from pyosys import libyosys as ys
+
+import json
+from pathlib import Path
+
+__file_dir__ = Path(__file__).absolute().parent
+
+class CellStatsPass(ys.Pass):
+	def __init__(self):
+		super().__init__(
+			"cell_stats",
+			"dumps cell statistics in JSON format"
+		)
+
+	def execute(self, args, design):
+		ys.log_header(design, "Dumping cell stats\n")
+		ys.log_push()
+		cell_stats = {}
+		for module in design.all_selected_whole_modules():
+			for cell in module.selected_cells():
+				if cell.type.str() in cell_stats:
+					cell_stats[cell.type.str()] += 1
+				else:
+					cell_stats[cell.type.str()] = 1
+		ys.log(json.dumps(cell_stats))
+		ys.log_pop()
+
+p = CellStatsPass() # registration
+
+design = ys.Design()
+ys.run_pass(f"read_verilog {__file_dir__.parent / 'simple' / 'fiedler-cooley.v'}", design)
+ys.run_pass("prep", design)
+ys.run_pass("opt -full", design)
+ys.run_pass("cell_stats", design)
diff --git a/tests/pyosys/test_script.py b/tests/pyosys/test_script.py
new file mode 100644
index 000000000..7c3ec96ef
--- /dev/null
+++ b/tests/pyosys/test_script.py
@@ -0,0 +1,21 @@
+from pathlib import Path
+from pyosys import libyosys as ys
+
+
+__file_dir__ = Path(__file__).absolute().parent
+add_sub = __file_dir__.parent / "arch" / "common" / "add_sub.v"
+
+base = ys.Design()
+ys.run_pass(f"read_verilog {add_sub}", base)
+ys.run_pass("hierarchy -top top", base)
+ys.run_pass("proc", base)
+ys.run_pass("equiv_opt -assert -map +/ecp5/cells_sim.v synth_ecp5", base)
+
+postopt = ys.Design()
+ys.run_pass("design -load postopt", postopt)
+ys.run_pass("cd top", postopt)
+ys.run_pass("select -assert-min 25 t:LUT4", postopt)
+ys.run_pass("select -assert-max 26 t:LUT4", postopt)
+ys.run_pass("select -assert-count 10 t:PFUMX", postopt)
+ys.run_pass("select -assert-count 6 t:L6MUX21", postopt)
+ys.run_pass("select -assert-none t:LUT4 t:PFUMX t:L6MUX21 %% t:* %D", postopt)

From 384f7431fdb08b7ba348567b003745a3369c204f Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Sun, 21 Sep 2025 23:04:27 +0300
Subject: [PATCH 663/931] pyosys: rewrite wrapper generator

[skip ci]
---
 pyosys/.gitignore         |    1 +
 pyosys/__init__.py        |    1 -
 pyosys/generator.py       | 2695 ++++++++++---------------------------
 pyosys/hashlib.h          |   14 +
 pyosys/wrappers_tpl.cc    |   25 +-
 pyproject.toml            |    5 +-
 tests/pyosys/test_logs.py |    8 +
 7 files changed, 738 insertions(+), 2011 deletions(-)
 create mode 100644 tests/pyosys/test_logs.py

diff --git a/pyosys/.gitignore b/pyosys/.gitignore
index f9fbdf4f6..925a2bd84 100644
--- a/pyosys/.gitignore
+++ b/pyosys/.gitignore
@@ -1 +1,2 @@
 wrappers.cc
+wrappers.inc.cc
diff --git a/pyosys/__init__.py b/pyosys/__init__.py
index 4622464da..d74e3f5bd 100644
--- a/pyosys/__init__.py
+++ b/pyosys/__init__.py
@@ -1,4 +1,3 @@
-
 import os
 import sys
 
diff --git a/pyosys/generator.py b/pyosys/generator.py
index ebe89737e..b8a7aa8dc 100644
--- a/pyosys/generator.py
+++ b/pyosys/generator.py
@@ -15,2025 +15,712 @@
 #  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 #  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
-#  Author: Benedikt Tutzer
-#  Modified for pybind11 by: Mohamed Gaber
+#  Written by Mohamed Gaber <me@donn.website>
+#
+#  Inspired by py_wrap_generator.py by Benedikt Tutzer
 
-import argparse
-import copy
-from enum import Enum
-from io import StringIO
+import io
+import shutil
 from pathlib import Path
-from functools import wraps
-from typing import ClassVar, Optional
+from sysconfig import get_paths
+from dataclasses import dataclass, field
+from typing import Any, Dict, FrozenSet, Iterable, Tuple, Union, Optional, List
+
+import pybind11
+import argparse
+from cxxheaderparser.simple import parse_file, ClassScope, NamespaceScope, EnumDecl
+from cxxheaderparser.options import ParserOptions
+from cxxheaderparser.preprocessor import make_gcc_preprocessor
+from cxxheaderparser.types import (
+    PQName,
+    Type,
+    Pointer,
+    Reference,
+    MoveReference,
+    AnonymousName,
+    Method,
+    Function,
+    Field,
+    Variable,
+    Array,
+    FundamentalSpecifier,
+)
 
 __file_dir__ = Path(__file__).absolute().parent
+__yosys_root__ = __file_dir__.parent
 
 
-def autostring(fn):
-	@wraps(fn)
-	def wrapper(*args, **kwargs):
-		if "stream" not in kwargs:
-			stream = StringIO()
-			fn(*args, stream=stream, **kwargs)
-			return stream.getvalue()
-		else:
-			fn(*args, **kwargs)
+@dataclass
+class PyosysClass:
+    """
+    Metadata about classes or structs intended to be wrapped using Pyosys.
 
-	return wrapper
+    :param name: The base name of the class (without extra qualifiers)
+    :param ref_only: Whether this class can be copied to Python, or only
+        referenced.
+    :param string_expr: A C++ expression that will be used for the __str__ method in Python
+    :param hash_expr: A C++ expression that will be fed to ``run_hash`` to declare a __hash__ method for Python
+    :param denylist: If specified, one or more methods can be excluded from
+        wrapping.
+    """
+    name: str
+    ref_only: bool = False
+
+    # in the format s.(method or property)
+    string_expr: Optional[str] = None
+    hash_expr: Optional[str] = None
+
+    denylist: FrozenSet[str] = frozenset({})
 
 
-# Map c++ operator Syntax to Python functions
-wrappable_operators = {
-	"<": "__lt__",
-	"==": "__eq__",
-	"!=": "__ne__",
-	"+": "__add__",
-	"-": "__sub__",
-	"*": "__mul__",
-	"/": "__div__",
-	"()": "__call__",
-}
+@dataclass
+class PyosysHeader:
+    """
+    :param name: The name of the header, i.e., its relative path to the Yosys root
+    :param classes: A list of ``PyosysClass`` classes to be wrapped
+    :param enums: A list of enums to be wrapped
+    """
+    name: str
+    classes: List[PyosysClass] = field(default_factory=lambda: [])
+
+    def __post_init__(self):
+        self.classes_by_name = {}
+        if classes := self.classes:
+            for cls in classes:
+                self.classes_by_name[cls.name] = cls
+
+"""
+Add headers and classes here!
+"""
+global_denylist = frozenset(
+    {
+        # deprecated
+        "builtin_ff_cell_types",
+        # no implementation
+        "set_verific_logging",
+        # can't bridge to python cleanly
+        ## std::regex
+        "log_warn_regexes",
+        "log_nowarn_regexes",
+        "log_werror_regexes",
+        ## function pointers
+        "log_error_atexit",
+        "log_verific_callback",
+    }
+)
+pyosys_headers = [
+    # Headers for incomplete types
+    PyosysHeader("kernel/binding.h"),
+    PyosysHeader("libs/sha1/sha1.h"),
+    # Headers for globals
+    PyosysHeader("kernel/log.h"),
+    PyosysHeader("kernel/yosys.h"),
+    PyosysHeader("kernel/cost.h"),
+    # Headers with classes
+    PyosysHeader(
+        "kernel/celltypes.h",
+        [PyosysClass("CellType", hash_expr="s.type"), PyosysClass("CellTypes")],
+    ),
+    PyosysHeader("kernel/consteval.h", [PyosysClass("ConstEval")]),
+    PyosysHeader(
+        "kernel/register.h",
+        [
+            # PyosysClass("Pass") # Virtual methods, manually bridged
+        ],
+    ),
+    PyosysHeader(
+        "kernel/rtlil.h",
+        [
+            PyosysClass(
+                "IdString",
+                string_expr="s.str()",
+                hash_expr="s.str()",
+                denylist=frozenset(
+                    # shouldn't be messed with from python in general
+                    {
+                        "global_id_storage_",
+                        "global_id_index_",
+                        "global_refcount_storage_",
+                        "global_free_idx_list_",
+                        "last_created_idx_ptr_",
+                        "last_created_idx_",
+                        "builtin_ff_cell_types",
+                    }
+                ),
+            ),
+            PyosysClass("Const", string_expr="s.as_string()", denylist=frozenset({"bits", "bitvectorize"})),
+            PyosysClass("AttrObject", denylist=frozenset({"get_blackbox_attribute"})),
+            PyosysClass("NamedObject", denylist=frozenset({"get_blackbox_attribute"})),
+            PyosysClass("Selection"),
+            # PyosysClass("Monitor"), # Virtual methods, manually bridged
+            PyosysClass("CaseRule", denylist=frozenset({"get_blackbox_attribute"})),
+            PyosysClass("SwitchRule", denylist=frozenset({"get_blackbox_attribute"})),
+            PyosysClass("SyncRule"),
+            PyosysClass(
+                "Process",
+                ref_only=True,
+                string_expr="s.name.c_str()",
+                hash_expr="s.name",
+            ),
+            PyosysClass("SigChunk"),
+            PyosysClass("SigBit", hash_expr="s"),
+            PyosysClass("SigSpec", hash_expr="s"),
+            PyosysClass(
+                "Cell",
+                ref_only=True,
+                string_expr="s.name.c_str()",
+                hash_expr="s",
+            ),
+            PyosysClass(
+                "Wire",
+                ref_only=True,
+                string_expr="s.name.c_str()",
+                hash_expr="s",
+            ),
+            PyosysClass(
+                "Memory",
+                ref_only=True,
+                string_expr="s.name.c_str()",
+                hash_expr="s",
+            ),
+            PyosysClass(
+                "Module",
+                ref_only=True,
+                string_expr="s.name.c_str()",
+                hash_expr="s",
+                denylist=frozenset({"Pow"}), # has no implementation
+            ),
+            PyosysClass(
+                "Design",
+                ref_only=True,
+                string_expr="s.hashidx_",
+                hash_expr="s",
+                denylist=frozenset({"selected_whole_modules"}), # deprecated
+            ),
+        ],
+    ),
+]
+
+
+@dataclass(frozen=True)  # hashable
+class PyosysType:
+    """
+    Bit of a hacky object all-around: this is more or less used to encapsulate
+    container types so they can be later made opaque using pybind.
+    """
+    base: str
+    specialization: Tuple["PyosysType", ...]
+    const: bool = False
+
+    @classmethod
+    def from_type(Self, type_obj, drop_const=False) -> "PyosysType":
+        const = type_obj.const and not drop_const
+        if isinstance(type_obj, Pointer):
+            ptr_to = Self.from_type(type_obj.ptr_to)
+            return Self("ptr", (ptr_to,), const)
+        elif isinstance(type_obj, Reference):
+            ref_to = Self.from_type(type_obj.ref_to)
+            return Self("ref", (ref_to,), const)
+        assert isinstance(
+            type_obj, Type
+        ), f"unexpected c++ type object of type {type(type_obj)}"
+        last_segment = type_obj.typename.segments[-1]
+        base = last_segment.name
+        specialization = tuple()
+        if (
+            hasattr(last_segment, "specialization")
+            and last_segment.specialization is not None
+        ):
+            for template_arg in last_segment.specialization.args:
+                specialization = (*specialization, Self.from_type(template_arg.arg))
+        return Self(base, specialization, const)
+
+    def generate_identifier(self):
+        title = self.base.title()
+        if len(self.specialization) == 0:
+            return title
+
+        if title == "Dict":
+            key, value = self.specialization
+            return f"{key.generate_identifier()}To{value.generate_identifier()}{title}"
+
+        return (
+            "".join(spec.generate_identifier() for spec in self.specialization) + title
+        )
+
+    def generate_cpp_name(self):
+        const_prefix = "const " * self.const
+        if len(self.specialization) == 0:
+            return const_prefix + self.base
+        elif self.base == "ptr":
+            return const_prefix + f"{self.specialization[0].generate_cpp_name()} *"
+        elif self.base == "ref":
+            return const_prefix + f"{self.specialization[0].generate_cpp_name()} &"
+        else:
+            return (
+                const_prefix
+                + f"{self.base}<{', '.join(spec.generate_cpp_name() for spec in self.specialization)}>"
+            )
+
+
+class PyosysWrapperGenerator(object):
+    def __init__(
+        self,
+        from_headers: Iterable[PyosysHeader],
+        wrapper_stream: io.TextIOWrapper,
+        header_stream: io.TextIOWrapper,
+    ):
+        self.headers = from_headers
+        self.f = wrapper_stream
+        self.f_inc = header_stream
+        self.found_containers: Dict[PyosysType, Any] = {}
+        self.class_registry: Dict[str, ClassScope] = {}
+
+    # entry point
+    def generate(self):
+        tpl = __file_dir__ / "wrappers_tpl.cc"
+        preprocessor_opts = self.make_preprocessor_options()
+        with open(tpl, encoding="utf8") as f:
+            do_line_directive = True
+            for i, line in enumerate(f):
+                if do_line_directive:
+                    self.f.write(f'#line {i + 1} "{tpl}"\n')
+                    do_line_directive = False
+                if "<!-- generated includes -->" in line:
+                    for header in self.headers:
+                        self.f.write(f'#include "{header.name}"\n')
+                    do_line_directive = True
+                elif "<!-- generated pymod-level code -->" in line:
+                    for header in self.headers:
+                        header_path = __yosys_root__ / header.name
+                        parsed = parse_file(header_path, options=preprocessor_opts)
+                        global_namespace = parsed.namespace
+                        self.process_namespace(header, global_namespace)
+                else:
+                    self.f.write(line)
+
+        for container, _ in self.found_containers.items():
+            identifier = container.generate_identifier()
+            print(
+                f"using {identifier} = {container.generate_cpp_name()};",
+                file=self.f_inc,
+            )
+            print(f"PYBIND11_MAKE_OPAQUE({identifier})", file=self.f_inc)
+
+        print(
+            f"static void bind_autogenerated_opaque_containers(py::module &m) {{",
+            file=self.f_inc,
+        )
+        for container, _ in self.found_containers.items():
+            identifier = container.generate_identifier()
+            cxx = container.generate_cpp_name()
+            tpl_args = [cxx]
+            for spec in container.specialization:
+                tpl_args.append(spec.generate_cpp_name())
+            print(
+                f'\tpy::hashlib::bind_{container.base}<{", ".join(tpl_args)}>(m, "{container.generate_identifier()}");',
+                file=self.f_inc,
+            )
+        print(f"}}", file=self.f_inc)
+
+    # helpers
+    def make_preprocessor_options(self):
+        py_include = get_paths()["include"]
+        preprocessor_bin = shutil.which("clang++") or "g++"
+        return ParserOptions(
+            preprocessor=make_gcc_preprocessor(
+                defines=["_YOSYS_", "WITH_PYTHON"],
+                gcc_args=[preprocessor_bin, "-fsyntax-only"],
+                include_paths=[str(__yosys_root__), py_include, pybind11.get_include()],
+            ),
+        )
+
+    @staticmethod
+    def find_containers(
+        containers: Iterable[str], type_info: Any
+    ) -> Dict[PyosysType, Any]:
+        if isinstance(type_info, Pointer):
+            return PyosysWrapperGenerator.find_containers(containers, type_info.ptr_to)
+        if isinstance(type_info, MoveReference):
+            return PyosysWrapperGenerator.find_containers(
+                containers, type_info.moveref_to
+            )
+        if isinstance(type_info, Reference):
+            return PyosysWrapperGenerator.find_containers(containers, type_info.ref_to)
+        if not isinstance(type_info, Type):
+            return ()
+        segments = type_info.typename.segments
+        containers_found = {}
+        for segment in segments:
+            if isinstance(segment, FundamentalSpecifier):
+                continue
+            if segment.name in containers:
+                containers_found.update(
+                    {PyosysType.from_type(type_info, drop_const=True): type_info}
+                )
+            if segment.specialization is not None:
+                for arg in segment.specialization.args:
+                    sub_containers = PyosysWrapperGenerator.find_containers(
+                        containers, arg.arg
+                    )
+                    containers_found.update(sub_containers)
+        return containers_found
+
+    @staticmethod
+    def find_anonymous_union(cls: ClassScope):
+        if cls.class_decl.typename.classkey != "union":
+            return None
+        for s in cls.class_decl.typename.segments:
+            if isinstance(s, AnonymousName):
+                return s
+        return None  # named union
+
+    @staticmethod
+    def get_parameter_types(function: Function) -> str:
+        return ", ".join(p.type.format() for p in function.parameters)
+
+    def register_containers(self, target: Union[Function, Field, Variable]):
+        supported = ("dict", "idict", "pool", "set", "vector")
+        if isinstance(target, Function):
+            self.found_containers.update(
+                self.find_containers(supported, target.return_type)
+            )
+
+            for parameter in target.parameters:
+                self.found_containers.update(
+                    self.find_containers(supported, parameter.type)
+                )
+        else:
+            self.found_containers.update(self.find_containers(supported, target.type))
+
+    # processors
+    def get_overload_cast(self, function: Function, class_basename: Optional[str]) -> str:
+        is_method = isinstance(function, Method)
+        function_return_type = function.return_type.format()
+        if class_basename == "Const" and function_return_type in {"iterator", "const_iterator"}:
+            # HACK: qualify Const's iterators
+            function_return_type = f"{class_basename}::{function_return_type}"
+
+        pointer_kind = f"{class_basename}::*" if (is_method and not function.static) else "*"
+
+        retval = f"static_cast <"
+        retval += function_return_type
+        retval += f"({pointer_kind})"
+        retval += f"({self.get_parameter_types(function)})"
+        if is_method and function.const:
+            retval += " const"
+        retval += ">"
+        retval += "(&"
+        if is_method:
+            retval += f"{class_basename}::"
+        retval += function.name.segments[-1].format()
+        retval += ")"
+        return retval
+
+    def get_definition_args(self, function: Function, class_basename: Optional[str], python_name_override: Optional[str] = None) -> List[str]:
+        function_basename = function.name.segments[-1].format()
+
+        python_function_basename = python_name_override or keyword_aliases.get(function_basename, function_basename)
+
+        def_args = [f'"{python_function_basename}"']
+        def_args.append(self.get_overload_cast(function, class_basename))
+        for parameter in function.parameters:
+            # ASSUMPTION: there are no unnamed parameters in the yosys codebase
+            parameter_arg = f'py::arg("{parameter.name}")'
+            if parameter.default is not None:
+                parameter_arg += f" = {parameter.default.format()}"
+            def_args.append(parameter_arg)
+
+        return def_args
+
+    def process_method(self, function: Method, class_basename: str):
+        if (
+            function.deleted
+            or function.template
+            or function.vararg
+            or function.access != "public"
+            or function.pure_virtual
+            or function.destructor
+        ):
+            return
+
+        if any(isinstance(p.type, MoveReference) for p in function.parameters):
+            # skip move constructors
+            return
+
+        if len(function.name.segments) > 1:
+            # can't handle, skip
+            return
+
+        if function.constructor:
+            print(
+                f"\t\t\t.def(py::init<{self.get_parameter_types(function)}>())",
+                file=self.f,
+            )
+            return
+
+        python_name_override = None
+        if function.operator is not None:
+            if function.operator == "==":
+                python_name_override = "__eq__"
+            elif function.operator == "!=":
+                python_name_override = "__ne__"
+            elif function.operator == "<":
+                python_name_override = "__lt__"
+            else:
+                return
+
+        self.register_containers(function)
+
+        definition_fn = "def"
+        if function.static:
+            definition_fn = "def_static"
+
+        print(f"\t\t\t.{definition_fn}({", ".join(self.get_definition_args(function, class_basename, python_name_override))})", file=self.f)
+
+    def process_function(self, function: Function):
+        if (
+            function.deleted
+            or function.template
+            or function.vararg
+            or function.static
+        ):
+            return
+
+        if function.operator is not None:
+            # Python doesn't do global operators
+            return
+
+        if function.name.segments[-1].format() in global_denylist:
+            return
+
+        self.register_containers(function)
+
+        print(f"\t\t\tm.def({", ".join(self.get_definition_args(function, None))});", file=self.f)
+
+    def process_field(self, field: Field, class_basename: str):
+        if field.access != "public":
+            return
+
+        if field.name is None:
+            # anonymous structs and unions
+            # unions handled in calling function
+            # ASSUMPTION: No anonymous structs in the yosys codebase
+            # 			  (they're not in the C++ standard anyway)
+            return
+
+        unique_ptrs = self.find_containers(("unique_ptr",), field.type)
+        if len(unique_ptrs):
+            # TODO: figure out how to bridge unique pointers
+            return
+
+        self.register_containers(field)
+
+        definition_fn = f"def_{'readonly' if field.type.const else 'readwrite'}"
+        if field.static:
+            definition_fn += "_static"
+
+        field_python_basename = keyword_aliases.get(field.name, field.name)
+
+        print(
+            f'\t\t\t.{definition_fn}("{field_python_basename}", &{class_basename}::{field.name})',
+            file=self.f,
+        )
+
+    def process_variable(self, variable: Variable):
+        if isinstance(variable.type, Array):
+            return
+
+        variable_basename = variable.name.segments[-1].format()
+        if variable_basename in global_denylist:
+            return
+
+        self.register_containers(variable)
+
+        definition_fn = f"def_{'readonly' if variable.type.const else 'readwrite'}_static"
+
+        variable_python_basename = keyword_aliases.get(variable_basename, variable_basename)
+        variable_name = variable.name.format()
+
+        print(
+            f'\t\t\tglobal_variables.{definition_fn}("{variable_python_basename}", &{variable_name});',
+            file=self.f,
+        )
+
+    def process_class_members(
+        self,
+        metadata: PyosysClass,
+        cls: ClassScope,
+        basename: str
+    ):
+        for method in cls.methods:
+            if method.name.segments[-1].name in metadata.denylist:
+                continue
+            self.process_method(method, basename)
+
+        visited_anonymous_unions = set()
+        for field in cls.fields:
+            if field.name in metadata.denylist:
+                continue
+            self.process_field(field, basename)
+
+            # Handle anonymous unions
+            for subclass in cls.classes:
+                if subclass.class_decl.access != "public":
+                    continue
+                if au := self.find_anonymous_union(subclass):
+                    if au.id in visited_anonymous_unions:
+                        continue
+                    visited_anonymous_unions.add(au.id)
+                    for subfield in subclass.fields:
+                        self.process_field(subfield, basename)
+
+    def process_class(
+        self,
+        metadata: PyosysClass,
+        cls: ClassScope,
+        namespace_components: Tuple[str, ...],
+    ):
+        pqname: PQName = cls.class_decl.typename
+        full_path = list(namespace_components) + [
+            segment.format() for segment in pqname.segments
+        ]
+        basename = full_path.pop()
+        self.class_registry[basename] = cls
+
+        declaration_namespace = "::".join(full_path)
+        tpl_args = [basename]
+        if metadata.ref_only:
+            tpl_args.append(f"std::unique_ptr<{basename}, py::nodelete>")
+        print(
+            f'\t\t{{using namespace {declaration_namespace}; py::class_<{", ".join(tpl_args)}>(m, "{basename}")',
+            file=self.f,
+        )
+
+        self.process_class_members(metadata, cls, basename)
+        for base in cls.class_decl.bases:
+            if base.access != "public":
+                continue
+            name = base.typename.segments[-1].format()
+            if base_scope := self.class_registry.get(name):
+                self.process_class_members(metadata, base_scope, basename)
+
+        if expr := metadata.string_expr:
+            print(f'\t\t.def("__str__", [](const {basename} &s) {{ return {expr}; }})', file=self.f)
+
+        if expr := metadata.hash_expr:
+            print(f'\t\t.def("__hash__", [](const {basename} &s) {{ return run_hash({expr}); }})', file=self.f)
+
+        print(f"\t\t;}}", file=self.f)
+
+    def process_enum(
+        self,
+        enum: EnumDecl,
+        namespace_components: Tuple[str, ...],
+    ):
+        pqname: PQName = enum.typename
+        full_path = list(namespace_components) + [
+            segment.format() for segment in pqname.segments
+        ]
+        basename = full_path.pop()
+
+        declaration_namespace = "::".join(full_path)
+        print(
+            f'\t\t{{using namespace {declaration_namespace}; py::native_enum<{basename}>(m, "{basename}", "enum.Enum")',
+            file=self.f,
+        )
+        enum_class = enum.typename.classkey == "enum class"
+        for value in enum.values:
+            enum_class_qualifier = f"{basename}::" * enum_class
+            print(f'\t\t\t.value("{value.name}", {enum_class_qualifier}{value.name})', file=self.f)
+        print(f"\t\t\t.finalize();}}", file=self.f)
+
+
+    def process_namespace(
+        self,
+        header: PyosysHeader,
+        ns: NamespaceScope,
+        namespace_components: Tuple[str, ...] = (),
+    ):
+        for name, subns in ns.namespaces.items():
+            self.process_namespace(header, subns, (*namespace_components, name))
+        if len(namespace_components) and (len(ns.functions) + len(ns.variables)):
+            # TODO: Not essential but maybe move namespace usage into
+            # process_function for consistency?
+            print(f"\t\t{{ using namespace {'::'.join(namespace_components)};", file=self.f)
+            for function in ns.functions:
+                self.process_function(function)
+            for variable in ns.variables:
+                self.process_variable(variable)
+            print(f"\t\t}}", file=self.f)
+        for enum in ns.enums:
+            self.process_enum(enum, namespace_components)
+        for cls in ns.classes:
+            pqname = cls.class_decl.typename
+            declared_name_str = pqname.segments[-1].format()
+            if cls_metadata := header.classes_by_name.get(declared_name_str):
+                self.process_class(cls_metadata, cls, namespace_components)
+
 
-# Restrict certain strings from being function names in Python
 keyword_aliases = {
-	"in": "in_",
-	"False": "False_",
-	"None": "None_",
-	"True": "True_",
-	"and": "and_",
-	"as": "as_",
-	"assert": "assert_",
-	"break": "break_",
-	"class": "class_",
-	"continue": "continue_",
-	"def": "def_",
-	"del": "del_",
-	"elif": "elif_",
-	"else": "else_",
-	"except": "except_",
-	"for": "for_",
-	"from": "from_",
-	"global": "global_",
-	"if": "if_",
-	"import": "import_",
-	"in": "in_",
-	"is": "is_",
-	"lambda": "lambda_",
-	"nonlocal": "nonlocal_",
-	"not": "not_",
-	"or": "or_",
-	"pass": "pass_",
-	"raise": "raise_",
-	"return": "return_",
-	"try": "try_",
-	"while": "while_",
-	"with": "with_",
-	"yield": "yield_",
+    "in": "in_",
+    "False": "False_",
+    "None": "None_",
+    "True": "True_",
+    "and": "and_",
+    "as": "as_",
+    "assert": "assert_",
+    "break": "break_",
+    "class": "class_",
+    "continue": "continue_",
+    "def": "def_",
+    "del": "del_",
+    "elif": "elif_",
+    "else": "else_",
+    "except": "except_",
+    "for": "for_",
+    "from": "from_",
+    "global": "global_",
+    "if": "if_",
+    "import": "import_",
+    "in": "in_",
+    "is": "is_",
+    "lambda": "lambda_",
+    "nonlocal": "nonlocal_",
+    "not": "not_",
+    "or": "or_",
+    "pass": "pass_",
+    "raise": "raise_",
+    "return": "return_",
+    "try": "try_",
+    "while": "while_",
+    "with": "with_",
+    "yield": "yield_",
 }
 
-# These can be used without any explicit conversion
-autocast_types = {
-	"void": "void",
-	"bool": "bool",
-	"int": "int",
-	"double": "double",
-	"size_t": "size_t",
-	"std::string": "std::string",
-	"string": "string",
-	"char_p": "char_p",
-	"std::source_location": "std::source_location",
-	"source_location": "source_location",
-	"State": "RTLIL::State",
-	# trampoline types
-	"Pass": "RTLIL::Pass",
-	"Monitor": "RTLIL::Monitor",
-}
-
-def strip_std_prefix(str_in):
-	# removesuffix is python 3.9+
-	std_namespace = "std::"
-	if str_in.startswith(std_namespace):
-		return str_in[len(std_namespace):]
-	return str_in
-
-
-# Ways to link between Python- and C++ Objects
-class link_types(Enum):
-	global_list = 1  # Identical to pointer, kept for historical reasons
-	ref_copy = 2  # Copy
-	pointer = 3  # The Python Object contains a pointer to its C++
-	# counterpart
-	derive = 4  # Identical to ref_copy, kept for historical reasons
-
-
-class attr_types(Enum):
-	star = "*"
-	amp = "&"
-	ampamp = "&&"
-	default = ""
-
-
-# For source-files
-class Source:
-	name = ""
-	classes = []
-
-	def __init__(self, name, classes):
-		self.name = name
-		self.classes = classes
-
-
-# Splits a list by the given delimiter, without splitting strings inside
-# pointy-brackets (< and >)
-def split_list(str_def, delim):
-	str_def = str_def.strip()
-	if len(str_def) == 0:
-		return []
-	if str_def.count(delim) == 0:
-		return [str_def]
-	if str_def.count("<") == 0:
-		return str_def.split(delim)
-	if str_def.find("<") < str_def.find(" "):
-		closing = find_closing(
-			str_def[str_def.find("<") + 1 :], "<", ">"
-		) + str_def.find("<")
-		comma = str_def[closing:].find(delim)
-		if comma == -1:
-			return [str_def]
-		comma = closing + comma
-	else:
-		comma = str_def.find(delim)
-	rest = split_list(str_def[comma + 1 :], delim)
-	ret = [str_def[:comma]]
-	if rest != None and len(rest) != 0:
-		ret.extend(rest)
-	return ret
-
-
-# Represents a Type
-class WType:
-	name = ""
-	cont = None
-	attr_type = attr_types.default
-
-	def __init__(self, name="", cont=None, attr_type=attr_types.default):
-		self.name = name
-		self.cont = cont
-		self.attr_type = attr_type
-
-	# Python type-string
-	def gen_text(self):
-		text = self.name
-		if self.name in enum_names:
-			text = enum_by_name(self.name).namespace + "::" + self.name
-		if self.cont != None:
-			return self.cont.gen_identifier()
-		return text
-
-	# C++ type-string
-	def gen_text_cpp(self):
-		postfix = ""
-		if self.attr_type == attr_types.star:
-			postfix = " *"
-		elif self.attr_type == attr_types.amp:
-			postfix = " &"
-		elif self.attr_type == attr_types.ampamp:
-			postfix = " &&"
-		if self.name in classnames:
-			return class_by_name(self.name).namespace + "::" + self.name + postfix
-		if self.name in enum_names:
-			return enum_by_name(self.name).namespace + "::" + self.name + postfix
-		if self.name in autocast_types:
-			return autocast_types[self.name] + postfix
-		text = self.name
-		if self.cont != None:
-			text += "<"
-			for a in self.cont.args:
-				text += a.gen_text_cpp() + ", "
-			text = text[:-2]
-			text += ">"
-		return text
-
-	@staticmethod
-	def from_string(str_def, containing_file, line_number):
-		str_def = str_def.strip()
-		if len(str_def) == 0:
-			return None
-		str_def = str_def.replace(
-			"RTLIL::SigSig", "std::pair<SigSpec, SigSpec>"
-		).replace("SigSig", "std::pair<SigSpec, SigSpec>")
-		t = WType()
-		t.name = ""
-		t.cont = None
-		t.attr_type = attr_types.default
-		if str_def.find("<") != -1:  # and str_def.find("<") < str_def.find(" "):
-			str_def = str_def.replace("const ", "")
-
-			candidate = WContainer.from_string(str_def, containing_file, line_number)
-			if candidate == None:
-				return None
-			t.name = str_def[: str_def.find("<")]
-
-			if t.name.count("*") + t.name.count("&") > 1:
-				return None
-
-			if t.name.count("*") == 1 or str_def[0] == "*" or str_def[-1] == "*":
-				t.attr_type = attr_types.star
-				t.name = t.name.replace("*", "")
-			elif t.name.count("&&") == 1:
-				t.attr_type = attr_types.ampamp
-				t.name = t.name.replace("&&", "")
-			elif t.name.count("&") == 1 or str_def[0] == "&" or str_def[-1] == "&":
-				t.attr_type = attr_types.amp
-				t.name = t.name.replace("&", "")
-
-			t.cont = candidate
-			if t.name not in known_containers:
-				return None
-			return t
-
-		prefix = ""
-
-		if str.startswith(str_def, "const "):
-			if "char_p" in str_def:
-				prefix = "const "
-			str_def = str_def[6:]
-		if str.startswith(str_def, "unsigned "):
-			prefix = "unsigned " + prefix
-			str_def = str_def[9:]
-		while str.startswith(str_def, "long "):
-			prefix = "long " + prefix
-			str_def = str_def[5:]
-		while str.startswith(str_def, "short "):
-			prefix = "short " + prefix
-			str_def = str_def[6:]
-
-		str_def = str_def.split("::")[-1]
-
-		if str_def.count("*") + str_def.count("&") >= 2:
-			return None
-
-		if str_def.count("*") == 1:
-			t.attr_type = attr_types.star
-			str_def = str_def.replace("*", "")
-		elif str_def.count("&&") == 1:
-			t.attr_type = attr_types.ampamp
-			str_def = str_def.replace("&&", "")
-		elif str_def.count("&") == 1:
-			t.attr_type = attr_types.amp
-			str_def = str_def.replace("&", "")
-
-		if (
-			len(str_def) > 0
-			and str_def.split("::")[-1] not in autocast_types
-			and str_def.split("::")[-1] not in classnames
-			and str_def.split("::")[-1] not in enum_names
-		):
-			return None
-
-		if str_def.count(" ") == 0:
-			t.name = (prefix + str_def).replace("char_p", "char *")
-			t.cont = None
-			return t
-		return None
-
-	def gen_identifier(self):
-		if self.cont:
-			return self.cont.gen_identifier()
-		return self.name.title()
-
-	def as_wclass(self) -> Optional["WClass"]:
-		return class_by_name(self.name)
-
-	def __repr__(self):
-		return f"{self.__class__.__qualname__}(**{repr(self.__dict__)})"
-
-
-# Associate the "Translators" with their c++ type
-known_containers = {
-	"std::set",
-	"std::vector",
-	"std::map",
-	"std::pair",
-	"pool",
-	"idict",
-	"dict",
-	"RTLIL::ObjRange"
-}
-
-# Represents a container-type
-class WContainer:
-	name = ""
-	args = []
-
-	def from_string(str_def, containing_file, line_number):
-		if str_def == None or len(str_def) < 4:
-			return None
-		cont = WContainer()
-		cont.name = str_def[: str_def.find("<")]
-		str_def = str_def[str_def.find("<") + 1 : find_closing(str_def, "<", ">")]
-		cont.args = []
-		for arg in split_list(str_def, ","):
-			candidate = WType.from_string(arg.strip(), containing_file, line_number)
-			if candidate == None:
-				return None
-			if candidate.name == "void":
-				return None
-			cont.args.append(candidate)
-		return cont
-
-	# generate the c++ type string
-	def gen_type_cpp(self):
-		tpl_args = []
-		for arg in self.args:
-			postfix = (arg.attr_type == attr_types.star) * " *"
-			if arg.name in autocast_types:
-				tpl_args.append(autocast_types[arg.name] + postfix)
-			elif arg.name in known_containers:
-				tpl_args.append(arg.cont.gen_type_cpp())
-			else:
-				tpl_args.append(arg.as_wclass().fully_qualified_name() + postfix)
-		return f'{self.name}<{ ", ".join(tpl_args) }>'
-
-	def gen_identifier(self):
-		container = strip_std_prefix(self.name).title()
-
-		if container == "Dict":
-			assert len(self.args) == 2
-			return f"{self.args[0].gen_identifier()}To{self.args[1].gen_identifier()}{container}"
-
-		args = []
-		for arg in self.args:
-			arg_name = arg.name.title()
-			if arg.cont:
-				arg_name = arg.cont.gen_identifier()
-			args.append(arg_name)
-		args.append(container)
-		result = "".join(args)
-		if result == "SigspecSigspecPair":
-			return "SigSig"
-		return result
-
-	@autostring
-	def gen_boost_py(self, *, stream):
-		bind_fn = "py::bind_" + strip_std_prefix(self.name)
-		tpl_args = [self.gen_type_cpp()]
-		if bind_fn != "py::bind_vector":
-			# using custom bind function, can't use ::value so need more
-			# template arguments
-			for arg in self.args:
-				postfix = (arg.attr_type == attr_types.star) * " *"
-				if arg.name in autocast_types:
-					tpl_args.append(autocast_types[arg.name] + postfix)
-				elif arg.name in known_containers:
-					tpl_args.append(arg.cont.gen_type_cpp())
-				else:
-					tpl_args.append(arg.as_wclass().fully_qualified_name() + postfix)
-		if bind_fn == "py::bind_set":
-			bind_fn = "py::bind_pool"
-		stream.write(f'\t\t{bind_fn}<{",".join(tpl_args)}>(m, "{self.gen_identifier()}");\n')
-
-	def __repr__(self):
-		return f"{self.__class__.__qualname__}(**{repr(self.__dict__)})"
-
-
-class Attribute:
-	wtype = None
-	varname = None
-	is_const = False
-	default_value = None
-	pos = None
-	pos_counter = 0
-
-	def __init__(self, wtype, varname, is_const=False, default_value=None):
-		self.wtype = wtype
-		self.varname = varname
-		self.is_const = is_const
-		self.default_value = None
-		self.container = None
-
-	@staticmethod
-	def from_string(str_def, containing_file, line_number):
-		if len(str_def) < 3:
-			return None
-		orig = str_def
-		arg = Attribute(None, None)
-		prefix = ""
-		arg.wtype = None
-		arg.varname = None
-		arg.is_const = False
-		arg.default_value = None
-		arg.container = None
-		if str.startswith(str_def, "const "):
-			arg.is_const = True
-			str_def = str_def[6:]
-		if str.startswith(str_def, "unsigned "):
-			prefix = "unsigned "
-			str_def = str_def[9:]
-		while str.startswith(str_def, "long "):
-			prefix = "long " + prefix
-			str_def = str_def[5:]
-		while str.startswith(str_def, "short "):
-			prefix = "short " + prefix
-			str_def = str_def[6:]
-
-		if str_def.find("<") != -1 and str_def.find("<") < str_def.find(" "):
-			closing = (
-				find_closing(str_def[str_def.find("<") :], "<", ">")
-				+ str_def.find("<")
-				+ 1
-			)
-			arg.wtype = WType.from_string(
-				str_def[:closing].strip(), containing_file, line_number
-			)
-			str_def = str_def[closing + 1 :]
-		else:
-			if str_def.count(" ") > 0:
-				arg.wtype = WType.from_string(
-					prefix + str_def[: str_def.find(" ")].strip(),
-					containing_file,
-					line_number,
-				)
-				str_def = str_def[str_def.find(" ") + 1 :]
-			else:
-				arg.wtype = WType.from_string(
-					prefix + str_def.strip(), containing_file, line_number
-				)
-				str_def = ""
-				arg.varname = ""
-
-		if arg.wtype == None:
-			return None
-		if str_def.count("=") == 0:
-			arg.varname = str_def.strip()
-			if arg.varname.find(" ") > 0:
-				return None
-		else:
-			arg.varname = str_def[: str_def.find("=")].strip()
-			if arg.varname.find(" ") > 0:
-				return None
-			str_def = str_def[str_def.find("=") + 1 :].strip()
-			arg.default_value = str_def[arg.varname.find("=") + 1 :].strip()
-		if len(arg.varname) == 0:
-			arg.varname = None
-			return arg
-		if arg.varname[0] == "*":
-			arg.wtype.attr_type = attr_types.star
-			arg.varname = arg.varname[1:]
-		elif arg.varname[0] == "&":
-			if arg.wtype.attr_type != attr_types.default:
-				return None
-			if arg.varname[1] == "&":
-				arg.wtype.attr_type = attr_types.ampamp
-				arg.varname = arg.varname[2:]
-			else:
-				arg.wtype.attr_type = attr_types.amp
-				arg.varname = arg.varname[1:]
-		return arg
-
-	# Generates the varname. If the attribute has no name in the header file,
-	# a name is generated
-	def gen_varname(self):
-		if self.varname != None:
-			return self.varname
-		if self.wtype.name == "void":
-			return ""
-		if self.pos == None:
-			self.pos = Attribute.pos_counter
-			Attribute.pos_counter = Attribute.pos_counter + 1
-		return "gen_varname_" + str(self.pos)
-
-	# Generates the test for the function headers with c++ types
-	def gen_listitem_cpp(self, include_varname=True):
-		postfix = self.gen_varname() * include_varname
-		prefix = ""
-		if self.is_const:
-			prefix = "const "
-		infix = ""
-		if self.wtype.attr_type == attr_types.star:
-			infix = "*"
-		elif self.wtype.attr_type == attr_types.amp:
-			infix = "&"
-		elif self.wtype.attr_type == attr_types.ampamp:
-			infix = "&&"
-		if self.wtype.name in known_containers:
-			return (
-				prefix
-				+ self.wtype.cont.gen_type_cpp()
-				+ " "
-				+ infix
-				+ postfix
-			)
-		if self.wtype.name in classnames:
-			return (
-				prefix
-				+ class_by_name(self.wtype.name).namespace
-				+ "::"
-				+ self.wtype.name
-				+ " "
-				+ infix
-				+ postfix
-			)
-		return prefix + self.wtype.name + " " + infix + postfix
-
-	def gen_listitem_pyarg(self):
-		default = ""
-		if self.default_value is not None:
-			default = f" = {self.default_value}"
-		return f'py::arg("{self.varname}"){default}'
-
-	# Generates the listitem withtout the varname, so the signature can be
-	# compared
-	def gen_listitem_hash(self):
-		prefix = ""
-		if self.is_const:
-			prefix = "const "
-		if self.wtype.name in classnames:
-			return prefix + self.wtype.name + "* "
-		if self.wtype.name in known_containers:
-			return self.wtype.cont.gen_identifier()
-		return prefix + self.wtype.name
-
-
-class WClass:
-	name = None
-	namespace = None
-	link_type = None
-	base_class = None
-	id_ = None
-	string_id = None
-	hash_id = None
-	needs_clone = False
-	found_funs = []
-	found_vars = []
-	found_constrs = []
-
-	def __init__(
-		self,
-		name,
-		link_type,
-		*,
-		id_=None,
-		string_id=None,
-		hash_id=None,
-		needs_clone=False,
-	):
-		self.name = name
-		self.namespace = None
-		self.base_class = None
-		self.link_type = link_type
-		self.id_ = id_
-		self.string_id = string_id
-		self.hash_id = hash_id
-		self.needs_clone = needs_clone
-		self.found_funs = []
-		self.found_vars = []
-		self.found_constrs = []
-
-	@autostring
-	def gen_boost_py(self, *, stream):
-		name_qualified = f"{self.namespace}::{self.name}"
-		tpl_args = [name_qualified]
-		if self.link_type in [link_types.pointer, link_types.global_list]:
-			tpl_args.append(f"std::unique_ptr<{name_qualified}, py::nodelete>")
-		stream.write(f'\t\tpy::class_<{", ".join(tpl_args)}>(m, "{self.name}")\n')
-		for con in self.found_constrs:
-			# HACK: skip move constructors
-			if "&&" in con.orig_text:
-				continue
-			con.gen_boost_py(stream=stream)
-		for fun in sorted(self.found_funs, key=lambda f: (f.is_operator, f.name)):
-			fun.gen_boost_py(stream=stream)
-		if self.string_id:
-			stream.write(
-				f'\t\t\t.def("__str__", [](const {name_qualified} &self){{ return self.{self.string_id}; }})\n'
-			)
-		if self.hash_id:
-			hash_member = f".{self.hash_id}" if self.hash_id != "" else ""
-			stream.write(
-				f'\t\t\t.def("__hash__", [](const {name_qualified} &self){{ return run_hash(self{hash_member}); }})\n'
-			)
-		for var in self.found_vars:
-			var.gen_boost_py(stream=stream)
-		stream.write("\t\t;\n")
-
-	def fully_qualified_name(self) -> str:
-		return f"{self.namespace}::{self.name}"
-
-	def __repr__(self):
-		return f"{self.__class__.__qualname__}({repr(self.__dict__)})"
-
-
-# CONFIGURE HEADER-FILES TO BE PARSED AND CLASSES EXPECTED IN THEM HERE
-
-sources = [
-	Source(
-		"kernel/celltypes",
-		[
-			WClass("CellType", link_types.ref_copy, hash_id="type", needs_clone=True),
-			WClass("CellTypes", link_types.ref_copy, needs_clone=True),
-		],
-	),
-	Source(
-		"kernel/consteval", [WClass("ConstEval", link_types.ref_copy, needs_clone=True)]
-	),
-	Source("kernel/log", []),
-	Source(
-		"kernel/register",
-		[
-			# WClass("Pass", link_types.derive, needs_clone=True), # Manual mapping because of virtual method
-		],
-	),
-	Source(
-		"kernel/rtlil",
-		[
-			WClass("IdString", link_types.ref_copy, string_id="str()", hash_id="str()"),
-			WClass("Const", link_types.ref_copy, string_id="as_string()"),
-			WClass("AttrObject", link_types.ref_copy),
-			WClass("NamedObject", link_types.ref_copy),
-			WClass("Selection", link_types.ref_copy),
-			#WClass("Monitor", link_types.derive), # Moved to tpl for virtual methods
-			WClass("CaseRule", link_types.ref_copy, needs_clone=True),
-			WClass("SwitchRule", link_types.ref_copy, needs_clone=True),
-			WClass("SyncRule", link_types.ref_copy, needs_clone=True),
-			WClass(
-				"Process", link_types.pointer, string_id="name.c_str()", hash_id="name"
-			),
-			WClass("SigChunk", link_types.ref_copy),
-			WClass("SigBit", link_types.ref_copy, hash_id=""),
-			WClass("SigSpec", link_types.ref_copy, hash_id=""),
-			WClass(
-				"Cell",
-				link_types.global_list,
-				id_=Attribute(WType("unsigned int"), "hashidx_"),
-				string_id="name.c_str()",
-				hash_id="",
-			),
-			WClass(
-				"Wire",
-				link_types.global_list,
-				id_=Attribute(WType("unsigned int"), "hashidx_"),
-				string_id="name.c_str()",
-				hash_id="",
-			),
-			WClass(
-				"Memory",
-				link_types.global_list,
-				id_=Attribute(WType("unsigned int"), "hashidx_"),
-				string_id="name.c_str()",
-				hash_id="",
-			),
-			WClass(
-				"Module",
-				link_types.global_list,
-				id_=Attribute(WType("unsigned int"), "hashidx_"),
-				string_id="name.c_str()",
-				hash_id="",
-			),
-			WClass(
-				"Design",
-				link_types.ref_copy,
-				id_=Attribute(WType("unsigned int"), "hashidx_"),
-				string_id="hashidx_",
-				hash_id="",
-			),
-		],
-	),
-	# Source("kernel/satgen",[
-	# 	]
-	# 	),
-	# Source("libs/ezsat/ezsat",[
-	# 	]
-	# 	),
-	# Source("libs/ezsat/ezminisat",[
-	# 	]
-	# 	),
-	Source(
-		"kernel/sigtools", [WClass("SigMap", link_types.ref_copy, needs_clone=True)]
-	),
-	Source("kernel/yosys", []),
-	Source("kernel/cost", []),
-]
-
-blacklist_methods = [
-	"YOSYS_NAMESPACE::Pass::run_register",
-	"YOSYS_NAMESPACE::Module::Pow",
-	"YOSYS_NAMESPACE::RTLIL::Design::selected_whole_modules",
-	"YOSYS_NAMESPACE::RTLIL::AttrObject::get_blackbox_attribute"
-]
-
-enum_names = ["State", "SyncType", "ConstFlags"]
-
-enums = []  # Do not edit
-glbls = []
-
-unowned_functions = []
-
-classnames = []
-for source in sources:
-	for wclass in source.classes:
-		classnames.append(wclass.name)
-
-
-def class_by_name(name):
-	for source in sources:
-		for wclass in source.classes:
-			if wclass.name == name:
-				return wclass
-	return None
-
-
-def enum_by_name(name):
-	for e in enums:
-		if e.name == name:
-			return e
-	return None
-
-
-def find_closing(text, open_tok, close_tok):
-	if text.find(open_tok) == -1 or text.find(close_tok) <= text.find(open_tok):
-		return text.find(close_tok)
-	return (
-		text.find(close_tok)
-		+ find_closing(text[text.find(close_tok) + 1 :], open_tok, close_tok)
-		+ 1
-	)
-
-
-def unpretty_string(s):
-	s = s.strip()
-	while s.find("  ") != -1:
-		s = s.replace("  ", " ")
-	while s.find("\t") != -1:
-		s = s.replace("\t", " ")
-	s = s.replace(" (", "(")
-	return s
-
-
-class WEnum:
-	name = None
-	namespace = None
-	values = []
-
-	def from_string(str_def, namespace, line_number):
-		str_def = str_def.strip()
-		if not str.startswith(str_def, "enum "):
-			return None
-		if str_def.count(";") != 1:
-			return None
-		str_def = str_def[5:]
-		enum = WEnum()
-		split = str_def.split(":")
-		if len(split) != 2:
-			return None
-		enum.name = split[0].strip()
-		if enum.name not in enum_names:
-			return None
-		str_def = split[1]
-		if str_def.count("{") != str_def.count("}") != 1:
-			return None
-		if (
-			len(str_def) < str_def.find("}") + 2
-			or str_def[str_def.find("}") + 1] != ";"
-		):
-			return None
-		str_def = str_def.split("{")[-1].split("}")[0]
-		enum.values = []
-		for val in str_def.split(","):
-			enum.values.append(val.strip().split("=")[0].strip())
-		enum.namespace = namespace
-		return enum
-
-	@autostring
-	def gen_boost_py(self, *, stream):
-		stream.write(
-			f'\t\tpy::native_enum<{self.namespace}::{self.name}>(m, "{self.name}", "enum.Enum")\n'
-		)
-		for value in self.values:
-			stream.write(f'\t\t\t.value("{value}", {self.namespace}::{value})\n')
-		stream.write("\t\t\t.finalize();\n")
-
-	def __str__(self):
-		ret = "Enum " + self.namespace + "::" + self.name + "(\n"
-		for val in self.values:
-			ret = ret + "\t" + val + "\n"
-		return ret + ")"
-
-
-class WConstructor:
-	orig_text = None
-	args = []
-	containing_file = None
-	member_of = None
-	duplicate = False
-	protected = False
-
-	def __init__(self, containing_file, class_):
-		self.orig_text = "Auto generated default constructor"
-		self.args = []
-		self.containing_file = containing_file
-		self.member_of = class_
-		self.protected = False
-
-	def from_string(str_def, containing_file, class_, line_number, protected=False):
-		if class_ == None:
-			return None
-		if str_def.count("delete;") > 0:
-			return None
-		con = WConstructor(containing_file, class_)
-		con.orig_text = str_def
-		con.args = []
-		con.duplicate = False
-		con.protected = protected
-		if str.startswith(str_def, "inline "):
-			str_def = str_def[7:]
-		if not str.startswith(str_def, class_.name + "("):
-			return None
-		str_def = str_def[len(class_.name) + 1 :]
-		found = find_closing(str_def, "(", ")")
-		if found == -1:
-			return None
-		str_def = str_def[0:found].strip()
-		if len(str_def) == 0:
-			return con
-		args = split_list(str_def, ",")
-		for i, arg in enumerate(args):
-			parsed = Attribute.from_string(arg.strip(), containing_file, line_number)
-			if parsed == None:
-				return None
-			# Only allow std::source_location as defaulted last argument, and
-			# don't append so it takes default value
-			if parsed.wtype.name in ["std::source_location", "source_location"]:
-				if parsed.default_value is None or i != len(args) - 1:
-					debug(
-						"std::source_location not defaulted last arg of "
-						+ class_.name
-						+ " is unsupported",
-						2,
-					)
-					return None
-				continue
-			con.args.append(parsed)
-		return con
-
-	def gen_decl_hash_py(self):
-		text = self.member_of.name + "("
-		for arg in self.args:
-			text += arg.gen_listitem_hash() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += ");"
-		return text
-
-	def overload_params(self):
-		return ", ".join([a.gen_listitem_cpp(include_varname=False) for a in self.args])
-
-	@autostring
-	def gen_boost_py(self, *, stream):
-		if self.duplicate or self.protected:
-			return
-		stream.write(f"\t\t\t.def(py::init<{self.overload_params()}>())\n")
-
-
-class WFunction:
-	orig_text = None
-	is_static = False
-	is_inline = False
-	is_virtual = False
-	is_const = False
-	ret_attr_type = attr_types.default
-	is_operator = False
-	ret_type = None
-	name = None
-	alias = None
-	args = []
-	containing_file = None
-	member_of = None
-	duplicate = False
-	namespace = ""
-
-	def from_string(str_def, containing_file, class_, line_number, namespace):
-		if str_def.count("delete;") > 0:
-			return None
-		func = WFunction()
-		func.is_static = False
-		func.is_inline = False
-		func.is_virtual = False
-		func.is_const = False
-		func.ret_attr_type = attr_types.default
-		func.is_operator = False
-		func.member_of = None
-		func.orig_text = str_def
-		func.args = []
-		func.containing_file = containing_file
-		func.member_of = class_
-		func.duplicate = False
-		func.namespace = namespace
-		str_def = str_def.replace("operator ", "operator")
-
-		# remove attributes from the start
-		if str.startswith(str_def, "[[") and "]]" in str_def:
-			str_def = str_def[str_def.find("]]") + 2 :]
-
-		if str.startswith(str_def, "static "):
-			func.is_static = True
-			str_def = str_def[7:]
-		else:
-			func.is_static = False
-		if str.startswith(str_def, "inline "):
-			func.is_inline = True
-			str_def = str_def[7:]
-		else:
-			func.is_inline = False
-		if str.startswith(str_def, "virtual "):
-			func.is_virtual = True
-			str_def = str_def[8:]
-		else:
-			func.is_virtual = False
-
-		if str_def.count(" ") == 0:
-			return None
-
-		parts = split_list(str_def.strip(), " ")
-
-		prefix = ""
-		i = 0
-		for part in parts:
-			if part in ["unsigned", "long", "short", "const"]:
-				prefix += part + " "
-				i += 1
-			else:
-				break
-		parts = parts[i:]
-
-		if len(parts) <= 1:
-			return None
-
-		func.ret_type = WType.from_string(
-			prefix + parts[0], containing_file, line_number
-		)
-
-		if func.ret_type == None:
-			return None
-
-		str_def = parts[1]
-		for part in parts[2:]:
-			str_def = str_def + " " + part
-
-		found = str_def.find("(")
-		if found == -1 or (str_def.find(" ") != -1 and found > str_def.find(" ")):
-			return None
-		func.name = str_def[:found]
-		str_def = str_def[found:]
-		if func.name.find("operator") != -1 and str.startswith(str_def, "()("):
-			func.name += "()"
-			str_def = str_def[2:]
-		str_def = str_def[1:]
-		if func.name.find("operator") != -1:
-			func.is_operator = True
-		if func.name.find("*") == 0:
-			func.name = func.name.replace("*", "")
-			func.ret_type.attr_type = attr_types.star
-		if func.name.find("&&") == 0:
-			func.name = func.name.replace("&&", "")
-			func.ret_type.attr_type = attr_types.ampamp
-		if func.name.find("&") == 0:
-			func.name = func.name.replace("&", "")
-			func.ret_type.attr_type = attr_types.amp
-
-		found = find_closing(str_def, "(", ")")
-		if found == -1:
-			return None
-
-		post_qualifiers = str_def[found + 1 :].lstrip()
-		if post_qualifiers.startswith("const"):
-			func.is_const = True
-
-		str_def = str_def[0:found]
-		if func.name in blacklist_methods:
-			return None
-		if func.namespace != None and func.namespace != "":
-			if (func.namespace + "::" + func.name) in blacklist_methods:
-				return None
-			if func.member_of != None:
-				if (
-					func.namespace + "::" + func.member_of.name + "::" + func.name
-				) in blacklist_methods:
-					return None
-		if (
-			func.is_operator
-			and func.name.replace(" ", "").replace("operator", "").split("::")[-1]
-			not in wrappable_operators
-		):
-			return None
-
-		testname = func.name
-		if func.is_operator:
-			testname = testname[: testname.find("operator")]
-		if (
-			testname.count(")") != 0
-			or testname.count("(") != 0
-			or testname.count("~") != 0
-			or testname.count(";") != 0
-			or testname.count(">") != 0
-			or testname.count("<") != 0
-			or testname.count("throw") != 0
-		):
-			return None
-
-		func.alias = func.name
-		if func.name in keyword_aliases:
-			func.alias = keyword_aliases[func.name]
-		str_def = str_def[:found].strip()
-		if len(str_def) == 0:
-			return func
-		args = split_list(str_def, ",")
-		for i, arg in enumerate(args):
-			if arg.strip() == "...":
-				continue
-			parsed = Attribute.from_string(arg.strip(), containing_file, line_number)
-			if parsed == None:
-				return None
-			# Only allow std::source_location as defaulted last argument, and
-			# don't append so it takes default value
-			if parsed.wtype.name in ["std::source_location", "source_location"]:
-				if parsed.default_value is None or i != len(args) - 1:
-					debug(
-						"std::source_location not defaulted last arg of "
-						+ func.name
-						+ " is unsupported",
-						2,
-					)
-					return None
-				continue
-			func.args.append(parsed)
-		# handle (void) parameter declarations
-		if len(func.args) == 1 and func.args[0].wtype.name == "void":
-			func.args = []
-		return func
-
-	@property
-	def mangled_name(self):
-		mangled_typename = (
-			lambda code: code.replace("::", "_")
-			.replace("<", "_")
-			.replace(">", "_")
-			.replace(" ", "")
-			.replace("*", "")
-			.replace(",", "")
-		)
-
-		return self.name + "".join(
-			f"__{mangled_typename(arg.wtype.gen_text_cpp())}" for arg in self.args
-		)
-
-	def gen_alias(self):
-		self.alias = self.mangled_name
-
-	def gen_post_qualifiers(self, derived=False):
-		if (
-			self.member_of != None
-			and self.member_of.link_type == link_types.derive
-			and self.is_virtual
-			and derived
-		):
-			# we drop the qualifiers when deriving callbacks to be implemented in Python
-			return ""
-		return " const" if self.is_const else ""
-
-	def gen_decl_hash_py(self):
-		text = self.ret_type.gen_text() + " " + self.alias + "("
-		for arg in self.args:
-			text += arg.gen_listitem_hash() + ", "
-		if len(self.args) > 0:
-			text = text[:-2]
-		text += ");"
-		return text
-
-	def overload_params(self):
-		return ", ".join([a.gen_listitem_cpp(False) for a in self.args])
-
-	def py_args(self):
-		return ", ".join([a.gen_listitem_pyarg() for a in self.args])
-
-	def wrapper_params(self):
-		return ", ".join([a.gen_listitem_cpp() for a in self.args])
-
-	def wrapper_args(self):
-		varnames = []
-		for a in self.args:
-			if a.varname == "format":
-				# HACK: handle format strings (by ignoring the format part)
-				varnames.extend(['"%s"', "format"])
-			else:
-				varnames.append(a.varname)
-		return ", ".join(varnames)
-
-	@autostring
-	def gen_boost_py(self, *, stream):
-		if self.duplicate:
-			return
-
-		fully_qualify = False
-		if self.member_of is not None and (
-			(self.member_of.name == "IdString" and self.name == "in")
-			or (self.member_of.name == "Design" and self.name == "selection")
-		):
-			fully_qualify = True
-
-		# HACK: skip methods with inline-related nonsense
-		if self.alias in [
-			"log_id",
-			"log_dump_val_worker",
-			"log_dump_args_worker",
-			"GetSize",
-		]:
-			return
-
-		prefix = "\t\tm"
-		ns = self.namespace
-		if self.member_of:
-			prefix = "\t\t\t"
-			ns = self.member_of.fully_qualified_name()
-
-		stream.write(f"{prefix}.def")
-		if self.member_of and self.is_static:
-			stream.write("_static")
-		stream.write("(")
-
-		if self.is_operator:
-			stream.write(f"py::self {self.name[len('operator'):]} py::self")
-		else:
-			stream.write(f'"{self.alias}", ')
-			# HACK: wrap variadics by only allowing a string
-			if "..." in self.orig_text:
-				stream.write(
-					f"[]({self.wrapper_params()}) {{ {self.namespace}::{self.name}({self.wrapper_args()}); }}"
-				)
-			else:
-
-				# HACK: Some of these needs special handling, i.e., a FULL
-				# overload disambiguation. Not sure why. Something to do with
-				# inlines and overloads.
-				#
-				# In theory, this disambiguation should work for everything but
-				# WType doesn't properly retain const return types yet.
-				if fully_qualify:
-					stream.write(
-						f"static_cast < {self.ret_type.gen_text_cpp()} ({ns}::*)({self.overload_params()}) {self.gen_post_qualifiers()} >("
-					)
-				elif not len(self.args) == 0:
-					stream.write(f"py::overload_cast<{self.overload_params()}>(")
-				stream.write(f"&{ns}::{self.name}")
-				if fully_qualify:
-					stream.write(")")
-				elif not len(self.args) == 0:
-					if self.is_const:
-						stream.write(f", py::const_")
-					stream.write(")")
-		py_args = self.py_args()
-		if len(py_args):
-			stream.write(", ")
-			stream.write(py_args)
-		stream.write(")\n" if self.member_of is not None else ");\n")
-
-	def __repr__(self):
-		return f"{self.__class__.__qualname__}({repr(self.__dict__)})"
-
-
-class WMember:
-	opaque_containers: ClassVar[dict] = dict()
-	orig_text = None
-	wtype = attr_types.default
-	name = None
-	containing_file = None
-	member_of = None
-	namespace = ""
-	is_const = False
-
-	def from_string(str_def, containing_file, class_, line_number, namespace):
-		member = WMember()
-		member.orig_text = str_def
-		member.wtype = None
-		member.name = ""
-		member.containing_file = containing_file
-		member.member_of = class_
-		member.namespace = namespace
-		member.is_const = False
-
-		if str.startswith(str_def, "const "):
-			member.is_const = True
-			str_def = str_def[6:]
-
-		if str_def.count(" ") == 0:
-			return None
-
-		parts = split_list(str_def.strip(), " ")
-
-		prefix = ""
-		i = 0
-		for part in parts:
-			if part in ["unsigned", "long", "short"]:
-				prefix += part + " "
-				i += 1
-			else:
-				break
-		parts = parts[i:]
-
-		if len(parts) <= 1:
-			return None
-
-		member.wtype = WType.from_string(
-			prefix + parts[0], containing_file, line_number
-		)
-
-		if member.wtype == None:
-			return None
-
-		str_def = parts[1]
-		for part in parts[2:]:
-			str_def = str_def + " " + part
-
-		if (
-			str_def.find("(") != -1
-			or str_def.find(")") != -1
-			or str_def.find("{") != -1
-			or str_def.find("}") != -1
-		):
-			return None
-
-		found = str_def.find(";")
-		if found == -1:
-			return None
-
-		found_eq = str_def.find("=")
-		if found_eq != -1:
-			found = found_eq
-
-		member.name = str_def[:found]
-		str_def = str_def[found + 1 :]
-		if member.name.find("*") == 0:
-			member.name = member.name.replace("*", "")
-			member.wtype.attr_type = attr_types.star
-		if member.name.find("&&") == 0:
-			member.name = member.name.replace("&&", "")
-			member.wtype.attr_type = attr_types.ampamp
-		if member.name.find("&") == 0:
-			member.name = member.name.replace("&", "")
-			member.wtype.attr_type = attr_types.amp
-
-		if len(str_def.strip()) != 0:
-			return None
-
-		if len(member.name.split(",")) > 1:
-			member_list = []
-			for name in member.name.split(","):
-				name = name.strip()
-				member_list.append(WMember())
-				member_list[-1].orig_text = member.orig_text
-				member_list[-1].wtype = member.wtype
-				member_list[-1].name = name
-				member_list[-1].containing_file = member.containing_file
-				member_list[-1].member_of = member.member_of
-				member_list[-1].namespace = member.namespace
-				member_list[-1].is_const = member.is_const
-			return member_list
-
-		if member.wtype.cont:
-			WMember.opaque_containers[member.wtype.gen_identifier()] = member.wtype
-
-		return member
-
-	@autostring
-	def gen_boost_py(self, *, stream):
-		if False and self.wtype.attr_type == attr_types.default:
-			property_type = self.wtype.gen_text_cpp()
-			stream.write(f'\t\t\t.def_property("{self.name}",\n')
-			stream.write(f'\t\t\t\t[]({self.member_of.fully_qualified_name()} &o) -> {property_type}&  {{ return o.{self.name}; }},\n')
-			stream.write(f'\t\t\t\t[]({self.member_of.fully_qualified_name()} &o, {property_type} const &p) {{ o.{self.name} = p; }},\n')
-			stream.write(f'\t\t\t\tpy::return_value_policy::reference_internal\n')
-			stream.write(f'\t\t\t)\n')
-		else:
-			meth = "def_readonly" if self.is_const else "def_readwrite"
-			stream.write(
-				f'\t\t\t.{meth}("{self.name}", &{self.member_of.fully_qualified_name()}::{self.name})\n'
-			)
-
-	def __repr__(self):
-		return f"{self.__class__.__qualname__}({repr(self.__dict__)})"
-
-
-class WGlobal:
-	orig_text = None
-	wtype = attr_types.default
-	name = None
-	containing_file = None
-	namespace = ""
-	is_const = False
-
-	def from_string(str_def, containing_file, line_number, namespace):
-		glbl = WGlobal()
-		glbl.orig_text = str_def
-		glbl.wtype = None
-		glbl.name = ""
-		glbl.containing_file = containing_file
-		glbl.namespace = namespace
-		glbl.is_const = False
-
-		if not str.startswith(str_def, "extern"):
-			return None
-		str_def = str_def[7:]
-
-		if str.startswith(str_def, "const "):
-			glbl.is_const = True
-			str_def = str_def[6:]
-
-		if str_def.count(" ") == 0:
-			return None
-
-		parts = split_list(str_def.strip(), " ")
-
-		prefix = ""
-		i = 0
-		for part in parts:
-			if part in ["unsigned", "long", "short"]:
-				prefix += part + " "
-				i += 1
-			else:
-				break
-		parts = parts[i:]
-
-		if len(parts) <= 1:
-			return None
-
-		glbl.wtype = WType.from_string(prefix + parts[0], containing_file, line_number)
-
-		if glbl.wtype == None:
-			return None
-
-		str_def = parts[1]
-		for part in parts[2:]:
-			str_def = str_def + " " + part
-
-		if (
-			str_def.find("(") != -1
-			or str_def.find(")") != -1
-			or str_def.find("{") != -1
-			or str_def.find("}") != -1
-		):
-			return None
-
-		found = str_def.find(";")
-		if found == -1:
-			return None
-
-		found_eq = str_def.find("=")
-		if found_eq != -1:
-			found = found_eq
-
-		glbl.name = str_def[:found]
-		str_def = str_def[found + 1 :]
-		if glbl.name.find("*") == 0:
-			glbl.name = glbl.name.replace("*", "")
-			glbl.wtype.attr_type = attr_types.star
-		if glbl.name.find("&&") == 0:
-			glbl.name = glbl.name.replace("&&", "")
-			glbl.wtype.attr_type = attr_types.ampamp
-		if glbl.name.find("&") == 0:
-			glbl.name = glbl.name.replace("&", "")
-			glbl.wtype.attr_type = attr_types.amp
-
-		if len(str_def.strip()) != 0:
-			return None
-
-		if len(glbl.name.split(",")) > 1:
-			glbl_list = []
-			for name in glbl.name.split(","):
-				name = name.strip()
-				glbl_list.append(WGlobal())
-				glbl_list[-1].orig_text = glbl.orig_text
-				glbl_list[-1].wtype = glbl.wtype
-				glbl_list[-1].name = name
-				glbl_list[-1].containing_file = glbl.containing_file
-				glbl_list[-1].namespace = glbl.namespace
-				glbl_list[-1].is_const = glbl.is_const
-			return glbl_list
-
-		return glbl
-
-	@autostring
-	def gen_boost_py(self, *, stream):
-		args = [
-			f'"{self.name}"',
-		]
-		meth = "def_readonly_static"
-		if not self.is_const:
-			meth = "def_readwrite_static"
-		args.append(f"&{self.namespace}::{self.name}")
-		stream.write(f'\t\t\t.{meth}({", ".join(args)})\n')
-
-
-def concat_namespace(tuple_list):
-	if len(tuple_list) == 0:
-		return ""
-	ret = ""
-	for namespace in tuple_list:
-		ret += "::" + namespace[0]
-	return ret[2:]
-
-
-def calc_ident(text):
-	if len(text) == 0 or text[0] != " ":
-		return 0
-	return calc_ident(text[1:]) + 1
-
-
-def assure_length(text, length, left=False):
-	if len(text) > length:
-		return text[:length]
-	if left:
-		return text + " " * (length - len(text))
-	return " " * (length - len(text)) + text
-
-
-def nesting_delta(s):
-	return s.count("{") - s.count("}")
-
-
-def parse_header(source):
-	debug("Parsing " + source.name + ".pyh", 1)
-	source_file = open(source.name + ".pyh", "r")
-
-	source_text = []
-	in_line = source_file.readline()
-
-	namespaces = []
-
-	while in_line:
-		if len(in_line) > 1:
-			source_text.append(
-				in_line.replace("char *", "char_p ").replace("char* ", "char_p ")
-			)
-		in_line = source_file.readline()
-
-	i = 0
-
-	namespaces = []
-	classes = []
-	private_segment = False
-
-	while i < len(source_text):
-		line = (
-			source_text[i]
-			.replace(
-				"YOSYS_NAMESPACE_BEGIN",
-				"                    namespace YOSYS_NAMESPACE{",
-			)
-			.replace("YOSYS_NAMESPACE_END", "                    }")
-		)
-		ugly_line = unpretty_string(line)
-		debug(f"READ:>> {line}", 2)
-
-		# for anonymous unions, ignore union enclosure by skipping start line and replacing end line with new line
-		if "union {" in line:
-			j = i + 1
-			while j < len(source_text):
-				union_line = source_text[j]
-				if "};" in union_line:
-					source_text[j] = "\n"
-					break
-				j += 1
-			if j != len(source_text):
-				i += 1
-				continue
-
-		if str.startswith(
-			ugly_line, "namespace "
-		):  # and ugly_line.find("std") == -1 and ugly_line.find("__") == -1:
-			namespace_name = ugly_line[10:].replace("{", "").strip()
-			namespaces.append((namespace_name, ugly_line.count("{")))
-			debug("-----NAMESPACE " + concat_namespace(namespaces) + "-----", 3)
-			i += 1
-			continue
-
-		if len(namespaces) != 0:
-			namespaces[-1] = (
-				namespaces[-1][0],
-				namespaces[-1][1] + nesting_delta(ugly_line),
-			)
-			if namespaces[-1][1] == 0:
-				debug("-----END NAMESPACE " + concat_namespace(namespaces) + "-----", 3)
-				namespaces.pop()
-				i += 1
-				continue
-
-		if (
-			str.startswith(ugly_line, "struct ") or str.startswith(ugly_line, "class")
-		) and ugly_line.count(";") == 0:
-			# Opening a record declaration which isn't a forward declaration
-			struct_name = ugly_line.split(" ")[1].split("::")[-1]
-			impl_namespaces = ugly_line.split(" ")[1].split("::")[:-1]
-			complete_namespace = concat_namespace(namespaces)
-			for namespace in impl_namespaces:
-				complete_namespace += "::" + namespace
-			debug("\tFound " + struct_name + " in " + complete_namespace, 2)
-
-			base_class_name = None
-			if len(ugly_line.split(" : ")) > 1:  # class is derived
-				deriv_str = ugly_line.split(" : ")[1]
-				if len(deriv_str.split("::")) > 1:  # namespace of base class is given
-					base_class_name = deriv_str.split("::", 1)[1]
-				else:
-					base_class_name = deriv_str.split(" ")[0]
-				debug("\t  " + struct_name + " is derived from " + base_class_name, 2)
-			base_class = class_by_name(base_class_name)
-
-			c = (class_by_name(struct_name), ugly_line.count("{"))  # calc_ident(line))
-			debug(f"switch to {struct_name} in namespace {namespaces}", 2)
-			if struct_name in classnames:
-				c[0].namespace = complete_namespace
-				c[0].base_class = base_class
-			classes.append(c)
-			i += 1
-			continue
-
-		if len(classes):
-			c = (classes[-1][0], classes[-1][1] + nesting_delta(ugly_line))
-			classes[-1] = c
-			if c[1] == 0:
-				if c[0] == None:
-					debug("\tExiting unknown class", 3)
-				else:
-					debug("\tExiting class " + c[0].name, 3)
-				classes.pop()
-				private_segment = False
-				i += 1
-				continue
-
-		class_ = classes[-1] if classes else None
-
-		if class_ != None and (
-			line.find("private:") != -1 or line.find("protected:") != -1
-		):
-			private_segment = True
-			i += 1
-			continue
-		if class_ != None and line.find("public:") != -1:
-			private_segment = False
-			i += 1
-			continue
-
-		candidate = None
-
-		if private_segment and class_ != None and class_[0] != None:
-			candidate = WConstructor.from_string(
-				ugly_line, source.name, class_[0], i, True
-			)
-			if candidate != None:
-				debug(
-					'\t\tFound constructor of class "'
-					+ class_[0].name
-					+ '" in namespace '
-					+ concat_namespace(namespaces),
-					2,
-				)
-				class_[0].found_constrs.append(candidate)
-				i += 1
-				continue
-
-		if not private_segment and (class_ == None or class_[0] != None):
-			if class_ != None:
-				candidate = WFunction.from_string(
-					ugly_line, source.name, class_[0], i, concat_namespace(namespaces)
-				)
-			else:
-				candidate = WFunction.from_string(
-					ugly_line, source.name, None, i, concat_namespace(namespaces)
-				)
-			if candidate != None and candidate.name.find("::") == -1:
-				if class_ == None:
-					debug(
-						'\tFound unowned function "'
-						+ candidate.name
-						+ '" in namespace '
-						+ concat_namespace(namespaces),
-						2,
-					)
-					unowned_functions.append(candidate)
-				else:
-					debug(
-						'\t\tFound function "'
-						+ candidate.name
-						+ '" of class "'
-						+ class_[0].name
-						+ '" in namespace '
-						+ concat_namespace(namespaces),
-						2,
-					)
-					class_[0].found_funs.append(candidate)
-			else:
-				candidate = WEnum.from_string(
-					ugly_line, concat_namespace(namespaces), i
-				)
-				if candidate != None:
-					enums.append(candidate)
-					debug(
-						'\tFound enum "'
-						+ candidate.name
-						+ '" in namespace '
-						+ concat_namespace(namespaces),
-						2,
-					)
-				elif class_ != None and class_[1] == 1:
-					candidate = WConstructor.from_string(
-						ugly_line, source.name, class_[0], i
-					)
-					if candidate != None:
-						debug(
-							'\t\tFound constructor of class "'
-							+ class_[0].name
-							+ '" in namespace '
-							+ concat_namespace(namespaces),
-							2,
-						)
-						class_[0].found_constrs.append(candidate)
-					else:
-						candidate = WMember.from_string(
-							ugly_line,
-							source.name,
-							class_[0],
-							i,
-							concat_namespace(namespaces),
-						)
-						if candidate != None:
-							if type(candidate) == list:
-								for c in candidate:
-									debug(
-										'\t\tFound member "'
-										+ c.name
-										+ '" of class "'
-										+ class_[0].name
-										+ '" of type "'
-										+ c.wtype.name
-										+ '"',
-										2,
-									)
-								class_[0].found_vars.extend(candidate)
-							else:
-								debug(
-									'\t\tFound member "'
-									+ candidate.name
-									+ '" of class "'
-									+ class_[0].name
-									+ '" of type "'
-									+ candidate.wtype.name
-									+ '"',
-									2,
-								)
-								class_[0].found_vars.append(candidate)
-				if candidate == None and class_ == None:
-					candidate = WGlobal.from_string(
-						ugly_line, source.name, i, concat_namespace(namespaces)
-					)
-					if candidate != None:
-						if type(candidate) == list:
-							for c in candidate:
-								glbls.append(c)
-								debug(
-									'\tFound global "'
-									+ c.name
-									+ '" in namespace '
-									+ concat_namespace(namespaces),
-									2,
-								)
-						else:
-							glbls.append(candidate)
-							debug(
-								'\tFound global "'
-								+ candidate.name
-								+ '" in namespace '
-								+ concat_namespace(namespaces),
-								2,
-							)
-
-			j = i
-			line = unpretty_string(line)
-			while (
-				candidate == None
-				and j + 1 < len(source_text)
-				and line.count(";") <= 1
-				and line.count("(") >= line.count(")")
-			):
-				j += 1
-				line = line + "\n" + unpretty_string(source_text[j])
-				if class_ != None:
-					candidate = WFunction.from_string(
-						ugly_line,
-						source.name,
-						class_[0],
-						i,
-						concat_namespace(namespaces),
-					)
-				else:
-					candidate = WFunction.from_string(
-						ugly_line, source.name, None, i, concat_namespace(namespaces)
-					)
-				if candidate != None and candidate.name.find("::") == -1:
-					if class_ == None:
-						debug(
-							'\tFound unowned function "'
-							+ candidate.name
-							+ '" in namespace '
-							+ concat_namespace(namespaces),
-							2,
-						)
-						unowned_functions.append(candidate)
-					else:
-						debug(
-							'\t\tFound function "'
-							+ candidate.name
-							+ '" of class "'
-							+ class_[0].name
-							+ '" in namespace '
-							+ concat_namespace(namespaces),
-							2,
-						)
-						class_[0].found_funs.append(candidate)
-					continue
-				candidate = WEnum.from_string(line, concat_namespace(namespaces), i)
-				if candidate != None:
-					enums.append(candidate)
-					debug(
-						'\tFound enum "'
-						+ candidate.name
-						+ '" in namespace '
-						+ concat_namespace(namespaces),
-						2,
-					)
-					continue
-				if class_ != None:
-					candidate = WConstructor.from_string(
-						line, source.name, class_[0], i
-					)
-					if candidate != None:
-						debug(
-							'\t\tFound constructor of class "'
-							+ class_[0].name
-							+ '" in namespace '
-							+ concat_namespace(namespaces),
-							2,
-						)
-						class_[0].found_constrs.append(candidate)
-						continue
-				if class_ == None:
-					candidate = WGlobal.from_string(
-						line, source.name, i, concat_namespace(namespaces)
-					)
-					if candidate != None:
-						if type(candidate) == list:
-							for c in candidate:
-								glbls.append(c)
-								debug(
-									'\tFound global "'
-									+ c.name
-									+ '" in namespace '
-									+ concat_namespace(namespaces),
-									2,
-								)
-						else:
-							glbls.append(candidate)
-							debug(
-								'\tFound global "'
-								+ candidate.name
-								+ '" in namespace '
-								+ concat_namespace(namespaces),
-								2,
-							)
-						continue
-		if candidate != None:
-			while i < j:
-				i += 1
-				line = (
-					source_text[i]
-					.replace(
-						"YOSYS_NAMESPACE_BEGIN",
-						"                    namespace YOSYS_NAMESPACE{",
-					)
-					.replace("YOSYS_NAMESPACE_END", "                    }")
-				)
-				ugly_line = unpretty_string(line)
-				if len(namespaces) != 0:
-					namespaces[-1] = (
-						namespaces[-1][0],
-						namespaces[-1][1] + nesting_delta(ugly_line),
-					)
-					if namespaces[-1][1] == 0:
-						debug(
-							"-----END NAMESPACE "
-							+ concat_namespace(namespaces)
-							+ "-----",
-							3,
-						)
-						namespaces.pop()
-				if len(classes):
-					c = (classes[-1][0], classes[-1][1] + nesting_delta(ugly_line))
-					classes[-1] = c
-					if c[1] == 0:
-						if c[0] == None:
-							debug("\tExiting unknown class", 3)
-						else:
-							debug("\tExiting class " + c[0].name, 3)
-						classes.pop()
-						private_segment = False
-			i += 1
-		else:
-			i += 1
-
-
-def debug(message, level):
-	if level <= debug.debug_level:
-		print(message)
-
-
-def expand_functions():
-	global unowned_functions
-	new_funs = []
-	for fun in unowned_functions:
-		new_funs.append(fun)
-	unowned_functions = new_funs
-	for source in sources:
-		for class_ in source.classes:
-			new_funs = []
-			for fun in class_.found_funs:
-				new_funs.append(fun)
-			class_.found_funs = new_funs
-
-
-def inherit_members():
-	for source in sources:
-		for class_ in source.classes:
-			if class_.base_class:
-				base_funs = copy.deepcopy(class_.base_class.found_funs)
-				for fun in base_funs:
-					fun.member_of = class_
-					fun.namespace = class_.namespace
-				base_vars = copy.deepcopy(class_.base_class.found_vars)
-				for var in base_vars:
-					var.member_of = class_
-					var.namespace = class_.namespace
-				class_.found_funs.extend(base_funs)
-				class_.found_vars.extend(base_vars)
-
-
-def clean_duplicates():
-	for source in sources:
-		for class_ in source.classes:
-			known_decls = {}
-			for fun in class_.found_funs:
-				if fun.gen_decl_hash_py() in known_decls:
-					debug("Multiple declarations of " + fun.gen_decl_hash_py(), 3)
-
-					other = known_decls[fun.gen_decl_hash_py()]
-					if fun.mangled_name == other.mangled_name:
-						fun.duplicate = True
-						debug('Disabled "' + fun.gen_decl_hash_py() + '"', 3)
-						continue
-
-					other.gen_alias()
-					fun.gen_alias()
-				else:
-					known_decls[fun.gen_decl_hash_py()] = fun
-			known_decls = []
-			for con in class_.found_constrs:
-				if con.gen_decl_hash_py() in known_decls:
-					debug("Multiple declarations of " + con.gen_decl_hash_py(), 3)
-					con.duplicate = True
-				else:
-					known_decls.append(con.gen_decl_hash_py())
-	known_decls = []
-	for fun in unowned_functions:
-		if fun.gen_decl_hash_py() in known_decls:
-			debug("Multiple declarations of " + fun.gen_decl_hash_py(), 3)
-			fun.duplicate = True
-		else:
-			known_decls.append(fun.gen_decl_hash_py())
-
-
-def gen_wrappers(filename, debug_level_=0):
-	filename = Path(filename)
-
-	debug.debug_level = debug_level_
-	for source in sources:
-		parse_header(source)
-
-	expand_functions()
-	inherit_members()
-	clean_duplicates()
-
-	import shutil
-	import math
-
-	col = shutil.get_terminal_size((80, 20)).columns
-	debug("-" * col, 1)
-	debug(
-		"-" * math.floor((col - 7) / 2) + "SUMMARY" + "-" * math.ceil((col - 7) / 2), 1
-	)
-	debug("-" * col, 1)
-	for source in sources:
-		for class_ in source.classes:
-			debug(
-				"Class "
-				+ assure_length(class_.name, len(max(classnames, key=len)), True)
-				+ " contains "
-				+ assure_length(str(len(class_.found_vars)), 3, False)
-				+ " member variables, "
-				+ assure_length(str(len(class_.found_funs)), 3, False)
-				+ " methods and "
-				+ assure_length(str(len(class_.found_constrs)), 2, False)
-				+ " constructors",
-				1,
-			)
-			if len(class_.found_constrs) == 0:
-				class_.found_constrs.append(WConstructor(source.name, class_))
-	debug(str(len(unowned_functions)) + " functions are unowned", 1)
-	debug(str(len(unowned_functions)) + " global variables", 1)
-	for enum in enums:
-		debug(
-			"Enum "
-			+ assure_length(enum.name, len(max(enum_names, key=len)), True)
-			+ " contains "
-			+ assure_length(str(len(enum.values)), 2, False)
-			+ " values",
-			1,
-		)
-	debug("-" * col, 1)
-
-	tpl = __file_dir__ / "wrappers_tpl.cc"
-	with open(tpl, encoding="utf8") as f, open(
-		filename, "w", encoding="utf8"
-	) as wrapper_file:
-		do_line_directive = True
-		for i, line in enumerate(f):
-			if do_line_directive:
-				wrapper_file.write(f'#line {i + 1} "{tpl}"\n')
-				do_line_directive = False
-			if "<!-- generated includes -->" in line:
-				for source in sources:
-					wrapper_file.write(f'#include "{source.name}.h"\n')
-				do_line_directive = True
-			elif "<!-- generated top-level code -->" in line:
-				wrapper_file.write("// Opaque Container Declaration\n")
-				for i, (container_identifier, container) in enumerate(WMember.opaque_containers.items()):
-					wrapper_file.write(f"using {container_identifier} = {container.gen_text_cpp()};\n")
-					wrapper_file.write(f'PYBIND11_MAKE_OPAQUE({container_identifier})\n')
-				wrapper_file.write("\n")
-				do_line_directive = True
-			elif "<!-- generated YOSYS_PYTHON namespace-level code -->" in line:
-				do_line_directive = True
-			elif "<!-- generated pymod-level code -->" in line:
-				wrapper_file.write("\t\t// Opaque Container Binding\n")
-				for container in WMember.opaque_containers.values():
-					container.cont.gen_boost_py(stream=wrapper_file)
-				wrapper_file.write("\n")
-
-				wrapper_file.write("\t\t// Enums\n")
-				for enum in enums:
-					enum.gen_boost_py(stream=wrapper_file)
-				wrapper_file.write("\n")
-
-				wrapper_file.write("\t\t// Classes\n")
-				for source in sources:
-					for wclass in source.classes:
-						wclass.gen_boost_py(stream=wrapper_file)
-				wrapper_file.write("\n")
-
-				wrapper_file.write("\t\t// Global Functions\n")
-				for fun in sorted(unowned_functions, key=lambda x: x.alias):
-					fun.gen_boost_py(stream=wrapper_file)
-				wrapper_file.write("\n")
-
-				wrapper_file.write("\t\t// Global Variables\n")
-				wrapper_file.write('\t\tpy::class_<YosysStatics>(m, "Yosys")\n')
-				for glbl in sorted(glbls, key=lambda x: (not x.is_const, x.name)):
-					glbl.gen_boost_py(stream=wrapper_file)
-				wrapper_file.write("\t\t\t;\n")
-				do_line_directive = True
-			else:
-				wrapper_file.write(line)
-
 
 def print_includes():
-	for source in sources:
-		print(source.name + ".pyh")
+    for header in pyosys_headers:
+        print(header.name)
 
 
 if __name__ == "__main__":
-	ap = argparse.ArgumentParser()
-	ap.add_argument("--print-includes", action="store_true")
-	ap.add_argument("--debug", default=0, type=int)
-	ap.add_argument("output", nargs="?")
-	ns = ap.parse_args()
-	if ns.print_includes:
-		print_includes()
-		exit(0)
-	gen_wrappers(ns.output, ns.debug)
+    ap = argparse.ArgumentParser()
+    ap.add_argument("--debug", default=0, type=int)
+    group = ap.add_mutually_exclusive_group(required=True)
+    group.add_argument("--print-includes", action="store_true")
+    group.add_argument("output", nargs="?")
+    ns = ap.parse_args()
+    if ns.print_includes:
+        print_includes()
+        exit(0)
+
+    out_path = Path(ns.output)
+    out_inc = out_path.parent / (out_path.stem + ".inc.cc")
+    with open(out_path, "w", encoding="utf8") as f, open(
+        out_inc, "w", encoding="utf8"
+    ) as inc_f:
+        generator = PyosysWrapperGenerator(
+            from_headers=pyosys_headers, wrapper_stream=f, header_stream=inc_f
+        )
+        generator.generate()
diff --git a/pyosys/hashlib.h b/pyosys/hashlib.h
index e8ace90c8..2ecadc3f1 100644
--- a/pyosys/hashlib.h
+++ b/pyosys/hashlib.h
@@ -48,6 +48,7 @@
 #include "kernel/hashlib.h"
 
 namespace pybind11 {
+namespace hashlib {
 
 template<typename T>
 struct is_pointer { static const bool value = false; };
@@ -59,6 +60,11 @@ bool is_mapping(object obj) {
 	return isinstance(obj, mapping);
 }
 
+// shim
+template <typename C, typename V>
+void bind_vector(module &m, const char *name_cstr) {
+	pybind11::bind_vector<C>(m, name_cstr);
+}
 
 // also used for std::set because the semantics are close enough
 template <typename C, typename T>
@@ -106,6 +112,13 @@ void bind_pool(module &m, const char *name_cstr) {
 		});
 }
 
+// shim
+template <typename C, typename T>
+void bind_set(module &m, const char *name_cstr) {
+	bind_pool<C, T>(m, name_cstr);
+}
+
+
 template <typename C, typename K, typename V>
 void update_dict(C *target, iterable &iterable_or_mapping) {
 	if (is_mapping(iterable_or_mapping)) {
@@ -272,4 +285,5 @@ void bind_idict(module &m, const char *name_cstr) {
 		});
 	}
 }
+}; // namespace hashlib
 }; // namespace pybind11
diff --git a/pyosys/wrappers_tpl.cc b/pyosys/wrappers_tpl.cc
index e921ae17a..d235b2c55 100644
--- a/pyosys/wrappers_tpl.cc
+++ b/pyosys/wrappers_tpl.cc
@@ -26,7 +26,12 @@
 
 USING_YOSYS_NAMESPACE
 
-// <!-- generated top-level code -->
+using std::set;
+using std::regex;
+using std::ostream;
+using namespace RTLIL;
+
+#include "wrappers.inc.cc"
 
 namespace YOSYS_PYTHON {
 
@@ -37,8 +42,6 @@ namespace YOSYS_PYTHON {
 
 	struct YosysStatics{};
 
-	// <!-- generated YOSYS_PYTHON namespace-level code -->
-
 	// Trampolines for Classes with Python-Overridable Virtual Methods
 	// https://pybind11.readthedocs.io/en/stable/advanced/classes.html#overriding-virtual-functions-in-python
 	class PassTrampoline : public Pass {
@@ -182,7 +185,18 @@ namespace YOSYS_PYTHON {
 			}));
 		}
 
-		m.def("log_to_stream", &log_to_stream, "pipes yosys logs to a Python stream");
+		// Logging Methods
+		m.def("log_header", [](Design *d, std::string s) { log_formatted_header(d, "%s", s); });
+		m.def("log", [](std::string s) { log_formatted_string("%s", s); });
+		m.def("log_file_info", [](std::string_view file, int line, std::string s) { log_formatted_file_info(file, line, s); });
+		m.def("log_warning", [](std::string s) { log_formatted_warning("Warning: ", s); });
+		m.def("log_warning_noprefix", [](std::string s) { log_formatted_warning("", s); });
+		m.def("log_file_warning", [](std::string_view file, int line, std::string s) { log_formatted_file_warning(file, line, s); });
+		m.def("log_error", [](std::string s) { log_formatted_error(s); });
+		m.def("log_file_error", [](std::string_view file, int line, std::string s) { log_formatted_file_error(file, line, s); });
+
+		// Namespace to host global objects
+		auto global_variables = py::class_<YosysStatics>(m, "Yosys");
 
 		// Trampoline Classes
 		py::class_<Pass, YOSYS_PYTHON::PassTrampoline, std::unique_ptr<Pass, py::nodelete>>(m, "Pass")
@@ -241,6 +255,9 @@ namespace YOSYS_PYTHON {
 			.def("notify_blackout", &RTLIL::Monitor::notify_blackout)
 		;
 
+		// Bind Opaque Containers
+		bind_autogenerated_opaque_containers(m);
+
 		// <!-- generated pymod-level code -->
 	};
 };
diff --git a/pyproject.toml b/pyproject.toml
index caa620528..5a218c19d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,7 @@
 [build-system]
 requires = [
-    "setuptools>=42",
-    "pybind11>=3,<4",
+	"setuptools>=42",
+	"pybind11>=3,<4",
+	"cxxheaderparser",
 ]
 build-backend = "setuptools.build_meta"
diff --git a/tests/pyosys/test_logs.py b/tests/pyosys/test_logs.py
new file mode 100644
index 000000000..b6bd02222
--- /dev/null
+++ b/tests/pyosys/test_logs.py
@@ -0,0 +1,8 @@
+from pyosys import libyosys as ys
+
+d = ys.Design(); ys.log_header(d, "foo\n")
+ys.log("foo\n")
+ys.log_warning("foo\n")
+ys.log_warning_noprefix("foo\n")
+ys.log_file_info("foo.ys", 1, "foo\n")
+ys.log_file_warning("foo.ys", 1, "foo\n")

From 54799bb8be85f784b9682f5643e0f41f93684863 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Tue, 23 Sep 2025 03:44:34 +0300
Subject: [PATCH 664/931] pyosys: globals, set operators for opaque types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There is so much templating going on that compiling wrappers.cc now takes 1m1.668s on an Apple M4…
---
 Makefile                    |   2 +-
 kernel/yosys.cc             |  10 +-
 pyosys/generator.py         |  48 ++++---
 pyosys/hashlib.h            | 241 +++++++++++++++++++++++++++++++++---
 pyosys/wrappers_tpl.cc      |   6 -
 pyproject.toml              |   4 +
 tests/pyosys/test_dict.py   |  18 ++-
 tests/pyosys/test_import.py |  19 ++-
 tests/pyosys/test_set.py    |  42 +++++++
 9 files changed, 343 insertions(+), 47 deletions(-)
 create mode 100644 tests/pyosys/test_set.py

diff --git a/Makefile b/Makefile
index c9cbd0810..027f18a7a 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ all: top-all
 YOSYS_SRC := $(dir $(firstword $(MAKEFILE_LIST)))
 VPATH := $(YOSYS_SRC)
 
-CXXSTD ?= c++17
+export CXXSTD ?= c++17
 CXXFLAGS := $(CXXFLAGS) -Wall -Wextra -ggdb -I. -I"$(YOSYS_SRC)" -MD -MP -D_YOSYS_ -fPIC -I$(PREFIX)/include
 LIBS := $(LIBS) -lstdc++ -lm
 PLUGIN_LINKFLAGS :=
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 9cab12bf6..47057c1ca 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -185,13 +185,12 @@ bool already_setup = false;
 bool already_shutdown = false;
 
 #ifdef WITH_PYTHON
-// Include pyosys as a module so 'from pyosys import libyosys' also works
-// in interpreter mode.
+// Include pyosys as a package for some compatibility with wheels.
 //
 // This should not affect using wheels as the dylib has to actually be called
-// pyosys.so for this module to be interacted with at all.
+// pyosys.so for this function to be interacted with at all.
 PYBIND11_MODULE(pyosys, m) {
-	m.add_object("libyosys", m.import("libyosys"));
+	m.add_object("__path__", py::list());
 }
 #endif
 
@@ -209,7 +208,8 @@ void yosys_setup()
 	// initialized platform fails (such as when libyosys is imported
 	// from a Python interpreter)
 	if (!Py_IsInitialized()) {
-		PyImport_AppendInittab((char*)"libyosys", PyInit_libyosys);
+		PyImport_AppendInittab((char*)"pyosys.libyosys", PyInit_libyosys);
+		// compatibility with wheels
 		PyImport_AppendInittab((char*)"pyosys", PyInit_pyosys);
 		Py_Initialize();
 		PyRun_SimpleString("import sys");
diff --git a/pyosys/generator.py b/pyosys/generator.py
index b8a7aa8dc..b0cec99e3 100644
--- a/pyosys/generator.py
+++ b/pyosys/generator.py
@@ -18,7 +18,19 @@
 #  Written by Mohamed Gaber <me@donn.website>
 #
 #  Inspired by py_wrap_generator.py by Benedikt Tutzer
+"""
+This generates:
+- Wrapper calls for opaque container types
+- Full wrappers for select classes and all enums, global functions and global
+  variables
 
+Jump to "MARK: Inclusion and Exclusion" to control the above.
+
+Please run ruff on this file in particular to make sure it parses with Python
+<= 3.12. There is so much f-string use here that the outer quote thing
+is a common problem. ``ruff check pyosys/generator.py`` suffices.
+"""
+import os
 import io
 import shutil
 from pathlib import Path
@@ -58,15 +70,24 @@ class PyosysClass:
     :param name: The base name of the class (without extra qualifiers)
     :param ref_only: Whether this class can be copied to Python, or only
         referenced.
-    :param string_expr: A C++ expression that will be used for the __str__ method in Python
-    :param hash_expr: A C++ expression that will be fed to ``run_hash`` to declare a __hash__ method for Python
+    :param string_expr:
+        A C++ expression that will be used for the ``__str__`` method in Python.
+
+        The object will be available as a const reference with the identifier
+        `s`.
+    :param hash_expr:
+        A C++ expression that will be fed to ``run_hash`` to declare a
+        ``__hash__`` method for Python.
+
+        The object will be vailable as a const reference with the identifier
+        `s`.
     :param denylist: If specified, one or more methods can be excluded from
         wrapping.
     """
     name: str
     ref_only: bool = False
 
-    # in the format s.(method or property)
+    # in the format s.(method or property) (or just s)
     string_expr: Optional[str] = None
     hash_expr: Optional[str] = None
 
@@ -89,9 +110,7 @@ class PyosysHeader:
             for cls in classes:
                 self.classes_by_name[cls.name] = cls
 
-"""
-Add headers and classes here!
-"""
+# MARK: Inclusion and Exclusion
 global_denylist = frozenset(
     {
         # deprecated
@@ -327,10 +346,11 @@ class PyosysWrapperGenerator(object):
     def make_preprocessor_options(self):
         py_include = get_paths()["include"]
         preprocessor_bin = shutil.which("clang++") or "g++"
+        cxx_std = os.getenv("CXX_STD", "c++17")
         return ParserOptions(
             preprocessor=make_gcc_preprocessor(
                 defines=["_YOSYS_", "WITH_PYTHON"],
-                gcc_args=[preprocessor_bin, "-fsyntax-only"],
+                gcc_args=[preprocessor_bin, "-fsyntax-only", f"-std={cxx_std}"],
                 include_paths=[str(__yosys_root__), py_include, pybind11.get_include()],
             ),
         )
@@ -476,7 +496,7 @@ class PyosysWrapperGenerator(object):
         if function.static:
             definition_fn = "def_static"
 
-        print(f"\t\t\t.{definition_fn}({", ".join(self.get_definition_args(function, class_basename, python_name_override))})", file=self.f)
+        print(f"\t\t\t.{definition_fn}({', '.join(self.get_definition_args(function, class_basename, python_name_override))})", file=self.f)
 
     def process_function(self, function: Function):
         if (
@@ -496,7 +516,7 @@ class PyosysWrapperGenerator(object):
 
         self.register_containers(function)
 
-        print(f"\t\t\tm.def({", ".join(self.get_definition_args(function, None))});", file=self.f)
+        print(f"\t\t\tm.def({', '.join(self.get_definition_args(function, None))});", file=self.f)
 
     def process_field(self, field: Field, class_basename: str):
         if field.access != "public":
@@ -511,7 +531,8 @@ class PyosysWrapperGenerator(object):
 
         unique_ptrs = self.find_containers(("unique_ptr",), field.type)
         if len(unique_ptrs):
-            # TODO: figure out how to bridge unique pointers
+            # TODO: figure out how to bridge unique pointers maybe does anyone
+            # care
             return
 
         self.register_containers(field)
@@ -559,10 +580,10 @@ class PyosysWrapperGenerator(object):
             self.process_method(method, basename)
 
         visited_anonymous_unions = set()
-        for field in cls.fields:
-            if field.name in metadata.denylist:
+        for field_ in cls.fields:
+            if field_.name in metadata.denylist:
                 continue
-            self.process_field(field, basename)
+            self.process_field(field_, basename)
 
             # Handle anonymous unions
             for subclass in cls.classes:
@@ -663,7 +684,6 @@ class PyosysWrapperGenerator(object):
 
 
 keyword_aliases = {
-    "in": "in_",
     "False": "False_",
     "None": "None_",
     "True": "True_",
diff --git a/pyosys/hashlib.h b/pyosys/hashlib.h
index 2ecadc3f1..b772a2bb3 100644
--- a/pyosys/hashlib.h
+++ b/pyosys/hashlib.h
@@ -37,7 +37,7 @@
 // things like mutating containers that are class properties.
 //
 // All methods should be vaguely in the same order as the python reference
-// https://docs.python.org/3/library/stdtypes.html
+// https://docs.python.org/3.13/library/stdtypes.html
 //
 #include <optional> // optional maps cleanest to methods that accept None in Python
 
@@ -60,26 +60,188 @@ bool is_mapping(object obj) {
 	return isinstance(obj, mapping);
 }
 
+// Set Operations
+bool is_subset(const iterable &lhs, const iterable &rhs, bool strict = false) {
+	for (auto &element: lhs) {
+		if (!rhs.contains(element)) {
+			return false;
+		}
+	}
+	if (strict) {
+		return len(rhs) > len(lhs);
+	}
+	return true;
+}
+
+template <typename C, typename T>
+void unionize(C &lhs, const iterable &rhs) {
+	for (auto &element: rhs) {
+		lhs.insert(cast<T>(element));
+	}
+}
+
+template <typename C, typename T>
+void difference(C &lhs, const iterable &rhs) {
+	for (auto &element: rhs) {
+		auto element_cxx = cast<T>(element);
+		if (lhs.count(element_cxx)) {
+			lhs.erase(element_cxx);
+		}
+	}
+}
+
+template <typename C, typename T>
+void intersect(C &lhs, const iterable &rhs) {
+	// Doing it in-place is a lot slower
+	// TODO?: Leave modifying lhs to caller (saves a copy) but complicates
+	//        chaining intersections.
+	C storage(lhs);
+
+	for (auto &element_cxx: lhs) {
+		if (!rhs.contains(cast(element_cxx))) {
+			storage.erase(element_cxx);
+		}
+	}
+	lhs = std::move(storage);
+}
+
+template <typename C, typename T>
+void symmetric_difference(C &lhs, const iterable &rhs) {
+	C storage(lhs);
+
+	for (auto &element: rhs) {
+		auto element_cxx = cast<T>(element);
+		if (lhs.count(element_cxx)) {
+			storage.erase(element_cxx);
+		} else {
+			storage.insert(element_cxx);
+		}
+	}
+	for (auto &element_cxx: lhs) {
+		if (rhs.contains(cast(element_cxx))) {
+			storage.erase(element_cxx);
+		}
+	}
+	lhs = std::move(storage);
+}
+
 // shim
 template <typename C, typename V>
 void bind_vector(module &m, const char *name_cstr) {
 	pybind11::bind_vector<C>(m, name_cstr);
 }
 
-// also used for std::set because the semantics are close enough
+// also used for hashlib pool because the semantics are close enough
 template <typename C, typename T>
-void bind_pool(module &m, const char *name_cstr) {
-	std::string {name_cstr};
-
+void bind_set(module &m, const char *name_cstr) {
 	class_<C>(m, name_cstr)
 		.def(init<>())
+		.def(init<const C &>()) // copy constructor
+		.def(init([](const iterable &other){ // copy instructor from arbitrary iterables
+			auto s = new C();
+			unionize<C, T>(*s, other);
+			return s;
+		}))
 		.def("__len__", [](const C &s){ return (size_t)s.size(); })
 		.def("__contains__", [](const C &s, const T &v){ return s.count(v); })
 		.def("__delitem__", [](C &s, const T &v) {
 			auto n = s.erase(v);
 			if (n == 0) throw key_error(str(cast(v)));
 		})
-		// TODO: disjoint, subset, union, intersection, difference, symdif
+		.def("disjoint", [](const C &s, const iterable &other) {
+			for (const auto &element: other) {
+				if (s.count(cast<T>(element))) {
+					return false;
+				}
+			}
+			return true;
+		})
+		.def("issubset", [](const iterable &s, const iterable &other) {
+			return is_subset(s, other);
+		})
+		.def("__eq__", [](const iterable &s, const iterable &other) {
+			return is_subset(s, other) && len(s) == len(other);
+		})
+		.def("__le__", [](const iterable &s, const iterable &other) {
+			return is_subset(s, other);
+		})
+		.def("__lt__", [](const iterable &s, const iterable &other) {
+			return is_subset(s, other, true);
+		})
+		.def("issuperset", [](const iterable &s, const iterable &other) {
+			return is_subset(other, s);
+		})
+		.def("__ge__",  [](const iterable &s, const iterable &other) {
+			return is_subset(other, s);
+		})
+		.def("__gt__",  [](const iterable &s, const iterable &other) {
+			return is_subset(other, s, true);
+		})
+		.def("union",  [](const C &s, const args &others) {
+			auto result = new C(s);
+			for (const auto &arg: others) {
+				auto arg_iterable = reinterpret_borrow<iterable>(arg);
+				unionize<C, T>(*result, arg_iterable);
+			}
+			return result;
+		})
+		.def("__or__",  [](const C &s, const iterable &other) {
+			auto result = new C(s);
+			unionize<C, T>(*result, other);
+			return result;
+		})
+		.def("__ior__",  [](C &s, const iterable &other) {
+			unionize<C, T>(s, other);
+			return s;
+		})
+		.def("intersection",  [](const C &s, const args &others) {
+			auto result = new C(s);
+			for (const auto &arg: others) {
+				auto arg_iterable = reinterpret_borrow<iterable>(arg);
+				intersect<C, T>(*result, arg_iterable);
+			}
+			return result;
+		})
+		.def("__and__",  [](const C &s, const iterable &other) {
+			auto result = new C(s);
+			intersect<C, T>(*result, other);
+			return result;
+		})
+		.def("__iand__",  [](C &s, const iterable &other) {
+			intersect<C, T>(s, other);
+			return s;
+		})
+		.def("difference",  [](const C &s, const args &others) {
+			auto result = new C(s);
+			for (const auto &arg: others) {
+				auto arg_iterable = reinterpret_borrow<iterable>(arg);
+				difference<C, T>(*result, arg_iterable);
+			}
+			return result;
+		})
+		.def("__sub__",  [](const C &s, const iterable &other) {
+			auto result = new C(s);
+			difference<C, T>(*result, other);
+			return result;
+		})
+		.def("__isub__",  [](C &s, const iterable &other) {
+			difference<C, T>(s, other);
+			return s;
+		})
+		.def("symmetric_difference",  [](const C &s, const iterable &other) {
+			auto result = new C(s);
+			symmetric_difference<C, T>(*result, other);
+			return result;
+		})
+		.def("__xor__",  [](const C &s, const iterable &other) {
+			auto result = new C(s);
+			symmetric_difference<C, T>(*result, other);
+			return result;
+		})
+		.def("__ixor__",  [](C &s, const iterable &other) {
+			symmetric_difference<C, T>(s, other);
+			return s;
+		})
 		.def("copy", [](const C &s) {
 			return new C(s);
 		})
@@ -107,20 +269,29 @@ void bind_pool(module &m, const char *name_cstr) {
 		.def("__iter__", [](const C &s){
 			return make_iterator(s.begin(), s.end());
 		}, keep_alive<0,1>())
-		.def("__repr__", [name_cstr](const C &s){
-			return std::string("<") + name_cstr + " size=" + std::to_string(s.size()) + ">";
+		.def("__repr__", [name_cstr](const py::iterable &s){
+			// repr(set(s)) where s is iterable would be more terse/robust
+			// but are there concerns with copying?
+			str representation = str(name_cstr) + str("({");
+			str comma(", ");
+			for (const auto &element: s) {
+				representation += repr(element);
+				representation += comma; // python supports trailing commas
+			}
+			representation += str("})");
+			return representation;
 		});
 }
 
 // shim
 template <typename C, typename T>
-void bind_set(module &m, const char *name_cstr) {
-	bind_pool<C, T>(m, name_cstr);
+void bind_pool(module &m, const char *name_cstr) {
+	bind_set<C, T>(m, name_cstr);
 }
 
 
 template <typename C, typename K, typename V>
-void update_dict(C *target, iterable &iterable_or_mapping) {
+void update_dict(C *target, const iterable &iterable_or_mapping) {
 	if (is_mapping(iterable_or_mapping)) {
 		for (const auto &key: iterable_or_mapping) {
 			(*target)[cast<K>(key)] = cast<V>(iterable_or_mapping[key]);
@@ -137,10 +308,14 @@ void update_dict(C *target, iterable &iterable_or_mapping) {
 
 template <typename C, typename K, typename V>
 void bind_dict(module &m, const char *name_cstr) {
-	std::string {name_cstr};
-
-	class_<C>(m, name_cstr)
+	auto cls = class_<C>(m, name_cstr)
 		.def(init<>())
+		.def(init<const C &>()) // copy constructor
+		.def(init([](const iterable &other){ // copy instructor from arbitrary iterables and mappings
+			auto s = new C();
+			update_dict<C, K, V>(s, other);
+			return s;
+		}))
 		.def("__len__", [](const C &s){ return (size_t)s.size(); })
 		.def("__getitem__", [](const C &s, const K &k) { return s.at(k); })
 		.def("__setitem__", [](C &s, const K &k, const V &v) { s[k] = v; })
@@ -210,9 +385,29 @@ void bind_dict(module &m, const char *name_cstr) {
 			return s;
 		})
 		.def("__bool__", [](const C &s) { return s.size() != 0; })
-		.def("__repr__", [name_cstr](const C &s){
-			return std::string("<") + name_cstr + " size=" + std::to_string(s.size()) + ">";
+		.def("__repr__", [name_cstr](const C &s) {
+			// repr(dict(s)) where s is iterable would be more terse/robust
+			// but are there concerns with copying?
+			str representation = str(name_cstr) + str("({");
+			str colon(": ");
+			str comma(", ");
+			for (const auto &item: s) {
+				representation += repr(cast(item.first));
+				representation += colon;
+				representation += repr(cast(item.second));
+				representation += comma; // python supports trailing commas
+			}
+			representation += str("})");
+			return representation;
 		});
+
+	// Inherit from collections.abc.Mapping so update operators (and a bunch
+	// of other things) work.
+	auto collections_abc = module_::import("collections.abc");
+	auto mapping = getattr(collections_abc, "Mapping");
+	auto current_bases = list(getattr(cls, "__bases__"));
+	current_bases.append(mapping);
+	setattr(cls, "__bases__", tuple(current_bases));
 }
 
 // idict is a special bijection and doesn't map cleanly to dict
@@ -221,10 +416,9 @@ void bind_dict(module &m, const char *name_cstr) {
 // the hashable as key and the integer as value
 template <typename C, typename K>
 void bind_idict(module &m, const char *name_cstr) {
-	std::string {name_cstr};
-
 	auto cls = class_<C>(m, name_cstr)
 		.def(init<>())
+		.def(init<const C &>()) // copy constructor
 		.def("__len__", [](const C &s){ return (size_t)s.size(); })
 		.def("__getitem__", [](const C &s, int v) { return s[v]; })
 		.def("__call__", [](C &s, const K &k) { return s(k); })
@@ -276,7 +470,16 @@ void bind_idict(module &m, const char *name_cstr) {
 		})
 		.def("__bool__", [](const C &s) { return s.size() != 0; })
 		.def("__repr__", [name_cstr](const C &s){
-			return std::string("<") + name_cstr + " size=" + std::to_string(s.size()) + ">";
+			// repr(dict(s)) where s is iterable would be more terse/robust
+			// but are there concerns with copying?
+			str representation = str(name_cstr) + str("() | {");
+			str comma(", ");
+			for (const auto &item: s) {
+				representation += repr(cast(item));
+				representation += comma; // python supports trailing commas
+			}
+			representation += str("}");
+			return representation;
 		});
 
 	for (const char *mutator: {"__setitem__", "__delitem__", "pop", "popitem", "setdefault"}) {
diff --git a/pyosys/wrappers_tpl.cc b/pyosys/wrappers_tpl.cc
index d235b2c55..84e201657 100644
--- a/pyosys/wrappers_tpl.cc
+++ b/pyosys/wrappers_tpl.cc
@@ -34,12 +34,6 @@ using namespace RTLIL;
 #include "wrappers.inc.cc"
 
 namespace YOSYS_PYTHON {
-
-	[[noreturn]] static void log_python_exception_as_error() {
-		PyErr_Print();
-		log_error("Python interpreter encountered an exception.\\n");
-	}
-
 	struct YosysStatics{};
 
 	// Trampolines for Classes with Python-Overridable Virtual Methods
diff --git a/pyproject.toml b/pyproject.toml
index 5a218c19d..d5882084c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,3 +5,7 @@ requires = [
 	"cxxheaderparser",
 ]
 build-backend = "setuptools.build_meta"
+
+[tool.ruff]
+target-version = "py38"
+lint.ignore = ["F541"]
diff --git a/tests/pyosys/test_dict.py b/tests/pyosys/test_dict.py
index 81e7b5516..916d69b92 100644
--- a/tests/pyosys/test_dict.py
+++ b/tests/pyosys/test_dict.py
@@ -1,6 +1,12 @@
+from typing import Mapping
 from pyosys import libyosys as ys
 
-my_dict = ys.StringToStringDict()
+StringToStringDict = ys.StringToStringDict
+
+my_dict = StringToStringDict()
+
+assert isinstance(my_dict, Mapping)
+
 my_dict["foo"] = "bar"
 my_dict.update([("first", "second")])
 my_dict.update({"key": "value"})
@@ -11,3 +17,13 @@ new_dict = my_dict | {"tomato": "tomato"}
 del new_dict["foo"]
 assert set(my_dict.keys()) == {"first", "key", "foo"}
 assert set(new_dict.keys()) == {"first", "key", "tomato"}
+
+constructor_test_1 = ys.StringToStringDict(new_dict)
+constructor_test_2 = ys.StringToStringDict([("tomato", "tomato")])
+constructor_test_3 = ys.StringToStringDict({ "im running": "out of string ideas" })
+
+the_great_or = constructor_test_1 | constructor_test_2 | constructor_test_3
+
+assert set(the_great_or) ==  {"first", "key", "tomato", "im running"}
+repr_test = eval(repr(the_great_or))
+assert repr_test == the_great_or
diff --git a/tests/pyosys/test_import.py b/tests/pyosys/test_import.py
index 48e911033..b6a36b0c1 100644
--- a/tests/pyosys/test_import.py
+++ b/tests/pyosys/test_import.py
@@ -1,3 +1,20 @@
+import os
+import sys
+
 from pyosys import libyosys as ys
 
-ys.log("Hello, world!")
+print(ys)
+
+ys.log("Hello, world!\n")
+
+from pyosys.libyosys import log
+
+print(log)
+
+log("Goodbye, world!\n")
+
+import pyosys
+
+if os.path.basename(sys.executable) == "yosys":
+	# make sure it's not importing the directory
+	assert "built-in" in repr(pyosys)
diff --git a/tests/pyosys/test_set.py b/tests/pyosys/test_set.py
new file mode 100644
index 000000000..d89c5243e
--- /dev/null
+++ b/tests/pyosys/test_set.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+from pyosys.libyosys import StringSet, StringPool
+
+for cls in [StringSet, StringPool]:
+	print(f"Testing {cls.__name__}...")
+	A = cls()
+	A.add("a")
+
+	B = cls()
+	B = A | {"b"}
+
+	assert A < B
+	assert A <= B
+
+	A.add("b")
+
+	assert A == B
+	assert A <= B
+	assert not A < B
+
+	A.add("c")
+
+	assert A > B
+
+	A &= B
+	assert A == B
+
+	Ø = A - B
+	assert len(Ø) == 0
+
+	C = cls({"A", "B", "C"})
+	D = cls()
+	C |= {"A", "B", "C"}
+	D |= {"C", "D", "E"}
+	c_symdiff_d = (C ^ D)
+	assert (c_symdiff_d) == {"A", "B", "D", "E"}
+
+	repr_test = eval(repr(c_symdiff_d))
+	c_symdiff_d == repr_test
+
+
+print("Done.")

From dc88906c9199e93e89a2d78e6a66acc9567cf834 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Tue, 23 Sep 2025 08:05:04 +0300
Subject: [PATCH 665/931] tests/pyosys: print log on failed test, fix make
 clean

---
 .github/workflows/wheels.yml |  3 ++-
 Makefile                     |  7 ++++---
 tests/pyosys/run_tests.py    | 39 +++++++++++++++++++++---------------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b561b5d32..d6e9832aa 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -2,6 +2,7 @@ name: Build Wheels for PyPI
 
 # run every Sunday at 10 AM
 on:
+  push: # TODO: REMOVE THIS, DO NOT MERGE TO UPSTREAM THIS IS JUST SO I DON'T HAVE TO MANUALLY RUN THE WORKFLOW WITH EVERY PUSH
   workflow_dispatch:
   schedule:
     - cron: "0 10 * * 0"
@@ -107,7 +108,7 @@ jobs:
             makeFlags='CONFIG=clang'
             PATH="$PWD/bison/src:$PATH"
           CIBW_BEFORE_BUILD: bash ./.github/workflows/wheels/cibw_before_build.sh
-          CIBW_TEST_COMMAND: python3 {project}/tests/pyosys/run_tests.py python3
+          CIBW_TEST_COMMAND: python3 {project}/tests/pyosys/run_tests.py
       - uses: actions/upload-artifact@v4
         with:
           name: python-wheels-${{ matrix.os.runner }}
diff --git a/Makefile b/Makefile
index 027f18a7a..09d5f055d 100644
--- a/Makefile
+++ b/Makefile
@@ -344,6 +344,8 @@ ifeq ($(ENABLE_LIBYOSYS),1)
 TARGETS += libyosys.so
 endif
 
+PY_WRAPPER_FILE = pyosys/wrappers
+
 ifeq ($(ENABLE_PYOSYS),1)
 # python-config --ldflags includes -l and -L, but LINKFLAGS is only -L
 LINKFLAGS += $(filter-out -l%,$(shell $(PYTHON_CONFIG) --ldflags))
@@ -353,7 +355,6 @@ PYBIND11_INCLUDE ?= $(shell $(PYTHON_EXECUTABLE) -m pybind11 --includes)
 CXXFLAGS += -I$(PYBIND11_INCLUDE) -DWITH_PYTHON
 CXXFLAGS += $(shell $(PYTHON_CONFIG) --includes) -DWITH_PYTHON
 
-PY_WRAPPER_FILE = pyosys/wrappers
 OBJS += $(PY_WRAPPER_FILE).o
 PY_GEN_SCRIPT = pyosys/generator.py
 PY_WRAP_INCLUDES := $(shell $(PYTHON_EXECUTABLE) $(PY_GEN_SCRIPT) --print-includes)
@@ -1110,9 +1111,9 @@ docs: docs/prep
 clean:
 	rm -rf share
 	rm -rf kernel/*.pyh
-	rm -f $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS) $(EXTRA_OBJS) $(PY_WRAP_INCLUDES) $(PY_WRAPPER_FILE).cc
+	rm -f $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS) $(EXTRA_OBJS) $(PY_WRAP_INCLUDES) $(PY_WRAPPER_FILE).inc.cc $(PY_WRAPPER_FILE).cc
 	rm -f kernel/version_*.o kernel/version_*.cc
-	rm -f kernel/python_wrappers.o
+	rm -f $(PY_WRAPPER_FILE).o
 	rm -f libs/*/*.d frontends/*/*.d passes/*/*.d backends/*/*.d kernel/*.d techlibs/*/*.d
 	rm -rf tests/asicworld/*.out tests/asicworld/*.log
 	rm -rf tests/hana/*.out tests/hana/*.log
diff --git a/tests/pyosys/run_tests.py b/tests/pyosys/run_tests.py
index 953462c4f..6c631c507 100644
--- a/tests/pyosys/run_tests.py
+++ b/tests/pyosys/run_tests.py
@@ -1,39 +1,46 @@
-from pathlib import Path
-import shutil
-import subprocess
 import sys
+import shutil
+import shlex
+import subprocess
+from pathlib import Path
 
 __file_dir__ = Path(__file__).absolute().parent
 
-if len(sys.argv) != 2:
-	print(f"Usage: {sys.argv[0]} {sys.argv[1]}")
+if len(sys.argv) > 2 or len(sys.argv) == 2 and sys.argv[1] != 'yosys':
+	print(f"Usage: {sys.argv[0]} [yosys]")
 	exit(64)
 
-binary = []
-if sys.argv[1] in ["yosys"]:
-	binary = [__file_dir__.parents[1] / "yosys", "-Qy"]
+if len(sys.argv) == 2:
+	binary = [str(__file_dir__.parents[1] / "yosys"), "-Qy"]
 else:
-	binary = [sys.argv[1]]
+	binary = [sys.executable or shutil.which("python3") or "python3"] # sys.executable can actually be None
 
 tests = __file_dir__.glob("test_*.py")
-errors = False
+
 log_dir = __file_dir__ / "logs"
 try:
 	shutil.rmtree(log_dir)
 except FileNotFoundError:
 	pass
+fail_logs = set()
 for test in tests:
 	print(f"* {test.name} ", end="")
 	log_dir.mkdir(parents=True, exist_ok=True)
 	log = log_dir / (test.stem + ".log")
-	result = subprocess.run([
-		*binary,
-		test
-	], stdout=open(log, "w"), stderr=subprocess.STDOUT)
+	cmd = [*binary, str(test)]
+	log_file = open(log, "w", encoding="utf8")
+	log_file.write(f"$ {shlex.join(cmd)}\n")
+	log_file.flush()
+	result = subprocess.run(cmd, stdout=log_file, stderr=subprocess.STDOUT)
 	if result.returncode == 0:
 		print("OK!")
 	else:
 		print(f"FAILED: {log}")
-		errors = True
-if errors:
+		fail_logs.add(log)
+	log_file.close()
+for log in fail_logs:
+	print(f">>> {log}")
+	with open(log, encoding="utf8") as f:
+		print(f.read())
+if len(fail_logs):
 	exit(1)

From 447a6cb3f00d088c1fd92b304b8ad40ddf28dbd2 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Tue, 23 Sep 2025 15:29:01 +0300
Subject: [PATCH 666/931] misc: `WITH_PYTHON` -> `YOSYS_ENABLE_PYTHON`

For consistency.

Also trying a new thing: only rebuilding objects that use the pybind11 library. The idea is these are the only objects that include the Python/pybind headers and thus the only ones that depend on the Python ABI in any capacity, so other objects can be reused across wheel builds. This has the potential to cut down build times.
---
 .github/workflows/wheels/cibw_before_build.sh |  4 +--
 Makefile                                      | 20 +++++++++----
 kernel/driver.cc                              | 16 +++++++----
 kernel/rtlil.cc                               | 28 +++++++++----------
 kernel/rtlil.h                                | 10 +++----
 kernel/yosys.cc                               | 20 ++++++++-----
 kernel/yosys.h                                |  4 +--
 kernel/yosys_common.h                         |  7 -----
 passes/cmds/plugin.cc                         | 16 +++++++----
 pyosys/generator.py                           |  2 +-
 pyosys/hashlib.h                              |  5 ++--
 pyosys/wrappers_tpl.cc                        | 10 ++++---
 12 files changed, 82 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/wheels/cibw_before_build.sh b/.github/workflows/wheels/cibw_before_build.sh
index 4e81688d0..1ce96b291 100644
--- a/.github/workflows/wheels/cibw_before_build.sh
+++ b/.github/workflows/wheels/cibw_before_build.sh
@@ -1,8 +1,8 @@
 set -e
 set -x
 
-# Don't use objects from previous compiles on Windows/macOS
-make clean
+# Don't use Python objects from previous compiles
+make clean-py
 
 # DEBUG: show python3 and python3-config outputs
 if [ "$(uname)" != "Linux" ]; then
diff --git a/Makefile b/Makefile
index 09d5f055d..22aeee5e8 100644
--- a/Makefile
+++ b/Makefile
@@ -346,14 +346,18 @@ endif
 
 PY_WRAPPER_FILE = pyosys/wrappers
 
+# running make clean on just those and then recompiling saves a lot of
+# time when running cibuildwheel
+PYTHON_OBJECTS = pyosys/wrappers.o kernel/drivers.o kernel/yosys.o passes/cmds/plugin.o
+
 ifeq ($(ENABLE_PYOSYS),1)
 # python-config --ldflags includes -l and -L, but LINKFLAGS is only -L
 LINKFLAGS += $(filter-out -l%,$(shell $(PYTHON_CONFIG) --ldflags))
 LIBS += $(shell $(PYTHON_CONFIG) --libs)
 EXE_LIBS += $(filter-out $(LIBS),$(shell $(PYTHON_CONFIG_FOR_EXE) --libs))
 PYBIND11_INCLUDE ?= $(shell $(PYTHON_EXECUTABLE) -m pybind11 --includes)
-CXXFLAGS += -I$(PYBIND11_INCLUDE) -DWITH_PYTHON
-CXXFLAGS += $(shell $(PYTHON_CONFIG) --includes) -DWITH_PYTHON
+CXXFLAGS += -I$(PYBIND11_INCLUDE) -DYOSYS_ENABLE_PYTHON
+CXXFLAGS += $(shell $(PYTHON_CONFIG) --includes) -DYOSYS_ENABLE_PYTHON
 
 OBJS += $(PY_WRAPPER_FILE).o
 PY_GEN_SCRIPT = pyosys/generator.py
@@ -1108,12 +1112,10 @@ DOC_TARGET ?= html
 docs: docs/prep
 	$(Q) $(MAKE) -C docs $(DOC_TARGET)
 
-clean:
+clean: clean-py
 	rm -rf share
-	rm -rf kernel/*.pyh
-	rm -f $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS) $(EXTRA_OBJS) $(PY_WRAP_INCLUDES) $(PY_WRAPPER_FILE).inc.cc $(PY_WRAPPER_FILE).cc
+	rm -f $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS) $(EXTRA_OBJS) $(PY_WRAP_INCLUDES)
 	rm -f kernel/version_*.o kernel/version_*.cc
-	rm -f $(PY_WRAPPER_FILE).o
 	rm -f libs/*/*.d frontends/*/*.d passes/*/*.d backends/*/*.d kernel/*.d techlibs/*/*.d
 	rm -rf tests/asicworld/*.out tests/asicworld/*.log
 	rm -rf tests/hana/*.out tests/hana/*.log
@@ -1127,8 +1129,14 @@ clean:
 	rm -f $(addsuffix /run-test.mk,$(MK_TEST_DIRS))
 	-$(MAKE) -C docs clean
 	rm -rf docs/util/__pycache__
+	rm -f libyosys.so
+
+clean-py:
+	rm -f $(PY_WRAPPER_FILE).inc.cc $(PY_WRAPPER_FILE).cc
+	rm -f $(PYTHON_OBJECTS)
 	rm -f *.whl
 	rm -f libyosys.so
+	rm -rf kernel/*.pyh
 
 clean-abc:
 	$(MAKE) -C abc DEP= clean
diff --git a/kernel/driver.cc b/kernel/driver.cc
index a27c0a00f..795fd9fc5 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -37,6 +37,12 @@
 #  include <tcl.h>
 #endif
 
+#ifdef YOSYS_ENABLE_PYTHON
+#  include <Python.h>
+#  include <pybind11/pybind11.h>
+namespace py = pybind11;
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
@@ -91,7 +97,7 @@ int main(int argc, char **argv)
 	log_error_stderr = true;
 	yosys_banner();
 	yosys_setup();
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	py::object sys = py::module_::import("sys");
 	sys.attr("path").attr("append")(proc_self_dirname());
 	sys.attr("path").attr("append")(proc_share_dirname());
@@ -227,10 +233,10 @@ int main(int argc, char **argv)
 			cxxopts::value<std::string>(),"<tcl_scriptfile>")
 		("C,tcl-interactive", "enters TCL interactive shell mode")
 #endif // YOSYS_ENABLE_TCL
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 		("y,py-scriptfile", "execute the Python <script>",
 			cxxopts::value<std::string>(), "<script>")
-#endif // WITH_PYTHON
+#endif // YOSYS_ENABLE_PYTHON
 		("p,commands", "execute <commands> (to chain commands, separate them with semicolon + whitespace: 'cmd1; cmd2')",
 			cxxopts::value<std::vector<std::string>>(), "<commands>")
 		("r,top", "elaborate the specified HDL <top> module",
@@ -516,7 +522,7 @@ int main(int argc, char **argv)
 #endif
 
 	yosys_setup();
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	py::object sys = py::module_::import("sys");
 	sys.attr("path").attr("append")(proc_self_dirname());
 	sys.attr("path").attr("append")(proc_share_dirname());
@@ -568,7 +574,7 @@ int main(int argc, char **argv)
 			log_error("Can't execute TCL script: this version of yosys is not built with TCL support enabled.\n");
 #endif
 		} else if (scriptfile_python) {
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 			py::list new_argv;
 			int py_argc = special_args.size() + 1;
 			new_argv.append(scriptfile);
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 8daf2c821..a594d2da3 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -1083,7 +1083,7 @@ RTLIL::Design::Design()
 	refcount_modules_ = 0;
 	push_full_selection();
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	RTLIL::Design::get_all_designs()->insert(std::pair<unsigned int, RTLIL::Design*>(hashidx_, this));
 #endif
 }
@@ -1094,12 +1094,12 @@ RTLIL::Design::~Design()
 		delete pr.second;
 	for (auto n : bindings_)
 		delete n;
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	RTLIL::Design::get_all_designs()->erase(hashidx_);
 #endif
 }
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 static std::map<unsigned int, RTLIL::Design*> all_designs;
 std::map<unsigned int, RTLIL::Design*> *RTLIL::Design::get_all_designs(void)
 {
@@ -1430,7 +1430,7 @@ RTLIL::Module::Module()
 	refcount_wires_ = 0;
 	refcount_cells_ = 0;
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	RTLIL::Module::get_all_modules()->insert(std::pair<unsigned int, RTLIL::Module*>(hashidx_, this));
 #endif
 }
@@ -1447,12 +1447,12 @@ RTLIL::Module::~Module()
 		delete pr.second;
 	for (auto binding : bindings_)
 		delete binding;
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	RTLIL::Module::get_all_modules()->erase(hashidx_);
 #endif
 }
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 static std::map<unsigned int, RTLIL::Module*> all_modules;
 std::map<unsigned int, RTLIL::Module*> *RTLIL::Module::get_all_modules(void)
 {
@@ -4109,19 +4109,19 @@ RTLIL::Wire::Wire()
 	upto = false;
 	is_signed = false;
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	RTLIL::Wire::get_all_wires()->insert(std::pair<unsigned int, RTLIL::Wire*>(hashidx_, this));
 #endif
 }
 
 RTLIL::Wire::~Wire()
 {
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	RTLIL::Wire::get_all_wires()->erase(hashidx_);
 #endif
 }
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 static std::map<unsigned int, RTLIL::Wire*> all_wires;
 std::map<unsigned int, RTLIL::Wire*> *RTLIL::Wire::get_all_wires(void)
 {
@@ -4138,7 +4138,7 @@ RTLIL::Memory::Memory()
 	width = 1;
 	start_offset = 0;
 	size = 0;
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	RTLIL::Memory::get_all_memorys()->insert(std::pair<unsigned int, RTLIL::Memory*>(hashidx_, this));
 #endif
 }
@@ -4159,19 +4159,19 @@ RTLIL::Cell::Cell() : module(nullptr)
 	// log("#memtrace# %p\n", this);
 	memhasher();
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	RTLIL::Cell::get_all_cells()->insert(std::pair<unsigned int, RTLIL::Cell*>(hashidx_, this));
 #endif
 }
 
 RTLIL::Cell::~Cell()
 {
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	RTLIL::Cell::get_all_cells()->erase(hashidx_);
 #endif
 }
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 static std::map<unsigned int, RTLIL::Cell*> all_cells;
 std::map<unsigned int, RTLIL::Cell*> *RTLIL::Cell::get_all_cells(void)
 {
@@ -5957,7 +5957,7 @@ RTLIL::Process *RTLIL::Process::clone() const
 	return new_proc;
 }
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 RTLIL::Memory::~Memory()
 {
 	RTLIL::Memory::get_all_memorys()->erase(hashidx_);
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 9f636c5a2..01f8abdb2 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1680,7 +1680,7 @@ struct RTLIL::Design
 	// returns all selected unboxed whole modules, warning the user if any
 	// partially selected or boxed modules have been ignored
 	std::vector<RTLIL::Module*> selected_unboxed_whole_modules_warn() const { return selected_modules(SELECT_WHOLE_WARN, SB_UNBOXED_WARN); }
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	static std::map<unsigned int, RTLIL::Design*> *get_all_designs(void);
 #endif
 };
@@ -2040,7 +2040,7 @@ public:
 	RTLIL::SigSpec OriginalTag     (RTLIL::IdString name, const std::string &tag, const RTLIL::SigSpec &sig_a, const std::string &src = "");
 	RTLIL::SigSpec FutureFF        (RTLIL::IdString name, const RTLIL::SigSpec &sig_e, const std::string &src = "");
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	static std::map<unsigned int, RTLIL::Module*> *get_all_modules(void);
 #endif
 };
@@ -2093,7 +2093,7 @@ public:
 		return zero_index + start_offset;
 	}
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	static std::map<unsigned int, RTLIL::Wire*> *get_all_wires(void);
 #endif
 };
@@ -2110,7 +2110,7 @@ struct RTLIL::Memory : public RTLIL::NamedObject
 	Memory();
 
 	int width, start_offset, size;
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	~Memory();
 	static std::map<unsigned int, RTLIL::Memory*> *get_all_memorys(void);
 #endif
@@ -2168,7 +2168,7 @@ public:
 	template<typename T> void rewrite_sigspecs(T &functor);
 	template<typename T> void rewrite_sigspecs2(T &functor);
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	static std::map<unsigned int, RTLIL::Cell*> *get_all_cells(void);
 #endif
 
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 47057c1ca..7ed036a02 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -37,6 +37,12 @@
 #  include <dlfcn.h>
 #endif
 
+#ifdef YOSYS_ENABLE_PYTHON
+#  include <Python.h>
+#  include <pybind11/pybind11.h>
+namespace py = pybind11;
+#endif
+
 #if defined(_WIN32)
 #  include <windows.h>
 #  include <io.h>
@@ -63,7 +69,7 @@
 #  include <sys/sysctl.h>
 #endif
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 extern "C" PyObject* PyInit_libyosys();
 extern "C" PyObject* PyInit_pyosys();
 #include <signal.h>
@@ -184,7 +190,7 @@ int run_command(const std::string &command, std::function<void(const std::string
 bool already_setup = false;
 bool already_shutdown = false;
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 // Include pyosys as a package for some compatibility with wheels.
 //
 // This should not affect using wheels as the dylib has to actually be called
@@ -203,7 +209,7 @@ void yosys_setup()
 
 	IdString::ensure_prepopulated();
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	// Starting Python 3.12, calling PyImport_AppendInittab on an already
 	// initialized platform fails (such as when libyosys is imported
 	// from a Python interpreter)
@@ -267,13 +273,13 @@ void yosys_shutdown()
 		dlclose(it.second);
 
 	loaded_plugins.clear();
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	loaded_python_plugins.clear();
 #endif
 	loaded_plugin_aliases.clear();
 #endif
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 	Py_Finalize();
 #endif
 }
@@ -549,7 +555,7 @@ void init_share_dirname()
 #else
 void init_share_dirname()
 {
-#  ifdef WITH_PYTHON
+#  ifdef YOSYS_ENABLE_PYTHON
 	PyObject *sys_obj = PyImport_ImportModule("sys");
 
 	if (PyObject_HasAttrString(sys_obj, "_pyosys_share_dirname")) {
@@ -609,7 +615,7 @@ void init_abc_executable_name()
 		yosys_abc_executable = proc_self_dirname() + "..\\" + proc_program_prefix() + "yosys-abc";
 #  endif
 
-#  ifdef WITH_PYTHON
+#  ifdef YOSYS_ENABLE_PYTHON
 	PyObject *sys_obj = PyImport_ImportModule("sys");
 
 	if (PyObject_HasAttrString(sys_obj, "_pyosys_abc")) {
diff --git a/kernel/yosys.h b/kernel/yosys.h
index 7dfe8aa0b..b455ad496 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -51,7 +51,7 @@ YOSYS_NAMESPACE_BEGIN
 
 void yosys_setup();
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 bool yosys_already_setup();
 #endif
 
@@ -89,7 +89,7 @@ extern std::vector<RTLIL::Design*> pushed_designs;
 
 // from passes/cmds/pluginc.cc
 extern std::map<std::string, void*> loaded_plugins;
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 extern std::map<std::string, void*> loaded_python_plugins;
 #endif
 extern std::map<std::string, std::string> loaded_plugin_aliases;
diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index 3a74611a1..9afd2ac00 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -53,13 +53,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 
-#ifdef WITH_PYTHON
-#include <Python.h>
-#include <pybind11/pybind11.h>
-
-namespace py = pybind11;
-#endif
-
 #ifndef _YOSYS_
 #  error It looks like you are trying to build Yosys without the config defines set. \
          When building Yosys with a custom make system, make sure you set all the \
diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index e1e888a85..191261a17 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -24,10 +24,16 @@
 #  include <dlfcn.h>
 #endif
 
+#ifdef YOSYS_ENABLE_PYTHON
+#  include <Python.h>
+#  include <pybind11/pybind11.h>
+namespace py = pybind11;
+#endif
+
 YOSYS_NAMESPACE_BEGIN
 
 std::map<std::string, void*> loaded_plugins;
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 std::map<std::string, void*> loaded_python_plugins;
 #endif
 std::map<std::string, std::string> loaded_plugin_aliases;
@@ -43,7 +49,7 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
 		filename = "./" + filename;
 
 
-	#ifdef WITH_PYTHON
+	#ifdef YOSYS_ENABLE_PYTHON
 	const bool is_loaded = loaded_plugins.count(orig_filename) && loaded_python_plugins.count(orig_filename);
 	#else
 	const bool is_loaded = loaded_plugins.count(orig_filename);
@@ -52,7 +58,7 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
 	if (!is_loaded) {
 		// Check if we're loading a python script
 		if (filename.rfind(".py") != std::string::npos) {
-			#ifdef WITH_PYTHON
+			#ifdef YOSYS_ENABLE_PYTHON
 				py::object Path = py::module_::import("pathlib").attr("Path");
 				py::object full_path = Path(py::cast(filename));
 				py::object plugin_python_path = full_path.attr("parent");
@@ -171,7 +177,7 @@ struct PluginPass : public Pass {
 		if (list_mode)
 		{
 			log("\n");
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 			if (loaded_plugins.empty() and loaded_python_plugins.empty())
 #else
 			if (loaded_plugins.empty())
@@ -183,7 +189,7 @@ struct PluginPass : public Pass {
 			for (auto &it : loaded_plugins)
 				log("  %s\n", it.first);
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 			for (auto &it : loaded_python_plugins)
 				log("  %s\n", it.first);
 #endif
diff --git a/pyosys/generator.py b/pyosys/generator.py
index b0cec99e3..e8e0d96fe 100644
--- a/pyosys/generator.py
+++ b/pyosys/generator.py
@@ -349,7 +349,7 @@ class PyosysWrapperGenerator(object):
         cxx_std = os.getenv("CXX_STD", "c++17")
         return ParserOptions(
             preprocessor=make_gcc_preprocessor(
-                defines=["_YOSYS_", "WITH_PYTHON"],
+                defines=["_YOSYS_", "YOSYS_ENABLE_PYTHON"],
                 gcc_args=[preprocessor_bin, "-fsyntax-only", f"-std={cxx_std}"],
                 include_paths=[str(__yosys_root__), py_include, pybind11.get_include()],
             ),
diff --git a/pyosys/hashlib.h b/pyosys/hashlib.h
index b772a2bb3..c6ca8c096 100644
--- a/pyosys/hashlib.h
+++ b/pyosys/hashlib.h
@@ -41,9 +41,10 @@
 //
 #include <optional> // optional maps cleanest to methods that accept None in Python
 
-#include <pybind11/pybind11.h> // base
 #include <pybind11/stl.h> // std::optional
+#include <pybind11/pybind11.h> // base
 #include <pybind11/operators.h> // easier operator binding
+#include <pybind11/stl_bind.h> // vector
 
 #include "kernel/hashlib.h"
 
@@ -269,7 +270,7 @@ void bind_set(module &m, const char *name_cstr) {
 		.def("__iter__", [](const C &s){
 			return make_iterator(s.begin(), s.end());
 		}, keep_alive<0,1>())
-		.def("__repr__", [name_cstr](const py::iterable &s){
+		.def("__repr__", [name_cstr](const iterable &s){
 			// repr(set(s)) where s is iterable would be more terse/robust
 			// but are there concerns with copying?
 			str representation = str(name_cstr) + str("({");
diff --git a/pyosys/wrappers_tpl.cc b/pyosys/wrappers_tpl.cc
index 84e201657..9dee4f710 100644
--- a/pyosys/wrappers_tpl.cc
+++ b/pyosys/wrappers_tpl.cc
@@ -16,14 +16,16 @@
  *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef WITH_PYTHON
+#ifdef YOSYS_ENABLE_PYTHON
 
 // <!-- generated includes -->
-
-#include <pybind11/stl_bind.h>
+#include <pybind11/pybind11.h>
 #include <pybind11/native_enum.h>
+
 #include "pyosys/hashlib.h"
 
+namespace py = pybind11;
+
 USING_YOSYS_NAMESPACE
 
 using std::set;
@@ -256,4 +258,4 @@ namespace YOSYS_PYTHON {
 	};
 };
 
-#endif // WITH_PYTHON
+#endif // YOSYS_ENABLE_PYTHON

From c8404bf86b98579a6657baef4a759dbcbfdef2ce Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Sun, 28 Sep 2025 04:09:36 +0300
Subject: [PATCH 667/931] pyosys/hashlib: equivalence operators

---
 pyosys/hashlib.h          | 55 ++++++++++++++++++++++++++++++---------
 pyosys/wrappers_tpl.cc    |  4 +--
 tests/pyosys/test_dict.py | 17 +++++++++++-
 tests/pyosys/test_set.py  |  4 +--
 4 files changed, 62 insertions(+), 18 deletions(-)

diff --git a/pyosys/hashlib.h b/pyosys/hashlib.h
index c6ca8c096..02dd75566 100644
--- a/pyosys/hashlib.h
+++ b/pyosys/hashlib.h
@@ -51,10 +51,11 @@
 namespace pybind11 {
 namespace hashlib {
 
-template<typename T>
-struct is_pointer { static const bool value = false; };
-template<typename T>
-struct is_pointer<T*> { static const bool value = true; };
+// "traits"
+template <typename T> struct is_pointer: std::false_type {};
+template <typename T> struct is_pointer<T*>: std::true_type {};
+template <typename T> struct is_optional: std::false_type {};
+template <typename T> struct is_optional< std::optional<T> >: std::true_type {};
 
 bool is_mapping(object obj) {
 	object mapping = module_::import("collections.abc").attr("Mapping");
@@ -270,6 +271,12 @@ void bind_set(module &m, const char *name_cstr) {
 		.def("__iter__", [](const C &s){
 			return make_iterator(s.begin(), s.end());
 		}, keep_alive<0,1>())
+		.def("__eq__", [](const C &s, const C &other) { return s == other; })
+		.def("__eq__", [](const C &s, const iterable &other) {
+			C other_cast;
+			unionize<C, T>(other_cast, other);
+			return s == other_cast;
+		})
 		.def("__repr__", [name_cstr](const iterable &s){
 			// repr(set(s)) where s is iterable would be more terse/robust
 			// but are there concerns with copying?
@@ -292,17 +299,17 @@ void bind_pool(module &m, const char *name_cstr) {
 
 
 template <typename C, typename K, typename V>
-void update_dict(C *target, const iterable &iterable_or_mapping) {
+void update_dict(C &target, const iterable &iterable_or_mapping) {
 	if (is_mapping(iterable_or_mapping)) {
 		for (const auto &key: iterable_or_mapping) {
-			(*target)[cast<K>(key)] = cast<V>(iterable_or_mapping[key]);
+			target[cast<K>(key)] = cast<V>(iterable_or_mapping[key]);
 		}
 	} else {
 		for (const auto &pair: iterable_or_mapping) {
 			if (len(pair) != 2) {
 				throw value_error(str("iterable element %s has more than two elements").format(str(pair)));
 			}
-			(*target)[cast<K>(pair[cast(0)])] = cast<V>(pair[cast(1)]);
+			target[cast<K>(pair[cast(0)])] = cast<V>(pair[cast(1)]);
 		}
 	}
 }
@@ -314,7 +321,7 @@ void bind_dict(module &m, const char *name_cstr) {
 		.def(init<const C &>()) // copy constructor
 		.def(init([](const iterable &other){ // copy instructor from arbitrary iterables and mappings
 			auto s = new C();
-			update_dict<C, K, V>(s, other);
+			update_dict<C, K, V>(*s, other);
 			return s;
 		}))
 		.def("__len__", [](const C &s){ return (size_t)s.size(); })
@@ -352,7 +359,15 @@ void bind_dict(module &m, const char *name_cstr) {
 				return s.at(k);
 			}
 		}, arg("key"), arg("default") = std::nullopt)
-		.def("popitem", [name_cstr](args _) { throw std::runtime_error(std::string(name_cstr) + " is not an ordered dictionary"); })
+		.def("popitem", [](C &s) {
+			auto it = s.begin();
+			if (it == s.end()) {
+				throw key_error("dict is empty");
+			}
+			auto copy = *it;
+			s.erase(it);
+			return copy;
+		})
 		.def("setdefault", [name_cstr](C &s, const K& k, std::optional<const V> &default_) {
 			auto it = s.find(k);
 			if (it != s.end()) {
@@ -367,22 +382,25 @@ void bind_dict(module &m, const char *name_cstr) {
 				s[k] = nullptr;
 				return (V)nullptr;
 			}
-			// TODO: std::optional? do we care?
+			if constexpr (is_optional<V>::value) {
+				s[k] = std::nullopt;
+				return std::nullopt;
+			}
 			throw type_error(std::string("the value type of ") + name_cstr + " is not nullable");
 		}, arg("key"), arg("default") = std::nullopt)
 		.def("update", [](C &s, iterable iterable_or_mapping) {
-			update_dict<C, K, V>(&s, iterable_or_mapping);
+			update_dict<C, K, V>(s, iterable_or_mapping);
 		}, arg("iterable_or_mapping"))
 		.def("values", [](const C &s){
 			return make_value_iterator(s.begin(), s.end());
 		}, keep_alive<0,1>())
 		.def("__or__", [](const C &s, iterable iterable_or_mapping) {
 			auto result = new C(s);
-			update_dict<C, K, V>(result, iterable_or_mapping);
+			update_dict<C, K, V>(*result, iterable_or_mapping);
 			return result;
 		})
 		.def("__ior__", [](C &s, iterable iterable_or_mapping) {
-			update_dict<C, K, V>(&s, iterable_or_mapping);
+			update_dict<C, K, V>(s, iterable_or_mapping);
 			return s;
 		})
 		.def("__bool__", [](const C &s) { return s.size() != 0; })
@@ -402,6 +420,17 @@ void bind_dict(module &m, const char *name_cstr) {
 			return representation;
 		});
 
+	// K is always comparable
+	// Python implements `is` as a fallback to check if it's the same object
+	if constexpr (detail::is_comparable<V>::value) {
+		cls.def("__eq__", [](const C &s, const C &other) { return s == other; });
+		cls.def("__eq__", [](const C &s, const iterable &other) {
+			C other_cast;
+			update_dict<C, K, V>(other_cast, other);
+			return s == other_cast;
+		});
+	}
+
 	// Inherit from collections.abc.Mapping so update operators (and a bunch
 	// of other things) work.
 	auto collections_abc = module_::import("collections.abc");
diff --git a/pyosys/wrappers_tpl.cc b/pyosys/wrappers_tpl.cc
index 9dee4f710..0c17be4ed 100644
--- a/pyosys/wrappers_tpl.cc
+++ b/pyosys/wrappers_tpl.cc
@@ -36,7 +36,7 @@ using namespace RTLIL;
 #include "wrappers.inc.cc"
 
 namespace YOSYS_PYTHON {
-	struct YosysStatics{};
+	struct Globals {};
 
 	// Trampolines for Classes with Python-Overridable Virtual Methods
 	// https://pybind11.readthedocs.io/en/stable/advanced/classes.html#overriding-virtual-functions-in-python
@@ -192,7 +192,7 @@ namespace YOSYS_PYTHON {
 		m.def("log_file_error", [](std::string_view file, int line, std::string s) { log_formatted_file_error(file, line, s); });
 
 		// Namespace to host global objects
-		auto global_variables = py::class_<YosysStatics>(m, "Yosys");
+		auto global_variables = py::class_<Globals>(m, "Globals");
 
 		// Trampoline Classes
 		py::class_<Pass, YOSYS_PYTHON::PassTrampoline, std::unique_ptr<Pass, py::nodelete>>(m, "Pass")
diff --git a/tests/pyosys/test_dict.py b/tests/pyosys/test_dict.py
index 916d69b92..717fed8ea 100644
--- a/tests/pyosys/test_dict.py
+++ b/tests/pyosys/test_dict.py
@@ -26,4 +26,19 @@ the_great_or = constructor_test_1 | constructor_test_2 | constructor_test_3
 
 assert set(the_great_or) ==  {"first", "key", "tomato", "im running"}
 repr_test = eval(repr(the_great_or))
-assert repr_test == the_great_or
+
+assert repr_test == the_great_or # compare dicts
+assert repr_test == {'tomato': 'tomato', 'first': 'second', 'key': 'value', 'im running': 'out of string ideas', } # compare dict with mapping
+
+before = len(repr_test)
+print(repr_test.popitem())
+assert before - 1 == len(repr_test)
+
+# test noncomparable
+## if ys.CellType ever gets an == operator just disable this section
+uncomparable_value = ys.Globals.yosys_celltypes.cell_types[ys.IdString("$not")]
+
+x = ys.IdstringToCelltypeDict({ ys.IdString("\\a"): uncomparable_value})
+y = ys.IdstringToCelltypeDict({ ys.IdString("\\a"): uncomparable_value})
+
+assert x != y # not comparable
diff --git a/tests/pyosys/test_set.py b/tests/pyosys/test_set.py
index d89c5243e..5698cffbe 100644
--- a/tests/pyosys/test_set.py
+++ b/tests/pyosys/test_set.py
@@ -33,10 +33,10 @@ for cls in [StringSet, StringPool]:
 	C |= {"A", "B", "C"}
 	D |= {"C", "D", "E"}
 	c_symdiff_d = (C ^ D)
-	assert (c_symdiff_d) == {"A", "B", "D", "E"}
+	assert c_symdiff_d == {"A", "B", "D", "E"} # compare against iterable
 
 	repr_test = eval(repr(c_symdiff_d))
-	c_symdiff_d == repr_test
+	assert c_symdiff_d == repr_test # compare against self
 
 
 print("Done.")

From 80fcce64da993191bfb8bd82a2ab316fbb9e90cf Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Sun, 28 Sep 2025 05:50:37 +0300
Subject: [PATCH 668/931] pyosys: fix ref-only classes, implicit conversions

+ cleanup
---
 .github/workflows/wheels.yml |   1 -
 Makefile                     |   2 +-
 kernel/yosys.cc              |  11 ++++
 pyosys/generator.py          | 120 +++++++++++++++++++++++------------
 pyosys/hashlib.h             |  23 ++++---
 pyosys/wrappers_tpl.cc       |  20 +++---
 tests/pyosys/test_idict.py   |  12 ++--
 7 files changed, 122 insertions(+), 67 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index d6e9832aa..b6c9a51ac 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -2,7 +2,6 @@ name: Build Wheels for PyPI
 
 # run every Sunday at 10 AM
 on:
-  push: # TODO: REMOVE THIS, DO NOT MERGE TO UPSTREAM THIS IS JUST SO I DON'T HAVE TO MANUALLY RUN THE WORKFLOW WITH EVERY PUSH
   workflow_dispatch:
   schedule:
     - cron: "0 10 * * 0"
diff --git a/Makefile b/Makefile
index 22aeee5e8..f2dec8b0f 100644
--- a/Makefile
+++ b/Makefile
@@ -1017,12 +1017,12 @@ ifeq ($(ENABLE_LIBYOSYS),1)
 	if [ -n "$(STRIP)" ]; then $(INSTALL_SUDO) $(STRIP) -S $(DESTDIR)$(LIBDIR)/libyosys.so; fi
 ifeq ($(ENABLE_PYOSYS),1)
 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys
+	$(INSTALL_SUDO) cp pyosys/__init__.py $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys/__init__.py
 	$(INSTALL_SUDO) cp libyosys.so $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys/libyosys.so
 	$(INSTALL_SUDO) cp -r share $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys
 ifeq ($(ENABLE_ABC),1)
 	$(INSTALL_SUDO) cp yosys-abc $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys/yosys-abc
 endif
-	$(INSTALL_SUDO) cp misc/__init__.py $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys/
 endif
 endif
 ifeq ($(ENABLE_PLUGINS),1)
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 7ed036a02..ca1db3aa6 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -198,6 +198,15 @@ bool already_shutdown = false;
 PYBIND11_MODULE(pyosys, m) {
 	m.add_object("__path__", py::list());
 }
+
+// Catch uses of 'import libyosys' which can import libyosys.so, causing a ton
+// of symbol collisions and overall weird behavior.
+//
+// This should not affect using wheels as the dylib has to actually be called
+// libyosys_dummy.so for this function to be interacted with at all.
+PYBIND11_MODULE(libyosys_dummy, _) {
+	throw py::import_error("Change your import from 'import libyosys' to 'from pyosys import libyosys'.");
+}
 #endif
 
 void yosys_setup()
@@ -217,6 +226,8 @@ void yosys_setup()
 		PyImport_AppendInittab((char*)"pyosys.libyosys", PyInit_libyosys);
 		// compatibility with wheels
 		PyImport_AppendInittab((char*)"pyosys", PyInit_pyosys);
+		// prevent catastrophes
+		PyImport_AppendInittab((char*)"libyosys", PyInit_libyosys_dummy);
 		Py_Initialize();
 		PyRun_SimpleString("import sys");
 		signal(SIGINT, SIG_DFL);
diff --git a/pyosys/generator.py b/pyosys/generator.py
index e8e0d96fe..15b40a79e 100644
--- a/pyosys/generator.py
+++ b/pyosys/generator.py
@@ -33,13 +33,13 @@ is a common problem. ``ruff check pyosys/generator.py`` suffices.
 import os
 import io
 import shutil
+import argparse
 from pathlib import Path
 from sysconfig import get_paths
 from dataclasses import dataclass, field
 from typing import Any, Dict, FrozenSet, Iterable, Tuple, Union, Optional, List
 
 import pybind11
-import argparse
 from cxxheaderparser.simple import parse_file, ClassScope, NamespaceScope, EnumDecl
 from cxxheaderparser.options import ParserOptions
 from cxxheaderparser.preprocessor import make_gcc_preprocessor
@@ -84,6 +84,7 @@ class PyosysClass:
     :param denylist: If specified, one or more methods can be excluded from
         wrapping.
     """
+
     name: str
     ref_only: bool = False
 
@@ -101,6 +102,7 @@ class PyosysHeader:
     :param classes: A list of ``PyosysClass`` classes to be wrapped
     :param enums: A list of enums to be wrapped
     """
+
     name: str
     classes: List[PyosysClass] = field(default_factory=lambda: [])
 
@@ -110,11 +112,13 @@ class PyosysHeader:
             for cls in classes:
                 self.classes_by_name[cls.name] = cls
 
+
 # MARK: Inclusion and Exclusion
 global_denylist = frozenset(
     {
         # deprecated
         "builtin_ff_cell_types",
+        "logv_file_error",
         # no implementation
         "set_verific_logging",
         # can't bridge to python cleanly
@@ -167,7 +171,11 @@ pyosys_headers = [
                     }
                 ),
             ),
-            PyosysClass("Const", string_expr="s.as_string()", denylist=frozenset({"bits", "bitvectorize"})),
+            PyosysClass(
+                "Const",
+                string_expr="s.as_string()",
+                denylist=frozenset({"bits", "bitvectorize"}),
+            ),
             PyosysClass("AttrObject", denylist=frozenset({"get_blackbox_attribute"})),
             PyosysClass("NamedObject", denylist=frozenset({"get_blackbox_attribute"})),
             PyosysClass("Selection"),
@@ -207,14 +215,13 @@ pyosys_headers = [
                 ref_only=True,
                 string_expr="s.name.c_str()",
                 hash_expr="s",
-                denylist=frozenset({"Pow"}), # has no implementation
+                denylist=frozenset({"Pow"}),  # has no implementation
             ),
             PyosysClass(
                 "Design",
-                ref_only=True,
                 string_expr="s.hashidx_",
                 hash_expr="s",
-                denylist=frozenset({"selected_whole_modules"}), # deprecated
+                denylist=frozenset({"selected_whole_modules"}),  # deprecated
             ),
         ],
     ),
@@ -227,6 +234,7 @@ class PyosysType:
     Bit of a hacky object all-around: this is more or less used to encapsulate
     container types so they can be later made opaque using pybind.
     """
+
     base: str
     specialization: Tuple["PyosysType", ...]
     const: bool = False
@@ -340,6 +348,10 @@ class PyosysWrapperGenerator(object):
                 f'\tpy::hashlib::bind_{container.base}<{", ".join(tpl_args)}>(m, "{container.generate_identifier()}");',
                 file=self.f_inc,
             )
+            print(
+                f"\tpy::implicitly_convertible<py::iterable, {identifier}>();",
+                file=self.f_inc,
+            )
         print(f"}}", file=self.f_inc)
 
     # helpers
@@ -414,14 +426,21 @@ class PyosysWrapperGenerator(object):
             self.found_containers.update(self.find_containers(supported, target.type))
 
     # processors
-    def get_overload_cast(self, function: Function, class_basename: Optional[str]) -> str:
+    def get_overload_cast(
+        self, function: Function, class_basename: Optional[str]
+    ) -> str:
         is_method = isinstance(function, Method)
         function_return_type = function.return_type.format()
-        if class_basename == "Const" and function_return_type in {"iterator", "const_iterator"}:
+        if class_basename == "Const" and function_return_type in {
+            "iterator",
+            "const_iterator",
+        }:
             # HACK: qualify Const's iterators
             function_return_type = f"{class_basename}::{function_return_type}"
 
-        pointer_kind = f"{class_basename}::*" if (is_method and not function.static) else "*"
+        pointer_kind = (
+            f"{class_basename}::*" if (is_method and not function.static) else "*"
+        )
 
         retval = f"static_cast <"
         retval += function_return_type
@@ -437,10 +456,17 @@ class PyosysWrapperGenerator(object):
         retval += ")"
         return retval
 
-    def get_definition_args(self, function: Function, class_basename: Optional[str], python_name_override: Optional[str] = None) -> List[str]:
+    def get_definition_args(
+        self,
+        function: Function,
+        class_basename: Optional[str],
+        python_name_override: Optional[str] = None,
+    ) -> List[str]:
         function_basename = function.name.segments[-1].format()
 
-        python_function_basename = python_name_override or keyword_aliases.get(function_basename, function_basename)
+        python_function_basename = python_name_override or keyword_aliases.get(
+            function_basename, function_basename
+        )
 
         def_args = [f'"{python_function_basename}"']
         def_args.append(self.get_overload_cast(function, class_basename))
@@ -453,7 +479,7 @@ class PyosysWrapperGenerator(object):
 
         return def_args
 
-    def process_method(self, function: Method, class_basename: str):
+    def process_method(self, metadata: PyosysClass, function: Method):
         if (
             function.deleted
             or function.template
@@ -473,10 +499,13 @@ class PyosysWrapperGenerator(object):
             return
 
         if function.constructor:
-            print(
-                f"\t\t\t.def(py::init<{self.get_parameter_types(function)}>())",
-                file=self.f,
-            )
+            if (
+                not metadata.ref_only
+            ):  # ref-only classes should not be constructed from python
+                print(
+                    f"\t\t\t.def(py::init<{self.get_parameter_types(function)}>())",
+                    file=self.f,
+                )
             return
 
         python_name_override = None
@@ -496,15 +525,13 @@ class PyosysWrapperGenerator(object):
         if function.static:
             definition_fn = "def_static"
 
-        print(f"\t\t\t.{definition_fn}({', '.join(self.get_definition_args(function, class_basename, python_name_override))})", file=self.f)
+        print(
+            f"\t\t\t.{definition_fn}({', '.join(self.get_definition_args(function, metadata.name, python_name_override))})",
+            file=self.f,
+        )
 
     def process_function(self, function: Function):
-        if (
-            function.deleted
-            or function.template
-            or function.vararg
-            or function.static
-        ):
+        if function.deleted or function.template or function.vararg or function.static:
             return
 
         if function.operator is not None:
@@ -516,9 +543,12 @@ class PyosysWrapperGenerator(object):
 
         self.register_containers(function)
 
-        print(f"\t\t\tm.def({', '.join(self.get_definition_args(function, None))});", file=self.f)
+        print(
+            f"\t\t\tm.def({', '.join(self.get_definition_args(function, None))});",
+            file=self.f,
+        )
 
-    def process_field(self, field: Field, class_basename: str):
+    def process_field(self, metadata: PyosysClass, field: Field):
         if field.access != "public":
             return
 
@@ -544,7 +574,7 @@ class PyosysWrapperGenerator(object):
         field_python_basename = keyword_aliases.get(field.name, field.name)
 
         print(
-            f'\t\t\t.{definition_fn}("{field_python_basename}", &{class_basename}::{field.name})',
+            f'\t\t\t.{definition_fn}("{field_python_basename}", &{metadata.name}::{field.name})',
             file=self.f,
         )
 
@@ -558,9 +588,13 @@ class PyosysWrapperGenerator(object):
 
         self.register_containers(variable)
 
-        definition_fn = f"def_{'readonly' if variable.type.const else 'readwrite'}_static"
+        definition_fn = (
+            f"def_{'readonly' if variable.type.const else 'readwrite'}_static"
+        )
 
-        variable_python_basename = keyword_aliases.get(variable_basename, variable_basename)
+        variable_python_basename = keyword_aliases.get(
+            variable_basename, variable_basename
+        )
         variable_name = variable.name.format()
 
         print(
@@ -569,21 +603,18 @@ class PyosysWrapperGenerator(object):
         )
 
     def process_class_members(
-        self,
-        metadata: PyosysClass,
-        cls: ClassScope,
-        basename: str
+        self, metadata: PyosysClass, cls: ClassScope, basename: str
     ):
         for method in cls.methods:
             if method.name.segments[-1].name in metadata.denylist:
                 continue
-            self.process_method(method, basename)
+            self.process_method(metadata, method)
 
         visited_anonymous_unions = set()
         for field_ in cls.fields:
             if field_.name in metadata.denylist:
                 continue
-            self.process_field(field_, basename)
+            self.process_field(metadata, field_)
 
             # Handle anonymous unions
             for subclass in cls.classes:
@@ -594,7 +625,7 @@ class PyosysWrapperGenerator(object):
                         continue
                     visited_anonymous_unions.add(au.id)
                     for subfield in subclass.fields:
-                        self.process_field(subfield, basename)
+                        self.process_field(metadata, subfield)
 
     def process_class(
         self,
@@ -627,10 +658,16 @@ class PyosysWrapperGenerator(object):
                 self.process_class_members(metadata, base_scope, basename)
 
         if expr := metadata.string_expr:
-            print(f'\t\t.def("__str__", [](const {basename} &s) {{ return {expr}; }})', file=self.f)
+            print(
+                f'\t\t.def("__str__", [](const {basename} &s) {{ return {expr}; }})',
+                file=self.f,
+            )
 
         if expr := metadata.hash_expr:
-            print(f'\t\t.def("__hash__", [](const {basename} &s) {{ return run_hash({expr}); }})', file=self.f)
+            print(
+                f'\t\t.def("__hash__", [](const {basename} &s) {{ return run_hash({expr}); }})',
+                file=self.f,
+            )
 
         print(f"\t\t;}}", file=self.f)
 
@@ -653,10 +690,12 @@ class PyosysWrapperGenerator(object):
         enum_class = enum.typename.classkey == "enum class"
         for value in enum.values:
             enum_class_qualifier = f"{basename}::" * enum_class
-            print(f'\t\t\t.value("{value.name}", {enum_class_qualifier}{value.name})', file=self.f)
+            print(
+                f'\t\t\t.value("{value.name}", {enum_class_qualifier}{value.name})',
+                file=self.f,
+            )
         print(f"\t\t\t.finalize();}}", file=self.f)
 
-
     def process_namespace(
         self,
         header: PyosysHeader,
@@ -668,7 +707,10 @@ class PyosysWrapperGenerator(object):
         if len(namespace_components) and (len(ns.functions) + len(ns.variables)):
             # TODO: Not essential but maybe move namespace usage into
             # process_function for consistency?
-            print(f"\t\t{{ using namespace {'::'.join(namespace_components)};", file=self.f)
+            print(
+                f"\t\t{{ using namespace {'::'.join(namespace_components)};",
+                file=self.f,
+            )
             for function in ns.functions:
                 self.process_function(function)
             for variable in ns.variables:
diff --git a/pyosys/hashlib.h b/pyosys/hashlib.h
index 02dd75566..386f1c0d8 100644
--- a/pyosys/hashlib.h
+++ b/pyosys/hashlib.h
@@ -95,8 +95,8 @@ void difference(C &lhs, const iterable &rhs) {
 template <typename C, typename T>
 void intersect(C &lhs, const iterable &rhs) {
 	// Doing it in-place is a lot slower
-	// TODO?: Leave modifying lhs to caller (saves a copy) but complicates
-	//        chaining intersections.
+	// TODO?: Leave modifying lhs to caller (saves a copy in some cases)
+	//        but complicates chaining intersections.
 	C storage(lhs);
 
 	for (auto &element_cxx: lhs) {
@@ -449,6 +449,13 @@ void bind_idict(module &m, const char *name_cstr) {
 	auto cls = class_<C>(m, name_cstr)
 		.def(init<>())
 		.def(init<const C &>()) // copy constructor
+		.def(init([](const iterable &other){ // copy instructor from arbitrary iterables
+			auto s = new C();
+			for (auto &e: other) {
+				(*s)(cast<K>(e));
+			}
+			return s;
+		}))
 		.def("__len__", [](const C &s){ return (size_t)s.size(); })
 		.def("__getitem__", [](const C &s, int v) { return s[v]; })
 		.def("__call__", [](C &s, const K &k) { return s(k); })
@@ -480,20 +487,20 @@ void bind_idict(module &m, const char *name_cstr) {
 		.def("items", [](args _){
 			throw type_error("idicts do not support pairwise iteration");
 		})
-		.def("update", [](C &s, iterable iterable) {
-			for (auto &e: iterable) {
+		.def("update", [](C &s, iterable other) {
+			for (auto &e: other) {
 				s(cast<K>(e));
 			}
 		})
-		.def("__or__", [](const C &s, iterable iterable) {
+		.def("__or__", [](const C &s, iterable other) {
 			auto result = new C(s);
-			for (auto &e: iterable) {
+			for (auto &e: other) {
 				(*result)(cast<K>(e));
 			}
 			return result;
 		})
-		.def("__ior__", [](C &s, iterable iterable) {
-			for (auto &e: iterable) {
+		.def("__ior__", [](C &s, iterable other) {
+			for (auto &e: other) {
 				s(cast<K>(e));
 			}
 			return s;
diff --git a/pyosys/wrappers_tpl.cc b/pyosys/wrappers_tpl.cc
index 0c17be4ed..5e77fef21 100644
--- a/pyosys/wrappers_tpl.cc
+++ b/pyosys/wrappers_tpl.cc
@@ -21,7 +21,6 @@
 // <!-- generated includes -->
 #include <pybind11/pybind11.h>
 #include <pybind11/native_enum.h>
-
 #include "pyosys/hashlib.h"
 
 namespace py = pybind11;
@@ -35,7 +34,7 @@ using namespace RTLIL;
 
 #include "wrappers.inc.cc"
 
-namespace YOSYS_PYTHON {
+namespace pyosys {
 	struct Globals {};
 
 	// Trampolines for Classes with Python-Overridable Virtual Methods
@@ -160,12 +159,6 @@ namespace YOSYS_PYTHON {
 		}
 	};
 
-	/// @brief Use an auxiliary function to adapt the legacy function.
-	void log_to_stream(py::object object)
-	{
-		// TODO
-	};
-
 	PYBIND11_MODULE(libyosys, m) {
 		// this code is run on import
 		m.doc() = "python access to libyosys";
@@ -195,9 +188,9 @@ namespace YOSYS_PYTHON {
 		auto global_variables = py::class_<Globals>(m, "Globals");
 
 		// Trampoline Classes
-		py::class_<Pass, YOSYS_PYTHON::PassTrampoline, std::unique_ptr<Pass, py::nodelete>>(m, "Pass")
+		py::class_<Pass, pyosys::PassTrampoline, std::unique_ptr<Pass, py::nodelete>>(m, "Pass")
 			.def(py::init([](std::string name, std::string short_help) {
-				auto created = new YOSYS_PYTHON::PassTrampoline(name, short_help);
+				auto created = new pyosys::PassTrampoline(name, short_help);
 				Pass::init_register();
 				return created;
 			}), py::arg("name"), py::arg("short_help"))
@@ -219,9 +212,9 @@ namespace YOSYS_PYTHON {
 			.def("call", py::overload_cast<RTLIL::Design *,std::vector<std::string>>(&Pass::call))
 		;
 
-		py::class_<RTLIL::Monitor, YOSYS_PYTHON::MonitorTrampoline>(m, "Monitor")
+		py::class_<RTLIL::Monitor, pyosys::MonitorTrampoline>(m, "Monitor")
 			.def(py::init([]() {
-				return new YOSYS_PYTHON::MonitorTrampoline();
+				return new pyosys::MonitorTrampoline();
 			}))
 			.def("notify_module_add", &RTLIL::Monitor::notify_module_add)
 			.def("notify_module_del", &RTLIL::Monitor::notify_module_del)
@@ -255,6 +248,9 @@ namespace YOSYS_PYTHON {
 		bind_autogenerated_opaque_containers(m);
 
 		// <!-- generated pymod-level code -->
+
+		py::implicitly_convertible<std::string, RTLIL::IdString>();
+		py::implicitly_convertible<const char *, RTLIL::IdString>();
 	};
 };
 
diff --git a/tests/pyosys/test_idict.py b/tests/pyosys/test_idict.py
index fd04f4b8c..073eed1e5 100644
--- a/tests/pyosys/test_idict.py
+++ b/tests/pyosys/test_idict.py
@@ -1,11 +1,11 @@
 from pyosys import libyosys as ys
 
 my_idict = ys.IdstringIdict()
-print(my_idict(ys.IdString("\\hello")))
-print(my_idict(ys.IdString("\\world")))
-print(my_idict.get(ys.IdString("\\world")))
+print(my_idict(ys.IdString("\\hello"))) # test explicit IdString construction
+print(my_idict("\\world"))
+print(my_idict.get("\\world"))
 try:
-	print(my_idict.get(ys.IdString("\\dummy")))
+	print(my_idict.get("\\dummy"))
 except IndexError as e:
 	print(f"{repr(e)}")
 print(my_idict[0])
@@ -22,10 +22,10 @@ current_len = len(my_idict)
 assert current_len == 2, "copy"
 
 my_copy = my_idict.copy()
-my_copy(ys.IdString("\\copy"))
+my_copy("\\copy")
 assert len(my_idict) == current_len, "copy seemed to have mutate original idict"
 assert len(my_copy) == current_len + 1, "copy not behaving as expected"
 
 current_copy_len = len(my_copy)
-my_copy |= (ys.IdString(e) for e in ("\\the", "\\world")) # 1 new element
+my_copy |= ("\\the", "\\world") # 1 new element
 assert len(my_copy) == current_copy_len + 1, "or operator returned unexpected result"

From 93fae3c6068db5c2ca23d31b2864ebdd3167a3b3 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Tue, 30 Sep 2025 10:30:11 +0300
Subject: [PATCH 669/931] docs: write small guide for using pyosys

---
 .editorconfig                                 |   4 +
 docs/.gitignore                               |   1 +
 docs/source/code_examples/pyosys/pass.py      |  37 ++++
 .../code_examples/pyosys/simple_database.py   |  51 +++++
 docs/source/using_yosys/index.rst             |   1 +
 docs/source/using_yosys/pyosys.rst            | 197 ++++++++++++++++++
 examples/python-api/pass.py                   |   2 +-
 7 files changed, 292 insertions(+), 1 deletion(-)
 create mode 100644 docs/source/code_examples/pyosys/pass.py
 create mode 100644 docs/source/code_examples/pyosys/simple_database.py
 create mode 100644 docs/source/using_yosys/pyosys.rst

diff --git a/.editorconfig b/.editorconfig
index 572b73bd2..bbe9c3107 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,6 +11,10 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = false
 
+[*.rst]
+indent_style = space
+indent_size = 3
+
 [*.yml]
 indent_style = space
 indent_size = 2
diff --git a/docs/.gitignore b/docs/.gitignore
index 09bb59048..30a903f9a 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -6,3 +6,4 @@
 /source/_images/**/*.svg
 /source/_images/**/*.dot
 /source/_images/code_examples
+/venv
diff --git a/docs/source/code_examples/pyosys/pass.py b/docs/source/code_examples/pyosys/pass.py
new file mode 100644
index 000000000..2108b48ab
--- /dev/null
+++ b/docs/source/code_examples/pyosys/pass.py
@@ -0,0 +1,37 @@
+from pyosys import libyosys as ys
+
+class AllEnablePass(ys.Pass):
+	def __init__(self):
+		super().__init__(
+			"all_enable",
+			"makes all _DFF_P_ registers require an enable signal"
+		)
+
+	def execute(self, args, design):
+		ys.log_header(design, "Adding enable signals\n")
+		ys.log_push()
+		top_module = design.top_module()
+
+		if "\\enable" not in top_module.wires_:
+			enable_line = top_module.addWire("\\enable")
+			enable_line.port_input = True
+			top_module.fixup_ports()
+
+		for cell in top_module.cells_.values():
+			if cell.type != "$_DFF_P_":
+				continue
+			cell.type = "$_DFFE_PP_"
+			cell.setPort("\\E", ys.SigSpec(enable_line))
+		ys.log_pop()
+
+p = AllEnablePass() # register the pass
+
+# using the pass
+
+design = ys.Design()
+ys.run_pass("read_verilog tests/simple/fiedler-cooley.v", design)
+ys.run_pass("hierarchy -check -auto-top", design)
+ys.run_pass("synth", design)
+ys.run_pass("all_enable", design)
+ys.run_pass("write_verilog out.v", design)
+ys.run_pass("synth_ice40 -json out.json", design)
diff --git a/docs/source/code_examples/pyosys/simple_database.py b/docs/source/code_examples/pyosys/simple_database.py
new file mode 100644
index 000000000..4cfe6b586
--- /dev/null
+++ b/docs/source/code_examples/pyosys/simple_database.py
@@ -0,0 +1,51 @@
+from pyosys import libyosys as ys
+
+# loading design
+design = ys.Design()
+
+ys.run_pass("read_verilog tests/simple/fiedler-cooley.v", design)
+ys.run_pass("hierarchy -check -auto-top", design)
+
+# top module inspection
+top_module = design.top_module()
+
+for id, wire in top_module.wires_.items():
+	if not wire.port_input and not wire.port_output:
+		continue
+	description = "input" if wire.port_input else "output"
+	description += " " + wire.name.str()
+	if wire.width != 1:
+		frm = wire.start_offset
+		to = wire.start_offset + wire.width
+		if wire.upto:
+			to, frm = frm, to
+		description += f" [{to}:{frm}]"
+	print(description)
+
+# synth
+
+ys.run_pass("synth", design)
+
+# adding the enable line
+
+enable_line = top_module.addWire("\\enable")
+enable_line.port_input = True
+top_module.fixup_ports()
+
+# hooking the enable line to the internal dff cells
+
+for cell in top_module.cells_.values():
+	if cell.type != "$_DFF_P_":
+		continue
+	cell.type = "$_DFFE_PP_"
+	cell.setPort("\\E", ys.SigSpec(enable_line))
+
+# run check
+
+top_module.check()
+ys.run_pass("stat", design)
+
+# write outputs
+
+ys.run_pass("write_verilog out.v", design)
+ys.run_pass("synth_ice40 -json out.json", design)
diff --git a/docs/source/using_yosys/index.rst b/docs/source/using_yosys/index.rst
index b243d431e..93dd3629b 100644
--- a/docs/source/using_yosys/index.rst
+++ b/docs/source/using_yosys/index.rst
@@ -17,3 +17,4 @@ ways Yosys can interact with designs for a deeper investigation.
    more_scripting/index
    bugpoint
    verilog
+   pyosys
diff --git a/docs/source/using_yosys/pyosys.rst b/docs/source/using_yosys/pyosys.rst
new file mode 100644
index 000000000..7e3b0f77d
--- /dev/null
+++ b/docs/source/using_yosys/pyosys.rst
@@ -0,0 +1,197 @@
+Scripting with Pyosys
+=====================
+
+Pyosys is a limited subset of the Yosys C++ API (aka "libyosys") made available
+using the Python programming language.
+
+It offers access both to writing Yosys scripts like ``.ys`` and ``.tcl`` files
+with the amenities of the Python programming language (functions, flow control,
+etc), but also allows some access to internal data structures at the same time
+unlike those two platforms, allowing you to also implement complex functionality
+that is would otherwise not possible without writing custom passes using C++.
+
+
+Getting Pyosys
+--------------
+
+Pyosys supports Python 3.8.1 or higher. You can access Pyosys using one of two
+methods:
+
+1. Compiling Yosys with the Makefile flag ``ENABLE_PYOSYS=1``
+
+   This adds the flag ``-y`` to the Yosys binary, which allows you to execute
+   Python scripts using an interpreter embedded in Yosys itself:
+
+   ``yosys -y ./my_pyosys_script.py``
+
+2. Installing the Pyosys wheels
+
+   On macOS and GNU/Linux (specifically, not musllinux,) you can install
+   pre-built wheels of Yosys using ``pip`` as follows:
+
+   ``python3 -m pip install pyosys``
+
+   Which then allows you to run your scripts as follows:
+
+   ``python3 ./my_pyosys_script.py``
+
+
+Scripting and Database Inspection
+---------------------------------
+
+To start with, you have to import libyosys as follows:
+
+.. code-block:: python
+
+   from pyosys import libyosys
+
+
+As a reminder, Python allows you to alias imported modules and objects, so
+this import may be preferable for terseness:
+
+.. code-block:: python
+
+   from pyosys import libyosys as ys
+
+
+Now, scripting is actually quite similar to ``.ys`` and ``.tcl`` script in that
+you can provide mostly text commands. Albeit, you can construct your scripts
+to use Python's amenities including flow controls, loops, and functions:
+
+.. code-block:: python
+
+   do_flatten = True
+
+   ys.run_pass("read_verilog tests/simple/fiedler-cooley.v")
+   ys.run_pass("hierarchy -check -auto-top")
+   if do_flatten:
+      ys.run_pass("flatten")
+
+…but this does not provide anything that Tcl scripts do not provide you with.
+The real power of using Pyosys comes from the fact you can manually instantiate,
+manage, and interact with the design database.
+
+As an example, here is the same script with a manually instantiated design.
+
+.. literalinclude:: /code_examples/pyosys/simple_database.py
+   :start-after: loading design
+   :end-before: top module inspection
+   :language: python
+
+What's new here is that you can manually inspect the design's database. This
+gives you access to huge chunk of the design database API as in declared in the
+``kernel/rtlil.h`` header.
+
+For example, here's how to list the input and output ports of the top module
+of your design:
+
+.. literalinclude:: /code_examples/pyosys/simple_database.py
+   :start-after: top module inspection
+   :end-before: # synth
+   :language: python
+
+.. tip::
+
+   C++ data structures in Yosys are bridged to Python such that they have a
+   pretty similar API to Python objects, for example:
+
+   - ``std::vector`` supports the same methods as iterables in Python.
+   - ``std::set`` and hashlib ``pool`` support the same methods as ``set``\s in
+     Python.
+   - ``dict`` supports the same methods as ``dict``\s in Python, albeit it is
+     unordered, and modifications may cause a complete reordering of the
+     dictionary.
+
+   For most operations, the Python equivalents are also supported as arguments
+   where they will automatically be cast to the right type, so you do not have
+   to manually instantiate the right underlying C++ object(s) yourself.
+
+Modifying the Database
+----------------------
+
+.. warning::
+
+   Any modifications to the database may invalidate previous references held
+   by Python, just as if you were writing C++. Pyosys does not currently attempt
+   to keep deleted objects alive if a reference is held by Python.
+
+You are not restricted to inspecting the database either: you have the ability
+to modify it, and introduce new elements and/or changes to your design.
+
+As a demonstrative example, let's assume we want to add an enable line to all
+flip-flops in our fiedler-cooley design.
+
+First of all, we will run :yoscrypt:`synth` to convert all of the logic to Yosys's
+internal cell structure (see :ref:`sec:celllib_gates`):
+
+.. literalinclude:: /code_examples/pyosys/simple_database.py
+   :start-after: # synth
+   :end-before: adding the enable line
+   :language: python
+
+Next, we need to add the new port. The method for this is ``Module::addWire``\.
+
+.. tip::
+
+   IdString is Yosys's internal representation of strings used as identifiers
+   within Verilog designs. They are efficient as only integers are stored and
+   passed around, but they can be translated to and from normal strings at will.
+
+   Pyosys will automatically cast Python strings to IdStrings for you, but the
+   rules around IdStrings apply, namely that *broadly*:
+
+   - Identifiers for internal cells must start with ``$``\.
+   - All other identifiers must start with ``\``\.
+
+.. literalinclude:: /code_examples/pyosys/simple_database.py
+   :start-after: adding the enable line
+   :end-before: hooking the enable line
+   :language: python
+
+Notice how we modified the wire then called a method to make Yosys re-process
+the ports.
+
+Next, we can iterate over all constituent cells, and if they are of the type
+``$_DFF_P_``, we do two things:
+
+1. Change their type to ``$_DFFE_PP_`` to enable hooking up an enable signal.
+2. Hooking up the enable signal.
+
+.. literalinclude:: /code_examples/pyosys/simple_database.py
+   :start-after: hooking the enable line
+   :end-before: run check
+   :language: python
+
+To verify that you did everything correctly, it is prudent to call ``.check()``
+on the module you're manipulating as follows:
+
+.. literalinclude:: /code_examples/pyosys/simple_database.py
+   :start-after: run check
+   :end-before: write output
+   :language: python
+
+And then finally, write your outputs. Here, I choose an intermediate Verilog
+file and :yoscrypt:`synth_ice40` to map it to the iCE40 architecture.
+
+.. literalinclude:: /code_examples/pyosys/simple_database.py
+   :start-after: write output
+   :language: python
+
+And voila, you will note that in the intermediate output, all ``always @``
+statements have an ``if (enable)``\.
+
+Encapsulating as Passes
+-----------------------
+
+Just like when writing C++, you can encapsulate behavior in terms of "passes",
+which are the commands you access using ``run_pass``\. This adds it to a global
+registry of commands that you can use using ``run_pass``.
+
+.. literalinclude:: /code_examples/pyosys/pass.py
+   :language: python
+
+In general, abstract classes and virtual methods are not really supported by
+Pyosys due to their complexity, but there are two exceptions which are:
+
+- ``Pass`` in ``kernel/register.h``
+- ``Monitor`` in ``kernel/rtlil.h``
diff --git a/examples/python-api/pass.py b/examples/python-api/pass.py
index d87e09078..d5e5868b0 100755
--- a/examples/python-api/pass.py
+++ b/examples/python-api/pass.py
@@ -29,7 +29,7 @@ class CellStatsPass(ys.Pass):
         plt.xticks(range(len(cell_stats)), list(cell_stats.keys()))
         plt.show()
 
-    def py_clear_flags(self):
+    def clear_flags(self):
         ys.log("Clear Flags - CellStatsPass\n")
 
 p = CellStatsPass() # register

From 440e331ae03079a0743f48aa21cfc03191e6608d Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Fri, 3 Oct 2025 11:50:44 +0300
Subject: [PATCH 670/931] docs: proofread pyosys.rst

Primarily address feedback from @KrystalDelusion (thanks!)
---
 docs/source/using_yosys/pyosys.rst | 59 ++++++++++++++++++------------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/docs/source/using_yosys/pyosys.rst b/docs/source/using_yosys/pyosys.rst
index 7e3b0f77d..8aa7fd4fe 100644
--- a/docs/source/using_yosys/pyosys.rst
+++ b/docs/source/using_yosys/pyosys.rst
@@ -4,17 +4,21 @@ Scripting with Pyosys
 Pyosys is a limited subset of the Yosys C++ API (aka "libyosys") made available
 using the Python programming language.
 
-It offers access both to writing Yosys scripts like ``.ys`` and ``.tcl`` files
-with the amenities of the Python programming language (functions, flow control,
-etc), but also allows some access to internal data structures at the same time
-unlike those two platforms, allowing you to also implement complex functionality
-that is would otherwise not possible without writing custom passes using C++.
+Like ``.ys`` and ``.tcl`` scripts, Pyosys provides an interface to write Yosys
+scripts in the Python programming language, giving you the benefits of
+a type system, control flow, object-oriented programming, and more; especially
+that the other options lack a type system and control flow/OOP in Tcl is
+limited.
+
+Though unlike these two, Pyosys goes a bit further, allowing you to use the
+Yosys API to implement advanced functionality that would otherwise require
+custom passes written in C++.
 
 
 Getting Pyosys
 --------------
 
-Pyosys supports Python 3.8.1 or higher. You can access Pyosys using one of two
+Pyosys supports CPython 3.8 or higher. You can access Pyosys using one of two
 methods:
 
 1. Compiling Yosys with the Makefile flag ``ENABLE_PYOSYS=1``
@@ -26,8 +30,8 @@ methods:
 
 2. Installing the Pyosys wheels
 
-   On macOS and GNU/Linux (specifically, not musllinux,) you can install
-   pre-built wheels of Yosys using ``pip`` as follows:
+   On macOS and GNU/Linux you can install pre-built wheels of Yosys using
+   ``pip``:
 
    ``python3 -m pip install pyosys``
 
@@ -56,7 +60,7 @@ this import may be preferable for terseness:
 
 Now, scripting is actually quite similar to ``.ys`` and ``.tcl`` script in that
 you can provide mostly text commands. Albeit, you can construct your scripts
-to use Python's amenities including flow controls, loops, and functions:
+to use Python's amenities like conditional execution, loops, and functions:
 
 .. code-block:: python
 
@@ -67,9 +71,9 @@ to use Python's amenities including flow controls, loops, and functions:
    if do_flatten:
       ys.run_pass("flatten")
 
-…but this does not provide anything that Tcl scripts do not provide you with.
-The real power of using Pyosys comes from the fact you can manually instantiate,
-manage, and interact with the design database.
+…but this does not strictly provide anything that Tcl scripts do not provide you
+with. The real power of using Pyosys comes from the fact you can manually
+instantiate, manage, and interact with the design database.
 
 As an example, here is the same script with a manually instantiated design.
 
@@ -79,8 +83,8 @@ As an example, here is the same script with a manually instantiated design.
    :language: python
 
 What's new here is that you can manually inspect the design's database. This
-gives you access to huge chunk of the design database API as in declared in the
-``kernel/rtlil.h`` header.
+gives you access to a huge chunk of the design database API as declared in
+the ``kernel/rtlil.h`` header.
 
 For example, here's how to list the input and output ports of the top module
 of your design:
@@ -95,12 +99,18 @@ of your design:
    C++ data structures in Yosys are bridged to Python such that they have a
    pretty similar API to Python objects, for example:
 
-   - ``std::vector`` supports the same methods as iterables in Python.
-   - ``std::set`` and hashlib ``pool`` support the same methods as ``set``\s in
+   - ``std::vector`` supports the same methods as
+     `iterables <https://docs.python.org/3/glossary.html#term-iterable>`_ in
      Python.
+   - ``std::set`` and hashlib ``pool`` support the same methods as ``set``\s in
+     Python. While ``set`` is ordered, ``pool`` is not and modifications may
+     cause a complete reordering of the set.
    - ``dict`` supports the same methods as ``dict``\s in Python, albeit it is
      unordered, and modifications may cause a complete reordering of the
      dictionary.
+   - ``idict`` uses a custom set of methods because it doesn't map very cleanly
+     to an existing Python data structure. See ``pyosys/hashlib.h`` for more
+     info.
 
    For most operations, the Python equivalents are also supported as arguments
    where they will automatically be cast to the right type, so you do not have
@@ -121,8 +131,8 @@ to modify it, and introduce new elements and/or changes to your design.
 As a demonstrative example, let's assume we want to add an enable line to all
 flip-flops in our fiedler-cooley design.
 
-First of all, we will run :yoscrypt:`synth` to convert all of the logic to Yosys's
-internal cell structure (see :ref:`sec:celllib_gates`):
+First of all, we will run :yoscrypt:`synth` to convert all of the logic to
+Yosys's internal cell structure (see :ref:`sec:celllib_gates`):
 
 .. literalinclude:: /code_examples/pyosys/simple_database.py
    :start-after: # synth
@@ -163,7 +173,8 @@ Next, we can iterate over all constituent cells, and if they are of the type
    :language: python
 
 To verify that you did everything correctly, it is prudent to call ``.check()``
-on the module you're manipulating as follows:
+on the module you're manipulating as follows after you're done with a set of
+changes:
 
 .. literalinclude:: /code_examples/pyosys/simple_database.py
    :start-after: run check
@@ -177,15 +188,15 @@ file and :yoscrypt:`synth_ice40` to map it to the iCE40 architecture.
    :start-after: write output
    :language: python
 
-And voila, you will note that in the intermediate output, all ``always @``
-statements have an ``if (enable)``\.
+And voilà, you will note that in the intermediate output, all ``always @``
+statements should have an ``if (enable)``\.
 
 Encapsulating as Passes
 -----------------------
 
-Just like when writing C++, you can encapsulate behavior in terms of "passes",
-which are the commands you access using ``run_pass``\. This adds it to a global
-registry of commands that you can use using ``run_pass``.
+Just like when writing C++, you can encapsulate routines in terms of "passes",
+which adds your Pass to a global registry of commands accessible using
+``run_pass``\.
 
 .. literalinclude:: /code_examples/pyosys/pass.py
    :language: python

From 0b6adf832b0dc90538c715942731a46b6c3e3f1e Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Fri, 3 Oct 2025 12:57:49 +0200
Subject: [PATCH 671/931] verific: print source location of problematic object
 on import error (if available)

---
 frontends/verific/verific.cc | 42 ++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index b2b85641f..408542131 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -166,6 +166,25 @@ string get_full_netlist_name(Netlist *nl)
 	return nl->CellBaseName();
 }
 
+std::string format_src_location(DesignObj *obj)
+{
+	if (obj == nullptr || obj->Linefile() == nullptr)
+		return std::string();
+#ifdef VERIFIC_LINEFILE_INCLUDES_COLUMNS
+		return stringf("%s:%d.%d-%d.%d", LineFile::GetFileName(obj->Linefile()), obj->Linefile()->GetLeftLine(), obj->Linefile()->GetLeftCol(), obj->Linefile()->GetRightLine(), obj->Linefile()->GetRightCol());
+#else
+		return stringf("%s:%d", LineFile::GetFileName(obj->Linefile()), LineFile::GetLineNo(obj->Linefile()));
+#endif
+}
+
+std::string announce_src_location(DesignObj *obj)
+{
+	std::string loc = format_src_location(obj);
+	if (loc.empty())
+		return std::string();
+	return loc + ": ";
+}
+
 #ifdef VERIFIC_SYSTEMVERILOG_SUPPORT
 class YosysStreamCallBackHandler : public VerificStreamCallBackHandler
 {
@@ -416,13 +435,8 @@ void VerificImporter::import_attributes(dict<RTLIL::IdString, RTLIL::Const> &att
 	MapIter mi;
 	Att *attr;
 
-#ifdef VERIFIC_LINEFILE_INCLUDES_COLUMNS 
 	if (obj->Linefile())
-		attributes[ID::src] = stringf("%s:%d.%d-%d.%d", LineFile::GetFileName(obj->Linefile()), obj->Linefile()->GetLeftLine(), obj->Linefile()->GetLeftCol(), obj->Linefile()->GetRightLine(), obj->Linefile()->GetRightCol());
-#else
-	if (obj->Linefile())
-		attributes[ID::src] = stringf("%s:%d", LineFile::GetFileName(obj->Linefile()), LineFile::GetLineNo(obj->Linefile()));
-#endif
+		attributes[ID::src] = format_src_location(obj);
 
 	FOREACH_ATTRIBUTE(obj, mi, attr) {
 		if (attr->Key()[0] == ' ' || attr->Value() == nullptr)
@@ -508,7 +522,7 @@ void VerificImporter::import_attributes(dict<RTLIL::IdString, RTLIL::Const> &att
 					}
 				}
 				if (p == nullptr)
-					log_error("Expected TypeRange value '%s' to be of form \"<binary>\" or <binary>.\n", v);
+					log_error("%sExpected TypeRange value '%s' to be of form \"<binary>\" or <binary>.\n", announce_src_location(obj), v);
 			}
 #endif
 		}
@@ -988,7 +1002,7 @@ bool VerificImporter::import_netlist_instance_cells(Instance *inst, RTLIL::IdStr
 		else if (net_cin == net_a_msb)
 			cell = module->addSshr(inst_name, IN1, IN2, OUT, true);
 		else
-			log_error("Can't import Verific OPER_SHIFT_RIGHT instance %s: carry_in is neither 0 nor msb of left input\n", inst->Name());
+			log_error("%sCan't import Verific OPER_SHIFT_RIGHT instance %s: carry_in is neither 0 nor msb of left input\n", announce_src_location(inst), inst->Name());
 		import_attributes(cell->attributes, inst);
 		return true;
 	}
@@ -1039,7 +1053,7 @@ bool VerificImporter::import_netlist_instance_cells(Instance *inst, RTLIL::IdStr
 		else if (net_cin->IsPwr())
 			cell = module->addLe(inst_name, IN1, IN2, net_map_at(inst->GetOutput()), SIGNED);
 		else
-			log_error("Can't import Verific OPER_LESSTHAN instance %s: carry_in is neither 0 nor 1\n", inst->Name());
+			log_error("%sCan't import Verific OPER_LESSTHAN instance %s: carry_in is neither 0 nor 1\n", announce_src_location(inst), inst->Name());
 		import_attributes(cell->attributes, inst);
 		return true;
 	}
@@ -1625,7 +1639,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 					bits_in_word = min<int>(bits_in_word, pr->GetInst()->Input2Size());
 					continue;
 				}
-				log_error("Verific RamNet %s is connected to unsupported instance type %s (%s).\n",
+				log_error("%sVerific RamNet %s is connected to unsupported instance type %s (%s).\n", announce_src_location(pr->GetInst()),
 						net->Name(), pr->GetInst()->View()->Owner()->Name(), pr->GetInst()->Name());
 			}
 
@@ -1915,7 +1929,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 		{
 			RTLIL::Memory *memory = module->memories.at(RTLIL::escape_id(inst->GetInput()->Name()), nullptr);
 			if (!memory)
-				log_error("Memory net '%s' missing, possibly no driver, use verific -flatten.\n", inst->GetInput()->Name());
+				log_error("%sMemory net '%s' missing, possibly no driver, use verific -flatten.\n", announce_src_location(inst), inst->GetInput()->Name());
 
 			int numchunks = int(inst->OutputSize()) / memory->width;
 			int chunksbits = ceil_log2(numchunks);
@@ -1946,7 +1960,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 		{
 			RTLIL::Memory *memory = module->memories.at(RTLIL::escape_id(inst->GetOutput()->Name()), nullptr);
 			if (!memory)
-				log_error("Memory net '%s' missing, possibly no driver, use verific -flatten.\n", inst->GetInput()->Name());
+				log_error("%sMemory net '%s' missing, possibly no driver, use verific -flatten.\n", announce_src_location(inst), inst->GetInput()->Name());
 			int numchunks = int(inst->Input2Size()) / memory->width;
 			int chunksbits = ceil_log2(numchunks);
 
@@ -2167,10 +2181,10 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 		if (inst->IsPrimitive())
 		{
 			if (!mode_keep)
-				log_error("Unsupported Verific primitive %s of type %s\n", inst->Name(), inst->View()->Owner()->Name());
+				log_error("%sUnsupported Verific primitive %s of type %s\n", announce_src_location(inst), inst->Name(), inst->View()->Owner()->Name());
 
 			if (!verific_sva_prims.count(inst->Type()))
-				log_warning("Unsupported Verific primitive %s of type %s\n", inst->Name(), inst->View()->Owner()->Name());
+				log_warning("%sUnsupported Verific primitive %s of type %s\n", announce_src_location(inst), inst->Name(), inst->View()->Owner()->Name());
 		}
 
 	import_verific_cells:

From 637665c9d39ad5fe3b8681f69e5e8c6e2009917b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 4 Oct 2025 00:21:39 +0000
Subject: [PATCH 672/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ca589ff91..12d138119 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+260
+YOSYS_VER := 0.57+263
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From da2e021e3b9330c9da7c71fe15e91c634170d2ee Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Mon, 6 Oct 2025 16:49:26 +1300
Subject: [PATCH 673/931] abc9.cc: Use -r for &dch

Avoids "ABC: The command has to terminate. Boxes are not in a topological order." error during `&if`.
---
 passes/techmap/abc9.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/passes/techmap/abc9.cc b/passes/techmap/abc9.cc
index 2cf28f849..8b61a9299 100644
--- a/passes/techmap/abc9.cc
+++ b/passes/techmap/abc9.cc
@@ -38,8 +38,8 @@ struct Abc9Pass : public ScriptPass
 	Abc9Pass() : ScriptPass("abc9", "use ABC9 for technology mapping") { }
 	void on_register() override
 	{
-		RTLIL::constpad["abc9.script.default"] = "+&scorr; &sweep; &dc2; &dch -f; &ps; &if {C} {W} {D} {R} -v; &mfs";
-		RTLIL::constpad["abc9.script.default.area"] = "+&scorr; &sweep; &dc2; &dch -f; &ps; &if {C} {W} {D} {R} -a -v; &mfs";
+		RTLIL::constpad["abc9.script.default"] = "+&scorr; &sweep; &dc2; &dch -f -r; &ps; &if {C} {W} {D} {R} -v; &mfs";
+		RTLIL::constpad["abc9.script.default.area"] = "+&scorr; &sweep; &dc2; &dch -f -r; &ps; &if {C} {W} {D} {R} -a -v; &mfs";
 		RTLIL::constpad["abc9.script.default.fast"] = "+&if {C} {W} {D} {R} -v";
 		// Based on ABC's &flow
 		RTLIL::constpad["abc9.script.flow"] = "+&scorr; &sweep;" \

From 2f81c55389b1b4da66200ec806c6818841db6920 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 3 Oct 2025 01:14:56 +0000
Subject: [PATCH 674/931] Make `mfp` const methods thread-safe.

In particular, we make the parent links relaxed atomics so concurrent
`ifind()` calls are safe.

This may appear to cause a tiny performance regression but as discussed
in https://yosyshq.discourse.group/t/parallel-optmergepass-implementation/87/16
this is probably just noise.
---
 kernel/hashlib.h      | 58 ++++++++++++++++++++++++++++++++-----------
 kernel/yosys_common.h |  1 +
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index 65c7ed4cc..ee27c85d6 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -13,6 +13,7 @@
 #define HASHLIB_H
 
 #include <array>
+#include <atomic>
 #include <stdexcept>
 #include <algorithm>
 #include <optional>
@@ -1355,8 +1356,18 @@ public:
 template<typename K, typename OPS>
 class mfp
 {
-	mutable idict<K, 0, OPS> database;
-	mutable std::vector<int> parents;
+	idict<K, 0, OPS> database;
+	class AtomicParent {
+	public:
+		explicit AtomicParent(int p) : parent(p) {}
+		AtomicParent(const AtomicParent &other) : parent(other.get()) {}
+		AtomicParent &operator=(const AtomicParent &other) { set(other.get()); return *this; }
+		int get() const { return parent.load(std::memory_order_relaxed); }
+		void set(int p) { parent.store(p, std::memory_order_relaxed); }
+	private:
+		std::atomic<int> parent;
+	};
+	std::vector<AtomicParent> parents;
 
 public:
 	typedef typename idict<K, 0>::const_iterator const_iterator;
@@ -1367,12 +1378,14 @@ public:
 
 	// Finds a given element's index. If it isn't in the data structure,
 	// it is added as its own set
-	int operator()(const K &key) const
+	int operator()(const K &key)
 	{
 		int i = database(key);
 		// If the lookup caused the database to grow,
 		// also add a corresponding entry in parents initialized to -1 (no parent)
-		parents.resize(database.size(), -1);
+		if (parents.size() < database.size()) {
+			parents.emplace_back(-1);
+		}
 		return i;
 	}
 
@@ -1382,21 +1395,38 @@ public:
 		return database[index];
 	}
 
+	// Why this method is correct for concurent ifind() calls:
+	// Consider the mfp state after the last non-const method call before
+	// a particular call to ifind(i). In this state, i's parent chain leads
+	// to some root R. Let S be the set of integers s such that ifind(s) = R
+	// in this state. Let 'orig_parents' be the value of 'parents' in this state.
+	//
+	// Now consider the concurrent calls to ifind(s), s ∈ S, before the next non-const method
+	// call. Consider the atomic writes performed by various ifind() calls, in any causally
+	// consistent order. The first atomic write can only set parents[k] to R, because the
+	// atomic read of parents[p] in the first while loop can only observe the value
+	// 'orig_parents[p]'. Subsequent writes can also only set parents[k] to R, because the
+	// parents[p] reads either observe 'orig_parents[p]' or R (and observing R ends the first
+	// while loop immediately). Thus all parents[p] reads observe either 'orig_parents[p]'
+	// or R, so ifind() always returns R.
 	int ifind(int i) const
 	{
 		int p = i, k = i;
 
-		while (parents[p] != -1)
-			p = parents[p];
-
+		while (true) {
+			int pp = parents[p].get();
+			if (pp < 0)
+				break;
+			p = pp;
+		}
 		// p is now the representative of i
 		// Now we traverse from i up to the representative again
 		// and make p the parent of all the nodes along the way.
 		// This is a side effect and doesn't affect the return value.
 		// It speeds up future find operations
 		while (k != p) {
-			int next_k = parents[k];
-			parents[k] = p;
+			int next_k = parents[k].get();
+			const_cast<AtomicParent*>(&parents[k])->set(p);
 			k = next_k;
 		}
 
@@ -1411,7 +1441,7 @@ public:
 		j = ifind(j);
 
 		if (i != j)
-			parents[i] = j;
+			parents[i].set(j);
 	}
 
 	void ipromote(int i)
@@ -1419,15 +1449,15 @@ public:
 		int k = i;
 
 		while (k != -1) {
-			int next_k = parents[k];
-			parents[k] = i;
+			int next_k = parents[k].get();
+			parents[k].set(i);
 			k = next_k;
 		}
 
-		parents[i] = -1;
+		parents[i].set(-1);
 	}
 
-	int lookup(const K &a) const
+	int lookup(const K &a)
 	{
 		return ifind((*this)(a));
 	}
diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index d69e02a59..8fea1b2c3 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -21,6 +21,7 @@
 #define YOSYS_COMMON_H
 
 #include <array>
+#include <atomic>
 #include <map>
 #include <set>
 #include <tuple>

From b8b0f80f79ae5ed228134e7c3842c0a231c81e9d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Oct 2025 00:23:02 +0000
Subject: [PATCH 675/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 12d138119..8bfafc0e2 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+263
+YOSYS_VER := 0.57+265
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 2c94ca85d9421634d2a7a14094f5ec1a0b24180d Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Tue, 7 Oct 2025 17:35:32 +0200
Subject: [PATCH 676/931] abc_new: Avoid bufnorm helper cell churn

We were performing the helper passes `abc9_ops -replace_zbufs` and
`abc9_ops -restore_zbufs` for every module, but those passes act on the
full design (and can't be applied entirely selectively due to entering
and leaving bufnorm).

This lead to an explosive creation of a lot of redundant bufnorm helper
cells that would have been cleaned up by `clean` but that never ran.
Instead we now run each helper pass once, one before and one after
iterating over the selected modules. This limits the number of bufnorm
helper cells.
---
 passes/cmds/portarcs.cc    |  2 +-
 passes/techmap/abc9_ops.cc |  2 +-
 passes/techmap/abc_new.cc  | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/passes/cmds/portarcs.cc b/passes/cmds/portarcs.cc
index 8cc5d1236..4344d6cb2 100644
--- a/passes/cmds/portarcs.cc
+++ b/passes/cmds/portarcs.cc
@@ -125,7 +125,7 @@ struct PortarcsPass : Pass {
 
 				for (auto cell : m->cells())
 				// Ignore all bufnorm helper cells
-				if (!cell->type.in(ID($buf), ID($input_port), ID($connect))) {
+				if (!cell->type.in(ID($buf), ID($input_port), ID($connect), ID($tribuf))) {
 					auto tdata = tinfo.find(cell->type);
 					if (tdata == tinfo.end())
 						log_cmd_error("Missing timing data for module '%s'.\n", log_id(cell->type));
diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index 2e762d7b9..373d5d15e 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -1605,6 +1605,7 @@ static void replace_zbufs(Design *design)
 
 		mod->bufNormalize();
 	}
+	design->bufNormalize(false);
 }
 
 
@@ -1624,7 +1625,6 @@ static void restore_zbufs(Design *design)
 			mod->addBuf(NEW_ID, Const(State::Sz, GetSize(sig_y)), sig_y);
 			mod->remove(cell);
 		}
-		mod->bufNormalize();
 	}
 }
 
diff --git a/passes/techmap/abc_new.cc b/passes/techmap/abc_new.cc
index c48295916..21ffa075b 100644
--- a/passes/techmap/abc_new.cc
+++ b/passes/techmap/abc_new.cc
@@ -141,7 +141,11 @@ struct AbcNewPass : public ScriptPass {
 				selected_modules = order_modules(active_design,
 												 active_design->selected_whole_modules_warn());
 				active_design->push_empty_selection();
-			} else {
+			}
+
+			run("abc9_ops -replace_zbufs");
+
+			if (help_mode) {
 				selected_modules = {nullptr};
 				run("foreach module in selection");
 			}
@@ -169,13 +173,10 @@ struct AbcNewPass : public ScriptPass {
 				}
 
 				run(stringf("  abc9_ops -write_box %s/input.box", tmpdir));
-				run("  abc9_ops -replace_zbufs");
 				run(stringf("  write_xaiger2 -mapping_prep -map2 %s/input.map2 %s/input.xaig", tmpdir, tmpdir));
 				run(stringf("  abc9_exe %s -cwd %s -box %s/input.box", exe_options, tmpdir, tmpdir));
 				run(stringf("  read_xaiger2 -sc_mapping -module_name %s -map2 %s/input.map2 %s/output.aig",
 							modname.c_str(), tmpdir.c_str(), tmpdir.c_str()));
-				run("  abc9_ops -restore_zbufs");
-
 				if (!help_mode && mod->has_attribute(ID(abc9_script))) {
 					if (script_save.empty())
 						active_design->scratchpad_unset("abc9.script");
@@ -196,6 +197,8 @@ struct AbcNewPass : public ScriptPass {
 				}
 			}
 
+			run("abc9_ops -restore_zbufs");
+
 			if (!help_mode) {
 				active_design->pop_selection();
 			}

From 47ca09a0160b3901e36409a9b82088153b9075e6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 8 Oct 2025 00:22:29 +0000
Subject: [PATCH 677/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8bfafc0e2..da6aa71fa 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+265
+YOSYS_VER := 0.57+268
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 157aabb5831cc77d08346001c4a085f188d7c736 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 8 Oct 2025 07:51:14 +0200
Subject: [PATCH 678/931] Release version 0.58

---
 CHANGELOG           | 18 +++++++++++++++++-
 Makefile            |  4 ++--
 docs/source/conf.py |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 468724e81..9139147fe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,24 @@
 List of major changes and improvements between releases
 =======================================================
 
-Yosys 0.57 .. Yosys 0.58-dev
+Yosys 0.57 .. Yosys 0.58
 --------------------------
+ * Various
+    - Run ABC passes in parallel.
+    - Extending support for buffer normalization.
+    - Overhaul of logging APIs.
+    - read_blif: Represent sequential elements with gate cells.
+    - Support multiple lib files in abc9_exe.
+
+ * New commands and options
+    - Added "-wireshape" option to "show" command to allow
+      control the shape of wire nodes.
+    - Added "-relativeshare" option to "read_verilog", "synth"
+      and "techmap" pass for synthesis reproducibility testing.
+    - "write_rtlil" pass no longer sorts design, added "-sort"
+      option to match old behavior
+    - Added "-sva-continue-on-err" to "verific" pass to allow
+      processing designs that includes unsupported SVA.
 
 Yosys 0.56 .. Yosys 0.57
 --------------------------
diff --git a/Makefile b/Makefile
index da6aa71fa..ef8eacdae 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.57+268
+YOSYS_VER := 0.58
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -187,7 +187,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 3aca860.. | wc -l`/;" Makefile
+#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 3aca860.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5b93e2e70..49f8f5eab 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -6,7 +6,7 @@ import os
 project = 'YosysHQ Yosys'
 author = 'YosysHQ GmbH'
 copyright ='2025 YosysHQ GmbH'
-yosys_ver = "0.57"
+yosys_ver = "0.58"
 
 # select HTML theme
 html_theme = 'furo-ys'

From 1d2d777678f9f0856cb9d8a51d6d6447d4026c2f Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 8 Oct 2025 09:25:33 +0200
Subject: [PATCH 679/931] Next dev cycle

---
 CHANGELOG | 3 +++
 Makefile  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9139147fe..8ceefee41 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 List of major changes and improvements between releases
 =======================================================
 
+Yosys 0.58 .. Yosys 0.59-dev
+--------------------------
+
 Yosys 0.57 .. Yosys 0.58
 --------------------------
  * Various
diff --git a/Makefile b/Makefile
index ef8eacdae..5901e91f8 100644
--- a/Makefile
+++ b/Makefile
@@ -164,7 +164,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58
+YOSYS_VER := 0.58+0
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -187,7 +187,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 3aca860.. | wc -l`/;" Makefile
+	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 157aabb.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 

From 89f32a415b2fcd9fdf08f735fae043fac9e1ab4a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 9 Oct 2025 00:22:39 +0000
Subject: [PATCH 680/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d68fdfdad..b744763c8 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+0
+YOSYS_VER := 0.58+35
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 1a0b5d8ea70391100e5d3b7b08bc8b228f4627ee Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 24 May 2024 03:42:12 +1200
Subject: [PATCH 681/931] write_btor: Include `$assert` and `$assume` cells in
 -ywmap output

---
 backends/btor/btor.cc | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/backends/btor/btor.cc b/backends/btor/btor.cc
index bba7249c7..ca7cf8a7f 100644
--- a/backends/btor/btor.cc
+++ b/backends/btor/btor.cc
@@ -98,6 +98,8 @@ struct BtorWorker
 	vector<ywmap_btor_sig> ywmap_states;
 	dict<SigBit, int> ywmap_clock_bits;
 	dict<SigBit, int> ywmap_clock_inputs;
+	vector<Cell *> ywmap_asserts;
+	vector<Cell *> ywmap_assumes;
 
 
 	PrettyJson ywmap_json;
@@ -1280,6 +1282,8 @@ struct BtorWorker
 				btorf("%d or %d %d %d\n", nid_a_or_not_en, sid, nid_a, nid_not_en);
 				btorf("%d constraint %d\n", nid, nid_a_or_not_en);
 
+				if (ywmap_json.active()) ywmap_assumes.emplace_back(cell);
+
 				btorf_pop(log_id(cell));
 			}
 
@@ -1304,6 +1308,8 @@ struct BtorWorker
 					} else {
 						int nid = next_nid++;
 						btorf("%d bad %d%s\n", nid, nid_en_and_not_a, getinfo(cell, true));
+
+						if (ywmap_json.active()) ywmap_asserts.emplace_back(cell);
 					}
 				}
 
@@ -1461,6 +1467,7 @@ struct BtorWorker
 				log_assert(cursor == 0);
 				log_assert(GetSize(todo) == 1);
 				btorf("%d bad %d\n", nid, todo[cursor]);
+				// What do we do with ywmap_asserts when using single_bad?
 			}
 		}
 
@@ -1526,6 +1533,18 @@ struct BtorWorker
 				emit_ywmap_btor_sig(entry);
 			ywmap_json.end_array();
 
+			ywmap_json.name("asserts");
+			ywmap_json.begin_array();
+			for (Cell *cell : ywmap_asserts)
+				ywmap_json.value(witness_path(cell));
+			ywmap_json.end_array();
+
+			ywmap_json.name("assumes");
+			ywmap_json.begin_array();
+			for (Cell *cell : ywmap_assumes)
+				ywmap_json.value(witness_path(cell));
+			ywmap_json.end_array();
+
 			ywmap_json.end_object();
 		}
 	}

From 02e40e811823b3165e4fbae15a3bb17554cb8ae2 Mon Sep 17 00:00:00 2001
From: YRabbit <rabbit@yrabbit.cyou>
Date: Sat, 11 Oct 2025 21:12:35 +1000
Subject: [PATCH 682/931] Gowin. Reduce the range of flip-flop types.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

UG303-1.0E_Arora Ⅴ Configurable Function Unit (CFU) User Guide.pdf
specifies that the only flip-flop types supported in GW5 are DFFSE,
DFFRE, DFFPE, and DFFCE.

However, the bit streams generated by the vendor IDE also contain DFF
flip-flops, which are probably the result of optimisation, so we leave
them in the list of permitted items, but add a flag that will allow the
generation of completely correct output files, acceptable for further P&
R using vendor tools (they will not allow the use of flip-flops other
than the four specified in the netlist).

In the GW5 SemiDual Port BSRAM series, the primitive does not have
RESETA and RESETB ports—they are replaced by the RESET port, so we
separate the files for BSRAM generation, especially since in the future
we may have to take into account other, as yet unexplored, differences
in BSRAM.

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
---
 techlibs/gowin/Makefile.inc     |   1 +
 techlibs/gowin/brams_map_gw5a.v | 399 ++++++++++++++++++++++++++++++++
 techlibs/gowin/synth_gowin.cc   |  28 ++-
 3 files changed, 422 insertions(+), 6 deletions(-)
 create mode 100644 techlibs/gowin/brams_map_gw5a.v

diff --git a/techlibs/gowin/Makefile.inc b/techlibs/gowin/Makefile.inc
index 9ec7dce4d..df1b79317 100644
--- a/techlibs/gowin/Makefile.inc
+++ b/techlibs/gowin/Makefile.inc
@@ -8,6 +8,7 @@ $(eval $(call add_share_file,share/gowin,techlibs/gowin/cells_xtra_gw2a.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/cells_xtra_gw5a.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/arith_map.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/brams_map.v))
+$(eval $(call add_share_file,share/gowin,techlibs/gowin/brams_map_gw5a.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/brams.txt))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/lutrams_map.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/lutrams.txt))
diff --git a/techlibs/gowin/brams_map_gw5a.v b/techlibs/gowin/brams_map_gw5a.v
new file mode 100644
index 000000000..246146ee5
--- /dev/null
+++ b/techlibs/gowin/brams_map_gw5a.v
@@ -0,0 +1,399 @@
+`define DEF_FUNCS \
+	function [255:0] init_slice_x8; \
+		input integer idx; \
+		integer i; \
+		for (i = 0; i < 32; i = i + 1) begin \
+			init_slice_x8[i*8+:8] = INIT[(idx * 32 + i) * 9+:8]; \
+		end \
+	endfunction \
+	function [287:0] init_slice_x9; \
+		input integer idx; \
+		init_slice_x9 = INIT[idx * 288+:288]; \
+	endfunction \
+
+`define x8_width(width) (width / 9 * 8 + width % 9)
+`define x8_rd_data(data) {1'bx, data[31:24], 1'bx, data[23:16], 1'bx, data[15:8], 1'bx, data[7:0]}
+`define x8_wr_data(data) {data[34:27], data[25:18], data[16:9], data[7:0]}
+`define addrbe_always(width, addr) (width < 18 ? addr :  width == 18 ? {addr[13:4], 4'b0011} : {addr[13:5], 5'b01111})
+
+
+`define INIT(func) \
+	.INIT_RAM_00(func('h00)), \
+	.INIT_RAM_01(func('h01)), \
+	.INIT_RAM_02(func('h02)), \
+	.INIT_RAM_03(func('h03)), \
+	.INIT_RAM_04(func('h04)), \
+	.INIT_RAM_05(func('h05)), \
+	.INIT_RAM_06(func('h06)), \
+	.INIT_RAM_07(func('h07)), \
+	.INIT_RAM_08(func('h08)), \
+	.INIT_RAM_09(func('h09)), \
+	.INIT_RAM_0A(func('h0a)), \
+	.INIT_RAM_0B(func('h0b)), \
+	.INIT_RAM_0C(func('h0c)), \
+	.INIT_RAM_0D(func('h0d)), \
+	.INIT_RAM_0E(func('h0e)), \
+	.INIT_RAM_0F(func('h0f)), \
+	.INIT_RAM_10(func('h10)), \
+	.INIT_RAM_11(func('h11)), \
+	.INIT_RAM_12(func('h12)), \
+	.INIT_RAM_13(func('h13)), \
+	.INIT_RAM_14(func('h14)), \
+	.INIT_RAM_15(func('h15)), \
+	.INIT_RAM_16(func('h16)), \
+	.INIT_RAM_17(func('h17)), \
+	.INIT_RAM_18(func('h18)), \
+	.INIT_RAM_19(func('h19)), \
+	.INIT_RAM_1A(func('h1a)), \
+	.INIT_RAM_1B(func('h1b)), \
+	.INIT_RAM_1C(func('h1c)), \
+	.INIT_RAM_1D(func('h1d)), \
+	.INIT_RAM_1E(func('h1e)), \
+	.INIT_RAM_1F(func('h1f)), \
+	.INIT_RAM_20(func('h20)), \
+	.INIT_RAM_21(func('h21)), \
+	.INIT_RAM_22(func('h22)), \
+	.INIT_RAM_23(func('h23)), \
+	.INIT_RAM_24(func('h24)), \
+	.INIT_RAM_25(func('h25)), \
+	.INIT_RAM_26(func('h26)), \
+	.INIT_RAM_27(func('h27)), \
+	.INIT_RAM_28(func('h28)), \
+	.INIT_RAM_29(func('h29)), \
+	.INIT_RAM_2A(func('h2a)), \
+	.INIT_RAM_2B(func('h2b)), \
+	.INIT_RAM_2C(func('h2c)), \
+	.INIT_RAM_2D(func('h2d)), \
+	.INIT_RAM_2E(func('h2e)), \
+	.INIT_RAM_2F(func('h2f)), \
+	.INIT_RAM_30(func('h30)), \
+	.INIT_RAM_31(func('h31)), \
+	.INIT_RAM_32(func('h32)), \
+	.INIT_RAM_33(func('h33)), \
+	.INIT_RAM_34(func('h34)), \
+	.INIT_RAM_35(func('h35)), \
+	.INIT_RAM_36(func('h36)), \
+	.INIT_RAM_37(func('h37)), \
+	.INIT_RAM_38(func('h38)), \
+	.INIT_RAM_39(func('h39)), \
+	.INIT_RAM_3A(func('h3a)), \
+	.INIT_RAM_3B(func('h3b)), \
+	.INIT_RAM_3C(func('h3c)), \
+	.INIT_RAM_3D(func('h3d)), \
+	.INIT_RAM_3E(func('h3e)), \
+	.INIT_RAM_3F(func('h3f)),
+
+module $__GOWIN_SP_ (...);
+
+parameter INIT = 0;
+parameter OPTION_RESET_MODE = "SYNC";
+
+parameter PORT_A_WIDTH = 36;
+parameter PORT_A_OPTION_WRITE_MODE = 0;
+
+input PORT_A_CLK;
+input PORT_A_CLK_EN;
+input PORT_A_WR_EN;
+input PORT_A_RD_SRST;
+input PORT_A_RD_ARST;
+input [13:0] PORT_A_ADDR;
+input [PORT_A_WIDTH-1:0] PORT_A_WR_DATA;
+output [PORT_A_WIDTH-1:0] PORT_A_RD_DATA;
+
+`DEF_FUNCS
+
+wire RST = OPTION_RESET_MODE == "SYNC" ? PORT_A_RD_SRST : PORT_A_RD_ARST;
+wire [13:0] AD = `addrbe_always(PORT_A_WIDTH, PORT_A_ADDR);
+
+generate
+
+if (PORT_A_WIDTH < 9) begin
+
+	wire [31:0] DI = `x8_wr_data(PORT_A_WR_DATA);
+	wire [31:0] DO;
+
+	assign PORT_A_RD_DATA = `x8_rd_data(DO);
+
+	SP #(
+		`INIT(init_slice_x8)
+		.READ_MODE(1'b0),
+		.WRITE_MODE(PORT_A_OPTION_WRITE_MODE),
+		.BIT_WIDTH(`x8_width(PORT_A_WIDTH)),
+		.BLK_SEL(3'b000),
+		.RESET_MODE(OPTION_RESET_MODE),
+	) _TECHMAP_REPLACE_ (
+		.BLKSEL(3'b000),
+		.CLK(PORT_A_CLK),
+		.CE(PORT_A_CLK_EN),
+		.WRE(PORT_A_WR_EN),
+		.RESET(RST),
+		.OCE(1'b1),
+		.AD(AD),
+		.DI(DI),
+		.DO(DO),
+	);
+
+end else begin
+
+	wire [35:0] DI = PORT_A_WR_DATA;
+	wire [35:0] DO;
+
+	assign PORT_A_RD_DATA = DO;
+
+	SPX9 #(
+		`INIT(init_slice_x9)
+		.READ_MODE(1'b0),
+		.WRITE_MODE(PORT_A_OPTION_WRITE_MODE),
+		.BIT_WIDTH(PORT_A_WIDTH),
+		.BLK_SEL(3'b000),
+		.RESET_MODE(OPTION_RESET_MODE),
+	) _TECHMAP_REPLACE_ (
+		.BLKSEL(3'b000),
+		.CLK(PORT_A_CLK),
+		.CE(PORT_A_CLK_EN),
+		.WRE(PORT_A_WR_EN),
+		.RESET(RST),
+		.OCE(1'b1),
+		.AD(AD),
+		.DI(DI),
+		.DO(DO),
+	);
+
+end
+
+endgenerate
+
+endmodule
+
+
+module $__GOWIN_DP_ (...);
+
+parameter INIT = 0;
+parameter OPTION_RESET_MODE = "SYNC";
+
+parameter PORT_A_WIDTH = 18;
+parameter PORT_A_OPTION_WRITE_MODE = 0;
+
+parameter PORT_B_WIDTH = 18;
+parameter PORT_B_OPTION_WRITE_MODE = 0;
+
+input PORT_A_CLK;
+input PORT_A_CLK_EN;
+input PORT_A_WR_EN;
+input PORT_A_RD_SRST;
+input PORT_A_RD_ARST;
+input [13:0] PORT_A_ADDR;
+input [PORT_A_WIDTH-1:0] PORT_A_WR_DATA;
+output [PORT_A_WIDTH-1:0] PORT_A_RD_DATA;
+
+input PORT_B_CLK;
+input PORT_B_CLK_EN;
+input PORT_B_WR_EN;
+input PORT_B_RD_SRST;
+input PORT_B_RD_ARST;
+input [13:0] PORT_B_ADDR;
+input [PORT_A_WIDTH-1:0] PORT_B_WR_DATA;
+output [PORT_A_WIDTH-1:0] PORT_B_RD_DATA;
+
+`DEF_FUNCS
+
+wire RSTA = OPTION_RESET_MODE == "SYNC" ? PORT_A_RD_SRST : PORT_A_RD_ARST;
+wire RSTB = OPTION_RESET_MODE == "SYNC" ? PORT_B_RD_SRST : PORT_B_RD_ARST;
+wire [13:0] ADA = `addrbe_always(PORT_A_WIDTH, PORT_A_ADDR);
+wire [13:0] ADB = `addrbe_always(PORT_B_WIDTH, PORT_B_ADDR);
+
+generate
+
+if (PORT_A_WIDTH < 9 || PORT_B_WIDTH < 9) begin
+
+	wire [15:0] DIA = `x8_wr_data(PORT_A_WR_DATA);
+	wire [15:0] DIB = `x8_wr_data(PORT_B_WR_DATA);
+	wire [15:0] DOA;
+	wire [15:0] DOB;
+
+	assign PORT_A_RD_DATA = `x8_rd_data(DOA);
+	assign PORT_B_RD_DATA = `x8_rd_data(DOB);
+
+	DPB #(
+		`INIT(init_slice_x8)
+		.READ_MODE0(1'b0),
+		.READ_MODE1(1'b0),
+		.WRITE_MODE0(PORT_A_OPTION_WRITE_MODE),
+		.WRITE_MODE1(PORT_B_OPTION_WRITE_MODE),
+		.BIT_WIDTH_0(`x8_width(PORT_A_WIDTH)),
+		.BIT_WIDTH_1(`x8_width(PORT_B_WIDTH)),
+		.BLK_SEL_0(3'b000),
+		.BLK_SEL_1(3'b000),
+		.RESET_MODE(OPTION_RESET_MODE),
+	) _TECHMAP_REPLACE_ (
+		.BLKSELA(3'b000),
+		.BLKSELB(3'b000),
+
+		.CLKA(PORT_A_CLK),
+		.CEA(PORT_A_CLK_EN),
+		.WREA(PORT_A_WR_EN),
+		.RESETA(RSTA),
+		.OCEA(1'b1),
+		.ADA(ADA),
+		.DIA(DIA),
+		.DOA(DOA),
+
+		.CLKB(PORT_B_CLK),
+		.CEB(PORT_B_CLK_EN),
+		.WREB(PORT_B_WR_EN),
+		.RESETB(RSTB),
+		.OCEB(1'b1),
+		.ADB(ADB),
+		.DIB(DIB),
+		.DOB(DOB),
+	);
+
+end else begin
+
+	wire [17:0] DIA = PORT_A_WR_DATA;
+	wire [17:0] DIB = PORT_B_WR_DATA;
+	wire [17:0] DOA;
+	wire [17:0] DOB;
+
+	assign PORT_A_RD_DATA = DOA;
+	assign PORT_B_RD_DATA = DOB;
+
+	DPX9B #(
+		`INIT(init_slice_x9)
+		.READ_MODE0(1'b0),
+		.READ_MODE1(1'b0),
+		.WRITE_MODE0(PORT_A_OPTION_WRITE_MODE),
+		.WRITE_MODE1(PORT_B_OPTION_WRITE_MODE),
+		.BIT_WIDTH_0(PORT_A_WIDTH),
+		.BIT_WIDTH_1(PORT_B_WIDTH),
+		.BLK_SEL_0(3'b000),
+		.BLK_SEL_1(3'b000),
+		.RESET_MODE(OPTION_RESET_MODE),
+	) _TECHMAP_REPLACE_ (
+		.BLKSELA(3'b000),
+		.BLKSELB(3'b000),
+
+		.CLKA(PORT_A_CLK),
+		.CEA(PORT_A_CLK_EN),
+		.WREA(PORT_A_WR_EN),
+		.RESETA(RSTA),
+		.OCEA(1'b1),
+		.ADA(ADA),
+		.DIA(DIA),
+		.DOA(DOA),
+
+		.CLKB(PORT_B_CLK),
+		.CEB(PORT_B_CLK_EN),
+		.WREB(PORT_B_WR_EN),
+		.RESETB(RSTB),
+		.OCEB(1'b1),
+		.ADB(ADB),
+		.DIB(DIB),
+		.DOB(DOB),
+	);
+
+end
+
+endgenerate
+
+endmodule
+
+
+module $__GOWIN_SDP_ (...);
+
+parameter INIT = 0;
+parameter OPTION_RESET_MODE = "SYNC";
+
+parameter PORT_R_WIDTH = 18;
+parameter PORT_W_WIDTH = 18;
+
+input PORT_R_CLK;
+input PORT_R_CLK_EN;
+input PORT_R_RD_SRST;
+input PORT_R_RD_ARST;
+input [13:0] PORT_R_ADDR;
+output [PORT_R_WIDTH-1:0] PORT_R_RD_DATA;
+
+input PORT_W_CLK;
+input PORT_W_CLK_EN;
+input PORT_W_WR_EN;
+input [13:0] PORT_W_ADDR;
+input [PORT_W_WIDTH-1:0] PORT_W_WR_DATA;
+
+`DEF_FUNCS
+
+wire RST = OPTION_RESET_MODE == "SYNC" ? PORT_R_RD_SRST : PORT_R_RD_ARST;
+wire [13:0] ADW = `addrbe_always(PORT_W_WIDTH, PORT_W_ADDR);
+wire WRE = PORT_W_CLK_EN & PORT_W_WR_EN;
+
+generate
+
+if (PORT_W_WIDTH < 9 || PORT_R_WIDTH < 9) begin
+
+	wire [31:0] DI = `x8_wr_data(PORT_W_WR_DATA);
+	wire [31:0] DO;
+
+	assign PORT_R_RD_DATA = `x8_rd_data(DO);
+
+	SDPB #(
+		`INIT(init_slice_x8)
+		.READ_MODE(1'b0),
+		.BIT_WIDTH_0(`x8_width(PORT_W_WIDTH)),
+		.BIT_WIDTH_1(`x8_width(PORT_R_WIDTH)),
+		.BLK_SEL_0(3'b000),
+		.BLK_SEL_1(3'b000),
+		.RESET_MODE(OPTION_RESET_MODE),
+	) _TECHMAP_REPLACE_ (
+		.BLKSELA(3'b000),
+		.BLKSELB(3'b000),
+
+		.CLKA(PORT_W_CLK),
+		.CEA(WRE),
+		.ADA(ADW),
+		.DI(DI),
+
+		.CLKB(PORT_R_CLK),
+		.CEB(PORT_R_CLK_EN),
+		.RESET(RST),
+		.OCE(1'b1),
+		.ADB(PORT_R_ADDR),
+		.DO(DO),
+	);
+
+end else begin
+
+	wire [35:0] DI = PORT_W_WR_DATA;
+	wire [35:0] DO;
+
+	assign PORT_R_RD_DATA = DO;
+
+	SDPX9B #(
+		`INIT(init_slice_x9)
+		.READ_MODE(1'b0),
+		.BIT_WIDTH_0(PORT_W_WIDTH),
+		.BIT_WIDTH_1(PORT_R_WIDTH),
+		.BLK_SEL_0(3'b000),
+		.BLK_SEL_1(3'b000),
+		.RESET_MODE(OPTION_RESET_MODE),
+	) _TECHMAP_REPLACE_ (
+		.BLKSELA(3'b000),
+		.BLKSELB(3'b000),
+
+		.CLKA(PORT_W_CLK),
+		.CEA(WRE),
+		.ADA(ADW),
+		.DI(DI),
+
+		.CLKB(PORT_R_CLK),
+		.CEB(PORT_R_CLK_EN),
+		.RESET(RST),
+		.OCE(1'b1),
+		.ADB(PORT_R_ADDR),
+		.DO(DO),
+	);
+
+end
+
+endgenerate
+
+endmodule
diff --git a/techlibs/gowin/synth_gowin.cc b/techlibs/gowin/synth_gowin.cc
index 8f3553df6..03766ed36 100644
--- a/techlibs/gowin/synth_gowin.cc
+++ b/techlibs/gowin/synth_gowin.cc
@@ -57,6 +57,9 @@ struct SynthGowinPass : public ScriptPass
 		log("    -nodffe\n");
 		log("        do not use flipflops with CE in output netlist\n");
 		log("\n");
+		log("    -strict-gw5a-dffs\n");
+		log("        use only DFFSE/DFFRE/DFFPE/DFFCE flipflops for the GW5A family\n");
+		log("\n");
 		log("    -nobram\n");
 		log("        do not use BRAM cells in output netlist\n");
 		log("\n");
@@ -97,7 +100,7 @@ struct SynthGowinPass : public ScriptPass
 	}
 
 	string top_opt, vout_file, json_file, family;
-	bool retime, nobram, nolutram, flatten, nodffe, nowidelut, abc9, noiopads, noalu, no_rw_check;
+	bool retime, nobram, nolutram, flatten, nodffe, strict_gw5a_dffs, nowidelut, abc9, noiopads, noalu, no_rw_check;
 
 	void clear_flags() override
 	{
@@ -109,6 +112,7 @@ struct SynthGowinPass : public ScriptPass
 		flatten = true;
 		nobram = false;
 		nodffe = false;
+		strict_gw5a_dffs = false;
 		nolutram = false;
 		nowidelut = false;
 		abc9 = true;
@@ -165,6 +169,10 @@ struct SynthGowinPass : public ScriptPass
 				nodffe = true;
 				continue;
 			}
+			if (args[argidx] == "-strict-gw5a-dffs") {
+				strict_gw5a_dffs = true;
+				continue;
+			}
 			if (args[argidx] == "-noflatten") {
 				flatten = false;
 				continue;
@@ -248,7 +256,7 @@ struct SynthGowinPass : public ScriptPass
 					args += " -no-auto-distributed";
 			}
 			run("memory_libmap -lib +/gowin/lutrams.txt -lib +/gowin/brams.txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
-			run("techmap -map +/gowin/lutrams_map.v -map +/gowin/brams_map.v");
+			run(stringf("techmap -map +/gowin/lutrams_map.v -map +/gowin/brams_map%s.v", family == "gw5a" ? "_gw5a" : ""));
 		}
 
 		if (check_label("map_ffram"))
@@ -276,10 +284,18 @@ struct SynthGowinPass : public ScriptPass
 		if (check_label("map_ffs"))
 		{
 			run("opt_clean");
-			if (nodffe)
-				run("dfflegalize -cell $_DFF_?_ 0 -cell $_SDFF_?P?_ r -cell $_DFF_?P?_ r");
-			else
-				run("dfflegalize -cell $_DFF_?_ 0 -cell $_DFFE_?P_ 0 -cell $_SDFF_?P?_ r -cell $_SDFFE_?P?P_ r -cell $_DFF_?P?_ r -cell $_DFFE_?P?P_ r");
+			if (family == "gw5a") {
+				if (strict_gw5a_dffs) {
+					run("dfflegalize -cell $_SDFFE_PP?P_ r -cell $_DFFE_PP?P_ r");
+				} else {
+					run("dfflegalize -cell $_DFF_?_ 0 -cell $_SDFFE_PP?P_ r -cell $_DFFE_PP?P_ r");
+				}
+			} else {
+				if (nodffe)
+					run("dfflegalize -cell $_DFF_?_ 0 -cell $_SDFF_?P?_ r -cell $_DFF_?P?_ r");
+				else
+					run("dfflegalize -cell $_DFF_?_ 0 -cell $_DFFE_?P_ 0 -cell $_SDFF_?P?_ r -cell $_SDFFE_?P?P_ r -cell $_DFF_?P?_ r -cell $_DFFE_?P?P_ r");
+			}
 			run("techmap -map +/gowin/cells_map.v");
 			run("opt_expr -mux_undef");
 			run("simplemap");

From 2f8f421dee5d71a3c2c6ca0dbf09610b2b4d0e84 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 13 Oct 2025 09:47:18 +0200
Subject: [PATCH 683/931] verifix: fix bits() deprecation warnings

---
 frontends/verific/verific.cc    | 21 ++++++++++-----------
 frontends/verific/verificsva.cc |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 408542131..e56fd9e50 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -1663,7 +1663,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 						if (*ascii_initdata == 0)
 							break;
 						if (*ascii_initdata == '0' || *ascii_initdata == '1') {
-							initval.bits()[bit_idx] = (*ascii_initdata == '0') ? State::S0 : State::S1;
+							initval.set(bit_idx, (*ascii_initdata == '0') ? State::S0 : State::S1);
 							initval_valid = true;
 						}
 						ascii_initdata++;
@@ -1787,9 +1787,9 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 
 					if (init_nets.count(net)) {
 						if (init_nets.at(net) == '0')
-							initval.bits().at(bitidx) = State::S0;
+							initval.set(bitidx, State::S0);
 						if (init_nets.at(net) == '1')
-							initval.bits().at(bitidx) = State::S1;
+							initval.set(bitidx, State::S1);
 						initval_valid = true;
 						init_nets.erase(net);
 					}
@@ -1862,13 +1862,12 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 		if (bit.wire->attributes.count(ID::init))
 			initval = bit.wire->attributes.at(ID::init);
 
-		while (GetSize(initval) < GetSize(bit.wire))
-			initval.bits().push_back(State::Sx);
+		initval.resize(GetSize(bit.wire), State::Sx);
 
 		if (it.second == '0')
-			initval.bits().at(bit.offset) = State::S0;
+			initval.set(bit.offset, State::S0);
 		if (it.second == '1')
-			initval.bits().at(bit.offset) = State::S1;
+			initval.set(bit.offset, State::S1);
 
 		bit.wire->attributes[ID::init] = initval;
 	}
@@ -2055,7 +2054,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 			}
 
 			Const qx_init = Const(State::S1, width);
-			qx_init.bits().resize(2 * width, State::S0);
+			qx_init.resize(2 * width, State::S0);
 
 			clocking.addDff(new_verific_id(inst), sig_dx, sig_qx, qx_init);
 			module->addXnor(new_verific_id(inst), sig_dx, sig_qx, sig_ox);
@@ -2320,7 +2319,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 					continue;
 
 				if (non_ff_bits.count(SigBit(wire, i)))
-					initval.bits()[i] = State::Sx;
+					initval.set(i, State::Sx);
 			}
 
 			if (wire->port_input) {
@@ -2513,7 +2512,7 @@ Cell *VerificClocking::addDff(IdString name, SigSpec sig_d, SigSpec sig_q, Const
 				if (c.wire && c.wire->attributes.count(ID::init)) {
 					Const val = c.wire->attributes.at(ID::init);
 					for (int i = 0; i < GetSize(c); i++)
-						initval.bits()[offset+i] = val[c.offset+i];
+						initval.set(offset+i, val[c.offset+i]);
 				}
 				offset += GetSize(c);
 			}
@@ -2584,7 +2583,7 @@ Cell *VerificClocking::addAldff(IdString name, RTLIL::SigSpec sig_aload, RTLIL::
 			if (c.wire && c.wire->attributes.count(ID::init)) {
 				Const val = c.wire->attributes.at(ID::init);
 				for (int i = 0; i < GetSize(c); i++)
-					initval.bits()[offset+i] = val[c.offset+i];
+					initval.set(offset+i, val[c.offset+i]);
 			}
 			offset += GetSize(c);
 		}
diff --git a/frontends/verific/verificsva.cc b/frontends/verific/verificsva.cc
index 50e0049ae..dffe6e8e0 100644
--- a/frontends/verific/verificsva.cc
+++ b/frontends/verific/verificsva.cc
@@ -577,7 +577,7 @@ struct SvaFsm
 
 				if (delta_pos >= 0 && i_within_j && j_within_i) {
 					did_something = true;
-					values[i].bits()[delta_pos] = State::Sa;
+					values[i].set(delta_pos, State::Sa);
 					values[j] = values.back();
 					values.pop_back();
 					goto next_pair;

From 9570b395193691967491a23be8af3efd79d01866 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 13 Oct 2025 09:57:22 +0200
Subject: [PATCH 684/931] verifix: fix bits() deprecation warnings

---
 frontends/verific/verific.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index e56fd9e50..937789842 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -1862,7 +1862,8 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 		if (bit.wire->attributes.count(ID::init))
 			initval = bit.wire->attributes.at(ID::init);
 
-		initval.resize(GetSize(bit.wire), State::Sx);
+		if (GetSize(initval) < GetSize(bit.wire))
+			initval.resize(GetSize(bit.wire), State::Sx);
 
 		if (it.second == '0')
 			initval.set(bit.offset, State::S0);

From dc959cdf4abdcc696585cc8fa9d587042132018a Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 13 Oct 2025 09:11:46 +0200
Subject: [PATCH 685/931] verific: Fix error compiling without
 VERIFIC_LINEFILE_INCLUDES_COLUMNS

---
 frontends/verific/verific.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 937789842..2d0e6959e 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -168,12 +168,12 @@ string get_full_netlist_name(Netlist *nl)
 
 std::string format_src_location(DesignObj *obj)
 {
-	if (obj == nullptr || obj->Linefile() == nullptr)
+	if (obj == nullptr || !obj->Linefile())
 		return std::string();
 #ifdef VERIFIC_LINEFILE_INCLUDES_COLUMNS
-		return stringf("%s:%d.%d-%d.%d", LineFile::GetFileName(obj->Linefile()), obj->Linefile()->GetLeftLine(), obj->Linefile()->GetLeftCol(), obj->Linefile()->GetRightLine(), obj->Linefile()->GetRightCol());
+	return stringf("%s:%d.%d-%d.%d", LineFile::GetFileName(obj->Linefile()), obj->Linefile()->GetLeftLine(), obj->Linefile()->GetLeftCol(), obj->Linefile()->GetRightLine(), obj->Linefile()->GetRightCol());
 #else
-		return stringf("%s:%d", LineFile::GetFileName(obj->Linefile()), LineFile::GetLineNo(obj->Linefile()));
+	return stringf("%s:%d", LineFile::GetFileName(obj->Linefile()), LineFile::GetLineNo(obj->Linefile()));
 #endif
 }
 

From 1f11b2c5299781c1e935ee60e06a3a1fdbe8c376 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 13 Oct 2025 15:16:10 +0200
Subject: [PATCH 686/931] verific: Add src to message missed in #5406

---
 frontends/verific/verific.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index 2d0e6959e..ff8932dac 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -1995,7 +1995,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 			if (import_netlist_instance_cells(inst, inst_name))
 				continue;
 			if (inst->IsOperator() && !verific_sva_prims.count(inst->Type()))
-				log_warning("Unsupported Verific operator: %s (fallback to gate level implementation provided by verific)\n", inst->View()->Owner()->Name());
+				log_warning("%sUnsupported Verific operator: %s (fallback to gate level implementation provided by verific)\n", announce_src_location(inst), inst->View()->Owner()->Name());
 		} else {
 			if (import_netlist_instance_gates(inst, inst_name))
 				continue;

From 7d8f92e198e623b693c03d3c5cd9714004bfca65 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 25 Jun 2025 12:43:01 +0200
Subject: [PATCH 687/931] publish: add pass for renaming private cell types to
 public

---
 passes/cmds/Makefile.inc |  1 +
 passes/cmds/publish.cc   | 43 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 passes/cmds/publish.cc

diff --git a/passes/cmds/Makefile.inc b/passes/cmds/Makefile.inc
index 9bf615a7e..f4c4db2f8 100644
--- a/passes/cmds/Makefile.inc
+++ b/passes/cmds/Makefile.inc
@@ -57,3 +57,4 @@ OBJS += passes/cmds/abstract.o
 OBJS += passes/cmds/test_select.o
 OBJS += passes/cmds/timeest.o
 OBJS += passes/cmds/linecoverage.o
+OBJS += passes/cmds/publish.o
diff --git a/passes/cmds/publish.cc b/passes/cmds/publish.cc
new file mode 100644
index 000000000..45a3ef5de
--- /dev/null
+++ b/passes/cmds/publish.cc
@@ -0,0 +1,43 @@
+#include "kernel/register.h"
+#include "kernel/rtlil.h"
+#include "kernel/log.h"
+
+USING_YOSYS_NAMESPACE
+PRIVATE_NAMESPACE_BEGIN
+
+struct PublishPass : public Pass {
+private:
+	static void publish(RTLIL::IdString& id) {
+		if (id.begins_with("$")) {
+			log_debug("publishing %s\n", id.c_str());
+			id = "\\" + id.str();
+			log_debug("published %s\n", id.c_str());
+		}
+	}
+public:
+	PublishPass() : Pass("publish", "publish private cell types") { }
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    publish\n");
+		log("Makes all module names and cell types public by prefixing\n");
+		log("%% with \\.\n");
+	}
+	void execute(std::vector<std::string> args, RTLIL::Design *design) override
+	{
+		log_header(design, "Executing PUBLISH pass. (make cell types public)\n");
+		extra_args(args, 1, design);
+		auto saved_modules = design->modules_;
+		design->modules_.clear();
+		for (auto& [name, mod] : saved_modules) {
+			publish(mod->name);
+			design->modules_[mod->name] = mod;
+			for (auto* cell : mod->cells()) {
+				publish(cell->type);
+			}
+		}
+	}
+} PublishPass;
+
+PRIVATE_NAMESPACE_END

From d7cea2c35c61661c7f6c6fbc3e90c137e5c98251 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 25 Jun 2025 12:43:15 +0200
Subject: [PATCH 688/931] box_derive: add -apply

---
 passes/cmds/box_derive.cc   | 37 ++++++++++++++++++++++------------
 tests/various/box_derive.ys | 40 +++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/passes/cmds/box_derive.cc b/passes/cmds/box_derive.cc
index a0faacc9a..c193e91ae 100644
--- a/passes/cmds/box_derive.cc
+++ b/passes/cmds/box_derive.cc
@@ -51,6 +51,9 @@ struct BoxDerivePass : Pass {
 		log("        replaces the internal Yosys naming scheme in which the names of derived\n");
 		log("        modules start with '$paramod$')\n");
 		log("\n");
+		log("    -apply\n");
+		log("        use the derived modules\n");
+		log("\n");
 	}
 	void execute(std::vector<std::string> args, RTLIL::Design *d) override
 	{
@@ -59,11 +62,14 @@ struct BoxDerivePass : Pass {
 		size_t argidx;
 		IdString naming_attr;
 		IdString base_name;
+		bool apply_mode = false;
 		for (argidx = 1; argidx < args.size(); argidx++) {
 			if (args[argidx] == "-naming_attr" && argidx + 1 < args.size())
 				naming_attr = RTLIL::escape_id(args[++argidx]);
 			else if (args[argidx] == "-base" && argidx + 1 < args.size())
 				base_name = RTLIL::escape_id(args[++argidx]);
+			else if (args[argidx] == "-apply")
+				apply_mode = true;
 			else
 				break;
 		}
@@ -90,24 +96,29 @@ struct BoxDerivePass : Pass {
 
 				auto index = std::make_pair(base->name, cell->parameters);
 
-				if (cell->parameters.empty() || done.count(index))
+				if (cell->parameters.empty())
 					continue;
 
-				IdString derived_type = base->derive(d, cell->parameters);
-				Module *derived = d->module(derived_type);
-				log_assert(derived && "Failed to derive module\n");
-				log_debug("derived %s\n", derived_type);
+				if (!done.count(index)) {
+					IdString derived_type = base->derive(d, cell->parameters);
+					Module *derived = d->module(derived_type);
+					log_assert(derived && "Failed to derive module\n");
+					log("derived %s\n", derived_type);
 
-				if (!naming_attr.empty() && derived->has_attribute(naming_attr)) {
-					IdString new_name = RTLIL::escape_id(derived->get_string_attribute(naming_attr));
-					if (!new_name.isPublic())
-						log_error("Derived module %s cannot be renamed to private name %s.\n",
-								  log_id(derived), log_id(new_name));
-					derived->attributes.erase(naming_attr);
-					d->rename(derived, new_name);
+					if (!naming_attr.empty() && derived->has_attribute(naming_attr)) {
+						IdString new_name = RTLIL::escape_id(derived->get_string_attribute(naming_attr));
+						if (!new_name.isPublic())
+							log_error("Derived module %s cannot be renamed to private name %s.\n",
+									  log_id(derived), log_id(new_name));
+						derived->attributes.erase(naming_attr);
+						d->rename(derived, new_name);
+					}
+
+					done[index] = derived;
 				}
 
-				done[index] = derived;
+				if (apply_mode)
+					cell->type = done[index]->name;
 			}
 		}
 	}
diff --git a/tests/various/box_derive.ys b/tests/various/box_derive.ys
index f02e13360..ef6c87193 100644
--- a/tests/various/box_derive.ys
+++ b/tests/various/box_derive.ys
@@ -34,6 +34,7 @@ module top;
 endmodule
 EOF
 
+design -save before
 box_derive -naming_attr final_name top
 
 select -assert-mod-count 1 =aa1
@@ -48,6 +49,45 @@ select -assert-mod-count 1 =cc1
 select -assert-mod-count 0 =cc2
 select -assert-mod-count 0 =cc3
 
+# no instances of the new derived modules
+# you could use wildcards like t:aa* here - if that wasn't just broken
+select -assert-count 0 t:aa1 t:aa2 t:aa3
+select -assert-count 0 t:bb1 t:bb2 t:bb3
+select -assert-count 0 t:cc1 t:cc2 t:cc3
+
+design -load before
+
+# same command but with -apply
+box_derive -apply -naming_attr final_name top
+
+# same derived modules created as without -apply
+select -assert-mod-count 1 =aa1
+select -assert-mod-count 1 =aa2
+select -assert-mod-count 0 =aa3
+
+select -assert-mod-count 1 =bb1
+select -assert-mod-count 0 =bb2
+select -assert-mod-count 1 =bb3
+
+select -assert-mod-count 1 =cc1
+select -assert-mod-count 0 =cc2
+select -assert-mod-count 0 =cc3
+
+# but we have instances of the new derived modules
+select -assert-count 1 t:aa1
+select -assert-count 1 t:aa2
+select -assert-count 0 t:aa3
+
+select -assert-count 1 t:bb1
+select -assert-count 0 t:bb2
+select -assert-count 1 t:bb3
+
+select -assert-count 2 t:cc1
+select -assert-count 0 t:cc2
+select -assert-count 0 t:cc3
+
+
+
 # we are expecting the original aa, bb, cc modules
 # and 5 specializations generated by box_derive
 select -assert-mod-count 8 =A:whitebox

From c46df9ffdc4ad9975ee8258425cebd2ce8d51f1b Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 9 Oct 2025 01:44:13 +0200
Subject: [PATCH 689/931] box_derive: rename -apply to -apply_derived_type

---
 passes/cmds/box_derive.cc   | 4 ++--
 tests/various/box_derive.ys | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/passes/cmds/box_derive.cc b/passes/cmds/box_derive.cc
index c193e91ae..2590baa93 100644
--- a/passes/cmds/box_derive.cc
+++ b/passes/cmds/box_derive.cc
@@ -51,7 +51,7 @@ struct BoxDerivePass : Pass {
 		log("        replaces the internal Yosys naming scheme in which the names of derived\n");
 		log("        modules start with '$paramod$')\n");
 		log("\n");
-		log("    -apply\n");
+		log("    -apply_derived_type\n");
 		log("        use the derived modules\n");
 		log("\n");
 	}
@@ -68,7 +68,7 @@ struct BoxDerivePass : Pass {
 				naming_attr = RTLIL::escape_id(args[++argidx]);
 			else if (args[argidx] == "-base" && argidx + 1 < args.size())
 				base_name = RTLIL::escape_id(args[++argidx]);
-			else if (args[argidx] == "-apply")
+			else if (args[argidx] == "-apply_derived_type")
 				apply_mode = true;
 			else
 				break;
diff --git a/tests/various/box_derive.ys b/tests/various/box_derive.ys
index ef6c87193..465eab284 100644
--- a/tests/various/box_derive.ys
+++ b/tests/various/box_derive.ys
@@ -57,10 +57,10 @@ select -assert-count 0 t:cc1 t:cc2 t:cc3
 
 design -load before
 
-# same command but with -apply
-box_derive -apply -naming_attr final_name top
+# same command but with -apply_derived_type
+box_derive -apply_derived_type -naming_attr final_name top
 
-# same derived modules created as without -apply
+# same derived modules created as without -apply_derived_type
 select -assert-mod-count 1 =aa1
 select -assert-mod-count 1 =aa2
 select -assert-mod-count 0 =aa3

From e5edd2acdb1e3e8d753702a8424b0bf6b09166aa Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 13 Oct 2025 17:32:26 +0200
Subject: [PATCH 690/931] sort: init

---
 passes/cmds/Makefile.inc |  1 +
 passes/cmds/sort.cc      | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 passes/cmds/sort.cc

diff --git a/passes/cmds/Makefile.inc b/passes/cmds/Makefile.inc
index 9bf615a7e..2dbeadac2 100644
--- a/passes/cmds/Makefile.inc
+++ b/passes/cmds/Makefile.inc
@@ -57,3 +57,4 @@ OBJS += passes/cmds/abstract.o
 OBJS += passes/cmds/test_select.o
 OBJS += passes/cmds/timeest.o
 OBJS += passes/cmds/linecoverage.o
+OBJS += passes/cmds/sort.o
diff --git a/passes/cmds/sort.cc b/passes/cmds/sort.cc
new file mode 100644
index 000000000..ab058880e
--- /dev/null
+++ b/passes/cmds/sort.cc
@@ -0,0 +1,26 @@
+#include "kernel/yosys.h"
+
+USING_YOSYS_NAMESPACE
+PRIVATE_NAMESPACE_BEGIN
+
+struct SortPass : Pass {
+	SortPass() : Pass("sort", "sort the design objects") {}
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    sort\n");
+		log("\n");
+		log("Sorts the design objects.\n");
+		log("\n");
+	}
+	void execute(std::vector<std::string> args, RTLIL::Design *d) override
+	{
+		log_header(d, "Executing SORT pass.\n");
+        if (args.size() != 1)
+            log_cmd_error("This pass takes no arguments.\n");
+        d->sort();
+	}
+} SortPass;
+
+PRIVATE_NAMESPACE_END

From 25f2a887701f91dc2fd0aa02f5a19033e48887eb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Oct 2025 00:22:29 +0000
Subject: [PATCH 691/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b744763c8..8cf3fcef1 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+35
+YOSYS_VER := 0.58+47
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From bbceaa6b5e50aecc5bf8e4ab0cc03ad4abccd966 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 14 Oct 2025 14:59:32 +1300
Subject: [PATCH 692/931] docs: Note partial support of modports

---
 docs/source/using_yosys/verilog.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/source/using_yosys/verilog.rst b/docs/source/using_yosys/verilog.rst
index 92f223e49..95c0168ba 100644
--- a/docs/source/using_yosys/verilog.rst
+++ b/docs/source/using_yosys/verilog.rst
@@ -370,7 +370,10 @@ from SystemVerilog:
 	- array literals are currently not supported
 
 - SystemVerilog interfaces (SVIs) are supported. Modports for specifying whether
-  ports are inputs or outputs are supported.
+  ports are inputs or outputs are supported when used with named arguments, but
+  not positional arguments.  i.e. ``driver_mod d0(.intf(intf0),
+  .in(inputs[0]));`` is supported but ``driver_mod d0(intf0, inputs[0]);`` is
+  not.
 
 - Assignments within expressions are supported.
 

From d3d3a9f1ea3549ee250a25b7b722aee12110adbc Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 14 Oct 2025 14:47:17 +0200
Subject: [PATCH 693/931] Update ABC

---
 abc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abc b/abc
index 8827bafb7..fa186342b 160000
--- a/abc
+++ b/abc
@@ -1 +1 @@
-Subproject commit 8827bafb7f288de6749dc6e30fa452f2040949c0
+Subproject commit fa186342baefea06e7c2aa13fe51f338ffc84912

From d92cf2f5b0428b6f1c5a0abebdd0bea572262c20 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 14 Oct 2025 14:54:56 +0200
Subject: [PATCH 694/931] Compile abc when submodule updates

---
 .gitignore |  1 +
 Makefile   | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 47f758a9b..2367bccb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /Brewfile.lock.json
 
 ## build artifacts
+/.git-abc-submodule-hash
 # compiler intermediate files
 *.o
 *.d
diff --git a/Makefile b/Makefile
index 8cf3fcef1..976f709d1 100644
--- a/Makefile
+++ b/Makefile
@@ -845,7 +845,17 @@ check-git-abc:
 		exit 1; \
 	fi
 
-abc/abc$(EXE) abc/libabc.a: | check-git-abc
+.git-abc-submodule-hash: FORCE
+	@new=$$(cd abc 2>/dev/null && git rev-parse HEAD 2>/dev/null || echo none); \
+	old=$$(cat .git-abc-submodule-hash 2>/dev/null || echo none); \
+	if [ "$$new" != "$$old" ]; then \
+		echo "$$new" > .git-abc-submodule-hash; \
+	fi
+
+abc/abc$(EXE) abc/libabc.a: .git-abc-submodule-hash | check-git-abc
+	@if [ "$$(cd abc 2>/dev/null && git rev-parse HEAD 2>/dev/null)" != "$$(cat ../.git-abc-submodule-hash 2>/dev/null || echo none)" ]; then \
+		rm -f abc/abc$(EXE); \
+	fi
 	$(P)
 	$(Q) mkdir -p abc && $(MAKE) -C $(PROGRAM_PREFIX)abc -f "$(realpath $(YOSYS_SRC)/abc/Makefile)" ABCSRC="$(realpath $(YOSYS_SRC)/abc/)" $(S) $(ABCMKARGS) $(if $(filter %.a,$@),PROG="abc",PROG="abc$(EXE)") MSG_PREFIX="$(eval P_OFFSET = 5)$(call P_SHOW)$(eval P_OFFSET = 10) ABC: " $(if $(filter %.a,$@),libabc.a)
 
@@ -1147,7 +1157,7 @@ clean-py:
 
 clean-abc:
 	$(MAKE) -C abc DEP= clean
-	rm -f $(PROGRAM_PREFIX)yosys-abc$(EXE) $(PROGRAM_PREFIX)yosys-libabc.a abc/abc-[0-9a-f]* abc/libabc-[0-9a-f]*.a
+	rm -f $(PROGRAM_PREFIX)yosys-abc$(EXE) $(PROGRAM_PREFIX)yosys-libabc.a abc/abc-[0-9a-f]* abc/libabc-[0-9a-f]*.a .git-abc-submodule-hash
 
 mrproper: clean
 	git clean -xdf

From e9aedf505c5f4260c14b699ba3ab584d43bd72f0 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 9 Oct 2025 02:08:20 +0200
Subject: [PATCH 695/931] chtype: replace publish pass with chtype
 -publish_icells

---
 passes/cmds/Makefile.inc        |  1 -
 passes/cmds/chtype.cc           | 32 ++++++++++++++++++++++++
 passes/cmds/publish.cc          | 43 ---------------------------------
 tests/techmap/techmap_chtype.ys | 16 ++++++++++++
 4 files changed, 48 insertions(+), 44 deletions(-)
 delete mode 100644 passes/cmds/publish.cc

diff --git a/passes/cmds/Makefile.inc b/passes/cmds/Makefile.inc
index f4c4db2f8..9bf615a7e 100644
--- a/passes/cmds/Makefile.inc
+++ b/passes/cmds/Makefile.inc
@@ -57,4 +57,3 @@ OBJS += passes/cmds/abstract.o
 OBJS += passes/cmds/test_select.o
 OBJS += passes/cmds/timeest.o
 OBJS += passes/cmds/linecoverage.o
-OBJS += passes/cmds/publish.o
diff --git a/passes/cmds/chtype.cc b/passes/cmds/chtype.cc
index 6f9ca9a45..eb194f3e3 100644
--- a/passes/cmds/chtype.cc
+++ b/passes/cmds/chtype.cc
@@ -22,6 +22,27 @@
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
+static void publish(RTLIL::IdString& id) {
+	if (id.begins_with("$")) {
+		log_debug("publishing %s\n", id.c_str());
+		id = "\\" + id.str();
+		log_debug("published %s\n", id.c_str());
+	}
+}
+
+static void publish_design(RTLIL::Design* design) {
+	auto saved_modules = design->modules_;
+	design->modules_.clear();
+	for (auto& [name, mod] : saved_modules) {
+		publish(mod->name);
+		design->modules_[mod->name] = mod;
+		for (auto* cell : mod->cells()) {
+			publish(cell->type);
+		}
+	}
+}
+
+
 struct ChtypePass : public Pass {
 	ChtypePass() : Pass("chtype", "change type of cells in the design") { }
 	void help() override
@@ -38,12 +59,16 @@ struct ChtypePass : public Pass {
 		log("    -map <old_type> <new_type>\n");
 		log("        change cells types that match <old_type> to <new_type>\n");
 		log("\n");
+		log("    -publish_icells\n");
+		log("        change internal cells types to public types\n");
+		log("\n");
 		log("\n");
 	}
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		IdString set_type;
 		dict<IdString, IdString> map_types;
+		bool publish_mode = false;
 
 		size_t argidx;
 		for (argidx = 1; argidx < args.size(); argidx++)
@@ -58,10 +83,17 @@ struct ChtypePass : public Pass {
 				map_types[old_type] = new_type;
 				continue;
 			}
+			if (args[argidx] == "-publish_icells") {
+				publish_mode = true;
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
 
+		if (publish_mode)
+			publish_design(design);
+
 		for (auto module : design->selected_modules())
 		{
 			for (auto cell : module->selected_cells())
diff --git a/passes/cmds/publish.cc b/passes/cmds/publish.cc
deleted file mode 100644
index 45a3ef5de..000000000
--- a/passes/cmds/publish.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "kernel/register.h"
-#include "kernel/rtlil.h"
-#include "kernel/log.h"
-
-USING_YOSYS_NAMESPACE
-PRIVATE_NAMESPACE_BEGIN
-
-struct PublishPass : public Pass {
-private:
-	static void publish(RTLIL::IdString& id) {
-		if (id.begins_with("$")) {
-			log_debug("publishing %s\n", id.c_str());
-			id = "\\" + id.str();
-			log_debug("published %s\n", id.c_str());
-		}
-	}
-public:
-	PublishPass() : Pass("publish", "publish private cell types") { }
-	void help() override
-	{
-		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
-		log("\n");
-		log("    publish\n");
-		log("Makes all module names and cell types public by prefixing\n");
-		log("%% with \\.\n");
-	}
-	void execute(std::vector<std::string> args, RTLIL::Design *design) override
-	{
-		log_header(design, "Executing PUBLISH pass. (make cell types public)\n");
-		extra_args(args, 1, design);
-		auto saved_modules = design->modules_;
-		design->modules_.clear();
-		for (auto& [name, mod] : saved_modules) {
-			publish(mod->name);
-			design->modules_[mod->name] = mod;
-			for (auto* cell : mod->cells()) {
-				publish(cell->type);
-			}
-		}
-	}
-} PublishPass;
-
-PRIVATE_NAMESPACE_END
diff --git a/tests/techmap/techmap_chtype.ys b/tests/techmap/techmap_chtype.ys
index 7c3398420..0c759e448 100644
--- a/tests/techmap/techmap_chtype.ys
+++ b/tests/techmap/techmap_chtype.ys
@@ -31,3 +31,19 @@ opt
 techmap -map %techmap
 
 select -assert-count 1 t:LCU_8
+
+design -reset
+read_verilog <<EOT
+module top(input A, input B, output Y);
+assign Y = A ^ B;
+endmodule
+EOT
+
+# We can only test that the option doesn't crash
+# See https://github.com/YosysHQ/yosys/issues/5414
+
+# select -assert-count 1 t:$xor
+# select -assert-count 0 t:\$xor
+chtype -publish_icells
+# select -assert-count 0 t:$xor
+# select -assert-count 1 t:\$xor

From 5cfe6a9c1ee66d810a5f40bedc57442dafd4b40d Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 8 Nov 2024 19:29:56 +0100
Subject: [PATCH 696/931] reduce OS ifdefs, refactor getting dirs and filenames
 from paths to files

---
 backends/cxxrtl/cxxrtl_backend.cc | 16 +---------------
 frontends/ast/simplify.cc         |  8 ++------
 frontends/verilog/preproc.cc      |  6 +-----
 kernel/io.cc                      | 19 +++++++++++++++++++
 kernel/io.h                       |  2 ++
 5 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/backends/cxxrtl/cxxrtl_backend.cc b/backends/cxxrtl/cxxrtl_backend.cc
index 48710aff8..d575b5879 100644
--- a/backends/cxxrtl/cxxrtl_backend.cc
+++ b/backends/cxxrtl/cxxrtl_backend.cc
@@ -637,20 +637,6 @@ std::string escape_cxx_string(const std::string &input)
 	return output;
 }
 
-std::string basename(const std::string &filepath)
-{
-#ifdef _WIN32
-	const std::string dir_seps = "\\/";
-#else
-	const std::string dir_seps = "/";
-#endif
-	size_t sep_pos = filepath.find_last_of(dir_seps);
-	if (sep_pos != std::string::npos)
-		return filepath.substr(sep_pos + 1);
-	else
-		return filepath;
-}
-
 template<class T>
 std::string get_hdl_name(T *object)
 {
@@ -2858,7 +2844,7 @@ struct CxxrtlWorker {
 		}
 
 		if (split_intf)
-			f << "#include \"" << basename(intf_filename) << "\"\n";
+			f << "#include \"" << name_from_file_path(intf_filename) << "\"\n";
 		else
 			f << "#include <cxxrtl/cxxrtl.h>\n";
 		f << "\n";
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 81018e137..97abf7452 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -30,6 +30,7 @@
 #include "libs/sha1/sha1.h"
 #include "frontends/verilog/verilog_frontend.h"
 #include "ast.h"
+#include "kernel/io.h"
 
 #include <sstream>
 #include <stdarg.h>
@@ -4474,12 +4475,7 @@ std::unique_ptr<AstNode> AstNode::readmem(bool is_readmemh, std::string mem_file
 	std::ifstream f;
 	f.open(mem_filename.c_str());
 	if (f.fail()) {
-#ifdef _WIN32
-		char slash = '\\';
-#else
-		char slash = '/';
-#endif
-		std::string path = location.begin.filename->substr(0, location.begin.filename->find_last_of(slash)+1);
+		std::string path = parent_from_file_path(*location.begin.filename);
 		f.open(path + mem_filename.c_str());
 		yosys_input_files.insert(path + mem_filename);
 	} else {
diff --git a/frontends/verilog/preproc.cc b/frontends/verilog/preproc.cc
index 1858edc97..7675bab62 100644
--- a/frontends/verilog/preproc.cc
+++ b/frontends/verilog/preproc.cc
@@ -895,11 +895,7 @@ frontend_verilog_preproc(std::istream                 &f,
 				// if the include file was not found, it is not given with an absolute path, and the
 				// currently read file is given with a path, then try again relative to its directory
 				ff.clear();
-#ifdef _WIN32
-				fixed_fn = filename.substr(0, filename.find_last_of("/\\")+1) + fn;
-#else
-				fixed_fn = filename.substr(0, filename.rfind('/')+1) + fn;
-#endif
+				fixed_fn = parent_from_file_path(filename) + fn;
 				ff.open(fixed_fn);
 			}
 			if (ff.fail() && fn.size() > 0 && fn_relative) {
diff --git a/kernel/io.cc b/kernel/io.cc
index 9e9eb9fb0..dfdb56d16 100644
--- a/kernel/io.cc
+++ b/kernel/io.cc
@@ -391,6 +391,25 @@ void append_globbed(std::vector<std::string>& paths, std::string pattern)
 	copy(globbed.begin(), globbed.end(), back_inserter(paths));
 }
 
+#ifdef _WIN32
+const char* const OS_PATH_SEP = "/\\";
+#else
+const char* const OS_PATH_SEP = "/";
+#endif
+
+std::string name_from_file_path(std::string path) {
+	size_t sep_pos = path.find_last_of(OS_PATH_SEP);
+	if (sep_pos != std::string::npos)
+		return path.substr(sep_pos + 1);
+	else
+		return path;
+}
+
+// Includes OS_PATH_SEP at the end if present
+std::string parent_from_file_path(std::string path) {
+	return path.substr(0, path.find_last_of(OS_PATH_SEP)+1);
+}
+
 void format_emit_unescaped(std::string &result, std::string_view fmt)
 {
 	result.reserve(result.size() + fmt.size());
diff --git a/kernel/io.h b/kernel/io.h
index b3922bef0..171f47a80 100644
--- a/kernel/io.h
+++ b/kernel/io.h
@@ -470,6 +470,8 @@ void remove_directory(std::string dirname);
 bool create_directory(const std::string& dirname);
 std::string escape_filename_spaces(const std::string& filename);
 void append_globbed(std::vector<std::string>& paths, std::string pattern);
+std::string name_from_file_path(std::string path);
+std::string parent_from_file_path(std::string path);
 
 YOSYS_NAMESPACE_END
 

From 79cd4e08c4dc1828e697da722973c1be4c3d69ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Tue, 23 Sep 2025 17:38:14 +0200
Subject: [PATCH 697/931] io: use std::filesystem

---
 kernel/io.cc | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/kernel/io.cc b/kernel/io.cc
index dfdb56d16..45aa496b0 100644
--- a/kernel/io.cc
+++ b/kernel/io.cc
@@ -2,6 +2,7 @@
 #include "kernel/log.h"
 #include <iostream>
 #include <string>
+#include <filesystem>
 
 #if !defined(WIN32)
 #include <dirent.h>
@@ -398,16 +399,21 @@ const char* const OS_PATH_SEP = "/";
 #endif
 
 std::string name_from_file_path(std::string path) {
-	size_t sep_pos = path.find_last_of(OS_PATH_SEP);
-	if (sep_pos != std::string::npos)
-		return path.substr(sep_pos + 1);
-	else
-		return path;
+	return std::filesystem::path(path).filename().string();
 }
 
 // Includes OS_PATH_SEP at the end if present
 std::string parent_from_file_path(std::string path) {
-	return path.substr(0, path.find_last_of(OS_PATH_SEP)+1);
+	auto parent = std::filesystem::path(path).parent_path();
+	if (parent.empty()) {
+		return "";
+	}
+	// Add trailing separator to match original behavior
+	std::string result = parent.string();
+	if (!result.empty() && result.back() != std::filesystem::path::preferred_separator) {
+		result += std::filesystem::path::preferred_separator;
+	}
+	return result;
 }
 
 void format_emit_unescaped(std::string &result, std::string_view fmt)

From d1a628ab2664accf6cb58189c75e05c91c198695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Tue, 23 Sep 2025 17:38:32 +0200
Subject: [PATCH 698/931] CI: bump WASI SDK from 19 to 27

---
 .github/workflows/extra-builds.yml | 4 ++--
 Makefile                           | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 503145e97..b22a399db 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -73,8 +73,8 @@ jobs:
           persist-credentials: false
       - name: Build
         run: |
-          WASI_SDK=wasi-sdk-19.0
-          WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-linux.tar.gz
+          WASI_SDK=wasi-sdk-27.0-x86_64-linux
+          WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-x86_64-linux.tar.gz
           if ! [ -d ${WASI_SDK} ]; then curl -L ${WASI_SDK_URL} | tar xzf -; fi
 
           FLEX_VER=2.6.4
diff --git a/Makefile b/Makefile
index b744763c8..04395a5a0 100644
--- a/Makefile
+++ b/Makefile
@@ -282,12 +282,11 @@ ifeq ($(WASI_SDK),)
 CXX = clang++
 AR = llvm-ar
 RANLIB = llvm-ranlib
-WASIFLAGS := -target wasm32-wasi --sysroot $(WASI_SYSROOT) $(WASIFLAGS)
+WASIFLAGS := -target wasm32-wasi $(WASIFLAGS)
 else
 CXX = $(WASI_SDK)/bin/clang++
 AR = $(WASI_SDK)/bin/ar
 RANLIB = $(WASI_SDK)/bin/ranlib
-WASIFLAGS := --sysroot $(WASI_SDK)/share/wasi-sysroot $(WASIFLAGS)
 endif
 CXXFLAGS := $(WASIFLAGS) -std=$(CXXSTD) $(OPT_LEVEL) -D_WASI_EMULATED_PROCESS_CLOCKS $(filter-out -fPIC,$(CXXFLAGS))
 LINKFLAGS := $(WASIFLAGS) -Wl,-z,stack-size=1048576 $(filter-out -rdynamic,$(LINKFLAGS))

From 1eb5181700e980a9a10c7c607e06c98755f8bc10 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 14 Oct 2025 14:12:24 +1300
Subject: [PATCH 699/931] Add tests/verilog/local_include.*

`read_verilog` supports checking both the current directory and the source directory for relative includes.  Make sure we aren't regressing that.
---
 tests/verilog/.gitignore       |  2 ++
 tests/verilog/local_include.sh | 30 ++++++++++++++++++++++++++++++
 tests/verilog/local_include.v  |  4 ++++
 3 files changed, 36 insertions(+)
 create mode 100755 tests/verilog/local_include.sh
 create mode 100644 tests/verilog/local_include.v

diff --git a/tests/verilog/.gitignore b/tests/verilog/.gitignore
index 3702f10cf..d3e8690d5 100644
--- a/tests/verilog/.gitignore
+++ b/tests/verilog/.gitignore
@@ -4,3 +4,5 @@
 /roundtrip_proc_1.v
 /roundtrip_proc_2.v
 /assign_to_reg.v
+/subdir
+/temp_foo.v
diff --git a/tests/verilog/local_include.sh b/tests/verilog/local_include.sh
new file mode 100755
index 000000000..c10c7411b
--- /dev/null
+++ b/tests/verilog/local_include.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+set -eu
+
+# only works with read_verilog
+yosys='../../yosys -f verilog'
+test='-p hierarchy'
+subdir=subdir
+source=local_include.v
+include=temp_foo.v
+
+# no include file should fail
+rm -f $include
+echo "logger -expect error $include 1; read_verilog $source" | $yosys
+
+# both files local
+echo 'module foo (input a, output b); assign b = a; endmodule' > $include
+$yosys $test $source
+
+# include local to cwd
+mkdir -p $subdir
+cp -t $subdir $source
+$yosys $test $subdir/$source
+
+# include local to source
+mv -t $subdir $include
+$yosys $test $subdir/$source
+
+# include local to source, and source is given as an absolute path
+$yosys $test $(pwd)/$subdir/$source
diff --git a/tests/verilog/local_include.v b/tests/verilog/local_include.v
new file mode 100644
index 000000000..a677e888e
--- /dev/null
+++ b/tests/verilog/local_include.v
@@ -0,0 +1,4 @@
+`include "temp_foo.v"
+module top (input x, output y);
+	foo bar (.a(x), .b(y));
+endmodule

From 4513783a02d8b67a16d9d9b3ccad2265c9766868 Mon Sep 17 00:00:00 2001
From: "N. Engelhardt" <nak@yosyshq.com>
Date: Tue, 14 Oct 2025 15:48:16 +0200
Subject: [PATCH 700/931] add tests

---
 tests/verific/ext_ramnet_err.sv           | 13 +++++++++++++
 tests/verific/ext_ramnet_err.ys           |  5 +++++
 tests/verific/import_warning_operator.vhd | 15 +++++++++++++++
 tests/verific/import_warning_operator.ys  |  5 +++++
 4 files changed, 38 insertions(+)
 create mode 100644 tests/verific/ext_ramnet_err.sv
 create mode 100644 tests/verific/ext_ramnet_err.ys
 create mode 100644 tests/verific/import_warning_operator.vhd
 create mode 100644 tests/verific/import_warning_operator.ys

diff --git a/tests/verific/ext_ramnet_err.sv b/tests/verific/ext_ramnet_err.sv
new file mode 100644
index 000000000..ba8040004
--- /dev/null
+++ b/tests/verific/ext_ramnet_err.sv
@@ -0,0 +1,13 @@
+module sub_rom (input clk, input [3:0] addr, output reg [7:0] data);
+    reg [7:0] mem [0:15];
+
+    always @(posedge clk)
+        data <= mem[addr];
+endmodule
+
+module top (input clk, input [3:0] addr, output [7:0] data, input [3:0] f_addr, input [7:0] f_data);
+    sub_rom u_sub_rom (clk, addr, data);
+
+    always @(posedge clk) 
+        assume(u_sub_rom.mem[f_addr] == f_data);
+endmodule
diff --git a/tests/verific/ext_ramnet_err.ys b/tests/verific/ext_ramnet_err.ys
new file mode 100644
index 000000000..f1d45bd47
--- /dev/null
+++ b/tests/verific/ext_ramnet_err.ys
@@ -0,0 +1,5 @@
+logger -expect error "ext_ramnet_err.sv:\d+.\d+-\d+.\d+: Memory net '\S+' missing, possibly no driver, use verific -flatten." 1
+verific -sv ext_ramnet_err.sv
+verific -import top
+logger -check-expected
+design -reset
diff --git a/tests/verific/import_warning_operator.vhd b/tests/verific/import_warning_operator.vhd
new file mode 100644
index 000000000..0b7d51788
--- /dev/null
+++ b/tests/verific/import_warning_operator.vhd
@@ -0,0 +1,15 @@
+library IEEE;
+use IEEE.STD_LOGIC_1164.ALL;
+
+entity top is
+    Port (
+        a   : in  STD_LOGIC_VECTOR(3 downto 0);
+        b   : in  STD_LOGIC_VECTOR(3 downto 0);
+        y   : out STD_LOGIC_VECTOR(3 downto 0)
+    );
+end top;
+
+architecture Behavioral of top is
+begin
+    y <= a nor b;
+end Behavioral;
diff --git a/tests/verific/import_warning_operator.ys b/tests/verific/import_warning_operator.ys
new file mode 100644
index 000000000..9d16e3c18
--- /dev/null
+++ b/tests/verific/import_warning_operator.ys
@@ -0,0 +1,5 @@
+logger -expect warning "import_warning_operator.vhd:\d+.\d+-\d+.\d+: Unsupported Verific operator: nor_4 (fallback to gate level implementation provided by verific)" 1
+verific -vhdl import_warning_operator.vhd
+verific -import top
+logger -check-expected
+design -reset

From 7d2857b30fdbaa3713f080ceb9218529faf7c5b3 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 14 Oct 2025 16:04:56 +0200
Subject: [PATCH 701/931] Fix regex checks

---
 tests/verific/ext_ramnet_err.ys          | 2 +-
 tests/verific/import_warning_operator.ys | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/verific/ext_ramnet_err.ys b/tests/verific/ext_ramnet_err.ys
index f1d45bd47..7456af444 100644
--- a/tests/verific/ext_ramnet_err.ys
+++ b/tests/verific/ext_ramnet_err.ys
@@ -1,4 +1,4 @@
-logger -expect error "ext_ramnet_err.sv:\d+.\d+-\d+.\d+: Memory net '\S+' missing, possibly no driver, use verific -flatten." 1
+logger -expect error "ext_ramnet_err.sv:[0-9]+\.[0-9]+-[0-9]+\.[0-9]+: Memory net '[^']+' missing, possibly no driver, use verific -flatten." 1
 verific -sv ext_ramnet_err.sv
 verific -import top
 logger -check-expected
diff --git a/tests/verific/import_warning_operator.ys b/tests/verific/import_warning_operator.ys
index 9d16e3c18..1ecd6d296 100644
--- a/tests/verific/import_warning_operator.ys
+++ b/tests/verific/import_warning_operator.ys
@@ -1,4 +1,4 @@
-logger -expect warning "import_warning_operator.vhd:\d+.\d+-\d+.\d+: Unsupported Verific operator: nor_4 (fallback to gate level implementation provided by verific)" 1
+logger -expect warning "import_warning_operator.vhd:[0-9]+.[0-9]+-[0-9]+.[0-9]+: Unsupported Verific operator: nor_4 \(fallback to gate level implementation provided by verific\)" 1
 verific -vhdl import_warning_operator.vhd
 verific -import top
 logger -check-expected

From 7bb0a1913e46cc205e89e1fda88eb31c85da4d86 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 15 Oct 2025 09:10:33 +1300
Subject: [PATCH 702/931] hierarchy.cc: Raise error on positional interface

Add test to check that it does error.
---
 passes/hierarchy/hierarchy.cc         | 69 +++++++++++++++++++--------
 tests/svinterfaces/positional_args.ys | 33 +++++++++++++
 tests/svinterfaces/run-test.sh        |  1 +
 3 files changed, 82 insertions(+), 21 deletions(-)
 create mode 100644 tests/svinterfaces/positional_args.ys
 mode change 100755 => 100644 tests/svinterfaces/run-test.sh

diff --git a/passes/hierarchy/hierarchy.cc b/passes/hierarchy/hierarchy.cc
index ea68add18..c0e6a9104 100644
--- a/passes/hierarchy/hierarchy.cc
+++ b/passes/hierarchy/hierarchy.cc
@@ -156,6 +156,21 @@ std::string basic_cell_type(const std::string celltype, int pos[3] = nullptr) {
 	return basicType;
 }
 
+// Try to read an IdString as a numbered connection name ("$123" or similar),
+// writing the result to dst. If the string isn't of the right format, ignore
+// dst and return false.
+bool read_id_num(RTLIL::IdString str, int *dst)
+{
+	log_assert(dst);
+
+	const char *c_str = str.c_str();
+	if (c_str[0] != '$' || !('0' <= c_str[1] && c_str[1] <= '9'))
+		return false;
+
+	*dst = atoi(c_str + 1);
+	return true;
+}
+
 // A helper struct for expanding a module's interface connections in expand_module
 struct IFExpander
 {
@@ -283,15 +298,42 @@ struct IFExpander
 	                   RTLIL::IdString       conn_name,
 	                   const RTLIL::SigSpec &conn_signals)
 	{
-		// Check if the connection is present as an interface in the sub-module's port list
-		const RTLIL::Wire *wire = submodule.wire(conn_name);
-		if (!wire || !wire->get_bool_attribute(ID::is_interface))
+		// Does the connection look like an interface
+		const auto &bits = conn_signals;
+		if (
+			bits.size() != 1 ||
+			!bits[0].wire->get_bool_attribute(ID::is_interface) ||
+			conn_signals[0].wire->name.str().find("$dummywireforinterface") != 0
+		)
 			return;
 
+		// Check if the connection is present as an interface in the sub-module's port list
+		int id;
+		if (read_id_num(conn_name, &id)) {
+			/* Interface expansion is incompatible with positional arguments
+			 * during expansion, the port list gets each interface signal
+			 * inserted after the interface itself which means that the argument
+			 * positions in the parent module no longer match.
+			 *
+			 * Supporting this would require expanding the interfaces in the
+			 * parent module, renumbering the arguments to match, and then
+			 * iterating over the ports list to find the matching interface
+			 * (refactoring on_interface to accept different conn_names on the
+			 * parent and child).
+			 */
+			log_error("Unable to connect `%s' to submodule `%s' with positional interface argument `%s'!\n",
+				module.name,
+				submodule.name,
+				conn_signals[0].wire->name.str().substr(23)
+			);
+		} else {
+			// Lookup connection by name
+			const RTLIL::Wire *wire = submodule.wire(conn_name);
+			if (!wire || !wire->get_bool_attribute(ID::is_interface))
+				return;
+			}
 		// If the connection looks like an interface, handle it.
-		const auto &bits = conn_signals;
-		if (bits.size() == 1 && bits[0].wire->get_bool_attribute(ID::is_interface))
-			on_interface(submodule, conn_name, conn_signals);
+		on_interface(submodule, conn_name, conn_signals);
 	}
 
 	// Iterate over the connections in a cell, tracking any interface
@@ -376,21 +418,6 @@ RTLIL::Module *get_module(RTLIL::Design                  &design,
 	return nullptr;
 }
 
-// Try to read an IdString as a numbered connection name ("$123" or similar),
-// writing the result to dst. If the string isn't of the right format, ignore
-// dst and return false.
-bool read_id_num(RTLIL::IdString str, int *dst)
-{
-	log_assert(dst);
-
-	const char *c_str = str.c_str();
-	if (c_str[0] != '$' || !('0' <= c_str[1] && c_str[1] <= '9'))
-		return false;
-
-	*dst = atoi(c_str + 1);
-	return true;
-}
-
 // Check that the connections on the cell match those that are defined
 // on the type: each named connection should match the name of a port
 // and each positional connection should have an index smaller than
diff --git a/tests/svinterfaces/positional_args.ys b/tests/svinterfaces/positional_args.ys
new file mode 100644
index 000000000..6017a1c25
--- /dev/null
+++ b/tests/svinterfaces/positional_args.ys
@@ -0,0 +1,33 @@
+read_verilog -sv << EOF
+interface simple_if;
+    logic receiver;
+    logic driver;
+endinterface
+
+module driver_mod(simple_if intf, input in);
+    assign intf.driver = in;
+endmodule
+
+module receiver_mod(simple_if intf);
+    assign intf.receiver = intf.driver;
+endmodule
+
+module top(
+    input logic [1:0] inputs,
+    output logic [1:0] outputs
+);
+    simple_if intf0();
+    simple_if intf1();
+
+    driver_mod d0(intf0, inputs[0]);
+    driver_mod d1(intf1, inputs[1]);
+
+    receiver_mod r0(intf0);
+    receiver_mod r1(intf1);
+
+    assign outputs = {intf0.receiver, intf1.receiver};
+endmodule
+EOF
+
+logger -expect error "Unable to connect.* with positional interface" 1
+hierarchy -top top
diff --git a/tests/svinterfaces/run-test.sh b/tests/svinterfaces/run-test.sh
old mode 100755
new mode 100644
index afa222766..71bdcd67a
--- a/tests/svinterfaces/run-test.sh
+++ b/tests/svinterfaces/run-test.sh
@@ -5,3 +5,4 @@
 
 ./run_simple.sh load_and_derive
 ./run_simple.sh resolve_types
+./run_simple.sh positional_args

From 37ba29482ef98c11ffea81185d5b869a6986f280 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 15 Oct 2025 09:17:52 +1300
Subject: [PATCH 703/931] docs: Amend modports support to all SVI

Also some formatting fixes.
---
 docs/source/using_yosys/verilog.rst | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/docs/source/using_yosys/verilog.rst b/docs/source/using_yosys/verilog.rst
index 95c0168ba..a557360b7 100644
--- a/docs/source/using_yosys/verilog.rst
+++ b/docs/source/using_yosys/verilog.rst
@@ -9,7 +9,7 @@ Yosys and there are currently no plans to add support
 for them:
 
 - Non-synthesizable language features as defined in
-	IEC 62142(E):2005 / IEEE Std. 1364.1(E):2002
+  IEC 62142(E):2005 / IEEE Std. 1364.1(E):2002
 
 - The ``tri``, ``triand`` and ``trior`` net types
 
@@ -356,24 +356,29 @@ from SystemVerilog:
   files being read into the same design afterwards.
 
 - typedefs are supported (including inside packages)
-	- type casts are currently not supported
+
+  - type casts are currently not supported
 
 - enums are supported (including inside packages)
-	- but are currently not strongly typed
+
+  - but are currently not strongly typed
 
 - packed structs and unions are supported
-	- arrays of packed structs/unions are currently not supported
-	- structure literals are currently not supported
+
+  - arrays of packed structs/unions are currently not supported
+  - structure literals are currently not supported
 
 - multidimensional arrays are supported
-	- array assignment of unpacked arrays is currently not supported
-	- array literals are currently not supported
 
-- SystemVerilog interfaces (SVIs) are supported. Modports for specifying whether
-  ports are inputs or outputs are supported when used with named arguments, but
-  not positional arguments.  i.e. ``driver_mod d0(.intf(intf0),
-  .in(inputs[0]));`` is supported but ``driver_mod d0(intf0, inputs[0]);`` is
-  not.
+  - array assignment of unpacked arrays is currently not supported
+  - array literals are currently not supported
+
+- SystemVerilog interfaces (SVIs), including modports for specifying whether
+  ports are inputs or outputs, are partially supported.
+
+  - interfaces must be provided as *named* arguments, not positional arguments.
+    i.e. ``foo bar(.intf(intf0), .x(x));`` is supported but ``foo bar(intf0,
+    x);`` is not.
 
 - Assignments within expressions are supported.
 

From 5d2d5441090c0621a7288735027af93f8e616899 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 15 Oct 2025 09:38:43 +1300
Subject: [PATCH 704/931] hierarchy.cc: Don't segfault

---
 passes/hierarchy/hierarchy.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/passes/hierarchy/hierarchy.cc b/passes/hierarchy/hierarchy.cc
index c0e6a9104..bfdb80459 100644
--- a/passes/hierarchy/hierarchy.cc
+++ b/passes/hierarchy/hierarchy.cc
@@ -302,7 +302,9 @@ struct IFExpander
 		const auto &bits = conn_signals;
 		if (
 			bits.size() != 1 ||
+			bits[0].wire == nullptr ||
 			!bits[0].wire->get_bool_attribute(ID::is_interface) ||
+			conn_signals[0].wire == nullptr ||
 			conn_signals[0].wire->name.str().find("$dummywireforinterface") != 0
 		)
 			return;

From 10a55119a9b1008b52f18c499a406dc9d3e25ec7 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 15 Oct 2025 09:42:47 +1300
Subject: [PATCH 705/931] hierarchy.cc: Tidying

---
 passes/hierarchy/hierarchy.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/passes/hierarchy/hierarchy.cc b/passes/hierarchy/hierarchy.cc
index bfdb80459..416997bee 100644
--- a/passes/hierarchy/hierarchy.cc
+++ b/passes/hierarchy/hierarchy.cc
@@ -299,12 +299,10 @@ struct IFExpander
 	                   const RTLIL::SigSpec &conn_signals)
 	{
 		// Does the connection look like an interface
-		const auto &bits = conn_signals;
 		if (
-			bits.size() != 1 ||
-			bits[0].wire == nullptr ||
-			!bits[0].wire->get_bool_attribute(ID::is_interface) ||
+			conn_signals.size() != 1 ||
 			conn_signals[0].wire == nullptr ||
+			conn_signals[0].wire->get_bool_attribute(ID::is_interface) == false ||
 			conn_signals[0].wire->name.str().find("$dummywireforinterface") != 0
 		)
 			return;

From c599d6a67e1ddd54afd503cdc245cb0234d1c54c Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Wed, 15 Oct 2025 09:49:53 +1300
Subject: [PATCH 706/931] tests/svinterfaces: re-chmod test script

---
 tests/svinterfaces/run-test.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tests/svinterfaces/run-test.sh

diff --git a/tests/svinterfaces/run-test.sh b/tests/svinterfaces/run-test.sh
old mode 100644
new mode 100755

From e099a7d34a93397c4d41dad5ad8328c38bd37ec5 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 14 Oct 2025 21:18:58 +0000
Subject: [PATCH 707/931] Don't stop parsing sigspec after a {} group.

Resolves #5424
---
 frontends/rtlil/rtlil_frontend.cc | 30 ++++++++++++++----------------
 tests/rtlil/bug5424.ys            | 12 ++++++++++++
 tests/rtlil/run-test.sh           |  2 +-
 3 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 tests/rtlil/bug5424.ys

diff --git a/frontends/rtlil/rtlil_frontend.cc b/frontends/rtlil/rtlil_frontend.cc
index b54cd8f14..04d01fc93 100644
--- a/frontends/rtlil/rtlil_frontend.cc
+++ b/frontends/rtlil/rtlil_frontend.cc
@@ -324,29 +324,27 @@ struct RTLILFrontendWorker {
 
 	RTLIL::SigSpec parse_sigspec()
 	{
+		RTLIL::SigSpec sig;
+
 		if (try_parse_char('{')) {
 			std::vector<SigSpec> parts;
 			while (!try_parse_char('}'))
 				parts.push_back(parse_sigspec());
-			RTLIL::SigSpec sig;
 			for (auto it = parts.rbegin(); it != parts.rend(); ++it)
 				sig.append(std::move(*it));
-			return sig;
-		}
-
-		RTLIL::SigSpec sig;
-
-		// We could add a special path for parsing IdStrings that must already exist,
-		// as here.
-		// We don't need to addref/release in this case.
-		std::optional<RTLIL::IdString> id = try_parse_id();
-		if (id.has_value()) {
-			RTLIL::Wire *wire = current_module->wire(*id);
-			if (wire == nullptr)
-				error("Wire `%s' not found.", *id);
-			sig = RTLIL::SigSpec(wire);
 		} else {
-			sig = RTLIL::SigSpec(parse_const());
+			// We could add a special path for parsing IdStrings that must already exist,
+			// as here.
+			// We don't need to addref/release in this case.
+			std::optional<RTLIL::IdString> id = try_parse_id();
+			if (id.has_value()) {
+				RTLIL::Wire *wire = current_module->wire(*id);
+				if (wire == nullptr)
+					error("Wire `%s' not found.", *id);
+				sig = RTLIL::SigSpec(wire);
+			} else {
+				sig = RTLIL::SigSpec(parse_const());
+			}
 		}
 
 		while (try_parse_char('[')) {
diff --git a/tests/rtlil/bug5424.ys b/tests/rtlil/bug5424.ys
new file mode 100644
index 000000000..a0b0638e5
--- /dev/null
+++ b/tests/rtlil/bug5424.ys
@@ -0,0 +1,12 @@
+read_rtlil <<EOT
+module \meow
+	wire width 8 \nya
+	wire width 8 output 1 \mrrp
+	wire width 1 input 0 \purr
+	process $cat
+		assign \nya { \mrrp \purr } [7:0]
+	end
+end
+EOT
+
+select -assert-count 1 meow/$cat
diff --git a/tests/rtlil/run-test.sh b/tests/rtlil/run-test.sh
index 70b282a9a..83cdf8aeb 100755
--- a/tests/rtlil/run-test.sh
+++ b/tests/rtlil/run-test.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 set -eu
 source ../gen-tests-makefile.sh
-generate_mk --bash
+generate_mk --bash --yosys-scripts

From 4970ad5a187ab8950614fa77cca296aec3df7f2e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 15 Oct 2025 00:23:49 +0000
Subject: [PATCH 708/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 976f709d1..d62575f1a 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+47
+YOSYS_VER := 0.58+63
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From e86797f0297ef75826cebdd0e6f4cc51b7c77e0a Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Wed, 15 Oct 2025 14:13:25 +0300
Subject: [PATCH 709/931] plugins: add search path

This uses the environment variable `YOSYS_PLUGIN_PATH` to provide multiple colon-delimited search paths for native plugins in a similar manner to `PATH` for executables and `PYTHONPATH` for Python modules.

This addresses https://github.com/YosysHQ/yosys/issues/2545, allowing Yosys to be better packaged in non-FHS environments such as Nix.
---
 passes/cmds/plugin.cc    | 61 +++++++++++++++++++++++++++-------------
 tests/various/.gitignore |  1 +
 tests/various/plugin.sh  |  4 +++
 3 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index 191261a17..329aa4cee 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -22,6 +22,8 @@
 
 #ifdef YOSYS_ENABLE_PLUGINS
 #  include <dlfcn.h>
+#  include <filesystem>
+namespace fs = std::filesystem;
 #endif
 
 #ifdef YOSYS_ENABLE_PYTHON
@@ -39,6 +41,23 @@ std::map<std::string, void*> loaded_python_plugins;
 std::map<std::string, std::string> loaded_plugin_aliases;
 
 #ifdef YOSYS_ENABLE_PLUGINS
+inline const std::vector<fs::path> get_plugin_search_paths() {
+	std::vector<fs::path> result;
+	const char *yosys_plugin_path = std::getenv("YOSYS_PLUGIN_PATH");
+	if (yosys_plugin_path != nullptr && strlen(yosys_plugin_path)) {
+		// make mutable. std::string also manages allocation as a bonus
+		// guaranteed contiguous in c++>=11
+		std::string copy{yosys_plugin_path};
+		char *token = nullptr;
+		char *rest = &copy[0];
+		while ((token = strtok_r(rest, ":", &rest))) {
+			result.push_back(fs::path(token));
+		}
+	}
+	result.push_back(fs::path(proc_share_dirname()) / "plugins"); // lowest priority
+	return result;
+}
+
 void load_plugin(std::string filename, std::vector<std::string> aliases)
 {
 	std::string orig_filename = filename;
@@ -55,17 +74,17 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
 	const bool is_loaded = loaded_plugins.count(orig_filename);
 	#endif
 
+	fs::path full_path = fs::absolute(filename);
+
 	if (!is_loaded) {
 		// Check if we're loading a python script
-		if (filename.rfind(".py") != std::string::npos) {
+		if (full_path.extension() == ".py") {
 			#ifdef YOSYS_ENABLE_PYTHON
-				py::object Path = py::module_::import("pathlib").attr("Path");
-				py::object full_path = Path(py::cast(filename));
-				py::object plugin_python_path = full_path.attr("parent");
-				auto basename = py::cast<std::string>(full_path.attr("stem"));
+				fs::path plugin_python_path = full_path.parent_path();
+				fs::path basename = full_path.stem();
 
 				py::object sys = py::module_::import("sys");
-				sys.attr("path").attr("insert")(0, py::str(plugin_python_path));
+				sys.attr("path").attr("insert")(0, py::str(plugin_python_path.c_str()));
 
 				try {
 					auto module_container = py::module_::import(basename.c_str());
@@ -83,23 +102,25 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
 			#endif
 		} else {
 			// Otherwise we assume it's a native plugin
-
 			void *hdl = dlopen(filename.c_str(), RTLD_LAZY|RTLD_LOCAL);
 
-			// We were unable to open the file, try to do so from the plugin directory
-			if (hdl == NULL && orig_filename.find('/') == std::string::npos) {
-				hdl = dlopen([orig_filename]() {
-					std::string new_path = proc_share_dirname() + "plugins/" + orig_filename;
-
-					// Check if we need to append .so
-					if (new_path.find(".so") == std::string::npos)
-						new_path.append(".so");
-
-					return new_path;
-				}().c_str(), RTLD_LAZY|RTLD_LOCAL);
+			// We were unable to open the file, try to do so from plugin search
+			// paths
+			if (hdl == nullptr && orig_filename.find('/') == std::string::npos) {
+				const std::vector<fs::path> search_paths = get_plugin_search_paths();
+				for (const auto &search_path: search_paths) {
+					fs::path potential_path = search_path / orig_filename;
+					if (potential_path.extension() != ".so") {
+						potential_path = search_path / (orig_filename + ".so");
+					}
+					hdl = dlopen(potential_path.c_str(), RTLD_LAZY | RTLD_LOCAL);
+					if (hdl != nullptr) {
+						break;
+					}
+				}
 			}
 
-			if (hdl == NULL)
+			if (hdl == nullptr)
 				log_cmd_error("Can't load module `%s': %s\n", filename, dlerror());
 
 			loaded_plugins[orig_filename] = hdl;
@@ -116,7 +137,7 @@ void load_plugin(std::string, std::vector<std::string>)
 	log_error(
 		"\n  This version of Yosys cannot load plugins at runtime.\n"
 		"  Some plugins may have been included at build time.\n"
-		"  Use option `-H' to see the available built-in and plugin commands.\n"
+		"  Use `yosys -H' to see the available built-in and plugin commands.\n"
 	);
 }
 #endif
diff --git a/tests/various/.gitignore b/tests/various/.gitignore
index 879645f66..e116179ae 100644
--- a/tests/various/.gitignore
+++ b/tests/various/.gitignore
@@ -2,6 +2,7 @@
 /write_gzip.v
 /write_gzip.v.gz
 /plugin.so
+/plugin_search
 /plugin.so.dSYM
 /temp
 /smtlib2_module.smt2
diff --git a/tests/various/plugin.sh b/tests/various/plugin.sh
index 2880c8c06..75b4c9e56 100644
--- a/tests/various/plugin.sh
+++ b/tests/various/plugin.sh
@@ -1,8 +1,12 @@
 set -e
 rm -f plugin.so
+rm -rf plugin_search
 CXXFLAGS=$(../../yosys-config --cxxflags)
 DATDIR=$(../../yosys-config --datdir)
 DATDIR=${DATDIR//\//\\\/}
 CXXFLAGS=${CXXFLAGS//$DATDIR/..\/..\/share}
 ../../yosys-config --exec --cxx ${CXXFLAGS} --ldflags -shared -o plugin.so plugin.cc
 ../../yosys -m ./plugin.so -p "test" | grep -q "Plugin test passed!"
+mkdir -p plugin_search
+mv plugin.so plugin_search/plugin.so
+YOSYS_PLUGIN_PATH=$PWD/plugin_search ../../yosys -m plugin.so -p "test" | grep -q "Plugin test passed!"

From dce70abd94caaa81eeb4c9bf97548db8517fb193 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Wed, 15 Oct 2025 15:53:44 +0300
Subject: [PATCH 710/931] plugins: support Windows path delimiters

---
 passes/cmds/plugin.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index 329aa4cee..4ccd8e5d4 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -41,6 +41,9 @@ std::map<std::string, void*> loaded_python_plugins;
 std::map<std::string, std::string> loaded_plugin_aliases;
 
 #ifdef YOSYS_ENABLE_PLUGINS
+
+static constexpr const char *path_delimiters = fs::path::preferred_separator == '\\' ? ";" : ":" ;
+
 inline const std::vector<fs::path> get_plugin_search_paths() {
 	std::vector<fs::path> result;
 	const char *yosys_plugin_path = std::getenv("YOSYS_PLUGIN_PATH");
@@ -50,7 +53,7 @@ inline const std::vector<fs::path> get_plugin_search_paths() {
 		std::string copy{yosys_plugin_path};
 		char *token = nullptr;
 		char *rest = &copy[0];
-		while ((token = strtok_r(rest, ":", &rest))) {
+		while ((token = strtok_r(rest, path_delimiters, &rest))) {
 			result.push_back(fs::path(token));
 		}
 	}

From 061b6ce2adbce47cb1db4eef55169fd64977bbbb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 16 Oct 2025 00:23:57 +0000
Subject: [PATCH 711/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d62575f1a..934bd6586 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+63
+YOSYS_VER := 0.58+69
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From db8c1878a0df1eaafaef698469bb91ac4118f285 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 16 Oct 2025 08:30:43 +0200
Subject: [PATCH 712/931] fix dlopen using fs:path with mingw

---
 passes/cmds/plugin.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index 4ccd8e5d4..dec53cf37 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -116,7 +116,7 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
 					if (potential_path.extension() != ".so") {
 						potential_path = search_path / (orig_filename + ".so");
 					}
-					hdl = dlopen(potential_path.c_str(), RTLD_LAZY | RTLD_LOCAL);
+					hdl = dlopen(potential_path.string().c_str(), RTLD_LAZY | RTLD_LOCAL);
 					if (hdl != nullptr) {
 						break;
 					}

From f11a61b32b669248dc8e8535135672ccb8249532 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 16 Oct 2025 11:37:44 +0200
Subject: [PATCH 713/931] sim: Make cycle width small as possible and
 configurable

---
 passes/sat/sim.cc       | 56 ++++++++++++++++++++++++-----------------
 tests/sim/sim_cycles.ys | 14 +++++------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index fac7bd744..8f0886a4e 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -1392,7 +1392,7 @@ struct SimWorker : SimShared
 		}
 	}
 
-	void run(Module *topmod, int numcycles)
+	void run(Module *topmod, int cycle_width, int numcycles)
 	{
 		log_assert(top == nullptr);
 		top = new SimInstance(this, scope, topmod);
@@ -1418,20 +1418,20 @@ struct SimWorker : SimShared
 		for (int cycle = 0; cycle < numcycles; cycle++)
 		{
 			if (debug)
-				log("\n===== %d =====\n", 10*cycle + 5);
+				log("\n===== %d =====\n", int(cycle_width*cycle + cycle_width/2));
 			else if (verbose)
 				log("Simulating cycle %d.\n", (cycle*2)+1);
 			set_inports(clock, State::S0);
 			set_inports(clockn, State::S1);
 
 			update(true);
-			register_output_step(10*cycle + 5);
+			register_output_step(cycle_width*cycle + cycle_width/2);
 
 			if (cycle == 0)
 				top->set_initstate_outputs(State::S0);
 
 			if (debug)
-				log("\n===== %d =====\n", 10*cycle + 10);
+				log("\n===== %d =====\n", int(cycle_width*cycle + cycle_width));
 			else if (verbose)
 				log("Simulating cycle %d.\n", (cycle*2)+2);
 
@@ -1444,10 +1444,10 @@ struct SimWorker : SimShared
 			}
 
 			update(true);
-			register_output_step(10*cycle + 10);
+			register_output_step(cycle_width*cycle + cycle_width);
 		}
 
-		register_output_step(10*numcycles + 2);
+		register_output_step(cycle_width*numcycles + 2);
 
 		write_output_files();
 	}
@@ -1582,7 +1582,7 @@ struct SimWorker : SimShared
 		return atoi(name.substr(pos+1).c_str());
 	}
 
-	void run_cosim_aiger_witness(Module *topmod)
+	void run_cosim_aiger_witness(Module *topmod, int cycle_width)
 	{
 		log_assert(top == nullptr);
 		if (!multiclock && (clock.size()+clockn.size())==0)
@@ -1691,18 +1691,18 @@ struct SimWorker : SimShared
 						set_inports(clockn, State::S1);
 					}
 					update(true);
-					register_output_step(10*cycle);
+					register_output_step(cycle_width*cycle);
 					if (!multiclock && cycle) {
 						set_inports(clock, State::S0);
 						set_inports(clockn, State::S1);
 						update(true);
-						register_output_step(10*cycle + 5);
+						register_output_step(cycle_width*cycle + cycle_width/2);
 					}
 					cycle++;
 					break;
 			}
 		}
-		register_output_step(10*cycle);
+		register_output_step(cycle_width*cycle);
 		write_output_files();
 	}
 
@@ -1730,7 +1730,7 @@ struct SimWorker : SimShared
 		return name.substr(0, pos);
 	}
 
-	void run_cosim_btor2_witness(Module *topmod)
+	void run_cosim_btor2_witness(Module *topmod, int cycle_width)
 	{
 		log_assert(top == nullptr);
 		if (!multiclock && (clock.size()+clockn.size())==0)
@@ -1768,12 +1768,12 @@ struct SimWorker : SimShared
 					set_inports(clock, State::S1);
 					set_inports(clockn, State::S0);
 					update(true);
-					register_output_step(10*cycle+0);
+					register_output_step(cycle_width*cycle + 0);
 					if (!multiclock) {
 						set_inports(clock, State::S0);
 						set_inports(clockn, State::S1);
 						update(true);
-						register_output_step(10*cycle+5);
+						register_output_step(cycle_width*cycle + cycle_width/2);
 					}
 					cycle++;
 					prev_cycle = curr_cycle;
@@ -1832,7 +1832,7 @@ struct SimWorker : SimShared
 					break;
 			}
 		}
-		register_output_step(10*cycle);
+		register_output_step(cycle_width*cycle);
 		write_output_files();
 	}
 
@@ -1983,7 +1983,7 @@ struct SimWorker : SimShared
 		}
 	}
 
-	void run_cosim_yw_witness(Module *topmod, int append)
+	void run_cosim_yw_witness(Module *topmod, int cycle_width, int append)
 	{
 		if (!clock.empty())
 			log_cmd_error("The -clock option is not required nor supported when reading a Yosys witness file.\n");
@@ -2013,7 +2013,7 @@ struct SimWorker : SimShared
 					log("Simulating non-active clock edge.\n");
 				set_yw_clocks(yw, hierarchy, false);
 				update(false);
-				register_output_step(5);
+				register_output_step(cycle_width/2);
 			}
 			top->set_initstate_outputs(State::S0);
 		}
@@ -2026,18 +2026,18 @@ struct SimWorker : SimShared
 				set_yw_state(yw, hierarchy, cycle);
 			set_yw_clocks(yw, hierarchy, true);
 			update(true);
-			register_output_step(10 * cycle);
+			register_output_step(cycle_width*cycle);
 
 			if (!yw.clocks.empty()) {
 				if (debug)
 					log("Simulating non-active clock edge.\n");
 				set_yw_clocks(yw, hierarchy, false);
 				update(false);
-				register_output_step(5 + 10 * cycle);
+				register_output_step(cycle_width*cycle + cycle_width/2);
 			}
 		}
 
-		register_output_step(10 * (GetSize(yw.steps) + append));
+		register_output_step(cycle_width * (GetSize(yw.steps) + append));
 		write_output_files();
 	}
 
@@ -2630,6 +2630,9 @@ struct SimPass : public Pass {
 		log("            File formats supported: FST, VCD, AIW, WIT and .yw\n");
 		log("            VCD support requires vcd2fst external tool to be present\n");
 		log("\n");
+		log("    -width <integer>\n");
+		log("        cycle width in generated simulation output (must be divisible by 2).\n");
+		log("\n");
 		log("    -append <integer>\n");
 		log("        number of extra clock cycles to simulate for a Yosys witness input\n");
 		log("\n");
@@ -2689,6 +2692,7 @@ struct SimPass : public Pass {
 	{
 		SimWorker worker;
 		int numcycles = 20;
+		int cycle_width = 2;
 		int append = 0;
 		bool start_set = false, stop_set = false, at_set = false;
 
@@ -2781,6 +2785,12 @@ struct SimPass : public Pass {
 				append = atoi(args[++argidx].c_str());
 				continue;
 			}
+			if (args[argidx] == "-width" && argidx+1 < args.size()) {
+				cycle_width = atoi(args[++argidx].c_str());
+				if (cycle_width <= 0 || (cycle_width % 2))
+					log_cmd_error("Cycle width must be positive even number.\n");
+				continue;
+			}
 			if (args[argidx] == "-map" && argidx+1 < args.size()) {
 				std::string map_filename = args[++argidx];
 				rewrite_filename(map_filename);
@@ -2872,7 +2882,7 @@ struct SimPass : public Pass {
 		}
 
 		if (worker.sim_filename.empty())
-			worker.run(top_mod, numcycles);
+			worker.run(top_mod, cycle_width, numcycles);
 		else {
 			std::string filename_trim = file_base_name(worker.sim_filename);
 			if (filename_trim.size() > 4 && ((filename_trim.compare(filename_trim.size()-4, std::string::npos, ".fst") == 0) ||
@@ -2881,11 +2891,11 @@ struct SimPass : public Pass {
 			} else if (filename_trim.size() > 4 && filename_trim.compare(filename_trim.size()-4, std::string::npos, ".aiw") == 0) {
 				if (worker.map_filename.empty())
 					log_cmd_error("For AIGER witness file map parameter is mandatory.\n");
-				worker.run_cosim_aiger_witness(top_mod);
+				worker.run_cosim_aiger_witness(top_mod, cycle_width);
 			} else if (filename_trim.size() > 4 && filename_trim.compare(filename_trim.size()-4, std::string::npos, ".wit") == 0) {
-				worker.run_cosim_btor2_witness(top_mod);
+				worker.run_cosim_btor2_witness(top_mod, cycle_width);
 			} else if (filename_trim.size() > 3 && filename_trim.compare(filename_trim.size()-3, std::string::npos, ".yw") == 0) {
-				worker.run_cosim_yw_witness(top_mod, append);
+				worker.run_cosim_yw_witness(top_mod, cycle_width, append);
 			} else {
 				log_cmd_error("Unhandled extension for simulation input file `%s`.\n", worker.sim_filename);
 			}
diff --git a/tests/sim/sim_cycles.ys b/tests/sim/sim_cycles.ys
index 7c6c943d9..0a13d9301 100644
--- a/tests/sim/sim_cycles.ys
+++ b/tests/sim/sim_cycles.ys
@@ -10,7 +10,7 @@ logger -expect-no-warnings
 logger -expect log "Co-simulating cycle 41" 2
 logger -warn "Co-simulating cycle 42"
 sim -clock clk -r sim_cycles.fst -scope dff -n 21 -sim-cmp
-sim -clock clk -r sim_cycles.fst -scope dff -stop 202 -sim-cmp
+sim -clock clk -r sim_cycles.fst -scope dff -stop 41 -sim-cmp
 logger -check-expected
 
 # over limit stops at final step
@@ -18,29 +18,29 @@ logger -expect log "Co-simulating cycle 41" 2
 sim -clock clk -r sim_cycles.fst -scope dff -n 30 -sim-cmp
 # -stop warns for over limit
 logger -nowarn "Stop time is after simulation file end time"
-sim -clock clk -r sim_cycles.fst -scope dff -stop 300 -sim-cmp
+sim -clock clk -r sim_cycles.fst -scope dff -stop 50 -sim-cmp
 logger -check-expected
 
 # don't auto step last
 logger -expect log "Co-simulating cycle 40" 2
 logger -warn "Co-simulating cycle 41"
 sim -clock clk -r sim_cycles.fst -scope dff -n 20 -sim-cmp
-sim -clock clk -r sim_cycles.fst -scope dff -stop 200 -sim-cmp
+sim -clock clk -r sim_cycles.fst -scope dff -stop 40 -sim-cmp
 logger -check-expected
 
-# -n 10 == -stop 100
+# -n 10 == -stop 20
 # should simulate up to 20 and not more
 logger -expect log "Co-simulating cycle 20" 2
 logger -warn "Co-simulating cycle 21"
 sim -clock clk -r sim_cycles.fst -scope dff -n 10 -sim-cmp
-sim -clock clk -r sim_cycles.fst -scope dff -stop 100 -sim-cmp
+sim -clock clk -r sim_cycles.fst -scope dff -stop 20 -sim-cmp
 logger -check-expected
 
-# -n 1 == -stop 10
+# -n 1 == -stop 2
 logger -expect log "Co-simulating cycle 2" 2
 logger -warn "Co-simulating cycle 3"
 sim -clock clk -r sim_cycles.fst -scope dff -n 1 -sim-cmp
-sim -clock clk -r sim_cycles.fst -scope dff -stop 10 -sim-cmp
+sim -clock clk -r sim_cycles.fst -scope dff -stop 2 -sim-cmp
 logger -check-expected
 
 # -n 0 == -stop 0

From 8f6d63c0823cd8b64fd30f7892735f00e12f7467 Mon Sep 17 00:00:00 2001
From: Maxim Kudinov <max.kudinov@proton.me>
Date: Thu, 16 Oct 2025 10:32:39 +0300
Subject: [PATCH 714/931] synth_gowin: make setundef an off by default option

---
 techlibs/gowin/synth_gowin.cc | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/techlibs/gowin/synth_gowin.cc b/techlibs/gowin/synth_gowin.cc
index 03766ed36..f1669d8f8 100644
--- a/techlibs/gowin/synth_gowin.cc
+++ b/techlibs/gowin/synth_gowin.cc
@@ -94,13 +94,16 @@ struct SynthGowinPass : public ScriptPass
 		log("		  The following families are supported:\n");
 		log("        'gw1n', 'gw2a', 'gw5a'.\n");
 		log("\n");
+		log("    -setundef\n");
+		log("        run 'setundef' with '-undriven -params -zero' options\n");
+		log("\n");
 		log("The following commands are executed by this synthesis command:\n");
 		help_script();
 		log("\n");
 	}
 
 	string top_opt, vout_file, json_file, family;
-	bool retime, nobram, nolutram, flatten, nodffe, strict_gw5a_dffs, nowidelut, abc9, noiopads, noalu, no_rw_check;
+	bool retime, nobram, nolutram, flatten, nodffe, strict_gw5a_dffs, nowidelut, abc9, noiopads, noalu, no_rw_check, setundef;
 
 	void clear_flags() override
 	{
@@ -119,6 +122,7 @@ struct SynthGowinPass : public ScriptPass
 		noiopads = false;
 		noalu = false;
 		no_rw_check = false;
+		setundef = false;
 	}
 
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
@@ -201,6 +205,10 @@ struct SynthGowinPass : public ScriptPass
 				no_rw_check = true;
 				continue;
 			}
+			if (args[argidx] == "-setundef") {
+				setundef = true;
+				continue;
+			}
 			break;
 		}
 		extra_args(args, argidx, design);
@@ -321,7 +329,8 @@ struct SynthGowinPass : public ScriptPass
 		{
 			run("techmap -map +/gowin/cells_map.v");
 			run("opt_lut_ins -tech gowin");
-			run("setundef -undriven -params -zero");
+			if (setundef || help_mode)
+				run("setundef -undriven -params -zero", "(only if -setundef used)");
 			run("hilomap -singleton -hicell VCC V -locell GND G");
 			if (!vout_file.empty() || help_mode) // vendor output requires 1-bit wires
 				run("splitnets -ports", "(only if -vout used)");

From 8c347826f68586187c426d059ae4ce4a335ad037 Mon Sep 17 00:00:00 2001
From: Maxim Kudinov <max.kudinov@proton.me>
Date: Thu, 16 Oct 2025 11:06:02 +0300
Subject: [PATCH 715/931] synth_gowin: make help description more clear

---
 techlibs/gowin/synth_gowin.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/techlibs/gowin/synth_gowin.cc b/techlibs/gowin/synth_gowin.cc
index f1669d8f8..5585c0ddb 100644
--- a/techlibs/gowin/synth_gowin.cc
+++ b/techlibs/gowin/synth_gowin.cc
@@ -95,7 +95,7 @@ struct SynthGowinPass : public ScriptPass
 		log("        'gw1n', 'gw2a', 'gw5a'.\n");
 		log("\n");
 		log("    -setundef\n");
-		log("        run 'setundef' with '-undriven -params -zero' options\n");
+		log("        set undriven wires and parameters to zero\n");
 		log("\n");
 		log("The following commands are executed by this synthesis command:\n");
 		help_script();

From 653599500532fb7285bb0ce6d63369f7eb4dc079 Mon Sep 17 00:00:00 2001
From: Maxim Kudinov <max.kudinov@proton.me>
Date: Thu, 16 Oct 2025 11:08:27 +0300
Subject: [PATCH 716/931] synth_gowin: fix help hint style

---
 techlibs/gowin/synth_gowin.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/techlibs/gowin/synth_gowin.cc b/techlibs/gowin/synth_gowin.cc
index 5585c0ddb..1a55f9f37 100644
--- a/techlibs/gowin/synth_gowin.cc
+++ b/techlibs/gowin/synth_gowin.cc
@@ -330,10 +330,10 @@ struct SynthGowinPass : public ScriptPass
 			run("techmap -map +/gowin/cells_map.v");
 			run("opt_lut_ins -tech gowin");
 			if (setundef || help_mode)
-				run("setundef -undriven -params -zero", "(only if -setundef used)");
+				run("setundef -undriven -params -zero", "(only if -setundef)");
 			run("hilomap -singleton -hicell VCC V -locell GND G");
 			if (!vout_file.empty() || help_mode) // vendor output requires 1-bit wires
-				run("splitnets -ports", "(only if -vout used)");
+				run("splitnets -ports", "(only if -vout)");
 			run("clean");
 			run("autoname");
 		}

From 272aa9cde2cbb943e44a6e5c195b7bc231d51f92 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 17 Oct 2025 00:23:40 +0000
Subject: [PATCH 717/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 934bd6586..f2784bfd8 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+69
+YOSYS_VER := 0.58+74
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From b510c361621d80c63f3016d4af424a8a800393a6 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Sat, 18 Oct 2025 15:59:17 +0300
Subject: [PATCH 718/931] hotfix: headers mistakenly added to clean target

- fix `make clean` deleting a number of headers when ENABLE_PYOSYS is set to 1
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f2784bfd8..9252e1e7a 100644
--- a/Makefile
+++ b/Makefile
@@ -1131,7 +1131,7 @@ docs: docs/prep
 
 clean: clean-py
 	rm -rf share
-	rm -f $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS) $(EXTRA_OBJS) $(PY_WRAP_INCLUDES)
+	rm -f $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS) $(EXTRA_OBJS)
 	rm -f kernel/version_*.o kernel/version_*.cc
 	rm -f libs/*/*.d frontends/*/*.d passes/*/*.d backends/*/*.d kernel/*.d techlibs/*/*.d
 	rm -rf tests/asicworld/*.out tests/asicworld/*.log

From 1598771a370d5636624c7bf0029c484880c361b0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 19 Oct 2025 00:26:17 +0000
Subject: [PATCH 719/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9252e1e7a..ed0428ef4 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+74
+YOSYS_VER := 0.58+76
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 6a0ee6e4fb740840326d163599b6cad38933d26e Mon Sep 17 00:00:00 2001
From: Jannis Harder <me@jix.one>
Date: Mon, 20 Oct 2025 14:40:05 +0200
Subject: [PATCH 720/931] Revert sim's cycle_width default back to 10, but keep
 -width option

---
 passes/sat/sim.cc       | 2 +-
 tests/sim/sim_cycles.ys | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/passes/sat/sim.cc b/passes/sat/sim.cc
index 8f0886a4e..a29651653 100644
--- a/passes/sat/sim.cc
+++ b/passes/sat/sim.cc
@@ -2692,7 +2692,7 @@ struct SimPass : public Pass {
 	{
 		SimWorker worker;
 		int numcycles = 20;
-		int cycle_width = 2;
+		int cycle_width = 10;
 		int append = 0;
 		bool start_set = false, stop_set = false, at_set = false;
 
diff --git a/tests/sim/sim_cycles.ys b/tests/sim/sim_cycles.ys
index 0a13d9301..732b1fb81 100644
--- a/tests/sim/sim_cycles.ys
+++ b/tests/sim/sim_cycles.ys
@@ -2,7 +2,7 @@ read_verilog dff.v
 prep
 
 # create fst with 20 clock cycles (41 samples, 202ns)
-sim -clock clk -fst sim_cycles.fst -n 20
+sim -clock clk -fst sim_cycles.fst -width 2 -n 20
 
 logger -expect-no-warnings
 

From 311a2739f66f8231174f5fc4d86064b6623fb6c7 Mon Sep 17 00:00:00 2001
From: "William D. Jones" <thor0505@comcast.net>
Date: Mon, 20 Oct 2025 19:50:18 -0400
Subject: [PATCH 721/931] Add sys/wait.h header to bugpoint to bring in
 constants.

---
 passes/cmds/bugpoint.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/passes/cmds/bugpoint.cc b/passes/cmds/bugpoint.cc
index 897dd8459..0ced09dd9 100644
--- a/passes/cmds/bugpoint.cc
+++ b/passes/cmds/bugpoint.cc
@@ -28,6 +28,8 @@
 #  define WEXITSTATUS(x) ((x) & 0xff)
 #  define WTERMSIG(x) SIGTERM
 #  define WSTOPSIG(x) 0
+#else
+#include <sys/wait.h>
 #endif
 
 USING_YOSYS_NAMESPACE

From 37875fdedfeb6a72d2fe830618346e5c695cfe74 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Oct 2025 00:23:46 +0000
Subject: [PATCH 722/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ed0428ef4..d17fe3a9a 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+76
+YOSYS_VER := 0.58+80
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 64700dec65d6217d88b8f869dcf1a36cc365f94d Mon Sep 17 00:00:00 2001
From: YRabbit <rabbit@yrabbit.cyou>
Date: Tue, 21 Oct 2025 12:36:06 +1000
Subject: [PATCH 723/931] Gowin. Disable unsupported BSRAM mode in GW5A

All supported (and planned to be supported) GW5A series chips do not
support the 2: Read-before-Write write mode.

Here, we prohibit the generation of BSRAM with this mode.

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
---
 techlibs/gowin/Makefile.inc   |  1 +
 techlibs/gowin/brams_gw5a.txt | 69 +++++++++++++++++++++++++++++++++++
 techlibs/gowin/synth_gowin.cc |  2 +-
 3 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 techlibs/gowin/brams_gw5a.txt

diff --git a/techlibs/gowin/Makefile.inc b/techlibs/gowin/Makefile.inc
index df1b79317..08893e73f 100644
--- a/techlibs/gowin/Makefile.inc
+++ b/techlibs/gowin/Makefile.inc
@@ -10,5 +10,6 @@ $(eval $(call add_share_file,share/gowin,techlibs/gowin/arith_map.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/brams_map.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/brams_map_gw5a.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/brams.txt))
+$(eval $(call add_share_file,share/gowin,techlibs/gowin/brams_gw5a.txt))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/lutrams_map.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/lutrams.txt))
diff --git a/techlibs/gowin/brams_gw5a.txt b/techlibs/gowin/brams_gw5a.txt
new file mode 100644
index 000000000..2747ea451
--- /dev/null
+++ b/techlibs/gowin/brams_gw5a.txt
@@ -0,0 +1,69 @@
+ram block $__GOWIN_SP_ {
+	abits 14;
+	widths 1 2 4 9 18 36 per_port;
+	cost 128;
+	init no_undef;
+	port srsw "A" {
+		clock posedge;
+		clken;
+		option "RESET_MODE" "SYNC" {
+			rdsrst zero ungated;
+		}
+		option "RESET_MODE" "ASYNC" {
+			rdarst zero;
+		}
+		rdinit zero;
+		portoption "WRITE_MODE" 0 {
+			rdwr no_change;
+		}
+		portoption "WRITE_MODE" 1 {
+			rdwr new;
+		}
+	}
+}
+
+ram block $__GOWIN_DP_ {
+	abits 14;
+	widths 1 2 4 9 18 per_port;
+	cost 128;
+	init no_undef;
+	port srsw "A" "B" {
+		clock posedge;
+		clken;
+		option "RESET_MODE" "SYNC" {
+			rdsrst zero ungated;
+		}
+		option "RESET_MODE" "ASYNC" {
+			rdarst zero;
+		}
+		rdinit zero;
+		portoption "WRITE_MODE" 0 {
+			rdwr no_change;
+		}
+		portoption "WRITE_MODE" 1 {
+			rdwr new;
+		}
+	}
+}
+
+ram block $__GOWIN_SDP_ {
+	abits 14;
+	widths 1 2 4 9 18 36 per_port;
+	cost 128;
+	init no_undef;
+	port sr "R" {
+		clock posedge;
+		clken;
+		option "RESET_MODE" "SYNC" {
+			rdsrst zero ungated;
+		}
+		option "RESET_MODE" "ASYNC" {
+			rdarst zero;
+		}
+		rdinit zero;
+	}
+	port sw "W" {
+		clock posedge;
+		clken;
+	}
+}
diff --git a/techlibs/gowin/synth_gowin.cc b/techlibs/gowin/synth_gowin.cc
index 1a55f9f37..4e925daab 100644
--- a/techlibs/gowin/synth_gowin.cc
+++ b/techlibs/gowin/synth_gowin.cc
@@ -263,7 +263,7 @@ struct SynthGowinPass : public ScriptPass
 				if (nolutram)
 					args += " -no-auto-distributed";
 			}
-			run("memory_libmap -lib +/gowin/lutrams.txt -lib +/gowin/brams.txt" + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
+			run(stringf("memory_libmap -lib +/gowin/lutrams.txt -lib +/gowin/brams%s.txt", family == "gw5a" ? "_gw5a" : "") + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
 			run(stringf("techmap -map +/gowin/lutrams_map.v -map +/gowin/brams_map%s.v", family == "gw5a" ? "_gw5a" : ""));
 		}
 

From 25aafab86b6c22f711fdd45cdd14f7721cfcffe1 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 23 Oct 2025 20:46:11 +0000
Subject: [PATCH 724/931] Set `port_id` for Verific PortBus wires

---
 frontends/verific/verific.cc    |  1 +
 tests/verific/port_bus_order.ys | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 tests/verific/port_bus_order.ys

diff --git a/frontends/verific/verific.cc b/frontends/verific/verific.cc
index ff8932dac..5790e92f0 100644
--- a/frontends/verific/verific.cc
+++ b/frontends/verific/verific.cc
@@ -1576,6 +1576,7 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
 		SetIter si ;
 		Port *port ;
 		FOREACH_PORT_OF_PORTBUS(portbus, si, port) {
+			wire->port_id = nl->IndexOf(port) + 1;
 			import_attributes(wire->attributes, port->GetNet(), nl, portbus->Size());
 			break;
 		}
diff --git a/tests/verific/port_bus_order.ys b/tests/verific/port_bus_order.ys
new file mode 100644
index 000000000..8732582a2
--- /dev/null
+++ b/tests/verific/port_bus_order.ys
@@ -0,0 +1,13 @@
+verific -sv <<EOT
+module simple (
+  input  [3:0] I2,
+  input  [3:0] I1,
+  output [3:0] result
+);
+  assign result = I2 & I1;
+endmodule
+EOT
+verific -import simple
+
+write_verilog verilog_port_bus_order.out
+!grep -qF 'simple(I2, I1, result)' verilog_port_bus_order.out

From f5c9e122de08b35526e722a4f1a53e1c181b9365 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 Oct 2025 00:21:47 +0000
Subject: [PATCH 725/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d17fe3a9a..f97935dea 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+80
+YOSYS_VER := 0.58+84
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 3956f103a9f9dec6261845c163fdf8d3eaaf8794 Mon Sep 17 00:00:00 2001
From: YRabbit <rabbit@yrabbit.cyou>
Date: Sat, 25 Oct 2025 16:36:46 +1000
Subject: [PATCH 726/931] Gowin. Handle the WRITE_MODE.

Process the WRITE_MODE in the GW5A series in a more concise manner.

You can check it in the same way as in
https://github.com/YosysHQ/yosys/pull/5440

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
---
 techlibs/gowin/Makefile.inc   |  1 -
 techlibs/gowin/brams.txt      | 12 ++++--
 techlibs/gowin/brams_gw5a.txt | 69 -----------------------------------
 techlibs/gowin/synth_gowin.cc |  2 +-
 4 files changed, 9 insertions(+), 75 deletions(-)
 delete mode 100644 techlibs/gowin/brams_gw5a.txt

diff --git a/techlibs/gowin/Makefile.inc b/techlibs/gowin/Makefile.inc
index 08893e73f..df1b79317 100644
--- a/techlibs/gowin/Makefile.inc
+++ b/techlibs/gowin/Makefile.inc
@@ -10,6 +10,5 @@ $(eval $(call add_share_file,share/gowin,techlibs/gowin/arith_map.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/brams_map.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/brams_map_gw5a.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/brams.txt))
-$(eval $(call add_share_file,share/gowin,techlibs/gowin/brams_gw5a.txt))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/lutrams_map.v))
 $(eval $(call add_share_file,share/gowin,techlibs/gowin/lutrams.txt))
diff --git a/techlibs/gowin/brams.txt b/techlibs/gowin/brams.txt
index 435d3b5cf..ee76dd73a 100644
--- a/techlibs/gowin/brams.txt
+++ b/techlibs/gowin/brams.txt
@@ -19,8 +19,10 @@ ram block $__GOWIN_SP_ {
 		portoption "WRITE_MODE" 1 {
 			rdwr new;
 		}
-		portoption "WRITE_MODE" 2 {
-			rdwr old;
+		ifndef gw5a {
+			portoption "WRITE_MODE" 2 {
+				rdwr old;
+			}
 		}
 	}
 }
@@ -46,8 +48,10 @@ ram block $__GOWIN_DP_ {
 		portoption "WRITE_MODE" 1 {
 			rdwr new;
 		}
-		portoption "WRITE_MODE" 2 {
-			rdwr old;
+		ifndef gw5a {
+			portoption "WRITE_MODE" 2 {
+				rdwr old;
+			}
 		}
 	}
 }
diff --git a/techlibs/gowin/brams_gw5a.txt b/techlibs/gowin/brams_gw5a.txt
deleted file mode 100644
index 2747ea451..000000000
--- a/techlibs/gowin/brams_gw5a.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-ram block $__GOWIN_SP_ {
-	abits 14;
-	widths 1 2 4 9 18 36 per_port;
-	cost 128;
-	init no_undef;
-	port srsw "A" {
-		clock posedge;
-		clken;
-		option "RESET_MODE" "SYNC" {
-			rdsrst zero ungated;
-		}
-		option "RESET_MODE" "ASYNC" {
-			rdarst zero;
-		}
-		rdinit zero;
-		portoption "WRITE_MODE" 0 {
-			rdwr no_change;
-		}
-		portoption "WRITE_MODE" 1 {
-			rdwr new;
-		}
-	}
-}
-
-ram block $__GOWIN_DP_ {
-	abits 14;
-	widths 1 2 4 9 18 per_port;
-	cost 128;
-	init no_undef;
-	port srsw "A" "B" {
-		clock posedge;
-		clken;
-		option "RESET_MODE" "SYNC" {
-			rdsrst zero ungated;
-		}
-		option "RESET_MODE" "ASYNC" {
-			rdarst zero;
-		}
-		rdinit zero;
-		portoption "WRITE_MODE" 0 {
-			rdwr no_change;
-		}
-		portoption "WRITE_MODE" 1 {
-			rdwr new;
-		}
-	}
-}
-
-ram block $__GOWIN_SDP_ {
-	abits 14;
-	widths 1 2 4 9 18 36 per_port;
-	cost 128;
-	init no_undef;
-	port sr "R" {
-		clock posedge;
-		clken;
-		option "RESET_MODE" "SYNC" {
-			rdsrst zero ungated;
-		}
-		option "RESET_MODE" "ASYNC" {
-			rdarst zero;
-		}
-		rdinit zero;
-	}
-	port sw "W" {
-		clock posedge;
-		clken;
-	}
-}
diff --git a/techlibs/gowin/synth_gowin.cc b/techlibs/gowin/synth_gowin.cc
index 4e925daab..b9902659c 100644
--- a/techlibs/gowin/synth_gowin.cc
+++ b/techlibs/gowin/synth_gowin.cc
@@ -263,7 +263,7 @@ struct SynthGowinPass : public ScriptPass
 				if (nolutram)
 					args += " -no-auto-distributed";
 			}
-			run(stringf("memory_libmap -lib +/gowin/lutrams.txt -lib +/gowin/brams%s.txt", family == "gw5a" ? "_gw5a" : "") + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
+			run(stringf("memory_libmap -lib +/gowin/lutrams.txt -lib +/gowin/brams.txt -D %s", family) + args, "(-no-auto-block if -nobram, -no-auto-distributed if -nolutram)");
 			run(stringf("techmap -map +/gowin/lutrams_map.v -map +/gowin/brams_map%s.v", family == "gw5a" ? "_gw5a" : ""));
 		}
 

From d6b9158fa37cf18f48795e32275a3bf733aa0463 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Wed, 22 Oct 2025 00:02:40 +0300
Subject: [PATCH 727/931] pyosys: fix regressions from 0.58

- consistently use value semantics for objects passed along FFI boundary
  (not ideal but matches previous behavior)
- add new overload of RTLIL::Module: addMemory that does not require a "donor" object
  - the idea is `Module`, `Memory`, `Wire`, `Cell` and `Process` cannot be directly constructed in Python and can only be added to the existing memory hierarchy in `Design` using the `add` methods - `Memory` requiring a donor object was the odd one out here
- fix superclass member wrapping only looking at direct superclass for inheritance instead of recursively checking superclasses
- fix superclass member wrapping not using superclass's denylists
- fix Design's `__str__` function not returning a string
- fix the generator crashing if there's any `std::function` in a header
- misc: add a crude `__repr__` based on `__str__`
---
 kernel/rtlil.cc                           |   8 ++
 kernel/rtlil.h                            |   1 +
 pyosys/generator.py                       | 107 +++++++++++++++-------
 pyosys/wrappers_tpl.cc                    |   8 +-
 tests/pyosys/test_idstring_lifetime.py    |  28 ++++++
 tests/pyosys/test_indirect_inheritance.py |  15 +++
 tests/pyosys/test_monitor.py              |   2 +-
 7 files changed, 135 insertions(+), 34 deletions(-)
 create mode 100644 tests/pyosys/test_idstring_lifetime.py
 create mode 100644 tests/pyosys/test_indirect_inheritance.py

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index aa4743a87..adfda7d5f 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -3088,6 +3088,14 @@ RTLIL::Cell *RTLIL::Module::addCell(RTLIL::IdString name, const RTLIL::Cell *oth
 	return cell;
 }
 
+RTLIL::Memory *RTLIL::Module::addMemory(RTLIL::IdString name)
+{
+	RTLIL::Memory *mem = new RTLIL::Memory;
+	mem->name = std::move(name);
+	memories[mem->name] = mem;
+	return mem;
+}
+
 RTLIL::Memory *RTLIL::Module::addMemory(RTLIL::IdString name, const RTLIL::Memory *other)
 {
 	RTLIL::Memory *mem = new RTLIL::Memory;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 394c6f25d..c68af4161 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1827,6 +1827,7 @@ public:
 	RTLIL::Cell *addCell(RTLIL::IdString name, RTLIL::IdString type);
 	RTLIL::Cell *addCell(RTLIL::IdString name, const RTLIL::Cell *other);
 
+	RTLIL::Memory *addMemory(RTLIL::IdString name);
 	RTLIL::Memory *addMemory(RTLIL::IdString name, const RTLIL::Memory *other);
 
 	RTLIL::Process *addProcess(RTLIL::IdString name);
diff --git a/pyosys/generator.py b/pyosys/generator.py
index 15b40a79e..65d886cf0 100644
--- a/pyosys/generator.py
+++ b/pyosys/generator.py
@@ -56,6 +56,7 @@ from cxxheaderparser.types import (
     Variable,
     Array,
     FundamentalSpecifier,
+    FunctionType,
 )
 
 __file_dir__ = Path(__file__).absolute().parent
@@ -177,11 +178,11 @@ pyosys_headers = [
                 denylist=frozenset({"bits", "bitvectorize"}),
             ),
             PyosysClass("AttrObject", denylist=frozenset({"get_blackbox_attribute"})),
-            PyosysClass("NamedObject", denylist=frozenset({"get_blackbox_attribute"})),
+            PyosysClass("NamedObject"),
             PyosysClass("Selection"),
             # PyosysClass("Monitor"), # Virtual methods, manually bridged
-            PyosysClass("CaseRule", denylist=frozenset({"get_blackbox_attribute"})),
-            PyosysClass("SwitchRule", denylist=frozenset({"get_blackbox_attribute"})),
+            PyosysClass("CaseRule"),
+            PyosysClass("SwitchRule"),
             PyosysClass("SyncRule"),
             PyosysClass(
                 "Process",
@@ -219,7 +220,7 @@ pyosys_headers = [
             ),
             PyosysClass(
                 "Design",
-                string_expr="s.hashidx_",
+                string_expr="std::to_string(s.hashidx_)",
                 hash_expr="s",
                 denylist=frozenset({"selected_whole_modules"}),  # deprecated
             ),
@@ -241,13 +242,17 @@ class PyosysType:
 
     @classmethod
     def from_type(Self, type_obj, drop_const=False) -> "PyosysType":
-        const = type_obj.const and not drop_const
+        const = hasattr(type_obj, "const") and type_obj.const and not drop_const
         if isinstance(type_obj, Pointer):
             ptr_to = Self.from_type(type_obj.ptr_to)
             return Self("ptr", (ptr_to,), const)
         elif isinstance(type_obj, Reference):
             ref_to = Self.from_type(type_obj.ref_to)
             return Self("ref", (ref_to,), const)
+        elif isinstance(type_obj, FunctionType):
+            ret_type = Self.from_type(type_obj.return_type)
+            param_types = (Self.from_type(p.type) for p in type_obj.parameters)
+            return Self("fn", (ret_type, *param_types), False)
         assert isinstance(
             type_obj, Type
         ), f"unexpected c++ type object of type {type(type_obj)}"
@@ -270,6 +275,16 @@ class PyosysType:
         if title == "Dict":
             key, value = self.specialization
             return f"{key.generate_identifier()}To{value.generate_identifier()}{title}"
+        elif title == "Fn":
+            identifier = self.specialization[0].generate_identifier()
+            if identifier == "Void":
+                identifier = ""
+            else:
+                identifier += "From"
+            identifier += "And".join(
+                p.generate_identifier() for p in self.specialization[1:]
+            )
+            return identifier
 
         return (
             "".join(spec.generate_identifier() for spec in self.specialization) + title
@@ -283,6 +298,9 @@ class PyosysType:
             return const_prefix + f"{self.specialization[0].generate_cpp_name()} *"
         elif self.base == "ref":
             return const_prefix + f"{self.specialization[0].generate_cpp_name()} &"
+        elif self.base == "fn":
+            param_cpp_names = (s.generate_cpp_name() for s in self.specialization[1:])
+            return f"{self.specialization[0].generate_cpp_name()}({','.join(param_cpp_names)})"
         else:
             return (
                 const_prefix
@@ -301,7 +319,7 @@ class PyosysWrapperGenerator(object):
         self.f = wrapper_stream
         self.f_inc = header_stream
         self.found_containers: Dict[PyosysType, Any] = {}
-        self.class_registry: Dict[str, ClassScope] = {}
+        self.class_registry: Dict[str, Tuple[ClassScope, PyosysClass]] = {}
 
     # entry point
     def generate(self):
@@ -380,7 +398,7 @@ class PyosysWrapperGenerator(object):
         if isinstance(type_info, Reference):
             return PyosysWrapperGenerator.find_containers(containers, type_info.ref_to)
         if not isinstance(type_info, Type):
-            return ()
+            return {}
         segments = type_info.typename.segments
         containers_found = {}
         for segment in segments:
@@ -411,19 +429,23 @@ class PyosysWrapperGenerator(object):
     def get_parameter_types(function: Function) -> str:
         return ", ".join(p.type.format() for p in function.parameters)
 
-    def register_containers(self, target: Union[Function, Field, Variable]):
+    def register_containers(self, target: Union[Function, Field, Variable]) -> bool:
         supported = ("dict", "idict", "pool", "set", "vector")
+        found = False
         if isinstance(target, Function):
-            self.found_containers.update(
-                self.find_containers(supported, target.return_type)
-            )
+            return_type_containers = self.find_containers(supported, target.return_type)
+            found = found or len(return_type_containers)
+            self.found_containers.update(return_type_containers)
 
             for parameter in target.parameters:
-                self.found_containers.update(
-                    self.find_containers(supported, parameter.type)
-                )
+                parameter_containers = self.find_containers(supported, parameter.type)
+                found = found or len(parameter_containers)
+                self.found_containers.update(parameter_containers)
         else:
-            self.found_containers.update(self.find_containers(supported, target.type))
+            variable_containers = self.find_containers(supported, target.type)
+            found = found or len(variable_containers)
+            self.found_containers.update(variable_containers)
+        return found
 
     # processors
     def get_overload_cast(
@@ -470,9 +492,9 @@ class PyosysWrapperGenerator(object):
 
         def_args = [f'"{python_function_basename}"']
         def_args.append(self.get_overload_cast(function, class_basename))
-        for parameter in function.parameters:
-            # ASSUMPTION: there are no unnamed parameters in the yosys codebase
-            parameter_arg = f'py::arg("{parameter.name}")'
+        for i, parameter in enumerate(function.parameters):
+            name = parameter.name or f"arg{i}"
+            parameter_arg = f'py::arg("{name}")'
             if parameter.default is not None:
                 parameter_arg += f" = {parameter.default.format()}"
             def_args.append(parameter_arg)
@@ -525,8 +547,12 @@ class PyosysWrapperGenerator(object):
         if function.static:
             definition_fn = "def_static"
 
+        definition_args = self.get_definition_args(
+            function, metadata.name, python_name_override
+        )
+
         print(
-            f"\t\t\t.{definition_fn}({', '.join(self.get_definition_args(function, metadata.name, python_name_override))})",
+            f"\t\t\t.{definition_fn}({', '.join(definition_args)})",
             file=self.f,
         )
 
@@ -565,7 +591,7 @@ class PyosysWrapperGenerator(object):
             # care
             return
 
-        self.register_containers(field)
+        has_containers = self.register_containers(field)
 
         definition_fn = f"def_{'readonly' if field.type.const else 'readwrite'}"
         if field.static:
@@ -573,8 +599,13 @@ class PyosysWrapperGenerator(object):
 
         field_python_basename = keyword_aliases.get(field.name, field.name)
 
+        def_args = [
+            f'"{field_python_basename}"',
+            f"&{metadata.name}::{field.name}",
+        ]
+        def_args.append("py::return_value_policy::copy")
         print(
-            f'\t\t\t.{definition_fn}("{field_python_basename}", &{metadata.name}::{field.name})',
+            f"\t\t\t.{definition_fn}({', '.join(def_args)})",
             file=self.f,
         )
 
@@ -603,16 +634,20 @@ class PyosysWrapperGenerator(object):
         )
 
     def process_class_members(
-        self, metadata: PyosysClass, cls: ClassScope, basename: str
+        self,
+        metadata: PyosysClass,
+        base_metadata: PyosysClass,
+        cls: ClassScope,
+        basename: str,
     ):
         for method in cls.methods:
-            if method.name.segments[-1].name in metadata.denylist:
+            if method.name.segments[-1].name in base_metadata.denylist:
                 continue
             self.process_method(metadata, method)
 
         visited_anonymous_unions = set()
         for field_ in cls.fields:
-            if field_.name in metadata.denylist:
+            if field_.name in base_metadata.denylist:
                 continue
             self.process_field(metadata, field_)
 
@@ -627,6 +662,16 @@ class PyosysWrapperGenerator(object):
                     for subfield in subclass.fields:
                         self.process_field(metadata, subfield)
 
+        for base in cls.class_decl.bases:
+            if base.access != "public":
+                continue
+            name = base.typename.segments[-1].format()
+            if processed := self.class_registry.get(name):
+                base_scope, base_metadata = processed
+                self.process_class_members(
+                    metadata, base_metadata, base_scope, basename
+                )
+
     def process_class(
         self,
         metadata: PyosysClass,
@@ -638,7 +683,7 @@ class PyosysWrapperGenerator(object):
             segment.format() for segment in pqname.segments
         ]
         basename = full_path.pop()
-        self.class_registry[basename] = cls
+        self.class_registry[basename] = (cls, metadata)
 
         declaration_namespace = "::".join(full_path)
         tpl_args = [basename]
@@ -649,19 +694,17 @@ class PyosysWrapperGenerator(object):
             file=self.f,
         )
 
-        self.process_class_members(metadata, cls, basename)
-        for base in cls.class_decl.bases:
-            if base.access != "public":
-                continue
-            name = base.typename.segments[-1].format()
-            if base_scope := self.class_registry.get(name):
-                self.process_class_members(metadata, base_scope, basename)
+        self.process_class_members(metadata, metadata, cls, basename)
 
         if expr := metadata.string_expr:
             print(
                 f'\t\t.def("__str__", [](const {basename} &s) {{ return {expr}; }})',
                 file=self.f,
             )
+            print(
+                f'\t\t.def("__repr__", [](const {basename} &s) {{ std::stringstream ss; ss << "<{basename} " << {expr} << ">"; return ss.str(); }})',
+                file=self.f,
+            )
 
         if expr := metadata.hash_expr:
             print(
diff --git a/pyosys/wrappers_tpl.cc b/pyosys/wrappers_tpl.cc
index 5e77fef21..aa257e1b6 100644
--- a/pyosys/wrappers_tpl.cc
+++ b/pyosys/wrappers_tpl.cc
@@ -21,6 +21,12 @@
 // <!-- generated includes -->
 #include <pybind11/pybind11.h>
 #include <pybind11/native_enum.h>
+#include <pybind11/functional.h>
+
+// duplicates for LSPs
+#include "kernel/register.h"
+#include "kernel/yosys_common.h"
+
 #include "pyosys/hashlib.h"
 
 namespace py = pybind11;
@@ -28,7 +34,7 @@ namespace py = pybind11;
 USING_YOSYS_NAMESPACE
 
 using std::set;
-using std::regex;
+using std::function;
 using std::ostream;
 using namespace RTLIL;
 
diff --git a/tests/pyosys/test_idstring_lifetime.py b/tests/pyosys/test_idstring_lifetime.py
new file mode 100644
index 000000000..4e6984474
--- /dev/null
+++ b/tests/pyosys/test_idstring_lifetime.py
@@ -0,0 +1,28 @@
+
+from pyosys import libyosys as ys
+from pathlib import Path
+
+__file_dir__ = Path(__file__).absolute().parent
+
+d = ys.Design()
+ys.run_pass(f"read_verilog {__file_dir__ / 'spm.cut.v.gz'}", d)
+ys.run_pass("hierarchy -top spm", d)
+
+external_idstring_holder_0 = None
+external_idstring_holder_1 = None
+
+def get_top_module_idstring():
+	global external_idstring_holder_0, external_idstring_holder_1
+	d = ys.Design()
+	ys.run_pass(f"read_verilog {__file_dir__ / 'spm.cut.v.gz'}", d)
+	ys.run_pass("hierarchy -top spm", d)
+	external_idstring_holder_0 = d.top_module().name
+	for cell in d.top_module().cells_:
+		print(f"TARGETED: {cell}", flush=True)
+		external_idstring_holder_1 = cell
+		break
+	# d deallocates
+
+get_top_module_idstring()
+print(external_idstring_holder_0, flush=True)
+print(external_idstring_holder_1, flush=True)
diff --git a/tests/pyosys/test_indirect_inheritance.py b/tests/pyosys/test_indirect_inheritance.py
new file mode 100644
index 000000000..e29737e32
--- /dev/null
+++ b/tests/pyosys/test_indirect_inheritance.py
@@ -0,0 +1,15 @@
+
+from pyosys import libyosys as ys
+from pathlib import Path
+
+__file_dir__ = Path(__file__).absolute().parent
+
+
+d = ys.Design()
+ys.run_pass(f"read_verilog {__file_dir__ / 'spm.cut.v.gz'}", d)
+ys.run_pass("hierarchy -top spm", d)
+
+for idstr, cell in d.top_module().cells_.items():
+    cell.set_bool_attribute("\\set")
+    print(cell.attributes)
+    break
diff --git a/tests/pyosys/test_monitor.py b/tests/pyosys/test_monitor.py
index 2eefdad60..f9e435faa 100644
--- a/tests/pyosys/test_monitor.py
+++ b/tests/pyosys/test_monitor.py
@@ -14,7 +14,7 @@ class Monitor(ys.Monitor):
 		self.mods.append(mod.name.str())
 
 m = Monitor()
-d.monitors.add(m)
+d.monitors = [m]
 
 ys.run_pass(f"read_verilog {__file_dir__ / 'spm.cut.v.gz'}", d)
 ys.run_pass("hierarchy -top spm", d)

From 8bc63ef6da5154f067b3d9521c5644c6eed3980f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 26 Oct 2025 00:25:16 +0000
Subject: [PATCH 728/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f97935dea..ff2f45d9e 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+84
+YOSYS_VER := 0.58+86
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 14c1802b0170df13fe7fd5b6a732721c1f94afa4 Mon Sep 17 00:00:00 2001
From: Patrick Urban <patrick.urban@web.de>
Date: Mon, 27 Oct 2025 15:47:48 +0100
Subject: [PATCH 729/931] gatemate: fix SERDES CDR parameters

---
 techlibs/gatemate/cells_bb.v | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/techlibs/gatemate/cells_bb.v b/techlibs/gatemate/cells_bb.v
index c0cd64c89..63629c836 100644
--- a/techlibs/gatemate/cells_bb.v
+++ b/techlibs/gatemate/cells_bb.v
@@ -79,8 +79,8 @@ module CC_SERDES #(
 	parameter  [2:0] RX_AFE_VCMSEL = 4,
 	parameter  [7:0] RX_CDR_CKP = 8'hF8,
 	parameter  [7:0] RX_CDR_CKI = 0,
-	parameter  [8:0] RX_CDR_TRANS_TH = 128,
-	parameter  [5:0] RX_CDR_LOCK_CFG = 8'h0B,
+	parameter  [6:0] RX_CDR_TRANS_TH = 7'h08,
+	parameter  [7:0] RX_CDR_LOCK_CFG = 8'hD5,
 	parameter [14:0] RX_CDR_FREQ_ACC = 0,
 	parameter [15:0] RX_CDR_PHASE_ACC = 0,
 	parameter  [1:0] RX_CDR_SET_ACC_CONFIG = 0,

From a27b1a83ae3d568994e2b898ea67513251b14a32 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 27 Oct 2025 20:32:12 +0000
Subject: [PATCH 730/931] Don't recompute hash using moved-out-of value

---
 kernel/hashlib.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/hashlib.h b/kernel/hashlib.h
index ee27c85d6..ca600231a 100644
--- a/kernel/hashlib.h
+++ b/kernel/hashlib.h
@@ -1021,7 +1021,7 @@ protected:
 		if (hashtable.empty()) {
 			entries.emplace_back(std::forward<K>(rvalue), -1);
 			do_rehash();
-			hash = do_hash(rvalue);
+			hash = do_hash(entries.back().udata);
 		} else {
 			entries.emplace_back(std::forward<K>(rvalue), hashtable[hash]);
 			hashtable[hash] = entries.size() - 1;

From b2fe335b2d3270a565d5b46d7a64d4c8b88800bb Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 28 Oct 2025 13:01:26 +0100
Subject: [PATCH 731/931] dfflibmap: fix next_state inversion propagation for
 DFF flops by inverting reset value polarity

---
 passes/techmap/dfflibmap.cc              |  7 ++++++
 tests/techmap/dfflibmap_dff_not_next.lib | 24 ++++++++++++++++++
 tests/techmap/dfflibmap_formal.ys        | 31 ++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 tests/techmap/dfflibmap_dff_not_next.lib

diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index f2bd16082..6d55d1b43 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -271,6 +271,13 @@ static void find_cell(std::vector<const LibertyAst *> cells, IdString cell_type,
 			continue;
 		if (!parse_next_state(cell, ff->find("next_state"), cell_next_pin, cell_next_pol, cell_enable_pin, cell_enable_pol) || (has_enable && (cell_enable_pin.empty() || cell_enable_pol != enapol)))
 			continue;
+
+		if (has_reset && !cell_next_pol) {
+			// next_state is negated
+			// we later propagate this inversion to the output,
+			// which requires the negation of the reset value
+			rstval = !rstval;
+		}
 		if (has_reset && rstval == false) {
 			if (!parse_pin(cell, ff->find("clear"), cell_rst_pin, cell_rst_pol) || cell_rst_pol != rstpol)
 				continue;
diff --git a/tests/techmap/dfflibmap_dff_not_next.lib b/tests/techmap/dfflibmap_dff_not_next.lib
new file mode 100644
index 000000000..0a0b011de
--- /dev/null
+++ b/tests/techmap/dfflibmap_dff_not_next.lib
@@ -0,0 +1,24 @@
+library (test_not_next) {
+  cell (dff_not_next) {
+    area: 1.0;
+    pin (QN) {
+      direction : output;
+      function : "STATE";
+    }
+    pin (CLK) {
+      direction : input;
+      clock : true;
+    }
+    pin (D) {
+      direction : input;
+    }
+    pin (RN) {
+      direction : input;
+    }
+    ff (STATE, STATEN) {
+      clocked_on: "CLK";
+      next_state: "!D";
+      preset : "!RN";
+    }
+  }
+}
diff --git a/tests/techmap/dfflibmap_formal.ys b/tests/techmap/dfflibmap_formal.ys
index 11c90ea6c..71a52a261 100644
--- a/tests/techmap/dfflibmap_formal.ys
+++ b/tests/techmap/dfflibmap_formal.ys
@@ -108,6 +108,37 @@ copy top top_unmapped
 simplemap top
 dfflibmap -liberty dfflibmap_dffn_dffe.lib -liberty dfflibmap_dffsr_not_next.lib top
 
+async2sync
+flatten
+opt_clean -purge
+equiv_make top top_unmapped equiv
+equiv_induct equiv
+equiv_status -assert equiv
+
+##################################################################
+
+design -reset
+read_verilog <<EOT
+
+module top(input C, D, R, output Q);
+  // DFF with preset
+  always @(posedge C or negedge R) begin
+    if (!R) Q <= 1'b1;
+    else Q <= D;
+  end
+endmodule
+
+EOT
+
+proc
+opt
+read_liberty dfflibmap_dffn_dffe.lib
+read_liberty dfflibmap_dff_not_next.lib
+
+copy top top_unmapped
+simplemap top
+dfflibmap -liberty dfflibmap_dffn_dffe.lib -liberty dfflibmap_dff_not_next.lib top
+
 async2sync
 flatten
 opt_clean -purge

From 75eff54b316911f8a9aba6c8cb5c6637b76f2956 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 Oct 2025 00:24:43 +0000
Subject: [PATCH 732/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ff2f45d9e..108c92b2a 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+86
+YOSYS_VER := 0.58+89
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 2a3720921c503465c7aac95aaa66370fb2c0c12b Mon Sep 17 00:00:00 2001
From: YRabbit <rabbit@yrabbit.cyou>
Date: Wed, 29 Oct 2025 12:48:21 +1000
Subject: [PATCH 733/931] Gowin. Fix GW5A ADCs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For these primitives, Gowin decided to use a different option for
describing ports—directly in the module header, i.e.

``` verilog
module ADC(input CLK);
```

instead of
``` verilog
module ADC(CLK);
input CLK;
```

Since this one-time parser becomes too confusing, it is easier to simply
add ADC descriptions as they are from a separate file, especially since
these primitives are only available in the GW5A series.

Test:
``` shell
yosys -p "read_verilog top.v; synth_gowin -json top-synth.json -family gw5a"
```

The old version of Yosys simply won't compile the design due to the lack
of port descriptions, while the new version will compile without errors.

Signed-off-by: YRabbit <rabbit@yrabbit.cyou>
---
 techlibs/gowin/adc.v             | 260 +++++++++++++++++++++++
 techlibs/gowin/cells_xtra.py     |  10 +
 techlibs/gowin/cells_xtra_gw5a.v | 346 +++++++++++++++++++++++--------
 3 files changed, 533 insertions(+), 83 deletions(-)
 create mode 100644 techlibs/gowin/adc.v

diff --git a/techlibs/gowin/adc.v b/techlibs/gowin/adc.v
new file mode 100644
index 000000000..a5bb13bde
--- /dev/null
+++ b/techlibs/gowin/adc.v
@@ -0,0 +1,260 @@
+/********ADC***********/
+//ADC for LRC,GW5AT-138K
+module ADCLRC (
+//Voltage signal source, /mV
+  input  ADCINBK2A,       //input from bank2 IO, adc_in_b is the reference
+  input  ADCINBK2B,       //input from bank2 IO, adc_in_b is the reference
+  input  ADCINBK3A,       //input from bank3 IO, adc_in_b is the reference
+  input  ADCINBK3B,       //input from bank3 IO, adc_in_b is the reference
+  input  ADCINBK4A,       //input from bank4 IO, adc_in_b is the reference
+  input  ADCINBK4B,       //input from bank4 IO, adc_in_b is the reference
+  input  ADCINBK5A,       //input from bank5 IO, adc_in_b is the reference
+  input  ADCINBK5B,       //input from bank5 IO, adc_in_b is the reference
+
+//control signal
+  input  [2:0] VSENCTL,    //Input source selection (ciu), from 0 to 7: adcv, adct, vdd09_0, vdd09_1, vdd18_0, vdd18_1, vdd33_0, vdd33_1
+
+  input [9:0] FSCAL_VALUE,   // temperature mode 510~948, typical value 730; Voltage mode 452~840, typical value 653
+  input [11:0] OFFSET_VALUE, //signed number, temperature mode - 1560~- 760, typical value - 1180; Voltage mode - 410~410, typical value 0
+
+  input  ADCEN,         //Enable signal, active high
+  input  CLK,           //clk input，1/2 shared
+  input  DRSTN,         //0/1 shared, Digital part reset signal, active low
+  input  ADCREQI,       //Measurement request signal, valid rising edge, asynchronous signal
+
+  //output
+  output ADCRDY,          //The measurement completion signal, active high
+  output [13:0] ADCVALUE //The measurement result output, signed number. In voltage mode,/2048 is the actual measured value; In temperature mode,/4 is the actual measured value
+
+);
+
+  parameter DYN_BKEN = "FALSE";//"FALSE","TRUE"."TRUE",BUF_BK2_EN[0]&BUF_BK3_EN[0]=1
+//Input source selection，1/2 shared
+  parameter BUF_SERDES_Q1_EN = 3'b000;    //[1:0] does not support "11"
+  parameter BUF_BK2_EN       = 6'b000000; //[3:0] Only one bit can be 1 at the same time
+  parameter BUF_BK3_EN       = 6'b000000; //[3:0] Only one bit can be 1 at the same time
+  parameter BUF_BK4_EN       = 6'b000000; //[3:0] Only one bit can be 1 at the same time
+  parameter BUF_BK5_EN       = 6'b000000; //[3:0] Only one bit can be 1 at the same time
+  parameter BUF_BK10_EN      = 5'b00000;  //[3:1] Only one bit can be 1 at the same time
+  parameter BUF_BK11_EN      = 5'b00000;  //[3:1] Only one bit can be 1 at the same time
+//Analog terminal option
+  parameter CLK_SEL          = 1'b0;      //Clock source selection. 0,PIOCLK_SEL，1,ciu_clk
+  parameter PIOCLK_SEL       = 1'b0;      //Clock source selection. 1/2 shared，0,mck_adc_clk_osc，1,io_clk
+  parameter VSEN_CTL         = 3'b000;    //Input source selection
+  parameter VSEN_CTL_SEL     = 1'b0;      //vsen_ctl source selection，0,VSEN_CTL，1,ciu_vsen_ctl
+  parameter ADC_MODE      = 1'b0;      //Mode selection
+  parameter DIV_CTL       = 2'd0;      //clock division，0:/1，1:/2，2:/4，3:/8，Clock after frequency division, 500kHz~8MHz
+
+  //Digital terminal options
+  parameter SAMPLE_CNT_SEL   = 3'd4;      //total samples configuration, 0~4:64, 128, 256, 512, 1024 sampling points, and the other values are 2048 sampling points.The total number of samples shall be greater than 7 * sampling period, i.e.  SAMPLR_CNT_SEL >= RATE_CHANGE_CTRL-1
+  parameter RATE_CHANGE_CTRL = 3'd4;      //Sampling period configuration, 0~4:4、8、16、32、64，other values are 128
+
+
+endmodule
+
+//ADCULC,GW5AT-138K
+module ADCULC (
+
+  //Voltage signal source, /mV
+  input  ADCINBK6A,       //input from bank6 IO, adc_in_b is the reference
+  input  ADCINBK6B,       //input from bank6 IO, adc_in_b is the reference
+  input  ADCINBK7A,       //input from bank7 IO, adc_in_b is the reference
+  input  ADCINBK7B,       //input from bank7 IO, adc_in_b is the reference
+
+  //control signal
+  input  [2:0] VSENCTL,    //Input source selection(cib)，0~7: vtest, vdd09_0, vdd09_1, vdd09_2, vdd18_0, vdd18_1, reserved, vdd33
+
+  input [9:0] FSCAL_VALUE,   // temperature mode 510~948, typical value 730; Voltage mode 452~840, typical value 653
+  input [11:0] OFFSET_VALUE, //signed number, temperature mode - 1560~- 760, typical value - 1180; Voltage mode - 410~410, typical value 0
+
+  input  ADCEN,         //Enable signal, active high
+  input  CLK,           //clk input
+  input  DRSTN,         //0/1 shared, Digital part reset signal, active low
+  input   ADCREQI,      //Measurement request signal, valid rising edge, asynchronous signal
+  output  ADCRDY,       //The measurement completion signal, active high
+  output  [13:0] ADCVALUE //The measurement result output, signed number. In voltage mode,/2048 is the actual measured value; In temperature mode,/4 is the actual measured value
+
+);
+  parameter DYN_BKEN = "FALSE";//"FALSE","TRUE"."TRUE",BUF_BK6_EN[0]&BUF_BK7_EN[0]=1
+
+//Input source selection
+  parameter BUF_VCC_EN       = 1'b0;      //ulc
+  parameter BUF_VCCM_EN      = 1'b0;      //ulc
+  parameter BUF_MIPI_M0_EN   = 3'b000;    //ulc,[1:0] Only one bit can be 1 at the same time
+  parameter BUF_MIPI_M1_EN   = 3'b000;    //ulc,[1:0] Only one bit can be 1 at the same time
+  parameter BUF_SERDES_Q0_EN = 3'b000;    //ulc,[1:0] Only one bit can be 1 at the same time
+  parameter BUF_BK6_EN       = 6'b000000; //bk6,[3:0] Only one bit can be 1 at the same time
+  parameter BUF_BK7_EN       = 6'b000000; //bk7,[3:0] Only one bit can be 1 at the same time
+//Analog terminal option
+  parameter CLK_SEL          = 1'b0;      //Clock source selection. 0,PIOCLK_SEL，1,ciu_clk
+  parameter PIOCLK_SEL       = 1'b0;      //Clock source selection. 1/2 shared，0,mck_adc_clk_osc，1,io_clk
+  parameter VSEN_CTL         = 3'b000;    //Input source selection
+  parameter VSEN_CTL_SEL     = 1'b0;      //vsen_ctl source selection，0,VSEN_CTL，1,ciu_vsen_ctl
+  parameter ADC_MODE      = 1'b0;      //Mode selection
+  parameter DIV_CTL          = 2'd0;      //clock division，0:/1，1:/2，2:/4，3:/8，Clock after frequency division, 500kHz~8MHz
+
+//Digital terminal options
+  parameter SAMPLE_CNT_SEL   = 3'd4;      //total samples configuration, 0~4:64, 128, 256, 512, 1024 sampling points, and the other values are 2048 sampling points.The total number of samples shall be greater than 7 * sampling period, i.e.  SAMPLR_CNT_SEL >= RATE_CHANGE_CTRL-1
+  parameter RATE_CHANGE_CTRL = 3'd4;      //Sampling period configuration, 0~4:4、8、16、32、64，other values are 128
+
+endmodule
+
+
+//ADC,GW5A-25
+module ADC (
+
+  //control signal
+  input  CLK,               //clk input
+  input  [2:0] VSENCTL,     //Input source selection (ciu), from 0 to 7: glo_left,glo_right,loc_left,vtest,vcc_rt,vccc_rt,vccm_rt,vccx_buf
+  input  ADCMODE,           //Mode selection,0:temperature mode，1:voltage mode
+  input  DRSTN,             //Digital part reset signal, active low
+  input  ADCREQI,           //Measurement request signal, valid rising edge, asynchronous signal
+  output ADCRDY,          //The measurement completion signal, active high
+  output [13:0] ADCVALUE, //The measurement result output, signed number. In voltage mode,/2048 is the actual measured value; In temperature mode,/4 is the actual measured value
+  //mdrp
+  input  MDRP_CLK,              //mdrp clock
+  input  [7:0] MDRP_WDATA,      //mdrp write data
+  input  MDRP_A_INC,            //mdrp self-increased address
+  input  [1:0] MDRP_OPCODE,     //mdrp opcode
+  output [7:0] MDRP_RDATA,       //mdrp read data
+  input  ADCEN              //Enable signal, active high
+
+);
+
+  //Analog terminal option
+  parameter CLK_SEL         = 1'b0;      //时钟源选择，0:osc(2.5MHz)，1:CLK
+  parameter DIV_CTL         = 2'd0;      //clock division，0:/1，1:/2，2:/4，3:/8，Clock after frequency division, 500kHz~8MHz
+
+  //Input source selection
+  parameter BUF_EN          = 12'b000000000000; //
+  parameter BUF_BK0_VREF_EN = 1'b0;  //
+  parameter BUF_BK1_VREF_EN = 1'b0;  //
+  parameter BUF_BK2_VREF_EN = 1'b0;  //
+  parameter BUF_BK3_VREF_EN = 1'b0;  //
+  parameter BUF_BK4_VREF_EN = 1'b0;  //
+  parameter BUF_BK5_VREF_EN = 1'b0;  //
+  parameter BUF_BK6_VREF_EN = 1'b0;  //
+  parameter BUF_BK7_VREF_EN = 1'b0;  //
+
+  //Digital terminal options
+  parameter CSR_ADC_MODE      = 1'b1;       // Mode selection
+  parameter CSR_VSEN_CTRL        = 3'd0;       // signal source:vccx/vccio_*/vcc_reg -> 7, signal source:vcc_ext -> 4, others -> 0
+  parameter CSR_SAMPLE_CNT_SEL   = 3'd4;       // total samples configuration, 0~4:64, 128, 256, 512, 1024 sampling points, and the other values are 2048 sampling points.The total number of samples shall be greater than 7 * sampling period, i.e.  SAMPLR_CNT_SEL >= RATE_CHANGE_CTRL-1
+  parameter CSR_RATE_CHANGE_CTRL = 3'd4;       // Sampling period configuration, 0~4:4、8、16、32、64，other values are 128
+  parameter CSR_FSCAL            = 10'd730;    // Parameter 1: temperature mode 510~948, typical value 730; Voltage mode 452~840, typical value 653
+  parameter CSR_OFFSET           = -12'd1180;  // Parameter 2, signed number, temperature mode - 1560~- 760, typical value - 1180; Voltage mode - 410~410, typical value 0
+
+
+endmodule
+
+
+//ADC_SAR,integrated saradc and adc functions.
+module ADC_SAR (
+//`ifdef ADC
+  input  ADCMODE,          //Mode selection
+  input  [2:0] VSENCTL,    //Input source selection
+  input  CLK,              //clk input
+  //Digital
+  output ADCENO,           //Enable signal, active high
+  input  DRSTN,            //Digital part reset signal, active low
+  input  ADCREQI,          //Measurement request signal
+  output ADCRDY,           //The measurement completion signal, active high
+  output [13:0] ADCVALUE,  //The measurement result output
+  input  MDRP_CLK,         //mdrp clock
+  input  [7:0] MDRP_WDATA, //mdrp write data
+  input  MDRP_A_INC,       //mdrp self-increased address
+  input  [1:0] MDRP_OPCODE,//mdrp opcode
+  output [7:0] MDRP_RDATA, //mdrp read data
+  //Analog
+  output ADC1BIT,          //Analog data output
+  output ADCCLKO,          //Analog clock output
+  input  ADCENI,           //fabric adc enable input
+//`endif
+// SAR
+//`ifdef SARADC
+  output [12:0] ADCBIT,    //Measurement result output
+  output CLKO,             //output clk
+  output EOC,              //The measurement completion signal
+  input  CLKI,             //fabric input clk
+  input  [6:0] CHEN,       //channel select
+  input  RSTN,             //resetn,active low
+  input  SOC              //Measurement request signal
+//`endif
+);
+
+  parameter BUF_EN = 29'b0;    // signal source selecor switch
+// Δ-Σ
+//`ifdef ADC
+  parameter CLK_SEL        = 1'b1;     // clk source select
+  parameter DIV_CTL        = 2'd0;     // clock division.0:/1,1:/2,2:/4,3:/8
+  parameter ADC_EN_SEL     = 1'b0;     // adc_en source select
+  parameter PHASE_SEL      = 1'b0;     // adc internal data phase select
+
+  //Digital terminal options
+  parameter CSR_ADC_MODE         = 1'b1;          // Mode selection
+  parameter CSR_VSEN_CTRL        = 3'd0;       // signal source:vccx/vccio_*/vcc_reg -> 7, signal source:vcc_ext -> 4, others -> 0
+  parameter CSR_SAMPLE_CNT_SEL   = 3'd4;       // total samples configuration, 0~4:64, 128, 256, 512, 1024 sampling points, and the other values are 2048 sampling points.The total number of samples shall be greater than 7 * sampling period, i.e.  SAMPLR_CNT_SEL >= RATE_CHANGE_CTRL-1
+  parameter CSR_RATE_CHANGE_CTRL = 3'd4;       // Sampling period configuration, 0~4:4、8、16、32、64，other values are 128
+  parameter CSR_FSCAL            = 10'd730;    // Parameter 1: temperature mode 510~948, typical value 730; Voltage mode 452~840, typical value 653
+  parameter CSR_OFFSET           = -12'd1180;  // Parameter 2, signed number, temperature mode - 1560~- 760, typical value - 1180; Voltage mode - 410~410, typical value 0
+
+//`endif
+// SAR
+//`ifdef SARADC
+  parameter ADC_CLK_DIV        = 2'b00;     // clock division.00:/1,01:/2,10:/4,11:/8
+  parameter ADC_CLKDIV_EN      = 1'b0;     // clock division enable
+  parameter CLK_SRC_SEL        = 1'b1;     // source clock sel
+  parameter VREF_BUF_EN        = 1'b1;     // BGR vref buffer enable
+  parameter COUNT_LEN          = 5'b10100; // ADC counter length
+  parameter DAC_SAMPLE_END     = 5'b10010; // DAC sample end point
+  parameter DAC_SAMPLE_START   = 5'b01101; // DAC sample start point
+  parameter SH_SAMPLE_END      = 5'b01011; // SH sample start point
+  parameter SH_SAMPLE_START    = 5'b00001; // SH sample end point
+  parameter AUTO_CHOP_EN       = 1'b0;     // auto chop
+  parameter CHOP_CLK_DIV       = 4'b0;     // chop clock divider
+
+//`endif
+
+endmodule
+
+
+//ADCA,15k
+module ADCA (
+// analog
+  input  ADCMODE,          //Mode selection
+  input  [2:0] VSENCTL,    //Input source selection 0-7: vglo_left, vglo_right, vcc2, vccc3, vccb4, vcc5, vccm6, vccc7
+  input  CLK,              //clk input
+  input  ADCENI,           //fabric adc enable input
+  input  PWRON_DYN,        //power enable. 1:on 0:off
+  // digital
+  input  DRSTN,            //Digital part reset signal, active low
+  input  ADCREQI,          //Measurement request signal
+  output ADCRDY,           //The measurement completion signal, active high
+  output [13:0] ADCVALUE,  //The measurement result output
+  input  MDRP_CLK,         //mdrp clock
+  input  [7:0] MDRP_WDATA, //mdrp write data
+  input  MDRP_A_INC,       //mdrp self-increased address
+  input  [1:0] MDRP_OPCODE,//mdrp opcode
+  output [7:0] MDRP_RDATA  //mdrp read data
+);
+
+  parameter BUF_EN = 20'b0;    // signal source selecor switch //[8:0] one-hot; [19:15] one-hot. BUF_EN[6] must be 0
+  parameter CLK_SEL        = 1'b1;     // clk source select
+  parameter DIV_CTL        = 2'd0;     // clock division
+  parameter ADC_EN_SEL     = 1'b0;     // adc_en source select
+  parameter PHASE_SEL      = 1'b0;     // adc internal data phase select
+
+  parameter PWRON_SEL      = 1'b0;     // power enbale source select. 0:PWRON 1:PWRON_DYN
+  parameter PWRON          = 1'b1;     // as PWRON_DYN
+  parameter LDO_MODE       = 1'b0;     // LDO mode 0:on(2.5/3.3V) 1:off(1.8V)
+
+  //Digital terminal options
+  parameter CSR_ADC_MODE         = 1'b1;       // Mode selection
+  parameter CSR_VSEN_CTRL        = 3'd0;       // signal source:vccx/vccio_*/vcc_reg -> 7, signal source:vcc_ext -> 4, others -> 0
+  parameter CSR_SAMPLE_CNT_SEL   = 3'd4;       // total samples configuration, 0~4:64, 128, 256, 512, 1024 sampling points, and the other values are 2048 sampling points.The total number of samples shall be greater than 7 * sampling period, i.e.  SAMPLR_CNT_SEL >= RATE_CHANGE_CTRL-1
+  parameter CSR_RATE_CHANGE_CTRL = 3'd4;       // Sampling period configuration, 0~4:4、8、16、32、64，other values are 128
+  parameter CSR_FSCAL            = 10'd730;    // Parameter 1: temperature mode 510~948, typical value 730; Voltage mode 452~840, typical value 653
+  parameter CSR_OFFSET           = -12'd1180;  // Parameter 2, signed number, temperature mode - 1560~- 760, typical value - 1180; Voltage mode - 410~410, typical value 0
+
+endmodule
+
diff --git a/techlibs/gowin/cells_xtra.py b/techlibs/gowin/cells_xtra.py
index 01416268a..7e8253a6b 100644
--- a/techlibs/gowin/cells_xtra.py
+++ b/techlibs/gowin/cells_xtra.py
@@ -32,6 +32,8 @@ _skip = { # These are already described, no need to extract them from the vendor
           'DLNC', 'DLNCE', 'DLNP', 'DLNPE', 'rSDP', 'rSDPX9', 'rROM', 'rROMX9',
           'TLVDS_OEN_BK', 'DLL', 'DCC', 'I3C', 'IODELAYA', 'IODELAYC', 'IODELAYB',
           'SPMI', 'PLLO', 'DCCG', 'MIPI_DPHY_RX', 'CLKDIVG', 'PWRGRD', 'FLASH96KA',
+         # ADCs are in a separate file
+         'ADCLRC', 'ADCULC', 'ADC', 'ADC_SAR', 'ADCA',
         }
 def xtract_cells_decl(dir, fout):
     fname = os.path.join(dir, 'prim_sim.v')
@@ -94,3 +96,11 @@ if __name__ == '__main__':
                 fout.write('// Created by cells_xtra.py\n')
                 fout.write('\n')
                 xtract_cells_decl(dir, fout)
+                if family == 'gw5a':
+                    fout.write('\n')
+                    fout.write('// Added from adc.v\n')
+                    fout.write('\n')
+                    with open(f'adc.v', 'r') as fin:
+                        for l in fin:
+                            fout.write(l);
+
diff --git a/techlibs/gowin/cells_xtra_gw5a.v b/techlibs/gowin/cells_xtra_gw5a.v
index b4df1f33e..b2dc06236 100644
--- a/techlibs/gowin/cells_xtra_gw5a.v
+++ b/techlibs/gowin/cells_xtra_gw5a.v
@@ -1720,89 +1720,6 @@ input SPIAD;
 input LOAD;
 endmodule
 
-module ADCLRC (...);
-  parameter DYN_BKEN = "FALSE";
-  parameter BUF_SERDES_Q1_EN = 3'b000;    
-  parameter BUF_BK2_EN       = 6'b000000; 
-  parameter BUF_BK3_EN       = 6'b000000; 
-  parameter BUF_BK4_EN       = 6'b000000; 
-  parameter BUF_BK5_EN       = 6'b000000; 
-  parameter BUF_BK10_EN      = 5'b00000;  
-  parameter BUF_BK11_EN      = 5'b00000;  
-  parameter CLK_SEL          = 1'b0;      
-  parameter PIOCLK_SEL       = 1'b0;      
-  parameter VSEN_CTL         = 3'b000;    
-  parameter VSEN_CTL_SEL     = 1'b0;      
-  parameter ADC_MODE      = 1'b0;      
-  parameter DIV_CTL       = 2'd0;      
-  parameter SAMPLE_CNT_SEL   = 3'd4;      
-  parameter RATE_CHANGE_CTRL = 3'd4;      
-endmodule
-
-module ADCULC (...);
-  parameter DYN_BKEN = "FALSE";
-  parameter BUF_VCC_EN       = 1'b0;      
-  parameter BUF_VCCM_EN      = 1'b0;      
-  parameter BUF_MIPI_M0_EN   = 3'b000;    
-  parameter BUF_MIPI_M1_EN   = 3'b000;    
-  parameter BUF_SERDES_Q0_EN = 3'b000;    
-  parameter BUF_BK6_EN       = 6'b000000; 
-  parameter BUF_BK7_EN       = 6'b000000; 
-  parameter CLK_SEL          = 1'b0;      
-  parameter PIOCLK_SEL       = 1'b0;      
-  parameter VSEN_CTL         = 3'b000;    
-  parameter VSEN_CTL_SEL     = 1'b0;      
-  parameter ADC_MODE      = 1'b0;      
-  parameter DIV_CTL          = 2'd0;      
-  parameter SAMPLE_CNT_SEL   = 3'd4;      
-  parameter RATE_CHANGE_CTRL = 3'd4;      
-endmodule
-
-module ADC (...);
-  parameter CLK_SEL         = 1'b0;      
-  parameter DIV_CTL         = 2'd0;      
-  parameter BUF_EN          = 12'b000000000000; 
-  parameter BUF_BK0_VREF_EN = 1'b0;  
-  parameter BUF_BK1_VREF_EN = 1'b0;  
-  parameter BUF_BK2_VREF_EN = 1'b0;  
-  parameter BUF_BK3_VREF_EN = 1'b0;  
-  parameter BUF_BK4_VREF_EN = 1'b0;  
-  parameter BUF_BK5_VREF_EN = 1'b0;  
-  parameter BUF_BK6_VREF_EN = 1'b0;  
-  parameter BUF_BK7_VREF_EN = 1'b0;  
-  parameter CSR_ADC_MODE      = 1'b1;       
-  parameter CSR_VSEN_CTRL        = 3'd0;       
-  parameter CSR_SAMPLE_CNT_SEL   = 3'd4;       
-  parameter CSR_RATE_CHANGE_CTRL = 3'd4;       
-  parameter CSR_FSCAL            = 10'd730;    
-  parameter CSR_OFFSET           = -12'd1180;  
-endmodule
-
-module ADC_SAR (...);
-  parameter BUF_EN = 29'b0;    
-  parameter CLK_SEL        = 1'b1;     
-  parameter DIV_CTL        = 2'd2;     
-  parameter ADC_EN_SEL     = 1'b0;     
-  parameter PHASE_SEL      = 1'b0;     
-  parameter CSR_ADC_MODE         = 1'b1;          
-  parameter CSR_VSEN_CTRL        = 3'd0;       
-  parameter CSR_SAMPLE_CNT_SEL   = 3'd4;       
-  parameter CSR_RATE_CHANGE_CTRL = 3'd4;       
-  parameter CSR_FSCAL            = 10'd730;    
-  parameter CSR_OFFSET           = -12'd1180;  
-  parameter ADC_CLK_DIV        = 2'b00;     
-  parameter ADC_CLKDIV_EN      = 1'b0;     
-  parameter CLK_SRC_SEL        = 1'b1;     
-  parameter VREF_BUF_EN        = 1'b1;     
-  parameter COUNT_LEN          = 5'b10100; 
-  parameter DAC_SAMPLE_END     = 5'b10010; 
-  parameter DAC_SAMPLE_START   = 5'b01101; 
-  parameter SH_SAMPLE_END      = 5'b01011; 
-  parameter SH_SAMPLE_START    = 5'b00001; 
-  parameter AUTO_CHOP_EN       = 1'b0;     
-  parameter CHOP_CLK_DIV       = 4'b0;     
-endmodule
-
 module LICD (...);
     parameter   STAGE_NUM = 2'b00;        
     parameter   ENCDEC_NUM = 2'b00;       
@@ -2575,3 +2492,266 @@ parameter RD_PNTR = 3'b000;
 parameter DQS_MODE = "X1"; 
 parameter HWL = "false";   
 endmodule
+
+// Added form adc.v
+
+/********ADC***********/
+//ADC for LRC,GW5AT-138K
+module ADCLRC (
+//Voltage signal source, /mV
+  input  ADCINBK2A,       //input from bank2 IO, adc_in_b is the reference
+  input  ADCINBK2B,       //input from bank2 IO, adc_in_b is the reference
+  input  ADCINBK3A,       //input from bank3 IO, adc_in_b is the reference
+  input  ADCINBK3B,       //input from bank3 IO, adc_in_b is the reference
+  input  ADCINBK4A,       //input from bank4 IO, adc_in_b is the reference
+  input  ADCINBK4B,       //input from bank4 IO, adc_in_b is the reference
+  input  ADCINBK5A,       //input from bank5 IO, adc_in_b is the reference
+  input  ADCINBK5B,       //input from bank5 IO, adc_in_b is the reference
+
+//control signal
+  input  [2:0] VSENCTL,    //Input source selection (ciu), from 0 to 7: adcv, adct, vdd09_0, vdd09_1, vdd18_0, vdd18_1, vdd33_0, vdd33_1
+
+  input [9:0] FSCAL_VALUE,   // temperature mode 510~948, typical value 730; Voltage mode 452~840, typical value 653
+  input [11:0] OFFSET_VALUE, //signed number, temperature mode - 1560~- 760, typical value - 1180; Voltage mode - 410~410, typical value 0
+
+  input  ADCEN,         //Enable signal, active high
+  input  CLK,           //clk input，1/2 shared
+  input  DRSTN,         //0/1 shared, Digital part reset signal, active low
+  input  ADCREQI,       //Measurement request signal, valid rising edge, asynchronous signal
+
+  //output
+  output ADCRDY,          //The measurement completion signal, active high
+  output [13:0] ADCVALUE //The measurement result output, signed number. In voltage mode,/2048 is the actual measured value; In temperature mode,/4 is the actual measured value
+
+);
+
+  parameter DYN_BKEN = "FALSE";//"FALSE","TRUE"."TRUE",BUF_BK2_EN[0]&BUF_BK3_EN[0]=1
+//Input source selection，1/2 shared
+  parameter BUF_SERDES_Q1_EN = 3'b000;    //[1:0] does not support "11"
+  parameter BUF_BK2_EN       = 6'b000000; //[3:0] Only one bit can be 1 at the same time
+  parameter BUF_BK3_EN       = 6'b000000; //[3:0] Only one bit can be 1 at the same time
+  parameter BUF_BK4_EN       = 6'b000000; //[3:0] Only one bit can be 1 at the same time
+  parameter BUF_BK5_EN       = 6'b000000; //[3:0] Only one bit can be 1 at the same time
+  parameter BUF_BK10_EN      = 5'b00000;  //[3:1] Only one bit can be 1 at the same time
+  parameter BUF_BK11_EN      = 5'b00000;  //[3:1] Only one bit can be 1 at the same time
+//Analog terminal option
+  parameter CLK_SEL          = 1'b0;      //Clock source selection. 0,PIOCLK_SEL，1,ciu_clk
+  parameter PIOCLK_SEL       = 1'b0;      //Clock source selection. 1/2 shared，0,mck_adc_clk_osc，1,io_clk
+  parameter VSEN_CTL         = 3'b000;    //Input source selection
+  parameter VSEN_CTL_SEL     = 1'b0;      //vsen_ctl source selection，0,VSEN_CTL，1,ciu_vsen_ctl
+  parameter ADC_MODE      = 1'b0;      //Mode selection
+  parameter DIV_CTL       = 2'd0;      //clock division，0:/1，1:/2，2:/4，3:/8，Clock after frequency division, 500kHz~8MHz
+
+  //Digital terminal options
+  parameter SAMPLE_CNT_SEL   = 3'd4;      //total samples configuration, 0~4:64, 128, 256, 512, 1024 sampling points, and the other values are 2048 sampling points.The total number of samples shall be greater than 7 * sampling period, i.e.  SAMPLR_CNT_SEL >= RATE_CHANGE_CTRL-1
+  parameter RATE_CHANGE_CTRL = 3'd4;      //Sampling period configuration, 0~4:4、8、16、32、64，other values are 128
+
+
+endmodule
+
+//ADCULC,GW5AT-138K
+module ADCULC (
+
+  //Voltage signal source, /mV
+  input  ADCINBK6A,       //input from bank6 IO, adc_in_b is the reference
+  input  ADCINBK6B,       //input from bank6 IO, adc_in_b is the reference
+  input  ADCINBK7A,       //input from bank7 IO, adc_in_b is the reference
+  input  ADCINBK7B,       //input from bank7 IO, adc_in_b is the reference
+
+  //control signal
+  input  [2:0] VSENCTL,    //Input source selection(cib)，0~7: vtest, vdd09_0, vdd09_1, vdd09_2, vdd18_0, vdd18_1, reserved, vdd33
+
+  input [9:0] FSCAL_VALUE,   // temperature mode 510~948, typical value 730; Voltage mode 452~840, typical value 653
+  input [11:0] OFFSET_VALUE, //signed number, temperature mode - 1560~- 760, typical value - 1180; Voltage mode - 410~410, typical value 0
+
+  input  ADCEN,         //Enable signal, active high
+  input  CLK,           //clk input
+  input  DRSTN,         //0/1 shared, Digital part reset signal, active low
+  input   ADCREQI,      //Measurement request signal, valid rising edge, asynchronous signal
+  output  ADCRDY,       //The measurement completion signal, active high
+  output  [13:0] ADCVALUE //The measurement result output, signed number. In voltage mode,/2048 is the actual measured value; In temperature mode,/4 is the actual measured value
+
+);
+  parameter DYN_BKEN = "FALSE";//"FALSE","TRUE"."TRUE",BUF_BK6_EN[0]&BUF_BK7_EN[0]=1
+
+//Input source selection
+  parameter BUF_VCC_EN       = 1'b0;      //ulc
+  parameter BUF_VCCM_EN      = 1'b0;      //ulc
+  parameter BUF_MIPI_M0_EN   = 3'b000;    //ulc,[1:0] Only one bit can be 1 at the same time
+  parameter BUF_MIPI_M1_EN   = 3'b000;    //ulc,[1:0] Only one bit can be 1 at the same time
+  parameter BUF_SERDES_Q0_EN = 3'b000;    //ulc,[1:0] Only one bit can be 1 at the same time
+  parameter BUF_BK6_EN       = 6'b000000; //bk6,[3:0] Only one bit can be 1 at the same time
+  parameter BUF_BK7_EN       = 6'b000000; //bk7,[3:0] Only one bit can be 1 at the same time
+//Analog terminal option
+  parameter CLK_SEL          = 1'b0;      //Clock source selection. 0,PIOCLK_SEL，1,ciu_clk
+  parameter PIOCLK_SEL       = 1'b0;      //Clock source selection. 1/2 shared，0,mck_adc_clk_osc，1,io_clk
+  parameter VSEN_CTL         = 3'b000;    //Input source selection
+  parameter VSEN_CTL_SEL     = 1'b0;      //vsen_ctl source selection，0,VSEN_CTL，1,ciu_vsen_ctl
+  parameter ADC_MODE      = 1'b0;      //Mode selection
+  parameter DIV_CTL          = 2'd0;      //clock division，0:/1，1:/2，2:/4，3:/8，Clock after frequency division, 500kHz~8MHz
+
+//Digital terminal options
+  parameter SAMPLE_CNT_SEL   = 3'd4;      //total samples configuration, 0~4:64, 128, 256, 512, 1024 sampling points, and the other values are 2048 sampling points.The total number of samples shall be greater than 7 * sampling period, i.e.  SAMPLR_CNT_SEL >= RATE_CHANGE_CTRL-1
+  parameter RATE_CHANGE_CTRL = 3'd4;      //Sampling period configuration, 0~4:4、8、16、32、64，other values are 128
+
+endmodule
+
+
+//ADC,GW5A-25
+module ADC (
+
+  //control signal
+  input  CLK,               //clk input
+  input  [2:0] VSENCTL,     //Input source selection (ciu), from 0 to 7: glo_left,glo_right,loc_left,vtest,vcc_rt,vccc_rt,vccm_rt,vccx_buf
+  input  ADCMODE,           //Mode selection,0:temperature mode，1:voltage mode
+  input  DRSTN,             //Digital part reset signal, active low
+  input  ADCREQI,           //Measurement request signal, valid rising edge, asynchronous signal
+  output ADCRDY,          //The measurement completion signal, active high
+  output [13:0] ADCVALUE, //The measurement result output, signed number. In voltage mode,/2048 is the actual measured value; In temperature mode,/4 is the actual measured value
+  //mdrp
+  input  MDRP_CLK,              //mdrp clock
+  input  [7:0] MDRP_WDATA,      //mdrp write data
+  input  MDRP_A_INC,            //mdrp self-increased address
+  input  [1:0] MDRP_OPCODE,     //mdrp opcode
+  output [7:0] MDRP_RDATA,       //mdrp read data
+  input  ADCEN              //Enable signal, active high
+
+);
+
+  //Analog terminal option
+  parameter CLK_SEL         = 1'b0;      //时钟源选择，0:osc(2.5MHz)，1:CLK
+  parameter DIV_CTL         = 2'd0;      //clock division，0:/1，1:/2，2:/4，3:/8，Clock after frequency division, 500kHz~8MHz
+
+  //Input source selection
+  parameter BUF_EN          = 12'b000000000000; //
+  parameter BUF_BK0_VREF_EN = 1'b0;  //
+  parameter BUF_BK1_VREF_EN = 1'b0;  //
+  parameter BUF_BK2_VREF_EN = 1'b0;  //
+  parameter BUF_BK3_VREF_EN = 1'b0;  //
+  parameter BUF_BK4_VREF_EN = 1'b0;  //
+  parameter BUF_BK5_VREF_EN = 1'b0;  //
+  parameter BUF_BK6_VREF_EN = 1'b0;  //
+  parameter BUF_BK7_VREF_EN = 1'b0;  //
+
+  //Digital terminal options
+  parameter CSR_ADC_MODE      = 1'b1;       // Mode selection
+  parameter CSR_VSEN_CTRL        = 3'd0;       // signal source:vccx/vccio_*/vcc_reg -> 7, signal source:vcc_ext -> 4, others -> 0
+  parameter CSR_SAMPLE_CNT_SEL   = 3'd4;       // total samples configuration, 0~4:64, 128, 256, 512, 1024 sampling points, and the other values are 2048 sampling points.The total number of samples shall be greater than 7 * sampling period, i.e.  SAMPLR_CNT_SEL >= RATE_CHANGE_CTRL-1
+  parameter CSR_RATE_CHANGE_CTRL = 3'd4;       // Sampling period configuration, 0~4:4、8、16、32、64，other values are 128
+  parameter CSR_FSCAL            = 10'd730;    // Parameter 1: temperature mode 510~948, typical value 730; Voltage mode 452~840, typical value 653
+  parameter CSR_OFFSET           = -12'd1180;  // Parameter 2, signed number, temperature mode - 1560~- 760, typical value - 1180; Voltage mode - 410~410, typical value 0
+
+
+endmodule
+
+
+//ADC_SAR,integrated saradc and adc functions.
+module ADC_SAR (
+//`ifdef ADC
+  input  ADCMODE,          //Mode selection
+  input  [2:0] VSENCTL,    //Input source selection
+  input  CLK,              //clk input
+  //Digital
+  output ADCENO,           //Enable signal, active high
+  input  DRSTN,            //Digital part reset signal, active low
+  input  ADCREQI,          //Measurement request signal
+  output ADCRDY,           //The measurement completion signal, active high
+  output [13:0] ADCVALUE,  //The measurement result output
+  input  MDRP_CLK,         //mdrp clock
+  input  [7:0] MDRP_WDATA, //mdrp write data
+  input  MDRP_A_INC,       //mdrp self-increased address
+  input  [1:0] MDRP_OPCODE,//mdrp opcode
+  output [7:0] MDRP_RDATA, //mdrp read data
+  //Analog
+  output ADC1BIT,          //Analog data output
+  output ADCCLKO,          //Analog clock output
+  input  ADCENI,           //fabric adc enable input
+//`endif
+// SAR
+//`ifdef SARADC
+  output [12:0] ADCBIT,    //Measurement result output
+  output CLKO,             //output clk
+  output EOC,              //The measurement completion signal
+  input  CLKI,             //fabric input clk
+  input  [6:0] CHEN,       //channel select
+  input  RSTN,             //resetn,active low
+  input  SOC              //Measurement request signal
+//`endif
+);
+
+  parameter BUF_EN = 29'b0;    // signal source selecor switch
+// Δ-Σ
+//`ifdef ADC
+  parameter CLK_SEL        = 1'b1;     // clk source select
+  parameter DIV_CTL        = 2'd0;     // clock division.0:/1,1:/2,2:/4,3:/8
+  parameter ADC_EN_SEL     = 1'b0;     // adc_en source select
+  parameter PHASE_SEL      = 1'b0;     // adc internal data phase select
+
+  //Digital terminal options
+  parameter CSR_ADC_MODE         = 1'b1;          // Mode selection
+  parameter CSR_VSEN_CTRL        = 3'd0;       // signal source:vccx/vccio_*/vcc_reg -> 7, signal source:vcc_ext -> 4, others -> 0
+  parameter CSR_SAMPLE_CNT_SEL   = 3'd4;       // total samples configuration, 0~4:64, 128, 256, 512, 1024 sampling points, and the other values are 2048 sampling points.The total number of samples shall be greater than 7 * sampling period, i.e.  SAMPLR_CNT_SEL >= RATE_CHANGE_CTRL-1
+  parameter CSR_RATE_CHANGE_CTRL = 3'd4;       // Sampling period configuration, 0~4:4、8、16、32、64，other values are 128
+  parameter CSR_FSCAL            = 10'd730;    // Parameter 1: temperature mode 510~948, typical value 730; Voltage mode 452~840, typical value 653
+  parameter CSR_OFFSET           = -12'd1180;  // Parameter 2, signed number, temperature mode - 1560~- 760, typical value - 1180; Voltage mode - 410~410, typical value 0
+
+//`endif
+// SAR
+//`ifdef SARADC
+  parameter ADC_CLK_DIV        = 2'b00;     // clock division.00:/1,01:/2,10:/4,11:/8
+  parameter ADC_CLKDIV_EN      = 1'b0;     // clock division enable
+  parameter CLK_SRC_SEL        = 1'b1;     // source clock sel
+  parameter VREF_BUF_EN        = 1'b1;     // BGR vref buffer enable
+  parameter COUNT_LEN          = 5'b10100; // ADC counter length
+  parameter DAC_SAMPLE_END     = 5'b10010; // DAC sample end point
+  parameter DAC_SAMPLE_START   = 5'b01101; // DAC sample start point
+  parameter SH_SAMPLE_END      = 5'b01011; // SH sample start point
+  parameter SH_SAMPLE_START    = 5'b00001; // SH sample end point
+  parameter AUTO_CHOP_EN       = 1'b0;     // auto chop
+  parameter CHOP_CLK_DIV       = 4'b0;     // chop clock divider
+
+//`endif
+
+endmodule
+
+
+//ADCA,15k
+module ADCA (
+// analog
+  input  ADCMODE,          //Mode selection
+  input  [2:0] VSENCTL,    //Input source selection 0-7: vglo_left, vglo_right, vcc2, vccc3, vccb4, vcc5, vccm6, vccc7
+  input  CLK,              //clk input
+  input  ADCENI,           //fabric adc enable input
+  input  PWRON_DYN,        //power enable. 1:on 0:off
+  // digital
+  input  DRSTN,            //Digital part reset signal, active low
+  input  ADCREQI,          //Measurement request signal
+  output ADCRDY,           //The measurement completion signal, active high
+  output [13:0] ADCVALUE,  //The measurement result output
+  input  MDRP_CLK,         //mdrp clock
+  input  [7:0] MDRP_WDATA, //mdrp write data
+  input  MDRP_A_INC,       //mdrp self-increased address
+  input  [1:0] MDRP_OPCODE,//mdrp opcode
+  output [7:0] MDRP_RDATA  //mdrp read data
+);
+
+  parameter BUF_EN = 20'b0;    // signal source selecor switch //[8:0] one-hot; [19:15] one-hot. BUF_EN[6] must be 0
+  parameter CLK_SEL        = 1'b1;     // clk source select
+  parameter DIV_CTL        = 2'd0;     // clock division
+  parameter ADC_EN_SEL     = 1'b0;     // adc_en source select
+  parameter PHASE_SEL      = 1'b0;     // adc internal data phase select
+
+  parameter PWRON_SEL      = 1'b0;     // power enbale source select. 0:PWRON 1:PWRON_DYN
+  parameter PWRON          = 1'b1;     // as PWRON_DYN
+  parameter LDO_MODE       = 1'b0;     // LDO mode 0:on(2.5/3.3V) 1:off(1.8V)
+
+  //Digital terminal options
+  parameter CSR_ADC_MODE         = 1'b1;       // Mode selection
+  parameter CSR_VSEN_CTRL        = 3'd0;       // signal source:vccx/vccio_*/vcc_reg -> 7, signal source:vcc_ext -> 4, others -> 0
+  parameter CSR_SAMPLE_CNT_SEL   = 3'd4;       // total samples configuration, 0~4:64, 128, 256, 512, 1024 sampling points, and the other values are 2048 sampling points.The total number of samples shall be greater than 7 * sampling period, i.e.  SAMPLR_CNT_SEL >= RATE_CHANGE_CTRL-1
+  parameter CSR_RATE_CHANGE_CTRL = 3'd4;       // Sampling period configuration, 0~4:4、8、16、32、64，other values are 128
+  parameter CSR_FSCAL            = 10'd730;    // Parameter 1: temperature mode 510~948, typical value 730; Voltage mode 452~840, typical value 653
+  parameter CSR_OFFSET           = -12'd1180;  // Parameter 2, signed number, temperature mode - 1560~- 760, typical value - 1180; Voltage mode - 410~410, typical value 0
+
+endmodule
+

From 4011d72656029e3843c219bdc0d91276f9d8101a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 30 Oct 2025 00:24:42 +0000
Subject: [PATCH 734/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 108c92b2a..e0b3b561d 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+89
+YOSYS_VER := 0.58+94
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 88d101b4626dbeb0c276422c685c0b0db199dc9f Mon Sep 17 00:00:00 2001
From: Vaibhav Singh <hi.vaibhavsingh@gmail.com>
Date: Fri, 31 Oct 2025 14:06:00 +0530
Subject: [PATCH 735/931] kernel: Fix define ID issue, needs undef first

---
 kernel/rtlil.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 394c6f25d..819704cf9 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -569,6 +569,7 @@ template <> struct IDMacroHelper<-1> {
 	}
 };
 
+#undef ID
 #define ID(_id) \
 		YOSYS_NAMESPACE_PREFIX IDMacroHelper< \
 				YOSYS_NAMESPACE_PREFIX lookup_well_known_id(#_id) \

From a243e4e60fa34be4b9b9db0992f9023697107717 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 1 Nov 2025 17:28:39 +1300
Subject: [PATCH 736/931] Docs: ecp5 and nexus are under lattice

---
 docs/source/cmd/index_techlibs_ecp5.rst          | 5 -----
 docs/source/cmd/index_techlibs_lattice_nexus.rst | 5 -----
 2 files changed, 10 deletions(-)
 delete mode 100644 docs/source/cmd/index_techlibs_ecp5.rst
 delete mode 100644 docs/source/cmd/index_techlibs_lattice_nexus.rst

diff --git a/docs/source/cmd/index_techlibs_ecp5.rst b/docs/source/cmd/index_techlibs_ecp5.rst
deleted file mode 100644
index 29fd309cf..000000000
--- a/docs/source/cmd/index_techlibs_ecp5.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-ECP5
-------------------
-
-.. autocmdgroup:: techlibs/ecp5
-   :members:
diff --git a/docs/source/cmd/index_techlibs_lattice_nexus.rst b/docs/source/cmd/index_techlibs_lattice_nexus.rst
deleted file mode 100644
index d5ac4184c..000000000
--- a/docs/source/cmd/index_techlibs_lattice_nexus.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Lattice Nexus
-------------------
-
-.. autocmdgroup:: techlibs/nexus
-   :members:

From 797780eda5c5b855e6404aaa2aa1e69850201ba1 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 2 Nov 2025 00:26:19 +0000
Subject: [PATCH 737/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e0b3b561d..5d659e5e8 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+94
+YOSYS_VER := 0.58+98
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 5fa7feccd378ae2189346ce5e6771cb3a52e7eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Mon, 3 Nov 2025 12:48:44 +0100
Subject: [PATCH 738/931] timeest: Add top ports launching/sampling

---
 passes/cmds/timeest.cc   | 55 +++++++++++++++++++++++++++++-----------
 tests/various/timeest.ys | 12 +++++++++
 2 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 tests/various/timeest.ys

diff --git a/passes/cmds/timeest.cc b/passes/cmds/timeest.cc
index ce9c628f4..1caa1ddaf 100644
--- a/passes/cmds/timeest.cc
+++ b/passes/cmds/timeest.cc
@@ -39,7 +39,8 @@ const arrivalint INF_PAST = std::numeric_limits<arrivalint>::min();
 struct EstimateSta {
 	SigMap sigmap;
 	Module *m;
-	SigBit clk;
+	std::optional<SigBit> clk;
+	bool top_port_endpoints = false;
 
 	dict<std::pair<RTLIL::IdString, dict<RTLIL::IdString, RTLIL::Const>>, Aig> aigs;
 	dict<Cell *, Aig *> cell_aigs;
@@ -73,15 +74,18 @@ struct EstimateSta {
 	}
 
 	// TODO: ignores clock polarity
-	EstimateSta(Module *m, SigBit clk)
-		: sigmap(m), m(m), clk(clk)
+	EstimateSta(Module *m, std::optional<SigBit> clk, bool top_port_endpoints)
+		: sigmap(m), m(m), clk(clk), top_port_endpoints(top_port_endpoints)
 	{
-		sigmap.apply(clk);
+		if (clk.has_value())
+			sigmap.apply(*clk);
 	}
 
 	void run()
 	{
-		log("Domain %s\n", log_signal(clk));
+		log("\nModule %s\n", log_id(m));
+		if (clk.has_value())
+			log("Domain %s\n", log_signal(*clk));
 
 		// first, we collect launch and sample points and convert the combinational logic to AIG
 		std::vector<Cell *> combinational;
@@ -151,6 +155,22 @@ struct EstimateSta {
 			}
 		}
 
+		// add top module port launching/sampling, if requested
+		if (top_port_endpoints) {
+			SigSpec all_inputs, all_outputs;
+			for (auto port_id : m->ports) {
+				Wire *port = m->wire(port_id);
+				if (port->port_input && !port->port_output) {
+					all_inputs.append(port);
+				} else if (port->port_output && !port->port_input) {
+					all_outputs.append(port);
+				} else if (port->port_output && port->port_input) {
+					log_warning("Ignoring bi-directional port %s\n", log_id(port));
+				}
+			}
+			add_seq(nullptr, all_inputs, all_outputs);
+		}
+
 		// now we toposort the combinational logic
 
 		// each toposort node is either a SigBit or a pair of Cell * / AigNode *
@@ -360,7 +380,7 @@ struct TimeestPass : Pass {
 		log("\n");
 		log("    timeest [-clk <clk_signal>] [options] [selection]\n");
 		log("\n");
-		log("Estimate the critical path in clock domain <clk_signal> by counting AIG nodes.\n");
+		log("Estimate the critical path by counting AIG nodes.\n");
 		log("\n");
 		log("    -all_paths\n");
 		log("        Print or select nodes from all critical paths instead of focusing on\n");
@@ -374,7 +394,8 @@ struct TimeestPass : Pass {
 	{
 		log_header(d, "Executing TIMEEST pass. (estimate timing)\n");
 
-		std::string clk;
+		std::string clk_name;
+		bool clk_domain_specified = false;
 		bool all_paths = false;
 		bool select = false;
 		size_t argidx;
@@ -388,26 +409,30 @@ struct TimeestPass : Pass {
 				continue;
 			}
 			if (args[argidx] == "-clk" && argidx + 1 < args.size()) {
-				clk = args[++argidx];
+				clk_domain_specified = true;
+				clk_name = args[++argidx];
 				continue;
 			}
 			break;
 		}
 		extra_args(args, argidx, d);
 
-		if (clk.empty())
-			log_cmd_error("No -clk argument provided\n");
-
 		if (select && d->selected_modules().size() > 1)
 			log_cmd_error("The -select option operates on a single selected module\n");
 
 		for (auto m : d->selected_modules()) {
-			if (!m->wire(RTLIL::escape_id(clk))) {
-				log_warning("No domain '%s' in module %s\n", clk, log_id(m));
-				continue;
+			std::optional<SigBit> clk;
+
+			if (clk_domain_specified) {
+				if (!m->wire(RTLIL::escape_id(clk_name))) {
+					log_warning("No domain '%s' in module %s\n", clk_name.c_str(), log_id(m));
+					continue;
+				}
+
+				clk = SigBit(m->wire(RTLIL::escape_id(clk_name)), 0);
 			}
 
-			EstimateSta sta(m, SigBit(m->wire(RTLIL::escape_id(clk)), 0));
+			EstimateSta sta(m, clk, /*top_port_endpoints=*/ !clk_domain_specified);
 			sta.all_paths = all_paths;
 			sta.select = select;
 			sta.run();
diff --git a/tests/various/timeest.ys b/tests/various/timeest.ys
new file mode 100644
index 000000000..3859de5e1
--- /dev/null
+++ b/tests/various/timeest.ys
@@ -0,0 +1,12 @@
+read_verilog <<EOF
+module top(input [3:0] a, input [3:0] b, output [7:0] y);
+	assign y = a * b;
+endmodule
+
+module top2(input [7:0] a, input [7:0] b, output [15:0] y);
+	assign y = a * b;
+endmodule
+EOF
+
+synth
+timeest

From e9733d681dca466e2d51c44cf24e3bd013f38f74 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Sat, 18 Oct 2025 14:58:56 +0300
Subject: [PATCH 739/931] pyosys: uv for non-wheel builds, update instructions

- add `uv` to dependencies: saves builder(s) from manually having to manage a venv for python build dependencies
  - when building wheels, pip automatically creates the environment with those dependencies, so no need for uv
  - when running simply `make ENABLE_PYOSYS=1`, this is not the case. people attempting to `pip3 install --upgrade pybind11 cxxheaderparser` to add it to their system packages will be met with a scare message about "breaking system packages"
- update installation instructions to drop boost and add uv instead
- update ci scripts to use `macos-15[-intel]` (`macos-13` sunset in early december)
---
 .github/actions/setup-build-env/action.yml   |  3 ++-
 .github/workflows/test-compile.yml           |  2 +-
 .github/workflows/wheels.yml                 |  4 ++--
 Brewfile                                     |  2 +-
 Makefile                                     | 13 ++++++++++---
 README.md                                    |  4 ++--
 docs/source/getting_started/installation.rst | 10 +++++-----
 docs/source/using_yosys/pyosys.rst           |  8 ++++++++
 pyproject.toml                               |  2 +-
 9 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index e4bc8ec58..209965acb 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -8,7 +8,8 @@ runs:
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install gperf build-essential bison flex libfl-dev libreadline-dev gawk tcl-dev libffi-dev git graphviz xdot pkg-config python3 libboost-system-dev libboost-python-dev libboost-filesystem-dev zlib1g-dev libbz2-dev libgtest-dev
+        sudo apt-get install gperf build-essential bison flex libfl-dev libreadline-dev gawk tcl-dev libffi-dev git graphviz xdot pkg-config python3-dev zlib1g-dev libbz2-dev libgtest-dev
+        curl -LsSf https://astral.sh/uv/install.sh | sh
 
     - name: Install macOS Dependencies
       if: runner.os == 'macOS'
diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index 7c18c7ba0..1604ca9d2 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -45,7 +45,7 @@ jobs:
           - 'gcc-14'
         include:
           # macOS x86
-          - os: macos-13
+          - os: macos-15-intel
             compiler: 'clang-19'
           # macOS arm
           - os: macos-latest
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b6c9a51ac..9eea1468d 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -27,13 +27,13 @@ jobs:
             {
               name: "macOS 13",
               family: "macos",
-              runner: "macos-13",
+              runner: "macos-15-intel",
               archs: "x86_64",
             },
             {
               name: "macOS 14",
               family: "macos",
-              runner: "macos-14",
+              runner: "macos-15",
               archs: "arm64",
             },
             ## Windows is disabled because of an issue with compiling FFI as
diff --git a/Brewfile b/Brewfile
index c90434e62..917f1bdb4 100644
--- a/Brewfile
+++ b/Brewfile
@@ -6,9 +6,9 @@ brew "git"
 brew "graphviz"
 brew "pkg-config"
 brew "python3"
+brew "uv"
 brew "xdot"
 brew "bash"
-brew "boost-python3"
 brew "llvm@20"
 brew "lld"
 brew "googletest"
diff --git a/Makefile b/Makefile
index 5d659e5e8..16843b073 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ ENABLE_HELP_SOURCE := 0
 
 # python wrappers
 ENABLE_PYOSYS := 0
+PYOSYS_USE_UV := 1
 
 # other configuration flags
 ENABLE_GCOV := 0
@@ -352,16 +353,22 @@ PYTHON_OBJECTS = pyosys/wrappers.o kernel/drivers.o kernel/yosys.o passes/cmds/p
 
 ifeq ($(ENABLE_PYOSYS),1)
 # python-config --ldflags includes -l and -L, but LINKFLAGS is only -L
+
+UV_ENV :=
+ifeq ($(PYOSYS_USE_UV),1)
+UV_ENV := uv run  --no-project --with 'pybind11>3,<4' --with 'cxxheaderparser'
+endif
+
 LINKFLAGS += $(filter-out -l%,$(shell $(PYTHON_CONFIG) --ldflags))
 LIBS += $(shell $(PYTHON_CONFIG) --libs)
 EXE_LIBS += $(filter-out $(LIBS),$(shell $(PYTHON_CONFIG_FOR_EXE) --libs))
-PYBIND11_INCLUDE ?= $(shell $(PYTHON_EXECUTABLE) -m pybind11 --includes)
+PYBIND11_INCLUDE ?= $(shell $(UV_ENV) $(PYTHON_EXECUTABLE) -m pybind11 --includes)
 CXXFLAGS += -I$(PYBIND11_INCLUDE) -DYOSYS_ENABLE_PYTHON
 CXXFLAGS += $(shell $(PYTHON_CONFIG) --includes) -DYOSYS_ENABLE_PYTHON
 
 OBJS += $(PY_WRAPPER_FILE).o
 PY_GEN_SCRIPT = pyosys/generator.py
-PY_WRAP_INCLUDES := $(shell $(PYTHON_EXECUTABLE) $(PY_GEN_SCRIPT) --print-includes)
+PY_WRAP_INCLUDES := $(shell $(UV_ENV) $(PYTHON_EXECUTABLE) $(PY_GEN_SCRIPT) --print-includes)
 endif # ENABLE_PYOSYS
 
 ifeq ($(ENABLE_READLINE),1)
@@ -777,7 +784,7 @@ endif
 ifeq ($(ENABLE_PYOSYS),1)
 $(PY_WRAPPER_FILE).cc: $(PY_GEN_SCRIPT) pyosys/wrappers_tpl.cc $(PY_WRAP_INCLUDES) pyosys/hashlib.h
 	$(Q) mkdir -p $(dir $@)
-	$(P) $(PYTHON_EXECUTABLE) $(PY_GEN_SCRIPT) $(PY_WRAPPER_FILE).cc
+	$(P) $(UV_ENV) $(PYTHON_EXECUTABLE) $(PY_GEN_SCRIPT) $(PY_WRAPPER_FILE).cc
 endif
 
 %.o: %.cpp
diff --git a/README.md b/README.md
index 6118d6079..dd5b634f9 100644
--- a/README.md
+++ b/README.md
@@ -85,8 +85,8 @@ prerequisites for building yosys:
 
 	$ sudo apt-get install build-essential clang lld bison flex libfl-dev \
 		libreadline-dev gawk tcl-dev libffi-dev git \
-		graphviz xdot pkg-config python3 libboost-system-dev \
-		libboost-python-dev libboost-filesystem-dev zlib1g-dev
+		graphviz xdot pkg-config python3-dev zlib1g-dev
+	$ curl -LsSf https://astral.sh/uv/install.sh | sh
 
 The environment variable `CXX` can be used to control the C++ compiler used, or
 run one of the following to override it:
diff --git a/docs/source/getting_started/installation.rst b/docs/source/getting_started/installation.rst
index 0ac85d199..fef495389 100644
--- a/docs/source/getting_started/installation.rst
+++ b/docs/source/getting_started/installation.rst
@@ -99,8 +99,8 @@ Installing all prerequisites for Ubuntu 22.04:
 
    sudo apt-get install gperf build-essential clang lld bison flex libfl-dev \
       libreadline-dev gawk tcl-dev libffi-dev git \
-      graphviz xdot pkg-config python3 libboost-system-dev \
-      libboost-python-dev libboost-filesystem-dev zlib1g-dev
+      graphviz xdot pkg-config python3-dev zlib1g-dev
+   curl -LsSf https://astral.sh/uv/install.sh | sh
 
 Installing all prerequisites for macOS 13 (with Homebrew):
 
@@ -141,7 +141,7 @@ For Cygwin use the following command to install all prerequisites, or select the
    missing `strdup` function when using gcc.  It is instead recommended to use
    Windows Subsystem for Linux (WSL) and follow the instructions for Ubuntu.
 
-.. 
+..
    For MSYS2 (MINGW64):
 
    .. code:: console
@@ -215,7 +215,7 @@ Running the build system
 From the root ``yosys`` directory, call the following commands:
 
 .. code:: console
-   
+
    make
    sudo make install
 
@@ -228,7 +228,7 @@ To use a separate (out-of-tree) build directory, provide a path to the Makefile.
 
 Out-of-tree builds require a clean source tree.
 
-.. seealso:: 
+.. seealso::
 
    Refer to :doc:`/yosys_internals/extending_yosys/test_suites` for details on
    testing Yosys once compiled.
diff --git a/docs/source/using_yosys/pyosys.rst b/docs/source/using_yosys/pyosys.rst
index 8aa7fd4fe..09b572e05 100644
--- a/docs/source/using_yosys/pyosys.rst
+++ b/docs/source/using_yosys/pyosys.rst
@@ -28,6 +28,14 @@ methods:
 
    ``yosys -y ./my_pyosys_script.py``
 
+   Do note this requires some build-time dependencies to be available to Python,
+   namely, ``pybind11`` and ``cxxheaderparser``. By default, the required
+   ``uv`` package will be used to create an ephemeral environment with the
+   correct versions of the tools installed.
+
+   You can force use of your current Python environment by passing the Makefile
+   flag ``PYOSYS_USE_UV=0``.
+
 2. Installing the Pyosys wheels
 
    On macOS and GNU/Linux you can install pre-built wheels of Yosys using
diff --git a/pyproject.toml b/pyproject.toml
index d5882084c..8893137d8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 requires = [
 	"setuptools>=42",
 	"pybind11>=3,<4",
-	"cxxheaderparser",
+	"cxxheaderparser"
 ]
 build-backend = "setuptools.build_meta"
 

From 1a80c26bae9b4545a7f7fb7717de842071f17a85 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 4 Nov 2025 11:11:01 +1300
Subject: [PATCH 740/931] tests: Fix for macos

Drop non standard `-t` flag for putting the destination directory first.
---
 tests/verilog/local_include.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/verilog/local_include.sh b/tests/verilog/local_include.sh
index c10c7411b..aecbef713 100755
--- a/tests/verilog/local_include.sh
+++ b/tests/verilog/local_include.sh
@@ -19,11 +19,11 @@ $yosys $test $source
 
 # include local to cwd
 mkdir -p $subdir
-cp -t $subdir $source
+cp $source $subdir
 $yosys $test $subdir/$source
 
 # include local to source
-mv -t $subdir $include
+mv $include $subdir
 $yosys $test $subdir/$source
 
 # include local to source, and source is given as an absolute path

From 39fab4a07fdf52ad12e50b608e0b80430a7530ed Mon Sep 17 00:00:00 2001
From: KrystalDelusion <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 4 Nov 2025 11:46:27 +1300
Subject: [PATCH 741/931] Makefile: Add gatemate genfiles

Allows files to be cleaned with `make clean`, without which it breaks out-of-tree builds if an in-tree build has previously run and subsequently cleaned.
---
 techlibs/gatemate/Makefile.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/techlibs/gatemate/Makefile.inc b/techlibs/gatemate/Makefile.inc
index aeb318cc9..8a258aec8 100644
--- a/techlibs/gatemate/Makefile.inc
+++ b/techlibs/gatemate/Makefile.inc
@@ -2,6 +2,9 @@
 OBJS += techlibs/gatemate/synth_gatemate.o
 OBJS += techlibs/gatemate/gatemate_foldinv.o
 
+GENFILES += techlibs/gatemate/lut_tree_cells.genlib
+GENFILES += techlibs/gatemate/lut_tree_map.v
+
 $(eval $(call add_share_file,share/gatemate,techlibs/gatemate/reg_map.v))
 $(eval $(call add_share_file,share/gatemate,techlibs/gatemate/mux_map.v))
 $(eval $(call add_share_file,share/gatemate,techlibs/gatemate/lut_map.v))
@@ -28,3 +31,4 @@ techlibs/gatemate/lut_tree_map.v: techlibs/gatemate/lut_tree_lib.mk
 
 $(eval $(call add_gen_share_file,share/gatemate,techlibs/gatemate/lut_tree_cells.genlib))
 $(eval $(call add_gen_share_file,share/gatemate,techlibs/gatemate/lut_tree_map.v))
+

From 336877a3535d13537e9b126407be9382e6766a0b Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 4 Nov 2025 12:27:31 +1300
Subject: [PATCH 742/931] io.cc: Drop unused variable

---
 kernel/io.cc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/kernel/io.cc b/kernel/io.cc
index 45aa496b0..e9801f63e 100644
--- a/kernel/io.cc
+++ b/kernel/io.cc
@@ -392,12 +392,6 @@ void append_globbed(std::vector<std::string>& paths, std::string pattern)
 	copy(globbed.begin(), globbed.end(), back_inserter(paths));
 }
 
-#ifdef _WIN32
-const char* const OS_PATH_SEP = "/\\";
-#else
-const char* const OS_PATH_SEP = "/";
-#endif
-
 std::string name_from_file_path(std::string path) {
 	return std::filesystem::path(path).filename().string();
 }

From 2d778a94fa01b7083184e40b3c10eace5cd09de5 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 1 Nov 2025 12:04:13 +1300
Subject: [PATCH 743/931] action.yml: Playing with apt cache

---
 .github/actions/setup-build-env/action.yml | 15 ++++++++++-----
 .github/workflows/test-build.yml           |  8 ++++++++
 .github/workflows/test-compile.yml         |  2 ++
 .github/workflows/test-sanitizers.yml      |  2 ++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 209965acb..0bd7bf71b 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -1,15 +1,20 @@
 name: Build environment setup
 description: Configure build env for Yosys builds
+
+inputs:
+  runs-on:
+    required: true
+    type: string
+
 runs:
   using: composite
   steps:
     - name: Install Linux Dependencies
       if: runner.os == 'Linux'
-      shell: bash
-      run: |
-        sudo apt-get update
-        sudo apt-get install gperf build-essential bison flex libfl-dev libreadline-dev gawk tcl-dev libffi-dev git graphviz xdot pkg-config python3-dev zlib1g-dev libbz2-dev libgtest-dev
-        curl -LsSf https://astral.sh/uv/install.sh | sh
+      uses: awalsh128/cache-apt-pkgs-action@v1.6.0
+      with:
+        packages: gperf build-essential bison flex libfl-dev libreadline-dev gawk tcl-dev libffi-dev git graphviz xdot pkg-config python3 libboost-system-dev libboost-python-dev libboost-filesystem-dev zlib1g-dev libbz2-dev libgtest-dev
+        version: ${{ inputs.runs-on }}-buildys
 
     - name: Install macOS Dependencies
       if: runner.os == 'macOS'
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 2d4a7a6c8..eb52da203 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -60,6 +60,8 @@ jobs:
 
       - name: Setup environment
         uses: ./.github/actions/setup-build-env
+        with:
+          runs-on: ${{ matrix.os }}
 
       - name: Build
         shell: bash
@@ -105,6 +107,8 @@ jobs:
 
       - name: Setup environment
         uses: ./.github/actions/setup-build-env
+        with:
+          runs-on: ${{ matrix.os }}
 
       - name: Get iverilog
         id: get-iverilog
@@ -191,6 +195,8 @@ jobs:
 
       - name: Setup environment
         uses: ./.github/actions/setup-build-env
+        with:
+          runs-on: ${{ matrix.os }}
 
       - name: Download build artifact
         uses: actions/download-artifact@v4
@@ -229,6 +235,8 @@ jobs:
 
       - name: Setup environment
         uses: ./.github/actions/setup-build-env
+        with:
+          runs-on: ${{ matrix.os }}
 
       - name: Download build artifact
         uses: actions/download-artifact@v4
diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index 1604ca9d2..af8f1328d 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -60,6 +60,8 @@ jobs:
 
       - name: Setup environment
         uses: ./.github/actions/setup-build-env
+        with:
+          runs-on: ${{ matrix.os }}
 
       - name: Setup Cpp
         uses: aminya/setup-cpp@v1
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
index 9c0f6d746..38e51f7b4 100644
--- a/.github/workflows/test-sanitizers.yml
+++ b/.github/workflows/test-sanitizers.yml
@@ -44,6 +44,8 @@ jobs:
 
       - name: Setup environment
         uses: ./.github/actions/setup-build-env
+        with:
+          runs-on: ${{ matrix.os }}
 
       - name: Get iverilog
         id: get-iverilog

From 0e2d24edd3b9a45c98dcc9a4dd1090918e8f402c Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 1 Nov 2025 12:43:45 +1300
Subject: [PATCH 744/931] CI: iverilog setup as composite action

Called during setup-build-env.
---
 .github/actions/setup-build-env/action.yml | 11 +++++
 .github/actions/setup-iverilog/action.yml  | 57 ++++++++++++++++++++++
 .github/workflows/test-build.yml           | 43 +---------------
 .github/workflows/test-sanitizers.yml      | 48 +-----------------
 4 files changed, 70 insertions(+), 89 deletions(-)
 create mode 100644 .github/actions/setup-iverilog/action.yml

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 0bd7bf71b..6bf0afa15 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -5,6 +5,11 @@ inputs:
   runs-on:
     required: true
     type: string
+  get-iverilog:
+    description: 'Install iverilog'
+    default: false
+    required: false
+    type: boolean
 
 runs:
   using: composite
@@ -38,3 +43,9 @@ runs:
         echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
         echo "$(brew --prefix flex)/bin" >> $GITHUB_PATH
         echo "procs=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
+
+    - name: Setup iverilog
+      if: inputs.get-iverilog
+      uses: ./.github/actions/setup-iverilog
+      with:
+        runs-on: ${{ inputs.runs-on }}
diff --git a/.github/actions/setup-iverilog/action.yml b/.github/actions/setup-iverilog/action.yml
new file mode 100644
index 000000000..7f264a462
--- /dev/null
+++ b/.github/actions/setup-iverilog/action.yml
@@ -0,0 +1,57 @@
+name: iverilog setup
+description: Cached build and install of iverilog
+
+inputs:
+  runs-on:
+    required: true
+    type: string
+
+runs:
+  using: composite
+  steps:
+    - name: Get iverilog
+      id: get-iverilog
+      shell: bash
+      run: |
+        git clone https://github.com/steveicarus/iverilog.git
+        cd iverilog
+        echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
+    - name: Get vcd2fst
+      shell: bash
+      run: |
+        git clone https://github.com/mmicko/libwave.git
+        mkdir -p ${{ github.workspace }}/.local/
+        cd libwave
+        cmake . -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.local
+        make -j$procs
+        make install
+
+    - name: Cache iverilog
+      id: cache-iverilog
+      uses: actions/cache@v4
+      with:
+        path: .local/
+        key: ${{ inputs.runs-on }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
+
+    - name: iverilog macOS deps
+      if: steps.cache-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
+      shell: bash
+      run: |
+        brew install autoconf
+
+    - name: Build iverilog
+      if: steps.cache-iverilog.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        mkdir -p ${{ github.workspace }}/.local/
+        cd iverilog
+        autoconf
+        CC=gcc CXX=g++ ./configure --prefix=${{ github.workspace }}/.local
+        make -j$procs
+        make install
+
+    - name: Check iverilog
+      shell: bash
+      run: |
+        iverilog -V
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index eb52da203..6bd5495f0 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -109,48 +109,7 @@ jobs:
         uses: ./.github/actions/setup-build-env
         with:
           runs-on: ${{ matrix.os }}
-
-      - name: Get iverilog
-        id: get-iverilog
-        shell: bash
-        run: |
-          git clone https://github.com/steveicarus/iverilog.git
-          cd iverilog
-          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Get vcd2fst
-        shell: bash
-        run: |
-          git clone https://github.com/mmicko/libwave.git
-          mkdir -p ${{ github.workspace }}/.local/
-          cd libwave
-          cmake . -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.local
-          make -j$procs
-          make install
-
-      - name: Cache iverilog
-        id: cache-iverilog
-        uses: actions/cache@v4
-        with:
-          path: .local/
-          key: ${{ matrix.os }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
-
-      - name: iverilog macOS deps
-        if: steps.cache-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
-        shell: bash
-        run: |
-          brew install autoconf
-
-      - name: Build iverilog
-        if: steps.cache-iverilog.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          mkdir -p ${{ github.workspace }}/.local/
-          cd iverilog
-          autoconf
-          CC=gcc CXX=g++ ./configure --prefix=${{ github.workspace }}/.local
-          make -j$procs
-          make install
+          setup-iverilog: true
 
       - name: Download build artifact
         uses: actions/download-artifact@v4
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
index 38e51f7b4..6e3dfb2f2 100644
--- a/.github/workflows/test-sanitizers.yml
+++ b/.github/workflows/test-sanitizers.yml
@@ -46,53 +46,7 @@ jobs:
         uses: ./.github/actions/setup-build-env
         with:
           runs-on: ${{ matrix.os }}
-
-      - name: Get iverilog
-        id: get-iverilog
-        shell: bash
-        run: |
-          git clone https://github.com/steveicarus/iverilog.git
-          cd iverilog
-          echo "IVERILOG_GIT=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Get vcd2fst
-        shell: bash
-        run: |
-          git clone https://github.com/mmicko/libwave.git
-          mkdir -p ${{ github.workspace }}/.local/
-          cd libwave
-          cmake . -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/.local
-          make -j$procs
-          make install
-
-      - name: Cache iverilog
-        id: cache-iverilog
-        uses: actions/cache@v4
-        with:
-          path: .local/
-          key: ${{ matrix.os }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
-
-      - name: iverilog macOS deps
-        if: steps.cache-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
-        shell: bash
-        run: |
-          brew install autoconf
-
-      - name: Build iverilog
-        if: steps.cache-iverilog.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          mkdir -p ${{ github.workspace }}/.local/
-          cd iverilog
-          autoconf
-          CC=gcc CXX=g++ ./configure --prefix=${{ github.workspace }}/.local
-          make -j$procs
-          make install
-
-      - name: Check iverilog
-        shell: bash
-        run: |
-          iverilog -V
+          setup-iverilog: true
 
       - name: Build
         shell: bash

From c597bf70b077a4211cfede64f9d1dffe4b907cd7 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 1 Nov 2025 13:03:33 +1300
Subject: [PATCH 745/931] CI: Save iverilog cache in action

We still want to cache iverilog even if the rest of the action fails, so explicitly save/restore instead of standard cache.
---
 .github/actions/setup-build-env/action.yml |  2 +-
 .github/actions/setup-iverilog/action.yml  | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 6bf0afa15..6e46e1dfb 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -45,7 +45,7 @@ runs:
         echo "procs=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
 
     - name: Setup iverilog
-      if: inputs.get-iverilog
+      if: inputs.get-iverilog == 'true'
       uses: ./.github/actions/setup-iverilog
       with:
         runs-on: ${{ inputs.runs-on }}
diff --git a/.github/actions/setup-iverilog/action.yml b/.github/actions/setup-iverilog/action.yml
index 7f264a462..1517ad9c4 100644
--- a/.github/actions/setup-iverilog/action.yml
+++ b/.github/actions/setup-iverilog/action.yml
@@ -27,21 +27,20 @@ runs:
         make -j$procs
         make install
 
-    - name: Cache iverilog
-      id: cache-iverilog
-      uses: actions/cache@v4
+    - uses: actions/cache/restore@v4
+      id: restore-iverilog
       with:
         path: .local/
         key: ${{ inputs.runs-on }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
 
     - name: iverilog macOS deps
-      if: steps.cache-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
+      if: steps.restore-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
       shell: bash
       run: |
         brew install autoconf
 
     - name: Build iverilog
-      if: steps.cache-iverilog.outputs.cache-hit != 'true'
+      if: steps.restore-iverilog.outputs.cache-hit != 'true'
       shell: bash
       run: |
         mkdir -p ${{ github.workspace }}/.local/
@@ -55,3 +54,10 @@ runs:
       shell: bash
       run: |
         iverilog -V
+
+    - uses: actions/cache/save@v4
+      id: save-iverilog
+      if: steps.restore-iverilog.outputs.cache-hit != 'true'
+      with:
+        path: .local/
+        key: ${{ steps.restore-iverilog.outputs.cache-primary-key }}

From 1f6ac5f392b62a07c7fabe5d71327048cd3d6c7e Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 1 Nov 2025 14:29:58 +1300
Subject: [PATCH 746/931] CI: Split dependency setup

Split into common + build/docs/test (common always installs, build/docs/test are installed as requested with `build-*-deps` input flag).
---
 .github/actions/setup-build-env/action.yml | 40 ++++++++++++++++++++--
 .github/workflows/codeql.yml               |  7 ++--
 .github/workflows/test-build.yml           |  6 +++-
 .github/workflows/test-compile.yml         |  1 +
 .github/workflows/test-sanitizers.yml      |  4 ++-
 5 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 6e46e1dfb..24e7d84a5 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -5,6 +5,21 @@ inputs:
   runs-on:
     required: true
     type: string
+  get-build-deps:
+    description: 'Install Yosys build dependencies'
+    default: false
+    required: false
+    type: boolean
+  get-docs-deps:
+    description: 'Install Yosys docs dependencies'
+    default: false
+    required: false
+    type: boolean
+  get-test-deps:
+    description: 'Install Yosys test dependencies'
+    default: false
+    required: false
+    type: boolean
   get-iverilog:
     description: 'Install iverilog'
     default: false
@@ -14,13 +29,34 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Install Linux Dependencies
+    - name: Linux common dependencies
       if: runner.os == 'Linux'
       uses: awalsh128/cache-apt-pkgs-action@v1.6.0
       with:
-        packages: gperf build-essential bison flex libfl-dev libreadline-dev gawk tcl-dev libffi-dev git graphviz xdot pkg-config python3 libboost-system-dev libboost-python-dev libboost-filesystem-dev zlib1g-dev libbz2-dev libgtest-dev
+        packages: autoconf git make python3
+        version: ${{ inputs.runs-on }}-commonys
+
+    - name: Linux build dependencies
+      if: runner.os == 'Linux' && inputs.get-build-deps == 'true'
+      uses: awalsh128/cache-apt-pkgs-action@v1.6.0
+      with:
+        packages: bison clang flex libboost-filesystem-dev libboost-python-dev libboost-system-dev libbz2-dev libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev
         version: ${{ inputs.runs-on }}-buildys
 
+    - name: Linux docs dependencies
+      if: runner.os == 'Linux' && inputs.get-docs-deps == 'true'
+      uses: awalsh128/cache-apt-pkgs-action@v1.6.0
+      with:
+        packages: graphviz xdot
+        version: ${{ inputs.runs-on }}-docsys
+
+    - name: Linux test dependencies
+      if: runner.os == 'Linux' && inputs.get-test-deps == 'true'
+      uses: awalsh128/cache-apt-pkgs-action@v1.6.0
+      with:
+        packages: gawk libgtest-dev
+        version: ${{ inputs.runs-on }}-testys
+
     - name: Install macOS Dependencies
       if: runner.os == 'macOS'
       shell: bash
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 95595924a..da30e3da4 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -10,8 +10,11 @@ jobs:
     name: Analyze
     runs-on: ubuntu-latest
     steps:
-    - name: Install deps
-      run: sudo apt-get install bison flex libfl-dev libreadline-dev tcl-dev libffi-dev
+    - name: Setup environment
+      uses: ./.github/actions/setup-build-env
+      with:
+        runs-on: ubuntu-latest
+        get-build-deps: true
 
     - name: Checkout repository
       uses: actions/checkout@v4
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 6bd5495f0..8c1a3bbd2 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -62,6 +62,7 @@ jobs:
         uses: ./.github/actions/setup-build-env
         with:
           runs-on: ${{ matrix.os }}
+          get-build-deps: true
 
       - name: Build
         shell: bash
@@ -109,7 +110,8 @@ jobs:
         uses: ./.github/actions/setup-build-env
         with:
           runs-on: ${{ matrix.os }}
-          setup-iverilog: true
+          get-test-deps: true
+          get-iverilog: true
 
       - name: Download build artifact
         uses: actions/download-artifact@v4
@@ -196,6 +198,8 @@ jobs:
         uses: ./.github/actions/setup-build-env
         with:
           runs-on: ${{ matrix.os }}
+          get-build-deps: true
+          get-docs-deps: true
 
       - name: Download build artifact
         uses: actions/download-artifact@v4
diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index af8f1328d..31c8bccf6 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -62,6 +62,7 @@ jobs:
         uses: ./.github/actions/setup-build-env
         with:
           runs-on: ${{ matrix.os }}
+          get-build-deps: true
 
       - name: Setup Cpp
         uses: aminya/setup-cpp@v1
diff --git a/.github/workflows/test-sanitizers.yml b/.github/workflows/test-sanitizers.yml
index 6e3dfb2f2..4c8e3ec51 100644
--- a/.github/workflows/test-sanitizers.yml
+++ b/.github/workflows/test-sanitizers.yml
@@ -46,7 +46,9 @@ jobs:
         uses: ./.github/actions/setup-build-env
         with:
           runs-on: ${{ matrix.os }}
-          setup-iverilog: true
+          get-build-deps: true
+          get-test-deps: true
+          get-iverilog: true
 
       - name: Build
         shell: bash

From a4bd40e1992faafd3e7d5c73af2f0928844bcc6c Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 1 Nov 2025 15:36:07 +1300
Subject: [PATCH 747/931] CI: Fix iverilog deps

---
 .github/actions/setup-build-env/action.yml | 4 ++--
 .github/actions/setup-iverilog/action.yml  | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 24e7d84a5..c8dc5dc64 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -33,7 +33,7 @@ runs:
       if: runner.os == 'Linux'
       uses: awalsh128/cache-apt-pkgs-action@v1.6.0
       with:
-        packages: autoconf git make python3
+        packages: gawk git make python3
         version: ${{ inputs.runs-on }}-commonys
 
     - name: Linux build dependencies
@@ -54,7 +54,7 @@ runs:
       if: runner.os == 'Linux' && inputs.get-test-deps == 'true'
       uses: awalsh128/cache-apt-pkgs-action@v1.6.0
       with:
-        packages: gawk libgtest-dev
+        packages: libgtest-dev
         version: ${{ inputs.runs-on }}-testys
 
     - name: Install macOS Dependencies
diff --git a/.github/actions/setup-iverilog/action.yml b/.github/actions/setup-iverilog/action.yml
index 1517ad9c4..ac4f33ad8 100644
--- a/.github/actions/setup-iverilog/action.yml
+++ b/.github/actions/setup-iverilog/action.yml
@@ -33,6 +33,13 @@ runs:
         path: .local/
         key: ${{ inputs.runs-on }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
 
+    - name: iverilog Linux deps
+      if: steps.restore-iverilog.outputs.cache-hit != 'true' && runner.os == 'Linux'
+      uses: awalsh128/cache-apt-pkgs-action@v1.6.0
+      with:
+        packages: autoconf gperf make gcc g++ bison flex
+        version: ${{ inputs.runs-on }}-iverilog
+
     - name: iverilog macOS deps
       if: steps.restore-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
       shell: bash

From cc5642c904fe610cf18937fd54ea225f6de281f7 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 1 Nov 2025 16:19:38 +1300
Subject: [PATCH 748/931] Docs: Bringing prereqs in line

Add comments in setup-build-env/action.yml for where to document prereqs (and the separation between build/run and test).
Add some initial (very basic) text for `test_suites.rst`, listing prereqs and how to run the tests (with subsections for the different optional tests, which is currently docs, functional and unit).
Add sphinx-inline-tabs, use it for tidying up prereq instructions based on OS/platform (mostly helpful in the test suites doc where there are multiple sections split by OS).
Also fixes some single backticks that should be double backtick.
---
 .github/actions/setup-build-env/action.yml    |  4 ++
 README.md                                     |  8 ++-
 docs/source/conf.py                           |  2 +-
 docs/source/getting_started/installation.rst  | 72 ++++++++++---------
 docs/source/requirements.txt                  |  1 +
 .../extending_yosys/test_suites.rst           | 69 +++++++++++++++++-
 6 files changed, 117 insertions(+), 39 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index c8dc5dc64..4fea7ad46 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -29,6 +29,8 @@ inputs:
 runs:
   using: composite
   steps:
+    # if updating common/build/docs dependencies, make sure to update README.md
+    # and docs/source/getting_started/installation.rst to match.
     - name: Linux common dependencies
       if: runner.os == 'Linux'
       uses: awalsh128/cache-apt-pkgs-action@v1.6.0
@@ -50,6 +52,8 @@ runs:
         packages: graphviz xdot
         version: ${{ inputs.runs-on }}-docsys
 
+    # if updating test dependencies, make sure to update
+    # docs/source/yosys_internals/extending_yosys/test_suites.rst to match.
     - name: Linux test dependencies
       if: runner.os == 'Linux' && inputs.get-test-deps == 'true'
       uses: awalsh128/cache-apt-pkgs-action@v1.6.0
diff --git a/README.md b/README.md
index dd5b634f9..2e659a46f 100644
--- a/README.md
+++ b/README.md
@@ -83,9 +83,11 @@ Xdot (graphviz) is used by the ``show`` command in yosys to display schematics.
 For example on Ubuntu Linux 22.04 LTS the following commands will install all
 prerequisites for building yosys:
 
-	$ sudo apt-get install build-essential clang lld bison flex libfl-dev \
-		libreadline-dev gawk tcl-dev libffi-dev git \
-		graphviz xdot pkg-config python3-dev zlib1g-dev
+	$ sudo apt-get install gawk git make python3 lld \
+		bison clang flex libboost-filesystem-dev libboost-python-dev \
+		libboost-system-dev libbz2-dev libffi-dev libfl-dev \
+		libreadline-dev pkg-config tcl-dev zlib1g-dev \
+		graphviz xdot
 	$ curl -LsSf https://astral.sh/uv/install.sh | sh
 
 The environment variable `CXX` can be used to control the C++ compiler used, or
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 49f8f5eab..6740fab83 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -50,7 +50,7 @@ rst_prolog = """
    :language: yoscrypt
 """
 
-extensions = ['sphinx.ext.autosectionlabel', 'sphinxcontrib.bibtex']
+extensions = ['sphinx.ext.autosectionlabel', 'sphinxcontrib.bibtex', 'sphinx_inline_tabs']
 
 if os.getenv("READTHEDOCS"):
     # Use rtds_action if we are building on read the docs and have a github token env var
diff --git a/docs/source/getting_started/installation.rst b/docs/source/getting_started/installation.rst
index fef495389..48a4c5fdd 100644
--- a/docs/source/getting_started/installation.rst
+++ b/docs/source/getting_started/installation.rst
@@ -93,56 +93,64 @@ tools: readline, libffi, Tcl and zlib; are optional but enabled by default (see
 :makevar:`ENABLE_*` settings in Makefile). Graphviz and Xdot are used by the
 `show` command to display schematics.
 
-Installing all prerequisites for Ubuntu 22.04:
+Installing all prerequisites:
 
-.. code:: console
+.. tab:: Ubuntu 22.04
 
-   sudo apt-get install gperf build-essential clang lld bison flex libfl-dev \
-      libreadline-dev gawk tcl-dev libffi-dev git \
-      graphviz xdot pkg-config python3-dev zlib1g-dev
-   curl -LsSf https://astral.sh/uv/install.sh | sh
+   .. code:: console
 
-Installing all prerequisites for macOS 13 (with Homebrew):
+      sudo apt-get install gawk git make python3 lld \
+         bison clang flex libboost-filesystem-dev libboost-python-dev \
+         libboost-system-dev libbz2-dev libffi-dev libfl-dev \
+         libreadline-dev pkg-config tcl-dev zlib1g-dev \
+         graphviz xdot
+      curl -LsSf https://astral.sh/uv/install.sh | sh
 
-.. code:: console
+.. tab:: macOS 13 (with Homebrew)
 
-   brew tap Homebrew/bundle && brew bundle
+   .. code:: console
 
-or MacPorts:
+      brew tap Homebrew/bundle && brew bundle
 
-.. code:: console
+.. tab:: MacPorts
 
-   sudo port install bison flex readline gawk libffi graphviz \
-      pkgconfig python311 boost zlib tcl
+   .. code:: console
 
-On FreeBSD use the following command to install all prerequisites:
+      sudo port install bison flex readline gawk libffi graphviz \
+         pkgconfig python311 boost zlib tcl
 
-.. code:: console
+.. tab:: FreeBSD
 
-   pkg install bison flex readline gawk libffi graphviz \
-      pkgconf python311 tcl-wrapper boost-libs
+   .. code:: console
 
-.. note:: On FreeBSD system use gmake instead of make. To run tests use:
-    ``MAKE=gmake CXX=cxx CC=cc gmake test``
+      pkg install bison flex readline gawk libffi graphviz \
+         pkgconf python311 tcl-wrapper boost-libs
 
-For Cygwin use the following command to install all prerequisites, or select these additional packages:
+   .. note:: On FreeBSD system use gmake instead of make. To run tests use:
+      ``MAKE=gmake CXX=cxx CC=cc gmake test``
 
-.. code:: console
+.. tab:: Cygwin
 
-   setup-x86_64.exe -q --packages=bison,flex,gcc-core,gcc-g++,git,libffi-devel,libreadline-devel,make,pkg-config,python3,tcl-devel,boost-build,zlib-devel
+   Use the following command to install all prerequisites, or select these
+   additional packages:
 
-.. warning::
+   .. code:: console
 
-   As of this writing, Cygwin only supports up to Python 3.9.16 while the
-   minimum required version of Python is 3.11.  This means that Cygwin is not
-   compatible with many of the Python-based frontends.  While this does not
-   currently prevent Yosys itself from working, no guarantees are made for
-   continued support.  You may also need to specify `CXXSTD=gnu++17` to resolve
-   missing `strdup` function when using gcc.  It is instead recommended to use
-   Windows Subsystem for Linux (WSL) and follow the instructions for Ubuntu.
+      setup-x86_64.exe -q --packages=bison,flex,gcc-core,gcc-g++,git,libffi-devel,libreadline-devel,make,pkg-config,python3,tcl-devel,boost-build,zlib-devel
 
-..
-   For MSYS2 (MINGW64):
+   .. warning::
+
+      As of this writing, Cygwin only supports up to Python 3.9.16 while the
+      minimum required version of Python is 3.11.  This means that Cygwin is not
+      compatible with many of the Python-based frontends.  While this does not
+      currently prevent Yosys itself from working, no guarantees are made for
+      continued support.  You may also need to specify ``CXXSTD=gnu++17`` to
+      resolve missing ``strdup`` function when using gcc.  It is instead
+      recommended to use Windows Subsystem for Linux (WSL) and follow the
+      instructions for Ubuntu.
+
+.. 
+   tab:: MSYS2 (MINGW64)
 
    .. code:: console
 
diff --git a/docs/source/requirements.txt b/docs/source/requirements.txt
index 203205169..403bfb1c6 100644
--- a/docs/source/requirements.txt
+++ b/docs/source/requirements.txt
@@ -1,3 +1,4 @@
 furo-ys @ git+https://github.com/YosysHQ/furo-ys
 sphinxcontrib-bibtex
 rtds-action
+sphinx-inline-tabs
diff --git a/docs/source/yosys_internals/extending_yosys/test_suites.rst b/docs/source/yosys_internals/extending_yosys/test_suites.rst
index 3e5f45b94..81a79e77f 100644
--- a/docs/source/yosys_internals/extending_yosys/test_suites.rst
+++ b/docs/source/yosys_internals/extending_yosys/test_suites.rst
@@ -1,7 +1,72 @@
 Testing Yosys
 =============
 
-.. TODO:: more about the included test suite and how to add tests
+.. todo:: adding tests (makefile-tests vs seed-tests)
+
+Running the included test suite
+-------------------------------
+
+The Yosys source comes with a test suite to avoid regressions and keep
+everything working as expected.  Tests can be run by calling ``make test`` from
+the root Yosys directory.
+
+Functional tests
+~~~~~~~~~~~~~~~~
+
+Testing functional backends (see
+:doc:`/yosys_internals/extending_yosys/functional_ir`) has a few requirements in
+addition to those listed in :ref:`getting_started/installation:Build
+prerequisites`:
+
+.. tab:: Ubuntu
+
+   .. code:: console
+
+      sudo apt-get install racket
+      raco pkg install rosette
+      pip install pytest-xdist pytest-xdist-gnumake
+
+.. tab:: macOS
+
+   .. code:: console
+
+      brew install racket
+      raco pkg install rosette
+      pip install pytest-xdist pytest-xdist-gnumake
+
+If you don't have one of the :ref:`getting_started/installation:CAD suite(s)`
+installed, you should also install Z3 `following their
+instructions <https://github.com/Z3Prover/z3>`_.
+
+Then, set the :makevar:`ENABLE_FUNCTIONAL_TESTS` make variable when calling
+``make test`` and the functional tests will be run as well.
+
+Unit tests
+~~~~~~~~~~
+
+Running the unit tests requires the following additional packages:
+
+.. tab:: Ubuntu
+
+   .. code:: console
+
+      sudo apt-get install libgtest-dev
+
+.. tab:: macOS
+
+   No additional requirements.
+
+Unit tests can be run with ``make unit-test``. 
+
+Docs tests
+~~~~~~~~~~
+
+There are some additional tests for checking examples included in the
+documentation, which can be run by calling ``make test`` from the
+:file:`yosys/docs` sub-directory (or ``make -C docs test`` from the root). This
+also includes checking some macro commands to ensure that descriptions of them
+are kept up to date, and is mostly intended for CI.
+
 
 Automatic testing
 -----------------
@@ -14,8 +79,6 @@ compiler versions.  For up to date information, including OS versions, refer to
 .. _Yosys Git repo: https://github.com/YosysHQ/yosys
 .. _the git actions page: https://github.com/YosysHQ/yosys/actions
 
-.. todo:: are unit tests currently working
-
 ..
    How to add a unit test
    ----------------------

From bf7c79cc8520f13b0da30299ac07a8d59b6fe282 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 1 Nov 2025 17:27:09 +1300
Subject: [PATCH 749/931] CI: vcd2fst needs deps

---
 .github/actions/setup-iverilog/action.yml | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/actions/setup-iverilog/action.yml b/.github/actions/setup-iverilog/action.yml
index ac4f33ad8..557ff6add 100644
--- a/.github/actions/setup-iverilog/action.yml
+++ b/.github/actions/setup-iverilog/action.yml
@@ -9,6 +9,19 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: iverilog Linux deps
+      if: steps.restore-iverilog.outputs.cache-hit != 'true' && runner.os == 'Linux'
+      uses: awalsh128/cache-apt-pkgs-action@v1.6.0
+      with:
+        packages: autoconf gperf make gcc g++ bison flex
+        version: ${{ inputs.runs-on }}-iverilog
+
+    - name: iverilog macOS deps
+      if: steps.restore-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
+      shell: bash
+      run: |
+        brew install autoconf
+
     - name: Get iverilog
       id: get-iverilog
       shell: bash
@@ -33,19 +46,6 @@ runs:
         path: .local/
         key: ${{ inputs.runs-on }}-${{ steps.get-iverilog.outputs.IVERILOG_GIT }}
 
-    - name: iverilog Linux deps
-      if: steps.restore-iverilog.outputs.cache-hit != 'true' && runner.os == 'Linux'
-      uses: awalsh128/cache-apt-pkgs-action@v1.6.0
-      with:
-        packages: autoconf gperf make gcc g++ bison flex
-        version: ${{ inputs.runs-on }}-iverilog
-
-    - name: iverilog macOS deps
-      if: steps.restore-iverilog.outputs.cache-hit != 'true' && runner.os == 'macOS'
-      shell: bash
-      run: |
-        brew install autoconf
-
     - name: Build iverilog
       if: steps.restore-iverilog.outputs.cache-hit != 'true'
       shell: bash

From 684bbf6a25f4dc8a600a9cf8cf9614313b2945d2 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 1 Nov 2025 20:08:45 +1300
Subject: [PATCH 750/931] CI: Move libbz2 to iverilog setup

Needed for vcd2fst.
---
 .github/actions/setup-build-env/action.yml   | 2 +-
 .github/actions/setup-iverilog/action.yml    | 2 +-
 README.md                                    | 4 ++--
 docs/source/getting_started/installation.rst | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 4fea7ad46..216742791 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -42,7 +42,7 @@ runs:
       if: runner.os == 'Linux' && inputs.get-build-deps == 'true'
       uses: awalsh128/cache-apt-pkgs-action@v1.6.0
       with:
-        packages: bison clang flex libboost-filesystem-dev libboost-python-dev libboost-system-dev libbz2-dev libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev
+        packages: bison clang flex libboost-filesystem-dev libboost-python-dev libboost-system-dev libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev
         version: ${{ inputs.runs-on }}-buildys
 
     - name: Linux docs dependencies
diff --git a/.github/actions/setup-iverilog/action.yml b/.github/actions/setup-iverilog/action.yml
index 557ff6add..0acb582e3 100644
--- a/.github/actions/setup-iverilog/action.yml
+++ b/.github/actions/setup-iverilog/action.yml
@@ -13,7 +13,7 @@ runs:
       if: steps.restore-iverilog.outputs.cache-hit != 'true' && runner.os == 'Linux'
       uses: awalsh128/cache-apt-pkgs-action@v1.6.0
       with:
-        packages: autoconf gperf make gcc g++ bison flex
+        packages: autoconf gperf make gcc g++ bison flex libbz2-dev
         version: ${{ inputs.runs-on }}-iverilog
 
     - name: iverilog macOS deps
diff --git a/README.md b/README.md
index 2e659a46f..6a204fa8d 100644
--- a/README.md
+++ b/README.md
@@ -85,8 +85,8 @@ prerequisites for building yosys:
 
 	$ sudo apt-get install gawk git make python3 lld \
 		bison clang flex libboost-filesystem-dev libboost-python-dev \
-		libboost-system-dev libbz2-dev libffi-dev libfl-dev \
-		libreadline-dev pkg-config tcl-dev zlib1g-dev \
+		libboost-system-dev libffi-dev libfl-dev libreadline-dev \
+		pkg-config tcl-dev zlib1g-dev \
 		graphviz xdot
 	$ curl -LsSf https://astral.sh/uv/install.sh | sh
 
diff --git a/docs/source/getting_started/installation.rst b/docs/source/getting_started/installation.rst
index 48a4c5fdd..5c538a959 100644
--- a/docs/source/getting_started/installation.rst
+++ b/docs/source/getting_started/installation.rst
@@ -101,8 +101,8 @@ Installing all prerequisites:
 
       sudo apt-get install gawk git make python3 lld \
          bison clang flex libboost-filesystem-dev libboost-python-dev \
-         libboost-system-dev libbz2-dev libffi-dev libfl-dev \
-         libreadline-dev pkg-config tcl-dev zlib1g-dev \
+         libboost-system-dev libffi-dev libfl-dev libreadline-dev \
+         pkg-config tcl-dev zlib1g-dev \
          graphviz xdot
       curl -LsSf https://astral.sh/uv/install.sh | sh
 

From 17c1388303af4f5c2d71c2b03450dcb1d389a04c Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 1 Nov 2025 20:11:36 +1300
Subject: [PATCH 751/931] Drop boost-python

---
 .github/actions/setup-build-env/action.yml   | 2 +-
 README.md                                    | 5 ++---
 docs/source/getting_started/installation.rst | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 216742791..5ecb4d3a9 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -42,7 +42,7 @@ runs:
       if: runner.os == 'Linux' && inputs.get-build-deps == 'true'
       uses: awalsh128/cache-apt-pkgs-action@v1.6.0
       with:
-        packages: bison clang flex libboost-filesystem-dev libboost-python-dev libboost-system-dev libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev
+        packages: bison clang flex libboost-filesystem-dev libboost-system-dev libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev
         version: ${{ inputs.runs-on }}-buildys
 
     - name: Linux docs dependencies
diff --git a/README.md b/README.md
index 6a204fa8d..42462efbc 100644
--- a/README.md
+++ b/README.md
@@ -84,9 +84,8 @@ For example on Ubuntu Linux 22.04 LTS the following commands will install all
 prerequisites for building yosys:
 
 	$ sudo apt-get install gawk git make python3 lld \
-		bison clang flex libboost-filesystem-dev libboost-python-dev \
-		libboost-system-dev libffi-dev libfl-dev libreadline-dev \
-		pkg-config tcl-dev zlib1g-dev \
+		bison clang flex libboost-filesystem-dev libboost-system-dev \
+		libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev \
 		graphviz xdot
 	$ curl -LsSf https://astral.sh/uv/install.sh | sh
 
diff --git a/docs/source/getting_started/installation.rst b/docs/source/getting_started/installation.rst
index 5c538a959..8ec5c4e35 100644
--- a/docs/source/getting_started/installation.rst
+++ b/docs/source/getting_started/installation.rst
@@ -100,9 +100,8 @@ Installing all prerequisites:
    .. code:: console
 
       sudo apt-get install gawk git make python3 lld \
-         bison clang flex libboost-filesystem-dev libboost-python-dev \
-         libboost-system-dev libffi-dev libfl-dev libreadline-dev \
-         pkg-config tcl-dev zlib1g-dev \
+         bison clang flex libboost-filesystem-dev libboost-system-dev \
+         libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev \
          graphviz xdot
       curl -LsSf https://astral.sh/uv/install.sh | sh
 

From 35e4d967c6cb637bb50900196aac8e4a73b59290 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 4 Nov 2025 08:00:35 +0100
Subject: [PATCH 752/931] install UV in wheels.yml

---
 .github/workflows/wheels.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 9eea1468d..e75e02ad2 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -54,6 +54,11 @@ jobs:
           fetch-depth: 0
           submodules: true
           persist-credentials: false
+      - if: ${{ matrix.os.family == 'linux' }}
+        name: "[Linux] Install UV"
+        shell: bash
+        run: |
+          curl -LsSf https://astral.sh/uv/install.sh | sh
       - uses: actions/setup-python@v5
       - name: Get FFI
         shell: bash

From db76eebc0f69d791ec455f9b0f9e006d25b0bcbb Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 4 Nov 2025 08:35:07 +0100
Subject: [PATCH 753/931] Remove mentions of Boost

---
 .github/actions/setup-build-env/action.yml   |  2 +-
 .github/workflows/wheels/_run_cibw_linux.py  |  4 ++--
 .gitignore                                   |  1 -
 README.md                                    |  3 +--
 docs/source/getting_started/installation.rst | 11 +++++------
 flake.nix                                    |  2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 5ecb4d3a9..60fe481e7 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -42,7 +42,7 @@ runs:
       if: runner.os == 'Linux' && inputs.get-build-deps == 'true'
       uses: awalsh128/cache-apt-pkgs-action@v1.6.0
       with:
-        packages: bison clang flex libboost-filesystem-dev libboost-system-dev libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev
+        packages: bison clang flex libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev
         version: ${{ inputs.runs-on }}-buildys
 
     - name: Linux docs dependencies
diff --git a/.github/workflows/wheels/_run_cibw_linux.py b/.github/workflows/wheels/_run_cibw_linux.py
index fb4e0b839..1e8a0f497 100644
--- a/.github/workflows/wheels/_run_cibw_linux.py
+++ b/.github/workflows/wheels/_run_cibw_linux.py
@@ -24,10 +24,10 @@ from pathlib import Path
 
 __yosys_root__ = Path(__file__).absolute().parents[3]
 
-for source in ["boost", "ffi", "bison"]:
+for source in ["ffi", "bison"]:
     if not (__yosys_root__ / source).is_dir():
         print(
-            "You need to download boost, ffi and bison in a similar manner to wheels.yml first."
+            "You need to download ffi and bison in a similar manner to wheels.yml first."
         )
         exit(-1)
 
diff --git a/.gitignore b/.gitignore
index 2367bccb3..a8b04ac45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,6 @@
 # pyosys
 /kernel/*.pyh
 /kernel/python_wrappers.cc
-/boost
 /ffi
 /bison
 /venv
diff --git a/README.md b/README.md
index 42462efbc..427d59c9e 100644
--- a/README.md
+++ b/README.md
@@ -83,8 +83,7 @@ Xdot (graphviz) is used by the ``show`` command in yosys to display schematics.
 For example on Ubuntu Linux 22.04 LTS the following commands will install all
 prerequisites for building yosys:
 
-	$ sudo apt-get install gawk git make python3 lld \
-		bison clang flex libboost-filesystem-dev libboost-system-dev \
+	$ sudo apt-get install gawk git make python3 lld bison clang flex \
 		libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev \
 		graphviz xdot
 	$ curl -LsSf https://astral.sh/uv/install.sh | sh
diff --git a/docs/source/getting_started/installation.rst b/docs/source/getting_started/installation.rst
index 8ec5c4e35..43b996353 100644
--- a/docs/source/getting_started/installation.rst
+++ b/docs/source/getting_started/installation.rst
@@ -99,8 +99,7 @@ Installing all prerequisites:
 
    .. code:: console
 
-      sudo apt-get install gawk git make python3 lld \
-         bison clang flex libboost-filesystem-dev libboost-system-dev \
+      sudo apt-get install gawk git make python3 lld bison clang flex \
          libffi-dev libfl-dev libreadline-dev pkg-config tcl-dev zlib1g-dev \
          graphviz xdot
       curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -116,14 +115,14 @@ Installing all prerequisites:
    .. code:: console
 
       sudo port install bison flex readline gawk libffi graphviz \
-         pkgconfig python311 boost zlib tcl
+         pkgconfig python311 zlib tcl
 
 .. tab:: FreeBSD
 
    .. code:: console
 
       pkg install bison flex readline gawk libffi graphviz \
-         pkgconf python311 tcl-wrapper boost-libs
+         pkgconf python311 tcl-wrapper
 
    .. note:: On FreeBSD system use gmake instead of make. To run tests use:
       ``MAKE=gmake CXX=cxx CC=cc gmake test``
@@ -135,7 +134,7 @@ Installing all prerequisites:
 
    .. code:: console
 
-      setup-x86_64.exe -q --packages=bison,flex,gcc-core,gcc-g++,git,libffi-devel,libreadline-devel,make,pkg-config,python3,tcl-devel,boost-build,zlib-devel
+      setup-x86_64.exe -q --packages=bison,flex,gcc-core,gcc-g++,git,libffi-devel,libreadline-devel,make,pkg-config,python3,tcl-devel,zlib-devel
 
    .. warning::
 
@@ -153,7 +152,7 @@ Installing all prerequisites:
 
    .. code:: console
 
-      pacman -S bison flex mingw-w64-x86_64-gcc git libffi-devel libreadline-devel make pkg-config python3 tcl-devel mingw-w64-x86_64-boost zlib-devel
+      pacman -S bison flex mingw-w64-x86_64-gcc git libffi-devel libreadline-devel make pkg-config python3 tcl-devel zlib-devel
 
    Not that I can get this to work; it's failing during ld with what looks like
    math library issues: ``multiple definition of `tanh'`` and
diff --git a/flake.nix b/flake.nix
index 19ba59f17..1993b803b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,7 +41,7 @@
         packages.default = yosys;
         defaultPackage = yosys;
         devShell = pkgs.mkShell {
-          buildInputs = with pkgs; [ clang llvmPackages.bintools gcc bison flex libffi tcl readline python3 zlib git gtest abc-verifier verilog boost python3Packages.boost ];
+          buildInputs = with pkgs; [ clang llvmPackages.bintools gcc bison flex libffi tcl readline python3 zlib git gtest abc-verifier verilog ];
         };
       }
     );

From ad3ae52e9a6f830766c3b9b8fb8c99e0d2a2826a Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 4 Nov 2025 09:30:04 +0100
Subject: [PATCH 754/931] Upload only on manual action

---
 .github/workflows/wheels.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index e75e02ad2..3fdde6abf 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -25,13 +25,13 @@ jobs:
               archs: "aarch64",
             },
             {
-              name: "macOS 13",
+              name: "macOS 15 x64",
               family: "macos",
               runner: "macos-15-intel",
               archs: "x86_64",
             },
             {
-              name: "macOS 14",
+              name: "macOS 15 arm64",
               family: "macos",
               runner: "macos-15",
               archs: "arm64",
@@ -119,7 +119,7 @@ jobs:
           path: ./wheelhouse/*.whl
   upload_wheels:
     name: Upload Wheels
-    if: github.repository == 'YosysHQ/Yosys'
+    if: (github.repository == 'YosysHQ/Yosys') && (github.event_name == 'workflow_dispatch')
     runs-on: ubuntu-latest
     # Specifying a GitHub environment is optional, but strongly encouraged
     environment: pypi

From 3a54ed6916f45e558e3f26d1a9abcb932ea04b32 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Tue, 4 Nov 2025 14:32:38 +0200
Subject: [PATCH 755/931] hotfix: don't use uv when building wheels

---
 .github/workflows/wheels.yml | 5 -----
 setup.py                     | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 3fdde6abf..b3a25a43a 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -54,11 +54,6 @@ jobs:
           fetch-depth: 0
           submodules: true
           persist-credentials: false
-      - if: ${{ matrix.os.family == 'linux' }}
-        name: "[Linux] Install UV"
-        shell: bash
-        run: |
-          curl -LsSf https://astral.sh/uv/install.sh | sh
       - uses: actions/setup-python@v5
       - name: Get FFI
         shell: bash
diff --git a/setup.py b/setup.py
index 59c1c4b33..8b786cb32 100644
--- a/setup.py
+++ b/setup.py
@@ -51,6 +51,7 @@ class libyosys_so_ext(Extension):
             "ENABLE_TCL=0",
             "ENABLE_READLINE=0",
             "ENABLE_EDITLINE=0",
+            "PYOSYS_USE_UV=0", # + install requires takes its role when building wheels
             # Always compile and include ABC in wheel
             "ABCEXTERNAL=",
             # Show compile commands

From 51c8193643cbda5c3aefe22c9fb1235388f8fd14 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Tue, 4 Nov 2025 14:58:48 +0200
Subject: [PATCH 756/931] hotfix: update libffi in wheels ci

update libffi to a version where https://github.com/libffi/libffi/issues/852 is fixed
---
 .github/workflows/wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b3a25a43a..8e055f526 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -59,7 +59,7 @@ jobs:
         shell: bash
         run: |
           mkdir -p ffi
-          curl -L https://github.com/libffi/libffi/releases/download/v3.4.6/libffi-3.4.6.tar.gz | tar --strip-components=1 -xzC ffi
+          curl -L https://github.com/libffi/libffi/releases/download/v3.4.8/libffi-3.4.8.tar.gz | tar --strip-components=1 -xzC ffi
       - if: ${{ matrix.os.family == 'linux' }}
         name: "[Linux] Bison 3.8.2"
         shell: bash

From 12cb8e95110af37c46dea77f46484db72ae7cdc9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 5 Nov 2025 00:24:49 +0000
Subject: [PATCH 757/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a46b865ed..d72cbee7e 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+98
+YOSYS_VER := 0.58+132
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From e89c5914fe279bfee42e1bbaf6fd017cb333ff64 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 5 Nov 2025 07:10:08 +0100
Subject: [PATCH 758/931] CodeQL CI fix

---
 .github/workflows/codeql.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index da30e3da4..4bca5a8a5 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -10,18 +10,18 @@ jobs:
     name: Analyze
     runs-on: ubuntu-latest
     steps:
-    - name: Setup environment
-      uses: ./.github/actions/setup-build-env
-      with:
-        runs-on: ubuntu-latest
-        get-build-deps: true
-
     - name: Checkout repository
       uses: actions/checkout@v4
       with:
         submodules: true
         persist-credentials: false
 
+    - name: Setup environment
+      uses: ./.github/actions/setup-build-env
+      with:
+        runs-on: ubuntu-latest
+        get-build-deps: true
+
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
       with:

From 66d8fc5c287aa67e13148c3b27ce966155e48975 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 5 Nov 2025 11:00:25 +0100
Subject: [PATCH 759/931] libparse: quirk-compatibility for unquoted boolean
 expression strings

---
 passes/techmap/libparse.cc | 81 +++++++++++++++++++++++++++-----------
 passes/techmap/libparse.h  |  2 +
 2 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index 7d4fd77ad..cf1854c87 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -364,7 +364,7 @@ std::string LibertyExpression::str(int indent)
 
 #endif
 
-int LibertyParser::lexer(std::string &str)
+int LibertyParser::lexer_inner(std::string &str)
 {
 	int c;
 
@@ -390,11 +390,9 @@ int LibertyParser::lexer(std::string &str)
 
 		if (str == "+" || str == "-") {
 			/* Single operator is not an identifier */
-			// fprintf(stderr, "LEX: char >>%s<<\n", str.c_str());
 			return str[0];
 		}
 		else {
-			// fprintf(stderr, "LEX: identifier >>%s<<\n", str.c_str());
 			return 'v';
 		}
 	}
@@ -402,24 +400,25 @@ int LibertyParser::lexer(std::string &str)
 	// if it wasn't an identifer, number of array range,
 	// maybe it's a string?
 	if (c == '"') {
+		f.consume(1);
 		size_t i = 0;
 		while (true) {
 			c = f.peek(i);
 			line += (c == '\n');
-			if (c != '"')
+			if (c != '"' && c != EOF)
 				i += 1;
 			else
 				break;
 		}
 		str.clear();
-#ifdef FILTERLIB
 		f.unget();
-		str.append(f.buffered_data(), f.buffered_data() + i + 2);
-		f.consume(i + 2);
-#else
-		str.append(f.buffered_data(), f.buffered_data() + i);
-		f.consume(i + 1);
+		str.append(f.buffered_data(), f.buffered_data() + i + 1);
+		// Usage in filterlib is expected to retain quotes
+		// but yosys expects to get unquoted
+#ifdef FILTERLIB
+		str = "\"" + str + "\"";
 #endif
+		f.consume(i + 2);
 		return 'v';
 	}
 
@@ -442,13 +441,12 @@ int LibertyParser::lexer(std::string &str)
 			return lexer(str);
 		}
 		f.unget();
-		// fprintf(stderr, "LEX: char >>/<<\n");
 		return '/';             // a single '/' charater.
 	}
 
 	// check for a backslash
 	if (c == '\\') {
-		c = f.get();		
+		c = f.get();
 		if (c == '\r')
 			c = f.get();
 		if (c == '\n') {
@@ -467,14 +465,22 @@ int LibertyParser::lexer(std::string &str)
 
 	// anything else, such as ';' will get passed
 	// through as literal items.
-
-	// if (c >= 32 && c < 255)
-	// 	fprintf(stderr, "LEX: char >>%c<<\n", c);
-	// else
-	// 	fprintf(stderr, "LEX: char %d\n", c);
 	return c;
 }
 
+int LibertyParser::lexer(std::string &str)
+{
+	int ret = lexer_inner(str);
+	// if (ret >= 32 && ret < 255) {
+	// 	fprintf(stdout, "LEX: ret >>%c<<\n", ret);
+	// } else if (ret == 'v') {
+	// 	fprintf(stdout, "LEX: ret v str %s\n", str.c_str());
+	// } else {
+	// 	fprintf(stdout, "LEX: ret %d\n", ret);
+	// }
+	return ret;
+}
+
 void LibertyParser::report_unexpected_token(int tok)
 {
 	std::string eReport;
@@ -545,6 +551,25 @@ void LibertyParser::parse_vector_range(int tok)
 	}
 }
 
+// Consume into out_str any string-ish tokens, seperated with spaces
+// to cope with abuse of the underdefined spec by real world PDKs
+// enabled by proprietary implementations.
+// Sorry.
+int LibertyParser::consume_wrecked_str(int tok, std::string& out_str) {
+	std::string str = "";
+	while (tok != ';' && tok != EOF && tok != 'n') {
+		out_str += " ";
+		if (tok == 'v')
+			out_str += str;
+		else
+			out_str += tok;
+		tok = lexer(str);
+	}
+	if (tok == EOF)
+		error("wrecked string EOF");
+	return tok;
+}
+
 LibertyAst *LibertyParser::parse(bool top_level)
 {
 	std::string str;
@@ -591,17 +616,29 @@ LibertyAst *LibertyParser::parse(bool top_level)
 				if (tok == '[') {
 					parse_vector_range(tok);
 					tok = lexer(str);
+				} else {
+					// Hack for when an expression string is unquoted
+					// std::cout << "consume_wrecked_str from :\n";
+					// std::cout << " weh " << str << "\n";
+					tok = consume_wrecked_str(tok, ast->value);
 				}
+			} else if (tok == '(') {
+				// Hack for when an expression string is unquoted and starts with
+				// parentheses
+				// tok = '';
+				// ast->value = "(";
+				// std::cout << "consume_wrecked_str from (\n";
+				tok = consume_wrecked_str(tok, ast->value);
 			}
 			while (tok == '+' || tok == '-' || tok == '*' || tok == '/' || tok == '!') {
 				ast->value += tok;
 				tok = lexer(str);
 				if (tok != 'v')
-					error();
+					error("one");
 				ast->value += str;
 				tok = lexer(str);
 			}
-			
+
 			// In a liberty file, all key : value pairs should end in ';'
 			// However, there are some liberty files in the wild that
 			// just have a newline. We'll be kind and accept a newline
@@ -609,7 +646,7 @@ LibertyAst *LibertyParser::parse(bool top_level)
 			if ((tok == ';') || (tok == 'n'))
 				break;
 			else
-				error();
+				error("two");
 			continue;
 		}
 
@@ -621,11 +658,11 @@ LibertyAst *LibertyParser::parse(bool top_level)
 					continue;
 				if (tok == ')')
 					break;
-				
+
 				if (tok == '[')
 				{
 					parse_vector_range(tok);
-					continue;           
+					continue;
 				}
 				if (tok == 'n')
 					continue;
diff --git a/passes/techmap/libparse.h b/passes/techmap/libparse.h
index 44b5d3d47..91f06a46c 100644
--- a/passes/techmap/libparse.h
+++ b/passes/techmap/libparse.h
@@ -170,10 +170,12 @@ namespace Yosys
 		   'n': newline
 		   anything else is a single character.
 		*/
+		int lexer_inner(std::string &str);
 		int lexer(std::string &str);
 
 		void report_unexpected_token(int tok);
 		void parse_vector_range(int tok);
+		int consume_wrecked_str(int tok, std::string& out_str);
 		LibertyAst *parse(bool top_level);
 		void error() const;
 		void error(const std::string &str) const;

From 547e254a9bcd846232f54512a834c1af561a155e Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 5 Nov 2025 12:12:30 +0100
Subject: [PATCH 760/931] libparse: parse expressions in filterlib

---
 passes/techmap/dfflibmap.cc |   4 +-
 passes/techmap/libparse.cc  | 120 +++++++++++++++++++++---------------
 passes/techmap/libparse.h   |  10 +--
 3 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/passes/techmap/dfflibmap.cc b/passes/techmap/dfflibmap.cc
index 6d55d1b43..e8fc6fc12 100644
--- a/passes/techmap/dfflibmap.cc
+++ b/passes/techmap/dfflibmap.cc
@@ -127,7 +127,7 @@ static bool parse_next_state(const LibertyAst *cell, const LibertyAst *attr, std
 		return false;
 	}
 
-	auto pin_names = pool<std::string>{};
+	auto pin_names = std::unordered_set<std::string>{};
 	tree.get_pin_names(pin_names);
 
 	// from the `ff` block, we know the flop output signal name for loopback.
@@ -156,7 +156,7 @@ static bool parse_next_state(const LibertyAst *cell, const LibertyAst *attr, std
 		auto pins = std::vector<std::string>(pin_names.begin(), pin_names.end());
 		int lut = 0;
 		for (int n = 0; n < 8; n++) {
-			auto values = dict<std::string, bool>{};
+			auto values = std::unordered_map<std::string, bool>{};
 			values.insert(std::make_pair(pins[0], (n & 1) == 1));
 			values.insert(std::make_pair(pins[1], (n & 2) == 2));
 			values.insert(std::make_pair(ff_output, (n & 4) == 4));
diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index cf1854c87..50bf2aca6 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -26,8 +26,20 @@
 #include <iostream>
 #include <sstream>
 
-#ifndef FILTERLIB
+#ifdef FILTERLIB
+#undef log_assert
+void log_assert(bool cond) {
+	if (!cond)
+		fprintf(stderr, "Unspecified assertion failed\n");
+}
+void warn(std::string str) {
+	std::cerr << str;
+}
+#else
 #include "kernel/log.h"
+void warn(std::string str) {
+	Yosys::log_formatted_warning("", str);
+}
 #endif
 
 using namespace Yosys;
@@ -162,13 +174,15 @@ void LibertyAst::dump(FILE *f, sieve &blacklist, sieve &whitelist, std::string i
 		fprintf(f, " ;\n");
 }
 
-#ifndef FILTERLIB
-
 // binary operators excluding ' '
-bool LibertyExpression::is_nice_binop(char c) {
+bool LibertyExpression::char_is_nice_binop(char c) {
 	return c == '*' || c == '&' || c == '^' || c == '+' || c == '|';
 }
 
+bool LibertyExpression::is_binop() {
+	return kind == AND || kind == OR || kind == XOR;
+}
+
 // https://matklad.github.io/2020/04/13/simple-but-powerful-pratt-parsing.html
 LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 	if (s.empty())
@@ -191,7 +205,9 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 		s.next();
 		lhs = parse(s);
 		if (s.peek() != ')') {
-			log_warning("expected ')' instead of '%c' while parsing Liberty expression '%s'\n", s.peek(), s.full_expr());
+			std::stringstream ss;
+			ss << "expected ')' instead of " << s.peek() << " while parsing Liberty expression '" << s.full_expr() << "'\n";
+			warn(ss.str());
 			return lhs;
 		}
 		s.next();
@@ -200,7 +216,9 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 		lhs.kind = Kind::NOT;
 		lhs.children.push_back(parse(s, 7));
 	} else {
-		log_warning("unrecognised character '%c' while parsing Liberty expression '%s'\n", c, s.full_expr());
+		std::stringstream ss;
+		ss << "unrecognised character " << c << " while parsing Liberty expression " << s.full_expr() << "\n";
+		warn(ss.str());
 		return lhs;
 	}
 
@@ -246,7 +264,7 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 					s.next();
 					c = s.peek();
 				}
-				if (is_nice_binop(c)) {
+				if (char_is_nice_binop(c)) {
 					// We found a real binop, so this space wasn't an AND
 					// and we just discard it as meaningless whitespace
 					continue;
@@ -286,7 +304,7 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 	return lhs;
 }
 
-void LibertyExpression::get_pin_names(pool<std::string>& names) {
+void LibertyExpression::get_pin_names(std::unordered_set<std::string>& names) {
 	if (kind == Kind::PIN) {
 		names.insert(name);
 	} else {
@@ -295,7 +313,7 @@ void LibertyExpression::get_pin_names(pool<std::string>& names) {
 	}
 }
 
-bool LibertyExpression::eval(dict<std::string, bool>& values) {
+bool LibertyExpression::eval(std::unordered_map<std::string, bool>& values) {
 	bool result = false;
 	switch (kind) {
 	case Kind::AND:
@@ -324,7 +342,7 @@ bool LibertyExpression::eval(dict<std::string, bool>& values) {
 	return false;
 }
 
-std::string LibertyExpression::str(int indent)
+std::string LibertyExpression::sexpr_str(int indent)
 {
 	std::string prefix;
 	switch (kind) {
@@ -355,14 +373,53 @@ std::string LibertyExpression::str(int indent)
 		if (!first) {
 			prefix += "\n" + std::string(indent + add_indent, ' ');
 		}
-		prefix += child.str(indent + add_indent);
+		prefix += child.sexpr_str(indent + add_indent);
 		first = false;
 	}
 	prefix += ")";
 	return prefix;
 }
 
-#endif
+std::string LibertyExpression::vlog_str()
+{
+	std::string prefix;
+	if (kind != PIN)
+		prefix += "(";
+	if (is_binop()) {
+		log_assert(children.size() == 2);
+		prefix += children[0].vlog_str();
+		switch (kind) {
+			case AND:
+				prefix += "&";
+				break;
+			case OR:
+				prefix += "|";
+				break;
+			case XOR:
+				prefix += "^";
+				break;
+			default:
+				log_assert(false);
+		}
+		prefix += children[1].vlog_str();
+	} else {
+		switch (kind) {
+			case NOT:
+				log_assert(children.size() == 1);
+				prefix += "~";
+				prefix += children[0].vlog_str();
+				break;
+			case PIN:
+				prefix += name;
+				break;
+			default:
+				log_assert(false);
+			}
+	}
+	if (kind != PIN)
+		prefix += ")";
+	return prefix;
+}
 
 int LibertyParser::lexer_inner(std::string &str)
 {
@@ -764,43 +821,8 @@ const LibertyAst *find_non_null(const LibertyAst *node, const char *name)
 
 std::string func2vl(std::string str)
 {
-	for (size_t pos = str.find_first_of("\" \t"); pos != std::string::npos; pos = str.find_first_of("\" \t")) {
-		char c_left = pos > 0 ? str[pos-1] : ' ';
-		char c_right = pos+1 < str.size() ? str[pos+1] : ' ';
-		if (std::string("\" \t*+").find(c_left) != std::string::npos)
-			str.erase(pos, 1);
-		else if (std::string("\" \t*+").find(c_right) != std::string::npos)
-			str.erase(pos, 1);
-		else
-			str[pos] = '*';
-	}
-
-	std::vector<size_t> group_start;
-	for (size_t pos = 0; pos < str.size(); pos++) {
-		if (str[pos] == '(')
-			group_start.push_back(pos);
-		if (str[pos] == ')' && group_start.size() > 0) {
-			if (pos+1 < str.size() && str[pos+1] == '\'') {
-				std::string group = str.substr(group_start.back(), pos-group_start.back()+1);
-				str[group_start.back()] = '~';
-				str.replace(group_start.back()+1, group.size(), group);
-				pos++;
-			}
-			group_start.pop_back();
-		}
-		if (str[pos] == '\'' && pos > 0) {
-			size_t start = str.find_last_of("()'*+^&| ", pos-1)+1;
-			std::string group = str.substr(start, pos-start);
-			str[start] = '~';
-			str.replace(start+1, group.size(), group);
-		}
-		if (str[pos] == '*')
-			str[pos] = '&';
-		if (str[pos] == '+')
-			str[pos] = '|';
-	}
-
-	return str;
+	auto helper = LibertyExpression::Lexer(str);
+	return LibertyExpression::parse(helper).vlog_str();
 }
 
 void event2vl(const LibertyAst *ast, std::string &edge, std::string &expr)
diff --git a/passes/techmap/libparse.h b/passes/techmap/libparse.h
index 91f06a46c..f1138567d 100644
--- a/passes/techmap/libparse.h
+++ b/passes/techmap/libparse.h
@@ -91,11 +91,13 @@ namespace Yosys
 		LibertyExpression() : kind(Kind::EMPTY) {}
 
 		static LibertyExpression parse(Lexer &s, int min_prio = 0);
-		void get_pin_names(pool<std::string>& names);
-		bool eval(dict<std::string, bool>& values);
-		std::string str(int indent = 0);
+		void get_pin_names(std::unordered_set<std::string>& names);
+		bool eval(std::unordered_map<std::string, bool>& values);
+		std::string sexpr_str(int indent = 0);
+		std::string vlog_str();
 	private:
-		static bool is_nice_binop(char c);
+		static bool char_is_nice_binop(char c);
+		bool is_binop();
 	};
 
 	class LibertyInputStream {

From 4fac7a1b20078ee2a73afc815f8244ba5f345528 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 5 Nov 2025 12:35:58 +0100
Subject: [PATCH 761/931] libparse: fix space before closing paren in
 expressions

---
 passes/techmap/libparse.cc         | 6 +++---
 tests/unit/techmap/libparseTest.cc | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index 50bf2aca6..6db204c2e 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -191,7 +191,7 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 	char c = s.peek();
 	auto lhs = LibertyExpression{};
 
-	while (isspace(c)) {
+	while (isspace(c) || c == '"') {
 		if (s.empty())
 			return lhs;
 		s.next();
@@ -221,7 +221,6 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 		warn(ss.str());
 		return lhs;
 	}
-
 	while (true) {
 		if (s.empty())
 			break;
@@ -264,9 +263,10 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 					s.next();
 					c = s.peek();
 				}
-				if (char_is_nice_binop(c)) {
+				if (char_is_nice_binop(c) || c == ')') {
 					// We found a real binop, so this space wasn't an AND
 					// and we just discard it as meaningless whitespace
+					// Closing paren is also always terminating here
 					continue;
 				}
 			} else {
diff --git a/tests/unit/techmap/libparseTest.cc b/tests/unit/techmap/libparseTest.cc
index b58e55bf2..95070dd04 100644
--- a/tests/unit/techmap/libparseTest.cc
+++ b/tests/unit/techmap/libparseTest.cc
@@ -13,7 +13,7 @@ namespace RTLIL {
 		void checkAll(std::initializer_list<std::string> expressions, std::string expected) {
 			for (const auto& e : expressions) {
 				auto helper = LibertyExpression::Lexer(e);
-				auto tree_s = LibertyExpression::parse(helper).str();
+				auto tree_s = LibertyExpression::parse(helper).sexpr_str();
 				EXPECT_EQ(tree_s, expected);
 			}
 		}
@@ -82,6 +82,11 @@ namespace RTLIL {
 		}, "(and (pin \"x\")\n"
 		   "     (not (pin \"y\")))"
 		);
+		checkAll({
+			"( D & EN )",
+		}, "(and (pin \"D\")\n"
+		   "     (pin \"EN\"))"
+		);
 	}
 }
 

From bf29f6dc11630a3d97254bfaed3652fe8be35890 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 5 Nov 2025 12:50:50 +0100
Subject: [PATCH 762/931] libparse: tolerate closing quotes in expression
 parsing

---
 passes/techmap/libparse.cc | 4 ++--
 passes/techmap/libparse.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index 6db204c2e..eddc68263 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -263,10 +263,10 @@ LibertyExpression LibertyExpression::parse(Lexer &s, int min_prio) {
 					s.next();
 					c = s.peek();
 				}
-				if (char_is_nice_binop(c) || c == ')') {
+				if (char_is_nice_binop(c) || c == ')' || c == '\'' || c == '\"') {
 					// We found a real binop, so this space wasn't an AND
 					// and we just discard it as meaningless whitespace
-					// Closing paren is also always terminating here
+					// Tail operators also imply this isn't an AND
 					continue;
 				}
 			} else {
diff --git a/passes/techmap/libparse.h b/passes/techmap/libparse.h
index f1138567d..674484dad 100644
--- a/passes/techmap/libparse.h
+++ b/passes/techmap/libparse.h
@@ -63,7 +63,7 @@ namespace Yosys
 			}
 
 			std::string pin() {
-				auto length = s.find_first_of("\t()'!^*& +|");
+				auto length = s.find_first_of("\t()'!^*& +|\"");
 				if (length == std::string::npos) {
 					// nothing found so use size of s
 					length = s.size();

From b0a3d6a3e7b01e57c707af7c575ad243ab16ce9c Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 5 Nov 2025 13:05:30 +0100
Subject: [PATCH 763/931] libparse: fix up tests since liberty expression
 parsing now normalizes the form of these expressions

---
 tests/liberty/XNOR2X1.lib.verilogsim.ok  |  2 +-
 tests/liberty/dff.lib                    |  4 +-
 tests/liberty/dff.lib.filtered.ok        |  4 +-
 tests/liberty/dff.lib.verilogsim.ok      |  6 +--
 tests/liberty/normal.lib.verilogsim.ok   | 18 +++----
 tests/liberty/unquoted.lib               | 60 ++++++++++++++++++++++++
 tests/liberty/unquoted.lib.filtered.ok   | 60 ++++++++++++++++++++++++
 tests/liberty/unquoted.lib.verilogsim.ok | 39 +++++++++++++++
 8 files changed, 176 insertions(+), 17 deletions(-)
 create mode 100644 tests/liberty/unquoted.lib
 create mode 100644 tests/liberty/unquoted.lib.filtered.ok
 create mode 100644 tests/liberty/unquoted.lib.verilogsim.ok

diff --git a/tests/liberty/XNOR2X1.lib.verilogsim.ok b/tests/liberty/XNOR2X1.lib.verilogsim.ok
index 89e55e8b8..6c9ec26dd 100644
--- a/tests/liberty/XNOR2X1.lib.verilogsim.ok
+++ b/tests/liberty/XNOR2X1.lib.verilogsim.ok
@@ -2,5 +2,5 @@ module XNOR2X1 (B, A, Y);
   input B;
   input A;
   output Y;
-  assign Y = !(B&!A|!B&A); // "!(B&!A|!B&A)"
+  assign Y = (~((B&(~A))|((~B)&A))); // "!(B&!A|!B&A)"
 endmodule
diff --git a/tests/liberty/dff.lib b/tests/liberty/dff.lib
index 61f5966f5..b5df36587 100644
--- a/tests/liberty/dff.lib
+++ b/tests/liberty/dff.lib
@@ -5,7 +5,7 @@ library(dff) {
     area : 1;
     ff("IQ", "IQN") {
       next_state : "(D)";
-      clocked_on : "CLK";
+      clocked_on : (CLK);
     } 
     pin(D) {
       direction : input;
@@ -15,7 +15,7 @@ library(dff) {
     }
     pin(Q) {
       direction: output;
-      function : "IQ";   
+      function : IQ;   
     }
   }
 
diff --git a/tests/liberty/dff.lib.filtered.ok b/tests/liberty/dff.lib.filtered.ok
index b7dcb96be..2c2804ca1 100644
--- a/tests/liberty/dff.lib.filtered.ok
+++ b/tests/liberty/dff.lib.filtered.ok
@@ -3,7 +3,7 @@ library(dff) {
     area : 1 ;
     ff("IQ", "IQN") {
       next_state : "(D)" ;
-      clocked_on : "CLK" ;
+      clocked_on :  ( CLK ) ;
     }
     pin(D) {
       direction : input ;
@@ -13,7 +13,7 @@ library(dff) {
     }
     pin(Q) {
       direction : output ;
-      function : "IQ" ;
+      function : IQ ;
     }
   }
 }
diff --git a/tests/liberty/dff.lib.verilogsim.ok b/tests/liberty/dff.lib.verilogsim.ok
index 46441d0fc..4f2a5750c 100644
--- a/tests/liberty/dff.lib.verilogsim.ok
+++ b/tests/liberty/dff.lib.verilogsim.ok
@@ -3,10 +3,10 @@ module dff (D, CLK, Q);
   input D;
   input CLK;
   output Q;
-  assign Q = IQ; // "IQ"
+  assign Q = IQ; // IQ
   always @(posedge CLK) begin
       // "(D)"
-      "IQ" <= (D);
-      "IQN" <= ~((D));
+      "IQ" <= D;
+      "IQN" <= ~(D);
   end
 endmodule
diff --git a/tests/liberty/normal.lib.verilogsim.ok b/tests/liberty/normal.lib.verilogsim.ok
index 85aed5f4e..190ecd285 100644
--- a/tests/liberty/normal.lib.verilogsim.ok
+++ b/tests/liberty/normal.lib.verilogsim.ok
@@ -1,13 +1,13 @@
 module inv (A, Y);
   input A;
   output Y;
-  assign Y = ~A; // "A'"
+  assign Y = (~A); // "A'"
 endmodule
 module tri_inv (A, S, Z);
   input A;
   input S;
   output Z;
-  assign Z = ~A; // "A'"
+  assign Z = (~A); // "A'"
 endmodule
 module buffer (A, Y);
   input A;
@@ -18,26 +18,26 @@ module nand2 (A, B, Y);
   input A;
   input B;
   output Y;
-  assign Y = ~(A&B); // "(A * B)'"
+  assign Y = (~(A&B)); // "(A * B)'"
 endmodule
 module nor2 (A, B, Y);
   input A;
   input B;
   output Y;
-  assign Y = ~(A|B); // "(A + B)'"
+  assign Y = (~(A|B)); // "(A + B)'"
 endmodule
 module xor2 (A, B, Y);
   input A;
   input B;
   output Y;
-  assign Y = (A&~B)|(~A&B); // "(A *B') + (A' * B)"
+  assign Y = ((A&(~B))|((~A)&B)); // "(A *B') + (A' * B)"
 endmodule
 module imux2 (A, B, S, Y);
   input A;
   input B;
   input S;
   output Y;
-  assign Y = ~(&(A&S)|(B&~S)&); // "( (A * S) + (B * S') )'"
+  assign Y = (~((A&S)|(B&(~S)))); // "( (A * S) + (B * S') )'"
 endmodule
 module dff (D, CLK, RESET, PRESET, Q, QN);
   reg "IQ", "IQN";
@@ -89,14 +89,14 @@ module aoi211 (A, B, C, Y);
   input B;
   input C;
   output Y;
-  assign Y = ~((A&B)|C); // "((A * B) + C)'"
+  assign Y = (~((A&B)|C)); // "((A * B) + C)'"
 endmodule
 module oai211 (A, B, C, Y);
   input A;
   input B;
   input C;
   output Y;
-  assign Y = ~((A|B)&C); // "((A + B) * C)'"
+  assign Y = (~((A|B)&C)); // "((A + B) * C)'"
 endmodule
 module halfadder (A, B, C, Y);
   input A;
@@ -104,7 +104,7 @@ module halfadder (A, B, C, Y);
   output C;
   assign C = (A&B); // "(A * B)"
   output Y;
-  assign Y = (A&~B)|(~A&B); // "(A *B') + (A' * B)"
+  assign Y = ((A&(~B))|((~A)&B)); // "(A *B') + (A' * B)"
 endmodule
 module fulladder (A, B, CI, CO, Y);
   input A;
diff --git a/tests/liberty/unquoted.lib b/tests/liberty/unquoted.lib
new file mode 100644
index 000000000..c2bf538d2
--- /dev/null
+++ b/tests/liberty/unquoted.lib
@@ -0,0 +1,60 @@
+library(dff_unquoted) {
+  cell (dff1) {
+    area : 1;
+    ff("IQ", "IQN") {
+      next_state : !D;
+      clocked_on : (CLK);
+    }
+    pin(D) {
+      direction : input;
+    }
+    pin(CLK) {
+      direction : input;
+    }
+    pin(Q) {
+      direction: output;
+      function : IQ;
+    }
+  }
+  cell (dff2) {
+    area : 1;
+    ff(IQ, IQN) {
+      next_state : D';
+      clocked_on : CLK;
+    }
+    pin(D) {
+      direction : input;
+    }
+    pin(CLK) {
+      direction : input;
+    }
+    pin(Q) {
+      direction: output;
+      function : "IQ";
+    }
+  }
+  cell (dffe) {
+    area : 6;
+    ff("IQ", "IQN") {
+      next_state : (D&EN) | (IQ&!EN);
+      clocked_on : !CLK;
+    }
+    pin(D) {
+      direction : input;
+    }
+    pin(EN) {
+      direction : input;
+    }
+    pin(CLK) {
+      direction : input;
+    }
+    pin(Q) {
+      direction: output;
+      function : "IQ";
+    }
+    pin(QN) {
+      direction: output;
+      function : "IQN";
+    }
+  }
+}
diff --git a/tests/liberty/unquoted.lib.filtered.ok b/tests/liberty/unquoted.lib.filtered.ok
new file mode 100644
index 000000000..0ffc157b4
--- /dev/null
+++ b/tests/liberty/unquoted.lib.filtered.ok
@@ -0,0 +1,60 @@
+library(dff_unquoted) {
+  cell(dff1) {
+    area : 1 ;
+    ff("IQ", "IQN") {
+      next_state : !D ;
+      clocked_on :  ( CLK ) ;
+    }
+    pin(D) {
+      direction : input ;
+    }
+    pin(CLK) {
+      direction : input ;
+    }
+    pin(Q) {
+      direction : output ;
+      function : IQ ;
+    }
+  }
+  cell(dff2) {
+    area : 1 ;
+    ff(IQ, IQN) {
+      next_state : D ' ;
+      clocked_on : CLK ;
+    }
+    pin(D) {
+      direction : input ;
+    }
+    pin(CLK) {
+      direction : input ;
+    }
+    pin(Q) {
+      direction : output ;
+      function : "IQ" ;
+    }
+  }
+  cell(dffe) {
+    area : 6 ;
+    ff("IQ", "IQN") {
+      next_state :  ( D & EN ) | ( IQ & ! EN ) ;
+      clocked_on : !CLK ;
+    }
+    pin(D) {
+      direction : input ;
+    }
+    pin(EN) {
+      direction : input ;
+    }
+    pin(CLK) {
+      direction : input ;
+    }
+    pin(Q) {
+      direction : output ;
+      function : "IQ" ;
+    }
+    pin(QN) {
+      direction : output ;
+      function : "IQN" ;
+    }
+  }
+}
diff --git a/tests/liberty/unquoted.lib.verilogsim.ok b/tests/liberty/unquoted.lib.verilogsim.ok
new file mode 100644
index 000000000..8706d1773
--- /dev/null
+++ b/tests/liberty/unquoted.lib.verilogsim.ok
@@ -0,0 +1,39 @@
+module dff1 (D, CLK, Q);
+  reg "IQ", "IQN";
+  input D;
+  input CLK;
+  output Q;
+  assign Q = IQ; // IQ
+  always @(posedge CLK) begin
+      // !D
+      "IQ" <= (~D);
+      "IQN" <= ~((~D));
+  end
+endmodule
+module dff2 (D, CLK, Q);
+  reg IQ, IQN;
+  input D;
+  input CLK;
+  output Q;
+  assign Q = IQ; // "IQ"
+  always @(posedge CLK) begin
+      // D '
+      IQ <= (~D);
+      IQN <= ~((~D));
+  end
+endmodule
+module dffe (D, EN, CLK, Q, QN);
+  reg "IQ", "IQN";
+  input D;
+  input EN;
+  input CLK;
+  output Q;
+  assign Q = IQ; // "IQ"
+  output QN;
+  assign QN = IQN; // "IQN"
+  always @(posedge (~CLK)) begin
+      //  ( D & EN ) | ( IQ & ! EN )
+      "IQ" <= ((D&EN)|(IQ&(~EN)));
+      "IQN" <= ~(((D&EN)|(IQ&(~EN))));
+  end
+endmodule

From 504b668ea64b755bfa8090db78ac024a46d4e0ec Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 5 Nov 2025 13:49:05 +0100
Subject: [PATCH 764/931] libparse: fix verilogsim negedge

---
 passes/techmap/libparse.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index eddc68263..da88dfc66 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -831,11 +831,13 @@ void event2vl(const LibertyAst *ast, std::string &edge, std::string &expr)
 	expr.clear();
 
 	if (ast != NULL) {
-		expr = func2vl(ast->value);
-		if (expr.size() > 0 && expr[0] == '~')
-			edge = "negedge " + expr.substr(1);
+		auto helper = LibertyExpression::Lexer(ast->value);
+		auto parsed = LibertyExpression::parse(helper);
+		expr = parsed.vlog_str();
+		if (parsed.kind == LibertyExpression::Kind::NOT)
+			edge = "negedge " + parsed.children[0].vlog_str();
 		else
-			edge = "posedge " + expr;
+			edge = "posedge " + parsed.vlog_str();
 	}
 }
 

From 90553267b0a3a98bad21b6892f0e170422fdddad Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 5 Nov 2025 14:13:58 +0100
Subject: [PATCH 765/931] libparse: fix quoting and negedge in filterlib
 -verilogsim

---
 passes/techmap/libparse.cc               | 26 ++++++++++++++++--------
 tests/liberty/dff.lib.verilogsim.ok      |  6 +++---
 tests/liberty/normal.lib.verilogsim.ok   | 24 +++++++++++-----------
 tests/liberty/unquoted.lib.verilogsim.ok | 14 ++++++-------
 4 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index da88dfc66..2d3f1792a 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -25,6 +25,7 @@
 #include <fstream>
 #include <iostream>
 #include <sstream>
+#include <algorithm>
 
 #ifdef FILTERLIB
 #undef log_assert
@@ -825,6 +826,12 @@ std::string func2vl(std::string str)
 	return LibertyExpression::parse(helper).vlog_str();
 }
 
+std::string vlog_identifier(std::string str)
+{
+	str.erase(std::remove(str.begin(), str.end(), '\"'), str.end());
+	return str;
+}
+
 void event2vl(const LibertyAst *ast, std::string &edge, std::string &expr)
 {
 	edge.clear();
@@ -867,13 +874,13 @@ void gen_verilogsim_cell(const LibertyAst *ast)
 		return;
 
 	CHECK_NV(ast->args.size(), == 1);
-	printf("module %s (", ast->args[0].c_str());
+	printf("module %s (", vlog_identifier(ast->args[0]).c_str());
 	bool first = true;
 	for (auto child : ast->children) {
 		if (child->id != "pin")
 			continue;
 		CHECK_NV(child->args.size(), == 1);
-		printf("%s%s", first ? "" : ", ", child->args[0].c_str());
+		printf("%s%s", first ? "" : ", ", vlog_identifier(child->args[0]).c_str());
 		first = false;
 	}
 	printf(");\n");
@@ -884,7 +891,7 @@ void gen_verilogsim_cell(const LibertyAst *ast)
 		printf("  reg ");
 		first = true;
 		for (auto arg : child->args) {
-			printf("%s%s", first ? "" : ", ", arg.c_str());
+			printf("%s%s", first ? "" : ", ", vlog_identifier(arg).c_str());
 			first = false;
 		}
 		printf(";\n");
@@ -896,9 +903,10 @@ void gen_verilogsim_cell(const LibertyAst *ast)
 		CHECK_NV(child->args.size(), == 1);
 		const LibertyAst *dir = find_non_null(child, "direction");
 		const LibertyAst *func = child->find("function");
-		printf("  %s %s;\n", dir->value.c_str(), child->args[0].c_str());
+		std::string var = vlog_identifier(child->args[0]);
+		printf("  %s %s;\n", dir->value.c_str(), var.c_str());
 		if (func != NULL)
-			printf("  assign %s = %s; // %s\n", child->args[0].c_str(), func2vl(func->value).c_str(), func->value.c_str());
+			printf("  assign %s = %s; // %s\n", var.c_str(), func2vl(func->value).c_str(), func->value.c_str());
 	}
 
 	for (auto child : ast->children)
@@ -906,8 +914,8 @@ void gen_verilogsim_cell(const LibertyAst *ast)
 		if (child->id != "ff" || child->args.size() != 2)
 			continue;
 
-		std::string iq_var = child->args[0];
-		std::string iqn_var = child->args[1];
+		std::string iq_var = vlog_identifier(child->args[0]);
+		std::string iqn_var = vlog_identifier(child->args[1]);
 
 		std::string clock_edge, clock_expr;
 		event2vl(child->find("clocked_on"), clock_edge, clock_expr);
@@ -970,8 +978,8 @@ void gen_verilogsim_cell(const LibertyAst *ast)
 		if (child->id != "latch" || child->args.size() != 2)
 			continue;
 
-		std::string iq_var = child->args[0];
-		std::string iqn_var = child->args[1];
+		std::string iq_var = vlog_identifier(child->args[0]);
+		std::string iqn_var = vlog_identifier(child->args[1]);
 
 		std::string enable_edge, enable_expr;
 		event2vl(child->find("enable"), enable_edge, enable_expr);
diff --git a/tests/liberty/dff.lib.verilogsim.ok b/tests/liberty/dff.lib.verilogsim.ok
index 4f2a5750c..e560df539 100644
--- a/tests/liberty/dff.lib.verilogsim.ok
+++ b/tests/liberty/dff.lib.verilogsim.ok
@@ -1,12 +1,12 @@
 module dff (D, CLK, Q);
-  reg "IQ", "IQN";
+  reg IQ, IQN;
   input D;
   input CLK;
   output Q;
   assign Q = IQ; // IQ
   always @(posedge CLK) begin
       // "(D)"
-      "IQ" <= D;
-      "IQN" <= ~(D);
+      IQ <= D;
+      IQN <= ~(D);
   end
 endmodule
diff --git a/tests/liberty/normal.lib.verilogsim.ok b/tests/liberty/normal.lib.verilogsim.ok
index 190ecd285..92efbf8aa 100644
--- a/tests/liberty/normal.lib.verilogsim.ok
+++ b/tests/liberty/normal.lib.verilogsim.ok
@@ -40,7 +40,7 @@ module imux2 (A, B, S, Y);
   assign Y = (~((A&S)|(B&(~S)))); // "( (A * S) + (B * S') )'"
 endmodule
 module dff (D, CLK, RESET, PRESET, Q, QN);
-  reg "IQ", "IQN";
+  reg IQ, IQN;
   input D;
   input CLK;
   input RESET;
@@ -51,26 +51,26 @@ module dff (D, CLK, RESET, PRESET, Q, QN);
   assign QN = IQN; // "IQN"
   always @(posedge CLK, posedge RESET, posedge PRESET) begin
     if ((RESET) && (PRESET)) begin
-      "IQ" <= 0;
-      "IQN" <= 0;
+      IQ <= 0;
+      IQN <= 0;
     end
     else if (RESET) begin
-      "IQ" <= 0;
-      "IQN" <= 1;
+      IQ <= 0;
+      IQN <= 1;
     end
     else if (PRESET) begin
-      "IQ" <= 1;
-      "IQN" <= 0;
+      IQ <= 1;
+      IQN <= 0;
     end
     else begin
       // "D"
-      "IQ" <= D;
-      "IQN" <= ~(D);
+      IQ <= D;
+      IQN <= ~(D);
     end
   end
 endmodule
 module latch (D, G, Q, QN);
-  reg "IQ", "IQN";
+  reg IQ, IQN;
   input D;
   input G;
   output Q;
@@ -79,8 +79,8 @@ module latch (D, G, Q, QN);
   assign QN = IQN; // "IQN"
   always @* begin
     if (G) begin
-      "IQ" <= D;
-      "IQN" <= ~(D);
+      IQ <= D;
+      IQN <= ~(D);
     end
   end
 endmodule
diff --git a/tests/liberty/unquoted.lib.verilogsim.ok b/tests/liberty/unquoted.lib.verilogsim.ok
index 8706d1773..2a2f1d173 100644
--- a/tests/liberty/unquoted.lib.verilogsim.ok
+++ b/tests/liberty/unquoted.lib.verilogsim.ok
@@ -1,13 +1,13 @@
 module dff1 (D, CLK, Q);
-  reg "IQ", "IQN";
+  reg IQ, IQN;
   input D;
   input CLK;
   output Q;
   assign Q = IQ; // IQ
   always @(posedge CLK) begin
       // !D
-      "IQ" <= (~D);
-      "IQN" <= ~((~D));
+      IQ <= (~D);
+      IQN <= ~((~D));
   end
 endmodule
 module dff2 (D, CLK, Q);
@@ -23,7 +23,7 @@ module dff2 (D, CLK, Q);
   end
 endmodule
 module dffe (D, EN, CLK, Q, QN);
-  reg "IQ", "IQN";
+  reg IQ, IQN;
   input D;
   input EN;
   input CLK;
@@ -31,9 +31,9 @@ module dffe (D, EN, CLK, Q, QN);
   assign Q = IQ; // "IQ"
   output QN;
   assign QN = IQN; // "IQN"
-  always @(posedge (~CLK)) begin
+  always @(negedge CLK) begin
       //  ( D & EN ) | ( IQ & ! EN )
-      "IQ" <= ((D&EN)|(IQ&(~EN)));
-      "IQN" <= ~(((D&EN)|(IQ&(~EN))));
+      IQ <= ((D&EN)|(IQ&(~EN)));
+      IQN <= ~(((D&EN)|(IQ&(~EN))));
   end
 endmodule

From f8341affe397ae1622d12ff90cb38dab3f81b5b4 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 5 Nov 2025 14:20:30 +0100
Subject: [PATCH 766/931] Fix generatory.py location for out of tree builds

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d72cbee7e..685fec40e 100644
--- a/Makefile
+++ b/Makefile
@@ -366,7 +366,7 @@ CXXFLAGS += -I$(PYBIND11_INCLUDE) -DYOSYS_ENABLE_PYTHON
 CXXFLAGS += $(shell $(PYTHON_CONFIG) --includes) -DYOSYS_ENABLE_PYTHON
 
 OBJS += $(PY_WRAPPER_FILE).o
-PY_GEN_SCRIPT = pyosys/generator.py
+PY_GEN_SCRIPT = $(YOSYS_SRC)/pyosys/generator.py
 PY_WRAP_INCLUDES := $(shell $(UV_ENV) $(PYTHON_EXECUTABLE) $(PY_GEN_SCRIPT) --print-includes)
 endif # ENABLE_PYOSYS
 

From 0f770285f39ae865882fa2b9dde5d07ad3d996b0 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 3 Nov 2025 15:45:30 +0000
Subject: [PATCH 767/931] Move global ABC configuration variables into
 AbcConfig and initialize them properly

---
 passes/techmap/abc.cc      | 110 ++++++++++++++++++-------------------
 tests/techmap/abc_state.ys |  26 +++++++++
 2 files changed, 80 insertions(+), 56 deletions(-)
 create mode 100644 tests/techmap/abc_state.ys

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index c5c653317..e2894aee3 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -117,15 +117,6 @@ struct gate_t
 	std::string bit_str;
 };
 
-bool map_mux4;
-bool map_mux8;
-bool map_mux16;
-
-bool markgroups;
-
-pool<std::string> enabled_gates;
-bool cmos_cost;
-
 struct AbcConfig
 {
 	std::string global_tempdir_name;
@@ -146,6 +137,12 @@ struct AbcConfig
 	bool show_tempdir = false;
 	bool sop_mode = false;
 	bool abc_dress = false;
+	bool map_mux4 = false;
+	bool map_mux8 = false;
+	bool map_mux16 = false;
+	bool markgroups = false;
+	pool<std::string> enabled_gates;
+	bool cmos_cost = false;
 };
 
 struct AbcSigVal {
@@ -1382,7 +1379,7 @@ void emit_global_input_files(const AbcConfig &config)
 			fprintf(f, "%d %d.00 1.00\n", i+1, config.lut_costs.at(i));
 		fclose(f);
 	} else {
-		auto &cell_cost = cmos_cost ? CellCosts::cmos_gate_cost() : CellCosts::default_gate_cost();
+		auto &cell_cost = config.cmos_cost ? CellCosts::cmos_gate_cost() : CellCosts::default_gate_cost();
 
 		std::string buffer = stringf("%s/stdcells.genlib", config.global_tempdir_name.c_str());
 		FILE *f = fopen(buffer.c_str(), "wt");
@@ -1392,39 +1389,39 @@ void emit_global_input_files(const AbcConfig &config)
 		fprintf(f, "GATE ONE     1 Y=CONST1;\n");
 		fprintf(f, "GATE BUF    %d Y=A;                  PIN * NONINV  1 999 1 0 1 0\n", cell_cost.at(ID($_BUF_)));
 		fprintf(f, "GATE NOT    %d Y=!A;                 PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_NOT_)));
-		if (enabled_gates.count("AND"))
+		if (config.enabled_gates.count("AND"))
 			fprintf(f, "GATE AND    %d Y=A*B;                PIN * NONINV  1 999 1 0 1 0\n", cell_cost.at(ID($_AND_)));
-		if (enabled_gates.count("NAND"))
+		if (config.enabled_gates.count("NAND"))
 			fprintf(f, "GATE NAND   %d Y=!(A*B);             PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_NAND_)));
-		if (enabled_gates.count("OR"))
+		if (config.enabled_gates.count("OR"))
 			fprintf(f, "GATE OR     %d Y=A+B;                PIN * NONINV  1 999 1 0 1 0\n", cell_cost.at(ID($_OR_)));
-		if (enabled_gates.count("NOR"))
+		if (config.enabled_gates.count("NOR"))
 			fprintf(f, "GATE NOR    %d Y=!(A+B);             PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_NOR_)));
-		if (enabled_gates.count("XOR"))
+		if (config.enabled_gates.count("XOR"))
 			fprintf(f, "GATE XOR    %d Y=(A*!B)+(!A*B);      PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_XOR_)));
-		if (enabled_gates.count("XNOR"))
+		if (config.enabled_gates.count("XNOR"))
 			fprintf(f, "GATE XNOR   %d Y=(A*B)+(!A*!B);      PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_XNOR_)));
-		if (enabled_gates.count("ANDNOT"))
+		if (config.enabled_gates.count("ANDNOT"))
 			fprintf(f, "GATE ANDNOT %d Y=A*!B;               PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_ANDNOT_)));
-		if (enabled_gates.count("ORNOT"))
+		if (config.enabled_gates.count("ORNOT"))
 			fprintf(f, "GATE ORNOT  %d Y=A+!B;               PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_ORNOT_)));
-		if (enabled_gates.count("AOI3"))
+		if (config.enabled_gates.count("AOI3"))
 			fprintf(f, "GATE AOI3   %d Y=!((A*B)+C);         PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_AOI3_)));
-		if (enabled_gates.count("OAI3"))
+		if (config.enabled_gates.count("OAI3"))
 			fprintf(f, "GATE OAI3   %d Y=!((A+B)*C);         PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_OAI3_)));
-		if (enabled_gates.count("AOI4"))
+		if (config.enabled_gates.count("AOI4"))
 			fprintf(f, "GATE AOI4   %d Y=!((A*B)+(C*D));     PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_AOI4_)));
-		if (enabled_gates.count("OAI4"))
+		if (config.enabled_gates.count("OAI4"))
 			fprintf(f, "GATE OAI4   %d Y=!((A+B)*(C+D));     PIN * INV     1 999 1 0 1 0\n", cell_cost.at(ID($_OAI4_)));
-		if (enabled_gates.count("MUX"))
+		if (config.enabled_gates.count("MUX"))
 			fprintf(f, "GATE MUX    %d Y=(A*B)+(S*B)+(!S*A); PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_MUX_)));
-		if (enabled_gates.count("NMUX"))
+		if (config.enabled_gates.count("NMUX"))
 			fprintf(f, "GATE NMUX   %d Y=!((A*B)+(S*B)+(!S*A)); PIN * UNKNOWN 1 999 1 0 1 0\n", cell_cost.at(ID($_NMUX_)));
-		if (map_mux4)
+		if (config.map_mux4)
 			fprintf(f, "GATE MUX4   %d Y=(!S*!T*A)+(S*!T*B)+(!S*T*C)+(S*T*D); PIN * UNKNOWN 1 999 1 0 1 0\n", 2*cell_cost.at(ID($_MUX_)));
-		if (map_mux8)
+		if (config.map_mux8)
 			fprintf(f, "GATE MUX8   %d Y=(!S*!T*!U*A)+(S*!T*!U*B)+(!S*T*!U*C)+(S*T*!U*D)+(!S*!T*U*E)+(S*!T*U*F)+(!S*T*U*G)+(S*T*U*H); PIN * UNKNOWN 1 999 1 0 1 0\n", 4*cell_cost.at(ID($_MUX_)));
-		if (map_mux16)
+		if (config.map_mux16)
 			fprintf(f, "GATE MUX16  %d Y=(!S*!T*!U*!V*A)+(S*!T*!U*!V*B)+(!S*T*!U*!V*C)+(S*T*!U*!V*D)+(!S*!T*U*!V*E)+(S*!T*U*!V*F)+(!S*T*U*!V*G)+(S*T*U*!V*H)+(!S*!T*!U*V*I)+(S*!T*!U*V*J)+(!S*T*!U*V*K)+(S*T*!U*V*L)+(!S*!T*U*V*M)+(S*!T*U*V*N)+(!S*T*U*V*O)+(S*T*U*V*P); PIN * UNKNOWN 1 999 1 0 1 0\n", 8*cell_cost.at(ID($_MUX_)));
 		fclose(f);
 	}
@@ -1456,6 +1453,7 @@ void AbcModuleState::extract(AbcSigMap &assign_map, RTLIL::Design *design, RTLIL
 	RTLIL::Module *mapped_mod = mapped_design->module(ID(netlist));
 	if (mapped_mod == nullptr)
 		log_error("ABC output file does not contain a module `netlist'.\n");
+	bool markgroups = run_abc.config.markgroups;
 	for (auto w : mapped_mod->wires()) {
 		RTLIL::Wire *orig_wire = nullptr;
 		RTLIL::Wire *wire = module->addWire(remap_name(w->name, &orig_wire));
@@ -1998,9 +1996,9 @@ struct AbcPass : public Pass {
 		lut_arg = design->scratchpad_get_string("abc.lut", lut_arg);
 		luts_arg = design->scratchpad_get_string("abc.luts", luts_arg);
 		config.sop_mode = design->scratchpad_get_bool("abc.sop", false);
-		map_mux4 = design->scratchpad_get_bool("abc.mux4", map_mux4);
-		map_mux8 = design->scratchpad_get_bool("abc.mux8", map_mux8);
-		map_mux16 = design->scratchpad_get_bool("abc.mux16", map_mux16);
+		config.map_mux4 = design->scratchpad_get_bool("abc.mux4", false);
+		config.map_mux8 = design->scratchpad_get_bool("abc.mux8", false);
+		config.map_mux16 = design->scratchpad_get_bool("abc.mux16", false);
 		config.abc_dress = design->scratchpad_get_bool("abc.dress", false);
 		g_arg = design->scratchpad_get_string("abc.g", g_arg);
 
@@ -2014,7 +2012,7 @@ struct AbcPass : public Pass {
 		config.keepff = design->scratchpad_get_bool("abc.keepff", false);
 		config.cleanup = !design->scratchpad_get_bool("abc.nocleanup", false);
 		config.show_tempdir = design->scratchpad_get_bool("abc.showtmp", false);
-		markgroups = design->scratchpad_get_bool("abc.markgroups", markgroups);
+		config.markgroups = design->scratchpad_get_bool("abc.markgroups", false);
 
 		if (config.cleanup)
 			config.global_tempdir_name = get_base_tmpdir() + "/";
@@ -2094,15 +2092,15 @@ struct AbcPass : public Pass {
 				continue;
 			}
 			if (arg == "-mux4") {
-				map_mux4 = true;
+				config.map_mux4 = true;
 				continue;
 			}
 			if (arg == "-mux8") {
-				map_mux8 = true;
+				config.map_mux8 = true;
 				continue;
 			}
 			if (arg == "-mux16") {
-				map_mux16 = true;
+				config.map_mux16 = true;
 				continue;
 			}
 			if (arg == "-dress") {
@@ -2143,7 +2141,7 @@ struct AbcPass : public Pass {
 				continue;
 			}
 			if (arg == "-markgroups") {
-				markgroups = true;
+				config.markgroups = true;
 				continue;
 			}
 			break;
@@ -2236,14 +2234,14 @@ struct AbcPass : public Pass {
 				}
 				if (g == "cmos2") {
 					if (!remove_gates)
-						cmos_cost = true;
+						config.cmos_cost = true;
 					gate_list.push_back("NAND");
 					gate_list.push_back("NOR");
 					goto ok_alias;
 				}
 				if (g == "cmos3") {
 					if (!remove_gates)
-						cmos_cost = true;
+						config.cmos_cost = true;
 					gate_list.push_back("NAND");
 					gate_list.push_back("NOR");
 					gate_list.push_back("AOI3");
@@ -2252,7 +2250,7 @@ struct AbcPass : public Pass {
 				}
 				if (g == "cmos4") {
 					if (!remove_gates)
-						cmos_cost = true;
+						config.cmos_cost = true;
 					gate_list.push_back("NAND");
 					gate_list.push_back("NOR");
 					gate_list.push_back("AOI3");
@@ -2263,7 +2261,7 @@ struct AbcPass : public Pass {
 				}
 				if (g == "cmos") {
 					if (!remove_gates)
-						cmos_cost = true;
+						config.cmos_cost = true;
 					gate_list.push_back("NAND");
 					gate_list.push_back("NOR");
 					gate_list.push_back("AOI3");
@@ -2322,9 +2320,9 @@ struct AbcPass : public Pass {
 			ok_alias:
 				for (auto gate : gate_list) {
 					if (remove_gates)
-						enabled_gates.erase(gate);
+						config.enabled_gates.erase(gate);
 					else
-						enabled_gates.insert(gate);
+						config.enabled_gates.insert(gate);
 				}
 			}
 		}
@@ -2334,21 +2332,21 @@ struct AbcPass : public Pass {
 		if (!config.constr_file.empty() && (config.liberty_files.empty() && config.genlib_files.empty()))
 			log_cmd_error("Got -constr but no -liberty/-genlib!\n");
 
-		if (enabled_gates.empty()) {
-			enabled_gates.insert("AND");
-			enabled_gates.insert("NAND");
-			enabled_gates.insert("OR");
-			enabled_gates.insert("NOR");
-			enabled_gates.insert("XOR");
-			enabled_gates.insert("XNOR");
-			enabled_gates.insert("ANDNOT");
-			enabled_gates.insert("ORNOT");
-			// enabled_gates.insert("AOI3");
-			// enabled_gates.insert("OAI3");
-			// enabled_gates.insert("AOI4");
-			// enabled_gates.insert("OAI4");
-			enabled_gates.insert("MUX");
-			// enabled_gates.insert("NMUX");
+		if (config.enabled_gates.empty()) {
+			config.enabled_gates.insert("AND");
+			config.enabled_gates.insert("NAND");
+			config.enabled_gates.insert("OR");
+			config.enabled_gates.insert("NOR");
+			config.enabled_gates.insert("XOR");
+			config.enabled_gates.insert("XNOR");
+			config.enabled_gates.insert("ANDNOT");
+			config.enabled_gates.insert("ORNOT");
+			// config.enabled_gates.insert("AOI3");
+			// config.enabled_gates.insert("OAI3");
+			// config.enabled_gates.insert("AOI4");
+			// config.enabled_gates.insert("OAI4");
+			config.enabled_gates.insert("MUX");
+			// config.enabled_gates.insert("NMUX");
 		}
 
 		emit_global_input_files(config);
diff --git a/tests/techmap/abc_state.ys b/tests/techmap/abc_state.ys
new file mode 100644
index 000000000..bc2a744f5
--- /dev/null
+++ b/tests/techmap/abc_state.ys
@@ -0,0 +1,26 @@
+read_verilog <<EOT
+module simple(I1, I2, O);
+	input wire I1;
+	input wire I2;
+	output wire O;
+
+	assign O = I1 | I2;
+endmodule
+EOT
+abc -g all
+
+design -reset
+read_verilog <<EOT
+module simple(I1, I2, O);
+	input wire I1;
+	input wire I2;
+	output wire O;
+
+	assign O = I1 | I2;
+endmodule
+EOT
+techmap
+abc -g AND
+
+select -assert-count 0 t:$_OR_
+select -assert-count 1 t:$_AND_

From 3d5b1e0a93a2b7ce690b707e6ed3abd543677afe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Nov 2025 00:24:21 +0000
Subject: [PATCH 768/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 685fec40e..93091bd6d 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+132
+YOSYS_VER := 0.58+138
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 75ce33c7b25c602027e3e741c77ef20deaf1cb1a Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 6 Nov 2025 09:54:47 +0100
Subject: [PATCH 769/931] Update ABC

---
 abc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abc b/abc
index fa186342b..1c5ed1ce3 160000
--- a/abc
+++ b/abc
@@ -1 +1 @@
-Subproject commit fa186342baefea06e7c2aa13fe51f338ffc84912
+Subproject commit 1c5ed1ce378cc04beac30bb31abc4c37c8467042

From fdcc4c1507392f722014c77c5847e63113508666 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 6 Nov 2025 13:30:09 +0100
Subject: [PATCH 770/931] libparse: remove leftover comments

---
 passes/techmap/libparse.cc | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index 2d3f1792a..9e2556891 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -676,23 +676,18 @@ LibertyAst *LibertyParser::parse(bool top_level)
 					tok = lexer(str);
 				} else {
 					// Hack for when an expression string is unquoted
-					// std::cout << "consume_wrecked_str from :\n";
-					// std::cout << " weh " << str << "\n";
 					tok = consume_wrecked_str(tok, ast->value);
 				}
 			} else if (tok == '(') {
 				// Hack for when an expression string is unquoted and starts with
 				// parentheses
-				// tok = '';
-				// ast->value = "(";
-				// std::cout << "consume_wrecked_str from (\n";
 				tok = consume_wrecked_str(tok, ast->value);
 			}
 			while (tok == '+' || tok == '-' || tok == '*' || tok == '/' || tok == '!') {
 				ast->value += tok;
 				tok = lexer(str);
 				if (tok != 'v')
-					error("one");
+					error();
 				ast->value += str;
 				tok = lexer(str);
 			}
@@ -704,7 +699,7 @@ LibertyAst *LibertyParser::parse(bool top_level)
 			if ((tok == ';') || (tok == 'n'))
 				break;
 			else
-				error("two");
+				error();
 			continue;
 		}
 

From 2bf7aac9d12d79695d858fb6590adeb35f0691fe Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 6 Nov 2025 13:59:14 +0100
Subject: [PATCH 771/931] Makefile: clean unit test on clean, ensure prepared
 to fix parallelism

---
 Makefile            | 2 +-
 tests/unit/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 93091bd6d..7ee59bb79 100644
--- a/Makefile
+++ b/Makefile
@@ -1135,7 +1135,7 @@ DOC_TARGET ?= html
 docs: docs/prep
 	$(Q) $(MAKE) -C docs $(DOC_TARGET)
 
-clean: clean-py
+clean: clean-py clean-unit-test
 	rm -rf share
 	rm -f $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS) $(EXTRA_OBJS)
 	rm -f kernel/version_*.o kernel/version_*.cc
diff --git a/tests/unit/Makefile b/tests/unit/Makefile
index eee60ef9f..b275d7f41 100644
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
@@ -30,11 +30,11 @@ TESTS := $(addprefix $(BINTEST)/, $(basename $(ALLTESTFILE:%Test.cc=%Test.o)))
 
 all: prepare $(TESTS) run-tests
 
-$(BINTEST)/%: $(OBJTEST)/%.o
+$(BINTEST)/%: $(OBJTEST)/%.o | prepare
 	$(CXX) -L$(ROOTPATH) $(RPATH) $(LINKFLAGS) -o $@ $^ $(LIBS) \
 		$(GTEST_LDFLAGS) $(EXTRAFLAGS)
 
-$(OBJTEST)/%.o: $(basename $(subst $(OBJTEST),.,%)).cc
+$(OBJTEST)/%.o: $(basename $(subst $(OBJTEST),.,%)).cc | prepare
 	$(CXX) -o $@ -c -I$(ROOTPATH) $(CPPFLAGS) $(CXXFLAGS) $(GTEST_CXXFLAGS) $^
 
 .PHONY: prepare run-tests clean

From dc9a78702500ba180d28104886e28255bcfbb646 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 6 Nov 2025 14:28:28 +0100
Subject: [PATCH 772/931] Fix out of tree clean

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7ee59bb79..fced3c4ae 100644
--- a/Makefile
+++ b/Makefile
@@ -95,14 +95,14 @@ TARGETS = $(PROGRAM_PREFIX)yosys$(EXE) $(PROGRAM_PREFIX)yosys-config
 PRETTY = 1
 SMALL = 0
 
-# Unit test
-UNITESTPATH := tests/unit
-
 all: top-all
 
 YOSYS_SRC := $(dir $(firstword $(MAKEFILE_LIST)))
 VPATH := $(YOSYS_SRC)
 
+# Unit test
+UNITESTPATH := $(YOSYS_SRC)/tests/unit
+
 export CXXSTD ?= c++17
 CXXFLAGS := $(CXXFLAGS) -Wall -Wextra -ggdb -I. -I"$(YOSYS_SRC)" -MD -MP -D_YOSYS_ -fPIC -I$(PREFIX)/include
 LIBS := $(LIBS) -lstdc++ -lm
@@ -1150,7 +1150,7 @@ clean: clean-py clean-unit-test
 	rm -f tests/svinterfaces/*.log_stdout tests/svinterfaces/*.log_stderr tests/svinterfaces/dut_result.txt tests/svinterfaces/reference_result.txt tests/svinterfaces/a.out tests/svinterfaces/*_syn.v tests/svinterfaces/*.diff
 	rm -f  tests/tools/cmp_tbdata
 	rm -f $(addsuffix /run-test.mk,$(MK_TEST_DIRS))
-	-$(MAKE) -C docs clean
+	-$(MAKE) -C $(YOSYS_SRC)/docs clean
 	rm -rf docs/util/__pycache__
 	rm -f libyosys.so
 
@@ -1162,7 +1162,7 @@ clean-py:
 	rm -rf kernel/*.pyh
 
 clean-abc:
-	$(MAKE) -C abc DEP= clean
+	$(MAKE) -C $(YOSYS_SRC)/abc DEP= clean
 	rm -f $(PROGRAM_PREFIX)yosys-abc$(EXE) $(PROGRAM_PREFIX)yosys-libabc.a abc/abc-[0-9a-f]* abc/libabc-[0-9a-f]*.a .git-abc-submodule-hash
 
 mrproper: clean

From 7d10a724903749001d6ecb3e4b723d7f2bbd4a2e Mon Sep 17 00:00:00 2001
From: Anhijkt <mihail.ershov.zp@gmail.com>
Date: Thu, 6 Nov 2025 23:29:47 +0200
Subject: [PATCH 773/931] fsm_detect: add adff detection

---
 passes/fsm/fsm_detect.cc  |  11 +++-
 tests/various/fsm-arst.ys | 133 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+), 2 deletions(-)
 create mode 100644 tests/various/fsm-arst.ys

diff --git a/passes/fsm/fsm_detect.cc b/passes/fsm/fsm_detect.cc
index 9cffbf95a..5f491a16c 100644
--- a/passes/fsm/fsm_detect.cc
+++ b/passes/fsm/fsm_detect.cc
@@ -199,8 +199,15 @@ static void detect_fsm(RTLIL::Wire *wire, bool ignore_self_reset=false)
 		}
 
 		SigSpec sig_y = sig_d, sig_undef;
-		if (!ignore_self_reset && ce.eval(sig_y, sig_undef))
-			is_self_resetting = true;
+		if (!ignore_self_reset) {
+			if (cellport.first->type == ID($adff)) {
+				SigSpec sig_arst = assign_map(cellport.first->getPort(ID::ARST));
+				if (ce.eval(sig_arst, sig_undef))
+					is_self_resetting = true;
+			}
+			else if (ce.eval(sig_y, sig_undef))
+				is_self_resetting = true;
+		}
 	}
 
 	if (has_fsm_encoding_attr)
diff --git a/tests/various/fsm-arst.ys b/tests/various/fsm-arst.ys
new file mode 100644
index 000000000..2cfca1d57
--- /dev/null
+++ b/tests/various/fsm-arst.ys
@@ -0,0 +1,133 @@
+read_verilog << EOT
+module non_self_rs_fsm (
+    input  wire clk,
+    input  wire reset,
+    output wire s1
+);
+    localparam [7:0] RST = 8'b10010010;
+    localparam [7:0] S1 = 8'b01001000;
+    localparam [7:0] S2 = 8'b11000111;
+
+    reg [7:0] current_state, next_state;
+    always @(posedge clk or posedge reset) begin
+        if (reset) begin
+            current_state <= RST;
+        end else begin
+            current_state <= next_state;
+        end
+    end
+
+    always @(*) begin
+        next_state = current_state;
+
+        case (current_state)
+            RST: next_state = S1;
+            S1: next_state = S2;
+            S2: next_state = S1;
+            default: next_state = RST;
+        endcase
+    end
+
+    assign s1 = next_state == S1;
+endmodule
+
+module semi_self_rs_fsm (
+    input  wire clk,
+    inout  wire reset,
+    input wire test,
+    output wire s1
+);
+    localparam [7:0] RST = 8'b10010010;
+    localparam [7:0] S1 = 8'b01001000;
+    localparam [7:0] S2 = 8'b11000111;
+
+    reg [7:0] current_state, next_state;
+    reg [1:0] reset_test;
+
+    assign reset = (test || (reset_test == 2));
+
+    always @(posedge clk or posedge reset) begin
+        if (reset) begin
+            current_state <= RST;
+            reset_test <= 0;
+        end else begin
+            current_state <= next_state;
+            if (current_state == S2)
+                reset_test = reset_test + 1;
+        end
+    end
+    
+
+    always @(*) begin
+        next_state = current_state;
+
+        case (current_state)
+            RST: next_state = S1;
+            S2: next_state = S1;
+            S1: next_state = S2;
+
+            default: next_state = RST;
+        endcase
+    end
+
+    assign s1 = next_state == S1;
+endmodule
+
+module self_rs_fsm (
+    input  wire clk,
+    inout  wire reset,
+    output wire s1
+);
+    localparam [7:0] RST = 8'b10010010;
+    localparam [7:0] S1 = 8'b01001000;
+    localparam [7:0] S2 = 8'b11000111;
+
+    reg [7:0] current_state, next_state;
+    reg reset_reg;
+
+    wire reset = (reset_reg || next_state == S1);
+    always @(posedge clk or posedge reset) begin
+        if (reset) begin
+            current_state <= RST;
+            reset_reg = 0;
+        end else begin
+            current_state <= next_state;
+        end
+    end
+
+    always @(*) begin
+        next_state = current_state;
+
+        case (current_state)
+            RST: next_state = S1;
+            S1: next_state = S2;
+            S2: next_state = S1;
+            default: begin 
+                reset_reg = 1;
+                next_state = RST;
+            end
+        endcase
+    end
+
+    assign s1 = next_state == S1;
+endmodule
+
+EOT
+
+proc
+opt_expr
+opt_clean
+check
+opt -nodffe -nosdff
+
+fsm_detect 
+fsm_extract
+
+cd non_self_rs_fsm
+select -assert-count 1 t:$fsm
+
+cd semi_self_rs_fsm
+select -assert-count 1 t:$fsm
+
+cd self_rs_fsm
+select -assert-none t:$fsm

From 5d0847f6fbef980914134a6a98b2397ecb0a3189 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 7 Nov 2025 00:24:35 +0000
Subject: [PATCH 774/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fced3c4ae..dd7a8c022 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+138
+YOSYS_VER := 0.58+162
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From a5cc905184f3a8112063742a13653a8be148a51b Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 7 Nov 2025 15:52:24 +1300
Subject: [PATCH 775/931] simplify.cc: Fix unsized const in params

---
 frontends/ast/simplify.cc        | 10 +++++++---
 tests/verilog/unbased_unsized.sv |  9 +++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 97abf7452..330e9ef12 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -2231,9 +2231,13 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 			}
 			if (children[0]->type == AST_CONSTANT) {
 				if (width != int(children[0]->bits.size())) {
-					RTLIL::SigSpec sig(children[0]->bits);
-					sig.extend_u0(width, children[0]->is_signed);
-					children[0] = mkconst_bits(location, sig.as_const().to_bits(), is_signed);
+					RTLIL::Const val;
+					if (children[0]->is_unsized) {
+						val = children[0]->bitsAsUnsizedConst(width);
+					} else {
+						val = children[0]->bitsAsConst(width);
+					}
+					children[0] = mkconst_bits(location, val.to_bits(), is_signed);
 					fixup_hierarchy_flags();
 				}
 				children[0]->is_signed = is_signed;
diff --git a/tests/verilog/unbased_unsized.sv b/tests/verilog/unbased_unsized.sv
index 1d0c5a72c..af932cb74 100644
--- a/tests/verilog/unbased_unsized.sv
+++ b/tests/verilog/unbased_unsized.sv
@@ -6,6 +6,11 @@ module pass_through(
 endmodule
 
 module top;
+    localparam logic [63:0]
+        l01 = '0,
+        l02 = '1,
+        l03 = 'x,
+        l04 = 'z;
     logic [63:0]
         o01, o02, o03, o04,
         o05, o06, o07, o08,
@@ -36,5 +41,9 @@ module top;
         assert (o10 === {64 {1'b1}});
         assert (o11 === {64 {1'bx}});
         assert (o12 === {64 {1'bz}});
+        assert (l01 === {64 {1'b0}});
+        assert (l02 === {64 {1'b1}});
+        assert (l03 === {64 {1'bx}});
+        assert (l04 === {64 {1'bz}});
     end
 endmodule

From e4c5900acd5caeaaea6f4e3983fe3f2ad6ba0495 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 7 Nov 2025 17:13:12 +1300
Subject: [PATCH 776/931] tests/verilog: Unsized params in cell

Non-zero case fails with `read_verilog`, but passes with `verific` and `read_slang`.
---
 tests/verilog/unbased_unsized.sv | 16 ++++++++++++++++
 tests/verilog/unbased_unsized.ys |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/tests/verilog/unbased_unsized.sv b/tests/verilog/unbased_unsized.sv
index af932cb74..62f7d41ff 100644
--- a/tests/verilog/unbased_unsized.sv
+++ b/tests/verilog/unbased_unsized.sv
@@ -5,6 +5,14 @@ module pass_through(
     assign out = inp;
 endmodule
 
+module set_param #(
+    parameter logic [63:0] VALUE
+) (
+    output logic [63:0] out
+);
+    assign out = VALUE;
+endmodule
+
 module top;
     localparam logic [63:0]
         l01 = '0,
@@ -28,6 +36,10 @@ module top;
     pass_through pt10('1, o10);
     pass_through pt11('x, o11);
     pass_through pt12('z, o12);
+    set_param #('0) sp13(o13);
+    set_param #('1) sp14(o14);
+    set_param #('x) sp15(o15);
+    set_param #('z) sp16(o16);
     always @* begin
         assert (o01 === {64 {1'b0}});
         assert (o02 === {64 {1'b1}});
@@ -45,5 +57,9 @@ module top;
         assert (l02 === {64 {1'b1}});
         assert (l03 === {64 {1'bx}});
         assert (l04 === {64 {1'bz}});
+        assert (o13 === {64 {1'b0}});
+        assert (o14 === {64 {1'b1}});
+        assert (o15 === {64 {1'bx}});
+        assert (o16 === {64 {1'bz}});
     end
 endmodule
diff --git a/tests/verilog/unbased_unsized.ys b/tests/verilog/unbased_unsized.ys
index 3290650d5..851866140 100644
--- a/tests/verilog/unbased_unsized.ys
+++ b/tests/verilog/unbased_unsized.ys
@@ -1,5 +1,5 @@
 read_verilog -sv unbased_unsized.sv
-hierarchy
+hierarchy -top top
 proc
 flatten
 opt -full

From 7302bf9a66b5b7635403cc4f59575b0e2899d414 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 7 Nov 2025 17:45:07 +1300
Subject: [PATCH 777/931] Add CONST_FLAG_UNSIZED

In order to support unsized constants being used as parameters, the `const` struct needs to know if it is unsized (so that the parameter can be used to set the size).
Add unsized flag to param value serialization and rtlil back-/front-end.
Add cell params to `tests/rtlil/everything.v`.
---
 backends/rtlil/rtlil_backend.cc   |  7 +++++--
 frontends/ast/ast.cc              |  9 +++++++--
 frontends/rtlil/rtlil_frontend.cc |  5 +++++
 kernel/rtlil.h                    |  9 +++++----
 tests/rtlil/everything.v          | 17 +++++++++++++++++
 5 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/backends/rtlil/rtlil_backend.cc b/backends/rtlil/rtlil_backend.cc
index d607be837..63f64d12d 100644
--- a/backends/rtlil/rtlil_backend.cc
+++ b/backends/rtlil/rtlil_backend.cc
@@ -61,7 +61,9 @@ void RTLIL_BACKEND::dump_const(std::ostream &f, const RTLIL::Const &data, int wi
 				return;
 			}
 		}
-		f << stringf("%d'", width);
+		if ((data.flags & RTLIL::CONST_FLAG_UNSIZED) == 0) {
+			f << stringf("%d'", width);
+		}
 		if (data.flags & RTLIL::CONST_FLAG_SIGNED) {
 			f << stringf("s");
 		}
@@ -172,9 +174,10 @@ void RTLIL_BACKEND::dump_cell(std::ostream &f, std::string indent, const RTLIL::
 	dump_attributes(f, indent, cell);
 	f << stringf("%s" "cell %s %s\n", indent, cell->type, cell->name);
 	for (const auto& [name, param] : reversed(cell->parameters)) {
-		f << stringf("%s  parameter%s%s %s ", indent,
+		f << stringf("%s  parameter%s%s%s %s ", indent,
 				(param.flags & RTLIL::CONST_FLAG_SIGNED) != 0 ? " signed" : "",
 				(param.flags & RTLIL::CONST_FLAG_REAL) != 0 ? " real" : "",
+				(param.flags & RTLIL::CONST_FLAG_UNSIZED) != 0 ? " unsized" : "",
 				name);
 		dump_const(f, param);
 		f << stringf("\n");
diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index 4a16abee9..984c4294c 100644
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -993,6 +993,8 @@ RTLIL::Const AstNode::asParaConst() const
 	RTLIL::Const val = asAttrConst();
 	if (is_signed)
 		val.flags |= RTLIL::CONST_FLAG_SIGNED;
+	if (is_unsized)
+		val.flags |= RTLIL::CONST_FLAG_UNSIZED;
 	return val;
 }
 
@@ -1766,7 +1768,10 @@ static std::string serialize_param_value(const RTLIL::Const &val) {
 		res.push_back('s');
 	if (val.flags & RTLIL::ConstFlags::CONST_FLAG_REAL)
 		res.push_back('r');
-	res += stringf("%d", GetSize(val));
+	if (val.flags & RTLIL::ConstFlags::CONST_FLAG_UNSIZED)
+		res.push_back('u');
+	else
+		res += stringf("%d", GetSize(val));
 	res.push_back('\'');
 	res.append(val.as_string("?"));
 	return res;
@@ -1860,7 +1865,7 @@ std::string AstModule::derive_common(RTLIL::Design *design, const dict<RTLIL::Id
 		} else if ((it->second.flags & RTLIL::CONST_FLAG_STRING) != 0)
 			child->children[0] = AstNode::mkconst_str(loc, it->second.decode_string());
 		else
-			child->children[0] = AstNode::mkconst_bits(loc, it->second.to_bits(), (it->second.flags & RTLIL::CONST_FLAG_SIGNED) != 0);
+			child->children[0] = AstNode::mkconst_bits(loc, it->second.to_bits(), (it->second.flags & RTLIL::CONST_FLAG_SIGNED) != 0, (it->second.flags & RTLIL::CONST_FLAG_UNSIZED) != 0);
 		rewritten.insert(it->first);
 	}
 
diff --git a/frontends/rtlil/rtlil_frontend.cc b/frontends/rtlil/rtlil_frontend.cc
index 04d01fc93..271962725 100644
--- a/frontends/rtlil/rtlil_frontend.cc
+++ b/frontends/rtlil/rtlil_frontend.cc
@@ -567,10 +567,13 @@ struct RTLILFrontendWorker {
 			if (try_parse_keyword("parameter")) {
 				bool is_signed = false;
 				bool is_real = false;
+				bool is_unsized = false;
 				if (try_parse_keyword("signed")) {
 					is_signed = true;
 				} else if (try_parse_keyword("real")) {
 					is_real = true;
+				} else if (try_parse_keyword("unsized")) {
+					is_unsized = true;
 				}
 				RTLIL::IdString param_name = parse_id();
 				RTLIL::Const val = parse_const();
@@ -578,6 +581,8 @@ struct RTLILFrontendWorker {
 					val.flags |= RTLIL::CONST_FLAG_SIGNED;
 				if (is_real)
 					val.flags |= RTLIL::CONST_FLAG_REAL;
+				if (is_unsized)
+					val.flags |= RTLIL::CONST_FLAG_UNSIZED;
 				cell->parameters.insert({std::move(param_name), std::move(val)});
 				expect_eol();
 			} else if (try_parse_keyword("connect")) {
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 7e699b365..85ae70ef4 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -53,10 +53,11 @@ namespace RTLIL
 	// Semantic metadata - how can this constant be interpreted?
 	// Values may be generally non-exclusive
 	enum ConstFlags : unsigned char {
-		CONST_FLAG_NONE   = 0,
-		CONST_FLAG_STRING = 1,
-		CONST_FLAG_SIGNED = 2,  // only used for parameters
-		CONST_FLAG_REAL   = 4   // only used for parameters
+		CONST_FLAG_NONE    = 0,
+		CONST_FLAG_STRING  = 1,
+		CONST_FLAG_SIGNED  = 2,  // only used for parameters
+		CONST_FLAG_REAL    = 4,  // only used for parameters
+		CONST_FLAG_UNSIZED = 8,  // only used for parameters
 	};
 
 	enum SelectPartials : unsigned char {
diff --git a/tests/rtlil/everything.v b/tests/rtlil/everything.v
index 666d630c2..c4f8c348a 100644
--- a/tests/rtlil/everything.v
+++ b/tests/rtlil/everything.v
@@ -38,3 +38,20 @@ module foo(
     assign b = bb;
     assign y = a + bb;
 endmodule
+
+module set_param #(
+    parameter [3:0] VALUE = 1'bx
+) (
+    output logic [3:0] out
+);
+    assign out = VALUE;
+endmodule
+
+module use_param (
+    output logic [3:0] a, b, c, d
+);
+    set_param #($signed(1)) spa (a);
+    set_param #('1) spb (b);
+    set_param #(1.1) spc (c);
+    set_param #(1'b1) spd (d);
+endmodule

From 8d4f790951b237eeb4871f719d4f72ab385797ec Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 27 Oct 2025 12:41:50 +0000
Subject: [PATCH 778/931] Make Module stop accessing internals of SigSpec

---
 kernel/rtlil.cc | 25 +++++++++++++++----------
 kernel/rtlil.h  |  6 ++----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index adfda7d5f..1d0d45197 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -2657,10 +2657,9 @@ void RTLIL::Module::cloneInto(RTLIL::Module *new_mod) const
 		RTLIL::Module *mod;
 		void operator()(RTLIL::SigSpec &sig)
 		{
-			sig.pack();
-			for (auto &c : sig.chunks_)
-				if (c.wire != NULL)
-					c.wire = mod->wires_.at(c.wire->name);
+			sig.rewrite_wires([this](RTLIL::Wire *&wire) {
+				wire = mod->wires_.at(wire->name);
+			});
 		}
 	};
 
@@ -2808,12 +2807,10 @@ void RTLIL::Module::remove(const pool<RTLIL::Wire*> &wires)
 		const pool<RTLIL::Wire*> *wires_p;
 
 		void operator()(RTLIL::SigSpec &sig) {
-			sig.pack();
-			for (auto &c : sig.chunks_)
-				if (c.wire != NULL && wires_p->count(c.wire)) {
-					c.wire = module->addWire(stringf("$delete_wire$%d", autoidx++), c.width);
-					c.offset = 0;
-				}
+			sig.rewrite_wires([this](RTLIL::Wire *&wire) {
+				if (wires_p->count(wire))
+					wire = module->addWire(stringf("$delete_wire$%d", autoidx++), wire->width);
+			});
 		}
 
 		void operator()(RTLIL::SigSpec &lhs, RTLIL::SigSpec &rhs) {
@@ -5159,6 +5156,14 @@ RTLIL::SigSpec RTLIL::SigSpec::extract(int offset, int length) const
 	}
 }
 
+void RTLIL::SigSpec::rewrite_wires(std::function<void(RTLIL::Wire*& wire)> rewrite)
+{
+	pack();
+	for (RTLIL::SigChunk &chunk : chunks_)
+		if (chunk.wire != nullptr)
+			rewrite(chunk.wire);
+}
+
 void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
 {
 	if (signal.width_ == 0)
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 7e699b365..77b434e1d 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1252,10 +1252,6 @@ private:
 			unpack();
 	}
 
-	// Only used by Module::remove(const pool<Wire*> &wires)
-	// but cannot be more specific as it isn't yet declared
-	friend struct RTLIL::Module;
-
 public:
 	SigSpec() : width_(0), hash_(0) {}
 	SigSpec(std::initializer_list<RTLIL::SigSpec> parts);
@@ -1327,6 +1323,8 @@ public:
 	RTLIL::SigSpec extract(int offset, int length = 1) const;
 	RTLIL::SigSpec extract_end(int offset) const { return extract(offset, width_ - offset); }
 
+	void rewrite_wires(std::function<void(RTLIL::Wire*& wire)> rewrite);
+
 	RTLIL::SigBit lsb() const { log_assert(width_); return (*this)[0]; };
 	RTLIL::SigBit msb() const { log_assert(width_); return (*this)[width_ - 1]; };
 

From 3f7af10edae8d4a5b633b984a4b30bac33cd540f Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 27 Oct 2025 15:46:36 +0000
Subject: [PATCH 779/931] Make SigSpec::chunks() return an object that can be
 iterated over without packing the SigSpec

---
 kernel/rtlil.cc            | 25 ++++++++++++
 kernel/rtlil.h             | 80 ++++++++++++++++++++++++++++++++++++--
 passes/cmds/show.cc        |  7 ++--
 passes/techmap/abc9_ops.cc |  4 +-
 4 files changed, 107 insertions(+), 9 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 1d0d45197..0991b9709 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -4656,6 +4656,31 @@ RTLIL::SigSpec::SigSpec(bool bit)
 	check();
 }
 
+void RTLIL::SigSpec::Chunks::const_iterator::next_chunk_bits()
+{
+	int bits_size = GetSize(spec.bits_);
+	if (bit_index >= bits_size)
+		return;
+	int i = bit_index;
+	const SigBit &bit = spec.bits_[i++];
+	chunk.wire = bit.wire;
+	chunk.data.clear();
+	if (bit.is_wire()) {
+		chunk.offset = bit.offset;
+		while (i < bits_size && spec.bits_[i].wire == bit.wire &&
+			spec.bits_[i].offset == bit.offset + i - bit_index)
+			++i;
+	} else {
+		chunk.offset = 0;
+		chunk.data.push_back(bit.data);
+		while (i < bits_size && !spec.bits_[i].is_wire()) {
+			chunk.data.push_back(spec.bits_[i].data);
+			++i;
+		}
+	}
+	chunk.width = i - bit_index;
+}
+
 void RTLIL::SigSpec::pack() const
 {
 	RTLIL::SigSpec *that = (RTLIL::SigSpec*)this;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 77b434e1d..8e93f5f05 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1276,7 +1276,78 @@ public:
 	SigSpec &operator=(const SigSpec &rhs) = default;
 	SigSpec &operator=(SigSpec &&rhs) = default;
 
-	inline const std::vector<RTLIL::SigChunk> &chunks() const { pack(); return chunks_; }
+	struct Chunks {
+		const SigSpec &spec;
+
+		struct const_iterator {
+			using iterator_category = std::forward_iterator_tag;
+			using value_type = const SigChunk &;
+			using difference_type = std::ptrdiff_t;
+			using pointer = const SigChunk *;
+			using reference = const SigChunk &;
+
+			const SigSpec &spec;
+			int chunk_index;
+			int bit_index;
+			SigChunk chunk;
+
+			const_iterator(const SigSpec &spec) : spec(spec) {
+				chunk_index = 0;
+				bit_index = 0;
+				if (!spec.packed())
+					next_chunk_bits();
+			}
+			enum End { END };
+			const_iterator(const SigSpec &spec, End) : spec(spec) {
+				bit_index = spec.size();
+			}
+			void next_chunk_bits();
+
+			const SigChunk &operator*() {
+				if (spec.packed())
+					return spec.chunks_[chunk_index];
+				return chunk;
+			};
+			const SigChunk *operator->() { return &**this; }
+			const_iterator &operator++() {
+				bit_index += (**this).width;
+				++chunk_index;
+				if (!spec.packed())
+					next_chunk_bits();
+				return *this;
+			}
+			bool operator==(const const_iterator &rhs) const { return bit_index == rhs.bit_index; }
+			bool operator!=(const const_iterator &rhs) const { return !(*this == rhs); }
+		};
+		const_iterator begin() const { return const_iterator(spec); }
+		const_iterator end() const {
+			const_iterator it(spec, const_iterator::END);
+			return it;
+		}
+		std::vector<RTLIL::SigChunk>::const_reverse_iterator rbegin() const {
+			spec.pack();
+			return spec.chunks_.rbegin();
+		}
+		std::vector<RTLIL::SigChunk>::const_reverse_iterator rend() const {
+			spec.pack();
+			return spec.chunks_.rend();
+		}
+		int size() const {
+			spec.pack();
+			return spec.chunks_.size();
+		}
+		const SigChunk &at(int index) const {
+			spec.pack();
+			return spec.chunks_.at(index);
+		}
+		operator const std::vector<RTLIL::SigChunk>&() const {
+			spec.pack();
+			return spec.chunks_;
+		}
+	};
+	friend struct Chunks::const_iterator;
+
+	inline Chunks chunks() const { return {*this}; }
 	inline const std::vector<RTLIL::SigBit> &bits() const { inline_unpack(); return bits_; }
 
 	inline int size() const { return width_; }
@@ -1403,7 +1474,7 @@ public:
 	static bool parse_sel(RTLIL::SigSpec &sig, RTLIL::Design *design, RTLIL::Module *module, std::string str);
 	static bool parse_rhs(const RTLIL::SigSpec &lhs, RTLIL::SigSpec &sig, RTLIL::Module *module, std::string str);
 
-	operator std::vector<RTLIL::SigChunk>() const { return chunks(); }
+	operator std::vector<RTLIL::SigChunk>() const { pack(); return chunks_; }
 	operator std::vector<RTLIL::SigBit>() const { return bits(); }
 	const RTLIL::SigBit &at(int offset, const RTLIL::SigBit &defval) { return offset < width_ ? (*this)[offset] : defval; }
 
@@ -2317,8 +2388,9 @@ inline const RTLIL::SigBit &RTLIL::SigSpecConstIterator::operator*() const {
 }
 
 inline RTLIL::SigBit::SigBit(const RTLIL::SigSpec &sig) {
-	log_assert(sig.size() == 1 && sig.chunks().size() == 1);
-	*this = SigBit(sig.chunks().front());
+	log_assert(sig.size() == 1);
+	auto it = sig.chunks().begin();
+	*this = SigBit(*it);
 }
 
 template<typename T>
diff --git a/passes/cmds/show.cc b/passes/cmds/show.cc
index d0d9c0f85..14a251c41 100644
--- a/passes/cmds/show.cc
+++ b/passes/cmds/show.cc
@@ -278,11 +278,12 @@ struct ShowWorker
 			std::vector<std::string> label_pieces;
 			int bitpos = sig.size()-1;
 
-			for (int rep, chunk_idx = ((int) sig.chunks().size()) - 1; chunk_idx >= 0; chunk_idx -= rep) {
-				const RTLIL::SigChunk &c = sig.chunks().at(chunk_idx);
+			RTLIL::SigSpec::Chunks sig_chunks = sig.chunks();
+			for (int rep, chunk_idx = ((int) sig_chunks.size()) - 1; chunk_idx >= 0; chunk_idx -= rep) {
+				const RTLIL::SigChunk &c = sig_chunks.at(chunk_idx);
 
 				// Find the number of times this chunk is repeating
-				for (rep = 1; chunk_idx - rep >= 0 && c == sig.chunks().at(chunk_idx - rep); rep++);
+				for (rep = 1; chunk_idx - rep >= 0 && c == sig_chunks.at(chunk_idx - rep); rep++);
 
 				int cl, cr;
 				cl = c.offset + c.width - 1;
diff --git a/passes/techmap/abc9_ops.cc b/passes/techmap/abc9_ops.cc
index 373d5d15e..8d3869ece 100644
--- a/passes/techmap/abc9_ops.cc
+++ b/passes/techmap/abc9_ops.cc
@@ -1428,13 +1428,13 @@ void reintegrate(RTLIL::Module *module, bool dff_mode)
 	// Copy connections (and rename) from mapped_mod to module
 	for (auto conn : mapped_mod->connections()) {
 		if (!conn.first.is_fully_const()) {
-			auto chunks = conn.first.chunks();
+			std::vector<RTLIL::SigChunk> chunks = conn.first.chunks();
 			for (auto &c : chunks)
 				c.wire = module->wires_.at(remap_name(c.wire->name));
 			conn.first = std::move(chunks);
 		}
 		if (!conn.second.is_fully_const()) {
-			auto chunks = conn.second.chunks();
+			std::vector<RTLIL::SigChunk> chunks = conn.second.chunks();
 			for (auto &c : chunks)
 				if (c.wire)
 					c.wire = module->wires_.at(remap_name(c.wire->name));

From fc7d61132d9c95d6c07ba00b0019cd66797b49b0 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:35:47 +0000
Subject: [PATCH 780/931] Make SigSpec::updhash() use chunk iterator

---
 kernel/rtlil.cc | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 0991b9709..e7330842f 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -4744,10 +4744,9 @@ void RTLIL::SigSpec::updhash() const
 		return;
 
 	cover("kernel.rtlil.sigspec.hash");
-	that->pack();
 
 	Hasher h;
-	for (auto &c : that->chunks_)
+	for (auto &c : that->chunks())
 		if (c.wire == NULL) {
 			for (auto &v : c.data)
 				h.eat(v);
@@ -5201,13 +5200,8 @@ void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
 
 	cover("kernel.rtlil.sigspec.append");
 
-	if (packed() != signal.packed()) {
-		pack();
-		signal.pack();
-	}
-
 	if (packed())
-		for (auto &other_c : signal.chunks_)
+		for (auto &other_c : signal.chunks())
 		{
 			auto &my_last_c = chunks_.back();
 			if (my_last_c.wire == NULL && other_c.wire == NULL) {
@@ -5221,8 +5215,10 @@ void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
 			} else
 				chunks_.push_back(other_c);
 		}
-	else
+	else {
+		signal.unpack();
 		bits_.insert(bits_.end(), signal.bits_.begin(), signal.bits_.end());
+	}
 
 	width_ += signal.width_;
 	check();

From b0ee67a3557568bfd4adc9f254972ba047ac8947 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:36:12 +0000
Subject: [PATCH 781/931] Make SigSpec::is_wire/is_chunk/is_fully_const use
 chunk iterator

---
 kernel/rtlil.cc | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index e7330842f..38b798052 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5409,22 +5409,28 @@ bool RTLIL::SigSpec::is_wire() const
 {
 	cover("kernel.rtlil.sigspec.is_wire");
 
-	pack();
-	return GetSize(chunks_) == 1 && chunks_[0].wire && chunks_[0].wire->width == width_;
+	Chunks cs = chunks();
+	auto it = cs.begin();
+	if (it == cs.end())
+		return false;
+	const RTLIL::SigChunk &chunk = *it;
+	return chunk.wire && chunk.wire->width == width_ && ++it == cs.end();
 }
 
 bool RTLIL::SigSpec::is_chunk() const
 {
 	cover("kernel.rtlil.sigspec.is_chunk");
 
-	pack();
-	return GetSize(chunks_) == 1;
+	Chunks cs = chunks();
+	auto it = cs.begin();
+	if (it == cs.end())
+		return false;
+	return ++it == cs.end();
 }
 
 bool RTLIL::SigSpec::known_driver() const
 {
-	pack();
-	for (auto &chunk : chunks_)
+	for (auto &chunk : chunks())
 		if (chunk.is_wire() && !chunk.wire->known_driver())
 			return false;
 	return true;

From a7ac396fd9f971c240a842d88e5c1162e120ea40 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:36:36 +0000
Subject: [PATCH 782/931] Make is_fully_const use chunk iterator

---
 kernel/rtlil.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 38b798052..d3030831e 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5440,9 +5440,8 @@ bool RTLIL::SigSpec::is_fully_const() const
 {
 	cover("kernel.rtlil.sigspec.is_fully_const");
 
-	pack();
-	for (auto it = chunks_.begin(); it != chunks_.end(); it++)
-		if (it->width > 0 && it->wire != NULL)
+	for (auto &chunk : chunks())
+		if (chunk.width > 0 && chunk.wire != NULL)
 			return false;
 	return true;
 }

From ddd04e13e087167bb3425dc3f256ea78836b18c7 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:36:47 +0000
Subject: [PATCH 783/931] Make SigSpec::is_fully_zero use chunk iterator

---
 kernel/rtlil.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index d3030831e..f91ca821c 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5450,12 +5450,11 @@ bool RTLIL::SigSpec::is_fully_zero() const
 {
 	cover("kernel.rtlil.sigspec.is_fully_zero");
 
-	pack();
-	for (auto it = chunks_.begin(); it != chunks_.end(); it++) {
-		if (it->width > 0 && it->wire != NULL)
+	for (auto &chunk : chunks()) {
+		if (chunk.width > 0 && chunk.wire != NULL)
 			return false;
-		for (size_t i = 0; i < it->data.size(); i++)
-			if (it->data[i] != RTLIL::State::S0)
+		for (RTLIL::State d : chunk.data)
+			if (d != RTLIL::State::S0)
 				return false;
 	}
 	return true;

From 152a487cc8df50b0ef612c24abd614000807d20d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:36:58 +0000
Subject: [PATCH 784/931] Make SigSpec::is_fully_ones use chunk iterator

---
 kernel/rtlil.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index f91ca821c..3183cb7bc 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5464,12 +5464,11 @@ bool RTLIL::SigSpec::is_fully_ones() const
 {
 	cover("kernel.rtlil.sigspec.is_fully_ones");
 
-	pack();
-	for (auto it = chunks_.begin(); it != chunks_.end(); it++) {
-		if (it->width > 0 && it->wire != NULL)
+	for (auto &chunk : chunks()) {
+		if (chunk.width > 0 && chunk.wire != NULL)
 			return false;
-		for (size_t i = 0; i < it->data.size(); i++)
-			if (it->data[i] != RTLIL::State::S1)
+		for (RTLIL::State d : chunk.data)
+			if (d != RTLIL::State::S1)
 				return false;
 	}
 	return true;

From e2defe78982562c09ba9e9a1b19511342dbe9b66 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:37:08 +0000
Subject: [PATCH 785/931] Make SigSpec::is_fully_def use chunk iterator

---
 kernel/rtlil.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 3183cb7bc..9fb8098ba 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5478,12 +5478,11 @@ bool RTLIL::SigSpec::is_fully_def() const
 {
 	cover("kernel.rtlil.sigspec.is_fully_def");
 
-	pack();
-	for (auto it = chunks_.begin(); it != chunks_.end(); it++) {
-		if (it->width > 0 && it->wire != NULL)
+	for (auto &chunk : chunks()) {
+		if (chunk.width > 0 && chunk.wire != NULL)
 			return false;
-		for (size_t i = 0; i < it->data.size(); i++)
-			if (it->data[i] != RTLIL::State::S0 && it->data[i] != RTLIL::State::S1)
+		for (RTLIL::State d : chunk.data)
+			if (d != RTLIL::State::S0 && d != RTLIL::State::S1)
 				return false;
 	}
 	return true;

From 1893c61fe29aae7e31925ba01849e482925adff2 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:37:17 +0000
Subject: [PATCH 786/931] Make SigSpec::is_fully_undef use chunk iterator

---
 kernel/rtlil.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 9fb8098ba..70fd14856 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5492,12 +5492,11 @@ bool RTLIL::SigSpec::is_fully_undef() const
 {
 	cover("kernel.rtlil.sigspec.is_fully_undef");
 
-	pack();
-	for (auto it = chunks_.begin(); it != chunks_.end(); it++) {
-		if (it->width > 0 && it->wire != NULL)
+	for (auto &chunk : chunks()) {
+		if (chunk.width > 0 && chunk.wire != NULL)
 			return false;
-		for (size_t i = 0; i < it->data.size(); i++)
-			if (it->data[i] != RTLIL::State::Sx && it->data[i] != RTLIL::State::Sz)
+		for (RTLIL::State d : chunk.data)
+			if (d != RTLIL::State::Sx && d != RTLIL::State::Sz)
 				return false;
 	}
 	return true;

From ed8022f53faaade7e8f5ebccf5d69f765f2351b0 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:37:38 +0000
Subject: [PATCH 787/931] Make SigSpec::has_const use chunk iterator

---
 kernel/rtlil.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 70fd14856..cfc841b9f 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5506,9 +5506,8 @@ bool RTLIL::SigSpec::has_const() const
 {
 	cover("kernel.rtlil.sigspec.has_const");
 
-	pack();
-	for (auto it = chunks_.begin(); it != chunks_.end(); it++)
-		if (it->width > 0 && it->wire == NULL)
+	for (auto &chunk : chunks())
+		if (chunk.width > 0 && chunk.wire == NULL)
 			return true;
 	return false;
 }

From 80b3efb3dabba0d8ef76b6014f622af943ba0906 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:37:51 +0000
Subject: [PATCH 788/931] Make SigSpec::has_const(State) use chunk iterator

---
 kernel/rtlil.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index cfc841b9f..979f115be 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5516,9 +5516,8 @@ bool RTLIL::SigSpec::has_const(State state) const
 {
 	cover("kernel.rtlil.sigspec.has_const");
 
-	pack();
-	for (auto it = chunks_.begin(); it != chunks_.end(); it++)
-		if (it->width > 0 && it->wire == NULL && std::find(it->data.begin(), it->data.end(), state) != it->data.end())
+	for (auto &chunk : chunks())
+		if (chunk.width > 0 && chunk.wire == NULL && std::find(chunk.data.begin(), chunk.data.end(), state) != chunk.data.end())
 			return true;
 	return false;
 }

From 0091d14e6d35cd7987195028b7bd56397cf52208 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:38:03 +0000
Subject: [PATCH 789/931] Make SigSpec::has_marked_bits use chunk iterator

---
 kernel/rtlil.cc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 979f115be..2647e4876 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5527,11 +5527,10 @@ bool RTLIL::SigSpec::has_marked_bits() const
 {
 	cover("kernel.rtlil.sigspec.has_marked_bits");
 
-	pack();
-	for (auto it = chunks_.begin(); it != chunks_.end(); it++)
-		if (it->width > 0 && it->wire == NULL) {
-			for (size_t i = 0; i < it->data.size(); i++)
-				if (it->data[i] == RTLIL::State::Sm)
+	for (auto &chunk : chunks())
+		if (chunk.width > 0 && chunk.wire == NULL) {
+			for (RTLIL::State d : chunk.data)
+				if (d == RTLIL::State::Sm)
 					return true;
 		}
 	return false;

From 0281ed1458e5e43d845b031236b73bc435c47430 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 15:48:24 +0000
Subject: [PATCH 790/931] Add try_as_const and use the const iterator a bit
 more

---
 kernel/rtlil.cc | 37 ++++++++++++++++++++++++++-----------
 kernel/rtlil.h  |  3 +++
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 2647e4876..a2e766a9b 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5629,33 +5629,48 @@ std::string RTLIL::SigSpec::as_string() const
 	return str;
 }
 
+std::optional<RTLIL::Const> RTLIL::SigSpec::try_as_const() const
+{
+	cover("kernel.rtlil.sigspec.as_const");
+
+	auto it = chunks().begin();
+	if (it == chunks().end())
+		return RTLIL::Const();
+	SigChunk chunk = *it;
+	if (chunk.wire != NULL || ++it != chunks().end())
+		return std::nullopt;
+	return RTLIL::Const(std::move(chunk.data));
+}
+
 RTLIL::Const RTLIL::SigSpec::as_const() const
 {
 	cover("kernel.rtlil.sigspec.as_const");
 
-	pack();
-	log_assert(is_fully_const() && GetSize(chunks_) <= 1);
-	if (width_)
-		return chunks_[0].data;
-	return RTLIL::Const();
+	std::optional<RTLIL::Const> c = try_as_const();
+	log_assert(c.has_value());
+	return *c;
 }
 
 RTLIL::Wire *RTLIL::SigSpec::as_wire() const
 {
 	cover("kernel.rtlil.sigspec.as_wire");
 
-	pack();
-	log_assert(is_wire());
-	return chunks_[0].wire;
+	auto it = chunks().begin();
+	log_assert(it != chunks().end());
+	RTLIL::SigChunk chunk = *it;
+	log_assert(++it == chunks().end() && chunk.wire && chunk.wire->width == width_);
+	return chunk.wire;
 }
 
 RTLIL::SigChunk RTLIL::SigSpec::as_chunk() const
 {
 	cover("kernel.rtlil.sigspec.as_chunk");
 
-	pack();
-	log_assert(is_chunk());
-	return chunks_[0];
+	auto it = chunks().begin();
+	log_assert(it != chunks().end());
+	RTLIL::SigChunk chunk = *it;
+	log_assert(++it == chunks().end());
+	return chunk;
 }
 
 RTLIL::SigBit RTLIL::SigSpec::as_bit() const
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 8e93f5f05..5bc60d1e9 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1457,6 +1457,9 @@ public:
 	int as_int_saturating(bool is_signed = false) const;
 
 	std::string as_string() const;
+	// Returns std::nullopt if there are any non-constant bits. Returns an empty
+	// Const if this has zero width.
+	std::optional<RTLIL::Const> try_as_const() const;
 	RTLIL::Const as_const() const;
 	RTLIL::Wire *as_wire() const;
 	RTLIL::SigChunk as_chunk() const;

From ce597dc38c8b47a2ba3a83460fdc2c0d8b4cfbda Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 30 Oct 2025 11:59:57 +0000
Subject: [PATCH 791/931] Fix try_as_const/as_wire/as_chunk

---
 kernel/rtlil.cc | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index a2e766a9b..68cc596fc 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5633,11 +5633,12 @@ std::optional<RTLIL::Const> RTLIL::SigSpec::try_as_const() const
 {
 	cover("kernel.rtlil.sigspec.as_const");
 
-	auto it = chunks().begin();
-	if (it == chunks().end())
+	Chunks cs = chunks();
+	auto it = cs.begin();
+	if (it == cs.end())
 		return RTLIL::Const();
 	SigChunk chunk = *it;
-	if (chunk.wire != NULL || ++it != chunks().end())
+	if (chunk.wire != NULL || ++it != cs.end())
 		return std::nullopt;
 	return RTLIL::Const(std::move(chunk.data));
 }
@@ -5655,10 +5656,11 @@ RTLIL::Wire *RTLIL::SigSpec::as_wire() const
 {
 	cover("kernel.rtlil.sigspec.as_wire");
 
-	auto it = chunks().begin();
-	log_assert(it != chunks().end());
+	Chunks cs = chunks();
+	auto it = cs.begin();
+	log_assert(it != cs.end());
 	RTLIL::SigChunk chunk = *it;
-	log_assert(++it == chunks().end() && chunk.wire && chunk.wire->width == width_);
+	log_assert(++it == cs.end() && chunk.wire && chunk.wire->width == width_);
 	return chunk.wire;
 }
 
@@ -5666,10 +5668,11 @@ RTLIL::SigChunk RTLIL::SigSpec::as_chunk() const
 {
 	cover("kernel.rtlil.sigspec.as_chunk");
 
-	auto it = chunks().begin();
-	log_assert(it != chunks().end());
+	Chunks cs = chunks();
+	auto it = cs.begin();
+	log_assert(it != cs.end());
 	RTLIL::SigChunk chunk = *it;
-	log_assert(++it == chunks().end());
+	log_assert(++it == cs.end());
 	return chunk;
 }
 

From dd3940c8bb8a771e3d067c34d7e0f9b7a216f31d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:39:31 +0000
Subject: [PATCH 792/931] Make SigSpec::is_one_hot use try_as_const

---
 kernel/rtlil.cc | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 68cc596fc..4b27c95c2 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5540,12 +5540,8 @@ bool RTLIL::SigSpec::is_onehot(int *pos) const
 {
 	cover("kernel.rtlil.sigspec.is_onehot");
 
-	pack();
-	if (!is_fully_const())
-		return false;
-	log_assert(GetSize(chunks_) <= 1);
-	if (width_)
-		return RTLIL::Const(chunks_[0].data).is_onehot(pos);
+	if (std::optional<RTLIL::Const> c = try_as_const())
+		return c->is_onehot(pos);
 	return false;
 }
 

From 39b89aae88e05a429f073b6a9b8e4824296b289e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:39:53 +0000
Subject: [PATCH 793/931] Use SigSpec::try_as_const in some places

---
 kernel/rtlil.cc | 52 +++++++++++++++++--------------------------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 4b27c95c2..a87161465 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5549,74 +5549,58 @@ bool RTLIL::SigSpec::as_bool() const
 {
 	cover("kernel.rtlil.sigspec.as_bool");
 
-	pack();
-	log_assert(is_fully_const() && GetSize(chunks_) <= 1);
-	if (width_)
-		return RTLIL::Const(chunks_[0].data).as_bool();
-	return false;
+	std::optional<RTLIL::Const> c = try_as_const();
+	log_assert(c.has_value());
+	return c->as_bool();
 }
 
 int RTLIL::SigSpec::as_int(bool is_signed) const
 {
 	cover("kernel.rtlil.sigspec.as_int");
 
-	pack();
-	log_assert(is_fully_const() && GetSize(chunks_) <= 1);
-	if (width_)
-		return RTLIL::Const(chunks_[0].data).as_int(is_signed);
-	return 0;
+	std::optional<RTLIL::Const> c = try_as_const();
+	log_assert(c.has_value());
+	return c->as_int(is_signed);
 }
 
 bool RTLIL::SigSpec::convertible_to_int(bool is_signed) const
 {
 	cover("kernel.rtlil.sigspec.convertible_to_int");
 
-	pack();
-	if (!is_fully_const())
+	std::optional<RTLIL::Const> c = try_as_const();
+	if (!c.has_value())
 		return false;
-
-	if (empty())
-		return true;
-
-	return RTLIL::Const(chunks_[0].data).convertible_to_int(is_signed);
+	return c->convertible_to_int(is_signed);
 }
 
 std::optional<int> RTLIL::SigSpec::try_as_int(bool is_signed) const
 {
 	cover("kernel.rtlil.sigspec.try_as_int");
 
-	pack();
-	if (!is_fully_const())
+	std::optional<RTLIL::Const> c = try_as_const();
+	if (!c.has_value())
 		return std::nullopt;
-
-	if (empty())
-		return 0;
-
-	return RTLIL::Const(chunks_[0].data).try_as_int(is_signed);
+	return c->try_as_int(is_signed);
 }
 
 int RTLIL::SigSpec::as_int_saturating(bool is_signed) const
 {
 	cover("kernel.rtlil.sigspec.try_as_int");
 
-	pack();
-	log_assert(is_fully_const() && GetSize(chunks_) <= 1);
-
-	if (empty())
-		return 0;
-
-	return RTLIL::Const(chunks_[0].data).as_int_saturating(is_signed);
+	std::optional<RTLIL::Const> c = try_as_const();
+	log_assert(c.has_value());
+	return c->as_int_saturating(is_signed);
 }
 
 std::string RTLIL::SigSpec::as_string() const
 {
 	cover("kernel.rtlil.sigspec.as_string");
 
-	pack();
 	std::string str;
 	str.reserve(size());
-	for (size_t i = chunks_.size(); i > 0; i--) {
-		const RTLIL::SigChunk &chunk = chunks_[i-1];
+	std::vector<RTLIL::SigChunk> chunks = *this;
+	for (size_t i = chunks.size(); i > 0; i--) {
+		const RTLIL::SigChunk &chunk = chunks[i-1];
 		if (chunk.wire != NULL)
 			str.append(chunk.width, '?');
 		else

From 4ed25c05382d5fe481c992d1187b74a69998a6f5 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:40:08 +0000
Subject: [PATCH 794/931] Make SigSpec::to_sigbit_set use chunk iterator

---
 kernel/rtlil.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index a87161465..2aa85f6fb 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5700,9 +5700,8 @@ std::set<RTLIL::SigBit> RTLIL::SigSpec::to_sigbit_set() const
 {
 	cover("kernel.rtlil.sigspec.to_sigbit_set");
 
-	pack();
 	std::set<RTLIL::SigBit> sigbits;
-	for (auto &c : chunks_)
+	for (auto &c : chunks())
 		for (int i = 0; i < c.width; i++)
 			sigbits.insert(RTLIL::SigBit(c, i));
 	return sigbits;

From 62cd3ddfb898d8c867a19fb6e19587e77f05f3fd Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:40:20 +0000
Subject: [PATCH 795/931] Make SigSpec::to_sigbit_pool use chunk iterator

---
 kernel/rtlil.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 2aa85f6fb..028f0e895 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5711,10 +5711,9 @@ pool<RTLIL::SigBit> RTLIL::SigSpec::to_sigbit_pool() const
 {
 	cover("kernel.rtlil.sigspec.to_sigbit_pool");
 
-	pack();
 	pool<RTLIL::SigBit> sigbits;
 	sigbits.reserve(size());
-	for (auto &c : chunks_)
+	for (auto &c : chunks())
 		for (int i = 0; i < c.width; i++)
 			sigbits.insert(RTLIL::SigBit(c, i));
 	return sigbits;

From 974b4dbe25c617dbef5c742f11258eecbbd8ed1e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 28 Oct 2025 12:40:45 +0000
Subject: [PATCH 796/931] Make SigSpec::parse_rhs use is_chunk to avoid direct
 access to chunks_

---
 kernel/rtlil.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 028f0e895..5594df6e7 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5890,7 +5890,7 @@ bool RTLIL::SigSpec::parse_rhs(const RTLIL::SigSpec &lhs, RTLIL::SigSpec &sig, R
 		return true;
 	}
 
-	if (lhs.chunks_.size() == 1) {
+	if (lhs.is_chunk()) {
 		char *p = (char*)str.c_str(), *endptr;
 		long int val = strtol(p, &endptr, 10);
 		if (endptr && endptr != p && *endptr == 0) {

From 7394a2c59780ceb7ef73211ff5a162d7f0d7d3a5 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 30 Oct 2025 10:30:03 +0000
Subject: [PATCH 797/931] Make SigSpec conversion to vector of SigChunk use
 chunks iterator

---
 kernel/rtlil.cc | 8 ++++++++
 kernel/rtlil.h  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 5594df6e7..cc3714948 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5907,6 +5907,14 @@ bool RTLIL::SigSpec::parse_rhs(const RTLIL::SigSpec &lhs, RTLIL::SigSpec &sig, R
 	return true;
 }
 
+RTLIL::SigSpec::operator std::vector<RTLIL::SigChunk>() const
+{
+	std::vector<RTLIL::SigChunk> result;
+	for (const RTLIL::SigChunk &c : chunks())
+		result.push_back(c);
+	return result;
+}
+
 RTLIL::CaseRule::~CaseRule()
 {
 	for (auto it = switches.begin(); it != switches.end(); it++)
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 5bc60d1e9..64e96ea53 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1477,7 +1477,7 @@ public:
 	static bool parse_sel(RTLIL::SigSpec &sig, RTLIL::Design *design, RTLIL::Module *module, std::string str);
 	static bool parse_rhs(const RTLIL::SigSpec &lhs, RTLIL::SigSpec &sig, RTLIL::Module *module, std::string str);
 
-	operator std::vector<RTLIL::SigChunk>() const { pack(); return chunks_; }
+	operator std::vector<RTLIL::SigChunk>() const;
 	operator std::vector<RTLIL::SigBit>() const { return bits(); }
 	const RTLIL::SigBit &at(int offset, const RTLIL::SigBit &defval) { return offset < width_ ? (*this)[offset] : defval; }
 

From 92ea557979ff4acfaa8b81def29a37587895918b Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 30 Oct 2025 11:07:02 +0000
Subject: [PATCH 798/931] Build a temporary SigChunk list in the iterator in
 the cases where that's needed

---
 backends/rtlil/rtlil_backend.cc     |  3 +-
 backends/verilog/verilog_backend.cc |  5 +--
 kernel/rtlil.h                      | 48 +++++++++++++++++++----------
 kernel/utils.h                      | 24 +++++++++++----
 4 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/backends/rtlil/rtlil_backend.cc b/backends/rtlil/rtlil_backend.cc
index d607be837..057edc584 100644
--- a/backends/rtlil/rtlil_backend.cc
+++ b/backends/rtlil/rtlil_backend.cc
@@ -121,7 +121,8 @@ void RTLIL_BACKEND::dump_sigspec(std::ostream &f, const RTLIL::SigSpec &sig, boo
 		dump_sigchunk(f, sig.as_chunk(), autoint);
 	} else {
 		f << stringf("{ ");
-		for (const auto& chunk : reversed(sig.chunks())) {
+		auto chunks = sig.chunks();
+		for (const auto& chunk : reversed(chunks)) {
 			dump_sigchunk(f, chunk, false);
 			f << stringf(" ");
 		}
diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index c747aa901..faeb2cd0b 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -382,8 +382,9 @@ void dump_sigspec(std::ostream &f, const RTLIL::SigSpec &sig)
 		dump_sigchunk(f, sig.as_chunk());
 	} else {
 		f << stringf("{ ");
-		for (auto it = sig.chunks().rbegin(); it != sig.chunks().rend(); ++it) {
-			if (it != sig.chunks().rbegin())
+		auto chunks = sig.chunks();
+		for (auto it = chunks.rbegin(); it != chunks.rend(); ++it) {
+			if (it != chunks.rbegin())
 				f << stringf(", ");
 			dump_sigchunk(f, *it, true);
 		}
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 64e96ea53..3a21f898f 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1277,8 +1277,7 @@ public:
 	SigSpec &operator=(SigSpec &&rhs) = default;
 
 	struct Chunks {
-		const SigSpec &spec;
-
+		Chunks(const SigSpec &spec) : spec(spec) {}
 		struct const_iterator {
 			using iterator_category = std::forward_iterator_tag;
 			using value_type = const SigChunk &;
@@ -1324,26 +1323,43 @@ public:
 			const_iterator it(spec, const_iterator::END);
 			return it;
 		}
-		std::vector<RTLIL::SigChunk>::const_reverse_iterator rbegin() const {
-			spec.pack();
-			return spec.chunks_.rbegin();
+		// Later we should deprecate these and remove their in-tree calls,
+		// so we can eventually remove chunk_vector.
+		std::vector<RTLIL::SigChunk>::const_reverse_iterator rbegin() {
+			ensure_chunk_vector();
+			return chunk_vector.rbegin();
 		}
-		std::vector<RTLIL::SigChunk>::const_reverse_iterator rend() const {
-			spec.pack();
-			return spec.chunks_.rend();
+		std::vector<RTLIL::SigChunk>::const_reverse_iterator rend() {
+			ensure_chunk_vector();
+			return chunk_vector.rend();
+		}
+		int size() {
+			ensure_chunk_vector();
+			return chunk_vector.size();
 		}
 		int size() const {
-			spec.pack();
-			return spec.chunks_.size();
+			int result = 0;
+			for (const SigChunk &_: *this)
+				++result;
+			return result;
 		}
-		const SigChunk &at(int index) const {
-			spec.pack();
-			return spec.chunks_.at(index);
+		const SigChunk &at(int index) {
+			ensure_chunk_vector();
+			return chunk_vector.at(index);
 		}
-		operator const std::vector<RTLIL::SigChunk>&() const {
-			spec.pack();
-			return spec.chunks_;
+		operator const std::vector<RTLIL::SigChunk>&() {
+			ensure_chunk_vector();
+			return chunk_vector;
 		}
+	private:
+		void ensure_chunk_vector() {
+			if (spec.size() > 0 && chunk_vector.empty()) {
+				for (const RTLIL::SigChunk &c : *this)
+					chunk_vector.push_back(c);
+			}
+		}
+		const SigSpec &spec;
+		std::vector<RTLIL::SigChunk> chunk_vector;
 	};
 	friend struct Chunks::const_iterator;
 
diff --git a/kernel/utils.h b/kernel/utils.h
index 5c739aceb..e90ba09d8 100644
--- a/kernel/utils.h
+++ b/kernel/utils.h
@@ -277,14 +277,26 @@ inline int ceil_log2(int x)
 #endif
 }
 
+template <typename T>
+auto reversed(T& container) {
+	struct reverse_view {
+		reverse_view(T& container) : container(container) {}
+		auto begin() const { return container.rbegin(); }
+		auto end() const { return container.rend(); }
+		T& container;
+	};
+	return reverse_view{container};
+}
+
 template <typename T>
 auto reversed(const T& container) {
-    struct reverse_view {
-        const T& cont;
-        auto begin() const { return cont.rbegin(); }
-        auto end() const { return cont.rend(); }
-    };
-    return reverse_view{container};
+	struct reverse_view {
+		reverse_view(const T& container) : container(container) {}
+		auto begin() const { return container.rbegin(); }
+		auto end() const { return container.rend(); }
+		const T& container;
+	};
+	return reverse_view{container};
 }
 
 YOSYS_NAMESPACE_END

From a69d48dd19cb9f1b0f26795566b96969aba0d7eb Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 30 Oct 2025 11:24:00 +0000
Subject: [PATCH 799/931] Instead of using packing and hashing to compute
 SigSpec ordering and equality, just use the width and chunkwise comparisons

This avoids having to pack and compute hashes, and generally results in a
simpler ordering.
---
 kernel/rtlil.cc | 50 +++++++++++--------------------------------------
 1 file changed, 11 insertions(+), 39 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index cc3714948..634269d9d 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5345,23 +5345,12 @@ bool RTLIL::SigSpec::operator <(const RTLIL::SigSpec &other) const
 	if (width_ != other.width_)
 		return width_ < other.width_;
 
-	pack();
-	other.pack();
-
-	if (chunks_.size() != other.chunks_.size())
-		return chunks_.size() < other.chunks_.size();
-
-	updhash();
-	other.updhash();
-
-	if (hash_ != other.hash_)
-		return hash_ < other.hash_;
-
-	for (size_t i = 0; i < chunks_.size(); i++)
-		if (chunks_[i] != other.chunks_[i]) {
-			cover("kernel.rtlil.sigspec.comp_lt.hash_collision");
-			return chunks_[i] < other.chunks_[i];
-		}
+	auto other_it = other.chunks().begin();
+	for (const SigChunk &c : chunks()) {
+		if (c != *other_it)
+			return c < *other_it;
+		++other_it;
+	}
 
 	cover("kernel.rtlil.sigspec.comp_lt.equal");
 	return false;
@@ -5377,29 +5366,12 @@ bool RTLIL::SigSpec::operator ==(const RTLIL::SigSpec &other) const
 	if (width_ != other.width_)
 		return false;
 
-	// Without this, SigSpec() == SigSpec(State::S0, 0) will fail
-	//   since the RHS will contain one SigChunk of width 0 causing
-	//   the size check below to fail
-	if (width_ == 0)
-		return true;
-
-	pack();
-	other.pack();
-
-	if (chunks_.size() != other.chunks_.size())
-		return false;
-
-	updhash();
-	other.updhash();
-
-	if (hash_ != other.hash_)
-		return false;
-
-	for (size_t i = 0; i < chunks_.size(); i++)
-		if (chunks_[i] != other.chunks_[i]) {
-			cover("kernel.rtlil.sigspec.comp_eq.hash_collision");
+	auto other_it = other.chunks().begin();
+	for (const SigChunk &c : chunks()) {
+		if (c != *other_it)
 			return false;
-		}
+		++other_it;
+	}
 
 	cover("kernel.rtlil.sigspec.comp_eq.equal");
 	return true;

From b612c1bb39aefea933241784ae1b69fb2c5b4deb Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 30 Oct 2025 11:34:42 +0000
Subject: [PATCH 800/931] Simplify SigSpec::as_bit()

---
 kernel/rtlil.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 634269d9d..c4a53ddd5 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5631,12 +5631,7 @@ RTLIL::SigChunk RTLIL::SigSpec::as_chunk() const
 RTLIL::SigBit RTLIL::SigSpec::as_bit() const
 {
 	cover("kernel.rtlil.sigspec.as_bit");
-
-	log_assert(width_ == 1);
-	if (packed())
-		return RTLIL::SigBit(*chunks_.begin());
-	else
-		return bits_[0];
+	return RTLIL::SigBit(*this);
 }
 
 bool RTLIL::SigSpec::match(const char* pattern) const

From 619f49eabe37650dd7ccbe49d26bf8afad8db242 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 30 Oct 2025 13:42:53 +0000
Subject: [PATCH 801/931] Remove unnecessary pack() from SigSpec::extend_u0()

---
 kernel/rtlil.cc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index c4a53ddd5..8713f5755 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5259,8 +5259,6 @@ void RTLIL::SigSpec::extend_u0(int width, bool is_signed)
 {
 	cover("kernel.rtlil.sigspec.extend_u0");
 
-	pack();
-
 	if (width_ > width)
 		remove(width, width_ - width);
 

From aa4a0fe815b6c479dcac4643a3b28ff96ee3f9f1 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 30 Oct 2025 14:13:46 +0000
Subject: [PATCH 802/931] Use size() instead of direct access to width_ in many
 places

---
 kernel/rtlil.cc | 122 ++++++++++++++++++++++++++----------------------
 kernel/rtlil.h  |  16 +++----
 2 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 8713f5755..2a3c72c51 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -4727,7 +4727,7 @@ void RTLIL::SigSpec::unpack() const
 	cover("kernel.rtlil.sigspec.convert.unpack");
 	log_assert(that->bits_.empty());
 
-	that->bits_.reserve(that->width_);
+	that->bits_.reserve(that->size());
 	for (auto &c : that->chunks_)
 		for (int i = 0; i < c.width; i++)
 			that->bits_.emplace_back(c, i);
@@ -4791,8 +4791,8 @@ void RTLIL::SigSpec::replace(const RTLIL::SigSpec &pattern, const RTLIL::SigSpec
 void RTLIL::SigSpec::replace(const RTLIL::SigSpec &pattern, const RTLIL::SigSpec &with, RTLIL::SigSpec *other) const
 {
 	log_assert(other != NULL);
-	log_assert(width_ == other->width_);
-	log_assert(pattern.width_ == with.width_);
+	log_assert(size() == other->size());
+	log_assert(pattern.size() == with.size());
 
 	pattern.unpack();
 	with.unpack();
@@ -4826,7 +4826,7 @@ void RTLIL::SigSpec::replace(const dict<RTLIL::SigBit, RTLIL::SigBit> &rules, RT
 	cover("kernel.rtlil.sigspec.replace_dict");
 
 	log_assert(other != NULL);
-	log_assert(width_ == other->width_);
+	log_assert(size() == other->size());
 
 	if (rules.empty()) return;
 	unpack();
@@ -4851,7 +4851,7 @@ void RTLIL::SigSpec::replace(const std::map<RTLIL::SigBit, RTLIL::SigBit> &rules
 	cover("kernel.rtlil.sigspec.replace_map");
 
 	log_assert(other != NULL);
-	log_assert(width_ == other->width_);
+	log_assert(size() == other->size());
 
 	if (rules.empty()) return;
 	unpack();
@@ -4886,7 +4886,7 @@ void RTLIL::SigSpec::remove2(const RTLIL::SigSpec &pattern, RTLIL::SigSpec *othe
 
 	unpack();
 	if (other != NULL) {
-		log_assert(width_ == other->width_);
+		log_assert(size() == other->size());
 		other->unpack();
 	}
 
@@ -4932,7 +4932,7 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::SigBit> &pattern, RTLIL::SigSpec
 	unpack();
 
 	if (other != NULL) {
-		log_assert(width_ == other->width_);
+		log_assert(size() == other->size());
 		other->unpack();
 	}
 
@@ -4960,7 +4960,7 @@ void RTLIL::SigSpec::remove2(const std::set<RTLIL::SigBit> &pattern, RTLIL::SigS
 	unpack();
 
 	if (other != NULL) {
-		log_assert(width_ == other->width_);
+		log_assert(size() == other->size());
 		other->unpack();
 	}
 
@@ -4988,7 +4988,7 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::Wire*> &pattern, RTLIL::SigSpec *
 	unpack();
 
 	if (other != NULL) {
-		log_assert(width_ == other->width_);
+		log_assert(size() == other->size());
 		other->unpack();
 	}
 
@@ -5013,7 +5013,7 @@ RTLIL::SigSpec RTLIL::SigSpec::extract(const RTLIL::SigSpec &pattern, const RTLI
 	else
 		cover("kernel.rtlil.sigspec.extract");
 
-	log_assert(other == NULL || width_ == other->width_);
+	log_assert(other == NULL || size() == other->size());
 
 	RTLIL::SigSpec ret;
 	std::vector<RTLIL::SigBit> bits_match = to_sigbit_vector();
@@ -5021,19 +5021,22 @@ RTLIL::SigSpec RTLIL::SigSpec::extract(const RTLIL::SigSpec &pattern, const RTLI
 	for (auto& pattern_chunk : pattern.chunks()) {
 		if (other) {
 			std::vector<RTLIL::SigBit> bits_other = other->to_sigbit_vector();
-			for (int i = 0; i < width_; i++)
-				if (bits_match[i].wire &&
-					bits_match[i].wire == pattern_chunk.wire &&
-					bits_match[i].offset >= pattern_chunk.offset &&
-					bits_match[i].offset < pattern_chunk.offset + pattern_chunk.width)
+			int i = 0;
+			for (const RTLIL::SigBit &bit : bits_match) {
+				if (bit.wire &&
+					bit.wire == pattern_chunk.wire &&
+					bit.offset >= pattern_chunk.offset &&
+					bit.offset < pattern_chunk.offset + pattern_chunk.width)
 					ret.append(bits_other[i]);
+				++i;
+			}
 		} else {
-			for (int i = 0; i < width_; i++)
-				if (bits_match[i].wire &&
-					bits_match[i].wire == pattern_chunk.wire &&
-					bits_match[i].offset >= pattern_chunk.offset &&
-					bits_match[i].offset < pattern_chunk.offset + pattern_chunk.width)
-					ret.append(bits_match[i]);
+			for (const RTLIL::SigBit &bit : bits_match)
+				if (bit.wire &&
+					bit.wire == pattern_chunk.wire &&
+					bit.offset >= pattern_chunk.offset &&
+					bit.offset < pattern_chunk.offset + pattern_chunk.width)
+					ret.append(bit);
 		}
 	}
 
@@ -5048,20 +5051,23 @@ RTLIL::SigSpec RTLIL::SigSpec::extract(const pool<RTLIL::SigBit> &pattern, const
 	else
 		cover("kernel.rtlil.sigspec.extract");
 
-	log_assert(other == NULL || width_ == other->width_);
+	log_assert(other == NULL || size() == other->size());
 
 	std::vector<RTLIL::SigBit> bits_match = to_sigbit_vector();
 	RTLIL::SigSpec ret;
 
 	if (other) {
 		std::vector<RTLIL::SigBit> bits_other = other->to_sigbit_vector();
-		for (int i = 0; i < width_; i++)
-			if (bits_match[i].wire && pattern.count(bits_match[i]))
+		int i = 0;
+		for (const RTLIL::SigBit &bit : bits_match) {
+			if (bit.wire && pattern.count(bit))
 				ret.append(bits_other[i]);
+			++i;
+		}
 	} else {
-		for (int i = 0; i < width_; i++)
-			if (bits_match[i].wire && pattern.count(bits_match[i]))
-				ret.append(bits_match[i]);
+		for (const RTLIL::SigBit &bit : bits_match)
+			if (bit.wire && pattern.count(bit))
+				ret.append(bit);
 	}
 
 	ret.check();
@@ -5073,14 +5079,16 @@ void RTLIL::SigSpec::replace(int offset, const RTLIL::SigSpec &with)
 	cover("kernel.rtlil.sigspec.replace_pos");
 
 	unpack();
-	with.unpack();
 
 	log_assert(offset >= 0);
-	log_assert(with.width_ >= 0);
-	log_assert(offset+with.width_ <= width_);
+	log_assert(with.size() >= 0);
+	log_assert(offset+with.size() <= size());
 
-	for (int i = 0; i < with.width_; i++)
-		bits_.at(offset + i) = with.bits_.at(i);
+	int i = 0;
+	for (const RTLIL::SigBit &bit : with.bits()) {
+		bits_.at(offset + i) = bit;
+		++i;
+	}
 
 	check();
 }
@@ -5135,7 +5143,7 @@ void RTLIL::SigSpec::remove(int offset, int length)
 
 	log_assert(offset >= 0);
 	log_assert(length >= 0);
-	log_assert(offset + length <= width_);
+	log_assert(offset + length <= size());
 
 	bits_.erase(bits_.begin() + offset, bits_.begin() + offset + length);
 	width_ = bits_.size();
@@ -5147,7 +5155,7 @@ RTLIL::SigSpec RTLIL::SigSpec::extract(int offset, int length) const
 {
 	log_assert(offset >= 0);
 	log_assert(length >= 0);
-	log_assert(offset + length <= width_);
+	log_assert(offset + length <= size());
 
 	cover("kernel.rtlil.sigspec.extract_pos");
 
@@ -5190,10 +5198,10 @@ void RTLIL::SigSpec::rewrite_wires(std::function<void(RTLIL::Wire*& wire)> rewri
 
 void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
 {
-	if (signal.width_ == 0)
+	if (signal.size() == 0)
 		return;
 
-	if (width_ == 0) {
+	if (size() == 0) {
 		*this = signal;
 		return;
 	}
@@ -5220,7 +5228,7 @@ void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
 		bits_.insert(bits_.end(), signal.bits_.begin(), signal.bits_.end());
 	}
 
-	width_ += signal.width_;
+	width_ += signal.size();
 	check();
 }
 
@@ -5259,14 +5267,14 @@ void RTLIL::SigSpec::extend_u0(int width, bool is_signed)
 {
 	cover("kernel.rtlil.sigspec.extend_u0");
 
-	if (width_ > width)
-		remove(width, width_ - width);
+	if (size() > width)
+		remove(width, size() - width);
 
-	if (width_ < width) {
-		RTLIL::SigBit padding = width_ > 0 ? (*this)[width_ - 1] : RTLIL::State::Sx;
+	if (size() < width) {
+		RTLIL::SigBit padding = size() > 0 ? (*this)[size() - 1] : RTLIL::State::Sx;
 		if (!is_signed)
 			padding = RTLIL::State::S0;
-		while (width_ < width)
+		while (size() < width)
 			append(padding);
 	}
 
@@ -5285,7 +5293,7 @@ RTLIL::SigSpec RTLIL::SigSpec::repeat(int num) const
 #ifndef NDEBUG
 void RTLIL::SigSpec::check(Module *mod) const
 {
-	if (width_ > 64)
+	if (size() > 64)
 	{
 		cover("kernel.rtlil.sigspec.check.skip");
 	}
@@ -5314,7 +5322,7 @@ void RTLIL::SigSpec::check(Module *mod) const
 			}
 			w += chunk.width;
 		}
-		log_assert(w == width_);
+		log_assert(w == size());
 		log_assert(bits_.empty());
 	}
 	else
@@ -5327,7 +5335,7 @@ void RTLIL::SigSpec::check(Module *mod) const
 					log_assert(bits_[i].wire->module == mod);
 		}
 
-		log_assert(width_ == GetSize(bits_));
+		log_assert(size() == GetSize(bits_));
 		log_assert(chunks_.empty());
 	}
 }
@@ -5340,8 +5348,8 @@ bool RTLIL::SigSpec::operator <(const RTLIL::SigSpec &other) const
 	if (this == &other)
 		return false;
 
-	if (width_ != other.width_)
-		return width_ < other.width_;
+	if (size() != other.size())
+		return size() < other.size();
 
 	auto other_it = other.chunks().begin();
 	for (const SigChunk &c : chunks()) {
@@ -5361,7 +5369,7 @@ bool RTLIL::SigSpec::operator ==(const RTLIL::SigSpec &other) const
 	if (this == &other)
 		return true;
 
-	if (width_ != other.width_)
+	if (size() != other.size())
 		return false;
 
 	auto other_it = other.chunks().begin();
@@ -5384,7 +5392,7 @@ bool RTLIL::SigSpec::is_wire() const
 	if (it == cs.end())
 		return false;
 	const RTLIL::SigChunk &chunk = *it;
-	return chunk.wire && chunk.wire->width == width_ && ++it == cs.end();
+	return chunk.wire && chunk.wire->width == size() && ++it == cs.end();
 }
 
 bool RTLIL::SigSpec::is_chunk() const
@@ -5610,7 +5618,7 @@ RTLIL::Wire *RTLIL::SigSpec::as_wire() const
 	auto it = cs.begin();
 	log_assert(it != cs.end());
 	RTLIL::SigChunk chunk = *it;
-	log_assert(++it == cs.end() && chunk.wire && chunk.wire->width == width_);
+	log_assert(++it == cs.end() && chunk.wire && chunk.wire->width == size());
 	return chunk.wire;
 }
 
@@ -5699,7 +5707,7 @@ std::map<RTLIL::SigBit, RTLIL::SigBit> RTLIL::SigSpec::to_sigbit_map(const RTLIL
 	unpack();
 	other.unpack();
 
-	log_assert(width_ == other.width_);
+	log_assert(size() == other.size());
 
 	std::map<RTLIL::SigBit, RTLIL::SigBit> new_map;
 	for (int i = 0; i < width_; i++)
@@ -5715,7 +5723,7 @@ dict<RTLIL::SigBit, RTLIL::SigBit> RTLIL::SigSpec::to_sigbit_dict(const RTLIL::S
 	unpack();
 	other.unpack();
 
-	log_assert(width_ == other.width_);
+	log_assert(size() == other.size());
 
 	dict<RTLIL::SigBit, RTLIL::SigBit> new_map;
 	new_map.reserve(size());
@@ -5845,13 +5853,13 @@ bool RTLIL::SigSpec::parse_rhs(const RTLIL::SigSpec &lhs, RTLIL::SigSpec &sig, R
 {
 	if (str == "0") {
 		cover("kernel.rtlil.sigspec.parse.rhs_zeros");
-		sig = RTLIL::SigSpec(RTLIL::State::S0, lhs.width_);
+		sig = RTLIL::SigSpec(RTLIL::State::S0, lhs.size());
 		return true;
 	}
 
 	if (str == "~0") {
 		cover("kernel.rtlil.sigspec.parse.rhs_ones");
-		sig = RTLIL::SigSpec(RTLIL::State::S1, lhs.width_);
+		sig = RTLIL::SigSpec(RTLIL::State::S1, lhs.size());
 		return true;
 	}
 
@@ -5859,7 +5867,7 @@ bool RTLIL::SigSpec::parse_rhs(const RTLIL::SigSpec &lhs, RTLIL::SigSpec &sig, R
 		char *p = (char*)str.c_str(), *endptr;
 		long int val = strtol(p, &endptr, 10);
 		if (endptr && endptr != p && *endptr == 0) {
-			sig = RTLIL::SigSpec(val, lhs.width_);
+			sig = RTLIL::SigSpec(val, lhs.size());
 			cover("kernel.rtlil.sigspec.parse.rhs_dec");
 			return true;
 		}
@@ -5867,8 +5875,8 @@ bool RTLIL::SigSpec::parse_rhs(const RTLIL::SigSpec &lhs, RTLIL::SigSpec &sig, R
 
 	if (!parse(sig, module, str))
 		return false;
-	if (sig.width_ > lhs.width_)
-		sig.remove(lhs.width_, sig.width_ - lhs.width_);
+	if (sig.size() > lhs.size())
+		sig.remove(lhs.size(), sig.size() - lhs.size());
 	return true;
 }
 
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 3a21f898f..85ef0f056 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1367,16 +1367,16 @@ public:
 	inline const std::vector<RTLIL::SigBit> &bits() const { inline_unpack(); return bits_; }
 
 	inline int size() const { return width_; }
-	inline bool empty() const { return width_ == 0; }
+	inline bool empty() const { return size() == 0; }
 
 	inline RTLIL::SigBit &operator[](int index) { inline_unpack(); return bits_.at(index); }
 	inline const RTLIL::SigBit &operator[](int index) const { inline_unpack(); return bits_.at(index); }
 
 	inline RTLIL::SigSpecIterator begin() { RTLIL::SigSpecIterator it; it.sig_p = this; it.index = 0; return it; }
-	inline RTLIL::SigSpecIterator end() { RTLIL::SigSpecIterator it; it.sig_p = this; it.index = width_; return it; }
+	inline RTLIL::SigSpecIterator end() { RTLIL::SigSpecIterator it; it.sig_p = this; it.index = size(); return it; }
 
 	inline RTLIL::SigSpecConstIterator begin() const { RTLIL::SigSpecConstIterator it; it.sig_p = this; it.index = 0; return it; }
-	inline RTLIL::SigSpecConstIterator end() const { RTLIL::SigSpecConstIterator it; it.sig_p = this; it.index = width_; return it; }
+	inline RTLIL::SigSpecConstIterator end() const { RTLIL::SigSpecConstIterator it; it.sig_p = this; it.index = size(); return it; }
 
 	void sort();
 	void sort_and_unify();
@@ -1408,12 +1408,12 @@ public:
 	RTLIL::SigSpec extract(const RTLIL::SigSpec &pattern, const RTLIL::SigSpec *other = NULL) const;
 	RTLIL::SigSpec extract(const pool<RTLIL::SigBit> &pattern, const RTLIL::SigSpec *other = NULL) const;
 	RTLIL::SigSpec extract(int offset, int length = 1) const;
-	RTLIL::SigSpec extract_end(int offset) const { return extract(offset, width_ - offset); }
+	RTLIL::SigSpec extract_end(int offset) const { return extract(offset, size() - offset); }
 
 	void rewrite_wires(std::function<void(RTLIL::Wire*& wire)> rewrite);
 
-	RTLIL::SigBit lsb() const { log_assert(width_); return (*this)[0]; };
-	RTLIL::SigBit msb() const { log_assert(width_); return (*this)[width_ - 1]; };
+	RTLIL::SigBit lsb() const { log_assert(size()); return (*this)[0]; };
+	RTLIL::SigBit msb() const { log_assert(size()); return (*this)[size() - 1]; };
 
 	void append(const RTLIL::SigSpec &signal);
 	inline void append(Wire *wire) { append(RTLIL::SigSpec(wire)); }
@@ -1436,7 +1436,7 @@ public:
 
 	bool is_wire() const;
 	bool is_chunk() const;
-	inline bool is_bit() const { return width_ == 1; }
+	inline bool is_bit() const { return size() == 1; }
 
 	bool known_driver() const;
 
@@ -1495,7 +1495,7 @@ public:
 
 	operator std::vector<RTLIL::SigChunk>() const;
 	operator std::vector<RTLIL::SigBit>() const { return bits(); }
-	const RTLIL::SigBit &at(int offset, const RTLIL::SigBit &defval) { return offset < width_ ? (*this)[offset] : defval; }
+	const RTLIL::SigBit &at(int offset, const RTLIL::SigBit &defval) { return offset < size() ? (*this)[offset] : defval; }
 
 	[[nodiscard]] Hasher hash_into(Hasher h) const { if (!hash_) updhash(); h.eat(hash_); return h; }
 

From 4939484840d50275aed247758bcdd4120f485a0a Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 30 Oct 2025 15:03:47 +0000
Subject: [PATCH 803/931] Don't reset the hash when unpacking, instead clear
 the hash whenever bits are modified

---
 kernel/rtlil.cc | 21 +++++++++++++++++++--
 kernel/rtlil.h  |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 2a3c72c51..1291432c2 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -4733,7 +4733,6 @@ void RTLIL::SigSpec::unpack() const
 			that->bits_.emplace_back(c, i);
 
 	that->chunks_.clear();
-	that->hash_ = 0;
 }
 
 void RTLIL::SigSpec::updhash() const
@@ -4765,6 +4764,7 @@ void RTLIL::SigSpec::sort()
 	unpack();
 	cover("kernel.rtlil.sigspec.sort");
 	std::sort(bits_.begin(), bits_.end());
+	hash_ = 0;
 }
 
 void RTLIL::SigSpec::sort_and_unify()
@@ -4781,6 +4781,7 @@ void RTLIL::SigSpec::sort_and_unify()
 	unique_bits.erase(last, unique_bits.end());
 
 	*this = unique_bits;
+	hash_ = 0;
 }
 
 void RTLIL::SigSpec::replace(const RTLIL::SigSpec &pattern, const RTLIL::SigSpec &with)
@@ -4812,6 +4813,7 @@ void RTLIL::SigSpec::replace(const RTLIL::SigSpec &pattern, const RTLIL::SigSpec
 			other->bits_[j] = with.bits_[it->second];
 		}
 	}
+	other->hash_ = 0;
 
 	other->check();
 }
@@ -4837,6 +4839,7 @@ void RTLIL::SigSpec::replace(const dict<RTLIL::SigBit, RTLIL::SigBit> &rules, RT
 		if (it != rules.end())
 			other->bits_[i] = it->second;
 	}
+	other->hash_ = 0;
 
 	other->check();
 }
@@ -4862,6 +4865,7 @@ void RTLIL::SigSpec::replace(const std::map<RTLIL::SigBit, RTLIL::SigBit> &rules
 		if (it != rules.end())
 			other->bits_[i] = it->second;
 	}
+	other->hash_ = 0;
 
 	other->check();
 }
@@ -4888,6 +4892,7 @@ void RTLIL::SigSpec::remove2(const RTLIL::SigSpec &pattern, RTLIL::SigSpec *othe
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
+		other->hash_ = 0;
 	}
 
 	for (int i = GetSize(bits_) - 1; i >= 0; i--)
@@ -4907,6 +4912,7 @@ void RTLIL::SigSpec::remove2(const RTLIL::SigSpec &pattern, RTLIL::SigSpec *othe
 				break;
 			}
 	}
+	hash_ = 0;
 
 	check();
 }
@@ -4934,6 +4940,7 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::SigBit> &pattern, RTLIL::SigSpec
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
+		other->hash_ = 0;
 	}
 
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
@@ -4946,6 +4953,7 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::SigBit> &pattern, RTLIL::SigSpec
 			}
 		}
 	}
+	hash_ = 0;
 
 	check();
 }
@@ -4962,6 +4970,7 @@ void RTLIL::SigSpec::remove2(const std::set<RTLIL::SigBit> &pattern, RTLIL::SigS
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
+		other->hash_ = 0;
 	}
 
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
@@ -4974,6 +4983,7 @@ void RTLIL::SigSpec::remove2(const std::set<RTLIL::SigBit> &pattern, RTLIL::SigS
 			}
 		}
 	}
+	hash_ = 0;
 
 	check();
 }
@@ -4990,6 +5000,7 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::Wire*> &pattern, RTLIL::SigSpec *
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
+		other->hash_ = 0;
 	}
 
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
@@ -5002,6 +5013,7 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::Wire*> &pattern, RTLIL::SigSpec *
 			}
 		}
 	}
+	hash_ = 0;
 
 	check();
 }
@@ -5089,6 +5101,7 @@ void RTLIL::SigSpec::replace(int offset, const RTLIL::SigSpec &with)
 		bits_.at(offset + i) = bit;
 		++i;
 	}
+	hash_ = 0;
 
 	check();
 }
@@ -5132,6 +5145,7 @@ void RTLIL::SigSpec::remove_const()
 		width_ = bits_.size();
 	}
 
+	hash_ = 0;
 	check();
 }
 
@@ -5148,6 +5162,7 @@ void RTLIL::SigSpec::remove(int offset, int length)
 	bits_.erase(bits_.begin() + offset, bits_.begin() + offset + length);
 	width_ = bits_.size();
 
+	hash_ = 0;
 	check();
 }
 
@@ -5194,6 +5209,7 @@ void RTLIL::SigSpec::rewrite_wires(std::function<void(RTLIL::Wire*& wire)> rewri
 	for (RTLIL::SigChunk &chunk : chunks_)
 		if (chunk.wire != nullptr)
 			rewrite(chunk.wire);
+	hash_ = 0;
 }
 
 void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
@@ -5229,6 +5245,7 @@ void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
 	}
 
 	width_ += signal.size();
+	hash_ = 0;
 	check();
 }
 
@@ -5260,6 +5277,7 @@ void RTLIL::SigSpec::append(const RTLIL::SigBit &bit)
 	}
 
 	width_++;
+	hash_ = 0;
 	check();
 }
 
@@ -5277,7 +5295,6 @@ void RTLIL::SigSpec::extend_u0(int width, bool is_signed)
 		while (size() < width)
 			append(padding);
 	}
-
 }
 
 RTLIL::SigSpec RTLIL::SigSpec::repeat(int num) const
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 85ef0f056..02b23a69a 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1369,7 +1369,7 @@ public:
 	inline int size() const { return width_; }
 	inline bool empty() const { return size() == 0; }
 
-	inline RTLIL::SigBit &operator[](int index) { inline_unpack(); return bits_.at(index); }
+	inline RTLIL::SigBit &operator[](int index) { inline_unpack(); hash_ = 0; return bits_.at(index); }
 	inline const RTLIL::SigBit &operator[](int index) const { inline_unpack(); return bits_.at(index); }
 
 	inline RTLIL::SigSpecIterator begin() { RTLIL::SigSpecIterator it; it.sig_p = this; it.index = 0; return it; }

From e1169d03fe0e5c1dd9a5074c7444df25485f1a87 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 30 Oct 2025 17:42:58 +0000
Subject: [PATCH 804/931] Use chunks iterator for SigSpec::extract()

---
 kernel/rtlil.cc | 44 +++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 1291432c2..6fccaf1d3 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -5174,33 +5174,27 @@ RTLIL::SigSpec RTLIL::SigSpec::extract(int offset, int length) const
 
 	cover("kernel.rtlil.sigspec.extract_pos");
 
-	if (packed()) {
-		SigSpec extracted;
-		extracted.width_ = length;
-
-		auto it = chunks_.begin();
-		for (; offset; offset -= it->width, it++) {
-			if (offset < it->width) {
-				int chunk_length = min(it->width - offset, length);
-				extracted.chunks_.emplace_back(it->extract(offset, chunk_length));
-				length -= chunk_length;
-				it++;
-				break;
-			}
+	SigSpec extracted;
+	Chunks cs = chunks();
+	auto it = cs.begin();
+	for (; offset; offset -= it->width, ++it) {
+		if (offset < it->width) {
+			int chunk_length = min(it->width - offset, length);
+			extracted.append(it->extract(offset, chunk_length));
+			length -= chunk_length;
+			++it;
+			break;
 		}
-		for (; length; length -= it->width, it++) {
-			if (length >= it->width) {
-				extracted.chunks_.emplace_back(*it);
-			} else {
-				extracted.chunks_.emplace_back(it->extract(0, length));
-				break;
-			}
-		}
-
-		return extracted;
-	} else {
-		return std::vector<RTLIL::SigBit>(bits_.begin() + offset, bits_.begin() + offset + length);
 	}
+	for (; length; length -= it->width, ++it) {
+		if (length >= it->width) {
+			extracted.append(*it);
+		} else {
+			extracted.append(it->extract(0, length));
+			break;
+		}
+	}
+	return extracted;
 }
 
 void RTLIL::SigSpec::rewrite_wires(std::function<void(RTLIL::Wire*& wire)> rewrite)

From 870ae18a2d069af6f953db5b9b825202d1a02c93 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 30 Oct 2025 15:02:39 +0000
Subject: [PATCH 805/931] Switch the SigSpec packed representation to allow
 just a single chunk that's inline in the SigSpec.

Single-chunk SigSpecs are very common and this avoids a heap allocation. It also simplifies
some algorithms.
---
 kernel/rtlil.cc | 363 +++++++++++++++++++-----------------------------
 kernel/rtlil.h  |  88 +++++++++---
 2 files changed, 208 insertions(+), 243 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 6fccaf1d3..eda732619 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -4456,9 +4456,7 @@ RTLIL::SigSpec::SigSpec(std::initializer_list<RTLIL::SigSpec> parts)
 {
 	cover("kernel.rtlil.sigspec.init.list");
 
-	width_ = 0;
-	hash_ = 0;
-
+	init_empty_bits();
 	log_assert(parts.size() > 0);
 	auto ie = parts.begin();
 	auto it = ie + parts.size() - 1;
@@ -4471,12 +4469,11 @@ RTLIL::SigSpec::SigSpec(const RTLIL::Const &value)
 	cover("kernel.rtlil.sigspec.init.const");
 
 	if (GetSize(value) != 0) {
-		chunks_.emplace_back(value);
-		width_ = chunks_.back().width;
+		rep_ = CHUNK;
+		new (&chunk_) RTLIL::SigChunk(value);
 	} else {
-		width_ = 0;
+		init_empty_bits();
 	}
-	hash_ = 0;
 	check();
 }
 
@@ -4485,12 +4482,11 @@ RTLIL::SigSpec::SigSpec(RTLIL::Const &&value)
 	cover("kernel.rtlil.sigspec.init.const.move");
 
 	if (GetSize(value) != 0) {
-		chunks_.emplace_back(std::move(value));
-		width_ = chunks_.back().width;
+		rep_ = CHUNK;
+		new (&chunk_) RTLIL::SigChunk(value);
 	} else {
-		width_ = 0;
+		init_empty_bits();
 	}
-	hash_ = 0;
 	check();
 }
 
@@ -4499,12 +4495,11 @@ RTLIL::SigSpec::SigSpec(const RTLIL::SigChunk &chunk)
 	cover("kernel.rtlil.sigspec.init.chunk");
 
 	if (chunk.width != 0) {
-		chunks_.emplace_back(chunk);
-		width_ = chunks_.back().width;
+		rep_ = CHUNK;
+		new (&chunk_) RTLIL::SigChunk(chunk);
 	} else {
-		width_ = 0;
+		init_empty_bits();
 	}
-	hash_ = 0;
 	check();
 }
 
@@ -4513,12 +4508,11 @@ RTLIL::SigSpec::SigSpec(RTLIL::SigChunk &&chunk)
 	cover("kernel.rtlil.sigspec.init.chunk.move");
 
 	if (chunk.width != 0) {
-		chunks_.emplace_back(std::move(chunk));
-		width_ = chunks_.back().width;
+		rep_ = CHUNK;
+		new (&chunk_) RTLIL::SigChunk(chunk);
 	} else {
-		width_ = 0;
+		init_empty_bits();
 	}
-	hash_ = 0;
 	check();
 }
 
@@ -4527,12 +4521,11 @@ RTLIL::SigSpec::SigSpec(RTLIL::Wire *wire)
 	cover("kernel.rtlil.sigspec.init.wire");
 
 	if (wire->width != 0) {
-		chunks_.emplace_back(wire);
-		width_ = chunks_.back().width;
+		rep_ = CHUNK;
+		new (&chunk_) RTLIL::SigChunk(wire);
 	} else {
-		width_ = 0;
+		init_empty_bits();
 	}
-	hash_ = 0;
 	check();
 }
 
@@ -4541,12 +4534,11 @@ RTLIL::SigSpec::SigSpec(RTLIL::Wire *wire, int offset, int width)
 	cover("kernel.rtlil.sigspec.init.wire_part");
 
 	if (width != 0) {
-		chunks_.emplace_back(wire, offset, width);
-		width_ = chunks_.back().width;
+		rep_ = CHUNK;
+		new (&chunk_) RTLIL::SigChunk(wire, offset, width);
 	} else {
-		width_ = 0;
+		init_empty_bits();
 	}
-	hash_ = 0;
 	check();
 }
 
@@ -4555,12 +4547,11 @@ RTLIL::SigSpec::SigSpec(const std::string &str)
 	cover("kernel.rtlil.sigspec.init.str");
 
 	if (str.size() != 0) {
-		chunks_.emplace_back(str);
-		width_ = chunks_.back().width;
+		rep_ = CHUNK;
+		new (&chunk_) RTLIL::SigChunk(str);
 	} else {
-		width_ = 0;
+		init_empty_bits();
 	}
-	hash_ = 0;
 	check();
 }
 
@@ -4568,10 +4559,11 @@ RTLIL::SigSpec::SigSpec(int val, int width)
 {
 	cover("kernel.rtlil.sigspec.init.int");
 
-	if (width != 0)
-		chunks_.emplace_back(val, width);
-	width_ = width;
-	hash_ = 0;
+	if (width != 0) {
+		rep_ = CHUNK;
+		new (&chunk_) RTLIL::SigChunk(val, width);
+	} else
+		init_empty_bits();
 	check();
 }
 
@@ -4579,10 +4571,11 @@ RTLIL::SigSpec::SigSpec(RTLIL::State bit, int width)
 {
 	cover("kernel.rtlil.sigspec.init.state");
 
-	if (width != 0)
-		chunks_.emplace_back(bit, width);
-	width_ = width;
-	hash_ = 0;
+	if (width != 0) {
+		rep_ = CHUNK;
+		new (&chunk_) RTLIL::SigChunk(bit, width);
+	} else
+		init_empty_bits();
 	check();
 }
 
@@ -4591,14 +4584,20 @@ RTLIL::SigSpec::SigSpec(const RTLIL::SigBit &bit, int width)
 	cover("kernel.rtlil.sigspec.init.bit");
 
 	if (width != 0) {
-		if (bit.wire == NULL)
-			chunks_.emplace_back(bit.data, width);
-		else
+		if (bit.wire == NULL) {
+			rep_ = CHUNK;
+			new (&chunk_) RTLIL::SigChunk(bit.data, width);
+		} else if (width == 1) {
+			rep_ = CHUNK;
+			new (&chunk_) RTLIL::SigChunk(bit);
+		} else {
+			init_empty_bits();
+			bits_.reserve(width);
 			for (int i = 0; i < width; i++)
-				chunks_.push_back(bit);
-	}
-	width_ = width;
-	hash_ = 0;
+				bits_.push_back(bit);
+		}
+	} else
+		init_empty_bits();
 	check();
 }
 
@@ -4606,8 +4605,7 @@ RTLIL::SigSpec::SigSpec(const std::vector<RTLIL::SigChunk> &chunks)
 {
 	cover("kernel.rtlil.sigspec.init.stdvec_chunks");
 
-	width_ = 0;
-	hash_ = 0;
+	init_empty_bits();
 	for (const auto &c : chunks)
 		append(c);
 	check();
@@ -4617,8 +4615,7 @@ RTLIL::SigSpec::SigSpec(const std::vector<RTLIL::SigBit> &bits)
 {
 	cover("kernel.rtlil.sigspec.init.stdvec_bits");
 
-	width_ = 0;
-	hash_ = 0;
+	init_empty_bits();
 	for (const auto &bit : bits)
 		append(bit);
 	check();
@@ -4628,8 +4625,7 @@ RTLIL::SigSpec::SigSpec(const pool<RTLIL::SigBit> &bits)
 {
 	cover("kernel.rtlil.sigspec.init.pool_bits");
 
-	width_ = 0;
-	hash_ = 0;
+	init_empty_bits();
 	for (const auto &bit : bits)
 		append(bit);
 	check();
@@ -4639,8 +4635,7 @@ RTLIL::SigSpec::SigSpec(const std::set<RTLIL::SigBit> &bits)
 {
 	cover("kernel.rtlil.sigspec.init.stdset_bits");
 
-	width_ = 0;
-	hash_ = 0;
+	init_empty_bits();
 	for (const auto &bit : bits)
 		append(bit);
 	check();
@@ -4650,9 +4645,8 @@ RTLIL::SigSpec::SigSpec(bool bit)
 {
 	cover("kernel.rtlil.sigspec.init.bool");
 
-	width_ = 0;
-	hash_ = 0;
-	append(SigBit(bit));
+	rep_ = CHUNK;
+	new (&chunk_) RTLIL::SigChunk(bit ? RTLIL::S1 : RTLIL::S0);
 	check();
 }
 
@@ -4681,58 +4675,23 @@ void RTLIL::SigSpec::Chunks::const_iterator::next_chunk_bits()
 	chunk.width = i - bit_index;
 }
 
-void RTLIL::SigSpec::pack() const
-{
-	RTLIL::SigSpec *that = (RTLIL::SigSpec*)this;
-
-	if (that->bits_.empty())
-		return;
-
-	cover("kernel.rtlil.sigspec.convert.pack");
-	log_assert(that->chunks_.empty());
-
-	std::vector<RTLIL::SigBit> old_bits;
-	old_bits.swap(that->bits_);
-
-	RTLIL::SigChunk *last = NULL;
-	int last_end_offset = 0;
-
-	for (auto &bit : old_bits) {
-		if (last && bit.wire == last->wire) {
-			if (bit.wire == NULL) {
-				last->data.push_back(bit.data);
-				last->width++;
-				continue;
-			} else if (last_end_offset == bit.offset) {
-				last_end_offset++;
-				last->width++;
-				continue;
-			}
-		}
-		that->chunks_.push_back(bit);
-		last = &that->chunks_.back();
-		last_end_offset = bit.offset + 1;
-	}
-
-	check();
-}
-
 void RTLIL::SigSpec::unpack() const
 {
-	RTLIL::SigSpec *that = (RTLIL::SigSpec*)this;
-
-	if (that->chunks_.empty())
+	if (rep_ == BITS)
 		return;
 
+	RTLIL::SigSpec *that = (RTLIL::SigSpec*)this;
+
 	cover("kernel.rtlil.sigspec.convert.unpack");
-	log_assert(that->bits_.empty());
 
-	that->bits_.reserve(that->size());
-	for (auto &c : that->chunks_)
-		for (int i = 0; i < c.width; i++)
-			that->bits_.emplace_back(c, i);
+	std::vector<RTLIL::SigBit> bits;
+	bits.reserve(that->chunk_.width);
+	for (int i = 0; i < that->chunk_.width; i++)
+		bits.emplace_back(that->chunk_, i);
 
-	that->chunks_.clear();
+	that->chunk_.~SigChunk();
+	that->rep_ = BITS;
+	new (&that->bits_) std::vector<RTLIL::SigBit>(std::move(bits));
 }
 
 void RTLIL::SigSpec::updhash() const
@@ -4904,11 +4863,8 @@ void RTLIL::SigSpec::remove2(const RTLIL::SigSpec &pattern, RTLIL::SigSpec *othe
 				bits_[i].offset >= pattern_chunk.offset &&
 				bits_[i].offset < pattern_chunk.offset + pattern_chunk.width) {
 				bits_.erase(bits_.begin() + i);
-				width_--;
-				if (other != NULL) {
+				if (other != NULL)
 					other->bits_.erase(other->bits_.begin() + i);
-					other->width_--;
-				}
 				break;
 			}
 	}
@@ -4946,11 +4902,8 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::SigBit> &pattern, RTLIL::SigSpec
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
 		if (bits_[i].wire != NULL && pattern.count(bits_[i])) {
 			bits_.erase(bits_.begin() + i);
-			width_--;
-			if (other != NULL) {
+			if (other != NULL)
 				other->bits_.erase(other->bits_.begin() + i);
-				other->width_--;
-			}
 		}
 	}
 	hash_ = 0;
@@ -4976,11 +4929,8 @@ void RTLIL::SigSpec::remove2(const std::set<RTLIL::SigBit> &pattern, RTLIL::SigS
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
 		if (bits_[i].wire != NULL && pattern.count(bits_[i])) {
 			bits_.erase(bits_.begin() + i);
-			width_--;
-			if (other != NULL) {
+			if (other != NULL)
 				other->bits_.erase(other->bits_.begin() + i);
-				other->width_--;
-			}
 		}
 	}
 	hash_ = 0;
@@ -5006,11 +4956,8 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::Wire*> &pattern, RTLIL::SigSpec *
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
 		if (bits_[i].wire != NULL && pattern.count(bits_[i].wire)) {
 			bits_.erase(bits_.begin() + i);
-			width_--;
-			if (other != NULL) {
+			if (other != NULL)
 				other->bits_.erase(other->bits_.begin() + i);
-				other->width_--;
-			}
 		}
 	}
 	hash_ = 0;
@@ -5108,41 +5055,27 @@ void RTLIL::SigSpec::replace(int offset, const RTLIL::SigSpec &with)
 
 void RTLIL::SigSpec::remove_const()
 {
-	if (packed())
+	if (rep_ == CHUNK)
 	{
 		cover("kernel.rtlil.sigspec.remove_const.packed");
 
-		std::vector<RTLIL::SigChunk> new_chunks;
-		new_chunks.reserve(GetSize(chunks_));
-
-		width_ = 0;
-		for (auto &chunk : chunks_)
-			if (chunk.wire != NULL) {
-				if (!new_chunks.empty() &&
-					new_chunks.back().wire == chunk.wire &&
-					new_chunks.back().offset + new_chunks.back().width == chunk.offset) {
-					new_chunks.back().width += chunk.width;
-				} else {
-					new_chunks.push_back(chunk);
-				}
-				width_ += chunk.width;
-			}
-
-		chunks_.swap(new_chunks);
+		if (chunk_.wire == NULL) {
+			chunk_.~SigChunk();
+			init_empty_bits();
+		}
 	}
 	else
 	{
 		cover("kernel.rtlil.sigspec.remove_const.unpacked");
 
 		std::vector<RTLIL::SigBit> new_bits;
-		new_bits.reserve(width_);
+		new_bits.reserve(bits_.size());
 
 		for (auto &bit : bits_)
 			if (bit.wire != NULL)
 				new_bits.push_back(bit);
 
 		bits_.swap(new_bits);
-		width_ = bits_.size();
 	}
 
 	hash_ = 0;
@@ -5160,7 +5093,6 @@ void RTLIL::SigSpec::remove(int offset, int length)
 	log_assert(offset + length <= size());
 
 	bits_.erase(bits_.begin() + offset, bits_.begin() + offset + length);
-	width_ = bits_.size();
 
 	hash_ = 0;
 	check();
@@ -5199,10 +5131,21 @@ RTLIL::SigSpec RTLIL::SigSpec::extract(int offset, int length) const
 
 void RTLIL::SigSpec::rewrite_wires(std::function<void(RTLIL::Wire*& wire)> rewrite)
 {
-	pack();
-	for (RTLIL::SigChunk &chunk : chunks_)
-		if (chunk.wire != nullptr)
-			rewrite(chunk.wire);
+	if (rep_ == CHUNK) {
+		if (chunk_.wire != nullptr)
+			rewrite(chunk_.wire);
+		return;
+	}
+
+	std::vector<RTLIL::SigBit> new_bits;
+	for (const RTLIL::SigChunk &chunk : chunks()) {
+		RTLIL::SigChunk c = chunk;
+		if (c.wire != nullptr)
+			rewrite(c.wire);
+		for (int i = 0; i < c.width; i++)
+			new_bits.emplace_back(c, i);
+	}
+	bits_ = std::move(new_bits);
 	hash_ = 0;
 }
 
@@ -5218,60 +5161,54 @@ void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
 
 	cover("kernel.rtlil.sigspec.append");
 
-	if (packed())
-		for (auto &other_c : signal.chunks())
-		{
-			auto &my_last_c = chunks_.back();
-			if (my_last_c.wire == NULL && other_c.wire == NULL) {
-				auto &this_data = my_last_c.data;
-				auto &other_data = other_c.data;
-				this_data.insert(this_data.end(), other_data.begin(), other_data.end());
-				my_last_c.width += other_c.width;
-			} else
-			if (my_last_c.wire == other_c.wire && my_last_c.offset + my_last_c.width == other_c.offset) {
-				my_last_c.width += other_c.width;
-			} else
-				chunks_.push_back(other_c);
+	hash_ = 0;
+	if (rep_ == CHUNK && signal.rep_ == CHUNK && chunk_.wire == signal.chunk_.wire) {
+		if (chunk_.wire == NULL) {
+			chunk_.data.insert(chunk_.data.end(), signal.chunk_.data.begin(), signal.chunk_.data.end());
+			chunk_.width = GetSize(chunk_.data);
+			return;
+		}
+		if (chunk_.offset + chunk_.width == signal.chunk_.offset) {
+			chunk_.width += signal.chunk_.width;
+			return;
 		}
-	else {
-		signal.unpack();
-		bits_.insert(bits_.end(), signal.bits_.begin(), signal.bits_.end());
 	}
 
-	width_ += signal.size();
-	hash_ = 0;
+	unpack();
+	for (const SigBit &bit : signal.bits())
+		bits_.push_back(bit);
 	check();
 }
 
 void RTLIL::SigSpec::append(const RTLIL::SigBit &bit)
 {
-	if (packed())
-	{
+	hash_ = 0;
+
+	if (size() == 0) {
+		destroy();
+		rep_ = CHUNK;
+		new (&chunk_) RTLIL::SigChunk(bit);
+		return;
+	}
+
+	if (rep_ == CHUNK && chunk_.wire == bit.wire) {
 		cover("kernel.rtlil.sigspec.append_bit.packed");
 
-		if (chunks_.size() == 0)
-			chunks_.push_back(bit);
-		else
-			if (bit.wire == NULL)
-				if (chunks_.back().wire == NULL) {
-					chunks_.back().data.push_back(bit.data);
-					chunks_.back().width++;
-				} else
-					chunks_.push_back(bit);
-			else
-				if (chunks_.back().wire == bit.wire && chunks_.back().offset + chunks_.back().width == bit.offset)
-					chunks_.back().width++;
-				else
-					chunks_.push_back(bit);
-	}
-	else
-	{
-		cover("kernel.rtlil.sigspec.append_bit.unpacked");
-		bits_.push_back(bit);
+		if (chunk_.wire == NULL) {
+			chunk_.data.push_back(bit.data);
+			chunk_.width++;
+			return;
+		}
+		if (chunk_.offset + chunk_.width == bit.offset) {
+			chunk_.width++;
+			return;
+		}
 	}
 
-	width_++;
-	hash_ = 0;
+	unpack();
+
+	cover("kernel.rtlil.sigspec.append_bit.unpacked");
+	bits_.push_back(bit);
 	check();
 }
 
@@ -5304,50 +5241,36 @@ RTLIL::SigSpec RTLIL::SigSpec::repeat(int num) const
 #ifndef NDEBUG
 void RTLIL::SigSpec::check(Module *mod) const
 {
-	if (size() > 64)
-	{
-		cover("kernel.rtlil.sigspec.check.skip");
-	}
-	else if (packed())
+	if (rep_ == CHUNK)
 	{
 		cover("kernel.rtlil.sigspec.check.packed");
 
-		int w = 0;
-		for (size_t i = 0; i < chunks_.size(); i++) {
-			const RTLIL::SigChunk &chunk = chunks_[i];
-			log_assert(chunk.width != 0);
-			if (chunk.wire == NULL) {
-				if (i > 0)
-					log_assert(chunks_[i-1].wire != NULL);
-				log_assert(chunk.offset == 0);
-				log_assert(chunk.data.size() == (size_t)chunk.width);
-			} else {
-				if (i > 0 && chunks_[i-1].wire == chunk.wire)
-					log_assert(chunk.offset != chunks_[i-1].offset + chunks_[i-1].width);
-				log_assert(chunk.offset >= 0);
-				log_assert(chunk.width >= 0);
-				log_assert(chunk.offset + chunk.width <= chunk.wire->width);
-				log_assert(chunk.data.size() == 0);
-				if (mod != nullptr)
-					log_assert(chunk.wire->module == mod);
-			}
-			w += chunk.width;
+		log_assert(chunk_.width != 0);
+		if (chunk_.wire == NULL) {
+			log_assert(chunk_.offset == 0);
+			log_assert(chunk_.data.size() == (size_t)chunk_.width);
+		} else {
+			log_assert(chunk_.offset >= 0);
+			log_assert(chunk_.width >= 0);
+			log_assert(chunk_.offset + chunk_.width <= chunk_.wire->width);
+			log_assert(chunk_.data.size() == 0);
+			if (mod != nullptr)
+				log_assert(chunk_.wire->module == mod);
 		}
-		log_assert(w == size());
-		log_assert(bits_.empty());
+	}
+	else if (size() > 64)
+	{
+		cover("kernel.rtlil.sigspec.check.skip");
 	}
 	else
 	{
 		cover("kernel.rtlil.sigspec.check.unpacked");
 
 		if (mod != nullptr) {
-			for (size_t i = 0; i < bits_.size(); i++)
-				if (bits_[i].wire != nullptr)
-					log_assert(bits_[i].wire->module == mod);
+			for (const RTLIL::SigBit &bit : bits_)
+				if (bit.wire != nullptr)
+					log_assert(bit.wire->module == mod);
 		}
-
-		log_assert(size() == GetSize(bits_));
-		log_assert(chunks_.empty());
 	}
 }
 #endif
@@ -5721,7 +5644,7 @@ std::map<RTLIL::SigBit, RTLIL::SigBit> RTLIL::SigSpec::to_sigbit_map(const RTLIL
 	log_assert(size() == other.size());
 
 	std::map<RTLIL::SigBit, RTLIL::SigBit> new_map;
-	for (int i = 0; i < width_; i++)
+	for (int i = 0; i < GetSize(bits_); i++)
 		new_map[bits_[i]] = other.bits_[i];
 
 	return new_map;
@@ -5738,7 +5661,7 @@ dict<RTLIL::SigBit, RTLIL::SigBit> RTLIL::SigSpec::to_sigbit_dict(const RTLIL::S
 
 	dict<RTLIL::SigBit, RTLIL::SigBit> new_map;
 	new_map.reserve(size());
-	for (int i = 0; i < width_; i++)
+	for (int i = 0; i < GetSize(bits_); i++)
 		new_map[bits_[i]] = other.bits_[i];
 
 	return new_map;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 02b23a69a..436b8b440 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1234,29 +1234,53 @@ struct RTLIL::SigSpecConstIterator
 struct RTLIL::SigSpec
 {
 private:
-	int width_;
-	Hasher::hash_t hash_;
-	std::vector<RTLIL::SigChunk> chunks_; // LSB at index 0
-	std::vector<RTLIL::SigBit> bits_; // LSB at index 0
+	enum Representation : char {
+		CHUNK,
+		BITS,
+	};
 
-	void pack() const;
-	void unpack() const;
-	void updhash() const;
+	Representation rep_;
+	Hasher::hash_t hash_ = 0;
+	union {
+		RTLIL::SigChunk chunk_;
+		std::vector<RTLIL::SigBit> bits_; // LSB at index 0
+	};
 
-	inline bool packed() const {
-		return bits_.empty();
+	void init_empty_bits() {
+		rep_ = BITS;
+		new (&bits_) std::vector<RTLIL::SigBit>;
 	}
 
+	void unpack() const;
 	inline void inline_unpack() const {
-		if (!chunks_.empty())
+		if (rep_ == CHUNK)
 			unpack();
 	}
 
+	void updhash() const;
+	void destroy() {
+		if (rep_ == CHUNK)
+			chunk_.~SigChunk();
+		else
+			bits_.~vector();
+	}
+	friend struct Chunks;
+
 public:
-	SigSpec() : width_(0), hash_(0) {}
+	SigSpec() { init_empty_bits(); }
 	SigSpec(std::initializer_list<RTLIL::SigSpec> parts);
-	SigSpec(const SigSpec &value) = default;
-	SigSpec(SigSpec &&value) = default;
+	SigSpec(const SigSpec &value) : rep_(value.rep_), hash_(value.hash_) {
+		if (value.rep_ == CHUNK)
+			new (&chunk_) RTLIL::SigChunk(value.chunk_);
+		else
+			new (&bits_) std::vector<RTLIL::SigBit>(value.bits_);
+	}
+	SigSpec(SigSpec &&value) : rep_(value.rep_), hash_(value.hash_) {
+		if (value.rep_ == CHUNK)
+			new (&chunk_) RTLIL::SigChunk(std::move(value.chunk_));
+		else
+			new (&bits_) std::vector<RTLIL::SigBit>(std::move(value.bits_));
+	}
 	SigSpec(const RTLIL::Const &value);
 	SigSpec(RTLIL::Const &&value);
 	SigSpec(const RTLIL::SigChunk &chunk);
@@ -1272,9 +1296,30 @@ public:
 	SigSpec(const pool<RTLIL::SigBit> &bits);
 	SigSpec(const std::set<RTLIL::SigBit> &bits);
 	explicit SigSpec(bool bit);
+	~SigSpec() {
+		destroy();
+	}
 
-	SigSpec &operator=(const SigSpec &rhs) = default;
-	SigSpec &operator=(SigSpec &&rhs) = default;
+	SigSpec &operator=(const SigSpec &rhs) {
+		destroy();
+		rep_ = rhs.rep_;
+		hash_ = rhs.hash_;
+		if (rep_ == CHUNK)
+			new (&chunk_) RTLIL::SigChunk(rhs.chunk_);
+		else
+			new (&bits_) std::vector<RTLIL::SigBit>(rhs.bits_);
+		return *this;
+	}
+	SigSpec &operator=(SigSpec &&rhs) {
+		destroy();
+		rep_ = rhs.rep_;
+		hash_ = rhs.hash_;
+		if (rep_ == CHUNK)
+			new (&chunk_) RTLIL::SigChunk(std::move(rhs.chunk_));
+		else
+			new (&bits_) std::vector<RTLIL::SigBit>(std::move(rhs.bits_));
+		return *this;
+	}
 
 	struct Chunks {
 		Chunks(const SigSpec &spec) : spec(spec) {}
@@ -1286,14 +1331,12 @@ public:
 			using reference = const SigChunk &;
 
 			const SigSpec &spec;
-			int chunk_index;
 			int bit_index;
 			SigChunk chunk;
 
 			const_iterator(const SigSpec &spec) : spec(spec) {
-				chunk_index = 0;
 				bit_index = 0;
-				if (!spec.packed())
+				if (spec.rep_ == BITS)
 					next_chunk_bits();
 			}
 			enum End { END };
@@ -1303,15 +1346,14 @@ public:
 			void next_chunk_bits();
 
 			const SigChunk &operator*() {
-				if (spec.packed())
-					return spec.chunks_[chunk_index];
+				if (spec.rep_ == CHUNK)
+					return spec.chunk_;
 				return chunk;
 			};
 			const SigChunk *operator->() { return &**this; }
 			const_iterator &operator++() {
 				bit_index += (**this).width;
-				++chunk_index;
-				if (!spec.packed())
+				if (spec.rep_ == BITS)
 					next_chunk_bits();
 				return *this;
 			}
@@ -1366,7 +1408,7 @@ public:
 	inline Chunks chunks() const { return {*this}; }
 	inline const std::vector<RTLIL::SigBit> &bits() const { inline_unpack(); return bits_; }
 
-	inline int size() const { return width_; }
+	inline int size() const { return rep_ == CHUNK ? chunk_.width : GetSize(bits_); }
 	inline bool empty() const { return size() == 0; }
 
 	inline RTLIL::SigBit &operator[](int index) { inline_unpack(); hash_ = 0; return bits_.at(index); }

From 745222fa3bf2ac570935ffd044c86fa2eb12d123 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 31 Oct 2025 10:06:13 +0000
Subject: [PATCH 806/931] Make SigSpec::unpack() non-const

---
 kernel/rtlil.cc | 108 ++++++++++++++++++++++--------------------------
 kernel/rtlil.h  |  29 +++++++++----
 2 files changed, 71 insertions(+), 66 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index eda732619..95db45e64 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -4675,23 +4675,21 @@ void RTLIL::SigSpec::Chunks::const_iterator::next_chunk_bits()
 	chunk.width = i - bit_index;
 }
 
-void RTLIL::SigSpec::unpack() const
+void RTLIL::SigSpec::unpack()
 {
 	if (rep_ == BITS)
 		return;
 
-	RTLIL::SigSpec *that = (RTLIL::SigSpec*)this;
-
 	cover("kernel.rtlil.sigspec.convert.unpack");
 
 	std::vector<RTLIL::SigBit> bits;
-	bits.reserve(that->chunk_.width);
-	for (int i = 0; i < that->chunk_.width; i++)
-		bits.emplace_back(that->chunk_, i);
+	bits.reserve(chunk_.width);
+	for (int i = 0; i < chunk_.width; i++)
+		bits.emplace_back(chunk_, i);
 
-	that->chunk_.~SigChunk();
-	that->rep_ = BITS;
-	new (&that->bits_) std::vector<RTLIL::SigBit>(std::move(bits));
+	chunk_.~SigChunk();
+	rep_ = BITS;
+	new (&bits_) std::vector<RTLIL::SigBit>(std::move(bits));
 }
 
 void RTLIL::SigSpec::updhash() const
@@ -4754,25 +4752,22 @@ void RTLIL::SigSpec::replace(const RTLIL::SigSpec &pattern, const RTLIL::SigSpec
 	log_assert(size() == other->size());
 	log_assert(pattern.size() == with.size());
 
-	pattern.unpack();
-	with.unpack();
-	unpack();
-	other->unpack();
-
 	dict<RTLIL::SigBit, int> pattern_to_with;
-	for (int i = 0; i < GetSize(pattern.bits_); i++) {
-		if (pattern.bits_[i].wire != NULL) {
-			pattern_to_with.emplace(pattern.bits_[i], i);
+	int pattern_size = pattern.size();
+	for (int i = 0; i < pattern_size; i++) {
+		SigBit pattern_bit = pattern[i];
+		if (pattern_bit.wire != NULL) {
+			pattern_to_with.emplace(pattern_bit, i);
 		}
 	}
 
-	for (int j = 0; j < GetSize(bits_); j++) {
-		auto it = pattern_to_with.find(bits_[j]);
+	int this_size = size();
+	for (int j = 0; j < this_size; j++) {
+		auto it = pattern_to_with.find((*this)[j]);
 		if (it != pattern_to_with.end()) {
-			other->bits_[j] = with.bits_[it->second];
+			(*other)[j] = with[it->second];
 		}
 	}
-	other->hash_ = 0;
 
 	other->check();
 }
@@ -4790,15 +4785,13 @@ void RTLIL::SigSpec::replace(const dict<RTLIL::SigBit, RTLIL::SigBit> &rules, RT
 	log_assert(size() == other->size());
 
 	if (rules.empty()) return;
-	unpack();
-	other->unpack();
 
-	for (int i = 0; i < GetSize(bits_); i++) {
-		auto it = rules.find(bits_[i]);
+	int this_size = size();
+	for (int i = 0; i < this_size; i++) {
+		auto it = rules.find((*this)[i]);
 		if (it != rules.end())
-			other->bits_[i] = it->second;
+			(*other)[i] = it->second;
 	}
-	other->hash_ = 0;
 
 	other->check();
 }
@@ -4816,15 +4809,13 @@ void RTLIL::SigSpec::replace(const std::map<RTLIL::SigBit, RTLIL::SigBit> &rules
 	log_assert(size() == other->size());
 
 	if (rules.empty()) return;
-	unpack();
-	other->unpack();
 
-	for (int i = 0; i < GetSize(bits_); i++) {
-		auto it = rules.find(bits_[i]);
+	int this_size = size();
+	for (int i = 0; i < this_size; i++) {
+		auto it = rules.find((*this)[i]);
 		if (it != rules.end())
-			other->bits_[i] = it->second;
+			(*other)[i] = it->second;
 	}
-	other->hash_ = 0;
 
 	other->check();
 }
@@ -5578,23 +5569,25 @@ bool RTLIL::SigSpec::match(const char* pattern) const
 {
 	cover("kernel.rtlil.sigspec.match");
 
-	unpack();
-	log_assert(int(strlen(pattern)) == GetSize(bits_));
+	int pattern_len = strlen(pattern);
+	log_assert(pattern_len == size());
 
-	for (auto it = bits_.rbegin(); it != bits_.rend(); it++, pattern++) {
-		if (*pattern == ' ')
+	for (int i = 0; i < pattern_len; ++i) {
+		char ch = pattern[i];
+		if (ch == ' ')
 			continue;
-		if (*pattern == '*') {
-			if (*it != State::Sz && *it != State::Sx)
+		RTLIL::SigBit bit = (*this)[pattern_len - 1 - i];
+		if (ch == '*') {
+			if (bit != State::Sz && bit != State::Sx)
 				return false;
 			continue;
 		}
-		if (*pattern == '0') {
-			if (*it != State::S0)
+		if (ch == '0') {
+			if (bit != State::S0)
 				return false;
 		} else
-		if (*pattern == '1') {
-			if (*it != State::S1)
+		if (ch == '1') {
+			if (bit != State::S1)
 				return false;
 		} else
 			log_abort();
@@ -5630,22 +5623,23 @@ std::vector<RTLIL::SigBit> RTLIL::SigSpec::to_sigbit_vector() const
 {
 	cover("kernel.rtlil.sigspec.to_sigbit_vector");
 
-	unpack();
-	return bits_;
+	std::vector<RTLIL::SigBit> result;
+	result.reserve(size());
+	for (SigBit bit : *this)
+		result.push_back(bit);
+	return result;
 }
 
 std::map<RTLIL::SigBit, RTLIL::SigBit> RTLIL::SigSpec::to_sigbit_map(const RTLIL::SigSpec &other) const
 {
 	cover("kernel.rtlil.sigspec.to_sigbit_map");
 
-	unpack();
-	other.unpack();
-
-	log_assert(size() == other.size());
+	int this_size = size();
+	log_assert(this_size == other.size());
 
 	std::map<RTLIL::SigBit, RTLIL::SigBit> new_map;
-	for (int i = 0; i < GetSize(bits_); i++)
-		new_map[bits_[i]] = other.bits_[i];
+	for (int i = 0; i < this_size; i++)
+		new_map[(*this)[i]] = other[i];
 
 	return new_map;
 }
@@ -5654,15 +5648,13 @@ dict<RTLIL::SigBit, RTLIL::SigBit> RTLIL::SigSpec::to_sigbit_dict(const RTLIL::S
 {
 	cover("kernel.rtlil.sigspec.to_sigbit_dict");
 
-	unpack();
-	other.unpack();
-
-	log_assert(size() == other.size());
+	int this_size = size();
+	log_assert(this_size == other.size());
 
 	dict<RTLIL::SigBit, RTLIL::SigBit> new_map;
-	new_map.reserve(size());
-	for (int i = 0; i < GetSize(bits_); i++)
-		new_map[bits_[i]] = other.bits_[i];
+	new_map.reserve(this_size);
+	for (int i = 0; i < this_size; i++)
+		new_map[(*this)[i]] = other[i];
 
 	return new_map;
 }
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 436b8b440..fb184fe50 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1223,9 +1223,10 @@ struct RTLIL::SigSpecConstIterator
 	typedef RTLIL::SigBit& reference;
 
 	const RTLIL::SigSpec *sig_p;
+	RTLIL::SigBit bit;
 	int index;
 
-	inline const RTLIL::SigBit &operator*() const;
+	inline const RTLIL::SigBit &operator*();
 	inline bool operator!=(const RTLIL::SigSpecConstIterator &other) const { return index != other.index; }
 	inline bool operator==(const RTLIL::SigSpecIterator &other) const { return index == other.index; }
 	inline void operator++() { index++; }
@@ -1251,8 +1252,8 @@ private:
 		new (&bits_) std::vector<RTLIL::SigBit>;
 	}
 
-	void unpack() const;
-	inline void inline_unpack() const {
+	void unpack();
+	inline void inline_unpack() {
 		if (rep_ == CHUNK)
 			unpack();
 	}
@@ -1406,13 +1407,22 @@ public:
 	friend struct Chunks::const_iterator;
 
 	inline Chunks chunks() const { return {*this}; }
-	inline const std::vector<RTLIL::SigBit> &bits() const { inline_unpack(); return bits_; }
+	inline const SigSpec &bits() const { return *this; }
 
 	inline int size() const { return rep_ == CHUNK ? chunk_.width : GetSize(bits_); }
 	inline bool empty() const { return size() == 0; }
 
 	inline RTLIL::SigBit &operator[](int index) { inline_unpack(); hash_ = 0; return bits_.at(index); }
-	inline const RTLIL::SigBit &operator[](int index) const { inline_unpack(); return bits_.at(index); }
+	inline RTLIL::SigBit operator[](int index) const {
+		if (rep_ == CHUNK) {
+			if (index < 0 || index >= chunk_.width)
+				throw std::out_of_range("SigSpec::operator[]");
+			if (chunk_.wire)
+				return RTLIL::SigBit(chunk_.wire, chunk_.offset + index);
+			return RTLIL::SigBit(chunk_.data[index]);
+		}
+		return bits_.at(index);
+	}
 
 	inline RTLIL::SigSpecIterator begin() { RTLIL::SigSpecIterator it; it.sig_p = this; it.index = 0; return it; }
 	inline RTLIL::SigSpecIterator end() { RTLIL::SigSpecIterator it; it.sig_p = this; it.index = size(); return it; }
@@ -1456,6 +1466,8 @@ public:
 
 	RTLIL::SigBit lsb() const { log_assert(size()); return (*this)[0]; };
 	RTLIL::SigBit msb() const { log_assert(size()); return (*this)[size() - 1]; };
+	RTLIL::SigBit front() const { return (*this)[0]; }
+	RTLIL::SigBit back() const { return (*this)[size() - 1]; }
 
 	void append(const RTLIL::SigSpec &signal);
 	inline void append(Wire *wire) { append(RTLIL::SigSpec(wire)); }
@@ -1536,7 +1548,7 @@ public:
 	static bool parse_rhs(const RTLIL::SigSpec &lhs, RTLIL::SigSpec &sig, RTLIL::Module *module, std::string str);
 
 	operator std::vector<RTLIL::SigChunk>() const;
-	operator std::vector<RTLIL::SigBit>() const { return bits(); }
+	operator std::vector<RTLIL::SigBit>() const { return to_sigbit_vector(); }
 	const RTLIL::SigBit &at(int offset, const RTLIL::SigBit &defval) { return offset < size() ? (*this)[offset] : defval; }
 
 	[[nodiscard]] Hasher hash_into(Hasher h) const { if (!hash_) updhash(); h.eat(hash_); return h; }
@@ -2444,8 +2456,9 @@ inline RTLIL::SigBit &RTLIL::SigSpecIterator::operator*() const {
 	return (*sig_p)[index];
 }
 
-inline const RTLIL::SigBit &RTLIL::SigSpecConstIterator::operator*() const {
-	return (*sig_p)[index];
+inline const RTLIL::SigBit &RTLIL::SigSpecConstIterator::operator*() {
+	bit = (*sig_p)[index];
+	return bit;
 }
 
 inline RTLIL::SigBit::SigBit(const RTLIL::SigSpec &sig) {

From 38d1d071a5db00e9cc60953fa3c1b00f2e8b29ee Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 31 Oct 2025 10:48:39 +0000
Subject: [PATCH 807/931] Implement SigSpec::updhash() using a relaxed atomic
 for thread-safety

---
 kernel/rtlil.cc | 49 +++++++++++++++++++++++--------------------------
 kernel/rtlil.h  | 48 +++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 95db45e64..46ed8287c 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -4692,17 +4692,12 @@ void RTLIL::SigSpec::unpack()
 	new (&bits_) std::vector<RTLIL::SigBit>(std::move(bits));
 }
 
-void RTLIL::SigSpec::updhash() const
+Hasher::hash_t RTLIL::SigSpec::updhash() const
 {
-	RTLIL::SigSpec *that = (RTLIL::SigSpec*)this;
-
-	if (that->hash_ != 0)
-		return;
-
 	cover("kernel.rtlil.sigspec.hash");
 
 	Hasher h;
-	for (auto &c : that->chunks())
+	for (auto &c : chunks())
 		if (c.wire == NULL) {
 			for (auto &v : c.data)
 				h.eat(v);
@@ -4711,9 +4706,11 @@ void RTLIL::SigSpec::updhash() const
 			h.eat(c.offset);
 			h.eat(c.width);
 		}
-	that->hash_ = h.yield();
-	if (that->hash_ == 0)
-		that->hash_ = 1;
+	Hasher::hash_t result = h.yield();
+	if (result == 0)
+		result = 1;
+	hash_.set(result);
+	return result;
 }
 
 void RTLIL::SigSpec::sort()
@@ -4721,7 +4718,7 @@ void RTLIL::SigSpec::sort()
 	unpack();
 	cover("kernel.rtlil.sigspec.sort");
 	std::sort(bits_.begin(), bits_.end());
-	hash_ = 0;
+	hash_.clear();
 }
 
 void RTLIL::SigSpec::sort_and_unify()
@@ -4738,7 +4735,7 @@ void RTLIL::SigSpec::sort_and_unify()
 	unique_bits.erase(last, unique_bits.end());
 
 	*this = unique_bits;
-	hash_ = 0;
+	hash_.clear();
 }
 
 void RTLIL::SigSpec::replace(const RTLIL::SigSpec &pattern, const RTLIL::SigSpec &with)
@@ -4842,7 +4839,7 @@ void RTLIL::SigSpec::remove2(const RTLIL::SigSpec &pattern, RTLIL::SigSpec *othe
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
-		other->hash_ = 0;
+		other->hash_.clear();
 	}
 
 	for (int i = GetSize(bits_) - 1; i >= 0; i--)
@@ -4859,7 +4856,7 @@ void RTLIL::SigSpec::remove2(const RTLIL::SigSpec &pattern, RTLIL::SigSpec *othe
 				break;
 			}
 	}
-	hash_ = 0;
+	hash_.clear();
 
 	check();
 }
@@ -4887,7 +4884,7 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::SigBit> &pattern, RTLIL::SigSpec
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
-		other->hash_ = 0;
+		other->hash_.clear();
 	}
 
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
@@ -4897,7 +4894,7 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::SigBit> &pattern, RTLIL::SigSpec
 				other->bits_.erase(other->bits_.begin() + i);
 		}
 	}
-	hash_ = 0;
+	hash_.clear();
 
 	check();
 }
@@ -4914,7 +4911,7 @@ void RTLIL::SigSpec::remove2(const std::set<RTLIL::SigBit> &pattern, RTLIL::SigS
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
-		other->hash_ = 0;
+		other->hash_.clear();
 	}
 
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
@@ -4924,7 +4921,7 @@ void RTLIL::SigSpec::remove2(const std::set<RTLIL::SigBit> &pattern, RTLIL::SigS
 				other->bits_.erase(other->bits_.begin() + i);
 		}
 	}
-	hash_ = 0;
+	hash_.clear();
 
 	check();
 }
@@ -4941,7 +4938,7 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::Wire*> &pattern, RTLIL::SigSpec *
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
-		other->hash_ = 0;
+		other->hash_.clear();
 	}
 
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
@@ -4951,7 +4948,7 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::Wire*> &pattern, RTLIL::SigSpec *
 				other->bits_.erase(other->bits_.begin() + i);
 		}
 	}
-	hash_ = 0;
+	hash_.clear();
 
 	check();
 }
@@ -5039,7 +5036,7 @@ void RTLIL::SigSpec::replace(int offset, const RTLIL::SigSpec &with)
 		bits_.at(offset + i) = bit;
 		++i;
 	}
-	hash_ = 0;
+	hash_.clear();
 
 	check();
 }
@@ -5069,7 +5066,7 @@ void RTLIL::SigSpec::remove_const()
 		bits_.swap(new_bits);
 	}
 
-	hash_ = 0;
+	hash_.clear();
 	check();
 }
 
@@ -5085,7 +5082,7 @@ void RTLIL::SigSpec::remove(int offset, int length)
 
 	bits_.erase(bits_.begin() + offset, bits_.begin() + offset + length);
 
-	hash_ = 0;
+	hash_.clear();
 	check();
 }
 
@@ -5137,7 +5134,7 @@ void RTLIL::SigSpec::rewrite_wires(std::function<void(RTLIL::Wire*& wire)> rewri
 			new_bits.emplace_back(c, i);
 	}
 	bits_ = std::move(new_bits);
-	hash_ = 0;
+	hash_.clear();
 }
 
 void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
@@ -5152,7 +5149,7 @@ void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
 
 	cover("kernel.rtlil.sigspec.append");
 
-	hash_ = 0;
+	hash_.clear();
 	if (rep_ == CHUNK && signal.rep_ == CHUNK && chunk_.wire == signal.chunk_.wire) {
 		if (chunk_.wire == NULL) {
 			chunk_.data.insert(chunk_.data.end(), signal.chunk_.data.begin(), signal.chunk_.data.end());
@@ -5173,7 +5170,7 @@ void RTLIL::SigSpec::append(const RTLIL::SigSpec &signal)
 
 void RTLIL::SigSpec::append(const RTLIL::SigBit &bit)
 {
-	hash_ = 0;
+	hash_.clear();
 
 	if (size() == 0) {
 		destroy();
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index fb184fe50..c11e603fb 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1239,9 +1239,39 @@ private:
 		CHUNK,
 		BITS,
 	};
+	// An AtomicHash is either clear or a nonzero integer.
+	struct AtomicHash {
+		// Create an initially clear value.
+		AtomicHash() : atomic_(0) {}
+		AtomicHash(const AtomicHash &rhs) : atomic_(rhs.load()) {}
+		AtomicHash &operator=(const AtomicHash &rhs) { store(rhs.load()); return *this; }
+		// Read the hash. Returns nullopt if the hash is clear.
+		std::optional<Hasher::hash_t> read() const {
+			Hasher::hash_t value = load();
+			if (value == 0)
+				return std::nullopt;
+			return value;
+		}
+		// Set the hash. If the value is already set, then the new value must
+		// equal the current value.
+		void set(Hasher::hash_t value) const {
+			log_assert(value != 0);
+			Hasher::hash_t old = const_cast<std::atomic<Hasher::hash_t>&>(atomic_)
+					.exchange(value, std::memory_order_relaxed);
+			log_assert(old == 0 || old == value);
+		}
+		void clear() { store(0); }
+	private:
+		int load() const { return atomic_.load(std::memory_order_relaxed); }
+		void store(Hasher::hash_t value) const {
+			const_cast<std::atomic<Hasher::hash_t>&>(atomic_).store(value, std::memory_order_relaxed);
+		}
+
+		std::atomic<Hasher::hash_t> atomic_;
+	};
 
 	Representation rep_;
-	Hasher::hash_t hash_ = 0;
+	AtomicHash hash_;
 	union {
 		RTLIL::SigChunk chunk_;
 		std::vector<RTLIL::SigBit> bits_; // LSB at index 0
@@ -1258,7 +1288,7 @@ private:
 			unpack();
 	}
 
-	void updhash() const;
+	Hasher::hash_t updhash() const;
 	void destroy() {
 		if (rep_ == CHUNK)
 			chunk_.~SigChunk();
@@ -1410,9 +1440,9 @@ public:
 	inline const SigSpec &bits() const { return *this; }
 
 	inline int size() const { return rep_ == CHUNK ? chunk_.width : GetSize(bits_); }
-	inline bool empty() const { return size() == 0; }
+	inline bool empty() const { return size() == 0; };
 
-	inline RTLIL::SigBit &operator[](int index) { inline_unpack(); hash_ = 0; return bits_.at(index); }
+	inline RTLIL::SigBit &operator[](int index) { inline_unpack(); hash_.clear(); return bits_.at(index); }
 	inline RTLIL::SigBit operator[](int index) const {
 		if (rep_ == CHUNK) {
 			if (index < 0 || index >= chunk_.width)
@@ -1551,7 +1581,15 @@ public:
 	operator std::vector<RTLIL::SigBit>() const { return to_sigbit_vector(); }
 	const RTLIL::SigBit &at(int offset, const RTLIL::SigBit &defval) { return offset < size() ? (*this)[offset] : defval; }
 
-	[[nodiscard]] Hasher hash_into(Hasher h) const { if (!hash_) updhash(); h.eat(hash_); return h; }
+	[[nodiscard]] Hasher hash_into(Hasher h) const {
+		Hasher::hash_t val;
+		if (std::optional<Hasher::hash_t> current = hash_.read())
+			val = *current;
+		else
+			val = updhash();
+		h.eat(val);
+		return h;
+	}
 
 #ifndef NDEBUG
 	void check(Module *mod = nullptr) const;

From 1cf3497d15070ce49bbc6258d1bee5d47b72ab81 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 7 Nov 2025 15:50:57 +0000
Subject: [PATCH 808/931] Repack SigSpecs when possible

---
 kernel/rtlil.cc | 139 +++++++++++++++++++++++++++++++++++++++++-------
 kernel/rtlil.h  |   1 +
 2 files changed, 122 insertions(+), 18 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 46ed8287c..a58487216 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -4692,6 +4692,39 @@ void RTLIL::SigSpec::unpack()
 	new (&bits_) std::vector<RTLIL::SigBit>(std::move(bits));
 }
 
+void RTLIL::SigSpec::try_repack()
+{
+	if (rep_ != BITS)
+		return;
+
+	cover("kernel.rtlil.sigspec.convert.try_repack");
+
+	int bits_size = GetSize(bits_);
+	if (bits_size == 0)
+		return;
+	if (bits_[0].is_wire()) {
+		for (int i = 1; i < bits_size; i++)
+			if (bits_[0].wire != bits_[i].wire || bits_[0].offset + i != bits_[i].offset)
+				return;
+		SigChunk chunk(bits_[0].wire, bits_[0].offset, bits_size);
+		bits_.~vector();
+		rep_ = CHUNK;
+		new (&chunk_) SigChunk(std::move(chunk));
+		return;
+	}
+	std::vector<RTLIL::State> bits;
+	bits.reserve(bits_size);
+	bits.push_back(bits_[0].data);
+	for (int i = 1; i < bits_size; i++) {
+		if (bits_[i].is_wire())
+			return;
+		bits.push_back(bits_[i].data);
+	}
+	bits_.~vector();
+	rep_ = CHUNK;
+	new (&chunk_) SigChunk(std::move(bits));
+}
+
 Hasher::hash_t RTLIL::SigSpec::updhash() const
 {
 	cover("kernel.rtlil.sigspec.hash");
@@ -4719,6 +4752,7 @@ void RTLIL::SigSpec::sort()
 	cover("kernel.rtlil.sigspec.sort");
 	std::sort(bits_.begin(), bits_.end());
 	hash_.clear();
+	try_repack();
 }
 
 void RTLIL::SigSpec::sort_and_unify()
@@ -4736,6 +4770,7 @@ void RTLIL::SigSpec::sort_and_unify()
 
 	*this = unique_bits;
 	hash_.clear();
+	try_repack();
 }
 
 void RTLIL::SigSpec::replace(const RTLIL::SigSpec &pattern, const RTLIL::SigSpec &with)
@@ -4759,13 +4794,17 @@ void RTLIL::SigSpec::replace(const RTLIL::SigSpec &pattern, const RTLIL::SigSpec
 	}
 
 	int this_size = size();
+	bool other_modified = false;
 	for (int j = 0; j < this_size; j++) {
 		auto it = pattern_to_with.find((*this)[j]);
 		if (it != pattern_to_with.end()) {
+			other_modified = true;
 			(*other)[j] = with[it->second];
 		}
 	}
 
+	if (other_modified)
+		other->try_repack();
 	other->check();
 }
 
@@ -4784,12 +4823,17 @@ void RTLIL::SigSpec::replace(const dict<RTLIL::SigBit, RTLIL::SigBit> &rules, RT
 	if (rules.empty()) return;
 
 	int this_size = size();
+	bool other_modified = false;
 	for (int i = 0; i < this_size; i++) {
 		auto it = rules.find((*this)[i]);
-		if (it != rules.end())
+		if (it != rules.end()) {
+			other_modified = true;
 			(*other)[i] = it->second;
+		}
 	}
 
+	if (other_modified)
+		other->try_repack();
 	other->check();
 }
 
@@ -4808,12 +4852,17 @@ void RTLIL::SigSpec::replace(const std::map<RTLIL::SigBit, RTLIL::SigBit> &rules
 	if (rules.empty()) return;
 
 	int this_size = size();
+	bool other_modified = false;
 	for (int i = 0; i < this_size; i++) {
 		auto it = rules.find((*this)[i]);
-		if (it != rules.end())
+		if (it != rules.end()) {
+			other_modified = true;
 			(*other)[i] = it->second;
+		}
 	}
 
+	if (other_modified)
+		other->try_repack();
 	other->check();
 }
 
@@ -4839,9 +4888,10 @@ void RTLIL::SigSpec::remove2(const RTLIL::SigSpec &pattern, RTLIL::SigSpec *othe
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
-		other->hash_.clear();
 	}
 
+	bool modified = false;
+	bool other_modified = false;
 	for (int i = GetSize(bits_) - 1; i >= 0; i--)
 	{
 		if (bits_[i].wire == NULL) continue;
@@ -4850,14 +4900,24 @@ void RTLIL::SigSpec::remove2(const RTLIL::SigSpec &pattern, RTLIL::SigSpec *othe
 			if (bits_[i].wire == pattern_chunk.wire &&
 				bits_[i].offset >= pattern_chunk.offset &&
 				bits_[i].offset < pattern_chunk.offset + pattern_chunk.width) {
+				modified = true;
 				bits_.erase(bits_.begin() + i);
-				if (other != NULL)
+				if (other != NULL) {
+					other_modified = true;
 					other->bits_.erase(other->bits_.begin() + i);
+				}
 				break;
 			}
 	}
-	hash_.clear();
 
+	if (modified) {
+		hash_.clear();
+		try_repack();
+	}
+	if (other_modified) {
+		other->hash_.clear();
+		other->try_repack();
+	}
 	check();
 }
 
@@ -4884,18 +4944,29 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::SigBit> &pattern, RTLIL::SigSpec
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
-		other->hash_.clear();
 	}
 
+	bool modified = false;
+	bool other_modified = false;
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
 		if (bits_[i].wire != NULL && pattern.count(bits_[i])) {
+			modified = true;
 			bits_.erase(bits_.begin() + i);
-			if (other != NULL)
+			if (other != NULL) {
+				other_modified = true;
 				other->bits_.erase(other->bits_.begin() + i);
+			}
 		}
 	}
-	hash_.clear();
 
+	if (modified) {
+		hash_.clear();
+		try_repack();
+	}
+	if (other_modified) {
+		other->hash_.clear();
+		other->try_repack();
+	}
 	check();
 }
 
@@ -4911,18 +4982,29 @@ void RTLIL::SigSpec::remove2(const std::set<RTLIL::SigBit> &pattern, RTLIL::SigS
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
-		other->hash_.clear();
 	}
 
+	bool modified = false;
+	bool other_modified = false;
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
 		if (bits_[i].wire != NULL && pattern.count(bits_[i])) {
+			modified = true;
 			bits_.erase(bits_.begin() + i);
-			if (other != NULL)
+			if (other != NULL) {
+				other_modified = true;
 				other->bits_.erase(other->bits_.begin() + i);
+			}
 		}
 	}
-	hash_.clear();
 
+	if (modified) {
+		hash_.clear();
+		try_repack();
+	}
+	if (other_modified) {
+		other->hash_.clear();
+		other->try_repack();
+	}
 	check();
 }
 
@@ -4938,18 +5020,29 @@ void RTLIL::SigSpec::remove2(const pool<RTLIL::Wire*> &pattern, RTLIL::SigSpec *
 	if (other != NULL) {
 		log_assert(size() == other->size());
 		other->unpack();
-		other->hash_.clear();
 	}
 
+	bool modified = false;
+	bool other_modified = false;
 	for (int i = GetSize(bits_) - 1; i >= 0; i--) {
 		if (bits_[i].wire != NULL && pattern.count(bits_[i].wire)) {
+			modified = true;
 			bits_.erase(bits_.begin() + i);
-			if (other != NULL)
+			if (other != NULL) {
+				other_modified = true;
 				other->bits_.erase(other->bits_.begin() + i);
+			}
 		}
 	}
-	hash_.clear();
 
+	if (modified) {
+		hash_.clear();
+		try_repack();
+	}
+	if (other_modified) {
+		other->hash_.clear();
+		other->try_repack();
+	}
 	check();
 }
 
@@ -5025,6 +5118,9 @@ void RTLIL::SigSpec::replace(int offset, const RTLIL::SigSpec &with)
 {
 	cover("kernel.rtlil.sigspec.replace_pos");
 
+	if (with.size() == 0)
+		return;
+
 	unpack();
 
 	log_assert(offset >= 0);
@@ -5037,6 +5133,7 @@ void RTLIL::SigSpec::replace(int offset, const RTLIL::SigSpec &with)
 		++i;
 	}
 	hash_.clear();
+	try_repack();
 
 	check();
 }
@@ -5050,6 +5147,7 @@ void RTLIL::SigSpec::remove_const()
 		if (chunk_.wire == NULL) {
 			chunk_.~SigChunk();
 			init_empty_bits();
+			hash_.clear();
 		}
 	}
 	else
@@ -5058,15 +5156,16 @@ void RTLIL::SigSpec::remove_const()
 
 		std::vector<RTLIL::SigBit> new_bits;
 		new_bits.reserve(bits_.size());
-
 		for (auto &bit : bits_)
 			if (bit.wire != NULL)
 				new_bits.push_back(bit);
-
-		bits_.swap(new_bits);
+		if (GetSize(new_bits) != GetSize(bits_)) {
+			bits_.swap(new_bits);
+			hash_.clear();
+			try_repack();
+		}
 	}
 
-	hash_.clear();
 	check();
 }
 
@@ -5074,6 +5173,9 @@ void RTLIL::SigSpec::remove(int offset, int length)
 {
 	cover("kernel.rtlil.sigspec.remove_pos");
 
+	if (length == 0)
+		return;
+
 	unpack();
 
 	log_assert(offset >= 0);
@@ -5083,6 +5185,7 @@ void RTLIL::SigSpec::remove(int offset, int length)
 	bits_.erase(bits_.begin() + offset, bits_.begin() + offset + length);
 
 	hash_.clear();
+	try_repack();
 	check();
 }
 
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index c11e603fb..98230ab1f 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1287,6 +1287,7 @@ private:
 		if (rep_ == CHUNK)
 			unpack();
 	}
+	void try_repack();
 
 	Hasher::hash_t updhash() const;
 	void destroy() {

From 224109151da988618ede22c284a218e9bb3f3c06 Mon Sep 17 00:00:00 2001
From: Rahul Bhagwat <rahulmbme@gmail.com>
Date: Sat, 8 Nov 2025 23:05:10 +0530
Subject: [PATCH 809/931] add specific package imports and tests

---
 frontends/ast/simplify.cc                     | 25 +++++++++++++-
 frontends/verilog/verilog_parser.y            | 33 ++++++++++++++++++-
 tests/verilog/package_import_specific.sv      | 14 ++++++++
 tests/verilog/package_import_specific.ys      |  5 +++
 .../verilog/package_import_specific_module.sv | 16 +++++++++
 5 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 tests/verilog/package_import_specific.sv
 create mode 100644 tests/verilog/package_import_specific.ys
 create mode 100644 tests/verilog/package_import_specific_module.sv

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 97abf7452..010f4e14f 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1123,16 +1123,39 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				}
 
 				if (package_node) {
-					// Import all names from the package into current scope
+					bool is_wildcard = child->children.empty();
+					std::set<std::string> import_items;
+					
+					// For specific imports, collect the list of items to import
+					if (!is_wildcard) {
+						for (auto& import_item : child->children) {
+							import_items.insert(import_item->str);
+						}
+					}
+					
+					// Import names from the package into current scope
 					for (auto& pkg_child : package_node->children) {
+						// Check if this is a specific import and if this item should be imported
+						if (!is_wildcard && import_items.count(pkg_child->str) == 0)
+							continue;
+						
 						if (pkg_child->type == AST_PARAMETER || pkg_child->type == AST_LOCALPARAM ||
 							pkg_child->type == AST_TYPEDEF || pkg_child->type == AST_FUNCTION ||
 							pkg_child->type == AST_TASK || pkg_child->type == AST_ENUM) {
+							// For wildcard imports, check if item already exists (from specific import)
+							if (is_wildcard && current_scope.count(pkg_child->str) > 0)
+								continue;
 							current_scope[pkg_child->str] = pkg_child.get();
 						}
 						if (pkg_child->type == AST_ENUM) {
 							for (auto& enode : pkg_child->children) {
 								log_assert(enode->type==AST_ENUM_ITEM);
+								// Check if this enum item should be imported
+								if (!is_wildcard && import_items.count(enode->str) == 0)
+									continue;
+								// For wildcard imports, check if item already exists (from specific import)
+								if (is_wildcard && current_scope.count(enode->str) > 0)
+									continue;
 								if (current_scope.count(enode->str) == 0)
 									current_scope[enode->str] = enode.get();
 								else
diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index ef8427679..e6c7f3672 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -428,6 +428,7 @@
 	#include <map>
 	#include <string>
 	#include <memory>
+	#include <vector>
 	#include "frontends/verilog/verilog_frontend.h"
 
 	struct specify_target {
@@ -462,6 +463,7 @@
 
 	using string_t = std::unique_ptr<std::string>;
 	using ast_t = std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode>;
+	using ast_list_t = std::vector<ast_t>;
 	using al_t = std::unique_ptr<YOSYS_NAMESPACE_PREFIX dict<YOSYS_NAMESPACE_PREFIX RTLIL::IdString, std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode>>>;
 	using specify_target_ptr_t = std::unique_ptr<struct specify_target>;
 	using specify_triple_ptr_t = std::unique_ptr<struct specify_triple>;
@@ -557,6 +559,8 @@
 %type <ast_t> struct_union
 %type <ast_node_type_t> asgn_binop inc_or_dec_op
 %type <ast_t> genvar_identifier
+%type <ast_list_t> import_item_list
+%type <ast_t> import_item
 
 %type <specify_target_ptr_t> specify_target
 %type <specify_triple_ptr_t> specify_triple specify_opt_triple
@@ -830,10 +834,37 @@ package_body_stmt:
 
 import_stmt:
 	TOK_IMPORT hierarchical_id TOK_PACKAGESEP TOK_ASTER TOK_SEMICOL {
-		// Create an import node to track package imports
+		// Create an import node to track specific and wildcard package imports
 		auto import_node = std::make_unique<AstNode>(@$, AST_IMPORT);
 		import_node->str = *$2;
 		extra->ast_stack.back()->children.push_back(std::move(import_node));
+	} |
+	TOK_IMPORT hierarchical_id TOK_PACKAGESEP import_item_list TOK_SEMICOL {
+		// Create an import node to track specific package imports
+		auto import_node = std::make_unique<AstNode>(@$, AST_IMPORT);
+		import_node->str = *$2;
+		// Move children from import_item_list to import_node
+		import_node->children = std::move($4);
+		extra->ast_stack.back()->children.push_back(std::move(import_node));
+	};
+
+import_item_list:
+	import_item {
+		ast_list_t list;
+		list.push_back(std::move($1));
+		$$ = std::move(list);
+	} |
+	import_item_list TOK_COMMA import_item {
+		$1.push_back(std::move($3));
+		$$ = std::move($1);
+	};
+
+import_item:
+	TOK_ID {
+		// Create a simple node to store the imported item name
+		auto item_node = std::make_unique<AstNode>(@$, AST_NONE);
+		item_node->str = *$1;
+		$$ = std::move(item_node);
 	};
 
 interface:
diff --git a/tests/verilog/package_import_specific.sv b/tests/verilog/package_import_specific.sv
new file mode 100644
index 000000000..97004ed56
--- /dev/null
+++ b/tests/verilog/package_import_specific.sv
@@ -0,0 +1,14 @@
+package package_import_specific;
+
+  localparam integer
+    DATA_WIDTH = 8,
+    ADDR_WIDTH = 4;
+
+  localparam logic [2:0]
+    IDLE  = 3'b000,
+    START = 3'b001,
+    DATA  = 3'b010,
+    STOP  = 3'b100,
+    DONE  = 3'b101;
+
+endpackage
diff --git a/tests/verilog/package_import_specific.ys b/tests/verilog/package_import_specific.ys
new file mode 100644
index 000000000..8b183aac4
--- /dev/null
+++ b/tests/verilog/package_import_specific.ys
@@ -0,0 +1,5 @@
+read_verilog -sv package_import_specific.sv
+read_verilog -sv package_import_specific_module.sv
+hierarchy -check
+proc
+opt -full
diff --git a/tests/verilog/package_import_specific_module.sv b/tests/verilog/package_import_specific_module.sv
new file mode 100644
index 000000000..a568af4d2
--- /dev/null
+++ b/tests/verilog/package_import_specific_module.sv
@@ -0,0 +1,16 @@
+import package_import_specific::DATA_WIDTH;
+import package_import_specific::IDLE;
+
+module package_import_specific_module;
+  logic [DATA_WIDTH-1:0] data;
+  logic [3:0] addr;
+  logic [2:0] state;
+
+  always_comb begin
+    case (state)
+      IDLE: data = 8'h00;
+      default: data = 8'hFF;
+    endcase
+  end
+
+endmodule

From 54e5eb1c3c7dea139401e811564bbf2e9ca91f60 Mon Sep 17 00:00:00 2001
From: Rahul Bhagwat <rahulmbme@gmail.com>
Date: Sat, 8 Nov 2025 23:16:52 +0530
Subject: [PATCH 810/931] no use vector

---
 frontends/verilog/verilog_parser.y | 35 ++++++++++--------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/frontends/verilog/verilog_parser.y b/frontends/verilog/verilog_parser.y
index e6c7f3672..684727d5b 100644
--- a/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@ -428,7 +428,6 @@
 	#include <map>
 	#include <string>
 	#include <memory>
-	#include <vector>
 	#include "frontends/verilog/verilog_frontend.h"
 
 	struct specify_target {
@@ -463,7 +462,6 @@
 
 	using string_t = std::unique_ptr<std::string>;
 	using ast_t = std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode>;
-	using ast_list_t = std::vector<ast_t>;
 	using al_t = std::unique_ptr<YOSYS_NAMESPACE_PREFIX dict<YOSYS_NAMESPACE_PREFIX RTLIL::IdString, std::unique_ptr<YOSYS_NAMESPACE_PREFIX AST::AstNode>>>;
 	using specify_target_ptr_t = std::unique_ptr<struct specify_target>;
 	using specify_triple_ptr_t = std::unique_ptr<struct specify_triple>;
@@ -559,8 +557,6 @@
 %type <ast_t> struct_union
 %type <ast_node_type_t> asgn_binop inc_or_dec_op
 %type <ast_t> genvar_identifier
-%type <ast_list_t> import_item_list
-%type <ast_t> import_item
 
 %type <specify_target_ptr_t> specify_target
 %type <specify_triple_ptr_t> specify_triple specify_opt_triple
@@ -833,38 +829,31 @@ package_body_stmt:
 	typedef_decl | localparam_decl | param_decl | task_func_decl;
 
 import_stmt:
-	TOK_IMPORT hierarchical_id TOK_PACKAGESEP TOK_ASTER TOK_SEMICOL {
-		// Create an import node to track specific and wildcard package imports
+	TOK_IMPORT TOK_ID TOK_PACKAGESEP TOK_ASTER TOK_SEMICOL {
+		// Create an import node to track wildcard package imports
 		auto import_node = std::make_unique<AstNode>(@$, AST_IMPORT);
 		import_node->str = *$2;
 		extra->ast_stack.back()->children.push_back(std::move(import_node));
 	} |
-	TOK_IMPORT hierarchical_id TOK_PACKAGESEP import_item_list TOK_SEMICOL {
-		// Create an import node to track specific package imports
-		auto import_node = std::make_unique<AstNode>(@$, AST_IMPORT);
+	TOK_IMPORT TOK_ID TOK_PACKAGESEP {
+		// Start a specific import: create and push the AST_IMPORT node
+		AstNode* import_node = extra->pushChild(std::make_unique<AstNode>(@$, AST_IMPORT));
 		import_node->str = *$2;
-		// Move children from import_item_list to import_node
-		import_node->children = std::move($4);
-		extra->ast_stack.back()->children.push_back(std::move(import_node));
+	} import_item_list TOK_SEMICOL {
+		// Done collecting specific items, pop the AST_IMPORT node
+		extra->ast_stack.pop_back();
 	};
 
 import_item_list:
-	import_item {
-		ast_list_t list;
-		list.push_back(std::move($1));
-		$$ = std::move(list);
-	} |
-	import_item_list TOK_COMMA import_item {
-		$1.push_back(std::move($3));
-		$$ = std::move($1);
-	};
+	import_item |
+	import_item_list TOK_COMMA import_item ;
 
 import_item:
 	TOK_ID {
-		// Create a simple node to store the imported item name
+		// Append this specific import name under the current AST_IMPORT
 		auto item_node = std::make_unique<AstNode>(@$, AST_NONE);
 		item_node->str = *$1;
-		$$ = std::move(item_node);
+		extra->ast_stack.back()->children.push_back(std::move(item_node));
 	};
 
 interface:

From 0452955069e051d5916f0d1ab04bd0ca43f75697 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 10 Nov 2025 12:02:21 +0100
Subject: [PATCH 811/931] rtlil: add explanatory note to SigSpec::Chunks

---
 kernel/rtlil.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 98230ab1f..f81cba38c 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1353,6 +1353,9 @@ public:
 		return *this;
 	}
 
+	// SigSpec::Chunks holds one reconstructed chunk at a time
+	// to provide the SigSpec::chunks() read-only chunks view
+	// since vector<SigChunk> SigSpec::chunks_ has been removed
 	struct Chunks {
 		Chunks(const SigSpec &spec) : spec(spec) {}
 		struct const_iterator {

From ee5b8a97b9b6cbd0c22ee5555091b0094092d450 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 10 Nov 2025 12:02:36 +0100
Subject: [PATCH 812/931] rtlil: avoid clang warning

---
 kernel/rtlil.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index f81cba38c..79cc73e45 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1415,10 +1415,7 @@ public:
 			return chunk_vector.size();
 		}
 		int size() const {
-			int result = 0;
-			for (const SigChunk &_: *this)
-				++result;
-			return result;
+			return std::distance(begin(), end());
 		}
 		const SigChunk &at(int index) {
 			ensure_chunk_vector();

From 4dac5cd1f85d9b90ba5dd86422213aeff1bcd951 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 10 Nov 2025 12:08:35 +0100
Subject: [PATCH 813/931] rtlil: note SigSpec only has one chunk in internal
 docs

---
 .../yosys_internals/formats/rtlil_rep.rst     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/docs/source/yosys_internals/formats/rtlil_rep.rst b/docs/source/yosys_internals/formats/rtlil_rep.rst
index b0cbfe3a5..dbd69c7e4 100644
--- a/docs/source/yosys_internals/formats/rtlil_rep.rst
+++ b/docs/source/yosys_internals/formats/rtlil_rep.rst
@@ -194,17 +194,18 @@ RTLIL::SigSpec
 
 A "signal" is everything that can be applied to a cell port. I.e.
 
--  | Any constant value of arbitrary bit-width
+-  | A bit from a wire (``RTLIL::SigBit``)
+   | 1em For example: ``mywire[24]``
+
+-  | A range of bits from a wire (wire variant of ``RTLIL::SigChunk``)
+   | 1em For example: ``mywire, mywire[15:8]``
+
+-  | Any constant value of arbitrary bit-width (``std::vector<RTLIL::State>>`` variant of ``RTLIL::SigChunk``)
    | 1em For example: ``1337, 16'b0000010100111001, 1'b1, 1'bx``
 
--  | All bits of a wire or a selection of bits from a wire
-   | 1em For example: ``mywire, mywire[24], mywire[15:8]``
-
--  | Concatenations of the above
-   | 1em For example: ``{16'd1337, mywire[15:8]}``
-
-The ``RTLIL::SigSpec`` data type is used to represent signals. The
-``RTLIL::Cell`` object contains one ``RTLIL::SigSpec`` for each cell port.
+The ``RTLIL::SigSpec`` data type is used to represent signals.
+It contains a single ``RTLIL::SigChunk`` or a vector of ``RTLIL::SigBit``.
+The ``RTLIL::Cell`` object contains one ``RTLIL::SigSpec`` for each cell port.
 
 In addition, connections between wires are represented using a pair of
 ``RTLIL::SigSpec`` objects. Such pairs are needed in different locations.

From 8f53d21ea7eaec66ab93cb611f36fbf9e798935b Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 10 Nov 2025 14:26:10 +0100
Subject: [PATCH 814/931] simplify: refactor specific package import

---
 frontends/ast/simplify.cc | 85 ++++++++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 37 deletions(-)

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 010f4e14f..308406591 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -889,6 +889,52 @@ static void check_auto_nosync(AstNode *node)
 		check_auto_nosync(child.get());
 }
 
+class PackageImporter {
+	std::set<std::string> import_items;
+	bool is_wildcard;
+	const AstNode* node;
+public:
+	PackageImporter(const AstNode* n, const AstNode* child) : node(n) {
+		is_wildcard = child->children.empty();
+		// For specific imports, collect the list of items to import
+		if (!is_wildcard) {
+			for (auto& item : child->children) {
+				import_items.insert(item->str);
+			}
+		}
+	}
+
+	void import(std::map<std::string, AstNode*>& scope, AstNode* to_import) const {
+		// Check if this is a specific import and if this item should be imported
+		if (!is_wildcard && import_items.count(to_import->str) == 0)
+			return;
+
+		if (to_import->type == AST_PARAMETER || to_import->type == AST_LOCALPARAM ||
+			to_import->type == AST_TYPEDEF || to_import->type == AST_FUNCTION ||
+			to_import->type == AST_TASK || to_import->type == AST_ENUM) {
+			// For wildcard imports, check if item already exists (from specific import)
+			if (is_wildcard && scope.count(to_import->str) > 0)
+				return;
+			scope[to_import->str] = to_import;
+		}
+		if (to_import->type == AST_ENUM) {
+			for (auto& enode : to_import->children) {
+				log_assert(enode->type==AST_ENUM_ITEM);
+				// Check if this enum item should be imported
+				if (!is_wildcard && import_items.count(enode->str) == 0)
+					continue;
+				// For wildcard imports, check if item already exists (from specific import)
+				if (is_wildcard && scope.count(enode->str) > 0)
+					continue;
+				if (scope.count(enode->str) == 0)
+					scope[enode->str] = enode.get();
+				else
+					node->input_error("enum item %s already exists in current scope\n", enode->str);
+			}
+		}
+	}
+};
+
 // convert the AST into a simpler AST that has all parameters substituted by their
 // values, unrolled for-loops, expanded generate blocks, etc. when this function
 // is done with an AST it can be converted into RTLIL using genRTLIL().
@@ -1123,45 +1169,10 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
 				}
 
 				if (package_node) {
-					bool is_wildcard = child->children.empty();
-					std::set<std::string> import_items;
-					
-					// For specific imports, collect the list of items to import
-					if (!is_wildcard) {
-						for (auto& import_item : child->children) {
-							import_items.insert(import_item->str);
-						}
-					}
-					
+					PackageImporter importer(this, child);
 					// Import names from the package into current scope
 					for (auto& pkg_child : package_node->children) {
-						// Check if this is a specific import and if this item should be imported
-						if (!is_wildcard && import_items.count(pkg_child->str) == 0)
-							continue;
-						
-						if (pkg_child->type == AST_PARAMETER || pkg_child->type == AST_LOCALPARAM ||
-							pkg_child->type == AST_TYPEDEF || pkg_child->type == AST_FUNCTION ||
-							pkg_child->type == AST_TASK || pkg_child->type == AST_ENUM) {
-							// For wildcard imports, check if item already exists (from specific import)
-							if (is_wildcard && current_scope.count(pkg_child->str) > 0)
-								continue;
-							current_scope[pkg_child->str] = pkg_child.get();
-						}
-						if (pkg_child->type == AST_ENUM) {
-							for (auto& enode : pkg_child->children) {
-								log_assert(enode->type==AST_ENUM_ITEM);
-								// Check if this enum item should be imported
-								if (!is_wildcard && import_items.count(enode->str) == 0)
-									continue;
-								// For wildcard imports, check if item already exists (from specific import)
-								if (is_wildcard && current_scope.count(enode->str) > 0)
-									continue;
-								if (current_scope.count(enode->str) == 0)
-									current_scope[enode->str] = enode.get();
-								else
-									input_error("enum item %s already exists in current scope\n", enode->str);
-							}
-						}
+						importer.import(current_scope, pkg_child.get());
 					}
 					// Remove the import node since it's been processed
 					children.erase(children.begin() + i);

From f7881ced9e8d2a1fdeef33ceb5a4021fb8eaaf24 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Nov 2025 00:25:20 +0000
Subject: [PATCH 815/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index dd7a8c022..575d1a7f3 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+162
+YOSYS_VER := 0.58+202
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 03eb2206d7b8a830dd32d0e1673986318111a4c3 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 11 Nov 2025 07:57:22 +0100
Subject: [PATCH 816/931] Release version 0.59

---
 CHANGELOG           | 17 ++++++++++++++++-
 Makefile            |  4 ++--
 docs/source/conf.py |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8ceefee41..d267a4826 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,8 +2,23 @@
 List of major changes and improvements between releases
 =======================================================
 
-Yosys 0.58 .. Yosys 0.59-dev
+Yosys 0.58 .. Yosys 0.59
 --------------------------
+ * Various
+    - Pyosys is rewritten using pybind11.
+    - alumacc: merge independent of sign.
+    - write_btor: Include $assert and $assume cells in -ywmap output.
+    - RTLIL parser rewritten for efficiency.
+    - Wildcards enabled for Liberty file consuming.
+    - timeest: Add top ports launching/sampling.
+
+ * New commands and options
+    - Added "-apply_derived_type" option to "box_derive" pass.
+    - Added "-publish_icells" option to "chtype" pass.
+    - Added "-width" option to "sim" pass.
+    - Added "sort" pass for sorting the design objects.
+    - Merged "synth_ecp5" and "synth_nexus" into "synth_lattice" pass.
+    - Added "-strict-gw5a-dffs" and "-setundef" options to "synth_gowin" pass.
 
 Yosys 0.57 .. Yosys 0.58
 --------------------------
diff --git a/Makefile b/Makefile
index 575d1a7f3..2501a7ea0 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.58+202
+YOSYS_VER := 0.59
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -184,7 +184,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 157aabb.. | wc -l`/;" Makefile
+#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 157aabb.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 6740fab83..fb106bddb 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -6,7 +6,7 @@ import os
 project = 'YosysHQ Yosys'
 author = 'YosysHQ GmbH'
 copyright ='2025 YosysHQ GmbH'
-yosys_ver = "0.58"
+yosys_ver = "0.59"
 
 # select HTML theme
 html_theme = 'furo-ys'

From fd40418c102eb2fdc15ca5cd5c2276468fa7ddd0 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 11 Nov 2025 09:26:05 +0100
Subject: [PATCH 817/931] Next dev cycle

---
 CHANGELOG | 3 +++
 Makefile  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d267a4826..6cefcc3ac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 List of major changes and improvements between releases
 =======================================================
 
+Yosys 0.59 .. Yosys 0.60-dev
+--------------------------
+
 Yosys 0.58 .. Yosys 0.59
 --------------------------
  * Various
diff --git a/Makefile b/Makefile
index 2501a7ea0..09dcd0639 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.59
+YOSYS_VER := 0.59+0
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)
@@ -184,7 +184,7 @@ endif
 OBJS = kernel/version_$(GIT_REV).o
 
 bumpversion:
-#	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 157aabb.. | wc -l`/;" Makefile
+	sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline 03eb220.. | wc -l`/;" Makefile
 
 ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
 

From e29328ec99e6b8a3cc5bd60c169ebed47f1b279c Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Tue, 11 Nov 2025 13:48:35 +0200
Subject: [PATCH 818/931] hotfix: workaround for pyosys build failure

temporarily exclude `SigSpec::chunks` from the interface until nested structs/classes are supported
---
 pyosys/generator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyosys/generator.py b/pyosys/generator.py
index 65d886cf0..0883a7ba4 100644
--- a/pyosys/generator.py
+++ b/pyosys/generator.py
@@ -192,7 +192,7 @@ pyosys_headers = [
             ),
             PyosysClass("SigChunk"),
             PyosysClass("SigBit", hash_expr="s"),
-            PyosysClass("SigSpec", hash_expr="s"),
+            PyosysClass("SigSpec", hash_expr="s", denylist={"chunks"}),
             PyosysClass(
                 "Cell",
                 ref_only=True,

From 967e91aa73e84d921591f2f3b34aa5cad5124f5c Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 11 Nov 2025 13:44:50 +0100
Subject: [PATCH 819/931] libparse: fix parsing and memory safety of quoted
 values

---
 passes/techmap/libparse.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/passes/techmap/libparse.cc b/passes/techmap/libparse.cc
index 9e2556891..a9ae75c01 100644
--- a/passes/techmap/libparse.cc
+++ b/passes/techmap/libparse.cc
@@ -123,7 +123,9 @@ int LibertyInputStream::peek_cold(size_t offset)
 		if (!extend_buffer_at_least(offset + 1))
 			return EOF;
 	}
-
+#ifdef log_assert
+	log_assert(buf_pos + offset < buffer.size());
+#endif
 	return buffer[buf_pos + offset];
 }
 
@@ -458,7 +460,6 @@ int LibertyParser::lexer_inner(std::string &str)
 	// if it wasn't an identifer, number of array range,
 	// maybe it's a string?
 	if (c == '"') {
-		f.consume(1);
 		size_t i = 0;
 		while (true) {
 			c = f.peek(i);
@@ -469,14 +470,13 @@ int LibertyParser::lexer_inner(std::string &str)
 				break;
 		}
 		str.clear();
-		f.unget();
-		str.append(f.buffered_data(), f.buffered_data() + i + 1);
+		str.append(f.buffered_data(), f.buffered_data() + i);
 		// Usage in filterlib is expected to retain quotes
 		// but yosys expects to get unquoted
 #ifdef FILTERLIB
 		str = "\"" + str + "\"";
 #endif
-		f.consume(i + 2);
+		f.consume(i + 1);
 		return 'v';
 	}
 

From 5f76729cbbcc6fd98f1cacbcf4e598cd74f30857 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 12 Nov 2025 00:24:49 +0000
Subject: [PATCH 820/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 09dcd0639..f29c15484 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.59+0
+YOSYS_VER := 0.59+9
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 2319d82efbec1f9f1f06fd3d7a338aafa4a0904a Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 16 Oct 2025 03:37:49 +0000
Subject: [PATCH 821/931] Make IdString::begins_width/ends_with take
 std::string_view so we avoid a strlen when the parameter is a string constant

---
 kernel/rtlil.h | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 27f610f85..85e89686e 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -405,16 +405,15 @@ struct RTLIL::IdString
 		return strncmp(c_str()+pos, s, len);
 	}
 
-	bool begins_with(const char* prefix) const {
-		size_t len = strlen(prefix);
-		if (size() < len) return false;
-		return compare(0, len, prefix) == 0;
+	bool begins_with(std::string_view prefix) const {
+		if (size() < prefix.size()) return false;
+		return compare(0, prefix.size(), prefix.data()) == 0;
 	}
 
-	bool ends_with(const char* suffix) const {
-		size_t len = strlen(suffix);
-		if (size() < len) return false;
-		return compare(size()-len, len, suffix) == 0;
+	bool ends_with(std::string_view suffix) const {
+		size_t sz = size();
+		if (sz < suffix.size()) return false;
+		return compare(sz - suffix.size(), suffix.size(), suffix.data()) == 0;
 	}
 
 	bool contains(const char* str) const {

From 32641bbf935a44597c50d285beacb812f18d9075 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 16 Oct 2025 04:05:56 +0000
Subject: [PATCH 822/931] Make IdString::contains take std::string_view so we
 avoid a strlen when the parameter is a string constant

---
 kernel/rtlil.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 85e89686e..b6104e0e5 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -416,8 +416,8 @@ struct RTLIL::IdString
 		return compare(sz - suffix.size(), suffix.size(), suffix.data()) == 0;
 	}
 
-	bool contains(const char* str) const {
-		return strstr(c_str(), str);
+	bool contains(std::string_view s) const {
+		return std::string_view(c_str()).find(s) != std::string::npos;
 	}
 
 	size_t size() const {

From 20639906e3c645a9ae73076169e4ead98bdd4ab1 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Wed, 20 Aug 2025 03:47:03 +0000
Subject: [PATCH 823/931] Store IdString lengths and use them

---
 kernel/io.cc    |  2 +-
 kernel/rtlil.cc |  6 ++---
 kernel/rtlil.h  | 58 +++++++++++++++++++++++++++++--------------------
 3 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/kernel/io.cc b/kernel/io.cc
index e9801f63e..e713cff85 100644
--- a/kernel/io.cc
+++ b/kernel/io.cc
@@ -606,7 +606,7 @@ void format_emit_idstring(std::string &result, std::string_view spec, int *dynam
 {
 	if (spec == "%s") {
 		// Format checking will have guaranteed num_dynamic_ints == 0.
-		result += arg.c_str();
+		result += arg.str_view();
 		return;
 	}
 	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg.c_str());
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index a58487216..5dac6016c 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -35,7 +35,7 @@ YOSYS_NAMESPACE_BEGIN
 
 bool RTLIL::IdString::destruct_guard_ok = false;
 RTLIL::IdString::destruct_guard_t RTLIL::IdString::destruct_guard;
-std::vector<char*> RTLIL::IdString::global_id_storage_;
+std::vector<RTLIL::IdString::Storage> RTLIL::IdString::global_id_storage_;
 std::unordered_map<std::string_view, int> RTLIL::IdString::global_id_index_;
 #ifndef YOSYS_NO_IDS_REFCNT
 std::vector<uint32_t> RTLIL::IdString::global_refcount_storage_;
@@ -57,14 +57,14 @@ static void populate(std::string_view name)
 		name = name.substr(1);
 	}
 	RTLIL::IdString::global_id_index_.insert({name, GetSize(RTLIL::IdString::global_id_storage_)});
-	RTLIL::IdString::global_id_storage_.push_back(const_cast<char*>(name.data()));
+	RTLIL::IdString::global_id_storage_.push_back({const_cast<char*>(name.data()), GetSize(name)});
 }
 
 void RTLIL::IdString::prepopulate()
 {
 	int size = static_cast<short>(RTLIL::StaticId::STATIC_ID_END);
 	global_id_storage_.reserve(size);
-	RTLIL::IdString::global_id_storage_.push_back(const_cast<char*>(""));
+	RTLIL::IdString::global_id_storage_.push_back({const_cast<char*>(""), 0});
 	global_id_index_.reserve(size);
 	global_refcount_storage_.resize(size, 1);
 #define X(N) populate("\\" #N);
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index b6104e0e5..45d696321 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -138,6 +138,11 @@ namespace RTLIL
 
 struct RTLIL::IdString
 {
+	struct Storage {
+		char *buf;
+		int size;
+	};
+
 	#undef YOSYS_XTRACE_GET_PUT
 	#undef YOSYS_SORT_ID_FREE_LIST
 	#undef YOSYS_USE_STICKY_IDS
@@ -151,7 +156,7 @@ struct RTLIL::IdString
 		~destruct_guard_t() { destruct_guard_ok = false; }
 	} destruct_guard;
 
-	static std::vector<char*> global_id_storage_;
+	static std::vector<Storage> global_id_storage_;
 	static std::unordered_map<std::string_view, int> global_id_index_;
 #ifndef YOSYS_NO_IDS_REFCNT
 	// For prepopulated IdStrings, the refcount is meaningless since they
@@ -174,10 +179,10 @@ struct RTLIL::IdString
 	#ifdef YOSYS_XTRACE_GET_PUT
 		for (int idx = 0; idx < GetSize(global_id_storage_); idx++)
 		{
-			if (global_id_storage_.at(idx) == nullptr)
+			if (global_id_storage_.at(idx).buf == nullptr)
 				log("#X# DB-DUMP index %d: FREE\n", idx);
 			else
-				log("#X# DB-DUMP index %d: '%s' (ref %u)\n", idx, global_id_storage_.at(idx), global_refcount_storage_.at(idx));
+				log("#X# DB-DUMP index %d: '%s' (ref %u)\n", idx, global_id_storage_.at(idx).buf, global_refcount_storage_.at(idx));
 		}
 	#endif
 	}
@@ -204,7 +209,7 @@ struct RTLIL::IdString
 	#endif
 	#ifdef YOSYS_XTRACE_GET_PUT
 		if (yosys_xtrace && idx >= static_cast<short>(StaticId::STATIC_ID_END))
-			log("#X# GET-BY-INDEX '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
+			log("#X# GET-BY-INDEX '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx).buf, idx, global_refcount_storage_.at(idx));
 	#endif
 		return idx;
 	}
@@ -225,7 +230,7 @@ struct RTLIL::IdString
 	#endif
 	#ifdef YOSYS_XTRACE_GET_PUT
 			if (yosys_xtrace)
-				log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(it->second), it->second, global_refcount_storage_.at(it->second));
+				log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(it->second).buf, it->second, global_refcount_storage_.at(it->second));
 	#endif
 			return it->second;
 		}
@@ -244,32 +249,31 @@ struct RTLIL::IdString
 		if (global_free_idx_list_.empty()) {
 			log_assert(global_id_storage_.size() < 0x40000000);
 			global_free_idx_list_.push_back(global_id_storage_.size());
-			global_id_storage_.push_back(nullptr);
+			global_id_storage_.push_back({nullptr, 0});
 			global_refcount_storage_.push_back(0);
 		}
 
 		int idx = global_free_idx_list_.back();
 		global_free_idx_list_.pop_back();
-		char* buf = static_cast<char*>(malloc(p.size() + 1));
-		memcpy(buf, p.data(), p.size());
-		buf[p.size()] = 0;
-		global_id_storage_.at(idx) = buf;
-		global_id_index_.insert(it, {std::string_view(buf, p.size()), idx});
 		global_refcount_storage_.at(idx)++;
 	#else
 		int idx = global_id_storage_.size();
-		global_id_storage_.push_back(strdup(p));
-		global_id_index_[global_id_storage_.back()] = idx;
+		global_id_storage_.push_back({nullptr, 0});
 	#endif
+		char* buf = static_cast<char*>(malloc(p.size() + 1));
+		memcpy(buf, p.data(), p.size());
+		buf[p.size()] = 0;
+		global_id_storage_.at(idx) = {buf, GetSize(p)};
+		global_id_index_.insert(it, {std::string_view(buf, p.size()), idx});
 
 		if (yosys_xtrace) {
-			log("#X# New IdString '%s' with index %d.\n", global_id_storage_.at(idx), idx);
+			log("#X# New IdString '%s' with index %d.\n", global_id_storage_.at(idx).buf, idx);
 			log_backtrace("-X- ", yosys_xtrace-1);
 		}
 
 	#ifdef YOSYS_XTRACE_GET_PUT
 		if (yosys_xtrace)
-			log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
+			log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx).buf, idx, global_refcount_storage_.at(idx));
 	#endif
 
 	#ifdef YOSYS_USE_STICKY_IDS
@@ -294,7 +298,7 @@ struct RTLIL::IdString
 
 	#ifdef YOSYS_XTRACE_GET_PUT
 		if (yosys_xtrace) {
-			log("#X# PUT '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
+			log("#X# PUT '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx).buf, idx, global_refcount_storage_.at(idx));
 		}
 	#endif
 
@@ -308,14 +312,14 @@ struct RTLIL::IdString
 	static inline void free_reference(int idx)
 	{
 		if (yosys_xtrace) {
-			log("#X# Removed IdString '%s' with index %d.\n", global_id_storage_.at(idx), idx);
+			log("#X# Removed IdString '%s' with index %d.\n", global_id_storage_.at(idx).buf, idx);
 			log_backtrace("-X- ", yosys_xtrace-1);
 		}
 		log_assert(idx >= static_cast<short>(StaticId::STATIC_ID_END));
 
-		global_id_index_.erase(global_id_storage_.at(idx));
-		free(global_id_storage_.at(idx));
-		global_id_storage_.at(idx) = nullptr;
+		global_id_index_.erase(global_id_storage_.at(idx).buf);
+		free(global_id_storage_.at(idx).buf);
+		global_id_storage_.at(idx) = {nullptr, 0};
 		global_free_idx_list_.push_back(idx);
 	}
 #else
@@ -359,11 +363,17 @@ struct RTLIL::IdString
 	constexpr inline const IdString &id_string() const { return *this; }
 
 	inline const char *c_str() const {
-		return global_id_storage_.at(index_);
+		return global_id_storage_.at(index_).buf;
 	}
 
 	inline std::string str() const {
-		return std::string(global_id_storage_.at(index_));
+		const Storage &storage = global_id_storage_.at(index_);
+		return std::string(storage.buf, storage.size);
+	}
+
+	inline std::string_view str_view() const {
+		const Storage &storage = global_id_storage_.at(index_);
+		return std::string_view(storage.buf, storage.size);
 	}
 
 	inline bool operator<(const IdString &rhs) const {
@@ -395,7 +405,7 @@ struct RTLIL::IdString
 	}
 
 	std::string substr(size_t pos = 0, size_t len = std::string::npos) const {
-		if (len == std::string::npos || len >= strlen(c_str() + pos))
+		if (len == std::string::npos || len + pos >= size())
 			return std::string(c_str() + pos);
 		else
 			return std::string(c_str() + pos, len);
@@ -421,7 +431,7 @@ struct RTLIL::IdString
 	}
 
 	size_t size() const {
-		return strlen(c_str());
+		return global_id_storage_.at(index_).size;
 	}
 
 	bool empty() const {

From e84bc3c6c542f18bbc53ee21ecbbd0b1e1f9bb0d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 16 Oct 2025 02:13:33 +0000
Subject: [PATCH 824/931] Remove explicit empty-string check when looking up
 IdStrings

---
 kernel/rtlil.cc | 3 ++-
 kernel/rtlil.h  | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 5dac6016c..76744836d 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -64,9 +64,10 @@ void RTLIL::IdString::prepopulate()
 {
 	int size = static_cast<short>(RTLIL::StaticId::STATIC_ID_END);
 	global_id_storage_.reserve(size);
-	RTLIL::IdString::global_id_storage_.push_back({const_cast<char*>(""), 0});
 	global_id_index_.reserve(size);
 	global_refcount_storage_.resize(size, 1);
+	RTLIL::IdString::global_id_index_.insert({"", 0});
+	RTLIL::IdString::global_id_storage_.push_back({const_cast<char*>(""), 0});
 #define X(N) populate("\\" #N);
 #include "kernel/constids.inc"
 #undef X
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 45d696321..e005ac65e 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -237,9 +237,6 @@ struct RTLIL::IdString
 
 		ensure_prepopulated();
 
-		if (p.empty())
-			return 0;
-
 		log_assert(p[0] == '$' || p[0] == '\\');
 		for (char ch : p)
 			if ((unsigned)ch <= (unsigned)' ')

From 0fe79ce01bc5df9cc23793875a0c9e5be05e7995 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 9 Oct 2025 22:54:26 +0000
Subject: [PATCH 825/931] Make RTLIL::Design::get_all_designs() unconditionally
 defined

---
 kernel/rtlil.cc | 6 ------
 kernel/rtlil.h  | 2 --
 2 files changed, 8 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 76744836d..670b61afd 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -1084,9 +1084,7 @@ RTLIL::Design::Design()
 	refcount_modules_ = 0;
 	push_full_selection();
 
-#ifdef YOSYS_ENABLE_PYTHON
 	RTLIL::Design::get_all_designs()->insert(std::pair<unsigned int, RTLIL::Design*>(hashidx_, this));
-#endif
 }
 
 RTLIL::Design::~Design()
@@ -1095,18 +1093,14 @@ RTLIL::Design::~Design()
 		delete pr.second;
 	for (auto n : bindings_)
 		delete n;
-#ifdef YOSYS_ENABLE_PYTHON
 	RTLIL::Design::get_all_designs()->erase(hashidx_);
-#endif
 }
 
-#ifdef YOSYS_ENABLE_PYTHON
 static std::map<unsigned int, RTLIL::Design*> all_designs;
 std::map<unsigned int, RTLIL::Design*> *RTLIL::Design::get_all_designs(void)
 {
 	return &all_designs;
 }
-#endif
 
 RTLIL::ObjRange<RTLIL::Module*> RTLIL::Design::modules()
 {
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index e005ac65e..fbf9292b3 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1883,9 +1883,7 @@ struct RTLIL::Design
 	// returns all selected unboxed whole modules, warning the user if any
 	// partially selected or boxed modules have been ignored
 	std::vector<RTLIL::Module*> selected_unboxed_whole_modules_warn() const { return selected_modules(SELECT_WHOLE_WARN, SB_UNBOXED_WARN); }
-#ifdef YOSYS_ENABLE_PYTHON
 	static std::map<unsigned int, RTLIL::Design*> *get_all_designs(void);
-#endif
 };
 
 struct RTLIL::Module : public RTLIL::NamedObject

From d28f97e9da2d168406a2758a4b7cfd3d65f94159 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 9 Oct 2025 23:40:47 +0000
Subject: [PATCH 826/931] Remove YOSYS_USE_STICKY_IDS

---
 kernel/rtlil.cc |  4 ----
 kernel/rtlil.h  | 23 -----------------------
 2 files changed, 27 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 670b61afd..c6358729a 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -41,10 +41,6 @@ std::unordered_map<std::string_view, int> RTLIL::IdString::global_id_index_;
 std::vector<uint32_t> RTLIL::IdString::global_refcount_storage_;
 std::vector<int> RTLIL::IdString::global_free_idx_list_;
 #endif
-#ifdef YOSYS_USE_STICKY_IDS
-int RTLIL::IdString::last_created_idx_[8];
-int RTLIL::IdString::last_created_idx_ptr_;
-#endif
 
 #define X(_id) const RTLIL::IdString RTLIL::IDInternal::_id(RTLIL::StaticId::_id);
 #include "kernel/constids.inc"
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index fbf9292b3..556f936e9 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -145,7 +145,6 @@ struct RTLIL::IdString
 
 	#undef YOSYS_XTRACE_GET_PUT
 	#undef YOSYS_SORT_ID_FREE_LIST
-	#undef YOSYS_USE_STICKY_IDS
 	#undef YOSYS_NO_IDS_REFCNT
 
 	// the global id string cache
@@ -169,11 +168,6 @@ struct RTLIL::IdString
 	static std::vector<int> global_free_idx_list_;
 #endif
 
-#ifdef YOSYS_USE_STICKY_IDS
-	static int last_created_idx_ptr_;
-	static int last_created_idx_[8];
-#endif
-
 	static inline void xtrace_db_dump()
 	{
 	#ifdef YOSYS_XTRACE_GET_PUT
@@ -189,14 +183,6 @@ struct RTLIL::IdString
 
 	static inline void checkpoint()
 	{
-	#ifdef YOSYS_USE_STICKY_IDS
-		last_created_idx_ptr_ = 0;
-		for (int i = 0; i < 8; i++) {
-			if (last_created_idx_[i])
-				put_reference(last_created_idx_[i]);
-			last_created_idx_[i] = 0;
-		}
-	#endif
 	#ifdef YOSYS_SORT_ID_FREE_LIST
 		std::sort(global_free_idx_list_.begin(), global_free_idx_list_.end(), std::greater<int>());
 	#endif
@@ -273,15 +259,6 @@ struct RTLIL::IdString
 			log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx).buf, idx, global_refcount_storage_.at(idx));
 	#endif
 
-	#ifdef YOSYS_USE_STICKY_IDS
-		// Avoid Create->Delete->Create pattern
-		if (last_created_idx_[last_created_idx_ptr_])
-			put_reference(last_created_idx_[last_created_idx_ptr_]);
-		last_created_idx_[last_created_idx_ptr_] = idx;
-		get_reference(last_created_idx_[last_created_idx_ptr_]);
-		last_created_idx_ptr_ = (last_created_idx_ptr_ + 1) & 7;
-	#endif
-
 		return idx;
 	}
 

From 5133b4bdea85a075842bb735b51712d16bac905e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Thu, 9 Oct 2025 23:28:10 +0000
Subject: [PATCH 827/931] Create RTLIL::OwningIdString and use it in a few
 places

---
 kernel/rtlil.cc |  2 +-
 kernel/rtlil.h  | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index c6358729a..6889343cd 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -42,7 +42,7 @@ std::vector<uint32_t> RTLIL::IdString::global_refcount_storage_;
 std::vector<int> RTLIL::IdString::global_free_idx_list_;
 #endif
 
-#define X(_id) const RTLIL::IdString RTLIL::IDInternal::_id(RTLIL::StaticId::_id);
+#define X(_id) const RTLIL::OwningIdString RTLIL::IDInternal::_id(RTLIL::StaticId::_id);
 #include "kernel/constids.inc"
 #undef X
 
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 556f936e9..df1559f8c 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -122,6 +122,7 @@ namespace RTLIL
 	struct Binding;
 	struct IdString;
 	struct StaticIdString;
+	struct OwningIdString;
 
 	typedef std::pair<SigSpec, SigSpec> SigSig;
 
@@ -460,6 +461,16 @@ public:
 	}
 };
 
+struct RTLIL::OwningIdString : public RTLIL::IdString {
+	inline OwningIdString() { }
+	inline OwningIdString(const char *str) : IdString(str) { }
+	inline OwningIdString(const IdString &str) : IdString(str) { }
+	inline OwningIdString(IdString &&str) : IdString(str) { }
+	inline OwningIdString(const std::string &str) : IdString(str) { }
+	inline OwningIdString(std::string_view str) : IdString(str) { }
+	inline OwningIdString(StaticId id) : IdString(id) { }
+};
+
 namespace hashlib {
 	template <>
 	struct hash_ops<RTLIL::IdString> {
@@ -494,7 +505,7 @@ inline bool RTLIL::IdString::operator!=(const RTLIL::StaticIdString &rhs) const
 
 namespace RTLIL {
 	namespace IDInternal {
-#define X(_id) extern const IdString _id;
+#define X(_id) extern const OwningIdString _id;
 #include "kernel/constids.inc"
 #undef X
 	}

From 54bde15329c961c29b53585dbbcf0fab35120935 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 10 Oct 2025 01:10:33 +0000
Subject: [PATCH 828/931] Implement IdString garbage collection instead of
 refcounting.

---
 kernel/register.cc             |  30 +++++-
 kernel/register.h              |  30 ++++++
 kernel/rtlil.cc                | 122 +++++++++++++++++++++++
 kernel/rtlil.h                 | 170 ++++++++++++++++-----------------
 passes/opt/opt_clean.cc        |   4 +
 tests/unit/kernel/rtlilTest.cc |   6 ++
 6 files changed, 272 insertions(+), 90 deletions(-)

diff --git a/kernel/register.cc b/kernel/register.cc
index bd12dcc38..1f8e4a9a5 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -42,6 +42,23 @@ std::map<std::string, Backend*> backend_register;
 
 std::vector<std::string> Frontend::next_args;
 
+bool GarbageCollectionGuard::is_enabled_ = true;
+
+static bool garbage_collection_requested = false;
+
+void request_garbage_collection()
+{
+	garbage_collection_requested = true;
+}
+
+void try_collect_garbage()
+{
+	if (!GarbageCollectionGuard::is_enabled() || !garbage_collection_requested)
+		return;
+	garbage_collection_requested = false;
+	RTLIL::OwningIdString::collect_garbage();
+}
+
 Pass::Pass(std::string name, std::string short_help, source_location location) : 
 	pass_name(name), short_help(short_help), location(location)
 {
@@ -263,14 +280,19 @@ void Pass::call(RTLIL::Design *design, std::vector<std::string> args)
 
 	if (pass_register.count(args[0]) == 0)
 		log_cmd_error("No such command: %s (type 'help' for a command overview)\n", args[0]);
+	Pass *pass = pass_register[args[0]];
 
-	if (pass_register[args[0]]->experimental_flag)
+	// Collect garbage before the next pass if requested. No need to collect garbage after the last pass.
+	try_collect_garbage();
+	GarbageCollectionGuard gc_guard(pass->allow_garbage_collection_during_pass());
+
+	if (pass->experimental_flag)
 		log_experimental(args[0]);
 
 	size_t orig_sel_stack_pos = design->selection_stack.size();
-	auto state = pass_register[args[0]]->pre_execute();
-	pass_register[args[0]]->execute(args, design);
-	pass_register[args[0]]->post_execute(state);
+	auto state = pass->pre_execute();
+	pass->execute(args, design);
+	pass->post_execute(state);
 	while (design->selection_stack.size() > orig_sel_stack_pos)
 		design->pop_selection();
 }
diff --git a/kernel/register.h b/kernel/register.h
index 534cfbc28..b9c709dc1 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -50,6 +50,30 @@ struct source_location { // dummy placeholder
 
 YOSYS_NAMESPACE_BEGIN
 
+// Track whether garbage collection is enabled. Garbage collection must be disabled
+// while any RTLIL objects (e.g. non-owning non-immortal IdStrings) exist outside Designs.
+// Garbage collection is disabled whenever any GarbageCollectionGuard(false) is on the
+// stack. These objects must be stack-allocated on the main thread.
+class GarbageCollectionGuard
+{
+	bool was_enabled;
+	static bool is_enabled_;
+public:
+	GarbageCollectionGuard(bool allow) : was_enabled(is_enabled_) {
+		is_enabled_ &= allow;
+	}
+	~GarbageCollectionGuard() {
+		is_enabled_ = was_enabled;
+	}
+	static bool is_enabled() { return is_enabled_; }
+};
+
+// Call from anywhere to request GC at the next safe point.
+void request_garbage_collection();
+
+// GC if GarbageCollectionGuard::is_enabled() and GC was requested.
+void try_collect_garbage();
+
 struct Pass
 {
 	std::string pass_name, short_help;
@@ -108,6 +132,10 @@ struct Pass
 	virtual void on_register();
 	virtual void on_shutdown();
 	virtual bool replace_existing_pass() const { return false; }
+
+	// This should return false if the pass holds onto RTLIL objects outside a Design while it
+	// calls nested passes. For safety, we default to assuming the worst.
+	virtual bool allow_garbage_collection_during_pass() const { return false; }
 };
 
 struct ScriptPass : Pass
@@ -126,6 +154,8 @@ struct ScriptPass : Pass
 	void run_nocheck(std::string command, std::string info = std::string());
 	void run_script(RTLIL::Design *design, std::string run_from = std::string(), std::string run_to = std::string());
 	void help_script();
+
+	bool allow_garbage_collection_during_pass() const override { return true; }
 };
 
 struct Frontend : Pass
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 6889343cd..0e974b141 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -82,6 +82,128 @@ static constexpr bool check_well_known_id_order()
 // and in sorted ascii order, as required by the ID macro.
 static_assert(check_well_known_id_order());
 
+struct IdStringCollector {
+	IdStringCollector(int size) : live(size, false) {}
+
+	void trace(IdString id) { live[id.index_] = true; }
+	template <typename T> void trace(const T* v) {
+		trace(*v);
+	}
+	template <typename V> void trace(const std::vector<V> &v) {
+		for (const auto &element : v)
+			trace(element);
+	}
+	template <typename K> void trace(const pool<K> &p) {
+		for (const auto &element : p)
+			trace(element);
+	}
+	template <typename K, typename V> void trace(const dict<K, V> &d) {
+		for (const auto &[key, value] : d) {
+			trace(key);
+			trace(value);
+		}
+	}
+	template <typename K, typename V> void trace_keys(const dict<K, V> &d) {
+		for (const auto &[key, value] : d) {
+			trace(key);
+		}
+	}
+	template <typename K, typename V> void trace_values(const dict<K, V> &d) {
+		for (const auto &[key, value] : d) {
+			trace(value);
+		}
+	}
+	template <typename K> void trace(const idict<K> &d) {
+		for (const auto &element : d)
+			trace(element);
+	}
+
+	void trace(const RTLIL::Design &design) {
+		trace_values(design.modules_);
+		trace(design.selection_vars);
+	}
+	void trace(const RTLIL::Selection &selection_var) {
+		trace(selection_var.selected_modules);
+		trace(selection_var.selected_members);
+	}
+	void trace_named(const RTLIL::NamedObject named) {
+		trace_keys(named.attributes);
+		trace(named.name);
+	}
+	void trace(const RTLIL::Module &module) {
+		trace_named(module);
+		trace_values(module.wires_);
+		trace_values(module.cells_);
+		trace(module.avail_parameters);
+		trace_keys(module.parameter_default_values);
+		trace_values(module.memories);
+		trace_values(module.processes);
+	}
+	void trace(const RTLIL::Wire &wire) {
+		trace_named(wire);
+		if (wire.known_driver())
+			trace(wire.driverPort());
+	}
+	void trace(const RTLIL::Cell &cell) {
+		trace_named(cell);
+		trace(cell.type);
+		trace_keys(cell.connections_);
+		trace_keys(cell.parameters);
+	}
+	void trace(const RTLIL::Memory &mem) {
+		trace_named(mem);
+	}
+	void trace(const RTLIL::Process &proc) {
+		trace_named(proc);
+		trace(proc.root_case);
+		trace(proc.syncs);
+	}
+	void trace(const RTLIL::CaseRule &rule) {
+		trace_keys(rule.attributes);
+		trace(rule.switches);
+	}
+	void trace(const RTLIL::SwitchRule &rule) {
+		trace_keys(rule.attributes);
+		trace(rule.cases);
+	}
+	void trace(const RTLIL::SyncRule &rule) {
+		trace(rule.mem_write_actions);
+	}
+	void trace(const RTLIL::MemWriteAction &action) {
+		trace_keys(action.attributes);
+		trace(action.memid);
+	}
+
+	std::vector<bool> live;
+};
+
+void RTLIL::OwningIdString::collect_garbage()
+{
+#ifndef YOSYS_NO_IDS_REFCNT
+	int size = GetSize(global_refcount_storage_);
+	IdStringCollector collector(size);
+	for (auto &[idx, design] : *RTLIL::Design::get_all_designs()) {
+		collector.trace(*design);
+	}
+	for (int i = static_cast<int>(StaticId::STATIC_ID_END); i < size; ++i) {
+		if (collector.live[i] || global_refcount_storage_[i] > 0)
+			continue;
+		RTLIL::IdString::Storage &storage = global_id_storage_.at(i);
+		if (storage.buf == nullptr)
+			continue;
+		if (yosys_xtrace) {
+			log("#X# Removed IdString '%s' with index %d.\n", storage.buf, i);
+			log_backtrace("-X- ", yosys_xtrace-1);
+		}
+
+		global_id_index_.erase(std::string_view(storage.buf, storage.size));
+		free(storage.buf);
+		storage = {nullptr, 0};
+		global_free_idx_list_.push_back(i);
+	}
+#endif
+}
+
 dict<std::string, std::string> RTLIL::constpad;
 
 static const pool<IdString> &builtin_ff_cell_types_internal() {
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index df1559f8c..9d3919162 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -127,12 +127,12 @@ namespace RTLIL
 	typedef std::pair<SigSpec, SigSpec> SigSig;
 
 	struct StaticIdString {
-		constexpr StaticIdString(StaticId id, const IdString &id_str) : id_str(id_str), id(id) {}
-		constexpr inline operator const IdString &() const { return id_str; }
+		constexpr StaticIdString(StaticId id, const OwningIdString &id_str) : id_str(id_str), id(id) {}
+		constexpr inline operator const OwningIdString &() const { return id_str; }
 		constexpr inline int index() const { return static_cast<short>(id); }
-		constexpr inline const IdString &id_string() const { return id_str; }
+		constexpr inline const OwningIdString &id_string() const { return id_str; }
 
-		const IdString &id_str;
+		const OwningIdString &id_str;
 		const StaticId id;
 	};
 };
@@ -189,32 +189,12 @@ struct RTLIL::IdString
 	#endif
 	}
 
-	static inline int get_reference(int idx)
-	{
-	#ifndef YOSYS_NO_IDS_REFCNT
-		global_refcount_storage_[idx]++;
-	#endif
-	#ifdef YOSYS_XTRACE_GET_PUT
-		if (yosys_xtrace && idx >= static_cast<short>(StaticId::STATIC_ID_END))
-			log("#X# GET-BY-INDEX '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx).buf, idx, global_refcount_storage_.at(idx));
-	#endif
-		return idx;
-	}
-
-	static int get_reference(const char *p)
-	{
-		return get_reference(std::string_view(p));
-	}
-
-	static int get_reference(std::string_view p)
+	static int insert(std::string_view p)
 	{
 		log_assert(destruct_guard_ok);
 
 		auto it = global_id_index_.find(p);
 		if (it != global_id_index_.end()) {
-	#ifndef YOSYS_NO_IDS_REFCNT
-			global_refcount_storage_.at(it->second)++;
-	#endif
 	#ifdef YOSYS_XTRACE_GET_PUT
 			if (yosys_xtrace)
 				log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(it->second).buf, it->second, global_refcount_storage_.at(it->second));
@@ -239,7 +219,6 @@ struct RTLIL::IdString
 
 		int idx = global_free_idx_list_.back();
 		global_free_idx_list_.pop_back();
-		global_refcount_storage_.at(idx)++;
 	#else
 		int idx = global_id_storage_.size();
 		global_id_storage_.push_back({nullptr, 0});
@@ -263,67 +242,19 @@ struct RTLIL::IdString
 		return idx;
 	}
 
-#ifndef YOSYS_NO_IDS_REFCNT
-	static inline void put_reference(int idx)
-	{
-		// put_reference() may be called from destructors after the destructor of
-		// global_refcount_storage_ has been run. in this case we simply do nothing.
-		if (idx < static_cast<short>(StaticId::STATIC_ID_END) || !destruct_guard_ok)
-			return;
-
-	#ifdef YOSYS_XTRACE_GET_PUT
-		if (yosys_xtrace) {
-			log("#X# PUT '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx).buf, idx, global_refcount_storage_.at(idx));
-		}
-	#endif
-
-		uint32_t &refcount = global_refcount_storage_[idx];
-
-		if (--refcount > 0)
-			return;
-
-		free_reference(idx);
-	}
-	static inline void free_reference(int idx)
-	{
-		if (yosys_xtrace) {
-			log("#X# Removed IdString '%s' with index %d.\n", global_id_storage_.at(idx).buf, idx);
-			log_backtrace("-X- ", yosys_xtrace-1);
-		}
-		log_assert(idx >= static_cast<short>(StaticId::STATIC_ID_END));
-
-		global_id_index_.erase(global_id_storage_.at(idx).buf);
-		free(global_id_storage_.at(idx).buf);
-		global_id_storage_.at(idx) = {nullptr, 0};
-		global_free_idx_list_.push_back(idx);
-	}
-#else
-	static inline void put_reference(int) { }
-#endif
-
 	// the actual IdString object is just is a single int
 
 	int index_;
 
 	inline IdString() : index_(0) { }
-	inline IdString(const char *str) : index_(get_reference(str)) { }
-	inline IdString(const IdString &str) : index_(get_reference(str.index_)) { }
+	inline IdString(const char *str) : index_(insert(std::string_view(str))) { }
+	inline IdString(const IdString &str) : index_(str.index_) { }
 	inline IdString(IdString &&str) : index_(str.index_) { str.index_ = 0; }
-	inline IdString(const std::string &str) : index_(get_reference(std::string_view(str))) { }
-	inline IdString(std::string_view str) : index_(get_reference(str)) { }
+	inline IdString(const std::string &str) : index_(insert(std::string_view(str))) { }
+	inline IdString(std::string_view str) : index_(insert(str)) { }
 	inline IdString(StaticId id) : index_(static_cast<short>(id)) {}
-	inline ~IdString() { put_reference(index_); }
 
-	inline void operator=(const IdString &rhs) {
-		put_reference(index_);
-		index_ = get_reference(rhs.index_);
-	}
-
-	inline void operator=(IdString &&rhs) {
-		put_reference(index_);
-		index_ = rhs.index_;
-		rhs.index_ = 0;
-	}
+	IdString &operator=(const IdString &rhs) = default;
 
 	inline void operator=(const char *rhs) {
 		IdString id(rhs);
@@ -463,12 +394,78 @@ public:
 
 struct RTLIL::OwningIdString : public RTLIL::IdString {
 	inline OwningIdString() { }
-	inline OwningIdString(const char *str) : IdString(str) { }
-	inline OwningIdString(const IdString &str) : IdString(str) { }
-	inline OwningIdString(IdString &&str) : IdString(str) { }
-	inline OwningIdString(const std::string &str) : IdString(str) { }
-	inline OwningIdString(std::string_view str) : IdString(str) { }
-	inline OwningIdString(StaticId id) : IdString(id) { }
+	inline OwningIdString(const StaticIdString &str) : IdString(str) { }
+	inline OwningIdString(const OwningIdString &str) : IdString(str) { get_reference(); }
+	inline OwningIdString(const char *str) : IdString(str) { get_reference(); }
+	inline OwningIdString(const IdString &str) : IdString(str) { get_reference(); }
+	inline OwningIdString(IdString &&str) : IdString(str) {	get_reference(); }
+	inline OwningIdString(const std::string &str) : IdString(str) { get_reference(); }
+	inline OwningIdString(std::string_view str) : IdString(str) { get_reference(); }
+	inline OwningIdString(StaticId id) : IdString(id) {}
+	inline ~OwningIdString() {
+		put_reference();
+	}
+
+	inline OwningIdString &operator=(const OwningIdString &rhs) {
+		put_reference();
+		index_ = rhs.index_;
+		get_reference();
+		return *this;
+	}
+	inline OwningIdString &operator=(const IdString &rhs) {
+		put_reference();
+		index_ = rhs.index_;
+		get_reference();
+		return *this;
+	}
+	inline OwningIdString &operator=(OwningIdString &&rhs) {
+		std::swap(index_, rhs.index_);
+		return *this;
+	}
+
+	// Collect all non-owning references.
+	static void collect_garbage();
+
+	// Used by the ID() macro to create an IdString with no destructor whose string will
+	// never be released. If ID() creates a closure-static `OwningIdString` then
+	// initialization of the static registers its destructor to run at exit, which is
+	// wasteful.
+	static IdString immortal(const char* str) {
+		IdString result(str);
+		get_reference(result.index_);
+		return result;
+	}
+private:
+	void get_reference()
+	{
+		get_reference(index_);
+	}
+	static void get_reference(int idx)
+	{
+	#ifndef YOSYS_NO_IDS_REFCNT
+		global_refcount_storage_[idx]++;
+	#endif
+	#ifdef YOSYS_XTRACE_GET_PUT
+		if (yosys_xtrace && idx >= static_cast<short>(StaticId::STATIC_ID_END))
+			log("#X# GET-BY-INDEX '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
+	#endif
+	}
+
+	void put_reference()
+	{
+	#ifndef YOSYS_NO_IDS_REFCNT
+		// put_reference() may be called from destructors after the destructor of
+		// global_refcount_storage_ has been run. in this case we simply do nothing.
+		if (index_ < static_cast<short>(StaticId::STATIC_ID_END) || !destruct_guard_ok)
+			return;
+	#ifdef YOSYS_XTRACE_GET_PUT
+		if (yosys_xtrace) {
+			log("#X# PUT '%s' (index %d, refcount %u)\n", global_id_storage_.at(index_), index_, global_refcount_storage_.at(index_));
+		}
+	#endif
+		--global_refcount_storage_[index_];
+	#endif
+	}
 };
 
 namespace hashlib {
@@ -571,7 +568,8 @@ template <> struct IDMacroHelper<-1> {
 		>::eval([]() \
 		-> const YOSYS_NAMESPACE_PREFIX RTLIL::IdString & { \
 			const char *p = "\\" #_id, *q = p[1] == '$' ? p+1 : p; \
-			static const YOSYS_NAMESPACE_PREFIX RTLIL::IdString id(q); \
+			static const YOSYS_NAMESPACE_PREFIX RTLIL::IdString id = \
+				YOSYS_NAMESPACE_PREFIX RTLIL::OwningIdString::immortal(q); \
 			return id; \
         })
 
diff --git a/passes/opt/opt_clean.cc b/passes/opt/opt_clean.cc
index 996a9b3c9..b3e3cd33a 100644
--- a/passes/opt/opt_clean.cc
+++ b/passes/opt/opt_clean.cc
@@ -722,6 +722,8 @@ struct OptCleanPass : public Pass {
 		ct_reg.clear();
 		ct_all.clear();
 		log_pop();
+
+		request_garbage_collection();
 	}
 } OptCleanPass;
 
@@ -784,6 +786,8 @@ struct CleanPass : public Pass {
 		keep_cache.reset();
 		ct_reg.clear();
 		ct_all.clear();
+
+		request_garbage_collection();
 	}
 } CleanPass;
 
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index 557355ed9..8bba9ac28 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -361,6 +361,12 @@ namespace RTLIL {
 		EXPECT_FALSE(Const().is_onehot(&pos));
 	}
 
+	TEST_F(KernelRtlilTest, OwningIdString) {
+		OwningIdString own("\\figblortle");
+		OwningIdString::collect_garbage();
+		EXPECT_EQ(own.str(), "\\figblortle");
+	}
+
 	class WireRtlVsHdlIndexConversionTest :
 		public KernelRtlilTest,
 		public testing::WithParamInterface<std::tuple<bool, int, int>>

From b0e2d75dbe26b98b2bf8a0d9702c422aa23f21f6 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 13 Oct 2025 00:12:51 +0000
Subject: [PATCH 829/931] Make IdString refcounts a hashtable containing only
 the nonzero refcounts

This saves space and doesn't cost very much since we hardly ever have nonzero refcounts any more.

It also allows for IdStrings with negative indexes, which we're going to add.
---
 kernel/rtlil.cc | 10 ++++++----
 kernel/rtlil.h  | 44 +++++++++++++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 0e974b141..466ed0a74 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -38,7 +38,7 @@ RTLIL::IdString::destruct_guard_t RTLIL::IdString::destruct_guard;
 std::vector<RTLIL::IdString::Storage> RTLIL::IdString::global_id_storage_;
 std::unordered_map<std::string_view, int> RTLIL::IdString::global_id_index_;
 #ifndef YOSYS_NO_IDS_REFCNT
-std::vector<uint32_t> RTLIL::IdString::global_refcount_storage_;
+std::unordered_map<int, int> RTLIL::IdString::global_refcount_storage_;
 std::vector<int> RTLIL::IdString::global_free_idx_list_;
 #endif
 
@@ -61,7 +61,6 @@ void RTLIL::IdString::prepopulate()
 	int size = static_cast<short>(RTLIL::StaticId::STATIC_ID_END);
 	global_id_storage_.reserve(size);
 	global_id_index_.reserve(size);
-	global_refcount_storage_.resize(size, 1);
 	RTLIL::IdString::global_id_index_.insert({"", 0});
 	RTLIL::IdString::global_id_storage_.push_back({const_cast<char*>(""), 0});
 #define X(N) populate("\\" #N);
@@ -180,17 +179,20 @@ struct IdStringCollector {
 void RTLIL::OwningIdString::collect_garbage()
 {
 #ifndef YOSYS_NO_IDS_REFCNT
-	int size = GetSize(global_refcount_storage_);
+	int size = GetSize(global_id_storage_);
 	IdStringCollector collector(size);
 	for (auto &[idx, design] : *RTLIL::Design::get_all_designs()) {
 		collector.trace(*design);
 	}
 	for (int i = static_cast<int>(StaticId::STATIC_ID_END); i < size; ++i) {
-		if (collector.live[i] || global_refcount_storage_[i] > 0)
+		if (collector.live[i])
 			continue;
 		RTLIL::IdString::Storage &storage = global_id_storage_.at(i);
 		if (storage.buf == nullptr)
 			continue;
+		if (global_refcount_storage_.find(i) != global_refcount_storage_.end())
+			continue;
+
 		if (yosys_xtrace) {
 			log("#X# Removed IdString '%s' with index %d.\n", storage.buf, i);
 			log_backtrace("-X- ", yosys_xtrace-1);
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 9d3919162..a081762c9 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -159,16 +159,18 @@ struct RTLIL::IdString
 	static std::vector<Storage> global_id_storage_;
 	static std::unordered_map<std::string_view, int> global_id_index_;
 #ifndef YOSYS_NO_IDS_REFCNT
-	// For prepopulated IdStrings, the refcount is meaningless since they
-	// are never freed even if the refcount is zero. For code efficiency
-	// we increment the refcount of prepopulated IdStrings like any other string,
-	// but we never decrement the refcount or check whether it's zero.
-	// So, make this unsigned because refcounts of preopulated IdStrings may overflow
-	// and overflow of signed integers is undefined behavior.
-	static std::vector<uint32_t> global_refcount_storage_;
+	// All (index, refcount) pairs in this map have refcount > 0.
+	static std::unordered_map<int, int> global_refcount_storage_;
 	static std::vector<int> global_free_idx_list_;
 #endif
 
+	static int refcount(int idx) {
+		auto it = global_refcount_storage_.find(idx);
+		if (it == global_refcount_storage_.end())
+			return 0;
+		return it->second;
+	}
+
 	static inline void xtrace_db_dump()
 	{
 	#ifdef YOSYS_XTRACE_GET_PUT
@@ -177,7 +179,7 @@ struct RTLIL::IdString
 			if (global_id_storage_.at(idx).buf == nullptr)
 				log("#X# DB-DUMP index %d: FREE\n", idx);
 			else
-				log("#X# DB-DUMP index %d: '%s' (ref %u)\n", idx, global_id_storage_.at(idx).buf, global_refcount_storage_.at(idx));
+				log("#X# DB-DUMP index %d: '%s' (ref %u)\n", idx, refcount(idx).buf, refcount);
 		}
 	#endif
 	}
@@ -197,7 +199,7 @@ struct RTLIL::IdString
 		if (it != global_id_index_.end()) {
 	#ifdef YOSYS_XTRACE_GET_PUT
 			if (yosys_xtrace)
-				log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(it->second).buf, it->second, global_refcount_storage_.at(it->second));
+				log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(it->second).buf, it->second, refcount(it->second));
 	#endif
 			return it->second;
 		}
@@ -214,7 +216,6 @@ struct RTLIL::IdString
 			log_assert(global_id_storage_.size() < 0x40000000);
 			global_free_idx_list_.push_back(global_id_storage_.size());
 			global_id_storage_.push_back({nullptr, 0});
-			global_refcount_storage_.push_back(0);
 		}
 
 		int idx = global_free_idx_list_.back();
@@ -236,7 +237,7 @@ struct RTLIL::IdString
 
 	#ifdef YOSYS_XTRACE_GET_PUT
 		if (yosys_xtrace)
-			log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx).buf, idx, global_refcount_storage_.at(idx));
+			log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx).buf, idx, refcount(idx));
 	#endif
 
 		return idx;
@@ -443,11 +444,17 @@ private:
 	static void get_reference(int idx)
 	{
 	#ifndef YOSYS_NO_IDS_REFCNT
-		global_refcount_storage_[idx]++;
+		if (idx < static_cast<short>(StaticId::STATIC_ID_END))
+			return;
+		auto it = global_refcount_storage_.find(idx);
+		if (it == global_refcount_storage_.end())
+			global_refcount_storage_.insert(it, {idx, 1});
+		else
+			++it->second;
 	#endif
 	#ifdef YOSYS_XTRACE_GET_PUT
 		if (yosys_xtrace && idx >= static_cast<short>(StaticId::STATIC_ID_END))
-			log("#X# GET-BY-INDEX '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, global_refcount_storage_.at(idx));
+			log("#X# GET-BY-INDEX '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, refcount(idx));
 	#endif
 	}
 
@@ -459,11 +466,14 @@ private:
 		if (index_ < static_cast<short>(StaticId::STATIC_ID_END) || !destruct_guard_ok)
 			return;
 	#ifdef YOSYS_XTRACE_GET_PUT
-		if (yosys_xtrace) {
-			log("#X# PUT '%s' (index %d, refcount %u)\n", global_id_storage_.at(index_), index_, global_refcount_storage_.at(index_));
-		}
+		if (yosys_xtrace)
+			log("#X# PUT '%s' (index %d, refcount %u)\n", global_id_storage_.at(index_), index_, refcount(index_));
 	#endif
-		--global_refcount_storage_[index_];
+		auto it = global_refcount_storage_.find(index_);
+		log_assert(it != global_refcount_storage_.end() && it->second >= 1);
+		if (--it->second == 0) {
+			global_refcount_storage_.erase(it);
+		}
 	#endif
 	}
 };

From b3f3f425771c1cc0c401528b067b9b7b33983ebb Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 14 Oct 2025 01:00:20 +0000
Subject: [PATCH 830/931] Remove StaticIdString and just use IdString now that
 we can make it constexpr

---
 kernel/rtlil.cc |  4 ----
 kernel/rtlil.h  | 45 +++++++++------------------------------------
 2 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 466ed0a74..6084dd03e 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -42,10 +42,6 @@ std::unordered_map<int, int> RTLIL::IdString::global_refcount_storage_;
 std::vector<int> RTLIL::IdString::global_free_idx_list_;
 #endif
 
-#define X(_id) const RTLIL::OwningIdString RTLIL::IDInternal::_id(RTLIL::StaticId::_id);
-#include "kernel/constids.inc"
-#undef X
-
 static void populate(std::string_view name)
 {
 	if (name[1] == '$') {
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index a081762c9..2f7319d4a 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -121,20 +121,9 @@ namespace RTLIL
 	struct Process;
 	struct Binding;
 	struct IdString;
-	struct StaticIdString;
 	struct OwningIdString;
 
 	typedef std::pair<SigSpec, SigSpec> SigSig;
-
-	struct StaticIdString {
-		constexpr StaticIdString(StaticId id, const OwningIdString &id_str) : id_str(id_str), id(id) {}
-		constexpr inline operator const OwningIdString &() const { return id_str; }
-		constexpr inline int index() const { return static_cast<short>(id); }
-		constexpr inline const OwningIdString &id_string() const { return id_str; }
-
-		const OwningIdString &id_str;
-		const StaticId id;
-	};
 };
 
 struct RTLIL::IdString
@@ -247,13 +236,13 @@ struct RTLIL::IdString
 
 	int index_;
 
-	inline IdString() : index_(0) { }
+	constexpr inline IdString() : index_(0) { }
 	inline IdString(const char *str) : index_(insert(std::string_view(str))) { }
-	inline IdString(const IdString &str) : index_(str.index_) { }
+	constexpr inline IdString(const IdString &str) : index_(str.index_) { }
 	inline IdString(IdString &&str) : index_(str.index_) { str.index_ = 0; }
 	inline IdString(const std::string &str) : index_(insert(std::string_view(str))) { }
 	inline IdString(std::string_view str) : index_(insert(str)) { }
-	inline IdString(StaticId id) : index_(static_cast<short>(id)) {}
+	constexpr inline IdString(StaticId id) : index_(static_cast<short>(id)) {}
 
 	IdString &operator=(const IdString &rhs) = default;
 
@@ -289,8 +278,6 @@ struct RTLIL::IdString
 
 	inline bool operator==(const IdString &rhs) const { return index_ == rhs.index_; }
 	inline bool operator!=(const IdString &rhs) const { return index_ != rhs.index_; }
-	inline bool operator==(const StaticIdString &rhs) const;
-	inline bool operator!=(const StaticIdString &rhs) const;
 
 	// The methods below are just convenience functions for better compatibility with std::string.
 
@@ -375,7 +362,6 @@ struct RTLIL::IdString
 	}
 
 	bool in(const IdString &rhs) const { return *this == rhs; }
-	bool in(const StaticIdString &rhs) const { return *this == rhs; }
 	bool in(const char *rhs) const { return *this == rhs; }
 	bool in(const std::string &rhs) const { return *this == rhs; }
 	inline bool in(const pool<IdString> &rhs) const;
@@ -395,7 +381,6 @@ public:
 
 struct RTLIL::OwningIdString : public RTLIL::IdString {
 	inline OwningIdString() { }
-	inline OwningIdString(const StaticIdString &str) : IdString(str) { }
 	inline OwningIdString(const OwningIdString &str) : IdString(str) { get_reference(); }
 	inline OwningIdString(const char *str) : IdString(str) { get_reference(); }
 	inline OwningIdString(const IdString &str) : IdString(str) { get_reference(); }
@@ -503,21 +488,9 @@ inline bool RTLIL::IdString::in(const pool<IdString> &rhs) const { return rhs.co
 [[deprecated]]
 inline bool RTLIL::IdString::in(const pool<IdString> &&rhs) const { return rhs.count(*this) != 0; }
 
-inline bool RTLIL::IdString::operator==(const RTLIL::StaticIdString &rhs) const {
-	return index_ == rhs.index();
-}
-inline bool RTLIL::IdString::operator!=(const RTLIL::StaticIdString &rhs) const {
-	return index_ != rhs.index();
-}
-
 namespace RTLIL {
-	namespace IDInternal {
-#define X(_id) extern const OwningIdString _id;
-#include "kernel/constids.inc"
-#undef X
-	}
 	namespace ID {
-#define X(_id) constexpr StaticIdString _id(StaticId::_id, IDInternal::_id);
+#define X(_id) constexpr IdString _id(StaticId::_id);
 #include "kernel/constids.inc"
 #undef X
 	}
@@ -525,7 +498,7 @@ namespace RTLIL {
 
 struct IdTableEntry {
 	const std::string_view name;
-	const RTLIL::StaticIdString static_id;
+	const RTLIL::IdString static_id;
 };
 
 constexpr IdTableEntry IdTable[] = {
@@ -558,15 +531,15 @@ constexpr int lookup_well_known_id(std::string_view name)
 //
 //  sed -i.orig -r 's/"\\\\([a-zA-Z0-9_]+)"/ID(\1)/g; s/"(\$[a-zA-Z0-9_]+)"/ID(\1)/g;' <filename>
 //
-typedef const RTLIL::IdString &IDMacroHelperFunc();
+typedef RTLIL::IdString IDMacroHelperFunc();
 
 template <int IdTableIndex> struct IDMacroHelper {
-	static constexpr RTLIL::StaticIdString eval(IDMacroHelperFunc) {
+	static constexpr RTLIL::IdString eval(IDMacroHelperFunc) {
 		return IdTable[IdTableIndex].static_id;
 	}
 };
 template <> struct IDMacroHelper<-1> {
-	static constexpr const RTLIL::IdString &eval(IDMacroHelperFunc func) {
+	static constexpr RTLIL::IdString eval(IDMacroHelperFunc func) {
 		return func();
 	}
 };
@@ -576,7 +549,7 @@ template <> struct IDMacroHelper<-1> {
 		YOSYS_NAMESPACE_PREFIX IDMacroHelper< \
 				YOSYS_NAMESPACE_PREFIX lookup_well_known_id(#_id) \
 		>::eval([]() \
-		-> const YOSYS_NAMESPACE_PREFIX RTLIL::IdString & { \
+		-> YOSYS_NAMESPACE_PREFIX RTLIL::IdString { \
 			const char *p = "\\" #_id, *q = p[1] == '$' ? p+1 : p; \
 			static const YOSYS_NAMESPACE_PREFIX RTLIL::IdString id = \
 				YOSYS_NAMESPACE_PREFIX RTLIL::OwningIdString::immortal(q); \

From 9577a028c8dd25669c982a82c5ea69ec7737066b Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 13 Oct 2025 00:28:49 +0000
Subject: [PATCH 831/931] Make new_id/new_id_suffix taking string_view to avoid
 allocating strings

---
 kernel/yosys.cc       | 12 ++++++------
 kernel/yosys_common.h |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index ca1db3aa6..85de1ea72 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -295,35 +295,35 @@ void yosys_shutdown()
 #endif
 }
 
-RTLIL::IdString new_id(std::string file, int line, std::string func)
+RTLIL::IdString new_id(std::string_view file, int line, std::string_view func)
 {
 #ifdef _WIN32
 	size_t pos = file.find_last_of("/\\");
 #else
 	size_t pos = file.find_last_of('/');
 #endif
-	if (pos != std::string::npos)
+	if (pos != std::string_view::npos)
 		file = file.substr(pos+1);
 
 	pos = func.find_last_of(':');
-	if (pos != std::string::npos)
+	if (pos != std::string_view::npos)
 		func = func.substr(pos+1);
 
 	return stringf("$auto$%s:%d:%s$%d", file, line, func, autoidx++);
 }
 
-RTLIL::IdString new_id_suffix(std::string file, int line, std::string func, std::string suffix)
+RTLIL::IdString new_id_suffix(std::string_view file, int line, std::string_view func, std::string_view suffix)
 {
 #ifdef _WIN32
 	size_t pos = file.find_last_of("/\\");
 #else
 	size_t pos = file.find_last_of('/');
 #endif
-	if (pos != std::string::npos)
+	if (pos != std::string_view::npos)
 		file = file.substr(pos+1);
 
 	pos = func.find_last_of(':');
-	if (pos != std::string::npos)
+	if (pos != std::string_view::npos)
 		func = func.substr(pos+1);
 
 	return stringf("$auto$%s:%d:%s$%s$%d", file, line, func, suffix, autoidx++);
diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index 4794b5618..08b7fdc08 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -271,8 +271,8 @@ extern int autoidx;
 extern int yosys_xtrace;
 extern bool yosys_write_versions;
 
-RTLIL::IdString new_id(std::string file, int line, std::string func);
-RTLIL::IdString new_id_suffix(std::string file, int line, std::string func, std::string suffix);
+RTLIL::IdString new_id(std::string_view file, int line, std::string_view func);
+RTLIL::IdString new_id_suffix(std::string_view file, int line, std::string_view func, std::string_view suffix);
 
 #define NEW_ID \
 	YOSYS_NAMESPACE_PREFIX new_id(__FILE__, __LINE__, __FUNCTION__)

From 889575736485854fa87fb247da83a3bc12e9dd41 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 13 Oct 2025 00:44:15 +0000
Subject: [PATCH 832/931] Ensure that `new_id(_suffix)()` cannot create
 collisions with existing `IdString`s.

---
 kernel/rtlil.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 2f7319d4a..fb0849902 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -23,6 +23,7 @@
 #include "kernel/yosys_common.h"
 #include "kernel/yosys.h"
 
+#include <charconv>
 #include <string_view>
 #include <unordered_map>
 
@@ -200,6 +201,16 @@ struct RTLIL::IdString
 			if ((unsigned)ch <= (unsigned)' ')
 				log_error("Found control character or space (0x%02x) in string '%s' which is not allowed in RTLIL identifiers\n", ch, std::string(p).c_str());
 
+		if (p.substr(0, 6) == "$auto$") {
+			// Ensure new_id(_suffix) will not create collisions.
+			size_t autoidx_pos = p.find_last_of('$');
+			int p_autoidx;
+			std::string_view v = p.substr(autoidx_pos + 1);
+			if (std::from_chars(v.begin(), v.end(), p_autoidx).ec == std::errc()) {
+				autoidx = std::max(autoidx, p_autoidx + 1);
+			}
+		}
+
 	#ifndef YOSYS_NO_IDS_REFCNT
 		if (global_free_idx_list_.empty()) {
 			log_assert(global_id_storage_.size() < 0x40000000);

From e95ed7bbaba71645860745eaeb88fa77bbece53c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 13 Oct 2025 02:56:32 +0000
Subject: [PATCH 833/931] Make NEW_ID create IDs whose string allocation is
 delayed

---
 kernel/io.cc                   |   2 +-
 kernel/rtlil.cc                | 104 ++++++++++++++++++++++++++++---
 kernel/rtlil.h                 | 110 ++++++++++++++++-----------------
 kernel/yosys.cc                |   4 +-
 kernel/yosys_common.h          |   7 ++-
 pyosys/generator.py            |   2 +
 tests/unit/kernel/rtlilTest.cc |   6 ++
 7 files changed, 165 insertions(+), 70 deletions(-)

diff --git a/kernel/io.cc b/kernel/io.cc
index e713cff85..4f805e43b 100644
--- a/kernel/io.cc
+++ b/kernel/io.cc
@@ -606,7 +606,7 @@ void format_emit_idstring(std::string &result, std::string_view spec, int *dynam
 {
 	if (spec == "%s") {
 		// Format checking will have guaranteed num_dynamic_ints == 0.
-		result += arg.str_view();
+		arg.append_to(&result);
 		return;
 	}
 	format_emit_stringf(result, spec, dynamic_ints, num_dynamic_ints, arg.c_str());
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 6084dd03e..91fbc7960 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -28,6 +28,7 @@
 
 #include <string.h>
 #include <algorithm>
+#include <charconv>
 #include <optional>
 #include <string_view>
 
@@ -37,6 +38,8 @@ bool RTLIL::IdString::destruct_guard_ok = false;
 RTLIL::IdString::destruct_guard_t RTLIL::IdString::destruct_guard;
 std::vector<RTLIL::IdString::Storage> RTLIL::IdString::global_id_storage_;
 std::unordered_map<std::string_view, int> RTLIL::IdString::global_id_index_;
+std::unordered_map<int, const std::string*> RTLIL::IdString::global_autoidx_id_prefix_storage_;
+std::unordered_map<int, char*> RTLIL::IdString::global_autoidx_id_storage_;
 #ifndef YOSYS_NO_IDS_REFCNT
 std::unordered_map<int, int> RTLIL::IdString::global_refcount_storage_;
 std::vector<int> RTLIL::IdString::global_free_idx_list_;
@@ -64,6 +67,74 @@ void RTLIL::IdString::prepopulate()
 #undef X
 }
 
+static std::optional<int> parse_autoidx(std::string_view v)
+{
+	// autoidx values can never be <= 0, so there can never be a leading 0 digit.
+	if (v.empty() || v[0] == '0')
+		return std::nullopt;
+	for (char ch : v) {
+		if (ch < '0' || ch > '9')
+			return std::nullopt;
+	}
+	int p_autoidx;
+	if (std::from_chars(v.data(), v.data() + v.size(), p_autoidx).ec != std::errc())
+		return std::nullopt;
+	return p_autoidx;
+}
+
+int RTLIL::IdString::really_insert(std::string_view p, std::unordered_map<std::string_view, int>::iterator &it)
+{
+	ensure_prepopulated();
+
+	log_assert(p[0] == '$' || p[0] == '\\');
+	for (char ch : p)
+		if ((unsigned)ch <= (unsigned)' ')
+			log_error("Found control character or space (0x%02x) in string '%s' which is not allowed in RTLIL identifiers\n", ch, std::string(p).c_str());
+
+	if (p.substr(0, 6) == "$auto$") {
+		size_t autoidx_pos = p.find_last_of('$') + 1;
+		std::optional<int> p_autoidx = parse_autoidx(p.substr(autoidx_pos));
+		if (p_autoidx.has_value()) {
+			auto prefix_it = global_autoidx_id_prefix_storage_.find(-*p_autoidx);
+			if (prefix_it != global_autoidx_id_prefix_storage_.end() && p.substr(0, autoidx_pos) == *prefix_it->second)
+				return -*p_autoidx;
+			// Ensure NEW_ID/NEW_ID_SUFFIX will not create collisions with the ID
+			// we're about to create.
+			autoidx = std::max(autoidx, *p_autoidx + 1);
+		}
+	}
+
+#ifndef YOSYS_NO_IDS_REFCNT
+	if (global_free_idx_list_.empty()) {
+		log_assert(global_id_storage_.size() < 0x40000000);
+		global_free_idx_list_.push_back(global_id_storage_.size());
+		global_id_storage_.push_back({nullptr, 0});
+	}
+
+	int idx = global_free_idx_list_.back();
+	global_free_idx_list_.pop_back();
+#else
+	int idx = global_id_storage_.size();
+	global_id_index_[global_id_storage_.back()] = idx;
+#endif
+	char* buf = static_cast<char*>(malloc(p.size() + 1));
+	memcpy(buf, p.data(), p.size());
+	buf[p.size()] = 0;
+	global_id_storage_.at(idx) = {buf, GetSize(p)};
+	global_id_index_.insert(it, {std::string_view(buf, p.size()), idx});
+
+	if (yosys_xtrace) {
+		log("#X# New IdString '%s' with index %d.\n", global_id_storage_.at(idx).buf, idx);
+		log_backtrace("-X- ", yosys_xtrace-1);
+	}
+
+#ifdef YOSYS_XTRACE_GET_PUT
+	if (yosys_xtrace)
+		log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, refcount(idx));
+#endif
+	return idx;
+}
+
 static constexpr bool check_well_known_id_order()
 {
 	int size = sizeof(IdTable) / sizeof(IdTable[0]);
@@ -78,9 +149,9 @@ static constexpr bool check_well_known_id_order()
 static_assert(check_well_known_id_order());
 
 struct IdStringCollector {
-	IdStringCollector(int size) : live(size, false) {}
-
-	void trace(IdString id) { live[id.index_] = true; }
+	void trace(IdString id) {
+		live.insert(id.index_);
+	}
 	template <typename T> void trace(const T* v) {
 		trace(*v);
 	}
@@ -169,23 +240,23 @@ struct IdStringCollector {
 		trace(action.memid);
 	}
 
-	std::vector<bool> live;
+	std::unordered_set<int> live;
 };
 
 void RTLIL::OwningIdString::collect_garbage()
 {
 #ifndef YOSYS_NO_IDS_REFCNT
-	int size = GetSize(global_id_storage_);
-	IdStringCollector collector(size);
+	IdStringCollector collector;
 	for (auto &[idx, design] : *RTLIL::Design::get_all_designs()) {
 		collector.trace(*design);
 	}
+	int size = GetSize(global_id_storage_);
 	for (int i = static_cast<int>(StaticId::STATIC_ID_END); i < size; ++i) {
-		if (collector.live[i])
-			continue;
 		RTLIL::IdString::Storage &storage = global_id_storage_.at(i);
 		if (storage.buf == nullptr)
 			continue;
+		if (collector.live.find(i) != collector.live.end())
+			continue;
 		if (global_refcount_storage_.find(i) != global_refcount_storage_.end())
 			continue;
 
@@ -199,6 +270,23 @@ void RTLIL::OwningIdString::collect_garbage()
 		storage = {nullptr, 0};
 		global_free_idx_list_.push_back(i);
 	}
+
+	for (auto it = global_autoidx_id_prefix_storage_.begin(); it != global_autoidx_id_prefix_storage_.end();) {
+		if (collector.live.find(it->first) != collector.live.end()) {
+			++it;
+			continue;
+		}
+		if (global_refcount_storage_.find(it->first) != global_refcount_storage_.end()) {
+			++it;
+			continue;
+		}
+		auto str_it = global_autoidx_id_storage_.find(it->first);
+		if (str_it != global_autoidx_id_storage_.end()) {
+			delete[] str_it->second;
+			global_autoidx_id_storage_.erase(str_it);
+		}
+		it = global_autoidx_id_prefix_storage_.erase(it);
+	}
 #endif
 }
 
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index fb0849902..7a6dad57f 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -23,7 +23,6 @@
 #include "kernel/yosys_common.h"
 #include "kernel/yosys.h"
 
-#include <charconv>
 #include <string_view>
 #include <unordered_map>
 
@@ -146,8 +145,16 @@ struct RTLIL::IdString
 		~destruct_guard_t() { destruct_guard_ok = false; }
 	} destruct_guard;
 
+	// String storage for non-autoidx IDs
 	static std::vector<Storage> global_id_storage_;
+	// Lookup table for non-autoidx IDs
 	static std::unordered_map<std::string_view, int> global_id_index_;
+	// Shared prefix string storage for autoidx IDs, which have negative
+	// indices. Append the negated (i.e. positive) ID to this string to get
+	// the real string. The prefix strings must live forever.
+	static std::unordered_map<int, const std::string*> global_autoidx_id_prefix_storage_;
+	// Explicit string storage for autoidx IDs
+	static std::unordered_map<int, char*> global_autoidx_id_storage_;
 #ifndef YOSYS_NO_IDS_REFCNT
 	// All (index, refcount) pairs in this map have refcount > 0.
 	static std::unordered_map<int, int> global_refcount_storage_;
@@ -193,54 +200,15 @@ struct RTLIL::IdString
 	#endif
 			return it->second;
 		}
+		return really_insert(p, it);
+	}
 
-		ensure_prepopulated();
-
-		log_assert(p[0] == '$' || p[0] == '\\');
-		for (char ch : p)
-			if ((unsigned)ch <= (unsigned)' ')
-				log_error("Found control character or space (0x%02x) in string '%s' which is not allowed in RTLIL identifiers\n", ch, std::string(p).c_str());
-
-		if (p.substr(0, 6) == "$auto$") {
-			// Ensure new_id(_suffix) will not create collisions.
-			size_t autoidx_pos = p.find_last_of('$');
-			int p_autoidx;
-			std::string_view v = p.substr(autoidx_pos + 1);
-			if (std::from_chars(v.begin(), v.end(), p_autoidx).ec == std::errc()) {
-				autoidx = std::max(autoidx, p_autoidx + 1);
-			}
-		}
-
-	#ifndef YOSYS_NO_IDS_REFCNT
-		if (global_free_idx_list_.empty()) {
-			log_assert(global_id_storage_.size() < 0x40000000);
-			global_free_idx_list_.push_back(global_id_storage_.size());
-			global_id_storage_.push_back({nullptr, 0});
-		}
-
-		int idx = global_free_idx_list_.back();
-		global_free_idx_list_.pop_back();
-	#else
-		int idx = global_id_storage_.size();
-		global_id_storage_.push_back({nullptr, 0});
-	#endif
-		char* buf = static_cast<char*>(malloc(p.size() + 1));
-		memcpy(buf, p.data(), p.size());
-		buf[p.size()] = 0;
-		global_id_storage_.at(idx) = {buf, GetSize(p)};
-		global_id_index_.insert(it, {std::string_view(buf, p.size()), idx});
-
-		if (yosys_xtrace) {
-			log("#X# New IdString '%s' with index %d.\n", global_id_storage_.at(idx).buf, idx);
-			log_backtrace("-X- ", yosys_xtrace-1);
-		}
-
-	#ifdef YOSYS_XTRACE_GET_PUT
-		if (yosys_xtrace)
-			log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx).buf, idx, refcount(idx));
-	#endif
-
-		return idx;
+	// Inserts an ID with string `prefix + autoidx', incrementing autoidx.
+	// `prefix` must start with '$auto$', end with '$', and live forever.
+	static IdString new_autoidx_with_prefix(const std::string *prefix) {
+		int index = -(autoidx++);
+		global_autoidx_id_prefix_storage_.insert({index, prefix});
+		return from_index(index);
 	}
 
 	// the actual IdString object is just is a single int
@@ -270,17 +238,35 @@ struct RTLIL::IdString
 	constexpr inline const IdString &id_string() const { return *this; }
 
 	inline const char *c_str() const {
-		return global_id_storage_.at(index_).buf;
+		if (index_ >= 0)
+			return global_id_storage_.at(index_).buf;
+		auto it = global_autoidx_id_storage_.find(index_);
+		if (it != global_autoidx_id_storage_.end())
+			return it->second;
+
+		const std::string &prefix = *global_autoidx_id_prefix_storage_.at(index_);
+		std::string suffix = std::to_string(-index_);
+		char *c = new char[prefix.size() + suffix.size() + 1];
+		memcpy(c, prefix.data(), prefix.size());
+		memcpy(c + prefix.size(), suffix.c_str(), suffix.size() + 1);
+		global_autoidx_id_storage_.insert(it, {index_, c});
+		return c;
 	}
 
 	inline std::string str() const {
-		const Storage &storage = global_id_storage_.at(index_);
-		return std::string(storage.buf, storage.size);
+		std::string result;
+		append_to(&result);
+		return result;
 	}
 
-	inline std::string_view str_view() const {
-		const Storage &storage = global_id_storage_.at(index_);
-		return std::string_view(storage.buf, storage.size);
+	inline void append_to(std::string *out) const {
+		if (index_ >= 0) {
+			const Storage &storage = global_id_storage_.at(index_);
+			*out += std::string_view(storage.buf, storage.size);
+			return;
+		}
+		*out += *global_autoidx_id_prefix_storage_.at(index_);
+		*out += std::to_string(-index_);
 	}
 
 	inline bool operator<(const IdString &rhs) const {
@@ -336,7 +322,9 @@ struct RTLIL::IdString
 	}
 
 	size_t size() const {
-		return global_id_storage_.at(index_).size;
+		if (index_ >= 0)
+			return global_id_storage_.at(index_).size;
+		return strlen(c_str());
 	}
 
 	bool empty() const {
@@ -382,6 +370,14 @@ struct RTLIL::IdString
 
 private:
 	static void prepopulate();
+	static int really_insert(std::string_view p, std::unordered_map<std::string_view, int>::iterator &it);
+
+protected:
+	static IdString from_index(int index) {
+		IdString result;
+		result.index_ = index;
+		return result;
+	}
 
 public:
 	static void ensure_prepopulated() {
@@ -450,7 +446,7 @@ private:
 	#endif
 	#ifdef YOSYS_XTRACE_GET_PUT
 		if (yosys_xtrace && idx >= static_cast<short>(StaticId::STATIC_ID_END))
-			log("#X# GET-BY-INDEX '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, refcount(idx));
+			log("#X# GET-BY-INDEX '%s' (index %d, refcount %u)\n", from_index(idx), idx, refcount(idx));
 	#endif
 	}
 
@@ -463,7 +459,7 @@ private:
 			return;
 	#ifdef YOSYS_XTRACE_GET_PUT
 		if (yosys_xtrace)
-			log("#X# PUT '%s' (index %d, refcount %u)\n", global_id_storage_.at(index_), index_, refcount(index_));
+			log("#X# PUT '%s' (index %d, refcount %u)\n", from_index(index_), index_, refcount(index_));
 	#endif
 		auto it = global_refcount_storage_.find(index_);
 		log_assert(it != global_refcount_storage_.end() && it->second >= 1);
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 85de1ea72..bf59302f8 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -295,7 +295,7 @@ void yosys_shutdown()
 #endif
 }
 
-RTLIL::IdString new_id(std::string_view file, int line, std::string_view func)
+const std::string *create_id_prefix(std::string_view file, int line, std::string_view func)
 {
 #ifdef _WIN32
 	size_t pos = file.find_last_of("/\\");
@@ -309,7 +309,7 @@ RTLIL::IdString new_id(std::string_view file, int line, std::string_view func)
 	if (pos != std::string_view::npos)
 		func = func.substr(pos+1);
 
-	return stringf("$auto$%s:%d:%s$%d", file, line, func, autoidx++);
+	return new std::string(stringf("$auto$%s:%d:%s$", file, line, func));
 }
 
 RTLIL::IdString new_id_suffix(std::string_view file, int line, std::string_view func, std::string_view suffix)
diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index 08b7fdc08..bc8500654 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -271,11 +271,14 @@ extern int autoidx;
 extern int yosys_xtrace;
 extern bool yosys_write_versions;
 
-RTLIL::IdString new_id(std::string_view file, int line, std::string_view func);
+const std::string *create_id_prefix(std::string_view file, int line, std::string_view func);
 RTLIL::IdString new_id_suffix(std::string_view file, int line, std::string_view func, std::string_view suffix);
 
 #define NEW_ID \
-	YOSYS_NAMESPACE_PREFIX new_id(__FILE__, __LINE__, __FUNCTION__)
+	YOSYS_NAMESPACE_PREFIX RTLIL::IdString::new_autoidx_with_prefix([](std::string_view func) -> const std::string * { \
+		static const std::string *prefix = create_id_prefix(__FILE__, __LINE__, func); \
+		return prefix; \
+	}(__FUNCTION__))
 #define NEW_ID_SUFFIX(suffix) \
 	YOSYS_NAMESPACE_PREFIX new_id_suffix(__FILE__, __LINE__, __FUNCTION__, suffix)
 
diff --git a/pyosys/generator.py b/pyosys/generator.py
index 0883a7ba4..f89819504 100644
--- a/pyosys/generator.py
+++ b/pyosys/generator.py
@@ -164,6 +164,8 @@ pyosys_headers = [
                     {
                         "global_id_storage_",
                         "global_id_index_",
+                        "global_negative_id_storage_",
+                        "global_negative_id_prefix_storage_",
                         "global_refcount_storage_",
                         "global_free_idx_list_",
                         "last_created_idx_ptr_",
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index 8bba9ac28..a5923e02c 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -367,6 +367,12 @@ namespace RTLIL {
 		EXPECT_EQ(own.str(), "\\figblortle");
 	}
 
+	TEST_F(KernelRtlilTest, LookupAutoidxId) {
+		IdString id = NEW_ID;
+		IdString id2 = IdString(id.str());
+		EXPECT_EQ(id, id2);
+	}
+
 	class WireRtlVsHdlIndexConversionTest :
 		public KernelRtlilTest,
 		public testing::WithParamInterface<std::tuple<bool, int, int>>

From df8444c5e73de481f7129dbfc7220d1d525cbb9f Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 13 Oct 2025 20:51:35 +0000
Subject: [PATCH 834/931] Optimize IdString operations to avoid calling c_str()

---
 kernel/rtlil.h                 | 203 +++++++++++++++++++++++++++++----
 tests/unit/kernel/rtlilTest.cc |  18 +++
 2 files changed, 200 insertions(+), 21 deletions(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 7a6dad57f..de80a9c60 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -131,6 +131,8 @@ struct RTLIL::IdString
 	struct Storage {
 		char *buf;
 		int size;
+
+		std::string_view str_view() const { return {buf, static_cast<size_t>(size)}; }
 	};
 
 	#undef YOSYS_XTRACE_GET_PUT
@@ -261,14 +263,135 @@ struct RTLIL::IdString
 
 	inline void append_to(std::string *out) const {
 		if (index_ >= 0) {
-			const Storage &storage = global_id_storage_.at(index_);
-			*out += std::string_view(storage.buf, storage.size);
+			*out += global_id_storage_.at(index_).str_view();
 			return;
 		}
 		*out += *global_autoidx_id_prefix_storage_.at(index_);
 		*out += std::to_string(-index_);
 	}
 
+	class Substrings {
+		std::string_view first_;
+		int suffix_number;
+		char buf[10];
+	public:
+		Substrings(const Storage &storage) : first_(storage.str_view()), suffix_number(-1) {}
+		// suffix_number must be non-negative
+		Substrings(const std::string *prefix, int suffix_number)
+				: first_(*prefix), suffix_number(suffix_number) {}
+		std::string_view first() { return first_; }
+		std::optional<std::string_view> next() {
+			if (suffix_number < 0)
+				return std::nullopt;
+                       int i = sizeof(buf);
+			do {
+				--i;
+                               buf[i] = (suffix_number % 10) + '0';
+                               suffix_number /= 10;
+			} while (suffix_number > 0);
+			suffix_number = -1;
+			return std::string_view(buf + i, sizeof(buf) - i);
+		}
+	};
+
+	class const_iterator {
+		const std::string *prefix;
+		std::string suffix;
+		const char *c_str;
+		int c_str_len;
+		// When this is INT_MAX it's the generic "end" value.
+		int index;
+
+	public:
+		using iterator_category = std::forward_iterator_tag;
+		using value_type = char;
+		using difference_type = std::ptrdiff_t;
+		using pointer = const char*;
+		using reference = const char&;
+
+		const_iterator(const Storage &storage) : prefix(nullptr), c_str(storage.buf), c_str_len(storage.size), index(0) {}
+		const_iterator(const std::string *prefix, int number) :
+				prefix(prefix), suffix(std::to_string(number)), c_str(nullptr), c_str_len(0), index(0) {}
+		// Construct end-marker
+		const_iterator() : prefix(nullptr), c_str(nullptr), c_str_len(0), index(INT_MAX) {}
+
+		int size() const {
+			if (c_str != nullptr)
+				return c_str_len;
+			return GetSize(*prefix) + GetSize(suffix);
+		}
+
+		char operator*() const {
+			if (c_str != nullptr)
+				return c_str[index];
+			int prefix_size = GetSize(*prefix);
+			if (index < prefix_size)
+				return prefix->at(index);
+			return suffix[index - prefix_size];
+		}
+
+		const_iterator& operator++() { ++index; return *this; }
+		const_iterator operator++(int) { const_iterator result(*this); ++index; return result; }
+		const_iterator& operator+=(int i) { index += i; return *this; }
+
+		const_iterator operator+(int add) {
+			const_iterator result = *this;
+			result += add;
+			return result;
+		}
+
+		bool operator==(const const_iterator& other) const {
+			return index == other.index || (other.index == INT_MAX && index == size())
+				|| (index == INT_MAX && other.index == other.size());
+		}
+		bool operator!=(const const_iterator& other) const {
+			return !(*this == other);
+		}
+	};
+	const_iterator begin() const {
+		if (index_ >= 0) {
+			return const_iterator(global_id_storage_.at(index_));
+		}
+		return const_iterator(global_autoidx_id_prefix_storage_.at(index_), -index_);
+	}
+	const_iterator end() const {
+		return const_iterator();
+	}
+
+	Substrings substrings() const {
+		if (index_ >= 0) {
+			return Substrings(global_id_storage_.at(index_));
+		}
+		return Substrings(global_autoidx_id_prefix_storage_.at(index_), -index_);
+	}
+
+	inline bool lt_by_name(const IdString &rhs) const {
+		Substrings lhs_it = substrings();
+		Substrings rhs_it = rhs.substrings();
+		std::string_view lhs_substr = lhs_it.first();
+		std::string_view rhs_substr = rhs_it.first();
+		while (true) {
+			int min = std::min(GetSize(lhs_substr), GetSize(rhs_substr));
+			int diff = memcmp(lhs_substr.data(), rhs_substr.data(), min);
+			if (diff != 0)
+				return diff < 0;
+			lhs_substr = lhs_substr.substr(min);
+			rhs_substr = rhs_substr.substr(min);
+			if (rhs_substr.empty()) {
+				if (std::optional<std::string_view> s = rhs_it.next())
+					rhs_substr = *s;
+				else
+					return false;
+			}
+			if (lhs_substr.empty()) {
+				if (std::optional<std::string_view> s = lhs_it.next())
+					lhs_substr = *s;
+				else
+					return true;
+			}
+		}
+	}
+
 	inline bool operator<(const IdString &rhs) const {
 		return index_ < rhs.index_;
 	}
@@ -285,30 +408,68 @@ struct RTLIL::IdString
 	bool operator!=(const char *rhs) const { return strcmp(c_str(), rhs) != 0; }
 
 	char operator[](size_t i) const {
-					const char *p = c_str();
+		if (index_ >= 0) {
+			const Storage &storage = global_id_storage_.at(index_);
 #ifndef NDEBUG
-		for (; i != 0; i--, p++)
-			log_assert(*p != 0);
-		return *p;
-#else
-		return *(p + i);
+			log_assert(static_cast<int>(i) < storage.size);
 #endif
+			return *(storage.buf + i);
+		}
+		const std::string &id_start = *global_autoidx_id_prefix_storage_.at(index_);
+		if (i < id_start.size())
+			return id_start[i];
+		i -= id_start.size();
+		std::string suffix = std::to_string(-index_);
+#ifndef NDEBUG
+		// Allow indexing to access the trailing null.
+		log_assert(i <= suffix.size());
+#endif
+		return suffix[i];
 	}
 
 	std::string substr(size_t pos = 0, size_t len = std::string::npos) const {
-		if (len == std::string::npos || len + pos >= size())
-			return std::string(c_str() + pos);
-		else
-			return std::string(c_str() + pos, len);
+		std::string result;
+		const_iterator it = begin() + pos;
+		const_iterator end_it = end();
+		if (len != std::string::npos && len < it.size() - pos) {
+			end_it = it + len;
+		}
+		std::copy(it, end_it, std::back_inserter(result));
+		return result;
 	}
 
 	int compare(size_t pos, size_t len, const char* s) const {
-		return strncmp(c_str()+pos, s, len);
+		const_iterator it = begin() + pos;
+		const_iterator end_it = end();
+		while (len > 0 && *s != 0 && it != end_it) {
+			int diff = *it - *s;
+			if (diff != 0)
+				return diff;
+			++it;
+			++s;
+			--len;
+		}
+		return 0;
 	}
 
 	bool begins_with(std::string_view prefix) const {
-		if (size() < prefix.size()) return false;
-		return compare(0, prefix.size(), prefix.data()) == 0;
+		Substrings it = substrings();
+		std::string_view substr = it.first();
+		while (true) {
+			int min = std::min(GetSize(substr), GetSize(prefix));
+			if (memcmp(substr.data(), prefix.data(), min) != 0)
+				return false;
+			prefix = prefix.substr(min);
+			if (prefix.empty())
+				return true;
+			substr = substr.substr(min);
+			if (substr.empty()) {
+				if (std::optional<std::string_view> s = it.next())
+					substr = *s;
+				else
+					return false;
+			}
+		}
 	}
 
 	bool ends_with(std::string_view suffix) const {
@@ -318,13 +479,13 @@ struct RTLIL::IdString
 	}
 
 	bool contains(std::string_view s) const {
-		return std::string_view(c_str()).find(s) != std::string::npos;
+		if (index_ >= 0)
+			return global_id_storage_.at(index_).str_view().find(s) != std::string::npos;
+		return str().find(s) != std::string::npos;
 	}
 
 	size_t size() const {
-		if (index_ >= 0)
-			return global_id_storage_.at(index_).size;
-		return strlen(c_str());
+		return begin().size();
 	}
 
 	bool empty() const {
@@ -603,13 +764,13 @@ namespace RTLIL {
 
 	template <typename T> struct sort_by_name_str {
 		bool operator()(T *a, T *b) const {
-			return strcmp(a->name.c_str(), b->name.c_str()) < 0;
+			return a->name.lt_by_name(b->name);
 		}
 	};
 
 	struct sort_by_id_str {
 		bool operator()(const RTLIL::IdString &a, const RTLIL::IdString &b) const {
-			return strcmp(a.c_str(), b.c_str()) < 0;
+			return a.lt_by_name(b);
 		}
 	};
 
diff --git a/tests/unit/kernel/rtlilTest.cc b/tests/unit/kernel/rtlilTest.cc
index a5923e02c..32c40616e 100644
--- a/tests/unit/kernel/rtlilTest.cc
+++ b/tests/unit/kernel/rtlilTest.cc
@@ -373,6 +373,24 @@ namespace RTLIL {
 		EXPECT_EQ(id, id2);
 	}
 
+	TEST_F(KernelRtlilTest, NewIdBeginsWith) {
+		IdString id = NEW_ID;
+		EXPECT_TRUE(id.begins_with("$auto"));
+		EXPECT_FALSE(id.begins_with("xyz"));
+		EXPECT_TRUE(id.begins_with("$auto$"));
+		EXPECT_FALSE(id.begins_with("abcdefghijklmn"));
+		EXPECT_TRUE(id.begins_with("$auto$rtlilTest"));
+		EXPECT_FALSE(id.begins_with("$auto$rtlilX"));
+	}
+
+	TEST_F(KernelRtlilTest, NewIdIndexing) {
+		IdString id = NEW_ID;
+		std::string str = id.str();
+		for (int i = 0; i < GetSize(str) + 1; ++i) {
+			EXPECT_EQ(id[i], str.c_str()[i]);
+		}
+	}
+
 	class WireRtlVsHdlIndexConversionTest :
 		public KernelRtlilTest,
 		public testing::WithParamInterface<std::tuple<bool, int, int>>

From 325b27f43ad7b694d611a48a6a216d136db1d0be Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 13 Oct 2025 20:52:35 +0000
Subject: [PATCH 835/931] Avoid calling IdString::c_str() in opt_clean

---
 passes/opt/opt_clean.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/opt/opt_clean.cc b/passes/opt/opt_clean.cc
index b3e3cd33a..3892c7581 100644
--- a/passes/opt/opt_clean.cc
+++ b/passes/opt/opt_clean.cc
@@ -283,7 +283,7 @@ bool compare_signals(RTLIL::SigBit &s1, RTLIL::SigBit &s2, SigPool &regs, SigPoo
 	if (attrs1 != attrs2)
 		return attrs2 > attrs1;
 
-	return strcmp(w2->name.c_str(), w1->name.c_str()) < 0;
+	return w2->name.lt_by_name(w1->name);
 }
 
 bool check_public_name(RTLIL::IdString id)

From c4c389fdd71f9dfc653d64789437084fd091f21e Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 13 Oct 2025 22:23:51 +0000
Subject: [PATCH 836/931] Fix verilog backend to avoid IdString::c_str()

---
 backends/verilog/verilog_backend.cc | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index faeb2cd0b..67ff1f808 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -108,22 +108,30 @@ IdString initial_id;
 
 void reset_auto_counter_id(RTLIL::IdString id, bool may_rename)
 {
-	const char *str = id.c_str();
-
-	if (*str == '$' && may_rename && !norename)
-		auto_name_map[id] = auto_name_counter++;
-
-	if (str[0] != '\\' || str[1] != '_' || str[2] == 0)
+	auto it = id.begin();
+	auto it_end = id.end();
+	if (it == it_end)
 		return;
 
-	for (int i = 2; str[i] != 0; i++) {
-		if (str[i] == '_' && str[i+1] == 0)
+	if (*it == '$' && may_rename && !norename)
+		auto_name_map[id] = auto_name_counter++;
+
+	if (*it != '\\' || *it != '_' || (it + 1) == it_end)
+		return;
+
+	it += 2;
+	auto start = it;
+	while (it != it_end) {
+		char ch = *it;
+		if (ch == '_' && (it + 1) == it_end)
 			continue;
-		if (str[i] < '0' || str[i] > '9')
+		if (ch < '0' || ch > '9')
 			return;
 	}
 
-	int num = atoi(str+2);
+	std::string s;
+	std::copy(start, it_end, std::back_inserter(s));
+	int num = atoi(s.c_str());
 	if (num >= auto_name_offset)
 		auto_name_offset = num + 1;
 }

From 8c2984dc5f29ac22736febbda462e3f164dcb641 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 13 Oct 2025 22:43:31 +0000
Subject: [PATCH 837/931] Fix AbcModuleState::remap_name() to avoid calling
 IdString::c_str()

---
 passes/techmap/abc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index e2894aee3..3a814d0b7 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -611,7 +611,7 @@ std::string AbcModuleState::remap_name(RTLIL::IdString abc_name, RTLIL::Wire **o
 			}
 		}
 	}
-	return stringf("$abc$%d$%s", map_autoidx, abc_name.c_str()+1);
+	return stringf("$abc$%d$%s", map_autoidx, abc_name.substr(1));
 }
 
 void AbcModuleState::dump_loop_graph(FILE *f, int &nr, dict<int, pool<int>> &edges, pool<int> &workpool, std::vector<int> &in_counts)

From 578d6588713b4a82a493dfdac70fed26984dcaed Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Fri, 17 Oct 2025 12:15:53 +1300
Subject: [PATCH 838/931] Add timing stats for IdString garbage collection

---
 kernel/driver.cc   | 2 ++
 kernel/register.cc | 5 +++++
 kernel/register.h  | 2 ++
 kernel/rtlil.cc    | 8 ++++++++
 kernel/rtlil.h     | 5 +++++
 5 files changed, 22 insertions(+)

diff --git a/kernel/driver.cc b/kernel/driver.cc
index 795fd9fc5..eae9c5276 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -709,6 +709,8 @@ int main(int argc, char **argv)
 				total_ns += it.second->runtime_ns + 1;
 				timedat.insert(make_tuple(it.second->runtime_ns + 1, it.second->call_counter, it.first));
 			}
+		timedat.insert(make_tuple(RTLIL::OwningIdString::garbage_collection_ns() + 1,
+				RTLIL::OwningIdString::garbage_collection_count(), "id_gc"));
 
 		if (timing_details)
 		{
diff --git a/kernel/register.cc b/kernel/register.cc
index 1f8e4a9a5..3f5aa49ca 100644
--- a/kernel/register.cc
+++ b/kernel/register.cc
@@ -129,6 +129,11 @@ void Pass::post_execute(Pass::pre_post_exec_state_t state)
 	int64_t time_ns = PerformanceTimer::query() - state.begin_ns;
 	runtime_ns += time_ns;
 	current_pass = state.parent_pass;
+	subtract_from_current_runtime_ns(time_ns);
+}
+
+void Pass::subtract_from_current_runtime_ns(int64_t time_ns)
+{
 	if (current_pass)
 		current_pass->runtime_ns -= time_ns;
 }
diff --git a/kernel/register.h b/kernel/register.h
index b9c709dc1..78f9b430d 100644
--- a/kernel/register.h
+++ b/kernel/register.h
@@ -95,6 +95,8 @@ struct Pass
 	bool experimental_flag = false;
 	bool internal_flag = false;
 
+	static void subtract_from_current_runtime_ns(int64_t time_ns);
+
 	void experimental() {
 		experimental_flag = true;
 	}
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 91fbc7960..bc89fc6a4 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -243,8 +243,12 @@ struct IdStringCollector {
 	std::unordered_set<int> live;
 };
 
+int64_t RTLIL::OwningIdString::gc_ns;
+int RTLIL::OwningIdString::gc_count;
+
 void RTLIL::OwningIdString::collect_garbage()
 {
+	int64_t start = PerformanceTimer::query();
 #ifndef YOSYS_NO_IDS_REFCNT
 	IdStringCollector collector;
 	for (auto &[idx, design] : *RTLIL::Design::get_all_designs()) {
@@ -288,6 +292,10 @@ void RTLIL::OwningIdString::collect_garbage()
 		it = global_autoidx_id_prefix_storage_.erase(it);
 	}
 #endif
+	int64_t time_ns = PerformanceTimer::query() - start;
+	Pass::subtract_from_current_runtime_ns(time_ns);
+	gc_ns += time_ns;
+	++gc_count;
 }
 
 dict<std::string, std::string> RTLIL::constpad;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index de80a9c60..4ae284b25 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -579,6 +579,8 @@ struct RTLIL::OwningIdString : public RTLIL::IdString {
 
 	// Collect all non-owning references.
 	static void collect_garbage();
+	static int64_t garbage_collection_ns() { return gc_ns; }
+	static int garbage_collection_count() { return gc_count; }
 
 	// Used by the ID() macro to create an IdString with no destructor whose string will
 	// never be released. If ID() creates a closure-static `OwningIdString` then
@@ -590,6 +592,9 @@ struct RTLIL::OwningIdString : public RTLIL::IdString {
 		return result;
 	}
 private:
+	static int64_t gc_ns;
+	static int gc_count;
+
 	void get_reference()
 	{
 		get_reference(index_);

From ae281720cf25fa7b0d74a9eaa7c25fb7b2672614 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 21 Oct 2025 00:00:59 +0200
Subject: [PATCH 839/931] tests: remove unstable FPGA synthesis result checks

---
 tests/arch/quicklogic/pp3/fsm.ys | 2 --
 tests/arch/xilinx/dsp_cascade.ys | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/arch/quicklogic/pp3/fsm.ys b/tests/arch/quicklogic/pp3/fsm.ys
index 9679628e9..3276e45c6 100644
--- a/tests/arch/quicklogic/pp3/fsm.ys
+++ b/tests/arch/quicklogic/pp3/fsm.ys
@@ -11,8 +11,6 @@ sat -verify -prove-asserts -show-public -set-at 1 in_reset 1 -seq 20 -prove-skip
 design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design)
 cd fsm # Constrain all select calls below inside the top module
 
-select -assert-count 2 t:LUT2
-select -assert-count 4 t:LUT3
 select -assert-count 4 t:dffepc
 select -assert-count 1 t:logic_0
 select -assert-count 1 t:logic_1
diff --git a/tests/arch/xilinx/dsp_cascade.ys b/tests/arch/xilinx/dsp_cascade.ys
index ca6b619b9..0a68377f6 100644
--- a/tests/arch/xilinx/dsp_cascade.ys
+++ b/tests/arch/xilinx/dsp_cascade.ys
@@ -69,7 +69,8 @@ equiv_opt -assert -map +/xilinx/cells_sim.v synth_xilinx -noiopad
 design -load postopt
 cd cascade
 select -assert-count 2 t:DSP48E1
-select -assert-none t:DSP48E1 t:BUFG %% t:* %D
+# TODO Disabled check, FDREs emitted due to order sensitivity
+# select -assert-none t:DSP48E1 t:BUFG %% t:* %D
 # Very crude method of checking that DSP48E1.PCOUT -> DSP48E1.PCIN
 #   (see above for explanation)
 select -assert-count 1 t:DSP48E1 %co:+[PCOUT] t:DSP48E1 %d %co:+[PCIN] w:* %d t:DSP48E1 %i

From 50bfb5c5c9bfd464bf2c33b6e2b3bd2c755ed78f Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 12 Nov 2025 20:19:42 +0100
Subject: [PATCH 840/931] constids: add $input_port and $connect

---
 kernel/constids.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/constids.inc b/kernel/constids.inc
index 7aed897e1..c99aa788d 100644
--- a/kernel/constids.inc
+++ b/kernel/constids.inc
@@ -196,6 +196,7 @@ X($bweqx)
 X($bwmux)
 X($check)
 X($concat)
+X($connect)
 X($cover)
 X($demux)
 X($dff)
@@ -222,6 +223,7 @@ X($get_tag)
 X($gt)
 X($initstate)
 X($input)
+X($input_port)
 X($lcu)
 X($le)
 X($live)

From 1ee4fc9d27292a1508029c188814ddc043741e44 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 12 Nov 2025 20:20:51 +0100
Subject: [PATCH 841/931] fix YOSYS_XTRACE_GET_PUT

---
 kernel/rtlil.cc | 2 +-
 kernel/rtlil.h  | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index bc89fc6a4..d18a709c9 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -130,7 +130,7 @@ int RTLIL::IdString::really_insert(std::string_view p, std::unordered_map<std::s
 
 #ifdef YOSYS_XTRACE_GET_PUT
 	if (yosys_xtrace)
-		log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx), idx, refcount(idx));
+		log("#X# GET-BY-NAME '%s' (index %d, refcount %u)\n", global_id_storage_.at(idx).buf, idx, refcount(idx));
 #endif
 	return idx;
 }
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 4ae284b25..584c4e11b 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -135,10 +135,6 @@ struct RTLIL::IdString
 		std::string_view str_view() const { return {buf, static_cast<size_t>(size)}; }
 	};
 
-	#undef YOSYS_XTRACE_GET_PUT
-	#undef YOSYS_SORT_ID_FREE_LIST
-	#undef YOSYS_NO_IDS_REFCNT
-
 	// the global id string cache
 
 	static bool destruct_guard_ok; // POD, will be initialized to zero
@@ -178,7 +174,7 @@ struct RTLIL::IdString
 			if (global_id_storage_.at(idx).buf == nullptr)
 				log("#X# DB-DUMP index %d: FREE\n", idx);
 			else
-				log("#X# DB-DUMP index %d: '%s' (ref %u)\n", idx, refcount(idx).buf, refcount);
+				log("#X# DB-DUMP index %d: '%s' (ref %u)\n", idx, global_id_storage_.at(idx).buf, refcount(idx));
 		}
 	#endif
 	}

From 8c76f93fcef412605d0ef01e7987a903be6c9e99 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 12 Nov 2025 20:22:30 +0100
Subject: [PATCH 842/931] rtlil: make tracing optional in IdString garbage
 collection

---
 kernel/rtlil.cc | 9 +++++----
 kernel/rtlil.h  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index d18a709c9..ee53afe41 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -246,14 +246,15 @@ struct IdStringCollector {
 int64_t RTLIL::OwningIdString::gc_ns;
 int RTLIL::OwningIdString::gc_count;
 
-void RTLIL::OwningIdString::collect_garbage()
+void RTLIL::OwningIdString::collect_garbage(bool trace)
 {
 	int64_t start = PerformanceTimer::query();
 #ifndef YOSYS_NO_IDS_REFCNT
 	IdStringCollector collector;
-	for (auto &[idx, design] : *RTLIL::Design::get_all_designs()) {
-		collector.trace(*design);
-	}
+	if (trace)
+		for (auto &[idx, design] : *RTLIL::Design::get_all_designs()) {
+			collector.trace(*design);
+		}
 	int size = GetSize(global_id_storage_);
 	for (int i = static_cast<int>(StaticId::STATIC_ID_END); i < size; ++i) {
 		RTLIL::IdString::Storage &storage = global_id_storage_.at(i);
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 584c4e11b..6098d916b 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -574,7 +574,7 @@ struct RTLIL::OwningIdString : public RTLIL::IdString {
 	}
 
 	// Collect all non-owning references.
-	static void collect_garbage();
+	static void collect_garbage(bool trace = true);
 	static int64_t garbage_collection_ns() { return gc_ns; }
 	static int garbage_collection_count() { return gc_count; }
 

From ead0f922e1b8116f114633e31c79a6f1db2673c6 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Wed, 12 Nov 2025 22:29:54 +0000
Subject: [PATCH 843/931] Add missing YOSYS_NAMESPACE_PREFIX to fix callers of
 NEW_ID that aren't in the Yosys namespace

---
 kernel/yosys_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index bc8500654..2374182ee 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -276,7 +276,7 @@ RTLIL::IdString new_id_suffix(std::string_view file, int line, std::string_view
 
 #define NEW_ID \
 	YOSYS_NAMESPACE_PREFIX RTLIL::IdString::new_autoidx_with_prefix([](std::string_view func) -> const std::string * { \
-		static const std::string *prefix = create_id_prefix(__FILE__, __LINE__, func); \
+		static const std::string *prefix = YOSYS_NAMESPACE_PREFIX create_id_prefix(__FILE__, __LINE__, func); \
 		return prefix; \
 	}(__FUNCTION__))
 #define NEW_ID_SUFFIX(suffix) \

From 04135ba3e48b835efc5c8a453e3fa4f3243b10f2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 13 Nov 2025 00:24:44 +0000
Subject: [PATCH 844/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f29c15484..d9cf6e998 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.59+9
+YOSYS_VER := 0.59+30
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From bc3fc212480abf0ccdf475761bf7a4131074cef5 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 13 Nov 2025 02:02:02 +0100
Subject: [PATCH 845/931] microchip: fix IdString memory leak

---
 techlibs/microchip/microchip_dsp.pmg         | 2 +-
 techlibs/microchip/microchip_dsp_cascade.pmg | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/techlibs/microchip/microchip_dsp.pmg b/techlibs/microchip/microchip_dsp.pmg
index 9a6b9e1fa..2573135ee 100644
--- a/techlibs/microchip/microchip_dsp.pmg
+++ b/techlibs/microchip/microchip_dsp.pmg
@@ -268,7 +268,7 @@ endmatch
 code
 	if (postAdd)
 	{
-		if (postAdd->type.in(ID($sub)) && postAddAB == \A) {
+		if (postAdd->type.in($sub) && postAddAB == \A) {
 			// if $sub, the multiplier output must match to $sub.B, otherwise no match	
 		} else {
 			u_postAddAB = postAddAB;
diff --git a/techlibs/microchip/microchip_dsp_cascade.pmg b/techlibs/microchip/microchip_dsp_cascade.pmg
index d7ea5911e..fa276d5b5 100644
--- a/techlibs/microchip/microchip_dsp_cascade.pmg
+++ b/techlibs/microchip/microchip_dsp_cascade.pmg
@@ -115,9 +115,9 @@ finally
 				Wire *cascade = module->addWire(NEW_ID, 48);
 
 				// zero port C and move wire to cascade
-				dsp_pcin->setPort(ID(C), Const(0, 48));
-				dsp_pcin->setPort(ID(CDIN), cascade);
-				dsp->setPort(ID(CDOUT), cascade);
+				dsp_pcin->setPort(\C, Const(0, 48));
+				dsp_pcin->setPort(\CDIN, cascade);
+				dsp->setPort(\CDOUT, cascade);
 
 				// Configure wire to cascade the dsps
 				add_siguser(cascade, dsp_pcin);

From 1dd5b150e545d9b22e790d649dc46a9d433864e0 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 13 Nov 2025 11:10:13 +0100
Subject: [PATCH 846/931] driver: garbage collect IdStrings without tracing at
 exit

---
 kernel/driver.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/driver.cc b/kernel/driver.cc
index eae9c5276..792f78b7f 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -158,6 +158,7 @@ extern "C" {
 
 void yosys_atexit()
 {
+	RTLIL::OwningIdString::collect_garbage(false);
 #if defined(YOSYS_ENABLE_READLINE) || defined(YOSYS_ENABLE_EDITLINE)
 	if (!yosys_history_file.empty()) {
 #if defined(YOSYS_ENABLE_READLINE)

From c48bc56f4aa8873e8f32d2a7542ade803cc3043c Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 13 Nov 2025 11:10:50 +0100
Subject: [PATCH 847/931] driver: fix timing data divison by zero when no
 passes run

---
 kernel/driver.cc | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/kernel/driver.cc b/kernel/driver.cc
index 792f78b7f..d8b104117 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -707,11 +707,16 @@ int main(int argc, char **argv)
 
 		for (auto &it : pass_register)
 			if (it.second->call_counter) {
-				total_ns += it.second->runtime_ns + 1;
-				timedat.insert(make_tuple(it.second->runtime_ns + 1, it.second->call_counter, it.first));
+				auto pass_ns = it.second->runtime_ns + 1;
+				total_ns += pass_ns;
+				timedat.insert(make_tuple(pass_ns, it.second->call_counter, it.first));
 			}
-		timedat.insert(make_tuple(RTLIL::OwningIdString::garbage_collection_ns() + 1,
-				RTLIL::OwningIdString::garbage_collection_count(), "id_gc"));
+		{
+			auto gc_ns = RTLIL::OwningIdString::garbage_collection_ns() + 1;
+			total_ns += gc_ns;
+			timedat.insert(make_tuple(gc_ns,
+					RTLIL::OwningIdString::garbage_collection_count(), "id_gc"));
+		}
 
 		if (timing_details)
 		{

From a9151437688b06b068114170066d1242e4721dbc Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 13 Nov 2025 12:40:04 +0100
Subject: [PATCH 848/931] ice40: fix IdString memory leak

---
 techlibs/ice40/ice40_opt.cc       | 4 ++--
 techlibs/ice40/ice40_wrapcarry.cc | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/techlibs/ice40/ice40_opt.cc b/techlibs/ice40/ice40_opt.cc
index b13d33018..c88fd69b6 100644
--- a/techlibs/ice40/ice40_opt.cc
+++ b/techlibs/ice40/ice40_opt.cc
@@ -117,7 +117,7 @@ static void run_ice40_opts(Module *module)
 
 			if (GetSize(replacement_output)) {
 				optimized_co.insert(sigmap(cell->getPort(ID::CO)[0]));
-				auto it = cell->attributes.find(ID(SB_LUT4.name));
+				auto it = cell->attributes.find(IdString{"\\SB_LUT4.name"});
 				if (it != cell->attributes.end()) {
 					module->rename(cell, it->second.decode_string());
 					decltype(Cell::attributes) new_attr;
@@ -126,7 +126,7 @@ static void run_ice40_opts(Module *module)
 							new_attr[a.first.c_str() + strlen("\\SB_LUT4.")] = a.second;
 						else if (a.first == ID::src)
 							new_attr.insert(std::make_pair(a.first, a.second));
-						else if (a.first.in(ID(SB_LUT4.name), ID::keep, ID::module_not_derived))
+						else if (a.first.in(IdString{"\\SB_LUT4.name"}, ID::keep, ID::module_not_derived))
 							continue;
 						else if (a.first.begins_with("\\SB_CARRY.\\"))
 							continue;
diff --git a/techlibs/ice40/ice40_wrapcarry.cc b/techlibs/ice40/ice40_wrapcarry.cc
index fe928ba6d..82218ff11 100644
--- a/techlibs/ice40/ice40_wrapcarry.cc
+++ b/techlibs/ice40/ice40_wrapcarry.cc
@@ -62,7 +62,7 @@ void create_ice40_wrapcarry(ice40_wrapcarry_pm &pm)
 		cell->attributes[stringf("\\SB_CARRY.%s", a.first)] = a.second;
 	for (const auto &a : st.lut->attributes)
 		cell->attributes[stringf("\\SB_LUT4.%s", a.first)] = a.second;
-	cell->attributes[ID(SB_LUT4.name)] = Const(st.lut->name.str());
+	cell->attributes[IdString{"\\SB_LUT4.name"}] = Const(st.lut->name.str());
 	if (st.carry->get_bool_attribute(ID::keep) || st.lut->get_bool_attribute(ID::keep))
 		cell->attributes[ID::keep] = true;
 
@@ -122,7 +122,7 @@ struct Ice40WrapCarryPass : public Pass {
 					carry->setPort(ID::CI, cell->getPort(ID::CI));
 					carry->setPort(ID::CO, cell->getPort(ID::CO));
 					module->swap_names(carry, cell);
-					auto lut_name = cell->attributes.at(ID(SB_LUT4.name), Const(NEW_ID.str())).decode_string();
+					auto lut_name = cell->attributes.at(IdString{"\\SB_LUT4.name"}, Const(NEW_ID.str())).decode_string();
 					auto lut = module->addCell(lut_name, ID($lut));
 					lut->setParam(ID::WIDTH, 4);
 					lut->setParam(ID::LUT, cell->getParam(ID::LUT));
@@ -138,7 +138,7 @@ struct Ice40WrapCarryPass : public Pass {
 							lut->attributes[a.first.c_str() + strlen("\\SB_LUT4.")] = a.second;
 						else if (a.first == ID::src)
 							src = a.second;
-						else if (a.first.in(ID(SB_LUT4.name), ID::keep, ID::module_not_derived))
+						else if (a.first.in(IdString{"\\SB_LUT4.name"}, ID::keep, ID::module_not_derived))
 							continue;
 						else
 							log_abort();

From f2263642a4de789069edcefb4a0a1c68e0b01446 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 13 Nov 2025 12:42:06 +0100
Subject: [PATCH 849/931] xilinx: fix IdString memory leak

---
 techlibs/xilinx/xilinx_dsp_cascade.pmg | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/techlibs/xilinx/xilinx_dsp_cascade.pmg b/techlibs/xilinx/xilinx_dsp_cascade.pmg
index 29fc27dfe..9eebd33c3 100644
--- a/techlibs/xilinx/xilinx_dsp_cascade.pmg
+++ b/techlibs/xilinx/xilinx_dsp_cascade.pmg
@@ -90,9 +90,9 @@ finally
 			if (i % MAX_DSP_CASCADE > 0) {
 				if (P >= 0) {
 					Wire *cascade = module->addWire(NEW_ID, 48);
-					dsp_pcin->setPort(ID(C), Const(0, 48));
-					dsp_pcin->setPort(ID(PCIN), cascade);
-					dsp->setPort(ID(PCOUT), cascade);
+					dsp_pcin->setPort(\C, Const(0, 48));
+					dsp_pcin->setPort(\PCIN, cascade);
+					dsp->setPort(\PCOUT, cascade);
 					add_siguser(cascade, dsp_pcin);
 					add_siguser(cascade, dsp);
 
@@ -118,15 +118,15 @@ finally
 				}
 				if (AREG >= 0) {
 					Wire *cascade = module->addWire(NEW_ID, 30);
-					dsp_pcin->setPort(ID(A), Const(0, 30));
-					dsp_pcin->setPort(ID(ACIN), cascade);
-					dsp->setPort(ID(ACOUT), cascade);
+					dsp_pcin->setPort(\A, Const(0, 30));
+					dsp_pcin->setPort(\ACIN, cascade);
+					dsp->setPort(\ACOUT, cascade);
 					add_siguser(cascade, dsp_pcin);
 					add_siguser(cascade, dsp);
 
 					if (dsp->type.in(\DSP48E1))
-						dsp->setParam(ID(ACASCREG), AREG);
-					dsp_pcin->setParam(ID(A_INPUT), Const("CASCADE"));
+						dsp->setParam(\ACASCREG, AREG);
+					dsp_pcin->setParam(\A_INPUT, Const("CASCADE"));
 
 					log_debug("ACOUT -> ACIN cascade for %s -> %s\n", log_id(dsp), log_id(dsp_pcin));
 				}
@@ -138,18 +138,18 @@ finally
 						//   BCOUT from an adjacent DSP48A1 slice. The tools then
 						//   translate BCOUT cascading to the dedicated BCIN input
 						//   and set the B_INPUT attribute for implementation."
-						dsp_pcin->setPort(ID(B), cascade);
+						dsp_pcin->setPort(\B, cascade);
 					}
 					else {
-						dsp_pcin->setPort(ID(B), Const(0, 18));
-						dsp_pcin->setPort(ID(BCIN), cascade);
+						dsp_pcin->setPort(\B, Const(0, 18));
+						dsp_pcin->setPort(\BCIN, cascade);
 					}
-					dsp->setPort(ID(BCOUT), cascade);
+					dsp->setPort(\BCOUT, cascade);
 					add_siguser(cascade, dsp_pcin);
 					add_siguser(cascade, dsp);
 
 					if (dsp->type.in(\DSP48E1)) {
-						dsp->setParam(ID(BCASCREG), BREG);
+						dsp->setParam(\BCASCREG, BREG);
 						// According to UG389 p13 [https://www.xilinx.com/support/documentation/user_guides/ug389.pdf]
 						// "The attribute is only used by place and route tools and
 						//   is not necessary for the users to set for synthesis. The
@@ -158,7 +158,7 @@ finally
 						//   BCOUT of another DSP48A1 slice, then the tools automatically
 						//   set the attribute to 'CASCADE', otherwise it is set to
 						//   'DIRECT'".
-						dsp_pcin->setParam(ID(B_INPUT), Const("CASCADE"));
+						dsp_pcin->setParam(\B_INPUT, Const("CASCADE"));
 					}
 
 					log_debug("BCOUT -> BCIN cascade for %s -> %s\n", log_id(dsp), log_id(dsp_pcin));

From 5e0bc3fd9f951229afa1b71d9f5b115899094bd4 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 12 Nov 2025 11:26:46 +0100
Subject: [PATCH 850/931] Build pyosys on CI

---
 .github/workflows/test-verific.yml | 39 ++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/.github/workflows/test-verific.yml b/.github/workflows/test-verific.yml
index 503d6c31b..6619e1124 100644
--- a/.github/workflows/test-verific.yml
+++ b/.github/workflows/test-verific.yml
@@ -83,3 +83,42 @@ jobs:
         shell: bash
         run: |
           make -j$procs unit-test ENABLE_LTO=1 ENABLE_LIBYOSYS=1
+
+  test-pyosys:
+    needs: pre-job
+    if: ${{ needs.pre-job.outputs.should_skip != 'true' && github.repository == 'YosysHQ/Yosys' }}
+    runs-on: [self-hosted, linux, x64, fast]
+    steps:
+      - name: Checkout Yosys
+        uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          submodules: true
+      - name: Install UV
+        run: |
+          curl -LsSf https://astral.sh/uv/install.sh | sh
+      - name: Runtime environment
+        run: |
+          echo "procs=$(nproc)" >> $GITHUB_ENV
+          echo "${{ github.workspace }}/.local/bin" >> $GITHUB_PATH
+
+      - name: Build pyosys
+        run: |
+          make config-clang
+          echo "ENABLE_VERIFIC := 1" >> Makefile.conf
+          echo "ENABLE_VERIFIC_EDIF := 1" >> Makefile.conf
+          echo "ENABLE_VERIFIC_LIBERTY := 1" >> Makefile.conf
+          echo "ENABLE_VERIFIC_YOSYSHQ_EXTENSIONS := 1" >> Makefile.conf
+          echo "ENABLE_CCACHE := 1" >> Makefile.conf
+          echo "ENABLE_PYOSYS := 1" >> Makefile.conf
+          echo "PYTHON_DESTDIR := /usr/lib/python3/site-packages" >> Makefile.conf
+          make -j$procs
+
+      - name: Install pyosys
+        run: |
+          make install DESTDIR=${GITHUB_WORKSPACE}/.local PREFIX=
+
+      - name: Run pyosys tests
+        run: |
+          export PYTHONPATH=${GITHUB_WORKSPACE}/.local/usr/lib/python3/site-packages:$PYTHONPATH
+          python3 tests/pyosys/run_tests.py

From 10b49f3a916a924b6ef31aeac0d5a31289c2d54a Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 12 Nov 2025 13:47:47 +0100
Subject: [PATCH 851/931] Update generator to reflect IdString changes

---
 pyosys/generator.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pyosys/generator.py b/pyosys/generator.py
index f89819504..c0ccdac5a 100644
--- a/pyosys/generator.py
+++ b/pyosys/generator.py
@@ -168,9 +168,8 @@ pyosys_headers = [
                         "global_negative_id_prefix_storage_",
                         "global_refcount_storage_",
                         "global_free_idx_list_",
-                        "last_created_idx_ptr_",
-                        "last_created_idx_",
                         "builtin_ff_cell_types",
+                        "substrings",
                     }
                 ),
             ),
@@ -455,7 +454,7 @@ class PyosysWrapperGenerator(object):
     ) -> str:
         is_method = isinstance(function, Method)
         function_return_type = function.return_type.format()
-        if class_basename == "Const" and function_return_type in {
+        if class_basename in {"Const","IdString"} and function_return_type in {
             "iterator",
             "const_iterator",
         }:

From 40bbb847667ea11236b03a5825bbcb51a5e986e8 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Wed, 12 Nov 2025 13:53:40 +0100
Subject: [PATCH 852/931] Enable pyosys install in out of tree builds

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d9cf6e998..937cc42bf 100644
--- a/Makefile
+++ b/Makefile
@@ -1040,7 +1040,7 @@ ifeq ($(ENABLE_LIBYOSYS),1)
 	if [ -n "$(STRIP)" ]; then $(INSTALL_SUDO) $(STRIP) -S $(DESTDIR)$(LIBDIR)/libyosys.so; fi
 ifeq ($(ENABLE_PYOSYS),1)
 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys
-	$(INSTALL_SUDO) cp pyosys/__init__.py $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys/__init__.py
+	$(INSTALL_SUDO) cp $(YOSYS_SRC)/pyosys/__init__.py $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys/__init__.py
 	$(INSTALL_SUDO) cp libyosys.so $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys/libyosys.so
 	$(INSTALL_SUDO) cp -r share $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys
 ifeq ($(ENABLE_ABC),1)

From abc78f04241d3f6e59f9256814c54968923bb0e5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Nov 2025 00:25:00 +0000
Subject: [PATCH 853/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 937cc42bf..1016e3d13 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.59+30
+YOSYS_VER := 0.59+44
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From a75b999f133b90c35f366e6b170ad03b3fda796a Mon Sep 17 00:00:00 2001
From: Anhijkt <mihail.ershov.zp@gmail.com>
Date: Fri, 14 Nov 2025 13:25:51 +0200
Subject: [PATCH 854/931] fsm_detect: fix test

---
 tests/various/fsm-arst.ys | 32 ++++++++++----------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/tests/various/fsm-arst.ys b/tests/various/fsm-arst.ys
index 2cfca1d57..d3c40444b 100644
--- a/tests/various/fsm-arst.ys
+++ b/tests/various/fsm-arst.ys
@@ -33,7 +33,6 @@ endmodule
 
 module semi_self_rs_fsm (
     input  wire clk,
-    inout  wire reset,
     input wire test,
     output wire s1
 );
@@ -44,7 +43,7 @@ module semi_self_rs_fsm (
     reg [7:0] current_state, next_state;
     reg [1:0] reset_test;
 
-    assign reset = (test || (reset_test == 2));
+    wire reset = (test || (reset_test == 2));
 
     always @(posedge clk or posedge reset) begin
         if (reset) begin
@@ -75,39 +74,28 @@ endmodule
 
 module self_rs_fsm (
     input  wire clk,
-    inout  wire reset,
     output wire s1
 );
     localparam [7:0] RST = 8'b10010010;
     localparam [7:0] S1 = 8'b01001000;
     localparam [7:0] S2 = 8'b11000111;
 
-    reg [7:0] current_state, next_state;
-    reg reset_reg;
-
+    reg [7:0] next_state;
     wire reset = (reset_reg || next_state == S1);
+
     always @(posedge clk or posedge reset) begin
         if (reset) begin
-            current_state <= RST;
-            reset_reg = 0;
+            next_state <= RST;
         end else begin
-            current_state <= next_state;
+            case (next_state)
+                RST: next_state = S1;
+                S1: next_state = S2;
+                S2: next_state = S1;
+                default: next_state = RST;
+            endcase
         end
     end
 
-    always @(*) begin
-        next_state = current_state;
-
-        case (current_state)
-            RST: next_state = S1;
-            S1: next_state = S2;
-            S2: next_state = S1;
-            default: begin 
-                reset_reg = 1;
-                next_state = RST;
-            end
-        endcase
-    end
 
     assign s1 = next_state == S1;
 endmodule

From b08195a9cffdeff14fc93047745033952d20f914 Mon Sep 17 00:00:00 2001
From: Anhijkt <mihail.ershov.zp@gmail.com>
Date: Fri, 14 Nov 2025 13:34:58 +0200
Subject: [PATCH 855/931] typo

---
 tests/various/fsm-arst.ys | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/various/fsm-arst.ys b/tests/various/fsm-arst.ys
index d3c40444b..4b2c9c66a 100644
--- a/tests/various/fsm-arst.ys
+++ b/tests/various/fsm-arst.ys
@@ -81,7 +81,7 @@ module self_rs_fsm (
     localparam [7:0] S2 = 8'b11000111;
 
     reg [7:0] next_state;
-    wire reset = (reset_reg || next_state == S1);
+    wire reset = next_state == S1;
 
     always @(posedge clk or posedge reset) begin
         if (reset) begin

From 65d7d70507cc007a66d5e876a2246b4aa6d784c5 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 14 Nov 2025 15:31:45 +0100
Subject: [PATCH 856/931] driver: move IdString collection to yosys_shutdown

---
 kernel/driver.cc | 1 -
 kernel/yosys.cc  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/driver.cc b/kernel/driver.cc
index d8b104117..726e25302 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -158,7 +158,6 @@ extern "C" {
 
 void yosys_atexit()
 {
-	RTLIL::OwningIdString::collect_garbage(false);
 #if defined(YOSYS_ENABLE_READLINE) || defined(YOSYS_ENABLE_EDITLINE)
 	if (!yosys_history_file.empty()) {
 #if defined(YOSYS_ENABLE_READLINE)
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index bf59302f8..4e4abed20 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -260,6 +260,7 @@ void yosys_shutdown()
 
 	delete yosys_design;
 	yosys_design = NULL;
+	RTLIL::OwningIdString::collect_garbage();
 
 	for (auto f : log_files)
 		if (f != stderr)

From c497b3b24c4168659288be344c6548163f604a45 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 14 Nov 2025 15:32:10 +0100
Subject: [PATCH 857/931] Revert "rtlil: make tracing optional in IdString
 garbage collection"

This reverts commit 8c76f93fcef412605d0ef01e7987a903be6c9e99.
---
 kernel/rtlil.cc | 9 ++++-----
 kernel/rtlil.h  | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index ee53afe41..d18a709c9 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -246,15 +246,14 @@ struct IdStringCollector {
 int64_t RTLIL::OwningIdString::gc_ns;
 int RTLIL::OwningIdString::gc_count;
 
-void RTLIL::OwningIdString::collect_garbage(bool trace)
+void RTLIL::OwningIdString::collect_garbage()
 {
 	int64_t start = PerformanceTimer::query();
 #ifndef YOSYS_NO_IDS_REFCNT
 	IdStringCollector collector;
-	if (trace)
-		for (auto &[idx, design] : *RTLIL::Design::get_all_designs()) {
-			collector.trace(*design);
-		}
+	for (auto &[idx, design] : *RTLIL::Design::get_all_designs()) {
+		collector.trace(*design);
+	}
 	int size = GetSize(global_id_storage_);
 	for (int i = static_cast<int>(StaticId::STATIC_ID_END); i < size; ++i) {
 		RTLIL::IdString::Storage &storage = global_id_storage_.at(i);
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 6098d916b..584c4e11b 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -574,7 +574,7 @@ struct RTLIL::OwningIdString : public RTLIL::IdString {
 	}
 
 	// Collect all non-owning references.
-	static void collect_garbage(bool trace = true);
+	static void collect_garbage();
 	static int64_t garbage_collection_ns() { return gc_ns; }
 	static int garbage_collection_count() { return gc_count; }
 

From f47540b950d3b3b1f10831effafa77f7e9f33d8b Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 14 Nov 2025 15:40:14 +0100
Subject: [PATCH 858/931] techlibs: remove cells.lib

---
 techlibs/common/Makefile.inc |   1 -
 techlibs/common/cells.lib    | 108 -----------------------------------
 2 files changed, 109 deletions(-)
 delete mode 100644 techlibs/common/cells.lib

diff --git a/techlibs/common/Makefile.inc b/techlibs/common/Makefile.inc
index e76d70a1a..22b119800 100644
--- a/techlibs/common/Makefile.inc
+++ b/techlibs/common/Makefile.inc
@@ -28,7 +28,6 @@ $(eval $(call add_share_file,share,techlibs/common/adff2dff.v))
 $(eval $(call add_share_file,share,techlibs/common/dff2ff.v))
 $(eval $(call add_share_file,share,techlibs/common/gate2lut.v))
 $(eval $(call add_share_file,share,techlibs/common/cmp2lut.v))
-$(eval $(call add_share_file,share,techlibs/common/cells.lib))
 $(eval $(call add_share_file,share,techlibs/common/mul2dsp.v))
 $(eval $(call add_share_file,share,techlibs/common/abc9_model.v))
 $(eval $(call add_share_file,share,techlibs/common/abc9_map.v))
diff --git a/techlibs/common/cells.lib b/techlibs/common/cells.lib
deleted file mode 100644
index eb89036d7..000000000
--- a/techlibs/common/cells.lib
+++ /dev/null
@@ -1,108 +0,0 @@
-library(yosys_cells) {
-	cell(DFF_N) {
-		ff(IQ, IQN) {
-			clocked_on: "!C";
-			next_state: "D";
-		}
-		pin(D) { direction: input; }
-		pin(C) { direction: input; clock: true; }
-		pin(Q) { direction: output; function: "IQ"; }
-	}
-	cell(DFF_P) {
-		ff(IQ, IQN) {
-			clocked_on: "C";
-			next_state: "D";
-		}
-		pin(D) { direction: input; }
-		pin(C) { direction: input; clock: true; }
-		pin(Q) { direction: output; function: "IQ"; }
-	}
-	cell(DFF_NN0) {
-		ff(IQ, IQN) {
-			clocked_on: "!C";
-			next_state: "D";
-			clear: "!R";
-		}
-		pin(D) { direction: input; }
-		pin(R) { direction: input; }
-		pin(C) { direction: input; clock: true; }
-		pin(Q) { direction: output; function: "IQ"; }
-	}
-	cell(DFF_NN1) {
-		ff(IQ, IQN) {
-			clocked_on: "!C";
-			next_state: "D";
-			preset: "!R";
-		}
-		pin(D) { direction: input; }
-		pin(R) { direction: input; }
-		pin(C) { direction: input; clock: true; }
-		pin(Q) { direction: output; function: "IQ"; }
-	}
-	cell(DFF_NP0) {
-		ff(IQ, IQN) {
-			clocked_on: "!C";
-			next_state: "D";
-			clear: "R";
-		}
-		pin(D) { direction: input; }
-		pin(R) { direction: input; }
-		pin(C) { direction: input; clock: true; }
-		pin(Q) { direction: output; function: "IQ"; }
-	}
-	cell(DFF_NP1) {
-		ff(IQ, IQN) {
-			clocked_on: "!C";
-			next_state: "D";
-			preset: "R";
-		}
-		pin(D) { direction: input; }
-		pin(R) { direction: input; }
-		pin(C) { direction: input; clock: true; }
-		pin(Q) { direction: output; function: "IQ"; }
-	}
-	cell(DFF_PN0) {
-		ff(IQ, IQN) {
-			clocked_on: "C";
-			next_state: "D";
-			clear: "!R";
-		}
-		pin(D) { direction: input; }
-		pin(R) { direction: input; }
-		pin(C) { direction: input; clock: true; }
-		pin(Q) { direction: output; function: "IQ"; }
-	}
-	cell(DFF_PN1) {
-		ff(IQ, IQN) {
-			clocked_on: "C";
-			next_state: "D";
-			preset: "!R";
-		}
-		pin(D) { direction: input; }
-		pin(R) { direction: input; }
-		pin(C) { direction: input; clock: true; }
-		pin(Q) { direction: output; function: "IQ"; }
-	}
-	cell(DFF_PP0) {
-		ff(IQ, IQN) {
-			clocked_on: "C";
-			next_state: "D";
-			clear: "R";
-		}
-		pin(D) { direction: input; }
-		pin(R) { direction: input; }
-		pin(C) { direction: input; clock: true; }
-		pin(Q) { direction: output; function: "IQ"; }
-	}
-	cell(DFF_PP1) {
-		ff(IQ, IQN) {
-			clocked_on: "C";
-			next_state: "D";
-			preset: "R";
-		}
-		pin(D) { direction: input; }
-		pin(R) { direction: input; }
-		pin(C) { direction: input; clock: true; }
-		pin(Q) { direction: output; function: "IQ"; }
-	}
-}

From 677bf21947d80eb341f15109392d7f65e6ed2589 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 15 Nov 2025 00:23:54 +0000
Subject: [PATCH 859/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1016e3d13..b040cf39f 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.59+44
+YOSYS_VER := 0.59+54
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 261a0ae9e13a0b05c430d0666f4933f14d7f573d Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 17 Nov 2025 09:14:51 +0000
Subject: [PATCH 860/931] Implement at() methods on SigSpec so that
 SigSpec::bits().at() continues to work as it did

Fixes a regression caused by commit 745222fa3bf2ac570935ffd044c86fa2eb12d123, which caused some
third-party code to fail to build, e.g.:
https://github.com/google/heir/blob/5d7aa035c6e42394cd4dd45faca0b0933af89950/lib/Transforms/YosysOptimizer/RTLILImporter.cpp#L229
---
 kernel/rtlil.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 584c4e11b..a8e43fe1d 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1726,6 +1726,8 @@ public:
 	operator std::vector<RTLIL::SigChunk>() const;
 	operator std::vector<RTLIL::SigBit>() const { return to_sigbit_vector(); }
 	const RTLIL::SigBit &at(int offset, const RTLIL::SigBit &defval) { return offset < size() ? (*this)[offset] : defval; }
+	RTLIL::SigBit& at(int offset) { return (*this)[offset]; }
+	RTLIL::SigBit at(int offset) const { return (*this)[offset]; }
 
 	[[nodiscard]] Hasher hash_into(Hasher h) const {
 		Hasher::hash_t val;

From b870693393db0842ed5b00623809397fbad3fc7c Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 17 Nov 2025 09:11:15 +0000
Subject: [PATCH 861/931] Fix reset_auto_counter_id to correctly detect _NNN_
 patterns

This fixes a regression caused by commit c4c389fdd71f9dfc653d64789437084fd091f21e.
---
 backends/verilog/verilog_backend.cc | 10 +++++-----
 tests/verilog/reset_auto_counter.ys | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 tests/verilog/reset_auto_counter.ys

diff --git a/backends/verilog/verilog_backend.cc b/backends/verilog/verilog_backend.cc
index 67ff1f808..8d77160fd 100644
--- a/backends/verilog/verilog_backend.cc
+++ b/backends/verilog/verilog_backend.cc
@@ -116,21 +116,21 @@ void reset_auto_counter_id(RTLIL::IdString id, bool may_rename)
 	if (*it == '$' && may_rename && !norename)
 		auto_name_map[id] = auto_name_counter++;
 
-	if (*it != '\\' || *it != '_' || (it + 1) == it_end)
+	if (*it != '\\' || (it + 1) == it_end || *(it + 1) != '_' || (it + 2) == it_end)
 		return;
 
+	std::string s;
 	it += 2;
-	auto start = it;
 	while (it != it_end) {
 		char ch = *it;
 		if (ch == '_' && (it + 1) == it_end)
-			continue;
+			break;
 		if (ch < '0' || ch > '9')
 			return;
+		s.push_back(ch);
+		++it;
 	}
 
-	std::string s;
-	std::copy(start, it_end, std::back_inserter(s));
 	int num = atoi(s.c_str());
 	if (num >= auto_name_offset)
 		auto_name_offset = num + 1;
diff --git a/tests/verilog/reset_auto_counter.ys b/tests/verilog/reset_auto_counter.ys
new file mode 100644
index 000000000..c9756cbac
--- /dev/null
+++ b/tests/verilog/reset_auto_counter.ys
@@ -0,0 +1,17 @@
+read_verilog -sv <<EOT
+module arithmetic (
+    input  logic [7:0] _0_,
+    input  logic [7:0] _1_,
+    output logic [7:0] _2_,
+);
+  assign _2_ = _0_ + _1_;
+
+endmodule : arithmetic
+EOT
+
+hierarchy
+techmap
+write_verilog reset_auto_counter.v
+! ! grep -qE '_0+0_' reset_auto_counter.v
+! ! grep -qE '_0+1_' reset_auto_counter.v
+! ! grep -qE '_0+2_' reset_auto_counter.v

From 58d4e2c38e87d3195fd1faa1bdbe9d19168da88e Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 17 Nov 2025 13:35:38 +0100
Subject: [PATCH 862/931] ignore generated file

---
 tests/verilog/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/verilog/.gitignore b/tests/verilog/.gitignore
index d3e8690d5..b16ed0890 100644
--- a/tests/verilog/.gitignore
+++ b/tests/verilog/.gitignore
@@ -1,6 +1,7 @@
 /const_arst.v
 /const_sr.v
 /doubleslash.v
+/reset_auto_counter.v
 /roundtrip_proc_1.v
 /roundtrip_proc_2.v
 /assign_to_reg.v

From 9aa2dde7efb2edb75f35f01d5b0b6ded1d638ba3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 18 Nov 2025 00:24:34 +0000
Subject: [PATCH 863/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b040cf39f..6984ba5f1 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.59+54
+YOSYS_VER := 0.59+62
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From b3ead7e47dfb42aa2c35457bfccb7496618a8c85 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 16 Jul 2025 23:15:43 +0200
Subject: [PATCH 864/931] icell_liberty: start

---
 passes/cmds/Makefile.inc     |   1 +
 passes/cmds/icell_liberty.cc | 138 +++++++++++++++++++++++++++++++++++
 2 files changed, 139 insertions(+)
 create mode 100644 passes/cmds/icell_liberty.cc

diff --git a/passes/cmds/Makefile.inc b/passes/cmds/Makefile.inc
index 2dbeadac2..bb726aa7d 100644
--- a/passes/cmds/Makefile.inc
+++ b/passes/cmds/Makefile.inc
@@ -58,3 +58,4 @@ OBJS += passes/cmds/test_select.o
 OBJS += passes/cmds/timeest.o
 OBJS += passes/cmds/linecoverage.o
 OBJS += passes/cmds/sort.o
+OBJS += passes/cmds/icell_liberty.o
diff --git a/passes/cmds/icell_liberty.cc b/passes/cmds/icell_liberty.cc
new file mode 100644
index 000000000..19692fa01
--- /dev/null
+++ b/passes/cmds/icell_liberty.cc
@@ -0,0 +1,138 @@
+/*
+ *  yosys -- Yosys Open SYnthesis Suite
+ *
+ *  Copyright (C) 2024  Martin Povišer <povik@cutebit.org>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+#include "kernel/yosys.h"
+#include "kernel/celltypes.h"
+
+USING_YOSYS_NAMESPACE
+PRIVATE_NAMESPACE_BEGIN
+
+struct LibertyStubber {
+	CellTypes ct;
+	CellTypes ct_ff;
+	LibertyStubber() {
+		ct.setup();
+		ct.setup_internals_ff();
+	}
+	void liberty_prefix(std::ostream& f)
+	{
+		f << "library (yosys) {\n";
+		f << "\tinput_threshold_pct_fall : 50;\n";
+		f << "\tinput_threshold_pct_rise : 50;\n";
+		f << "\toutput_threshold_pct_fall : 50;\n";
+		f << "\toutput_threshold_pct_rise : 50;\n";
+		f << "\tslew_lower_threshold_pct_fall : 1;\n";
+		f << "\tslew_lower_threshold_pct_rise : 1;\n";
+		f << "\tslew_upper_threshold_pct_fall : 99;\n";
+		f << "\tslew_upper_threshold_pct_rise : 99;\n";
+	}
+	void liberty_suffix(std::ostream& f)
+	{
+		f << "}\n";
+	}
+	void liberty_cell(Module* base, Module* derived, std::ostream& f)
+	{
+		auto base_name = base->name.str().substr(1);
+		auto derived_name = derived->name.str().substr(1);
+		if (!ct.cell_types.count(base_name)) {
+			log_debug("skip skeleton for %s\n", base_name.c_str());
+			return;
+		}
+		auto& base_type = ct.cell_types[base_name];
+		f << "\tcell (\"" << derived_name << "\") {\n";
+		for (auto x : derived->ports) {
+			bool is_input = base_type.inputs.count(x);
+			bool is_output = base_type.outputs.count(x);
+			f << "\t\tpin (" << RTLIL::unescape_id(x.str()) << ") {\n";
+			if (is_input && !is_output) {
+				f << "\t\t\tdirection : input;\n";
+			} else if (!is_input && is_output) {
+				f << "\t\t\tdirection : output;\n";
+			} else {
+				f << "\t\t\tdirection : inout;\n";
+			}
+			f << "\t\t}\n";
+		}
+		f << "\t}\n";
+	}
+};
+
+struct IcellLiberty : Pass {
+	IcellLiberty() : Pass("icell_liberty", "derive box modules") {}
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    icell_liberty <liberty_file>\n"); // TODO
+		log("\n");
+		log("\n");
+	}
+	void execute(std::vector<std::string> args, RTLIL::Design *d) override
+	{
+		log_header(d, "Executing ICELL_LIBERTY pass.\n");
+
+		size_t argidx;
+		IdString naming_attr;
+		std::string liberty_filename;
+		std::ofstream* liberty_file = new std::ofstream;
+
+		for (argidx = 1; argidx < args.size(); argidx++) {
+			break;
+		}
+		if (argidx < args.size())
+			liberty_filename = args[argidx++];
+		else
+			log_error("no Liberty filename specified\n");
+
+		// extra_args(args, argidx, d);
+
+		if (liberty_filename.size()) {
+			liberty_file->open(liberty_filename.c_str());
+			if (liberty_file->fail()) {
+				delete liberty_file;
+				log_error("Can't open file `%s' for writing: %s\n", liberty_filename.c_str(), strerror(errno));
+			}
+		}
+
+		pool<RTLIL::IdString> done;
+		LibertyStubber stubber = {};
+
+		if (liberty_file)
+			stubber.liberty_prefix(*liberty_file);
+
+		for (auto module : d->selected_modules()) {
+			for (auto cell : module->selected_cells()) {
+				Module *inst_module = d->module(cell->type);
+				if (!inst_module || !inst_module->get_blackbox_attribute())
+					continue;
+				Module *base = inst_module;
+				if (!done.count(base->name)) {
+					stubber.liberty_cell(base, base, *liberty_file);
+					done.insert(base->name);
+				}
+			}
+		}
+
+		if (liberty_file) {
+			stubber.liberty_suffix(*liberty_file);
+			delete liberty_file;
+		}
+	}
+} IcellLiberty;
+
+PRIVATE_NAMESPACE_END

From 9e81db43731bc90f42612191f33f63af509774d1 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 18 Jul 2025 12:34:10 +0200
Subject: [PATCH 865/931] ff: split out type-only information

---
 kernel/ff.cc | 489 +++++++++++++++++++++++++++++----------------------
 kernel/ff.h  |  78 ++++----
 2 files changed, 323 insertions(+), 244 deletions(-)

diff --git a/kernel/ff.cc b/kernel/ff.cc
index a72e6a65c..7dd5e24ac 100644
--- a/kernel/ff.cc
+++ b/kernel/ff.cc
@@ -21,245 +21,316 @@
 
 USING_YOSYS_NAMESPACE
 
-FfData::FfData(FfInitVals *initvals, Cell *cell_) : FfData(cell_->module, initvals, cell_->name)
-{
-	cell = cell_;
-	sig_q = cell->getPort(ID::Q);
-	width = GetSize(sig_q);
-	attributes = cell->attributes;
+// sorry
+template<typename InputType, typename OutputType, typename = std::enable_if_t<std::is_base_of_v<FfTypeData, OutputType>>>
+void manufacture_info(InputType flop, OutputType& info, FfInitVals *initvals) {
+	Cell* cell = nullptr;
+	IdString type;
+	constexpr bool have_cell = std::is_same_v<InputType, Cell*>;
+	if constexpr (std::is_same_v<InputType, IdString>) {
+		type = flop;
+	} else {
+		static_assert(std::is_same_v<InputType, Cell*>);
+		cell = flop;
+		type = flop->type;
+	}
+	if constexpr (have_cell) {
+		info.sig_q = cell->getPort(ID::Q);
+		info.width = GetSize(info.sig_q);
+		info.attributes = cell->attributes;
+		if (initvals)
+			info.val_init = (*initvals)(info.sig_q);
+	}
 
-	if (initvals)
-		val_init = (*initvals)(sig_q);
 
-	std::string type_str = cell->type.str();
+	std::string type_str = type.str();
 
-	if (cell->type.in(ID($anyinit), ID($ff), ID($dff), ID($dffe), ID($dffsr), ID($dffsre), ID($adff), ID($adffe), ID($aldff), ID($aldffe), ID($sdff), ID($sdffe), ID($sdffce), ID($dlatch), ID($adlatch), ID($dlatchsr), ID($sr))) {
-		if (cell->type.in(ID($anyinit), ID($ff))) {
-			has_gclk = true;
-			sig_d = cell->getPort(ID::D);
-			if (cell->type == ID($anyinit)) {
-				is_anyinit = true;
-				log_assert(val_init.is_fully_undef());
+	if (type.in(ID($anyinit), ID($ff), ID($dff), ID($dffe), ID($dffsr), ID($dffsre), ID($adff), ID($adffe), ID($aldff), ID($aldffe), ID($sdff), ID($sdffe), ID($sdffce), ID($dlatch), ID($adlatch), ID($dlatchsr), ID($sr))) {
+		if (type.in(ID($anyinit), ID($ff))) {
+			info.has_gclk = true;
+			if constexpr (have_cell)
+				info.sig_d = cell->getPort(ID::D);
+			if (type == ID($anyinit)) {
+				info.is_anyinit = true;
+				if constexpr (have_cell)
+					log_assert(info.val_init.is_fully_undef());
 			}
-		} else if (cell->type == ID($sr)) {
+		} else if (type == ID($sr)) {
 			// No data input at all.
-		} else if (cell->type.in(ID($dlatch), ID($adlatch), ID($dlatchsr))) {
-			has_aload = true;
-			sig_aload = cell->getPort(ID::EN);
-			pol_aload = cell->getParam(ID::EN_POLARITY).as_bool();
-			sig_ad = cell->getPort(ID::D);
+		} else if (type.in(ID($dlatch), ID($adlatch), ID($dlatchsr))) {
+			info.has_aload = true;
+			if constexpr (have_cell) {
+				info.sig_aload = cell->getPort(ID::EN);
+				info.pol_aload = cell->getParam(ID::EN_POLARITY).as_bool();
+				info.sig_ad = cell->getPort(ID::D);
+			}
 		} else {
-			has_clk = true;
-			sig_clk = cell->getPort(ID::CLK);
-			pol_clk = cell->getParam(ID::CLK_POLARITY).as_bool();
-			sig_d = cell->getPort(ID::D);
+			info.has_clk = true;
+			if constexpr (have_cell) {
+				info.sig_clk = cell->getPort(ID::CLK);
+				info.pol_clk = cell->getParam(ID::CLK_POLARITY).as_bool();
+				info.sig_d = cell->getPort(ID::D);
+			}
 		}
-		if (cell->type.in(ID($dffe), ID($dffsre), ID($adffe), ID($aldffe), ID($sdffe), ID($sdffce))) {
-			has_ce = true;
-			sig_ce = cell->getPort(ID::EN);
-			pol_ce = cell->getParam(ID::EN_POLARITY).as_bool();
+		if (type.in(ID($dffe), ID($dffsre), ID($adffe), ID($aldffe), ID($sdffe), ID($sdffce))) {
+			info.has_ce = true;
+			if constexpr (have_cell) {
+				info.sig_ce = cell->getPort(ID::EN);
+				info.pol_ce = cell->getParam(ID::EN_POLARITY).as_bool();
+			}
 		}
-		if (cell->type.in(ID($dffsr), ID($dffsre), ID($dlatchsr), ID($sr))) {
-			has_sr = true;
-			sig_clr = cell->getPort(ID::CLR);
-			sig_set = cell->getPort(ID::SET);
-			pol_clr = cell->getParam(ID::CLR_POLARITY).as_bool();
-			pol_set = cell->getParam(ID::SET_POLARITY).as_bool();
+		if (type.in(ID($dffsr), ID($dffsre), ID($dlatchsr), ID($sr))) {
+			info.has_sr = true;
+			if constexpr (have_cell) {
+				info.sig_clr = cell->getPort(ID::CLR);
+				info.sig_set = cell->getPort(ID::SET);
+				info.pol_clr = cell->getParam(ID::CLR_POLARITY).as_bool();
+				info.pol_set = cell->getParam(ID::SET_POLARITY).as_bool();
+			}
 		}
-		if (cell->type.in(ID($aldff), ID($aldffe))) {
-			has_aload = true;
-			sig_aload = cell->getPort(ID::ALOAD);
-			pol_aload = cell->getParam(ID::ALOAD_POLARITY).as_bool();
-			sig_ad = cell->getPort(ID::AD);
+		if (type.in(ID($aldff), ID($aldffe))) {
+			info.has_aload = true;
+			if constexpr (have_cell) {
+				info.sig_aload = cell->getPort(ID::ALOAD);
+				info.pol_aload = cell->getParam(ID::ALOAD_POLARITY).as_bool();
+				info.sig_ad = cell->getPort(ID::AD);
+			}
 		}
-		if (cell->type.in(ID($adff), ID($adffe), ID($adlatch))) {
-			has_arst = true;
-			sig_arst = cell->getPort(ID::ARST);
-			pol_arst = cell->getParam(ID::ARST_POLARITY).as_bool();
-			val_arst = cell->getParam(ID::ARST_VALUE);
+		if (type.in(ID($adff), ID($adffe), ID($adlatch))) {
+			info.has_arst = true;
+			if constexpr (have_cell) {
+				info.sig_arst = cell->getPort(ID::ARST);
+				info.pol_arst = cell->getParam(ID::ARST_POLARITY).as_bool();
+				info.val_arst = cell->getParam(ID::ARST_VALUE);
+			}
 		}
-		if (cell->type.in(ID($sdff), ID($sdffe), ID($sdffce))) {
-			has_srst = true;
-			sig_srst = cell->getPort(ID::SRST);
-			pol_srst = cell->getParam(ID::SRST_POLARITY).as_bool();
-			val_srst = cell->getParam(ID::SRST_VALUE);
-			ce_over_srst = cell->type == ID($sdffce);
+		if (type.in(ID($sdff), ID($sdffe), ID($sdffce))) {
+			info.has_srst = true;
+			if constexpr (have_cell) {
+				info.sig_srst = cell->getPort(ID::SRST);
+				info.pol_srst = cell->getParam(ID::SRST_POLARITY).as_bool();
+				info.val_srst = cell->getParam(ID::SRST_VALUE);
+			}
+			info.ce_over_srst = type == ID($sdffce);
 		}
-	} else if (cell->type == ID($_FF_)) {
-		is_fine = true;
-		has_gclk = true;
-		sig_d = cell->getPort(ID::D);
+	} else if (type == ID($_FF_)) {
+		info.is_fine = true;
+		info.has_gclk = true;
+		if constexpr (have_cell)
+			info.sig_d = cell->getPort(ID::D);
 	} else if (type_str.substr(0, 5) == "$_SR_") {
-		is_fine = true;
-		has_sr = true;
-		pol_set = type_str[5] == 'P';
-		pol_clr = type_str[6] == 'P';
-		sig_set = cell->getPort(ID::S);
-		sig_clr = cell->getPort(ID::R);
+		info.is_fine = true;
+		info.has_sr = true;
+		info.pol_set = type_str[5] == 'P';
+		info.pol_clr = type_str[6] == 'P';
+		if constexpr (have_cell) {
+			info.sig_set = cell->getPort(ID::S);
+			info.sig_clr = cell->getPort(ID::R);
+		}
 	} else if (type_str.substr(0, 6) == "$_DFF_" && type_str.size() == 8) {
-		is_fine = true;
-		sig_d = cell->getPort(ID::D);
-		has_clk = true;
-		pol_clk = type_str[6] == 'P';
-		sig_clk = cell->getPort(ID::C);
+		info.is_fine = true;
+		info.has_clk = true;
+		info.pol_clk = type_str[6] == 'P';
+		if constexpr (have_cell) {
+			info.sig_d = cell->getPort(ID::D);
+			info.sig_clk = cell->getPort(ID::C);
+		}
 	} else if (type_str.substr(0, 7) == "$_DFFE_" && type_str.size() == 10) {
-		is_fine = true;
-		sig_d = cell->getPort(ID::D);
-		has_clk = true;
-		pol_clk = type_str[7] == 'P';
-		sig_clk = cell->getPort(ID::C);
-		has_ce = true;
-		pol_ce = type_str[8] == 'P';
-		sig_ce = cell->getPort(ID::E);
+		info.is_fine = true;
+		info.has_clk = true;
+		info.pol_clk = type_str[7] == 'P';
+		info.has_ce = true;
+		info.pol_ce = type_str[8] == 'P';
+		if constexpr (have_cell) {
+			info.sig_d = cell->getPort(ID::D);
+			info.sig_clk = cell->getPort(ID::C);
+			info.sig_ce = cell->getPort(ID::E);
+		}
 	} else if (type_str.substr(0, 6) == "$_DFF_" && type_str.size() == 10) {
-		is_fine = true;
-		sig_d = cell->getPort(ID::D);
-		has_clk = true;
-		pol_clk = type_str[6] == 'P';
-		sig_clk = cell->getPort(ID::C);
-		has_arst = true;
-		pol_arst = type_str[7] == 'P';
-		sig_arst = cell->getPort(ID::R);
-		val_arst = type_str[8] == '1' ? State::S1 : State::S0;
+		info.is_fine = true;
+		info.has_clk = true;
+		info.pol_clk = type_str[6] == 'P';
+		info.has_arst = true;
+		info.pol_arst = type_str[7] == 'P';
+		info.val_arst = type_str[8] == '1' ? State::S1 : State::S0;
+		if constexpr (have_cell) {
+			info.sig_d = cell->getPort(ID::D);
+			info.sig_clk = cell->getPort(ID::C);
+			info.sig_arst = cell->getPort(ID::R);
+		}
 	} else if (type_str.substr(0, 7) == "$_DFFE_" && type_str.size() == 12) {
-		is_fine = true;
-		sig_d = cell->getPort(ID::D);
-		has_clk = true;
-		pol_clk = type_str[7] == 'P';
-		sig_clk = cell->getPort(ID::C);
-		has_arst = true;
-		pol_arst = type_str[8] == 'P';
-		sig_arst = cell->getPort(ID::R);
-		val_arst = type_str[9] == '1' ? State::S1 : State::S0;
-		has_ce = true;
-		pol_ce = type_str[10] == 'P';
-		sig_ce = cell->getPort(ID::E);
+		info.is_fine = true;
+		info.has_clk = true;
+		info.pol_clk = type_str[7] == 'P';
+		info.has_arst = true;
+		info.pol_arst = type_str[8] == 'P';
+		info.val_arst = type_str[9] == '1' ? State::S1 : State::S0;
+		info.has_ce = true;
+		info.pol_ce = type_str[10] == 'P';
+		if constexpr (have_cell) {
+			info.sig_d = cell->getPort(ID::D);
+			info.sig_clk = cell->getPort(ID::C);
+			info.sig_arst = cell->getPort(ID::R);
+			info.sig_ce = cell->getPort(ID::E);
+		}
 	} else if (type_str.substr(0, 8) == "$_ALDFF_" && type_str.size() == 11) {
-		is_fine = true;
-		sig_d = cell->getPort(ID::D);
-		has_clk = true;
-		pol_clk = type_str[8] == 'P';
-		sig_clk = cell->getPort(ID::C);
-		has_aload = true;
-		pol_aload = type_str[9] == 'P';
-		sig_aload = cell->getPort(ID::L);
-		sig_ad = cell->getPort(ID::AD);
+		info.is_fine = true;
+		info.has_clk = true;
+		info.pol_clk = type_str[8] == 'P';
+		info.has_aload = true;
+		info.pol_aload = type_str[9] == 'P';
+		if constexpr (have_cell) {
+			info.sig_d = cell->getPort(ID::D);
+			info.sig_clk = cell->getPort(ID::C);
+			info.sig_aload = cell->getPort(ID::L);
+			info.sig_ad = cell->getPort(ID::AD);
+		}
 	} else if (type_str.substr(0, 9) == "$_ALDFFE_" && type_str.size() == 13) {
-		is_fine = true;
-		sig_d = cell->getPort(ID::D);
-		has_clk = true;
-		pol_clk = type_str[9] == 'P';
-		sig_clk = cell->getPort(ID::C);
-		has_aload = true;
-		pol_aload = type_str[10] == 'P';
-		sig_aload = cell->getPort(ID::L);
-		sig_ad = cell->getPort(ID::AD);
-		has_ce = true;
-		pol_ce = type_str[11] == 'P';
-		sig_ce = cell->getPort(ID::E);
+		info.is_fine = true;
+		info.has_clk = true;
+		info.pol_clk = type_str[9] == 'P';
+		info.has_aload = true;
+		info.pol_aload = type_str[10] == 'P';
+		info.has_ce = true;
+		info.pol_ce = type_str[11] == 'P';
+		if constexpr (have_cell) {
+			info.sig_d = cell->getPort(ID::D);
+			info.sig_clk = cell->getPort(ID::C);
+			info.sig_aload = cell->getPort(ID::L);
+			info.sig_ad = cell->getPort(ID::AD);
+			info.sig_ce = cell->getPort(ID::E);
+		}
 	} else if (type_str.substr(0, 8) == "$_DFFSR_" && type_str.size() == 12) {
-		is_fine = true;
-		sig_d = cell->getPort(ID::D);
-		has_clk = true;
-		pol_clk = type_str[8] == 'P';
-		sig_clk = cell->getPort(ID::C);
-		has_sr = true;
-		pol_set = type_str[9] == 'P';
-		pol_clr = type_str[10] == 'P';
-		sig_set = cell->getPort(ID::S);
-		sig_clr = cell->getPort(ID::R);
+		info.is_fine = true;
+		info.has_clk = true;
+		info.pol_clk = type_str[8] == 'P';
+		info.has_sr = true;
+		info.pol_set = type_str[9] == 'P';
+		info.pol_clr = type_str[10] == 'P';
+		if constexpr (have_cell) {
+			info.sig_d = cell->getPort(ID::D);
+			info.sig_clk = cell->getPort(ID::C);
+			info.sig_set = cell->getPort(ID::S);
+			info.sig_clr = cell->getPort(ID::R);
+		}
 	} else if (type_str.substr(0, 9) == "$_DFFSRE_" && type_str.size() == 14) {
-		is_fine = true;
-		sig_d = cell->getPort(ID::D);
-		has_clk = true;
-		pol_clk = type_str[9] == 'P';
-		sig_clk = cell->getPort(ID::C);
-		has_sr = true;
-		pol_set = type_str[10] == 'P';
-		pol_clr = type_str[11] == 'P';
-		sig_set = cell->getPort(ID::S);
-		sig_clr = cell->getPort(ID::R);
-		has_ce = true;
-		pol_ce = type_str[12] == 'P';
-		sig_ce = cell->getPort(ID::E);
+		info.is_fine = true;
+		info.has_clk = true;
+		info.pol_clk = type_str[9] == 'P';
+		info.has_sr = true;
+		info.pol_set = type_str[10] == 'P';
+		info.pol_clr = type_str[11] == 'P';
+		info.has_ce = true;
+		info.pol_ce = type_str[12] == 'P';
+		if constexpr (have_cell) {
+			info.sig_d = cell->getPort(ID::D);
+			info.sig_clk = cell->getPort(ID::C);
+			info.sig_set = cell->getPort(ID::S);
+			info.sig_clr = cell->getPort(ID::R);
+			info.sig_ce = cell->getPort(ID::E);
+		}
 	} else if (type_str.substr(0, 7) == "$_SDFF_" && type_str.size() == 11) {
-		is_fine = true;
-		sig_d = cell->getPort(ID::D);
-		has_clk = true;
-		pol_clk = type_str[7] == 'P';
-		sig_clk = cell->getPort(ID::C);
-		has_srst = true;
-		pol_srst = type_str[8] == 'P';
-		sig_srst = cell->getPort(ID::R);
-		val_srst = type_str[9] == '1' ? State::S1 : State::S0;
+		info.is_fine = true;
+		info.has_clk = true;
+		info.pol_clk = type_str[7] == 'P';
+		info.has_srst = true;
+		info.pol_srst = type_str[8] == 'P';
+		info.val_srst = type_str[9] == '1' ? State::S1 : State::S0;
+		if constexpr (have_cell) {
+			info.sig_d = cell->getPort(ID::D);
+			info.sig_clk = cell->getPort(ID::C);
+			info.sig_srst = cell->getPort(ID::R);
+		}
 	} else if (type_str.substr(0, 8) == "$_SDFFE_" && type_str.size() == 13) {
-		is_fine = true;
-		sig_d = cell->getPort(ID::D);
-		has_clk = true;
-		pol_clk = type_str[8] == 'P';
-		sig_clk = cell->getPort(ID::C);
-		has_srst = true;
-		pol_srst = type_str[9] == 'P';
-		sig_srst = cell->getPort(ID::R);
-		val_srst = type_str[10] == '1' ? State::S1 : State::S0;
-		has_ce = true;
-		pol_ce = type_str[11] == 'P';
-		sig_ce = cell->getPort(ID::E);
+		info.is_fine = true;
+		info.has_clk = true;
+		info.pol_clk = type_str[8] == 'P';
+		info.has_srst = true;
+		info.pol_srst = type_str[9] == 'P';
+		info.val_srst = type_str[10] == '1' ? State::S1 : State::S0;
+		info.has_ce = true;
+		info.pol_ce = type_str[11] == 'P';
+		if constexpr (have_cell) {
+			info.sig_d = cell->getPort(ID::D);
+			info.sig_clk = cell->getPort(ID::C);
+			info.sig_srst = cell->getPort(ID::R);
+			info.sig_ce = cell->getPort(ID::E);
+		}
 	} else if (type_str.substr(0, 9) == "$_SDFFCE_" && type_str.size() == 14) {
-		is_fine = true;
-		sig_d = cell->getPort(ID::D);
-		has_clk = true;
-		pol_clk = type_str[9] == 'P';
-		sig_clk = cell->getPort(ID::C);
-		has_srst = true;
-		pol_srst = type_str[10] == 'P';
-		sig_srst = cell->getPort(ID::R);
-		val_srst = type_str[11] == '1' ? State::S1 : State::S0;
-		has_ce = true;
-		pol_ce = type_str[12] == 'P';
-		sig_ce = cell->getPort(ID::E);
-		ce_over_srst = true;
+		info.is_fine = true;
+		info.has_clk = true;
+		info.pol_clk = type_str[9] == 'P';
+		info.has_srst = true;
+		info.pol_srst = type_str[10] == 'P';
+		info.val_srst = type_str[11] == '1' ? State::S1 : State::S0;
+		info.has_ce = true;
+		info.pol_ce = type_str[12] == 'P';
+		info.ce_over_srst = true;
+		if constexpr (have_cell) {
+			info.sig_d = cell->getPort(ID::D);
+			info.sig_clk = cell->getPort(ID::C);
+			info.sig_srst = cell->getPort(ID::R);
+			info.sig_ce = cell->getPort(ID::E);
+		}
 	} else if (type_str.substr(0, 9) == "$_DLATCH_" && type_str.size() == 11) {
-		is_fine = true;
-		has_aload = true;
-		sig_ad = cell->getPort(ID::D);
-		has_aload = true;
-		pol_aload = type_str[9] == 'P';
-		sig_aload = cell->getPort(ID::E);
+		info.is_fine = true;
+		info.has_aload = true;
+		info.has_aload = true;
+		info.pol_aload = type_str[9] == 'P';
+		if constexpr (have_cell) {
+			info.sig_ad = cell->getPort(ID::D);
+			info.sig_aload = cell->getPort(ID::E);
+		}
 	} else if (type_str.substr(0, 9) == "$_DLATCH_" && type_str.size() == 13) {
-		is_fine = true;
-		has_aload = true;
-		sig_ad = cell->getPort(ID::D);
-		has_aload = true;
-		pol_aload = type_str[9] == 'P';
-		sig_aload = cell->getPort(ID::E);
-		has_arst = true;
-		pol_arst = type_str[10] == 'P';
-		sig_arst = cell->getPort(ID::R);
-		val_arst = type_str[11] == '1' ? State::S1 : State::S0;
+		info.is_fine = true;
+		info.has_aload = true;
+		info.has_aload = true;
+		info.pol_aload = type_str[9] == 'P';
+		info.has_arst = true;
+		info.pol_arst = type_str[10] == 'P';
+		info.val_arst = type_str[11] == '1' ? State::S1 : State::S0;
+		if constexpr (have_cell) {
+			info.sig_ad = cell->getPort(ID::D);
+			info.sig_aload = cell->getPort(ID::E);
+			info.sig_arst = cell->getPort(ID::R);
+		}
 	} else if (type_str.substr(0, 11) == "$_DLATCHSR_" && type_str.size() == 15) {
-		is_fine = true;
-		has_aload = true;
-		sig_ad = cell->getPort(ID::D);
-		has_aload = true;
-		pol_aload = type_str[11] == 'P';
-		sig_aload = cell->getPort(ID::E);
-		has_sr = true;
-		pol_set = type_str[12] == 'P';
-		pol_clr = type_str[13] == 'P';
-		sig_set = cell->getPort(ID::S);
-		sig_clr = cell->getPort(ID::R);
+		info.is_fine = true;
+		info.has_aload = true;
+		info.has_aload = true;
+		info.pol_aload = type_str[11] == 'P';
+		info.has_sr = true;
+		info.pol_set = type_str[12] == 'P';
+		info.pol_clr = type_str[13] == 'P';
+		if constexpr (have_cell) {
+			info.sig_ad = cell->getPort(ID::D);
+			info.sig_aload = cell->getPort(ID::E);
+			info.sig_set = cell->getPort(ID::S);
+			info.sig_clr = cell->getPort(ID::R);
+		}
 	} else {
 		log_assert(0);
 	}
-	if (has_aload && !has_clk && !has_sr && !has_arst && sig_ad.is_fully_const()) {
-		// Plain D latches with const D treated specially.
-		has_aload = false;
-		has_arst = true;
-		sig_arst = sig_aload;
-		pol_arst = pol_aload;
-		val_arst = sig_ad.as_const();
-	}
+	if constexpr (have_cell)
+		if (info.has_aload && !info.has_clk && !info.has_sr && !info.has_arst && info.sig_ad.is_fully_const()) {
+			// Plain D latches with const D treated specially.
+			info.has_aload = false;
+			info.has_arst = true;
+			info.sig_arst = info.sig_aload;
+			info.pol_arst = info.pol_aload;
+			info.val_arst = info.sig_ad.as_const();
+		}
+}
+
+FfTypeData::FfTypeData(IdString type) : FfTypeData()
+{
+	manufacture_info(type, *this, nullptr);
+}
+
+FfData::FfData(FfInitVals *initvals, Cell *cell_) : FfData(cell_->module, initvals, cell_->name)
+{
+	cell = cell_;
+	manufacture_info(cell, *this, initvals);
 }
 
 FfData FfData::slice(const std::vector<int> &bits) {
diff --git a/kernel/ff.h b/kernel/ff.h
index d6cf99b9b..217658d35 100644
--- a/kernel/ff.h
+++ b/kernel/ff.h
@@ -78,31 +78,20 @@ YOSYS_NAMESPACE_BEGIN
 // - has_arst [does not correspond to a native cell, represented as dlatch with const D input]
 // - empty set [not a cell — will be emitted as a simple direct connection]
 
-struct FfData {
-	Module *module;
-	FfInitVals *initvals;
-	Cell *cell;
-	IdString name;
-	// The FF output.
-	SigSpec sig_q;
-	// The sync data input, present if has_clk or has_gclk.
-	SigSpec sig_d;
-	// The async data input, present if has_aload.
-	SigSpec sig_ad;
-	// The sync clock, present if has_clk.
-	SigSpec sig_clk;
-	// The clock enable, present if has_ce.
-	SigSpec sig_ce;
-	// The async load enable, present if has_aload.
-	SigSpec sig_aload;
-	// The async reset, preset if has_arst.
-	SigSpec sig_arst;
-	// The sync reset, preset if has_srst.
-	SigSpec sig_srst;
-	// The async clear (per-lane), present if has_sr.
-	SigSpec sig_clr;
-	// The async set (per-lane), present if has_sr.
-	SigSpec sig_set;
+struct FfTypeData {
+	FfTypeData(IdString type);
+	FfTypeData() {
+		has_clk = false;
+		has_gclk = false;
+		has_ce = false;
+		has_aload = false;
+		has_srst = false;
+		has_arst = false;
+		has_sr = false;
+		ce_over_srst = false;
+		is_fine = false;
+		is_anyinit = false;
+	}
 	// True if this is a clocked (edge-sensitive) flip-flop.
 	bool has_clk;
 	// True if this is a $ff, exclusive with every other has_*.
@@ -143,9 +132,38 @@ struct FfData {
 	bool pol_clr;
 	bool pol_set;
 	// The value loaded by sig_arst.
+	// Zero length if unknowable from just type
 	Const val_arst;
 	// The value loaded by sig_srst.
+	// Zero length if unknowable from just type
 	Const val_srst;
+};
+
+struct FfData : FfTypeData {
+	Module *module;
+	FfInitVals *initvals;
+	Cell *cell;
+	IdString name;
+	// The FF output.
+	SigSpec sig_q;
+	// The sync data input, present if has_clk or has_gclk.
+	SigSpec sig_d;
+	// The async data input, present if has_aload.
+	SigSpec sig_ad;
+	// The sync clock, present if has_clk.
+	SigSpec sig_clk;
+	// The clock enable, present if has_ce.
+	SigSpec sig_ce;
+	// The async load enable, present if has_aload.
+	SigSpec sig_aload;
+	// The async reset, preset if has_arst.
+	SigSpec sig_arst;
+	// The sync reset, preset if has_srst.
+	SigSpec sig_srst;
+	// The async clear (per-lane), present if has_sr.
+	SigSpec sig_clr;
+	// The async set (per-lane), present if has_sr.
+	SigSpec sig_set;
 	// The initial value at power-up.
 	Const val_init;
 	// The FF data width in bits.
@@ -154,16 +172,6 @@ struct FfData {
 
 	FfData(Module *module = nullptr, FfInitVals *initvals = nullptr, IdString name = IdString()) : module(module), initvals(initvals), cell(nullptr), name(name) {
 		width = 0;
-		has_clk = false;
-		has_gclk = false;
-		has_ce = false;
-		has_aload = false;
-		has_srst = false;
-		has_arst = false;
-		has_sr = false;
-		ce_over_srst = false;
-		is_fine = false;
-		is_anyinit = false;
 		pol_clk = false;
 		pol_aload = false;
 		pol_ce = false;

From c2c9506f4f0bd3d0d0a59bc904258d1c24cd9341 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 18 Jul 2025 13:32:49 +0200
Subject: [PATCH 866/931] icell_liberty: flops

---
 passes/cmds/icell_liberty.cc | 86 +++++++++++++++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 2 deletions(-)

diff --git a/passes/cmds/icell_liberty.cc b/passes/cmds/icell_liberty.cc
index 19692fa01..9b89c1125 100644
--- a/passes/cmds/icell_liberty.cc
+++ b/passes/cmds/icell_liberty.cc
@@ -18,19 +18,27 @@
  */
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
+#include "kernel/ff.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct LibertyStubber {
 	CellTypes ct;
-	CellTypes ct_ff;
 	LibertyStubber() {
 		ct.setup();
 		ct.setup_internals_ff();
 	}
 	void liberty_prefix(std::ostream& f)
 	{
+		f << "/*\n";
+		f << stringf("Models interfaces of select Yosys internal cell.\n");
+		f << stringf("Likely contains INCORRECT POLARITIES.\n");
+		f << stringf("Impractical for any simulation, synthesis, or timing.\n");
+		f << stringf("Intended purely for SDC expansion.\n");
+		f << stringf("Do not microwave or tumble dry.\n");
+		f << stringf("Generated by %s\n", yosys_maybe_version());
+		f << "*/\n";
 		f << "library (yosys) {\n";
 		f << "\tinput_threshold_pct_fall : 50;\n";
 		f << "\tinput_threshold_pct_rise : 50;\n";
@@ -45,6 +53,76 @@ struct LibertyStubber {
 	{
 		f << "}\n";
 	}
+	struct LibertyItemizer {
+		std::ostream& f;
+		int indent;
+		LibertyItemizer(std::ostream& f) : f(f), indent(0) {};
+		void item(std::string key, std::string val)
+		{
+			f << std::string(indent, '\t') << key << " : \"" << val << "\";\n";
+		}
+	};
+	void liberty_flop(Module* base, Module* derived, std::ostream& f)
+	{
+		auto base_name = base->name.str().substr(1);
+		auto derived_name = derived->name.str().substr(1);
+
+		FfTypeData ffType(base_name);
+		LibertyItemizer i(f);
+
+		if (ffType.has_gclk) {
+			log_warning("Formal flip flop %s can't be modeled\n", base_name.c_str());
+			return;
+		}
+		if (ffType.has_ce) {
+			log_warning("DFFE %s can't be modeled\n", base_name.c_str());
+			return;
+		}
+
+		f << "\tcell (\"" << derived_name << "\") {\n";
+		auto& base_type = ct.cell_types[base_name];
+		i.indent = 3;
+		for (auto x : derived->ports) {
+			bool is_input = base_type.inputs.count(x);
+			bool is_output = base_type.outputs.count(x);
+			f << "\t\tpin (" << RTLIL::unescape_id(x.str()) << ") {\n";
+			if (is_input && !is_output) {
+				i.item("direction", "input");
+			} else if (!is_input && is_output) {
+				i.item("direction", "output");
+			} else {
+				i.item("direction", "inout");
+			}
+			if (RTLIL::unescape_id(x) == "CLK" || RTLIL::unescape_id(x) == "C")
+				i.item("clock", "true");
+			if (RTLIL::unescape_id(x) == "Q")
+				i.item("function", "IQ");
+			f << "\t\t}\n";
+		}
+
+		f << "\t\tff (\"IQ\",\"IQ_N\") {\n";
+		i.indent = 3;
+		// TODO polarities?
+		if (ffType.has_clk) {
+			auto pin = ffType.is_fine ? "C" : "CLK";
+			i.item("clocked_on", pin);
+		}
+		if (ffType.has_arst) {
+			auto meaning = (ffType.val_arst == State::S1) ? "preset" : "clear";
+			auto pin = ffType.is_fine ? "R" : "ARST";
+			i.item(meaning, pin);
+		}
+		auto next_state = ffType.has_ce ? "D & EN" : "D";
+		i.item("next_state", next_state);
+		f << "\t\t}\n";
+
+
+		// bool has_aload;
+		// bool has_srst;
+		// bool has_arst;
+		// bool has_sr;
+		f << "\t}\n";
+	}
 	void liberty_cell(Module* base, Module* derived, std::ostream& f)
 	{
 		auto base_name = base->name.str().substr(1);
@@ -53,6 +131,10 @@ struct LibertyStubber {
 			log_debug("skip skeleton for %s\n", base_name.c_str());
 			return;
 		}
+
+		if (RTLIL::builtin_ff_cell_types().count(base_name))
+			return liberty_flop(base, derived, f);
+
 		auto& base_type = ct.cell_types[base_name];
 		f << "\tcell (\"" << derived_name << "\") {\n";
 		for (auto x : derived->ports) {
@@ -73,7 +155,7 @@ struct LibertyStubber {
 };
 
 struct IcellLiberty : Pass {
-	IcellLiberty() : Pass("icell_liberty", "derive box modules") {}
+	IcellLiberty() : Pass("icell_liberty", "write Liberty interfaces for used internal cells") {}
 	void help() override
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|

From e4e32d7966865f107ba63349d6551ce39f6c6ff4 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 18 Jul 2025 22:27:11 +0200
Subject: [PATCH 867/931] icell_liberty: flop harder

---
 passes/cmds/icell_liberty.cc | 51 +++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/passes/cmds/icell_liberty.cc b/passes/cmds/icell_liberty.cc
index 9b89c1125..83252ffb4 100644
--- a/passes/cmds/icell_liberty.cc
+++ b/passes/cmds/icell_liberty.cc
@@ -1,21 +1,3 @@
-/*
- *  yosys -- Yosys Open SYnthesis Suite
- *
- *  Copyright (C) 2024  Martin Povišer <povik@cutebit.org>
- *
- *  Permission to use, copy, modify, and/or distribute this software for any
- *  purpose with or without fee is hereby granted, provided that the above
- *  copyright notice and this permission notice appear in all copies.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
 #include "kernel/ff.h"
@@ -32,12 +14,12 @@ struct LibertyStubber {
 	void liberty_prefix(std::ostream& f)
 	{
 		f << "/*\n";
-		f << stringf("Models interfaces of select Yosys internal cell.\n");
-		f << stringf("Likely contains INCORRECT POLARITIES.\n");
-		f << stringf("Impractical for any simulation, synthesis, or timing.\n");
-		f << stringf("Intended purely for SDC expansion.\n");
-		f << stringf("Do not microwave or tumble dry.\n");
-		f << stringf("Generated by %s\n", yosys_maybe_version());
+		f << stringf("\tModels interfaces of select Yosys internal cell.\n");
+		f << stringf("\tLikely contains INCORRECT POLARITIES.\n");
+		f << stringf("\tImpractical for any simulation, synthesis, or timing.\n");
+		f << stringf("\tIntended purely for SDC expansion.\n");
+		f << stringf("\tDo not microwave or tumble dry.\n");
+		f << stringf("\tGenerated by %s\n", yosys_maybe_version());
 		f << "*/\n";
 		f << "library (yosys) {\n";
 		f << "\tinput_threshold_pct_fall : 50;\n";
@@ -82,7 +64,13 @@ struct LibertyStubber {
 		f << "\tcell (\"" << derived_name << "\") {\n";
 		auto& base_type = ct.cell_types[base_name];
 		i.indent = 3;
-		for (auto x : derived->ports) {
+		auto sorted_ports = derived->ports;
+		// Hack for CLK and C coming before Q does
+		auto cmp = [](IdString l, IdString r) { return l.str() < r.str(); };
+		std::sort(sorted_ports.begin(), sorted_ports.end(), cmp);
+		std::string clock_pin_name = "";
+		for (auto x : sorted_ports) {
+			std::string port_name = RTLIL::unescape_id(x);
 			bool is_input = base_type.inputs.count(x);
 			bool is_output = base_type.outputs.count(x);
 			f << "\t\tpin (" << RTLIL::unescape_id(x.str()) << ") {\n";
@@ -93,10 +81,19 @@ struct LibertyStubber {
 			} else {
 				i.item("direction", "inout");
 			}
-			if (RTLIL::unescape_id(x) == "CLK" || RTLIL::unescape_id(x) == "C")
+			if (port_name == "CLK" || port_name == "C") {
 				i.item("clock", "true");
-			if (RTLIL::unescape_id(x) == "Q")
+				clock_pin_name = port_name;
+			}
+			if (port_name == "Q") {
 				i.item("function", "IQ");
+				f << "\t\t\ttiming () {\n";
+				i.indent++;
+				log_assert(clock_pin_name.size());
+				i.item("related_pin", clock_pin_name);
+				i.indent--;
+            	f << "\t\t\t}\n";
+			}
 			f << "\t\t}\n";
 		}
 

From bbf1e4bca2a1e55ad2534efb35196a3150b7c341 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 18 Jul 2025 22:45:31 +0200
Subject: [PATCH 868/931] sdc_expand, opensta: start

---
 techlibs/common/Makefile.inc  |   2 +
 techlibs/common/opensta.cc    | 118 ++++++++++++++++++++++++++
 techlibs/common/sdc_expand.cc | 150 ++++++++++++++++++++++++++++++++++
 3 files changed, 270 insertions(+)
 create mode 100644 techlibs/common/opensta.cc
 create mode 100644 techlibs/common/sdc_expand.cc

diff --git a/techlibs/common/Makefile.inc b/techlibs/common/Makefile.inc
index 22b119800..df96fdd46 100644
--- a/techlibs/common/Makefile.inc
+++ b/techlibs/common/Makefile.inc
@@ -2,6 +2,8 @@
 ifneq ($(SMALL),1)
 OBJS += techlibs/common/synth.o
 OBJS += techlibs/common/prep.o
+OBJS += techlibs/common/opensta.o
+OBJS += techlibs/common/sdc_expand.o
 endif
 
 GENFILES += techlibs/common/simlib_help.inc
diff --git a/techlibs/common/opensta.cc b/techlibs/common/opensta.cc
new file mode 100644
index 000000000..1b3571973
--- /dev/null
+++ b/techlibs/common/opensta.cc
@@ -0,0 +1,118 @@
+#include "kernel/rtlil.h"
+#include "kernel/log.h"
+
+USING_YOSYS_NAMESPACE
+PRIVATE_NAMESPACE_BEGIN
+
+#if !defined(YOSYS_DISABLE_SPAWN)
+struct OpenstaPass : public Pass
+{
+	const char* default_sta_cmd = "sta";
+	OpenstaPass() : Pass("opensta", "run OpenSTA") { }
+
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    opensta [options]\n");
+		log("\n");
+		// TOOD
+		log("\n");
+		log("    -exe <command>\n");
+		log("        use <command> to run OpenSTA instead of \"%s\"\n", default_sta_cmd);
+		log("\n");
+		log("    -sdc-in <filename>\n");
+		log("        expand SDC input file <filename>\n");
+		log("\n");
+		log("    -sdc-out <filename>\n");
+		log("        expand SDC file to output file <filename>\n");
+		log("\n");
+		log("    -nocleanup\n");
+		log("\n");
+		log("\n");
+	}
+
+	void execute(std::vector<std::string> args, RTLIL::Design *design) override
+	{
+		string run_from, run_to;
+		string opensta_exe = "sta";
+		string sdc_filename, sdc_expanded_filename;
+		string tempdir_name, script_filename;
+		string verilog_filename, liberty_filename;
+		bool cleanup = true;
+
+		log_header(design, "Executing OPENSTA pass.\n");
+		log_push();
+
+		size_t argidx;
+		for (argidx = 1; argidx < args.size(); argidx++)
+		{
+			if (args[argidx] == "-exe" && argidx+1 < args.size()) {
+				opensta_exe = args[++argidx];
+				continue;
+			}
+			if (args[argidx] == "-sdc-in" && argidx+1 < args.size()) {
+				sdc_filename = args[++argidx];
+				continue;
+			}
+			if (args[argidx] == "-sdc-out" && argidx+1 < args.size()) {
+				sdc_expanded_filename = args[++argidx];
+				continue;
+			}
+			if (args[argidx] == "-verilog" && argidx+1 < args.size()) {
+				verilog_filename = args[++argidx];
+				continue;
+			}
+			if (args[argidx] == "-liberty" && argidx+1 < args.size()) {
+				liberty_filename = args[++argidx];
+				continue;
+			}
+			if (args[argidx] == "-nocleanup") {
+				cleanup = false;
+				continue;
+			}
+			break;
+		}
+		extra_args(args, argidx, design);
+		if (!design->full_selection())
+			log_cmd_error("This command only operates on fully selected designs!\n");
+
+		if (cleanup)
+			tempdir_name = get_base_tmpdir() + "/";
+		else
+			tempdir_name = "_tmp_";
+		tempdir_name += proc_program_prefix() + "yosys-opensta-XXXXXX";
+		tempdir_name = make_temp_dir(tempdir_name);
+		script_filename = tempdir_name + "/opensta.tcl";
+		// script_filename
+
+		auto top_mod = design->top_module();
+		if (!top_mod)
+			log_error("Can't find top module in current design!\n");
+
+		std::ofstream f_script;
+		f_script.open(script_filename);
+
+		f_script << "read_verilog " << verilog_filename << "\n";
+		f_script << "read_lib " << liberty_filename << "\n";
+		f_script << "link_design " << RTLIL::unescape_id(top_mod->name) << "\n";
+		f_script << "read_sdc " << sdc_filename << "\n";
+		f_script << "write_sdc " << sdc_expanded_filename << "\n";
+		f_script.close();
+		std::string command = opensta_exe + " -exit " + script_filename; 
+		int ret = run_command(command);
+		if (ret)
+			log_error("OpenSTA return %d (error)\n", ret);
+		else
+			log("sdc_expanded_filename: %s\n", sdc_expanded_filename.c_str());
+
+		if (cleanup) {
+			log("Removing temp directory.\n");
+			remove_directory(tempdir_name);
+		}
+		log_pop();
+	}
+} OpenstaPass;
+#endif
+
+PRIVATE_NAMESPACE_END
diff --git a/techlibs/common/sdc_expand.cc b/techlibs/common/sdc_expand.cc
new file mode 100644
index 000000000..7efaf8c0d
--- /dev/null
+++ b/techlibs/common/sdc_expand.cc
@@ -0,0 +1,150 @@
+#include "kernel/rtlil.h"
+#include "kernel/log.h"
+
+USING_YOSYS_NAMESPACE
+PRIVATE_NAMESPACE_BEGIN
+
+struct SdcexpandPass : public ScriptPass
+{
+	const char* default_sta_cmd = "sta";
+	SdcexpandPass() : ScriptPass("sdc_expand", "run OpenSTA") { }
+
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    sdc_expand [options]\n");
+		log("\n");
+		// TODO
+		log("\n");
+		log("    -exe <command>\n");
+		log("        use <command> to run OpenSTA instead of \"%s\"\n", default_sta_cmd);
+		log("\n");
+		log("    -sdc-in <filename>\n");
+		log("        expand SDC file <filename>\n");
+		log("\n");
+		log("    -nocleanup\n");
+		log("\n");
+		log("\n");
+		log("The following commands are executed by this synthesis command:\n");
+		help_script();
+		log("\n");
+	}
+
+	string opensta_exe, sdc_filename, sdc_expanded_filename;
+	bool cleanup;
+	void execute(std::vector<std::string> args, RTLIL::Design *design) override
+	{
+		string run_from, run_to;
+		cleanup = true;
+
+		size_t argidx;
+		for (argidx = 1; argidx < args.size(); argidx++)
+		{
+			if (args[argidx] == "-exe" && argidx+1 < args.size()) {
+				opensta_exe = args[++argidx];
+				continue;
+			}
+			if (args[argidx] == "-sdc-in" && argidx+1 < args.size()) {
+				sdc_filename = args[++argidx];
+				continue;
+			}
+			if (args[argidx] == "-sdc-out" && argidx+1 < args.size()) {
+				sdc_expanded_filename = args[++argidx];
+				continue;
+			}
+			if (args[argidx] == "-nocleanup") {
+				cleanup = false;
+				continue;
+			}
+			// repetitive boring bit
+			if (args[argidx] == "-run" && argidx+1 < args.size()) {
+				size_t pos = args[argidx+1].find(':');
+				if (pos == std::string::npos) {
+					run_from = args[++argidx];
+					run_to = args[argidx];
+				} else {
+					run_from = args[++argidx].substr(0, pos);
+					run_to = args[argidx].substr(pos+1);
+				}
+				continue;
+			}
+			break;
+		}
+		extra_args(args, argidx, design);
+
+		if (!design->full_selection())
+			log_cmd_error("This command only operates on fully selected designs!\n");
+
+		log_header(design, "Executing OPENSTA pass.\n");
+		log_push();
+
+		run_script(design, run_from, run_to);
+
+		log_pop();
+	}
+
+	void script() override
+	{
+		std::string tempdir_name;
+		std::string liberty_path;
+		std::string verilog_path;
+
+		run("design -save pre_expand");
+		run("proc");
+		run("memory");
+		// run("dfflegalize -cell $dff");
+
+		std::string write_verilog_cmd = "write_verilog -norename -noexpr -attr2comment -defparam ";
+		if (help_mode) {
+			run(write_verilog_cmd + "<tmp_dir>/elaborated.v");
+		} else {
+			if (cleanup)
+				tempdir_name = get_base_tmpdir() + "/";
+			else
+				tempdir_name = "_tmp_";
+			tempdir_name += proc_program_prefix() + "yosys-sdc_expand-XXXXXX";
+			tempdir_name = make_temp_dir(tempdir_name);
+			verilog_path = tempdir_name + "/elaborated.v";
+			run(write_verilog_cmd + verilog_path);
+		}
+
+		run("read_verilog -setattr whitebox -defer -DSIMLIB_NOCHECKS +/simlib.v");
+		run("proc");
+		run("hierarchy -auto-top");
+		run("chtype -publish_icells");
+
+		if (help_mode) {
+			run("icell_liberty <tmp_dir>/yosys.lib");
+		} else {
+			liberty_path = tempdir_name + "/yosys.lib";
+			run(stringf("icell_liberty %s", liberty_path.c_str()));
+		}
+
+		std::string opensta_pass_call = "opensta -exe ";
+		opensta_pass_call += help_mode ? "<exe>" : opensta_exe;
+		opensta_pass_call += " -sdc-in ";
+		opensta_pass_call += help_mode ? "<sdc-in>" : sdc_filename;
+		opensta_pass_call += " -sdc-out ";
+		opensta_pass_call += help_mode ? "<sdc-out>" : sdc_expanded_filename;
+		opensta_pass_call += " -verilog ";
+		opensta_pass_call += help_mode ? "<verilog>" : verilog_path;
+		opensta_pass_call += " -liberty ";
+		opensta_pass_call += help_mode ? "<tmp_dir>/yosys.lib" : liberty_path;
+		if (!cleanup)
+			opensta_pass_call += " -nocleanup";
+		run(opensta_pass_call.c_str());
+
+		if (!help_mode) {
+			if (cleanup) {
+				log("Removing temp directory.\n");
+				remove_directory(tempdir_name);
+			} else {
+				log("Keeping temp directory %s\n", tempdir_name.c_str());
+			}
+		}
+		run("design -load pre_expand");
+	}
+} SdcexpandPass;
+
+PRIVATE_NAMESPACE_END

From 0c4105d72c3d5b512176b75a8c825307cd95debb Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 31 Jul 2025 15:38:45 +0200
Subject: [PATCH 869/931] opensta: quiet net width mismatch warning

---
 techlibs/common/opensta.cc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/techlibs/common/opensta.cc b/techlibs/common/opensta.cc
index 1b3571973..bfd36c380 100644
--- a/techlibs/common/opensta.cc
+++ b/techlibs/common/opensta.cc
@@ -99,8 +99,13 @@ struct OpenstaPass : public Pass
 		f_script << "read_sdc " << sdc_filename << "\n";
 		f_script << "write_sdc " << sdc_expanded_filename << "\n";
 		f_script.close();
-		std::string command = opensta_exe + " -exit " + script_filename; 
-		int ret = run_command(command);
+		std::string command = opensta_exe + " -exit " + script_filename;
+		auto process_line = [](const std::string &line) {
+			if (line.find("does not match net size") != std::string::npos)
+				return;
+			log("OpenSTA: %s", line.c_str());
+		};
+		int ret = run_command(command, process_line);
 		if (ret)
 			log_error("OpenSTA return %d (error)\n", ret);
 		else

From 7bed6ec658e2f9137131dca03b8a7b55a5d843a6 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 2 Oct 2025 15:26:24 +0200
Subject: [PATCH 870/931] opensta: quiet blackbox warning

---
 techlibs/common/opensta.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/techlibs/common/opensta.cc b/techlibs/common/opensta.cc
index bfd36c380..0a93a915c 100644
--- a/techlibs/common/opensta.cc
+++ b/techlibs/common/opensta.cc
@@ -101,6 +101,8 @@ struct OpenstaPass : public Pass
 		f_script.close();
 		std::string command = opensta_exe + " -exit " + script_filename;
 		auto process_line = [](const std::string &line) {
+			if (line.find("Creating black box") != std::string::npos)
+				return;
 			if (line.find("does not match net size") != std::string::npos)
 				return;
 			log("OpenSTA: %s", line.c_str());

From 793594bd5973d2f48100aaec7c67c93d439d9956 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 2 Oct 2025 16:45:32 +0200
Subject: [PATCH 871/931] sdc_expand: log header

---
 techlibs/common/sdc_expand.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/techlibs/common/sdc_expand.cc b/techlibs/common/sdc_expand.cc
index 7efaf8c0d..baa281dd7 100644
--- a/techlibs/common/sdc_expand.cc
+++ b/techlibs/common/sdc_expand.cc
@@ -35,6 +35,7 @@ struct SdcexpandPass : public ScriptPass
 	bool cleanup;
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
+		log_header(design, "Executing SDC_EXPAND pass.\n");
 		string run_from, run_to;
 		cleanup = true;
 

From 7bc88d5c4098255a8be65cba16c0e12b35c8d0e5 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 8 Oct 2025 16:11:03 +0200
Subject: [PATCH 872/931] sdc_expand: cleanup

---
 techlibs/common/sdc_expand.cc | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/techlibs/common/sdc_expand.cc b/techlibs/common/sdc_expand.cc
index baa281dd7..2fd5f380e 100644
--- a/techlibs/common/sdc_expand.cc
+++ b/techlibs/common/sdc_expand.cc
@@ -32,12 +32,12 @@ struct SdcexpandPass : public ScriptPass
 	}
 
 	string opensta_exe, sdc_filename, sdc_expanded_filename;
-	bool cleanup;
+	bool cleanup = true;
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		log_header(design, "Executing SDC_EXPAND pass.\n");
 		string run_from, run_to;
-		cleanup = true;
+		opensta_exe = "sta";
 
 		size_t argidx;
 		for (argidx = 1; argidx < args.size(); argidx++)
@@ -58,7 +58,6 @@ struct SdcexpandPass : public ScriptPass
 				cleanup = false;
 				continue;
 			}
-			// repetitive boring bit
 			if (args[argidx] == "-run" && argidx+1 < args.size()) {
 				size_t pos = args[argidx+1].find(':');
 				if (pos == std::string::npos) {
@@ -72,6 +71,12 @@ struct SdcexpandPass : public ScriptPass
 			}
 			break;
 		}
+
+		if (sdc_filename.empty())
+			log_cmd_error("Missing -sdc-in argument\n");
+		if (sdc_expanded_filename.empty())
+			log_cmd_error("Missing -sdc-out argument\n");
+
 		extra_args(args, argidx, design);
 
 		if (!design->full_selection())
@@ -88,17 +93,14 @@ struct SdcexpandPass : public ScriptPass
 	void script() override
 	{
 		std::string tempdir_name;
-		std::string liberty_path;
-		std::string verilog_path;
 
 		run("design -save pre_expand");
 		run("proc");
 		run("memory");
 		// run("dfflegalize -cell $dff");
 
-		std::string write_verilog_cmd = "write_verilog -norename -noexpr -attr2comment -defparam ";
 		if (help_mode) {
-			run(write_verilog_cmd + "<tmp_dir>/elaborated.v");
+			tempdir_name = "<tmp_dir>";
 		} else {
 			if (cleanup)
 				tempdir_name = get_base_tmpdir() + "/";
@@ -106,21 +108,18 @@ struct SdcexpandPass : public ScriptPass
 				tempdir_name = "_tmp_";
 			tempdir_name += proc_program_prefix() + "yosys-sdc_expand-XXXXXX";
 			tempdir_name = make_temp_dir(tempdir_name);
-			verilog_path = tempdir_name + "/elaborated.v";
-			run(write_verilog_cmd + verilog_path);
 		}
+		std::string verilog_path = tempdir_name + "/elaborated.v";
 
+		std::string write_verilog_cmd = "write_verilog -norename -noexpr -attr2comment -defparam ";
+		run(write_verilog_cmd + verilog_path);
 		run("read_verilog -setattr whitebox -defer -DSIMLIB_NOCHECKS +/simlib.v");
 		run("proc");
 		run("hierarchy -auto-top");
 		run("chtype -publish_icells");
 
-		if (help_mode) {
-			run("icell_liberty <tmp_dir>/yosys.lib");
-		} else {
-			liberty_path = tempdir_name + "/yosys.lib";
-			run(stringf("icell_liberty %s", liberty_path.c_str()));
-		}
+		std::string liberty_path = tempdir_name + "/yosys.lib";
+		run("icell_liberty " + liberty_path);
 
 		std::string opensta_pass_call = "opensta -exe ";
 		opensta_pass_call += help_mode ? "<exe>" : opensta_exe;
@@ -134,7 +133,7 @@ struct SdcexpandPass : public ScriptPass
 		opensta_pass_call += help_mode ? "<tmp_dir>/yosys.lib" : liberty_path;
 		if (!cleanup)
 			opensta_pass_call += " -nocleanup";
-		run(opensta_pass_call.c_str());
+		run(opensta_pass_call);
 
 		if (!help_mode) {
 			if (cleanup) {

From 9f07e21e35558200fc180c98bf301942bdc6861c Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 8 Oct 2025 16:25:47 +0200
Subject: [PATCH 873/931] rtlil: undeprecate builtin_ff_cell_types

---
 kernel/rtlil.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index a8e43fe1d..4da030e8d 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -728,7 +728,6 @@ template <> struct IDMacroHelper<-1> {
 namespace RTLIL {
 	extern dict<std::string, std::string> constpad;
 
-	[[deprecated("Call cell->is_builtin_ff() instead")]]
 	const pool<IdString> &builtin_ff_cell_types();
 
 	static inline std::string escape_id(const std::string &str) {

From cee3d0b598046f6410f417891f5942372a1a09d6 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 14 Nov 2025 13:23:14 +0100
Subject: [PATCH 874/931] icell_liberty: refactor and add help

---
 passes/cmds/icell_liberty.cc | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/passes/cmds/icell_liberty.cc b/passes/cmds/icell_liberty.cc
index 83252ffb4..01e25b9e9 100644
--- a/passes/cmds/icell_liberty.cc
+++ b/passes/cmds/icell_liberty.cc
@@ -112,12 +112,6 @@ struct LibertyStubber {
 		auto next_state = ffType.has_ce ? "D & EN" : "D";
 		i.item("next_state", next_state);
 		f << "\t\t}\n";
-
-
-		// bool has_aload;
-		// bool has_srst;
-		// bool has_arst;
-		// bool has_sr;
 		f << "\t}\n";
 	}
 	void liberty_cell(Module* base, Module* derived, std::ostream& f)
@@ -157,8 +151,11 @@ struct IcellLiberty : Pass {
 	{
 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 		log("\n");
-		log("    icell_liberty <liberty_file>\n"); // TODO
+		log("    icell_liberty <liberty_file>\n");
 		log("\n");
+		log("Write Liberty files modeling the interfaces of used internal cells.\n");
+		log("\n");
+		log("Models are not guaranteed to be logically sound.\n");
 		log("\n");
 	}
 	void execute(std::vector<std::string> args, RTLIL::Design *d) override
@@ -168,7 +165,7 @@ struct IcellLiberty : Pass {
 		size_t argidx;
 		IdString naming_attr;
 		std::string liberty_filename;
-		std::ofstream* liberty_file = new std::ofstream;
+		auto liberty_file = std::make_unique<std::ofstream>();
 
 		for (argidx = 1; argidx < args.size(); argidx++) {
 			break;
@@ -176,15 +173,12 @@ struct IcellLiberty : Pass {
 		if (argidx < args.size())
 			liberty_filename = args[argidx++];
 		else
-			log_error("no Liberty filename specified\n");
-
-		// extra_args(args, argidx, d);
+			log_cmd_error("no Liberty filename specified\n");
 
 		if (liberty_filename.size()) {
 			liberty_file->open(liberty_filename.c_str());
 			if (liberty_file->fail()) {
-				delete liberty_file;
-				log_error("Can't open file `%s' for writing: %s\n", liberty_filename.c_str(), strerror(errno));
+				log_cmd_error("Can't open file `%s' for writing: %s\n", liberty_filename.c_str(), strerror(errno));
 			}
 		}
 
@@ -209,7 +203,6 @@ struct IcellLiberty : Pass {
 
 		if (liberty_file) {
 			stubber.liberty_suffix(*liberty_file);
-			delete liberty_file;
 		}
 	}
 } IcellLiberty;

From 5acb77cab1a9b1c67f5f978771c9d336756f4293 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 14 Nov 2025 13:30:07 +0100
Subject: [PATCH 875/931] sdc_expand, opensta: typos

---
 techlibs/common/opensta.cc    | 2 +-
 techlibs/common/sdc_expand.cc | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/techlibs/common/opensta.cc b/techlibs/common/opensta.cc
index 0a93a915c..7f2b15243 100644
--- a/techlibs/common/opensta.cc
+++ b/techlibs/common/opensta.cc
@@ -109,7 +109,7 @@ struct OpenstaPass : public Pass
 		};
 		int ret = run_command(command, process_line);
 		if (ret)
-			log_error("OpenSTA return %d (error)\n", ret);
+			log_error("OpenSTA returned %d (error)\n", ret);
 		else
 			log("sdc_expanded_filename: %s\n", sdc_expanded_filename.c_str());
 
diff --git a/techlibs/common/sdc_expand.cc b/techlibs/common/sdc_expand.cc
index 2fd5f380e..1b13923f0 100644
--- a/techlibs/common/sdc_expand.cc
+++ b/techlibs/common/sdc_expand.cc
@@ -4,10 +4,10 @@
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
-struct SdcexpandPass : public ScriptPass
+struct SdcExpandPass : public ScriptPass
 {
 	const char* default_sta_cmd = "sta";
-	SdcexpandPass() : ScriptPass("sdc_expand", "run OpenSTA") { }
+	SdcExpandPass() : ScriptPass("sdc_expand", "run OpenSTA") { }
 
 	void help() override
 	{
@@ -145,6 +145,6 @@ struct SdcexpandPass : public ScriptPass
 		}
 		run("design -load pre_expand");
 	}
-} SdcexpandPass;
+} SdcExpandPass;
 
 PRIVATE_NAMESPACE_END

From 6846168db3e634a737cd1349458de35d55a5e8c2 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 14 Nov 2025 13:35:51 +0100
Subject: [PATCH 876/931] opensta: opensta.exe scratchpad variable

---
 techlibs/common/opensta.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/techlibs/common/opensta.cc b/techlibs/common/opensta.cc
index 7f2b15243..fbdf27304 100644
--- a/techlibs/common/opensta.cc
+++ b/techlibs/common/opensta.cc
@@ -35,7 +35,7 @@ struct OpenstaPass : public Pass
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		string run_from, run_to;
-		string opensta_exe = "sta";
+		string opensta_exe = design->scratchpad_get_string("opensta.exe", "sta");
 		string sdc_filename, sdc_expanded_filename;
 		string tempdir_name, script_filename;
 		string verilog_filename, liberty_filename;

From 9a5465bc83c568b7890bbd5b506a642bba8ebe5c Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 14 Nov 2025 13:37:19 +0100
Subject: [PATCH 877/931] icell_liberty: simplify

---
 passes/cmds/icell_liberty.cc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/passes/cmds/icell_liberty.cc b/passes/cmds/icell_liberty.cc
index 01e25b9e9..d49cd360a 100644
--- a/passes/cmds/icell_liberty.cc
+++ b/passes/cmds/icell_liberty.cc
@@ -185,8 +185,7 @@ struct IcellLiberty : Pass {
 		pool<RTLIL::IdString> done;
 		LibertyStubber stubber = {};
 
-		if (liberty_file)
-			stubber.liberty_prefix(*liberty_file);
+		stubber.liberty_prefix(*liberty_file);
 
 		for (auto module : d->selected_modules()) {
 			for (auto cell : module->selected_cells()) {
@@ -201,9 +200,7 @@ struct IcellLiberty : Pass {
 			}
 		}
 
-		if (liberty_file) {
-			stubber.liberty_suffix(*liberty_file);
-		}
+		stubber.liberty_suffix(*liberty_file);
 	}
 } IcellLiberty;
 

From a5b6c3cc191c2f18f52f45c1e34588a7bbe639b4 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 14 Nov 2025 13:44:12 +0100
Subject: [PATCH 878/931] opensta, sdc_expand: more scratchpad

---
 techlibs/common/opensta.cc    |  2 +-
 techlibs/common/sdc_expand.cc | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/techlibs/common/opensta.cc b/techlibs/common/opensta.cc
index fbdf27304..6d793b3e1 100644
--- a/techlibs/common/opensta.cc
+++ b/techlibs/common/opensta.cc
@@ -39,7 +39,7 @@ struct OpenstaPass : public Pass
 		string sdc_filename, sdc_expanded_filename;
 		string tempdir_name, script_filename;
 		string verilog_filename, liberty_filename;
-		bool cleanup = true;
+		bool cleanup = design->scratchpad_get_bool("opensta.cleanup", true);
 
 		log_header(design, "Executing OPENSTA pass.\n");
 		log_push();
diff --git a/techlibs/common/sdc_expand.cc b/techlibs/common/sdc_expand.cc
index 1b13923f0..cec5e8c1e 100644
--- a/techlibs/common/sdc_expand.cc
+++ b/techlibs/common/sdc_expand.cc
@@ -32,12 +32,13 @@ struct SdcExpandPass : public ScriptPass
 	}
 
 	string opensta_exe, sdc_filename, sdc_expanded_filename;
-	bool cleanup = true;
+	bool cleanup;
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		log_header(design, "Executing SDC_EXPAND pass.\n");
 		string run_from, run_to;
-		opensta_exe = "sta";
+		opensta_exe = "";
+		cleanup = design->scratchpad_get_bool("sdc_expand.cleanup", true);
 
 		size_t argidx;
 		for (argidx = 1; argidx < args.size(); argidx++)
@@ -121,8 +122,11 @@ struct SdcExpandPass : public ScriptPass
 		std::string liberty_path = tempdir_name + "/yosys.lib";
 		run("icell_liberty " + liberty_path);
 
-		std::string opensta_pass_call = "opensta -exe ";
-		opensta_pass_call += help_mode ? "<exe>" : opensta_exe;
+		std::string opensta_pass_call = "opensta ";
+		if (opensta_exe.length()) {
+			opensta_pass_call += "-exe ";
+			opensta_pass_call += help_mode ? "<exe>" : opensta_exe;
+		}
 		opensta_pass_call += " -sdc-in ";
 		opensta_pass_call += help_mode ? "<sdc-in>" : sdc_filename;
 		opensta_pass_call += " -sdc-out ";

From 411fc149df9d727f561ca04e2149e1dc4af2abf3 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 14 Nov 2025 16:06:46 +0100
Subject: [PATCH 879/931] opensta: refactor default command

---
 techlibs/common/opensta.cc    | 6 +++---
 techlibs/common/opensta.h     | 8 ++++++++
 techlibs/common/sdc_expand.cc | 4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 techlibs/common/opensta.h

diff --git a/techlibs/common/opensta.cc b/techlibs/common/opensta.cc
index 6d793b3e1..2a806edf6 100644
--- a/techlibs/common/opensta.cc
+++ b/techlibs/common/opensta.cc
@@ -1,5 +1,6 @@
 #include "kernel/rtlil.h"
 #include "kernel/log.h"
+#include "techlibs/common/opensta.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -7,7 +8,6 @@ PRIVATE_NAMESPACE_BEGIN
 #if !defined(YOSYS_DISABLE_SPAWN)
 struct OpenstaPass : public Pass
 {
-	const char* default_sta_cmd = "sta";
 	OpenstaPass() : Pass("opensta", "run OpenSTA") { }
 
 	void help() override
@@ -19,7 +19,7 @@ struct OpenstaPass : public Pass
 		// TOOD
 		log("\n");
 		log("    -exe <command>\n");
-		log("        use <command> to run OpenSTA instead of \"%s\"\n", default_sta_cmd);
+		log("        use <command> to run OpenSTA instead of \"%s\"\n", default_opensta_cmd);
 		log("\n");
 		log("    -sdc-in <filename>\n");
 		log("        expand SDC input file <filename>\n");
@@ -35,7 +35,7 @@ struct OpenstaPass : public Pass
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		string run_from, run_to;
-		string opensta_exe = design->scratchpad_get_string("opensta.exe", "sta");
+		string opensta_exe = design->scratchpad_get_string("opensta.exe", default_opensta_cmd);
 		string sdc_filename, sdc_expanded_filename;
 		string tempdir_name, script_filename;
 		string verilog_filename, liberty_filename;
diff --git a/techlibs/common/opensta.h b/techlibs/common/opensta.h
new file mode 100644
index 000000000..4c5ac871f
--- /dev/null
+++ b/techlibs/common/opensta.h
@@ -0,0 +1,8 @@
+#include "kernel/yosys_common.h"
+#ifndef OPENSTA_H
+YOSYS_NAMESPACE_BEGIN
+
+static const char* default_opensta_cmd = "sta";
+
+YOSYS_NAMESPACE_END
+#endif /* OPENSTA_H */
diff --git a/techlibs/common/sdc_expand.cc b/techlibs/common/sdc_expand.cc
index cec5e8c1e..95254d1f4 100644
--- a/techlibs/common/sdc_expand.cc
+++ b/techlibs/common/sdc_expand.cc
@@ -1,12 +1,12 @@
 #include "kernel/rtlil.h"
 #include "kernel/log.h"
+#include "techlibs/common/opensta.h"
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
 struct SdcExpandPass : public ScriptPass
 {
-	const char* default_sta_cmd = "sta";
 	SdcExpandPass() : ScriptPass("sdc_expand", "run OpenSTA") { }
 
 	void help() override
@@ -18,7 +18,7 @@ struct SdcExpandPass : public ScriptPass
 		// TODO
 		log("\n");
 		log("    -exe <command>\n");
-		log("        use <command> to run OpenSTA instead of \"%s\"\n", default_sta_cmd);
+		log("        use <command> to run OpenSTA instead of \"%s\"\n", default_opensta_cmd);
 		log("\n");
 		log("    -sdc-in <filename>\n");
 		log("        expand SDC file <filename>\n");

From 85d2702ef6b78dbcc6138cc8745f6bd796fa2d23 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 14 Nov 2025 16:16:33 +0100
Subject: [PATCH 880/931] opensta, sdc_expand: fix help

---
 techlibs/common/opensta.cc    | 4 +++-
 techlibs/common/sdc_expand.cc | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/techlibs/common/opensta.cc b/techlibs/common/opensta.cc
index 2a806edf6..282481953 100644
--- a/techlibs/common/opensta.cc
+++ b/techlibs/common/opensta.cc
@@ -16,7 +16,9 @@ struct OpenstaPass : public Pass
 		log("\n");
 		log("    opensta [options]\n");
 		log("\n");
-		// TOOD
+		log("Expand SDC file with OpenSTA.\n");
+		log("Internal command like abc. Requires a well-formed design.\n");
+		log("For general SDC expansion with OpenSTA, use the sdc_expand command.\n");
 		log("\n");
 		log("    -exe <command>\n");
 		log("        use <command> to run OpenSTA instead of \"%s\"\n", default_opensta_cmd);
diff --git a/techlibs/common/sdc_expand.cc b/techlibs/common/sdc_expand.cc
index 95254d1f4..fe8f20aa9 100644
--- a/techlibs/common/sdc_expand.cc
+++ b/techlibs/common/sdc_expand.cc
@@ -7,7 +7,7 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct SdcExpandPass : public ScriptPass
 {
-	SdcExpandPass() : ScriptPass("sdc_expand", "run OpenSTA") { }
+	SdcExpandPass() : ScriptPass("sdc_expand", "expand SDC design with opensta") { }
 
 	void help() override
 	{
@@ -15,7 +15,8 @@ struct SdcExpandPass : public ScriptPass
 		log("\n");
 		log("    sdc_expand [options]\n");
 		log("\n");
-		// TODO
+		log("Expand SDC file with opensta based on arbitrary current design.\n");
+		log("Changes the design but only temporarily.\n");
 		log("\n");
 		log("    -exe <command>\n");
 		log("        use <command> to run OpenSTA instead of \"%s\"\n", default_opensta_cmd);

From c281bac461ee64157e66134cee3828856d99c5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Fri, 2 May 2025 17:48:33 +0200
Subject: [PATCH 881/931] sdc: add initial stubbed demo

---
 kernel/driver.cc |  4 ++--
 kernel/tclapi.cc | 60 +++++++++++++++++++++++++++++++++++++++++++++++-
 kernel/yosys.cc  | 34 +++++++++++++++++++++++++--
 3 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/kernel/driver.cc b/kernel/driver.cc
index 726e25302..4097411b4 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -188,7 +188,7 @@ extern char yosys_path[PATH_MAX];
 #endif
 #ifdef YOSYS_ENABLE_TCL
 namespace Yosys {
-	extern int yosys_tcl_iterp_init(Tcl_Interp *interp);
+	extern int yosys_tcl_interp_init(Tcl_Interp *interp);
 	extern void yosys_tcl_activate_repl();
 };
 #endif
@@ -610,7 +610,7 @@ int main(int argc, char **argv)
 	if (run_tcl_shell) {
 #ifdef YOSYS_ENABLE_TCL
 		yosys_tcl_activate_repl();
-		Tcl_Main(argc, argv, yosys_tcl_iterp_init);
+		Tcl_Main(argc, argv, yosys_tcl_interp_init);
 #else
 		log_error("Can't exectue TCL shell: this version of yosys is not built with TCL support enabled.\n");
 #endif
diff --git a/kernel/tclapi.cc b/kernel/tclapi.cc
index a2ebaffa2..a25aa4c0c 100644
--- a/kernel/tclapi.cc
+++ b/kernel/tclapi.cc
@@ -533,7 +533,65 @@ static int tcl_set_param(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj *cons
 	return TCL_OK;
 }
 
-int yosys_tcl_iterp_init(Tcl_Interp *interp)
+static int sdc_get_pins_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+{
+	(void)interp;
+	bool hierarchical_flag = false;
+	bool regexp_flag = false;
+	bool nocase_flag = false;
+	std::string separator = "/";
+	Tcl_Obj* of_objects;
+	std::vector<std::string> patterns;
+	int i = 1;
+	for (; i < objc; i++) {
+		FLAG2(hierarchical)
+		FLAG2(regexp)
+		FLAG2(nocase)
+		if (!strcmp(Tcl_GetString(objv[i]), "-hsc")) {
+			i++;
+			separator = Tcl_GetString(objv[i]);
+			continue;
+		}
+		if (!strcmp(Tcl_GetString(objv[i]), "-of_objects")) {
+			i++;
+			of_objects = objv[i];
+			continue;
+		}
+		// Onto the next loop
+		break;
+	}
+	for (; i < objc; i++) {
+		patterns.push_back(Tcl_GetString(objv[i]));
+	}
+	log("get_pins patterns:\n");
+	for (auto pat : patterns) {
+		log("\t%s\n", pat.c_str());
+	}
+	(void)hierarchical_flag;
+	(void)regexp_flag;
+	(void)nocase_flag;
+	(void)separator;
+	(void)of_objects;
+	return TCL_OK;
+}
+static int sdc_dummy_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+{
+	(void)interp;
+	(void)objc;
+	log("Ignoring known SDC command %s\n", Tcl_GetString(objv[0]));
+	return TCL_OK;
+}
+
+int yosys_sdc_interp_init(Tcl_Interp *interp)
+{
+	if (Tcl_Init(interp)!=TCL_OK)
+		log_warning("Tcl_Init() call failed - %s\n",Tcl_ErrnoMsg(Tcl_GetErrno()));
+	Tcl_CreateObjCommand(interp, "set_false_path", sdc_dummy_cmd, NULL, NULL);
+	Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, NULL, NULL);
+	return TCL_OK;
+}
+
+int yosys_tcl_interp_init(Tcl_Interp *interp)
 {
 	if (Tcl_Init(interp)!=TCL_OK)
 		log_warning("Tcl_Init() call failed - %s\n",Tcl_ErrnoMsg(Tcl_GetErrno()));
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 4e4abed20..cab1e3ee7 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -95,6 +95,7 @@ CellTypes yosys_celltypes;
 
 #ifdef YOSYS_ENABLE_TCL
 Tcl_Interp *yosys_tcl_interp = NULL;
+Tcl_Interp *yosys_sdc_interp = NULL;
 #endif
 
 std::set<std::string> yosys_input_files, yosys_output_files;
@@ -393,16 +394,25 @@ void rewrite_filename(std::string &filename)
 #ifdef YOSYS_ENABLE_TCL
 
 // defined in tclapi.cc
-extern int yosys_tcl_iterp_init(Tcl_Interp *interp);
+extern int yosys_tcl_interp_init(Tcl_Interp *interp);
+extern int yosys_sdc_interp_init(Tcl_Interp *interp);
 
 extern Tcl_Interp *yosys_get_tcl_interp()
 {
 	if (yosys_tcl_interp == NULL) {
 		yosys_tcl_interp = Tcl_CreateInterp();
-		yosys_tcl_iterp_init(yosys_tcl_interp);
+		yosys_tcl_interp_init(yosys_tcl_interp);
 	}
 	return yosys_tcl_interp;
 }
+extern Tcl_Interp *yosys_get_sdc_interp()
+{
+	if (yosys_sdc_interp == NULL) {
+		yosys_sdc_interp = Tcl_CreateInterp();
+		yosys_sdc_interp_init(yosys_sdc_interp);
+	}
+	return yosys_sdc_interp;
+}
 
 struct TclPass : public Pass {
 	TclPass() : Pass("tcl", "execute a TCL script file") { }
@@ -446,6 +456,26 @@ struct TclPass : public Pass {
 		Tcl_Release(interp);
 	}
 } TclPass;
+struct SdcPass : public Pass {
+	SdcPass() : Pass("sdc", "sniff at some SDC") { }
+	void execute(std::vector<std::string> args, RTLIL::Design *) override {
+		if (args.size() < 2)
+			log_cmd_error("Missing script file.\n");
+
+		std::vector<Tcl_Obj*> script_args;
+		for (auto it = args.begin() + 2; it != args.end(); ++it)
+			script_args.push_back(Tcl_NewStringObj((*it).c_str(), (*it).size()));
+
+		Tcl_Interp *interp = yosys_get_sdc_interp();
+		Tcl_Preserve(interp);
+		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argc", 4), NULL, Tcl_NewIntObj(script_args.size()), 0);
+		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv", 4), NULL, Tcl_NewListObj(script_args.size(), script_args.data()), 0);
+		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv0", 5), NULL, Tcl_NewStringObj(args[1].c_str(), args[1].size()), 0);
+		if (Tcl_EvalFile(interp, args[1].c_str()) != TCL_OK)
+			log_cmd_error("SDC interpreter returned an error: %s\n", Tcl_GetStringResult(interp));
+		Tcl_Release(interp);
+	}
+} SdcPass;
 #endif
 
 #if defined(__linux__) || defined(__CYGWIN__)

From 5a798b64ef19122c3539eb208afcbf757dff56f8 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 26 May 2025 22:53:16 +0200
Subject: [PATCH 882/931] sdc: separate out

---
 kernel/tclapi.cc         |  58 --------------------
 kernel/yosys.cc          |  29 +---------
 passes/cmds/Makefile.inc |   3 ++
 passes/cmds/sdc.cc       | 112 +++++++++++++++++++++++++++++++++++++++
 passes/cmds/stubs.sdc    |   1 +
 5 files changed, 117 insertions(+), 86 deletions(-)
 create mode 100644 passes/cmds/sdc.cc
 create mode 100644 passes/cmds/stubs.sdc

diff --git a/kernel/tclapi.cc b/kernel/tclapi.cc
index a25aa4c0c..ec0483a4a 100644
--- a/kernel/tclapi.cc
+++ b/kernel/tclapi.cc
@@ -533,64 +533,6 @@ static int tcl_set_param(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj *cons
 	return TCL_OK;
 }
 
-static int sdc_get_pins_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
-{
-	(void)interp;
-	bool hierarchical_flag = false;
-	bool regexp_flag = false;
-	bool nocase_flag = false;
-	std::string separator = "/";
-	Tcl_Obj* of_objects;
-	std::vector<std::string> patterns;
-	int i = 1;
-	for (; i < objc; i++) {
-		FLAG2(hierarchical)
-		FLAG2(regexp)
-		FLAG2(nocase)
-		if (!strcmp(Tcl_GetString(objv[i]), "-hsc")) {
-			i++;
-			separator = Tcl_GetString(objv[i]);
-			continue;
-		}
-		if (!strcmp(Tcl_GetString(objv[i]), "-of_objects")) {
-			i++;
-			of_objects = objv[i];
-			continue;
-		}
-		// Onto the next loop
-		break;
-	}
-	for (; i < objc; i++) {
-		patterns.push_back(Tcl_GetString(objv[i]));
-	}
-	log("get_pins patterns:\n");
-	for (auto pat : patterns) {
-		log("\t%s\n", pat.c_str());
-	}
-	(void)hierarchical_flag;
-	(void)regexp_flag;
-	(void)nocase_flag;
-	(void)separator;
-	(void)of_objects;
-	return TCL_OK;
-}
-static int sdc_dummy_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
-{
-	(void)interp;
-	(void)objc;
-	log("Ignoring known SDC command %s\n", Tcl_GetString(objv[0]));
-	return TCL_OK;
-}
-
-int yosys_sdc_interp_init(Tcl_Interp *interp)
-{
-	if (Tcl_Init(interp)!=TCL_OK)
-		log_warning("Tcl_Init() call failed - %s\n",Tcl_ErrnoMsg(Tcl_GetErrno()));
-	Tcl_CreateObjCommand(interp, "set_false_path", sdc_dummy_cmd, NULL, NULL);
-	Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, NULL, NULL);
-	return TCL_OK;
-}
-
 int yosys_tcl_interp_init(Tcl_Interp *interp)
 {
 	if (Tcl_Init(interp)!=TCL_OK)
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index cab1e3ee7..009da56b9 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -395,7 +395,6 @@ void rewrite_filename(std::string &filename)
 
 // defined in tclapi.cc
 extern int yosys_tcl_interp_init(Tcl_Interp *interp);
-extern int yosys_sdc_interp_init(Tcl_Interp *interp);
 
 extern Tcl_Interp *yosys_get_tcl_interp()
 {
@@ -405,15 +404,8 @@ extern Tcl_Interp *yosys_get_tcl_interp()
 	}
 	return yosys_tcl_interp;
 }
-extern Tcl_Interp *yosys_get_sdc_interp()
-{
-	if (yosys_sdc_interp == NULL) {
-		yosys_sdc_interp = Tcl_CreateInterp();
-		yosys_sdc_interp_init(yosys_sdc_interp);
-	}
-	return yosys_sdc_interp;
-}
 
+// Also see SdcPass
 struct TclPass : public Pass {
 	TclPass() : Pass("tcl", "execute a TCL script file") { }
 	void help() override {
@@ -456,26 +448,7 @@ struct TclPass : public Pass {
 		Tcl_Release(interp);
 	}
 } TclPass;
-struct SdcPass : public Pass {
-	SdcPass() : Pass("sdc", "sniff at some SDC") { }
-	void execute(std::vector<std::string> args, RTLIL::Design *) override {
-		if (args.size() < 2)
-			log_cmd_error("Missing script file.\n");
 
-		std::vector<Tcl_Obj*> script_args;
-		for (auto it = args.begin() + 2; it != args.end(); ++it)
-			script_args.push_back(Tcl_NewStringObj((*it).c_str(), (*it).size()));
-
-		Tcl_Interp *interp = yosys_get_sdc_interp();
-		Tcl_Preserve(interp);
-		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argc", 4), NULL, Tcl_NewIntObj(script_args.size()), 0);
-		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv", 4), NULL, Tcl_NewListObj(script_args.size(), script_args.data()), 0);
-		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv0", 5), NULL, Tcl_NewStringObj(args[1].c_str(), args[1].size()), 0);
-		if (Tcl_EvalFile(interp, args[1].c_str()) != TCL_OK)
-			log_cmd_error("SDC interpreter returned an error: %s\n", Tcl_GetStringResult(interp));
-		Tcl_Release(interp);
-	}
-} SdcPass;
 #endif
 
 #if defined(__linux__) || defined(__CYGWIN__)
diff --git a/passes/cmds/Makefile.inc b/passes/cmds/Makefile.inc
index 2dbeadac2..f64fdea55 100644
--- a/passes/cmds/Makefile.inc
+++ b/passes/cmds/Makefile.inc
@@ -58,3 +58,6 @@ OBJS += passes/cmds/test_select.o
 OBJS += passes/cmds/timeest.o
 OBJS += passes/cmds/linecoverage.o
 OBJS += passes/cmds/sort.o
+OBJS += passes/cmds/sdc.o
+
+$(eval $(call add_share_file,share/sdc,passes/cmds/stubs.sdc))
diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
new file mode 100644
index 000000000..539b349f7
--- /dev/null
+++ b/passes/cmds/sdc.cc
@@ -0,0 +1,112 @@
+#include "kernel/register.h"
+#include "kernel/celltypes.h"
+#include "kernel/rtlil.h"
+#include "kernel/log.h"
+#include <tcl.h>
+
+
+USING_YOSYS_NAMESPACE
+PRIVATE_NAMESPACE_BEGIN
+
+template<typename T>
+static bool parse_flag(char* arg, const char* flag_name, T& flag_var) {
+    std::string expected = std::string("-") + flag_name;
+    if (expected == arg) {
+        flag_var = true;
+        return true;
+    }
+    return false;
+}
+
+static int sdc_get_pins_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
+{
+	(void)interp;
+	bool hierarchical_flag = false;
+	bool regexp_flag = false;
+	bool nocase_flag = false;
+	std::string separator = "/";
+	Tcl_Obj* of_objects;
+	std::vector<std::string> patterns;
+	int i = 1;
+	for (; i < objc; i++) {
+        if (parse_flag(Tcl_GetString(objv[i]), "hierarchical", hierarchical_flag))
+        if (parse_flag(Tcl_GetString(objv[i]), "regexp", regexp_flag)) continue;
+        if (parse_flag(Tcl_GetString(objv[i]), "nocase", nocase_flag)) continue;
+		if (!strcmp(Tcl_GetString(objv[i]), "-hsc")) {
+			separator = Tcl_GetString(objv[++i]);
+			continue;
+		}
+		if (!strcmp(Tcl_GetString(objv[i]), "-of_objects")) {
+			of_objects = objv[++i];
+			continue;
+		}
+		// Onto the next loop
+		break;
+	}
+	for (; i < objc; i++) {
+		patterns.push_back(Tcl_GetString(objv[i]));
+	}
+	log("get_pins patterns:\n");
+	for (auto pat : patterns) {
+		log("\t%s\n", pat.c_str());
+	}
+	(void)hierarchical_flag;
+	(void)regexp_flag;
+	(void)nocase_flag;
+	(void)separator;
+	(void)of_objects;
+	return TCL_OK;
+}
+
+class SDCInterpreter
+{
+private:
+    Tcl_Interp* interp = nullptr;
+public:
+    ~SDCInterpreter() {
+        if (interp)
+            Tcl_DeleteInterp(interp);
+    }
+    static SDCInterpreter& get() {
+        static SDCInterpreter instance;
+        return instance;
+    }
+    Tcl_Interp* fresh_interp() {
+        if (interp)
+            Tcl_DeleteInterp(interp);
+        interp = Tcl_CreateInterp();
+        if (Tcl_Init(interp)!=TCL_OK)
+            log_warning("Tcl_Init() call failed - %s\n",Tcl_ErrnoMsg(Tcl_GetErrno()));
+        Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, NULL, NULL);
+        return interp;
+    }
+};
+
+// Also see TclPass
+struct SdcPass : public Pass {
+	SdcPass() : Pass("sdc", "sniff at some SDC") { }
+	void execute(std::vector<std::string> args, RTLIL::Design *) override {
+		if (args.size() < 2)
+			log_cmd_error("Missing script file.\n");
+
+		std::vector<Tcl_Obj*> script_args;
+		for (auto it = args.begin() + 2; it != args.end(); ++it)
+			script_args.push_back(Tcl_NewStringObj((*it).c_str(), (*it).size()));
+
+		Tcl_Interp *interp = SDCInterpreter::get().fresh_interp();
+		Tcl_Preserve(interp);
+		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argc", 4), NULL, Tcl_NewIntObj(script_args.size()), 0);
+		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv", 4), NULL, Tcl_NewListObj(script_args.size(), script_args.data()), 0);
+		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv0", 5), NULL, Tcl_NewStringObj(args[1].c_str(), args[1].size()), 0);
+
+        std::string stub_path = "+/sdc/stubs.sdc";
+        rewrite_filename(stub_path);
+		if (Tcl_EvalFile(interp, stub_path.c_str()) != TCL_OK)
+            log_cmd_error("SDC interpreter returned an error in stub file: %s\n", Tcl_GetStringResult(interp));
+		if (Tcl_EvalFile(interp, args[1].c_str()) != TCL_OK)
+			log_cmd_error("SDC interpreter returned an error: %s\n", Tcl_GetStringResult(interp));
+		Tcl_Release(interp);
+	}
+} SdcPass;
+
+YOSYS_NAMESPACE_END
diff --git a/passes/cmds/stubs.sdc b/passes/cmds/stubs.sdc
new file mode 100644
index 000000000..bf41c4620
--- /dev/null
+++ b/passes/cmds/stubs.sdc
@@ -0,0 +1 @@
+proc set_false_path {args} {}
\ No newline at end of file

From c1c6ec12662c7a3330910f035c647fe6bce2df42 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 27 May 2025 11:33:32 +0200
Subject: [PATCH 883/931] sdc: stubs SDC commands supported by Vivado

---
 passes/cmds/stubs.sdc | 106 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 105 insertions(+), 1 deletion(-)

diff --git a/passes/cmds/stubs.sdc b/passes/cmds/stubs.sdc
index bf41c4620..9f5d03b87 100644
--- a/passes/cmds/stubs.sdc
+++ b/passes/cmds/stubs.sdc
@@ -1 +1,105 @@
-proc set_false_path {args} {}
\ No newline at end of file
+proc stub {function_name} {
+    proc $function_name {args} {}
+}
+
+# Vivado UG903
+stub add_cells_to_pblock
+stub add_to_power_rail
+stub all_clocks
+stub all_cpus
+stub all_dsps
+stub all_fanin
+stub all_fanout
+stub all_ffs
+stub all_hsios
+stub all_inputs
+stub all_latches
+stub all_outputs
+stub all_rams
+stub all_registers
+stub connect_debug_port
+stub create_clock
+stub create_debug_core
+stub create_debug_port
+stub create_generated_clock
+stub create_macro
+stub create_pblock
+stub create_power_rail
+stub create_property
+stub create_waiver
+stub current_design
+stub current_instance
+stub delete_macros
+stub delete_pblock
+stub delete_power_rails
+stub endgroup
+stub get_bel_pins
+stub get_bels
+stub get_cells
+stub get_clocks
+stub get_debug_cores
+stub get_debug_ports
+stub get_generated_clocks
+stub get_hierarchy_separator
+stub get_iobanks
+stub get_macros
+stub get_nets
+stub get_nodes
+stub get_package_pins
+stub get_path_groups
+stub get_pblocks
+stub get_pins
+stub get_pips
+stub get_pkgpin_bytegroups
+stub get_pkgpin_nibbles
+stub get_ports
+stub get_power_rails
+stub get_property
+stub get_site_pins
+stub get_site_pips
+stub get_sites
+stub get_slrs
+stub get_speed_models
+stub get_tiles
+stub get_timing_arcs
+stub get_wires
+stub group_path
+stub make_diff_pair_ports
+stub remove_cells_from_pblock
+stub remove_from_power_rail
+stub reset_operating_conditions
+stub reset_switching_activity
+stub resize_pblock
+stub set_bus_skew
+stub set_case_analysis
+stub set_clock_groups
+stub set_clock_latency
+stub set_clock_sense
+stub set_clock_uncertainty
+stub set_data_check
+stub set_disable_timing
+stub set_external_delay
+stub set_false_path
+stub set_hierarchy_separator
+stub set_input_delay
+stub set_input_jitter
+stub set_load
+stub set_logic_dc
+stub set_logic_one
+stub set_logic_unconnected
+stub set_logic_zero
+stub set_max_delay
+stub set_max_time_borrow
+stub set_min_delay
+stub set_multicycle_path
+stub set_operating_conditions
+stub set_output_delay
+stub set_package_pin_val
+stub set_power_opt
+stub set_propagated_clock
+stub set_property
+stub set_switching_activity
+stub set_system_jitter
+stub set_units
+stub startgroup
+stub update_macro

From c26aa3186de8b7ccb9b27985580790b441fc6ff7 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 27 May 2025 17:14:23 +0200
Subject: [PATCH 884/931] sdc: collect design objects

---
 passes/cmds/sdc.cc    | 202 +++++++++++++++++++++++++++++++++---------
 passes/cmds/stubs.sdc |  14 +--
 tests/various/sdc.sdc |   5 ++
 3 files changed, 174 insertions(+), 47 deletions(-)
 create mode 100644 tests/various/sdc.sdc

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index 539b349f7..0343c6b09 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -3,6 +3,7 @@
 #include "kernel/rtlil.h"
 #include "kernel/log.h"
 #include <tcl.h>
+#include <list>
 
 
 USING_YOSYS_NAMESPACE
@@ -10,17 +11,22 @@ PRIVATE_NAMESPACE_BEGIN
 
 template<typename T>
 static bool parse_flag(char* arg, const char* flag_name, T& flag_var) {
-    std::string expected = std::string("-") + flag_name;
-    if (expected == arg) {
-        flag_var = true;
-        return true;
-    }
-    return false;
+	std::string expected = std::string("-") + flag_name;
+	if (expected == arg) {
+		flag_var = true;
+		return true;
+	}
+	return false;
 }
 
+// TODO return values like json_to_tcl on result.json?
+// TODO vectors
+// TODO cell arrays?
+
 static int sdc_get_pins_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
 {
 	(void)interp;
+	// When this flag is present, the search for the pattern is made in all positions in the hierarchy.
 	bool hierarchical_flag = false;
 	bool regexp_flag = false;
 	bool nocase_flag = false;
@@ -29,9 +35,10 @@ static int sdc_get_pins_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj* c
 	std::vector<std::string> patterns;
 	int i = 1;
 	for (; i < objc; i++) {
-        if (parse_flag(Tcl_GetString(objv[i]), "hierarchical", hierarchical_flag))
-        if (parse_flag(Tcl_GetString(objv[i]), "regexp", regexp_flag)) continue;
-        if (parse_flag(Tcl_GetString(objv[i]), "nocase", nocase_flag)) continue;
+		if (parse_flag(Tcl_GetString(objv[i]), "hierarchical", hierarchical_flag)) continue;
+		if (parse_flag(Tcl_GetString(objv[i]), "hier", hierarchical_flag)) continue;
+		if (parse_flag(Tcl_GetString(objv[i]), "regexp", regexp_flag)) continue;
+		if (parse_flag(Tcl_GetString(objv[i]), "nocase", nocase_flag)) continue;
 		if (!strcmp(Tcl_GetString(objv[i]), "-hsc")) {
 			separator = Tcl_GetString(objv[++i]);
 			continue;
@@ -53,56 +60,167 @@ static int sdc_get_pins_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj* c
 	(void)hierarchical_flag;
 	(void)regexp_flag;
 	(void)nocase_flag;
-	(void)separator;
 	(void)of_objects;
+	if (separator != "/") {
+		Tcl_SetObjResult(interp, Tcl_NewStringObj("Only '/' accepted as separator", -1));
+		return TCL_ERROR;
+	}
+	return TCL_OK;
+}
+
+static int sdc_get_ports_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
+{
+	(void)interp;
+	bool regexp_flag = false;
+	bool nocase_flag = false;
+	std::vector<std::string> patterns;
+	int i = 1;
+	for (; i < objc; i++) {
+		if (parse_flag(Tcl_GetString(objv[i]), "regexp", regexp_flag)) continue;
+		if (parse_flag(Tcl_GetString(objv[i]), "nocase", nocase_flag)) continue;
+		// Onto the next loop
+		break;
+	}
+	for (; i < objc; i++) {
+		patterns.push_back(Tcl_GetString(objv[i]));
+	}
+	log("get_ports patterns:\n");
+	for (auto pat : patterns) {
+		log("\t%s\n", pat.c_str());
+	}
+	(void)regexp_flag;
+	(void)nocase_flag;
 	return TCL_OK;
 }
 
 class SDCInterpreter
 {
 private:
-    Tcl_Interp* interp = nullptr;
+	Tcl_Interp* interp = nullptr;
 public:
-    ~SDCInterpreter() {
-        if (interp)
-            Tcl_DeleteInterp(interp);
-    }
-    static SDCInterpreter& get() {
-        static SDCInterpreter instance;
-        return instance;
-    }
-    Tcl_Interp* fresh_interp() {
-        if (interp)
-            Tcl_DeleteInterp(interp);
-        interp = Tcl_CreateInterp();
-        if (Tcl_Init(interp)!=TCL_OK)
-            log_warning("Tcl_Init() call failed - %s\n",Tcl_ErrnoMsg(Tcl_GetErrno()));
-        Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, NULL, NULL);
-        return interp;
-    }
+	~SDCInterpreter() {
+		if (interp)
+			Tcl_DeleteInterp(interp);
+	}
+	static SDCInterpreter& get() {
+		static SDCInterpreter instance;
+		return instance;
+	}
+	Tcl_Interp* fresh_interp() {
+		if (interp)
+			Tcl_DeleteInterp(interp);
+		interp = Tcl_CreateInterp();
+		if (Tcl_Init(interp)!=TCL_OK)
+			log_warning("Tcl_Init() call failed - %s\n",Tcl_ErrnoMsg(Tcl_GetErrno()));
+		Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, NULL, NULL);
+		Tcl_CreateObjCommand(interp, "get_ports", sdc_get_ports_cmd, NULL, NULL);
+		return interp;
+	}
+};
+
+struct SdcObjects {
+	std::vector<std::string> ports;
+	std::vector<std::pair<std::string, Cell*>> cells;
+	std::vector<std::pair<std::string, Cell*>> pins;
+	std::vector<std::pair<std::string, Wire*>> nets;
+
+	void sniff_module(std::list<std::string>& hierarchy, Module* mod) {
+		log_debug("sniffing module %s\n", mod->name.c_str());
+
+		std::string prefix;
+		for (auto mod_name : hierarchy) {
+			if (prefix.length())
+				prefix += "/"; // TODO seperator?
+			prefix += mod_name;
+		}
+
+		for (auto* wire : mod->wires()) {
+			std::string name = wire->name.str();
+			log_assert(name.length());
+			// TODO: really skip internal wires?
+			if (name[0] == '$')
+				continue;
+			name = name.substr(1);
+			std::string path = prefix;
+			if (path.length())
+				path += "/";
+			path += name;
+			nets.push_back(std::make_pair(path, wire));
+		}
+
+		for (auto* cell : mod->cells()) {
+			std::string name = cell->name.str();
+			// TODO: really skip internal cells?
+			if (name[0] == '$')
+				continue;
+			name = name.substr(1);
+			std::string path = prefix;
+			if (path.length())
+				path += "/";
+			path += name;
+			cells.push_back(std::make_pair(path, cell));
+			for (auto pin : cell->connections()) {
+				std::string pin_name = path + "/" + pin.first.str().substr(1);
+				pins.push_back(std::make_pair(pin_name, cell));
+			}
+			if (auto sub_mod = mod->design->module(cell->type)) {
+				hierarchy.push_back(name);
+				sniff_module(hierarchy, sub_mod);
+				hierarchy.pop_back();
+			}
+		}
+	}
+	SdcObjects(Design* design) {
+		Module* top = design->top_module();
+		if (!top)
+			log_error("Top module couldn't be determined. Check 'top' attribute usage");
+		for (auto port : top->ports) {
+			ports.push_back(port.str().substr(1));
+		}
+		std::list<std::string> hierarchy{};
+		sniff_module(hierarchy, top);
+	}
+	void dump() {
+		log("Dumping detected design objects visible to SDC constraints\n");
+		log("Ports:\n");
+		for (auto name : ports) {
+			log("\t%s\n", name.c_str());
+		}
+		log("Cells:\n");
+		for (auto [name, cell] : cells) {
+			(void)cell;
+			log("\t%s\n", name.c_str());
+		}
+		log("Pins:\n");
+		for (auto [name, pin] : pins) {
+			(void)pin;
+			log("\t%s\n", name.c_str());
+		}
+		log("Nets:\n");
+		for (auto [name, net] : nets) {
+			(void)net;
+			log("\t%s\n", name.c_str());
+		}
+		log("\n");
+	}
 };
 
 // Also see TclPass
 struct SdcPass : public Pass {
+	// TODO help
 	SdcPass() : Pass("sdc", "sniff at some SDC") { }
-	void execute(std::vector<std::string> args, RTLIL::Design *) override {
+	void execute(std::vector<std::string> args, RTLIL::Design *design) override {
 		if (args.size() < 2)
-			log_cmd_error("Missing script file.\n");
-
-		std::vector<Tcl_Obj*> script_args;
-		for (auto it = args.begin() + 2; it != args.end(); ++it)
-			script_args.push_back(Tcl_NewStringObj((*it).c_str(), (*it).size()));
-
+			log_cmd_error("Missing SDC file.\n");
+		// TODO optional extra stub file
 		Tcl_Interp *interp = SDCInterpreter::get().fresh_interp();
 		Tcl_Preserve(interp);
-		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argc", 4), NULL, Tcl_NewIntObj(script_args.size()), 0);
-		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv", 4), NULL, Tcl_NewListObj(script_args.size(), script_args.data()), 0);
-		Tcl_ObjSetVar2(interp, Tcl_NewStringObj("argv0", 5), NULL, Tcl_NewStringObj(args[1].c_str(), args[1].size()), 0);
-
-        std::string stub_path = "+/sdc/stubs.sdc";
-        rewrite_filename(stub_path);
+		std::string stub_path = "+/sdc/stubs.sdc";
+		rewrite_filename(stub_path);
+		SdcObjects objects(design);
+		objects.dump();
 		if (Tcl_EvalFile(interp, stub_path.c_str()) != TCL_OK)
-            log_cmd_error("SDC interpreter returned an error in stub file: %s\n", Tcl_GetStringResult(interp));
+			log_cmd_error("SDC interpreter returned an error in stub file: %s\n", Tcl_GetStringResult(interp));
 		if (Tcl_EvalFile(interp, args[1].c_str()) != TCL_OK)
 			log_cmd_error("SDC interpreter returned an error: %s\n", Tcl_GetStringResult(interp));
 		Tcl_Release(interp);
diff --git a/passes/cmds/stubs.sdc b/passes/cmds/stubs.sdc
index 9f5d03b87..8659ca392 100644
--- a/passes/cmds/stubs.sdc
+++ b/passes/cmds/stubs.sdc
@@ -1,7 +1,16 @@
+# with Tcl's eager evaluation, we will still eval args if they're unused by a stub
 proc stub {function_name} {
     proc $function_name {args} {}
 }
 
+# OpenROAD
+proc get_name {thing} {
+    return thing
+}
+proc get_full_name {thing} {
+    return thing
+}
+
 # Vivado UG903
 stub add_cells_to_pblock
 stub add_to_power_rail
@@ -35,7 +44,6 @@ stub delete_power_rails
 stub endgroup
 stub get_bel_pins
 stub get_bels
-stub get_cells
 stub get_clocks
 stub get_debug_cores
 stub get_debug_ports
@@ -43,16 +51,13 @@ stub get_generated_clocks
 stub get_hierarchy_separator
 stub get_iobanks
 stub get_macros
-stub get_nets
 stub get_nodes
 stub get_package_pins
 stub get_path_groups
 stub get_pblocks
-stub get_pins
 stub get_pips
 stub get_pkgpin_bytegroups
 stub get_pkgpin_nibbles
-stub get_ports
 stub get_power_rails
 stub get_property
 stub get_site_pins
@@ -62,7 +67,6 @@ stub get_slrs
 stub get_speed_models
 stub get_tiles
 stub get_timing_arcs
-stub get_wires
 stub group_path
 stub make_diff_pair_ports
 stub remove_cells_from_pblock
diff --git a/tests/various/sdc.sdc b/tests/various/sdc.sdc
new file mode 100644
index 000000000..69efcb40a
--- /dev/null
+++ b/tests/various/sdc.sdc
@@ -0,0 +1,5 @@
+puts "SDC constraints file says hello from arbitrary Tcl execution"
+set_false_path -from [get_pins s1/sa] -to [get_pins s1/sb]
+puts "This should print something:"
+puts [get_ports {slink_clk_o slink_*_o}]
+puts "Did it?"
\ No newline at end of file

From 9a3c7f70adaa1b9f7bebde3befd82701324a1804 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 27 May 2025 17:47:26 +0200
Subject: [PATCH 885/931] sdc: stubs SDC commands supported by OpenSTA

---
 passes/cmds/stubs.sdc | 125 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/passes/cmds/stubs.sdc b/passes/cmds/stubs.sdc
index 8659ca392..ea1600139 100644
--- a/passes/cmds/stubs.sdc
+++ b/passes/cmds/stubs.sdc
@@ -107,3 +107,128 @@ stub set_system_jitter
 stub set_units
 stub startgroup
 stub update_macro
+
+# OpenSTA
+stub source_
+stub write_sdc
+stub current_instance
+stub set_hierarchy_separator
+stub check_path_divider
+stub set_units
+stub check_unit
+stub unit_prefix_scale
+stub check_unit_scale
+stub all_clocks
+stub all_inputs
+stub all_outputs
+stub all_registers
+stub current_design
+stub filter_objs
+stub check_nocase_flag
+stub find_liberty_libraries_matching
+stub create_clock
+stub delete_clock
+stub create_generated_clock
+stub delete_generated_clock
+stub remove_gclk_cmd
+stub group_path
+stub check_exception_pins
+stub set_clock_gating_check
+stub set_clock_gating_check1
+stub set_clock_groups
+stub unset_clock_groups
+stub unset_clk_groups_cmd
+stub set_clock_latency
+stub unset_clock_latency
+stub unset_clk_latency_cmd
+stub set_sense
+stub set_clock_sense
+stub set_clock_sense_cmd1
+stub set_clock_transition
+stub unset_clock_transition
+stub set_clock_uncertainty
+stub unset_clock_uncertainty
+stub unset_clk_uncertainty_cmd
+stub set_data_check
+stub unset_data_check
+stub unset_data_checks_cmd
+stub set_disable_timing
+stub set_disable_timing_instance
+stub parse_disable_inst_ports
+stub port_members
+stub set_disable_timing_cell
+stub parse_disable_cell_ports
+stub unset_disable_timing
+stub unset_disable_cmd
+stub unset_disable_timing_cell
+stub unset_disable_timing_instance
+stub set_false_path
+stub set_ideal_latency
+stub set_ideal_network
+stub set_ideal_transition
+stub set_input_delay
+stub set_port_delay
+stub unset_input_delay
+stub set_max_delay
+stub set_path_delay
+stub set_max_time_borrow
+stub set_min_delay
+stub set_min_pulse_width
+stub set_multicycle_path
+stub unset_path_exceptions
+stub unset_path_exceptions_cmd
+stub set_output_delay
+stub unset_output_delay
+stub unset_port_delay
+stub set_propagated_clock
+stub unset_propagated_clock
+stub set_case_analysis
+stub unset_case_analysis
+stub set_drive
+stub set_driving_cell
+stub port_direction_any_output
+stub set_fanout_load
+stub set_input_transition
+stub set_load
+stub set_logic_dc
+stub set_logic_value
+stub set_logic_one
+stub set_logic_zero
+stub set_max_area
+stub set_max_capacitance
+stub set_capacitance_limit
+stub set_max_fanout
+stub set_fanout_limit
+stub set_max_transition
+stub set_port_fanout_number
+stub set_resistance
+stub set_timing_derate
+stub unset_timing_derate
+stub parse_from_arg
+stub parse_thrus_arg
+stub parse_to_arg
+stub parse_to_arg1
+stub delete_from_thrus_to
+stub parse_comment_key
+stub set_min_capacitance
+stub set_operating_conditions
+stub parse_op_cond
+stub parse_op_cond_analysis_type
+stub set_wire_load_min_block_size
+stub set_wire_load_mode
+stub set_wire_load_model
+stub set_wire_load_selection_group
+stub set_voltage
+stub create_voltage_area
+stub set_level_shifter_strategy
+stub set_level_shifter_threshold
+stub set_max_dynamic_power
+stub set_max_leakage_power
+stub define_corners
+stub set_pvt
+stub set_pvt_min_max
+stub default_operating_conditions
+stub cell_regexp
+stub cell_regexp_hsc
+stub port_regexp
+stub port_regexp_hsc
\ No newline at end of file

From dc48ceadd9510bbb7b628901b1badf41400f264c Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 27 May 2025 18:00:30 +0200
Subject: [PATCH 886/931] sdc: collect strictly matching objects

---
 passes/cmds/sdc.cc    | 245 +++++++++++++++++++++++++-----------------
 tests/various/sdc.sdc |   2 +-
 2 files changed, 146 insertions(+), 101 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index 0343c6b09..4d7347f54 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -9,6 +9,117 @@
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
+
+struct SdcObjects {
+	std::vector<std::string> design_ports;
+	std::vector<std::pair<std::string, Cell*>> design_cells;
+	std::vector<std::pair<std::string, Cell*>> design_pins;
+	std::vector<std::pair<std::string, Wire*>> design_nets;
+
+	pool<std::string> constrained_ports;
+	pool<std::pair<std::string, Cell*>> constrained_cells;
+	pool<std::pair<std::string, Cell*>> constrained_pins;
+	pool<std::pair<std::string, Wire*>> constrained_nets;
+
+	void sniff_module(std::list<std::string>& hierarchy, Module* mod) {
+		std::string prefix;
+		for (auto mod_name : hierarchy) {
+			if (prefix.length())
+				prefix += "/"; // TODO seperator?
+			prefix += mod_name;
+		}
+
+		for (auto* wire : mod->wires()) {
+			std::string name = wire->name.str();
+			log_assert(name.length());
+			// TODO: really skip internal wires?
+			if (name[0] == '$')
+				continue;
+			name = name.substr(1);
+			std::string path = prefix;
+			if (path.length())
+				path += "/";
+			path += name;
+			design_nets.push_back(std::make_pair(path, wire));
+		}
+
+		for (auto* cell : mod->cells()) {
+			std::string name = cell->name.str();
+			// TODO: really skip internal cells?
+			if (name[0] == '$')
+				continue;
+			name = name.substr(1);
+			std::string path = prefix;
+			if (path.length())
+				path += "/";
+			path += name;
+			design_cells.push_back(std::make_pair(path, cell));
+			for (auto pin : cell->connections()) {
+				std::string pin_name = path + "/" + pin.first.str().substr(1);
+				design_pins.push_back(std::make_pair(pin_name, cell));
+			}
+			if (auto sub_mod = mod->design->module(cell->type)) {
+				hierarchy.push_back(name);
+				sniff_module(hierarchy, sub_mod);
+				hierarchy.pop_back();
+			}
+		}
+	}
+	SdcObjects(Design* design) {
+		Module* top = design->top_module();
+		if (!top)
+			log_error("Top module couldn't be determined. Check 'top' attribute usage");
+		for (auto port : top->ports) {
+			design_ports.push_back(port.str().substr(1));
+		}
+		std::list<std::string> hierarchy{};
+		sniff_module(hierarchy, top);
+	}
+	~SdcObjects() = default;
+	void dump() {
+		log("Design ports:\n");
+		for (auto name : design_ports) {
+			log("\t%s\n", name.c_str());
+		}
+		log("Design cells:\n");
+		for (auto [name, cell] : design_cells) {
+			(void)cell;
+			log("\t%s\n", name.c_str());
+		}
+		log("Design pins:\n");
+		for (auto [name, pin] : design_pins) {
+			(void)pin;
+			log("\t%s\n", name.c_str());
+		}
+		log("Design nets:\n");
+		for (auto [name, net] : design_nets) {
+			(void)net;
+			log("\t%s\n", name.c_str());
+		}
+		log("\n");
+		log("Constrained ports:\n");
+		for (auto name : constrained_ports) {
+			log("\t%s\n", name.c_str());
+		}
+		log("Constrained cells:\n");
+		for (auto [name, cell] : constrained_cells) {
+			(void)cell;
+			log("\t%s\n", name.c_str());
+		}
+		log("Constrained pins:\n");
+		for (auto [name, pin] : constrained_pins) {
+			(void)pin;
+			log("\t%s\n", name.c_str());
+		}
+		log("Constrained nets:\n");
+		for (auto [name, net] : constrained_nets) {
+			(void)net;
+			log("\t%s\n", name.c_str());
+		}
+		log("\n");
+	}
+};
+
 template<typename T>
 static bool parse_flag(char* arg, const char* flag_name, T& flag_var) {
 	std::string expected = std::string("-") + flag_name;
@@ -23,9 +134,10 @@ static bool parse_flag(char* arg, const char* flag_name, T& flag_var) {
 // TODO vectors
 // TODO cell arrays?
 
-static int sdc_get_pins_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
+static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
 {
 	(void)interp;
+	auto* objects = (SdcObjects*)data;
 	// When this flag is present, the search for the pattern is made in all positions in the hierarchy.
 	bool hierarchical_flag = false;
 	bool regexp_flag = false;
@@ -53,9 +165,16 @@ static int sdc_get_pins_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj* c
 	for (; i < objc; i++) {
 		patterns.push_back(Tcl_GetString(objv[i]));
 	}
-	log("get_pins patterns:\n");
 	for (auto pat : patterns) {
-		log("\t%s\n", pat.c_str());
+		bool found = false;
+		for (auto [name, pin] : objects->design_pins) {
+			if (name == pat) {
+				found = true;
+				objects->constrained_pins.insert(std::make_pair(name, pin));
+			}
+		}
+		if (!found)
+			log_warning("No matches in design for pattern %s\n", pat.c_str());
 	}
 	(void)hierarchical_flag;
 	(void)regexp_flag;
@@ -68,9 +187,10 @@ static int sdc_get_pins_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj* c
 	return TCL_OK;
 }
 
-static int sdc_get_ports_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
+static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
 {
 	(void)interp;
+	auto* objects = (SdcObjects*)data;
 	bool regexp_flag = false;
 	bool nocase_flag = false;
 	std::vector<std::string> patterns;
@@ -84,20 +204,29 @@ static int sdc_get_ports_cmd(ClientData, Tcl_Interp *interp, int objc, Tcl_Obj*
 	for (; i < objc; i++) {
 		patterns.push_back(Tcl_GetString(objv[i]));
 	}
-	log("get_ports patterns:\n");
 	for (auto pat : patterns) {
-		log("\t%s\n", pat.c_str());
+		bool found = false;
+		for (auto name : objects->design_ports) {
+			if (name == pat) {
+				found = true;
+				objects->constrained_ports.insert(name);
+			}
+		}
+		if (!found)
+			log_warning("No matches in design for pattern %s\n", pat.c_str());
 	}
 	(void)regexp_flag;
 	(void)nocase_flag;
 	return TCL_OK;
 }
 
+
 class SDCInterpreter
 {
 private:
 	Tcl_Interp* interp = nullptr;
 public:
+	std::unique_ptr<SdcObjects> objects;
 	~SDCInterpreter() {
 		if (interp)
 			Tcl_DeleteInterp(interp);
@@ -106,105 +235,21 @@ public:
 		static SDCInterpreter instance;
 		return instance;
 	}
-	Tcl_Interp* fresh_interp() {
+	Tcl_Interp* fresh_interp(Design* design) {
 		if (interp)
 			Tcl_DeleteInterp(interp);
+
 		interp = Tcl_CreateInterp();
 		if (Tcl_Init(interp)!=TCL_OK)
-			log_warning("Tcl_Init() call failed - %s\n",Tcl_ErrnoMsg(Tcl_GetErrno()));
-		Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, NULL, NULL);
-		Tcl_CreateObjCommand(interp, "get_ports", sdc_get_ports_cmd, NULL, NULL);
+			log_error("Tcl_Init() call failed - %s\n",Tcl_ErrnoMsg(Tcl_GetErrno()));
+
+		objects = std::make_unique<SdcObjects>(design);
+		Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, (ClientData) objects.get(), NULL);
+		Tcl_CreateObjCommand(interp, "get_ports", sdc_get_ports_cmd, (ClientData) objects.get(), NULL);
 		return interp;
 	}
 };
 
-struct SdcObjects {
-	std::vector<std::string> ports;
-	std::vector<std::pair<std::string, Cell*>> cells;
-	std::vector<std::pair<std::string, Cell*>> pins;
-	std::vector<std::pair<std::string, Wire*>> nets;
-
-	void sniff_module(std::list<std::string>& hierarchy, Module* mod) {
-		log_debug("sniffing module %s\n", mod->name.c_str());
-
-		std::string prefix;
-		for (auto mod_name : hierarchy) {
-			if (prefix.length())
-				prefix += "/"; // TODO seperator?
-			prefix += mod_name;
-		}
-
-		for (auto* wire : mod->wires()) {
-			std::string name = wire->name.str();
-			log_assert(name.length());
-			// TODO: really skip internal wires?
-			if (name[0] == '$')
-				continue;
-			name = name.substr(1);
-			std::string path = prefix;
-			if (path.length())
-				path += "/";
-			path += name;
-			nets.push_back(std::make_pair(path, wire));
-		}
-
-		for (auto* cell : mod->cells()) {
-			std::string name = cell->name.str();
-			// TODO: really skip internal cells?
-			if (name[0] == '$')
-				continue;
-			name = name.substr(1);
-			std::string path = prefix;
-			if (path.length())
-				path += "/";
-			path += name;
-			cells.push_back(std::make_pair(path, cell));
-			for (auto pin : cell->connections()) {
-				std::string pin_name = path + "/" + pin.first.str().substr(1);
-				pins.push_back(std::make_pair(pin_name, cell));
-			}
-			if (auto sub_mod = mod->design->module(cell->type)) {
-				hierarchy.push_back(name);
-				sniff_module(hierarchy, sub_mod);
-				hierarchy.pop_back();
-			}
-		}
-	}
-	SdcObjects(Design* design) {
-		Module* top = design->top_module();
-		if (!top)
-			log_error("Top module couldn't be determined. Check 'top' attribute usage");
-		for (auto port : top->ports) {
-			ports.push_back(port.str().substr(1));
-		}
-		std::list<std::string> hierarchy{};
-		sniff_module(hierarchy, top);
-	}
-	void dump() {
-		log("Dumping detected design objects visible to SDC constraints\n");
-		log("Ports:\n");
-		for (auto name : ports) {
-			log("\t%s\n", name.c_str());
-		}
-		log("Cells:\n");
-		for (auto [name, cell] : cells) {
-			(void)cell;
-			log("\t%s\n", name.c_str());
-		}
-		log("Pins:\n");
-		for (auto [name, pin] : pins) {
-			(void)pin;
-			log("\t%s\n", name.c_str());
-		}
-		log("Nets:\n");
-		for (auto [name, net] : nets) {
-			(void)net;
-			log("\t%s\n", name.c_str());
-		}
-		log("\n");
-	}
-};
-
 // Also see TclPass
 struct SdcPass : public Pass {
 	// TODO help
@@ -213,16 +258,16 @@ struct SdcPass : public Pass {
 		if (args.size() < 2)
 			log_cmd_error("Missing SDC file.\n");
 		// TODO optional extra stub file
-		Tcl_Interp *interp = SDCInterpreter::get().fresh_interp();
+		SDCInterpreter& sdc = SDCInterpreter::get();
+		Tcl_Interp *interp = sdc.fresh_interp(design);
 		Tcl_Preserve(interp);
 		std::string stub_path = "+/sdc/stubs.sdc";
 		rewrite_filename(stub_path);
-		SdcObjects objects(design);
-		objects.dump();
 		if (Tcl_EvalFile(interp, stub_path.c_str()) != TCL_OK)
 			log_cmd_error("SDC interpreter returned an error in stub file: %s\n", Tcl_GetStringResult(interp));
 		if (Tcl_EvalFile(interp, args[1].c_str()) != TCL_OK)
 			log_cmd_error("SDC interpreter returned an error: %s\n", Tcl_GetStringResult(interp));
+		sdc.objects->dump();
 		Tcl_Release(interp);
 	}
 } SdcPass;
diff --git a/tests/various/sdc.sdc b/tests/various/sdc.sdc
index 69efcb40a..2143b34d7 100644
--- a/tests/various/sdc.sdc
+++ b/tests/various/sdc.sdc
@@ -1,5 +1,5 @@
 puts "SDC constraints file says hello from arbitrary Tcl execution"
 set_false_path -from [get_pins s1/sa] -to [get_pins s1/sb]
 puts "This should print something:"
-puts [get_ports {slink_clk_o slink_*_o}]
+puts [get_ports a b]
 puts "Did it?"
\ No newline at end of file

From 834125a0763be101cac5bcd3242f89ab09328055 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 27 May 2025 18:29:59 +0200
Subject: [PATCH 887/931] sdc: return resolved patterns

---
 passes/cmds/sdc.cc | 62 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 8 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index 4d7347f54..dcbd60ce5 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -4,6 +4,7 @@
 #include "kernel/log.h"
 #include <tcl.h>
 #include <list>
+#include <regex>
 
 
 USING_YOSYS_NAMESPACE
@@ -77,6 +78,14 @@ struct SdcObjects {
 	}
 	~SdcObjects() = default;
 	void dump() {
+		std::sort(design_ports.begin(), design_ports.end());
+		std::sort(design_cells.begin(), design_cells.end());
+		std::sort(design_pins.begin(), design_pins.end());
+		std::sort(design_nets.begin(), design_nets.end());
+		constrained_ports.sort();
+		constrained_cells.sort();
+		constrained_pins.sort();
+		constrained_nets.sort();
 		log("Design ports:\n");
 		for (auto name : design_ports) {
 			log("\t%s\n", name.c_str());
@@ -130,9 +139,27 @@ static bool parse_flag(char* arg, const char* flag_name, T& flag_var) {
 	return false;
 }
 
-// TODO return values like json_to_tcl on result.json?
 // TODO vectors
 // TODO cell arrays?
+struct MatchConfig {
+	enum MatchMode {
+		WILDCARD,
+		REGEX,
+	} match;
+	bool match_case;
+	enum HierMode {
+		FLAT,
+		TREE,
+	} hier;
+	MatchConfig(bool regexp_flag, bool nocase_flag, bool hierarchical_flag) :
+		match(regexp_flag ? REGEX : WILDCARD),
+		match_case(!nocase_flag),
+		hier(hierarchical_flag ? FLAT : TREE) { }
+};
+
+static bool matches(std::string name, const std::string& pat, const MatchConfig& config) {
+	return name == pat;
+}
 
 static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
 {
@@ -165,25 +192,36 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 	for (; i < objc; i++) {
 		patterns.push_back(Tcl_GetString(objv[i]));
 	}
+
+	MatchConfig config(regexp_flag, nocase_flag, hierarchical_flag);
+	std::vector<std::pair<std::string, Cell*>> resolved;
 	for (auto pat : patterns) {
 		bool found = false;
 		for (auto [name, pin] : objects->design_pins) {
-			if (name == pat) {
+			if (matches(name, pat, config)) {
 				found = true;
-				objects->constrained_pins.insert(std::make_pair(name, pin));
+				resolved.push_back(std::make_pair(name, pin));
 			}
 		}
 		if (!found)
-			log_warning("No matches in design for pattern %s\n", pat.c_str());
+			log_warning("No matches in design for pin %s\n", pat.c_str());
+	}
+	Tcl_Obj *result = Tcl_NewListObj(resolved.size(), nullptr);
+	for (auto obj : resolved) {
+		Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(obj.first.c_str(), obj.first.size()));
+		objects->constrained_pins.insert(obj);
 	}
 	(void)hierarchical_flag;
 	(void)regexp_flag;
 	(void)nocase_flag;
 	(void)of_objects;
+
 	if (separator != "/") {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj("Only '/' accepted as separator", -1));
+		Tcl_SetResult(interp, (char *)"Only '/' accepted as separator", TCL_STATIC);
 		return TCL_ERROR;
 	}
+
+	Tcl_SetObjResult(interp, result);
 	return TCL_OK;
 }
 
@@ -204,19 +242,27 @@ static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_
 	for (; i < objc; i++) {
 		patterns.push_back(Tcl_GetString(objv[i]));
 	}
+	MatchConfig config(regexp_flag, nocase_flag, false);
+	std::vector<std::string> resolved;
 	for (auto pat : patterns) {
 		bool found = false;
 		for (auto name : objects->design_ports) {
-			if (name == pat) {
+			if (matches(name, pat, config)) {
 				found = true;
-				objects->constrained_ports.insert(name);
+				resolved.push_back(name);
 			}
 		}
 		if (!found)
-			log_warning("No matches in design for pattern %s\n", pat.c_str());
+			log_warning("No matches in design for port %s\n", pat.c_str());
+	}
+	Tcl_Obj *result = Tcl_NewListObj(resolved.size(), nullptr);
+	for (auto obj : resolved) {
+		Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(obj.c_str(), obj.size()));
+		objects->constrained_ports.insert(obj);
 	}
 	(void)regexp_flag;
 	(void)nocase_flag;
+	Tcl_SetObjResult(interp, result);
 	return TCL_OK;
 }
 

From 420a083d9b0dbd46e1dd7602a54ee88d8907b9e8 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 10 Jun 2025 16:34:04 +0200
Subject: [PATCH 888/931] sdc: simple mode, remove per-tool stubs

---
 passes/cmds/sdc.cc    | 180 +++++++++++++++++++++++++------
 passes/cmds/stubs.sdc | 241 +++---------------------------------------
 2 files changed, 160 insertions(+), 261 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index dcbd60ce5..b01cbe025 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -5,6 +5,7 @@
 #include <tcl.h>
 #include <list>
 #include <regex>
+#include <optional>
 
 
 USING_YOSYS_NAMESPACE
@@ -12,6 +13,11 @@ PRIVATE_NAMESPACE_BEGIN
 
 
 struct SdcObjects {
+	enum CollectMode {
+		SimpleGetter,
+		FullGetter,
+		FullConstraint,
+	} collect_mode;
 	std::vector<std::string> design_ports;
 	std::vector<std::pair<std::string, Cell*>> design_cells;
 	std::vector<std::pair<std::string, Cell*>> design_pins;
@@ -86,26 +92,26 @@ struct SdcObjects {
 		constrained_cells.sort();
 		constrained_pins.sort();
 		constrained_nets.sort();
-		log("Design ports:\n");
-		for (auto name : design_ports) {
-			log("\t%s\n", name.c_str());
-		}
-		log("Design cells:\n");
-		for (auto [name, cell] : design_cells) {
-			(void)cell;
-			log("\t%s\n", name.c_str());
-		}
-		log("Design pins:\n");
-		for (auto [name, pin] : design_pins) {
-			(void)pin;
-			log("\t%s\n", name.c_str());
-		}
-		log("Design nets:\n");
-		for (auto [name, net] : design_nets) {
-			(void)net;
-			log("\t%s\n", name.c_str());
-		}
-		log("\n");
+		// log("Design ports:\n");
+		// for (auto name : design_ports) {
+		// 	log("\t%s\n", name.c_str());
+		// }
+		// log("Design cells:\n");
+		// for (auto [name, cell] : design_cells) {
+		// 	(void)cell;
+		// 	log("\t%s\n", name.c_str());
+		// }
+		// log("Design pins:\n");
+		// for (auto [name, pin] : design_pins) {
+		// 	(void)pin;
+		// 	log("\t%s\n", name.c_str());
+		// }
+		// log("Design nets:\n");
+		// for (auto [name, net] : design_nets) {
+		// 	(void)net;
+		// 	log("\t%s\n", name.c_str());
+		// }
+		// log("\n");
 		log("Constrained ports:\n");
 		for (auto name : constrained_ports) {
 			log("\t%s\n", name.c_str());
@@ -158,12 +164,13 @@ struct MatchConfig {
 };
 
 static bool matches(std::string name, const std::string& pat, const MatchConfig& config) {
+	(void)config;
+	// TODO implement full mode
 	return name == pat;
 }
 
 static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
 {
-	(void)interp;
 	auto* objects = (SdcObjects*)data;
 	// When this flag is present, the search for the pattern is made in all positions in the hierarchy.
 	bool hierarchical_flag = false;
@@ -192,6 +199,14 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 	for (; i < objc; i++) {
 		patterns.push_back(Tcl_GetString(objv[i]));
 	}
+	if (objects->collect_mode == SdcObjects::CollectMode::SimpleGetter) {
+		if (regexp_flag || hierarchical_flag || nocase_flag || separator != "/" || of_objects) {
+			log_error("get_pins got unexpected flags in simple mode\n");
+		}
+		if (patterns.size() != 1) {
+			log_error("get_pins got unexpected number of patterns in simple mode\n");
+		}
+	}
 
 	MatchConfig config(regexp_flag, nocase_flag, hierarchical_flag);
 	std::vector<std::pair<std::string, Cell*>> resolved;
@@ -209,12 +224,9 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 	Tcl_Obj *result = Tcl_NewListObj(resolved.size(), nullptr);
 	for (auto obj : resolved) {
 		Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(obj.first.c_str(), obj.first.size()));
-		objects->constrained_pins.insert(obj);
+		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
+			objects->constrained_pins.insert(obj);
 	}
-	(void)hierarchical_flag;
-	(void)regexp_flag;
-	(void)nocase_flag;
-	(void)of_objects;
 
 	if (separator != "/") {
 		Tcl_SetResult(interp, (char *)"Only '/' accepted as separator", TCL_STATIC);
@@ -227,7 +239,6 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 
 static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
 {
-	(void)interp;
 	auto* objects = (SdcObjects*)data;
 	bool regexp_flag = false;
 	bool nocase_flag = false;
@@ -242,6 +253,14 @@ static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_
 	for (; i < objc; i++) {
 		patterns.push_back(Tcl_GetString(objv[i]));
 	}
+	if (objects->collect_mode == SdcObjects::CollectMode::SimpleGetter) {
+		if (regexp_flag || nocase_flag) {
+			log_error("get_ports got unexpected flags in simple mode\n");
+		}
+		if (patterns.size() != 1) {
+			log_error("get_ports got unexpected number of patterns in simple mode\n");
+		}
+	}
 	MatchConfig config(regexp_flag, nocase_flag, false);
 	std::vector<std::string> resolved;
 	for (auto pat : patterns) {
@@ -258,14 +277,89 @@ static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_
 	Tcl_Obj *result = Tcl_NewListObj(resolved.size(), nullptr);
 	for (auto obj : resolved) {
 		Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(obj.c_str(), obj.size()));
-		objects->constrained_ports.insert(obj);
+		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
+			objects->constrained_ports.insert(obj);
 	}
-	(void)regexp_flag;
-	(void)nocase_flag;
+
 	Tcl_SetObjResult(interp, result);
 	return TCL_OK;
 }
 
+std::optional<std::tuple<std::string, std::string>> split_at(std::string s)
+{
+	size_t pos = s.find('@');
+	if (pos == std::string::npos)
+		return std::nullopt;
+	return std::make_tuple(s.substr(0, pos), s.substr(pos + 1));
+}
+
+// Whether string or list of strings, apply op to each string
+void apply_args(Tcl_Interp *interp, std::function<void(const char*)> op, Tcl_Obj* obj)
+{
+	int length;
+	Tcl_Obj **value_list;
+	if (Tcl_ListObjGetElements(interp, obj, &length, &value_list) == TCL_OK) {
+		for (int i = 0; i < length; i++) {
+			op(Tcl_GetString(value_list[i]));
+		}
+	} else {
+		op(Tcl_GetString(obj));
+	}
+}
+
+static int ys_track_typed_key_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
+{
+	log("ys_track_typed_key_cmd\n");
+	auto* objects = (SdcObjects*)data;
+	if (objc != 5)
+		log_error("ys_track_typed_key: Unexpected number of arguments: %d (expected 5)\n", objc);
+
+	if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
+		return TCL_OK;
+
+	std::string key_name         = Tcl_GetString(objv[1]);
+	Tcl_Obj* key_value           = objv[2];
+	std::string key_expect_type  = Tcl_GetString(objv[3]);
+	std::string proc_name        = Tcl_GetString(objv[4]);
+
+	auto track_typed = [key_expect_type, objects, proc_name, key_name](const char* str) -> void {
+		auto split = split_at(str);
+		if (!split)
+			log_error("%s: key %s should be a typed SDC object, but is something weird: %s\n",
+				proc_name.c_str(), key_name.c_str(), str);
+
+		if (key_expect_type == "pin") {
+			log("PIN! %s\n", str);
+			bool found = false;
+			for (auto [name, pin] : objects->design_pins) {
+				if (name + "/" + pin->name.str() == str) {
+					found = true;
+					objects->constrained_pins.insert(std::make_pair(name, pin));
+					break; // resolved, expected unique
+				}
+			}
+			if (!found)
+				log_error("%s: pin %s not found\n", proc_name.c_str(), str);
+		} else if (key_expect_type == "port") {
+			bool found = false;
+			for (auto name : objects->design_ports) {
+				if (name == str) {
+					found = true;
+					objects->constrained_ports.insert(name);
+					break; // resolved, expected unique
+				}
+			}
+			if (!found)
+				log_error("%s: port %s not found\n", proc_name.c_str(), str);
+		} else {
+			// TODO
+			log_warning("%s: unsupported type %s\n", proc_name.c_str(), key_expect_type.c_str());
+		}
+	};
+	apply_args(interp, track_typed, key_value);
+	return TCL_OK;
+}
+
 
 class SDCInterpreter
 {
@@ -290,8 +384,10 @@ public:
 			log_error("Tcl_Init() call failed - %s\n",Tcl_ErrnoMsg(Tcl_GetErrno()));
 
 		objects = std::make_unique<SdcObjects>(design);
+		objects->collect_mode = SdcObjects::CollectMode::FullConstraint;
 		Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, (ClientData) objects.get(), NULL);
 		Tcl_CreateObjCommand(interp, "get_ports", sdc_get_ports_cmd, (ClientData) objects.get(), NULL);
+		Tcl_CreateObjCommand(interp, "ys_track_typed_key", ys_track_typed_key_cmd, (ClientData) objects.get(), NULL);
 		return interp;
 	}
 };
@@ -301,17 +397,33 @@ struct SdcPass : public Pass {
 	// TODO help
 	SdcPass() : Pass("sdc", "sniff at some SDC") { }
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override {
-		if (args.size() < 2)
-			log_cmd_error("Missing SDC file.\n");
+		// if (args.size() < 2)
+		// 	log_cmd_error("Missing SDC file.\n");
 		// TODO optional extra stub file
+		size_t argidx;
+		std::vector<std::string> opensta_stubs_paths;
+		for (argidx = 1; argidx < args.size(); argidx++) {
+			if (args[argidx] == "-stubs" && argidx+1 < args.size()) {
+				opensta_stubs_paths.push_back(args[++argidx]);
+				continue;
+			}
+			break;
+		}
+		if (argidx >= args.size())
+			log_cmd_error("Missing SDC file.\n");
+
+		std::string sdc_path = args[argidx];
 		SDCInterpreter& sdc = SDCInterpreter::get();
 		Tcl_Interp *interp = sdc.fresh_interp(design);
 		Tcl_Preserve(interp);
 		std::string stub_path = "+/sdc/stubs.sdc";
 		rewrite_filename(stub_path);
 		if (Tcl_EvalFile(interp, stub_path.c_str()) != TCL_OK)
-			log_cmd_error("SDC interpreter returned an error in stub file: %s\n", Tcl_GetStringResult(interp));
-		if (Tcl_EvalFile(interp, args[1].c_str()) != TCL_OK)
+			log_cmd_error("SDC interpreter returned an error in stub preamble file: %s\n", Tcl_GetStringResult(interp));
+		for (auto path : opensta_stubs_paths)
+			if (Tcl_EvalFile(interp, path.c_str()) != TCL_OK)
+				log_cmd_error("SDC interpreter returned an error in OpenSTA stub file %s: %s\n", path.c_str(), Tcl_GetStringResult(interp));
+		if (Tcl_EvalFile(interp, sdc_path.c_str()) != TCL_OK)
 			log_cmd_error("SDC interpreter returned an error: %s\n", Tcl_GetStringResult(interp));
 		sdc.objects->dump();
 		Tcl_Release(interp);
diff --git a/passes/cmds/stubs.sdc b/passes/cmds/stubs.sdc
index ea1600139..3466981c9 100644
--- a/passes/cmds/stubs.sdc
+++ b/passes/cmds/stubs.sdc
@@ -1,234 +1,21 @@
 # with Tcl's eager evaluation, we will still eval args if they're unused by a stub
 proc stub {function_name} {
-    proc $function_name {args} {}
+    proc $function_name {args} "puts \"stubbed $function_name\""
 }
 
-# OpenROAD
-proc get_name {thing} {
-    return thing
-}
-proc get_full_name {thing} {
-    return thing
+proc is_suppressed {args} {
+    return 0
+}
+
+proc create_clock {args} {
+    return "CLOCK@"
+}
+proc get_clocks {args} {
+    return "CLOCK@"
 }
 
-# Vivado UG903
-stub add_cells_to_pblock
-stub add_to_power_rail
-stub all_clocks
-stub all_cpus
-stub all_dsps
-stub all_fanin
-stub all_fanout
-stub all_ffs
-stub all_hsios
-stub all_inputs
-stub all_latches
-stub all_outputs
-stub all_rams
-stub all_registers
-stub connect_debug_port
-stub create_clock
-stub create_debug_core
-stub create_debug_port
-stub create_generated_clock
-stub create_macro
-stub create_pblock
-stub create_power_rail
-stub create_property
-stub create_waiver
 stub current_design
-stub current_instance
-stub delete_macros
-stub delete_pblock
-stub delete_power_rails
-stub endgroup
-stub get_bel_pins
-stub get_bels
-stub get_clocks
-stub get_debug_cores
-stub get_debug_ports
-stub get_generated_clocks
-stub get_hierarchy_separator
-stub get_iobanks
-stub get_macros
-stub get_nodes
-stub get_package_pins
-stub get_path_groups
-stub get_pblocks
-stub get_pips
-stub get_pkgpin_bytegroups
-stub get_pkgpin_nibbles
-stub get_power_rails
-stub get_property
-stub get_site_pins
-stub get_site_pips
-stub get_sites
-stub get_slrs
-stub get_speed_models
-stub get_tiles
-stub get_timing_arcs
-stub group_path
-stub make_diff_pair_ports
-stub remove_cells_from_pblock
-stub remove_from_power_rail
-stub reset_operating_conditions
-stub reset_switching_activity
-stub resize_pblock
-stub set_bus_skew
-stub set_case_analysis
-stub set_clock_groups
-stub set_clock_latency
-stub set_clock_sense
-stub set_clock_uncertainty
-stub set_data_check
-stub set_disable_timing
-stub set_external_delay
-stub set_false_path
-stub set_hierarchy_separator
-stub set_input_delay
-stub set_input_jitter
-stub set_load
-stub set_logic_dc
-stub set_logic_one
-stub set_logic_unconnected
-stub set_logic_zero
-stub set_max_delay
-stub set_max_time_borrow
-stub set_min_delay
-stub set_multicycle_path
-stub set_operating_conditions
-stub set_output_delay
-stub set_package_pin_val
-stub set_power_opt
-stub set_propagated_clock
-stub set_property
-stub set_switching_activity
-stub set_system_jitter
-stub set_units
-stub startgroup
-stub update_macro
-
-# OpenSTA
-stub source_
-stub write_sdc
-stub current_instance
-stub set_hierarchy_separator
-stub check_path_divider
-stub set_units
-stub check_unit
-stub unit_prefix_scale
-stub check_unit_scale
-stub all_clocks
-stub all_inputs
-stub all_outputs
-stub all_registers
-stub current_design
-stub filter_objs
-stub check_nocase_flag
-stub find_liberty_libraries_matching
-stub create_clock
-stub delete_clock
-stub create_generated_clock
-stub delete_generated_clock
-stub remove_gclk_cmd
-stub group_path
-stub check_exception_pins
-stub set_clock_gating_check
-stub set_clock_gating_check1
-stub set_clock_groups
-stub unset_clock_groups
-stub unset_clk_groups_cmd
-stub set_clock_latency
-stub unset_clock_latency
-stub unset_clk_latency_cmd
-stub set_sense
-stub set_clock_sense
-stub set_clock_sense_cmd1
-stub set_clock_transition
-stub unset_clock_transition
-stub set_clock_uncertainty
-stub unset_clock_uncertainty
-stub unset_clk_uncertainty_cmd
-stub set_data_check
-stub unset_data_check
-stub unset_data_checks_cmd
-stub set_disable_timing
-stub set_disable_timing_instance
-stub parse_disable_inst_ports
-stub port_members
-stub set_disable_timing_cell
-stub parse_disable_cell_ports
-stub unset_disable_timing
-stub unset_disable_cmd
-stub unset_disable_timing_cell
-stub unset_disable_timing_instance
-stub set_false_path
-stub set_ideal_latency
-stub set_ideal_network
-stub set_ideal_transition
-stub set_input_delay
-stub set_port_delay
-stub unset_input_delay
-stub set_max_delay
-stub set_path_delay
-stub set_max_time_borrow
-stub set_min_delay
-stub set_min_pulse_width
-stub set_multicycle_path
-stub unset_path_exceptions
-stub unset_path_exceptions_cmd
-stub set_output_delay
-stub unset_output_delay
-stub unset_port_delay
-stub set_propagated_clock
-stub unset_propagated_clock
-stub set_case_analysis
-stub unset_case_analysis
-stub set_drive
-stub set_driving_cell
-stub port_direction_any_output
-stub set_fanout_load
-stub set_input_transition
-stub set_load
-stub set_logic_dc
-stub set_logic_value
-stub set_logic_one
-stub set_logic_zero
-stub set_max_area
-stub set_max_capacitance
-stub set_capacitance_limit
-stub set_max_fanout
-stub set_fanout_limit
-stub set_max_transition
-stub set_port_fanout_number
-stub set_resistance
-stub set_timing_derate
-stub unset_timing_derate
-stub parse_from_arg
-stub parse_thrus_arg
-stub parse_to_arg
-stub parse_to_arg1
-stub delete_from_thrus_to
-stub parse_comment_key
-stub set_min_capacitance
-stub set_operating_conditions
-stub parse_op_cond
-stub parse_op_cond_analysis_type
-stub set_wire_load_min_block_size
-stub set_wire_load_mode
-stub set_wire_load_model
-stub set_wire_load_selection_group
-stub set_voltage
-stub create_voltage_area
-stub set_level_shifter_strategy
-stub set_level_shifter_threshold
-stub set_max_dynamic_power
-stub set_max_leakage_power
-stub define_corners
-stub set_pvt
-stub set_pvt_min_max
-stub default_operating_conditions
-stub cell_regexp
-stub cell_regexp_hsc
-stub port_regexp
-stub port_regexp_hsc
\ No newline at end of file
+#stub ys_track_typed_key
+stub ys_track_untyped_key
+stub ys_err_key
+stub ys_err_flag

From 21c68e0022680a6f6268368d21c1eeb0604e4112 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 30 Jul 2025 18:51:14 +0200
Subject: [PATCH 889/931] sdc: unknown handler experiment

---
 passes/cmds/sdc.cc    |  5 +++--
 passes/cmds/stubs.sdc | 23 +++++++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index b01cbe025..76b9b95ff 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -384,7 +384,7 @@ public:
 			log_error("Tcl_Init() call failed - %s\n",Tcl_ErrnoMsg(Tcl_GetErrno()));
 
 		objects = std::make_unique<SdcObjects>(design);
-		objects->collect_mode = SdcObjects::CollectMode::FullConstraint;
+		objects->collect_mode = SdcObjects::CollectMode::SimpleGetter;
 		Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, (ClientData) objects.get(), NULL);
 		Tcl_CreateObjCommand(interp, "get_ports", sdc_get_ports_cmd, (ClientData) objects.get(), NULL);
 		Tcl_CreateObjCommand(interp, "ys_track_typed_key", ys_track_typed_key_cmd, (ClientData) objects.get(), NULL);
@@ -396,7 +396,8 @@ public:
 struct SdcPass : public Pass {
 	// TODO help
 	SdcPass() : Pass("sdc", "sniff at some SDC") { }
-	void execute(std::vector<std::string> args, RTLIL::Design *design) override {
+void execute(std::vector<std::string> args, RTLIL::Design *design) override {
+		log_header(design, "Executing SDC pass.\n");
 		// if (args.size() < 2)
 		// 	log_cmd_error("Missing SDC file.\n");
 		// TODO optional extra stub file
diff --git a/passes/cmds/stubs.sdc b/passes/cmds/stubs.sdc
index 3466981c9..a7845b02d 100644
--- a/passes/cmds/stubs.sdc
+++ b/passes/cmds/stubs.sdc
@@ -7,15 +7,22 @@ proc is_suppressed {args} {
     return 0
 }
 
-proc create_clock {args} {
-    return "CLOCK@"
-}
-proc get_clocks {args} {
-    return "CLOCK@"
-}
-
-stub current_design
+# stub current_design
 #stub ys_track_typed_key
 stub ys_track_untyped_key
 stub ys_err_key
 stub ys_err_flag
+
+proc unknown {args} {
+    global sdc_call_index
+    global sdc_calls
+    if {![info exists sdc_call_index]} {
+        set sdc_call_index 0
+    }
+    if {![info exists sdc_calls]} {
+        set sdc_calls {}
+    }
+    incr sdc_call_index
+    lappend sdc_calls $args
+    return $sdc_call_index
+}
\ No newline at end of file

From 24a6412ea801b9f399bbb9dc94d89b9a5a309ab6 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 31 Jul 2025 15:31:36 +0200
Subject: [PATCH 890/931] sdc: bit selections

---
 passes/cmds/sdc.cc | 176 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 142 insertions(+), 34 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index 76b9b95ff..c5dbbc7f5 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -18,15 +18,77 @@ struct SdcObjects {
 		FullGetter,
 		FullConstraint,
 	} collect_mode;
+	struct BitSelection {
+		bool all = false;
+		std::vector<bool> bits = {};
+		void set_all() {
+			bits.clear();
+			all = true;
+		}
+		void clear() {
+			bits.clear();
+			all = false;
+		}
+		void set(size_t idx) {
+			if (all)
+				return;
+			if (idx >= bits.size())
+				bits.resize(idx + 1);
+			bits[idx] = true;
+		}
+		void merge(const BitSelection& other) {
+			if (all)
+				return;
+			if (other.all) {
+				set_all();
+				return;
+			}
+			if (other.bits.size() > bits.size())
+				bits.resize(other.bits.size());
+			for (size_t other_idx = 0; other_idx < other.bits.size(); other_idx++) {
+				bool other_bit = other.bits[other_idx];
+				if (other_bit)
+					set(other_idx);
+			}
+		}
+		void dump() {
+			if (!all) {
+				for (size_t i = 0; i < bits.size(); i++)
+					if (bits[i])
+						log("\t\t [%zu]\n", i);
+			} else {
+				log("\t\t FULL\n");
+			}
+		}
+		bool is_set(size_t idx) {
+			if (all)
+				return true;
+			if (idx >= bits.size())
+				return false;
+			return bits[idx];
+		}
+		// TODO actually use this
+		void compress(size_t size) {
+			if (bits.size() < size)
+				return;
+			for (size_t i = 0; i < size; i++)
+				if (!bits[i])
+					return;
+			bits.clear();
+			bits.shrink_to_fit();
+			all = true;
+		}
+	};
+	using CellPin = std::pair<Cell*, IdString>;
 	std::vector<std::string> design_ports;
 	std::vector<std::pair<std::string, Cell*>> design_cells;
-	std::vector<std::pair<std::string, Cell*>> design_pins;
+	std::vector<std::pair<std::string, CellPin>> design_pins;
 	std::vector<std::pair<std::string, Wire*>> design_nets;
 
-	pool<std::string> constrained_ports;
+	dict<std::string, BitSelection> constrained_ports;
 	pool<std::pair<std::string, Cell*>> constrained_cells;
-	pool<std::pair<std::string, Cell*>> constrained_pins;
-	pool<std::pair<std::string, Wire*>> constrained_nets;
+	dict<std::pair<std::string, CellPin>, BitSelection> constrained_pins;
+	dict<std::pair<std::string, Wire*>, BitSelection> constrained_nets;
 
 	void sniff_module(std::list<std::string>& hierarchy, Module* mod) {
 		std::string prefix;
@@ -62,8 +124,9 @@ struct SdcObjects {
 			path += name;
 			design_cells.push_back(std::make_pair(path, cell));
 			for (auto pin : cell->connections()) {
-				std::string pin_name = path + "/" + pin.first.str().substr(1);
-				design_pins.push_back(std::make_pair(pin_name, cell));
+				IdString pin_name = pin.first;
+				std::string pin_name_sdc = path + "/" + pin.first.str().substr(1);
+				design_pins.push_back(std::make_pair(pin_name_sdc, std::make_pair(cell, pin_name)));
 			}
 			if (auto sub_mod = mod->design->module(cell->type)) {
 				hierarchy.push_back(name);
@@ -113,23 +176,28 @@ struct SdcObjects {
 		// }
 		// log("\n");
 		log("Constrained ports:\n");
-		for (auto name : constrained_ports) {
+		for (auto [name, bits] : constrained_ports) {
 			log("\t%s\n", name.c_str());
+			bits.dump();
 		}
 		log("Constrained cells:\n");
-		for (auto [name, cell] : constrained_cells) {
+		for (auto& [name, cell] : constrained_cells) {
 			(void)cell;
 			log("\t%s\n", name.c_str());
 		}
 		log("Constrained pins:\n");
-		for (auto [name, pin] : constrained_pins) {
+		for (auto& [ref, bits] : constrained_pins) {
+			auto [name, pin] = ref;
 			(void)pin;
 			log("\t%s\n", name.c_str());
+			bits.dump();
 		}
 		log("Constrained nets:\n");
-		for (auto [name, net] : constrained_nets) {
+		for (auto& [ref, bits] : constrained_nets) {
+			auto [name, net] = ref;
 			(void)net;
 			log("\t%s\n", name.c_str());
+			bits.dump();
 		}
 		log("\n");
 	}
@@ -163,10 +231,36 @@ struct MatchConfig {
 		hier(hierarchical_flag ? FLAT : TREE) { }
 };
 
-static bool matches(std::string name, const std::string& pat, const MatchConfig& config) {
+static std::pair<bool, SdcObjects::BitSelection> matches(std::string name, const std::string& pat, const MatchConfig& config) {
 	(void)config;
-	// TODO implement full mode
-	return name == pat;
+	bool got_bit_index = false;;
+	int bit_idx;
+	std::string pat_base = pat;
+	size_t pos = pat.rfind('[');
+	if (pos != std::string::npos) {
+		got_bit_index = true;
+		pat_base = pat.substr(0, pos);
+		std::string bit_selector = pat.substr(pos + 1, pat.rfind(']') - pos - 1);
+		for (auto c : bit_selector)
+			if (!std::isdigit(c))
+				log_error("Unsupported bit selector %s in SDC pattern %s\n",
+							bit_selector.c_str(), pat.c_str());
+		bit_idx = std::stoi(bit_selector);
+
+	}
+	SdcObjects::BitSelection bits = {};
+	if (name == pat_base) {
+		if (got_bit_index) {
+			bits.set(bit_idx);
+			return std::make_pair(true, bits);
+		} else {
+			bits.set_all();
+			return std::make_pair(true, bits);
+
+		}
+	} else {
+		return std::make_pair(false, bits);
+	}
 }
 
 static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
@@ -177,7 +271,7 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 	bool regexp_flag = false;
 	bool nocase_flag = false;
 	std::string separator = "/";
-	Tcl_Obj* of_objects;
+	Tcl_Obj* of_objects = nullptr;
 	std::vector<std::string> patterns;
 	int i = 1;
 	for (; i < objc; i++) {
@@ -209,30 +303,37 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 	}
 
 	MatchConfig config(regexp_flag, nocase_flag, hierarchical_flag);
-	std::vector<std::pair<std::string, Cell*>> resolved;
+	std::vector<std::tuple<std::string, SdcObjects::CellPin, SdcObjects::BitSelection>> resolved;
 	for (auto pat : patterns) {
 		bool found = false;
 		for (auto [name, pin] : objects->design_pins) {
-			if (matches(name, pat, config)) {
+			auto [does_match, matching_bits] = matches(name, pat, config);
+			if (does_match) {
 				found = true;
-				resolved.push_back(std::make_pair(name, pin));
+				resolved.push_back(std::make_tuple(name, pin, matching_bits));
 			}
 		}
 		if (!found)
 			log_warning("No matches in design for pin %s\n", pat.c_str());
 	}
-	Tcl_Obj *result = Tcl_NewListObj(resolved.size(), nullptr);
-	for (auto obj : resolved) {
-		Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(obj.first.c_str(), obj.first.size()));
-		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
-			objects->constrained_pins.insert(obj);
-	}
 
 	if (separator != "/") {
 		Tcl_SetResult(interp, (char *)"Only '/' accepted as separator", TCL_STATIC);
 		return TCL_ERROR;
 	}
 
+	Tcl_Obj *result = Tcl_NewListObj(resolved.size(), nullptr);
+	for (auto [name, pin, matching_bits] : resolved) {
+		// TODO change this to graph tracking if desired
+		size_t width = (size_t)pin.first->getPort(pin.second).size();
+		for (size_t i = 0; i < width; i++)
+			if (matching_bits.is_set(i))
+				Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(name.c_str(), name.size()));
+
+		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
+			objects->constrained_pins[std::make_pair(name, pin)].merge(matching_bits);
+	}
+
 	Tcl_SetObjResult(interp, result);
 	return TCL_OK;
 }
@@ -262,23 +363,29 @@ static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_
 		}
 	}
 	MatchConfig config(regexp_flag, nocase_flag, false);
-	std::vector<std::string> resolved;
+	std::vector<std::tuple<std::string, SdcObjects::BitSelection>> resolved;
 	for (auto pat : patterns) {
 		bool found = false;
 		for (auto name : objects->design_ports) {
-			if (matches(name, pat, config)) {
+			auto [does_match, matching_bits] = matches(name, pat, config);
+			if (does_match) {
 				found = true;
-				resolved.push_back(name);
+				resolved.push_back(std::make_tuple(name, matching_bits));
 			}
 		}
 		if (!found)
 			log_warning("No matches in design for port %s\n", pat.c_str());
 	}
 	Tcl_Obj *result = Tcl_NewListObj(resolved.size(), nullptr);
-	for (auto obj : resolved) {
+	for (auto [obj, matching_bits] : resolved) {
 		Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(obj.c_str(), obj.size()));
-		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
-			objects->constrained_ports.insert(obj);
+		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint) {
+			if (objects->constrained_ports.count(obj) == 0) {
+				objects->constrained_ports[obj] = matching_bits;
+			} else {
+				objects->constrained_ports[obj].merge(matching_bits);
+			}
+		}
 	}
 
 	Tcl_SetObjResult(interp, result);
@@ -332,11 +439,12 @@ static int ys_track_typed_key_cmd(ClientData data, Tcl_Interp *interp, int objc,
 			log("PIN! %s\n", str);
 			bool found = false;
 			for (auto [name, pin] : objects->design_pins) {
-				if (name + "/" + pin->name.str() == str) {
-					found = true;
-					objects->constrained_pins.insert(std::make_pair(name, pin));
-					break; // resolved, expected unique
-				}
+				log_error("TODO temporarily disabled due to working on a different flow\n");
+				// if (name + "/" + pin->name.str() == str) {
+				// 	found = true;
+				// 	objects->constrained_pins.insert(std::make_pair(name, pin));
+				// 	break; // resolved, expected unique
+				// }
 			}
 			if (!found)
 				log_error("%s: pin %s not found\n", proc_name.c_str(), str);

From c6491629d87f3aa2dac76f7f2db7105ca649f93c Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 31 Jul 2025 18:33:20 +0200
Subject: [PATCH 891/931] sdc: start graph

---
 passes/cmds/sdc.cc    | 111 +++++++++++++++++++++++++++++++++++++++---
 passes/cmds/stubs.sdc |   7 ++-
 2 files changed, 110 insertions(+), 8 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index c5dbbc7f5..cc95302cc 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -14,10 +14,19 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct SdcObjects {
 	enum CollectMode {
+		// getter-side object tracking with minimal features
 		SimpleGetter,
+		// getter-side object tracking with everything
 		FullGetter,
+		// constraint-side tracking
 		FullConstraint,
 	} collect_mode;
+	enum ValueMode {
+		// return something sensible and error on unknown
+		Normal,
+		// return a new graph node assuming unknown is overridden
+		Graph,
+	} value_mode;
 	struct BitSelection {
 		bool all = false;
 		std::vector<bool> bits = {};
@@ -263,6 +272,85 @@ static std::pair<bool, SdcObjects::BitSelection> matches(std::string name, const
 	}
 }
 
+
+static int redirect_unknown(Tcl_Interp *interp, int objc, Tcl_Obj* const objv[]) {
+    Tcl_Obj *newCmd = Tcl_NewStringObj("unknown", -1);
+    Tcl_Obj **newObjv = new Tcl_Obj*[objc+1];
+    newObjv[0] = newCmd;
+    for (int i = 1; i < objc + 1; i++) {
+        newObjv[i] = objv[i - 1];
+    }
+    int result = Tcl_EvalObjv(interp, objc, newObjv, 0);
+    Tcl_DecrRefCount(newCmd);
+    delete[] newObjv;
+	return result;
+}
+
+void inspect_globals(Tcl_Interp* interp) {
+	auto get_var = [&](const char* name) -> const char* {
+	    return Tcl_GetVar(interp, name, TCL_GLOBAL_ONLY);
+	};
+	const char* idx_s = get_var("sdc_call_index");
+	log_assert(idx_s);
+	size_t node_count = std::stoi(idx_s);
+
+	// else
+	//     printf("sdc_call_index: unset\n");
+	// if (auto calls = get_var("sdc_calls"))
+	//     printf("sdc_calls: %s\n", calls);
+	// else
+	//     printf("sdc_calls: unset\n");
+	Tcl_Obj* listObj = Tcl_GetVar2Ex(interp, "sdc_calls", nullptr, TCL_GLOBAL_ONLY);
+	int listLength;
+
+	// Get list length first
+	std::vector<std::vector<std::string>> nestedData;
+	if (Tcl_ListObjLength(interp, listObj, &listLength) == TCL_OK) {
+		for (int i = 0; i < listLength; i++) {
+			Tcl_Obj* subListObj;
+			std::vector<std::string> subList;
+			if (Tcl_ListObjIndex(interp, listObj, i, &subListObj) != TCL_OK) {
+				log_error("broken list of lists\n");
+			}
+			int subListLength;
+			if (Tcl_ListObjLength(interp, subListObj, &subListLength) == TCL_OK) {
+				// It's a valid list - extract elements
+				for (int j = 0; j < subListLength; j++) {
+					Tcl_Obj* elementObj;
+					if (Tcl_ListObjIndex(interp, subListObj, j, &elementObj) == TCL_OK) {
+						const char* elementStr = Tcl_GetString(elementObj);
+						subList.push_back(std::string(elementStr));
+					}
+				}
+			} else {
+				// It's a single element, not a list
+				const char* elementStr = Tcl_GetString(subListObj);
+				subList.push_back(std::string(elementStr));
+			}
+			nestedData.push_back(subList);
+		}
+	}
+	std::vector<bool> has_parent;
+	log_assert(nestedData.size() == node_count);
+	has_parent.resize(node_count);
+	for (size_t i = 0; i < node_count; i++) {
+		for (size_t j = 0; j < nestedData[i].size(); j++) {
+			auto arg = nestedData[i][j];
+			auto pos = arg.find("YOSYS_SDC_MAGIC_NODE_");
+			if (pos == std::string::npos)
+				continue;
+			std::string rest = arg.substr(pos);
+			for (auto c : rest)
+				if (!std::isdigit(c))
+					log_error("weird thing %s\n", rest.c_str());
+			size_t arg_node_idx = std::stoi(rest);
+			log("%zu %zu %s IDX %zu\n", i, j, arg.c_str(), arg_node_idx);
+			// log("%zu %zu %s\n", i, j, arg.c_str());
+
+		}
+	}
+}
+
 static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
 {
 	auto* objects = (SdcObjects*)data;
@@ -322,19 +410,26 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 		return TCL_ERROR;
 	}
 
-	Tcl_Obj *result = Tcl_NewListObj(resolved.size(), nullptr);
+	Tcl_Obj *result = nullptr;
 	for (auto [name, pin, matching_bits] : resolved) {
-		// TODO change this to graph tracking if desired
-		size_t width = (size_t)pin.first->getPort(pin.second).size();
-		for (size_t i = 0; i < width; i++)
-			if (matching_bits.is_set(i))
-				Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(name.c_str(), name.size()));
+		if (objects->value_mode == SdcObjects::ValueMode::Normal) {
+			if (!result)
+				result = Tcl_NewListObj(resolved.size(), nullptr);
+			size_t width = (size_t)pin.first->getPort(pin.second).size();
+			for (size_t i = 0; i < width; i++)
+				if (matching_bits.is_set(i))
+					Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(name.c_str(), name.size()));
+		}
 
 		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
 			objects->constrained_pins[std::make_pair(name, pin)].merge(matching_bits);
 	}
 
-	Tcl_SetObjResult(interp, result);
+	if (objects->value_mode == SdcObjects::ValueMode::Graph) {
+		return redirect_unknown(interp, objc, objv);
+	}
+	if (result)
+		Tcl_SetObjResult(interp, result);
 	return TCL_OK;
 }
 
@@ -493,6 +588,7 @@ public:
 
 		objects = std::make_unique<SdcObjects>(design);
 		objects->collect_mode = SdcObjects::CollectMode::SimpleGetter;
+		objects->value_mode = SdcObjects::ValueMode::Graph;
 		Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, (ClientData) objects.get(), NULL);
 		Tcl_CreateObjCommand(interp, "get_ports", sdc_get_ports_cmd, (ClientData) objects.get(), NULL);
 		Tcl_CreateObjCommand(interp, "ys_track_typed_key", ys_track_typed_key_cmd, (ClientData) objects.get(), NULL);
@@ -535,6 +631,7 @@ void execute(std::vector<std::string> args, RTLIL::Design *design) override {
 		if (Tcl_EvalFile(interp, sdc_path.c_str()) != TCL_OK)
 			log_cmd_error("SDC interpreter returned an error: %s\n", Tcl_GetStringResult(interp));
 		sdc.objects->dump();
+		inspect_globals(interp);
 		Tcl_Release(interp);
 	}
 } SdcPass;
diff --git a/passes/cmds/stubs.sdc b/passes/cmds/stubs.sdc
index a7845b02d..467ce70c6 100644
--- a/passes/cmds/stubs.sdc
+++ b/passes/cmds/stubs.sdc
@@ -13,6 +13,7 @@ stub ys_track_untyped_key
 stub ys_err_key
 stub ys_err_flag
 
+# TODO move to separate file and tie to graph value mode
 proc unknown {args} {
     global sdc_call_index
     global sdc_calls
@@ -24,5 +25,9 @@ proc unknown {args} {
     }
     incr sdc_call_index
     lappend sdc_calls $args
-    return $sdc_call_index
+    puts "unknown $args, returning YOSYS_SDC_MAGIC_NODE_$sdc_call_index"
+    return "YOSYS_SDC_MAGIC_NODE_$sdc_call_index"
+}
+proc list {args} {
+    unknown "list" $args
 }
\ No newline at end of file

From ae1235210da6f4eb3995c96f8333f259357e38c0 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Fri, 1 Aug 2025 16:33:10 +0200
Subject: [PATCH 892/931] sdc: functional graph

---
 passes/cmds/sdc.cc    | 178 ++++++++++++++++++++++++++++++------------
 passes/cmds/stubs.sdc |   5 +-
 2 files changed, 129 insertions(+), 54 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index cc95302cc..f0d7175c5 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -6,6 +6,7 @@
 #include <list>
 #include <regex>
 #include <optional>
+#include <iostream>
 
 
 USING_YOSYS_NAMESPACE
@@ -89,7 +90,7 @@ struct SdcObjects {
 		}
 	};
 	using CellPin = std::pair<Cell*, IdString>;
-	std::vector<std::string> design_ports;
+	std::vector<std::pair<std::string, Wire*>> design_ports;
 	std::vector<std::pair<std::string, Cell*>> design_cells;
 	std::vector<std::pair<std::string, CellPin>> design_pins;
 	std::vector<std::pair<std::string, Wire*>> design_nets;
@@ -149,7 +150,7 @@ struct SdcObjects {
 		if (!top)
 			log_error("Top module couldn't be determined. Check 'top' attribute usage");
 		for (auto port : top->ports) {
-			design_ports.push_back(port.str().substr(1));
+			design_ports.push_back(std::make_pair(port.str().substr(1), top->wire(port)));
 		}
 		std::list<std::string> hierarchy{};
 		sniff_module(hierarchy, top);
@@ -275,36 +276,59 @@ static std::pair<bool, SdcObjects::BitSelection> matches(std::string name, const
 
 static int redirect_unknown(Tcl_Interp *interp, int objc, Tcl_Obj* const objv[]) {
     Tcl_Obj *newCmd = Tcl_NewStringObj("unknown", -1);
-    Tcl_Obj **newObjv = new Tcl_Obj*[objc+1];
+	auto newObjc = objc + 1;
+    Tcl_Obj **newObjv = new Tcl_Obj*[newObjc];
     newObjv[0] = newCmd;
-    for (int i = 1; i < objc + 1; i++) {
+    for (int i = 1; i < newObjc; i++) {
         newObjv[i] = objv[i - 1];
+		log("newObjv %s\n", Tcl_GetString(newObjv[i]));
     }
-    int result = Tcl_EvalObjv(interp, objc, newObjv, 0);
+    int result = Tcl_EvalObjv(interp, newObjc, newObjv, 0);
     Tcl_DecrRefCount(newCmd);
     delete[] newObjv;
 	return result;
 }
 
-void inspect_globals(Tcl_Interp* interp) {
-	auto get_var = [&](const char* name) -> const char* {
-	    return Tcl_GetVar(interp, name, TCL_GLOBAL_ONLY);
-	};
-	const char* idx_s = get_var("sdc_call_index");
+struct SdcGraphNode {
+    using Child = std::variant<SdcGraphNode*, std::string>;
+    std::vector<Child> children;
+    SdcGraphNode() = default;
+    void addChild(SdcGraphNode* child) {
+        children.push_back(child);
+    }
+    void addChild(std::string tcl_string) {
+        children.push_back(tcl_string);
+    }
+    void dump(std::ostream& os) const {
+		bool first = true;
+		for (auto child : children) {
+			if (first) {
+				first = false;
+			} else {
+				os << " ";
+			}
+			if (auto* s = std::get_if<std::string>(&child))
+				os << *s;
+			else if (SdcGraphNode*& c = *std::get_if<SdcGraphNode*>(&child)) {
+				os << "[";
+				c->dump(os);
+				os << "]";
+			} else {
+				log_assert(false);
+			}
+		}
+    }
+};
+
+std::vector<std::vector<std::string>> gather_nested_calls(Tcl_Interp* interp) {
+	const char* idx_s = Tcl_GetVar(interp, "sdc_call_index", TCL_GLOBAL_ONLY);
 	log_assert(idx_s);
 	size_t node_count = std::stoi(idx_s);
 
-	// else
-	//     printf("sdc_call_index: unset\n");
-	// if (auto calls = get_var("sdc_calls"))
-	//     printf("sdc_calls: %s\n", calls);
-	// else
-	//     printf("sdc_calls: unset\n");
 	Tcl_Obj* listObj = Tcl_GetVar2Ex(interp, "sdc_calls", nullptr, TCL_GLOBAL_ONLY);
 	int listLength;
 
-	// Get list length first
-	std::vector<std::vector<std::string>> nestedData;
+	std::vector<std::vector<std::string>> sdc_calls;
 	if (Tcl_ListObjLength(interp, listObj, &listLength) == TCL_OK) {
 		for (int i = 0; i < listLength; i++) {
 			Tcl_Obj* subListObj;
@@ -314,7 +338,7 @@ void inspect_globals(Tcl_Interp* interp) {
 			}
 			int subListLength;
 			if (Tcl_ListObjLength(interp, subListObj, &subListLength) == TCL_OK) {
-				// It's a valid list - extract elements
+				// Valid list - extract elements
 				for (int j = 0; j < subListLength; j++) {
 					Tcl_Obj* elementObj;
 					if (Tcl_ListObjIndex(interp, subListObj, j, &elementObj) == TCL_OK) {
@@ -323,32 +347,70 @@ void inspect_globals(Tcl_Interp* interp) {
 					}
 				}
 			} else {
-				// It's a single element, not a list
+				// Single element, not a list
 				const char* elementStr = Tcl_GetString(subListObj);
 				subList.push_back(std::string(elementStr));
 			}
-			nestedData.push_back(subList);
+			sdc_calls.push_back(subList);
 		}
 	}
-	std::vector<bool> has_parent;
-	log_assert(nestedData.size() == node_count);
-	has_parent.resize(node_count);
+	log_assert(sdc_calls.size() == node_count);
+	return sdc_calls;
+}
+
+std::vector<SdcGraphNode> build_graph(const std::vector<std::vector<std::string>>& sdc_calls) {
+	size_t node_count = sdc_calls.size();
+	std::vector<SdcGraphNode> graph(node_count);
 	for (size_t i = 0; i < node_count; i++) {
-		for (size_t j = 0; j < nestedData[i].size(); j++) {
-			auto arg = nestedData[i][j];
-			auto pos = arg.find("YOSYS_SDC_MAGIC_NODE_");
-			if (pos == std::string::npos)
-				continue;
-			std::string rest = arg.substr(pos);
-			for (auto c : rest)
-				if (!std::isdigit(c))
-					log_error("weird thing %s\n", rest.c_str());
-			size_t arg_node_idx = std::stoi(rest);
-			log("%zu %zu %s IDX %zu\n", i, j, arg.c_str(), arg_node_idx);
-			// log("%zu %zu %s\n", i, j, arg.c_str());
+		auto& new_node = graph[i];
+		for (size_t j = 0; j < sdc_calls[i].size(); j++) {
+			auto arg = sdc_calls[i][j];
+			const std::string prefix = "YOSYS_SDC_MAGIC_NODE_";
+			auto pos = arg.find(prefix);
+			if (pos != std::string::npos) {
+				std::string rest = arg.substr(pos + prefix.length());
+				for (auto c : rest)
+					if (!std::isdigit(c))
+						log_error("weird thing %s in %s\n", rest.c_str(), arg.c_str());
+				size_t arg_node_idx = std::stoi(rest);
+				log_assert(arg_node_idx < graph.size());
+				new_node.addChild(&graph[arg_node_idx]);
+			} else {
+				new_node.addChild(arg);
+			}
 
 		}
 	}
+	return graph;
+}
+
+std::vector<bool> node_ownership(const std::vector<SdcGraphNode>& graph) {
+	std::vector<bool> has_parent(graph.size());
+	for (auto node : graph) {
+		for (auto child : node.children) {
+			if (SdcGraphNode** pp = std::get_if<SdcGraphNode*>(&child)) {
+				size_t idx = std::distance(&graph.front(), (const SdcGraphNode*)*pp);
+				log_assert(idx < has_parent.size());
+				has_parent[idx] = true;
+			}
+		}
+	}
+	return has_parent;
+}
+
+void dump_sdc_graph(const std::vector<SdcGraphNode>& graph, const std::vector<bool>& has_parent) {
+	for (size_t i = 0; i < graph.size(); i++) {
+		if (!has_parent[i]) {
+			graph[i].dump(std::cout);
+			std::cout << "\n";
+		}
+	}
+}
+
+void inspect_globals(Tcl_Interp* interp) {
+	std::vector<std::vector<std::string>> sdc_calls = gather_nested_calls(interp);
+	std::vector<SdcGraphNode> graph = build_graph(sdc_calls);
+	dump_sdc_graph(graph, node_ownership(graph));
 }
 
 static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
@@ -458,31 +520,42 @@ static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_
 		}
 	}
 	MatchConfig config(regexp_flag, nocase_flag, false);
-	std::vector<std::tuple<std::string, SdcObjects::BitSelection>> resolved;
+	std::vector<std::tuple<std::string, Wire*, SdcObjects::BitSelection>> resolved;
 	for (auto pat : patterns) {
 		bool found = false;
-		for (auto name : objects->design_ports) {
+		for (auto [name, wire] : objects->design_ports) {
 			auto [does_match, matching_bits] = matches(name, pat, config);
 			if (does_match) {
 				found = true;
-				resolved.push_back(std::make_tuple(name, matching_bits));
+				resolved.push_back(std::make_tuple(name, wire, matching_bits));
 			}
 		}
 		if (!found)
 			log_warning("No matches in design for port %s\n", pat.c_str());
 	}
-	Tcl_Obj *result = Tcl_NewListObj(resolved.size(), nullptr);
-	for (auto [obj, matching_bits] : resolved) {
-		Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(obj.c_str(), obj.size()));
+	Tcl_Obj *result = nullptr;
+	for (auto [name, wire, matching_bits] : resolved) {
+		if (objects->value_mode == SdcObjects::ValueMode::Normal) {
+			if (!result)
+				result = Tcl_NewListObj(resolved.size(), nullptr);
+			size_t width = wire->width;
+			for (size_t i = 0; i < width; i++)
+				if (matching_bits.is_set(i))
+					Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(name.c_str(), name.size()));
+		}
 		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint) {
-			if (objects->constrained_ports.count(obj) == 0) {
-				objects->constrained_ports[obj] = matching_bits;
+			if (objects->constrained_ports.count(name) == 0) {
+				objects->constrained_ports[name] = matching_bits;
 			} else {
-				objects->constrained_ports[obj].merge(matching_bits);
+				objects->constrained_ports[name].merge(matching_bits);
 			}
 		}
 	}
 
+	if (objects->value_mode == SdcObjects::ValueMode::Graph) {
+		return redirect_unknown(interp, objc, objv);
+	}
+
 	Tcl_SetObjResult(interp, result);
 	return TCL_OK;
 }
@@ -545,13 +618,14 @@ static int ys_track_typed_key_cmd(ClientData data, Tcl_Interp *interp, int objc,
 				log_error("%s: pin %s not found\n", proc_name.c_str(), str);
 		} else if (key_expect_type == "port") {
 			bool found = false;
-			for (auto name : objects->design_ports) {
-				if (name == str) {
-					found = true;
-					objects->constrained_ports.insert(name);
-					break; // resolved, expected unique
-				}
-			}
+			log_error("TODO temporarily disabled due to working on a different flow\n");
+			// for (auto [name, ] : objects->design_ports) {
+			// 	if (name == str) {
+			// 		found = true;
+			// 		objects->constrained_ports.insert(name);
+			// 		break; // resolved, expected unique
+			// 	}
+			// }
 			if (!found)
 				log_error("%s: port %s not found\n", proc_name.c_str(), str);
 		} else {
diff --git a/passes/cmds/stubs.sdc b/passes/cmds/stubs.sdc
index 467ce70c6..f89050f6f 100644
--- a/passes/cmds/stubs.sdc
+++ b/passes/cmds/stubs.sdc
@@ -23,11 +23,12 @@ proc unknown {args} {
     if {![info exists sdc_calls]} {
         set sdc_calls {}
     }
+    set ret "YOSYS_SDC_MAGIC_NODE_$sdc_call_index"
     incr sdc_call_index
     lappend sdc_calls $args
     puts "unknown $args, returning YOSYS_SDC_MAGIC_NODE_$sdc_call_index"
-    return "YOSYS_SDC_MAGIC_NODE_$sdc_call_index"
+    return $ret
 }
 proc list {args} {
-    unknown "list" $args
+    return [unknown "list" {*}$args]
 }
\ No newline at end of file

From 48ff9d4950e850632c2987c29aa029a370bb0d8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Mon, 4 Aug 2025 13:27:42 +0200
Subject: [PATCH 893/931] sdc: refactor find_matching

---
 passes/cmds/sdc.cc | 53 ++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index f0d7175c5..0c00a4466 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -412,7 +412,25 @@ void inspect_globals(Tcl_Interp* interp) {
 	std::vector<SdcGraphNode> graph = build_graph(sdc_calls);
 	dump_sdc_graph(graph, node_ownership(graph));
 }
-
+template <typename T, typename U>
+std::vector<std::tuple<std::string, T, SdcObjects::BitSelection>>
+find_matching(U objects, const MatchConfig& config, const std::vector<std::string> &patterns, const char* obj_type)
+{
+	std::vector<std::tuple<std::string, T, SdcObjects::BitSelection>> resolved;
+	for (auto pat : patterns) {
+		bool found = false;
+		for (auto [name, obj] : objects) {
+			auto [does_match, matching_bits] = matches(name, pat, config);
+			if (does_match) {
+				found = true;
+				resolved.push_back(std::make_tuple(name, obj, matching_bits));
+			}
+		}
+		if (!found)
+			log_warning("No matches in design for %s %s\n", obj_type, pat.c_str());
+	}
+	return resolved;
+}
 static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
 {
 	auto* objects = (SdcObjects*)data;
@@ -454,18 +472,8 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 
 	MatchConfig config(regexp_flag, nocase_flag, hierarchical_flag);
 	std::vector<std::tuple<std::string, SdcObjects::CellPin, SdcObjects::BitSelection>> resolved;
-	for (auto pat : patterns) {
-		bool found = false;
-		for (auto [name, pin] : objects->design_pins) {
-			auto [does_match, matching_bits] = matches(name, pat, config);
-			if (does_match) {
-				found = true;
-				resolved.push_back(std::make_tuple(name, pin, matching_bits));
-			}
-		}
-		if (!found)
-			log_warning("No matches in design for pin %s\n", pat.c_str());
-	}
+	const auto& pins = objects->design_pins;
+	resolved = find_matching<SdcObjects::CellPin, decltype(pins)>(pins, config, patterns, "pin");
 
 	if (separator != "/") {
 		Tcl_SetResult(interp, (char *)"Only '/' accepted as separator", TCL_STATIC);
@@ -519,20 +527,12 @@ static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_
 			log_error("get_ports got unexpected number of patterns in simple mode\n");
 		}
 	}
+
 	MatchConfig config(regexp_flag, nocase_flag, false);
 	std::vector<std::tuple<std::string, Wire*, SdcObjects::BitSelection>> resolved;
-	for (auto pat : patterns) {
-		bool found = false;
-		for (auto [name, wire] : objects->design_ports) {
-			auto [does_match, matching_bits] = matches(name, pat, config);
-			if (does_match) {
-				found = true;
-				resolved.push_back(std::make_tuple(name, wire, matching_bits));
-			}
-		}
-		if (!found)
-			log_warning("No matches in design for port %s\n", pat.c_str());
-	}
+	const auto& ports = objects->design_ports;
+	resolved = find_matching<Wire*, decltype(ports)>(ports, config, patterns, "port");
+
 	Tcl_Obj *result = nullptr;
 	for (auto [name, wire, matching_bits] : resolved) {
 		if (objects->value_mode == SdcObjects::ValueMode::Normal) {
@@ -676,9 +676,6 @@ struct SdcPass : public Pass {
 	SdcPass() : Pass("sdc", "sniff at some SDC") { }
 void execute(std::vector<std::string> args, RTLIL::Design *design) override {
 		log_header(design, "Executing SDC pass.\n");
-		// if (args.size() < 2)
-		// 	log_cmd_error("Missing SDC file.\n");
-		// TODO optional extra stub file
 		size_t argidx;
 		std::vector<std::string> opensta_stubs_paths;
 		for (argidx = 1; argidx < args.size(); argidx++) {

From 075237f73b3cadd4e4e29d18a096bdfbe590c4b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Ji=C5=99=C3=AD=20Tywoniak?= <emil.tywoniak@gmail.com>
Date: Mon, 4 Aug 2025 14:22:23 +0200
Subject: [PATCH 894/931] sdc: refactor more

---
 passes/cmds/sdc.cc | 474 ++++++++++++++++++++++++++-------------------
 1 file changed, 270 insertions(+), 204 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index 0c00a4466..9a2a5b1ed 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -1,10 +1,8 @@
 #include "kernel/register.h"
-#include "kernel/celltypes.h"
 #include "kernel/rtlil.h"
 #include "kernel/log.h"
 #include <tcl.h>
 #include <list>
-#include <regex>
 #include <optional>
 #include <iostream>
 
@@ -12,6 +10,76 @@
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
 
+struct TclCall {
+	Tcl_Interp *interp;
+	int objc;
+	Tcl_Obj* const* objv;
+};
+
+static int redirect_unknown(TclCall call);
+static size_t get_node_count(Tcl_Interp* interp);
+
+struct BitSelection {
+	bool all = false;
+	std::vector<bool> bits = {};
+	void set_all() {
+		bits.clear();
+		all = true;
+	}
+	void clear() {
+		bits.clear();
+		all = false;
+	}
+	void set(size_t idx) {
+		if (all)
+			return;
+		if (idx >= bits.size())
+			bits.resize(idx + 1);
+		bits[idx] = true;
+	}
+	void merge(const BitSelection& other) {
+		if (all)
+			return;
+		if (other.all) {
+			set_all();
+			return;
+		}
+		if (other.bits.size() > bits.size())
+			bits.resize(other.bits.size());
+		for (size_t other_idx = 0; other_idx < other.bits.size(); other_idx++) {
+			bool other_bit = other.bits[other_idx];
+			if (other_bit)
+				set(other_idx);
+		}
+	}
+	void dump() {
+		if (!all) {
+			for (size_t i = 0; i < bits.size(); i++)
+				if (bits[i])
+					log("\t\t [%zu]\n", i);
+		} else {
+			log("\t\t FULL\n");
+		}
+	}
+	bool is_set(size_t idx) const {
+		if (all)
+			return true;
+		if (idx >= bits.size())
+			return false;
+		return bits[idx];
+	}
+	// TODO actually use this
+	void compress(size_t size) {
+		if (bits.size() < size)
+			return;
+		for (size_t i = 0; i < size; i++)
+			if (!bits[i])
+				return;
+		bits.clear();
+		bits.shrink_to_fit();
+		all = true;
+	}
+};
 
 struct SdcObjects {
 	enum CollectMode {
@@ -28,74 +96,19 @@ struct SdcObjects {
 		// return a new graph node assuming unknown is overridden
 		Graph,
 	} value_mode;
-	struct BitSelection {
-		bool all = false;
-		std::vector<bool> bits = {};
-		void set_all() {
-			bits.clear();
-			all = true;
-		}
-		void clear() {
-			bits.clear();
-			all = false;
-		}
-		void set(size_t idx) {
-			if (all)
-				return;
-			if (idx >= bits.size())
-				bits.resize(idx + 1);
-			bits[idx] = true;
-		}
-		void merge(const BitSelection& other) {
-			if (all)
-				return;
-			if (other.all) {
-				set_all();
-				return;
-			}
-			if (other.bits.size() > bits.size())
-				bits.resize(other.bits.size());
-			for (size_t other_idx = 0; other_idx < other.bits.size(); other_idx++) {
-				bool other_bit = other.bits[other_idx];
-				if (other_bit)
-					set(other_idx);
-			}
-		}
-		void dump() {
-			if (!all) {
-				for (size_t i = 0; i < bits.size(); i++)
-					if (bits[i])
-						log("\t\t [%zu]\n", i);
-			} else {
-				log("\t\t FULL\n");
-			}
-		}
-		bool is_set(size_t idx) {
-			if (all)
-				return true;
-			if (idx >= bits.size())
-				return false;
-			return bits[idx];
-		}
-		// TODO actually use this
-		void compress(size_t size) {
-			if (bits.size() < size)
-				return;
-			for (size_t i = 0; i < size; i++)
-				if (!bits[i])
-					return;
-			bits.clear();
-			bits.shrink_to_fit();
-			all = true;
-		}
-	};
 	using CellPin = std::pair<Cell*, IdString>;
 	std::vector<std::pair<std::string, Wire*>> design_ports;
 	std::vector<std::pair<std::string, Cell*>> design_cells;
 	std::vector<std::pair<std::string, CellPin>> design_pins;
 	std::vector<std::pair<std::string, Wire*>> design_nets;
 
-	dict<std::string, BitSelection> constrained_ports;
+	using PortPattern = std::tuple<std::string, Wire*, BitSelection>;
+	using PinPattern = std::tuple<std::string, SdcObjects::CellPin, BitSelection>;
+	std::vector<std::vector<PortPattern>> resolved_port_pattern_sets;
+	std::vector<std::vector<PinPattern>> resolved_pin_pattern_sets;
+	// TODO
+
+	dict<std::pair<std::string, Wire*>, BitSelection> constrained_ports;
 	pool<std::pair<std::string, Cell*>> constrained_cells;
 	dict<std::pair<std::string, CellPin>, BitSelection> constrained_pins;
 	dict<std::pair<std::string, Wire*>, BitSelection> constrained_nets;
@@ -156,6 +169,30 @@ struct SdcObjects {
 		sniff_module(hierarchy, top);
 	}
 	~SdcObjects() = default;
+
+	template <typename T, typename U>
+	void build_normal_result(Tcl_Interp* interp, std::vector<std::tuple<std::string, T, BitSelection>>&& resolved, U& tgt, std::function<size_t(T&)> width, Tcl_Obj*& result) {
+		if (!result)
+			result = Tcl_NewListObj(resolved.size(), nullptr);
+		for (auto [name, obj, matching_bits] : resolved) {
+			for (size_t i = 0; i < width(obj); i++)
+				if (matching_bits.is_set(i)) {
+					Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(name.c_str(), name.size()));
+					break;
+				}
+
+		}
+		size_t node_count = get_node_count(interp);
+		tgt.emplace_back(std::move(resolved));
+		log("%zu %zu\n", node_count, tgt.size());
+		log_assert(node_count == tgt.size());
+	}
+	template <typename T>
+	void merge_as_constrained(std::vector<std::tuple<std::string, T, BitSelection>>&& resolved) {
+		for (auto [name, obj, matching_bits] : resolved) {
+			merge_or_init(std::make_pair(name, obj), constrained_pins, matching_bits);
+		}
+	}
 	void dump() {
 		std::sort(design_ports.begin(), design_ports.end());
 		std::sort(design_cells.begin(), design_cells.end());
@@ -186,7 +223,9 @@ struct SdcObjects {
 		// }
 		// log("\n");
 		log("Constrained ports:\n");
-		for (auto [name, bits] : constrained_ports) {
+		for (auto [ref, bits] : constrained_ports) {
+			auto [name, port] = ref;
+			(void)port;
 			log("\t%s\n", name.c_str());
 			bits.dump();
 		}
@@ -213,16 +252,6 @@ struct SdcObjects {
 	}
 };
 
-template<typename T>
-static bool parse_flag(char* arg, const char* flag_name, T& flag_var) {
-	std::string expected = std::string("-") + flag_name;
-	if (expected == arg) {
-		flag_var = true;
-		return true;
-	}
-	return false;
-}
-
 // TODO vectors
 // TODO cell arrays?
 struct MatchConfig {
@@ -241,7 +270,7 @@ struct MatchConfig {
 		hier(hierarchical_flag ? FLAT : TREE) { }
 };
 
-static std::pair<bool, SdcObjects::BitSelection> matches(std::string name, const std::string& pat, const MatchConfig& config) {
+static std::pair<bool, BitSelection> matches(std::string name, const std::string& pat, const MatchConfig& config) {
 	(void)config;
 	bool got_bit_index = false;;
 	int bit_idx;
@@ -258,7 +287,7 @@ static std::pair<bool, SdcObjects::BitSelection> matches(std::string name, const
 		bit_idx = std::stoi(bit_selector);
 
 	}
-	SdcObjects::BitSelection bits = {};
+	BitSelection bits = {};
 	if (name == pat_base) {
 		if (got_bit_index) {
 			bits.set(bit_idx);
@@ -273,33 +302,38 @@ static std::pair<bool, SdcObjects::BitSelection> matches(std::string name, const
 	}
 }
 
+static int graph_node(TclCall call) {
+	// TODO is that it?
+	return redirect_unknown(call);
+}
 
-static int redirect_unknown(Tcl_Interp *interp, int objc, Tcl_Obj* const objv[]) {
-    Tcl_Obj *newCmd = Tcl_NewStringObj("unknown", -1);
-	auto newObjc = objc + 1;
-    Tcl_Obj **newObjv = new Tcl_Obj*[newObjc];
-    newObjv[0] = newCmd;
-    for (int i = 1; i < newObjc; i++) {
-        newObjv[i] = objv[i - 1];
-		log("newObjv %s\n", Tcl_GetString(newObjv[i]));
-    }
-    int result = Tcl_EvalObjv(interp, newObjc, newObjv, 0);
-    Tcl_DecrRefCount(newCmd);
-    delete[] newObjv;
+static int redirect_unknown(TclCall call) {
+	// TODO redirect to different command
+	Tcl_Obj *newCmd = Tcl_NewStringObj("unknown", -1);
+	auto newObjc = call.objc + 1;
+	Tcl_Obj **newObjv = new Tcl_Obj*[newObjc];
+	newObjv[0] = newCmd;
+	for (int i = 1; i < newObjc; i++) {
+		newObjv[i] = call.objv[i - 1];
+	}
+	int result = Tcl_EvalObjv(call.interp, newObjc, newObjv, 0);
+	Tcl_DecrRefCount(newCmd);
+	delete[] newObjv;
 	return result;
 }
 
+
 struct SdcGraphNode {
-    using Child = std::variant<SdcGraphNode*, std::string>;
-    std::vector<Child> children;
-    SdcGraphNode() = default;
-    void addChild(SdcGraphNode* child) {
-        children.push_back(child);
-    }
-    void addChild(std::string tcl_string) {
-        children.push_back(tcl_string);
-    }
-    void dump(std::ostream& os) const {
+	using Child = std::variant<SdcGraphNode*, std::string>;
+	std::vector<Child> children;
+	SdcGraphNode() = default;
+	void addChild(SdcGraphNode* child) {
+		children.push_back(child);
+	}
+	void addChild(std::string tcl_string) {
+		children.push_back(tcl_string);
+	}
+	void dump(std::ostream& os) const {
 		bool first = true;
 		for (auto child : children) {
 			if (first) {
@@ -317,13 +351,20 @@ struct SdcGraphNode {
 				log_assert(false);
 			}
 		}
-    }
+	}
 };
 
+static size_t get_node_count(Tcl_Interp* interp) {
+	const char* idx_raw = Tcl_GetVar(interp, "sdc_call_index", TCL_GLOBAL_ONLY);
+	log_assert(idx_raw);
+	std::string idx(idx_raw);
+	for (auto c : idx)
+		if (!std::isdigit(c))
+			log_error("sdc_call_index non-numeric value %s\n", idx.c_str());
+	return std::stoi(idx);
+}
+
 std::vector<std::vector<std::string>> gather_nested_calls(Tcl_Interp* interp) {
-	const char* idx_s = Tcl_GetVar(interp, "sdc_call_index", TCL_GLOBAL_ONLY);
-	log_assert(idx_s);
-	size_t node_count = std::stoi(idx_s);
 
 	Tcl_Obj* listObj = Tcl_GetVar2Ex(interp, "sdc_calls", nullptr, TCL_GLOBAL_ONLY);
 	int listLength;
@@ -354,7 +395,7 @@ std::vector<std::vector<std::string>> gather_nested_calls(Tcl_Interp* interp) {
 			sdc_calls.push_back(subList);
 		}
 	}
-	log_assert(sdc_calls.size() == node_count);
+	log_assert(sdc_calls.size() == get_node_count(interp));
 	return sdc_calls;
 }
 
@@ -412,11 +453,13 @@ void inspect_globals(Tcl_Interp* interp) {
 	std::vector<SdcGraphNode> graph = build_graph(sdc_calls);
 	dump_sdc_graph(graph, node_ownership(graph));
 }
+
+// patterns -> (pattern-object-bit)s
 template <typename T, typename U>
-std::vector<std::tuple<std::string, T, SdcObjects::BitSelection>>
+std::vector<std::tuple<std::string, T, BitSelection>>
 find_matching(U objects, const MatchConfig& config, const std::vector<std::string> &patterns, const char* obj_type)
 {
-	std::vector<std::tuple<std::string, T, SdcObjects::BitSelection>> resolved;
+	std::vector<std::tuple<std::string, T, BitSelection>> resolved;
 	for (auto pat : patterns) {
 		bool found = false;
 		for (auto [name, obj] : objects) {
@@ -424,6 +467,7 @@ find_matching(U objects, const MatchConfig& config, const std::vector<std::strin
 			if (does_match) {
 				found = true;
 				resolved.push_back(std::make_tuple(name, obj, matching_bits));
+				// TODO add a continue statement, conditional on config
 			}
 		}
 		if (!found)
@@ -431,73 +475,120 @@ find_matching(U objects, const MatchConfig& config, const std::vector<std::strin
 	}
 	return resolved;
 }
-static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
-{
-	auto* objects = (SdcObjects*)data;
-	// When this flag is present, the search for the pattern is made in all positions in the hierarchy.
+struct GetterOpts {
 	bool hierarchical_flag = false;
 	bool regexp_flag = false;
 	bool nocase_flag = false;
 	std::string separator = "/";
 	Tcl_Obj* of_objects = nullptr;
-	std::vector<std::string> patterns;
-	int i = 1;
-	for (; i < objc; i++) {
-		if (parse_flag(Tcl_GetString(objv[i]), "hierarchical", hierarchical_flag)) continue;
-		if (parse_flag(Tcl_GetString(objv[i]), "hier", hierarchical_flag)) continue;
-		if (parse_flag(Tcl_GetString(objv[i]), "regexp", regexp_flag)) continue;
-		if (parse_flag(Tcl_GetString(objv[i]), "nocase", nocase_flag)) continue;
-		if (!strcmp(Tcl_GetString(objv[i]), "-hsc")) {
-			separator = Tcl_GetString(objv[++i]);
-			continue;
+	std::vector<std::string> patterns = {};
+	std::initializer_list<const char*> legals;
+	const char* name;
+	GetterOpts(const char* name, std::initializer_list<const char*> legals) : legals(legals), name(name) {}
+	bool parse_opt(Tcl_Obj* obj, const char* opt_name) {
+		char* arg = Tcl_GetString(obj);
+		std::string expected = std::string("-") + opt_name;
+		if (expected == arg) {
+			if (!std::find_if(legals.begin(), legals.end(),
+					   [&opt_name](const char* str) { return opt_name == str; }))
+				log_cmd_error("Illegal argument %s for %s.\n", expected.c_str(), name);
+			return true;
 		}
-		if (!strcmp(Tcl_GetString(objv[i]), "-of_objects")) {
-			of_objects = objv[++i];
-			continue;
+		return false;
+	}
+	template<typename T>
+	bool parse_flag(Tcl_Obj* obj, const char* flag_name, T& flag_var) {
+		bool ret = parse_opt(obj, flag_name);
+		if (ret)
+			flag_var = true;
+		return ret;
+	}
+	void parse(int objc, Tcl_Obj* const objv[]) {
+		int i = 1;
+		for (; i < objc; i++) {
+			if (parse_flag(objv[i], "hierarchical", hierarchical_flag)) continue;
+			if (parse_flag(objv[i], "hier", hierarchical_flag)) continue;
+			if (parse_flag(objv[i], "regexp", regexp_flag)) continue;
+			if (parse_flag(objv[i], "nocase", nocase_flag)) continue;
+			if (parse_opt(objv[i], "hsc")) {
+				log_assert(i + 1 < objc);
+				separator = Tcl_GetString(objv[++i]);
+				continue;
+			}
+			if (parse_opt(objv[i], "of_objects")) {
+				log_assert(i + 1 < objc);
+				of_objects = objv[++i];
+				continue;
+			}
+			break;
 		}
-		// Onto the next loop
-		break;
-	}
-	for (; i < objc; i++) {
-		patterns.push_back(Tcl_GetString(objv[i]));
-	}
-	if (objects->collect_mode == SdcObjects::CollectMode::SimpleGetter) {
+		for (; i < objc; i++) {
+			patterns.push_back(Tcl_GetString(objv[i]));
+		}
+	};
+	void check_simple() {
 		if (regexp_flag || hierarchical_flag || nocase_flag || separator != "/" || of_objects) {
-			log_error("get_pins got unexpected flags in simple mode\n");
-		}
-		if (patterns.size() != 1) {
-			log_error("get_pins got unexpected number of patterns in simple mode\n");
+			log_error("%s got unexpected flags in simple mode\n", name);
 		}
+		if (patterns.size() != 1)
+			log_error("%s got unexpected number of patterns in simple mode: %zu\n", name, patterns.size());
 	}
+	void check_simple_sep() {
+		if (separator != "/")
+			log_error("Only '/' accepted as separator");
+	}
+};
 
-	MatchConfig config(regexp_flag, nocase_flag, hierarchical_flag);
-	std::vector<std::tuple<std::string, SdcObjects::CellPin, SdcObjects::BitSelection>> resolved;
+// void build_normal_result(Tcl_Interp* interp, size_t list_len, size_t width, const std::string& name, Tcl_Obj*& result, const BitSelection& matching_bits) {
+// 	if (!result)
+// 		result = Tcl_NewListObj(list_len, nullptr);
+// 	for (size_t i = 0; i < width; i++)
+// 		if (matching_bits.is_set(i))
+// 			Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(name.c_str(), name.size()));
+// }
+
+template <typename T>
+void merge_or_init(const T& key, dict<T, BitSelection>& dst, const BitSelection& src) {
+	if (dst.count(key) == 0) {
+		dst[key] = src;
+	} else {
+		dst[key].merge(src);
+	}
+}
+
+static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
+{
+	auto* objects = (SdcObjects*)data;
+	GetterOpts opts("get_pins", {"hierarchical", "hier", "regexp", "nocase", "hsc", "of_objects"});
+	opts.parse(objc, objv);
+	if (objects->collect_mode == SdcObjects::CollectMode::SimpleGetter)
+		opts.check_simple();
+	opts.check_simple_sep();
+
+	MatchConfig config(opts.regexp_flag, opts.nocase_flag, opts.hierarchical_flag);
+	std::vector<std::tuple<std::string, SdcObjects::CellPin, BitSelection>> resolved;
 	const auto& pins = objects->design_pins;
-	resolved = find_matching<SdcObjects::CellPin, decltype(pins)>(pins, config, patterns, "pin");
-
-	if (separator != "/") {
-		Tcl_SetResult(interp, (char *)"Only '/' accepted as separator", TCL_STATIC);
-		return TCL_ERROR;
-	}
+	resolved = find_matching<SdcObjects::CellPin, decltype(pins)>(pins, config, opts.patterns, "pin");
 
 	Tcl_Obj *result = nullptr;
-	for (auto [name, pin, matching_bits] : resolved) {
-		if (objects->value_mode == SdcObjects::ValueMode::Normal) {
-			if (!result)
-				result = Tcl_NewListObj(resolved.size(), nullptr);
-			size_t width = (size_t)pin.first->getPort(pin.second).size();
-			for (size_t i = 0; i < width; i++)
-				if (matching_bits.is_set(i))
-					Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(name.c_str(), name.size()));
-		}
+	if (objects->value_mode == SdcObjects::ValueMode::Normal) {
+		log_error("TODO normal\n");
+		auto width = [](SdcObjects::CellPin& pin) -> size_t {
+			return (size_t)pin.first->getPort(pin.second).size();
+		};
+		objects->build_normal_result<SdcObjects::CellPin, decltype(objects->resolved_pin_pattern_sets)>(interp, std::move(resolved), objects->resolved_pin_pattern_sets, width, result);
+	} else if (objects->value_mode == SdcObjects::ValueMode::Graph)
+		return graph_node(TclCall{interp, objc, objv});
 
-		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
-			objects->constrained_pins[std::make_pair(name, pin)].merge(matching_bits);
-	}
+	if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
+		objects->merge_as_constrained(std::move(resolved));
+		// merge_or_init(std::make_pair(name, pin), objects->constrained_pins, matching_bits);
+		// TODO
+	// }
+
+	
+		// return objects->graph_node(interp, objc, objv, std::move(resolved), objects->resolved_pin_pattern_sets);
 
-	if (objects->value_mode == SdcObjects::ValueMode::Graph) {
-		return redirect_unknown(interp, objc, objv);
-	}
 	if (result)
 		Tcl_SetObjResult(interp, result);
 	return TCL_OK;
@@ -506,57 +597,32 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
 {
 	auto* objects = (SdcObjects*)data;
-	bool regexp_flag = false;
-	bool nocase_flag = false;
-	std::vector<std::string> patterns;
-	int i = 1;
-	for (; i < objc; i++) {
-		if (parse_flag(Tcl_GetString(objv[i]), "regexp", regexp_flag)) continue;
-		if (parse_flag(Tcl_GetString(objv[i]), "nocase", nocase_flag)) continue;
-		// Onto the next loop
-		break;
-	}
-	for (; i < objc; i++) {
-		patterns.push_back(Tcl_GetString(objv[i]));
-	}
-	if (objects->collect_mode == SdcObjects::CollectMode::SimpleGetter) {
-		if (regexp_flag || nocase_flag) {
-			log_error("get_ports got unexpected flags in simple mode\n");
-		}
-		if (patterns.size() != 1) {
-			log_error("get_ports got unexpected number of patterns in simple mode\n");
-		}
-	}
+	GetterOpts opts("get_ports", {"regexp", "nocase"});
+	opts.parse(objc, objv);
+	if (objects->collect_mode == SdcObjects::CollectMode::SimpleGetter)
+		opts.check_simple();
 
-	MatchConfig config(regexp_flag, nocase_flag, false);
-	std::vector<std::tuple<std::string, Wire*, SdcObjects::BitSelection>> resolved;
+	MatchConfig config(opts.regexp_flag, opts.nocase_flag, false);
+	std::vector<std::tuple<std::string, Wire*, BitSelection>> resolved;
 	const auto& ports = objects->design_ports;
-	resolved = find_matching<Wire*, decltype(ports)>(ports, config, patterns, "port");
+	resolved = find_matching<Wire*, decltype(ports)>(ports, config, opts.patterns, "port");
 
 	Tcl_Obj *result = nullptr;
 	for (auto [name, wire, matching_bits] : resolved) {
-		if (objects->value_mode == SdcObjects::ValueMode::Normal) {
-			if (!result)
-				result = Tcl_NewListObj(resolved.size(), nullptr);
-			size_t width = wire->width;
-			for (size_t i = 0; i < width; i++)
-				if (matching_bits.is_set(i))
-					Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(name.c_str(), name.size()));
-		}
-		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint) {
-			if (objects->constrained_ports.count(name) == 0) {
-				objects->constrained_ports[name] = matching_bits;
-			} else {
-				objects->constrained_ports[name].merge(matching_bits);
-			}
-		}
+		if (objects->value_mode == SdcObjects::ValueMode::Normal)
+			log_error("TODO normal\n");
+			// objects->build_normal_result(interp, resolved.size(), wire->width, name, result, matching_bits);
+
+		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
+			merge_or_init(std::make_pair(name, wire), objects->constrained_ports, matching_bits);
 	}
 
 	if (objects->value_mode == SdcObjects::ValueMode::Graph) {
-		return redirect_unknown(interp, objc, objv);
+		return graph_node(TclCall{interp, objc, objv});
+		// return objects->graph_node(interp, objc, objv, std::move(resolved), objects->resolved_port_pattern_sets);
 	}
-
-	Tcl_SetObjResult(interp, result);
+	if (result)
+		Tcl_SetObjResult(interp, result);
 	return TCL_OK;
 }
 
@@ -592,10 +658,10 @@ static int ys_track_typed_key_cmd(ClientData data, Tcl_Interp *interp, int objc,
 	if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
 		return TCL_OK;
 
-	std::string key_name         = Tcl_GetString(objv[1]);
-	Tcl_Obj* key_value           = objv[2];
+	std::string key_name		 = Tcl_GetString(objv[1]);
+	Tcl_Obj* key_value		   = objv[2];
 	std::string key_expect_type  = Tcl_GetString(objv[3]);
-	std::string proc_name        = Tcl_GetString(objv[4]);
+	std::string proc_name		= Tcl_GetString(objv[4]);
 
 	auto track_typed = [key_expect_type, objects, proc_name, key_name](const char* str) -> void {
 		auto split = split_at(str);
@@ -608,7 +674,7 @@ static int ys_track_typed_key_cmd(ClientData data, Tcl_Interp *interp, int objc,
 			bool found = false;
 			for (auto [name, pin] : objects->design_pins) {
 				log_error("TODO temporarily disabled due to working on a different flow\n");
-				// if (name + "/" + pin->name.str() == str) {
+				// if (name + "/" + pin.name.str() == str) {
 				// 	found = true;
 				// 	objects->constrained_pins.insert(std::make_pair(name, pin));
 				// 	break; // resolved, expected unique
@@ -674,7 +740,7 @@ public:
 struct SdcPass : public Pass {
 	// TODO help
 	SdcPass() : Pass("sdc", "sniff at some SDC") { }
-void execute(std::vector<std::string> args, RTLIL::Design *design) override {
+	void execute(std::vector<std::string> args, RTLIL::Design *design) override {
 		log_header(design, "Executing SDC pass.\n");
 		size_t argidx;
 		std::vector<std::string> opensta_stubs_paths;

From d4228efae84cf0f9bbdab5f1150a07489d1dae19 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 2 Oct 2025 16:45:41 +0200
Subject: [PATCH 895/931] sdc: keep_hiearchy

---
 passes/cmds/sdc.cc | 70 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 64 insertions(+), 6 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index 9a2a5b1ed..c3cd0ed0a 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -97,6 +97,7 @@ struct SdcObjects {
 		Graph,
 	} value_mode;
 	using CellPin = std::pair<Cell*, IdString>;
+	Design* design;
 	std::vector<std::pair<std::string, Wire*>> design_ports;
 	std::vector<std::pair<std::string, Cell*>> design_cells;
 	std::vector<std::pair<std::string, CellPin>> design_pins;
@@ -158,7 +159,7 @@ struct SdcObjects {
 			}
 		}
 	}
-	SdcObjects(Design* design) {
+	SdcObjects(Design* design) : design(design) {
 		Module* top = design->top_module();
 		if (!top)
 			log_error("Top module couldn't be determined. Check 'top' attribute usage");
@@ -250,6 +251,47 @@ struct SdcObjects {
 		}
 		log("\n");
 	}
+
+	class KeepHierarchyWorker {
+		std::unordered_set<Module*> tracked_modules = {};
+		Design* design = nullptr;
+		bool mark(Module* mod) {
+			for (auto* cell : mod->cells()) {
+				if (auto* submod = design->module(cell->type))
+					if (mark(submod))
+						return true;
+			}
+
+			if (tracked_modules.count(mod))
+				return true;
+
+			return false;
+		}
+	public:
+		KeepHierarchyWorker(SdcObjects* objects, Design* d) : design(d) {
+			for (auto [ref, _] : objects->constrained_ports) {
+				tracked_modules.insert(ref.second->module);
+			}
+			for (auto& [_, cell] : objects->constrained_cells) {
+				tracked_modules.insert(cell->module);
+			}
+			for (auto& [ref, _] : objects->constrained_pins) {
+				tracked_modules.insert(ref.second.first->module);
+			}
+			for (auto& [ref, _] : objects->constrained_nets) {
+				tracked_modules.insert(ref.second->module);
+			}
+			log_debug("keep_hierarchy tracked modules:\n");
+			for (auto* mod : tracked_modules)
+				log_debug("%s", mod->name);
+		}
+		bool mark() {
+			return mark(design->top_module());
+		}
+	};
+	void keep_hierarchy() {
+		(void)KeepHierarchyWorker(this, design).mark();
+	}
 };
 
 // TODO vectors
@@ -448,10 +490,11 @@ void dump_sdc_graph(const std::vector<SdcGraphNode>& graph, const std::vector<bo
 	}
 }
 
-void inspect_globals(Tcl_Interp* interp) {
+void inspect_globals(Tcl_Interp* interp, bool dump_mode) {
 	std::vector<std::vector<std::string>> sdc_calls = gather_nested_calls(interp);
 	std::vector<SdcGraphNode> graph = build_graph(sdc_calls);
-	dump_sdc_graph(graph, node_ownership(graph));
+	if (dump_mode)
+		dump_sdc_graph(graph, node_ownership(graph));
 }
 
 // patterns -> (pattern-object-bit)s
@@ -743,9 +786,21 @@ struct SdcPass : public Pass {
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override {
 		log_header(design, "Executing SDC pass.\n");
 		size_t argidx;
+		bool graph_mode = false;
+		bool dump_mode = false;
+		bool keep_hierarchy_mode = false;
 		std::vector<std::string> opensta_stubs_paths;
 		for (argidx = 1; argidx < args.size(); argidx++) {
-			if (args[argidx] == "-stubs" && argidx+1 < args.size()) {
+			if (args[argidx] == "-graph") {
+				graph_mode = true;
+				continue;
+			} else if (args[argidx] == "-dump") {
+				dump_mode = true;
+				continue;
+			} else if (args[argidx] == "-keep_hierarchy") {
+				keep_hierarchy_mode = true;
+				continue;
+			} else if (args[argidx] == "-stubs" && argidx+1 < args.size()) {
 				opensta_stubs_paths.push_back(args[++argidx]);
 				continue;
 			}
@@ -767,8 +822,11 @@ struct SdcPass : public Pass {
 				log_cmd_error("SDC interpreter returned an error in OpenSTA stub file %s: %s\n", path.c_str(), Tcl_GetStringResult(interp));
 		if (Tcl_EvalFile(interp, sdc_path.c_str()) != TCL_OK)
 			log_cmd_error("SDC interpreter returned an error: %s\n", Tcl_GetStringResult(interp));
-		sdc.objects->dump();
-		inspect_globals(interp);
+		if (dump_mode)
+			sdc.objects->dump();
+		if (keep_hierarchy_mode)
+			sdc.objects->keep_hierarchy();
+		inspect_globals(interp, graph_mode);
 		Tcl_Release(interp);
 	}
 } SdcPass;

From 8a54e513008e9d6739da1240ca00e19a45a4baf1 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 2 Oct 2025 16:52:46 +0200
Subject: [PATCH 896/931] sdc: add -keep_hierarchy

---
 passes/cmds/sdc.cc    | 43 ++++++++++++++++++++++++++++++++++++++++---
 passes/cmds/stubs.sdc |  2 +-
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index c3cd0ed0a..719cbef64 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -258,12 +258,16 @@ struct SdcObjects {
 		bool mark(Module* mod) {
 			for (auto* cell : mod->cells()) {
 				if (auto* submod = design->module(cell->type))
-					if (mark(submod))
+					if (mark(submod)) {
+						mod->set_bool_attribute(ID::keep_hierarchy);
 						return true;
+					}
 			}
 
-			if (tracked_modules.count(mod))
+			if (tracked_modules.count(mod)) {
+				mod->set_bool_attribute(ID::keep_hierarchy);
 				return true;
+			}
 
 			return false;
 		}
@@ -283,7 +287,7 @@ struct SdcObjects {
 			}
 			log_debug("keep_hierarchy tracked modules:\n");
 			for (auto* mod : tracked_modules)
-				log_debug("%s", mod->name);
+				log_debug("\t%s\n", mod->name);
 		}
 		bool mark() {
 			return mark(design->top_module());
@@ -669,6 +673,38 @@ static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_
 	return TCL_OK;
 }
 
+static int sdc_get_nets_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
+{
+	auto* objects = (SdcObjects*)data;
+	GetterOpts opts("get_nets", {"hierarchical", "hier", "regexp", "nocase", "hsc", "of_objects"});
+	opts.parse(objc, objv);
+	if (objects->collect_mode == SdcObjects::CollectMode::SimpleGetter)
+		opts.check_simple();
+
+	MatchConfig config(opts.regexp_flag, opts.nocase_flag, false);
+	std::vector<std::tuple<std::string, Wire*, BitSelection>> resolved;
+	const auto& ports = objects->design_nets;
+	resolved = find_matching<Wire*, decltype(ports)>(ports, config, opts.patterns, "net");
+
+	Tcl_Obj *result = nullptr;
+	for (auto [name, wire, matching_bits] : resolved) {
+		if (objects->value_mode == SdcObjects::ValueMode::Normal)
+			log_error("TODO normal\n");
+			// objects->build_normal_result(interp, resolved.size(), wire->width, name, result, matching_bits);
+
+		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
+			merge_or_init(std::make_pair(name, wire), objects->constrained_nets, matching_bits);
+	}
+
+	if (objects->value_mode == SdcObjects::ValueMode::Graph) {
+		return graph_node(TclCall{interp, objc, objv});
+		// return objects->graph_node(interp, objc, objv, std::move(resolved), objects->resolved_port_pattern_sets);
+	}
+	if (result)
+		Tcl_SetObjResult(interp, result);
+	return TCL_OK;
+}
+
 std::optional<std::tuple<std::string, std::string>> split_at(std::string s)
 {
 	size_t pos = s.find('@');
@@ -773,6 +809,7 @@ public:
 		objects->collect_mode = SdcObjects::CollectMode::SimpleGetter;
 		objects->value_mode = SdcObjects::ValueMode::Graph;
 		Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, (ClientData) objects.get(), NULL);
+		Tcl_CreateObjCommand(interp, "get_nets", sdc_get_nets_cmd, (ClientData) objects.get(), NULL);
 		Tcl_CreateObjCommand(interp, "get_ports", sdc_get_ports_cmd, (ClientData) objects.get(), NULL);
 		Tcl_CreateObjCommand(interp, "ys_track_typed_key", ys_track_typed_key_cmd, (ClientData) objects.get(), NULL);
 		return interp;
diff --git a/passes/cmds/stubs.sdc b/passes/cmds/stubs.sdc
index f89050f6f..591d4d6cd 100644
--- a/passes/cmds/stubs.sdc
+++ b/passes/cmds/stubs.sdc
@@ -26,7 +26,7 @@ proc unknown {args} {
     set ret "YOSYS_SDC_MAGIC_NODE_$sdc_call_index"
     incr sdc_call_index
     lappend sdc_calls $args
-    puts "unknown $args, returning YOSYS_SDC_MAGIC_NODE_$sdc_call_index"
+    # puts "unknown $args, returning YOSYS_SDC_MAGIC_NODE_$sdc_call_index"
     return $ret
 }
 proc list {args} {

From 94dd248dfb0ce9d7a022ce4876fba2e5288dd7dd Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 7 Oct 2025 16:41:31 +0200
Subject: [PATCH 897/931] sdc: graph mode only

---
 passes/cmds/sdc.cc | 91 ++++++++++++----------------------------------
 1 file changed, 23 insertions(+), 68 deletions(-)

diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc.cc
index 719cbef64..f21973480 100644
--- a/passes/cmds/sdc.cc
+++ b/passes/cmds/sdc.cc
@@ -90,12 +90,6 @@ struct SdcObjects {
 		// constraint-side tracking
 		FullConstraint,
 	} collect_mode;
-	enum ValueMode {
-		// return something sensible and error on unknown
-		Normal,
-		// return a new graph node assuming unknown is overridden
-		Graph,
-	} value_mode;
 	using CellPin = std::pair<Cell*, IdString>;
 	Design* design;
 	std::vector<std::pair<std::string, Wire*>> design_ports;
@@ -522,16 +516,11 @@ find_matching(U objects, const MatchConfig& config, const std::vector<std::strin
 	}
 	return resolved;
 }
-struct GetterOpts {
-	bool hierarchical_flag = false;
-	bool regexp_flag = false;
-	bool nocase_flag = false;
-	std::string separator = "/";
-	Tcl_Obj* of_objects = nullptr;
-	std::vector<std::string> patterns = {};
-	std::initializer_list<const char*> legals;
+
+struct TclOpts {
 	const char* name;
-	GetterOpts(const char* name, std::initializer_list<const char*> legals) : legals(legals), name(name) {}
+	std::initializer_list<const char*> legals;
+	TclOpts(const char* name, std::initializer_list<const char*> legals) : name(name), legals(legals)  {}
 	bool parse_opt(Tcl_Obj* obj, const char* opt_name) {
 		char* arg = Tcl_GetString(obj);
 		std::string expected = std::string("-") + opt_name;
@@ -543,6 +532,16 @@ struct GetterOpts {
 		}
 		return false;
 	}
+};
+
+struct GetterOpts : TclOpts {
+	bool hierarchical_flag = false;
+	bool regexp_flag = false;
+	bool nocase_flag = false;
+	std::string separator = "/";
+	Tcl_Obj* of_objects = nullptr;
+	std::vector<std::string> patterns = {};
+	GetterOpts(const char* name, std::initializer_list<const char*> legals) : TclOpts(name, legals) {}
 	template<typename T>
 	bool parse_flag(Tcl_Obj* obj, const char* flag_name, T& flag_var) {
 		bool ret = parse_opt(obj, flag_name);
@@ -617,28 +616,7 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 	const auto& pins = objects->design_pins;
 	resolved = find_matching<SdcObjects::CellPin, decltype(pins)>(pins, config, opts.patterns, "pin");
 
-	Tcl_Obj *result = nullptr;
-	if (objects->value_mode == SdcObjects::ValueMode::Normal) {
-		log_error("TODO normal\n");
-		auto width = [](SdcObjects::CellPin& pin) -> size_t {
-			return (size_t)pin.first->getPort(pin.second).size();
-		};
-		objects->build_normal_result<SdcObjects::CellPin, decltype(objects->resolved_pin_pattern_sets)>(interp, std::move(resolved), objects->resolved_pin_pattern_sets, width, result);
-	} else if (objects->value_mode == SdcObjects::ValueMode::Graph)
-		return graph_node(TclCall{interp, objc, objv});
-
-	if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
-		objects->merge_as_constrained(std::move(resolved));
-		// merge_or_init(std::make_pair(name, pin), objects->constrained_pins, matching_bits);
-		// TODO
-	// }
-
-	
-		// return objects->graph_node(interp, objc, objv, std::move(resolved), objects->resolved_pin_pattern_sets);
-
-	if (result)
-		Tcl_SetObjResult(interp, result);
-	return TCL_OK;
+	return graph_node(TclCall{interp, objc, objv});
 }
 
 static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
@@ -654,23 +632,12 @@ static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_
 	const auto& ports = objects->design_ports;
 	resolved = find_matching<Wire*, decltype(ports)>(ports, config, opts.patterns, "port");
 
-	Tcl_Obj *result = nullptr;
 	for (auto [name, wire, matching_bits] : resolved) {
-		if (objects->value_mode == SdcObjects::ValueMode::Normal)
-			log_error("TODO normal\n");
-			// objects->build_normal_result(interp, resolved.size(), wire->width, name, result, matching_bits);
-
 		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
 			merge_or_init(std::make_pair(name, wire), objects->constrained_ports, matching_bits);
 	}
 
-	if (objects->value_mode == SdcObjects::ValueMode::Graph) {
-		return graph_node(TclCall{interp, objc, objv});
-		// return objects->graph_node(interp, objc, objv, std::move(resolved), objects->resolved_port_pattern_sets);
-	}
-	if (result)
-		Tcl_SetObjResult(interp, result);
-	return TCL_OK;
+	return graph_node(TclCall{interp, objc, objv});
 }
 
 static int sdc_get_nets_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
@@ -686,23 +653,12 @@ static int sdc_get_nets_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 	const auto& ports = objects->design_nets;
 	resolved = find_matching<Wire*, decltype(ports)>(ports, config, opts.patterns, "net");
 
-	Tcl_Obj *result = nullptr;
 	for (auto [name, wire, matching_bits] : resolved) {
-		if (objects->value_mode == SdcObjects::ValueMode::Normal)
-			log_error("TODO normal\n");
-			// objects->build_normal_result(interp, resolved.size(), wire->width, name, result, matching_bits);
-
 		if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
 			merge_or_init(std::make_pair(name, wire), objects->constrained_nets, matching_bits);
 	}
 
-	if (objects->value_mode == SdcObjects::ValueMode::Graph) {
-		return graph_node(TclCall{interp, objc, objv});
-		// return objects->graph_node(interp, objc, objv, std::move(resolved), objects->resolved_port_pattern_sets);
-	}
-	if (result)
-		Tcl_SetObjResult(interp, result);
-	return TCL_OK;
+	return graph_node(TclCall{interp, objc, objv});
 }
 
 std::optional<std::tuple<std::string, std::string>> split_at(std::string s)
@@ -807,7 +763,6 @@ public:
 
 		objects = std::make_unique<SdcObjects>(design);
 		objects->collect_mode = SdcObjects::CollectMode::SimpleGetter;
-		objects->value_mode = SdcObjects::ValueMode::Graph;
 		Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, (ClientData) objects.get(), NULL);
 		Tcl_CreateObjCommand(interp, "get_nets", sdc_get_nets_cmd, (ClientData) objects.get(), NULL);
 		Tcl_CreateObjCommand(interp, "get_ports", sdc_get_ports_cmd, (ClientData) objects.get(), NULL);
@@ -823,17 +778,17 @@ struct SdcPass : public Pass {
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override {
 		log_header(design, "Executing SDC pass.\n");
 		size_t argidx;
-		bool graph_mode = false;
 		bool dump_mode = false;
+		bool dump_graph_mode = false;
 		bool keep_hierarchy_mode = false;
 		std::vector<std::string> opensta_stubs_paths;
 		for (argidx = 1; argidx < args.size(); argidx++) {
-			if (args[argidx] == "-graph") {
-				graph_mode = true;
-				continue;
-			} else if (args[argidx] == "-dump") {
+			if (args[argidx] == "-dump") {
 				dump_mode = true;
 				continue;
+			} else if (args[argidx] == "-dump-graph") {
+				dump_graph_mode = true;
+				continue;
 			} else if (args[argidx] == "-keep_hierarchy") {
 				keep_hierarchy_mode = true;
 				continue;
@@ -863,7 +818,7 @@ struct SdcPass : public Pass {
 			sdc.objects->dump();
 		if (keep_hierarchy_mode)
 			sdc.objects->keep_hierarchy();
-		inspect_globals(interp, graph_mode);
+		inspect_globals(interp, dump_graph_mode);
 		Tcl_Release(interp);
 	}
 } SdcPass;

From 224ed524fa6effede43b004221f95783faad8446 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Tue, 7 Oct 2025 18:09:12 +0200
Subject: [PATCH 898/931] sdc: move to directory

---
 passes/cmds/Makefile.inc        | 3 +--
 passes/cmds/sdc/Makefile.inc    | 3 +++
 passes/cmds/{ => sdc}/sdc.cc    | 0
 passes/cmds/{ => sdc}/stubs.sdc | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 passes/cmds/sdc/Makefile.inc
 rename passes/cmds/{ => sdc}/sdc.cc (100%)
 rename passes/cmds/{ => sdc}/stubs.sdc (93%)

diff --git a/passes/cmds/Makefile.inc b/passes/cmds/Makefile.inc
index f64fdea55..c4d43fd70 100644
--- a/passes/cmds/Makefile.inc
+++ b/passes/cmds/Makefile.inc
@@ -58,6 +58,5 @@ OBJS += passes/cmds/test_select.o
 OBJS += passes/cmds/timeest.o
 OBJS += passes/cmds/linecoverage.o
 OBJS += passes/cmds/sort.o
-OBJS += passes/cmds/sdc.o
 
-$(eval $(call add_share_file,share/sdc,passes/cmds/stubs.sdc))
+include $(YOSYS_SRC)/passes/cmds/sdc/Makefile.inc
diff --git a/passes/cmds/sdc/Makefile.inc b/passes/cmds/sdc/Makefile.inc
new file mode 100644
index 000000000..1962f622f
--- /dev/null
+++ b/passes/cmds/sdc/Makefile.inc
@@ -0,0 +1,3 @@
+OBJS += passes/cmds/sdc/sdc.o
+
+$(eval $(call add_share_file,share/sdc,passes/cmds/sdc/stubs.sdc))
diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc/sdc.cc
similarity index 100%
rename from passes/cmds/sdc.cc
rename to passes/cmds/sdc/sdc.cc
diff --git a/passes/cmds/stubs.sdc b/passes/cmds/sdc/stubs.sdc
similarity index 93%
rename from passes/cmds/stubs.sdc
rename to passes/cmds/sdc/stubs.sdc
index 591d4d6cd..247fe0abd 100644
--- a/passes/cmds/stubs.sdc
+++ b/passes/cmds/sdc/stubs.sdc
@@ -13,7 +13,6 @@ stub ys_track_untyped_key
 stub ys_err_key
 stub ys_err_flag
 
-# TODO move to separate file and tie to graph value mode
 proc unknown {args} {
     global sdc_call_index
     global sdc_calls

From 07de7509bf0bff0ec59787235f978fcb134188d0 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 8 Oct 2025 12:51:56 +0200
Subject: [PATCH 899/931] sdc: add -keep_hierarchy test

---
 Makefile                   |  1 +
 tests/sdc/alu_sub.sdc      | 70 ++++++++++++++++++++++++++++++++++++++
 tests/sdc/alu_sub.v        | 62 +++++++++++++++++++++++++++++++++
 tests/sdc/alu_sub.ys       | 14 ++++++++
 tests/sdc/run-test.sh      |  4 +++
 tests/sdc/side-effects.sdc |  2 ++
 tests/sdc/side-effects.sh  |  4 +++
 tests/various/sdc.sdc      |  5 ---
 8 files changed, 157 insertions(+), 5 deletions(-)
 create mode 100644 tests/sdc/alu_sub.sdc
 create mode 100644 tests/sdc/alu_sub.v
 create mode 100644 tests/sdc/alu_sub.ys
 create mode 100755 tests/sdc/run-test.sh
 create mode 100644 tests/sdc/side-effects.sdc
 create mode 100755 tests/sdc/side-effects.sh
 delete mode 100644 tests/various/sdc.sdc

diff --git a/Makefile b/Makefile
index 6984ba5f1..c16dbf175 100644
--- a/Makefile
+++ b/Makefile
@@ -902,6 +902,7 @@ MK_TEST_DIRS += tests/arch/xilinx
 MK_TEST_DIRS += tests/bugpoint
 MK_TEST_DIRS += tests/opt
 MK_TEST_DIRS += tests/sat
+MK_TEST_DIRS += tests/sdc
 MK_TEST_DIRS += tests/sim
 MK_TEST_DIRS += tests/svtypes
 MK_TEST_DIRS += tests/techmap
diff --git a/tests/sdc/alu_sub.sdc b/tests/sdc/alu_sub.sdc
new file mode 100644
index 000000000..f298d20bc
--- /dev/null
+++ b/tests/sdc/alu_sub.sdc
@@ -0,0 +1,70 @@
+###############################################################################
+# Created by write_sdc
+# Fri Oct  3 11:26:00 2025
+###############################################################################
+current_design wrapper
+###############################################################################
+# Timing Constraints
+###############################################################################
+create_clock -name this_clk -period 1.0000 [get_ports {clk}]
+create_clock -name that_clk -period 2.0000 
+create_clock -name another_clk -period 2.0000 \
+    [list [get_ports {A[0]}]\
+          [get_ports {A[1]}]\
+          [get_ports {A[2]}]\
+          [get_ports {A[3]}]\
+          [get_ports {A[4]}]\
+          [get_ports {A[5]}]\
+          [get_ports {A[6]}]\
+          [get_ports {A[7]}]\
+          [get_ports {B[0]}]\
+          [get_ports {B[1]}]\
+          [get_ports {B[2]}]\
+          [get_ports {B[3]}]\
+          [get_ports {B[4]}]\
+          [get_ports {B[5]}]\
+          [get_ports {B[6]}]\
+          [get_ports {B[7]}]]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {A[0]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {A[0]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {A[1]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {A[1]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {A[2]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {A[2]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {A[3]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {A[3]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {A[4]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {A[4]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {A[5]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {A[5]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {A[6]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {A[6]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {A[7]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {A[7]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {B[0]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {B[0]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {B[1]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {B[1]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {B[2]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {B[2]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {B[3]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {B[3]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {B[4]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {B[4]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {B[5]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {B[5]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {B[6]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {B[6]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -rise -min -add_delay [get_ports {B[7]}]
+set_input_delay 1.0000 -clock [get_clocks {this_clk}] -fall -min -add_delay [get_ports {B[7]}]
+group_path -name operation_group\
+    -through [list [get_nets {alu/operation[0]}]\
+           [get_nets {alu/operation[1]}]\
+           [get_nets {alu/operation[2]}]\
+           [get_nets {alu/operation[3]}]]
+###############################################################################
+# Environment
+###############################################################################
+###############################################################################
+# Design Rules
+###############################################################################
diff --git a/tests/sdc/alu_sub.v b/tests/sdc/alu_sub.v
new file mode 100644
index 000000000..d66cad18e
--- /dev/null
+++ b/tests/sdc/alu_sub.v
@@ -0,0 +1,62 @@
+module adder(
+    input [7:0] a, input [7:0] b, output [7:0] y
+);
+    assign y = a + b;
+endmodule
+
+module wrapper(
+	input clk,
+	input [7:0] A,
+	input [7:0] B,
+	input [3:0] op,
+	output reg [7:0] result
+);
+	wire CF, ZF, SF;
+	alu alu(
+		.clk(clk),
+		.A(A),
+		.B(B),
+		.operation(op),
+		.result(result),
+		.CF(CF),
+		.ZF(ZF),
+		.SF(SF)
+	);
+endmodule
+
+module alu(
+	input clk,
+	input [7:0] A,
+	input [7:0] B,
+	input [3:0] operation,
+	output reg [7:0] result,
+	output reg CF,
+	output reg ZF,
+	output reg SF
+);
+
+	localparam ALU_OP_ADD /* verilator public_flat */ = 4'b0000;
+	localparam ALU_OP_SUB /* verilator public_flat */ = 4'b0001;
+
+	reg [8:0] tmp;
+	reg [7:0] added;
+
+	adder adder(.a(A), .b(B), .y(added));
+
+	always @(posedge clk)
+	begin
+		case (operation)
+			ALU_OP_ADD :
+				tmp = added;
+			ALU_OP_SUB :
+				tmp = A - B;
+		endcase
+
+		CF <= tmp[8];
+		ZF <= tmp[7:0] == 0;
+		SF <= tmp[7];
+
+		result <= tmp[7:0];
+	end
+endmodule
+
diff --git a/tests/sdc/alu_sub.ys b/tests/sdc/alu_sub.ys
new file mode 100644
index 000000000..7e804e7a0
--- /dev/null
+++ b/tests/sdc/alu_sub.ys
@@ -0,0 +1,14 @@
+read_verilog alu_sub.v
+proc
+hierarchy -auto-top
+
+select -assert-mod-count 1 adder
+select -assert-mod-count 1 wrapper
+select -assert-mod-count 1 alu
+
+sdc -keep_hierarchy alu_sub.sdc
+flatten
+
+select -assert-mod-count 0 adder
+select -assert-mod-count 1 wrapper
+select -assert-mod-count 1 alu
diff --git a/tests/sdc/run-test.sh b/tests/sdc/run-test.sh
new file mode 100755
index 000000000..971664bdb
--- /dev/null
+++ b/tests/sdc/run-test.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -eu
+source ../gen-tests-makefile.sh
+generate_mk --yosys-scripts --bash
\ No newline at end of file
diff --git a/tests/sdc/side-effects.sdc b/tests/sdc/side-effects.sdc
new file mode 100644
index 000000000..2c2126f84
--- /dev/null
+++ b/tests/sdc/side-effects.sdc
@@ -0,0 +1,2 @@
+puts "This should print something:"
+puts [get_ports {A[0]}]
\ No newline at end of file
diff --git a/tests/sdc/side-effects.sh b/tests/sdc/side-effects.sh
new file mode 100755
index 000000000..88d6154a1
--- /dev/null
+++ b/tests/sdc/side-effects.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+../../yosys -p 'read_verilog alu_sub.v; proc; hierarchy -auto-top; sdc side-effects.sdc' | grep 'This should print something:
+YOSYS_SDC_MAGIC_NODE_0'
diff --git a/tests/various/sdc.sdc b/tests/various/sdc.sdc
deleted file mode 100644
index 2143b34d7..000000000
--- a/tests/various/sdc.sdc
+++ /dev/null
@@ -1,5 +0,0 @@
-puts "SDC constraints file says hello from arbitrary Tcl execution"
-set_false_path -from [get_pins s1/sa] -to [get_pins s1/sb]
-puts "This should print something:"
-puts [get_ports a b]
-puts "Did it?"
\ No newline at end of file

From 650392d4eca33298aa836b2e01360f0f4cc9f3da Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 8 Oct 2025 13:49:53 +0200
Subject: [PATCH 900/931] sdc: specialize stubs for the call graph

---
 passes/cmds/sdc/Makefile.inc                   |  2 +-
 passes/cmds/sdc/{stubs.sdc => graph-stubs.sdc} | 15 ---------------
 passes/cmds/sdc/sdc.cc                         |  2 +-
 3 files changed, 2 insertions(+), 17 deletions(-)
 rename passes/cmds/sdc/{stubs.sdc => graph-stubs.sdc} (58%)

diff --git a/passes/cmds/sdc/Makefile.inc b/passes/cmds/sdc/Makefile.inc
index 1962f622f..7c8036550 100644
--- a/passes/cmds/sdc/Makefile.inc
+++ b/passes/cmds/sdc/Makefile.inc
@@ -1,3 +1,3 @@
 OBJS += passes/cmds/sdc/sdc.o
 
-$(eval $(call add_share_file,share/sdc,passes/cmds/sdc/stubs.sdc))
+$(eval $(call add_share_file,share/sdc,passes/cmds/sdc/graph-stubs.sdc))
diff --git a/passes/cmds/sdc/stubs.sdc b/passes/cmds/sdc/graph-stubs.sdc
similarity index 58%
rename from passes/cmds/sdc/stubs.sdc
rename to passes/cmds/sdc/graph-stubs.sdc
index 247fe0abd..b668f4d18 100644
--- a/passes/cmds/sdc/stubs.sdc
+++ b/passes/cmds/sdc/graph-stubs.sdc
@@ -1,18 +1,3 @@
-# with Tcl's eager evaluation, we will still eval args if they're unused by a stub
-proc stub {function_name} {
-    proc $function_name {args} "puts \"stubbed $function_name\""
-}
-
-proc is_suppressed {args} {
-    return 0
-}
-
-# stub current_design
-#stub ys_track_typed_key
-stub ys_track_untyped_key
-stub ys_err_key
-stub ys_err_flag
-
 proc unknown {args} {
     global sdc_call_index
     global sdc_calls
diff --git a/passes/cmds/sdc/sdc.cc b/passes/cmds/sdc/sdc.cc
index f21973480..4df256a77 100644
--- a/passes/cmds/sdc/sdc.cc
+++ b/passes/cmds/sdc/sdc.cc
@@ -805,7 +805,7 @@ struct SdcPass : public Pass {
 		SDCInterpreter& sdc = SDCInterpreter::get();
 		Tcl_Interp *interp = sdc.fresh_interp(design);
 		Tcl_Preserve(interp);
-		std::string stub_path = "+/sdc/stubs.sdc";
+		std::string stub_path = "+/sdc/graph-stubs.sdc";
 		rewrite_filename(stub_path);
 		if (Tcl_EvalFile(interp, stub_path.c_str()) != TCL_OK)
 			log_cmd_error("SDC interpreter returned an error in stub preamble file: %s\n", Tcl_GetStringResult(interp));

From f56e121ddbb1ff6a8832fa4d561bfd77ed1213fa Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 8 Oct 2025 14:32:21 +0200
Subject: [PATCH 901/931] sdc: add help

---
 passes/cmds/sdc/sdc.cc | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/passes/cmds/sdc/sdc.cc b/passes/cmds/sdc/sdc.cc
index 4df256a77..b77ee3ebf 100644
--- a/passes/cmds/sdc/sdc.cc
+++ b/passes/cmds/sdc/sdc.cc
@@ -773,15 +773,33 @@ public:
 
 // Also see TclPass
 struct SdcPass : public Pass {
-	// TODO help
-	SdcPass() : Pass("sdc", "sniff at some SDC") { }
+	void help() override
+	{
+		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
+		log("\n");
+		log("    sdc [options] file\n");
+		log("\n");
+		log("Read the SDC file for the current design.\n");
+		log("\n");
+		log("    -dump\n");
+		log("        Dump the referenced design objects.\n");
+		log("\n");
+		log("    -dump-graph\n");
+		log("        Dump the uninterpreted call graph.\n");
+		log("\n");
+		log("    -keep_hierarchy\n");
+		log("        Add keep_hierarchy attributes while retaining SDC validity.\n");
+		log("\n");
+	}
+	SdcPass() : Pass("sdc", "Read an SDC file") { }
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override {
 		log_header(design, "Executing SDC pass.\n");
+		log_experimental("sdc");
 		size_t argidx;
 		bool dump_mode = false;
 		bool dump_graph_mode = false;
 		bool keep_hierarchy_mode = false;
-		std::vector<std::string> opensta_stubs_paths;
+		std::vector<std::string> stubs_paths;
 		for (argidx = 1; argidx < args.size(); argidx++) {
 			if (args[argidx] == "-dump") {
 				dump_mode = true;
@@ -793,7 +811,7 @@ struct SdcPass : public Pass {
 				keep_hierarchy_mode = true;
 				continue;
 			} else if (args[argidx] == "-stubs" && argidx+1 < args.size()) {
-				opensta_stubs_paths.push_back(args[++argidx]);
+				stubs_paths.push_back(args[++argidx]);
 				continue;
 			}
 			break;
@@ -801,7 +819,9 @@ struct SdcPass : public Pass {
 		if (argidx >= args.size())
 			log_cmd_error("Missing SDC file.\n");
 
-		std::string sdc_path = args[argidx];
+		std::string sdc_path = args[argidx++];
+		if (argidx < args.size())
+			log_cmd_error("Unexpected extra positional argument %s after SDC file %s.\n", args[argidx], sdc_path);
 		SDCInterpreter& sdc = SDCInterpreter::get();
 		Tcl_Interp *interp = sdc.fresh_interp(design);
 		Tcl_Preserve(interp);
@@ -809,7 +829,7 @@ struct SdcPass : public Pass {
 		rewrite_filename(stub_path);
 		if (Tcl_EvalFile(interp, stub_path.c_str()) != TCL_OK)
 			log_cmd_error("SDC interpreter returned an error in stub preamble file: %s\n", Tcl_GetStringResult(interp));
-		for (auto path : opensta_stubs_paths)
+		for (auto path : stubs_paths)
 			if (Tcl_EvalFile(interp, path.c_str()) != TCL_OK)
 				log_cmd_error("SDC interpreter returned an error in OpenSTA stub file %s: %s\n", path.c_str(), Tcl_GetStringResult(interp));
 		if (Tcl_EvalFile(interp, sdc_path.c_str()) != TCL_OK)

From 033a2d5a673d33461a497e1ab0496680d16f8717 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 8 Oct 2025 14:45:36 +0200
Subject: [PATCH 902/931] sdc: remove vestigial code for tracked constraint
 followup work

---
 passes/cmds/sdc/sdc.cc | 87 ------------------------------------------
 1 file changed, 87 deletions(-)

diff --git a/passes/cmds/sdc/sdc.cc b/passes/cmds/sdc/sdc.cc
index b77ee3ebf..07040184e 100644
--- a/passes/cmds/sdc/sdc.cc
+++ b/passes/cmds/sdc/sdc.cc
@@ -585,14 +585,6 @@ struct GetterOpts : TclOpts {
 	}
 };
 
-// void build_normal_result(Tcl_Interp* interp, size_t list_len, size_t width, const std::string& name, Tcl_Obj*& result, const BitSelection& matching_bits) {
-// 	if (!result)
-// 		result = Tcl_NewListObj(list_len, nullptr);
-// 	for (size_t i = 0; i < width; i++)
-// 		if (matching_bits.is_set(i))
-// 			Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(name.c_str(), name.size()));
-// }
-
 template <typename T>
 void merge_or_init(const T& key, dict<T, BitSelection>& dst, const BitSelection& src) {
 	if (dst.count(key) == 0) {
@@ -661,84 +653,6 @@ static int sdc_get_nets_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 	return graph_node(TclCall{interp, objc, objv});
 }
 
-std::optional<std::tuple<std::string, std::string>> split_at(std::string s)
-{
-	size_t pos = s.find('@');
-	if (pos == std::string::npos)
-		return std::nullopt;
-	return std::make_tuple(s.substr(0, pos), s.substr(pos + 1));
-}
-
-// Whether string or list of strings, apply op to each string
-void apply_args(Tcl_Interp *interp, std::function<void(const char*)> op, Tcl_Obj* obj)
-{
-	int length;
-	Tcl_Obj **value_list;
-	if (Tcl_ListObjGetElements(interp, obj, &length, &value_list) == TCL_OK) {
-		for (int i = 0; i < length; i++) {
-			op(Tcl_GetString(value_list[i]));
-		}
-	} else {
-		op(Tcl_GetString(obj));
-	}
-}
-
-static int ys_track_typed_key_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
-{
-	log("ys_track_typed_key_cmd\n");
-	auto* objects = (SdcObjects*)data;
-	if (objc != 5)
-		log_error("ys_track_typed_key: Unexpected number of arguments: %d (expected 5)\n", objc);
-
-	if (objects->collect_mode != SdcObjects::CollectMode::FullConstraint)
-		return TCL_OK;
-
-	std::string key_name		 = Tcl_GetString(objv[1]);
-	Tcl_Obj* key_value		   = objv[2];
-	std::string key_expect_type  = Tcl_GetString(objv[3]);
-	std::string proc_name		= Tcl_GetString(objv[4]);
-
-	auto track_typed = [key_expect_type, objects, proc_name, key_name](const char* str) -> void {
-		auto split = split_at(str);
-		if (!split)
-			log_error("%s: key %s should be a typed SDC object, but is something weird: %s\n",
-				proc_name.c_str(), key_name.c_str(), str);
-
-		if (key_expect_type == "pin") {
-			log("PIN! %s\n", str);
-			bool found = false;
-			for (auto [name, pin] : objects->design_pins) {
-				log_error("TODO temporarily disabled due to working on a different flow\n");
-				// if (name + "/" + pin.name.str() == str) {
-				// 	found = true;
-				// 	objects->constrained_pins.insert(std::make_pair(name, pin));
-				// 	break; // resolved, expected unique
-				// }
-			}
-			if (!found)
-				log_error("%s: pin %s not found\n", proc_name.c_str(), str);
-		} else if (key_expect_type == "port") {
-			bool found = false;
-			log_error("TODO temporarily disabled due to working on a different flow\n");
-			// for (auto [name, ] : objects->design_ports) {
-			// 	if (name == str) {
-			// 		found = true;
-			// 		objects->constrained_ports.insert(name);
-			// 		break; // resolved, expected unique
-			// 	}
-			// }
-			if (!found)
-				log_error("%s: port %s not found\n", proc_name.c_str(), str);
-		} else {
-			// TODO
-			log_warning("%s: unsupported type %s\n", proc_name.c_str(), key_expect_type.c_str());
-		}
-	};
-	apply_args(interp, track_typed, key_value);
-	return TCL_OK;
-}
-
-
 class SDCInterpreter
 {
 private:
@@ -766,7 +680,6 @@ public:
 		Tcl_CreateObjCommand(interp, "get_pins", sdc_get_pins_cmd, (ClientData) objects.get(), NULL);
 		Tcl_CreateObjCommand(interp, "get_nets", sdc_get_nets_cmd, (ClientData) objects.get(), NULL);
 		Tcl_CreateObjCommand(interp, "get_ports", sdc_get_ports_cmd, (ClientData) objects.get(), NULL);
-		Tcl_CreateObjCommand(interp, "ys_track_typed_key", ys_track_typed_key_cmd, (ClientData) objects.get(), NULL);
 		return interp;
 	}
 };

From 229123eb87a7ab2aa51ad5f1006a69af4f168f0e Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 8 Oct 2025 14:57:28 +0200
Subject: [PATCH 903/931] sdc: disable without YOSYS_ENABLE_TCL

---
 passes/cmds/sdc/sdc.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/passes/cmds/sdc/sdc.cc b/passes/cmds/sdc/sdc.cc
index 07040184e..37af8a51c 100644
--- a/passes/cmds/sdc/sdc.cc
+++ b/passes/cmds/sdc/sdc.cc
@@ -1,3 +1,5 @@
+#ifdef YOSYS_ENABLE_TCL
+
 #include "kernel/register.h"
 #include "kernel/rtlil.h"
 #include "kernel/log.h"
@@ -757,3 +759,4 @@ struct SdcPass : public Pass {
 } SdcPass;
 
 YOSYS_NAMESPACE_END
+#endif

From 920f4793fb68d6421016d3e0acd0f86f9d3a3597 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 9 Oct 2025 20:55:15 +0200
Subject: [PATCH 904/931] sdc: error on unknown getters

---
 passes/cmds/sdc/graph-stubs.sdc | 26 +++++++++++++++++++++++-
 passes/cmds/sdc/sdc.cc          | 35 +++++++++++++++++++++++++++------
 tests/sdc/get_foo.sdc           |  1 +
 tests/sdc/unknown-getter.sh     |  5 +++++
 4 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 tests/sdc/get_foo.sdc
 create mode 100755 tests/sdc/unknown-getter.sh

diff --git a/passes/cmds/sdc/graph-stubs.sdc b/passes/cmds/sdc/graph-stubs.sdc
index b668f4d18..a6601f7f8 100644
--- a/passes/cmds/sdc/graph-stubs.sdc
+++ b/passes/cmds/sdc/graph-stubs.sdc
@@ -1,4 +1,21 @@
 proc unknown {args} {
+    # Check if it's a getter
+    if {[llength $args] > 0} {
+        set first_arg [lindex $args 0]
+        if {[string match "get_*" $first_arg]} {
+            # It's a getter, has it been redirected from specialized C++ code?
+            if {[llength $args] > 1} {
+                set second_arg [lindex $args 1]
+                if {$second_arg ne "-getter-validated"} {
+                    error "Unknown getter: $first_arg"
+                }
+            } else {
+                error "Unknown getter: $first_arg"
+            }
+        }
+    }
+    # TODO this safety feature could be optional via a global
+
     global sdc_call_index
     global sdc_calls
     if {![info exists sdc_call_index]} {
@@ -15,4 +32,11 @@ proc unknown {args} {
 }
 proc list {args} {
     return [unknown "list" {*}$args]
-}
\ No newline at end of file
+}
+proc get_clocks {args} {
+    # get_clocks isn't a design object getter
+    # because clocks aren't design objects, just aliases
+    # so the referred to clock pin already are being tracked
+    # as arguments of uninterpreted create_clock command or similar
+    return [unknown "get_clocks" "-getter-validated" {*}$args]
+}
diff --git a/passes/cmds/sdc/sdc.cc b/passes/cmds/sdc/sdc.cc
index 37af8a51c..17c0f0be6 100644
--- a/passes/cmds/sdc/sdc.cc
+++ b/passes/cmds/sdc/sdc.cc
@@ -344,9 +344,32 @@ static std::pair<bool, BitSelection> matches(std::string name, const std::string
 	}
 }
 
-static int graph_node(TclCall call) {
-	// TODO is that it?
-	return redirect_unknown(call);
+static int getter_graph_node(TclCall call) {
+	// Insert -getter-validated as first argument for passing to unknown
+	// to distinguish resolved and unknown getters.
+	// For example, if call is ["get_foo", "-bar"]
+	// then newCall is ["get_foo", "-getter-validated", "-bar"]
+    Tcl_Obj* validity_tag = Tcl_NewStringObj("-getter-validated", -1);
+    Tcl_IncrRefCount(validity_tag);
+	std::vector<Tcl_Obj*> newObjv(call.objc + 1);
+    log_assert(call.objc > 0);
+	newObjv[0] = call.objv[0];
+    newObjv[1] = validity_tag;
+    for (int i = 1; i < call.objc; ++i) {
+        newObjv[i + 1] = call.objv[i];
+    }
+	// Send the vector to the Tcl land
+    Tcl_Obj** allocatedObjv = new Tcl_Obj*[call.objc + 1];
+    for (int i = 0; i < call.objc + 1; ++i) {
+        allocatedObjv[i] = newObjv[i];
+    }
+	TclCall newCall {
+		.interp = call.interp,
+		.objc = call.objc + 1,
+		.objv = allocatedObjv
+	};
+	// Finally, redirect to unknown handler
+	return redirect_unknown(newCall);
 }
 
 static int redirect_unknown(TclCall call) {
@@ -610,7 +633,7 @@ static int sdc_get_pins_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 	const auto& pins = objects->design_pins;
 	resolved = find_matching<SdcObjects::CellPin, decltype(pins)>(pins, config, opts.patterns, "pin");
 
-	return graph_node(TclCall{interp, objc, objv});
+	return getter_graph_node(TclCall{interp, objc, objv});
 }
 
 static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
@@ -631,7 +654,7 @@ static int sdc_get_ports_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_
 			merge_or_init(std::make_pair(name, wire), objects->constrained_ports, matching_bits);
 	}
 
-	return graph_node(TclCall{interp, objc, objv});
+	return getter_graph_node(TclCall{interp, objc, objv});
 }
 
 static int sdc_get_nets_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_Obj* const objv[])
@@ -652,7 +675,7 @@ static int sdc_get_nets_cmd(ClientData data, Tcl_Interp *interp, int objc, Tcl_O
 			merge_or_init(std::make_pair(name, wire), objects->constrained_nets, matching_bits);
 	}
 
-	return graph_node(TclCall{interp, objc, objv});
+	return getter_graph_node(TclCall{interp, objc, objv});
 }
 
 class SDCInterpreter
diff --git a/tests/sdc/get_foo.sdc b/tests/sdc/get_foo.sdc
new file mode 100644
index 000000000..0ea5ea34a
--- /dev/null
+++ b/tests/sdc/get_foo.sdc
@@ -0,0 +1 @@
+get_foo -bar 1
diff --git a/tests/sdc/unknown-getter.sh b/tests/sdc/unknown-getter.sh
new file mode 100755
index 000000000..9038834c6
--- /dev/null
+++ b/tests/sdc/unknown-getter.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+! ../../yosys -p 'read_verilog alu_sub.v; proc; hierarchy -auto-top; sdc get_foo.sdc' 2>&1 | grep 'Unknown getter'

From 1edc32dcd03a6c20ef2389aa3591cfbda8b1080f Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Wed, 19 Nov 2025 15:31:17 +0100
Subject: [PATCH 905/931] opensta, sdc_expand: mark as experimental

---
 techlibs/common/opensta.cc    | 1 +
 techlibs/common/sdc_expand.cc | 1 +
 2 files changed, 2 insertions(+)

diff --git a/techlibs/common/opensta.cc b/techlibs/common/opensta.cc
index 282481953..655fdbf2d 100644
--- a/techlibs/common/opensta.cc
+++ b/techlibs/common/opensta.cc
@@ -44,6 +44,7 @@ struct OpenstaPass : public Pass
 		bool cleanup = design->scratchpad_get_bool("opensta.cleanup", true);
 
 		log_header(design, "Executing OPENSTA pass.\n");
+		log_experimental("opensta");
 		log_push();
 
 		size_t argidx;
diff --git a/techlibs/common/sdc_expand.cc b/techlibs/common/sdc_expand.cc
index fe8f20aa9..39c50875f 100644
--- a/techlibs/common/sdc_expand.cc
+++ b/techlibs/common/sdc_expand.cc
@@ -37,6 +37,7 @@ struct SdcExpandPass : public ScriptPass
 	void execute(std::vector<std::string> args, RTLIL::Design *design) override
 	{
 		log_header(design, "Executing SDC_EXPAND pass.\n");
+		log_experimental("sdc_expand");
 		string run_from, run_to;
 		opensta_exe = "";
 		cleanup = design->scratchpad_get_bool("sdc_expand.cleanup", true);

From 58e831486d3a4e2193a3d1b7ad3c3f4870767871 Mon Sep 17 00:00:00 2001
From: Mohamed Gaber <me@donn.website>
Date: Wed, 19 Nov 2025 03:42:32 +0200
Subject: [PATCH 906/931] pyosys: __getitem__ for supported classes

- functions that have a const `[]` operator method now support `__getitem__` in Python
- fields of a pointer type now return a `reference_internal` instead of a `copy` because classes referenced to by pointers typically aren't copyable (e.g. RTLIL::Wire, RTLIL::Module, etc)
- removed duplicate of test_script.py
---
 pyosys/generator.py                           | 11 ++++++--
 tests/arch/ecp5/add_sub.py                    | 20 -------------
 .../{test_script.py => test_ecp5_addsub.py}   |  1 -
 tests/pyosys/test_sigspec_it.py               | 28 +++++++++++++++++++
 4 files changed, 36 insertions(+), 24 deletions(-)
 delete mode 100644 tests/arch/ecp5/add_sub.py
 rename tests/pyosys/{test_script.py => test_ecp5_addsub.py} (99%)
 create mode 100644 tests/pyosys/test_sigspec_it.py

diff --git a/pyosys/generator.py b/pyosys/generator.py
index c0ccdac5a..25f87d570 100644
--- a/pyosys/generator.py
+++ b/pyosys/generator.py
@@ -193,7 +193,7 @@ pyosys_headers = [
             ),
             PyosysClass("SigChunk"),
             PyosysClass("SigBit", hash_expr="s"),
-            PyosysClass("SigSpec", hash_expr="s", denylist={"chunks"}),
+            PyosysClass("SigSpec", hash_expr="s", denylist=frozenset({"chunks"})),
             PyosysClass(
                 "Cell",
                 ref_only=True,
@@ -539,6 +539,8 @@ class PyosysWrapperGenerator(object):
                 python_name_override = "__ne__"
             elif function.operator == "<":
                 python_name_override = "__lt__"
+            elif function.operator == "[]" and function.const:
+                python_name_override = "__getitem__"
             else:
                 return
 
@@ -592,7 +594,10 @@ class PyosysWrapperGenerator(object):
             # care
             return
 
-        has_containers = self.register_containers(field)
+        self.register_containers(field)
+        rvp = "py::return_value_policy::copy"
+        if isinstance(field.type, Pointer):
+            rvp = "py::return_value_policy::reference_internal"
 
         definition_fn = f"def_{'readonly' if field.type.const else 'readwrite'}"
         if field.static:
@@ -604,7 +609,7 @@ class PyosysWrapperGenerator(object):
             f'"{field_python_basename}"',
             f"&{metadata.name}::{field.name}",
         ]
-        def_args.append("py::return_value_policy::copy")
+        def_args.append(rvp)
         print(
             f"\t\t\t.{definition_fn}({', '.join(def_args)})",
             file=self.f,
diff --git a/tests/arch/ecp5/add_sub.py b/tests/arch/ecp5/add_sub.py
deleted file mode 100644
index 0232ac1db..000000000
--- a/tests/arch/ecp5/add_sub.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import os
-from pyosys import libyosys as ys
-
-__dir__ = os.path.dirname(os.path.abspath(__file__))
-add_sub = os.path.join(__dir__, "..", "common", "add_sub.v")
-
-base = ys.Design()
-ys.run_pass(f"read_verilog {add_sub}", base)
-ys.run_pass("hierarchy -top top", base)
-ys.run_pass("proc", base)
-ys.run_pass("equiv_opt -assert -map +/ecp5/cells_sim.v synth_ecp5", base)
-
-postopt = ys.Design()
-ys.run_pass("design -load postopt", postopt)
-ys.run_pass("cd top", postopt)
-ys.run_pass("select -assert-min 25 t:LUT4", postopt)
-ys.run_pass("select -assert-max 26 t:LUT4", postopt)
-ys.run_pass("select -assert-count 10 t:PFUMX", postopt)
-ys.run_pass("select -assert-count 6 t:L6MUX21", postopt)
-ys.run_pass("select -assert-none t:LUT4 t:PFUMX t:L6MUX21 %% t:* %D", postopt)
diff --git a/tests/pyosys/test_script.py b/tests/pyosys/test_ecp5_addsub.py
similarity index 99%
rename from tests/pyosys/test_script.py
rename to tests/pyosys/test_ecp5_addsub.py
index 7c3ec96ef..ddc50b775 100644
--- a/tests/pyosys/test_script.py
+++ b/tests/pyosys/test_ecp5_addsub.py
@@ -1,7 +1,6 @@
 from pathlib import Path
 from pyosys import libyosys as ys
 
-
 __file_dir__ = Path(__file__).absolute().parent
 add_sub = __file_dir__.parent / "arch" / "common" / "add_sub.v"
 
diff --git a/tests/pyosys/test_sigspec_it.py b/tests/pyosys/test_sigspec_it.py
new file mode 100644
index 000000000..2876e7725
--- /dev/null
+++ b/tests/pyosys/test_sigspec_it.py
@@ -0,0 +1,28 @@
+from pyosys import libyosys as ys
+from pathlib import Path
+
+__file_dir__ = Path(__file__).absolute().parent
+
+def _dump_sigbit(bit):
+    if bit.is_wire():
+        if bit.wire.width == 1:
+            return bit.wire.name.str()
+        else:
+            return f"{bit.wire.name} [{bit.offset}]"
+    else:
+        if bit.data == ys.State.S1:
+            return 1
+        elif bit.data == ys.State.S0:
+            return 0
+        else:
+            assert "unknown constants not supported"
+
+d = ys.Design()
+
+ys.run_pass(f"read_verilog {__file_dir__ / 'spm.cut.v.gz'}", d)
+ys.run_pass(f"hierarchy -top spm", d)
+module = d.module(r"\spm")
+for conn_from, conn_to in module.connections_:
+    for bit_from, bit_to in zip(conn_from, conn_to):
+        print(f"assign {_dump_sigbit(bit_from)} = {_dump_sigbit(bit_to)};")
+

From 6eb9e823e0e080624bc261382418dd3880b0ee45 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Thu, 20 Nov 2025 00:21:15 +0100
Subject: [PATCH 907/931] sdc: use Tcl memory management functionality

---
 passes/cmds/sdc/sdc.cc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/passes/cmds/sdc/sdc.cc b/passes/cmds/sdc/sdc.cc
index 17c0f0be6..eb1951665 100644
--- a/passes/cmds/sdc/sdc.cc
+++ b/passes/cmds/sdc/sdc.cc
@@ -349,20 +349,20 @@ static int getter_graph_node(TclCall call) {
 	// to distinguish resolved and unknown getters.
 	// For example, if call is ["get_foo", "-bar"]
 	// then newCall is ["get_foo", "-getter-validated", "-bar"]
-    Tcl_Obj* validity_tag = Tcl_NewStringObj("-getter-validated", -1);
-    Tcl_IncrRefCount(validity_tag);
+	Tcl_Obj* validity_tag = Tcl_NewStringObj("-getter-validated", -1);
+	Tcl_IncrRefCount(validity_tag);
 	std::vector<Tcl_Obj*> newObjv(call.objc + 1);
-    log_assert(call.objc > 0);
+	log_assert(call.objc > 0);
 	newObjv[0] = call.objv[0];
-    newObjv[1] = validity_tag;
-    for (int i = 1; i < call.objc; ++i) {
-        newObjv[i + 1] = call.objv[i];
-    }
+	newObjv[1] = validity_tag;
+	for (int i = 1; i < call.objc; ++i) {
+		newObjv[i + 1] = call.objv[i];
+	}
 	// Send the vector to the Tcl land
-    Tcl_Obj** allocatedObjv = new Tcl_Obj*[call.objc + 1];
-    for (int i = 0; i < call.objc + 1; ++i) {
-        allocatedObjv[i] = newObjv[i];
-    }
+	Tcl_Obj** allocatedObjv = (Tcl_Obj**)Tcl_Alloc((call.objc + 1) * sizeof(Tcl_Obj*));
+	for (int i = 0; i < call.objc + 1; ++i) {
+		allocatedObjv[i] = newObjv[i];
+	}
 	TclCall newCall {
 		.interp = call.interp,
 		.objc = call.objc + 1,
@@ -376,14 +376,14 @@ static int redirect_unknown(TclCall call) {
 	// TODO redirect to different command
 	Tcl_Obj *newCmd = Tcl_NewStringObj("unknown", -1);
 	auto newObjc = call.objc + 1;
-	Tcl_Obj **newObjv = new Tcl_Obj*[newObjc];
+	Tcl_Obj** newObjv = (Tcl_Obj**)Tcl_Alloc(newObjc * sizeof(Tcl_Obj*));
 	newObjv[0] = newCmd;
 	for (int i = 1; i < newObjc; i++) {
 		newObjv[i] = call.objv[i - 1];
 	}
 	int result = Tcl_EvalObjv(call.interp, newObjc, newObjv, 0);
 	Tcl_DecrRefCount(newCmd);
-	delete[] newObjv;
+	Tcl_Free((char*) newObjv);
 	return result;
 }
 
@@ -551,7 +551,7 @@ struct TclOpts {
 		std::string expected = std::string("-") + opt_name;
 		if (expected == arg) {
 			if (!std::find_if(legals.begin(), legals.end(),
-					   [&opt_name](const char* str) { return opt_name == str; }))
+					[&opt_name](const char* str) { return opt_name == str; }))
 				log_cmd_error("Illegal argument %s for %s.\n", expected.c_str(), name);
 			return true;
 		}

From 25ba41f42419c2ee6f0499d5c74bf0c6c56e0b63 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 20 Nov 2025 00:24:25 +0000
Subject: [PATCH 908/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c16dbf175..0c673cdf8 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.59+62
+YOSYS_VER := 0.59+110
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 4d1b68871746e469a71eaeab3036a71ca04bdc00 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 21 Nov 2025 14:46:01 +1300
Subject: [PATCH 909/931] Tests: Add testcase for problematic ABC DONE check

---
 tests/techmap/bug5495.abc | 2 ++
 tests/techmap/bug5495.sh  | 7 +++++++
 tests/techmap/bug5495.v   | 7 +++++++
 3 files changed, 16 insertions(+)
 create mode 100644 tests/techmap/bug5495.abc
 create mode 100755 tests/techmap/bug5495.sh
 create mode 100644 tests/techmap/bug5495.v

diff --git a/tests/techmap/bug5495.abc b/tests/techmap/bug5495.abc
new file mode 100644
index 000000000..60a29a58a
--- /dev/null
+++ b/tests/techmap/bug5495.abc
@@ -0,0 +1,2 @@
+
+fraig_store; fraig_restore
diff --git a/tests/techmap/bug5495.sh b/tests/techmap/bug5495.sh
new file mode 100755
index 000000000..181797e32
--- /dev/null
+++ b/tests/techmap/bug5495.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+if ! timeout 5 ../../yosys bug5495.v -p 'hierarchy; techmap; abc -script bug5495.abc' ; then
+    echo "Yosys failed to complete"
+    exit 1
+fi
+
diff --git a/tests/techmap/bug5495.v b/tests/techmap/bug5495.v
new file mode 100644
index 000000000..37ce73ec8
--- /dev/null
+++ b/tests/techmap/bug5495.v
@@ -0,0 +1,7 @@
+module simple(I1, I2, O);
+	input wire I1;
+	input wire I2;
+	output wire O;
+
+	assign O = I1 | I2;
+endmodule

From e33ca173889a9a7791f3bae94cc88aa38c053c79 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 21 Nov 2025 03:50:07 +0000
Subject: [PATCH 910/931] Force a newline to appear before YOSYS_ABC_DONE

---
 passes/techmap/abc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/passes/techmap/abc.cc b/passes/techmap/abc.cc
index 3a814d0b7..0963ecfde 100644
--- a/passes/techmap/abc.cc
+++ b/passes/techmap/abc.cc
@@ -1064,7 +1064,7 @@ void AbcModuleState::prepare_module(RTLIL::Design *design, RTLIL::Module *module
 	abc_script += stringf("; write_blif %s/output.blif", run_abc.tempdir_name);
 	abc_script = add_echos_to_abc_cmd(abc_script);
 #if defined(__linux__) && !defined(YOSYS_DISABLE_SPAWN)
-	abc_script += "; echo \"YOSYS_ABC_DONE\"\n";
+	abc_script += "; echo; echo \"YOSYS_ABC_DONE\"\n";
 #endif
 
 	for (size_t i = 0; i+1 < abc_script.size(); i++)

From 44ab884b062a38385d91b893390413cad6fdea82 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 21 Nov 2025 16:30:27 +1300
Subject: [PATCH 911/931] bug5495.sh: Skip test if timeout isn't available

---
 tests/techmap/bug5495.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/techmap/bug5495.sh b/tests/techmap/bug5495.sh
index 181797e32..64bf2ca99 100755
--- a/tests/techmap/bug5495.sh
+++ b/tests/techmap/bug5495.sh
@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+if ! which timeout ; then
+    echo "No 'timeout', skipping test"
+    exit 0
+fi
+
 if ! timeout 5 ../../yosys bug5495.v -p 'hierarchy; techmap; abc -script bug5495.abc' ; then
     echo "Yosys failed to complete"
     exit 1

From 542723d12179186305a3f6dc25f3d7a6a5056d3c Mon Sep 17 00:00:00 2001
From: KrystalDelusion <93062060+KrystalDelusion@users.noreply.github.com>
Date: Sat, 22 Nov 2025 09:51:07 +1300
Subject: [PATCH 912/931] Check ENABLE_ABC validity

From https://github.com/YosysHQ/yosys/pull/5497#issuecomment-3561398279, for ENABLE_ABC=1 to be valid, either ABC must be linked (LINK_ABC=1), or it must be possible to spawn executables (DISABLE_SPAWN=0).  This configuration (ENABLE_ABC=1 LINK_ABC=0 DISABLE_SPAWN=1) already fails compilation in `abc.cc` trying to call `run_command()` which doesn't exist if DISABLE_SPAWN=1.  All we are doing here is catching the known bad configuration and providing an explanation for why it isn't working.
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index 0c673cdf8..b45b46fbf 100644
--- a/Makefile
+++ b/Makefile
@@ -474,6 +474,9 @@ else
 ifeq ($(ABCEXTERNAL),)
 TARGETS := $(PROGRAM_PREFIX)yosys-abc$(EXE) $(TARGETS)
 endif
+ifeq ($(DISABLE_SPAWN),1)
+$(error ENABLE_ABC=1 requires either LINK_ABC=1 or DISABLE_SPAWN=0)
+endif
 endif
 endif
 

From 615e338acd75eb43a50fd276203763d0d55b7592 Mon Sep 17 00:00:00 2001
From: Mike Inouye <mikeinouye@google.com>
Date: Fri, 21 Nov 2025 14:10:05 -0800
Subject: [PATCH 913/931] Fix abc_new pass when not in NDEBUG

---
 passes/techmap/abc_new.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/passes/techmap/abc_new.cc b/passes/techmap/abc_new.cc
index 21ffa075b..4a4f3cee8 100644
--- a/passes/techmap/abc_new.cc
+++ b/passes/techmap/abc_new.cc
@@ -38,7 +38,8 @@ std::vector<Module*> order_modules(Design *design, std::vector<Module *> modules
 				sort.edge(submodule, m);
 		}
 	}
-	log_assert(sort.sort());
+	bool sorted = sort.sort();
+	log_assert(sorted);
 	return sort.sorted;
 }
 

From f098352ae6d0a8947df74f6a714954bb7f105f9f Mon Sep 17 00:00:00 2001
From: Mike Inouye <mikeinouye@google.com>
Date: Fri, 21 Nov 2025 14:23:32 -0800
Subject: [PATCH 914/931] Enable xaiger2 pass when not in NDEBUG

---
 frontends/aiger2/xaiger.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontends/aiger2/xaiger.cc b/frontends/aiger2/xaiger.cc
index d983f8c41..510da0be8 100644
--- a/frontends/aiger2/xaiger.cc
+++ b/frontends/aiger2/xaiger.cc
@@ -110,7 +110,8 @@ struct Xaiger2Frontend : public Frontend {
 		for (int i = 0; i < (int) O; i++) {
 			int po;
 			*f >> po;
-			log_assert(f->get() == '\n');
+			int c = f->get();
+			log_assert(c == '\n');
 			outputs.push_back(po);
 		}
 

From 33a49452d9da3aa1c6a7949b7cdf1c744cca4c7d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 22 Nov 2025 00:23:19 +0000
Subject: [PATCH 915/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 0c673cdf8..3c53c877d 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.59+110
+YOSYS_VER := 0.59+117
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 53614a37a13088333e8192ef57dd614aa4ff5cd6 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 24 Nov 2025 18:28:36 +1300
Subject: [PATCH 916/931] Use `Tcl_Size` instead of `int` to fix build errors

Fixes these build errors I'm getting locally with `tcl-devel-9.0.0-7.fc42.x86_64`.
I guess Tcl 9 broke this.

```
passes/cmds/sdc/sdc.cc:438:6: error: no matching function for call to 'Tcl_ListObjLength'
  438 |         if (Tcl_ListObjLength(interp, listObj, &listLength) == TCL_OK) {
      |             ^~~~~~~~~~~~~~~~~
/usr/include/tclDecls.h:1788:13: note: candidate function not viable: no known conversion from 'int *' to 'Tcl_Size *' (aka 'long *') for 3rd argument
 1788 | EXTERN int              Tcl_ListObjLength(Tcl_Interp *interp,
      |                         ^
 1789 |                                 Tcl_Obj *listPtr, Tcl_Size *lengthPtr);
      |                                                   ~~~~~~~~~~~~~~~~~~~
passes/cmds/sdc/sdc.cc:446:8: error: no matching function for call to 'Tcl_ListObjLength'
  446 |                         if (Tcl_ListObjLength(interp, subListObj, &subListLength) == TCL_OK) {
      |                             ^~~~~~~~~~~~~~~~~
/usr/include/tclDecls.h:1788:13: note: candidate function not viable: no known conversion from 'int *' to 'Tcl_Size *' (aka 'long *') for 3rd argument
 1788 | EXTERN int              Tcl_ListObjLength(Tcl_Interp *interp,
      |                         ^
 1789 |                                 Tcl_Obj *listPtr, Tcl_Size *lengthPtr);
      |                                                   ~~~~~~~~~~~~~~~~~~~
```
---
 passes/cmds/sdc/sdc.cc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/passes/cmds/sdc/sdc.cc b/passes/cmds/sdc/sdc.cc
index eb1951665..fad001e50 100644
--- a/passes/cmds/sdc/sdc.cc
+++ b/passes/cmds/sdc/sdc.cc
@@ -8,6 +8,11 @@
 #include <optional>
 #include <iostream>
 
+#if TCL_MAJOR_VERSION < 9
+typedef int YS_Tcl_Size;
+#else
+typedef Tcl_Size YS_Tcl_Size;
+#endif
 
 USING_YOSYS_NAMESPACE
 PRIVATE_NAMESPACE_BEGIN
@@ -432,7 +437,7 @@ static size_t get_node_count(Tcl_Interp* interp) {
 std::vector<std::vector<std::string>> gather_nested_calls(Tcl_Interp* interp) {
 
 	Tcl_Obj* listObj = Tcl_GetVar2Ex(interp, "sdc_calls", nullptr, TCL_GLOBAL_ONLY);
-	int listLength;
+	YS_Tcl_Size listLength;
 
 	std::vector<std::vector<std::string>> sdc_calls;
 	if (Tcl_ListObjLength(interp, listObj, &listLength) == TCL_OK) {
@@ -442,7 +447,7 @@ std::vector<std::vector<std::string>> gather_nested_calls(Tcl_Interp* interp) {
 			if (Tcl_ListObjIndex(interp, listObj, i, &subListObj) != TCL_OK) {
 				log_error("broken list of lists\n");
 			}
-			int subListLength;
+			YS_Tcl_Size subListLength;
 			if (Tcl_ListObjLength(interp, subListObj, &subListLength) == TCL_OK) {
 				// Valid list - extract elements
 				for (int j = 0; j < subListLength; j++) {

From e8cbc92462088abead8776a7494af0bc24f9e702 Mon Sep 17 00:00:00 2001
From: "Emil J. Tywoniak" <emil@tywoniak.eu>
Date: Mon, 24 Nov 2025 11:46:09 +0100
Subject: [PATCH 917/931] abc_new: sorted -> is_sorted

---
 passes/techmap/abc_new.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/passes/techmap/abc_new.cc b/passes/techmap/abc_new.cc
index 4a4f3cee8..4e279c577 100644
--- a/passes/techmap/abc_new.cc
+++ b/passes/techmap/abc_new.cc
@@ -38,8 +38,8 @@ std::vector<Module*> order_modules(Design *design, std::vector<Module *> modules
 				sort.edge(submodule, m);
 		}
 	}
-	bool sorted = sort.sort();
-	log_assert(sorted);
+	bool is_sorted = sort.sort();
+	log_assert(is_sorted);
 	return sort.sorted;
 }
 

From 38a1e6614594af5437f8e486517e993941369680 Mon Sep 17 00:00:00 2001
From: De hekkende krekker <8060851+dehekkendekrekker@users.noreply.github.com>
Date: Tue, 18 Oct 2022 17:36:25 -0400
Subject: [PATCH 918/931] Fixes #3515

---
 libs/subcircuit/subcircuit.cc | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/libs/subcircuit/subcircuit.cc b/libs/subcircuit/subcircuit.cc
index 60f27fd55..dfec80254 100644
--- a/libs/subcircuit/subcircuit.cc
+++ b/libs/subcircuit/subcircuit.cc
@@ -912,6 +912,10 @@ class SubCircuit::SolverWorker
 	bool pruneEnumerationMatrix(std::vector<std::set<int>> &enumerationMatrix, const GraphData &needle, const GraphData &haystack, int &nextRow, bool allowOverlap)
 	{
 		bool didSomething = true;
+
+		// Map of j:[i where j is used]
+		std::map<int, std::set<int>> usedNodes;
+
 		while (didSomething)
 		{
 			nextRow = -1;
@@ -923,13 +927,23 @@ class SubCircuit::SolverWorker
 						didSomething = true;
 					else if (!allowOverlap && haystack.usedNodes[j])
 						didSomething = true;
-					else
+					else {
 						newRow.insert(j);
+						usedNodes[j].insert(i); // Store the needle index by haystack node index
+					}
 				}
+
+				// This indicates there are no available haystack nodes to assign to the needle
 				if (newRow.size() == 0)
 					return false;
+
+				// If there are multiple needles assigned to the haystack node, the solution is invalid
+				if (newRow.size() == 1 && usedNodes[*newRow.begin()].size() > 1)
+					return false;
+
 				if (newRow.size() >= 2 && (nextRow < 0 || needle.adjMatrix.at(nextRow).size() < needle.adjMatrix.at(i).size()))
 					nextRow = i;
+
 				enumerationMatrix[i].swap(newRow);
 			}
 		}

From ba31a02578a5a2decaa333fb93d80bb17014cc00 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 25 Nov 2025 07:04:34 +1300
Subject: [PATCH 919/931] tests: Add bug3515

---
 tests/various/bug3515.v  | 26 ++++++++++++++++++++++++++
 tests/various/bug3515.ys | 21 +++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 tests/various/bug3515.v
 create mode 100644 tests/various/bug3515.ys

diff --git a/tests/various/bug3515.v b/tests/various/bug3515.v
new file mode 100644
index 000000000..220ae4ad6
--- /dev/null
+++ b/tests/various/bug3515.v
@@ -0,0 +1,26 @@
+// Triple AND GATE
+module mod_74x08_3 (
+    input A_1,
+    input B_1,
+    input A_2,
+    input B_2,
+    input A_3,
+    input B_3,
+    output Y_1,
+    output Y_2,
+    output Y_3);
+
+assign Y_1 = A_1 & B_1;
+assign Y_2 = A_2 & B_2;
+assign Y_3 = A_3 & B_3;
+
+endmodule
+
+// OR GATE
+module mod_74x32_1 (
+    input A_1,
+    input B_1,
+    output Y_1);
+
+assign Y_1 = A_1 | B_1;
+endmodule
diff --git a/tests/various/bug3515.ys b/tests/various/bug3515.ys
new file mode 100644
index 000000000..63c2ccde2
--- /dev/null
+++ b/tests/various/bug3515.ys
@@ -0,0 +1,21 @@
+read_verilog << EOF
+module mod_and_or (
+    input a,
+    input b,
+    input c,
+    input d,
+    output reg y
+);
+
+always @(a,b,c,d) begin
+    y <= (a&b)|(c&d);
+end
+endmodule
+EOF
+hierarchy -top mod_and_or
+proc
+opt
+techmap -map ./bug3515.v
+proc
+extract -map ./bug3515.v -verbose
+proc

From a8e8746fc0f0ce32e8d08ccd9886911a0288ed97 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 25 Nov 2025 07:35:19 +1300
Subject: [PATCH 920/931] tests: Tidy up bug3515

Add base case where mapping is possible for sanity checking.
---
 tests/various/bug3515.ys | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/tests/various/bug3515.ys b/tests/various/bug3515.ys
index 63c2ccde2..783a75bb4 100644
--- a/tests/various/bug3515.ys
+++ b/tests/various/bug3515.ys
@@ -1,21 +1,31 @@
+# base case is able to map
 read_verilog << EOF
-module mod_and_or (
-    input a,
-    input b,
-    input c,
-    input d,
+module and_x3 (
+    input a, b, c, d,
     output reg y
 );
 
-always @(a,b,c,d) begin
-    y <= (a&b)|(c&d);
-end
+assign y = (a&b)&(c&d);
+endmodule
+EOF
+hierarchy -top and_x3
+opt
+extract -map ./bug3515.v
+select -assert-count 1 t:mod_74x08_3
+
+# more needles than haystacks; not able to map
+design -reset
+read_verilog << EOF
+module mod_and_or (
+    input a, b, c, d,
+    output reg y
+);
+
+assign y = (a&b)|(c&d);
 endmodule
 EOF
 hierarchy -top mod_and_or
-proc
 opt
-techmap -map ./bug3515.v
-proc
-extract -map ./bug3515.v -verbose
-proc
+extract -map ./bug3515.v
+select -assert-count 2 t:$and
+

From 5d3599a78c6de99afc29ca92a203e2c007eb824c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Nov 2025 00:23:19 +0000
Subject: [PATCH 921/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 6f3e4fa13..15cffdb90 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.59+117
+YOSYS_VER := 0.59+127
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From cae020a5810a02b65c5d62d9c8ff795715715873 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Tue, 25 Nov 2025 11:29:48 +0100
Subject: [PATCH 922/931] Update ABC as per 2025-11-24

---
 abc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abc b/abc
index 1c5ed1ce3..131a50dd7 160000
--- a/abc
+++ b/abc
@@ -1 +1 @@
-Subproject commit 1c5ed1ce378cc04beac30bb31abc4c37c8467042
+Subproject commit 131a50dd773f21ebbfc51da1d182438382a04209

From 7f9de6e48fcbbf359992423ad1c93dbe37d65584 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 25 Nov 2025 02:19:51 +0000
Subject: [PATCH 923/931] Make coverage data thread-safe

---
 kernel/log.cc |  2 +-
 kernel/log.h  | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/kernel/log.cc b/kernel/log.cc
index 34e56f8ac..d712eda2c 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -720,7 +720,7 @@ dict<std::string, std::pair<std::string, int>> get_coverage_data()
 		if (coverage_data.count(p->id))
 			log_warning("found duplicate coverage id \"%s\".\n", p->id);
 		coverage_data[p->id].first = stringf("%s:%d:%s", p->file, p->line, p->func);
-		coverage_data[p->id].second += p->counter;
+		coverage_data[p->id].second += p->counter.load(std::memory_order_relaxed);
 	}
 
 	for (auto &it : coverage_data)
diff --git a/kernel/log.h b/kernel/log.h
index 144570026..197cfab8d 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -24,6 +24,7 @@
 
 #include <time.h>
 
+#include <atomic>
 #include <regex>
 #define YS_REGEX_COMPILE(param) std::regex(param, \
 				std::regex_constants::nosubs | \
@@ -298,15 +299,16 @@ void log_abort_internal(const char *file, int line);
 
 #define cover(_id) do { \
     static CoverData __d __attribute__((section("yosys_cover_list"), aligned(1), used)) = { __FILE__, __FUNCTION__, _id, __LINE__, 0 }; \
-    __d.counter++; \
+    __d.counter.fetch_add(1, std::memory_order_relaxed); \
 } while (0)
 
 struct CoverData {
 	const char *file, *func, *id;
-	int line, counter;
-} YS_ATTRIBUTE(packed);
+	int line;
+	std::atomic<int> counter;
+};
 
-// this two symbols are created by the linker for the "yosys_cover_list" ELF section
+// this two symbols are created by the linker __start_yosys_cover_listfor the "yosys_cover_list" ELF section
 extern "C" struct CoverData __start_yosys_cover_list[];
 extern "C" struct CoverData __stop_yosys_cover_list[];
 

From 4c8b537d7194bbb300c23162d07b9cf25b8d7447 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Fri, 14 Nov 2025 01:52:22 +0000
Subject: [PATCH 924/931] Remove YOSYS_NO_IDS_REFCNT

Refcounting is hardly used at all so this option is not that useful.

We might want to have a different option that disables GC if that becomes
a performance issue, but that should be a different option.
---
 kernel/rtlil.cc | 9 ---------
 kernel/rtlil.h  | 6 ------
 2 files changed, 15 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index d18a709c9..dc851c019 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -40,10 +40,8 @@ std::vector<RTLIL::IdString::Storage> RTLIL::IdString::global_id_storage_;
 std::unordered_map<std::string_view, int> RTLIL::IdString::global_id_index_;
 std::unordered_map<int, const std::string*> RTLIL::IdString::global_autoidx_id_prefix_storage_;
 std::unordered_map<int, char*> RTLIL::IdString::global_autoidx_id_storage_;
-#ifndef YOSYS_NO_IDS_REFCNT
 std::unordered_map<int, int> RTLIL::IdString::global_refcount_storage_;
 std::vector<int> RTLIL::IdString::global_free_idx_list_;
-#endif
 
 static void populate(std::string_view name)
 {
@@ -104,7 +102,6 @@ int RTLIL::IdString::really_insert(std::string_view p, std::unordered_map<std::s
 		}
 	}
 
-#ifndef YOSYS_NO_IDS_REFCNT
 	if (global_free_idx_list_.empty()) {
 		log_assert(global_id_storage_.size() < 0x40000000);
 		global_free_idx_list_.push_back(global_id_storage_.size());
@@ -113,10 +110,6 @@ int RTLIL::IdString::really_insert(std::string_view p, std::unordered_map<std::s
 
 	int idx = global_free_idx_list_.back();
 	global_free_idx_list_.pop_back();
-#else
-	int idx = global_id_storage_.size();
-	global_id_index_[global_id_storage_.back()] = idx;
-#endif
 	char* buf = static_cast<char*>(malloc(p.size() + 1));
 	memcpy(buf, p.data(), p.size());
 	buf[p.size()] = 0;
@@ -249,7 +242,6 @@ int RTLIL::OwningIdString::gc_count;
 void RTLIL::OwningIdString::collect_garbage()
 {
 	int64_t start = PerformanceTimer::query();
-#ifndef YOSYS_NO_IDS_REFCNT
 	IdStringCollector collector;
 	for (auto &[idx, design] : *RTLIL::Design::get_all_designs()) {
 		collector.trace(*design);
@@ -291,7 +283,6 @@ void RTLIL::OwningIdString::collect_garbage()
 		}
 		it = global_autoidx_id_prefix_storage_.erase(it);
 	}
-#endif
 	int64_t time_ns = PerformanceTimer::query() - start;
 	Pass::subtract_from_current_runtime_ns(time_ns);
 	gc_ns += time_ns;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 4da030e8d..a674d87e9 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -153,11 +153,9 @@ struct RTLIL::IdString
 	static std::unordered_map<int, const std::string*> global_autoidx_id_prefix_storage_;
 	// Explicit string storage for autoidx IDs
 	static std::unordered_map<int, char*> global_autoidx_id_storage_;
-#ifndef YOSYS_NO_IDS_REFCNT
 	// All (index, refcount) pairs in this map have refcount > 0.
 	static std::unordered_map<int, int> global_refcount_storage_;
 	static std::vector<int> global_free_idx_list_;
-#endif
 
 	static int refcount(int idx) {
 		auto it = global_refcount_storage_.find(idx);
@@ -597,7 +595,6 @@ private:
 	}
 	static void get_reference(int idx)
 	{
-	#ifndef YOSYS_NO_IDS_REFCNT
 		if (idx < static_cast<short>(StaticId::STATIC_ID_END))
 			return;
 		auto it = global_refcount_storage_.find(idx);
@@ -605,7 +602,6 @@ private:
 			global_refcount_storage_.insert(it, {idx, 1});
 		else
 			++it->second;
-	#endif
 	#ifdef YOSYS_XTRACE_GET_PUT
 		if (yosys_xtrace && idx >= static_cast<short>(StaticId::STATIC_ID_END))
 			log("#X# GET-BY-INDEX '%s' (index %d, refcount %u)\n", from_index(idx), idx, refcount(idx));
@@ -614,7 +610,6 @@ private:
 
 	void put_reference()
 	{
-	#ifndef YOSYS_NO_IDS_REFCNT
 		// put_reference() may be called from destructors after the destructor of
 		// global_refcount_storage_ has been run. in this case we simply do nothing.
 		if (index_ < static_cast<short>(StaticId::STATIC_ID_END) || !destruct_guard_ok)
@@ -628,7 +623,6 @@ private:
 		if (--it->second == 0) {
 			global_refcount_storage_.erase(it);
 		}
-	#endif
 	}
 };
 

From 8f0ecce53f4293e324dfe6cefbed26b6c86d6ade Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Mon, 24 Nov 2025 22:29:06 +0000
Subject: [PATCH 925/931] Forbid creating IdStrings and incrementing autoidx
 during multithreaded phases, and add dynamic checks for that

We could make it safe to increment autoidx during multithreaded passes, but that's
actually undesirable because it would lead to nondeterminism. If/when we need new
IDs during parallel passes, we'll have to figure out how to allocate them in a
deterministic way, and that will depend on the details of what the pass does.
So don't try to tackle that now.
---
 frontends/blif/blifparse.cc |  2 +-
 kernel/rtlil.cc             |  2 +-
 kernel/rtlil.h              |  6 ++++++
 kernel/yosys.cc             | 24 +++++++++++++++++++++++-
 kernel/yosys_common.h       | 25 ++++++++++++++++++++++++-
 5 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/frontends/blif/blifparse.cc b/frontends/blif/blifparse.cc
index 0aa3a173d..bff347ea2 100644
--- a/frontends/blif/blifparse.cc
+++ b/frontends/blif/blifparse.cc
@@ -245,7 +245,7 @@ void parse_blif(RTLIL::Design *design, std::istream &f, IdString dff_name, bool
 					if (undef_wire != nullptr)
 						module->rename(undef_wire, stringf("$undef$%d", ++blif_maxnum));
 
-					autoidx = std::max(autoidx, blif_maxnum+1);
+					autoidx.ensure_at_least(blif_maxnum+1);
 					blif_maxnum = 0;
 				}
 
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index dc851c019..9477b04a8 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -98,7 +98,7 @@ int RTLIL::IdString::really_insert(std::string_view p, std::unordered_map<std::s
 				return -*p_autoidx;
 			// Ensure NEW_ID/NEW_ID_SUFFIX will not create collisions with the ID
 			// we're about to create.
-			autoidx = std::max(autoidx, *p_autoidx + 1);
+			autoidx.ensure_at_least(*p_autoidx + 1);
 		}
 	}
 
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index a674d87e9..29eac294f 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -187,6 +187,7 @@ struct RTLIL::IdString
 	static int insert(std::string_view p)
 	{
 		log_assert(destruct_guard_ok);
+		log_assert(!Multithreading::active());
 
 		auto it = global_id_index_.find(p);
 		if (it != global_id_index_.end()) {
@@ -202,6 +203,7 @@ struct RTLIL::IdString
 	// Inserts an ID with string `prefix + autoidx', incrementing autoidx.
 	// `prefix` must start with '$auto$', end with '$', and live forever.
 	static IdString new_autoidx_with_prefix(const std::string *prefix) {
+		log_assert(!Multithreading::active());
 		int index = -(autoidx++);
 		global_autoidx_id_prefix_storage_.insert({index, prefix});
 		return from_index(index);
@@ -595,6 +597,8 @@ private:
 	}
 	static void get_reference(int idx)
 	{
+		log_assert(!Multithreading::active());
+
 		if (idx < static_cast<short>(StaticId::STATIC_ID_END))
 			return;
 		auto it = global_refcount_storage_.find(idx);
@@ -610,6 +614,8 @@ private:
 
 	void put_reference()
 	{
+		log_assert(!Multithreading::active());
+
 		// put_reference() may be called from destructors after the destructor of
 		// global_refcount_storage_ has been run. in this case we simply do nothing.
 		if (index_ < static_cast<short>(StaticId::STATIC_ID_END) || !destruct_guard_ok)
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 009da56b9..2c9b8304d 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -19,6 +19,7 @@
 
 #include "kernel/yosys.h"
 #include "kernel/celltypes.h"
+#include "kernel/log.h"
 
 #ifdef YOSYS_ENABLE_READLINE
 #  include <readline/readline.h>
@@ -80,7 +81,7 @@ extern "C" PyObject* PyInit_pyosys();
 
 YOSYS_NAMESPACE_BEGIN
 
-int autoidx = 1;
+Autoidx autoidx(1);
 int yosys_xtrace = 0;
 bool yosys_write_versions = true;
 const char* yosys_maybe_version() {
@@ -108,9 +109,30 @@ uint32_t Hasher::fudge = 0;
 std::string yosys_share_dirname;
 std::string yosys_abc_executable;
 
+bool Multithreading::active_ = false;
+
 void init_share_dirname();
 void init_abc_executable_name();
 
+Multithreading::Multithreading() {
+	log_assert(!active_);
+	active_ = true;
+}
+
+Multithreading::~Multithreading() {
+	log_assert(active_);
+	active_ = false;
+}
+
+void Autoidx::ensure_at_least(int v) {
+	value = std::max(value, v);
+}
+
+int Autoidx::operator++(int) {
+	log_assert(!Multithreading::active());
+	return value++;
+}
+
 void memhasher_on()
 {
 #if defined(__linux__) || defined(__FreeBSD__)
diff --git a/kernel/yosys_common.h b/kernel/yosys_common.h
index 2374182ee..55e7b71eb 100644
--- a/kernel/yosys_common.h
+++ b/kernel/yosys_common.h
@@ -267,7 +267,30 @@ int ceil_log2(int x) YS_ATTRIBUTE(const);
 template<typename T> int GetSize(const T &obj) { return obj.size(); }
 inline int GetSize(RTLIL::Wire *wire);
 
-extern int autoidx;
+// When multiple threads are accessing RTLIL, one of these guard objects
+// must exist.
+struct Multithreading
+{
+	Multithreading();
+	~Multithreading();
+	// Returns true when multiple threads are accessing RTLIL.
+	// autoidx cannot be used during such times.
+	// IdStrings cannot be created during such times.
+	static bool active() { return active_; }
+private:
+	static bool active_;
+};
+
+struct Autoidx {
+	Autoidx(int value) : value(value) {}
+	operator int() const { return value; }
+	void ensure_at_least(int v);
+	int operator++(int);
+private:
+	int value;
+};
+
+extern Autoidx autoidx;
 extern int yosys_xtrace;
 extern bool yosys_write_versions;
 

From 948001f39f016de043e8cb59165015347b1a34bc Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 25 Nov 2025 00:47:11 +0000
Subject: [PATCH 926/931] Merge the two autoidx hashtables into one

When something calls `IdString::c_str()` on an autoidx ID, we need to cache the
full string in a thread-safe way. If we need to allocate an entry in some data
structure to do that, it's difficult to do in a thread-safe no-performance-hazard way.
So instead, store the cached string pointer in the same hashtable as the prefix
pointer.
---
 kernel/rtlil.cc | 19 ++++++++-----------
 kernel/rtlil.h  | 36 ++++++++++++++++++++----------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 9477b04a8..6077237ac 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -38,8 +38,7 @@ bool RTLIL::IdString::destruct_guard_ok = false;
 RTLIL::IdString::destruct_guard_t RTLIL::IdString::destruct_guard;
 std::vector<RTLIL::IdString::Storage> RTLIL::IdString::global_id_storage_;
 std::unordered_map<std::string_view, int> RTLIL::IdString::global_id_index_;
-std::unordered_map<int, const std::string*> RTLIL::IdString::global_autoidx_id_prefix_storage_;
-std::unordered_map<int, char*> RTLIL::IdString::global_autoidx_id_storage_;
+std::unordered_map<int, RTLIL::IdString::AutoidxStorage> RTLIL::IdString::global_autoidx_id_storage_;
 std::unordered_map<int, int> RTLIL::IdString::global_refcount_storage_;
 std::vector<int> RTLIL::IdString::global_free_idx_list_;
 
@@ -93,8 +92,9 @@ int RTLIL::IdString::really_insert(std::string_view p, std::unordered_map<std::s
 		size_t autoidx_pos = p.find_last_of('$') + 1;
 		std::optional<int> p_autoidx = parse_autoidx(p.substr(autoidx_pos));
 		if (p_autoidx.has_value()) {
-			auto prefix_it = global_autoidx_id_prefix_storage_.find(-*p_autoidx);
-			if (prefix_it != global_autoidx_id_prefix_storage_.end() && p.substr(0, autoidx_pos) == *prefix_it->second)
+			auto autoidx_it = global_autoidx_id_storage_.find(-*p_autoidx);
+			if (autoidx_it != global_autoidx_id_storage_.end() &&
+					p.substr(0, autoidx_pos) == *autoidx_it->second.prefix)
 				return -*p_autoidx;
 			// Ensure NEW_ID/NEW_ID_SUFFIX will not create collisions with the ID
 			// we're about to create.
@@ -267,7 +267,7 @@ void RTLIL::OwningIdString::collect_garbage()
 		global_free_idx_list_.push_back(i);
 	}
 
-	for (auto it = global_autoidx_id_prefix_storage_.begin(); it != global_autoidx_id_prefix_storage_.end();) {
+	for (auto it = global_autoidx_id_storage_.begin(); it != global_autoidx_id_storage_.end();) {
 		if (collector.live.find(it->first) != collector.live.end()) {
 			++it;
 			continue;
@@ -276,13 +276,10 @@ void RTLIL::OwningIdString::collect_garbage()
 			++it;
 			continue;
 		}
-		auto str_it = global_autoidx_id_storage_.find(it->first);
-		if (str_it != global_autoidx_id_storage_.end()) {
-			delete[] str_it->second;
-			global_autoidx_id_storage_.erase(str_it);
-		}
-		it = global_autoidx_id_prefix_storage_.erase(it);
+		delete[] it->second.full_str;
+		it = global_autoidx_id_storage_.erase(it);
 	}
+
 	int64_t time_ns = PerformanceTimer::query() - start;
 	Pass::subtract_from_current_runtime_ns(time_ns);
 	gc_ns += time_ns;
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 29eac294f..06c38c52e 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -134,6 +134,13 @@ struct RTLIL::IdString
 
 		std::string_view str_view() const { return {buf, static_cast<size_t>(size)}; }
 	};
+	struct AutoidxStorage {
+		// Append the negated (i.e. positive) ID to this string to get
+		// the real string. The prefix strings must live forever.
+		const std::string *prefix;
+		// Cache of the full string, or nullptr if not cached yet.
+		char *full_str;
+	};
 
 	// the global id string cache
 
@@ -147,12 +154,9 @@ struct RTLIL::IdString
 	static std::vector<Storage> global_id_storage_;
 	// Lookup table for non-autoidx IDs
 	static std::unordered_map<std::string_view, int> global_id_index_;
-	// Shared prefix string storage for autoidx IDs, which have negative
-	// indices. Append the negated (i.e. positive) ID to this string to get
-	// the real string. The prefix strings must live forever.
-	static std::unordered_map<int, const std::string*> global_autoidx_id_prefix_storage_;
-	// Explicit string storage for autoidx IDs
-	static std::unordered_map<int, char*> global_autoidx_id_storage_;
+	// Storage for autoidx IDs, which have negative indices, i.e. all entries in this
+	// map have negative keys.
+	static std::unordered_map<int, AutoidxStorage> global_autoidx_id_storage_;
 	// All (index, refcount) pairs in this map have refcount > 0.
 	static std::unordered_map<int, int> global_refcount_storage_;
 	static std::vector<int> global_free_idx_list_;
@@ -205,7 +209,7 @@ struct RTLIL::IdString
 	static IdString new_autoidx_with_prefix(const std::string *prefix) {
 		log_assert(!Multithreading::active());
 		int index = -(autoidx++);
-		global_autoidx_id_prefix_storage_.insert({index, prefix});
+		global_autoidx_id_storage_.insert({index, {prefix, nullptr}});
 		return from_index(index);
 	}
 
@@ -238,16 +242,16 @@ struct RTLIL::IdString
 	inline const char *c_str() const {
 		if (index_ >= 0)
 			return global_id_storage_.at(index_).buf;
-		auto it = global_autoidx_id_storage_.find(index_);
-		if (it != global_autoidx_id_storage_.end())
-			return it->second;
 
-		const std::string &prefix = *global_autoidx_id_prefix_storage_.at(index_);
+		AutoidxStorage &s = global_autoidx_id_storage_.at(index_);
+		if (s.full_str != nullptr)
+			return s.full_str;
+		const std::string &prefix = *s.prefix;
 		std::string suffix = std::to_string(-index_);
 		char *c = new char[prefix.size() + suffix.size() + 1];
 		memcpy(c, prefix.data(), prefix.size());
 		memcpy(c + prefix.size(), suffix.c_str(), suffix.size() + 1);
-		global_autoidx_id_storage_.insert(it, {index_, c});
+		s.full_str = c;
 		return c;
 	}
 
@@ -262,7 +266,7 @@ struct RTLIL::IdString
 			*out += global_id_storage_.at(index_).str_view();
 			return;
 		}
-		*out += *global_autoidx_id_prefix_storage_.at(index_);
+		*out += *global_autoidx_id_storage_.at(index_).prefix;
 		*out += std::to_string(-index_);
 	}
 
@@ -348,7 +352,7 @@ struct RTLIL::IdString
 		if (index_ >= 0) {
 			return const_iterator(global_id_storage_.at(index_));
 		}
-		return const_iterator(global_autoidx_id_prefix_storage_.at(index_), -index_);
+		return const_iterator(global_autoidx_id_storage_.at(index_).prefix, -index_);
 	}
 	const_iterator end() const {
 		return const_iterator();
@@ -358,7 +362,7 @@ struct RTLIL::IdString
 		if (index_ >= 0) {
 			return Substrings(global_id_storage_.at(index_));
 		}
-		return Substrings(global_autoidx_id_prefix_storage_.at(index_), -index_);
+		return Substrings(global_autoidx_id_storage_.at(index_).prefix, -index_);
 	}
 
 	inline bool lt_by_name(const IdString &rhs) const {
@@ -411,7 +415,7 @@ struct RTLIL::IdString
 #endif
 			return *(storage.buf + i);
 		}
-		const std::string &id_start = *global_autoidx_id_prefix_storage_.at(index_);
+		const std::string &id_start = *global_autoidx_id_storage_.at(index_).prefix;
 		if (i < id_start.size())
 			return id_start[i];
 		i -= id_start.size();

From b23dc345ae915f5ffad10fc8ebbdd3668dc6c849 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <rocallahan@google.com>
Date: Tue, 25 Nov 2025 01:02:01 +0000
Subject: [PATCH 927/931] Make it safe to access .c_str() for autoidx IDs in a
 multithreaded context

---
 kernel/rtlil.cc     |  1 -
 kernel/rtlil.h      | 19 +++++++++++++------
 pyosys/generator.py |  3 +--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index 6077237ac..6960b7620 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -276,7 +276,6 @@ void RTLIL::OwningIdString::collect_garbage()
 			++it;
 			continue;
 		}
-		delete[] it->second.full_str;
 		it = global_autoidx_id_storage_.erase(it);
 	}
 
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 06c38c52e..f841df1ed 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -139,7 +139,11 @@ struct RTLIL::IdString
 		// the real string. The prefix strings must live forever.
 		const std::string *prefix;
 		// Cache of the full string, or nullptr if not cached yet.
-		char *full_str;
+		std::atomic<char *> full_str;
+
+		AutoidxStorage(const std::string *prefix) : prefix(prefix), full_str(nullptr) {}
+		AutoidxStorage(AutoidxStorage&& other) : prefix(other.prefix), full_str(other.full_str.exchange(nullptr, std::memory_order_relaxed)) {}
+		~AutoidxStorage() { delete[] full_str.load(std::memory_order_acquire); }
 	};
 
 	// the global id string cache
@@ -209,7 +213,7 @@ struct RTLIL::IdString
 	static IdString new_autoidx_with_prefix(const std::string *prefix) {
 		log_assert(!Multithreading::active());
 		int index = -(autoidx++);
-		global_autoidx_id_storage_.insert({index, {prefix, nullptr}});
+		global_autoidx_id_storage_.insert({index, prefix});
 		return from_index(index);
 	}
 
@@ -244,15 +248,18 @@ struct RTLIL::IdString
 			return global_id_storage_.at(index_).buf;
 
 		AutoidxStorage &s = global_autoidx_id_storage_.at(index_);
-		if (s.full_str != nullptr)
-			return s.full_str;
+		char *full_str = s.full_str.load(std::memory_order_acquire);
+		if (full_str != nullptr)
+			return full_str;
 		const std::string &prefix = *s.prefix;
 		std::string suffix = std::to_string(-index_);
 		char *c = new char[prefix.size() + suffix.size() + 1];
 		memcpy(c, prefix.data(), prefix.size());
 		memcpy(c + prefix.size(), suffix.c_str(), suffix.size() + 1);
-		s.full_str = c;
-		return c;
+		if (s.full_str.compare_exchange_strong(full_str, c, std::memory_order_acq_rel))
+			return c;
+		delete[] c;
+		return full_str;
 	}
 
 	inline std::string str() const {
diff --git a/pyosys/generator.py b/pyosys/generator.py
index 25f87d570..7d4293abd 100644
--- a/pyosys/generator.py
+++ b/pyosys/generator.py
@@ -164,8 +164,7 @@ pyosys_headers = [
                     {
                         "global_id_storage_",
                         "global_id_index_",
-                        "global_negative_id_storage_",
-                        "global_negative_id_prefix_storage_",
+                        "global_autoidx_id_storage_",
                         "global_refcount_storage_",
                         "global_free_idx_list_",
                         "builtin_ff_cell_types",

From 752d24c0a8f5f41e6d0700ef8807dc853729ec7c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Nov 2025 00:24:41 +0000
Subject: [PATCH 928/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 15cffdb90..52f5c31ac 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.59+127
+YOSYS_VER := 0.59+130
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)

From 7cb3a0f83000b80f17df9a95aca4666464db1740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Wed, 26 Nov 2025 12:34:02 +0100
Subject: [PATCH 929/931] Add static library option

---
 Makefile | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 52f5c31ac..f919e31b6 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ ENABLE_VERIFIC_EDIF := 0
 ENABLE_VERIFIC_LIBERTY := 0
 ENABLE_COVER := 1
 ENABLE_LIBYOSYS := 0
+ENABLE_LIBYOSYS_STATIC := 0
 ENABLE_ZLIB := 1
 ENABLE_HELP_SOURCE := 0
 
@@ -342,6 +343,9 @@ endif
 
 ifeq ($(ENABLE_LIBYOSYS),1)
 TARGETS += libyosys.so
+ifeq ($(ENABLE_LIBYOSYS_STATIC),1)
+TARGETS += libyosys.a
+endif
 endif
 
 PY_WRAPPER_FILE = pyosys/wrappers
@@ -775,6 +779,9 @@ else
 	$(P) $(CXX) -o libyosys.so -shared -Wl,-soname,libyosys.so $(LINKFLAGS) $^ $(LIBS) $(LIBS_VERIFIC)
 endif
 
+libyosys.a: $(filter-out kernel/driver.o,$(OBJS))
+	$(P) ar rcs $@ $^
+
 %.o: %.cc
 	$(Q) mkdir -p $(dir $@)
 	$(P) $(CXX) -o $@ -c $(CPPFLAGS) $(CXXFLAGS) $<
@@ -1026,7 +1033,7 @@ install-dev: $(PROGRAM_PREFIX)yosys-config share
 
 install: $(TARGETS) $(EXTRA_TARGETS)
 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(BINDIR)
-	$(INSTALL_SUDO) cp $(filter-out libyosys.so,$(TARGETS)) $(DESTDIR)$(BINDIR)
+	$(INSTALL_SUDO) cp $(filter-out libyosys.so libyosys.a,$(TARGETS)) $(DESTDIR)$(BINDIR)
 ifneq ($(filter $(PROGRAM_PREFIX)yosys,$(TARGETS)),)
 	if [ -n "$(STRIP)" ]; then $(INSTALL_SUDO) $(STRIP) -S $(DESTDIR)$(BINDIR)/$(PROGRAM_PREFIX)yosys; fi
 endif
@@ -1042,6 +1049,9 @@ ifeq ($(ENABLE_LIBYOSYS),1)
 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(LIBDIR)
 	$(INSTALL_SUDO) cp libyosys.so $(DESTDIR)$(LIBDIR)/
 	if [ -n "$(STRIP)" ]; then $(INSTALL_SUDO) $(STRIP) -S $(DESTDIR)$(LIBDIR)/libyosys.so; fi
+ifeq ($(ENABLE_LIBYOSYS_STATIC),1)
+	$(INSTALL_SUDO) cp libyosys.a $(DESTDIR)$(LIBDIR)/
+endif
 ifeq ($(ENABLE_PYOSYS),1)
 	$(INSTALL_SUDO) mkdir -p $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys
 	$(INSTALL_SUDO) cp $(YOSYS_SRC)/pyosys/__init__.py $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys/__init__.py
@@ -1064,6 +1074,9 @@ uninstall:
 	$(INSTALL_SUDO) rm -rvf $(DESTDIR)$(DATDIR)
 ifeq ($(ENABLE_LIBYOSYS),1)
 	$(INSTALL_SUDO) rm -vf $(DESTDIR)$(LIBDIR)/libyosys.so
+ifeq ($(ENABLE_LIBYOSYS_STATIC),1)
+	$(INSTALL_SUDO) rm -vf $(DESTDIR)$(LIBDIR)/libyosys.a
+endif
 ifeq ($(ENABLE_PYOSYS),1)
 	$(INSTALL_SUDO) rm -vf $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys/libyosys.so
 	$(INSTALL_SUDO) rm -vf $(DESTDIR)$(PYTHON_DESTDIR)/$(subst -,_,$(PROGRAM_PREFIX))pyosys/__init__.py
@@ -1162,7 +1175,7 @@ clean-py:
 	rm -f $(PY_WRAPPER_FILE).inc.cc $(PY_WRAPPER_FILE).cc
 	rm -f $(PYTHON_OBJECTS)
 	rm -f *.whl
-	rm -f libyosys.so
+	rm -f libyosys.so libyosys.a
 	rm -rf kernel/*.pyh
 
 clean-abc:

From c1e40e113c24c1279a6d592c96c8a34fcbe072d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Povi=C5=A1er?= <povik@cutebit.org>
Date: Wed, 26 Nov 2025 13:02:44 +0100
Subject: [PATCH 930/931] Use `$(AR)`

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f919e31b6..8959eacf9 100644
--- a/Makefile
+++ b/Makefile
@@ -780,7 +780,7 @@ else
 endif
 
 libyosys.a: $(filter-out kernel/driver.o,$(OBJS))
-	$(P) ar rcs $@ $^
+	$(P) $(AR) rcs $@ $^
 
 %.o: %.cc
 	$(Q) mkdir -p $(dir $@)

From e4044e1b4a28e4412a168d6ed3fe7c4192145814 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Nov 2025 00:24:24 +0000
Subject: [PATCH 931/931] Bump version

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8959eacf9..ccb1be1b9 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.59+130
+YOSYS_VER := 0.59+134
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2 | cut -d'+' -f1)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'+' -f2)