Skip to content

Commit 8c5b617

Browse files
packet_filter: Updates and fixes
- Updated interconnect communication - Updated the affected testbenches Signed-off-by: Istvan-Zsolt Szekely <istvan.szekely@analog.com>
1 parent 4d12c2b commit 8c5b617

File tree

6 files changed

+25
-14
lines changed

6 files changed

+25
-14
lines changed

axis_sequencers/tests/test_program.sv

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ program test_program;
6969
`TH.`DST_AXIS.inst.IF
7070
);
7171

72-
#1step;
73-
7472
setLoggerVerbosity(250);
7573

7674
env.start();
@@ -123,8 +121,6 @@ program test_program;
123121

124122
env.src_axis_seq.start();
125123

126-
#1step;
127-
128124
case (`SRC_DESCRIPTORS)
129125
1: //env.src_axis_seq.beat_sent();
130126
env.src_axis_seq.packet_sent();

common/sv/m_axis_sequencer.sv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ package m_axis_sequencer_pkg;
292292
enabled = 0;
293293
byte_count = 0;
294294
->> disable_ev;
295-
#1step;
296295
endtask: stop
297296

298297
task run();

common/sv/scoreboard.sv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ package scoreboard_pkg;
195195
packet[i] = source_byte;
196196
end
197197
this.source_monitor.put_key();
198+
this.source_monitor.scoreboard_notified();
198199

199200
if (this.filter_enabled)
200201
this.filter_tree_source.apply_filter(packet);
@@ -238,6 +239,7 @@ package scoreboard_pkg;
238239
packet[i] = sink_byte;
239240
end
240241
this.sink_monitor.put_key();
242+
this.sink_monitor.scoreboard_notified();
241243

242244
if (this.filter_enabled)
243245
this.filter_tree_sink.apply_filter(packet);

common/sv/scoreboard_pack.sv

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,16 @@ package scoreboard_pack_pkg;
7979
end
8080
end
8181
end else begin
82-
if ((this.source_byte_stream_size == 0) &&
83-
(this.sink_byte_stream_size == 0)) begin
84-
byte_streams_empty_sig = 1;
85-
->>byte_streams_empty;
82+
if (this.sink_byte_stream_size < this.channels*this.samples*this.width/8) begin
83+
if (this.transfer_type == CYCLIC) begin
84+
byte_streams_empty_sig = 1;
85+
->>byte_streams_empty;
86+
end else begin
87+
if ((this.source_byte_stream_size == 0)) begin
88+
byte_streams_empty_sig = 1;
89+
->>byte_streams_empty;
90+
end
91+
end
8692
end
8793
fork begin
8894
fork

common/sv/watchdog.sv

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,11 @@ package watchdog_pkg;
6363

6464
task reset();
6565
this.stop();
66-
#1step;
6766
this.start();
6867
endtask: reset
6968

7069
task stop();
71-
->>this.stop_event;
70+
->this.stop_event;
7271
endtask: stop
7372

7473
task start();

common/sv/x_monitor.sv

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ package x_monitor_pkg;
1414
mailbox_c #(logic [7:0]) mailbox;
1515
protected semaphore semaphore_key;
1616
protected event transaction_event;
17+
protected event scoreboard_event;
1718

1819
protected bit enabled;
1920

@@ -44,6 +45,14 @@ package x_monitor_pkg;
4445
@this.transaction_event;
4546
endtask
4647

48+
task scoreboard_notified();
49+
->>this.scoreboard_event;
50+
endtask
51+
52+
task wait_for_scoreboard_event();
53+
@this.scoreboard_event;
54+
endtask
55+
4756
// run task
4857
task run();
4958
fork
@@ -128,13 +137,13 @@ package x_monitor_pkg;
128137
this.put_key();
129138
`INFOV(("Packet mail length: %d", this.mailbox.num()), 200);
130139
this.transaction_captured();
131-
#1step;
140+
this.wait_for_scoreboard_event();
132141
this.get_key();
133142
this.mailbox.flush();
134143
this.put_key();
135144
end else begin
136145
this.axi_ap.write(transaction);
137-
#1step;
146+
#1;
138147
end
139148
end
140149

@@ -206,7 +215,7 @@ package x_monitor_pkg;
206215
`INFOV(("Packet mail length: %d", this.mailbox.num()), 200);
207216
axi_packet = new [0];
208217
this.transaction_captured();
209-
#1step;
218+
this.wait_for_scoreboard_event();
210219
this.get_key();
211220
this.mailbox.flush();
212221
this.put_key();

0 commit comments

Comments
 (0)