From 64eb8f29adcc3e6ee92e083ae0fee3aaf85dbbc4 Mon Sep 17 00:00:00 2001 From: Udi Finkelstein Date: Tue, 26 Sep 2017 06:25:42 +0300 Subject: Add $size() function. At the moment it works only on expressions, not on memories. --- frontends/ast/simplify.cc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'frontends/ast/simplify.cc') diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index 28c9945ab..541fe1b18 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -1870,6 +1870,20 @@ skip_dynamic_range_lvalue_expansion:; goto apply_newNode; } + if (str == "\\$size") + { + if (children.size() != 1) + log_error("System function %s got %d arguments, expected 1 at %s:%d.\n", + RTLIL::unescape_id(str).c_str(), int(children.size()), filename.c_str(), linenum); + + AstNode *buf = children[0]->clone(); + buf->detectSignWidth(width_hint, sign_hint); + delete buf; + + newNode = mkconst_int(width_hint, false); + goto apply_newNode; + } + if (str == "\\$ln" || str == "\\$log10" || str == "\\$exp" || str == "\\$sqrt" || str == "\\$pow" || str == "\\$floor" || str == "\\$ceil" || str == "\\$sin" || str == "\\$cos" || str == "\\$tan" || str == "\\$asin" || str == "\\$acos" || str == "\\$atan" || str == "\\$atan2" || str == "\\$hypot" || -- cgit v1.2.3 From 17f8b4160574d34c446782952f09f940cd66c290 Mon Sep 17 00:00:00 2001 From: Udi Finkelstein Date: Tue, 26 Sep 2017 08:36:45 +0300 Subject: $size() now works with memories as well! --- frontends/ast/simplify.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'frontends/ast/simplify.cc') diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index 541fe1b18..608df0cb9 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -387,7 +387,7 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage, } for (size_t i = 0; i < children.size(); 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 || node->type == AST_MEMORY) while (node->simplify(true, false, false, 1, -1, false, node->type == AST_PARAMETER || node->type == AST_LOCALPARAM)) did_something = true; } @@ -1877,6 +1877,8 @@ skip_dynamic_range_lvalue_expansion:; RTLIL::unescape_id(str).c_str(), int(children.size()), filename.c_str(), linenum); AstNode *buf = children[0]->clone(); + // Is this needed? + //while (buf->simplify(true, false, false, stage, width_hint, sign_hint, false)) { } buf->detectSignWidth(width_hint, sign_hint); delete buf; -- cgit v1.2.3 From 2dea42e9039cdf47ca4927f62c69c6ae7ac2e399 Mon Sep 17 00:00:00 2001 From: Udi Finkelstein Date: Tue, 26 Sep 2017 09:11:25 +0300 Subject: Added $bits() for memories as well. --- frontends/ast/simplify.cc | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'frontends/ast/simplify.cc') diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index 608df0cb9..0cde34dc5 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -1870,19 +1870,43 @@ skip_dynamic_range_lvalue_expansion:; goto apply_newNode; } - if (str == "\\$size") + if (str == "\\$size" || str == "\\$bits") { if (children.size() != 1) log_error("System function %s got %d arguments, expected 1 at %s:%d.\n", RTLIL::unescape_id(str).c_str(), int(children.size()), filename.c_str(), linenum); 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 (str == "\\$bits") { + if (buf->type == AST_IDENTIFIER) { + id_ast = buf->id2ast; + if (id_ast == NULL && current_scope.count(buf->str)) + id_ast = current_scope.at(buf->str); + if (!id_ast) + log_error("Failed to resolve identifier %s for width detection at %s:%d!\n", buf->str.c_str(), filename.c_str(), linenum); + if (id_ast->type == AST_MEMORY) { + AstNode *mem_range = id_ast->children[1]; + 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); + 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); + } + } + } delete buf; - newNode = mkconst_int(width_hint, false); + newNode = mkconst_int(width_hint * mem_depth, false); goto apply_newNode; } -- cgit v1.2.3 From 7e391ba90438ba1c20c29863d1556cb6bfd1ea29 Mon Sep 17 00:00:00 2001 From: Udi Finkelstein Date: Tue, 26 Sep 2017 09:19:56 +0300 Subject: enable $bits() and $size() functions only when the SystemVerilog flag is enabled for read_verilog --- frontends/ast/simplify.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'frontends/ast/simplify.cc') diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index 0cde34dc5..5b7e48361 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -1870,7 +1870,7 @@ skip_dynamic_range_lvalue_expansion:; goto apply_newNode; } - if (str == "\\$size" || str == "\\$bits") + if (VERILOG_FRONTEND::sv_mode && (str == "\\$size" || str == "\\$bits")) { if (children.size() != 1) log_error("System function %s got %d arguments, expected 1 at %s:%d.\n", -- cgit v1.2.3 From 6ddc6a7af42d371aa7c08505d82b30628372a16c Mon Sep 17 00:00:00 2001 From: Udi Finkelstein Date: Tue, 26 Sep 2017 19:18:25 +0300 Subject: $size() seems to work now with or without the optional parameter. Multidimensional arrays still don't work. I suspect the problem is that the array is flattened into a 1D array before $size() is evaluated. --- frontends/ast/simplify.cc | 50 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 10 deletions(-) (limited to 'frontends/ast/simplify.cc') diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index 5b7e48361..a87fccbe9 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -1872,26 +1872,39 @@ skip_dynamic_range_lvalue_expansion:; if (VERILOG_FRONTEND::sv_mode && (str == "\\$size" || str == "\\$bits")) { - if (children.size() != 1) + if (str == "\\$bits" && children.size() != 1) log_error("System function %s got %d arguments, expected 1 at %s:%d.\n", RTLIL::unescape_id(str).c_str(), int(children.size()), filename.c_str(), linenum); + if (str == "\\$size" && children.size() != 1 && children.size() != 2) + log_error("System function %s got %d arguments, expected 1 or 2 at %s:%d.\n", + RTLIL::unescape_id(str).c_str(), int(children.size()), filename.c_str(), linenum); + + int dim = 1; + if (str == "\\$size" && children.size() == 2) { + AstNode *buf = children[1]->clone(); + 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 (str == "\\$bits") { - if (buf->type == AST_IDENTIFIER) { - id_ast = buf->id2ast; - if (id_ast == NULL && current_scope.count(buf->str)) - id_ast = current_scope.at(buf->str); - if (!id_ast) - log_error("Failed to resolve identifier %s for width detection at %s:%d!\n", buf->str.c_str(), filename.c_str(), linenum); - if (id_ast->type == AST_MEMORY) { - AstNode *mem_range = id_ast->children[1]; + if (buf->type == AST_IDENTIFIER) { + id_ast = buf->id2ast; + if (id_ast == NULL && current_scope.count(buf->str)) + id_ast = current_scope.at(buf->str); + if (!id_ast) + log_error("Failed to resolve identifier %s for width detection at %s:%d!\n", buf->str.c_str(), filename.c_str(), linenum); + if (id_ast->type == AST_MEMORY) { + // We got here only if the argument is a memory + // Otherwise $size() and $bits() return the expression width + AstNode *mem_range = id_ast->children[1]; + 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); @@ -1901,6 +1914,23 @@ skip_dynamic_range_lvalue_expansion:; 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); + } 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); + 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); + } else + log_error("Unknown memory depth AST type in `%s' at %s:%d!\n", mem_range->str.c_str(), filename.c_str(), linenum); } } } -- cgit v1.2.3 From e951ac0dfba554a86331b0863f7bda81effef10d Mon Sep 17 00:00:00 2001 From: Udi Finkelstein Date: Tue, 26 Sep 2017 20:34:24 +0300 Subject: $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. --- frontends/ast/simplify.cc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'frontends/ast/simplify.cc') 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); } } } -- cgit v1.2.3