From b020585e88b6b83f776a2ec71af049df2df3118d Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Mon, 1 May 2023 16:00:54 -0700 Subject: [PATCH] Deprecate old BusWrapper methods (#3337) (cherry picked from commit 2570db7ce9448b7c1f16aa966810a733213fdfe4) --- src/main/scala/tilelink/BusWrapper.scala | 152 ----------------------- 1 file changed, 152 deletions(-) diff --git a/src/main/scala/tilelink/BusWrapper.scala b/src/main/scala/tilelink/BusWrapper.scala index ea6dacd5a2e..ecf2ce196eb 100644 --- a/src/main/scala/tilelink/BusWrapper.scala +++ b/src/main/scala/tilelink/BusWrapper.scala @@ -34,8 +34,6 @@ abstract class TLBusWrapper(params: HasTLBusParams, val busName: String)(implici extends ClockDomain with HasTLBusParams with CanHaveBuiltInDevices - with CanAttachTLSlaves - with CanAttachTLMasters { private val clockGroupAggregator = LazyModule(new ClockGroupAggregator(busName){ override def shouldBeInlined = true }).suggestName(busName + "_clock_groups") private val clockGroup = LazyModule(new ClockGroup(busName){ override def shouldBeInlined = true }) @@ -218,156 +216,6 @@ class TLBusWrapperTopology( } } -trait CanAttachTLSlaves extends HasTLBusParams { this: TLBusWrapper => - - def toTile - (name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: => TLInwardNode): NoHandle = { - to("tile" named name) { FlipRendering { implicit p => - gen :*= TLWidthWidget(beatBytes) :*= TLBuffer(buffer) :*= outwardNode - }} - } - - def toDRAMController[D,U,E,B <: Data] - (name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: => NodeHandle[ TLClientPortParameters,TLManagerPortParameters,TLEdgeIn,TLBundle, D,U,E,B] = - TLNameNode(name)): OutwardNodeHandle[D,U,E,B] = { - to("memory_controller" named name) { gen :*= TLWidthWidget(beatBytes) :*= TLBuffer(buffer) :*= outwardNode } - } - - @deprecated("Replace with e.g. bus.coupleTo(s\"slave_named_${name}\"){ slave.controlXing(NoCrossing) :*= _ }", "rocket-chip 1.3") - def toSlave[D,U,E,B <: Data] - (name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: => NodeHandle[TLClientPortParameters,TLManagerPortParameters,TLEdgeIn,TLBundle,D,U,E,B] = - TLNameNode(name)): OutwardNodeHandle[D,U,E,B] = { - to("slave" named name) { gen :*= TLBuffer(buffer) :*= outwardNode } - } - - @deprecated("Replace with e.g. bus.coupleTo(s\"slave_named_${name}\"){ node :*= TLFragmenter(bus.beatBytes, bus.blockBytes) :*= _ }", "rocket-chip 1.3") - def toVariableWidthSlaveNode(name: Option[String] = None, buffer: BufferParams = BufferParams.none)(node: TLInwardNode): Unit = { - toVariableWidthSlaveNodeOption(name, buffer)(Some(node)) - } - - @deprecated("Replace with e.g. node.foreach { n => bus.coupleTo(s\"slave_named_${name}\"){ b => n :*= TLFragmenter(bus.beatBytes, bus.blockBytes) :*= b } }", "rocket-chip 1.3") - def toVariableWidthSlaveNodeOption(name: Option[String] = None, buffer: BufferParams = BufferParams.none)(node: Option[TLInwardNode]): Unit = { - node foreach { n => to("slave" named name) { - n :*= TLFragmenter(beatBytes, blockBytes) :*= TLBuffer(buffer) :*= outwardNode - }} - } - - @deprecated("Replace with e.g. bus.coupleTo(s\"slave_named_${name}\"){ slave.controlXing(NoCrossing) :*= TLFragmenter(bus.beatBytes, bus.blockBytes) :*= _ }", "rocket-chip 1.3") - def toVariableWidthSlave[D,U,E,B <: Data] - (name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: => NodeHandle[TLClientPortParameters,TLManagerPortParameters,TLEdgeIn,TLBundle,D,U,E,B] = - TLNameNode(name)): OutwardNodeHandle[D,U,E,B] = { - to("slave" named name) { - gen :*= TLFragmenter(beatBytes, blockBytes) :*= TLBuffer(buffer) :*= outwardNode - } - } - - @deprecated("Replace with e.g. bus.coupleTo(s\"slave_named_${name}\"){ slave.control :*= TLWidthWidget(bus.beatBytes) :*= node }", "rocket-chip 1.3") - def toFixedWidthSlaveNode(name: Option[String] = None, buffer: BufferParams = BufferParams.none)(gen: TLInwardNode): Unit = { - to("slave" named name) { gen :*= TLWidthWidget(beatBytes) :*= TLBuffer(buffer) :*= outwardNode } - } - - @deprecated("Replace with e.g. bus.coupleTo(s\"slave_named_${name}\"){ slave.controlXing(NoCrossing) :*= TLWidthWidget(bus.beatBytes) :*= _ }", "rocket-chip 1.3") - def toFixedWidthSlave[D,U,E,B <: Data] - (name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: => NodeHandle[TLClientPortParameters,TLManagerPortParameters,TLEdgeIn,TLBundle,D,U,E,B] = - TLNameNode(name)): OutwardNodeHandle[D,U,E,B] = { - to("slave" named name) { gen :*= TLWidthWidget(beatBytes) :*= TLBuffer(buffer) :*= outwardNode } - } - - @deprecated("Replace with e.g. bus.coupleTo(s\"slave_named_${name}\"){ slave.controlXing(NoCrossing) :*= TLFragmenter(widthBytes, bus.blockBytes) :*= TLWidthWidget(bus.beatBytes) :*= node }", "rocket-chip 1.3") - def toFixedWidthSingleBeatSlaveNode - (widthBytes: Int, name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: TLInwardNode): Unit = { - to("slave" named name) { - gen :*= TLFragmenter(widthBytes, blockBytes) :*= TLWidthWidget(beatBytes) :*= TLBuffer(buffer) :*= outwardNode - } - } - - @deprecated("Replace with e.g. bus.coupleTo(s\"slave_named_${name}\"){ slave.controlXing(NoCrossing) :*= TLFragmenter(widthBytes, bus.blockBytes) :*= TLWidthWidget(bus.beatBytes) :*= _ }", "rocket-chip 1.3") - def toFixedWidthSingleBeatSlave[D,U,E,B <: Data] - (widthBytes: Int, name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: => NodeHandle[TLClientPortParameters,TLManagerPortParameters,TLEdgeIn,TLBundle,D,U,E,B] = - TLNameNode(name)): OutwardNodeHandle[D,U,E,B] = { - to("slave" named name) { - gen :*= TLFragmenter(widthBytes, blockBytes) :*= TLWidthWidget(beatBytes) :*= TLBuffer(buffer) :*= outwardNode - } - } - - @deprecated("Replace with e.g. bus.coupleTo(s\"slave_named_${name}\"){ slave.controlXing(NoCrossing) :*= TLFragmenter(bus.beatBytes, ) :*= _ }", "rocket-chip 1.3") - def toLargeBurstSlave[D,U,E,B <: Data] - (maxXferBytes: Int, name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: => NodeHandle[TLClientPortParameters,TLManagerPortParameters,TLEdgeIn,TLBundle,D,U,E,B] = - TLNameNode(name)): OutwardNodeHandle[D,U,E,B] = { - to("slave" named name) { - gen :*= TLFragmenter(beatBytes, maxXferBytes) :*= TLBuffer(buffer) :*= outwardNode - } - } - - @deprecated("Replace with e.g. bus.coupleTo(s\"slave_named_${name}\"){ slave.controlXing(NoCrossing) :*= TLFragmenter(bus.beatBytes, ) :*= _ }", "rocket-chip 1.3") - def toFixedWidthPort[D,U,E,B <: Data] - (name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: => NodeHandle[TLClientPortParameters,TLManagerPortParameters,TLEdgeIn,TLBundle,D,U,E,B] = - TLNameNode(name)): OutwardNodeHandle[D,U,E,B] = { - to("port" named name) { - gen := TLWidthWidget(beatBytes) :*= TLBuffer(buffer) :*= outwardNode - } - } -} - -trait CanAttachTLMasters extends HasTLBusParams { this: TLBusWrapper => - def fromTile - (name: Option[String], buffer: BufferParams = BufferParams.none, cork: Option[Boolean] = None) - (gen: => TLOutwardNode): NoHandle = { - from("tile" named name) { - inwardNode :=* TLBuffer(buffer) :=* TLFIFOFixer(TLFIFOFixer.allVolatile) :=* gen - } - } - - @deprecated("Replace with e.g. bus.coupleFrom(s\"master_named_${name}\"){ _ :=* TLFIFOFixer(TLFIFOFixer.all) :=* node }", "rocket-chip 1.3") - def fromMasterNode - (name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: TLOutwardNode): Unit = { - from("master" named name) { - inwardNode :=* TLBuffer(buffer) :=* TLFIFOFixer(TLFIFOFixer.all) :=* gen - } - } - - @deprecated("Replace with e.g. bus.coupleFrom(s\"master_named_${name}\"){ _ :=* TLFIFOFixer(TLFIFOFixer.all) :=* master.node }", "rocket-chip 1.3") - def fromMaster[D,U,E,B <: Data] - (name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: => NodeHandle[D,U,E,B,TLClientPortParameters,TLManagerPortParameters,TLEdgeOut,TLBundle] = - TLNameNode(name)): InwardNodeHandle[D,U,E,B] = { - from("master" named name) { - inwardNode :=* TLBuffer(buffer) :=* TLFIFOFixer(TLFIFOFixer.all) :=* gen - } - } - - // TODO also deprecate this once debug module isn't using it - //@deprecated("Replace with e.g. bus.coupleFrom(s\"port_named_${name}\"){ _ :=* TLFIFOFixer(TLFIFOFixer.all) :=* master.node }", "rocket-chip 1.3") - def fromPort[D,U,E,B <: Data] - (name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: => NodeHandle[D,U,E,B,TLClientPortParameters,TLManagerPortParameters,TLEdgeOut,TLBundle] = - TLNameNode(name)): InwardNodeHandle[D,U,E,B] = { - from("port" named name) { - inwardNode :=* TLBuffer(buffer) :=* TLFIFOFixer(TLFIFOFixer.all) :=* gen - } - } - - @deprecated("Replace with e.g. bus.coupleFrom(s\"coherent_master_named_${name}\"){ _ :=* TLFIFOFixer(TLFIFOFixer.all) :=* master.node }", "rocket-chip 1.3") - def fromCoherentMaster[D,U,E,B <: Data] - (name: Option[String] = None, buffer: BufferParams = BufferParams.none) - (gen: => NodeHandle[D,U,E,B,TLClientPortParameters,TLManagerPortParameters,TLEdgeOut,TLBundle] = - TLNameNode(name)): InwardNodeHandle[D,U,E,B] = { - from("coherent_master" named name) { - inwardNode :=* TLBuffer(buffer) :=* TLFIFOFixer(TLFIFOFixer.all) :=* gen - } - } -} - trait HasTLXbarPhy { this: TLBusWrapper => private val xbar = LazyModule(new TLXbar).suggestName(busName + "_xbar")