Transition segmaker and fuzzers to new tilegrid format Signed-off-by: Clifford Wolf <clifford@clifford.at>
diff --git a/fuzzers/050-intpips/Makefile b/fuzzers/050-intpips/Makefile index 6e3b0f0..171d299 100644 --- a/fuzzers/050-intpips/Makefile +++ b/fuzzers/050-intpips/Makefile
@@ -4,12 +4,12 @@ SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_clbl[lm]_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS)) - ${XRAY_MASKMERGE} mask_clbll_l.segbits $(addsuffix /segdata_clbll_l.txt,$(SPECIMENS)) - ${XRAY_MASKMERGE} mask_clbll_r.segbits $(addsuffix /segdata_clbll_r.txt,$(SPECIMENS)) - ${XRAY_MASKMERGE} mask_clblm_l.segbits $(addsuffix /segdata_clblm_l.txt,$(SPECIMENS)) - ${XRAY_MASKMERGE} mask_clblm_r.segbits $(addsuffix /segdata_clblm_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_MASKMERGE} mask_clbll_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_MASKMERGE} mask_clbll_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_MASKMERGE} mask_clblm_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_MASKMERGE} mask_clblm_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_MERGEDB} int_l seg_int_l.segbits
diff --git a/fuzzers/051-imuxlout/Makefile b/fuzzers/051-imuxlout/Makefile index da59695..1016152 100644 --- a/fuzzers/051-imuxlout/Makefile +++ b/fuzzers/051-imuxlout/Makefile
@@ -4,8 +4,8 @@ SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_clbl[lm]_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_MERGEDB} int_l seg_int_l.segbits
diff --git a/fuzzers/052-clkin/Makefile b/fuzzers/052-clkin/Makefile index 5d71a14..a0f9a3e 100644 --- a/fuzzers/052-clkin/Makefile +++ b/fuzzers/052-clkin/Makefile
@@ -4,8 +4,8 @@ SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_clbl[lm]_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_MERGEDB} int_l seg_int_l.segbits
diff --git a/fuzzers/053-ctrlin/Makefile b/fuzzers/053-ctrlin/Makefile index 5d71a14..a0f9a3e 100644 --- a/fuzzers/053-ctrlin/Makefile +++ b/fuzzers/053-ctrlin/Makefile
@@ -4,8 +4,8 @@ SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_clbl[lm]_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_MERGEDB} int_l seg_int_l.segbits
diff --git a/fuzzers/054-gfan/Makefile b/fuzzers/054-gfan/Makefile index 5d71a14..a0f9a3e 100644 --- a/fuzzers/054-gfan/Makefile +++ b/fuzzers/054-gfan/Makefile
@@ -4,8 +4,8 @@ SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_clbl[lm]_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_MERGEDB} int_l seg_int_l.segbits
diff --git a/fuzzers/055-gnd/Makefile b/fuzzers/055-gnd/Makefile index 069063e..c7a87af 100644 --- a/fuzzers/055-gnd/Makefile +++ b/fuzzers/055-gnd/Makefile
@@ -4,8 +4,8 @@ SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_clbl[lm]_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_MERGEDB} int_l seg_int_l.segbits
diff --git a/fuzzers/056-rempips/Makefile b/fuzzers/056-rempips/Makefile index 9c96fe6..f6e6806 100644 --- a/fuzzers/056-rempips/Makefile +++ b/fuzzers/056-rempips/Makefile
@@ -4,8 +4,8 @@ SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_clbl[lm]_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_MERGEDB} int_l seg_int_l.segbits
diff --git a/fuzzers/057-bipips/Makefile b/fuzzers/057-bipips/Makefile index 4ade569..efbdfd0 100644 --- a/fuzzers/057-bipips/Makefile +++ b/fuzzers/057-bipips/Makefile
@@ -4,8 +4,8 @@ SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_clbl[lm]_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_MERGEDB} int_l seg_int_l.segbits
diff --git a/utils/segmaker.py b/utils/segmaker.py index 580edf1..5910096 100644 --- a/utils/segmaker.py +++ b/utils/segmaker.py
@@ -40,30 +40,25 @@ self.segments_by_type = dict() for tilename, tiledata in self.grid["tiles"].items(): - if "segment" not in tiledata: + if "baseaddr" not in tiledata: continue - segdata = self.grid["segments"][tiledata["segment"]] - - if "baseaddr" not in segdata: - continue - - if segdata["type"] not in self.segments_by_type: - self.segments_by_type[segdata["type"]] = dict() - segments = self.segments_by_type[segdata["type"]] + if tiledata["type"] not in self.segments_by_type: + self.segments_by_type[tiledata["type"]] = dict() + segments = self.segments_by_type[tiledata["type"]] tile_type = tiledata["type"] segname = "%s_%03d" % ( - segdata["baseaddr"][0][2:], segdata["baseaddr"][1]) + tiledata["baseaddr"][2:], tiledata["offset"]) def add_segbits(): if not segname in segments: segments[segname] = {"bits": set(), "tags": dict()} - base_frame = int(segdata["baseaddr"][0][2:], 16) + base_frame = int(tiledata["baseaddr"][2:], 16) for wordidx in range( - segdata["baseaddr"][1], - segdata["baseaddr"][1] + segdata["words"]): + tiledata["offset"], + tiledata["offset"] + tiledata["height"]): if base_frame not in self.bits: continue if wordidx not in self.bits[base_frame]: @@ -72,8 +67,7 @@ base_frame][wordidx]: bitname_frame = bit_frame - base_frame bitname_bit = 32 * ( - bit_wordidx - segdata["baseaddr"][1] - ) + bit_bitidx + bit_wordidx - tiledata["offset"]) + bit_bitidx if bitfilter is None or bitfilter(bitname_frame, bitname_bit): bitname = "%02d_%02d" % ( @@ -111,9 +105,9 @@ def write(self, suffix=None, roi=False): for segtype in self.segments_by_type.keys(): if suffix is not None: - filename = "segdata_%s_%s.txt" % (segtype, suffix) + filename = "segdata_%s_%s.txt" % (segtype.lower(), suffix) else: - filename = "segdata_%s.txt" % (segtype) + filename = "segdata_%s.txt" % (segtype.lower()) print("Writing %s." % filename)