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

Add support for $increment

This commit is contained in:
Dag Lem 2023-12-27 22:00:13 +01:00 committed by Zachary Snow
parent 88d9e213cb
commit 2125357e76
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontends/ast/simplify.cc
View File

@ -3487,7 +3487,7 @@ skip_dynamic_range_lvalue_expansion:;
goto apply_newNode; goto apply_newNode;
} }
if (str == "\\$size" || str == "\\$bits" || str == "\\$high" || str == "\\$low" || str == "\\$left" || str == "\\$right") if (str == "\\$increment" || str == "\\$size" || str == "\\$bits" || str == "\\$high" || str == "\\$low" || str == "\\$left" || str == "\\$right")
{ {
int dim = 1; int dim = 1;
if (str == "\\$bits") { if (str == "\\$bits") {
@ -3556,6 +3556,8 @@ skip_dynamic_range_lvalue_expansion:;
result = left; result = left;
else if (str == "\\$right") else if (str == "\\$right")
result = right; result = right;
else if (str == "\\$increment")
result = left >= right ? 1 : -1;
else if (str == "\\$size") else if (str == "\\$size")
result = width; result = width;
else { // str == "\\$bits" else { // str == "\\$bits"

13
tests/sat/sizebits.sv
View File

@ -90,4 +90,17 @@ assert property ($right(z, 3) == 0);
assert property ($right(z[3]) == 9); assert property ($right(z[3]) == 9);
assert property ($right(z[3][3]) == 0); assert property ($right(z[3][3]) == 0);
assert property ($right(z[3], 2) == 0); assert property ($right(z[3], 2) == 0);
assert property ($increment(x) == 1);
assert property ($increment(y) == -1);
assert property ($increment(y, 1) == -1);
assert property ($increment(y, (1+1)) == 1);
assert property ($increment(z) == 1);
assert property ($increment(z, 1) == 1);
assert property ($increment(z, 2) == -1);
assert property ($increment(z, 3) == 1);
assert property ($increment(z[3]) == -1);
assert property ($increment(z[3][3]) == 1);
assert property ($increment(z[3], 2) == 1);
endmodule endmodule

13
tests/svtypes/struct_sizebits.sv
View File

@ -107,6 +107,19 @@ always_comb begin
assert ($right(s.sz.z[3]) == 9); assert ($right(s.sz.z[3]) == 9);
assert ($right(s.sz.z[3][3]) == 4); assert ($right(s.sz.z[3][3]) == 4);
assert ($right(s.sz.z[3], 2) == 4); assert ($right(s.sz.z[3], 2) == 4);
assert ($increment(s.x) == 1);
assert ($increment(s.sy.y) == -1);
assert ($increment(s.sy.y, 1) == -1);
assert ($increment(s.sy.y, (1+1)) == 1);
assert ($increment(s.sz.z) == 1);
assert ($increment(s.sz.z, 1) == 1);
assert ($increment(s.sz.z, 2) == -1);
assert ($increment(s.sz.z, 3) == -1);
assert ($increment(s.sz.z[3]) == -1);
assert ($increment(s.sz.z[3][3]) == -1);
assert ($increment(s.sz.z[3], 2) == -1);
end end
endmodule endmodule