mirror of
https://github.com/corundum/corundum.git
synced 2025-02-06 08:38:23 +08:00
Consolidate, add configuration parameters, and add tid and tdest ports to AXI stream FIFO
This commit is contained in:
parent
a5524287ca
commit
190d75df9d
@ -32,43 +32,65 @@ THE SOFTWARE.
|
|||||||
module axis_fifo #
|
module axis_fifo #
|
||||||
(
|
(
|
||||||
parameter ADDR_WIDTH = 12,
|
parameter ADDR_WIDTH = 12,
|
||||||
parameter DATA_WIDTH = 8
|
parameter DATA_WIDTH = 8,
|
||||||
|
parameter KEEP_ENABLE = (DATA_WIDTH>8),
|
||||||
|
parameter KEEP_WIDTH = (DATA_WIDTH/8),
|
||||||
|
parameter LAST_ENABLE = 1,
|
||||||
|
parameter ID_ENABLE = 0,
|
||||||
|
parameter ID_WIDTH = 8,
|
||||||
|
parameter DEST_ENABLE = 0,
|
||||||
|
parameter DEST_WIDTH = 8,
|
||||||
|
parameter USER_ENABLE = 1,
|
||||||
|
parameter USER_WIDTH = 1
|
||||||
)
|
)
|
||||||
(
|
(
|
||||||
input wire clk,
|
input wire clk,
|
||||||
input wire rst,
|
input wire rst,
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* AXI input
|
* AXI input
|
||||||
*/
|
*/
|
||||||
input wire [DATA_WIDTH-1:0] input_axis_tdata,
|
input wire [DATA_WIDTH-1:0] input_axis_tdata,
|
||||||
|
input wire [KEEP_WIDTH-1:0] input_axis_tkeep,
|
||||||
input wire input_axis_tvalid,
|
input wire input_axis_tvalid,
|
||||||
output wire input_axis_tready,
|
output wire input_axis_tready,
|
||||||
input wire input_axis_tlast,
|
input wire input_axis_tlast,
|
||||||
input wire input_axis_tuser,
|
input wire [ID_WIDTH-1:0] input_axis_tid,
|
||||||
|
input wire [DEST_WIDTH-1:0] input_axis_tdest,
|
||||||
|
input wire [USER_WIDTH-1:0] input_axis_tuser,
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* AXI output
|
* AXI output
|
||||||
*/
|
*/
|
||||||
output wire [DATA_WIDTH-1:0] output_axis_tdata,
|
output wire [DATA_WIDTH-1:0] output_axis_tdata,
|
||||||
|
output wire [KEEP_WIDTH-1:0] output_axis_tkeep,
|
||||||
output wire output_axis_tvalid,
|
output wire output_axis_tvalid,
|
||||||
input wire output_axis_tready,
|
input wire output_axis_tready,
|
||||||
output wire output_axis_tlast,
|
output wire output_axis_tlast,
|
||||||
output wire output_axis_tuser
|
output wire [ID_WIDTH-1:0] output_axis_tid,
|
||||||
|
output wire [DEST_WIDTH-1:0] output_axis_tdest,
|
||||||
|
output wire [USER_WIDTH-1:0] output_axis_tuser
|
||||||
);
|
);
|
||||||
|
|
||||||
|
localparam KEEP_OFFSET = DATA_WIDTH;
|
||||||
|
localparam LAST_OFFSET = KEEP_OFFSET + (KEEP_ENABLE ? KEEP_WIDTH : 0);
|
||||||
|
localparam ID_OFFSET = LAST_OFFSET + (LAST_ENABLE ? 1 : 0);
|
||||||
|
localparam DEST_OFFSET = ID_OFFSET + (ID_ENABLE ? ID_WIDTH : 0);
|
||||||
|
localparam USER_OFFSET = DEST_OFFSET + (DEST_ENABLE ? DEST_WIDTH : 0);
|
||||||
|
localparam WIDTH = USER_OFFSET + (USER_ENABLE ? USER_WIDTH : 0);
|
||||||
|
|
||||||
reg [ADDR_WIDTH:0] wr_ptr_reg = {ADDR_WIDTH+1{1'b0}}, wr_ptr_next;
|
reg [ADDR_WIDTH:0] wr_ptr_reg = {ADDR_WIDTH+1{1'b0}}, wr_ptr_next;
|
||||||
reg [ADDR_WIDTH:0] wr_addr_reg = {ADDR_WIDTH+1{1'b0}};
|
reg [ADDR_WIDTH:0] wr_addr_reg = {ADDR_WIDTH+1{1'b0}};
|
||||||
reg [ADDR_WIDTH:0] rd_ptr_reg = {ADDR_WIDTH+1{1'b0}}, rd_ptr_next;
|
reg [ADDR_WIDTH:0] rd_ptr_reg = {ADDR_WIDTH+1{1'b0}}, rd_ptr_next;
|
||||||
reg [ADDR_WIDTH:0] rd_addr_reg = {ADDR_WIDTH+1{1'b0}};
|
reg [ADDR_WIDTH:0] rd_addr_reg = {ADDR_WIDTH+1{1'b0}};
|
||||||
|
|
||||||
reg [DATA_WIDTH+2-1:0] mem[(2**ADDR_WIDTH)-1:0];
|
reg [WIDTH-1:0] mem[(2**ADDR_WIDTH)-1:0];
|
||||||
reg [DATA_WIDTH+2-1:0] mem_read_data_reg = {DATA_WIDTH+2{1'b0}};
|
reg [WIDTH-1:0] mem_read_data_reg;
|
||||||
reg mem_read_data_valid_reg = 1'b0, mem_read_data_valid_next;
|
reg mem_read_data_valid_reg = 1'b0, mem_read_data_valid_next;
|
||||||
wire [DATA_WIDTH+2-1:0] mem_write_data;
|
|
||||||
|
|
||||||
reg [DATA_WIDTH+2-1:0] output_data_reg = {DATA_WIDTH+2{1'b0}};
|
wire [WIDTH-1:0] input_axis;
|
||||||
|
|
||||||
|
reg [WIDTH-1:0] output_axis_reg;
|
||||||
reg output_axis_tvalid_reg = 1'b0, output_axis_tvalid_next;
|
reg output_axis_tvalid_reg = 1'b0, output_axis_tvalid_next;
|
||||||
|
|
||||||
// full when first MSB different but rest same
|
// full when first MSB different but rest same
|
||||||
@ -84,10 +106,23 @@ reg store_output;
|
|||||||
|
|
||||||
assign input_axis_tready = ~full;
|
assign input_axis_tready = ~full;
|
||||||
|
|
||||||
|
generate
|
||||||
|
assign input_axis[DATA_WIDTH-1:0] = input_axis_tdata;
|
||||||
|
if (KEEP_ENABLE) assign input_axis[KEEP_OFFSET +: KEEP_WIDTH] = input_axis_tkeep;
|
||||||
|
if (LAST_ENABLE) assign input_axis[LAST_OFFSET] = input_axis_tlast;
|
||||||
|
if (ID_ENABLE) assign input_axis[ID_OFFSET +: ID_WIDTH] = input_axis_tid;
|
||||||
|
if (DEST_ENABLE) assign input_axis[DEST_OFFSET +: DEST_WIDTH] = input_axis_tdest;
|
||||||
|
if (USER_ENABLE) assign input_axis[USER_OFFSET +: USER_WIDTH] = input_axis_tuser;
|
||||||
|
endgenerate
|
||||||
|
|
||||||
assign output_axis_tvalid = output_axis_tvalid_reg;
|
assign output_axis_tvalid = output_axis_tvalid_reg;
|
||||||
|
|
||||||
assign mem_write_data = {input_axis_tlast, input_axis_tuser, input_axis_tdata};
|
assign output_axis_tdata = output_axis_reg[DATA_WIDTH-1:0];
|
||||||
assign {output_axis_tlast, output_axis_tuser, output_axis_tdata} = output_data_reg;
|
assign output_axis_tkeep = KEEP_ENABLE ? output_axis_reg[KEEP_OFFSET +: KEEP_WIDTH] : {KEEP_WIDTH{1'b1}};
|
||||||
|
assign output_axis_tlast = LAST_ENABLE ? output_axis_reg[LAST_OFFSET] : 1'b1;
|
||||||
|
assign output_axis_tid = ID_ENABLE ? output_axis_reg[ID_OFFSET +: ID_WIDTH] : {ID_WIDTH{1'b0}};
|
||||||
|
assign output_axis_tdest = DEST_ENABLE ? output_axis_reg[DEST_OFFSET +: DEST_WIDTH] : {DEST_WIDTH{1'b0}};
|
||||||
|
assign output_axis_tuser = USER_ENABLE ? output_axis_reg[USER_OFFSET +: USER_WIDTH] : {USER_WIDTH{1'b0}};
|
||||||
|
|
||||||
// Write logic
|
// Write logic
|
||||||
always @* begin
|
always @* begin
|
||||||
@ -115,7 +150,7 @@ always @(posedge clk) begin
|
|||||||
wr_addr_reg <= wr_ptr_next;
|
wr_addr_reg <= wr_ptr_next;
|
||||||
|
|
||||||
if (write) begin
|
if (write) begin
|
||||||
mem[wr_addr_reg[ADDR_WIDTH-1:0]] <= mem_write_data;
|
mem[wr_addr_reg[ADDR_WIDTH-1:0]] <= input_axis;
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -177,7 +212,7 @@ always @(posedge clk) begin
|
|||||||
end
|
end
|
||||||
|
|
||||||
if (store_output) begin
|
if (store_output) begin
|
||||||
output_data_reg <= mem_read_data_reg;
|
output_axis_reg <= mem_read_data_reg;
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1,187 +0,0 @@
|
|||||||
/*
|
|
||||||
|
|
||||||
Copyright (c) 2013-2017 Alex Forencich
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in
|
|
||||||
all copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
||||||
THE SOFTWARE.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Language: Verilog 2001
|
|
||||||
|
|
||||||
`timescale 1ns / 1ps
|
|
||||||
|
|
||||||
/*
|
|
||||||
* AXI4-Stream FIFO (64 bit datapath)
|
|
||||||
*/
|
|
||||||
module axis_fifo_64 #
|
|
||||||
(
|
|
||||||
parameter ADDR_WIDTH = 12,
|
|
||||||
parameter DATA_WIDTH = 64,
|
|
||||||
parameter KEEP_WIDTH = (DATA_WIDTH/8)
|
|
||||||
)
|
|
||||||
(
|
|
||||||
input wire clk,
|
|
||||||
input wire rst,
|
|
||||||
|
|
||||||
/*
|
|
||||||
* AXI input
|
|
||||||
*/
|
|
||||||
input wire [DATA_WIDTH-1:0] input_axis_tdata,
|
|
||||||
input wire [KEEP_WIDTH-1:0] input_axis_tkeep,
|
|
||||||
input wire input_axis_tvalid,
|
|
||||||
output wire input_axis_tready,
|
|
||||||
input wire input_axis_tlast,
|
|
||||||
input wire input_axis_tuser,
|
|
||||||
|
|
||||||
/*
|
|
||||||
* AXI output
|
|
||||||
*/
|
|
||||||
output wire [DATA_WIDTH-1:0] output_axis_tdata,
|
|
||||||
output wire [KEEP_WIDTH-1:0] output_axis_tkeep,
|
|
||||||
output wire output_axis_tvalid,
|
|
||||||
input wire output_axis_tready,
|
|
||||||
output wire output_axis_tlast,
|
|
||||||
output wire output_axis_tuser
|
|
||||||
);
|
|
||||||
|
|
||||||
reg [ADDR_WIDTH:0] wr_ptr_reg = {ADDR_WIDTH+1{1'b0}}, wr_ptr_next;
|
|
||||||
reg [ADDR_WIDTH:0] wr_addr_reg = {ADDR_WIDTH+1{1'b0}};
|
|
||||||
reg [ADDR_WIDTH:0] rd_ptr_reg = {ADDR_WIDTH+1{1'b0}}, rd_ptr_next;
|
|
||||||
reg [ADDR_WIDTH:0] rd_addr_reg = {ADDR_WIDTH+1{1'b0}};
|
|
||||||
|
|
||||||
reg [DATA_WIDTH+KEEP_WIDTH+2-1:0] mem[(2**ADDR_WIDTH)-1:0];
|
|
||||||
reg [DATA_WIDTH+KEEP_WIDTH+2-1:0] mem_read_data_reg = {DATA_WIDTH+KEEP_WIDTH+2{1'b0}};
|
|
||||||
reg mem_read_data_valid_reg = 1'b0, mem_read_data_valid_next;
|
|
||||||
wire [DATA_WIDTH+KEEP_WIDTH+2-1:0] mem_write_data;
|
|
||||||
|
|
||||||
reg [DATA_WIDTH+KEEP_WIDTH+2-1:0] output_data_reg = {DATA_WIDTH+KEEP_WIDTH+2{1'b0}};
|
|
||||||
|
|
||||||
reg output_axis_tvalid_reg = 1'b0, output_axis_tvalid_next;
|
|
||||||
|
|
||||||
// full when first MSB different but rest same
|
|
||||||
wire full = ((wr_ptr_reg[ADDR_WIDTH] != rd_ptr_reg[ADDR_WIDTH]) &&
|
|
||||||
(wr_ptr_reg[ADDR_WIDTH-1:0] == rd_ptr_reg[ADDR_WIDTH-1:0]));
|
|
||||||
// empty when pointers match exactly
|
|
||||||
wire empty = wr_ptr_reg == rd_ptr_reg;
|
|
||||||
|
|
||||||
// control signals
|
|
||||||
reg write;
|
|
||||||
reg read;
|
|
||||||
reg store_output;
|
|
||||||
|
|
||||||
assign input_axis_tready = ~full;
|
|
||||||
|
|
||||||
assign output_axis_tvalid = output_axis_tvalid_reg;
|
|
||||||
|
|
||||||
assign mem_write_data = {input_axis_tlast, input_axis_tuser, input_axis_tkeep, input_axis_tdata};
|
|
||||||
assign {output_axis_tlast, output_axis_tuser, output_axis_tkeep, output_axis_tdata} = output_data_reg;
|
|
||||||
|
|
||||||
// Write logic
|
|
||||||
always @* begin
|
|
||||||
write = 1'b0;
|
|
||||||
|
|
||||||
wr_ptr_next = wr_ptr_reg;
|
|
||||||
|
|
||||||
if (input_axis_tvalid) begin
|
|
||||||
// input data valid
|
|
||||||
if (~full) begin
|
|
||||||
// not full, perform write
|
|
||||||
write = 1'b1;
|
|
||||||
wr_ptr_next = wr_ptr_reg + 1;
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
always @(posedge clk) begin
|
|
||||||
if (rst) begin
|
|
||||||
wr_ptr_reg <= {ADDR_WIDTH+1{1'b0}};
|
|
||||||
end else begin
|
|
||||||
wr_ptr_reg <= wr_ptr_next;
|
|
||||||
end
|
|
||||||
|
|
||||||
wr_addr_reg <= wr_ptr_next;
|
|
||||||
|
|
||||||
if (write) begin
|
|
||||||
mem[wr_addr_reg[ADDR_WIDTH-1:0]] <= mem_write_data;
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
// Read logic
|
|
||||||
always @* begin
|
|
||||||
read = 1'b0;
|
|
||||||
|
|
||||||
rd_ptr_next = rd_ptr_reg;
|
|
||||||
|
|
||||||
mem_read_data_valid_next = mem_read_data_valid_reg;
|
|
||||||
|
|
||||||
if (store_output | ~mem_read_data_valid_reg) begin
|
|
||||||
// output data not valid OR currently being transferred
|
|
||||||
if (~empty) begin
|
|
||||||
// not empty, perform read
|
|
||||||
read = 1'b1;
|
|
||||||
mem_read_data_valid_next = 1'b1;
|
|
||||||
rd_ptr_next = rd_ptr_reg + 1;
|
|
||||||
end else begin
|
|
||||||
// empty, invalidate
|
|
||||||
mem_read_data_valid_next = 1'b0;
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
always @(posedge clk) begin
|
|
||||||
if (rst) begin
|
|
||||||
rd_ptr_reg <= {ADDR_WIDTH+1{1'b0}};
|
|
||||||
mem_read_data_valid_reg <= 1'b0;
|
|
||||||
end else begin
|
|
||||||
rd_ptr_reg <= rd_ptr_next;
|
|
||||||
mem_read_data_valid_reg <= mem_read_data_valid_next;
|
|
||||||
end
|
|
||||||
|
|
||||||
rd_addr_reg <= rd_ptr_next;
|
|
||||||
|
|
||||||
if (read) begin
|
|
||||||
mem_read_data_reg <= mem[rd_addr_reg[ADDR_WIDTH-1:0]];
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
// Output register
|
|
||||||
always @* begin
|
|
||||||
store_output = 1'b0;
|
|
||||||
|
|
||||||
output_axis_tvalid_next = output_axis_tvalid_reg;
|
|
||||||
|
|
||||||
if (output_axis_tready | ~output_axis_tvalid) begin
|
|
||||||
store_output = 1'b1;
|
|
||||||
output_axis_tvalid_next = mem_read_data_valid_reg;
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
always @(posedge clk) begin
|
|
||||||
if (rst) begin
|
|
||||||
output_axis_tvalid_reg <= 1'b0;
|
|
||||||
end else begin
|
|
||||||
output_axis_tvalid_reg <= output_axis_tvalid_next;
|
|
||||||
end
|
|
||||||
|
|
||||||
if (store_output) begin
|
|
||||||
output_data_reg <= mem_read_data_reg;
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
endmodule
|
|
@ -45,6 +45,15 @@ def bench():
|
|||||||
# Parameters
|
# Parameters
|
||||||
ADDR_WIDTH = 2
|
ADDR_WIDTH = 2
|
||||||
DATA_WIDTH = 8
|
DATA_WIDTH = 8
|
||||||
|
KEEP_ENABLE = (DATA_WIDTH>8)
|
||||||
|
KEEP_WIDTH = (DATA_WIDTH/8)
|
||||||
|
LAST_ENABLE = 1
|
||||||
|
ID_ENABLE = 1
|
||||||
|
ID_WIDTH = 8
|
||||||
|
DEST_ENABLE = 1
|
||||||
|
DEST_WIDTH = 8
|
||||||
|
USER_ENABLE = 1
|
||||||
|
USER_WIDTH = 1
|
||||||
|
|
||||||
# Inputs
|
# Inputs
|
||||||
clk = Signal(bool(0))
|
clk = Signal(bool(0))
|
||||||
@ -52,17 +61,23 @@ def bench():
|
|||||||
current_test = Signal(intbv(0)[8:])
|
current_test = Signal(intbv(0)[8:])
|
||||||
|
|
||||||
input_axis_tdata = Signal(intbv(0)[DATA_WIDTH:])
|
input_axis_tdata = Signal(intbv(0)[DATA_WIDTH:])
|
||||||
|
input_axis_tkeep = Signal(intbv(1)[KEEP_WIDTH:])
|
||||||
input_axis_tvalid = Signal(bool(0))
|
input_axis_tvalid = Signal(bool(0))
|
||||||
input_axis_tlast = Signal(bool(0))
|
input_axis_tlast = Signal(bool(0))
|
||||||
input_axis_tuser = Signal(bool(0))
|
input_axis_tid = Signal(intbv(0)[ID_WIDTH:])
|
||||||
|
input_axis_tdest = Signal(intbv(0)[DEST_WIDTH:])
|
||||||
|
input_axis_tuser = Signal(intbv(0)[USER_WIDTH:])
|
||||||
output_axis_tready = Signal(bool(0))
|
output_axis_tready = Signal(bool(0))
|
||||||
|
|
||||||
# Outputs
|
# Outputs
|
||||||
input_axis_tready = Signal(bool(0))
|
input_axis_tready = Signal(bool(0))
|
||||||
output_axis_tdata = Signal(intbv(0)[DATA_WIDTH:])
|
output_axis_tdata = Signal(intbv(0)[DATA_WIDTH:])
|
||||||
|
output_axis_tkeep = Signal(intbv(1)[KEEP_WIDTH:])
|
||||||
output_axis_tvalid = Signal(bool(0))
|
output_axis_tvalid = Signal(bool(0))
|
||||||
output_axis_tlast = Signal(bool(0))
|
output_axis_tlast = Signal(bool(0))
|
||||||
output_axis_tuser = Signal(bool(0))
|
output_axis_tid = Signal(intbv(0)[ID_WIDTH:])
|
||||||
|
output_axis_tdest = Signal(intbv(0)[DEST_WIDTH:])
|
||||||
|
output_axis_tuser = Signal(intbv(0)[USER_WIDTH:])
|
||||||
|
|
||||||
# sources and sinks
|
# sources and sinks
|
||||||
source_pause = Signal(bool(0))
|
source_pause = Signal(bool(0))
|
||||||
@ -74,9 +89,12 @@ def bench():
|
|||||||
clk,
|
clk,
|
||||||
rst,
|
rst,
|
||||||
tdata=input_axis_tdata,
|
tdata=input_axis_tdata,
|
||||||
|
tkeep=input_axis_tkeep,
|
||||||
tvalid=input_axis_tvalid,
|
tvalid=input_axis_tvalid,
|
||||||
tready=input_axis_tready,
|
tready=input_axis_tready,
|
||||||
tlast=input_axis_tlast,
|
tlast=input_axis_tlast,
|
||||||
|
tid=input_axis_tid,
|
||||||
|
tdest=input_axis_tdest,
|
||||||
tuser=input_axis_tuser,
|
tuser=input_axis_tuser,
|
||||||
pause=source_pause,
|
pause=source_pause,
|
||||||
name='source'
|
name='source'
|
||||||
@ -88,9 +106,12 @@ def bench():
|
|||||||
clk,
|
clk,
|
||||||
rst,
|
rst,
|
||||||
tdata=output_axis_tdata,
|
tdata=output_axis_tdata,
|
||||||
|
tkeep=output_axis_tkeep,
|
||||||
tvalid=output_axis_tvalid,
|
tvalid=output_axis_tvalid,
|
||||||
tready=output_axis_tready,
|
tready=output_axis_tready,
|
||||||
tlast=output_axis_tlast,
|
tlast=output_axis_tlast,
|
||||||
|
tid=output_axis_tid,
|
||||||
|
tdest=output_axis_tdest,
|
||||||
tuser=output_axis_tuser,
|
tuser=output_axis_tuser,
|
||||||
pause=sink_pause,
|
pause=sink_pause,
|
||||||
name='sink'
|
name='sink'
|
||||||
@ -107,15 +128,21 @@ def bench():
|
|||||||
current_test=current_test,
|
current_test=current_test,
|
||||||
|
|
||||||
input_axis_tdata=input_axis_tdata,
|
input_axis_tdata=input_axis_tdata,
|
||||||
|
input_axis_tkeep=input_axis_tkeep,
|
||||||
input_axis_tvalid=input_axis_tvalid,
|
input_axis_tvalid=input_axis_tvalid,
|
||||||
input_axis_tready=input_axis_tready,
|
input_axis_tready=input_axis_tready,
|
||||||
input_axis_tlast=input_axis_tlast,
|
input_axis_tlast=input_axis_tlast,
|
||||||
|
input_axis_tid=input_axis_tid,
|
||||||
|
input_axis_tdest=input_axis_tdest,
|
||||||
input_axis_tuser=input_axis_tuser,
|
input_axis_tuser=input_axis_tuser,
|
||||||
|
|
||||||
output_axis_tdata=output_axis_tdata,
|
output_axis_tdata=output_axis_tdata,
|
||||||
|
output_axis_tkeep=output_axis_tkeep,
|
||||||
output_axis_tvalid=output_axis_tvalid,
|
output_axis_tvalid=output_axis_tvalid,
|
||||||
output_axis_tready=output_axis_tready,
|
output_axis_tready=output_axis_tready,
|
||||||
output_axis_tlast=output_axis_tlast,
|
output_axis_tlast=output_axis_tlast,
|
||||||
|
output_axis_tid=output_axis_tid,
|
||||||
|
output_axis_tdest=output_axis_tdest,
|
||||||
output_axis_tuser=output_axis_tuser
|
output_axis_tuser=output_axis_tuser
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -140,10 +167,15 @@ def bench():
|
|||||||
print("test 1: test packet")
|
print("test 1: test packet")
|
||||||
current_test.next = 1
|
current_test.next = 1
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
b'\x80\x00' +
|
||||||
|
b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
|
id=1,
|
||||||
|
dest=1
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
|
|
||||||
@ -161,10 +193,15 @@ def bench():
|
|||||||
print("test 2: longer packet")
|
print("test 2: longer packet")
|
||||||
current_test.next = 2
|
current_test.next = 2
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
bytearray(range(256)))
|
b'\x80\x00' +
|
||||||
|
bytearray(range(256)),
|
||||||
|
id=2,
|
||||||
|
dest=1
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
|
|
||||||
@ -180,10 +217,15 @@ def bench():
|
|||||||
print("test 3: test packet with pauses")
|
print("test 3: test packet with pauses")
|
||||||
current_test.next = 3
|
current_test.next = 3
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
b'\x80\x00' +
|
||||||
|
b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
|
id=3,
|
||||||
|
dest=1
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
|
|
||||||
@ -215,14 +257,23 @@ def bench():
|
|||||||
print("test 4: back-to-back packets")
|
print("test 4: back-to-back packets")
|
||||||
current_test.next = 4
|
current_test.next = 4
|
||||||
|
|
||||||
test_frame1 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame1 = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
b'\x80\x00' +
|
||||||
test_frame2 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
id=4,
|
||||||
b'\x80\x00' +
|
dest=1
|
||||||
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
)
|
||||||
|
test_frame2 = axis_ep.AXIStreamFrame(
|
||||||
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
|
b'\x80\x00' +
|
||||||
|
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
|
id=4,
|
||||||
|
dest=2
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame1)
|
source.send(test_frame1)
|
||||||
source.send(test_frame2)
|
source.send(test_frame2)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
@ -247,14 +298,23 @@ def bench():
|
|||||||
print("test 5: alternate pause source")
|
print("test 5: alternate pause source")
|
||||||
current_test.next = 5
|
current_test.next = 5
|
||||||
|
|
||||||
test_frame1 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame1 = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
b'\x80\x00' +
|
||||||
test_frame2 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
id=5,
|
||||||
b'\x80\x00' +
|
dest=1
|
||||||
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
)
|
||||||
|
test_frame2 = axis_ep.AXIStreamFrame(
|
||||||
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
|
b'\x80\x00' +
|
||||||
|
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
|
id=5,
|
||||||
|
dest=2
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame1)
|
source.send(test_frame1)
|
||||||
source.send(test_frame2)
|
source.send(test_frame2)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
@ -284,14 +344,23 @@ def bench():
|
|||||||
print("test 6: alternate pause sink")
|
print("test 6: alternate pause sink")
|
||||||
current_test.next = 6
|
current_test.next = 6
|
||||||
|
|
||||||
test_frame1 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame1 = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
b'\x80\x00' +
|
||||||
test_frame2 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
id=6,
|
||||||
b'\x80\x00' +
|
dest=1
|
||||||
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
)
|
||||||
|
test_frame2 = axis_ep.AXIStreamFrame(
|
||||||
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
|
b'\x80\x00' +
|
||||||
|
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
|
id=6,
|
||||||
|
dest=2
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame1)
|
source.send(test_frame1)
|
||||||
source.send(test_frame2)
|
source.send(test_frame2)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
@ -321,11 +390,16 @@ def bench():
|
|||||||
print("test 7: tuser assert")
|
print("test 7: tuser assert")
|
||||||
current_test.next = 7
|
current_test.next = 7
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
b'\x80\x00' +
|
||||||
test_frame.user = 1
|
b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
|
id=7,
|
||||||
|
dest=1,
|
||||||
|
last_cycle_user=1
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
|
|
||||||
@ -336,7 +410,7 @@ def bench():
|
|||||||
rx_frame = sink.recv()
|
rx_frame = sink.recv()
|
||||||
|
|
||||||
assert rx_frame == test_frame
|
assert rx_frame == test_frame
|
||||||
assert rx_frame.user[-1]
|
assert rx_frame.last_cycle_user
|
||||||
|
|
||||||
yield delay(100)
|
yield delay(100)
|
||||||
|
|
||||||
@ -344,7 +418,11 @@ def bench():
|
|||||||
print("test 8: initial sink pause")
|
print("test 8: initial sink pause")
|
||||||
current_test.next = 8
|
current_test.next = 8
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(b'\x01\x02\x03')
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
|
b'\x01\x02\x03',
|
||||||
|
id=8,
|
||||||
|
dest=1
|
||||||
|
)
|
||||||
|
|
||||||
sink_pause.next = 1
|
sink_pause.next = 1
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
@ -368,7 +446,11 @@ def bench():
|
|||||||
print("test 9: initial sink pause, reset")
|
print("test 9: initial sink pause, reset")
|
||||||
current_test.next = 9
|
current_test.next = 9
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(b'\x01\x02\x03')
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
|
b'\x01\x02\x03',
|
||||||
|
id=9,
|
||||||
|
dest=1
|
||||||
|
)
|
||||||
|
|
||||||
sink_pause.next = 1
|
sink_pause.next = 1
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
|
@ -34,6 +34,15 @@ module test_axis_fifo;
|
|||||||
// Parameters
|
// Parameters
|
||||||
parameter ADDR_WIDTH = 2;
|
parameter ADDR_WIDTH = 2;
|
||||||
parameter DATA_WIDTH = 8;
|
parameter DATA_WIDTH = 8;
|
||||||
|
parameter KEEP_ENABLE = (DATA_WIDTH>8);
|
||||||
|
parameter KEEP_WIDTH = (DATA_WIDTH/8);
|
||||||
|
parameter LAST_ENABLE = 1;
|
||||||
|
parameter ID_ENABLE = 1;
|
||||||
|
parameter ID_WIDTH = 8;
|
||||||
|
parameter DEST_ENABLE = 1;
|
||||||
|
parameter DEST_WIDTH = 8;
|
||||||
|
parameter USER_ENABLE = 1;
|
||||||
|
parameter USER_WIDTH = 1;
|
||||||
|
|
||||||
// Inputs
|
// Inputs
|
||||||
reg clk = 0;
|
reg clk = 0;
|
||||||
@ -41,17 +50,23 @@ reg rst = 0;
|
|||||||
reg [7:0] current_test = 0;
|
reg [7:0] current_test = 0;
|
||||||
|
|
||||||
reg [DATA_WIDTH-1:0] input_axis_tdata = 0;
|
reg [DATA_WIDTH-1:0] input_axis_tdata = 0;
|
||||||
|
reg [KEEP_WIDTH-1:0] input_axis_tkeep = 0;
|
||||||
reg input_axis_tvalid = 0;
|
reg input_axis_tvalid = 0;
|
||||||
reg input_axis_tlast = 0;
|
reg input_axis_tlast = 0;
|
||||||
reg input_axis_tuser = 0;
|
reg [ID_WIDTH-1:0] input_axis_tid = 0;
|
||||||
|
reg [DEST_WIDTH-1:0] input_axis_tdest = 0;
|
||||||
|
reg [USER_WIDTH-1:0] input_axis_tuser = 0;
|
||||||
reg output_axis_tready = 0;
|
reg output_axis_tready = 0;
|
||||||
|
|
||||||
// Outputs
|
// Outputs
|
||||||
wire input_axis_tready;
|
wire input_axis_tready;
|
||||||
wire [DATA_WIDTH-1:0] output_axis_tdata;
|
wire [DATA_WIDTH-1:0] output_axis_tdata;
|
||||||
|
wire [KEEP_WIDTH-1:0] output_axis_tkeep;
|
||||||
wire output_axis_tvalid;
|
wire output_axis_tvalid;
|
||||||
wire output_axis_tlast;
|
wire output_axis_tlast;
|
||||||
wire output_axis_tuser;
|
wire [ID_WIDTH-1:0] output_axis_tid;
|
||||||
|
wire [DEST_WIDTH-1:0] output_axis_tdest;
|
||||||
|
wire [USER_WIDTH-1:0] output_axis_tuser;
|
||||||
|
|
||||||
initial begin
|
initial begin
|
||||||
// myhdl integration
|
// myhdl integration
|
||||||
@ -60,16 +75,22 @@ initial begin
|
|||||||
rst,
|
rst,
|
||||||
current_test,
|
current_test,
|
||||||
input_axis_tdata,
|
input_axis_tdata,
|
||||||
|
input_axis_tkeep,
|
||||||
input_axis_tvalid,
|
input_axis_tvalid,
|
||||||
input_axis_tlast,
|
input_axis_tlast,
|
||||||
|
input_axis_tid,
|
||||||
|
input_axis_tdest,
|
||||||
input_axis_tuser,
|
input_axis_tuser,
|
||||||
output_axis_tready
|
output_axis_tready
|
||||||
);
|
);
|
||||||
$to_myhdl(
|
$to_myhdl(
|
||||||
input_axis_tready,
|
input_axis_tready,
|
||||||
output_axis_tdata,
|
output_axis_tdata,
|
||||||
|
output_axis_tkeep,
|
||||||
output_axis_tvalid,
|
output_axis_tvalid,
|
||||||
output_axis_tlast,
|
output_axis_tlast,
|
||||||
|
output_axis_tid,
|
||||||
|
output_axis_tdest,
|
||||||
output_axis_tuser
|
output_axis_tuser
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -80,22 +101,37 @@ end
|
|||||||
|
|
||||||
axis_fifo #(
|
axis_fifo #(
|
||||||
.ADDR_WIDTH(ADDR_WIDTH),
|
.ADDR_WIDTH(ADDR_WIDTH),
|
||||||
.DATA_WIDTH(DATA_WIDTH)
|
.DATA_WIDTH(DATA_WIDTH),
|
||||||
|
.KEEP_ENABLE(KEEP_ENABLE),
|
||||||
|
.KEEP_WIDTH(KEEP_WIDTH),
|
||||||
|
.LAST_ENABLE(LAST_ENABLE),
|
||||||
|
.ID_ENABLE(ID_ENABLE),
|
||||||
|
.ID_WIDTH(ID_WIDTH),
|
||||||
|
.DEST_ENABLE(DEST_ENABLE),
|
||||||
|
.DEST_WIDTH(DEST_WIDTH),
|
||||||
|
.USER_ENABLE(USER_ENABLE),
|
||||||
|
.USER_WIDTH(USER_WIDTH)
|
||||||
)
|
)
|
||||||
UUT (
|
UUT (
|
||||||
.clk(clk),
|
.clk(clk),
|
||||||
.rst(rst),
|
.rst(rst),
|
||||||
// AXI input
|
// AXI input
|
||||||
.input_axis_tdata(input_axis_tdata),
|
.input_axis_tdata(input_axis_tdata),
|
||||||
|
.input_axis_tkeep(input_axis_tkeep),
|
||||||
.input_axis_tvalid(input_axis_tvalid),
|
.input_axis_tvalid(input_axis_tvalid),
|
||||||
.input_axis_tready(input_axis_tready),
|
.input_axis_tready(input_axis_tready),
|
||||||
.input_axis_tlast(input_axis_tlast),
|
.input_axis_tlast(input_axis_tlast),
|
||||||
|
.input_axis_tid(input_axis_tid),
|
||||||
|
.input_axis_tdest(input_axis_tdest),
|
||||||
.input_axis_tuser(input_axis_tuser),
|
.input_axis_tuser(input_axis_tuser),
|
||||||
// AXI output
|
// AXI output
|
||||||
.output_axis_tdata(output_axis_tdata),
|
.output_axis_tdata(output_axis_tdata),
|
||||||
|
.output_axis_tkeep(output_axis_tkeep),
|
||||||
.output_axis_tvalid(output_axis_tvalid),
|
.output_axis_tvalid(output_axis_tvalid),
|
||||||
.output_axis_tready(output_axis_tready),
|
.output_axis_tready(output_axis_tready),
|
||||||
.output_axis_tlast(output_axis_tlast),
|
.output_axis_tlast(output_axis_tlast),
|
||||||
|
.output_axis_tid(output_axis_tid),
|
||||||
|
.output_axis_tdest(output_axis_tdest),
|
||||||
.output_axis_tuser(output_axis_tuser)
|
.output_axis_tuser(output_axis_tuser)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -28,8 +28,8 @@ import os
|
|||||||
|
|
||||||
import axis_ep
|
import axis_ep
|
||||||
|
|
||||||
module = 'axis_fifo_64'
|
module = 'axis_fifo'
|
||||||
testbench = 'test_%s' % module
|
testbench = 'test_%s_64' % module
|
||||||
|
|
||||||
srcs = []
|
srcs = []
|
||||||
|
|
||||||
@ -45,7 +45,15 @@ def bench():
|
|||||||
# Parameters
|
# Parameters
|
||||||
ADDR_WIDTH = 2
|
ADDR_WIDTH = 2
|
||||||
DATA_WIDTH = 64
|
DATA_WIDTH = 64
|
||||||
|
KEEP_ENABLE = (DATA_WIDTH>8)
|
||||||
KEEP_WIDTH = (DATA_WIDTH/8)
|
KEEP_WIDTH = (DATA_WIDTH/8)
|
||||||
|
LAST_ENABLE = 1
|
||||||
|
ID_ENABLE = 1
|
||||||
|
ID_WIDTH = 8
|
||||||
|
DEST_ENABLE = 1
|
||||||
|
DEST_WIDTH = 8
|
||||||
|
USER_ENABLE = 1
|
||||||
|
USER_WIDTH = 1
|
||||||
|
|
||||||
# Inputs
|
# Inputs
|
||||||
clk = Signal(bool(0))
|
clk = Signal(bool(0))
|
||||||
@ -53,19 +61,23 @@ def bench():
|
|||||||
current_test = Signal(intbv(0)[8:])
|
current_test = Signal(intbv(0)[8:])
|
||||||
|
|
||||||
input_axis_tdata = Signal(intbv(0)[DATA_WIDTH:])
|
input_axis_tdata = Signal(intbv(0)[DATA_WIDTH:])
|
||||||
input_axis_tkeep = Signal(intbv(0)[KEEP_WIDTH:])
|
input_axis_tkeep = Signal(intbv(1)[KEEP_WIDTH:])
|
||||||
input_axis_tvalid = Signal(bool(0))
|
input_axis_tvalid = Signal(bool(0))
|
||||||
input_axis_tlast = Signal(bool(0))
|
input_axis_tlast = Signal(bool(0))
|
||||||
input_axis_tuser = Signal(bool(0))
|
input_axis_tid = Signal(intbv(0)[ID_WIDTH:])
|
||||||
|
input_axis_tdest = Signal(intbv(0)[DEST_WIDTH:])
|
||||||
|
input_axis_tuser = Signal(intbv(0)[USER_WIDTH:])
|
||||||
output_axis_tready = Signal(bool(0))
|
output_axis_tready = Signal(bool(0))
|
||||||
|
|
||||||
# Outputs
|
# Outputs
|
||||||
input_axis_tready = Signal(bool(0))
|
input_axis_tready = Signal(bool(0))
|
||||||
output_axis_tdata = Signal(intbv(0)[DATA_WIDTH:])
|
output_axis_tdata = Signal(intbv(0)[DATA_WIDTH:])
|
||||||
output_axis_tkeep = Signal(intbv(0)[KEEP_WIDTH:])
|
output_axis_tkeep = Signal(intbv(1)[KEEP_WIDTH:])
|
||||||
output_axis_tvalid = Signal(bool(0))
|
output_axis_tvalid = Signal(bool(0))
|
||||||
output_axis_tlast = Signal(bool(0))
|
output_axis_tlast = Signal(bool(0))
|
||||||
output_axis_tuser = Signal(bool(0))
|
output_axis_tid = Signal(intbv(0)[ID_WIDTH:])
|
||||||
|
output_axis_tdest = Signal(intbv(0)[DEST_WIDTH:])
|
||||||
|
output_axis_tuser = Signal(intbv(0)[USER_WIDTH:])
|
||||||
|
|
||||||
# sources and sinks
|
# sources and sinks
|
||||||
source_pause = Signal(bool(0))
|
source_pause = Signal(bool(0))
|
||||||
@ -81,6 +93,8 @@ def bench():
|
|||||||
tvalid=input_axis_tvalid,
|
tvalid=input_axis_tvalid,
|
||||||
tready=input_axis_tready,
|
tready=input_axis_tready,
|
||||||
tlast=input_axis_tlast,
|
tlast=input_axis_tlast,
|
||||||
|
tid=input_axis_tid,
|
||||||
|
tdest=input_axis_tdest,
|
||||||
tuser=input_axis_tuser,
|
tuser=input_axis_tuser,
|
||||||
pause=source_pause,
|
pause=source_pause,
|
||||||
name='source'
|
name='source'
|
||||||
@ -96,6 +110,8 @@ def bench():
|
|||||||
tvalid=output_axis_tvalid,
|
tvalid=output_axis_tvalid,
|
||||||
tready=output_axis_tready,
|
tready=output_axis_tready,
|
||||||
tlast=output_axis_tlast,
|
tlast=output_axis_tlast,
|
||||||
|
tid=output_axis_tid,
|
||||||
|
tdest=output_axis_tdest,
|
||||||
tuser=output_axis_tuser,
|
tuser=output_axis_tuser,
|
||||||
pause=sink_pause,
|
pause=sink_pause,
|
||||||
name='sink'
|
name='sink'
|
||||||
@ -116,6 +132,8 @@ def bench():
|
|||||||
input_axis_tvalid=input_axis_tvalid,
|
input_axis_tvalid=input_axis_tvalid,
|
||||||
input_axis_tready=input_axis_tready,
|
input_axis_tready=input_axis_tready,
|
||||||
input_axis_tlast=input_axis_tlast,
|
input_axis_tlast=input_axis_tlast,
|
||||||
|
input_axis_tid=input_axis_tid,
|
||||||
|
input_axis_tdest=input_axis_tdest,
|
||||||
input_axis_tuser=input_axis_tuser,
|
input_axis_tuser=input_axis_tuser,
|
||||||
|
|
||||||
output_axis_tdata=output_axis_tdata,
|
output_axis_tdata=output_axis_tdata,
|
||||||
@ -123,6 +141,8 @@ def bench():
|
|||||||
output_axis_tvalid=output_axis_tvalid,
|
output_axis_tvalid=output_axis_tvalid,
|
||||||
output_axis_tready=output_axis_tready,
|
output_axis_tready=output_axis_tready,
|
||||||
output_axis_tlast=output_axis_tlast,
|
output_axis_tlast=output_axis_tlast,
|
||||||
|
output_axis_tid=output_axis_tid,
|
||||||
|
output_axis_tdest=output_axis_tdest,
|
||||||
output_axis_tuser=output_axis_tuser
|
output_axis_tuser=output_axis_tuser
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -147,10 +167,15 @@ def bench():
|
|||||||
print("test 1: test packet")
|
print("test 1: test packet")
|
||||||
current_test.next = 1
|
current_test.next = 1
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
b'\x80\x00' +
|
||||||
|
b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
|
id=1,
|
||||||
|
dest=1
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
|
|
||||||
@ -168,10 +193,15 @@ def bench():
|
|||||||
print("test 2: longer packet")
|
print("test 2: longer packet")
|
||||||
current_test.next = 2
|
current_test.next = 2
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
bytearray(range(256)))
|
b'\x80\x00' +
|
||||||
|
bytearray(range(256)),
|
||||||
|
id=2,
|
||||||
|
dest=1
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
|
|
||||||
@ -187,10 +217,15 @@ def bench():
|
|||||||
print("test 3: test packet with pauses")
|
print("test 3: test packet with pauses")
|
||||||
current_test.next = 3
|
current_test.next = 3
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
bytearray(range(256)))
|
b'\x80\x00' +
|
||||||
|
bytearray(range(256)),
|
||||||
|
id=3,
|
||||||
|
dest=1
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
|
|
||||||
@ -222,14 +257,23 @@ def bench():
|
|||||||
print("test 4: back-to-back packets")
|
print("test 4: back-to-back packets")
|
||||||
current_test.next = 4
|
current_test.next = 4
|
||||||
|
|
||||||
test_frame1 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame1 = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
b'\x80\x00' +
|
||||||
test_frame2 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
id=4,
|
||||||
b'\x80\x00' +
|
dest=1
|
||||||
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
)
|
||||||
|
test_frame2 = axis_ep.AXIStreamFrame(
|
||||||
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
|
b'\x80\x00' +
|
||||||
|
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
|
id=4,
|
||||||
|
dest=2
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame1)
|
source.send(test_frame1)
|
||||||
source.send(test_frame2)
|
source.send(test_frame2)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
@ -254,14 +298,23 @@ def bench():
|
|||||||
print("test 5: alternate pause source")
|
print("test 5: alternate pause source")
|
||||||
current_test.next = 5
|
current_test.next = 5
|
||||||
|
|
||||||
test_frame1 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame1 = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
b'\x80\x00' +
|
||||||
test_frame2 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
id=5,
|
||||||
b'\x80\x00' +
|
dest=1
|
||||||
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
)
|
||||||
|
test_frame2 = axis_ep.AXIStreamFrame(
|
||||||
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
|
b'\x80\x00' +
|
||||||
|
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
|
id=5,
|
||||||
|
dest=2
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame1)
|
source.send(test_frame1)
|
||||||
source.send(test_frame2)
|
source.send(test_frame2)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
@ -291,14 +344,23 @@ def bench():
|
|||||||
print("test 6: alternate pause sink")
|
print("test 6: alternate pause sink")
|
||||||
current_test.next = 6
|
current_test.next = 6
|
||||||
|
|
||||||
test_frame1 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame1 = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
b'\x80\x00' +
|
||||||
test_frame2 = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
b'\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
id=6,
|
||||||
b'\x80\x00' +
|
dest=1
|
||||||
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
)
|
||||||
|
test_frame2 = axis_ep.AXIStreamFrame(
|
||||||
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
|
b'\x80\x00' +
|
||||||
|
b'\x02\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
|
id=6,
|
||||||
|
dest=2
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame1)
|
source.send(test_frame1)
|
||||||
source.send(test_frame2)
|
source.send(test_frame2)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
@ -328,11 +390,16 @@ def bench():
|
|||||||
print("test 7: tuser assert")
|
print("test 7: tuser assert")
|
||||||
current_test.next = 7
|
current_test.next = 7
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
b'\x5A\x51\x52\x53\x54\x55' +
|
b'\xDA\xD1\xD2\xD3\xD4\xD5' +
|
||||||
b'\x80\x00' +
|
b'\x5A\x51\x52\x53\x54\x55' +
|
||||||
b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10')
|
b'\x80\x00' +
|
||||||
test_frame.user = 1
|
b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10',
|
||||||
|
id=7,
|
||||||
|
dest=1,
|
||||||
|
last_cycle_user=1
|
||||||
|
)
|
||||||
|
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
yield clk.posedge
|
yield clk.posedge
|
||||||
|
|
||||||
@ -343,7 +410,7 @@ def bench():
|
|||||||
rx_frame = sink.recv()
|
rx_frame = sink.recv()
|
||||||
|
|
||||||
assert rx_frame == test_frame
|
assert rx_frame == test_frame
|
||||||
assert rx_frame.user[-1]
|
assert rx_frame.last_cycle_user
|
||||||
|
|
||||||
yield delay(100)
|
yield delay(100)
|
||||||
|
|
||||||
@ -351,7 +418,11 @@ def bench():
|
|||||||
print("test 8: initial sink pause")
|
print("test 8: initial sink pause")
|
||||||
current_test.next = 8
|
current_test.next = 8
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(bytearray(range(24)))
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
|
bytearray(range(24)),
|
||||||
|
id=8,
|
||||||
|
dest=1
|
||||||
|
)
|
||||||
|
|
||||||
sink_pause.next = 1
|
sink_pause.next = 1
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
@ -375,7 +446,11 @@ def bench():
|
|||||||
print("test 9: initial sink pause, reset")
|
print("test 9: initial sink pause, reset")
|
||||||
current_test.next = 9
|
current_test.next = 9
|
||||||
|
|
||||||
test_frame = axis_ep.AXIStreamFrame(bytearray(range(24)))
|
test_frame = axis_ep.AXIStreamFrame(
|
||||||
|
bytearray(range(24)),
|
||||||
|
id=9,
|
||||||
|
dest=1
|
||||||
|
)
|
||||||
|
|
||||||
sink_pause.next = 1
|
sink_pause.next = 1
|
||||||
source.send(test_frame)
|
source.send(test_frame)
|
||||||
|
@ -27,14 +27,22 @@ THE SOFTWARE.
|
|||||||
`timescale 1ns / 1ps
|
`timescale 1ns / 1ps
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Testbench for axis_fifo_64
|
* Testbench for axis_fifo
|
||||||
*/
|
*/
|
||||||
module test_axis_fifo_64;
|
module test_axis_fifo_64;
|
||||||
|
|
||||||
// Parameters
|
// Parameters
|
||||||
parameter ADDR_WIDTH = 2;
|
parameter ADDR_WIDTH = 2;
|
||||||
parameter DATA_WIDTH = 64;
|
parameter DATA_WIDTH = 64;
|
||||||
|
parameter KEEP_ENABLE = (DATA_WIDTH>8);
|
||||||
parameter KEEP_WIDTH = (DATA_WIDTH/8);
|
parameter KEEP_WIDTH = (DATA_WIDTH/8);
|
||||||
|
parameter LAST_ENABLE = 1;
|
||||||
|
parameter ID_ENABLE = 1;
|
||||||
|
parameter ID_WIDTH = 8;
|
||||||
|
parameter DEST_ENABLE = 1;
|
||||||
|
parameter DEST_WIDTH = 8;
|
||||||
|
parameter USER_ENABLE = 1;
|
||||||
|
parameter USER_WIDTH = 1;
|
||||||
|
|
||||||
// Inputs
|
// Inputs
|
||||||
reg clk = 0;
|
reg clk = 0;
|
||||||
@ -45,7 +53,9 @@ reg [DATA_WIDTH-1:0] input_axis_tdata = 0;
|
|||||||
reg [KEEP_WIDTH-1:0] input_axis_tkeep = 0;
|
reg [KEEP_WIDTH-1:0] input_axis_tkeep = 0;
|
||||||
reg input_axis_tvalid = 0;
|
reg input_axis_tvalid = 0;
|
||||||
reg input_axis_tlast = 0;
|
reg input_axis_tlast = 0;
|
||||||
reg input_axis_tuser = 0;
|
reg [ID_WIDTH-1:0] input_axis_tid = 0;
|
||||||
|
reg [DEST_WIDTH-1:0] input_axis_tdest = 0;
|
||||||
|
reg [USER_WIDTH-1:0] input_axis_tuser = 0;
|
||||||
reg output_axis_tready = 0;
|
reg output_axis_tready = 0;
|
||||||
|
|
||||||
// Outputs
|
// Outputs
|
||||||
@ -54,7 +64,9 @@ wire [DATA_WIDTH-1:0] output_axis_tdata;
|
|||||||
wire [KEEP_WIDTH-1:0] output_axis_tkeep;
|
wire [KEEP_WIDTH-1:0] output_axis_tkeep;
|
||||||
wire output_axis_tvalid;
|
wire output_axis_tvalid;
|
||||||
wire output_axis_tlast;
|
wire output_axis_tlast;
|
||||||
wire output_axis_tuser;
|
wire [ID_WIDTH-1:0] output_axis_tid;
|
||||||
|
wire [DEST_WIDTH-1:0] output_axis_tdest;
|
||||||
|
wire [USER_WIDTH-1:0] output_axis_tuser;
|
||||||
|
|
||||||
initial begin
|
initial begin
|
||||||
// myhdl integration
|
// myhdl integration
|
||||||
@ -66,6 +78,8 @@ initial begin
|
|||||||
input_axis_tkeep,
|
input_axis_tkeep,
|
||||||
input_axis_tvalid,
|
input_axis_tvalid,
|
||||||
input_axis_tlast,
|
input_axis_tlast,
|
||||||
|
input_axis_tid,
|
||||||
|
input_axis_tdest,
|
||||||
input_axis_tuser,
|
input_axis_tuser,
|
||||||
output_axis_tready
|
output_axis_tready
|
||||||
);
|
);
|
||||||
@ -75,6 +89,8 @@ initial begin
|
|||||||
output_axis_tkeep,
|
output_axis_tkeep,
|
||||||
output_axis_tvalid,
|
output_axis_tvalid,
|
||||||
output_axis_tlast,
|
output_axis_tlast,
|
||||||
|
output_axis_tid,
|
||||||
|
output_axis_tdest,
|
||||||
output_axis_tuser
|
output_axis_tuser
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -83,9 +99,18 @@ initial begin
|
|||||||
$dumpvars(0, test_axis_fifo_64);
|
$dumpvars(0, test_axis_fifo_64);
|
||||||
end
|
end
|
||||||
|
|
||||||
axis_fifo_64 #(
|
axis_fifo #(
|
||||||
.ADDR_WIDTH(ADDR_WIDTH),
|
.ADDR_WIDTH(ADDR_WIDTH),
|
||||||
.DATA_WIDTH(DATA_WIDTH)
|
.DATA_WIDTH(DATA_WIDTH),
|
||||||
|
.KEEP_ENABLE(KEEP_ENABLE),
|
||||||
|
.KEEP_WIDTH(KEEP_WIDTH),
|
||||||
|
.LAST_ENABLE(LAST_ENABLE),
|
||||||
|
.ID_ENABLE(ID_ENABLE),
|
||||||
|
.ID_WIDTH(ID_WIDTH),
|
||||||
|
.DEST_ENABLE(DEST_ENABLE),
|
||||||
|
.DEST_WIDTH(DEST_WIDTH),
|
||||||
|
.USER_ENABLE(USER_ENABLE),
|
||||||
|
.USER_WIDTH(USER_WIDTH)
|
||||||
)
|
)
|
||||||
UUT (
|
UUT (
|
||||||
.clk(clk),
|
.clk(clk),
|
||||||
@ -96,6 +121,8 @@ UUT (
|
|||||||
.input_axis_tvalid(input_axis_tvalid),
|
.input_axis_tvalid(input_axis_tvalid),
|
||||||
.input_axis_tready(input_axis_tready),
|
.input_axis_tready(input_axis_tready),
|
||||||
.input_axis_tlast(input_axis_tlast),
|
.input_axis_tlast(input_axis_tlast),
|
||||||
|
.input_axis_tid(input_axis_tid),
|
||||||
|
.input_axis_tdest(input_axis_tdest),
|
||||||
.input_axis_tuser(input_axis_tuser),
|
.input_axis_tuser(input_axis_tuser),
|
||||||
// AXI output
|
// AXI output
|
||||||
.output_axis_tdata(output_axis_tdata),
|
.output_axis_tdata(output_axis_tdata),
|
||||||
@ -103,6 +130,8 @@ UUT (
|
|||||||
.output_axis_tvalid(output_axis_tvalid),
|
.output_axis_tvalid(output_axis_tvalid),
|
||||||
.output_axis_tready(output_axis_tready),
|
.output_axis_tready(output_axis_tready),
|
||||||
.output_axis_tlast(output_axis_tlast),
|
.output_axis_tlast(output_axis_tlast),
|
||||||
|
.output_axis_tid(output_axis_tid),
|
||||||
|
.output_axis_tdest(output_axis_tdest),
|
||||||
.output_axis_tuser(output_axis_tuser)
|
.output_axis_tuser(output_axis_tuser)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user