diff options
author | Udi Finkelstein <github@udifink.com> | 2017-09-26 20:34:24 +0300 |
---|---|---|
committer | Udi Finkelstein <github@udifink.com> | 2017-09-26 20:34:24 +0300 |
commit | e951ac0dfba554a86331b0863f7bda81effef10d (patch) | |
tree | 1bf85e76f6258af1779520e8fda1c196ea758f7f | |
parent | 6ddc6a7af42d371aa7c08505d82b30628372a16c (diff) | |
download | yosys-e951ac0dfba554a86331b0863f7bda81effef10d.tar.gz yosys-e951ac0dfba554a86331b0863f7bda81effef10d.tar.bz2 yosys-e951ac0dfba554a86331b0863f7bda81effef10d.zip |
$size() now works correctly for all cases!
It seems the issues was that AST_MULTIRANGE is converted into a multirange_dimensions[] array on the AST_MEMORY node directly.
-rw-r--r-- | frontends/ast/simplify.cc | 34 | ||||
-rw-r--r-- | tests/simple/functions01.sv | 16 |
2 files changed, 28 insertions, 22 deletions
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index a87fccbe9..678951850 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -1883,17 +1883,19 @@ skip_dynamic_range_lvalue_expansion:; int dim = 1; if (str == "\\$size" && children.size() == 2) { AstNode *buf = children[1]->clone(); + // Evaluate constant expression + while (buf->simplify(true, false, false, stage, width_hint, sign_hint, false)) { } dim = buf->asInt(false); delete buf; } AstNode *buf = children[0]->clone(); int mem_depth = 1; AstNode *id_ast = NULL; - // Is this needed? //while (buf->simplify(true, false, false, stage, width_hint, sign_hint, false)) { } buf->detectSignWidth(width_hint, sign_hint); + if (buf->type == AST_IDENTIFIER) { id_ast = buf->id2ast; if (id_ast == NULL && current_scope.count(buf->str)) @@ -1907,30 +1909,28 @@ skip_dynamic_range_lvalue_expansion:; if (str == "\\$bits") { if (mem_range->type == AST_RANGE) { if (!mem_range->range_valid) - log_error("Failed to detect width of memory access `%s' at %s:%d!\n", mem_range->str.c_str(), filename.c_str(), linenum); + log_error("Failed to detect width of memory access `%s' at %s:%d!\n", buf->str.c_str(), filename.c_str(), linenum); mem_depth = mem_range->range_left - mem_range->range_right + 1; - } else if (mem_range->type == AST_MULTIRANGE) { - for (auto n : mem_range->children) - mem_depth *= (n->range_left - n->range_right + 1); } else - log_error("Unknown memory depth AST type in `%s' at %s:%d!\n", mem_range->str.c_str(), filename.c_str(), linenum); + log_error("Unknown memory depth AST type in `%s' at %s:%d!\n", buf->str.c_str(), filename.c_str(), linenum); } else { // $size() if (mem_range->type == AST_RANGE) { if (!mem_range->range_valid) - log_error("Failed to detect width of memory access `%s' at %s:%d!\n", mem_range->str.c_str(), filename.c_str(), linenum); + log_error("Failed to detect width of memory access `%s' at %s:%d!\n", buf->str.c_str(), filename.c_str(), linenum); + int dims; + if (id_ast->multirange_dimensions.empty()) + dims = 1; + else + dims = GetSize(id_ast->multirange_dimensions)/2; if (dim == 1) - width_hint = mem_range->range_left - mem_range->range_right + 1; - } else if (mem_range->type == AST_MULTIRANGE) { - log("multirange!\n"); - int s = mem_range->children.size(); - if (dim <= s) { - auto n = mem_range->children[dim-1]; - width_hint = (n->range_left - n->range_right + 1); - } else if (dim > s+1) - log_error("Dimension %d out of range in `%s', as it only has dimensions 1..%d at %s:%d!\n", dim, mem_range->str.c_str(), s+1, filename.c_str(), linenum); + width_hint = (dims > 1) ? id_ast->multirange_dimensions[1] : (mem_range->range_left - mem_range->range_right + 1); + else if (dim <= dims) { + width_hint = id_ast->multirange_dimensions[2*dim-1]; + } else if ((dim > dims+1) || (dim < 0)) + log_error("Dimension %d out of range in `%s', as it only has dimensions 1..%d at %s:%d!\n", dim, buf->str.c_str(), dims+1, filename.c_str(), linenum); } else - log_error("Unknown memory depth AST type in `%s' at %s:%d!\n", mem_range->str.c_str(), filename.c_str(), linenum); + log_error("Unknown memory depth AST type in `%s' at %s:%d!\n", buf->str.c_str(), filename.c_str(), linenum); } } } diff --git a/tests/simple/functions01.sv b/tests/simple/functions01.sv index e36d6a764..d7ce2326e 100644 --- a/tests/simple/functions01.sv +++ b/tests/simple/functions01.sv @@ -1,8 +1,8 @@ module functions01; -wire [3:0]x; -wire [3:0]y[0:5]; -wire [3:0]z[0:5][0:7]; +wire [5:2]x; +wire [3:0]y[2:7]; +wire [3:0]z[7:2][2:9]; //wire [$size(x)-1:0]x_size; //wire [$size({x, x})-1:0]xx_size; @@ -13,7 +13,14 @@ assert property ($size(x) == 4); assert property ($size({3{x}}) == 3*4); assert property ($size(y) == 6); assert property ($size(y, 1) == 6); -assert property ($size(y, 2) == 4); +assert property ($size(y, (1+1)) == 4); + +assert property ($size(z) == 6); +assert property ($size(z, 1) == 6); +assert property ($size(z, 2) == 8); +assert property ($size(z, 3) == 4); +// This should trigger an error if enabled (it does). +//assert property ($size(z, 4) == 4); //wire [$bits(x)-1:0]x_bits; //wire [$bits({x, x})-1:0]xx_bits; @@ -22,5 +29,4 @@ assert property ($bits(x) == 4); assert property ($bits(y) == 4*6); assert property ($bits(z) == 4*6*8); - endmodule |