mirror of https://github.com/YosysHQ/yosys.git
Compare commits
7 Commits
d36b0abae5
...
04a087ece5
Author | SHA1 | Date |
---|---|---|
Larry Doolittle | 04a087ece5 | |
Miodrag Milanović | 29e8812bab | |
Miodrag Milanović | 9512ec4bbc | |
Miodrag Milanovic | d6bd521487 | |
Larry Doolittle | 3ae9ca7c2b | |
Miodrag Milanovic | df391f5816 | |
Larry Doolittle | d36a387aca |
|
@ -2126,12 +2126,6 @@ void VerificImporter::import_netlist(RTLIL::Design *design, Netlist *nl, std::ma
|
||||||
log(" assert condition %s.\n", log_signal(cond));
|
log(" assert condition %s.\n", log_signal(cond));
|
||||||
|
|
||||||
Cell *cell = module->addAssert(new_verific_id(inst), cond, State::S1);
|
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);
|
import_attributes(cell->attributes, inst);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -3428,6 +3422,7 @@ struct VerificPass : public Pass {
|
||||||
RuntimeFlags::SetVar("veri_preserve_assignments", 1);
|
RuntimeFlags::SetVar("veri_preserve_assignments", 1);
|
||||||
RuntimeFlags::SetVar("veri_preserve_comments", 1);
|
RuntimeFlags::SetVar("veri_preserve_comments", 1);
|
||||||
RuntimeFlags::SetVar("veri_preserve_drivers", 1);
|
RuntimeFlags::SetVar("veri_preserve_drivers", 1);
|
||||||
|
RuntimeFlags::SetVar("veri_create_empty_box", 1);
|
||||||
|
|
||||||
// Workaround for VIPER #13851
|
// Workaround for VIPER #13851
|
||||||
RuntimeFlags::SetVar("veri_create_name_for_unnamed_gen_block", 1);
|
RuntimeFlags::SetVar("veri_create_name_for_unnamed_gen_block", 1);
|
||||||
|
|
|
@ -364,7 +364,7 @@ public:
|
||||||
|
|
||||||
unsigned int hash() const
|
unsigned int hash() const
|
||||||
{
|
{
|
||||||
unsigned int inner;
|
unsigned int inner = 0;
|
||||||
switch (type_)
|
switch (type_)
|
||||||
{
|
{
|
||||||
case DriveType::NONE:
|
case DriveType::NONE:
|
||||||
|
@ -385,6 +385,9 @@ public:
|
||||||
case DriveType::MULTIPLE:
|
case DriveType::MULTIPLE:
|
||||||
inner = multiple_.hash();
|
inner = multiple_.hash();
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
log_abort();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return mkhash((unsigned int)type_, inner);
|
return mkhash((unsigned int)type_, inner);
|
||||||
}
|
}
|
||||||
|
@ -912,7 +915,7 @@ public:
|
||||||
|
|
||||||
unsigned int hash() const
|
unsigned int hash() const
|
||||||
{
|
{
|
||||||
unsigned int inner;
|
unsigned int inner = 0;
|
||||||
switch (type_)
|
switch (type_)
|
||||||
{
|
{
|
||||||
case DriveType::NONE:
|
case DriveType::NONE:
|
||||||
|
@ -933,6 +936,9 @@ public:
|
||||||
case DriveType::MULTIPLE:
|
case DriveType::MULTIPLE:
|
||||||
inner = multiple_.hash();
|
inner = multiple_.hash();
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
log_abort();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
return mkhash((unsigned int)type_, inner);
|
return mkhash((unsigned int)type_, inner);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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