diff --git a/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh b/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh index cf40f84..7f12307 100755 --- a/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh +++ b/f4pga/wrappers/sh/xc7/vpr_common.f4pga.sh @@ -145,15 +145,3 @@ function run_genfasm { return $? } - -function run_vpr_xml_rr_graph { - set -e - - vpr ${ARCH_DEF} \ - ${EBLIF} \ - --read_rr_graph ${RR_GRAPH} - --write_rr_graph ${RR_GRAPH_XML} - $@ - - return $? -} diff --git a/f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh b/f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh index 2cf9aae..7b5f929 100755 --- a/f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh +++ b/f4pga/wrappers/sh/xc7/write_xml_rr_graph.f4pga.sh @@ -23,4 +23,8 @@ parse_args "$@" OUT_NOISY_WARNINGS=noisy_warnings-${DEVICE}_place.log -run_vpr_xml_rr_graph --pack +vpr ${ARCH_DEF} \ + ${EBLIF} \ + --read_rr_graph ${RR_GRAPH} \ + --write_rr_graph ${RR_GRAPH_XML} \ + --pack