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

Merge pull request #2050 from YosysHQ/eddie/opt_clean_fixes 

opt_clean: remove (* init *) regardless of -purge, remove (* init *) when consistent with sigmap, clean to behave identically
This commit is contained in:
Claire Wolf 2020-05-14 18:31:16 +02:00 committed by GitHub
parent ee0beb481d 5be4b00a0d
commit 140e9a8e06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
passes/opt/opt_clean.cc
View File

@ -412,7 +412,7 @@ bool rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos
return !del_wires_queue.empty(); return !del_wires_queue.empty();
} }
bool rmunused_module_init(RTLIL::Module *module, bool purge_mode, bool verbose) bool rmunused_module_init(RTLIL::Module *module, bool verbose)
{ {
bool did_something = false; bool did_something = false;
CellTypes fftypes; CellTypes fftypes;
@ -445,9 +445,6 @@ bool rmunused_module_init(RTLIL::Module *module, bool purge_mode, bool verbose)
for (auto wire : module->wires()) for (auto wire : module->wires())
{ {
if (!purge_mode && wire->name[0] == '\\')
continue;
if (wire->attributes.count(ID::init) == 0) if (wire->attributes.count(ID::init) == 0)
continue; continue;
@ -464,11 +461,22 @@ bool rmunused_module_init(RTLIL::Module *module, bool purge_mode, bool verbose)
if (wire_bit == mapped_wire_bit) if (wire_bit == mapped_wire_bit)
goto next_wire; goto next_wire;
if (qbits.count(sigmap(SigBit(wire, i))) == 0) if (mapped_wire_bit.wire) {
goto next_wire; if (qbits.count(mapped_wire_bit) == 0)
goto next_wire;
if (qbits.at(sigmap(SigBit(wire, i))) != init[i]) if (qbits.at(mapped_wire_bit) != init[i])
goto next_wire; goto next_wire;
}
else {
if (mapped_wire_bit == State::Sx || mapped_wire_bit == State::Sz)
goto next_wire;
if (mapped_wire_bit != init[i]) {
log_warning("Initial value conflict for %s resolving to %s but with init %s.\n", log_signal(wire_bit), log_signal(mapped_wire_bit), log_signal(init[i]));
goto next_wire;
}
}
} }
if (verbose) if (verbose)
@ -512,7 +520,7 @@ void rmunused_module(RTLIL::Module *module, bool purge_mode, bool verbose, bool
rmunused_module_cells(module, verbose); rmunused_module_cells(module, verbose);
while (rmunused_module_signals(module, purge_mode, verbose)) { } while (rmunused_module_signals(module, purge_mode, verbose)) { }
if (rminit && rmunused_module_init(module, purge_mode, verbose)) if (rminit && rmunused_module_init(module, verbose))
while (rmunused_module_signals(module, purge_mode, verbose)) { } while (rmunused_module_signals(module, purge_mode, verbose)) { }
} }
@ -611,8 +619,7 @@ struct CleanPass : public Pass {
} }
break; break;
} }
if (argidx < args.size()) extra_args(args, argidx, design);
extra_args(args, argidx, design);
keep_cache.reset(design); keep_cache.reset(design);
@ -627,7 +634,7 @@ struct CleanPass : public Pass {
for (auto module : design->selected_whole_modules()) { for (auto module : design->selected_whole_modules()) {
if (module->has_processes()) if (module->has_processes())
continue; continue;
rmunused_module(module, purge_mode, ys_debug(), false); rmunused_module(module, purge_mode, ys_debug(), true);
} }
log_suppressed(); log_suppressed();

13
tests/opt/opt_clean_init.ys Normal file
View File

@ -0,0 +1,13 @@
logger -expect warning "Initial value conflict for \\y resolving to 1'0 but with init 1'1" 1
logger -expect-no-warnings
read_verilog <<EOT
module top;
(* init=1'b0 *) wire w = 1'b0;
(* init=1'bx *) wire x = 1'b0;
(* init=1'b1 *) wire y = 1'b0;
(* init=1'b0 *) wire z = 1'bx;
endmodule
EOT
clean
select -assert-count 1 a:init
select -assert-count 1 w:y a:init %i