Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sv2v
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
sv2v
Commits
43883efa
Commit
43883efa
authored
Jul 05, 2021
by
Zachary Snow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix partial packing of multidimensional unpacked arrays
parent
5fd21ebf
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
14 deletions
+21
-14
src/Convert/UnpackedArray.hs
+3
-3
test/core/unpacked_array_depth.sv
+12
-8
test/core/unpacked_array_depth.v
+6
-3
No files found.
src/Convert/UnpackedArray.hs
View file @
43883efa
...
@@ -60,9 +60,9 @@ rewriteDeclM (decl @ (Variable d t x a e)) = do
...
@@ -60,9 +60,9 @@ rewriteDeclM (decl @ (Variable d t x a e)) = do
case
usedAsPacked
of
case
usedAsPacked
of
Just
depth
->
do
Just
depth
->
do
let
(
tf
,
rs
)
=
typeRanges
t
let
(
tf
,
rs
)
=
typeRanges
t
let
(
shifted
,
rest
)
=
splitAt
(
length
a
-
depth
)
a
let
(
unpacked
,
packed
)
=
splitAt
depth
a
let
t'
=
tf
$
shift
ed
++
rs
let
t'
=
tf
$
pack
ed
++
rs
return
$
Variable
d
t'
x
rest
e
return
$
Variable
d
t'
x
unpacked
e
Nothing
->
return
decl
Nothing
->
return
decl
rewriteDeclM
decl
@
Net
{}
=
traverseNetAsVarM
rewriteDeclM
decl
rewriteDeclM
decl
@
Net
{}
=
traverseNetAsVarM
rewriteDeclM
decl
rewriteDeclM
other
=
return
other
rewriteDeclM
other
=
return
other
...
...
test/core/unpacked_array_depth.sv
View file @
43883efa
module
example
(
module
example
(
input
wire
[
7
:
0
]
inp
,
input
wire
inp
[
7
:
0
]
,
output
wire
[
7
:
0
]
out
output
wire
out
[
7
:
0
]
)
;
)
;
assign
out
=
~
inp
;
for
(
genvar
i
=
0
;
i
<
8
;
++
i
)
assign
out
[
i
]
=
~
inp
[
i
]
;
endmodule
endmodule
module
top
;
module
top
;
reg
arr1
[
7
:
0
][
1
:
0
]
;
reg
arr1
[
1
:
0
][
7
:
0
]
;
reg
arr2
[
7
:
0
][
1
:
0
][
1
:
0
]
;
reg
arr2
[
1
:
0
][
1
:
0
][
7
:
0
]
;
wire
[
7
:
0
]
out1
,
out2
;
wire
out1
[
7
:
0
]
;
wire
out2
[
7
:
0
]
;
example
e1
(
arr1
[
0
]
,
out1
)
;
example
e1
(
arr1
[
0
]
,
out1
)
;
example
e2
(
arr2
[
0
][
0
]
,
out2
)
;
example
e2
(
arr2
[
0
][
0
]
,
out2
)
;
initial
begin
initial
begin
#
1
arr1
[
0
]
=
8'hAD
;
for
(
integer
i
=
0
;
i
<
8
;
++
i
)
begin
#
1
arr2
[
0
][
0
]
=
8'h42
;
#
1
arr1
[
0
][
i
]
=
(
8'hAD
>>
i
)
&
1'b1
;
#
1
arr2
[
0
][
0
][
i
]
=
(
8'h42
>>
i
)
&
1'b1
;
end
end
end
endmodule
endmodule
test/core/unpacked_array_depth.v
View file @
43883efa
...
@@ -11,8 +11,11 @@ module top;
...
@@ -11,8 +11,11 @@ module top;
wire
[
7
:
0
]
out1
,
out2
;
wire
[
7
:
0
]
out1
,
out2
;
example
e1
(
arr1
[
0
]
,
out1
)
;
example
e1
(
arr1
[
0
]
,
out1
)
;
example
e2
(
arr2
[
0
][
0
]
,
out2
)
;
example
e2
(
arr2
[
0
][
0
]
,
out2
)
;
initial
begin
initial
begin
:
blk
#
1
arr1
[
0
]
=
8'hAD
;
integer
i
;
#
1
arr2
[
0
][
0
]
=
8'h42
;
for
(
i
=
0
;
i
<
8
;
i
=
i
+
1
)
begin
#
1
arr1
[
0
][
i
]
=
(
8'hAD
>>
i
)
&
1'b1
;
#
1
arr2
[
0
][
0
][
i
]
=
(
8'h42
>>
i
)
&
1'b1
;
end
end
end
endmodule
endmodule
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment