From 22e1a8f7c30bb7ceda520f19c9a38bb5bca89f98 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Wed, 19 Feb 2020 16:31:15 -0800
Subject: [PATCH] Refactor how part specific for part generic fuzzers are
 marked.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 fuzzers/Makefile | 153 ++++++++++++++++++++---------------------------
 1 file changed, 65 insertions(+), 88 deletions(-)

diff --git a/fuzzers/Makefile b/fuzzers/Makefile
index bc216696..c880ed24 100644
--- a/fuzzers/Makefile
+++ b/fuzzers/Makefile
@@ -29,10 +29,10 @@ define fuzzer
 
 # $(1) - Fuzzer name/directory
 # $(2) - Space seperated list of dependencies for the fuzzer.
-# $(3) - Is this fuzzer setting specific?
+# $(3) - Is this fuzzer setting specific? Should be either "part" or "all"
 
 # Make the all target depend on the run.ok file for the fuzzer.
-ifeq ($(3),Y)
+ifeq ($(3),part)
 all: $(1)/run.$(XRAY_PART).ok
 part_only: $(1)/run.$(XRAY_PART).ok
 else
@@ -49,50 +49,27 @@ clean_logs::
 # Describe how to create the fuzzer's run.ok file.
 # This command must start with a + to tell make to pass the jobserver
 # parameters downwards.
-ifeq ($(VERBOSE),Y)
-
-# When verbose we just call make directory
-ifeq ($(3),Y)
 
+ifeq ($(3),part)
 $(1)/run.$(XRAY_PART).ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
-	$$(MAKE) -C $(1) run
-
 else
-
 $(1)/run.ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
-	$$(MAKE) -C $(1) run
-
 endif
-
+ifeq ($(VERBOSE),Y)
+# When verbose we just call make directory
+	$$(MAKE) -C $(1) run
 else
-
 # When not verbose, we use the run_fuzzer wrapper which will save the results
 # to log files.
-ifeq ($(3),Y)
-
-$(1)/run.$(XRAY_PART).ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
 	+@$(SELF_DIR)/run_fuzzer.py $(1)
-
-else
-
-$(1)/run.ok: $(addsuffix _$(XRAY_PART).ok,$(addprefix fuzzer_ok/fuzzer_, $(2)))
-	+@$(SELF_DIR)/run_fuzzer.py $(1)
-
 endif
 
-endif
-
-ifeq ($(3),Y)
-
+ifeq ($(3),part)
 fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok: $(1)/run.$(XRAY_PART).ok | fuzzer_ok
-	touch fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok
-
 else
-
 fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok: $(1)/run.ok | fuzzer_ok
-	touch fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok
-
 endif
+	touch fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok
 
 .PHONY: fuzzer_$(1)
 
@@ -100,78 +77,78 @@ fuzzer_$(1): fuzzer_ok/fuzzer_$(1)_$(XRAY_PART).ok
 
 endef
 
-$(eval $(call fuzzer,000-init-db,,Y))
+$(eval $(call fuzzer,000-init-db,,part))
 
 ifneq ($(FUZZONLY),Y)
-$(eval $(call fuzzer,001-part-yaml,000-init-db,Y))
-$(eval $(call fuzzer,005-tilegrid,001-part-yaml,Y))
+$(eval $(call fuzzer,001-part-yaml,000-init-db,part))
+$(eval $(call fuzzer,005-tilegrid,001-part-yaml,part))
 else
 all:: 005-tilegrid/run.ok
 	touch 005-tilegrid/run.ok
 endif
 
 ifneq ($(XRAY_DATABASE),kintex7)
-$(eval $(call fuzzer,007-timing,005-tilegrid,N))
+$(eval $(call fuzzer,007-timing,005-tilegrid,all))
 endif
