Skip to content

Commit f3ff4f8

Browse files
committed
Merge branch 'master' into secure-yosys0.53
Signed-off-by: Eder Monteiro <[email protected]>
2 parents 429c40b + 2b0d8be commit f3ff4f8

File tree

33 files changed

+216
-90
lines changed

33 files changed

+216
-90
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,7 @@ build
9999
metadata-base-at.json
100100

101101
user.bazelrc
102-
bazel-*
102+
bazel-bin
103+
bazel-out
104+
bazel-OpenROAD-flow-scripts
105+
bazel-testlogs

MODULE.bazel

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

18-
bazel_dep(name = "rules_python", version = "0.31.0")
18+
bazel_dep(name = "rules_python", version = "1.2.0")
1919

2020
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
2121
python.toolchain(

build_openroad.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,10 @@ __local_build()
237237
set -u
238238
fi
239239

240+
echo "[INFO FLW-0018] Compiling OpenROAD."
241+
eval ${NICE} ./tools/OpenROAD/etc/Build.sh -dir="$DIR/tools/OpenROAD/build" -threads=${PROC} -cmake=\'${OPENROAD_APP_ARGS}\'
242+
${NICE} cmake --build tools/OpenROAD/build --target install -j "${PROC}"
243+
240244
YOSYS_ABC_PATH=tools/yosys/abc
241245
if [[ -d "${YOSYS_ABC_PATH}/.git" ]]; then
242246
# update indexes to make sure git diff-index uses correct data
@@ -247,11 +251,9 @@ __local_build()
247251
${NICE} make install -C tools/yosys -j "${PROC}" ${YOSYS_ARGS}
248252

249253
echo "[INFO FLW-0030] Compiling yosys-slang."
250-
${NICE} make install -C tools/yosys-slang -j "${PROC}" YOSYS_PREFIX="${INSTALL_PATH}/yosys/bin/"
254+
# CMAKE_FLAGS added to work around yosys-slang#141 (unable to build outside of git checkout)
255+
${NICE} make install -C tools/yosys-slang -j "${PROC}" YOSYS_PREFIX="${INSTALL_PATH}/yosys/bin/" CMAKE_FLAGS="-DYOSYS_SLANG_REVISION=unknown -DSLANG_REVISION=unknown"
251256

252-
echo "[INFO FLW-0018] Compiling OpenROAD."
253-
eval ${NICE} ./tools/OpenROAD/etc/Build.sh -dir="$DIR/tools/OpenROAD/build" -threads=${PROC} -cmake=\'${OPENROAD_APP_ARGS}\'
254-
${NICE} cmake --build tools/OpenROAD/build --target install -j "${PROC}"
255257
}
256258

257259
__update_openroad_app_remote()

etc/DependencyInstaller.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ else
1010
fi
1111

1212
# package versions
13-
klayoutVersion=0.30.1
13+
klayoutVersion=0.28.17
1414
verilatorVersion=5.026
1515

