Skip to content

Commit 979d6e7

Browse files
authored
Merge pull request #1154 from Pinata-Consulting/mock-array-rename
mock-array: renamed mock-array-big to mock-array
2 parents 5128f0b + 4aaec55 commit 979d6e7

26 files changed

+34
-34
lines changed

flow/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
# DESIGN_CONFIG=./designs/asap7/ibex/config.mk
7777
# DESIGN_CONFIG=./designs/asap7/jpeg/config.mk
7878
# DESIGN_CONFIG=./designs/asap7/megaboom/config.mk
79-
# DESIGN_CONFIG=./designs/asap7/mock-array-big/config.mk
79+
# DESIGN_CONFIG=./designs/asap7/mock-array/config.mk
8080
# DESIGN_CONFIG=./designs/asap7/riscv32i/config.mk
8181
# DESIGN_CONFIG=./designs/asap7/sha3/config.mk
8282
# DESIGN_CONFIG=./designs/asap7/swerv_wrapper/config.mk

flow/designs/asap7/mock-array-big/Element/config.mk renamed to flow/designs/asap7/mock-array/Element/config.mk

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
include designs/asap7/mock-array-big/defaults.mk
1+
include designs/asap7/mock-array/defaults.mk
22

33
export DESIGN_NAME = Element
4-
export DESIGN_NICKNAME = mock-array-big_Element
4+
export DESIGN_NICKNAME = mock-array_Element
55

