Skip to content

Commit 2552d36

Browse files
alexforencichalexforencich
committed
Remove string parameters
1 parent 846183b commit 2552d36

19 files changed

+68
-66
lines changed

‎rtl/eth_arb_mux.v

+8-7
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ module eth_arb_mux #
4141
parameter DEST_WIDTH = 8,
4242
parameter USER_ENABLE = 1,
4343
parameter USER_WIDTH = 1,
44-
// arbitration type: "PRIORITY" or "ROUND_ROBIN"
45-
parameter ARB_TYPE = "PRIORITY",
46-
// LSB priority: "LOW", "HIGH"
47-
parameter LSB_PRIORITY = "HIGH"
44+
// select round robin arbitration
45+
parameter ARB_TYPE_ROUND_ROBIN = 0,
46+
// LSB priority selection
47+
parameter ARB_LSB_HIGH_PRIORITY = 1
4848
)
4949
(
5050
input wire clk,
@@ -135,9 +135,10 @@ wire [USER_WIDTH-1:0] current_s_tuser = s_eth_payload_axis_tuser[grant_encoded*
135135
// arbiter instance
136136
arbiter #(
137137
.PORTS(S_COUNT),
138-
.TYPE(ARB_TYPE),
139-
.BLOCK("ACKNOWLEDGE"),
140-
.LSB_PRIORITY(LSB_PRIORITY)
138+
.ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN),
139+
.ARB_BLOCK(1),
140+
.ARB_BLOCK_ACK(1),
141+
.ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY)
141142
)
142143
arb_inst (
143144
.clk(clk),

‎rtl/ip_arb_mux.v

+8-7
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ module ip_arb_mux #
4141
parameter DEST_WIDTH = 8,
4242
parameter USER_ENABLE = 1,
4343
parameter USER_WIDTH = 1,
44-
// arbitration type: "PRIORITY" or "ROUND_ROBIN"
45-
parameter ARB_TYPE = "PRIORITY",
46-
// LSB priority: "LOW", "HIGH"
47-
parameter LSB_PRIORITY = "HIGH"
44+
// select round robin arbitration
45+
parameter ARB_TYPE_ROUND_ROBIN = 0,
46+
// LSB priority selection
47+
parameter ARB_LSB_HIGH_PRIORITY = 1
4848
)
4949
(
5050
input wire clk,
@@ -187,9 +187,10 @@ wire [USER_WIDTH-1:0] current_s_tuser = s_ip_payload_axis_tuser[grant_encoded*U
187187
// arbiter instance
188188
arbiter #(
189189
.PORTS(S_COUNT),
190-
.TYPE(ARB_TYPE),
191-
.BLOCK("ACKNOWLEDGE"),
192-
.LSB_PRIORITY(LSB_PRIORITY)
190+
.ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN),
191+
.ARB_BLOCK(1),
192+
.ARB_BLOCK_ACK(1),
193+
.ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY)
193194
)
194195
arb_inst (
195196
.clk(clk),

‎rtl/ip_complete.v

+2-2
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ eth_arb_mux #(
261261
.DEST_ENABLE(0),
262262
.USER_ENABLE(1),
263263
.USER_WIDTH(1),
264-
.ARB_TYPE("PRIORITY"),
265-
.LSB_PRIORITY("HIGH")
264+
.ARB_TYPE_ROUND_ROBIN(0),
265+
.ARB_LSB_HIGH_PRIORITY(1)
266266
)
267267
eth_arb_mux_inst (
268268
.clk(clk),

‎rtl/ip_complete_64.v

+2-2
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ eth_arb_mux #(
271271
.DEST_ENABLE(0),
272272
.USER_ENABLE(1),
273273
.USER_WIDTH(1),
274-
.ARB_TYPE("PRIORITY"),
275-
.LSB_PRIORITY("HIGH")
274+
.ARB_TYPE_ROUND_ROBIN(0),
275+
.ARB_LSB_HIGH_PRIORITY(1)
276276
)
277277
eth_arb_mux_inst (
278278
.clk(clk),

‎rtl/udp_arb_mux.v

+8-7
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ module udp_arb_mux #
4141
parameter DEST_WIDTH = 8,
4242
parameter USER_ENABLE = 1,
4343
parameter USER_WIDTH = 1,
44-
// arbitration type: "PRIORITY" or "ROUND_ROBIN"
45-
parameter ARB_TYPE = "PRIORITY",
46-
// LSB priority: "LOW", "HIGH"
47-
parameter LSB_PRIORITY = "HIGH"
44+
// select round robin arbitration
45+
parameter ARB_TYPE_ROUND_ROBIN = 0,
46+
// LSB priority selection
47+
parameter ARB_LSB_HIGH_PRIORITY = 1
4848
)
4949
(
5050
input wire clk,
@@ -203,9 +203,10 @@ wire [USER_WIDTH-1:0] current_s_tuser = s_udp_payload_axis_tuser[grant_encoded*
203203
// arbiter instance
204204
arbiter #(
205205
.PORTS(S_COUNT),
206-
.TYPE(ARB_TYPE),
207-
.BLOCK("ACKNOWLEDGE"),
208-
.LSB_PRIORITY(LSB_PRIORITY)
206+
.ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN),
207+
.ARB_BLOCK(1),
208+
.ARB_BLOCK_ACK(1),
209+
.ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY)
209210
)
210211
arb_inst (
211212
.clk(clk),

‎rtl/udp_complete.v

+2-2
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,8 @@ ip_arb_mux #(
361361
.DEST_ENABLE(0),
362362
.USER_ENABLE(1),
363363
.USER_WIDTH(1),
364-
.ARB_TYPE("PRIORITY"),
365-
.LSB_PRIORITY("HIGH")
364+
.ARB_TYPE_ROUND_ROBIN(0),
365+
.ARB_LSB_HIGH_PRIORITY(1)
366366
)
367367
ip_arb_mux_inst (
368368
.clk(clk),

‎rtl/udp_complete_64.v

+2-2
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,8 @@ ip_arb_mux #(
373373
.DEST_ENABLE(0),
374374
.USER_ENABLE(1),
375375
.USER_WIDTH(1),
376-
.ARB_TYPE("PRIORITY"),
377-
.LSB_PRIORITY("HIGH")
376+
.ARB_TYPE_ROUND_ROBIN(0),
377+
.ARB_LSB_HIGH_PRIORITY(1)
378378
)
379379
ip_arb_mux_inst (
380380
.clk(clk),

‎tb/test_eth_arb_mux_4.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ def bench():
5555
DEST_WIDTH = 8
5656
USER_ENABLE = 1
5757
USER_WIDTH = 1
58-
ARB_TYPE = "PRIORITY"
59-
LSB_PRIORITY = "HIGH"
58+
ARB_TYPE_ROUND_ROBIN = 0
59+
ARB_LSB_HIGH_PRIORITY = 1
6060

6161
# Inputs
6262
clk = Signal(bool(0))

‎tb/test_eth_arb_mux_4.v

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ parameter DEST_ENABLE = 1;
4242
parameter DEST_WIDTH = 8;
4343
parameter USER_ENABLE = 1;
4444
parameter USER_WIDTH = 1;
45-
parameter ARB_TYPE = "PRIORITY";
46-
parameter LSB_PRIORITY = "HIGH";
45+
parameter ARB_TYPE_ROUND_ROBIN = 0;
46+
parameter ARB_LSB_HIGH_PRIORITY = 1;
4747

4848
// Inputs
4949
reg clk = 0;
@@ -133,8 +133,8 @@ eth_arb_mux #(
133133
.DEST_WIDTH(DEST_WIDTH),
134134
.USER_ENABLE(USER_ENABLE),
135135
.USER_WIDTH(USER_WIDTH),
136-
.ARB_TYPE(ARB_TYPE),
137-
.LSB_PRIORITY(LSB_PRIORITY)
136+
.ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN),
137+
.ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY)
138138
)
139139
UUT (
140140
.clk(clk),

‎tb/test_eth_arb_mux_64_4.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ def bench():
5555
DEST_WIDTH = 8
5656
USER_ENABLE = 1
5757
USER_WIDTH = 1
58-
ARB_TYPE = "PRIORITY"
59-
LSB_PRIORITY = "HIGH"
58+
ARB_TYPE_ROUND_ROBIN = 0
59+
ARB_LSB_HIGH_PRIORITY = 1
6060

6161
# Inputs
6262
clk = Signal(bool(0))

‎tb/test_eth_arb_mux_64_4.v

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ parameter DEST_ENABLE = 1;
4242
parameter DEST_WIDTH = 8;
4343
parameter USER_ENABLE = 1;
4444
parameter USER_WIDTH = 1;
45-
parameter ARB_TYPE = "PRIORITY";
46-
parameter LSB_PRIORITY = "HIGH";
45+
parameter ARB_TYPE_ROUND_ROBIN = 0;
46+
parameter ARB_LSB_HIGH_PRIORITY = 1;
4747

4848
// Inputs
4949
reg clk = 0;
@@ -133,8 +133,8 @@ eth_arb_mux #(
133133
.DEST_WIDTH(DEST_WIDTH),
134134
.USER_ENABLE(USER_ENABLE),
135135
.USER_WIDTH(USER_WIDTH),
136-
.ARB_TYPE(ARB_TYPE),
137-
.LSB_PRIORITY(LSB_PRIORITY)
136+
.ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN),
137+
.ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY)
138138
)
139139
UUT (
140140
.clk(clk),

‎tb/test_ip_arb_mux_4.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ def bench():
5555
DEST_WIDTH = 8
5656
USER_ENABLE = 1
5757
USER_WIDTH = 1
58-
ARB_TYPE = "PRIORITY"
59-
LSB_PRIORITY = "HIGH"
58+
ARB_TYPE_ROUND_ROBIN = 0
59+
ARB_LSB_HIGH_PRIORITY = 1
6060

6161
# Inputs
6262
clk = Signal(bool(0))

‎tb/test_ip_arb_mux_4.v

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ parameter DEST_ENABLE = 1;
4242
parameter DEST_WIDTH = 8;
4343
parameter USER_ENABLE = 1;
4444
parameter USER_WIDTH = 1;
45-
parameter ARB_TYPE = "PRIORITY";
46-
parameter LSB_PRIORITY = "HIGH";
45+
parameter ARB_TYPE_ROUND_ROBIN = 0;
46+
parameter ARB_LSB_HIGH_PRIORITY = 1;
4747

4848
// Inputs
4949
reg clk = 0;
@@ -185,8 +185,8 @@ ip_arb_mux #(
185185
.DEST_WIDTH(DEST_WIDTH),
186186
.USER_ENABLE(USER_ENABLE),
187187
.USER_WIDTH(USER_WIDTH),
188-
.ARB_TYPE(ARB_TYPE),
189-
.LSB_PRIORITY(LSB_PRIORITY)
188+
.ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN),
189+
.ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY)
190190
)
191191
UUT (
192192
.clk(clk),

‎tb/test_ip_arb_mux_64_4.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ def bench():
5555
DEST_WIDTH = 8
5656
USER_ENABLE = 1
5757
USER_WIDTH = 1
58-
ARB_TYPE = "PRIORITY"
59-
LSB_PRIORITY = "HIGH"
58+
ARB_TYPE_ROUND_ROBIN = 0
59+
ARB_LSB_HIGH_PRIORITY = 1
6060

6161
# Inputs
6262
clk = Signal(bool(0))

‎tb/test_ip_arb_mux_64_4.v

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ parameter DEST_ENABLE = 1;
4242
parameter DEST_WIDTH = 8;
4343
parameter USER_ENABLE = 1;
4444
parameter USER_WIDTH = 1;
45-
parameter ARB_TYPE = "PRIORITY";
46-
parameter LSB_PRIORITY = "HIGH";
45+
parameter ARB_TYPE_ROUND_ROBIN = 0;
46+
parameter ARB_LSB_HIGH_PRIORITY = 1;
4747

4848
// Inputs
4949
reg clk = 0;
@@ -185,8 +185,8 @@ ip_arb_mux #(
185185
.DEST_WIDTH(DEST_WIDTH),
186186
.USER_ENABLE(USER_ENABLE),
187187
.USER_WIDTH(USER_WIDTH),
188-
.ARB_TYPE(ARB_TYPE),
189-
.LSB_PRIORITY(LSB_PRIORITY)
188+
.ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN),
189+
.ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY)
190190
)
191191
UUT (
192192
.clk(clk),

‎tb/test_udp_arb_mux_4.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ def bench():
5555
DEST_WIDTH = 8
5656
USER_ENABLE = 1
5757
USER_WIDTH = 1
58-
ARB_TYPE = "PRIORITY"
59-
LSB_PRIORITY = "HIGH"
58+
ARB_TYPE_ROUND_ROBIN = 0
59+
ARB_LSB_HIGH_PRIORITY = 1
6060

6161
# Inputs
6262
clk = Signal(bool(0))

‎tb/test_udp_arb_mux_4.v

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ parameter DEST_ENABLE = 1;
4242
parameter DEST_WIDTH = 8;
4343
parameter USER_ENABLE = 1;
4444
parameter USER_WIDTH = 1;
45-
parameter ARB_TYPE = "PRIORITY";
46-
parameter LSB_PRIORITY = "HIGH";
45+
parameter ARB_TYPE_ROUND_ROBIN = 0;
46+
parameter ARB_LSB_HIGH_PRIORITY = 1;
4747

4848
// Inputs
4949
reg clk = 0;
@@ -201,8 +201,8 @@ udp_arb_mux #(
201201
.DEST_WIDTH(DEST_WIDTH),
202202
.USER_ENABLE(USER_ENABLE),
203203
.USER_WIDTH(USER_WIDTH),
204-
.ARB_TYPE(ARB_TYPE),
205-
.LSB_PRIORITY(LSB_PRIORITY)
204+
.ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN),
205+
.ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY)
206206
)
207207
UUT (
208208
.clk(clk),

‎tb/test_udp_arb_mux_64_4.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,8 @@ def bench():
5555
DEST_WIDTH = 8
5656
USER_ENABLE = 1
5757
USER_WIDTH = 1
58-
ARB_TYPE = "PRIORITY"
59-
LSB_PRIORITY = "HIGH"
60-
58+
ARB_TYPE_ROUND_ROBIN = 0
59+
ARB_LSB_HIGH_PRIORITY = 1
6160
# Inputs
6261
clk = Signal(bool(0))
6362
rst = Signal(bool(0))

‎tb/test_udp_arb_mux_64_4.v

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ parameter DEST_ENABLE = 1;
4242
parameter DEST_WIDTH = 8;
4343
parameter USER_ENABLE = 1;
4444
parameter USER_WIDTH = 1;
45-
parameter ARB_TYPE = "PRIORITY";
46-
parameter LSB_PRIORITY = "HIGH";
45+
parameter ARB_TYPE_ROUND_ROBIN = 0;
46+
parameter ARB_LSB_HIGH_PRIORITY = 1;
4747

4848
// Inputs
4949
reg clk = 0;
@@ -201,8 +201,8 @@ udp_arb_mux #(
201201
.DEST_WIDTH(DEST_WIDTH),
202202
.USER_ENABLE(USER_ENABLE),
203203
.USER_WIDTH(USER_WIDTH),
204-
.ARB_TYPE(ARB_TYPE),
205-
.LSB_PRIORITY(LSB_PRIORITY)
204+
.ARB_TYPE_ROUND_ROBIN(ARB_TYPE_ROUND_ROBIN),
205+
.ARB_LSB_HIGH_PRIORITY(ARB_LSB_HIGH_PRIORITY)
206206
)
207207
UUT (
208208
.clk(clk),

0 commit comments

Comments
 (0)