Skip to content

Commit 628ec9b

Browse files
shtaxxxshtaxxx
committed
Bug fix of the outstanding counter rules
1 parent 7502afc commit 628ec9b

29 files changed

+66
-66
lines changed

‎examples/simulation_verilator/test_simulation_verilator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,10 +1084,10 @@
10841084
myaxi_wlast <= 0;
10851085
last_31 <= 0;
10861086
end
1087-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
1087+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
10881088
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
10891089
end
1090-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
1090+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
10911091
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
10921092
end
10931093
_myaxi_read_start <= 0;

‎examples/thread_add_ipxact/test_thread_add_ipxact.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,10 @@
315315
if(__saxi_cond_8_1) begin
316316
_saxi_arvalid <= 0;
317317
end
318-
if(_saxi_awvalid && _saxi_awready && !(_saxi_bvalid && _saxi_bready)) begin
318+
if(_saxi_wvalid && _saxi_wready && !(_saxi_bvalid && _saxi_bready)) begin
319319
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
320320
end
321-
if(!(_saxi_awvalid && _saxi_awready) && (_saxi_bvalid && _saxi_bready) && (outstanding_wreq_count_0 > 0)) begin
321+
if(!(_saxi_wvalid && _saxi_wready) && (_saxi_bvalid && _saxi_bready) && (outstanding_wreq_count_0 > 0)) begin
322322
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
323323
end
324324
if((th_ctrl == 7) && (_saxi_awready || !_saxi_awvalid)) begin

‎examples/thread_embedded_verilog_ipcore/test_thread_embedded_verilog_ipxact.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -793,10 +793,10 @@
793793
if(__saxi_cond_9_1) begin
794794
_saxi_arvalid <= 0;
795795
end
796-
if(_saxi_awvalid && _saxi_awready && !(_saxi_bvalid && _saxi_bready)) begin
796+
if(_saxi_wvalid && _saxi_wready && !(_saxi_bvalid && _saxi_bready)) begin
797797
outstanding_wreq_count_9 <= outstanding_wreq_count_9 + 1;
798798
end
799-
if(!(_saxi_awvalid && _saxi_awready) && (_saxi_bvalid && _saxi_bready) && (outstanding_wreq_count_9 > 0)) begin
799+
if(!(_saxi_wvalid && _saxi_wready) && (_saxi_bvalid && _saxi_bready) && (outstanding_wreq_count_9 > 0)) begin
800800
outstanding_wreq_count_9 <= outstanding_wreq_count_9 - 1;
801801
end
802802
if((th_ctrl == 6) && (_saxi_awready || !_saxi_awvalid)) begin
@@ -1531,10 +1531,10 @@
15311531
maxi_wlast <= 0;
15321532
last_31 <= 0;
15331533
end
1534-
if(maxi_awvalid && maxi_awready && !(maxi_bvalid && maxi_bready)) begin
1534+
if(maxi_wlast && maxi_wvalid && maxi_wready && !(maxi_bvalid && maxi_bready)) begin
15351535
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
15361536
end
1537-
if(!(maxi_awvalid && maxi_awready) && (maxi_bvalid && maxi_bready) && (outstanding_wreq_count_0 > 0)) begin
1537+
if(!(maxi_wlast && maxi_wvalid && maxi_wready) && (maxi_bvalid && maxi_bready) && (outstanding_wreq_count_0 > 0)) begin
15381538
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
15391539
end
15401540
_maxi_read_start <= 0;

‎examples/thread_ipxact/test_thread_ipxact.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,10 @@
307307
if(__saxi_cond_7_1) begin
308308
_saxi_arvalid <= 0;
309309
end
310-
if(_saxi_awvalid && _saxi_awready && !(_saxi_bvalid && _saxi_bready)) begin
310+
if(_saxi_wvalid && _saxi_wready && !(_saxi_bvalid && _saxi_bready)) begin
311311
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
312312
end
313-
if(!(_saxi_awvalid && _saxi_awready) && (_saxi_bvalid && _saxi_bready) && (outstanding_wreq_count_0 > 0)) begin
313+
if(!(_saxi_wvalid && _saxi_wready) && (_saxi_bvalid && _saxi_bready) && (outstanding_wreq_count_0 > 0)) begin
314314
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
315315
end
316316
if((th_ctrl == 7) && (_saxi_awready || !_saxi_awvalid)) begin