6-
export VERILOG_FILES = designs/src/mock-array-big/*.v
7-
export SDC_FILE = designs/asap7/mock-array-big/Element/constraints.sdc
6+
export VERILOG_FILES = designs/src/mock-array/*.v
7+
export SDC_FILE = designs/asap7/mock-array/Element/constraints.sdc
88

99
export PLATFORM = asap7
1010

@@ -16,18 +16,18 @@ export CORE_AREA = $(shell \
1616
export MOCK_ARRAY_HEIGHT=$(MOCK_ARRAY_HEIGHT) && \
1717
export MOCK_ARRAY_WIDTH=$(MOCK_ARRAY_WIDTH) && \
1818
export MOCK_ARRAY_PITCH_SCALE=$(MOCK_ARRAY_PITCH_SCALE) && \
19-
cd designs/asap7/mock-array-big && \
19+
cd designs/asap7/mock-array && \
2020
python3 -c "import config; print(f'{config.ce_margin_x} {config.ce_margin_y} {config.ce_width - config.ce_margin_x} {config.ce_height - config.ce_margin_y}')")
2121
export DIE_AREA = $(shell \
2222
export MOCK_ARRAY_HEIGHT=$(MOCK_ARRAY_HEIGHT) && \
2323
export MOCK_ARRAY_WIDTH=$(MOCK_ARRAY_WIDTH) && \
2424
export MOCK_ARRAY_PITCH_SCALE=$(MOCK_ARRAY_PITCH_SCALE) && \
25-
cd designs/asap7/mock-array-big && \
25+
cd designs/asap7/mock-array && \
2626
python3 -c "import config; print(f'0 0 {config.ce_width} {config.ce_height}')")
2727

28-
export IO_CONSTRAINTS = designs/asap7/mock-array-big/Element/io.tcl
28+
export IO_CONSTRAINTS = designs/asap7/mock-array/Element/io.tcl
2929

30-
export PDN_TCL = designs/asap7/mock-array-big/Element/pdn.tcl
30+
export PDN_TCL = designs/asap7/mock-array/Element/pdn.tcl
3131

3232
# max routing layer need to be set to M5, since M6 is needed for next level up to connect
3333
# to the ring and stipe

flow/designs/asap7/mock-array-big/Element/constraints.sdc renamed to flow/designs/asap7/mock-array/Element/constraints.sdc

File renamed without changes.

flow/designs/asap7/mock-array-big/Element/io.tcl renamed to flow/designs/asap7/mock-array/Element/io.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
source designs/asap7/mock-array-big/util.tcl
1+
source designs/asap7/mock-array/util.tcl
22

33
set assignments [list \
44
top bottom \
File renamed without changes.

flow/designs/asap7/mock-array-big/README.md renamed to flow/designs/asap7/mock-array/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ export FLOW_VARIANT=small
1818
#export MOCK_ARRAY_HEIGHT=16
1919
#export MOCK_ARRAY_DATAWIDTH=64
2020
#export FLOW_VARIANT=giant
21-
export DESIGN_CONFIG=designs/asap7/mock-array-big/config.mk
21+
export DESIGN_CONFIG=designs/asap7/mock-array/config.mk
2222
```
2323

24-
Now run configure, which a custom target in mock-array-big, that runs Chisel to
24+
Now run configure, which a custom target in mock-array, that runs Chisel to
2525
regenerate the Verilog code for the above configuration:
2626

2727
```
@@ -39,10 +39,10 @@ Element/constraint.sdc
3939

4040
A relatively simple constraint.sdc is adequate for the Element as
4141
timing is exported when the Element macro is made and checked at the
42-
mock-array-big level.
42+
mock-array level.
4343

4444
Note that a failure on timing at the Element level is
45-
not a problem, as long as timing is met at the mock-array-big level.
45+
not a problem, as long as timing is met at the mock-array level.
4646

4747
The purpose of the constraint.sdc file at the Element level is to
4848
be able to iterate on the Element during development and work on,
@@ -56,7 +56,7 @@ Optimizing Element/constraint.sdc
5656
Before considering the various strategies to articulate an Element/constraint.sdc
5757
file below, note that no tests have been run to verify that these
5858
different constraint.sdc changes below have any effects on the quality
59-
of results at the mock-array-big level. If there are no substantial
59+
of results at the mock-array level. If there are no substantial
6060
differences in quality of results and timing is met, then the differences
6161
between the strategies below are inconsequential.
6262

File renamed without changes.

flow/designs/asap7/mock-array-big/config.mk renamed to flow/designs/asap7/mock-array/config.mk

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
include designs/asap7/mock-array-big/defaults.mk
1+
include designs/asap7/mock-array/defaults.mk
22

33
export DESIGN_NAME = MockArray
4-
export DESIGN_NICKNAME = mock-array-big
4+
export DESIGN_NICKNAME = mock-array
55

6-
export VERILOG_FILES_BLACKBOX = designs/src/mock-array-big/Element.v
7-
export VERILOG_FILES = designs/src/mock-array-big/*.v
6+
export VERILOG_FILES_BLACKBOX = designs/src/mock-array/Element.v
7+
export VERILOG_FILES = designs/src/mock-array/*.v
88

9-
export SDC_FILE = designs/asap7/mock-array-big/constraints.sdc
9+
export SDC_FILE = designs/asap7/mock-array/constraints.sdc
1010

1111
export PLATFORM = asap7
1212

@@ -16,30 +16,30 @@ export CORE_AREA = $(shell \
1616
export MOCK_ARRAY_HEIGHT=$(MOCK_ARRAY_HEIGHT) && \
1717
export MOCK_ARRAY_WIDTH=$(MOCK_ARRAY_WIDTH) && \
1818
export MOCK_ARRAY_PITCH_SCALE=$(MOCK_ARRAY_PITCH_SCALE) && \
19-
cd designs/asap7/mock-array-big && \
19+
cd designs/asap7/mock-array && \
2020
python3 -c "import config; print(f'{config.margin_x} {config.margin_y} {config.core_width + config.margin_x} {config.core_height + config.margin_y}')")
2121
export DIE_AREA = $(shell \
2222
export MOCK_ARRAY_HEIGHT=$(MOCK_ARRAY_HEIGHT) && \
2323
export MOCK_ARRAY_WIDTH=$(MOCK_ARRAY_WIDTH) && \
2424
export MOCK_ARRAY_PITCH_SCALE=$(MOCK_ARRAY_PITCH_SCALE) && \
25-
cd designs/asap7/mock-array-big && \
25+
cd designs/asap7/mock-array && \
2626
python3 -c "import config; print(f'0 0 {config.die_width} {config.die_height}')")
2727

2828
BLOCKS = Element
2929

3030
export GDS_ALLOW_EMPTY = Element
3131

32-
export MACRO_PLACEMENT_TCL = ./designs/asap7/mock-array-big/macro-placement.tcl
32+
export MACRO_PLACEMENT_TCL = ./designs/asap7/mock-array/macro-placement.tcl
3333

34-
export IO_CONSTRAINTS = designs/asap7/mock-array-big/io.tcl
34+
export IO_CONSTRAINTS = designs/asap7/mock-array/io.tcl
3535

36-
export PDN_TCL = designs/asap7/mock-array-big/pdn.tcl
36+
export PDN_TCL = designs/asap7/mock-array/pdn.tcl
3737
export TNS_END_PERCENT = 100
3838

3939
# Target to force generation of Verilog per user settings
4040
# MOCK_ARRAY_WIDTH and MOCK_ARRAY_HEIGHT
4141
verilog:
42-
./designs/asap7/mock-array-big/verilog.sh
42+
./designs/asap7/mock-array/verilog.sh
4343

4444
# If this design isn't quickly done in detailed routing, something is wrong.
4545
# At time of adding this option, only 12 iterations were needed for 0
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)