From 2ba55ff84ca39213ca6417ea7f0b038c9a7b5257 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 17 Oct 2017 23:31:08 +0200
Subject: [PATCH] Database progress

Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
---
 fuzzers/005-tilegrid/generate.py |  1 +
 fuzzers/010-lutinit/.gitignore   |  4 +++-
 fuzzers/010-lutinit/Makefile     | 22 +++++++++++++++++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/fuzzers/005-tilegrid/generate.py b/fuzzers/005-tilegrid/generate.py
index 3b3a04bf..66687ecc 100644
--- a/fuzzers/005-tilegrid/generate.py
+++ b/fuzzers/005-tilegrid/generate.py
@@ -53,6 +53,7 @@ for record in tiles:
         segment_name = "SEG_" + tile_name
         database["segments"][segment_name] = dict()
         database["segments"][segment_name]["tiles"] = [tile_name]
+        database["segments"][segment_name]["type"] = "SEG_" + tile_type
         if framebaseaddr is not None:
             database["segments"][segment_name]["baseaddr"] = [framebaseaddr, 0]
         database["tiles"][tile_name]["segment"] = segment_name
diff --git a/fuzzers/010-lutinit/.gitignore b/fuzzers/010-lutinit/.gitignore
index 47f246a6..046704d8 100644
--- a/fuzzers/010-lutinit/.gitignore
+++ b/fuzzers/010-lutinit/.gitignore
@@ -1,2 +1,4 @@
 /specimen_[0-9][0-9][0-9]/
-/database.txt
+/lutbits.txt
+/seg_clbl[lm]_[rl].segbits
+/seg_clbl[lm].segbits
diff --git a/fuzzers/010-lutinit/Makefile b/fuzzers/010-lutinit/Makefile
index 0273a2a7..f249c877 100644
--- a/fuzzers/010-lutinit/Makefile
+++ b/fuzzers/010-lutinit/Makefile
@@ -1,13 +1,29 @@
 
+include ../../settings.sh
+
 N := 1
 SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
-database.txt: $(SPECIMENS_OK)
-	../../tools/segmatch -o database.txt \
+database: $(SPECIMENS_OK)
+	../../tools/segmatch -o lutbits.txt \
 		$(addsuffix /segdata_0.txt,$(SPECIMENS)) \
 		$(addsuffix /segdata_1.txt,$(SPECIMENS)) \
 		$(addsuffix /segdata_2.txt,$(SPECIMENS))
+	grep '^CLBLL_L\.' lutbits.txt | cut -f2- -d. | sort > seg_clbll_l.segbits
+	grep '^CLBLL_R\.' lutbits.txt | cut -f2- -d. | sort > seg_clbll_r.segbits
+	grep '^CLBLM_L\.' lutbits.txt | cut -f2- -d. | sort > seg_clblm_l.segbits
+	grep '^CLBLM_R\.' lutbits.txt | cut -f2- -d. | sort > seg_clblm_r.segbits
+	cmp seg_clbll_l.segbits seg_clbll_r.segbits
+	cmp seg_clblm_l.segbits seg_clblm_r.segbits
+
+pushdb/%:
+	touch ../../database/$(XRAY_DATABASE)/seg_$(notdir $@).segbits
+	sort -u ../../database/$(XRAY_DATABASE)/seg_$(notdir $@).segbits \
+			seg_$(notdir $@)_?.segbits  > seg_$(notdir $@).segbits
+	cp seg_$(notdir $@).segbits ../../database/$(XRAY_DATABASE)/seg_$(notdir $@).segbits
+
+pushdb: pushdb/clbll pushdb/clblm
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
@@ -16,5 +32,5 @@ $(SPECIMENS_OK):
 clean:
 	rm -rf $(SPECIMENS)
 
-.PHONY: clean
+.PHONY: database pushdb clean