From 840b6ce354e74afe34561edf71786a1e5ed57fbf Mon Sep 17 00:00:00 2001 From: Michael Rogenmoser Date: Fri, 19 Jul 2024 12:00:30 +0200 Subject: [PATCH] Re-randomize beat to ensure 4KiB-safe Ax is found --- src/axi_test.sv | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/axi_test.sv b/src/axi_test.sv index 10caf777b..ce8638343 100644 --- a/src/axi_test.sv +++ b/src/axi_test.sv @@ -951,14 +951,14 @@ package axi_test; task rand_atop_burst(inout ax_beat_t beat); automatic logic rand_success; - beat.ax_atop[5:4] = $random(); - if (beat.ax_atop[5:4] != 2'b00 && !AXI_BURST_INCR) begin - // We can emit ATOPs only if INCR bursts are allowed. - $warning("ATOP suppressed because INCR bursts are disabled!"); - beat.ax_atop[5:4] = 2'b00; - end - if (beat.ax_atop[5:4] != 2'b00) begin // ATOP - forever begin + forever begin + beat.ax_atop[5:4] = $random(); + if (beat.ax_atop[5:4] != 2'b00 && !AXI_BURST_INCR) begin + // We can emit ATOPs only if INCR bursts are allowed. + $warning("ATOP suppressed because INCR bursts are disabled!"); + beat.ax_atop[5:4] = 2'b00; + end + if (beat.ax_atop[5:4] != 2'b00) begin // ATOP // Determine `ax_atop`. if (beat.ax_atop[5:4] == axi_pkg::ATOP_ATOMICSTORE || beat.ax_atop[5:4] == axi_pkg::ATOP_ATOMICLOAD) begin @@ -1020,6 +1020,8 @@ package axi_test; if (axi_pkg::beat_addr(beat.ax_addr, beat.ax_size, beat.ax_len, beat.ax_burst, 0) >> 12 == axi_pkg::beat_addr(beat.ax_addr, beat.ax_size, beat.ax_len, beat.ax_burst, beat.ax_len) >> 12) begin break; + end else begin + beat = new_rand_burst(1'b0); end end end @@ -1056,6 +1058,8 @@ package axi_test; if (axi_pkg::beat_addr(ar_beat.ax_addr, ar_beat.ax_size, ar_beat.ax_len, ar_beat.ax_burst, 0) >> 12 == axi_pkg::beat_addr(ar_beat.ax_addr, ar_beat.ax_size, ar_beat.ax_len, ar_beat.ax_burst, ar_beat.ax_len) >> 12) begin break; + end else begin + ar_beat = new_rand_burst(1'b1); end end endfunction