mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

Bugfix in recursive AST simplification

Browse source
This commit is contained in:
Clifford Wolf 2014-03-05 19:45:33 +01:00
parent 96e753041d
commit de7bd12004
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
frontends/ast/simplify.cc
View file

@ -219,7 +219,8 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
for (size_t i = 0; i < children.size(); i++) { for (size_t i = 0; i < children.size(); i++) {
AstNode *node = children[i]; AstNode *node = children[i];
if (node->type == AST_PARAMETER || node->type == AST_LOCALPARAM || node->type == AST_WIRE || node->type == AST_AUTOWIRE) if (node->type == AST_PARAMETER || node->type == AST_LOCALPARAM || node->type == AST_WIRE || node->type == AST_AUTOWIRE)
while (node->simplify(true, false, false, 1, -1, false, node->type == AST_PARAMETER || node->type == AST_LOCALPARAM)) { } while (node->simplify(true, false, false, 1, -1, false, node->type == AST_PARAMETER || node->type == AST_LOCALPARAM))
did_something = true;
} }
} }
@ -241,8 +242,10 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
case AST_ASSIGN_EQ: case AST_ASSIGN_EQ:
case AST_ASSIGN_LE: case AST_ASSIGN_LE:
case AST_ASSIGN: case AST_ASSIGN:
while (!children[0]->basic_prep && children[0]->simplify(false, false, true, stage, -1, false, false) == true) { } while (!children[0]->basic_prep && children[0]->simplify(false, false, true, stage, -1, false, false) == true)
while (!children[1]->basic_prep && children[1]->simplify(false, false, false, stage, -1, false, false) == true) { } did_something = true;
while (!children[1]->basic_prep && children[1]->simplify(false, false, false, stage, -1, false, false) == true)
did_something = true;
children[0]->detectSignWidth(backup_width_hint, backup_sign_hint); children[0]->detectSignWidth(backup_width_hint, backup_sign_hint);
children[1]->detectSignWidth(width_hint, sign_hint); children[1]->detectSignWidth(width_hint, sign_hint);
width_hint = std::max(width_hint, backup_width_hint); width_hint = std::max(width_hint, backup_width_hint);
@ -251,11 +254,13 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
case AST_PARAMETER: case AST_PARAMETER:
case AST_LOCALPARAM: case AST_LOCALPARAM:
while (!children[0]->basic_prep && children[0]->simplify(false, false, false, stage, -1, false, true) == true) { } while (!children[0]->basic_prep && children[0]->simplify(false, false, false, stage, -1, false, true) == true)
did_something = true;
children[0]->detectSignWidth(width_hint, sign_hint); children[0]->detectSignWidth(width_hint, sign_hint);
if (children.size() > 1) { if (children.size() > 1) {
assert(children[1]->type == AST_RANGE); assert(children[1]->type == AST_RANGE);
while (!children[1]->basic_prep && children[1]->simplify(false, false, false, stage, -1, false, true) == true) { } while (!children[1]->basic_prep && children[1]->simplify(false, false, false, stage, -1, false, true) == true)
did_something = true;
if (!children[1]->range_valid) if (!children[1]->range_valid)
log_error("Non-constant width range on parameter decl at %s:%d.\n", filename.c_str(), linenum); log_error("Non-constant width range on parameter decl at %s:%d.\n", filename.c_str(), linenum);
width_hint = std::max(width_hint, children[1]->range_left - children[1]->range_right + 1); width_hint = std::max(width_hint, children[1]->range_left - children[1]->range_right + 1);
@ -311,7 +316,8 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
width_hint = -1; width_hint = -1;
sign_hint = true; sign_hint = true;
for (auto child : children) { for (auto child : children) {
while (!child->basic_prep && child->simplify(false, false, in_lvalue, stage, -1, false, in_param) == true) { } while (!child->basic_prep && child->simplify(false, false, in_lvalue, stage, -1, false, in_param) == true)
did_something = true;
child->detectSignWidthWorker(width_hint, sign_hint); child->detectSignWidthWorker(width_hint, sign_hint);
} }
reset_width_after_children = true; reset_width_after_children = true;
@ -341,9 +347,11 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
if (detect_width_simple && width_hint < 0) { if (detect_width_simple && width_hint < 0) {
for (auto child : children) for (auto child : children)
while (!child->basic_prep && child->simplify(false, false, in_lvalue, stage, -1, false, in_param) == true) { } while (!child->basic_prep && child->simplify(false, false, in_lvalue, stage, -1, false, in_param) == true)
did_something = true;
if (type == AST_REPLICATE) if (type == AST_REPLICATE)
while (children[0]->simplify(true, false, in_lvalue, stage, -1, false, in_param) == true) { } while (children[0]->simplify(true, false, in_lvalue, stage, -1, false, in_param) == true)
did_something = true;
detectSignWidth(width_hint, sign_hint); detectSignWidth(width_hint, sign_hint);
} }
@ -389,7 +397,8 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
} }
} }
for (auto &attr : attributes) { for (auto &attr : attributes) {
while (attr.second->simplify(true, false, false, stage, -1, false, true)) { } while (attr.second->simplify(true, false, false, stage, -1, false, true))
did_something = true;
} }
if (reset_width_after_children) { if (reset_width_after_children) {
@ -539,7 +548,10 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
current_scope[str] = auto_wire; current_scope[str] = auto_wire;
did_something = true; did_something = true;
} }
id2ast = current_scope[str]; if (id2ast != current_scope[str]) {
id2ast = current_scope[str];
did_something = true;
}
} }
// split memory access with bit select to individual statements // split memory access with bit select to individual statements