From 3ee95542b8f7d9603cfffc06826ce6d54a5b431e Mon Sep 17 00:00:00 2001
From: Maciej Kurc <mkurc@antmicro.com>
Date: Tue, 26 Nov 2019 12:25:51 +0100
Subject: [PATCH] Enabled 035b in Makefile

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>
---
 fuzzers/035-iob-ilogic/Makefile   |  9 +++++++--
 fuzzers/035b-iob-iserdes/Makefile | 10 +++++++---
 fuzzers/Makefile                  |  1 +
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/fuzzers/035-iob-ilogic/Makefile b/fuzzers/035-iob-ilogic/Makefile
index e0e708a0..e6a26e88 100644
--- a/fuzzers/035-iob-ilogic/Makefile
+++ b/fuzzers/035-iob-ilogic/Makefile
@@ -10,8 +10,13 @@ include ../fuzzer.mk
 
 database: build/segbits_xioi3.db
 
-build/segbits_xioi3.rdb: $(SPECIMENS_OK)
-	${XRAY_SEGMATCH} -c 6 -o build/segbits_xioi3.rdb $$(find -name segdata_*)
+build/segbits_xioi3.rdb2: $(SPECIMENS_OK)
+	${XRAY_SEGMATCH} -c 6 -o build/segbits_xioi3.rdb2 $$(find -name segdata_*)
+
+build/segbits_xioi3.rdb: build/segbits_xioi3.rdb2
+	# Filter out ISERDES features. Also filter DYN_CLK_INV_EN as they should
+	# belong to ISEDRES and are solved by fuzzer 035b.
+	grep -v ".ISERDES." $^ | grep -v "DYN_" >$@
 
 build/segbits_xioi3.db: build/segbits_xioi3.rdb
 	${XRAY_DBFIXUP} --db-root build --zero-db bits.dbf --seg-fn-in $^ --seg-fn-out $@
diff --git a/fuzzers/035b-iob-iserdes/Makefile b/fuzzers/035b-iob-iserdes/Makefile
index 1bc5957e..784dc9d6 100644
--- a/fuzzers/035b-iob-iserdes/Makefile
+++ b/fuzzers/035b-iob-iserdes/Makefile
@@ -1,10 +1,14 @@
-N := 60
+N := 50
 include ../fuzzer.mk
 
 database: build/segbits_xiob33.db
 
-build/segbits_xiob33.rdb: $(SPECIMENS_OK)
-	${XRAY_SEGMATCH} -c 20 -m 1 -M 1 -o build/segbits_xiob33.rdb $$(find -name segdata_*.txt)
+build/segbits_xiob33.rdb2: $(SPECIMENS_OK)
+	${XRAY_SEGMATCH} -c 20 -m 1 -M 1 -o build/segbits_xiob33.rdb2 $$(find -name segdata_*.txt)
+
+build/segbits_xiob33.rdb: build/segbits_xiob33.rdb2
+	# Keep only solution for ISERDES related features.
+	grep -e ".ISERDES." $^ >$@
 
 build/segbits_xiob33.db: build/segbits_xiob33.rdb
 	${XRAY_DBFIXUP} --db-root build --zero-db bits.dbf --seg-fn-in $^ --seg-fn-out $@
diff --git a/fuzzers/Makefile b/fuzzers/Makefile
index c09f6b23..a882cdfa 100644
--- a/fuzzers/Makefile
+++ b/fuzzers/Makefile
@@ -117,6 +117,7 @@ $(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,035b-iob-iserdes,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))