riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

Don't use clone

Browse Source
This commit is contained in:
Andrew Waterman 2015-07-15 18:06:27 -07:00
parent 276f53b652
commit 2d6b3b2331
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
uncore/src/main/scala/cache.scala
View File

@ -135,16 +135,16 @@ class MetaReadReq extends CacheBundle {
class MetaWriteReq[T <: Metadata](gen: T) extends MetaReadReq { class MetaWriteReq[T <: Metadata](gen: T) extends MetaReadReq {
val way_en = Bits(width = nWays) val way_en = Bits(width = nWays)
val data = gen.clone val data = gen.cloneType
override def clone = new MetaWriteReq(gen).asInstanceOf[this.type] override def cloneType = new MetaWriteReq(gen).asInstanceOf[this.type]
} }
class MetadataArray[T <: Metadata](makeRstVal: () => T) extends CacheModule { class MetadataArray[T <: Metadata](makeRstVal: () => T) extends CacheModule {
val rstVal = makeRstVal() val rstVal = makeRstVal()
val io = new Bundle { val io = new Bundle {
val read = Decoupled(new MetaReadReq).flip val read = Decoupled(new MetaReadReq).flip
val write = Decoupled(new MetaWriteReq(rstVal.clone)).flip val write = Decoupled(new MetaWriteReq(rstVal)).flip
val resp = Vec.fill(nWays){rstVal.clone.asOutput} val resp = Vec.fill(nWays){rstVal.cloneType.asOutput}
} }
val rst_cnt = Reg(init=UInt(0, log2Up(nSets+1))) val rst_cnt = Reg(init=UInt(0, log2Up(nSets+1)))
val rst = rst_cnt < UInt(nSets) val rst = rst_cnt < UInt(nSets)
@ -186,7 +186,7 @@ abstract class L2HellaCacheModule extends Module with L2HellaCacheParameters {
def doInternalOutputArbitration[T <: Data : ClassTag]( def doInternalOutputArbitration[T <: Data : ClassTag](
out: DecoupledIO[T], out: DecoupledIO[T],
ins: Seq[DecoupledIO[T]]) { ins: Seq[DecoupledIO[T]]) {
val arb = Module(new RRArbiter(out.bits.clone, ins.size)) val arb = Module(new RRArbiter(out.bits, ins.size))
out <> arb.io.out out <> arb.io.out
arb.io.in <> ins arb.io.in <> ins
} }
@ -237,7 +237,7 @@ class L2MetaReadReq extends MetaReadReq with HasL2Id {
class L2MetaWriteReq extends MetaWriteReq[L2Metadata](new L2Metadata) class L2MetaWriteReq extends MetaWriteReq[L2Metadata](new L2Metadata)
with HasL2Id { with HasL2Id {
override def clone = new L2MetaWriteReq().asInstanceOf[this.type] override def cloneType = new L2MetaWriteReq().asInstanceOf[this.type]
} }
class L2MetaResp extends L2HellaCacheBundle class L2MetaResp extends L2HellaCacheBundle
@ -591,7 +591,7 @@ class L2AcquireTracker(trackerId: Int) extends L2XactTracker {
val xact_tag_match = Reg{ Bool() } val xact_tag_match = Reg{ Bool() }
val xact_way_en = Reg{ Bits(width = nWays) } val xact_way_en = Reg{ Bits(width = nWays) }
val xact_old_meta = Reg{ new L2Metadata } val xact_old_meta = Reg{ new L2Metadata }
val pending_coh = Reg{ xact_old_meta.coh.clone } val pending_coh = Reg{ xact_old_meta.coh }
// Secondary miss queue // Secondary miss queue
val ignt_q = Module(new Queue(new SecondaryMissInfo, nSecondaryMisses))(innerTLParams) val ignt_q = Module(new Queue(new SecondaryMissInfo, nSecondaryMisses))(innerTLParams)

6
uncore/src/main/scala/memserdes.scala
View File

@ -415,7 +415,7 @@ class MemIOTileLinkIOConverter(qDepth: Int) extends TLModule with MIFParameters
val (mif_cnt_in, mif_wrap_in) = Counter(io.mem.resp.fire(), mifDataBeats) // TODO: Assumes all resps have data val (mif_cnt_in, mif_wrap_in) = Counter(io.mem.resp.fire(), mifDataBeats) // TODO: Assumes all resps have data
val mif_done_in = Reg(init=Bool(false)) val mif_done_in = Reg(init=Bool(false))
val mif_buf_in = Reg(Vec(new MemData, mifDataBeats)) val mif_buf_in = Reg(Vec(new MemData, mifDataBeats))
val tl_buf_in = Vec.fill(tlDataBeats){ io.tl.acquire.bits.data.clone } val tl_buf_in = Vec.fill(tlDataBeats){ io.tl.acquire.bits.data }
tl_buf_in := tl_buf_in.fromBits(mif_buf_in.toBits) tl_buf_in := tl_buf_in.fromBits(mif_buf_in.toBits)
val tl_prog_in = (tl_cnt_in+UInt(1, width = log2Up(tlDataBeats+1)))*UInt(tlDataBits) val tl_prog_in = (tl_cnt_in+UInt(1, width = log2Up(tlDataBeats+1)))*UInt(tlDataBits)
val mif_prog_in = mif_cnt_in*UInt(mifDataBits) val mif_prog_in = mif_cnt_in*UInt(mifDataBits)
@ -506,7 +506,7 @@ class HellaQueue[T <: Data](val entries: Int)(data: => T) extends Module
object HellaQueue object HellaQueue
{ {
def apply[T <: Data](enq: DecoupledIO[T], entries: Int) = { def apply[T <: Data](enq: DecoupledIO[T], entries: Int) = {
val q = Module((new HellaQueue(entries)) { enq.bits.clone }) val q = Module((new HellaQueue(entries)) { enq.bits })
q.io.enq.valid := enq.valid // not using <> so that override is allowed q.io.enq.valid := enq.valid // not using <> so that override is allowed
q.io.enq.bits := enq.bits q.io.enq.bits := enq.bits
enq.ready := q.io.enq.ready enq.ready := q.io.enq.ready
@ -522,7 +522,7 @@ class MemIOArbiter(val arbN: Int) extends MIFModule {
if(arbN > 1) { if(arbN > 1) {
val cmd_arb = Module(new RRArbiter(new MemReqCmd, arbN)) val cmd_arb = Module(new RRArbiter(new MemReqCmd, arbN))
val choice_q = Module(new Queue(cmd_arb.io.chosen.clone, 4)) val choice_q = Module(new Queue(cmd_arb.io.chosen, 4))
val (data_cnt, data_done) = Counter(io.outer.req_data.fire(), mifDataBeats) val (data_cnt, data_done) = Counter(io.outer.req_data.fire(), mifDataBeats)
io.inner.map(_.req_cmd).zipWithIndex.zip(cmd_arb.io.in).map{ case ((req, id), arb) => { io.inner.map(_.req_cmd).zipWithIndex.zip(cmd_arb.io.in).map{ case ((req, id), arb) => {

12
uncore/src/main/scala/network.scala
View File

@ -13,8 +13,8 @@ class PhysicalHeader(n: Int) extends Bundle {
class PhysicalNetworkIO[T <: Data](n: Int, dType: T) extends Bundle { class PhysicalNetworkIO[T <: Data](n: Int, dType: T) extends Bundle {
val header = new PhysicalHeader(n) val header = new PhysicalHeader(n)
val payload = dType.clone val payload = dType
override def clone = new PhysicalNetworkIO(n,dType).asInstanceOf[this.type] override def cloneType = new PhysicalNetworkIO(n,dType).asInstanceOf[this.type]
} }
class BasicCrossbarIO[T <: Data](n: Int, dType: T) extends Bundle { class BasicCrossbarIO[T <: Data](n: Int, dType: T) extends Bundle {
@ -52,8 +52,8 @@ class LogicalHeader extends Bundle {
class LogicalNetworkIO[T <: Data](dType: T) extends Bundle { class LogicalNetworkIO[T <: Data](dType: T) extends Bundle {
val header = new LogicalHeader val header = new LogicalHeader
val payload = dType.clone val payload = dType.cloneType
override def clone = { new LogicalNetworkIO(dType).asInstanceOf[this.type] } override def cloneType = new LogicalNetworkIO(dType).asInstanceOf[this.type]
} }
object DecoupledLogicalNetworkIOWrapper { object DecoupledLogicalNetworkIOWrapper {
@ -61,7 +61,7 @@ object DecoupledLogicalNetworkIOWrapper {
in: DecoupledIO[T], in: DecoupledIO[T],
src: UInt = UInt(0), src: UInt = UInt(0),
dst: UInt = UInt(0)): DecoupledIO[LogicalNetworkIO[T]] = { dst: UInt = UInt(0)): DecoupledIO[LogicalNetworkIO[T]] = {
val out = Decoupled(new LogicalNetworkIO(in.bits.clone)).asDirectionless val out = Decoupled(new LogicalNetworkIO(in.bits)).asDirectionless
out.valid := in.valid out.valid := in.valid
out.bits.payload := in.bits out.bits.payload := in.bits
out.bits.header.dst := dst out.bits.header.dst := dst
@ -73,7 +73,7 @@ object DecoupledLogicalNetworkIOWrapper {
object DecoupledLogicalNetworkIOUnwrapper { object DecoupledLogicalNetworkIOUnwrapper {
def apply[T <: Data](in: DecoupledIO[LogicalNetworkIO[T]]): DecoupledIO[T] = { def apply[T <: Data](in: DecoupledIO[LogicalNetworkIO[T]]): DecoupledIO[T] = {
val out = Decoupled(in.bits.payload.clone).asDirectionless val out = Decoupled(in.bits.payload).asDirectionless
out.valid := in.valid out.valid := in.valid
out.bits := in.bits.payload out.bits := in.bits.payload
in.ready := out.ready in.ready := out.ready

10
uncore/src/main/scala/tilelink.scala
View File

@ -904,7 +904,7 @@ object ClientTileLinkHeaderCreator {
in: DecoupledIO[T], in: DecoupledIO[T],
clientId: Int, clientId: Int,
addrConvert: UInt => UInt): DecoupledIO[LogicalNetworkIO[T]] = { addrConvert: UInt => UInt): DecoupledIO[LogicalNetworkIO[T]] = {
val out = new DecoupledIO(new LogicalNetworkIO(in.bits.clone)).asDirectionless val out = new DecoupledIO(new LogicalNetworkIO(in.bits)).asDirectionless
out.bits.payload := in.bits out.bits.payload := in.bits
out.bits.header.src := UInt(clientId) out.bits.header.src := UInt(clientId)
out.bits.header.dst := addrConvert(in.bits.addr_block) out.bits.header.dst := addrConvert(in.bits.addr_block)
@ -943,7 +943,7 @@ object ManagerTileLinkHeaderCreator {
in: DecoupledIO[T], in: DecoupledIO[T],
managerId: Int, managerId: Int,
idConvert: UInt => UInt): DecoupledIO[LogicalNetworkIO[T]] = { idConvert: UInt => UInt): DecoupledIO[LogicalNetworkIO[T]] = {
val out = new DecoupledIO(new LogicalNetworkIO(in.bits.clone)).asDirectionless val out = new DecoupledIO(new LogicalNetworkIO(in.bits)).asDirectionless
out.bits.payload := in.bits out.bits.payload := in.bits
out.bits.header.src := UInt(managerId) out.bits.header.src := UInt(managerId)
out.bits.header.dst := idConvert(in.bits.client_id) out.bits.header.dst := idConvert(in.bits.client_id)
@ -1001,7 +1001,7 @@ trait TileLinkArbiterLike extends TileLinkParameters {
clts: Seq[DecoupledIO[LogicalNetworkIO[M]]], clts: Seq[DecoupledIO[LogicalNetworkIO[M]]],
mngr: DecoupledIO[LogicalNetworkIO[M]]) { mngr: DecoupledIO[LogicalNetworkIO[M]]) {
def hasData(m: LogicalNetworkIO[M]) = m.payload.hasMultibeatData() def hasData(m: LogicalNetworkIO[M]) = m.payload.hasMultibeatData()
val arb = Module(new LockingRRArbiter(mngr.bits.clone, arbN, tlDataBeats, Some(hasData _))) val arb = Module(new LockingRRArbiter(mngr.bits, arbN, tlDataBeats, Some(hasData _)))
clts.zipWithIndex.zip(arb.io.in).map{ case ((req, id), arb) => { clts.zipWithIndex.zip(arb.io.in).map{ case ((req, id), arb) => {
arb.valid := req.valid arb.valid := req.valid
arb.bits := req.bits arb.bits := req.bits
@ -1015,7 +1015,7 @@ trait TileLinkArbiterLike extends TileLinkParameters {
clts: Seq[DecoupledIO[M]], clts: Seq[DecoupledIO[M]],
mngr: DecoupledIO[M]) { mngr: DecoupledIO[M]) {
def hasData(m: M) = m.hasMultibeatData() def hasData(m: M) = m.hasMultibeatData()
val arb = Module(new LockingRRArbiter(mngr.bits.clone, arbN, tlDataBeats, Some(hasData _))) val arb = Module(new LockingRRArbiter(mngr.bits, arbN, tlDataBeats, Some(hasData _)))
clts.zipWithIndex.zip(arb.io.in).map{ case ((req, id), arb) => { clts.zipWithIndex.zip(arb.io.in).map{ case ((req, id), arb) => {
arb.valid := req.valid arb.valid := req.valid
arb.bits := req.bits arb.bits := req.bits
@ -1076,7 +1076,7 @@ trait TileLinkArbiterLike extends TileLinkParameters {
} }
def hookupFinish[M <: LogicalNetworkIO[Finish]]( clts: Seq[DecoupledIO[M]], mngr: DecoupledIO[M]) { def hookupFinish[M <: LogicalNetworkIO[Finish]]( clts: Seq[DecoupledIO[M]], mngr: DecoupledIO[M]) {
val arb = Module(new RRArbiter(mngr.bits.clone, arbN)) val arb = Module(new RRArbiter(mngr.bits, arbN))
arb.io.in <> clts arb.io.in <> clts
arb.io.out <> mngr arb.io.out <> mngr
} }

2
uncore/src/main/scala/uncore.scala
View File

@ -33,7 +33,7 @@ trait HasCoherenceAgentWiringHelpers {
out: DecoupledIO[T], out: DecoupledIO[T],
ins: Seq[DecoupledIO[T]]) { ins: Seq[DecoupledIO[T]]) {
def lock(o: T) = o.hasMultibeatData() def lock(o: T) = o.hasMultibeatData()
val arb = Module(new LockingRRArbiter(out.bits.clone, ins.size, out.bits.tlDataBeats, lock _)) val arb = Module(new LockingRRArbiter(out.bits, ins.size, out.bits.tlDataBeats, lock _))
out <> arb.io.out out <> arb.io.out
arb.io.in <> ins arb.io.in <> ins
} }

6
uncore/src/main/scala/util.scala
View File

@ -44,8 +44,8 @@ object ZCounter {
class FlowThroughSerializer[T <: HasTileLinkData](gen: T, n: Int) extends Module { class FlowThroughSerializer[T <: HasTileLinkData](gen: T, n: Int) extends Module {
val io = new Bundle { val io = new Bundle {
val in = Decoupled(gen.clone).flip val in = Decoupled(gen).flip
val out = Decoupled(gen.clone) val out = Decoupled(gen)
val cnt = UInt(OUTPUT, log2Up(n)) val cnt = UInt(OUTPUT, log2Up(n))
val done = Bool(OUTPUT) val done = Bool(OUTPUT)
} }
@ -59,7 +59,7 @@ class FlowThroughSerializer[T <: HasTileLinkData](gen: T, n: Int) extends Module
} else { } else {
val cnt = Reg(init=UInt(0, width = log2Up(n))) val cnt = Reg(init=UInt(0, width = log2Up(n)))
val wrap = cnt === UInt(n-1) val wrap = cnt === UInt(n-1)
val rbits = Reg(io.in.bits.clone) val rbits = Reg{io.in.bits}
val active = Reg(init=Bool(false)) val active = Reg(init=Bool(false))
val shifter = Vec.fill(n){Bits(width = narrowWidth)} val shifter = Vec.fill(n){Bits(width = narrowWidth)}