Merge pull request #6221 from YosysHQ/nella/abc-new-scopeinfo

aiger2: keep $scopeinfo through mapping_prep

backends/aiger2/aiger.cc

@@ -1708,7 +1708,9 @@ struct XAigerWriter : AigerWriter {
 		if (mapping_prep) {
 			std::vector<Cell *> to_remove_cells;
 			for (auto cell : top->cells())
-				if (!top_minfo->found_blackboxes.count(cell) && !keep_cells.count(cell))
+				// $scopeinfo isn't part of the mapping
+				if (cell->type != ID($scopeinfo) &&
+						!top_minfo->found_blackboxes.count(cell) && !keep_cells.count(cell))
 					to_remove_cells.push_back(cell);
 			for (auto cell : to_remove_cells)
 				top->remove(cell);

tests/abc_new/generate_mk.py

@@ -10,7 +10,6 @@ import gen_tests_makefile
 skip = [
     "hier_check.ys",
     "keep_wire.ys",
-    "scopeinfo.ys",
 ]
 
 def create_tests():

tests/abc_new/scopeinfo.ys

@@ -12,7 +12,10 @@ EOT
 hierarchy -top top
 proc
 opt
+design -save gold_hier
+flatten
 design -save gold
+design -load gold_hier
 flatten -scopename
 select -assert-count 2 t:$scopeinfo
 techmap