Skip to content

Commit

Permalink
Merge branch 'isa_dma_medusa_add_pcie_meters' into 'devel'
Browse files Browse the repository at this point in the history 
Add meters to AVST(PCIE) and AXI(PCIE) for the old verification.

See merge request ndk/ndk-fpga!85
  • Loading branch information
@jakubcabal
jakubcabal committed Nov 4, 2024
2 parents 8c4af13 + 27b12e4 commit 6374091
Show file tree
Hide file tree
Showing 6 changed files with 359 additions and 4 deletions.
235 changes: 235 additions & 0 deletions comp/ver/axi/axi4s_rq_meter.sv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
/*!
* \file axi4s_rq_stats.sv
* \brief Get statistic from axi4s
* \author Radek Iša <[email protected]>
* \date 2018
* \copyright CESNET, z. s. p. o.
*/

/* SPDX-License-Identifier: BSD-3-Clause */

class Axi4S_RQ_meter #(DATA_WIDTH = 512, USER_WIDTH = 137, ITEM_WIDTH_IN = 8, ST_COUNT = 4) extends Monitor;

localparam REGIONS = ST_COUNT;
localparam REGION_SIZE = 1;
localparam ITEM_WIDTH = 8;
localparam BLOCK_SIZE = DATA_WIDTH/REGIONS/ITEM_WIDTH;

protected int sof_pos[REGIONS];
protected int eof_pos[REGIONS];

localparam ITEMS = REGIONS * REGION_SIZE * BLOCK_SIZE;
localparam REGION_ITEMS = REGION_SIZE * BLOCK_SIZE;
localparam WORD_BLOCKS = REGIONS * REGION_SIZE;
localparam SOF_POS_WIDTH = $clog2(REGION_SIZE);
localparam EOF_POS_WIDTH = $clog2(REGION_SIZE * BLOCK_SIZE);

protected virtual iAxi4STx#(DATA_WIDTH, USER_WIDTH, ITEM_WIDTH_IN) vif;
protected sv_common_pkg::stats speed;
protected int unsigned speed_curr;
protected logic inframe;
protected int old_inframe = 0;

