hdl/csc/test: cleanup

timvideos · Aug 11, 2015 · 84b3fc2 · 84b3fc2
1 parent 63ed2f2
commit 84b3fc2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 27 deletions.
diff --git a/hdl/csc/test/Makefile b/hdl/csc/test/Makefile
@@ -11,3 +11,8 @@ ycbcr2rgb_tb:
 
 ycbcr_resampling_tb:
 	$(CMD) ycbcr_resampling_tb.py
+
+clean:
+	rm -rf *_*.png *.vvp *.v *.vcd
+
+.PHONY: clean
diff --git a/hdl/csc/test/rgb2ycbcr_tb.py b/hdl/csc/test/rgb2ycbcr_tb.py
@@ -15,21 +15,15 @@ def __init__(self):
         self.submodules.logger = PacketLogger(EndpointDescription([("data", 24)], packetized=True))
 
         self.comb += [
-            self.rgb2ycbcr.sink.stb.eq(self.streamer.source.stb),
-            self.rgb2ycbcr.sink.sop.eq(self.streamer.source.sop),
-            self.rgb2ycbcr.sink.eop.eq(self.streamer.source.eop),
+        	Record.connect(self.streamer.source, self.rgb2ycbcr.sink, leave_out=["data"]),
             self.rgb2ycbcr.sink.payload.r.eq(self.streamer.source.data[16:24]),
             self.rgb2ycbcr.sink.payload.g.eq(self.streamer.source.data[8:16]),
             self.rgb2ycbcr.sink.payload.b.eq(self.streamer.source.data[0:8]),
-            self.streamer.source.ack.eq(self.rgb2ycbcr.sink.ack),
 
-            self.logger.sink.stb.eq(self.rgb2ycbcr.source.stb),
-            self.logger.sink.sop.eq(self.rgb2ycbcr.source.sop),
-            self.logger.sink.eop.eq(self.rgb2ycbcr.source.eop),
+            Record.connect(self.rgb2ycbcr.source, self.logger.sink, leave_out=["y", "cb", "cr"]),
             self.logger.sink.data[16:24].eq(self.rgb2ycbcr.source.y),
             self.logger.sink.data[8:16].eq(self.rgb2ycbcr.source.cb),
-            self.logger.sink.data[0:8].eq(self.rgb2ycbcr.source.cr),
-            self.rgb2ycbcr.source.ack.eq(self.logger.sink.ack)
+            self.logger.sink.data[0:8].eq(self.rgb2ycbcr.source.cr)
         ]
 
 

diff --git a/hdl/csc/test/ycbcr2rgb_tb.py b/hdl/csc/test/ycbcr2rgb_tb.py
@@ -14,21 +14,15 @@ def __init__(self):
         self.submodules.logger = PacketLogger(EndpointDescription([("data", 24)], packetized=True))
 
         self.comb += [
-            self.ycbcr2rgb.sink.stb.eq(self.streamer.source.stb),
-            self.ycbcr2rgb.sink.sop.eq(self.streamer.source.sop),
-            self.ycbcr2rgb.sink.eop.eq(self.streamer.source.eop),
+            Record.connect(self.streamer.source, self.ycbcr2rgb.sink, leave_out=["data"]),
             self.ycbcr2rgb.sink.payload.y.eq(self.streamer.source.data[16:24]),
             self.ycbcr2rgb.sink.payload.cb.eq(self.streamer.source.data[8:16]),
             self.ycbcr2rgb.sink.payload.cr.eq(self.streamer.source.data[0:8]),
-            self.streamer.source.ack.eq(self.ycbcr2rgb.sink.ack),
 
-            self.logger.sink.stb.eq(self.ycbcr2rgb.source.stb),
-            self.logger.sink.sop.eq(self.ycbcr2rgb.source.sop),
-            self.logger.sink.eop.eq(self.ycbcr2rgb.source.eop),
+            Record.connect(self.ycbcr2rgb.source, self.logger.sink, leave_out=["r", "g", "b"]),
             self.logger.sink.data[16:24].eq(self.ycbcr2rgb.source.r),
             self.logger.sink.data[8:16].eq(self.ycbcr2rgb.source.g),
-            self.logger.sink.data[0:8].eq(self.ycbcr2rgb.source.b),
-            self.ycbcr2rgb.source.ack.eq(self.logger.sink.ack)
+            self.logger.sink.data[0:8].eq(self.ycbcr2rgb.source.b)
         ]
 
     def gen_simulation(self, selfp):

diff --git a/hdl/csc/test/ycbcr_resampling_tb.py b/hdl/csc/test/ycbcr_resampling_tb.py
@@ -17,23 +17,17 @@ def __init__(self):
         self.submodules.logger = PacketLogger(EndpointDescription([("data", 24)], packetized=True))
 
         self.comb += [
-            self.ycbcr444to422.sink.stb.eq(self.streamer.source.stb),
-            self.ycbcr444to422.sink.sop.eq(self.streamer.source.sop),
-            self.ycbcr444to422.sink.eop.eq(self.streamer.source.eop),
+            Record.connect(self.streamer.source, self.ycbcr444to422.sink, leave_out=["data"]),
             self.ycbcr444to422.sink.payload.y.eq(self.streamer.source.data[16:24]),
             self.ycbcr444to422.sink.payload.cb.eq(self.streamer.source.data[8:16]),
             self.ycbcr444to422.sink.payload.cr.eq(self.streamer.source.data[0:8]),
-            self.streamer.source.ack.eq(self.ycbcr444to422.sink.ack),
 
             Record.connect(self.ycbcr444to422.source, self.ycbcr422to444.sink),
 
-            self.logger.sink.stb.eq(self.ycbcr422to444.source.stb),
-            self.logger.sink.sop.eq(self.ycbcr422to444.source.sop),
-            self.logger.sink.eop.eq(self.ycbcr422to444.source.eop),
+            Record.connect(self.ycbcr422to444.source, self.logger.sink, leave_out=["y", "cb", "cr"]),
             self.logger.sink.data[16:24].eq(self.ycbcr422to444.source.y),
             self.logger.sink.data[8:16].eq(self.ycbcr422to444.source.cb),
-            self.logger.sink.data[0:8].eq(self.ycbcr422to444.source.cr),
-            self.ycbcr422to444.source.ack.eq(self.logger.sink.ack)
+            self.logger.sink.data[0:8].eq(self.ycbcr422to444.source.cr)
         ]