Updated test cases

Author: shtaxxx

tests/extension/types_/axi_/slave_readwrite_lite_simultaneous/types_axi_slave_readwrite_lite_simultaneous.py

@@ -32,7 +32,7 @@ def mkMain():
     fsm.If(readvalid).goto_next()
 
     # read
-    ack = myaxi.push_read_data(rdata, cond=fsm)
+    ack, valid = myaxi.push_read_data(rdata, cond=fsm)
     fsm.If(ack)(
         rdata(rdata + 1)
     )

tests/extension/types_/axi_/slave_readwrite_simultaneous/test_types_axi_slave_readwrite_simultaneous.py

@@ -682,7 +682,6 @@
   assign myaxi_awready = (fsm == 0) && (!_tmp_2 && !_tmp_3 && !myaxi_bvalid && _tmp_4);
   assign myaxi_arready = (fsm == 0) && (!_tmp_3 && !_tmp_2 && _tmp_5 && !_tmp_4);
   reg [32-1:0] rdata;
-  reg _tmp_6;
   reg _myaxi_cond_0_1;
   assign myaxi_wready = fsm == 100;
 
@@ -698,13 +697,11 @@
       myaxi_rdata <= 0;
       myaxi_rvalid <= 0;
       myaxi_rlast <= 0;
-      _tmp_6 <= 0;
       _myaxi_cond_0_1 <= 0;
     end else begin
       if(_myaxi_cond_0_1) begin
         myaxi_rvalid <= 0;
         myaxi_rlast <= 0;
-        _tmp_6 <= 0;
       end 
       if(myaxi_bvalid && myaxi_bready) begin
         myaxi_bvalid <= 0;
@@ -733,13 +730,11 @@
       end 
       if((fsm == 1) && ((_tmp_0 > 0) && (myaxi_rready || !myaxi_rvalid) && (_tmp_0 > 0)) && (_tmp_0 == 1)) begin
         myaxi_rlast <= 1;
-        _tmp_6 <= 1;
       end 
       _myaxi_cond_0_1 <= 1;
       if(myaxi_rvalid && !myaxi_rready) begin
         myaxi_rvalid <= myaxi_rvalid;
         myaxi_rlast <= myaxi_rlast;
-        _tmp_6 <= _tmp_6;
       end 
       if(myaxi_wready && myaxi_wvalid && (_tmp_0 > 0)) begin
         _tmp_0 <= _tmp_0 - 1;
@@ -774,7 +769,7 @@
           if((_tmp_0 > 0) && (myaxi_rready || !myaxi_rvalid)) begin
             rdata <= rdata + 1;
           end 
-          if(_tmp_6) begin
+          if(myaxi_rready && myaxi_rvalid && myaxi_rlast) begin
             fsm <= fsm_2;
           end 
         end

tests/extension/types_/axi_/slave_readwrite_simultaneous/types_axi_slave_readwrite_simultaneous.py

@@ -32,11 +32,11 @@ def mkMain():
     fsm.If(readvalid).goto_next()
 
     # read
-    ack, last = myaxi.push_read_data(rdata, counter, cond=fsm)
+    ack, valid, last = myaxi.push_read_data(rdata, counter, cond=fsm)
     fsm.If(ack)(
         rdata(rdata + 1)
     )
-    fsm.If(last).goto_next()
+    fsm.If(valid, last).goto_next()
 
     fsm.goto_init()