FPGA/verilog-ethernet
1
0
Fork 0
mirror of https://github.com/alexforencich/verilog-ethernet.git synced 2025-01-14 06:43:18 +08:00
Code Issues Projects Releases Wiki Activity

Change parameter concatenation to increments of DEST_WIDTH

Browse Source
This commit is contained in:
Alex Forencich 2019-03-28 23:49:04 -07:00
parent ad3905ac4d
commit a9c7946368
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rtl/axis_switch.v
View File

@ -41,8 +41,8 @@ module axis_switch #
parameter DEST_WIDTH = $clog2(S_COUNT), parameter DEST_WIDTH = $clog2(S_COUNT),
parameter USER_ENABLE = 1, parameter USER_ENABLE = 1,
parameter USER_WIDTH = 1, parameter USER_WIDTH = 1,
parameter M_BASE = {32'd3, 32'd2, 32'd1, 32'd0}, parameter M_BASE = {2'd3, 2'd2, 2'd1, 2'd0},
parameter M_TOP = {32'd3, 32'd2, 32'd1, 32'd0}, parameter M_TOP = {2'd3, 2'd2, 2'd1, 2'd0},
parameter M_CONNECT = {M_COUNT{{S_COUNT{1'b1}}}}, parameter M_CONNECT = {M_COUNT{{S_COUNT{1'b1}}}},
parameter S_REG_TYPE = 0, parameter S_REG_TYPE = 0,
parameter M_REG_TYPE = 2, parameter M_REG_TYPE = 2,
@ -93,14 +93,14 @@ initial begin
end end
for (i = 0; i < M_COUNT; i = i + 1) begin for (i = 0; i < M_COUNT; i = i + 1) begin
if (M_BASE[i*32 +: 32] < 0 || M_BASE[i*32 +: 32] > 2**DEST_WIDTH-1 || M_TOP[i*32 +: 32] < 0 || M_TOP[i*32 +: 32] > 2**DEST_WIDTH-1) begin if (M_BASE[i*DEST_WIDTH +: DEST_WIDTH] < 0 || M_BASE[i*DEST_WIDTH +: DEST_WIDTH] > 2**DEST_WIDTH-1 || M_TOP[i*DEST_WIDTH +: DEST_WIDTH] < 0 || M_TOP[i*DEST_WIDTH +: DEST_WIDTH] > 2**DEST_WIDTH-1) begin
$error("Error: value out of range"); $error("Error: value out of range");
$finish; $finish;
end end
end end
for (i = 0; i < M_COUNT; i = i + 1) begin for (i = 0; i < M_COUNT; i = i + 1) begin
if (M_BASE[i*32 +: 32] > M_TOP[i*32 +: 32]) begin if (M_BASE[i*DEST_WIDTH +: DEST_WIDTH] > M_TOP[i*DEST_WIDTH +: DEST_WIDTH]) begin
$error("Error: invalid range"); $error("Error: invalid range");
$finish; $finish;
end end
@ -108,9 +108,9 @@ initial begin
for (i = 0; i < M_COUNT; i = i + 1) begin for (i = 0; i < M_COUNT; i = i + 1) begin
for (j = i+1; j < M_COUNT; j = j + 1) begin for (j = i+1; j < M_COUNT; j = j + 1) begin
if (M_BASE[i*32 +: 32] <= M_TOP[j*32 +: 32] && M_BASE[j*32 +: 32] <= M_TOP[i*32 +: 32]) begin if (M_BASE[i*DEST_WIDTH +: DEST_WIDTH] <= M_TOP[j*DEST_WIDTH +: DEST_WIDTH] && M_BASE[j*DEST_WIDTH +: DEST_WIDTH] <= M_TOP[i*DEST_WIDTH +: DEST_WIDTH]) begin
$display("%d: %08x-%08x", i, M_BASE[i*32 +: 32], M_TOP[i*32 +: 32]); $display("%d: %08x-%08x", i, M_BASE[i*DEST_WIDTH +: DEST_WIDTH], M_TOP[i*DEST_WIDTH +: DEST_WIDTH]);
$display("%d: %08x-%08x", j, M_BASE[j*32 +: 32], M_TOP[j*32 +: 32]); $display("%d: %08x-%08x", j, M_BASE[j*DEST_WIDTH +: DEST_WIDTH], M_TOP[j*DEST_WIDTH +: DEST_WIDTH]);
$error("Error: ranges overlap"); $error("Error: ranges overlap");
$finish; $finish;
end end
@ -153,7 +153,7 @@ generate
select_valid_next = 1'b0; select_valid_next = 1'b0;
drop_next = 1'b1; drop_next = 1'b1;
for (k = 0; k < M_COUNT; k = k + 1) begin for (k = 0; k < M_COUNT; k = k + 1) begin
if (int_s_axis_tdest[m*DEST_WIDTH +: DEST_WIDTH] >= M_BASE[k*32 +: 32] && int_s_axis_tdest[m*DEST_WIDTH +: DEST_WIDTH] <= M_TOP[k*32 +: 32] && (M_CONNECT & (1 << (m+k*S_COUNT)))) begin if (int_s_axis_tdest[m*DEST_WIDTH +: DEST_WIDTH] >= M_BASE[k*DEST_WIDTH +: DEST_WIDTH] && int_s_axis_tdest[m*DEST_WIDTH +: DEST_WIDTH] <= M_TOP[k*DEST_WIDTH +: DEST_WIDTH] && (M_CONNECT & (1 << (m+k*S_COUNT)))) begin
select_next = k; select_next = k;
select_valid_next = 1'b1; select_valid_next = 1'b1;
drop_next = 1'b0; drop_next = 1'b0;

