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

Integrate main-next #84

Merged
merged 43 commits into from
Jun 21, 2023
Merged

Integrate main-next #84

merged 43 commits into from
Jun 21, 2023

Conversation

mkurc-ant
Copy link
Collaborator

@mkurc-ant mkurc-ant commented May 26, 2023

This PR intends to merge recent changes from main-next to main. These include:

mkurc-ant and others added 30 commits February 20, 2023 12:11
…d it with the Makefile flow

Signed-off-by: Maciej Kurc <[email protected]>
Signed-off-by: Maciej Kurc <[email protected]>
Signed-off-by: Maciej Kurc <[email protected]>
Signed-off-by: Maciej Kurc <[email protected]>
Signed-off-by: Maciej Kurc <[email protected]>
…ion attempts writing to x0 (zero)

Signed-off-by: Maciej Kurc <[email protected]>
Signed-off-by: Maciej Kurc <[email protected]>
Use RISC-V DV for core verification
Add a way of injecting user module for clock gate(s)
Correction of default WIDTH param value of rvdffppe
Signed-off-by: Maciej Kurc <[email protected]>
Comment on lines +23 to +24
module el2_pic_ctrl
import el2_pkg::*;
Copy link

Choose a reason for hiding this comment

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

⚠️ [verible-verilog-lint] reported by reviewdog 🐶
Remove trailing spaces. [Style: trailing-spaces] [no-trailing-spaces]

Suggested change
module el2_pic_ctrl
import el2_pkg::*;
module el2_pic_ctrlmodule el2_pic_ctrl
import el2_pkg::*;

@@ -43,7 +49,9 @@ end

endmodule

module el2_btb_ghr_hash #(
module el2_btb_ghr_hash
Copy link

Choose a reason for hiding this comment

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

⚠️ [verible-verilog-lint] reported by reviewdog 🐶
Declared module does not match the first dot-delimited component of file name: "el2_lib" [Style: file-names] [module-filename]

assign ifu_fetch_val[1:0] = ic_fetch_val_f[1:0];
assign ifu_fetch_pc[31:1] = ifc_fetch_addr_f[31:1];

logic ifc_fetch_uncacheable_bf; // The fetch request is uncacheable space. BF stage
Copy link

Choose a reason for hiding this comment

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

⚠️ [verible-verilog-lint] reported by reviewdog 🐶
Line length exceeds max: 100; is: 111 [Style: line-length] [line-length]

assign ifu_fetch_pc[31:1] = ifc_fetch_addr_f[31:1];

logic ifc_fetch_uncacheable_bf; // The fetch request is uncacheable space. BF stage
logic ifc_fetch_req_bf; // Fetch request. Comes with the address. BF stage
Copy link

Choose a reason for hiding this comment

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

⚠️ [verible-verilog-lint] reported by reviewdog 🐶
Line length exceeds max: 100; is: 111 [Style: line-length] [line-length]


logic ifc_fetch_uncacheable_bf; // The fetch request is uncacheable space. BF stage
logic ifc_fetch_req_bf; // Fetch request. Comes with the address. BF stage
logic ifc_fetch_req_bf_raw; // Fetch request without some qualifications. Used for clock-gating. BF stage
Copy link

Choose a reason for hiding this comment

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

⚠️ [verible-verilog-lint] reported by reviewdog 🐶
Line length exceeds max: 100; is: 137 [Style: line-length] [line-length]

logic ifc_fetch_uncacheable_bf; // The fetch request is uncacheable space. BF stage
logic ifc_fetch_req_bf; // Fetch request. Comes with the address. BF stage
logic ifc_fetch_req_bf_raw; // Fetch request without some qualifications. Used for clock-gating. BF stage
logic ifc_iccm_access_bf; // This request is to the ICCM. Do not generate misses to the bus.
Copy link

Choose a reason for hiding this comment

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

⚠️ [verible-verilog-lint] reported by reviewdog 🐶
Line length exceeds max: 100; is: 126 [Style: line-length] [line-length]

