Skip to content

Commit 4197720

Browse files
committed
rm vesitages of LSOracle
Signed-off-by: Matt Liberty <[email protected]>
1 parent a40a953 commit 4197720

File tree

8 files changed

+0
-79
lines changed

8 files changed

+0
-79
lines changed

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ WORKDIR /OpenROAD-flow-scripts
55

66
# synthesis tools binaries and plugins
77
COPY --from=openroad/yosys /install ./tools/install/yosys
8-
COPY --from=openroad/lsoracle /LSOracle/build/core/lsoracle ./tools/build/LSOracle/bin/lsoracle
9-
COPY --from=openroad/lsoracle /LSOracle/core/test.ini ./tools/build/LSOracle/share/lsoracle/test.ini
10-
COPY --from=openroad/lsoracle /LSOracle/build/yosys-plugin/oracle.so /OpenROAD-flow/tools/build/yosys/share/yosys/plugins/
118

129
# openroad binary
1310
COPY --from=openroad/ubuntu22.04-builder-gcc /OpenROAD/build/src/openroad ./tools/install/OpenROAD/bin/openroad

build_openroad.sh

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ YOSYS_ARGS="CONFIG=clang"
2525
OPENROAD_APP_USER_ARGS=""
2626
OPENROAD_APP_ARGS=""
2727

28-
LSORACLE_USER_ARGS=""
29-
LSORACLE_ARGS="\
30-
-D CMAKE_BUILD_TYPE=RELEASE \
31-
-D YOSYS_INCLUDE_DIR=$(pwd)/tools/yosys \
32-
-D YOSYS_PLUGIN=ON \
33-
"
34-
3528
DOCKER_OS_NAME="ubuntu22.04"
3629
PROC=-1
3730

@@ -43,7 +36,6 @@ Usage: $0 [-h|--help] [-o|--local] [-l|--latest]
4336
[-n|--nice] [-t|--threads N]
4437
[--yosys-args-overwrite] [--yosys-args STRING]
4538
[--openroad-args-overwrite] [--openroad-args STRING]
46-
[--lsoracle-args-overwrite] [--lsoracle-args STRING]
4739
[--install-path PATH] [--clean] [--clean-force]
4840
4941
[-c|--copy-platforms]
@@ -79,16 +71,6 @@ Options:
7971
--openroad-args STRING Aditional compilation flags for OpenROAD app
8072
compilation.
8173
82-
--lsoracle-enable Compile LSOracle. Disable by default as it is not
83-
currently used on the flow.
84-
85-
--lsoracle-args-overwrite
86-
Do not use default flags set by this script during
87-
LSOracle compilation.
88-
89-
--lsoracle-args STRING Aditional compilation flags for LSOracle
90-
compilation.
91-
9274
--install-path PATH Path to install tools. Default is ${INSTALL_PATH}.
9375
9476
--clean Call git clean interactively before compile.
@@ -159,16 +141,6 @@ while (( "$#" )); do
159141
OPENROAD_APP_USER_ARGS="$2"
160142
shift
161143
;;
162-
--lsoracle-enable)
163-
LSORACLE_ENABLE=1
164-
;;
165-
--lsoracle-args-overwrite)
166-
LSORACLE_OVERWIRTE_ARGS=1
167-
;;
168-
--lsoracle-args)
169-
LSORACLE_USER_ARGS="$2"
170-
shift
171-
;;
172144
--install-path)
173145
INSTALL_PATH="$2"
174146
shift
@@ -215,10 +187,6 @@ if [ -n "$CMAKE_INSTALL_RPATH" ]; then
215187
OPENROAD_APP_ARGS+=" -D CMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}"
216188
OPENROAD_APP_ARGS+=" -D CMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE"
217189
fi
218-
LSORACLE_ARGS+=" \
219-
-D YOSYS_SHARE_DIR=${INSTALL_PATH}/yosys/share/yosys \
220-
-D CMAKE_INSTALL_PREFIX=${INSTALL_PATH}/LSOracle \
221-
"
222190

223191
__args_setup() {
224192
if [ ! -z "${YOSYS_OVERWIRTE_ARGS+x}" ]; then
@@ -234,13 +202,6 @@ __args_setup() {
234202
else
235203
OPENROAD_APP_ARGS+=" ${OPENROAD_APP_USER_ARGS}"
236204
fi
237-
238-
if [ ! -z "${LSORACLE_OVERWIRTE_ARGS+x}" ]; then
239-
echo "[INFO FLW-0016] Overwriting LSOracle compilation flags."
240-
LSORACLE_ARGS="${LSORACLE_USER_ARGS}"
241-
else
242-
LSORACLE_ARGS+=" ${LSORACLE_USER_ARGS}"
243-
fi
244205
}
245206

246207
__docker_build()
@@ -287,12 +248,6 @@ __local_build()
287248
echo "[INFO FLW-0018] Compiling OpenROAD."
288249
eval ${NICE} cmake tools/OpenROAD -B tools/OpenROAD/build ${OPENROAD_APP_ARGS}
289250
${NICE} cmake --build tools/OpenROAD/build --target install -j "${PROC}"
290-
291-
if [ ! -z "${LSORACLE_ENABLE+x}" ]; then
292-
echo "[INFO FLW-0019] Compiling LSOracle."
293-
${NICE} cmake tools/LSOracle -B tools/LSOracle/build ${LSORACLE_ARGS}
294-
${NICE} cmake --build tools/LSOracle/build --target install -j "${PROC}"
295-
fi
296251
}
297252

