Consume data and ctrl when all inputs arrive

fu/single/AdderRTL.py

@@ -71,29 +71,29 @@ def comb_logic():
 #      s.send_out[0].en = s.recv_opt.en
 
       if s.recv_opt.msg.ctrl == OPT_ADD:
-        s.send_out[0].msg.payload @= s.recv_in[s.in0_idx].msg.payload + s.recv_in[s.in1_idx].msg.payload
+        s.send_out[0].msg.payload   @= s.recv_in[s.in0_idx].msg.payload + s.recv_in[s.in1_idx].msg.payload
         s.send_out[0].msg.predicate @= s.recv_in[s.in0_idx].msg.predicate & s.recv_in[s.in1_idx].msg.predicate
         if s.recv_opt.en & ( (s.recv_in_count[s.in0_idx] == 0) | \
                              (s.recv_in_count[s.in1_idx] == 0) ):
           s.recv_in[s.in0_idx].rdy @= b1( 0 )
           s.recv_in[s.in1_idx].rdy @= b1( 0 )
           s.send_out[0].msg.predicate @= b1( 0 )
       elif s.recv_opt.msg.ctrl == OPT_ADD_CONST:
-        s.send_out[0].msg.payload @= s.recv_in[s.in0_idx].msg.payload + s.recv_const.msg.payload
+        s.send_out[0].msg.payload   @= s.recv_in[s.in0_idx].msg.payload + s.recv_const.msg.payload
         s.send_out[0].msg.predicate @= s.recv_in[s.in0_idx].msg.predicate
       elif s.recv_opt.msg.ctrl == OPT_INC:
-        s.send_out[0].msg.payload @= s.recv_in[s.in0_idx].msg.payload + s.const_one.payload
+        s.send_out[0].msg.payload   @= s.recv_in[s.in0_idx].msg.payload + s.const_one.payload
         s.send_out[0].msg.predicate @= s.recv_in[s.in0_idx].msg.predicate
       elif s.recv_opt.msg.ctrl == OPT_SUB:
-        s.send_out[0].msg.payload @= s.recv_in[s.in0_idx].msg.payload - s.recv_in[s.in1_idx].msg.payload
+        s.send_out[0].msg.payload   @= s.recv_in[s.in0_idx].msg.payload - s.recv_in[s.in1_idx].msg.payload
         s.send_out[0].msg.predicate @= s.recv_in[s.in0_idx].msg.predicate
         if s.recv_opt.en & ( (s.recv_in_count[s.in0_idx] == 0) | \
                              (s.recv_in_count[s.in1_idx] == 0) ):
-          s.recv_in[s.in0_idx].rdy @= b1( 0 )
-          s.recv_in[s.in1_idx].rdy @= b1( 0 )
+          s.recv_in[s.in0_idx].rdy    @= b1( 0 )
+          s.recv_in[s.in1_idx].rdy    @= b1( 0 )
           s.send_out[0].msg.predicate @= b1( 0 )
       elif s.recv_opt.msg.ctrl == OPT_PAS:
-        s.send_out[0].msg.payload @= s.recv_in[s.in0_idx].msg.payload
+        s.send_out[0].msg.payload   @= s.recv_in[s.in0_idx].msg.payload
         s.send_out[0].msg.predicate @= s.recv_in[s.in0_idx].msg.predicate
       else:
         for j in range( num_outports ):

fu/single/BranchRTL.py

@@ -64,17 +64,17 @@ def comb_logic():
 
       if s.recv_opt.msg.ctrl == OPT_BRH:
         # Branch is only used to set predication rather than delivering value.
-        s.send_out[0].msg @= DataType(ZeroType( 0 ), b1( 0 ), b1( 0 ) )
-        s.send_out[1].msg @= DataType(ZeroType( 0 ), b1( 0 ), b1( 0 ) )
+        s.send_out[0].msg @= DataType(ZeroType( 0 ), b1( 0 ), b1( 0 ), b1( 0 ) )
+        s.send_out[1].msg @= DataType(ZeroType( 0 ), b1( 0 ), b1( 0 ), b1( 0 ) )
         if s.recv_in[s.in0_idx].msg.payload == s.const_zero.payload:
           s.send_out[0].msg.predicate @= Bits1( 1 )
           s.send_out[1].msg.predicate @= Bits1( 0 )
         else:
           s.send_out[0].msg.predicate @= Bits1( 0 )
           s.send_out[1].msg.predicate @= Bits1( 1 )
       elif s.recv_opt.msg.ctrl == OPT_BRH_START:
