Set zero latency for Cat, Slice, Pointer with a constant ptr, and _BinaryShiftOperator with a constant shift-amount.

Author: shtaxxx

tests/extension/stream_/average/test_stream_average.py

@@ -147,8 +147,8 @@
   reg signed [32-1:0] __delay_data_31;
   reg signed [32-1:0] _plus_data_25;
   reg signed [32-1:0] __delay_data_32;
-  reg signed [32-1:0] _sra_data_26;
-  reg signed [32-1:0] __delay_data_33;
+  wire signed [32-1:0] _sra_data_26;
+  assign _sra_data_26 = _plus_data_25 >>> 3'sd3;
   reg signed [32-1:0] _plus_data_28;
   assign zdata = _plus_data_28;
 
@@ -173,8 +173,6 @@
       __delay_data_31 <= 0;
       _plus_data_25 <= 0;
       __delay_data_32 <= 0;
-      _sra_data_26 <= 0;
-      __delay_data_33 <= 0;
       _plus_data_28 <= 0;
     end else begin
       _plus_data_2 <= xdata + 1'sd0;
@@ -196,9 +194,7 @@
       __delay_data_31 <= __delay_data_30;
       _plus_data_25 <= _plus_data_21 + _plus_data_24;
       __delay_data_32 <= __delay_data_31;
-      _sra_data_26 <= _plus_data_25 >>> 3'sd3;
-      __delay_data_33 <= __delay_data_32;
-      _plus_data_28 <= _sra_data_26 + __delay_data_33;
+      _plus_data_28 <= _sra_data_26 + __delay_data_32;
     end
   end
 

tests/extension/stream_/sra_round/stream_sra_round.py

@@ -13,6 +13,7 @@
 from decimal import Decimal, ROUND_HALF_UP, ROUND_HALF_EVEN
 from pprint import pprint
 
+
 def mkMain():
     # input variiable
     x = stream.Variable('xdata')
@@ -27,7 +28,7 @@ def mkMain():
     st = stream.Stream(z)
     m = st.to_module('main')
 
-    #st.draw_graph()
+    # st.draw_graph()
 
     return m, st.pipeline_depth()
 
@@ -82,9 +83,9 @@ def mkTest(numports=8):
     send_count = m.Reg('send_count', 32, initval=0)
     send_fsm.If(reset_done).goto_next()
 
-    test_val_boader = [-2147483648,-10, 1, 2147483637]
+    test_val_boader = [-2147483648, -10, 1, 2147483637]
     test_window = 9
-    test_shift = [0,1,2,3,15,16,17,30,31,32]
+    test_shift = [0, 1, 2, 3, 15, 16, 17, 30, 31, 32]
 
     for i in test_shift:
         for j in test_val_boader:
@@ -101,23 +102,25 @@ def mkTest(numports=8):
                 Display('xdata=%d', xdata),
                 Display('ydata=%d', ydata)
             )
-            send_fsm.goto_next(cond=send_count==test_window)
+            send_fsm.goto_next(cond=send_count == test_window)
 
     recv_fsm = FSM(m, 'recv_fsm', clk, rst)
     recv_count = m.Reg('recv_count', 32, initval=0)
     recv_fsm.If(reset_done).goto_next()
 
-    recv_fsm(
-        recv_count(0),
-    )
-    recv_fsm.goto_next()
+    if latency >= 1:
+        recv_fsm(
+            recv_count(0),
+        )
+        recv_fsm.goto_next()
 
-    recv_fsm.If(recv_count < latency-2)(
-        recv_count.inc()
-    ).Else(
-        recv_count(0)
-    )
-    recv_fsm.goto_next(cond=recv_count>=latency-2)
+    if latency >= 2:
+        recv_fsm.If(recv_count < latency - 2)(
+            recv_count.inc()
+        ).Else(
+            recv_count(0)
+        )
+        recv_fsm.goto_next(cond=recv_count >= latency - 2)
 
     for i in test_shift:
         for j in test_val_boader:
@@ -130,7 +133,7 @@ def mkTest(numports=8):
                 Display('zdata=%d', zdata),
                 recv_count.inc()
             )
-            recv_fsm.goto_next(cond=recv_count==test_window)
+            recv_fsm.goto_next(cond=recv_count == test_window)
 
     recv_fsm(
         end_of_sim(1)
@@ -148,15 +151,20 @@ def mkTest(numports=8):
     sim = simulation.Simulator(test)
     rslt = sim.run()  # display=False
     #rslt = sim.run(display=True)
-    #print(rslt)
-
-    vx = list(map(lambda x: int(str.split(x,"=")[1]), filter(lambda x: "xdata" in x  , str.split(rslt, "\n"))))
-    vy = list(map(lambda x: int(str.split(x,"=")[1]), filter(lambda x: "ydata" in x  , str.split(rslt, "\n"))))
-    vz = list(map(lambda x: int(str.split(x,"=")[1]), filter(lambda x: "zdata" in x  , str.split(rslt, "\n"))))
-    ez = list(map(lambda x,y: int( Decimal(str(x/(2.0**y))).quantize(Decimal('0'), rounding=ROUND_HALF_UP)), vx,vy))
-
-    pprint(list(zip(vx,vy,vz,ez)))
-    assert(all(map(lambda v, e: v==e, vz, ez)))
+    # print(rslt)
+
+    vx = list(map(lambda x: int(str.split(x, "=")[1]), filter(
+        lambda x: "xdata" in x, str.split(rslt, "\n"))))
+    vy = list(map(lambda x: int(str.split(x, "=")[1]), filter(
+        lambda x: "ydata" in x, str.split(rslt, "\n"))))
+    vz = list(map(lambda x: int(str.split(x, "=")[1]), filter(
+        lambda x: "zdata" in x, str.split(rslt, "\n"))))
+    ez = list(map(lambda x, y:
+                  int(Decimal(str(x / (2.0**y))).quantize(
+                      Decimal('0'), rounding=ROUND_HALF_UP)), vx, vy))
+
+    pprint(list(zip(vx, vy, vz, ez)))
+    assert(all(map(lambda v, e: v == e, vz, ez)))
 
     # launch waveform viewer (GTKwave)
     # sim.view_waveform() # background=False