298253
__update_openroad_app_remote()

docs/index.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ Options for `./build_openroad.sh` script
9191
| `--yosys-args STRING` | Aditional compilation flags for Yosys compilation. |
9292
| `--openroad-args-overwrite` | Do not use default flags set by this script during OpenROAD app compilation. |
9393
| `--openroad-args STRING` | Aditional compilation flags for OpenROAD app compilation. |
94-
| `--lsoracle-enable` | Compile LSOracle. Disable by default as it is not currently used on the flow. |
95-
| `--lsoracle-args-overwrite` | Do not use default flags set by this scrip during LSOracle compilation. |
96-
| `--lsoracle-args STRING` | Aditional compilation flags for LSOracle compilation. |
9794
| `--install-path PATH` | Path to install tools. Default is `${INSTALL_PATH}`. |
9895
| `--clean` | Call git clean interactively before compile. Useful to remove old build files. |
9996
| `--clean-force` | Call git clean before compile. WARNING: this option will not ask for confirmation. Useful to remove old build files. |

env.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ echo "OPENROAD: ${OPENROAD}"
1313

1414
export PATH=${DIR}/tools/install/OpenROAD/bin:$PATH
1515
export PATH=${DIR}/tools/install/yosys/bin:$PATH
16-
export PATH=${DIR}/tools/install/LSOracle/bin:$PATH
1716
export PATH=${DIR}/dependencies/bin:$PATH
1817

1918
if [[ "$OSTYPE" == "darwin"* ]]; then

flow/Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -269,17 +269,6 @@ ifeq (,$(strip $(NUM_CORES)))
269269
endif
270270
export NUM_CORES
271271

272-
export LSORACLE_CMD ?= $(shell command -v lsoracle)
273-
ifeq ($(LSORACLE_CMD),)
274-
LSORACLE_CMD = $(abspath $(FLOW_HOME)/../tools/install/LSOracle/bin/lsoracle)
275-
endif
276-
277-
LSORACLE_PLUGIN ?= $(abspath $(FLOW_HOME)/../tools/install/yosys/share/yosys/plugin/oracle.so)
278-
export LSORACLE_KAHYPAR_CONFIG ?= $(abspath $(FLOW_HOME)/../tools/install/LSOracle/share/lsoracle/test.ini)
279-
ifneq ($(USE_LSORACLE),)
280-
YOSYS_FLAGS ?= -m $(LSORACLE_PLUGIN)
281-
endif
282-
283272
YOSYS_FLAGS += -v 3
284273

285274
#-------------------------------------------------------------------------------

flow/scripts/synth.tcl

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,6 @@ synthesize_check $::env(SYNTH_FULL_ARGS)
1919
# At least this is predictable.
2020
renames -wire
2121

22-
if { [info exists ::env(USE_LSORACLE)] } {
23-
set lso_script [open $::env(OBJECTS_DIR)/lso.script w]
24-
puts $lso_script "ps -a"
25-
puts $lso_script "oracle --config $::env(LSORACLE_KAHYPAR_CONFIG)"
26-
puts $lso_script "ps -m"
27-
puts $lso_script "crit_path_stats"
28-
puts $lso_script "ntk_stats"
29-
close $lso_script
30-
31-
# LSOracle synthesis
32-
lsoracle -script $::env(OBJECTS_DIR)/lso.script -lso_exe $::env(LSORACLE_CMD)
33-
techmap
34-
}
35-
3622
# Optimize the design
3723
opt -purge
3824

flow/util/distributed.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,6 @@ def openroad(base_dir, parameters, flow_variant, path=''):
481481

482482
export_command = f'export PATH={INSTALL_PATH}/OpenROAD/bin'
483483
export_command += f':{INSTALL_PATH}/yosys/bin'
484-
export_command += f':{INSTALL_PATH}/LSOracle/bin:$PATH'
485484
export_command += ' && '
486485

487486
make_command = export_command

tools/AutoTuner/src/autotuner/distributed.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,6 @@ def openroad(base_dir, parameters, flow_variant, path=''):
485485

486486
export_command = f'export PATH={INSTALL_PATH}/OpenROAD/bin'
487487
export_command += f':{INSTALL_PATH}/yosys/bin'
488-
export_command += f':{INSTALL_PATH}/LSOracle/bin:$PATH'
489488
export_command += ' && '
490489

491490
make_command = export_command

0 commit comments

Comments
 (0)