diff --git a/f4pga/wrappers/sh/__init__.py b/f4pga/wrappers/sh/__init__.py index e7322fd..1509012 100644 --- a/f4pga/wrappers/sh/__init__.py +++ b/f4pga/wrappers/sh/__init__.py @@ -101,7 +101,31 @@ def genfasm(extra_args): def write_fasm(): print("[F4PGA] Running (deprecated) write fasm") - run_sh(ROOT / SH_SUBDIR / "write_fasm.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}}_fasm.log + +TOP="${{EBLIF%.*}}" +FASM_EXTRA="${{TOP}}_fasm_extra.fasm" + +ARCH_DEF="$ARCH_DEF" \ +EBLIF="$EBLIF" \ +DEVICE_NAME="$DEVICE_NAME" \ +VPR_OPTIONS="$VPR_OPTIONS" \ +RR_GRAPH="$RR_GRAPH" \ + python3 -m f4pga.wrappers.sh.genfasm + +echo "FASM extra: $FASM_EXTRA" +if [ -f $FASM_EXTRA ]; then + echo "writing final fasm" + cat ${{TOP}}.fasm $FASM_EXTRA > tmp.fasm + mv tmp.fasm ${{TOP}}.fasm +fi + +mv vpr_stdout.log fasm.log +""", env=f4pga_environ, shell=True, executable='/bin/bash') def write_xml_rr_graph(): diff --git a/f4pga/wrappers/sh/quicklogic/write_fasm.f4pga.sh b/f4pga/wrappers/sh/quicklogic/write_fasm.f4pga.sh deleted file mode 100755 index dd16153..0000000 --- a/f4pga/wrappers/sh/quicklogic/write_fasm.f4pga.sh +++ /dev/null @@ -1,43 +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 "$@" - -TOP="${EBLIF%.*}" -FASM_EXTRA="${TOP}_fasm_extra.fasm" - -export OUT_NOISY_WARNINGS=noisy_warnings-${DEVICE}_fasm.log - -ARCH_DEF="$ARCH_DEF" \ -EBLIF="$EBLIF" \ -DEVICE_NAME="$DEVICE_NAME" \ -VPR_OPTIONS="$VPR_OPTIONS" \ -RR_GRAPH="$RR_GRAPH" \ - python3 -m f4pga.wrappers.sh.genfasm - -echo "FASM extra: $FASM_EXTRA" -if [ -f $FASM_EXTRA ]; then - echo "writing final fasm" - cat ${TOP}.fasm $FASM_EXTRA > tmp.fasm - mv tmp.fasm ${TOP}.fasm -fi - -mv vpr_stdout.log fasm.log diff --git a/f4pga/wrappers/sh/xc7/write_fasm.f4pga.sh b/f4pga/wrappers/sh/xc7/write_fasm.f4pga.sh deleted file mode 100755 index dc68e0c..0000000 --- a/f4pga/wrappers/sh/xc7/write_fasm.f4pga.sh +++ /dev/null @@ -1,43 +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 "$@" - -TOP="${EBLIF%.*}" -FASM_EXTRA=${TOP}_fasm_extra.fasm - -export OUT_NOISY_WARNINGS=noisy_warnings-${DEVICE}_fasm.log - -ARCH_DEF="$ARCH_DEF" \ -EBLIF="$EBLIF" \ -DEVICE_NAME="$DEVICE_NAME" \ -VPR_OPTIONS="$VPR_OPTIONS" \ -RR_GRAPH="$RR_GRAPH" \ - python3 -m f4pga.wrappers.sh.genfasm - -echo "FASM extra: $FASM_EXTRA" -if [ -f $FASM_EXTRA ]; then - echo "writing final fasm" - cat ${TOP}.fasm $FASM_EXTRA > tmp.fasm - mv tmp.fasm ${TOP}.fasm -fi - -mv vpr_stdout.log fasm.log