From 683817460f2595c9a3bd5c8724f3cf3886691147 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Mon, 22 Oct 2018 14:54:06 -0700 Subject: [PATCH] Allow empty segement generation on select fuzzers that loop Signed-off-by: John McMaster --- fuzzers/051-imuxlout/generate.py | 2 +- fuzzers/052-clkin/generate.py | 2 +- fuzzers/053-ctrlin/generate.py | 2 +- fuzzers/057-bipips/generate.py | 2 +- prjxray/segmaker.py | 9 +++++---- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fuzzers/051-imuxlout/generate.py b/fuzzers/051-imuxlout/generate.py index a8638ee2..13c74782 100644 --- a/fuzzers/051-imuxlout/generate.py +++ b/fuzzers/051-imuxlout/generate.py @@ -65,4 +65,4 @@ def bitfilter(frame_idx, bit_idx): segmk.compile(bitfilter=bitfilter) -segmk.write() +segmk.write(allow_empty=True) diff --git a/fuzzers/052-clkin/generate.py b/fuzzers/052-clkin/generate.py index 4d39578c..1090497b 100644 --- a/fuzzers/052-clkin/generate.py +++ b/fuzzers/052-clkin/generate.py @@ -64,4 +64,4 @@ def bitfilter(frame_idx, bit_idx): segmk.compile(bitfilter=bitfilter) -segmk.write() +segmk.write(allow_empty=True) diff --git a/fuzzers/053-ctrlin/generate.py b/fuzzers/053-ctrlin/generate.py index d58c6f86..8bef4ac4 100644 --- a/fuzzers/053-ctrlin/generate.py +++ b/fuzzers/053-ctrlin/generate.py @@ -62,4 +62,4 @@ def bitfilter(frame_idx, bit_idx): segmk.compile(bitfilter=bitfilter) -segmk.write() +segmk.write(allow_empty=True) diff --git a/fuzzers/057-bipips/generate.py b/fuzzers/057-bipips/generate.py index d22412fe..10837375 100644 --- a/fuzzers/057-bipips/generate.py +++ b/fuzzers/057-bipips/generate.py @@ -46,4 +46,4 @@ def bitfilter(frame_idx, bit_idx): segmk.compile(bitfilter=bitfilter) -segmk.write() +segmk.write(allow_empty=True) diff --git a/prjxray/segmaker.py b/prjxray/segmaker.py index 9ce7e832..33fe1354 100644 --- a/prjxray/segmaker.py +++ b/prjxray/segmaker.py @@ -260,12 +260,13 @@ class Segmaker: print("Grid DB had %u tile types" % len(tile_types_found)) assert ntags and ntags == len(tags_used) - def write(self, suffix=None, roi=False): + def write(self, suffix=None, roi=False, allow_empty=False): assert self.segments_by_type, 'No data to write' - assert sum( - [len(segments) for segments in self.segments_by_type.values() - ]) != 0 + if not allow_empty: + assert sum( + [len(segments) for segments in self.segments_by_type.values() + ]) != 0 for segtype in self.segments_by_type.keys(): if suffix is not None: