Make renaming nicer for bmuxmap -pmux

akashlevy · akashlevy · commit b1383a80cf8b · 2024-09-27T00:54:05.000-07:00
diff --git a/passes/techmap/bmuxmap.cc b/passes/techmap/bmuxmap.cc
@@ -74,7 +74,9 @@ struct BmuxmapPass : public Pass {
 				{
 					module->addEq(NEW_ID, sel, SigSpec(val, GetSize(sel)), new_s[val]);
 				}
-				RTLIL::Cell *pmux = module->addPmux(NEW_ID, new_a, data, new_s, new_data);
+				IdString new_id = IdString("$" + cell->name.str());
+				while (module->count_id(new_id) > 0) new_id = IdString("$" + new_id.str());
+				RTLIL::Cell *pmux = module->addPmux(new_id, new_a, data, new_s, new_data);
 				pmux->add_strpool_attribute(ID::src, cell->get_strpool_attribute(ID::src));
 				data = new_data;
 			}

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,9 @@ struct BmuxmapPass : public Pass {`
`74`	`74`	`{`
`75`	`75`	`module->addEq(NEW_ID, sel, SigSpec(val, GetSize(sel)), new_s[val]);`
`76`	`76`	`}`
`77`		`- RTLIL::Cell *pmux = module->addPmux(NEW_ID, new_a, data, new_s, new_data);`
	`77`	`+ IdString new_id = IdString("$" + cell->name.str());`
	`78`	`+ while (module->count_id(new_id) > 0) new_id = IdString("$" + new_id.str());`
	`79`	`+ RTLIL::Cell *pmux = module->addPmux(new_id, new_a, data, new_s, new_data);`
`78`	`80`	`pmux->add_strpool_attribute(ID::src, cell->get_strpool_attribute(ID::src));`
`79`	`81`	`data = new_data;`
`80`	`82`	`}`