mirror of https://github.com/YosysHQ/yosys.git
Compare commits
8 Commits
121c01f058
...
9e48df6b4b
Author | SHA1 | Date |
---|---|---|
Carlo Alberto Ferraris | 9e48df6b4b | |
Miodrag Milanović | 29e8812bab | |
Miodrag Milanović | 9512ec4bbc | |
Miodrag Milanovic | d6bd521487 | |
Miodrag Milanovic | df391f5816 | |
N. Engelhardt | d67989f9ad | |
Carlo Alberto Ferraris | b5251b4802 | |
Carlo Alberto Ferraris | 551d36d384 |
|
@ -2126,12 +2126,6 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
|
|||
log(" assert condition %s.\n", log_signal(cond));
|
||||
|
||||
Cell *cell = module->addAssert(new_verific_id(inst), cond, State::S1);
|
||||
// Initialize FF feeding condition to 1, in case it is not
|
||||
// used by rest of design logic, to prevent failing on
|
||||
// initial uninitialized state
|
||||
if (cond.is_wire() && !cond.wire->name.isPublic())
|
||||
cond.wire->attributes[ID::init] = Const(1,1);
|
||||
|
||||
import_attributes(cell->attributes, inst);
|
||||
continue;
|
||||
}
|
||||
|
@ -3428,6 +3422,7 @@ struct VerificPass : public Pass {
|
|||
RuntimeFlags::SetVar("veri_preserve_assignments", 1);
|
||||
RuntimeFlags::SetVar("veri_preserve_comments", 1);
|
||||
RuntimeFlags::SetVar("veri_preserve_drivers", 1);
|
||||
RuntimeFlags::SetVar("veri_create_empty_box", 1);
|
||||
|
||||
// Workaround for VIPER #13851
|
||||
RuntimeFlags::SetVar("veri_create_name_for_unnamed_gen_block", 1);
|
||||
|
|
|
@ -36,7 +36,7 @@ struct OptMuxtreeWorker
|
|||
RTLIL::Module *module;
|
||||
SigMap assign_map;
|
||||
int removed_count;
|
||||
int glob_abort_cnt = 100000;
|
||||
int glob_abort_cnt;
|
||||
|
||||
struct bitinfo_t {
|
||||
bool seen_non_mux;
|
||||
|
@ -147,6 +147,10 @@ struct OptMuxtreeWorker
|
|||
return;
|
||||
}
|
||||
|
||||
// Limit the number of iterations based on the number of muxes.
|
||||
// The multiplier (1000) is arbitrary.
|
||||
glob_abort_cnt = max(100000, GetSize(mux2info) * 100);
|
||||
|
||||
// Populate mux2info[].ports[]:
|
||||
// .input_muxes
|
||||
for (int i = 0; i < GetSize(bit2info); i++)
|
||||
|
|
|
@ -0,0 +1,24 @@
|
|||
verific -sv -lib <<EOF
|
||||
module TEST_CELL(input clk, input a, input b, output reg c);
|
||||
parameter PATH = "DEFAULT";
|
||||
always @(posedge clk) begin
|
||||
if (PATH=="DEFAULT")
|
||||
c <= a;
|
||||
else
|
||||
c <= b;
|
||||
end
|
||||
|
||||
endmodule
|
||||
EOF
|
||||
|
||||
verific -sv <<EOF
|
||||
module top(input clk, input a, input b, output c, output d);
|
||||
TEST_CELL #(.PATH("TEST")) test1(.clk(clk),.a(a),.b(1'b1),.c(c));
|
||||
TEST_CELL #(.PATH("DEFAULT")) test2(.clk(clk),.a(a),.b(1'bx),.c(d));
|
||||
endmodule
|
||||
EOF
|
||||
|
||||
verific -import top
|
||||
hierarchy -top top
|
||||
stat
|
||||
select -assert-count 2 t:TEST_CELL
|
Loading…
Reference in New Issue