-        s.send_out[0].msg @= DataType(ZeroType( 0 ), b1( 0 ), b1( 0 ) )
-        s.send_out[1].msg @= DataType(ZeroType( 0 ), b1( 0 ), b1( 0 ) )
+        s.send_out[0].msg @= DataType(ZeroType( 0 ), b1( 0 ), b1( 0 ), b1( 0 ) )
+        s.send_out[1].msg @= DataType(ZeroType( 0 ), b1( 0 ), b1( 0 ), b1( 0 ) )
         if s.first:
           s.send_out[0].msg.predicate @= Bits1( 1 )
           s.send_out[1].msg.predicate @= Bits1( 0 )

lib/messages.py

@@ -22,16 +22,18 @@ def mk_data( payload_nbits=16, predicate_nbits=1, bypass_nbits=1,
   PayloadType   = mk_bits( payload_nbits   )
   PredicateType = mk_bits( predicate_nbits )
   BypassType    = mk_bits( bypass_nbits )
+  DelayType     = mk_bits( 1 )
 
-  new_name = f"{prefix}_{payload_nbits}_{predicate_nbits}_{bypass_nbits}"
+  new_name = f"{prefix}_{payload_nbits}_{predicate_nbits}_{bypass_nbits}_1"
 
   def str_func( s ):
-    return f"{s.payload}.{s.predicate}.{s.bypass}"
+    return f"{s.payload}.{s.predicate}.{s.bypass}.{s.delay}"
 
   return mk_bitstruct( new_name, {
       'payload'  : PayloadType,
       'predicate': PredicateType,
       'bypass'   : BypassType,
+      'delay'    : DelayType,
     },
     namespace = { '__str__': str_func }
   )

noc/BlockChannelRTL.py

@@ -0,0 +1,80 @@
+#=========================================================================
+# BlockChannelRTL.py
+#=========================================================================
+# RTL channel module for testing the delayed data receiving. Basically, it
+# set the recv.rdy signal after a few cycles.
+#
+# Author : Cheng Tan
+#   Date : Aug 26, 2023
+
+from pymtl3                       import *
+from pymtl3.stdlib.dstruct.queues import BypassQueue, NormalQueue
+from ..lib.ifcs                   import RecvIfcRTL, SendIfcRTL
+
+
+class BlockChannelRTL( Component ):
+  def construct(s, DataType, delay = 5 ):
+
+    # Constant
+    s.num_entries = 2
+    s.data = DataType(0, 0)
+    s.count = OutPort( mk_bits( clog2( s.num_entries+1 ) ) )
+
+    # Interface
+    s.recv  = RecvIfcRTL( DataType )
+    s.send  = SendIfcRTL( DataType )
+
+
+    # Component
+    s.queue    = NormalQueue( DataType, s.num_entries )
+    s.bypass_q = BypassQueue( DataType, num_entries=1 )
+
+    s.bypass_q.enq_en  //= s.recv.en
+    s.bypass_q.enq_msg //= s.recv.msg
+
+    s.count            //= s.queue.count
+
+    # Tracks the cycles spent in this channel..
+    s.timing = Wire( mk_bits( clog2( delay + 1 ) ) )
+
+    @update
+    def process():
+      s.recv.rdy          @= s.bypass_q.enq_rdy & (s.timing >= delay)
+
+      if ~s.bypass_q.deq_msg.bypass:
+        s.queue.enq_msg   @= s.bypass_q.deq_msg
+        s.bypass_q.deq_en @= s.queue.enq_rdy & s.bypass_q.deq_rdy
+        s.queue.enq_en    @= s.queue.enq_rdy & s.bypass_q.deq_rdy
+
+        s.send.msg        @= s.queue.deq_msg
+        s.send.msg.delay  @= s.queue.deq_msg.delay | ~s.queue.deq_rdy
+        s.send.en         @= s.send.rdy & s.queue.deq_rdy
+        s.queue.deq_en    @= s.send.rdy & s.queue.deq_rdy
+
+      else:
+        s.queue.enq_en       @= 0
+        s.queue.enq_msg      @= DataType()
+        s.queue.deq_en       @= 0
+
+        s.send.msg           @= DataType()
+        s.send.msg.payload   @= s.bypass_q.deq_msg.payload
+        s.send.msg.predicate @= s.bypass_q.deq_msg.predicate
+        s.send.msg.bypass    @= 0
+        s.send.msg.delay     @= s.bypass_q.deq_msg.delay | ~s.bypass_q.deq_rdy
+        s.send.en            @= s.send.rdy & s.bypass_q.deq_rdy
+        s.bypass_q.deq_en    @= s.send.rdy & s.bypass_q.deq_rdy
+
+    @update_ff
+    def update_timing():
+      if s.timing == delay + 1:
+        s.timing <<= 0
+      else:
+        s.timing <<= s.timing + 1
+
+  def line_trace( s ):
+    trace = '>'
+    trace += s.bypass_q.line_trace() + '>'
+    trace += s.queue.line_trace() + '>'
+    return trace # f'{s.bypass_q.line_trace()}'
+    return f"in:{s.recv.msg}({trace})out:{s.send.msg}.count:{s.count} ## "
+

noc/BypassChannelRTL.py

@@ -0,0 +1,44 @@
+#=========================================================================
+# BypassChannelRTL.py
+#=========================================================================
+# RTL channel module for connecting basic components to form accelerator.
+# This simple channel has latency insensitive send/recv interfaces.
+#
+# Author : Cheng Tan
+#   Date : Feb 22, 2020
+
+from pymtl3                       import *
+from pymtl3.stdlib.dstruct.queues import BypassQueue
+from ..lib.ifcs                   import RecvIfcRTL, SendIfcRTL
+
+
+class BypassChannelRTL( Component ):
+  def construct(s, DataType ):
+
+    # Constant
+    s.data = DataType(0, 0)
+
+    # Interface
+    s.recv  = RecvIfcRTL( DataType )
+    s.send  = SendIfcRTL( DataType )
+
+    # Component
+    s.bypass_q = BypassQueue( DataType, num_entries=1 )
+    s.bypass_q.enq_en  //= s.recv.en
+    s.bypass_q.enq_msg //= s.recv.msg
+    s.bypass_q.enq_rdy //= s.recv.rdy
+
+    @update
+    def process():
+      s.send.msg           @= DataType()
+      s.send.msg.payload   @= s.bypass_q.deq_msg.payload
+      s.send.msg.predicate @= s.bypass_q.deq_msg.predicate
+      s.send.msg.bypass    @= 0
+      s.send.msg.valid     @= s.bypass_q.deq_rdy
+      s.send.en            @= s.send.rdy & s.bypass_q.deq_rdy
+      s.bypass_q.deq_en    @= s.send.rdy & s.bypass_q.deq_rdy
+
+  def line_trace( s ):
+    trace = '>'
+    return f'{s.bypass_q.line_trace()}'
+

noc/ChannelRTL.py

@@ -51,8 +51,19 @@ def process():
         s.queues[0].enq_en  @= s.queues[0].enq_rdy & s.bypass_q.deq_rdy
 
         s.send.msg                   @= s.queues[s.latency-1].deq_msg
+        # s.send.msg.delay             @= s.queues[s.latency-1].deq_rdy
+        # s.send.msg.delay             @= s.queues[s.latency-1].deq_msg.delay
+        # Set the delay if FU not yet completes pipeline (the msg.delay is
+        # set by the FU) or the data has not yet arrived due to the delay
+        # propagation.
+        # s.send.msg.delay             @= s.queues[s.latency-1].deq_msg.delay | \
+        #                                 ~s.queues[s.latency-1].deq_rdy
+        s.send.msg.delay             @= s.queues[s.latency-1].deq_msg.delay
         s.send.en                    @= s.send.rdy & s.queues[s.latency-1].deq_rdy
         s.queues[s.latency-1].deq_en @= s.send.rdy & s.queues[s.latency-1].deq_rdy
+        # print("s.queues[0].deq_en: ", s.queues[0].deq_en)
+        # print("s.queues[0].enq_en: ", s.queues[0].enq_en)
+        # print("s.bypass_q.deq_rdy: ", s.bypass_q.deq_rdy)
 
       else:
         s.queues[0].enq_en           @= 0
@@ -63,13 +74,20 @@ def process():
         s.send.msg.payload   @= s.bypass_q.deq_msg.payload
         s.send.msg.predicate @= s.bypass_q.deq_msg.predicate
         s.send.msg.bypass    @= 0
+        # s.send.msg.delay     @= s.bypass_q.deq_rdy
+        # Set the delay if FU not yet completes pipeline (the msg.delay is
+        # set by the FU) or the data has not yet arrived due to the delay
+        # propagation.
+        # s.send.msg.delay     @= s.bypass_q.deq_msg.delay | ~s.bypass_q.deq_rdy
+        s.send.msg.delay     @= s.bypass_q.deq_msg.delay
         s.send.en            @= s.send.rdy & s.bypass_q.deq_rdy
         s.bypass_q.deq_en    @= s.send.rdy & s.bypass_q.deq_rdy
 
   def line_trace( s ):
     trace = '>'
+    trace += s.bypass_q.line_trace() + '>'
     for i in range( s.latency ):
       trace += s.queues[i].line_trace() + '>'
-    return f'{s.bypass_q.line_trace()}'
+    return trace # f'{s.bypass_q.line_trace()}'
     return f"in:{s.recv.msg}({trace})out:{s.send.msg}.count:{s.count} ## "