Skip to content

Commit 166bf13

Browse files
slaweksilukslaweksiluk
committed
Change burst subprograms names
1 parent 9c0658f commit 166bf13

3 files changed

Lines changed: 51 additions & 51 deletions

File tree

‎vunit/vhdl/verification_components/src/bus_master_pkg-body.vhd‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ package body bus_master_pkg is
9898
write_bus(net, bus_handle, to_address(bus_handle, address), data, byte_enable);
9999
end;
100100

101-
procedure write_bus(signal net : inout network_t;
101+
procedure burst_write_bus(signal net : inout network_t;
102102
constant bus_handle : bus_master_t;
103103
constant address : std_logic_vector;
104104
constant burst_length : positive;
105-
constant burstdata : queue_t) is
105+
constant data : queue_t) is
106106
variable request_msg : msg_t := new_msg(bus_burst_write_msg);
107107
variable full_address : std_logic_vector(bus_handle.p_address_length-1 downto 0) := (others => '0');
108108
variable full_data : std_logic_vector(bus_handle.p_data_length-1 downto 0) := (others => '0');
@@ -111,19 +111,19 @@ package body bus_master_pkg is
111111
push_std_ulogic_vector(request_msg, full_address);
112112
push_integer(request_msg, burst_length);
113113
for i in 0 to burst_length-1 loop
114-
full_data(bus_handle.p_data_length-1 downto 0) := pop(burstdata);
114+
full_data(bus_handle.p_data_length-1 downto 0) := pop(data);
115115
push_std_ulogic_vector(request_msg, full_data);
116116
end loop;
117117
send(net, bus_handle.p_actor, request_msg);
118118
end procedure;
119119

120-
procedure write_bus(signal net : inout network_t;
120+
procedure burst_write_bus(signal net : inout network_t;
121121
constant bus_handle : bus_master_t;
122122
constant address : natural;
123123
constant burst_length : positive;
124-
constant burstdata : queue_t) is
124+
constant data : queue_t) is
125125
begin
126-
write_bus(net, bus_handle, to_address(bus_handle, address), burst_length, burstdata);
126+
burst_write_bus(net, bus_handle, to_address(bus_handle, address), burst_length, data);
127127
end procedure;
128128

