From c37c1082dedb1032f909141c7e1a39e834a411e5 Mon Sep 17 00:00:00 2001
From: John McMaster <johndmcmaster@gmail.com>
Date: Wed, 5 Dec 2018 17:35:36 -0800
Subject: [PATCH] quick: merge into main makefile

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
---
 fuzzers/050-intpips/Makefile |  6 +++++-
 fuzzers/Makefile             | 15 +++++++++++++++
 fuzzers/int_loop.mk          |  3 +++
 fuzzers/quick.mk             | 32 --------------------------------
 4 files changed, 23 insertions(+), 33 deletions(-)
 delete mode 100644 fuzzers/quick.mk

diff --git a/fuzzers/050-intpips/Makefile b/fuzzers/050-intpips/Makefile
index 404b6365..f74f5de5 100644
--- a/fuzzers/050-intpips/Makefile
+++ b/fuzzers/050-intpips/Makefile
@@ -1,5 +1,9 @@
-
+ifeq ($(QUICK),Y)
+N := 1
+else
 N := 200
+endif
+
 SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
diff --git a/fuzzers/Makefile b/fuzzers/Makefile
index b20e3c70..8c1234f6 100644
--- a/fuzzers/Makefile
+++ b/fuzzers/Makefile
@@ -1,3 +1,10 @@
+# Developer options for quicker runs
+# Run algorithm, but only a small number of iterations
+QUICK=N
+# Skip metadata steps like tile and part generation
+# Ex: FUZZONLY=N: 30 min, FUZZONLY=Y: 6 min
+FUZZONLY=N
+
 define fuzzer
 all:: $(1)/run.ok
 clean::
@@ -6,8 +13,14 @@ $(1)/run.ok: $(addsuffix /run.ok,$(2))
 	$$(MAKE) -C $(1) run
 endef
 
+ifneq ($(FUZZONLY),Y)
 $(eval $(call fuzzer,001-part-yaml,))
 $(eval $(call fuzzer,005-tilegrid,001-part-yaml))
+else
+all:: 005-tilegrid/run.ok
+	touch 005-tilegrid/run.ok
+endif
+
 $(eval $(call fuzzer,010-lutinit,005-tilegrid))
 $(eval $(call fuzzer,011-ffconfig,005-tilegrid))
 $(eval $(call fuzzer,012-clbn5ffmux,005-tilegrid))
@@ -29,7 +42,9 @@ $(eval $(call fuzzer,055-gnd,050-intpips))
 $(eval $(call fuzzer,056-rempips,051-imuxlout 052-clkin 053-ctrlin 054-gfan 055-gnd))
 $(eval $(call fuzzer,057-bipips,056-rempips))
 $(eval $(call fuzzer,058-hclkpips,056-rempips))
+ifneq ($(QUICK),Y)
 $(eval $(call fuzzer,071-ppips,057-bipips 058-hclkpips))
 $(eval $(call fuzzer,072-ordered_wires,))
 $(eval $(call fuzzer,073-get_counts,))
 $(eval $(call fuzzer,074-dump_all,072-ordered_wires))
+endif
diff --git a/fuzzers/int_loop.mk b/fuzzers/int_loop.mk
index b91f4670..e8bc538b 100644
--- a/fuzzers/int_loop.mk
+++ b/fuzzers/int_loop.mk
@@ -48,6 +48,9 @@ run:
             if make database; then \
                 make pushdb; \
             fi; \
+            if [ "$(QUICK)" = "Y" ] ; then \
+                break; \
+            fi \
         done; \
         true
 	touch run.ok
diff --git a/fuzzers/quick.mk b/fuzzers/quick.mk
deleted file mode 100644
index 981de976..00000000
--- a/fuzzers/quick.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# Intended for CIT quick checks
-# Full run ("Makefile"): 10 hours
-# quick.mk (FUZZONLY=N): 30 min
-# quick.mk (FUZZONLY=Y): 6 min
-
-FUZZONLY=N
-
-define fuzzer
-all:: $(1)/run.ok
-clean::
-	$$(MAKE) -C $(1) clean
-$(1)/run.ok: $(addsuffix /run.ok,$(2))
-	$$(MAKE) -C $(1) run
-endef
-
-ifneq ($(FUZZONLY),Y)
-$(eval $(call fuzzer,001-part-yaml,))
-$(eval $(call fuzzer,005-tilegrid,001-part-yaml))
-endif
-
-$(eval $(call fuzzer,010-lutinit,005-tilegrid))
-$(eval $(call fuzzer,011-ffconfig,005-tilegrid))
-$(eval $(call fuzzer,012-clbn5ffmux,005-tilegrid))
-$(eval $(call fuzzer,013-clbncy0,005-tilegrid))
-$(eval $(call fuzzer,014-ffsrcemux,005-tilegrid))
-$(eval $(call fuzzer,015-clbnffmux,005-tilegrid))
-$(eval $(call fuzzer,016-clbnoutmux,005-tilegrid))
-$(eval $(call fuzzer,017-clbprecyinit,005-tilegrid))
-$(eval $(call fuzzer,018-clbram,005-tilegrid))
-$(eval $(call fuzzer,019-ndi1mux,005-tilegrid))
-$(eval $(call fuzzer,025-bram-config,005-tilegrid))
-$(eval $(call fuzzer,026-bram-data,005-tilegrid))