riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1984 from YosysHQ/eddie/getParam_exception 

kernel: Cell::getParam() to throw exception again if not found
This commit is contained in:
Eddie Hung 2020-04-22 22:12:41 -07:00 committed by GitHub
parent fa9df06c9d 51ae0f4e20
commit b700592881
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/rtlil.cc
View File

@ -2619,16 +2619,15 @@ void RTLIL::Cell::setParam(RTLIL::IdString paramname, RTLIL::Const value)
const RTLIL::Const &RTLIL::Cell::getParam(RTLIL::IdString paramname) const const RTLIL::Const &RTLIL::Cell::getParam(RTLIL::IdString paramname) const
{ {
static const RTLIL::Const empty;
const auto &it = parameters.find(paramname); const auto &it = parameters.find(paramname);
if (it != parameters.end()) if (it != parameters.end())
return it->second; return it->second;
if (module && module->design) { if (module && module->design) {
RTLIL::Module *m = module->design->module(type); RTLIL::Module *m = module->design->module(type);
if (m) if (m)
return m->parameter_default_values.at(paramname, empty); return m->parameter_default_values.at(paramname);
} }
return empty; throw std::out_of_range("Cell::getParam()");
} }
void RTLIL::Cell::sort() void RTLIL::Cell::sort()

2
passes/pmgen/xilinx_dsp_cascade.pmg
View File

@ -188,7 +188,7 @@ arg next
// driven by the 'P' output of the previous DSP cell, and (c) has its // driven by the 'P' output of the previous DSP cell, and (c) has its
// 'PCIN' port unused // 'PCIN' port unused
match nextP match nextP
select !param(nextP, \CREG).as_bool() select !nextP->type.in(\DSP48E1) || !param(nextP, \CREG).as_bool()
select (nextP->type.in(\DSP48A, \DSP48A1) && port(nextP, \OPMODE, Const(0, 8)).extract(2,2) == Const::from_string("11")) || (nextP->type.in(\DSP48E1) && port(nextP, \OPMODE, Const(0, 7)).extract(4,3) == Const::from_string("011")) select (nextP->type.in(\DSP48A, \DSP48A1) && port(nextP, \OPMODE, Const(0, 8)).extract(2,2) == Const::from_string("11")) || (nextP->type.in(\DSP48E1) && port(nextP, \OPMODE, Const(0, 7)).extract(4,3) == Const::from_string("011"))
select nusers(port(nextP, \C, SigSpec())) > 1 select nusers(port(nextP, \C, SigSpec())) > 1
select nusers(port(nextP, \PCIN, SigSpec())) == 0 select nusers(port(nextP, \PCIN, SigSpec())) == 0

2
techlibs/ecp5/ecp5_gsr.cc
View File

