Skip to content

refactor(Difftest): refactor display with c++11 features #617

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
Tang-Haojin merged 3 commits into from
Apr 28, 2025
Merged

refactor(Difftest): refactor display with c++11 features #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e346aa
fix(VCS): fix VCS compile std feature
cz4e Apr 28, 2025
16a948f
fix(Difftest): refactor `display` with c++11 features
cz4e Apr 28, 2025
23bbd42
fix(Difftest): fix some syntax errors
cz4e Apr 28, 2025
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
4 changes: 3 additions & 1 deletion src/test/csrc/difftest/difftest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,7 +1710,9 @@ void DiffState::display(int coreid) {
Info("\n============== Commit Group Trace (Core %d) ==============\n", coreid);
int group_index = 0;
while (!retire_group_queue.empty()) {
auto [pc, cnt] = retire_group_queue.front();
auto retire_group = retire_group_queue.front();
auto pc = retire_group.first;
auto cnt = retire_group.second;
retire_group_queue.pop();
Info("commit group [%02d]: pc %010lx cmtcnt %d%s\n", group_index, pc, cnt,
retire_group_queue.empty() ? " <--" : "");
Expand Down
2 changes: 1 addition & 1 deletion src/test/csrc/difftest/difftest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ class DiffState {
if (retire_group_queue.size() >= DEBUG_GROUP_TRACE_SIZE) {
retire_group_queue.pop();
}
retire_group_queue.push({pc, count});
retire_group_queue.push(std::make_pair(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) {
Expand Down
⚡