riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2352 from zachjs/const-func-localparam 

Allow localparams in constant functions
This commit is contained in:
clairexen 2020-09-01 17:31:48 +02:00 committed by GitHub
parent c1a6097376 74abc3bbfd
commit a10893072b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontends/ast/simplify.cc
View File

@ -4507,6 +4507,18 @@ AstNode *AstNode::eval_const_function(AstNode *fcall)
log_assert(variables.count(str) != 0); log_assert(variables.count(str) != 0);
if (stmt->type == AST_LOCALPARAM)
{
while (stmt->simplify(true, false, false, 1, -1, false, true)) { }
if (!backup_scope.count(stmt->str))
backup_scope[stmt->str] = current_scope[stmt->str];
current_scope[stmt->str] = stmt;
block->children.erase(block->children.begin());
continue;
}
if (stmt->type == AST_ASSIGN_EQ) if (stmt->type == AST_ASSIGN_EQ)
{ {
if (stmt->children.at(0)->type == AST_IDENTIFIER && stmt->children.at(0)->children.size() != 0 && if (stmt->children.at(0)->type == AST_IDENTIFIER && stmt->children.at(0)->children.size() != 0 &&

9
tests/various/const_func_block_var.v
View File

@ -1,15 +1,18 @@
module top(out); module top(out);
function integer operation; function integer operation;
input integer num; input integer num;
localparam incr = 1;
localparam mult = 1;
begin begin
operation = 0; operation = 0;
begin : op_i begin : op_i
integer i; integer i;
for (i = 0; i < 2; i = i + 1) for (i = 0; i * mult < 2; i = i + incr)
begin : op_j begin : op_j
integer j; integer j;
for (j = i; j < i * 2; j = j + 1) localparam other_mult = 2;
num = num + 1; for (j = i; j < i * other_mult; j = j + incr)
num = num + incr;
end end
num = num * 2; num = num * 2;
end end