From 9d1490df89b48856108568cfb4d6e5f9c8a32cb3 Mon Sep 17 00:00:00 2001 From: Krzysztof Boronski <kboronski@antmicro.com> Date: Mon, 12 Sep 2022 19:16:49 +0200 Subject: [PATCH] Use python command to call scripts in tcl files Signed-off-by: Krzysztof Boronski <kboronski@antmicro.com> --- .../tool_data/yosys/scripts/vendor/quicklogic/pp3/synth.tcl | 4 ++-- .../tool_data/yosys/scripts/vendor/xilinx/xc7/synth.tcl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/f4pga/auxiliary/tool_data/yosys/scripts/vendor/quicklogic/pp3/synth.tcl b/f4pga/auxiliary/tool_data/yosys/scripts/vendor/quicklogic/pp3/synth.tcl index 6cfd590..a290623 100644 --- a/f4pga/auxiliary/tool_data/yosys/scripts/vendor/quicklogic/pp3/synth.tcl +++ b/f4pga/auxiliary/tool_data/yosys/scripts/vendor/quicklogic/pp3/synth.tcl @@ -95,11 +95,11 @@ log ">>> F4PGA Phase 2: Cell names fixup" # Write output JSON, fixup cell names using an external Python script write_json $f4pga_json_org -exec $f4pga_python3 ${f4pga_shareDir}/scripts/yosys_fixup_cell_names.py $f4pga_json_org $f4pga_json_presplit +exec $f4pga_python3 -m f4pga.utils.quicklogic.yosys_fixup_cell_names $f4pga_json_org $f4pga_json_presplit log ">>> F4PGA Phase 3: Splitting in/outs" -exec ${f4pga_python3} ${f4pga_shareDir}/scripts/split_inouts.py -i $f4pga_json_presplit -o $f4pga_json +exec ${f4pga_python3} -m f4pga.utils.split_inouts -i $f4pga_json_presplit -o $f4pga_json log ">>> F4PGA Phase 4: Writing eblif" diff --git a/f4pga/auxiliary/tool_data/yosys/scripts/vendor/xilinx/xc7/synth.tcl b/f4pga/auxiliary/tool_data/yosys/scripts/vendor/xilinx/xc7/synth.tcl index a62981d..a6a91e3 100644 --- a/f4pga/auxiliary/tool_data/yosys/scripts/vendor/xilinx/xc7/synth.tcl +++ b/f4pga/auxiliary/tool_data/yosys/scripts/vendor/xilinx/xc7/synth.tcl @@ -286,7 +286,7 @@ write_json $f4pga_json_presplit log ">>> F4PGA Phase 2: Splitting in/outs" -exec ${f4pga_python3} ${f4pga_shareDir}/scripts/split_inouts.py -i $f4pga_json_presplit -o $f4pga_json +exec ${f4pga_python3} -m f4pga.utils.split_inouts -i $f4pga_json_presplit -o $f4pga_json log ">>> F4PGA Phase 3: Writing eblif"