Skip to content

Commit 302c0af

Browse files
jeffng-orjeffng-or
authored
Merge branch 'master' into add-sv-tests2
Signed-off-by: Jeff Ng <[email protected]>
2 parents 9655cbd + aa611ef commit 302c0af

File tree

17 files changed

+56
-43
lines changed

17 files changed

+56
-43
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-flow/
105+
bazel-testlogs/

‎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()

‎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/designs/asap7/cva6/rules-base.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"compare": "=="
99
},
1010
"placeopt__design__instance__area": {
11-
"value": 19733,
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": 1445732,
36+
"value": 1466793,
3637
"compare": "<="
3738
},
3839
"detailedroute__route__drc_errors": {
@@ -52,7 +53,7 @@
5253
"compare": ">="
5354
},
5455
"finish__design__instance__area": {
55-
"value": 20065,
56+
"value": 20112,
5657
"compare": "<="
5758
},
5859
"finish__timing__drv__setup_violation_count": {

‎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/gf180/ibex/rules-base.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"compare": "<="
3737
},
3838
"detailedroute__route__drc_errors": {
39-
"value": 2,
39+
"value": 1,
4040
"compare": "<="
4141
},
4242
"detailedroute__antenna__violating__nets": {
@@ -52,7 +52,7 @@
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
55-
"value": 899459,
55+
"value": 1067423,
5656
"compare": "<="
5757
},
5858
"finish__timing__drv__setup_violation_count": {

‎flow/designs/gf180/jpeg/rules-base.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"compare": "<="
2929
},
3030
"globalroute__antenna_diodes_count": {
31-
"value": 2,
31+
"value": 4,
3232
"compare": "<="
3333
},
3434
"detailedroute__route__wirelength": {
@@ -44,15 +44,15 @@
4444
"compare": "<="
4545
},
4646
"detailedroute__antenna_diodes_count": {
47-
"value": 18,
47+
"value": 16,
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
5151
"value": -0.47,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
55-
"value": 2438978,
55+
"value": 2842064,
5656
"compare": "<="
5757
},
5858
"finish__timing__drv__setup_violation_count": {

‎flow/designs/gf180/riscv32i/rules-base.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
55-
"value": 435127,
55+
"value": 521614,
5656
"compare": "<="
5757
},
5858
"finish__timing__drv__setup_violation_count": {

‎flow/designs/nangate45/mempool_group/rules-base.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"compare": "=="
99
},
1010
"placeopt__design__instance__area": {
11-
"value": 321669,
11+
"value": 322046,
1212
"compare": "<="
1313
},
1414
"placeopt__design__instance__count__stdcell": {
15-
"value": 163096,
15+
"value": 163160,
1616
"compare": "<="
1717
},
1818
"detailedplace__design__violations": {
@@ -32,7 +32,7 @@
3232
"compare": "<="
3333
},
3434
"detailedroute__route__wirelength": {
35-
"value": 4928860,
35+
"value": 4942626,
3636
"compare": "<="
3737
},
3838
"detailedroute__route__drc_errors": {
@@ -48,23 +48,24 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__setup__ws": {
51-
"value": -2.34,
51+
52+
"value": -2.35,
5253
"compare": ">="
5354
},
5455
"finish__design__instance__area": {
55-
"value": 330643,
56+
"value": 331160,
5657
"compare": "<="
5758
},
5859
"finish__timing__drv__setup_violation_count": {
59-
"value": 7091,
60+
"value": 7094,
6061
"compare": "<="
6162
},
6263
"finish__timing__drv__hold_violation_count": {
6364
"value": 100,
6465
"compare": "<="
6566
},
6667
"finish__timing__wns_percent_delay": {
67-
"value": -109.23,
68+
"value": -109.25,
6869
"compare": ">="
6970
}
7071
}

‎flow/designs/nangate45/swerv/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": -0.33,
51+
"value": -0.3,
5252
"compare": ">="
5353
},
5454
"finish__design__instance__area": {
@@ -60,7 +60,7 @@
6060
"compare": "<="
6161
},
6262
"finish__timing__drv__hold_violation_count": {
63-
"value": 861,
63+
"value": 408,
6464
"compare": "<="
6565
},
6666
"finish__timing__wns_percent_delay": {

0 commit comments

Comments
 (0)