Bump difftest for new TOP IOs (#151)

OSCPU · Dec 8, 2023 · 4cfa831 · 4cfa831
1 parent 63a2687
commit 4cfa831
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/difftest b/difftest
diff --git a/src/main/scala/sim/NutShellSim.scala b/src/main/scala/sim/NutShellSim.scala
@@ -30,12 +30,6 @@ import utils.GTimer
 import difftest._
 
 class SimTop extends Module {
-  val io = IO(new Bundle{
-    val logCtrl = new LogCtrlIO
-    val perfInfo = new PerfInfoIO
-    val uart = new UARTIO
-  })
-
   lazy val config = NutCoreConfig(FPGAPlatform = false)
   val soc = Module(new NutShell()(config))
   val mem = Module(new AXI4RAM(memByte = 128 * 1024 * 1024, useBlackBox = true))
@@ -53,10 +47,12 @@ class SimTop extends Module {
 
   soc.io.meip := mmio.io.meip
 
+  val difftest = DifftestModule.finish("nutshell")
+
   val log_begin, log_end, log_level = WireInit(0.U(64.W))
-  log_begin := io.logCtrl.log_begin
-  log_end := io.logCtrl.log_end
-  log_level := io.logCtrl.log_level
+  log_begin := difftest.logCtrl.begin
+  log_end := difftest.logCtrl.end
+  log_level := difftest.logCtrl.level
 
   assert(log_begin <= log_end)
   BoringUtils.addSource(WireInit((GTimer() >= log_begin) && (GTimer() < log_end)), "DISPLAY_ENABLE")
@@ -65,7 +61,5 @@ class SimTop extends Module {
   val dummyWire = WireInit(false.B)
   BoringUtils.addSink(dummyWire, "DISPLAY_ENABLE")
 
-  io.uart <> mmio.io.uart
-
-  DifftestModule.finish("nutshell")
+  difftest.uart <> mmio.io.uart
 }
+56 −7		.github/workflows/main.yml
+2 −0		Makefile
+16 −3		README.md
+3 −0		config/config.h
+0 −243		doc/usage.md
+0 −61		src/main/scala/Batch.scala
+77 −36		src/main/scala/DPIC.scala
+77 −49		src/main/scala/Difftest.scala
+212 −0		src/main/scala/Gateway.scala
+0 −113		src/main/scala/Merge.scala
+142 −0		src/main/scala/Squash.scala
+68 −0		src/main/scala/common/Flash.scala
+60 −0		src/main/scala/common/LogPerfControl.scala
+1 −1		src/test/csrc/common/dut.h
+49 −5		src/test/csrc/difftest/difftest.cpp
+31 −13		src/test/csrc/difftest/difftest.h
+5 −0		src/test/csrc/difftest/refproxy.h
+25 −15		src/test/csrc/vcs/vcs_main.cpp
+59 −34		src/test/csrc/verilator/emu.cpp
+1 −1		src/test/csrc/verilator/emu.h
+44 −0		src/test/vsrc/vcs/GfifoControl.v
+84 −47		src/test/vsrc/vcs/top.v
+1 −1		vcs.mk