diff --git a/f4pga/wrappers/sh/__init__.py b/f4pga/wrappers/sh/__init__.py index 19c0171..e7322fd 100644 --- a/f4pga/wrappers/sh/__init__.py +++ b/f4pga/wrappers/sh/__init__.py @@ -106,7 +106,17 @@ def write_fasm(): def write_xml_rr_graph(): print("[F4PGA] Running (deprecated) write xlm rr graph") - run_sh(ROOT / SH_SUBDIR / "write_xml_rr_graph.f4pga.sh") + check_call(f""" +set -e +source {ROOT / SH_SUBDIR}/vpr_common.f4pga.sh +parse_args {' '.join(sys_argv[1:])} +export OUT_NOISY_WARNINGS=noisy_warnings-${{DEVICE}}_place.log +vpr ${{ARCH_DEF}} \ + ${{EBLIF}} \ + --read_rr_graph ${{RR_GRAPH}} \ + --write_rr_graph ${{RR_GRAPH_XML}} \ + --pack +""", env=f4pga_environ, shell=True, executable='/bin/bash') def vpr_common(): diff --git a/f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh b/f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh deleted file mode 100755 index 7b5f929..0000000 --- a/f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh +++ /dev/null @@ -1,30 +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 "$@" - -OUT_NOISY_WARNINGS=noisy_warnings-${DEVICE}_place.log - -vpr ${ARCH_DEF} \ - ${EBLIF} \ - --read_rr_graph ${RR_GRAPH} \ - --write_rr_graph ${RR_GRAPH_XML} \ - --pack