extract_counter: Minor changes requested to comply with upstream policy, fixed a few typos

azonenberg · azonenberg · commit 634f18be9616 · 2017-08-30T16:28:25.000-07:00
diff --git a/passes/techmap/extract_counter.cc b/passes/techmap/extract_counter.cc
@@ -385,7 +385,7 @@ void counter_worker(
 	}
 
 	//Get new cell name
-	string countname = string("$auto$COUNTx$") + log_id(extract.rwire->name.str());
+	string countname = string("$COUNTx$") + log_id(extract.rwire->name.str());
 
 	//Log it
 	total_counters ++;
@@ -484,6 +484,7 @@ struct ExtractCounterPass : public Pass {
 		log("\n");
 		log("    -maxwidth N\n");
 		log("        Only extract counters up to N bits wide\n");
+		log("\n");
 		log("    -pout X,Y,...\n");
 		log("        Only allow parallel output from the counter to the listed cell types\n");
 		log("        (if not specified, parallel outputs are not restricted)\n");
@@ -513,13 +514,13 @@ struct ExtractCounterPass : public Pass {
 				{
 					if(pouts[i] == ',')
 					{
-						parallel_cells.insert(RTLIL::IdString(tmp));
+						parallel_cells.insert(RTLIL::escape_id(tmp));
 						tmp = "";
 					}
 					else
 						tmp += pouts[i];
 				}
-				parallel_cells.insert(RTLIL::IdString(tmp));
+				parallel_cells.insert(RTLIL::escape_id(tmp));
 				continue;
 			}
 
diff --git a/techlibs/greenpak4/cells_map.v b/techlibs/greenpak4/cells_map.v
@@ -164,23 +164,23 @@ module \$__COUNT_ (CE, CLK, OUT, POUT, RST, UP);
 	//If we have a CE, or DIRECTION other than DOWN fail... GP_COUNTx_ADV is not supported yet
 	if(HAS_CE || (DIRECTION != "DOWN") ) begin
 		initial begin
-			$display("ERROR: \$__COUNT__ support for GP_COUNTx_ADV is not yet implemented. This counter should never have been extracted (bug in extract_counter pass?).");
+			$display("ERROR: \$__COUNT_ support for GP_COUNTx_ADV is not yet implemented. This counter should never have been extracted (bug in extract_counter pass?).");
 			$finish;
 		end
 	end
 
 	//If counter is more than 14 bits wide, complain (also shouldn't happen)
 	else if(WIDTH > 14) begin
 		initial begin
-			$display("ERROR: \$__COUNT__ support for cascaded counters is not yet implemented. This counter should never have been extracted (bug in extract_counter pass?).");
+			$display("ERROR: \$__COUNT_ support for cascaded counters is not yet implemented. This counter should never have been extracted (bug in extract_counter pass?).");
 			$finish;
 		end
 	end
 
 	//If counter is more than 8 bits wide and has parallel output, we have a problem
 	else if(WIDTH > 8 && HAS_POUT) begin
 		initial begin
-			$display("ERROR: \$__COUNT__ support for 9-14 bit counters with parallel output is not yet implemented. This counter should never have been extracted (bug in extract_counter pass?).");
+			$display("ERROR: \$__COUNT_ support for 9-14 bit counters with parallel output is not yet implemented. This counter should never have been extracted (bug in extract_counter pass?).");
 			$finish;
 		end
 	end
diff --git a/techlibs/greenpak4/synth_greenpak4.cc b/techlibs/greenpak4/synth_greenpak4.cc
@@ -155,7 +155,7 @@ struct SynthGreenPAK4Pass : public ScriptPass
 
 		if (check_label("fine"))
 		{
-			run("extract_counter -pout \\GP_DCMP,\\GP_DAC -maxwidth 14");
+			run("extract_counter -pout GP_DCMP,GP_DAC -maxwidth 14");
 			run("clean");
 			run("opt -fast -mux_undef -undriven -fine");
 			run("memory_map");

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ void counter_worker(`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`//Get new cell name`
`388`		`- string countname = string("$auto$COUNTx$") + log_id(extract.rwire->name.str());`
	`388`	`+ string countname = string("$COUNTx$") + log_id(extract.rwire->name.str());`
`389`	`389`
`390`	`390`	`//Log it`
`391`	`391`	`total_counters ++;`
`@@ -484,6 +484,7 @@ struct ExtractCounterPass : public Pass {`
`484`	`484`	`log("\n");`
`485`	`485`	`log(" -maxwidth N\n");`
`486`	`486`	`log(" Only extract counters up to N bits wide\n");`
	`487`	`+ log("\n");`
`487`	`488`	`log(" -pout X,Y,...\n");`
`488`	`489`	`log(" Only allow parallel output from the counter to the listed cell types\n");`
`489`	`490`	`log(" (if not specified, parallel outputs are not restricted)\n");`
`@@ -513,13 +514,13 @@ struct ExtractCounterPass : public Pass {`
`513`	`514`	`{`
`514`	`515`	`if(pouts[i] == ',')`
`515`	`516`	`{`
`516`		`- parallel_cells.insert(RTLIL::IdString(tmp));`
	`517`	`+ parallel_cells.insert(RTLIL::escape_id(tmp));`
`517`	`518`	`tmp = "";`
`518`	`519`	`}`
`519`	`520`	`else`
`520`	`521`	`tmp += pouts[i];`
`521`	`522`	`}`
`522`		`- parallel_cells.insert(RTLIL::IdString(tmp));`
	`523`	`+ parallel_cells.insert(RTLIL::escape_id(tmp));`
`523`	`524`	`continue;`
`524`	`525`	`}`
`525`	`526`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ struct SynthGreenPAK4Pass : public ScriptPass`
`155`	`155`
`156`	`156`	`if (check_label("fine"))`
`157`	`157`	`{`
`158`		`- run("extract_counter -pout \\GP_DCMP,\\GP_DAC -maxwidth 14");`
	`158`	`+ run("extract_counter -pout GP_DCMP,GP_DAC -maxwidth 14");`
`159`	`159`	`run("clean");`
`160`	`160`	`run("opt -fast -mux_undef -undriven -fine");`
`161`	`161`	`run("memory_map");`