-$(eval $(call fuzzer,010-clb-lutinit,005-tilegrid,N))
-$(eval $(call fuzzer,011-clb-ffconfig,005-tilegrid,N))
-$(eval $(call fuzzer,012-clb-n5ffmux,005-tilegrid,N))
-$(eval $(call fuzzer,013-clb-ncy0,005-tilegrid,N))
-$(eval $(call fuzzer,014-clb-ffsrcemux,005-tilegrid,N))
-$(eval $(call fuzzer,015-clb-nffmux,005-tilegrid,N))
-$(eval $(call fuzzer,016-clb-noutmux,005-tilegrid,N))
-$(eval $(call fuzzer,017-clb-precyinit,005-tilegrid,N))
-$(eval $(call fuzzer,018-clb-ram,005-tilegrid,N))
-$(eval $(call fuzzer,019-clb-ndi1mux,005-tilegrid,N))
-$(eval $(call fuzzer,025-bram-config,005-tilegrid,N))
-$(eval $(call fuzzer,026-bram-data,005-tilegrid,N))
-$(eval $(call fuzzer,027-bram36-config,005-tilegrid,N))
-$(eval $(call fuzzer,028-fifo-config,005-tilegrid,N))
-$(eval $(call fuzzer,029-bram-fifo-config,005-tilegrid,N))
-$(eval $(call fuzzer,030-iob,005-tilegrid,N))
-$(eval $(call fuzzer,032-cmt-pll,005-tilegrid,N))
-$(eval $(call fuzzer,034-cmt-pll-pips,005-tilegrid 071-ppips,N))
-$(eval $(call fuzzer,035-iob-ilogic,005-tilegrid,N))
-$(eval $(call fuzzer,035a-iob-idelay,005-tilegrid,N))
-$(eval $(call fuzzer,036-iob-ologic,005-tilegrid,N))
-$(eval $(call fuzzer,037-iob-pips,005-tilegrid,N))
-$(eval $(call fuzzer,038-cfg,005-tilegrid,N))
-$(eval $(call fuzzer,039-hclk-config,005-tilegrid,N))
-$(eval $(call fuzzer,040-clk-hrow-config,005-tilegrid,N))
-$(eval $(call fuzzer,041-clk-hrow-pips,005-tilegrid,N))
-$(eval $(call fuzzer,042-clk-bufg-config,005-tilegrid,N))
-$(eval $(call fuzzer,043-clk-rebuf-pips,005-tilegrid,N))
-$(eval $(call fuzzer,044-clk-bufg-pips,046-clk-bufg-muxed-pips,N))
-$(eval $(call fuzzer,045-hclk-cmt-pips,005-tilegrid,N))
-$(eval $(call fuzzer,046-clk-bufg-muxed-pips,005-tilegrid,N))
-$(eval $(call fuzzer,047-hclk-ioi-pips,005-tilegrid,N))
-$(eval $(call fuzzer,047a-hclk-idelayctrl-pips,047-hclk-ioi-pips,N))
-$(eval $(call fuzzer,048-int-piplist,005-tilegrid,N))
-$(eval $(call fuzzer,049-int-imux-gfan,048-int-piplist,N))
-$(eval $(call fuzzer,050-pip-seed,048-int-piplist,N))
-$(eval $(call fuzzer,051-pip-imuxlout-bypalts,048-int-piplist,N))
-$(eval $(call fuzzer,052-pip-clkin,048-int-piplist,N))
-$(eval $(call fuzzer,053-pip-ctrlin,048-int-piplist,N))
-$(eval $(call fuzzer,054-pip-fan-alt,048-int-piplist,N))
-$(eval $(call fuzzer,055-pip-gnd,048-int-piplist,N))
-$(eval $(call fuzzer,056-pip-rem,049-int-imux-gfan 050-pip-seed 051-pip-imuxlout-bypalts 052-pip-clkin 053-pip-ctrlin 054-pip-fan-alt 055-pip-gnd 059-pip-byp-bounce,N))
-$(eval $(call fuzzer,057-pip-bi,056-pip-rem,N))
+$(eval $(call fuzzer,010-clb-lutinit,005-tilegrid,all))
+$(eval $(call fuzzer,011-clb-ffconfig,005-tilegrid,all))
+$(eval $(call fuzzer,012-clb-n5ffmux,005-tilegrid,all))
+$(eval $(call fuzzer,013-clb-ncy0,005-tilegrid,all))
+$(eval $(call fuzzer,014-clb-ffsrcemux,005-tilegrid,all))
+$(eval $(call fuzzer,015-clb-nffmux,005-tilegrid,all))
+$(eval $(call fuzzer,016-clb-noutmux,005-tilegrid,all))
+$(eval $(call fuzzer,017-clb-precyinit,005-tilegrid,all))
+$(eval $(call fuzzer,018-clb-ram,005-tilegrid,all))
+$(eval $(call fuzzer,019-clb-ndi1mux,005-tilegrid,all))
+$(eval $(call fuzzer,025-bram-config,005-tilegrid,all))
+$(eval $(call fuzzer,026-bram-data,005-tilegrid,all))
+$(eval $(call fuzzer,027-bram36-config,005-tilegrid,all))
+$(eval $(call fuzzer,028-fifo-config,005-tilegrid,all))
+$(eval $(call fuzzer,029-bram-fifo-config,005-tilegrid,all))
+$(eval $(call fuzzer,030-iob,005-tilegrid,all))
+$(eval $(call fuzzer,032-cmt-pll,005-tilegrid,all))
+$(eval $(call fuzzer,034-cmt-pll-pips,005-tilegrid 071-ppips,all))
+$(eval $(call fuzzer,035-iob-ilogic,005-tilegrid,all))
+$(eval $(call fuzzer,035a-iob-idelay,005-tilegrid,all))
+$(eval $(call fuzzer,036-iob-ologic,005-tilegrid,all))
+$(eval $(call fuzzer,037-iob-pips,005-tilegrid,all))
+$(eval $(call fuzzer,038-cfg,005-tilegrid,all))
+$(eval $(call fuzzer,039-hclk-config,005-tilegrid,all))
+$(eval $(call fuzzer,040-clk-hrow-config,005-tilegrid,all))
+$(eval $(call fuzzer,041-clk-hrow-pips,005-tilegrid,all))
+$(eval $(call fuzzer,042-clk-bufg-config,005-tilegrid,all))
+$(eval $(call fuzzer,043-clk-rebuf-pips,005-tilegrid,all))
+$(eval $(call fuzzer,044-clk-bufg-pips,046-clk-bufg-muxed-pips,all))
+$(eval $(call fuzzer,045-hclk-cmt-pips,005-tilegrid,all))
+$(eval $(call fuzzer,046-clk-bufg-muxed-pips,005-tilegrid,all))
+$(eval $(call fuzzer,047-hclk-ioi-pips,005-tilegrid,all))
+$(eval $(call fuzzer,047a-hclk-idelayctrl-pips,047-hclk-ioi-pips,all))
+$(eval $(call fuzzer,048-int-piplist,005-tilegrid,all))
+$(eval $(call fuzzer,049-int-imux-gfan,048-int-piplist,all))
+$(eval $(call fuzzer,050-pip-seed,048-int-piplist,all))
+$(eval $(call fuzzer,051-pip-imuxlout-bypalts,048-int-piplist,all))
+$(eval $(call fuzzer,052-pip-clkin,048-int-piplist,all))
+$(eval $(call fuzzer,053-pip-ctrlin,048-int-piplist,all))
+$(eval $(call fuzzer,054-pip-fan-alt,048-int-piplist,all))
+$(eval $(call fuzzer,055-pip-gnd,048-int-piplist,all))
+$(eval $(call fuzzer,056-pip-rem,049-int-imux-gfan 050-pip-seed 051-pip-imuxlout-bypalts 052-pip-clkin 053-pip-ctrlin 054-pip-fan-alt 055-pip-gnd 059-pip-byp-bounce,all))
+$(eval $(call fuzzer,057-pip-bi,056-pip-rem,all))
 ifneq ($(QUICK),Y)
