Skip to content

feat(difftest): display instructions in order #614

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

Merged
poemonsense merged 1 commit into from
Apr 27, 2025
Merged

feat(difftest): display instructions in order #614

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
47 changes: 20 additions & 27 deletions src/test/csrc/difftest/difftest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1689,6 +1689,12 @@ void CommitTrace::display(bool use_spike) {
}
}

void CommitTrace::display_line(int index, bool use_spike, bool is_retire) {
Info("[%02d] ", index);
display(use_spike);
Info("%s\n", is_retire ? " <--" : "");
}

void Difftest::display_stats() {
auto trap = get_trap_event();
uint64_t instrCnt = trap->instrCnt;
Expand All @@ -1698,40 +1704,27 @@ void Difftest::display_stats() {
this->id, instrCnt, cycleCnt, ipc);
}

void DiffState::display_commit_count(int i) {
auto retire_pointer = (retire_group_pointer + DEBUG_GROUP_TRACE_SIZE - 1) % DEBUG_GROUP_TRACE_SIZE;
Info("commit group [%02d]: pc %010lx cmtcnt %d%s\n", i, retire_group_pc_queue[i], retire_group_cnt_queue[i],
(i == retire_pointer) ? " <--" : "");
}

void DiffState::display_commit_instr(int i) {
display_commit_instr(retire_inst_pointer, spike_valid());
fflush(stdout);
}

void DiffState::display_commit_instr(int i, bool use_spike) {
if (!commit_trace[i]) {
return;
}
Info("[%02d] ", i);
commit_trace[i]->display(use_spike);
auto retire_pointer = (retire_inst_pointer + DEBUG_INST_TRACE_SIZE - 1) % DEBUG_INST_TRACE_SIZE;
Info("%s\n", (i == retire_pointer) ? " <--" : "");
}

void DiffState::display(int coreid) {
Info("\n============== Commit Group Trace (Core %d) ==============\n", coreid);
for (int j = 0; j < DEBUG_GROUP_TRACE_SIZE; j++) {
display_commit_count(j);
int group_index = 0;
while (!retire_group_queue.empty()) {
auto [pc, cnt] = retire_group_queue.front();
retire_group_queue.pop();
Info("commit group [%02d]: pc %010lx cmtcnt %d%s\n", group_index, pc, cnt,
retire_group_queue.empty() ? " <--" : "");
group_index++;
}

Info("\n============== Commit Instr Trace ==============\n");
bool use_spike = spike_valid();
for (int j = 0; j < DEBUG_INST_TRACE_SIZE; j++) {
display_commit_instr(j, use_spike);
int commit_index = 0;
while (!commit_trace.empty()) {
CommitTrace *trace = commit_trace.front();
commit_trace.pop();
trace->display_line(commit_index, use_spike, commit_trace.empty());
commit_index++;
}

fflush(stdout);
}

DiffState::DiffState() : commit_trace(DEBUG_INST_TRACE_SIZE, nullptr) {}
DiffState::DiffState() : use_spike(spike_valid()) {}
40 changes: 20 additions & 20 deletions src/test/csrc/difftest/difftest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
#include "refproxy.h"
#include <queue>
#include <unordered_set>
#include <vector>
#ifdef FUZZING
#include "emu.h"
#endif // FUZZING
Expand Down Expand Up @@ -81,6 +80,7 @@ class CommitTrace {
virtual ~CommitTrace() {}
virtual const char *get_type() = 0;
virtual void display(bool use_spike = false);
void display_line(int index, bool use_spike, bool is_retire);

protected:
virtual void display_custom() = 0;
Expand Down Expand Up @@ -159,48 +159,48 @@ class DiffState {
bool dump_commit_trace = false;

DiffState();
void record_group(uint64_t pc, uint64_t count) {
retire_group_pc_queue[retire_group_pointer] = pc;
retire_group_cnt_queue[retire_group_pointer] = count;
retire_group_pointer = (retire_group_pointer + 1) % DEBUG_GROUP_TRACE_SIZE;
};
void record_group(uint64_t pc, uint32_t count) {
if (retire_group_queue.size() >= DEBUG_GROUP_TRACE_SIZE) {
retire_group_queue.pop();
}
retire_group_queue.push({pc, count});
}
void record_inst(uint64_t pc, uint32_t inst, uint8_t en, uint8_t dest, uint64_t data, bool skip, bool delayed,
uint8_t lqidx, uint8_t sqidx, uint16_t robidx, uint8_t isLoad, uint8_t isStore) {
push_back_trace(new InstrTrace(pc, inst, en, dest, data, lqidx, sqidx, robidx, isLoad, isStore, skip, delayed));
retire_inst_pointer = (retire_inst_pointer + 1) % DEBUG_INST_TRACE_SIZE;
};
void record_exception(uint64_t pc, uint32_t inst, uint64_t cause) {
push_back_trace(new ExceptionTrace(pc, inst, cause));
retire_inst_pointer = (retire_inst_pointer + 1) % DEBUG_INST_TRACE_SIZE;
};
void record_interrupt(uint64_t pc, uint32_t inst, uint64_t cause) {
push_back_trace(new InterruptTrace(pc, inst, cause));
retire_inst_pointer = (retire_inst_pointer + 1) % DEBUG_INST_TRACE_SIZE;
};
void display(int coreid);

private:
const bool use_spike;

const static int DEBUG_GROUP_TRACE_SIZE = 16;
int retire_group_pointer = 0;
uint64_t retire_group_pc_queue[DEBUG_GROUP_TRACE_SIZE] = {0};
uint32_t retire_group_cnt_queue[DEBUG_GROUP_TRACE_SIZE] = {0};
std::queue<std::pair<uint64_t, uint32_t>> retire_group_queue;

const static int DEBUG_INST_TRACE_SIZE = 32;
int retire_inst_pointer = 0;
std::vector<CommitTrace *> commit_trace;
std::queue<CommitTrace *> commit_trace;

void push_back_trace(CommitTrace *trace) {
if (commit_trace[retire_inst_pointer]) {
delete commit_trace[retire_inst_pointer];
if (commit_trace.size() >= DEBUG_INST_TRACE_SIZE) {
delete commit_trace.front();
commit_trace.pop();
}
commit_trace[retire_inst_pointer] = trace;
commit_trace.push(trace);
if (dump_commit_trace) {
display_commit_instr(retire_inst_pointer);
static uint64_t commit_counter = 0;
trace->display_line(commit_counter, use_spike, false);
commit_counter++;
fflush(stdout);
}
}
void display_commit_count(int i);
void display_commit_instr(int i);
void display_commit_instr(int i, bool use_spike);
void display_commit_instr(int index, CommitTrace *trace, bool is_retire);
};

class Difftest {
Expand Down
⚡