3
tb/test_axis_switch_4x4.py
View File

@ -27,7 +27,6 @@ from myhdl import *
import os import os
import axis_ep import axis_ep
import math
module = 'axis_switch' module = 'axis_switch'
testbench = 'test_%s_4x4' % module testbench = 'test_%s_4x4' % module
@ -54,7 +53,7 @@ def bench():
KEEP_WIDTH = (DATA_WIDTH/8) KEEP_WIDTH = (DATA_WIDTH/8)
ID_ENABLE = 1 ID_ENABLE = 1
ID_WIDTH = 8 ID_WIDTH = 8
DEST_WIDTH = math.ceil(math.log(M_COUNT+1, 2)) DEST_WIDTH = (M_COUNT+1).bit_length()
USER_ENABLE = 1 USER_ENABLE = 1
USER_WIDTH = 1 USER_WIDTH = 1
M_BASE = [0, 1, 2, 3] M_BASE = [0, 1, 2, 3]

4
tb/test_axis_switch_4x4.v
View File

@ -42,8 +42,8 @@ parameter ID_WIDTH = 8;
parameter DEST_WIDTH = $clog2(M_COUNT+1); parameter DEST_WIDTH = $clog2(M_COUNT+1);
parameter USER_ENABLE = 1; parameter USER_ENABLE = 1;
parameter USER_WIDTH = 1; parameter USER_WIDTH = 1;
parameter M_BASE = {32'd3, 32'd2, 32'd1, 32'd0}; parameter M_BASE = {3'd3, 3'd2, 3'd1, 3'd0};
parameter M_TOP = {32'd3, 32'd2, 32'd1, 32'd0}; parameter M_TOP = {3'd3, 3'd2, 3'd1, 3'd0};
parameter M_CONNECT = {M_COUNT{{S_COUNT{1'b1}}}}; parameter M_CONNECT = {M_COUNT{{S_COUNT{1'b1}}}};
parameter S_REG_TYPE = 0; parameter S_REG_TYPE = 0;
parameter M_REG_TYPE = 2; parameter M_REG_TYPE = 2;

3
tb/test_axis_switch_4x4_64.py
View File

@ -27,7 +27,6 @@ from myhdl import *
import os import os
import axis_ep import axis_ep
import math
module = 'axis_switch' module = 'axis_switch'
testbench = 'test_%s_4x4_64' % module testbench = 'test_%s_4x4_64' % module
@ -54,7 +53,7 @@ def bench():
KEEP_WIDTH = (DATA_WIDTH/8) KEEP_WIDTH = (DATA_WIDTH/8)
ID_ENABLE = 1 ID_ENABLE = 1
ID_WIDTH = 8 ID_WIDTH = 8
DEST_WIDTH = math.ceil(math.log(M_COUNT+1, 2)) DEST_WIDTH = (M_COUNT+1).bit_length()
USER_ENABLE = 1 USER_ENABLE = 1
USER_WIDTH = 1 USER_WIDTH = 1
M_BASE = [0, 1, 2, 3] M_BASE = [0, 1, 2, 3]

4
tb/test_axis_switch_4x4_64.v
View File

@ -42,8 +42,8 @@ parameter ID_WIDTH = 8;
parameter DEST_WIDTH = $clog2(M_COUNT+1); parameter DEST_WIDTH = $clog2(M_COUNT+1);
parameter USER_ENABLE = 1; parameter USER_ENABLE = 1;
parameter USER_WIDTH = 1; parameter USER_WIDTH = 1;
parameter M_BASE = {32'd3, 32'd2, 32'd1, 32'd0}; parameter M_BASE = {3'd3, 3'd2, 3'd1, 3'd0};
parameter M_TOP = {32'd3, 32'd2, 32'd1, 32'd0}; parameter M_TOP = {3'd3, 3'd2, 3'd1, 3'd0};
parameter M_CONNECT = {M_COUNT{{S_COUNT{1'b1}}}}; parameter M_CONNECT = {M_COUNT{{S_COUNT{1'b1}}}};
parameter S_REG_TYPE = 0; parameter S_REG_TYPE = 0;
parameter M_REG_TYPE = 2; parameter M_REG_TYPE = 2;