[difftest] add check for issue index conflict

chipsalliance · Oct 17, 2024 · 308c41c · 308c41c
1 parent dd7e1e5
commit 308c41c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/difftest/Cargo.lock b/difftest/Cargo.lock
diff --git a/difftest/offline_t1emu/src/json_events.rs b/difftest/offline_t1emu/src/json_events.rs
@@ -162,6 +162,17 @@ impl JsonEventRunner for SpikeRunner {
 
     se.issue_idx = issue.idx as u8;
 
+    self.commit_queue.iter().for_each(|old_se| {
+      assert_eq!(
+        old_se.issue_idx, se.issue_idx,
+        "[{cycle}] Issue: new issue_idx={} ({}) should not be equal to any old event in commit_queue issue_idx={} ({}), check if the old event is retired in time",
+        se.issue_idx,
+        old_se.issue_idx,
+        se.describe_insn(),
+        old_se.describe_insn()
+      );
+    });
+
     info!(
       "[{}] SpikePeekIssue: issue_idx={}, pc={:#x}, inst={}",
       issue.cycle, issue.idx, se.pc, se.disasm

diff --git a/difftest/offline_t1rocketemu/src/json_events.rs b/difftest/offline_t1rocketemu/src/json_events.rs
@@ -337,6 +337,17 @@ impl JsonEventRunner for SpikeRunner {
 
     se.issue_idx = idx as u8;
 
+    self.commit_queue.iter().for_each(|old_se| {
+      assert_eq!(
+        old_se.issue_idx, se.issue_idx,
+        "[{cycle}] Issue: new issue_idx={} ({}) should not be equal to any old event in commit_queue issue_idx={} ({}), check if the old event is retired in time",
+        se.issue_idx,
+        old_se.issue_idx,
+        se.describe_insn(),
+        old_se.describe_insn()
+      );
+    });
+
     info!("[{cycle}] Issue: issue_idx={idx} ({})", se.describe_insn());
 
     self.commit_queue.push_front(se);