Working utests

ucb-bar · Aug 19, 2024 · 4398a10 · 4398a10
1 parent 704a790
commit 4398a10
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/.github/workflows/chipyard-full-flow.yml b/.github/workflows/chipyard-full-flow.yml
@@ -177,7 +177,8 @@ jobs:
           cd sims/firesim-staging
           export TEST_DISABLE_VERILATOR=1
           export TEST_DISABLE_VIVADO=1
-          make launch-sbt SBT_COMMAND=";project firechip; testOnly firesim.bridges.BridgeTests"
+          make launch-sbt SBT_COMMAND=";project firechip; testOnly firechip.test.core.bridges.BridgeTests"
+          make launch-sbt SBT_COMMAND=";project firechip; testOnly firechip.test.core.firesim.CITests"
 
   cleanup:
     name: cleanup

diff --git a/generators/firechip/core/src/main/makefrag/bridges/driver.mk b/generators/firechip/core/src/main/makefrag/bridges/driver.mk
@@ -4,8 +4,6 @@
 # Driver Sources & Flags #
 ##########################
 
-driver_dir = $(firesim_base_dir)/src/main/cc
-
 firechip_lib_dir = $(chipyard_dir)/generators/firechip/core/src/main/cc
 testchipip_csrc_dir = $(chipyard_dir)/generators/testchipip/src/main/resources/testchipip/csrc
 
@@ -59,9 +57,5 @@ TARGET_CXX_FLAGS += \
 TARGET_LD_FLAGS += -l:libdwarf.so -l:libelf.so
 
 # other
-DRIVER_H += $(shell find $(driver_dir) -name "*.h")
 TARGET_CXX_FLAGS += \
-		-I$(driver_dir)/midasexamples \
-		-I$(driver_dir) \
-		-I$(driver_dir)/bridges \
 		-g
diff --git a/generators/firechip/core/src/main/makefrag/firesim/driver.mk b/generators/firechip/core/src/main/makefrag/firesim/driver.mk
@@ -12,8 +12,6 @@ else
 LRISCV=-lriscv
 endif
 
-driver_dir = $(firesim_base_dir)/src/main/cc
-
 firechip_lib_dir = $(chipyard_dir)/generators/firechip/core/src/main/cc
 testchipip_csrc_dir = $(chipyard_dir)/generators/testchipip/src/main/resources/testchipip/csrc
 
@@ -42,7 +40,7 @@ TARGET_LD_FLAGS += \
 		$(LRISCV)
 
 # top-level sources
-DRIVER_CC += $(addprefix $(driver_dir)/firesim/, $(addsuffix .cc, firesim_top))
+DRIVER_CC += $(addprefix $(firechip_lib_dir)/firesim/, $(addsuffix .cc, firesim_top))
 TARGET_CXX_FLAGS += -I$(firechip_lib_dir)/bridge/test
 
 # bridge sources
@@ -64,7 +62,6 @@ TARGET_LD_FLAGS += \
 	-lz \
 
 # other
-DRIVER_H += $(shell find $(driver_dir) -name "*.h")
 TARGET_CXX_FLAGS += \
 		-I$(GENERATED_DIR) \
 		-g

diff --git a/generators/firechip/core/src/test/scala/firesim/FireSimTestSuite.scala b/generators/firechip/core/src/test/scala/firesim/FireSimTestSuite.scala
@@ -30,7 +30,10 @@ abstract class FireSimTestSuite(
   import scala.concurrent.duration._
   import ExecutionContext.Implicits.global
 
-  val topModuleProject = "firesim.firesim"
+  val chipyardDir = new File(System.getProperty("user.dir"))
+  override val extraMakeArgs = Seq(s"TARGET_PROJECT_MAKEFRAG=$chipyardDir/generators/firechip/core/src/main/makefrag/firesim")
+
+  val topModuleProject = "firechip.core.firesim"
 
   val chipyardLongName = topModuleProject + "." + targetName + "." + targetConfigs
 
@@ -76,45 +79,49 @@ abstract class FireSimTestSuite(
 class SimpleRocketF1Tests
     extends FireSimTestSuite(
       "FireSim",
-      "DDR3FCFS_FireSimRocketConfig",
+      "FireSimRocketConfig",
       BaseConfigs.F1,
+      Seq("FCFS16GBQuadRank"),
     )
 
 class RocketF1Tests
     extends FireSimTestSuite(
       "FireSim",
-      "DDR3FRFCFSLLC4MB_FireSimQuadRocketConfig",
+      "FireSimQuadRocketConfig",
       BaseConfigs.F1,
-      Seq("WithSynthAsserts"),
+      Seq("WithSynthAsserts", "FRFCFS16GBQuadRankLLC4MB"),
     )
 
 class MultiRocketF1Tests
     extends FireSimTestSuite(
       "FireSim",
-      "DDR3FRFCFSLLC4MB_FireSimQuadRocketConfig",
+      "FireSimQuadRocketConfig",
       BaseConfigs.F1,
-      Seq("WithSynthAsserts", "WithModelMultiThreading"),
+      Seq("WithSynthAsserts", "WithModelMultiThreading", "FRFCFS16GBQuadRankLLC4MB"),
     )
 
 class BoomF1Tests
     extends FireSimTestSuite(
       "FireSim",
-      "DDR3FRFCFSLLC4MB_FireSimLargeBoomConfig",
+      "FireSimLargeBoomConfig",
       BaseConfigs.F1,
+      Seq("FRFCFS16GBQuadRankLLC4MB"),
     )
 
 class RocketNICF1Tests
     extends FireSimTestSuite(
       "FireSim",
-      "WithNIC_DDR3FRFCFSLLC4MB_FireSimRocketConfig",
+      "WithNIC_FireSimRocketConfig",
       BaseConfigs.F1,
+      Seq("FRFCFS16GBQuadRankLLC4MB"),
     )
 
 class CVA6F1Tests
     extends FireSimTestSuite(
       "FireSim",
-      "WithNIC_DDR3FRFCFSLLC4MB_FireSimCVA6Config",
+      "WithNIC_FireSimCVA6Config",
       BaseConfigs.F1,
+      Seq("FRFCFS16GBQuadRankLLC4MB"),
     )
 
 class CITests