diff --git a/Makefile b/Makefile index 271650219..cdc4478d2 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ clean: @ cd abc_with_bb_support && make clean @ cd ace2 && make clean @ cd vpr7_x2p && make clean - @ cd vtr_release && make clean +# @ cd vtr_release && make clean clean_vpr: @ cd vpr && make clean diff --git a/README_Benchmarks.md b/README_Benchmarks.md index 14880fdf5..b9797186e 100644 --- a/README_Benchmarks.md +++ b/README_Benchmarks.md @@ -3,8 +3,7 @@ ### Benchmarks README ### ######### -fpga_flow is a folder which contains benchmarks testing the performances of the tool on a known variety of benchmarks. In order to launch them, a script called run_openfpga_testbench_study.sh is called. This script is based on different other scripts which can be found in the script folder. +fpga_flow is a folder which contains benchmarks testing the performances of the tool on a known variety of benchmarks. In order to launch them, a script called run_fpga_spice_testbench_study.sh is called. This script is based on different other scripts which can be found in the script folder. The different benchmarks can be found in the fpga_spice_bench.txt found in the benchmarks folder. By commenting them, the script will not read them and not run through them. This can be useful if you want to focus on one benchmark in particular for example. -At the moment, we do not change the diff --git a/fpga_flow/configs/fpga_spice/k6_N10_sram_tsmc40nm_TT.conf b/fpga_flow/configs/fpga_spice/k6_N10_sram_tsmc40nm_TT.conf index 01484fffa..c1b8e817d 100644 --- a/fpga_flow/configs/fpga_spice/k6_N10_sram_tsmc40nm_TT.conf +++ b/fpga_flow/configs/fpga_spice/k6_N10_sram_tsmc40nm_TT.conf @@ -4,7 +4,7 @@ script_base = /research/ece/lnis/USERS/chauviere/OpenFPGA/fpga_flow/scripts/ benchmark_dir = /research/ece/lnis/USERS/chauviere/OpenFPGA/fpga_flow/benchmarks/FPGA_SPICE_bench odin2_path = /research/ece/lnis/USERS/chauviere/OpenFPGA/fpga_flow/not_used_atm/odin2.exe cirkit_path = /research/ece/lnis/USERS/chauviere/OpenFPGA/fpga_flow/not_used_atm/cirkit -abc_path = /research/ece/lnis/USERS/chauviere/OpenFPGA/fpga_flow/../abc_with_bb_support/abc +abc_path = /research/ece/lnis/USERS/chauviere/OpenFPGA/fpga_flow/../abc/abc abc_mccl_path = /research/ece/lnis/USERS/chauviere/OpenFPGA/fpga_flow/../abc_with_bb_support/abc abc_with_bb_support_path = /research/ece/lnis/USERS/chauviere/OpenFPGA/fpga_flow/../abc_with_bb_support/abc mpack1_path = /research/ece/lnis/USERS/chauviere/OpenFPGA/fpga_flow/not_used_atm/mpack1 diff --git a/fpga_flow/scripts/generate_config.pl b/fpga_flow/scripts/generate_config.pl index ef13e6832..8871223ed 100644 --- a/fpga_flow/scripts/generate_config.pl +++ b/fpga_flow/scripts/generate_config.pl @@ -20,7 +20,7 @@ $CONFIG_PATH = "${FPGA_FLOW_PATH}/configs/fpga_spice/k6_N10_sram_tsmc40nm_TT.con sub print_usage() { - print "\n The configuration file is being generated. \nThe output is placed in ../configs/fpga_spice/k6_N10_sram_tsmc40nm_TT.conf\n"; + print "\nThe configuration file is being generated. \nThe output is placed in ../configs/fpga_spice/k6_N10_sram_tsmc40nm_TT.conf\n"; return 1; } @@ -54,7 +54,7 @@ sub generate_file($) print $CONF_HANDLE "benchmark_dir = ${FPGA_FLOW_PATH}/benchmarks/FPGA_SPICE_bench\n"; print $CONF_HANDLE "odin2_path = ${FPGA_FLOW_PATH}/not_used_atm/odin2.exe\n"; print $CONF_HANDLE "cirkit_path = ${FPGA_FLOW_PATH}/not_used_atm/cirkit\n"; - print $CONF_HANDLE "abc_path = ${FPGA_FLOW_PATH}/../abc_with_bb_support/abc\n"; + print $CONF_HANDLE "abc_path = ${FPGA_FLOW_PATH}/../abc/abc\n"; print $CONF_HANDLE "abc_mccl_path = ${FPGA_FLOW_PATH}/../abc_with_bb_support/abc\n"; print $CONF_HANDLE "abc_with_bb_support_path = ${FPGA_FLOW_PATH}/../abc_with_bb_support/abc\n"; print $CONF_HANDLE "mpack1_path = ${FPGA_FLOW_PATH}/not_used_atm/mpack1\n";