Skip to content

Commit 2b07244

Browse files
committed
style(uvm): satisfy linter
1 parent 053087c commit 2b07244

File tree

2 files changed

+34
-11
lines changed
  • comp/uvm/logic_vector_array_lbus
  • core/comp/eth/network_mod/uvm/tbench/cmac

2 files changed

+34
-11
lines changed

comp/uvm/logic_vector_array_lbus/monitor.sv

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ class monitor_logic_vector_array extends uvm_logic_vector_array::monitor #(8);
4141
endfunction
4242

4343
protected virtual function void send_packet();
44-
uvm_logic_vector_array::sequence_item #(8) item = uvm_logic_vector_array::sequence_item #(8)::type_id::create("item");
44+
uvm_logic_vector_array::sequence_item #(8) item;
45+
46+
item = uvm_logic_vector_array::sequence_item #(8)::type_id::create("item");
4547
item.data = bytes;
4648
bytes.delete();
4749
analysis_port.write(item);
@@ -82,7 +84,10 @@ class monitor_logic_vector_array extends uvm_logic_vector_array::monitor #(8);
8284
else begin
8385
assert(t.eop[i] !== 1'b1)
8486
else begin
85-
`uvm_error(this.get_full_name(), "\n\tThe EOP was set before a new packet transfer started. A SOP wasn't set before this EOP")
87+
string msg;
88+
// verilog_lint: waive line-length
89+
msg = "\n\tThe EOP was set before a new packet transfer started. A SOP wasn't set before this EOP";
90+
`uvm_error(this.get_full_name(), msg);
8691
end
8792
end
8893
end
@@ -98,7 +103,10 @@ class monitor_logic_vector_array extends uvm_logic_vector_array::monitor #(8);
98103

99104
assert(t.sop[i] !== 1'b1)
100105
else begin
101-
`uvm_error(this.get_full_name(), "\n\tThe SOP was before the last packet transfer correctly ended. A EOP wasn't set at the end of the packet transfer")
106+
string msg;
107+
// verilog_lint: waive line-length
108+
msg = "\n\tThe SOP was before the last packet transfer correctly ended. A EOP wasn't set at the end of the packet transfer";
109+
`uvm_error(this.get_full_name(), msg);
102110
end
103111
end
104112
end
@@ -150,7 +158,9 @@ class monitor_logic_vector extends uvm_logic_vector::monitor #(1);
150158

151159
for (int unsigned i = 0; i < 4; i++) begin
152160
if (t.ena[i] === 1'b1 && t.eop[i] === 1'b1) begin
153-
uvm_logic_vector::sequence_item #(1) item = uvm_logic_vector::sequence_item #(1)::type_id::create("item");
161+
uvm_logic_vector::sequence_item #(1) item;
162+
163+
item = uvm_logic_vector::sequence_item #(1)::type_id::create("item");
154164
item.data = t.err[i];
155165
analysis_port.write(item);
156166
end

core/comp/eth/network_mod/uvm/tbench/cmac/dut.sv

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
// SPDX-License-Identifier: BSD-3-Clause
66

7+
// verilog_lint: waive module-filename
78
module DUT #(
89
string ETH_CORE_ARCH,
910
int unsigned ETH_PORTS,
@@ -124,21 +125,25 @@ module DUT #(
124125
);
125126

126127
generate;
127-
for (genvar eth_it = 0; eth_it < ETH_PORTS; eth_it++) begin
128-
localparam int unsigned ETH_PORT_CHAN_LOCAL = ETH_PORT_CHAN[eth_it];
129-
initial assert(ETH_PORT_CHAN_LOCAL == 1);
128+
for (genvar eth_it = 0; eth_it < ETH_PORTS; eth_it++) begin : eth_inf
129+
initial begin
130+
assert(ETH_PORT_CHAN[eth_it] == 1);
131+
end
130132

131133
logic CLK_ETH_GEN = 1'b0;
132134

135+
// verilog_lint: waive explicit-begin
133136
always #(CLK_ETH_PERIOD[eth_it]/2) CLK_ETH_GEN = ~CLK_ETH_GEN;
134137

135138
// ------- //
136139
// TX side //
137140
// ------- //
138141

139-
for (genvar slice = 0; slice < 4; slice++) begin
142+
for (genvar slice = 0; slice < 4; slice++) begin : slice_tx
140143
initial begin
144+
// verilog_lint: waive line-length
141145
force DUT_BASE_U.VHDL_DUT_U.eth_core_g[eth_it].network_mod_core_i.cmac_rx_lbus_data[slice] = eth_tx[eth_it].DATA[128*(slice+1)-1 -: 128]; // Byte reordering
146+
// verilog_lint: waive line-length
142147
force DUT_BASE_U.VHDL_DUT_U.eth_core_g[eth_it].network_mod_core_i.cmac_rx_lbus_mty [slice] = eth_tx[eth_it].MTY[4*(slice+1)-1 -: 4];
143148
end
144149
end
@@ -156,8 +161,10 @@ module DUT #(
156161
// RX side //
157162
// ------- //
158163

159-
for (genvar segment = 0; segment < 4; segment++) begin
164+
for (genvar segment = 0; segment < 4; segment++) begin : slice_rx
165+
// verilog_lint: waive line-length
160166
assign eth_rx[eth_it].DATA[128*(segment+1)-1 -: 128] = DUT_BASE_U.VHDL_DUT_U.eth_core_g[eth_it].network_mod_core_i.cmac_tx_lbus_data[segment]; // Byte reordering
167+
// verilog_lint: waive line-length
161168
assign eth_rx[eth_it].MTY[4*(segment+1)-1 -: 4] = DUT_BASE_U.VHDL_DUT_U.eth_core_g[eth_it].network_mod_core_i.cmac_tx_lbus_mty[segment];
162169
end
163170

@@ -166,14 +173,20 @@ module DUT #(
166173
assign eth_rx[eth_it].EOP = DUT_BASE_U.VHDL_DUT_U.eth_core_g[eth_it].network_mod_core_i.cmac_tx_lbus_eop;
167174
assign eth_rx[eth_it].ERR = DUT_BASE_U.VHDL_DUT_U.eth_core_g[eth_it].network_mod_core_i.cmac_tx_lbus_err;
168175

169-
initial force DUT_BASE_U.VHDL_DUT_U.eth_core_g[eth_it].network_mod_core_i.cmac_tx_lbus_rdy = eth_rx[eth_it].RDY;
176+
// verilog_lint: waive line-length
177+
initial begin
178+
force DUT_BASE_U.VHDL_DUT_U.eth_core_g[eth_it].network_mod_core_i.cmac_tx_lbus_rdy = eth_rx[eth_it].RDY;
179+
end
170180

171181
// ----- //
172182
// Other //
173183
// ----- //
174184

175185
// CLK connection
176-
initial force DUT_BASE_U.VHDL_DUT_U.eth_core_g[eth_it].network_mod_core_i.cmac_gt_tx_clk_322m = CLK_ETH_GEN;
186+
// verilog_lint: waive line-length
187+
initial begin
188+
force DUT_BASE_U.VHDL_DUT_U.eth_core_g[eth_it].network_mod_core_i.cmac_gt_tx_clk_322m = CLK_ETH_GEN;
189+
end
177190
end
178191
endgenerate
179192

0 commit comments

Comments
 (0)