function new(string i, virtual iAxi4STx#(DATA_WIDTH, USER_WIDTH, ITEM_WIDTH_IN) v);
super.new(i);
speed = new();
vif = v;
endfunction

virtual task setEnabled();
enabled = 1;
fork
run();
join_none;
endtask

function int hasSOF();
if (USER_WIDTH==137) // ULTRASCALE
return vif.cb.TUSER[21:20];
else begin // 7SERIES
if (!inframe)
return vif.cb.TVALID;
else
return 0;
end
endfunction

function int hasEOF();
if (USER_WIDTH==137) // ULTRASCALE
return vif.cb.TUSER[27:26];
else begin // 7SERIES
return vif.cb.TLAST;
end
endfunction

function logic [3:0] fbe(int unsigned index);
if(USER_WIDTH== 137) begin
return vif.cb.TUSER[(index+1)*4-1 -: 4];
end else if (USER_WIDTH == 60) begin
return vif.cb.TUSER[3:0];
end else begin
$write("NOT SUPPORTED AXI USER_WIDTH\n");
$stop();
end
endfunction

function logic [3:0] lbe(int unsigned index);
if(USER_WIDTH== 137) begin
return vif.cb.TUSER[(index+1)*4+7 -: 4];
end else if (USER_WIDTH == 60) begin
return vif.cb.TUSER[7:4];
end else begin
$write("NOT SUPPORTED AXI USER_WIDTH\n");
$stop();
end
endfunction

function int sofPos(int index);
if(SOF_POS_WIDTH == 0) begin
return 0;
end

if (USER_WIDTH==137) // ULTRASCALE
return index;
else begin // 7SERIES
return 0;
end
endfunction

function int eofPos(int index);
int pos = 0;
int j = 0;

if (EOF_POS_WIDTH == 0) begin
return 0;
end

if (USER_WIDTH==137) begin // ULTRASCALE
if ((vif.cb.TUSER[26] && vif.cb.TUSER[31:31] == index))
return vif.cb.TUSER[30:28];
if ((vif.cb.TUSER[27] && vif.cb.TUSER[35:35] == index))
return vif.cb.TUSER[34:32];
end else begin // 7SERIES
for (j = 0; j < REGION_ITEMS; j++) begin
if (vif.cb.TKEEP[j]==1'b0)
break;
pos = j;
end
return pos;
end
return -1;
endfunction

function int isSOF(int index);
if (USER_WIDTH==137) begin // ULTRASCALE
if ((vif.cb.TUSER[20] && vif.cb.TUSER[23:23] == index) ||
(vif.cb.TUSER[21] && vif.cb.TUSER[25:25] == index))
return 1;
end else begin // 7SERIES
if (!old_inframe)
return vif.cb.TVALID;
end
return 0;
endfunction

function int isEOF(int index);
if (USER_WIDTH==137) begin // ULTRASCALE
if ((vif.cb.TUSER[26] && vif.cb.TUSER[31:31] == index) ||
(vif.cb.TUSER[27] && vif.cb.TUSER[35:35] == index))
return 1;
end else begin // 7SERIES
return hasEOF(); // only 1 region
end
return 0;
endfunction

task run_meter();
speed_curr = 0;
while (enabled) begin
time speed_start_time;
time speed_end_time;
const int unsigned mesures = 100;
string msg;

speed_end_time = $time();
forever begin
time step_speed_end_time = speed_end_time;
time step_speed_start_time;

for (int unsigned it = 0; it < mesures; it++) begin
step_speed_start_time = step_speed_end_time;

#(1us);
step_speed_end_time = $time();
speed.next_val(real'(speed_curr)/((step_speed_end_time-step_speed_start_time)/1ns));

speed_curr = 0;
end

begin
real min, max, avg, std_dev;

speed_start_time = speed_end_time;
speed_end_time = step_speed_end_time;
speed.count(min, max, avg, std_dev);
msg = $sformatf("\n\tSpeed [%0dns:%0dns]\n\t\tAverage : %0.2fGb/s std_dev %0.2fGb/s\n\t\tmin : %0.2fGb/s max %0.2fGb/s",
speed_start_time/1ns, speed_end_time/1ns, avg*ITEM_WIDTH, std_dev*ITEM_WIDTH, min*ITEM_WIDTH, max*ITEM_WIDTH);
$write({"\n", this.inst , "\n", msg, "\n"});
speed.reset();
end
end
end
endtask


virtual task run();
inframe = 0;

fork
run_meter();
join_none


while (enabled) begin
int unsigned data_frame_size = 0;

do begin
@(vif.monitor_cb);
end while (enabled && !(vif.monitor_cb.TVALID && vif.monitor_cb.TREADY));

if (!enabled)
break;

for (int unsigned it = 0; it < REGIONS; it++) begin
if (inframe == 1) begin
if (isEOF(it)) begin
data_frame_size += eofPos(it)+1;
inframe = 0;
if (isSOF(it)) begin
data_frame_size += (REGION_SIZE - sofPos(it))*BLOCK_SIZE;
inframe = 1;
end
old_inframe = inframe;
end else begin
data_frame_size += REGION_SIZE*BLOCK_SIZE;
end
end else begin
if (isSOF(it)) begin
if (isEOF(it)) begin
data_frame_size += (eofPos(it)+1 - sofPos(it)*BLOCK_SIZE);
inframe = 0;
end else begin
data_frame_size += (REGION_SIZE - sofPos(it))*BLOCK_SIZE;
inframe = 1;
end
old_inframe = inframe;
end else begin
data_frame_size += 0;
end
end
end
speed_curr += data_frame_size;
end
endtask

endclass
1 change: 1 addition & 0 deletions comp/ver/axi/sv_axi_pcie_pkg.sv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package sv_axi_pcie_pkg;
import sv_axi_pkg::*;

`include "axi4s_rc_agent.sv"
`include "axi4s_rq_meter.sv"
`include "axi4s_rq_agent.sv"

endpackage
54 changes: 50 additions & 4 deletions comp/ver/pcie/avalon_rq_monitor.sv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,65 @@ class avalon_rq_monitor extends sv_common_pkg::Monitor;
logic [31:0] data[$];
PcieRequest hl_tr;

protected sv_common_pkg::stats speed;
protected int unsigned speed_curr;

function new (string inst = "");
super.new(inst);
avalon_rq_cbs = new();
endfunction
function new (string inst = "");
super.new(inst);
avalon_rq_cbs = new();
speed = new();
endfunction

function void verbosity_set(int unsigned level);
verbosity = level;
endfunction

task run_meter();
speed_curr = 0;
while (enabled) begin
time speed_start_time;
time speed_end_time;
const int unsigned mesures = 100;
string msg;

speed_end_time = $time();
forever begin
time step_speed_end_time = speed_end_time;
time step_speed_start_time;

for (int unsigned it = 0; it < mesures; it++) begin
step_speed_start_time = step_speed_end_time;

#(1us);
step_speed_end_time = $time();
speed.next_val(real'(speed_curr)/((step_speed_end_time-step_speed_start_time)/1ns));

speed_curr = 0;
end

begin
real min, max, avg, std_dev;

speed_start_time = speed_end_time;
speed_end_time = step_speed_end_time;
speed.count(min, max, avg, std_dev);
msg = $sformatf("\n\tSpeed [%0dns:%0dns]\n\t\tAverage : %0.2fGb/s std_dev %0.2fGb/s\n\t\tmin : %0.2fGb/s max %0.2fGb/s",
speed_start_time/1ns, speed_end_time/1ns, avg*32, std_dev*32, min*32, max*32);
$write({"\n", this.inst , "\n", msg, "\n"});
speed.reset();
end
end
end
endtask

virtual task run();
sv_common_pkg::Transaction common_tr;
avst_rx::transaction tr;

fork
run_meter();
join_none;

while(enabled) begin
avalon_rq_cbs.get(common_tr);
$cast(tr, common_tr);
Expand Down Expand Up @@ -84,6 +129,7 @@ class avalon_rq_monitor extends sv_common_pkg::Monitor;
for (int i = 0; i < m_end; i++) begin
data.push_back(tr.data[(i+1)*32-1 -:32]);
end
speed_curr += m_end;
end

if(tr.eop == 1'b1) begin
Expand Down
4 changes: 4 additions & 0 deletions comp/ver/pcie/axi_agent.sv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class axi_agent #(RCB, MPS, DEVICE, DATA_WIDTH) extends agent #(RCB, MPS);

//AXI AGENTS
sv_axi_pcie_pkg::Axi4S_RQ_agent #(DATA_WIDTH, RQ_TUSER_WIDTH, 32, RQ_ST_COUNT) axiRQ;
sv_axi_pcie_pkg::Axi4S_RQ_meter #(DATA_WIDTH, RQ_TUSER_WIDTH, 32, RQ_ST_COUNT) axiRQ_meter;
AxiResponder #(DATA_WIDTH, RQ_TUSER_WIDTH, 32) axiRQ_responder;
AxiDriver #(DATA_WIDTH, RC_TUSER_WIDTH, 32, RC_ST_COUNT) axiRC;
string inst;
Expand All @@ -82,6 +83,7 @@ class axi_agent #(RCB, MPS, DEVICE, DATA_WIDTH) extends agent #(RCB, MPS);
rq_monitor = new();
rq_monitor.setCallbacks(this.tags_req_cbs);
axiRQ = new({inst, "AXI Request "}, vif_rx);
axiRQ_meter = new({inst, "AXI Meter "}, vif_rx);
axiRQ.setCallbacks(rq_monitor.axi_rq_cbs);
axiRQ_responder = new({inst, " AXI Responder"}, vif_rx);

Expand All @@ -94,6 +96,7 @@ class axi_agent #(RCB, MPS, DEVICE, DATA_WIDTH) extends agent #(RCB, MPS);

task setEnabled();
axiRQ.setEnabled();
axiRQ_meter.setEnabled();
rq_monitor.setEnabled();
super.setEnabled();
axiRQ_responder.setEnabled();
Expand All @@ -103,6 +106,7 @@ class axi_agent #(RCB, MPS, DEVICE, DATA_WIDTH) extends agent #(RCB, MPS);

task setDisabled();
axiRQ.setDisabled();
axiRQ_meter.setDisabled();
rq_monitor.setDisabled();
super.setDisabled();
axiRQ_responder.setDisabled();
Expand Down
Loading

0 comments on commit 6374091

Please sign in to comment.