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.

Sign up for GitHub

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

Jump to bottom

RVFI - Improving mstatsu_fs reporting and fcsr reporting #892

Merged
merged 4 commits into from
Oct 13, 2023
Merged

RVFI - Improving mstatsu_fs reporting and fcsr reporting #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3db3dcb
RVFI - Updating from mstatus_we to mstatus_fs_we as mstatus_fs trigge…
Oct 6, 2023
e45a57d
RVFI - Handle fcsr_we when frm_we or fflags_we late rather than early…
Oct 10, 2023
3222994
Tracer - Correcting typo on cv.pack decoding
Oct 13, 2023
265c80e
Tracer - Updating hwloop printing from rd[0] to instr[7] to sort betw…
Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions bhv/cv32e40p_instr_trace.svh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,22 +679,22 @@ class instr_trace_t;
// decode and print instruction
case (instr[11:8])
// cv.starti, cv.endi
4'b0000, 4'b0010: str = $sformatf("%-16s %d, 0x%0x", mnemonic, rd[0], imm_iz_type);
4'b0000, 4'b0010: str = $sformatf("%-16s %d, 0x%0x", mnemonic, instr[7], imm_iz_type);
// cv.counti
4'b0100: str = $sformatf("%-16s %d, %d", mnemonic, rd[0], imm_iz_type);
4'b0100: str = $sformatf("%-16s %d, %d", mnemonic, instr[7], imm_iz_type);
// cv.start, cv.end, cv.count
4'b0001, 4'b0011, 4'b0101: begin
regs_read.push_back('{rs1, rs1_value, 0});
str = $sformatf("%-16s %d, %s", mnemonic, rd[0], regAddrToStr(rs1));
str = $sformatf("%-16s %d, %s", mnemonic, instr[7], regAddrToStr(rs1));
end
// cv.setupi
4'b0110: begin
str = $sformatf("%-16s %d, %d, 0x%0x", mnemonic, rd[0], imm_iz_type, rs1);
str = $sformatf("%-16s %d, %d, 0x%0x", mnemonic, instr[7], imm_iz_type, rs1);
end
// cv.setup
4'b0111: begin
regs_read.push_back('{rs1, rs1_value, 0});
str = $sformatf("%-16s %d, %s, 0x%0x", mnemonic, rd[0], regAddrToStr(rs1), imm_iz_type);
str = $sformatf("%-16s %d, %s, 0x%0x", mnemonic, instr[7], regAddrToStr(rs1), imm_iz_type);
end
endcase
end
Expand Down Expand Up @@ -861,7 +861,7 @@ class instr_trace_t;
endcase
str_sci = "";
end

// shuffle/pack
6'b110000: begin
if (instr[14:12] == 3'b111) begin
Expand Down
10 changes: 8 additions & 2 deletions bhv/cv32e40p_rvfi.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@ insn_trace_t trace_if, trace_id, trace_ex, trace_ex_next, trace_wb;
logic [2:0] saved_debug_cause;
integer next_send;

event e_empty_queue;
function void empty_fifo();
integer i, trace_q_size;
trace_q_size = wb_bypass_trace_q.size();
Expand All @@ -648,6 +649,7 @@ insn_trace_t trace_if, trace_id, trace_ex, trace_ex_next, trace_wb;
new_rvfi_trace.m_csr.mstatus_fs_rdata = r_pipe_freeze_trace.csr.mstatus_fs_n;
rvfi_trace_q.push_back(new_rvfi_trace);
next_send = next_send + 1;
->e_empty_queue;
end else begin
wb_bypass_trace_q.push_back(new_rvfi_trace);
end
Expand All @@ -658,6 +660,7 @@ insn_trace_t trace_if, trace_id, trace_ex, trace_ex_next, trace_wb;
/*
* Function used to alocate a new insn and send it to the rvfi driver
*/
event e_add_to_bypass;
function void send_rvfi(insn_trace_t m_wb_insn);
insn_trace_t new_rvfi_trace;
new_rvfi_trace = new();
Expand All @@ -667,6 +670,7 @@ insn_trace_t trace_if, trace_id, trace_ex, trace_ex_next, trace_wb;
next_send = next_send + 1;
end else begin
wb_bypass_trace_q.push_back(new_rvfi_trace);
->e_add_to_bypass;
end
empty_fifo();
endfunction
Expand Down Expand Up @@ -1111,6 +1115,9 @@ insn_trace_t trace_if, trace_id, trace_ex, trace_ex_next, trace_wb;
* The third updates the rvfi interface
*/
`define CSR_FROM_PIPE(TRACE_NAME, CSR_NAME) \
if(!trace_``TRACE_NAME``.m_csr.``CSR_NAME``_we) begin \
trace_``TRACE_NAME``.m_csr.``CSR_NAME``_wdata = r_pipe_freeze_trace.csr.``CSR_NAME``_n; \
end\
if (r_pipe_freeze_trace.csr.``CSR_NAME``_we) begin \
trace_``TRACE_NAME``.m_csr.``CSR_NAME``_we = r_pipe_freeze_trace.csr.``CSR_NAME``_we; \
trace_``TRACE_NAME``.m_csr.``CSR_NAME``_wdata = r_pipe_freeze_trace.csr.``CSR_NAME``_n; \
Expand Down Expand Up @@ -1160,10 +1167,9 @@ insn_trace_t trace_if, trace_id, trace_ex, trace_ex_next, trace_wb;
`CSR_FROM_PIPE(apu_resp, fcsr)
`CSR_FROM_PIPE(apu_resp, fflags)

// `CSR_FROM_PIPE(apu_resp, mstatus)
`CSR_FROM_PIPE(apu_resp, mstatus_fs)

if (r_pipe_freeze_trace.csr.mstatus_we) begin
if (r_pipe_freeze_trace.csr.mstatus_fs_we) begin
trace_ex.m_csr.mstatus_fs_rdata = r_pipe_freeze_trace.csr.mstatus_fs_n;
end
endfunction
Expand Down
4 changes: 2 additions & 2 deletions bhv/include/cv32e40p_tracer_pkg.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ package cv32e40p_tracer_pkg;
parameter INSTR_CVSHUFFLE2H = {5'b11100, 1'b0, 1'b0, 5'b?, 5'b?, 3'b000, 5'b?, OPCODE_CUSTOM_3};
parameter INSTR_CVSHUFFLE2B = {5'b11100, 1'b0, 1'b0, 5'b?, 5'b?, 3'b001, 5'b?, OPCODE_CUSTOM_3};

parameter INSTR_CVPACK = {5'b11101, 1'b0, 1'b0, 5'b?, 5'b?, 3'b000, 5'b?, OPCODE_CUSTOM_3};
parameter INSTR_CVPACKH = {5'b11101, 1'b0, 1'b1, 5'b?, 5'b?, 3'b000, 5'b?, OPCODE_CUSTOM_3};
parameter INSTR_CVPACK = {5'b11110, 1'b0, 1'b0, 5'b?, 5'b?, 3'b000, 5'b?, OPCODE_CUSTOM_3};
parameter INSTR_CVPACKH = {5'b11110, 1'b0, 1'b1, 5'b?, 5'b?, 3'b000, 5'b?, OPCODE_CUSTOM_3};

parameter INSTR_CVPACKHIB = {5'b11111, 1'b0, 1'b1, 5'b?, 5'b?, 3'b001, 5'b?, OPCODE_CUSTOM_3};
parameter INSTR_CVPACKLOB = {5'b11111, 1'b0, 1'b0, 5'b?, 5'b?, 3'b001, 5'b?, OPCODE_CUSTOM_3};
Expand Down
4 changes: 0 additions & 4 deletions bhv/pipe_freeze_trace.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,10 +650,6 @@ task monitor_pipeline();
if (r_pipe_freeze_trace.csr.fcsr_we) begin
r_pipe_freeze_trace.csr.fflags_we = 1'b1;
r_pipe_freeze_trace.csr.frm_we = 1'b1;
end else begin
if (r_pipe_freeze_trace.csr.fflags_we || r_pipe_freeze_trace.csr.frm_we) begin
r_pipe_freeze_trace.csr.fcsr_we = 1'b1;
end
end

if (csr_fcsr_fflags_we_i) begin
Expand Down
Loading