Skip to content

Commit e640e83

Browse files
committed
Merge remote-tracking branch 'origin/master' into secure-opt-hier-test
2 parents f3d7136 + 61ad696 commit e640e83

File tree

23 files changed

+173
-102
lines changed

23 files changed

+173
-102
lines changed

docs/user/FlowVariables.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ configuration file.
155155
| <a name="LIB_FILES"></a>LIB_FILES| A Liberty file of the standard cell library with PVT characterization, input and output characteristics, timing and power definitions for each cell.| |
156156
| <a name="MACRO_BLOCKAGE_HALO"></a>MACRO_BLOCKAGE_HALO| Distance beyond the edges of a macro that will also be covered by the blockage generated for that macro. Note that the default macro blockage halo comes from the largest of the specified MACRO_PLACE_HALO x or y values. This variable overrides that calculation.| |
157157
| <a name="MACRO_EXTENSION"></a>MACRO_EXTENSION| Sets the number of GCells added to the blockages boundaries from macros.| |
158-
| <a name="MACRO_PLACEMENT"></a>MACRO_PLACEMENT| Specifies the path of a file on how to place certain macros manually using read_macro_placement.| |
159158
| <a name="MACRO_PLACEMENT_TCL"></a>MACRO_PLACEMENT_TCL| Specifies the path of a TCL file on how to place certain macros manually.| |
160159
| <a name="MACRO_PLACE_HALO"></a>MACRO_PLACE_HALO| Horizontal/vertical halo around macros (microns). Used by automatic macro placement.| |
161160
| <a name="MACRO_ROWS_HALO_X"></a>MACRO_ROWS_HALO_X| Horizontal distance between the edge of the macro and the beginning of the rows created by tapcell. Only available for ASAP7 PDK and GF180/uart-blocks design.| |
@@ -299,7 +298,6 @@ configuration file.
299298
- [HOLD_SLACK_MARGIN](#HOLD_SLACK_MARGIN)
300299
- [IO_CONSTRAINTS](#IO_CONSTRAINTS)
301300
- [MACRO_BLOCKAGE_HALO](#MACRO_BLOCKAGE_HALO)
302-
- [MACRO_PLACEMENT](#MACRO_PLACEMENT)
303301
- [MACRO_PLACEMENT_TCL](#MACRO_PLACEMENT_TCL)
304302
- [MACRO_PLACE_HALO](#MACRO_PLACE_HALO)
305303
- [MACRO_ROWS_HALO_X](#MACRO_ROWS_HALO_X)

etc/DockerTag.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,22 @@ cd $(dirname $(realpath $0))/../
44

55
if [[ "$@" == "-dev" ]]; then
66
file_list=(
7-
"./build_openroad.sh"
87
"./docker/Dockerfile.builder"
98
"./docker/Dockerfile.dev"
9+
"./Dockerfile"
1010
"./etc/DependencyInstaller.sh"
11-
"./etc/DockerHelper.sh"
12-
"./etc/DockerTag.sh"
13-
"./tools/OpenROAD/docker/Dockerfile.binary"
14-
"./tools/OpenROAD/docker/Dockerfile.builder"
15-
"./tools/OpenROAD/docker/Dockerfile.dev"
1611
"./tools/OpenROAD/etc/DependencyInstaller.sh"
17-
"./tools/OpenROAD/etc/DockerHelper.sh"
18-
"./tools/OpenROAD/etc/DockerTag.sh"
1912
)
2013
cat "${file_list[@]}" | sha256sum | awk '{print substr($1, 1, 6)}'
2114
elif [[ "$@" == "-master" ]]; then
15+
git fetch --tags >&2
16+
git -C tools/OpenROAD fetch --tags >&2
2217
git describe
2318
else
24-
echo "Usage: $0 {-dev|-master}"
19+
echo "Usage:"
20+
echo " To generate a tag for images that only have dev dependencies:"
21+
echo " $0 -dev"
22+
echo " To generate a tag for full releases based on master branch"
23+
echo " $0 -master"
2524
exit 1
2625
fi

flow/designs/asap7/riscv32i-mock-sram/rules-base.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"compare": "<="
3333
},
3434
"detailedroute__route__wirelength": {
35-
"value": 87921,
35+
"value": 87424,
3636
"compare": "<="
3737
},
3838
"detailedroute__route__drc_errors": {
@@ -48,23 +48,23 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -100.96,
51+
"value": -208.58,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
55-
"value": 2365,
55+
"value": 2364,
5656
"compare": "<="
5757
},
5858
"finish__timing__drv__setup_violation_count": {
59-
"value": 533,
59+
"value": 1092,
6060
"compare": "<="
6161
},
6262
"finish__timing__drv__hold_violation_count": {
6363
"value": 100,
6464
"compare": "<="
6565
},
6666
"finish__timing__wns_percent_delay": {
67-
"value": -11.73,
67+
"value": -28.41,
6868
"compare": ">="
6969
}
7070
}

flow/designs/asap7/swerv_wrapper/rules-base.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -669.97,
51+
"value": -557.02,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
@@ -60,7 +60,7 @@
6060
"compare": "<="
6161
},
6262
"finish__timing__drv__hold_violation_count": {
63-
"value": 739,
63+
"value": 1330,
6464
"compare": "<="
6565
},
6666
"finish__timing__wns_percent_delay": {

flow/designs/gf12/ariane/rules-base.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"compare": "=="
99
},
1010
"placeopt__design__instance__area": {
11-
"value": 226083,
11+
"value": 216604,
1212
"compare": "<="
1313
},
1414
"placeopt__design__instance__count__stdcell": {
@@ -32,7 +32,7 @@
3232
"compare": "<="
3333
},
3434
"detailedroute__route__wirelength": {
35-
"value": 3662425,
35+
"value": 4900103,
3636
"compare": "<="
3737
},
3838
"detailedroute__route__drc_errors": {
@@ -52,7 +52,7 @@
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
55-
"value": 228519,
55+
"value": 218993,
5656
"compare": "<="
5757
},
5858
"finish__timing__drv__setup_violation_count": {
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"_SDC_FILE_PATH": "constraint.sdc",
3+
"_SDC_CLK_PERIOD": {
4+
"type": "float",
5+
"minmax": [
6+
1270,
7+
1370
8+
],
9+
"step": 0
10+
}
11+
}
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
{
2+
"_SDC_FILE_PATH": "constraint.sdc",
3+
"_SDC_CLK_PERIOD": {
4+
"type": "float",
5+
"minmax": [
6+
1297.0415261866478,
7+
1297.0415261866478
8+
],
9+
"step": 0
10+
},
11+
"CORE_UTILIZATION": {
12+
"type": "int",
13+
"minmax": [
14+
40,
15+
60
16+
],
17+
"step": 1
18+
},
19+
"CTS_BUF_DISTANCE": {
20+
"type": "int",
21+
"minmax": [
22+
25,
23+
50
24+
],
25+
"step": 1
26+
},
27+
"CTS_CLUSTER_SIZE": {
28+
"type": "int",
29+
"minmax": [
30+
30,
31+
60
32+
],
33+
"step": 1
34+
},
35+
"CTS_CLUSTER_DIAMETER": {
36+
"type": "int",
37+
"minmax": [
38+
15,
39+
25
40+
],
41+
"step": 1
42+
},
43+
"CELL_PAD_IN_SITES_GLOBAL_PLACEMENT": {
44+
"type": "int",
45+
"minmax": [
46+
0,
47+
3
48+
],
49+
"step": 1
50+
},
51+
"CELL_PAD_IN_SITES_DETAIL_PLACEMENT": {
52+
"type": "int",
53+
"minmax": [
54+
0,
55+
3
56+
],
57+
"step": 1
58+
},
59+
"PLACE_SITE": {
60+
"type": "string",
61+
"values": [
62+
"SC6T",
63+
"SC8T"
64+
]
65+
},
66+
"CORE_MARGIN": {
67+
"type": "float",
68+
"minmax": [
69+
0.75,
70+
1.5
71+
],
72+
"step": 0
73+
}
74+
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Derived from cva6_synth.tcl and Makefiles
2+
3+
set clk_name main_clk
4+
set clk_port clk_i
5+
set clk_ports_list [list $clk_port]
6+
set clk_period 1380
7+
set input_delay 0.46
8+
set output_delay 0.11
9+
create_clock [get_ports $clk_port] -name $clk_name -period $clk_period

flow/designs/rapidus2hp/hercules_is_int/config.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export SYNTH_HIERARCHICAL ?= 0
2525
ifeq ($(PLACE_SITE), SC6T)
2626
export CORE_UTILIZATION = 30
2727
else
28-
export CORE_UTILIZATION = 35
28+
export CORE_UTILIZATION = 54
2929
endif
3030

3131
export CORE_MARGIN = 1
@@ -35,6 +35,12 @@ export PLACE_DENSITY = 0.58
3535
# few last gasp iterations
3636
export SKIP_LAST_GASP ?= 1
3737

38+
export PLACE_PINS_ARGS = -min_distance_in_tracks -min_distance 1
39+
export CELL_PAD_IN_SITES_GLOBAL_PLACEMENT = 0
40+
export CELL_PAD_IN_SITES_DETAIL_PLACEMENT = 0
41+
# temporarily skip over DPO to bypass one-site gap issues
42+
export ENABLE_DPO = 0
43+
3844
# Selectively keep module hierarchies to match baseline data
3945
# ifeq ($(SYNTH_HDL_FRONTEND), verific)
4046
# export SYNTH_KEEP_MODULES = \hercules_is_grbt \

flow/designs/rapidus2hp/hercules_is_int/rules-base.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,47 @@
88
"compare": "=="
99
},
1010
"placeopt__design__instance__area": {
11-
"value": 36863,
11+
"value": 34339,
1212
"compare": "<="
1313
},
1414
"placeopt__design__instance__count__stdcell": {
15-
"value": 750846,
15+
"value": 747172,
1616
"compare": "<="
1717
},
1818
"detailedplace__design__violations": {
1919
"value": 0,
2020
"compare": "=="
2121
},
2222
"cts__design__instance__count__setup_buffer": {
23-
"value": 65291,
23+
"value": 64972,
2424
"compare": "<="
2525
},
2626
"cts__design__instance__count__hold_buffer": {
27-
"value": 65291,
27+
"value": 64972,
2828
"compare": "<="
2929
},
3030
"globalroute__antenna_diodes_count": {
3131
"value": 0,
3232
"compare": "<="
3333
},
3434
"finish__timing__setup__ws": {
35-
"value": -802.81,
35+
"value": -435.93,
3636
"compare": ">="
3737
},
3838
"finish__design__instance__area": {
39-
"value": 37950,
39+
"value": 35330,
4040
"compare": "<="
4141
},
4242
"finish__timing__drv__setup_violation_count": {
43-
"value": 32646,
43+
"value": 32486,
4444
"compare": "<="
4545
},
4646
"finish__timing__drv__hold_violation_count": {
47-
"value": 134,
47+
"value": 110,
4848
"compare": "<="
4949
},
5050
"finish__timing__wns_percent_delay": {
51-
"value": -86.33,
51+
"value": -66.06,
5252
"compare": ">="
5353
}
5454
}

0 commit comments

Comments
 (0)