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

Allow reals as constant function parameters

This commit is contained in:
Zachary Snow 2020-07-19 20:27:09 -06:00
parent eed05953f8
commit f285f7b769
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontends/ast/simplify.cc
View File

@ -3029,7 +3029,7 @@ skip_dynamic_range_lvalue_expansion:;
bool all_args_const = true; bool all_args_const = true;
for (auto child : children) { for (auto child : children) {
while (child->simplify(true, false, false, 1, -1, false, true)) { } while (child->simplify(true, false, false, 1, -1, false, true)) { }
if (child->type != AST_CONSTANT) if (child->type != AST_CONSTANT && child->type != AST_REALVALUE)
all_args_const = false; all_args_const = false;
} }
@ -4349,8 +4349,16 @@ AstNode *AstNode::eval_const_function(AstNode *fcall)
variables[child->str].val = RTLIL::Const(RTLIL::State::Sx, abs(child->range_left - child->range_right)+1); variables[child->str].val = RTLIL::Const(RTLIL::State::Sx, abs(child->range_left - child->range_right)+1);
variables[child->str].offset = min(child->range_left, child->range_right); variables[child->str].offset = min(child->range_left, child->range_right);
variables[child->str].is_signed = child->is_signed; variables[child->str].is_signed = child->is_signed;
if (child->is_input && argidx < fcall->children.size()) if (child->is_input && argidx < fcall->children.size()) {
variables[child->str].val = fcall->children.at(argidx++)->bitsAsConst(variables[child->str].val.bits.size()); int width = variables[child->str].val.bits.size();
auto* arg_node = fcall->children.at(argidx++);
if (arg_node->type == AST_CONSTANT) {
variables[child->str].val = arg_node->bitsAsConst(width);
} else {
log_assert(arg_node->type == AST_REALVALUE);
variables[child->str].val = arg_node->realAsConst(width);
}
}
backup_scope[child->str] = current_scope[child->str]; backup_scope[child->str] = current_scope[child->str];
current_scope[child->str] = child; current_scope[child->str] = child;
continue; continue;

12
tests/various/const_func.v
View File

@ -53,6 +53,15 @@ module top(out);
c1, c2, c3, c4, c1, c2, c3, c4,
d1, d2, d3, d4}; d1, d2, d3, d4};
function signed [31:0] negate;
input integer inp;
negate = ~inp;
endfunction
parameter W = 10;
parameter X = 3;
localparam signed Y = $floor(W / X);
localparam signed Z = negate($floor(W / X));
// `define VERIFY // `define VERIFY
`ifdef VERIFY `ifdef VERIFY
assert property (a1 == 0); assert property (a1 == 0);
@ -71,5 +80,8 @@ module top(out);
assert property (d2 == 0); assert property (d2 == 0);
assert property (d3 == 1); assert property (d3 == 1);
assert property (d4 == 1); assert property (d4 == 1);
assert property (Y == 3);
assert property (Z == ~3);
`endif `endif
endmodule endmodule