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

Fix genvar constant propagation from package, bug1003.

Browse Source 
Signed-off-by: Wilson Snyder <wsnyder@wsnyder.org>
This commit is contained in:
Johan Bjork 2015-11-22 20:46:26 -05:00 committed by Wilson Snyder
parent 7698af5178
commit 9edd28d2ed
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes
View File

@ -19,6 +19,8 @@ indicates the contributor was also the author of the fix; Thanks!
**** Fix $signed casts under generates, bug999. [Clifford Wolf] **** Fix $signed casts under generates, bug999. [Clifford Wolf]
**** Fix genvar constant propagation from package, bug1003. [Johan Bjork]
* Verilator 3.878 2015-11-01 * Verilator 3.878 2015-11-01

7
src/V3Simulate.h
View File

@ -255,6 +255,7 @@ private:
virtual void visit(AstVarRef* nodep, AstNUser*) { virtual void visit(AstVarRef* nodep, AstNUser*) {
if (jumpingOver(nodep)) return; if (jumpingOver(nodep)) return;
if (!optimizable()) return; // Accelerate if (!optimizable()) return; // Accelerate
nodep->varp()->iterateChildren(*this);
AstNode* vscp = varOrScope(nodep); AstNode* vscp = varOrScope(nodep);
// We can't have non-delayed assignments with same value on LHS and RHS // We can't have non-delayed assignments with same value on LHS and RHS
@ -282,10 +283,10 @@ private:
if (!m_params && (vscp->user1() & VU_LV)) clearOptimizable(nodep,"Var write & read"); if (!m_params && (vscp->user1() & VU_LV)) clearOptimizable(nodep,"Var write & read");
vscp->user1( vscp->user1() | VU_RV); vscp->user1( vscp->user1() | VU_RV);
bool isConst = nodep->varp()->isParam(); bool isConst = nodep->varp()->isParam();
AstConst* constp = (isConst ? nodep->varp()->valuep()->castConst() : NULL); V3Number* nump = isConst ? fetchNumberNull(nodep->varp()->valuep()) : NULL;
if (isConst && constp) { // Propagate PARAM constants for constant function analysis if (isConst && nump) { // Propagate PARAM constants for constant function analysis
if (!m_checkOnly && optimizable()) { if (!m_checkOnly && optimizable()) {
newNumber(vscp)->opAssign(constp->num()); newNumber(vscp)->opAssign(*nump);
} }
} else { } else {
if (m_checkOnly) varRefCb (nodep); if (m_checkOnly) varRefCb (nodep);

11
test_regress/t/t_func_const.v
View File

@ -3,6 +3,11 @@
// This file ONLY is placed into the Public Domain, for any use, // This file ONLY is placed into the Public Domain, for any use,
// without warranty, 2009 by Wilson Snyder. // without warranty, 2009 by Wilson Snyder.
package testpackage;
localparam PARAM = 1024 >> 3;
endpackage
import testpackage::*;
module t; module t;
localparam P4 = f_add(P3,1); localparam P4 = f_add(P3,1);
@ -12,6 +17,7 @@ module t;
localparam P18 = f_case(P4); localparam P18 = f_case(P4);
localparam P6 = f_return(P4); localparam P6 = f_return(P4);
localparam P3 = 3; localparam P3 = 3;
localparam P128 = f_package();
typedef struct packed { typedef struct packed {
logic [7:0] data; logic [7:0] data;
@ -42,10 +48,15 @@ module t;
if (bigparam.first != 1'b1) $stop; if (bigparam.first != 1'b1) $stop;
if (bigparam.second != 1'b0) $stop; if (bigparam.second != 1'b0) $stop;
if (bigparam.data != 32'hfff12fff) $stop; if (bigparam.data != 32'hfff12fff) $stop;
if (P128 != 128) $stop;
$write("*-* All Finished *-*\n"); $write("*-* All Finished *-*\n");
$finish; $finish;
end end
function integer f_package();
return PARAM;
endfunction
function integer f_add(input [31:0] a, input [31:0] b); function integer f_add(input [31:0] a, input [31:0] b);
f_add = a+b; f_add = a+b;
endfunction endfunction