logic ifc_fetch_req_bf; // Fetch request. Comes with the address. BF stage
logic ifc_fetch_req_bf_raw; // Fetch request without some qualifications. Used for clock-gating. BF stage
logic ifc_iccm_access_bf; // This request is to the ICCM. Do not generate misses to the bus.
logic ifc_region_acc_fault_bf; // Access fault. in ICCM region but offset is outside defined ICCM.
Copy link

Choose a reason for hiding this comment

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

⚠️ [verible-verilog-lint] reported by reviewdog 🐶
Line length exceeds max: 100; is: 127 [Style: line-length] [line-length]

Comment on lines +24 to +25
module el2_dma_ctrl
import el2_pkg::*;
Copy link

Choose a reason for hiding this comment

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

⚠️ [verible-verilog-lint] reported by reviewdog 🐶
Remove trailing spaces. [Style: trailing-spaces] [no-trailing-spaces]

Suggested change
module el2_dma_ctrl
import el2_pkg::*;
module el2_dma_ctrlmodule el2_dma_ctrl
import el2_pkg::*;

@@ -2788,7 +2788,9 @@ assign dec_csr_rddata_d[31:0] = ( ({32{csr_misa}} & 32'h40001104) |

endmodule // el2_dec_tlu_ctl
Copy link

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
endmodule // el2_dec_tlu_ctl
endmodule // el2_dec_tlu_ctl

@@ -2788,7 +2788,9 @@

endmodule // el2_dec_tlu_ctl

module el2_dec_timer_ctl #(
module el2_dec_timer_ctl
import el2_pkg::*;
Copy link

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
import el2_pkg::*;
import el2_pkg::*;

Comment on lines +24 to +25
module el2_dma_ctrl
import el2_pkg::*;
Copy link

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
module el2_dma_ctrl
import el2_pkg::*;
module el2_dma_ctrl
import el2_pkg::*;

Comment on lines +23 to +24
module el2_pic_ctrl
import el2_pkg::*;
Copy link

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
module el2_pic_ctrl
import el2_pkg::*;
module el2_pic_ctrl
import el2_pkg::*;

Comment on lines +254 to +256
assign ifu_fetch_data_f[31:0] = ic_data_f[31:0];
assign ifu_fetch_val[1:0] = ic_fetch_val_f[1:0];
assign ifu_fetch_pc[31:1] = ifc_fetch_addr_f[31:1];
Copy link

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
assign ifu_fetch_data_f[31:0] = ic_data_f[31:0];
assign ifu_fetch_val[1:0] = ic_fetch_val_f[1:0];
assign ifu_fetch_pc[31:1] = ifc_fetch_addr_f[31:1];
logic [1:0] ic_fetch_val_f;
logic [31:0] ic_data_f;
logic [31:0] ifu_fetch_data_f;
logic ifc_fetch_req_f;
logic ifc_fetch_req_f_raw;
logic [1:0] iccm_rd_ecc_double_err; // This fetch has an iccm double error.

@@ -23,7 +27,9 @@

endmodule

module el2_btb_addr_hash #(
module el2_btb_addr_hash
import el2_pkg::*;
Copy link

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
import el2_pkg::*;
import el2_pkg::*;

@@ -43,7 +49,9 @@

endmodule

module el2_btb_ghr_hash #(
module el2_btb_ghr_hash
import el2_pkg::*;
Copy link

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
import el2_pkg::*;
import el2_pkg::*;

input logic EN
);

logic gate;
Copy link

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
logic gate;
logic gate;

Comment on lines +29 to +31
initial gate = 0;
always @(negedge CK)
gate <= EN;
Copy link

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
initial gate = 0;
always @(negedge CK)
gate <= EN;
initial gate = 0;
always @(negedge CK) gate <= EN;

always @(negedge CK)
gate <= EN;

assign Q = CK & gate;
Copy link

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
assign Q = CK & gate;
assign Q = CK & gate;

@tmichalak tmichalak merged commit 867e4d7 into main Jun 21, 2023
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.

5 participants