Skip to content

Commit 5eb729c

Browse files
committed
All ID and USER widths of AXI interfaces are customizable.
1 parent 84f2ac1 commit 5eb729c

File tree

28 files changed

+742
-1766
lines changed

28 files changed

+742
-1766
lines changed

examples/simulation_verilator/test_simulation_verilator.py

Lines changed: 27 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
1515
reg CLK;
1616
reg RST;
17-
wire [1-1:0] myaxi_awid;
1817
wire [32-1:0] myaxi_awaddr;
1918
wire [8-1:0] myaxi_awlen;
2019
wire [3-1:0] myaxi_awsize;
@@ -29,15 +28,11 @@
2928
wire [32-1:0] myaxi_wdata;
3029
wire [4-1:0] myaxi_wstrb;
3130
wire myaxi_wlast;
32-
wire [1-1:0] myaxi_wuser;
3331
wire myaxi_wvalid;
3432
reg myaxi_wready;
35-
reg [1-1:0] myaxi_bid;
3633
reg [2-1:0] myaxi_bresp;
37-
reg [1-1:0] myaxi_buser;
3834
reg myaxi_bvalid;
3935
wire myaxi_bready;
40-
wire [1-1:0] myaxi_arid;
4136
wire [32-1:0] myaxi_araddr;
4237
wire [8-1:0] myaxi_arlen;
4338
wire [3-1:0] myaxi_arsize;
@@ -49,14 +44,11 @@
4944
wire [1-1:0] myaxi_aruser;
5045
wire myaxi_arvalid;
5146
reg myaxi_arready;
52-
reg [1-1:0] myaxi_rid;
5347
reg [32-1:0] myaxi_rdata;
5448
reg [2-1:0] myaxi_rresp;
5549
reg myaxi_rlast;
56-
reg [1-1:0] myaxi_ruser;
5750
reg myaxi_rvalid;
5851
wire myaxi_rready;
59-
wire [1-1:0] memory_awid;
6052
wire [32-1:0] memory_awaddr;
6153
wire [8-1:0] memory_awlen;
6254
wire [3-1:0] memory_awsize;
@@ -71,15 +63,11 @@
7163
wire [32-1:0] memory_wdata;
7264
wire [4-1:0] memory_wstrb;
7365
wire memory_wlast;
74-
wire [1-1:0] memory_wuser;
7566
wire memory_wvalid;
7667
reg memory_wready;
77-
reg [1-1:0] memory_bid;
7868
wire [2-1:0] memory_bresp;
79-
wire [1-1:0] memory_buser;
8069
reg memory_bvalid;
8170
wire memory_bready;
82-
wire [1-1:0] memory_arid;
8371
wire [32-1:0] memory_araddr;
8472
wire [8-1:0] memory_arlen;
8573
wire [3-1:0] memory_arsize;
@@ -91,17 +79,13 @@
9179
wire [1-1:0] memory_aruser;
9280
wire memory_arvalid;
9381
reg memory_arready;
94-
reg [1-1:0] memory_rid;
9582
reg [32-1:0] memory_rdata;
9683
wire [2-1:0] memory_rresp;
9784
reg memory_rlast;
98-
wire [1-1:0] memory_ruser;
9985
reg memory_rvalid;
10086
wire memory_rready;
10187
assign memory_bresp = 0;
102-
assign memory_buser = 1;
10388
assign memory_rresp = 0;
104-
assign memory_ruser = 1;
10589
reg [32-1:0] _memory_fsm;
10690
localparam _memory_fsm_init = 0;
10791
reg [8-1:0] _memory_mem [0:2**20-1];
@@ -119,7 +103,6 @@
119103
reg __memory_fsm_cond_100_0_1;
120104
reg __memory_fsm_cond_200_1_1;
121105
reg __memory_fsm_cond_211_2_1;
122-
assign memory_awid = myaxi_awid;
123106
assign memory_awaddr = myaxi_awaddr;
124107
assign memory_awlen = myaxi_awlen;
125108
assign memory_awsize = myaxi_awsize;
@@ -140,7 +123,6 @@
140123
assign memory_wdata = myaxi_wdata;
141124
assign memory_wstrb = myaxi_wstrb;
142125
assign memory_wlast = myaxi_wlast;
143-
assign memory_wuser = myaxi_wuser;
144126
assign memory_wvalid = myaxi_wvalid;
145127
wire _tmp_1;
146128
assign _tmp_1 = memory_wready;
@@ -149,36 +131,21 @@
149131
myaxi_wready = _tmp_1;
150132
end
151133
152-
wire [1-1:0] _tmp_2;
153-
assign _tmp_2 = memory_bid;
134+
wire [2-1:0] _tmp_2;
135+
assign _tmp_2 = memory_bresp;
154136
155137
always @(*) begin
156-
myaxi_bid = _tmp_2;
138+
myaxi_bresp = _tmp_2;
157139
end
158140
159-
wire [2-1:0] _tmp_3;
160-
assign _tmp_3 = memory_bresp;
141+
wire _tmp_3;
142+
assign _tmp_3 = memory_bvalid;
161143
162144
always @(*) begin
163-
myaxi_bresp = _tmp_3;
164-
end
165-
166-
wire [1-1:0] _tmp_4;
167-
assign _tmp_4 = memory_buser;
168-
169-
always @(*) begin
170-
myaxi_buser = _tmp_4;
171-
end
172-
173-
wire _tmp_5;
174-
assign _tmp_5 = memory_bvalid;
175-
176-
always @(*) begin
177-
myaxi_bvalid = _tmp_5;
145+
myaxi_bvalid = _tmp_3;
178146
end
179147
180148
assign memory_bready = myaxi_bready;
181-
assign memory_arid = myaxi_arid;
182149
assign memory_araddr = myaxi_araddr;
183150
assign memory_arlen = myaxi_arlen;
184151
assign memory_arsize = myaxi_arsize;
@@ -189,53 +156,39 @@
189156
assign memory_arqos = myaxi_arqos;
190157
assign memory_aruser = myaxi_aruser;
191158
assign memory_arvalid = myaxi_arvalid;
192-
wire _tmp_6;
193-
assign _tmp_6 = memory_arready;
194-
195-
always @(*) begin
196-
myaxi_arready = _tmp_6;
197-
end
198-
199-
wire [1-1:0] _tmp_7;
200-
assign _tmp_7 = memory_rid;
201-
202-
always @(*) begin
203-
myaxi_rid = _tmp_7;
204-
end
205-
206-
wire [32-1:0] _tmp_8;
207-
assign _tmp_8 = memory_rdata;
159+
wire _tmp_4;
160+
assign _tmp_4 = memory_arready;
208161
209162
always @(*) begin
210-
myaxi_rdata = _tmp_8;
163+
myaxi_arready = _tmp_4;
211164
end
212165
213-
wire [2-1:0] _tmp_9;
214-
assign _tmp_9 = memory_rresp;
166+
wire [32-1:0] _tmp_5;
167+
assign _tmp_5 = memory_rdata;
215168
216169
always @(*) begin
217-
myaxi_rresp = _tmp_9;
170+
myaxi_rdata = _tmp_5;
218171
end
219172
220-
wire _tmp_10;
221-
assign _tmp_10 = memory_rlast;
173+
wire [2-1:0] _tmp_6;
174+
assign _tmp_6 = memory_rresp;
222175
223176
always @(*) begin
224-
myaxi_rlast = _tmp_10;
177+
myaxi_rresp = _tmp_6;
225178
end
226179
227-
wire [1-1:0] _tmp_11;
228-
assign _tmp_11 = memory_ruser;
180+
wire _tmp_7;
181+
assign _tmp_7 = memory_rlast;
229182
230183
always @(*) begin
231-
myaxi_ruser = _tmp_11;
184+
myaxi_rlast = _tmp_7;
232185
end
233186
234-
wire _tmp_12;
235-
assign _tmp_12 = memory_rvalid;
187+
wire _tmp_8;
188+
assign _tmp_8 = memory_rvalid;
236189
237190
always @(*) begin
238-
myaxi_rvalid = _tmp_12;
191+
myaxi_rvalid = _tmp_8;
239192
end
240193
241194
assign memory_rready = myaxi_rready;
@@ -245,7 +198,6 @@
245198
(
246199
.CLK(CLK),
247200
.RST(RST),
248-
.myaxi_awid(myaxi_awid),
249201
.myaxi_awaddr(myaxi_awaddr),
250202
.myaxi_awlen(myaxi_awlen),
251203
.myaxi_awsize(myaxi_awsize),
@@ -260,15 +212,11 @@
260212
.myaxi_wdata(myaxi_wdata),
261213
.myaxi_wstrb(myaxi_wstrb),
262214
.myaxi_wlast(myaxi_wlast),
263-
.myaxi_wuser(myaxi_wuser),
264215
.myaxi_wvalid(myaxi_wvalid),
265216
.myaxi_wready(myaxi_wready),
266-
.myaxi_bid(myaxi_bid),
267217
.myaxi_bresp(myaxi_bresp),
268-
.myaxi_buser(myaxi_buser),
269218
.myaxi_bvalid(myaxi_bvalid),
270219
.myaxi_bready(myaxi_bready),
271-
.myaxi_arid(myaxi_arid),
272220
.myaxi_araddr(myaxi_araddr),
273221
.myaxi_arlen(myaxi_arlen),
274222
.myaxi_arsize(myaxi_arsize),
@@ -280,11 +228,9 @@
280228
.myaxi_aruser(myaxi_aruser),
281229
.myaxi_arvalid(myaxi_arvalid),
282230
.myaxi_arready(myaxi_arready),
283-
.myaxi_rid(myaxi_rid),
284231
.myaxi_rdata(myaxi_rdata),
285232
.myaxi_rresp(myaxi_rresp),
286233
.myaxi_rlast(myaxi_rlast),
287-
.myaxi_ruser(myaxi_ruser),
288234
.myaxi_rvalid(myaxi_rvalid),
289235
.myaxi_rready(myaxi_rready)
290236
);
@@ -306,10 +252,8 @@
306252
RST = 0;
307253
memory_awready = 0;
308254
memory_wready = 0;
309-
memory_bid = 0;
310255
memory_bvalid = 0;
311256
memory_arready = 0;
312-
memory_rid = 0;
313257
memory_rdata = 0;
314258
memory_rlast = 0;
315259
memory_rvalid = 0;
@@ -331,18 +275,18 @@
331275
$write("");
332276
end
333277
334-
wire _tmp_13;
335-
assign _tmp_13 = io_CLK;
278+
wire _tmp_9;
279+
assign _tmp_9 = io_CLK;
336280
337281
always @(*) begin
338-
CLK = _tmp_13;
282+
CLK = _tmp_9;
339283
end
340284
341-
wire _tmp_14;
342-
assign _tmp_14 = io_RST;
285+
wire _tmp_10;
286+
assign _tmp_10 = io_RST;
343287
344288
always @(*) begin
345-
RST = _tmp_14;
289+
RST = _tmp_10;
346290
end
347291
348292
localparam _memory_fsm_200 = 200;
@@ -392,17 +336,9 @@
392336
memory_rlast <= 0;
393337
__memory_fsm_cond_211_2_1 <= 0;
394338
memory_rdata <= 0;
395-
memory_bid <= 0;
396-
memory_rid <= 0;
397339
memory_bvalid <= 0;
398340
_sleep_count <= 0;
399341
end else begin
400-
if(memory_awvalid && memory_awready && !memory_bvalid) begin
401-
memory_bid <= memory_awid;
402-
end
403-
if(memory_arvalid && memory_arready) begin
404-
memory_rid <= memory_arid;
405-
end
406342
if(memory_bvalid && memory_bready) begin
407343
memory_bvalid <= 0;
408344
end
@@ -606,7 +542,6 @@
606542
(
607543
input CLK,
608544
input RST,
609-
output reg [1-1:0] myaxi_awid,
610545
output reg [32-1:0] myaxi_awaddr,
611546
output reg [8-1:0] myaxi_awlen,
612547
output [3-1:0] myaxi_awsize,
@@ -621,15 +556,11 @@
621556
output reg [32-1:0] myaxi_wdata,
622557
output reg [4-1:0] myaxi_wstrb,
623558
output reg myaxi_wlast,
624-
output [1-1:0] myaxi_wuser,
625559
output reg myaxi_wvalid,
626560
input myaxi_wready,
627-
input [1-1:0] myaxi_bid,
628561
input [2-1:0] myaxi_bresp,
629-
input [1-1:0] myaxi_buser,
630562
input myaxi_bvalid,
631563
output myaxi_bready,
632-
output reg [1-1:0] myaxi_arid,
633564
output reg [32-1:0] myaxi_araddr,
634565
output reg [8-1:0] myaxi_arlen,
635566
output [3-1:0] myaxi_arsize,
@@ -641,11 +572,9 @@
641572
output [1-1:0] myaxi_aruser,
642573
output reg myaxi_arvalid,
643574
input myaxi_arready,
644-
input [1-1:0] myaxi_rid,
645575
input [32-1:0] myaxi_rdata,
646576
input [2-1:0] myaxi_rresp,
647577
input myaxi_rlast,
648-
input [1-1:0] myaxi_ruser,
649578
input myaxi_rvalid,
650579
output myaxi_rready
651580
);
@@ -703,7 +632,6 @@
703632
assign myaxi_awprot = 0;
704633
assign myaxi_awqos = 0;
705634
assign myaxi_awuser = 1;
706-
assign myaxi_wuser = 1;
707635
assign myaxi_bready = 1;
708636
assign myaxi_arsize = 2;
709637
assign myaxi_arburst = 1;
@@ -1102,7 +1030,6 @@
11021030
_myaxi_read_global_addr <= 0;
11031031
_myaxi_read_size <= 0;
11041032
_myaxi_read_local_stride <= 0;
1105-
myaxi_arid <= 0;
11061033
myaxi_araddr <= 0;
11071034
myaxi_arlen <= 0;
11081035
myaxi_arvalid <= 0;
@@ -1126,7 +1053,6 @@
11261053
_myaxi_write_global_addr <= 0;
11271054
_myaxi_write_size <= 0;
11281055
_myaxi_write_local_stride <= 0;
1129-
myaxi_awid <= 0;
11301056
myaxi_awaddr <= 0;
11311057
myaxi_awlen <= 0;
11321058
myaxi_awvalid <= 0;
@@ -1179,7 +1105,6 @@
11791105
_myaxi_read_local_stride <= _myaxi_ram_a_0_read_local_stride;
11801106
end
11811107
if((_myaxi_read_fsm == 2) && ((myaxi_arready || !myaxi_arvalid) && (_tmp_5 == 0))) begin
1182-
myaxi_arid <= 0;
11831108
myaxi_araddr <= _myaxi_read_cur_global_addr;
11841109
myaxi_arlen <= _myaxi_read_cur_size - 1;
11851110
myaxi_arvalid <= 1;
@@ -1236,7 +1161,6 @@
12361161
_myaxi_write_local_stride <= _myaxi_ram_c_0_write_local_stride;
12371162
end
12381163
if((_myaxi_write_fsm == 2) && ((myaxi_awready || !myaxi_awvalid) && (_tmp_29 == 0))) begin
1239-
myaxi_awid <= 0;
12401164
myaxi_awaddr <= _myaxi_write_cur_global_addr;
12411165
myaxi_awlen <= _myaxi_write_cur_size - 1;
12421166
myaxi_awvalid <= 1;

0 commit comments

Comments
 (0)