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

Merge pull request #2658 from zachjs/parameters-across-files 

sv: allow globals in one file to depend on globals in another
This commit is contained in:
whitequark 2021-03-14 15:02:16 +00:00 committed by GitHub
parent 396ad17e06 640b9927fa
commit e178d0367a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontends/ast/ast.cc
View File

@ -1288,7 +1288,6 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool dump_ast1, bool dump
// must be global definition // must be global definition
if ((*it)->type == AST_PARAMETER) if ((*it)->type == AST_PARAMETER)
(*it)->type = AST_LOCALPARAM; // cannot be overridden (*it)->type = AST_LOCALPARAM; // cannot be overridden
(*it)->simplify(false, false, false, 1, -1, false, false); //process enum/other declarations
design->verilog_globals.push_back((*it)->clone()); design->verilog_globals.push_back((*it)->clone());
current_scope.clear(); current_scope.clear();
} }

1
frontends/ast/simplify.cc
View File

@ -192,6 +192,7 @@ void AstNode::annotateTypedEnums(AstNode *template_node)
log_assert(current_scope.count(enum_type) == 1); log_assert(current_scope.count(enum_type) == 1);
AstNode *enum_node = current_scope.at(enum_type); AstNode *enum_node = current_scope.at(enum_type);
log_assert(enum_node->type == AST_ENUM); log_assert(enum_node->type == AST_ENUM);
while (enum_node->simplify(true, false, false, 1, -1, false, true)) { }
//get width from 1st enum item: //get width from 1st enum item:
log_assert(enum_node->children.size() >= 1); log_assert(enum_node->children.size() >= 1);
AstNode *enum_item0 = enum_node->children[0]; AstNode *enum_item0 = enum_node->children[0];

20
tests/verilog/parameters_across_files.ys Normal file
View File

@ -0,0 +1,20 @@
read_verilog -sv <<EOF
parameter Q = 1;
EOF
read_verilog -sv <<EOF
parameter P = Q;
module top(
output integer out
);
assign out = P;
always @*
assert (out == 1);
endmodule
EOF
hierarchy
proc
flatten
opt -full
select -module top
sat -verify -seq 1 -tempinduct -prove-asserts -show-all