diff --git a/f4pga/wrappers/sh/__init__.py b/f4pga/wrappers/sh/__init__.py index 81422f2..f57646e 100644 --- a/f4pga/wrappers/sh/__init__.py +++ b/f4pga/wrappers/sh/__init__.py @@ -89,7 +89,9 @@ def place(): def route(): print("[F4PGA] Running (deprecated) route") - run_sh_script(ROOT / SH_SUBDIR / "route.f4pga.sh") + extra_args = ['--write_timing_summary', 'timing_summary.json'] if isQuickLogic else [] + run_bash_cmds(vpr_common_cmds('pack')+f"run_vpr --route {' '.join(extra_args)}") + Path('vpr_stdout.log').rename('route.log') def synth(): diff --git a/f4pga/wrappers/sh/quicklogic/route.f4pga.sh b/f4pga/wrappers/sh/quicklogic/route.f4pga.sh deleted file mode 100755 index 6e832e7..0000000 --- a/f4pga/wrappers/sh/quicklogic/route.f4pga.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (C) 2020-2022 F4PGA Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 - -set -e - -source $(dirname "$0")/vpr_common.f4pga.sh -parse_args $@ - -export OUT_NOISY_WARNINGS=noisy_warnings-${DEVICE}_pack.log - -run_vpr --route --write_timing_summary timing_summary.json - -mv vpr_stdout.log route.log diff --git a/f4pga/wrappers/sh/xc7/route.f4pga.sh b/f4pga/wrappers/sh/xc7/route.f4pga.sh deleted file mode 100755 index 34dbe23..0000000 --- a/f4pga/wrappers/sh/xc7/route.f4pga.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (C) 2020-2022 F4PGA Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 - -set -e - -source $(dirname "$0")/vpr_common.f4pga.sh -parse_args "$@" - -export OUT_NOISY_WARNINGS=noisy_warnings-${DEVICE}_pack.log - -run_vpr --route - -mv vpr_stdout.log route.log