Merge pull request #826 from ucb-bar/tile-reset-async

Fix TileResetCtrl to be ahead of reset synchronizers.
ucb-bar · Mar 13, 2021 · f52822f · f52822f
2 parents 139149e + 2260fff
commit f52822f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/generators/chipyard/src/main/scala/Clocks.scala b/generators/chipyard/src/main/scala/Clocks.scala
@@ -71,27 +71,33 @@ object ClockingSchemeGenerators {
 
     // Add a control register for each tile's reset
     val resetSetter = chiptop.lazySystem match {
-      case sys: BaseSubsystem with InstantiatesTiles => TLTileResetCtrl(sys)
-      case _ => ClockGroupEphemeralNode()
+      case sys: BaseSubsystem with InstantiatesTiles => Some(TLTileResetCtrl(sys))
+      case _ => None
     }
+    val resetSetterResetProvider = resetSetter.map(_.tileResetProviderNode).getOrElse(ClockGroupEphemeralNode())
 
     val aggregator = LazyModule(new ClockGroupAggregator("allClocks")).node
     (chiptop.implicitClockSinkNode
       := ClockGroup()
       := aggregator)
     (systemAsyncClockGroup
-      :*= resetSetter
       :*= ClockGroupNamePrefixer()
       :*= aggregator)
 
     val referenceClockSource =  ClockSourceNode(Seq(ClockSourceParameters()))
     (aggregator
       := ClockGroupFrequencySpecifier(p(ClockFrequencyAssignersKey), p(DefaultClockFrequencyKey))
       := ClockGroupResetSynchronizer()
+      := resetSetterResetProvider
       := DividerOnlyClockGenerator()
       := referenceClockSource)
 
 
+    val asyncResetBroadcast = FixedClockBroadcast(None)
+    resetSetter.foreach(_.asyncResetSinkNode := asyncResetBroadcast)
+    val asyncResetSource = ClockSourceNode(Seq(ClockSourceParameters()))
+    asyncResetBroadcast := asyncResetSource
+
     InModuleBody {
       val clock_wire = Wire(Input(Clock()))
       val reset_wire = GenerateReset(chiptop, clock_wire)
@@ -103,6 +109,11 @@ object ClockingSchemeGenerators {
         o.reset := reset_wire
       }
 
+      asyncResetSource.out.unzip._1.map { o =>
+        o.clock := false.B.asClock // async reset broadcast network does not provide a clock
+        o.reset := reset_wire
+      }
+
       chiptop.harnessFunctions += ((th: HasHarnessSignalReferences) => {
         clock_io := th.harnessClock
         Nil })

diff --git a/generators/testchipip b/generators/testchipip
+1 −1		CHIPYARD.hash
+1 −1		src/main/resources/testchipip/csrc/SimDRAM.cc
+1 −1		src/main/resources/testchipip/vsrc/SimDRAM.v
+1 −1		src/main/scala/ClockUtil.scala
+11 −4		src/main/scala/TileResetCtrl.scala