Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Fix #3258 of internal error with inout port (#3268)

Browse Source 
* Tests: Modify t_tri_inout to reproduce #3258

* Set direction of __en accorting to its main signal direction

* Update Changes
This commit is contained in:
Yutetsu TAKATSUKASA 2022-01-05 08:37:20 +09:00 committed by GitHub
parent b989ac6db5
commit 4e5f30858b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -36,6 +36,7 @@ Verilator 4.217 devel
* Fix $random not updating seed (#3238). [Julie Schwartz] * Fix $random not updating seed (#3238). [Julie Schwartz]
* Fix spurious UNUSED by ignoring inout pin connections (#3242). [Julie Schwartz] * Fix spurious UNUSED by ignoring inout pin connections (#3242). [Julie Schwartz]
* Fix splitting of _eval and other top level functions. [Geza Lore, Shunyao CAD] * Fix splitting of _eval and other top level functions. [Geza Lore, Shunyao CAD]
* Fix internal error by inout port (#3258). [Yutetsu TAKATSUKASA]
Verilator 4.216 2021-12-05 Verilator 4.216 2021-12-05

9
src/V3Tristate.cpp
View File

@ -546,8 +546,7 @@ class TristateVisitor final : public TristateBaseVisitor {
UINFO(9, " TRISTATE propagates up with " << lhsp << endl); UINFO(9, " TRISTATE propagates up with " << lhsp << endl);
// Create an output enable port (__en) // Create an output enable port (__en)
// May already be created if have foo === 1'bz somewhere // May already be created if have foo === 1'bz somewhere
envarp = getCreateEnVarp(invarp); envarp = getCreateEnVarp(invarp); // direction will be sen in visit(AstPin*)
envarp->varType2Out();
// //
outvarp->user1p(envarp); outvarp->user1p(envarp);
outvarp->user3p(invarp->user3p()); // AstPull* propagation outvarp->user3p(invarp->user3p()); // AstPull* propagation
@ -1162,7 +1161,11 @@ class TristateVisitor final : public TristateBaseVisitor {
AstVar* const enVarp = new AstVar(nodep->fileline(), VVarType::MODULETEMP, AstVar* const enVarp = new AstVar(nodep->fileline(), VVarType::MODULETEMP,
nodep->name() + "__en" + cvtToStr(m_unique++), nodep->name() + "__en" + cvtToStr(m_unique++),
VFlagBitPacked(), enModVarp->width()); VFlagBitPacked(), enModVarp->width());
enModVarp->direction(VDirection::INPUT); if (inDeclProcessing) { // __en(from-resolver-const) or __en(from-resolver-wire)
enModVarp->varType2In();
} else {
enModVarp->varType2Out();
}
UINFO(9, " newenv " << enVarp << endl); UINFO(9, " newenv " << enVarp << endl);
AstPin* const enpinp AstPin* const enpinp
= new AstPin(nodep->fileline(), nodep->pinNum(), = new AstPin(nodep->fileline(), nodep->pinNum(),

9
test_regress/t/t_tri_inout.v
View File

@ -11,7 +11,7 @@ module top (input A, input B, input SEL, output Y1, output Y2, output Z);
endmodule endmodule
module pass (input A, input OE, inout Z, output Y); module pass (input A, input OE, inout Z, output Y);
io io(.A(A), .OE(OE), .Z(Z), .Y(Y)); io_noinline io(.A(A), .OE(OE), .Z(Z), .Y(Y));
assign Z = 1'bz; assign Z = 1'bz;
endmodule endmodule
@ -20,3 +20,10 @@ module io (input A, input OE, inout Z, output Y);
assign Y = Z; assign Y = Z;
assign Z = 1'bz; assign Z = 1'bz;
endmodule endmodule
module io_noinline (input A, input OE, inout Z, output Y);
/*verilator no_inline_module*/
assign Z = (OE) ? A : 1'bz;
assign Y = Z;
assign Z = 1'bz;
endmodule