-$(eval $(call fuzzer,058-pip-hclk,005-tilegrid,N))
-$(eval $(call fuzzer,059-pip-byp-bounce,048-int-piplist,N))
-$(eval $(call fuzzer,060-bram-cascades,005-tilegrid,N))
-$(eval $(call fuzzer,071-ppips,057-pip-bi 058-pip-hclk 060-bram-cascades,N))
+$(eval $(call fuzzer,058-pip-hclk,005-tilegrid,all))
+$(eval $(call fuzzer,059-pip-byp-bounce,048-int-piplist,all))
+$(eval $(call fuzzer,060-bram-cascades,005-tilegrid,all))
+$(eval $(call fuzzer,071-ppips,057-pip-bi 058-pip-hclk 060-bram-cascades,all))
 ifneq ($(BITONLY),Y)
-$(eval $(call fuzzer,072-ordered_wires,,Y))
-$(eval $(call fuzzer,073-get_counts,,Y))
-$(eval $(call fuzzer,074-dump_all,005-tilegrid 072-ordered_wires,Y))
-$(eval $(call fuzzer,075-pins,,Y))
+$(eval $(call fuzzer,072-ordered_wires,,part))
+$(eval $(call fuzzer,073-get_counts,,part))
+$(eval $(call fuzzer,074-dump_all,005-tilegrid 072-ordered_wires,part))
+$(eval $(call fuzzer,075-pins,,part))
 ifeq ($(XRAY_DATABASE),zynq7)
-$(eval $(call fuzzer,076-ps7,,N))
+$(eval $(call fuzzer,076-ps7,,all))
 endif
 endif
 endif
-$(eval $(call fuzzer,100-dsp-mskpat,005-tilegrid,N))
+$(eval $(call fuzzer,100-dsp-mskpat,005-tilegrid,all))
 
 quick:
 	$(MAKE) QUICK=Y