Skip to content

feat(refill-check): add mask to refill check #723

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
klin02 merged 1 commit into from
Nov 14, 2025
Merged

feat(refill-check): add mask to refill check #723

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
1 change: 1 addition & 0 deletions src/main/scala/Bundles.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ class L2TLBEvent extends DifftestBaseBundle with HasValid {
class RefillEvent extends DifftestBaseBundle with HasValid {
val addr = UInt(64.W)
val data = Vec(8, UInt(64.W))
val mask = UInt(8.W)
}

class ScEvent extends DifftestBaseBundle with HasValid {
Expand Down
12 changes: 4 additions & 8 deletions src/test/csrc/difftest/difftest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,12 +949,8 @@ int Difftest::do_store_check() {
// cacheid: 0 -> icache
// 1 -> dcache
// 2 -> pagecache
// 3 -> icache PIQ refill ipf
// 4 -> icache mainPipe port0 toIFU
// 5 -> icache mainPipe port1 toIFU
// 6 -> icache ipf refill cache
// 7 -> icache mainPipe port0 read PIQ
// 8 -> icache mainPipe port1 read PIQ
// 3 -> icache mainPipe read cacheline 0 (masked)
// 4 -> icache mainPipe read cacheline 1 (masked)
int Difftest::do_refill_check(int cacheid) {
#ifdef CONFIG_DIFFTEST_REFILLEVENT
auto dut_refill = &(dut->refill[cacheid]);
Expand All @@ -980,7 +976,7 @@ int Difftest::do_refill_check(int cacheid) {
}
for (int i = 0; i < 8; i++) {
read_goldenmem(dut_refill->addr + i * 8, &buf, 8, &flag_buf);
if (dut_refill->data[i] != *((uint64_t *)buf)) {
if ((dut_refill->mask & (1 << i)) && dut_refill->data[i] != *((uint64_t *)buf)) {
#ifdef CONFIG_DIFFTEST_CMOINVALEVENT
if (cmo_inval_event_set.find(dut_refill->addr) != cmo_inval_event_set.end()) {
// If the data inconsistency occurs in the cache block operated by CBO.INVAL,
Expand Down Expand Up @@ -1022,7 +1018,7 @@ int Difftest::do_refill_check(int cacheid) {
return 0;
}
#endif // CONFIG_DIFFTEST_UNCACHEMMSTOREEVENT
Info("cacheid=%d,realpaddr=0x%lx: Refill test failed!\n", cacheid, realpaddr);
Info("cacheid=%d,mask=%x,realpaddr=0x%lx: Refill test failed!\n", cacheid, dut_refill->mask, realpaddr);
Info("addr: %lx\nGold: ", dut_refill->addr);
for (int j = 0; j < 8; j++) {
read_goldenmem(dut_refill->addr + j * 8, &buf, 8);
Expand Down