‎examples/thread_memcpy_ipxact/test_thread_memcpy_ipxact.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -791,10 +791,10 @@
791791
if(__saxi_cond_9_1) begin
792792
_saxi_arvalid <= 0;
793793
end
794-
if(_saxi_awvalid && _saxi_awready && !(_saxi_bvalid && _saxi_bready)) begin
794+
if(_saxi_wvalid && _saxi_wready && !(_saxi_bvalid && _saxi_bready)) begin
795795
outstanding_wreq_count_9 <= outstanding_wreq_count_9 + 1;
796796
end
797-
if(!(_saxi_awvalid && _saxi_awready) && (_saxi_bvalid && _saxi_bready) && (outstanding_wreq_count_9 > 0)) begin
797+
if(!(_saxi_wvalid && _saxi_wready) && (_saxi_bvalid && _saxi_bready) && (outstanding_wreq_count_9 > 0)) begin
798798
outstanding_wreq_count_9 <= outstanding_wreq_count_9 - 1;
799799
end
800800
if((th_ctrl == 6) && (_saxi_awready || !_saxi_awvalid)) begin
@@ -1514,10 +1514,10 @@
15141514
maxi_wlast <= 0;
15151515
last_31 <= 0;
15161516
end
1517-
if(maxi_awvalid && maxi_awready && !(maxi_bvalid && maxi_bready)) begin
1517+
if(maxi_wlast && maxi_wvalid && maxi_wready && !(maxi_bvalid && maxi_bready)) begin
15181518
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
15191519
end
1520-
if(!(maxi_awvalid && maxi_awready) && (maxi_bvalid && maxi_bready) && (outstanding_wreq_count_0 > 0)) begin
1520+
if(!(maxi_wlast && maxi_wvalid && maxi_wready) && (maxi_bvalid && maxi_bready) && (outstanding_wreq_count_0 > 0)) begin
15211521
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
15221522
end
15231523
_maxi_read_start <= 0;

‎examples/thread_verilog_submodule_ipxact/test_thread_verilog_submodule_ipxact.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -793,10 +793,10 @@
793793
if(__saxi_cond_9_1) begin
794794
_saxi_arvalid <= 0;
795795
end
796-
if(_saxi_awvalid && _saxi_awready && !(_saxi_bvalid && _saxi_bready)) begin
796+
if(_saxi_wvalid && _saxi_wready && !(_saxi_bvalid && _saxi_bready)) begin
797797
outstanding_wreq_count_9 <= outstanding_wreq_count_9 + 1;
798798
end
799-
if(!(_saxi_awvalid && _saxi_awready) && (_saxi_bvalid && _saxi_bready) && (outstanding_wreq_count_9 > 0)) begin
799+
if(!(_saxi_wvalid && _saxi_wready) && (_saxi_bvalid && _saxi_bready) && (outstanding_wreq_count_9 > 0)) begin
800800
outstanding_wreq_count_9 <= outstanding_wreq_count_9 - 1;
801801
end
802802
if((th_ctrl == 6) && (_saxi_awready || !_saxi_awvalid)) begin
@@ -1576,10 +1576,10 @@
15761576
maxi_wlast <= 0;
15771577
last_34 <= 0;
15781578
end
1579-
if(maxi_awvalid && maxi_awready && !(maxi_bvalid && maxi_bready)) begin
1579+
if(maxi_wlast && maxi_wvalid && maxi_wready && !(maxi_bvalid && maxi_bready)) begin
15801580
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
15811581
end
1582-
if(!(maxi_awvalid && maxi_awready) && (maxi_bvalid && maxi_bready) && (outstanding_wreq_count_0 > 0)) begin
1582+
if(!(maxi_wlast && maxi_wvalid && maxi_wready) && (maxi_bvalid && maxi_bready) && (outstanding_wreq_count_0 > 0)) begin
15831583
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
15841584
end
15851585
_maxi_read_start <= 0;

‎tests/extension/types_/axi_/axi_to_ram/test_types_axi_axi_to_ram.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,10 @@
369369
if(_myaxi_cond_0_1) begin
370370
myaxi_arvalid <= 0;
371371
end
372-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
372+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
373373
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
374374
end
375-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
375+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
376376
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
377377
end
378378
myaxi_awaddr <= 0;

‎tests/extension/types_/axi_/memory_model_read/test_types_memory_model_read.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -656,10 +656,10 @@
656656
if(_myaxi_cond_1_1) begin
657657
myaxi_arvalid <= 0;
658658
end
659-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
659+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
660660
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
661661
end
662-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
662+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
663663
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
664664
end
665665
myaxi_awaddr <= 0;

‎tests/extension/types_/axi_/memory_model_write/test_types_memory_model_write.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -630,10 +630,10 @@
630630
myaxi_wlast <= 0;
631631
last_4 <= 0;
632632
end
633-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
633+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
634634
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
635635
end
636-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
636+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
637637
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
638638
end
639639
myaxi_araddr <= 0;

‎tests/extension/types_/axi_/ram_to_axi/test_types_axi_ram_to_axi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,10 +440,10 @@
440440
myaxi_wlast <= 0;
441441
last_19 <= 0;
442442
end
443-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
443+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
444444
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
445445
end
446-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
446+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
447447
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
448448
end
449449
if((fsm == 0) && ((myaxi_arready || !myaxi_arvalid) && (counter_1 == 0))) begin

‎tests/extension/types_/axi_/read/test_types_axi_read.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,10 @@
326326
if(_myaxi_cond_0_1) begin
327327
myaxi_arvalid <= 0;
328328
end
329-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
329+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
330330
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
331331
end
332-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
332+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
333333
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
334334
end
335335
myaxi_awaddr <= 0;

‎tests/extension/types_/axi_/read_dataflow/test_types_axi_read_dataflow.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,10 @@
305305
if(_myaxi_cond_0_1) begin
306306
myaxi_arvalid <= 0;
307307
end
308-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
308+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
309309
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
310310
end
311-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
311+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
312312
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
313313
end
314314
myaxi_awaddr <= 0;

‎tests/extension/types_/axi_/read_lite/test_types_axi_read_lite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,10 +590,10 @@
590590
if(_myaxi_cond_1_1) begin
591591
myaxi_arvalid <= 0;
592592
end
593-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
593+
if(myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
594594
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
595595
end
596-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
596+
if(!(myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
597597
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
598598
end
599599
myaxi_awaddr <= 0;

‎tests/extension/types_/axi_/read_multi/test_types_axi_read_multi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,10 +412,10 @@
412412
if(_myaxi_cond_1_1) begin
413413
myaxi_arvalid <= 0;
414414
end
415-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
415+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
416416
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
417417
end
418-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
418+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
419419
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
420420
end
421421
myaxi_awaddr <= 0;

‎tests/extension/types_/axi_/read_stall/test_types_axi_read_stall.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,10 @@
328328
if(_myaxi_cond_0_1) begin
329329
myaxi_arvalid <= 0;
330330
end
331-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
331+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
332332
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
333333
end
334-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
334+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
335335
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
336336
end
337337
myaxi_awaddr <= 0;

‎tests/extension/types_/axi_/slave_read/test_types_axi_slave_read.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,10 +403,10 @@
403403
if(__axi_cond_1_1) begin
404404
_axi_arvalid <= 0;
405405
end
406-
if(_axi_awvalid && _axi_awready && !(_axi_bvalid && _axi_bready)) begin
406+
if(_axi_wlast && _axi_wvalid && _axi_wready && !(_axi_bvalid && _axi_bready)) begin
407407
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
408408
end
409-
if(!(_axi_awvalid && _axi_awready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
409+
if(!(_axi_wlast && _axi_wvalid && _axi_wready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
410410
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
411411
end
412412
_axi_awaddr <= 0;

‎tests/extension/types_/axi_/slave_read_lite/test_types_axi_slave_read_lite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@
247247
if(__axi_cond_1_1) begin
248248
_axi_arvalid <= 0;
249249
end
250-
if(_axi_awvalid && _axi_awready && !(_axi_bvalid && _axi_bready)) begin
250+
if(_axi_wvalid && _axi_wready && !(_axi_bvalid && _axi_bready)) begin
251251
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
252252
end
253-
if(!(_axi_awvalid && _axi_awready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
253+
if(!(_axi_wvalid && _axi_wready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
254254
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
255255
end
256256
_axi_awaddr <= 0;

‎tests/extension/types_/axi_/slave_readwrite/test_types_axi_slave_readwrite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,10 +447,10 @@
447447
_axi_wlast <= 0;
448448
last_32 <= 0;
449449
end
450-
if(_axi_awvalid && _axi_awready && !(_axi_bvalid && _axi_bready)) begin
450+
if(_axi_wlast && _axi_wvalid && _axi_wready && !(_axi_bvalid && _axi_bready)) begin
451451
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
452452
end
453-
if(!(_axi_awvalid && _axi_awready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
453+
if(!(_axi_wlast && _axi_wvalid && _axi_wready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
454454
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
455455
end
456456
if((fsm == 0) && ((_axi_arready || !_axi_arvalid) && (counter_27 == 0))) begin

‎tests/extension/types_/axi_/slave_readwrite_lite/test_types_axi_slave_readwrite_lite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,10 @@
275275
if(__axi_cond_5_1) begin
276276
_axi_wvalid <= 0;
277277
end
278-
if(_axi_awvalid && _axi_awready && !(_axi_bvalid && _axi_bready)) begin
278+
if(_axi_wvalid && _axi_wready && !(_axi_bvalid && _axi_bready)) begin
279279
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
280280
end
281-
if(!(_axi_awvalid && _axi_awready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
281+
if(!(_axi_wvalid && _axi_wready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
282282
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
283283
end
284284
if((fsm == 0) && (_axi_arready || !_axi_arvalid)) begin

‎tests/extension/types_/axi_/slave_write/test_types_axi_slave_write.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,10 +427,10 @@
427427
_axi_wlast <= 0;
428428
last_30 <= 0;
429429
end
430-
if(_axi_awvalid && _axi_awready && !(_axi_bvalid && _axi_bready)) begin
430+
if(_axi_wlast && _axi_wvalid && _axi_wready && !(_axi_bvalid && _axi_bready)) begin
431431
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
432432
end
433-
if(!(_axi_awvalid && _axi_awready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
433+
if(!(_axi_wlast && _axi_wvalid && _axi_wready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
434434
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
435435
end
436436
_axi_araddr <= 0;

‎tests/extension/types_/axi_/slave_write_lite/test_types_axi_slave_write_lite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,10 @@
261261
if(__axi_cond_3_1) begin
262262
_axi_wvalid <= 0;
263263
end
264-
if(_axi_awvalid && _axi_awready && !(_axi_bvalid && _axi_bready)) begin
264+
if(_axi_wvalid && _axi_wready && !(_axi_bvalid && _axi_bready)) begin
265265
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
266266
end
267-
if(!(_axi_awvalid && _axi_awready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
267+
if(!(_axi_wvalid && _axi_wready) && (_axi_bvalid && _axi_bready) && (outstanding_wreq_count_0 > 0)) begin
268268
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
269269
end
270270
_axi_araddr <= 0;

‎tests/extension/types_/axi_/write/test_types_axi_write.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,10 @@
298298
myaxi_wlast <= 0;
299299
last_2 <= 0;
300300
end
301-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
301+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
302302
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
303303
end
304-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
304+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
305305
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
306306
end
307307
myaxi_araddr <= 0;

‎tests/extension/types_/axi_/write_dataflow/test_types_axi_write_dataflow.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,10 +301,10 @@
301301
myaxi_wlast <= 0;
302302
last_2 <= 0;
303303
end
304-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
304+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
305305
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
306306
end
307-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
307+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
308308
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
309309
end
310310
myaxi_araddr <= 0;

‎tests/extension/types_/axi_/write_dataflow_when/test_types_axi_write_dataflow_when.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,10 @@
307307
myaxi_wlast <= 0;
308308
last_2 <= 0;
309309
end
310-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
310+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
311311
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
312312
end
313-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
313+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
314314
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
315315
end
316316
myaxi_araddr <= 0;

‎tests/extension/types_/axi_/write_lite/test_types_axi_write_lite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,10 +556,10 @@
556556
if(_myaxi_cond_3_1) begin
557557
myaxi_wvalid <= 0;
558558
end
559-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
559+
if(myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
560560
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
561561
end
562-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
562+
if(!(myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
563563
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
564564
end
565565
myaxi_araddr <= 0;

‎tests/extension/types_/axi_/write_multi/test_types_axi_write_multi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,10 +315,10 @@
315315
myaxi_wlast <= 0;
316316
last_4 <= 0;
317317
end
318-
if(myaxi_awvalid && myaxi_awready && !(myaxi_bvalid && myaxi_bready)) begin
318+
if(myaxi_wlast && myaxi_wvalid && myaxi_wready && !(myaxi_bvalid && myaxi_bready)) begin
319319
outstanding_wreq_count_0 <= outstanding_wreq_count_0 + 1;
320320
end
321-
if(!(myaxi_awvalid && myaxi_awready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
321+
if(!(myaxi_wlast && myaxi_wvalid && myaxi_wready) && (myaxi_bvalid && myaxi_bready) && (outstanding_wreq_count_0 > 0)) begin
322322
outstanding_wreq_count_0 <= outstanding_wreq_count_0 - 1;
323323
end
324324
myaxi_araddr <= 0;

0 commit comments

Comments
 (0)