Skip to content

[dv] Use id_done to accurately track instruction monitor #2346

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

Open
SamuelRiedel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[dv] Use id_done to accurately track instruction monitor #2346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions dv/uvm/core_ibex/common/ibex_cosim_agent/ibex_cosim_scoreboard.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,7 @@ class ibex_cosim_scoreboard extends uvm_scoreboard;
bit [31:0] aligned_next_addr;
forever begin
// Wait for new instruction to appear in ID stage
wait (instr_vif.instr_cb.valid_id &&
instr_vif.instr_cb.instr_new_id &&
wait (instr_vif.instr_cb.rvfi_id_done &&
latest_order != instr_vif.instr_cb.rvfi_order_id);

latest_order = instr_vif.instr_cb.rvfi_order_id;
Expand Down Expand Up @@ -320,9 +319,9 @@ class ibex_cosim_scoreboard extends uvm_scoreboard;
// Wait for a new instruction or a writeback exception. When a new instruction has entered the
// ID stage and we haven't seen a writeback exception we know the instruction associated with the
// error just added to the queue isn't getting flushed.
wait (instr_vif.instr_cb.instr_new_id || dut_vif.dut_cb.wb_exception);
wait (instr_vif.instr_cb.rvfi_id_done || dut_vif.dut_cb.wb_exception);

if (!instr_vif.instr_cb.instr_new_id && dut_vif.dut_cb.wb_exception) begin
if (!instr_vif.instr_cb.rvfi_id_done && dut_vif.dut_cb.wb_exception) begin
// If we hit a writeback exception without seeing a new instruction then the newly added
// error relates to an instruction just flushed from the ID stage so pop it from the
// queue.
Expand Down
4 changes: 2 additions & 2 deletions dv/uvm/core_ibex/env/core_ibex_instr_monitor_if.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ interface core_ibex_instr_monitor_if #(
// ID stage
logic reset;
logic valid_id;
logic instr_new_id;
logic rvfi_id_done;
logic err_id;
logic is_compressed_id;
logic [15:0] instr_compressed_id;
Expand All @@ -30,7 +30,7 @@ interface core_ibex_instr_monitor_if #(
clocking instr_cb @(posedge clk);
input reset;
input valid_id;
input instr_new_id;
input rvfi_id_done;
input err_id;
input is_compressed_id;
input instr_compressed_id;
Expand Down
2 changes: 1 addition & 1 deletion dv/uvm/core_ibex/tb/core_ibex_tb_top.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ module core_ibex_tb_top;
// Instruction monitor connections
assign instr_monitor_if.reset = ~rst_n;
assign instr_monitor_if.valid_id = dut.u_ibex_top.u_ibex_core.id_stage_i.instr_valid_i;
assign instr_monitor_if.instr_new_id = dut.u_ibex_top.u_ibex_core.instr_new_id;
assign instr_monitor_if.rvfi_id_done = dut.u_ibex_top.u_ibex_core.rvfi_id_done;

assign instr_monitor_if.err_id =
dut.u_ibex_top.u_ibex_core.id_stage_i.controller_i.instr_fetch_err;
Expand Down
Loading