diff --git a/Dockerfile b/Dockerfile index b6bff62939..98864db40d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,6 @@ WORKDIR /OpenROAD-flow-scripts # synthesis tools binaries and plugins COPY --from=openroad/yosys /install ./tools/install/yosys -COPY --from=openroad/lsoracle /LSOracle/build/core/lsoracle ./tools/build/LSOracle/bin/lsoracle -COPY --from=openroad/lsoracle /LSOracle/core/test.ini ./tools/build/LSOracle/share/lsoracle/test.ini -COPY --from=openroad/lsoracle /LSOracle/build/yosys-plugin/oracle.so /OpenROAD-flow/tools/build/yosys/share/yosys/plugins/ # openroad binary COPY --from=openroad/ubuntu22.04-builder-gcc /OpenROAD/build/src/openroad ./tools/install/OpenROAD/bin/openroad diff --git a/build_openroad.sh b/build_openroad.sh index f838086bb8..81599d0876 100755 --- a/build_openroad.sh +++ b/build_openroad.sh @@ -25,13 +25,6 @@ YOSYS_ARGS="CONFIG=clang" OPENROAD_APP_USER_ARGS="" OPENROAD_APP_ARGS="" -LSORACLE_USER_ARGS="" -LSORACLE_ARGS="\ --D CMAKE_BUILD_TYPE=RELEASE \ --D YOSYS_INCLUDE_DIR=$(pwd)/tools/yosys \ --D YOSYS_PLUGIN=ON \ -" - DOCKER_OS_NAME="ubuntu22.04" PROC=-1 @@ -43,7 +36,6 @@ Usage: $0 [-h|--help] [-o|--local] [-l|--latest] [-n|--nice] [-t|--threads N] [--yosys-args-overwrite] [--yosys-args STRING] [--openroad-args-overwrite] [--openroad-args STRING] - [--lsoracle-args-overwrite] [--lsoracle-args STRING] [--install-path PATH] [--clean] [--clean-force] [-c|--copy-platforms] @@ -79,16 +71,6 @@ Options: --openroad-args STRING Aditional compilation flags for OpenROAD app compilation. - --lsoracle-enable Compile LSOracle. Disable by default as it is not - currently used on the flow. - - --lsoracle-args-overwrite - Do not use default flags set by this script during - LSOracle compilation. - - --lsoracle-args STRING Aditional compilation flags for LSOracle - compilation. - --install-path PATH Path to install tools. Default is ${INSTALL_PATH}. --clean Call git clean interactively before compile. @@ -159,16 +141,6 @@ while (( "$#" )); do OPENROAD_APP_USER_ARGS="$2" shift ;; - --lsoracle-enable) - LSORACLE_ENABLE=1 - ;; - --lsoracle-args-overwrite) - LSORACLE_OVERWIRTE_ARGS=1 - ;; - --lsoracle-args) - LSORACLE_USER_ARGS="$2" - shift - ;; --install-path) INSTALL_PATH="$2" shift @@ -215,10 +187,6 @@ if [ -n "$CMAKE_INSTALL_RPATH" ]; then OPENROAD_APP_ARGS+=" -D CMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}" OPENROAD_APP_ARGS+=" -D CMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE" fi -LSORACLE_ARGS+=" \ --D YOSYS_SHARE_DIR=${INSTALL_PATH}/yosys/share/yosys \ --D CMAKE_INSTALL_PREFIX=${INSTALL_PATH}/LSOracle \ -" __args_setup() { if [ ! -z "${YOSYS_OVERWIRTE_ARGS+x}" ]; then @@ -234,13 +202,6 @@ __args_setup() { else OPENROAD_APP_ARGS+=" ${OPENROAD_APP_USER_ARGS}" fi - - if [ ! -z "${LSORACLE_OVERWIRTE_ARGS+x}" ]; then - echo "[INFO FLW-0016] Overwriting LSOracle compilation flags." - LSORACLE_ARGS="${LSORACLE_USER_ARGS}" - else - LSORACLE_ARGS+=" ${LSORACLE_USER_ARGS}" - fi } __docker_build() @@ -287,12 +248,6 @@ __local_build() echo "[INFO FLW-0018] Compiling OpenROAD." eval ${NICE} cmake tools/OpenROAD -B tools/OpenROAD/build ${OPENROAD_APP_ARGS} ${NICE} cmake --build tools/OpenROAD/build --target install -j "${PROC}" - - if [ ! -z "${LSORACLE_ENABLE+x}" ]; then - echo "[INFO FLW-0019] Compiling LSOracle." - ${NICE} cmake tools/LSOracle -B tools/LSOracle/build ${LSORACLE_ARGS} - ${NICE} cmake --build tools/LSOracle/build --target install -j "${PROC}" - fi } __update_openroad_app_remote() diff --git a/docs/index.md b/docs/index.md index 7c7381e1d2..04580bef51 100644 --- a/docs/index.md +++ b/docs/index.md @@ -91,9 +91,6 @@ Options for `./build_openroad.sh` script | `--yosys-args STRING` | Aditional compilation flags for Yosys compilation. | | `--openroad-args-overwrite` | Do not use default flags set by this script during OpenROAD app compilation. | | `--openroad-args STRING` | Aditional compilation flags for OpenROAD app compilation. | -| `--lsoracle-enable` | Compile LSOracle. Disable by default as it is not currently used on the flow. | -| `--lsoracle-args-overwrite` | Do not use default flags set by this scrip during LSOracle compilation. | -| `--lsoracle-args STRING` | Aditional compilation flags for LSOracle compilation. | | `--install-path PATH` | Path to install tools. Default is `${INSTALL_PATH}`. | | `--clean` | Call git clean interactively before compile. Useful to remove old build files. | | `--clean-force` | Call git clean before compile. WARNING: this option will not ask for confirmation. Useful to remove old build files. | diff --git a/env.sh b/env.sh index bc870f05c1..3a279ea2f8 100755 --- a/env.sh +++ b/env.sh @@ -13,7 +13,6 @@ echo "OPENROAD: ${OPENROAD}" export PATH=${DIR}/tools/install/OpenROAD/bin:$PATH export PATH=${DIR}/tools/install/yosys/bin:$PATH -export PATH=${DIR}/tools/install/LSOracle/bin:$PATH export PATH=${DIR}/dependencies/bin:$PATH if [[ "$OSTYPE" == "darwin"* ]]; then diff --git a/flow/Makefile b/flow/Makefile index 4b5c1de080..6f63b9d712 100644 --- a/flow/Makefile +++ b/flow/Makefile @@ -269,17 +269,6 @@ ifeq (,$(strip $(NUM_CORES))) endif export NUM_CORES -export LSORACLE_CMD ?= $(shell command -v lsoracle) -ifeq ($(LSORACLE_CMD),) - LSORACLE_CMD = $(abspath $(FLOW_HOME)/../tools/install/LSOracle/bin/lsoracle) -endif - -LSORACLE_PLUGIN ?= $(abspath $(FLOW_HOME)/../tools/install/yosys/share/yosys/plugin/oracle.so) -export LSORACLE_KAHYPAR_CONFIG ?= $(abspath $(FLOW_HOME)/../tools/install/LSOracle/share/lsoracle/test.ini) -ifneq ($(USE_LSORACLE),) - YOSYS_FLAGS ?= -m $(LSORACLE_PLUGIN) -endif - YOSYS_FLAGS += -v 3 #------------------------------------------------------------------------------- diff --git a/flow/scripts/synth.tcl b/flow/scripts/synth.tcl index 97a8652872..4dd36153f6 100644 --- a/flow/scripts/synth.tcl +++ b/flow/scripts/synth.tcl @@ -19,20 +19,6 @@ synthesize_check $::env(SYNTH_FULL_ARGS) # At least this is predictable. renames -wire -if { [info exists ::env(USE_LSORACLE)] } { - set lso_script [open $::env(OBJECTS_DIR)/lso.script w] - puts $lso_script "ps -a" - puts $lso_script "oracle --config $::env(LSORACLE_KAHYPAR_CONFIG)" - puts $lso_script "ps -m" - puts $lso_script "crit_path_stats" - puts $lso_script "ntk_stats" - close $lso_script - - # LSOracle synthesis - lsoracle -script $::env(OBJECTS_DIR)/lso.script -lso_exe $::env(LSORACLE_CMD) - techmap -} - # Optimize the design opt -purge diff --git a/flow/util/distributed.py b/flow/util/distributed.py index 725576453a..74e77df44a 100644 --- a/flow/util/distributed.py +++ b/flow/util/distributed.py @@ -481,7 +481,6 @@ def openroad(base_dir, parameters, flow_variant, path=''): export_command = f'export PATH={INSTALL_PATH}/OpenROAD/bin' export_command += f':{INSTALL_PATH}/yosys/bin' - export_command += f':{INSTALL_PATH}/LSOracle/bin:$PATH' export_command += ' && ' make_command = export_command diff --git a/tools/AutoTuner/src/autotuner/distributed.py b/tools/AutoTuner/src/autotuner/distributed.py index 5537513642..2e962357f8 100644 --- a/tools/AutoTuner/src/autotuner/distributed.py +++ b/tools/AutoTuner/src/autotuner/distributed.py @@ -485,7 +485,6 @@ def openroad(base_dir, parameters, flow_variant, path=''): export_command = f'export PATH={INSTALL_PATH}/OpenROAD/bin' export_command += f':{INSTALL_PATH}/yosys/bin' - export_command += f':{INSTALL_PATH}/LSOracle/bin:$PATH' export_command += ' && ' make_command = export_command