diff options
Diffstat (limited to 'passes/techmap/simplemap.cc')
| -rw-r--r-- | passes/techmap/simplemap.cc | 326 | 
1 files changed, 163 insertions, 163 deletions
diff --git a/passes/techmap/simplemap.cc b/passes/techmap/simplemap.cc index 8cef1ffaa..325a816ee 100644 --- a/passes/techmap/simplemap.cc +++ b/passes/techmap/simplemap.cc @@ -28,37 +28,37 @@ YOSYS_NAMESPACE_BEGIN  void simplemap_not(RTLIL::Module *module, RTLIL::Cell *cell)  { -	RTLIL::SigSpec sig_a = cell->getPort(ID(\\A)); -	RTLIL::SigSpec sig_y = cell->getPort(ID(\\Y)); +	RTLIL::SigSpec sig_a = cell->getPort(ID(A)); +	RTLIL::SigSpec sig_y = cell->getPort(ID(Y)); -	sig_a.extend_u0(GetSize(sig_y), cell->parameters.at(ID(\\A_SIGNED)).as_bool()); +	sig_a.extend_u0(GetSize(sig_y), cell->parameters.at(ID(A_SIGNED)).as_bool());  	for (int i = 0; i < GetSize(sig_y); i++) {  		RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_NOT_)); -		gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\A), sig_a[i]); -		gate->setPort(ID(\\Y), sig_y[i]); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(A), sig_a[i]); +		gate->setPort(ID(Y), sig_y[i]);  	}  }  void simplemap_pos(RTLIL::Module *module, RTLIL::Cell *cell)  { -	RTLIL::SigSpec sig_a = cell->getPort(ID(\\A)); -	RTLIL::SigSpec sig_y = cell->getPort(ID(\\Y)); +	RTLIL::SigSpec sig_a = cell->getPort(ID(A)); +	RTLIL::SigSpec sig_y = cell->getPort(ID(Y)); -	sig_a.extend_u0(GetSize(sig_y), cell->parameters.at(ID(\\A_SIGNED)).as_bool()); +	sig_a.extend_u0(GetSize(sig_y), cell->parameters.at(ID(A_SIGNED)).as_bool());  	module->connect(RTLIL::SigSig(sig_y, sig_a));  }  void simplemap_bitop(RTLIL::Module *module, RTLIL::Cell *cell)  { -	RTLIL::SigSpec sig_a = cell->getPort(ID(\\A)); -	RTLIL::SigSpec sig_b = cell->getPort(ID(\\B)); -	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_y = cell->getPort(ID(Y)); -	sig_a.extend_u0(GetSize(sig_y), cell->parameters.at(ID(\\A_SIGNED)).as_bool()); -	sig_b.extend_u0(GetSize(sig_y), cell->parameters.at(ID(\\B_SIGNED)).as_bool()); +	sig_a.extend_u0(GetSize(sig_y), cell->parameters.at(ID(A_SIGNED)).as_bool()); +	sig_b.extend_u0(GetSize(sig_y), cell->parameters.at(ID(B_SIGNED)).as_bool());  	if (cell->type == ID($xnor))  	{ @@ -66,9 +66,9 @@ 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, ID($_NOT_)); -			gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -			gate->setPort(ID(\\A), sig_t[i]); -			gate->setPort(ID(\\Y), sig_y[i]); +			gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +			gate->setPort(ID(A), sig_t[i]); +			gate->setPort(ID(Y), sig_y[i]);  		}  		sig_y = sig_t; @@ -83,17 +83,17 @@ 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->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\A), sig_a[i]); -		gate->setPort(ID(\\B), sig_b[i]); -		gate->setPort(ID(\\Y), sig_y[i]); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(A), sig_a[i]); +		gate->setPort(ID(B), sig_b[i]); +		gate->setPort(ID(Y), sig_y[i]);  	}  }  void simplemap_reduce(RTLIL::Module *module, RTLIL::Cell *cell)  { -	RTLIL::SigSpec sig_a = cell->getPort(ID(\\A)); -	RTLIL::SigSpec sig_y = cell->getPort(ID(\\Y)); +	RTLIL::SigSpec sig_a = cell->getPort(ID(A)); +	RTLIL::SigSpec sig_y = cell->getPort(ID(Y));  	if (sig_y.size() == 0)  		return; @@ -134,10 +134,10 @@ void simplemap_reduce(RTLIL::Module *module, RTLIL::Cell *cell)  			}  			RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type); -			gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -			gate->setPort(ID(\\A), sig_a[i]); -			gate->setPort(ID(\\B), sig_a[i+1]); -			gate->setPort(ID(\\Y), sig_t[i/2]); +			gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +			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;  		} @@ -147,9 +147,9 @@ 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->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\A), sig_a); -		gate->setPort(ID(\\Y), sig_t); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(A), sig_a); +		gate->setPort(ID(Y), sig_t);  		last_output_cell = gate;  		sig_a = sig_t;  	} @@ -157,7 +157,7 @@ void simplemap_reduce(RTLIL::Module *module, RTLIL::Cell *cell)  	if (last_output_cell == NULL) {  		module->connect(RTLIL::SigSig(sig_y, sig_a));  	} else { -		last_output_cell->setPort(ID(\\Y), sig_y); +		last_output_cell->setPort(ID(Y), sig_y);  	}  } @@ -175,10 +175,10 @@ static void logic_reduce(RTLIL::Module *module, RTLIL::SigSpec &sig, RTLIL::Cell  			}  			RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_OR_)); -			gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -			gate->setPort(ID(\\A), sig[i]); -			gate->setPort(ID(\\B), sig[i+1]); -			gate->setPort(ID(\\Y), sig_t[i/2]); +			gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +			gate->setPort(ID(A), sig[i]); +			gate->setPort(ID(B), sig[i+1]); +			gate->setPort(ID(Y), sig_t[i/2]);  		}  		sig = sig_t; @@ -190,10 +190,10 @@ static void logic_reduce(RTLIL::Module *module, RTLIL::SigSpec &sig, RTLIL::Cell  void simplemap_lognot(RTLIL::Module *module, RTLIL::Cell *cell)  { -	RTLIL::SigSpec sig_a = cell->getPort(ID(\\A)); +	RTLIL::SigSpec sig_a = cell->getPort(ID(A));  	logic_reduce(module, sig_a, cell); -	RTLIL::SigSpec sig_y = cell->getPort(ID(\\Y)); +	RTLIL::SigSpec sig_y = cell->getPort(ID(Y));  	if (sig_y.size() == 0)  		return; @@ -204,20 +204,20 @@ void simplemap_lognot(RTLIL::Module *module, RTLIL::Cell *cell)  	}  	RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_NOT_)); -	gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -	gate->setPort(ID(\\A), sig_a); -	gate->setPort(ID(\\Y), sig_y); +	gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +	gate->setPort(ID(A), sig_a); +	gate->setPort(ID(Y), sig_y);  }  void simplemap_logbin(RTLIL::Module *module, RTLIL::Cell *cell)  { -	RTLIL::SigSpec sig_a = cell->getPort(ID(\\A)); +	RTLIL::SigSpec sig_a = cell->getPort(ID(A));  	logic_reduce(module, sig_a, cell); -	RTLIL::SigSpec sig_b = cell->getPort(ID(\\B)); +	RTLIL::SigSpec sig_b = cell->getPort(ID(B));  	logic_reduce(module, sig_b, cell); -	RTLIL::SigSpec sig_y = cell->getPort(ID(\\Y)); +	RTLIL::SigSpec sig_y = cell->getPort(ID(Y));  	if (sig_y.size() == 0)  		return; @@ -233,35 +233,35 @@ void simplemap_logbin(RTLIL::Module *module, RTLIL::Cell *cell)  	log_assert(!gate_type.empty());  	RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type); -	gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -	gate->setPort(ID(\\A), sig_a); -	gate->setPort(ID(\\B), sig_b); -	gate->setPort(ID(\\Y), sig_y); +	gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +	gate->setPort(ID(A), sig_a); +	gate->setPort(ID(B), sig_b); +	gate->setPort(ID(Y), sig_y);  }  void simplemap_eqne(RTLIL::Module *module, RTLIL::Cell *cell)  { -	RTLIL::SigSpec sig_a = cell->getPort(ID(\\A)); -	RTLIL::SigSpec sig_b = cell->getPort(ID(\\B)); -	RTLIL::SigSpec sig_y = cell->getPort(ID(\\Y)); -	bool is_signed = cell->parameters.at(ID(\\A_SIGNED)).as_bool(); +	RTLIL::SigSpec sig_a = cell->getPort(ID(A)); +	RTLIL::SigSpec sig_b = cell->getPort(ID(B)); +	RTLIL::SigSpec sig_y = cell->getPort(ID(Y)); +	bool is_signed = cell->parameters.at(ID(A_SIGNED)).as_bool();  	bool is_ne = cell->type.in(ID($ne), ID($nex));  	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->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); +	xor_cell->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src)));  	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->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); +	reduce_cell->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src)));  	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->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); +		not_cell->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src)));  		simplemap_lognot(module, not_cell);  		module->remove(not_cell);  	} @@ -269,65 +269,65 @@ void simplemap_eqne(RTLIL::Module *module, RTLIL::Cell *cell)  void simplemap_mux(RTLIL::Module *module, RTLIL::Cell *cell)  { -	RTLIL::SigSpec sig_a = cell->getPort(ID(\\A)); -	RTLIL::SigSpec sig_b = cell->getPort(ID(\\B)); -	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_y = cell->getPort(ID(Y));  	for (int i = 0; i < GetSize(sig_y); i++) {  		RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_MUX_)); -		gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\A), sig_a[i]); -		gate->setPort(ID(\\B), sig_b[i]); -		gate->setPort(ID(\\S), cell->getPort(ID(\\S))); -		gate->setPort(ID(\\Y), sig_y[i]); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(A), sig_a[i]); +		gate->setPort(ID(B), sig_b[i]); +		gate->setPort(ID(S), cell->getPort(ID(S))); +		gate->setPort(ID(Y), sig_y[i]);  	}  }  void simplemap_tribuf(RTLIL::Module *module, RTLIL::Cell *cell)  { -	RTLIL::SigSpec sig_a = cell->getPort(ID(\\A)); -	RTLIL::SigSpec sig_e = cell->getPort(ID(\\EN)); -	RTLIL::SigSpec sig_y = cell->getPort(ID(\\Y)); +	RTLIL::SigSpec sig_a = cell->getPort(ID(A)); +	RTLIL::SigSpec sig_e = cell->getPort(ID(EN)); +	RTLIL::SigSpec sig_y = cell->getPort(ID(Y));  	for (int i = 0; i < GetSize(sig_y); i++) {  		RTLIL::Cell *gate = module->addCell(NEW_ID, ID($_TBUF_)); -		gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\A), sig_a[i]); -		gate->setPort(ID(\\E), sig_e); -		gate->setPort(ID(\\Y), sig_y[i]); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(A), sig_a[i]); +		gate->setPort(ID(E), sig_e); +		gate->setPort(ID(Y), sig_y[i]);  	}  }  void simplemap_lut(RTLIL::Module *module, RTLIL::Cell *cell)  { -	SigSpec lut_ctrl = cell->getPort(ID(\\A)); -	SigSpec lut_data = cell->getParam(ID(\\LUT)); -	lut_data.extend_u0(1 << cell->getParam(ID(\\WIDTH)).as_int()); +	SigSpec lut_ctrl = cell->getPort(ID(A)); +	SigSpec lut_data = cell->getParam(ID(LUT)); +	lut_data.extend_u0(1 << cell->getParam(ID(WIDTH)).as_int());  	for (int idx = 0; GetSize(lut_data) > 1; idx++) {  		SigSpec sig_s = lut_ctrl[idx];  		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->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -			gate->setPort(ID(\\A), lut_data[i]); -			gate->setPort(ID(\\B), lut_data[i+1]); -			gate->setPort(ID(\\S), lut_ctrl[idx]); -			gate->setPort(ID(\\Y), new_lut_data[i/2]); +			gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +			gate->setPort(ID(A), lut_data[i]); +			gate->setPort(ID(B), lut_data[i+1]); +			gate->setPort(ID(S), lut_ctrl[idx]); +			gate->setPort(ID(Y), new_lut_data[i/2]);  		}  		lut_data = new_lut_data;  	} -	module->connect(cell->getPort(ID(\\Y)), lut_data); +	module->connect(cell->getPort(ID(Y)), lut_data);  }  void simplemap_sop(RTLIL::Module *module, RTLIL::Cell *cell)  { -	SigSpec ctrl = cell->getPort(ID(\\A)); -	SigSpec table = cell->getParam(ID(\\TABLE)); +	SigSpec ctrl = cell->getPort(ID(A)); +	SigSpec table = cell->getParam(ID(TABLE)); -	int width = cell->getParam(ID(\\WIDTH)).as_int(); -	int depth = cell->getParam(ID(\\DEPTH)).as_int(); +	int width = cell->getParam(ID(WIDTH)).as_int(); +	int depth = cell->getParam(ID(DEPTH)).as_int();  	table.extend_u0(2 * width * depth);  	SigSpec products; @@ -348,177 +348,177 @@ void simplemap_sop(RTLIL::Module *module, RTLIL::Cell *cell)  		products.append(GetSize(in) > 0 ? module->Eq(NEW_ID, in, pat) : State::S1);  	} -	module->connect(cell->getPort(ID(\\Y)), module->ReduceOr(NEW_ID, products)); +	module->connect(cell->getPort(ID(Y)), module->ReduceOr(NEW_ID, products));  }  void simplemap_slice(RTLIL::Module *module, RTLIL::Cell *cell)  { -	int offset = cell->parameters.at(ID(\\OFFSET)).as_int(); -	RTLIL::SigSpec sig_a = cell->getPort(ID(\\A)); -	RTLIL::SigSpec sig_y = cell->getPort(ID(\\Y)); +	int offset = cell->parameters.at(ID(OFFSET)).as_int(); +	RTLIL::SigSpec sig_a = cell->getPort(ID(A)); +	RTLIL::SigSpec sig_y = cell->getPort(ID(Y));  	module->connect(RTLIL::SigSig(sig_y, sig_a.extract(offset, sig_y.size())));  }  void simplemap_concat(RTLIL::Module *module, RTLIL::Cell *cell)  { -	RTLIL::SigSpec sig_ab = cell->getPort(ID(\\A)); -	sig_ab.append(cell->getPort(ID(\\B))); -	RTLIL::SigSpec sig_y = cell->getPort(ID(\\Y)); +	RTLIL::SigSpec sig_ab = cell->getPort(ID(A)); +	sig_ab.append(cell->getPort(ID(B))); +	RTLIL::SigSpec sig_y = cell->getPort(ID(Y));  	module->connect(RTLIL::SigSig(sig_y, sig_ab));  }  void simplemap_sr(RTLIL::Module *module, RTLIL::Cell *cell)  { -	int width = cell->parameters.at(ID(\\WIDTH)).as_int(); -	char set_pol = cell->parameters.at(ID(\\SET_POLARITY)).as_bool() ? 'P' : 'N'; -	char clr_pol = cell->parameters.at(ID(\\CLR_POLARITY)).as_bool() ? 'P' : 'N'; +	int width = cell->parameters.at(ID(WIDTH)).as_int(); +	char set_pol = cell->parameters.at(ID(SET_POLARITY)).as_bool() ? 'P' : 'N'; +	char clr_pol = cell->parameters.at(ID(CLR_POLARITY)).as_bool() ? 'P' : 'N'; -	RTLIL::SigSpec sig_s = cell->getPort(ID(\\SET)); -	RTLIL::SigSpec sig_r = cell->getPort(ID(\\CLR)); -	RTLIL::SigSpec sig_q = cell->getPort(ID(\\Q)); +	RTLIL::SigSpec sig_s = cell->getPort(ID(SET)); +	RTLIL::SigSpec sig_r = cell->getPort(ID(CLR)); +	RTLIL::SigSpec sig_q = cell->getPort(ID(Q));  	std::string gate_type = stringf("$_SR_%c%c_", set_pol, clr_pol);  	for (int i = 0; i < width; i++) {  		RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type); -		gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\S), sig_s[i]); -		gate->setPort(ID(\\R), sig_r[i]); -		gate->setPort(ID(\\Q), sig_q[i]); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(S), sig_s[i]); +		gate->setPort(ID(R), sig_r[i]); +		gate->setPort(ID(Q), sig_q[i]);  	}  }  void simplemap_ff(RTLIL::Module *module, RTLIL::Cell *cell)  { -	int width = cell->parameters.at(ID(\\WIDTH)).as_int(); +	int width = cell->parameters.at(ID(WIDTH)).as_int(); -	RTLIL::SigSpec sig_d = cell->getPort(ID(\\D)); -	RTLIL::SigSpec sig_q = cell->getPort(ID(\\Q)); +	RTLIL::SigSpec sig_d = cell->getPort(ID(D)); +	RTLIL::SigSpec sig_q = cell->getPort(ID(Q));  	IdString gate_type = ID($_FF_);  	for (int i = 0; i < width; i++) {  		RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type); -		gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\D), sig_d[i]); -		gate->setPort(ID(\\Q), sig_q[i]); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(D), sig_d[i]); +		gate->setPort(ID(Q), sig_q[i]);  	}  }  void simplemap_dff(RTLIL::Module *module, RTLIL::Cell *cell)  { -	int width = cell->parameters.at(ID(\\WIDTH)).as_int(); -	char clk_pol = cell->parameters.at(ID(\\CLK_POLARITY)).as_bool() ? 'P' : 'N'; +	int width = cell->parameters.at(ID(WIDTH)).as_int(); +	char clk_pol = cell->parameters.at(ID(CLK_POLARITY)).as_bool() ? 'P' : 'N'; -	RTLIL::SigSpec sig_clk = cell->getPort(ID(\\CLK)); -	RTLIL::SigSpec sig_d = cell->getPort(ID(\\D)); -	RTLIL::SigSpec sig_q = cell->getPort(ID(\\Q)); +	RTLIL::SigSpec sig_clk = cell->getPort(ID(CLK)); +	RTLIL::SigSpec sig_d = cell->getPort(ID(D)); +	RTLIL::SigSpec sig_q = cell->getPort(ID(Q));  	IdString gate_type = stringf("$_DFF_%c_", clk_pol);  	for (int i = 0; i < width; i++) {  		RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type); -		gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\C), sig_clk); -		gate->setPort(ID(\\D), sig_d[i]); -		gate->setPort(ID(\\Q), sig_q[i]); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(C), sig_clk); +		gate->setPort(ID(D), sig_d[i]); +		gate->setPort(ID(Q), sig_q[i]);  	}  }  void simplemap_dffe(RTLIL::Module *module, RTLIL::Cell *cell)  { -	int width = cell->parameters.at(ID(\\WIDTH)).as_int(); -	char clk_pol = cell->parameters.at(ID(\\CLK_POLARITY)).as_bool() ? 'P' : 'N'; -	char en_pol = cell->parameters.at(ID(\\EN_POLARITY)).as_bool() ? 'P' : 'N'; +	int width = cell->parameters.at(ID(WIDTH)).as_int(); +	char clk_pol = cell->parameters.at(ID(CLK_POLARITY)).as_bool() ? 'P' : 'N'; +	char en_pol = cell->parameters.at(ID(EN_POLARITY)).as_bool() ? 'P' : 'N'; -	RTLIL::SigSpec sig_clk = cell->getPort(ID(\\CLK)); -	RTLIL::SigSpec sig_en = cell->getPort(ID(\\EN)); -	RTLIL::SigSpec sig_d = cell->getPort(ID(\\D)); -	RTLIL::SigSpec sig_q = cell->getPort(ID(\\Q)); +	RTLIL::SigSpec sig_clk = cell->getPort(ID(CLK)); +	RTLIL::SigSpec sig_en = cell->getPort(ID(EN)); +	RTLIL::SigSpec sig_d = cell->getPort(ID(D)); +	RTLIL::SigSpec sig_q = cell->getPort(ID(Q));  	IdString gate_type = stringf("$_DFFE_%c%c_", clk_pol, en_pol);  	for (int i = 0; i < width; i++) {  		RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type); -		gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\C), sig_clk); -		gate->setPort(ID(\\E), sig_en); -		gate->setPort(ID(\\D), sig_d[i]); -		gate->setPort(ID(\\Q), sig_q[i]); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(C), sig_clk); +		gate->setPort(ID(E), sig_en); +		gate->setPort(ID(D), sig_d[i]); +		gate->setPort(ID(Q), sig_q[i]);  	}  }  void simplemap_dffsr(RTLIL::Module *module, RTLIL::Cell *cell)  { -	int width = cell->parameters.at(ID(\\WIDTH)).as_int(); -	char clk_pol = cell->parameters.at(ID(\\CLK_POLARITY)).as_bool() ? 'P' : 'N'; -	char set_pol = cell->parameters.at(ID(\\SET_POLARITY)).as_bool() ? 'P' : 'N'; -	char clr_pol = cell->parameters.at(ID(\\CLR_POLARITY)).as_bool() ? 'P' : 'N'; +	int width = cell->parameters.at(ID(WIDTH)).as_int(); +	char clk_pol = cell->parameters.at(ID(CLK_POLARITY)).as_bool() ? 'P' : 'N'; +	char set_pol = cell->parameters.at(ID(SET_POLARITY)).as_bool() ? 'P' : 'N'; +	char clr_pol = cell->parameters.at(ID(CLR_POLARITY)).as_bool() ? 'P' : 'N'; -	RTLIL::SigSpec sig_clk = cell->getPort(ID(\\CLK)); -	RTLIL::SigSpec sig_s = cell->getPort(ID(\\SET)); -	RTLIL::SigSpec sig_r = cell->getPort(ID(\\CLR)); -	RTLIL::SigSpec sig_d = cell->getPort(ID(\\D)); -	RTLIL::SigSpec sig_q = cell->getPort(ID(\\Q)); +	RTLIL::SigSpec sig_clk = cell->getPort(ID(CLK)); +	RTLIL::SigSpec sig_s = cell->getPort(ID(SET)); +	RTLIL::SigSpec sig_r = cell->getPort(ID(CLR)); +	RTLIL::SigSpec sig_d = cell->getPort(ID(D)); +	RTLIL::SigSpec sig_q = cell->getPort(ID(Q));  	IdString gate_type = stringf("$_DFFSR_%c%c%c_", clk_pol, set_pol, clr_pol);  	for (int i = 0; i < width; i++) {  		RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type); -		gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\C), sig_clk); -		gate->setPort(ID(\\S), sig_s[i]); -		gate->setPort(ID(\\R), sig_r[i]); -		gate->setPort(ID(\\D), sig_d[i]); -		gate->setPort(ID(\\Q), sig_q[i]); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(C), sig_clk); +		gate->setPort(ID(S), sig_s[i]); +		gate->setPort(ID(R), sig_r[i]); +		gate->setPort(ID(D), sig_d[i]); +		gate->setPort(ID(Q), sig_q[i]);  	}  }  void simplemap_adff(RTLIL::Module *module, RTLIL::Cell *cell)  { -	int width = cell->parameters.at(ID(\\WIDTH)).as_int(); -	char clk_pol = cell->parameters.at(ID(\\CLK_POLARITY)).as_bool() ? 'P' : 'N'; -	char rst_pol = cell->parameters.at(ID(\\ARST_POLARITY)).as_bool() ? 'P' : 'N'; +	int width = cell->parameters.at(ID(WIDTH)).as_int(); +	char clk_pol = cell->parameters.at(ID(CLK_POLARITY)).as_bool() ? 'P' : 'N'; +	char rst_pol = cell->parameters.at(ID(ARST_POLARITY)).as_bool() ? 'P' : 'N'; -	std::vector<RTLIL::State> rst_val = cell->parameters.at(ID(\\ARST_VALUE)).bits; +	std::vector<RTLIL::State> rst_val = cell->parameters.at(ID(ARST_VALUE)).bits;  	while (int(rst_val.size()) < width)  		rst_val.push_back(RTLIL::State::S0); -	RTLIL::SigSpec sig_clk = cell->getPort(ID(\\CLK)); -	RTLIL::SigSpec sig_rst = cell->getPort(ID(\\ARST)); -	RTLIL::SigSpec sig_d = cell->getPort(ID(\\D)); -	RTLIL::SigSpec sig_q = cell->getPort(ID(\\Q)); +	RTLIL::SigSpec sig_clk = cell->getPort(ID(CLK)); +	RTLIL::SigSpec sig_rst = cell->getPort(ID(ARST)); +	RTLIL::SigSpec sig_d = cell->getPort(ID(D)); +	RTLIL::SigSpec sig_q = cell->getPort(ID(Q));  	IdString gate_type_0 = stringf("$_DFF_%c%c0_", clk_pol, rst_pol);  	IdString gate_type_1 = stringf("$_DFF_%c%c1_", clk_pol, rst_pol);  	for (int i = 0; i < width; i++) {  		RTLIL::Cell *gate = module->addCell(NEW_ID, rst_val.at(i) == RTLIL::State::S1 ? gate_type_1 : gate_type_0); -		gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\C), sig_clk); -		gate->setPort(ID(\\R), sig_rst); -		gate->setPort(ID(\\D), sig_d[i]); -		gate->setPort(ID(\\Q), sig_q[i]); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(C), sig_clk); +		gate->setPort(ID(R), sig_rst); +		gate->setPort(ID(D), sig_d[i]); +		gate->setPort(ID(Q), sig_q[i]);  	}  }  void simplemap_dlatch(RTLIL::Module *module, RTLIL::Cell *cell)  { -	int width = cell->parameters.at(ID(\\WIDTH)).as_int(); -	char en_pol = cell->parameters.at(ID(\\EN_POLARITY)).as_bool() ? 'P' : 'N'; +	int width = cell->parameters.at(ID(WIDTH)).as_int(); +	char en_pol = cell->parameters.at(ID(EN_POLARITY)).as_bool() ? 'P' : 'N'; -	RTLIL::SigSpec sig_en = cell->getPort(ID(\\EN)); -	RTLIL::SigSpec sig_d = cell->getPort(ID(\\D)); -	RTLIL::SigSpec sig_q = cell->getPort(ID(\\Q)); +	RTLIL::SigSpec sig_en = cell->getPort(ID(EN)); +	RTLIL::SigSpec sig_d = cell->getPort(ID(D)); +	RTLIL::SigSpec sig_q = cell->getPort(ID(Q));  	IdString gate_type = stringf("$_DLATCH_%c_", en_pol);  	for (int i = 0; i < width; i++) {  		RTLIL::Cell *gate = module->addCell(NEW_ID, gate_type); -		gate->add_strpool_attribute(ID(\\src), cell->get_strpool_attribute(ID(\\src))); -		gate->setPort(ID(\\E), sig_en); -		gate->setPort(ID(\\D), sig_d[i]); -		gate->setPort(ID(\\Q), sig_q[i]); +		gate->add_strpool_attribute(ID(src), cell->get_strpool_attribute(ID(src))); +		gate->setPort(ID(E), sig_en); +		gate->setPort(ID(D), sig_d[i]); +		gate->setPort(ID(Q), sig_q[i]);  	}  }  | 
