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

Revert "replace remaining uses of Vec.fill"

Browse Source 
This reverts commit b6bb4e42127d1ed42b55ec8b859a4e074b347d47.
This commit is contained in:
Andrew Waterman 2015-09-25 17:06:06 -07:00
parent 20b7a82ab6
commit 3b1da4c57e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ class MetadataArray[T <: Metadata](makeRstVal: () => T) extends CacheModule {
val metabits = rstVal.getWidth val metabits = rstVal.getWidth
val tag_arr = SeqMem(Vec(UInt(width = metabits), nWays), nSets) val tag_arr = SeqMem(Vec(UInt(width = metabits), nWays), nSets)
when (rst || io.write.valid) { when (rst || io.write.valid) {
tag_arr.write(waddr, Vec(nWays, wdata), wmask) tag_arr.write(waddr, Vec.fill(nWays)(wdata), wmask)
} }
val tags = tag_arr.read(io.read.bits.idx, io.read.valid).toBits val tags = tag_arr.read(io.read.bits.idx, io.read.valid).toBits
@ -493,7 +493,7 @@ class L2VoluntaryReleaseTracker(trackerId: Int) extends L2XactTracker {
val state = Reg(init=s_idle) val state = Reg(init=s_idle)
val xact = Reg(Bundle(new ReleaseFromSrc, { case TLId => params(InnerTLId); case TLDataBits => 0 })) val xact = Reg(Bundle(new ReleaseFromSrc, { case TLId => params(InnerTLId); case TLDataBits => 0 }))
val data_buffer = Reg(init=Vec(innerDataBeats, UInt(0, innerDataBits))) val data_buffer = Reg(init=Vec.fill(innerDataBeats)(UInt(0, width = innerDataBits)))
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 coh = xact_old_meta.coh val coh = xact_old_meta.coh
@ -588,8 +588,8 @@ class L2AcquireTracker(trackerId: Int) extends L2XactTracker {
// State holding transaction metadata // State holding transaction metadata
val xact = Reg(Bundle(new AcquireFromSrc, { case TLId => params(InnerTLId) })) val xact = Reg(Bundle(new AcquireFromSrc, { case TLId => params(InnerTLId) }))
val data_buffer = Reg(init=Vec(innerDataBeats, UInt(0, innerDataBits))) val data_buffer = Reg(init=Vec.fill(innerDataBeats)(UInt(0, width = innerDataBits)))
val wmask_buffer = Reg(init=Vec(innerDataBeats, UInt(0, innerDataBits/8))) val wmask_buffer = Reg(init=Vec.fill(innerDataBeats)(UInt(0, width = innerDataBits/8)))
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 }
@ -981,7 +981,7 @@ class L2WritebackUnit(trackerId: Int) extends L2XactTracker {
val state = Reg(init=s_idle) val state = Reg(init=s_idle)
val xact = Reg(new L2WritebackReq) val xact = Reg(new L2WritebackReq)
val data_buffer = Reg(init=Vec(innerDataBeats, UInt(0, innerDataBits))) val data_buffer = Reg(init=Vec.fill(innerDataBeats)(UInt(0, width = innerDataBits)))
val xact_addr_block = Cat(xact.tag, xact.idx) val xact_addr_block = Cat(xact.tag, xact.idx)
val pending_irels = val pending_irels =