From 753eb2e3e147c7f5db7a96bc18571d05ab9f7ea8 Mon Sep 17 00:00:00 2001 From: Daniel Schultz Date: Sat, 13 Mar 2021 10:50:43 +0100 Subject: [PATCH 1/2] fuzzers: 005: Makefile: Rename clean and clean_all comamnds The 'make clean' command in the top-level Makefile calls 'clean' of all fuzzers. The top-level Makefile does not source and settings file before and therefore no XRAY_PART is set. The 005's fuzzers only cleans data for a XRAY_PART file, which is not set. Remove all fuzzer data during clean and only for a specific part during clean_all. Signed-off-by: Daniel Schultz --- fuzzers/005-tilegrid/Makefile | 66 ++++++++++++------------- fuzzers/005-tilegrid/fuzzaddr/common.mk | 6 +-- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/fuzzers/005-tilegrid/Makefile b/fuzzers/005-tilegrid/Makefile index 9dee480c..2667fae9 100644 --- a/fuzzers/005-tilegrid/Makefile +++ b/fuzzers/005-tilegrid/Makefile @@ -165,13 +165,13 @@ $(BUILD_FOLDER)/tilegrid.json: generate_full.py $(BUILD_FOLDER)/tilegrid_tdb.jso cd $(BUILD_FOLDER) && python3 ${FUZDIR}/generate_full.py \ --json-in tilegrid_tdb.json --json-out ${BUILD_DIR}/tilegrid.json run: - $(MAKE) clean + $(MAKE) clean_part $(MAKE) database $(MAKE) pushdb touch run.${XRAY_PART}.ok clean: - rm -rf $(BUILD_FOLDER) run.${XRAY_PART}.ok + rm -rf build_* run.*.ok cd clb && $(MAKE) clean cd clb_int && $(MAKE) clean cd cfg && $(MAKE) clean @@ -201,36 +201,36 @@ clean: cd gtp_channel && $(MAKE) clean cd gtp_int_interface && $(MAKE) clean -clean_all: - rm -rf build_* run.*.ok - cd clb && $(MAKE) clean_all - cd clb_int && $(MAKE) clean_all - cd cfg && $(MAKE) clean_all - cd iob && $(MAKE) clean_all - cd iob_int && $(MAKE) clean_all - cd ioi && $(MAKE) clean_all - cd mmcm && $(MAKE) clean_all - cd pll && $(MAKE) clean_all - cd ps7_int && $(MAKE) clean_all - cd bram && $(MAKE) clean_all - cd bram_block && $(MAKE) clean_all - cd bram_int && $(MAKE) clean_all - cd dsp && $(MAKE) clean_all - cd dsp_int && $(MAKE) clean_all - cd fifo_int && $(MAKE) clean_all - cd monitor && $(MAKE) clean_all - cd monitor_int && $(MAKE) clean_all - cd cfg_int && $(MAKE) clean_all - cd orphan_int_column && $(MAKE) clean_all - cd clk_hrow && $(MAKE) clean_all - cd clk_bufg && $(MAKE) clean_all - cd hclk_cmt && $(MAKE) clean_all - cd hclk_ioi && $(MAKE) clean_all - cd pcie && $(MAKE) clean_all - cd pcie_int_interface && $(MAKE) clean_all - cd gtp_common && $(MAKE) clean_all - cd gtp_channel && $(MAKE) clean_all - cd gtp_int_interface && $(MAKE) clean_all +clean_part: + rm -rf $(BUILD_FOLDER) run.${XRAY_PART}.ok + cd clb && $(MAKE) clean_part + cd clb_int && $(MAKE) clean_part + cd cfg && $(MAKE) clean_part + cd iob && $(MAKE) clean_part + cd iob_int && $(MAKE) clean_part + cd ioi && $(MAKE) clean_part + cd mmcm && $(MAKE) clean_part + cd pll && $(MAKE) clean_part + cd ps7_int && $(MAKE) clean_part + cd bram && $(MAKE) clean_part + cd bram_block && $(MAKE) clean_part + cd bram_int && $(MAKE) clean_part + cd dsp && $(MAKE) clean_part + cd dsp_int && $(MAKE) clean_part + cd fifo_int && $(MAKE) clean_part + cd monitor && $(MAKE) clean_part + cd monitor_int && $(MAKE) clean_part + cd cfg_int && $(MAKE) clean_part + cd orphan_int_column && $(MAKE) clean_part + cd clk_hrow && $(MAKE) clean_part + cd clk_bufg && $(MAKE) clean_part + cd hclk_cmt && $(MAKE) clean_part + cd hclk_ioi && $(MAKE) clean_part + cd pcie && $(MAKE) clean_part + cd pcie_int_interface && $(MAKE) clean_part + cd gtp_common && $(MAKE) clean_part + cd gtp_channel && $(MAKE) clean_part + cd gtp_int_interface && $(MAKE) clean_part -.PHONY: database pushdb clean clean_all run +.PHONY: database pushdb clean clean_part run diff --git a/fuzzers/005-tilegrid/fuzzaddr/common.mk b/fuzzers/005-tilegrid/fuzzaddr/common.mk index de467608..08315df4 100644 --- a/fuzzers/005-tilegrid/fuzzaddr/common.mk +++ b/fuzzers/005-tilegrid/fuzzaddr/common.mk @@ -14,10 +14,10 @@ $(SPECIMENS_OK): touch $@ clean: - rm -rf $(BUILD_DIR) - -clean_all: rm -rf build_* +clean_part: + rm -rf $(BUILD_DIR) + .PHONY: database clean From 8cdc7123546b8969d4b9e5db1cd25599682d8ee3 Mon Sep 17 00:00:00 2001 From: Daniel Schultz Date: Sat, 13 Mar 2021 10:53:22 +0100 Subject: [PATCH 2/2] fuzzers: 065(b): Makefile: Rename clean_all to clean The fuzzer Makefile calls 'make clean' of all fuzzers. Both Makefiles do not have a clean but a clean_all command. Rename to also clean these data. Signed-off-by: Daniel Schultz --- fuzzers/065-gtp-common-pips/Makefile | 2 +- fuzzers/065b-gtp-common-pips/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fuzzers/065-gtp-common-pips/Makefile b/fuzzers/065-gtp-common-pips/Makefile index 389544b4..54580674 100644 --- a/fuzzers/065-gtp-common-pips/Makefile +++ b/fuzzers/065-gtp-common-pips/Makefile @@ -53,7 +53,7 @@ $(BUILD_DIR)/cmt_regions.csv: output_cmt.tcl mkdir -p $(BUILD_DIR) cd $(BUILD_DIR)/ && ${XRAY_VIVADO} -mode batch -source ${FUZDIR}/output_cmt.tcl -clean_all: +clean: rm -rf build_* run.*.ok pushdb: database diff --git a/fuzzers/065b-gtp-common-pips/Makefile b/fuzzers/065b-gtp-common-pips/Makefile index 355b460a..73380916 100644 --- a/fuzzers/065b-gtp-common-pips/Makefile +++ b/fuzzers/065b-gtp-common-pips/Makefile @@ -52,7 +52,7 @@ $(BUILD_DIR)/cmt_regions.csv: output_cmt.tcl mkdir -p $(BUILD_DIR) cd $(BUILD_DIR)/ && ${XRAY_VIVADO} -mode batch -source ${FUZDIR}/output_cmt.tcl -clean_all: +clean: rm -rf build_* run.*.ok pushdb: database