mirror of
				https://github.com/YosysHQ/yosys
				synced 2025-10-31 19:52:31 +00:00 
			
		
		
		
	ice40: Use dfflegalize.
This commit is contained in:
		
							parent
							
								
									01772dec8c
								
							
						
					
					
						commit
						1fc8c3a0d1
					
				
					 4 changed files with 24 additions and 208 deletions
				
			
		|  | @ -2,7 +2,6 @@ | |||
| OBJS += techlibs/ice40/synth_ice40.o | ||||
| OBJS += techlibs/ice40/ice40_braminit.o | ||||
| OBJS += techlibs/ice40/ice40_ffssr.o | ||||
| OBJS += techlibs/ice40/ice40_ffinit.o | ||||
| OBJS += techlibs/ice40/ice40_opt.o | ||||
| 
 | ||||
| GENFILES += techlibs/ice40/brams_init1.vh | ||||
|  |  | |||
|  | @ -1,28 +1,25 @@ | |||
| module  \$_DFF_N_ (input D, C, output Q); SB_DFFN _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C)); endmodule | ||||
| module  \$_DFF_P_ (input D, C, output Q); SB_DFF  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C)); endmodule | ||||
| module  \$_DFF_N_ (input D, C, output Q); SB_DFFN _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_DFF_P_ (input D, C, output Q); SB_DFF  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| 
 | ||||
| module  \$_DFFE_NN_ (input D, C, E, output Q); SB_DFFNE _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(!E)); endmodule | ||||
| module  \$_DFFE_PN_ (input D, C, E, output Q); SB_DFFE  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(!E)); endmodule | ||||
| module  \$_DFFE_NP_ (input D, C, E, output Q); SB_DFFNE _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_DFFE_PP_ (input D, C, E, output Q); SB_DFFE  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| 
 | ||||
| module  \$_DFFE_NP_ (input D, C, E, output Q); SB_DFFNE _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E)); endmodule | ||||
| module  \$_DFFE_PP_ (input D, C, E, output Q); SB_DFFE  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E)); endmodule | ||||
| module  \$_DFF_NP0_ (input D, C, R, output Q); SB_DFFNR _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .R(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_DFF_NP1_ (input D, C, R, output Q); SB_DFFNS _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .S(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_DFF_PP0_ (input D, C, R, output Q); SB_DFFR  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .R(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_DFF_PP1_ (input D, C, R, output Q); SB_DFFS  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .S(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| 
 | ||||
| module  \$_DFF_NN0_ (input D, C, R, output Q); SB_DFFNR _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .R(!R)); endmodule | ||||
| module  \$_DFF_NN1_ (input D, C, R, output Q); SB_DFFNS _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .S(!R)); endmodule | ||||
| module  \$_DFF_PN0_ (input D, C, R, output Q); SB_DFFR  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .R(!R)); endmodule | ||||
| module  \$_DFF_PN1_ (input D, C, R, output Q); SB_DFFS  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .S(!R)); endmodule | ||||
| module  \$_DFFE_NP0P_ (input D, C, E, R, output Q); SB_DFFNER _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .R(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_DFFE_NP1P_ (input D, C, E, R, output Q); SB_DFFNES _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .S(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_DFFE_PP0P_ (input D, C, E, R, output Q); SB_DFFER  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .R(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_DFFE_PP1P_ (input D, C, E, R, output Q); SB_DFFES  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .S(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| 
 | ||||
| module  \$_DFF_NP0_ (input D, C, R, output Q); SB_DFFNR _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .R(R)); endmodule | ||||
| module  \$_DFF_NP1_ (input D, C, R, output Q); SB_DFFNS _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .S(R)); endmodule | ||||
| module  \$_DFF_PP0_ (input D, C, R, output Q); SB_DFFR  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .R(R)); endmodule | ||||
| module  \$_DFF_PP1_ (input D, C, R, output Q); SB_DFFS  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .S(R)); endmodule | ||||
| module  \$_SDFF_NP0_ (input D, C, R, output Q); SB_DFFNSR _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .R(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_SDFF_NP1_ (input D, C, R, output Q); SB_DFFNSS _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .S(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_SDFF_PP0_ (input D, C, R, output Q); SB_DFFSR  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .R(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_SDFF_PP1_ (input D, C, R, output Q); SB_DFFSS  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .S(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| 
 | ||||
| module  \$_DFFE_NN0P_ (input D, C, E, R, output Q); SB_DFFNER _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .R(!R)); endmodule | ||||
| module  \$_DFFE_NN1P_ (input D, C, E, R, output Q); SB_DFFNES _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .S(!R)); endmodule | ||||
| module  \$_DFFE_PN0P_ (input D, C, E, R, output Q); SB_DFFER  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .R(!R)); endmodule | ||||
| module  \$_DFFE_PN1P_ (input D, C, E, R, output Q); SB_DFFES  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .S(!R)); endmodule | ||||
| 
 | ||||
