From 10e022140e00f11d3629f4a7a0b7caa0b7b1c3a3 Mon Sep 17 00:00:00 2001
From: Karol Gugala <kgugala@antmicro.com>
Date: Tue, 23 Jul 2019 14:33:52 +0200
Subject: [PATCH] fuzzers: 007: reorganize Makefiles

Signed-off-by: Karol Gugala <kgugala@antmicro.com>
---
 fuzzers/007-timing/Makefile                   | 18 +++++++-----------
 fuzzers/007-timing/bel/Makefile               | 19 ++++++++++++++++++-
 .../007-timing/bel}/carry4delays.py           |  0
 fuzzers/007-timing/routing-bels/Makefile      |  1 +
 4 files changed, 26 insertions(+), 12 deletions(-)
 rename {utils => fuzzers/007-timing/bel}/carry4delays.py (100%)

diff --git a/fuzzers/007-timing/Makefile b/fuzzers/007-timing/Makefile
index 2ec3a800..60a3fad5 100644
--- a/fuzzers/007-timing/Makefile
+++ b/fuzzers/007-timing/Makefile
@@ -1,5 +1,5 @@
-SLICEL_SDFS = bel/build/CLBLL_L.sdf bel/build/CLBLL_R.sdf bel/build/CLBLM_L.sdf bel/build/CLBLM_R.sdf routing-bels/build/slicel.sdf
-SLICEM_SDFS = bel/build/CLBLL_L.sdf bel/build/CLBLL_R.sdf bel/build/CLBLM_L.sdf bel/build/CLBLM_R.sdf routing-bels/build/slicem.sdf
+SLICEL_SDFS = bel/build/slicel.sdf bel/build/carry4_slicel.sdf routing-bels/build/slicel.sdf
+SLICEM_SDFS = bel/build/slicem.sdf bel/build/carry4_slicem.sdf routing-bels/build/slicem.sdf
 
 run: all
 all: pushdb
@@ -8,21 +8,17 @@ clean:
 	cd bel && $(MAKE) clean
 	cd routing-bels && $(MAKE) clean
 
-bel/build/sdf.ok:
+bel/build/all_sdf.ok:
 	cd bel && $(MAKE)
 
-routing-bels/build/sdf:
+routing-bels/build/sdf.ok:
 	cd routing-bels && $(MAKE)
 
-mergesdfs: bel/build/sdf.ok routing-bels/build/sdf
+mergesdfs: bel/build/all_sdf.ok routing-bels/build/sdf.ok
 	mkdir -p sdfs
-	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs $(SLICEM_SDFS) --site SLICEM --out routing-bels/build/precarry_slicem.sdf
-	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs $(SLICEL_SDFS) --site SLICEL --out routing-bels/build/precarry_slicel.sdf
-	python3 ${XRAY_UTILS_DIR}/carry4delays.py --input routing-bels/build/precarry_slicem.sdf --output routing-bels/build/carry4_slicem.sdf
-	python3 ${XRAY_UTILS_DIR}/carry4delays.py --input routing-bels/build/precarry_slicel.sdf --output routing-bels/build/carry4_slicel.sdf
-	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs routing-bels/build/precarry_slicem.sdf routing-bels/build/carry4_slicem.sdf --site SLICEM --out sdfs/slicem.sdf
-	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs routing-bels/build/precarry_slicel.sdf routing-bels/build/carry4_slicel.sdf --site SLICEL --out sdfs/slicel.sdf --json debu.json
 	cp bel/build/*.sdf sdfs
+	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs $(SLICEM_SDFS) --site SLICEM --out sdfs/slicem.sdf
+	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs $(SLICEL_SDFS) --site SLICEL --out sdfs/slicel.sdf
 
 pushdb: mergesdfs
 	mkdir -p ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/timings
diff --git a/fuzzers/007-timing/bel/Makefile b/fuzzers/007-timing/bel/Makefile
index 7267b8d6..da76f091 100644
--- a/fuzzers/007-timing/bel/Makefile
+++ b/fuzzers/007-timing/bel/Makefile
@@ -1,10 +1,16 @@
-all: build/sdf.ok
+SLICEL_SDFS = build/CLBLL_L.sdf build/CLBLL_R.sdf build/CLBLM_L.sdf build/CLBLM_R.sdf
+SLICEM_SDFS = build/CLBLL_L.sdf build/CLBLL_R.sdf build/CLBLM_L.sdf build/CLBLM_R.sdf
 
+all: build/all_sdf.ok
+
+build/all_sdf.ok: build/carry4_slicel.sdf build/carry4_slicem.sdf
+	touch build/all_sdf.ok
 clean:
 	rm -rf build
 
 build/run.ok:
 	bash runme.sh
+	touch build/run.ok
 
 build/fixup_timings: build/run.ok
 	python3 fixup_timings_txt.py --txtin build/bel_timings.txt --txtout build/bel_timings.txt --site RAMBFIFO36E1 --slice BRAM_L --type timings
@@ -21,3 +27,14 @@ build/sdf.ok: build/bel_timings.json
 	python3 ${XRAY_UTILS_DIR}/makesdf.py --json=${PWD}/build/bel_timings.json --sdf=${PWD}/build
 	touch build/sdf.ok
 
+build/slicem.sdf: build/sdf.ok
+	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs $(SLICEL_SDFS) --site SLICEM --out build/slicem.sdf
+
+build/slicel.sdf: build/sdf.ok
+	python3 ${XRAY_UTILS_DIR}/sdfmerge.py --sdfs $(SLICEL_SDFS) --site SLICEL --out build/slicel.sdf
+
+build/carry4_slicem.sdf: build/slicem.sdf
+	python3 carry4delays.py --input build/slicem.sdf --output build/carry4_slicem.sdf
+
+build/carry4_slicel.sdf: build/slicel.sdf
+	python3 carry4delays.py --input build/slicel.sdf --output build/carry4_slicel.sdf
diff --git a/utils/carry4delays.py b/fuzzers/007-timing/bel/carry4delays.py
similarity index 100%
rename from utils/carry4delays.py
rename to fuzzers/007-timing/bel/carry4delays.py
diff --git a/fuzzers/007-timing/routing-bels/Makefile b/fuzzers/007-timing/routing-bels/Makefile
index ed041a1a..8cf875de 100644
--- a/fuzzers/007-timing/routing-bels/Makefile
+++ b/fuzzers/007-timing/routing-bels/Makefile
@@ -1,4 +1,5 @@
 all: build/slicel.sdf build/slicem.sdf
+	touch build/sdf.ok
 
 clean:
 	rm -rf build