mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-06-03 04:41:22 +00:00
Code Activity

Fixed handling of mixed real/int ternary expressions

Browse source
This commit is contained in:
Clifford Wolf 2014-06-25 10:05:36 +02:00
parent 4fc43d1932
commit 076182c34e
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
frontends/ast/simplify.cc
View file

@ -247,6 +247,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
bool detect_width_simple = false; bool detect_width_simple = false;
bool child_0_is_self_determined = false; bool child_0_is_self_determined = false;
bool child_1_is_self_determined = false; bool child_1_is_self_determined = false;
bool child_2_is_self_determined = false;
bool children_are_self_determined = false; bool children_are_self_determined = false;
bool reset_width_after_children = false; bool reset_width_after_children = false;
@ -367,6 +368,18 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
detectSignWidth(width_hint, sign_hint); detectSignWidth(width_hint, sign_hint);
} }
if (type == AST_TERNARY) {
int width_hint_left, width_hint_right;
bool sign_hint_left, sign_hint_right;
bool found_real_left, found_real_right;
children[1]->detectSignWidth(width_hint_left, sign_hint_left, &found_real_left);
children[2]->detectSignWidth(width_hint_right, sign_hint_right, &found_real_right);
if (found_real_left || found_real_right) {
child_1_is_self_determined = true;
child_2_is_self_determined = true;
}
}
// simplify all children first // simplify all children first
// (iterate by index as e.g. auto wires can add new children in the process) // (iterate by index as e.g. auto wires can add new children in the process)
for (size_t i = 0; i < children.size(); i++) { for (size_t i = 0; i < children.size(); i++) {
@ -402,6 +415,8 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
width_hint_here = -1, sign_hint_here = false; width_hint_here = -1, sign_hint_here = false;
if (i == 1 && child_1_is_self_determined) if (i == 1 && child_1_is_self_determined)
width_hint_here = -1, sign_hint_here = false; width_hint_here = -1, sign_hint_here = false;
if (i == 2 && child_2_is_self_determined)
width_hint_here = -1, sign_hint_here = false;
if (children_are_self_determined) if (children_are_self_determined)
width_hint_here = -1, sign_hint_here = false; width_hint_here = -1, sign_hint_here = false;
did_something_here = children[i]->simplify(const_fold_here, at_zero, in_lvalue_here, stage, width_hint_here, sign_hint_here, in_param_here); did_something_here = children[i]->simplify(const_fold_here, at_zero, in_lvalue_here, stage, width_hint_here, sign_hint_here, in_param_here);
@ -1620,6 +1635,7 @@ skip_dynamic_range_lvalue_expansion:;
not_choice->detectSignWidth(other_width_hint, other_sign_hint, &other_real); not_choice->detectSignWidth(other_width_hint, other_sign_hint, &other_real);
if (other_real) { if (other_real) {
newNode = new AstNode(AST_REALVALUE); newNode = new AstNode(AST_REALVALUE);
choice->detectSignWidth(width_hint, sign_hint);
newNode->realvalue = choice->asReal(sign_hint); newNode->realvalue = choice->asReal(sign_hint);
} else { } else {
RTLIL::Const y = choice->bitsAsConst(width_hint, sign_hint); RTLIL::Const y = choice->bitsAsConst(width_hint, sign_hint);

9
tests/simple/realexpr.v
View file

@ -13,9 +13,12 @@ module demo_001(y1, y2, y3, y4);
assign y4 = p4 + 0.2; assign y4 = p4 + 0.2;
endmodule endmodule
module demo_002(y1); module demo_002(y0, y1, y2, y3);
output [3:0] y1; output [63:0] y0, y1, y2, y3;
assign y1 = 1'bx >= (-1 * -1.17); assign y0 = 1'bx >= (-1 * -1.17);
assign y1 = 1 ? 1 ? -1 : 'd0 : 0.0;
assign y2 = 1 ? -1 : 1 ? 'd0 : 0.0;
assign y3 = 1 ? -1 : 'd0;
endmodule endmodule