129129
procedure check_bus(signal net : inout network_t;
@@ -188,7 +188,7 @@ package body bus_master_pkg is
188188
read_bus(net, bus_handle, to_address(bus_handle, address), reference);
189189
end;
190190

191-
procedure read_bus(signal net : inout network_t;
191+
procedure burst_read_bus(signal net : inout network_t;
192192
constant bus_handle : bus_master_t;
193193
constant address : std_logic_vector;
194194
constant burst_length : positive;
@@ -203,13 +203,13 @@ package body bus_master_pkg is
203203
send(net, bus_handle.p_actor, request_msg);
204204
end procedure;
205205

206-
procedure read_bus(signal net : inout network_t;
206+
procedure burst_read_bus(signal net : inout network_t;
207207
constant bus_handle : bus_master_t;
208208
constant address : natural;
209209
constant burst_length : positive;
210210
variable reference : inout bus_reference_t) is
211211
begin
212-
read_bus(net, bus_handle, to_address(bus_handle, address), burst_length, reference);
212+
burst_read_bus(net, bus_handle, to_address(bus_handle, address), burst_length, reference);
213213
end procedure;
214214

215215
-- Await read bus reply
@@ -225,20 +225,20 @@ package body bus_master_pkg is
225225
delete(reply_msg);
226226
end procedure;
227227

228-
procedure await_read_bus_reply(signal net : inout network_t;
228+
procedure await_burst_read_bus_reply(signal net : inout network_t;
229229
constant bus_handle : bus_master_t;
230-
constant burstdata : queue_t;
230+
constant data : queue_t;
231231
variable reference : inout bus_reference_t) is
232232
variable reply_msg : msg_t;
233233
alias request_msg : msg_t is reference;
234-
variable data : std_logic_vector(bus_handle.p_data_length-1 downto 0);
234+
variable d : std_logic_vector(bus_handle.p_data_length-1 downto 0);
235235
variable burst_length : positive;
236236
begin
237237
receive_reply(net, request_msg, reply_msg);
238238
burst_length := pop_integer(reply_msg);
239239
for i in 0 to burst_length-1 loop
240-
data := pop_std_ulogic_vector(reply_msg)(data'range);
241-
push(burstdata, data);
240+
d := pop_std_ulogic_vector(reply_msg)(d'range);
241+
push(data, d);
242242
end loop;
243243
delete(request_msg);
244244
delete(reply_msg);
@@ -264,24 +264,24 @@ package body bus_master_pkg is
264264
read_bus(net, bus_handle, to_address(bus_handle, address), data);
265265
end;
266266

267-
procedure read_bus(signal net : inout network_t;
267+
procedure burst_read_bus(signal net : inout network_t;
268268
constant bus_handle : bus_master_t;
269269
constant address : std_logic_vector;
270270
constant burst_length : positive;
271-
constant burstdata : queue_t) is
271+
constant data : queue_t) is
272272
variable reference : bus_reference_t;
273273
begin
274-
read_bus(net, bus_handle, address, burst_length, reference);
275-
await_read_bus_reply(net, bus_handle, burstdata, reference);
274+
burst_read_bus(net, bus_handle, address, burst_length, reference);
275+
await_burst_read_bus_reply(net, bus_handle, data, reference);
276276
end procedure;
277277

278-
procedure read_bus(signal net : inout network_t;
278+
procedure burst_read_bus(signal net : inout network_t;
279279
constant bus_handle : bus_master_t;
280280
constant address : natural;
281281
constant burst_length : positive;
282-
constant burstdata : queue_t) is
282+
constant data : queue_t) is
283283
begin
284-
read_bus(net, bus_handle, to_address(bus_handle, address), burst_length, burstdata);
284+
burst_read_bus(net, bus_handle, to_address(bus_handle, address), burst_length, data);
285285
end procedure;
286286

287287
procedure wait_until_read_equals(

‎vunit/vhdl/verification_components/src/bus_master_pkg.vhd‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ package bus_master_pkg is
7272
-- default byte enable is all bytes
7373
constant byte_enable : std_logic_vector := "");
7474
-- Procedures for burst bus write: Caller is responsible for allocation and
75-
-- deallocation of burstdata queue. Procedure cunsumes burst_length data words
76-
-- from burstdata queue. If burstdata queue has less data words, all data
75+
-- deallocation of data queue. Procedure cunsumes burst_length data words
76+
-- from data queue. If data queue has less data words, all data
7777
-- words are consumed and pop from empty queue error is raised.
78-
procedure write_bus(signal net : inout network_t;
78+
procedure burst_write_bus(signal net : inout network_t;
7979
constant bus_handle : bus_master_t;
8080
constant address : std_logic_vector;
8181
constant burst_length : positive;
82-
constant burstdata : queue_t);
83-
procedure write_bus(signal net : inout network_t;
82+
constant data : queue_t);
83+
procedure burst_write_bus(signal net : inout network_t;
8484
constant bus_handle : bus_master_t;
8585
constant address : natural;
8686
constant burst_length : positive;
87-
constant burstdata : queue_t);
87+
constant data : queue_t);
8888

8989
-- Non blocking: Read the bus returning a reference to the future reply
9090
procedure read_bus(signal net : inout network_t;
@@ -95,12 +95,12 @@ package bus_master_pkg is
9595
constant bus_handle : bus_master_t;
9696
constant address : natural;
9797
variable reference : inout bus_reference_t);
98-
procedure read_bus(signal net : inout network_t;
98+
procedure burst_read_bus(signal net : inout network_t;
9999
constant bus_handle : bus_master_t;
100100
constant address : std_logic_vector;
101101
constant burst_length : positive;
102102
variable reference : inout bus_reference_t);
103-
procedure read_bus(signal net : inout network_t;
103+
procedure burst_read_bus(signal net : inout network_t;
104104
constant bus_handle : bus_master_t;
105105
constant address : natural;
106106
constant burst_length : positive;
@@ -111,11 +111,11 @@ package bus_master_pkg is
111111
variable reference : inout bus_reference_t;
112112
variable data : inout std_logic_vector);
113113
-- Procedure for burst read reply: Caller is responsible for allocation and
114-
-- deallocation of burstdata queue. Procedure pushes burst_length data words
115-
-- into burstdata queue.
116-
procedure await_read_bus_reply(signal net : inout network_t;
114+
-- deallocation of data queue. Procedure pushes burst_length data words
115+
-- into data queue.
116+
procedure await_burst_read_bus_reply(signal net : inout network_t;
117117
constant bus_handle : bus_master_t;
118-
constant burstdata : queue_t;
118+
constant data : queue_t;
119119
variable reference : inout bus_reference_t);
120120

121121
-- Blocking: Read bus and check result against expected data
@@ -140,18 +140,18 @@ package bus_master_pkg is
140140
constant address : natural;
141141
variable data : inout std_logic_vector);
142142
-- Procedure for burst bus read: Caller is responsible for allocation and
143-
-- deallocation of burstdata queue. Procedure pushes burst_length data words
144-
-- into burstdata queue.
145-
procedure read_bus(signal net : inout network_t;
143+
-- deallocation of data queue. Procedure pushes burst_length data words
144+
-- into data queue.
145+
procedure burst_read_bus(signal net : inout network_t;
146146
constant bus_handle : bus_master_t;
147147
constant address : std_logic_vector;
148148
constant burst_length : positive;
149-
constant burstdata : queue_t);
150-
procedure read_bus(signal net : inout network_t;
149+
constant data : queue_t);
150+
procedure burst_read_bus(signal net : inout network_t;
151151
constant bus_handle : bus_master_t;
152152
constant address : natural;
153153
constant burst_length : positive;
154-
constant burstdata : queue_t);
154+
constant data : queue_t);
155155

156156
-- Blocking: Wait until a read from address equals the value using
157157
-- std_match If timeout is reached error with msg

‎vunit/vhdl/verification_components/test/tb_avalon_master.vhd‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,13 @@ begin
172172
for i in 0 to tb_cfg.transfers -1 loop
173173
push(data_queue, std_logic_vector(to_unsigned(i, writedata'length)));
174174
end loop;
175-
write_bus(net, bus_handle, 0, tb_cfg.transfers, data_queue);
175+
burst_write_bus(net, bus_handle, 0, tb_cfg.transfers, data_queue);
176176
check_true(is_empty(data_queue), "wr queue not flushed by master");
177177

178178
info(tb_logger, "Reading...");
179-
read_bus(net, bus_handle, 0, tb_cfg.transfers, burst_rd_ref);
179+
burst_read_bus(net, bus_handle, 0, tb_cfg.transfers, burst_rd_ref);
180180
info(tb_logger, "Get reads by references...");
181-
await_read_bus_reply(net, bus_handle, data_queue, burst_rd_ref);
181+
await_burst_read_bus_reply(net, bus_handle, data_queue, burst_rd_ref);
182182

183183
info(tb_logger, "Compare...");
184184
for i in 0 to tb_cfg.transfers-1 loop
@@ -193,11 +193,11 @@ begin
193193
for i in 0 to tb_cfg.transfers -1 loop
194194
push(data_queue, std_logic_vector(to_unsigned(i, writedata'length)));
195195
end loop;
196-
write_bus(net, bus_handle, 0, tb_cfg.transfers, data_queue);
196+
burst_write_bus(net, bus_handle, 0, tb_cfg.transfers, data_queue);
197197
check_true(is_empty(data_queue), "wr queue not flushed by master");
198198

199199
info(tb_logger, "Reading...");
200-
read_bus(net, bus_handle, 0, tb_cfg.transfers, data_queue);
200+
burst_read_bus(net, bus_handle, 0, tb_cfg.transfers, data_queue);
201201

202202
info(tb_logger, "Compare...");
203203
for i in 0 to tb_cfg.transfers-1 loop
@@ -217,7 +217,7 @@ begin
217217
addr := 0;
218218
while transfers > 0 loop
219219
gen_rndburst(rnd, rndburst, transfers);
220-
write_bus(net, bus_handle, addr, rndburst, data_queue);
220+
burst_write_bus(net, bus_handle, addr, rndburst, data_queue);
221221
addr := addr + rndburst * byteenable'length;
222222
end loop;
223223
check_true(is_empty(data_queue), "wr queue not flushed by master");
@@ -227,15 +227,15 @@ begin
227227
addr := 0;
228228
while transfers > 0 loop
229229
gen_rndburst(rnd, rndburst, transfers);
230-
read_bus(net, bus_handle, addr, rndburst, burst_rd_ref);
230+
burst_read_bus(net, bus_handle, addr, rndburst, burst_rd_ref);
231231
push(rd_ref_queue, burst_rd_ref);
232232
addr := addr + rndburst * byteenable'length;
233233
end loop;
234234

235235
info(tb_logger, "Get reads by references and compre...");
236236
while not is_empty(rd_ref_queue) loop
237237
burst_rd_ref := pop(rd_ref_queue);
238-
await_read_bus_reply(net, bus_handle, data_queue, burst_rd_ref);
238+
await_burst_read_bus_reply(net, bus_handle, data_queue, burst_rd_ref);
239239
while not is_empty(data_queue) loop
240240
tmp := pop(data_queue);
241241
check_equal(tmp, std_logic_vector(to_unsigned(i, readdata'length)), "read data");
@@ -262,21 +262,21 @@ begin
262262
for i in 1 to tb_cfg.transfers loop
263263
push(data_queue, std_logic_vector(to_unsigned(i, writedata'length)));
264264
end loop;
265-
write_bus(net, bus_handle, 0, tb_cfg.transfers, data_queue);
265+
burst_write_bus(net, bus_handle, 0, tb_cfg.transfers, data_queue);
266266
wait_until_idle(net, bus_handle);
267267
wait until rising_edge(clk);
268268
check_equal(write, '0', "unexpected write after wail till idle");
269269

270-
read_bus(net, bus_handle, 0, tb_cfg.transfers, data_queue);
270+
burst_read_bus(net, bus_handle, 0, tb_cfg.transfers, data_queue);
271271
wait_until_idle(net, bus_handle);
272272
wait until rising_edge(clk);
273273
check_equal(readdatavalid, '0', "unexpected readdatavalid after wail till idle");
274274

275-
read_bus(net, bus_handle, 0, tb_cfg.transfers, burst_rd_ref);
275+
burst_read_bus(net, bus_handle, 0, tb_cfg.transfers, burst_rd_ref);
276276
wait_until_idle(net, bus_handle);
277277
wait until rising_edge(clk);
278278
check_equal(readdatavalid, '0', "unexpected readdatavalid after wail till idle");
279-
await_read_bus_reply(net, bus_handle, data_queue, burst_rd_ref);
279+
await_burst_read_bus_reply(net, bus_handle, data_queue, burst_rd_ref);
280280
wait_until_idle(net, bus_handle);
281281

282282
end if;

0 commit comments

Comments
 (0)