Skip to content

Commit 01ca415

Browse files
committed
Merge remote-tracking branch 'private/master' into secure-gpl-binSize-float
2 parents 75d0064 + a8a56ba commit 01ca415

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+241
-219
lines changed

.devcontainer/devcontainer.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

docs/user/FlowVariables.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ configuration file.
7575
| <a name="CORNER"></a>CORNER| PVT corner library selection. Only available for ASAP7 and GF180 PDKs.| | |
7676
| <a name="CTS_ARGS"></a>CTS_ARGS| Override `clock_tree_synthesis` arguments.| | |
7777
| <a name="CTS_BUF_DISTANCE"></a>CTS_BUF_DISTANCE| Distance (in microns) between buffers.| | |
78+
| <a name="CTS_BUF_LIST"></a>CTS_BUF_LIST| List of cells used to construct the clock tree.| | |
7879
| <a name="CTS_CLUSTER_DIAMETER"></a>CTS_CLUSTER_DIAMETER| Maximum diameter (in microns) of sink cluster.| 20| |
7980
| <a name="CTS_CLUSTER_SIZE"></a>CTS_CLUSTER_SIZE| Maximum number of sinks per cluster.| 50| |
8081
| <a name="CTS_SNAPSHOT"></a>CTS_SNAPSHOT| Creates ODB/SDC files prior to clock net and setup/hold repair.| | |
@@ -162,6 +163,7 @@ configuration file.
162163
| <a name="RTLMP_RPT_DIR"></a>RTLMP_RPT_DIR| Path to the directory where reports are saved.| | |
163164
| <a name="RTLMP_SIGNATURE_NET_THRESHOLD"></a>RTLMP_SIGNATURE_NET_THRESHOLD| Minimum number of connections between two clusters to be identified as connected.| 50| |
164165
| <a name="RTLMP_WIRELENGTH_WT"></a>RTLMP_WIRELENGTH_WT| Weight for half-perimiter wirelength.| 100.0| |
166+
| <a name="RULES_JSON"></a>RULES_JSON| json files with the metrics baseline regression rules. In the ORFS Makefile, this defaults to $DESIGN_DIR/rules-base.json, but ORFS does not mandate the users source directory layout and this can be placed elsewhere when the user sets up an ORFS config.mk or from bazel-orfs.| | |
165167
| <a name="RUN_LOG_NAME_STEM"></a>RUN_LOG_NAME_STEM| Stem of the log file name, the log file will be named `$(LOG_DIR)/$(RUN_LOG_NAME_STEM).log`.| run| |
166168
| <a name="RUN_SCRIPT"></a>RUN_SCRIPT| Path to script to run from `make run`, python or tcl script detected by .py or .tcl extension.| | |
167169
| <a name="SC_LEF"></a>SC_LEF| Path to technology standard cell LEF file.| | |
@@ -304,6 +306,7 @@ configuration file.
304306
- [CELL_PAD_IN_SITES_DETAIL_PLACEMENT](#CELL_PAD_IN_SITES_DETAIL_PLACEMENT)
305307
- [CTS_ARGS](#CTS_ARGS)
306308
- [CTS_BUF_DISTANCE](#CTS_BUF_DISTANCE)
309+
- [CTS_BUF_LIST](#CTS_BUF_LIST)
307310
- [CTS_CLUSTER_DIAMETER](#CTS_CLUSTER_DIAMETER)
308311
- [CTS_CLUSTER_SIZE](#CTS_CLUSTER_SIZE)
309312
- [CTS_SNAPSHOT](#CTS_SNAPSHOT)
@@ -368,6 +371,10 @@ configuration file.
368371

369372
- [ABSTRACT_SOURCE](#ABSTRACT_SOURCE)
370373

374+
## test variables
375+
376+
- [RULES_JSON](#RULES_JSON)
377+
371378
## All stages variables
372379

373380

etc/DependencyInstaller.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,15 @@ _installUbuntuPackages() {
133133
zlib1g \
134134
zlib1g-dev
135135

136+
packages=()
137+
# Choose libstdc++ version
138+
if _versionCompare $1 -ge 24.04; then
139+
packages+=("libstdc++-14-dev")
140+
elif _versionCompare $1 -ge 22.10; then
141+
packages+=("libstdc++-12-dev")
142+
fi
143+
apt-get install -y --no-install-recommends ${packages[@]}
144+
136145
# install KLayout
137146
if [[ $1 == "rodete" ]]; then
138147
apt-get -y install --no-install-recommends klayout python3-pandas

flow/MODULE.bazel

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,6 @@ git_override(
1515
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
1616
)
1717

18-
# Read: https://github.com/The-OpenROAD-Project/bazel-orfs?tab=readme-ov-file#usage
19-
#
20-
# TL;DR
21-
#
22-
# 1. uncomment below
23-
# 2. comment git_override() above
24-
#
25-
#local_path_override(
26-
# module_name = "bazel-orfs", path = "../bazel-orfs"
27-
#)
28-
2918
bazel_dep(name = "rules_python", version = "0.31.0")
3019

3120
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
@@ -53,7 +42,7 @@ visibility = ["//visibility:public"],
5342
)
5443
filegroup(
5544
name = "all",
56-
data = glob(["**/*"]),
45+
data = glob(["openroad.runfiles/**/*"]),
5746
visibility = ["//visibility:public"],
5847
)
5948
""",

flow/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ DESIGN_CONFIG ?= ./designs/nangate45/gcd/config.mk
8787
export DESIGN_CONFIG
8888
include $(DESIGN_CONFIG)
8989

90-
export DESIGN_DIR = $(dir $(DESIGN_CONFIG))
90+
export DESIGN_DIR ?= $(dir $(DESIGN_CONFIG))
9191

9292
# default value "base" is duplicated from variables.yaml because we need it
9393
# earlier in the flow for BLOCKS. BLOCKS is a feature specific to the

flow/designs/asap7/aes-block/rules-base.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"compare": "<="
2525
},
2626
"cts__design__instance__count__hold_buffer": {
27-
"value": 1024,
27+
"value": 1491,
2828
"compare": "<="
2929
},
3030
"globalroute__antenna_diodes_count": {
@@ -48,7 +48,7 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -119.26,
51+
"value": -118.73,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
@@ -60,7 +60,7 @@
6060
"compare": "<="
6161
},
6262
"finish__timing__drv__hold_violation_count": {
63-
"value": 100,
63+
"value": 419,
6464
"compare": "<="
6565
},
6666
"finish__timing__wns_percent_delay": {

flow/designs/asap7/mock-array/Element/config.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ export PLACE_DENSITY = 0.82
1313
export CORE_AREA = $(shell \
1414
export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)" && \
1515
export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
16-
cd $(dir $(DESIGN_CONFIG))/../ && \
16+
cd $(DESIGN_DIR)/../ && \
1717
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}')")
1818

1919
export DIE_AREA = $(shell \
2020
export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)" && \
2121
export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
22-
cd $(dir $(DESIGN_CONFIG))/../ && \
22+
cd $(DESIGN_DIR)/../ && \
2323
python3 -c "import config; print(f'0 0 {config.ce_width} {config.ce_height}')")
2424

2525
export IO_CONSTRAINTS = designs/asap7/mock-array/Element/io.tcl

flow/designs/asap7/mock-array/config.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ export PLACE_DENSITY = 0.30
1414
export CORE_AREA = $(shell \
1515
export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)" && \
1616
export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
17-
cd $(dir $(DESIGN_CONFIG)) && \
17+
cd $(DESIGN_DIR) && \
1818
python3 -c "import config ; print(f'{config.margin_x} {config.margin_y} {config.core_width + config.margin_x} {config.core_height + config.margin_y}')")
1919

2020
export DIE_AREA = $(shell \
2121
export MOCK_ARRAY_TABLE="$(MOCK_ARRAY_TABLE)" && \
2222
export MOCK_ARRAY_SCALE="$(MOCK_ARRAY_SCALE)" && \
23-
cd $(dir $(DESIGN_CONFIG)) && \
23+
cd $(DESIGN_DIR) && \
2424
python3 -c "import config; print(f'{0} {0} {config.die_width} {config.die_height}')")
2525

2626
export MACRO_PLACE_HALO = 0 2.16

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -34.26,
51+
"value": -103.06,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {

flow/designs/asap7/riscv32i/config.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@ export IO_CONSTRAINTS = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/io.tcl
2828
export MACRO_PLACE_HALO = 2 2
2929

3030
export TNS_END_PERCENT = 100
31+
32+
export CTS_CLUSTER_SIZE = 10
33+
export CTS_CLUSTER_DIAMETER = 50

0 commit comments

Comments
 (0)