| module  \$_DFFE_NP0P_ (input D, C, E, R, output Q); SB_DFFNER _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .R(R)); endmodule | ||||
| module  \$_DFFE_NP1P_ (input D, C, E, R, output Q); SB_DFFNES _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .S(R)); endmodule | ||||
| module  \$_DFFE_PP0P_ (input D, C, E, R, output Q); SB_DFFER  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .R(R)); endmodule | ||||
| module  \$_DFFE_PP1P_ (input D, C, E, R, output Q); SB_DFFES  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .S(R)); endmodule | ||||
| module  \$_SDFFCE_NP0P_ (input D, C, E, R, output Q); SB_DFFNESR _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .R(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_SDFFCE_NP1P_ (input D, C, E, R, output Q); SB_DFFNESS _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .S(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_SDFFCE_PP0P_ (input D, C, E, R, output Q); SB_DFFESR  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .R(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
| module  \$_SDFFCE_PP1P_ (input D, C, E, R, output Q); SB_DFFESS  _TECHMAP_REPLACE_ (.D(D), .Q(Q), .C(C), .E(E), .S(R)); wire _TECHMAP_REMOVEINIT_Q_ = 1; endmodule | ||||
|  |  | |||
|  | @ -1,179 +0,0 @@ | |||
| /*
 | ||||
|  *  yosys -- Yosys Open SYnthesis Suite | ||||
|  * | ||||
|  *  Copyright (C) 2012  Clifford Wolf <clifford@clifford.at> | ||||
|  * | ||||
|  *  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" | ||||
| 
 | ||||
| USING_YOSYS_NAMESPACE | ||||
| PRIVATE_NAMESPACE_BEGIN | ||||
| 
 | ||||
| struct Ice40FfinitPass : public Pass { | ||||
| 	Ice40FfinitPass() : Pass("ice40_ffinit", "iCE40: handle FF init values") { } | ||||
| 	void help() override | ||||
| 	{ | ||||
| 		//   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
 | ||||
| 		log("\n"); | ||||
| 		log("    ice40_ffinit [options] [selection]\n"); | ||||
| 		log("\n"); | ||||
| 		log("Remove zero init values for FF output signals. Add inverters to implement\n"); | ||||
| 		log("nonzero init values.\n"); | ||||
| 		log("\n"); | ||||
| 	} | ||||
| 	void execute(std::vector<std::string> args, RTLIL::Design *design) override | ||||
| 	{ | ||||
| 		log_header(design, "Executing ICE40_FFINIT pass (implement FF init values).\n"); | ||||
| 
 | ||||
| 		size_t argidx; | ||||
| 		for (argidx = 1; argidx < args.size(); argidx++) | ||||
| 		{ | ||||
| 			// if (args[argidx] == "-singleton") {
 | ||||
| 			// 	singleton_mode = true;
 | ||||
| 			// 	continue;
 | ||||
| 			// }
 | ||||
| 			break; | ||||
| 		} | ||||
| 		extra_args(args, argidx, design); | ||||
| 
 | ||||
| 		for (auto module : design->selected_modules()) | ||||
| 		{ | ||||
| 			log("Handling FF init values in %s.\n", log_id(module)); | ||||
| 
 | ||||
| 			SigMap sigmap(module); | ||||
| 			pool<Wire*> init_wires; | ||||
| 			dict<SigBit, State> initbits; | ||||
| 			dict<SigBit, SigBit> initbit_to_wire; | ||||
| 			pool<SigBit> handled_initbits; | ||||
| 
 | ||||
| 			for (auto wire : module->selected_wires()) | ||||
| 			{ | ||||
| 				if (wire->attributes.count(ID::init) == 0) | ||||
| 					continue; | ||||
| 
 | ||||
| 				SigSpec wirebits = sigmap(wire); | ||||
| 				Const initval = wire->attributes.at(ID::init); | ||||
| 				init_wires.insert(wire); | ||||
| 
 | ||||
| 				for (int i = 0; i < GetSize(wirebits) && i < GetSize(initval); i++) | ||||
| 				{ | ||||
| 					SigBit bit = wirebits[i]; | ||||
| 					State val = initval[i]; | ||||
| 
 | ||||
| 					if (val != State::S0 && val != State::S1) | ||||
| 						continue; | ||||
| 
 | ||||
| 					if (initbits.count(bit)) { | ||||
| 						if (initbits.at(bit) != val) { | ||||
| 							log_warning("Conflicting init values for signal %s (%s = %s, %s = %s).\n", | ||||
| 									log_signal(bit), log_signal(SigBit(wire, i)), log_signal(val), | ||||
| 									log_signal(initbit_to_wire[bit]), log_signal(initbits.at(bit))); | ||||
| 							initbits.at(bit) = State::Sx; | ||||
| 						} | ||||
| 						continue; | ||||
| 					} | ||||
| 
 | ||||
| 					initbits[bit] = val; | ||||
| 					initbit_to_wire[bit] = SigBit(wire, i); | ||||
| 				} | ||||
| 			} | ||||
| 
 | ||||
| 			pool<IdString> sb_dff_types = { | ||||
| 				ID(SB_DFF),    ID(SB_DFFE),   ID(SB_DFFSR),   ID(SB_DFFR),   ID(SB_DFFSS),   ID(SB_DFFS),   ID(SB_DFFESR), | ||||
| 				ID(SB_DFFER),  ID(SB_DFFESS), ID(SB_DFFES),   ID(SB_DFFN),   ID(SB_DFFNE),   ID(SB_DFFNSR), ID(SB_DFFNR), | ||||
| 				ID(SB_DFFNSS), ID(SB_DFFNS),  ID(SB_DFFNESR), ID(SB_DFFNER), ID(SB_DFFNESS), ID(SB_DFFNES) | ||||
| 			}; | ||||
| 
 | ||||
| 			for (auto cell : module->selected_cells()) | ||||
| 			{ | ||||
| 				if (!sb_dff_types.count(cell->type)) | ||||
| 					continue; | ||||
| 
 | ||||
| 				SigSpec sig_d = cell->getPort(ID::D); | ||||
| 				SigSpec sig_q = cell->getPort(ID::Q); | ||||
| 
 | ||||
| 				if (GetSize(sig_d) < 1 || GetSize(sig_q) < 1) | ||||
| 					continue; | ||||
| 
 | ||||
| 				SigBit bit_d = sigmap(sig_d[0]); | ||||
| 				SigBit bit_q = sigmap(sig_q[0]); | ||||
| 
 | ||||
| 				if (!initbits.count(bit_q)) | ||||
| 					continue; | ||||
| 
 | ||||
| 				State val = initbits.at(bit_q); | ||||
| 
 | ||||
| 				if (val == State::Sx) | ||||
| 					continue; | ||||
| 
 | ||||
| 				handled_initbits.insert(bit_q); | ||||
| 
 | ||||
| 				log("FF init value for cell %s (%s): %s = %c\n", log_id(cell), log_id(cell->type), | ||||
| 						log_signal(bit_q), val != State::S0 ? '1' : '0'); | ||||
| 
 | ||||
| 				if (val == State::S0) | ||||
| 					continue; | ||||
| 
 | ||||
| 				string type_str = cell->type.str(); | ||||
| 
 | ||||
| 				if (type_str.back() == 'S') { | ||||
| 					type_str.back() = 'R'; | ||||
| 					cell->type = type_str; | ||||
| 					cell->setPort(ID::R, cell->getPort(ID::S)); | ||||
| 					cell->unsetPort(ID::S); | ||||
| 				} else | ||||
| 				if (type_str.back() == 'R') { | ||||
| 					type_str.back() = 'S'; | ||||
| 					cell->type = type_str; | ||||
| 					cell->setPort(ID::S, cell->getPort(ID::R)); | ||||
| 					cell->unsetPort(ID::R); | ||||
| 				} | ||||
| 
 | ||||
| 				Wire *new_bit_d = module->addWire(NEW_ID); | ||||
| 				Wire *new_bit_q = module->addWire(NEW_ID); | ||||
| 
 | ||||
| 				module->addNotGate(NEW_ID, bit_d, new_bit_d); | ||||
| 				module->addNotGate(NEW_ID, new_bit_q, bit_q); | ||||
| 
 | ||||
| 				cell->setPort(ID::D, new_bit_d); | ||||
| 				cell->setPort(ID::Q, new_bit_q); | ||||
| 			} | ||||
| 
 | ||||
| 			for (auto wire : init_wires) | ||||
| 			{ | ||||
| 				if (wire->attributes.count(ID::init) == 0) | ||||
| 					continue; | ||||
| 
 | ||||
| 				SigSpec wirebits = sigmap(wire); | ||||
| 				Const &initval = wire->attributes.at(ID::init); | ||||
| 				bool remove_attribute = true; | ||||
| 
 | ||||
| 				for (int i = 0; i < GetSize(wirebits) && i < GetSize(initval); i++) { | ||||
| 					if (handled_initbits.count(wirebits[i])) | ||||
| 						initval[i] = State::Sx; | ||||
| 					else if (initval[i] != State::Sx) | ||||
| 						remove_attribute = false; | ||||
| 				} | ||||
| 
 | ||||
| 				if (remove_attribute) | ||||
| 					wire->attributes.erase(ID::init); | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| } Ice40FfinitPass; | ||||
| 
 | ||||
| PRIVATE_NAMESPACE_END | ||||
|  | @ -358,15 +358,14 @@ struct SynthIce40Pass : public ScriptPass | |||
| 				run("dff2dffe -direct-match $_DFF_*"); | ||||
| 			if (min_ce_use >= 0) { | ||||
| 				run("opt_merge"); | ||||
| 				run(stringf("dff2dffe -unmap-mince %d", min_ce_use)); | ||||
| 				run("simplemap t:$dff"); | ||||
| 			} | ||||
| 			if ((abc9 && dff) || help_mode) | ||||
| 				run("zinit -all w:* t:$_DFF_?_ t:$_DFFE_??_ t:$_SDFF*", "(only if -abc9 and -dff"); | ||||
| 			if (nodffe) | ||||
| 				run(stringf("dfflegalize -cell $_DFF_?_ 0 -cell $_DFF_?P?_ 0 -cell $_SDFF_?P?_ 0 -cell $_DLATCH_?_ x")); | ||||
| 			else | ||||
| 				run(stringf("dfflegalize -cell $_DFF_?_ 0 -cell $_DFFE_?P_ 0 -cell $_DFF_?P?_ 0 -cell $_DFFE_?P?P_ 0 -cell $_SDFF_?P?_ 0 -cell $_SDFFCE_?P?P_ 0 -cell $_DLATCH_?_ x -mince %d", min_ce_use)); | ||||
| 			run("techmap -map +/ice40/ff_map.v"); | ||||
| 			run("opt_expr -mux_undef"); | ||||
| 			run("simplemap"); | ||||
| 			run("ice40_ffinit"); | ||||
| 			run("ice40_ffssr"); | ||||
| 			run("ice40_opt -full"); | ||||
| 		} | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue