Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spyglass clean up: multiple change to remove Spyglass warnings #2727

Merged

Conversation

Gchauvon
Copy link
Contributor

Multiple changes to clean up code and remove Spyglass warnings.

core/commit_stage.sv Outdated Show resolved Hide resolved
core/csr_regfile.sv Outdated Show resolved Hide resolved
core/csr_regfile.sv Outdated Show resolved Hide resolved
core/cva6_fifo_v3.sv Outdated Show resolved Hide resolved
core/cvxif_issue_register_commit_if_driver.sv Outdated Show resolved Hide resolved
core/issue_read_operands.sv Outdated Show resolved Hide resolved
Comment on lines 869 to 883
cvxif_off_instr_n = 32'b0;
for (int unsigned i = 0; i < CVA6Cfg.NrIssuePorts; i++) begin
if (!issue_instr_i[i].ex.valid && issue_instr_valid_i[i] && issue_ack_o[i]) begin
case (issue_instr_i[i].fu)
CVXIF: begin
cvxif_valid_q[i] <= 1'b1;
cvxif_off_instr_q <= orig_instr[i];
cvxif_valid_n[i] = 1'b1;
cvxif_off_instr_n = orig_instr[i];
end
default: ;
endcase
end
end
if (flush_i) begin
cvxif_valid_q <= '0;
cvxif_off_instr_q <= 32'b0;
cvxif_valid_n = '0;
cvxif_off_instr_n = 32'b0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
cvxif_off_instr_n = 32'b0;
for (int unsigned i = 0; i < CVA6Cfg.NrIssuePorts; i++) begin
if (!issue_instr_i[i].ex.valid && issue_instr_valid_i[i] && issue_ack_o[i]) begin
case (issue_instr_i[i].fu)
CVXIF: begin
cvxif_valid_q[i] <= 1'b1;
cvxif_off_instr_q <= orig_instr[i];
cvxif_valid_n[i] = 1'b1;
cvxif_off_instr_n = orig_instr[i];
end
default: ;
endcase
end
end
if (flush_i) begin
cvxif_valid_q <= '0;
cvxif_off_instr_q <= 32'b0;
cvxif_valid_n = '0;
cvxif_off_instr_n = 32'b0;
cvxif_off_instr_n = 32'b0;
for (int unsigned i = 0; i < CVA6Cfg.NrIssuePorts; i++) begin
if (!issue_instr_i[i].ex.valid && issue_instr_valid_i[i] && issue_ack_o[i]) begin
case (issue_instr_i[i].fu)
CVXIF: begin
cvxif_valid_n[i] = 1'b1;
cvxif_off_instr_n = orig_instr[i];
end
default: ;
endcase

end
end
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
end
end
if (flush_i) begin
cvxif_valid_n = '0;
cvxif_off_instr_n = 32'b0;
end
end

core/issue_read_operands.sv Outdated Show resolved Hide resolved
if (issue_instr_i[0].fu == CVXIF) begin
x_transaction_rejected_n = x_transaction_rejected;
end
end
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
end
end
if (issue_instr_i[0].fu == CTRL_FLOW) begin
pc_n = issue_instr_i[0].pc;
is_compressed_instr_n = issue_instr_i[0].is_compressed;
branch_predict_n = issue_instr_i[0].bp;
end
x_transaction_rejected_n = 1'b0;
if (issue_instr_i[0].fu == CVXIF) begin
x_transaction_rejected_n = x_transaction_rejected;
end
end

core/csr_regfile.sv Outdated Show resolved Hide resolved
output logic cvxif_busy_o
);
input logic [(CVA6Cfg.NrRgprPorts/CVA6Cfg.NrIssuePorts)-1:0] rs_valid_i
);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
);
);

Comment on lines 89 to 92
if (FPGA_ALTERA)
data_o = first_word_q ? data_ft_q : fifo_ram_rdata;
else
data_o = fifo_ram_rdata;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
if (FPGA_ALTERA)
data_o = first_word_q ? data_ft_q : fifo_ram_rdata;
else
data_o = fifo_ram_rdata;
if (FPGA_ALTERA) data_o = first_word_q ? data_ft_q : fifo_ram_rdata;
else data_o = fifo_ram_rdata;

Comment on lines 89 to 92
if (FPGA_ALTERA)
data_o = first_word_q ? data_ft_q : fifo_ram_rdata;
else
data_o = fifo_ram_rdata;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
if (FPGA_ALTERA)
data_o = first_word_q ? data_ft_q : fifo_ram_rdata;
else
data_o = fifo_ram_rdata;
if (FPGA_ALTERA) data_o = first_word_q ? data_ft_q : fifo_ram_rdata;
else data_o = fifo_ram_rdata;

@@ -2508,16 +2509,14 @@ module csr_regfile
if (~rst_ni) begin
priv_lvl_q <= riscv::PRIV_LVL_M;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
priv_lvl_q <= riscv::PRIV_LVL_M;
priv_lvl_q <= riscv::PRIV_LVL_M;

@@ -2508,16 +2509,14 @@ module csr_regfile
if (~rst_ni) begin
priv_lvl_q <= riscv::PRIV_LVL_M;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[verible-verilog-format] reported by reviewdog 🐶

Suggested change
priv_lvl_q <= riscv::PRIV_LVL_M;
priv_lvl_q <= riscv::PRIV_LVL_M;

@Gchauvon Gchauvon force-pushed the dev/spyglass-cleanup branch from 98826f5 to c733504 Compare January 22, 2025 09:58
Copy link
Contributor

❌ failed run, report available here.

1 similar comment
Copy link
Contributor

❌ failed run, report available here.

Copy link
Contributor

✔️ successful run, report available here.

1 similar comment
Copy link
Contributor

✔️ successful run, report available here.

@Gchauvon Gchauvon force-pushed the dev/spyglass-cleanup branch from 3ba5f54 to 6384e90 Compare January 22, 2025 13:00
Copy link
Contributor

✔️ successful run, report available here.

Copy link
Contributor

✔️ successful run, report available here.

Copy link
Contributor

❌ failed run, report available here.

@JeanRochCoulon JeanRochCoulon merged commit 3ce44b1 into openhwgroup:master Jan 23, 2025
4 checks passed
@JeanRochCoulon JeanRochCoulon deleted the dev/spyglass-cleanup branch January 23, 2025 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants