Fix RetRTL #25: In file /WORK_REPO/CGRA-Flow/VectorCGRA/fu/single/Ret…

…RTL.py, Line 63, Col 28:

  s.send_out[0].msg @= DataType(s.recv_in[s.in0_idx].msg.payload, b1( 0 ), b1( 0 ) )

- BitStruct CGRAData_32_1_1_1 has 4 fields but 3 arguments are given!

cgra/translate/CGRATemplateRTL_test.py

@@ -187,8 +187,8 @@ def test_cgra_universal( cmdline_opts, paramCGRA = None):
   DUT               = CGRATemplateRTL
   FunctionUnit      = FlexibleFuRTL
   # FuList            = [ SeqMulAdderRTL, MemUnitRTL ]#AdderRTL, MulRTL, LogicRTL, ShifterRTL, PhiRTL, CompRTL, BranchRTL, MemUnitRTL ]
-  # FuList           = [ PhiRTL, AdderRTL, ShifterRTL, MemUnitRTL, SelRTL, CompRTL, SeqMulAdderRTL, RetRTL, MulRTL, LogicRTL, BranchRTL ]
-  FuList           = [ PhiRTL, AdderRTL, ShifterRTL, MemUnitRTL, SelRTL, CompRTL, SeqMulAdderRTL, MulRTL, LogicRTL, BranchRTL ]
+  FuList           = [ PhiRTL, AdderRTL, ShifterRTL, MemUnitRTL, SelRTL, CompRTL, SeqMulAdderRTL, RetRTL, MulRTL, LogicRTL, BranchRTL ]
+  # FuList           = [ PhiRTL, AdderRTL, ShifterRTL, MemUnitRTL, SelRTL, CompRTL, SeqMulAdderRTL, MulRTL, LogicRTL, BranchRTL ]
   DataType          = mk_data( 32, 1 )
   PredicateType     = mk_predicate( 1, 1 )
 #  DataType         = mk_data( 16, 1 )
@@ -364,6 +364,7 @@ def handleReshape( t_tiles ):
   th = config_model_with_cmdline_opts( th, cmdline_opts, duts=['dut'] )
 
   if paramCGRA != None:
+    print(f'paramCGRA: {paramCGRA}')
     for tile in tiles:
         if not tile.isDefaultFus():
             targetFuList = []

fu/single/RetRTL.py

@@ -60,7 +60,8 @@ def comb_logic():
 
       if s.recv_opt.msg.ctrl == OPT_RET:
         # Branch is only used to set predication rather than delivering value.
-        s.send_out[0].msg @= DataType(s.recv_in[s.in0_idx].msg.payload, b1( 0 ), b1( 0 ) )
+        #                             payload,                          predicate, bypass,  delay
+        s.send_out[0].msg @= DataType(s.recv_in[s.in0_idx].msg.payload, b1( 0 ),   b1( 0 ), b1( 0 ) )
         if s.recv_in[s.in0_idx].msg.predicate == b1( 0 ):#s.const_zero.payload:
           s.send_out_predicate @= 0
         else: