Skip to content

Commit b82c4dc

Browse files
hongtedhongted
committed
Updated testcases to run in both bazel test and ctest contexts.
Signed-off-by: Ted Hong <[email protected]>
1 parent ee970cd commit b82c4dc

Some content is hidden

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

58 files changed

+159
-137
lines changed

‎BUILD.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ config_setting(
4949

5050
OPENROAD_LIBRARY_DEPS = [
5151
":openroad_version",
52-
":ord",
5352
"//src/ant",
5453
"//src/ant:ui",
5554
"//src/cgt",
@@ -106,6 +105,7 @@ OPENROAD_LIBRARY_DEPS = [
106105
"//src/utl",
107106
"//src/utl:ui",
108107
"@edu_berkeley_abc//:abc-lib",
108+
":ord",
109109
] + select(
110110
{
111111
":platform_cli": ["//src/gui"],
@@ -187,11 +187,11 @@ cc_library(
187187
"include",
188188
],
189189
visibility = ["//visibility:public"],
190-
deps = OPENROAD_LIBRARY_DEPS + [
190+
deps = [
191191
"//src/sta:opensta_lib",
192192
"@boost.stacktrace",
193193
"@tk_tcl//:tcl",
194-
],
194+
] + OPENROAD_LIBRARY_DEPS,
195195
)
196196

197197
cc_library(
@@ -231,7 +231,7 @@ genrule(
231231

232232
tcl_encode(
233233
name = "openroad_tcl",
234-
srcs = ["//src/sta:tcl_util"] + [
234+
srcs = ["//src/sta:tcl_util"] +[
235235
"src/Metrics.tcl",
236236
"src/OpenRoad.tcl",
237237
],

‎src/dbSta/BUILD‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,9 @@ cc_library(
143143

144144
tcl_encode(
145145
name = "tcl",
146-
srcs = [
146+
srcs = ["//src/sta:tcl_scripts"] + [
147147
"src/dbReadVerilog.tcl",
148148
"src/dbSta.tcl",
149-
"//src/sta:tcl_scripts",
150149
],
151150
char_array_name = "dbSta_tcl_inits",
152151
namespace = "sta",

‎src/drt/test/Distributed/example_leader.tcl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ read_def ../gcd_nangate45_preroute.def
44
read_guides ../gcd_nangate45.route_guide
55

66
set_thread_count 16
7-
detailed_route -output_drc ../results/gcd_nangate45_distributed.output.drc.rpt \
8-
-output_maze ../results/gcd_nangate45_distributed.output.maze.log \
7+
detailed_route -output_drc [make_result_file gcd_nangate45_distributed.output.drc.rpt] \
8+
-output_maze [make_result_file gcd_nangate45_distributed.output.maze.log] \
99
-verbose 1 \
1010
-distributed \
1111
-remote_host 127.0.0.1 \
1212
-remote_port 1234 \
1313
-cloud_size 2 \
14-
-shared_volume ../results
14+
-shared_volume [make_result_dir]

‎src/drt/test/aes_nangate45.tcl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ read_lef Nangate45/Nangate45_stdcell.lef
44
read_def aes_nangate45_preroute.def
55
read_guides aes_nangate45.route_guide
66
set_thread_count [expr [cpu_count] / 4]
7-
detailed_route -output_drc results/aes_nangate45.output.drc.rpt \
8-
-output_maze results/aes_nangate45.output.maze.log \
7+
detailed_route -output_drc [make_result_file aes_nangate45.output.drc.rpt] \
8+
-output_maze [make_result_file aes_nangate45.output.maze.log] \
99
-verbose 1
10-
set def_file results/aes_nangate45.defok
10+
set def_file [make_result_file aes_nangate45.defok]
1111
write_def $def_file

‎src/drt/test/aes_nangate45_distributed.tcl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
source "helpers.tcl"
22

33
set OR $argv0
4-
set server1 [exec $OR server1.tcl > results/server1.log &]
5-
set server2 [exec $OR server2.tcl > results/server2.log &]
6-
set balancer [exec $OR balancer.tcl > results/balancer.log &]
7-
set base [exec $OR -exit aes_nangate45.tcl > results/base.log &]
4+
set server1 [exec $OR server1.tcl > [make_result_file server1.log] &]
5+
set server2 [exec $OR server2.tcl > [make_result_file server2.log] &]
6+
set balancer [exec $OR balancer.tcl > [make_result_file balancer.log] &]
7+
set base [exec $OR -exit aes_nangate45.tcl > [make_result_file base.log] &]
88

99
read_lef Nangate45/Nangate45_tech.lef
1010
read_lef Nangate45/Nangate45_stdcell.lef
1111
read_def aes_nangate45_preroute.def
1212
read_guides aes_nangate45.route_guide
1313
set_thread_count [expr [cpu_count] / 4]
14-
detailed_route -output_drc results/aes_nangate45_distributed.output.drc.rpt \
15-
-output_maze results/aes_nangate45_distributed.output.maze.log \
14+
detailed_route -output_drc [make_result_file aes_nangate45_distributed.output.drc.rpt] \
15+
-output_maze [make_result_file aes_nangate45_distributed.output.maze.log] \
1616
-verbose 1 \
1717
-distributed \
1818
-remote_host 127.0.0.1 \
1919
-remote_port 1234 \
2020
-cloud_size 2 \
21-
-shared_volume results
21+
-shared_volume [make_result_dir]
2222
exec kill $server1
2323
exec kill $server2
2424
exec kill $balancer
25-
set def_file results/aes_nangate45.def
25+
set def_file [make_result_file aes_nangate45.def]
2626
write_def $def_file
2727
set running [file exists /proc/$base]
2828
while { $running } {
2929
exec sleep 1
3030
set running [file exists /proc/$base]
3131
}
32-
diff_files results/aes_nangate45.defok $def_file
32+
diff_files [make_result_file aes_nangate45.defok] $def_file

‎src/drt/test/gcd_nangate45.tcl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ read_lef Nangate45/Nangate45_stdcell.lef
44
read_def gcd_nangate45_preroute.def
55
read_guides gcd_nangate45.route_guide
66
set_thread_count [expr [cpu_count] / 4]
7-
detailed_route -output_drc results/gcd_nangate45.output.drc.rpt \
8-
-output_maze results/gcd_nangate45.output.maze.log \
7+
detailed_route -output_drc [make_result_file gcd_nangate45.output.drc.rpt] \
8+
-output_maze [make_result_file gcd_nangate45.output.maze.log] \
99
-verbose 1
10-
set def_file results/gcd_nangate45.defok
10+
set def_file [make_result_file gcd_nangate45.defok]
1111
write_def $def_file

‎src/drt/test/gcd_nangate45_distributed.tcl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
source "helpers.tcl"
22

33
set OR $argv0
4-
set server1 [exec $OR server1.tcl > results/server1.log &]
5-
set server2 [exec $OR server2.tcl > results/server2.log &]
6-
set balancer [exec $OR balancer.tcl > results/balancer.log &]
7-
set base [exec $OR -exit gcd_nangate45.tcl > results/base.log &]
4+
set server1 [exec $OR server1.tcl > [make_result_file server1.log] &]
5+
set server2 [exec $OR server2.tcl > [make_result_file server2.log] &]
6+
set balancer [exec $OR balancer.tcl > [make_result_file balancer.log] &]
7+
set base [exec $OR -exit gcd_nangate45.tcl > [make_result_file base.log] &]
88
exec sleep 3
99
read_lef Nangate45/Nangate45_tech.lef
1010
read_lef Nangate45/Nangate45_stdcell.lef
1111
read_def gcd_nangate45_preroute.def
1212
read_guides gcd_nangate45.route_guide
1313

1414
set_thread_count [expr [cpu_count] / 4]
15-
detailed_route -output_drc results/gcd_nangate45_distributed.output.drc.rpt \
16-
-output_maze results/gcd_nangate45_distributed.output.maze.log \
15+
detailed_route -output_drc [make_result_file gcd_nangate45_distributed.output.drc.rpt] \
16+
-output_maze [make_result_file gcd_nangate45_distributed.output.maze.log] \
1717
-verbose 1 \
1818
-distributed \
1919
-remote_host 127.0.0.1 \
2020
-remote_port 1234 \
2121
-cloud_size 2 \
22-
-shared_volume results
22+
-shared_volume [make_result_dir]
2323
exec kill $server1
2424
exec kill $server2
2525
exec kill $balancer
26-
set def_file results/gcd_nangate45.def
26+
set def_file [make_result_file gcd_nangate45.def]
2727
write_def $def_file
2828
set running [file exists /proc/$base]
2929
while { $running } {
3030
sleep 1
3131
set running [file exists /proc/$base]
3232
}
33-
diff_files results/gcd_nangate45.defok $def_file
33+
diff_files [make_result_file gcd_nangate45.defok] $def_file

‎src/drt/test/gcd_nangate45_dump_worker.tcl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ read_def gcd_nangate45_preroute.def
55
read_guides gcd_nangate45.route_guide
66
set_thread_count [cpu_count]
77

8-
detailed_route_debug -dump_dr -dump_dir results -iter 2
8+
detailed_route_debug -dump_dr -dump_dir [make_result_dir] -iter 2
99

10-
detailed_route -output_guide results/gcd_nangate45.output.guide.mod \
11-
-output_drc results/gcd_nangate45.output.drc.rpt \
12-
-output_maze results/gcd_nangate45.output.maze.log \
10+
detailed_route -output_guide [make_result_file gcd_nangate45.output.guide.mod] \
11+
-output_drc [make_result_file gcd_nangate45.output.drc.rpt] \
12+
-output_maze [make_result_file gcd_nangate45.output.maze.log] \
1313
-verbose 1
14-
set def_file results/gcd_nangate45.defok
14+
set def_file [make_result_file gcd_nangate45.defok]
1515
write_def $def_file

‎src/drt/test/gcd_nangate45_test_worker.tcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ set_debug_level DRT autotuner 1
33
detailed_route_debug -dr
44
detailed_route_worker_debug -maze_end_iter 1 -drc_cost 8 -marker_cost 8 \
55
-follow_guide 1 -ripup_mode 1
6-
detailed_route_run_worker -dump_dir results \
6+
detailed_route_run_worker -dump_dir [make_result_dir] \
77
-worker_dir workerx67200_y37800 \
8-
-drc_rpt results/worker.drc.rpt
8+
-drc_rpt [make_result_file worker.drc.rpt]

‎src/drt/test/ispd18_sample.tcl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ source "helpers.tcl"
33
read_lef testcase/ispd18_sample/ispd18_sample.input.lef
44
read_def testcase/ispd18_sample/ispd18_sample.input.def
55
read_guides testcase/ispd18_sample/ispd18_sample.input.guide
6-
detailed_route -output_drc results/ispd18_sample.output.drc.rpt \
7-
-output_maze results/ispd18_sample.output.maze.log \
8-
-output_guide_coverage results/ispd18_sample.coverage.csv \
6+
detailed_route -output_drc [make_result_file ispd18_sample.output.drc.rpt] \
7+
-output_maze [make_result_file ispd18_sample.output.maze.log] \
8+
-output_guide_coverage [make_result_file ispd18_sample.coverage.csv] \
99
-verbose 0
1010

1111
set def_file [make_result_file ispd18_sample.def]

0 commit comments

Comments
 (0)