3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-23 00:55:32 +00:00

Fix access to whole sub-structs (#3086)

* Add support for accessing whole struct
* Update tests

Signed-off-by: Kamil Rakoczy <krakoczy@antmicro.com>
This commit is contained in:
Kamil Rakoczy 2022-02-14 14:34:20 +01:00 committed by GitHub
parent 59738c09be
commit 68c67c40ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 72 additions and 11 deletions

View file

@ -41,8 +41,7 @@ always_comb begin
assert(j == 1'b1);
assert(k == 1'b0);
assert(l == 3'b111);
// TODO: support access to whole sub-structs and unions
// assert(m == 2'b10);
assert(m == 2'b10);
assert(u == 5'b11001);
end
endmodule

View file

@ -0,0 +1,43 @@
module dut();
typedef struct packed {
logic a;
logic b;
} sub_sub_struct_t;
typedef struct packed {
sub_sub_struct_t c;
} sub_struct_t;
typedef struct packed {
sub_struct_t d;
sub_struct_t e;
} struct_t;
parameter struct_t P = 4'b1100;
localparam sub_struct_t f = P.d;
localparam sub_struct_t g = P.e;
localparam sub_sub_struct_t h = f.c;
localparam logic i = P.d.c.a;
localparam logic j = P.d.c.b;
localparam x = P.e;
localparam y = x.c;
localparam z = y.a;
localparam q = P.d;
localparam n = q.c.a;
always_comb begin
assert(P == 4'b1100);
assert(f == 2'b11);
assert(g == 2'b00);
assert(h == 2'b11);
assert(i == 1'b1);
assert(j == 1'b1);
assert(x == 2'b00);
assert(y == 2'b00);
assert(x.c == 2'b00);
assert(y.b == 1'b0);
assert(n == 1'b1);
assert(z == 1'b0);
end
endmodule

View file

@ -0,0 +1,5 @@
read_verilog -sv struct_access.sv
hierarchy
proc
opt
sat -verify -seq 1 -prove-asserts -show-all

View file

@ -77,9 +77,8 @@ module top;
`CHECK(s.y.a, 1, 0)
`CHECK(s.y.b, 1, 1)
// TODO(zachjs): support access to whole sub-structs and unions
// `CHECK(s.x, 2, 0)
// `CHECK(s.y, 2, 1)
`CHECK(s.x, 2, 0)
`CHECK(s.y, 2, 1)
assert (fail === 0);
end