@ -81,7 +81,7 @@ struct Ecp5GsrPass : public Pass {
for (auto cell : module->selected_cells()) for (auto cell : module->selected_cells())
{ {
if (cell->getParam(ID(GSR)).decode_string() != "AUTO") if (!cell->hasParam(ID(GSR)) || cell->getParam(ID(GSR)).decode_string() != "AUTO")
continue; continue;
bool gsren = found_gsr; bool gsren = found_gsr;

9
techlibs/xilinx/xilinx_dffopt.cc
View File

@ -292,18 +292,21 @@ unmap:
LutData final_lut; LutData final_lut;
if (worthy_post_r) { if (worthy_post_r) {
final_lut = lut_d_post_r; final_lut = lut_d_post_r;
log(" Merging R LUT for %s/%s (%d -> %d)\n", log_id(cell), log_id(sig_Q.wire), GetSize(lut_d.second), GetSize(final_lut.second));
} else if (worthy_post_s) { } else if (worthy_post_s) {
final_lut = lut_d_post_s; final_lut = lut_d_post_s;
log(" Merging S LUT for %s/%s (%d -> %d)\n", log_id(cell), log_id(sig_Q.wire), GetSize(lut_d.second), GetSize(final_lut.second));
} else if (worthy_post_ce) { } else if (worthy_post_ce) {
final_lut = lut_d_post_ce; final_lut = lut_d_post_ce;
log(" Merging CE LUT for %s/%s (%d -> %d)\n", log_id(cell), log_id(sig_Q.wire), GetSize(lut_d.second), GetSize(final_lut.second));
} else { } else {
// Nothing to do here. // Nothing to do here.
continue; continue;
} }
std::string ports;
if (worthy_post_r) ports += " + R";
if (worthy_post_s) ports += " + S";
if (worthy_post_ce) ports += " + CE";
log(" Merging D%s LUTs for %s/%s (%d -> %d)\n", ports.c_str(), log_id(cell), log_id(sig_Q.wire), GetSize(lut_d.second), GetSize(final_lut.second));
// Okay, we're doing it. Unmap ports. // Okay, we're doing it. Unmap ports.
if (worthy_post_r) { if (worthy_post_r) {
cell->unsetParam(ID(IS_R_INVERTED)); cell->unsetParam(ID(IS_R_INVERTED));

1
tests/arch/ice40/ice40_dsp.ys
View File

@ -8,4 +8,5 @@ assign o4 = a * b;
SB_MAC16 m3 (.A(a), .B(b), .O(o5)); SB_MAC16 m3 (.A(a), .B(b), .O(o5));
endmodule endmodule
EOT EOT
read_verilog -lib +/ice40/cells_sim.v
ice40_dsp ice40_dsp

35
tests/arch/xilinx/xilinx_dffopt.ys
View File

@ -18,17 +18,17 @@ FDRE ff (.D(tmp[0]), .CE(tmp[1]), .R(tmp[2]), .Q(o[0]));
endmodule endmodule
EOT EOT
read_verilog -lib +/xilinx/cells_sim.v
design -save t0 design -save t0
equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim.v xilinx_dffopt equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim.v xilinx_dffopt
design -load postopt design -load postopt
clean clean
cd t0
select -assert-count 1 t:FDRE select -assert-count 1 t:FDRE
select -assert-count 1 t:LUT6 select -assert-count 1 t:LUT6
select -assert-count 3 t:LUT2 select -assert-none t:FDRE t:LUT6 %% t:* %D
select -assert-none t:FDRE t:LUT6 t:LUT2 %% t:* %D
design -load t0 design -load t0
@ -36,9 +36,10 @@ equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim
design -load postopt design -load postopt
clean clean
cd t0
select -assert-count 1 t:FDRE select -assert-count 1 t:FDRE
select -assert-count 1 t:LUT4 select -assert-count 1 t:LUT4
select -assert-count 3 t:LUT2 select -assert-count 1 t:LUT2
select -assert-none t:FDRE t:LUT4 t:LUT2 %% t:* %D select -assert-none t:FDRE t:LUT4 t:LUT2 %% t:* %D
design -reset design -reset
@ -65,16 +66,17 @@ endmodule
EOT EOT
read_verilog -lib +/xilinx/cells_sim.v
design -save t0 design -save t0
equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim.v xilinx_dffopt equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim.v xilinx_dffopt
design -load postopt design -load postopt
clean clean
cd t0
select -assert-count 1 t:FDSE select -assert-count 1 t:FDSE
select -assert-count 1 t:LUT6 select -assert-count 1 t:LUT6
select -assert-count 3 t:LUT2 select -assert-none t:FDSE t:LUT6 %% t:* %D
select -assert-none t:FDSE t:LUT6 t:LUT2 %% t:* %D
design -load t0 design -load t0
@ -82,9 +84,10 @@ equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim
design -load postopt design -load postopt
clean clean
cd t0
select -assert-count 1 t:FDSE select -assert-count 1 t:FDSE
select -assert-count 1 t:LUT4 select -assert-count 1 t:LUT4
select -assert-count 3 t:LUT2 select -assert-count 1 t:LUT2
select -assert-none t:FDSE t:LUT4 t:LUT2 %% t:* %D select -assert-none t:FDSE t:LUT4 t:LUT2 %% t:* %D
design -reset design -reset
@ -111,15 +114,17 @@ endmodule
EOT EOT
read_verilog -lib +/xilinx/cells_sim.v
design -save t0 design -save t0
equiv_opt -async2sync -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim.v xilinx_dffopt equiv_opt -async2sync -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim.v xilinx_dffopt
design -load postopt design -load postopt
clean clean
cd t0
select -assert-count 1 t:FDCE select -assert-count 1 t:FDCE
select -assert-count 1 t:LUT4 select -assert-count 1 t:LUT4
select -assert-count 3 t:LUT2 select -assert-count 1 t:LUT2
select -assert-none t:FDCE t:LUT4 t:LUT2 %% t:* %D select -assert-none t:FDCE t:LUT4 t:LUT2 %% t:* %D
design -reset design -reset
@ -145,16 +150,17 @@ endmodule
EOT EOT
read_verilog -lib +/xilinx/cells_sim.v
design -save t0 design -save t0
equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim.v xilinx_dffopt equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim.v xilinx_dffopt
design -load postopt design -load postopt
clean clean
cd t0
select -assert-count 1 t:FDSE select -assert-count 1 t:FDSE
select -assert-count 1 t:LUT5 select -assert-count 1 t:LUT5
select -assert-count 2 t:LUT2 select -assert-none t:FDSE t:LUT5 %% t:* %D
select -assert-none t:FDSE t:LUT5 t:LUT2 %% t:* %D
design -load t0 design -load t0
@ -162,6 +168,7 @@ equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim
design -load postopt design -load postopt
clean clean
cd t0
select -assert-count 1 t:FDSE select -assert-count 1 t:FDSE
select -assert-count 2 t:LUT2 select -assert-count 2 t:LUT2
select -assert-none t:FDSE t:LUT2 %% t:* %D select -assert-none t:FDSE t:LUT2 %% t:* %D
@ -191,16 +198,17 @@ endmodule
EOT EOT
read_verilog -lib +/xilinx/cells_sim.v
design -save t0 design -save t0
equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim.v xilinx_dffopt equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim.v xilinx_dffopt
design -load postopt design -load postopt
clean clean
cd t0
select -assert-count 1 t:FDRSE select -assert-count 1 t:FDRSE
select -assert-count 1 t:LUT6 select -assert-count 1 t:LUT6
select -assert-count 4 t:LUT2 select -assert-none t:FDRSE t:LUT6 %% t:* %D
select -assert-none t:FDRSE t:LUT6 t:LUT2 %% t:* %D
design -load t0 design -load t0
@ -208,9 +216,10 @@ equiv_opt -blacklist xilinx_dffopt_blacklist.txt -assert -map +/xilinx/cells_sim
design -load postopt design -load postopt
clean clean
cd t0
select -assert-count 1 t:FDRSE select -assert-count 1 t:FDRSE
select -assert-count 1 t:LUT4 select -assert-count 1 t:LUT4
select -assert-count 4 t:LUT2 select -assert-count 1 t:LUT2
select -assert-none t:FDRSE t:LUT4 t:LUT2 %% t:* %D select -assert-none t:FDRSE t:LUT4 t:LUT2 %% t:* %D
design -reset design -reset

1
tests/arch/xilinx/xilinx_dsp.ys
View File

@ -8,4 +8,5 @@ assign o4 = a * b;
DSP48E1 m3 (.A(a), .B(b), .P(o5)); DSP48E1 m3 (.A(a), .B(b), .P(o5));
endmodule endmodule
EOT EOT
read_verilog -lib +/xilinx/cells_sim.v
xilinx_dsp xilinx_dsp