VeniVidiVici
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix `--lib-create` with double-underscore (#6099).

This commit is contained in:
Wilson Snyder 2025-06-18 08:56:32 -04:00
parent 75df36bc8f
commit 49fe129634
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -67,6 +67,7 @@ Verilator 5.037 devel
* Fix unpacked to packed parameter assignment (#6081) (#6088). [Todd Strader] * Fix unpacked to packed parameter assignment (#6081) (#6088). [Todd Strader]
* Fix casting reals to large integrals (#6085). [Todd Strader] * Fix casting reals to large integrals (#6085). [Todd Strader]
* Fix nested hier blocks workers error (#6087). [Bartłomiej Chmiel, Antmicro Ltd.] * Fix nested hier blocks workers error (#6087). [Bartłomiej Chmiel, Antmicro Ltd.]
* Fix `--lib-create` with double-underscore (#6099).
Verilator 5.036 2025-04-27 Verilator 5.036 2025-04-27

22
src/V3ProtectLib.cpp
View File

@ -459,8 +459,9 @@ class ProtectVisitor final : public VNVisitor {
handleInput(varp); handleInput(varp);
m_seqPortsp->addNodesp(varp->cloneTree(false)); m_seqPortsp->addNodesp(varp->cloneTree(false));
if (m_hasClk) { if (m_hasClk) {
m_seqParamsp->addText(fl, varp->name() + "\n"); m_seqParamsp->addText(fl, varp->prettyName() + "\n");
m_clkSensp->addText(fl, "posedge " + varp->name() + " or negedge " + varp->name()); m_clkSensp->addText(fl, "posedge " + varp->prettyName() + " or negedge "
+ varp->prettyName());
} }
m_cSeqParamsp->addText(fl, varp->dpiArgType(true, false) + "\n"); m_cSeqParamsp->addText(fl, varp->dpiArgType(true, false) + "\n");
m_cSeqClksp->addText(fl, cInputConnection(varp)); m_cSeqClksp->addText(fl, cInputConnection(varp));
@ -470,9 +471,9 @@ class ProtectVisitor final : public VNVisitor {
FileLine* const fl = varp->fileline(); FileLine* const fl = varp->fileline();
handleInput(varp); handleInput(varp);
m_comboPortsp->addNodesp(varp->cloneTree(false)); m_comboPortsp->addNodesp(varp->cloneTree(false));
m_comboParamsp->addText(fl, varp->name() + "\n"); m_comboParamsp->addText(fl, varp->prettyName() + "\n");
m_comboIgnorePortsp->addNodesp(varp->cloneTree(false)); m_comboIgnorePortsp->addNodesp(varp->cloneTree(false));
if (m_hasClk) m_comboIgnoreParamsp->addText(fl, varp->name() + "\n"); if (m_hasClk) m_comboIgnoreParamsp->addText(fl, varp->prettyName() + "\n");
m_cComboParamsp->addText(fl, varp->dpiArgType(true, false) + "\n"); m_cComboParamsp->addText(fl, varp->dpiArgType(true, false) + "\n");
m_cComboInsp->addText(fl, cInputConnection(varp)); m_cComboInsp->addText(fl, cInputConnection(varp));
m_cIgnoreParamsp->addText(fl, varp->dpiArgType(true, false) + "\n"); m_cIgnoreParamsp->addText(fl, varp->dpiArgType(true, false) + "\n");
@ -490,10 +491,10 @@ class ProtectVisitor final : public VNVisitor {
FileLine* const fl = varp->fileline(); FileLine* const fl = varp->fileline();
m_modPortsp->addNodesp(varp->cloneTree(false)); m_modPortsp->addNodesp(varp->cloneTree(false));
m_comboPortsp->addNodesp(varp->cloneTree(false)); m_comboPortsp->addNodesp(varp->cloneTree(false));
m_comboParamsp->addText(fl, varp->name() + "_combo__V\n"); m_comboParamsp->addText(fl, varp->prettyName() + "_combo__V\n");
if (m_hasClk) { if (m_hasClk) {
m_seqPortsp->addNodesp(varp->cloneTree(false)); m_seqPortsp->addNodesp(varp->cloneTree(false));
m_seqParamsp->addText(fl, varp->name() + "_tmp__V\n"); m_seqParamsp->addText(fl, varp->prettyName() + "_tmp__V\n");
} }
addLocalVariable(m_comboDeclsp, varp, "_combo__V"); addLocalVariable(m_comboDeclsp, varp, "_combo__V");
@ -502,10 +503,13 @@ class ProtectVisitor final : public VNVisitor {
addLocalVariable(m_seqDeclsp, varp, "_seq__V"); addLocalVariable(m_seqDeclsp, varp, "_seq__V");
addLocalVariable(m_tmpDeclsp, varp, "_tmp__V"); addLocalVariable(m_tmpDeclsp, varp, "_tmp__V");
m_nbAssignsp->addText(fl, varp->name() + "_seq__V <= " + varp->name() + "_tmp__V;\n"); m_nbAssignsp->addText(fl, varp->prettyName() + "_seq__V <= " + varp->prettyName()
m_seqAssignsp->addText(fl, varp->name() + " = " + varp->name() + "_seq__V;\n"); + "_tmp__V;\n");
m_seqAssignsp->addText(fl,
varp->prettyName() + " = " + varp->prettyName() + "_seq__V;\n");
} }
m_comboAssignsp->addText(fl, varp->name() + " = " + varp->name() + "_combo__V;\n"); m_comboAssignsp->addText(fl,
varp->prettyName() + " = " + varp->prettyName() + "_combo__V;\n");
m_cComboParamsp->addText(fl, varp->dpiArgType(true, false) + "\n"); m_cComboParamsp->addText(fl, varp->dpiArgType(true, false) + "\n");
m_cComboOutsp->addText(fl, m_cComboOutsp->addText(fl,
V3Task::assignInternalToDpi(varp, true, "", "", "handlep__V->")); V3Task::assignInternalToDpi(varp, true, "", "", "handlep__V->"));

12
test_regress/t/t_lib_prot_comb.v
View File

@ -4,8 +4,8 @@
// SPDX-License-Identifier: CC0-1.0 // SPDX-License-Identifier: CC0-1.0
`ifdef PROCESS_TOP `ifdef PROCESS_TOP
`define CHECK if (out0 != (in0 ^ in1) || out1 != (in0 | in1) || out2 != (in0 & in1)) begin \ `define CHECK if (out0 != (in0 ^ in1) || out1 != (in0 | in1) || out2__under != (in0 & in1)) begin \
$display("Mismatch in0:%b in1:%b out0:%b out1:%b out2:%b", in0, in1, out0, out1, out2); \ $display("Mismatch in0:%b in1:%b out0:%b out1:%b out2:%b", in0, in1, out0, out1, out2__under); \
$stop; \ $stop; \
end end
@ -17,10 +17,10 @@ module t (/*AUTOARG*/
logic in0, in1; logic in0, in1;
logic out0, out1, out2; logic out0, out1, out2__under;
logic [31:0] count = 0; logic [31:0] count = 0;
// actually XOR and OR and AND // actually XOR and OR and AND
secret i_secret(.in0(in0), .in1(in1), .out0(out0), .out1(out1), .out2(out2)); secret i_secret(.in0(in0), .in1(in1), .out0(out0), .out1(out1), .out2__under(out2__under));
always @(posedge clk) begin always @(posedge clk) begin
count <= count + 32'd1; count <= count + 32'd1;
@ -48,9 +48,9 @@ module t (/*AUTOARG*/
endmodule endmodule
`else `else
module secret(input in0, input in1, output out0, output out1, output out2); module secret(input in0, input in1, output out0, output out1, output out2__under);
assign out0 = in0 ^ in1; assign out0 = in0 ^ in1;
assign out1 = in0 | in1; assign out1 = in0 | in1;
assign out2 = in0 & in1; assign out2__under = in0 & in1;
endmodule endmodule
`endif `endif