1616
_versionCompare() {
@@ -136,7 +136,9 @@ _installUbuntuPackages() {
136136

137137
packages=()
138138
# Choose libstdc++ version
139-
if _versionCompare $1 -ge 24.04; then
139+
if _versionCompare $1 -ge 25.04; then
140+
packages+=("libstdc++-15-dev")
141+
elif _versionCompare $1 -ge 24.04; then
140142
packages+=("libstdc++-14-dev")
141143
elif _versionCompare $1 -ge 22.10; then
142144
packages+=("libstdc++-12-dev")
@@ -170,7 +172,7 @@ _installUbuntuPackages() {
170172
if [[ $1 == 20.04 ]]; then
171173
klayoutChecksum=15a26f74cf396d8a10b7985ed70ab135
172174
else
173-
klayoutChecksum=11953ce5009a0e83f9840b506f80df49
175+
klayoutChecksum=54748a49e1ab53e14cf5bf95feb2f25a
174176
fi
175177
wget https://www.klayout.org/downloads/Ubuntu-${1%.*}/klayout_${klayoutVersion}-1_amd64.deb
176178
md5sum -c <(echo "${klayoutChecksum} klayout_${klayoutVersion}-1_amd64.deb") || exit 1

flow/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@ settings.mk
22
vars.sh
33
vars.gdb
44
vars.tcl
5-
user.bazelrc
6-
bazel-*

flow/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ $(OBJECTS_DIR)/klayout.lyt: $(KLAYOUT_TECH_FILE) $(OBJECTS_DIR)/klayout_tech.lef
219219
.PHONY: do-klayout
220220
do-klayout:
221221
ifeq ($(KLAYOUT_ENV_VAR_IN_PATH),valid)
222-
SC_LEF_RELATIVE_PATH="$$\(env('FLOW_HOME')\)/$(shell realpath --relative-to=$(FLOW_HOME) $(SC_LEF))"; \
222+
SC_LEF_RELATIVE_PATH="$(shell realpath --relative-to=$(RESULTS_DIR) $(SC_LEF))"; \
223223
OTHER_LEFS_RELATIVE_PATHS=$$(echo "$(foreach file, $(OBJECTS_DIR)/klayout_tech.lef $(ADDITIONAL_LEFS),<lef-files>$$(realpath --relative-to=$(RESULTS_DIR) $(file))</lef-files>)"); \
224224
sed 's,<lef-files>.*</lef-files>,<lef-files>'"$$SC_LEF_RELATIVE_PATH"'</lef-files>'"$$OTHER_LEFS_RELATIVE_PATHS"',g' $(KLAYOUT_TECH_FILE) > $(OBJECTS_DIR)/klayout.lyt
225225
else

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
22
"synth__design__instance__area__stdcell": {
3-
"value": 13337.62,
3+
"value": 16477.72,
44
"compare": "<="
55
},
66
"constraints__clocks__count": {
77
"value": 1,
88
"compare": "=="
99
},
1010
"placeopt__design__instance__area": {
11-
"value": 15798,
11+
12+
"value": 19790,
1213
"compare": "<="
1314
},
1415
"placeopt__design__instance__count__stdcell": {
@@ -32,7 +33,7 @@
3233
"compare": "<="
3334
},
3435
"detailedroute__route__wirelength": {
35-
"value": 1241141,
36+
"value": 1466793,
3637
"compare": "<="
3738
},
3839
"detailedroute__route__drc_errors": {
@@ -48,11 +49,11 @@
4849
"compare": "<="
4950
},
5051
"finish__timing__setup__ws": {
51-
"value": -181.59,
52+
"value": -176.32,
5253
"compare": ">="
5354
},
5455
"finish__design__instance__area": {
55-
"value": 16112,
56+
"value": 20112,
5657
"compare": "<="
5758
},
5859
"finish__timing__drv__setup_violation_count": {
@@ -64,7 +65,7 @@
6465
"compare": "<="
6566
},
6667
"finish__timing__wns_percent_delay": {
67-
"value": -18.66,
68+
"value": -17.83,
6869
"compare": ">="
6970
}
7071
}

flow/designs/asap7/mock-array/rules-base.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"synth__design__instance__area__stdcell": {
3-
"value": 35802.37,
3+
"value": 35273.33,
44
"compare": "<="
55
},
66
"constraints__clocks__count": {
@@ -48,7 +48,7 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -72.77,
51+
"value": -92.28,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
@@ -64,7 +64,7 @@
6464
"compare": "<="
6565
},
6666
"finish__timing__wns_percent_delay": {
67-
"value": -10.0,
67+
"value": -25.4,
6868
"compare": ">="
6969
}
7070
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"compare": "=="
55
},
66
"placeopt__design__instance__area": {
7-
"value": 1729278,
7+
"value": 1652113,
88
"compare": "<="
99
},
1010
"placeopt__design__instance__count__stdcell": {
@@ -24,7 +24,7 @@
2424
"compare": "<="
2525
},
2626
"globalroute__antenna_diodes_count": {
27-
"value": 0,
27+
"value": 33,
2828
"compare": "<="
2929
},
3030
"detailedroute__route__wirelength": {
@@ -44,23 +44,23 @@
4444
"compare": "<="
4545
},
4646
"finish__timing__setup__ws": {
47-
"value": -255.36,
47+
"value": -114.98,
4848
"compare": ">="
4949
},
5050
"finish__design__instance__area": {
51-
"value": 1765388,
51+
"value": 1688970,
5252
"compare": "<="
5353
},
5454
"finish__timing__drv__setup_violation_count": {
5555
"value": 69836,
5656
"compare": "<="
5757
},
5858
"finish__timing__drv__hold_violation_count": {
59-
"value": 109,
59+
"value": 105,
6060
"compare": "<="
6161
},
6262
"finish__timing__wns_percent_delay": {
63-
"value": -16.47,
63+
"value": -10.96,
6464
"compare": ">="
6565
}
6666
}

flow/designs/gf180/aes/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": -1.12,
51+
"value": -1.28,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {

0 commit comments

Comments
 (0)