github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 04:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix +: and -: unpacked array slicing when array has nonzero low index (#5345) (#5387)

Browse Source 
Co-authored-by: James Bailey <james.bailey@awaveip.com>
This commit is contained in:
James Bailey 2024-08-20 14:20:48 -04:00 committed by GitHub
parent 59d2eea302
commit 99a43b7695
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/CONTRIBUTORS
View File

@ -77,6 +77,7 @@ Iru Cai
Ivan Vnučec Ivan Vnučec
Iztok Jeras Iztok Jeras
Jake Merdich Jake Merdich
James Bailey
James Hanlon James Hanlon
James Hutchinson James Hutchinson
James Pallister James Pallister

6
src/V3WidthSel.cpp
View File

@ -551,8 +551,10 @@ class WidthSelVisitor final : public VNVisitor {
// down array: msb/hi -: width // down array: msb/hi -: width
// up array: msb/lo +: width // up array: msb/lo +: width
// up array: lsb/hi -: width // up array: lsb/hi -: width
const int32_t msb = VN_IS(nodep, SelPlus) ? rhs + width - 1 : rhs; const int32_t msb
const int32_t lsb = VN_IS(nodep, SelPlus) ? rhs : rhs - width + 1; = (VN_IS(nodep, SelPlus) ? rhs + width - 1 : rhs) - fromRange.lo();
const int32_t lsb
= (VN_IS(nodep, SelPlus) ? rhs : rhs - width + 1) - fromRange.lo();
AstSliceSel* const newp = new AstSliceSel{ AstSliceSel* const newp = new AstSliceSel{
nodep->fileline(), fromp, VNumRange{msb, lsb, fromRange.ascending()}}; nodep->fileline(), fromp, VNumRange{msb, lsb, fromRange.ascending()}};
nodep->replaceWith(newp); nodep->replaceWith(newp);

32
test_regress/t/t_unpacked_slice.v
View File

@ -9,45 +9,45 @@
module t (/*AUTOARG*/); module t (/*AUTOARG*/);
parameter int sliceddn[7:0] = '{'h100, 'h101, 'h102, 'h103, 'h104, 'h105, 'h106, 'h107}; parameter int sliceddn[4:-3] = '{'h100, 'h101, 'h102, 'h103, 'h104, 'h105, 'h106, 'h107};
parameter int slicedup[0:7] = '{'h100, 'h101, 'h102, 'h103, 'h104, 'h105, 'h106, 'h107}; parameter int slicedup[-3:4] = '{'h100, 'h101, 'h102, 'h103, 'h104, 'h105, 'h106, 'h107};
int alldn[7:0]; int alldn[7:0];
int allup[0:7]; int allup[0:7];
int twodn[1:0]; int twodn[1:0];
int twoup[0:1]; int twoup[0:1];
initial begin initial begin
`checkh(sliceddn[7], 'h100); `checkh(sliceddn[4], 'h100);
alldn[7:0] = sliceddn[7:0]; alldn[7:0] = sliceddn[4:-3];
`checkh(alldn[7], 'h100); `checkh(alldn[7], 'h100);
alldn[7:0] = sliceddn[0 +: 8]; // down: lsb/lo +: width alldn[7:0] = sliceddn[-3 +: 8]; // down: lsb/lo +: width
`checkh(alldn[7], 'h100); `checkh(alldn[7], 'h100);
alldn[7:0] = sliceddn[7 -: 8]; // down: msb/hi -: width alldn[7:0] = sliceddn[4 -: 8]; // down: msb/hi -: width
`checkh(alldn[7], 'h100); `checkh(alldn[7], 'h100);
twodn[1:0] = sliceddn[6:5]; twodn[1:0] = sliceddn[3:2];
`checkh(twodn[1], 'h101); `checkh(twodn[1], 'h101);
`checkh(twodn[0], 'h102); `checkh(twodn[0], 'h102);
twodn[1:0] = sliceddn[4 +: 2]; twodn[1:0] = sliceddn[1 +: 2];
`checkh(twodn[1], 'h102); `checkh(twodn[1], 'h102);
`checkh(twodn[0], 'h103); `checkh(twodn[0], 'h103);
twodn[1:0] = sliceddn[4 -: 2]; twodn[1:0] = sliceddn[1 -: 2];
`checkh(twodn[1], 'h103); `checkh(twodn[1], 'h103);
`checkh(twodn[0], 'h104); `checkh(twodn[0], 'h104);
`checkh(slicedup[7], 'h107); `checkh(slicedup[4], 'h107);
allup[0:7] = slicedup[0:7]; allup[0:7] = slicedup[-3:4];
`checkh(alldn[7], 'h100); `checkh(alldn[7], 'h100);
allup[0:7] = slicedup[0 +: 8]; // up: msb/lo +: width allup[0:7] = slicedup[-3 +: 8]; // up: msb/lo +: width
`checkh(alldn[7], 'h100); `checkh(alldn[7], 'h100);
allup[0:7] = slicedup[7 -: 8]; // up: lsb/hi -: width allup[0:7] = slicedup[4 -: 8]; // up: lsb/hi -: width
`checkh(alldn[7], 'h100); `checkh(alldn[7], 'h100);
twoup[0:1] = slicedup[5:6]; twoup[0:1] = slicedup[2:3];
`checkh(twoup[1], 'h106); `checkh(twoup[1], 'h106);
`checkh(twoup[0], 'h105); `checkh(twoup[0], 'h105);
twoup[0:1] = slicedup[4 +: 2]; twoup[0:1] = slicedup[1 +: 2];
`checkh(twoup[1], 'h105); `checkh(twoup[1], 'h105);
`checkh(twoup[0], 'h104); `checkh(twoup[0], 'h104);
twoup[0:1] = slicedup[4 -: 2]; twoup[0:1] = slicedup[1 -: 2];
`checkh(twoup[1], 'h104); `checkh(twoup[1], 'h104);
`checkh(twoup[0], 'h103); `checkh(twoup[0], 'h103);