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

Tl2 addr width0 (#346)

Browse Source 
* tilelink2 Edges: add accessor methods for address and addr_{hi,lo}

* tilelink2: use addr_lo instead of relying on truncation

Truncation can mess up if the width should be 0, but IS 1.
This commit is contained in:
Wesley W. Terpstra 2016-09-26 17:00:03 -07:00 committed by GitHub
parent 72c205b54f
commit d9e209365d
2 changed files with 63 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/main/scala/uncore/tilelink2/Edges.scala
View File

@ -171,15 +171,6 @@ class TLEdge(
} }
} }
def addr_lo(x: TLDataChannel): UInt = {
x match {
case a: TLBundleA => addr_lo(a.mask, a.size)
case b: TLBundleB => addr_lo(b.mask, b.size)
case c: TLBundleC => c.addr_lo
case d: TLBundleD => d.addr_lo
}
}
def full_mask(x: TLDataChannel): UInt = { def full_mask(x: TLDataChannel): UInt = {
x match { x match {
case a: TLBundleA => full_mask(a.mask, a.size) case a: TLBundleA => full_mask(a.mask, a.size)
@ -189,15 +180,36 @@ class TLEdge(
} }
} }
def address(x: TLAddrChannel): UInt = { def addr_lo(x: TLDataChannel): UInt = {
val hi = x match { x match {
case a: TLBundleA => addr_lo(a.mask, a.size)
case b: TLBundleB => addr_lo(b.mask, b.size)
case c: TLBundleC => c.addr_lo
case d: TLBundleD => d.addr_lo
}
}
def addr_hi(x: TLAddrChannel): UInt = {
x match {
case a: TLBundleA => a.addr_hi case a: TLBundleA => a.addr_hi
case b: TLBundleB => b.addr_hi case b: TLBundleB => b.addr_hi
case c: TLBundleC => c.addr_hi case c: TLBundleC => c.addr_hi
} }
}
def address(x: TLAddrChannel): UInt = {
val hi = addr_hi(x)
if (manager.beatBytes == 1) hi else Cat(hi, addr_lo(x)) if (manager.beatBytes == 1) hi else Cat(hi, addr_lo(x))
} }
def addr_lo(x: UInt): UInt = {
if (manager.beatBytes == 1) UInt(0) else x(log2Ceil(manager.beatBytes)-1, 0)
}
def addr_hi(x: UInt): UInt = {
x >> log2Ceil(manager.beatBytes)
}
def numBeats(x: TLChannel): UInt = { def numBeats(x: TLChannel): UInt = {
x match { x match {
case _: TLBundleE => UInt(1) case _: TLBundleE => UInt(1)
@ -241,7 +253,7 @@ class TLEdgeOut(
a.param := growPermissions a.param := growPermissions
a.size := lgSize a.size := lgSize
a.source := fromSource a.source := fromSource
a.addr_hi := toAddress >> log2Ceil(manager.beatBytes) a.addr_hi := addr_hi(toAddress)
a.mask := SInt(-1).asUInt a.mask := SInt(-1).asUInt
a.data := UInt(0) a.data := UInt(0)
(legal, a) (legal, a)
@ -255,8 +267,8 @@ class TLEdgeOut(
c.param := shrinkPermissions c.param := shrinkPermissions
c.size := lgSize c.size := lgSize
c.source := fromSource c.source := fromSource
c.addr_hi := toAddress >> log2Ceil(manager.beatBytes) c.addr_hi := addr_hi(toAddress)
c.addr_lo := toAddress c.addr_lo := addr_lo(toAddress)
c.data := UInt(0) c.data := UInt(0)
c.error := Bool(false) c.error := Bool(false)
(legal, c) (legal, c)
@ -270,8 +282,8 @@ class TLEdgeOut(
c.param := shrinkPermissions c.param := shrinkPermissions
c.size := lgSize c.size := lgSize
c.source := fromSource c.source := fromSource
c.addr_hi := toAddress >> log2Ceil(manager.beatBytes) c.addr_hi := addr_hi(toAddress)
c.addr_lo := toAddress c.addr_lo := addr_lo(toAddress)
c.data := data c.data := data
c.error := Bool(false) c.error := Bool(false)
(legal, c) (legal, c)
@ -283,8 +295,8 @@ class TLEdgeOut(
c.param := reportPermissions c.param := reportPermissions
c.size := lgSize c.size := lgSize
c.source := fromSource c.source := fromSource
c.addr_hi := toAddress >> log2Ceil(manager.beatBytes) c.addr_hi := addr_hi(toAddress)
c.addr_lo := toAddress c.addr_lo := addr_lo(toAddress)
c.data := UInt(0) c.data := UInt(0)
c.error := Bool(false) c.error := Bool(false)
c c
@ -296,8 +308,8 @@ class TLEdgeOut(
c.param := reportPermissions c.param := reportPermissions
c.size := lgSize c.size := lgSize
c.source := fromSource c.source := fromSource
c.addr_hi := toAddress >> log2Ceil(manager.beatBytes) c.addr_hi := addr_hi(toAddress)
c.addr_lo := toAddress c.addr_lo := addr_lo(toAddress)
c.data := data c.data := data
c.error := Bool(false) c.error := Bool(false)
c c
@ -318,7 +330,7 @@ class TLEdgeOut(
a.param := UInt(0) a.param := UInt(0)
a.size := lgSize a.size := lgSize
a.source := fromSource a.source := fromSource
a.addr_hi := toAddress >> log2Ceil(manager.beatBytes) a.addr_hi := addr_hi(toAddress)
a.mask := mask(toAddress, lgSize) a.mask := mask(toAddress, lgSize)
a.data := UInt(0) a.data := UInt(0)
(legal, a) (legal, a)
@ -332,7 +344,7 @@ class TLEdgeOut(
a.param := UInt(0) a.param := UInt(0)
a.size := lgSize a.size := lgSize
a.source := fromSource a.source := fromSource
a.addr_hi := toAddress >> log2Ceil(manager.beatBytes) a.addr_hi := addr_hi(toAddress)
a.mask := mask(toAddress, lgSize) a.mask := mask(toAddress, lgSize)
a.data := data a.data := data
(legal, a) (legal, a)
@ -346,7 +358,7 @@ class TLEdgeOut(
a.param := UInt(0) a.param := UInt(0)
a.size := lgSize a.size := lgSize
a.source := fromSource a.source := fromSource
a.addr_hi := toAddress >> log2Ceil(manager.beatBytes) a.addr_hi := addr_hi(toAddress)
a.mask := mask a.mask := mask
a.data := data a.data := data
(legal, a) (legal, a)
@ -360,7 +372,7 @@ class TLEdgeOut(
a.param := atomic a.param := atomic
a.size := lgSize a.size := lgSize
a.source := fromSource a.source := fromSource
a.addr_hi := toAddress >> log2Ceil(manager.beatBytes) a.addr_hi := addr_hi(toAddress)
a.mask := mask(toAddress, lgSize) a.mask := mask(toAddress, lgSize)
a.data := data a.data := data
(legal, a) (legal, a)
@ -374,7 +386,7 @@ class TLEdgeOut(
a.param := atomic a.param := atomic
a.size := lgSize a.size := lgSize
a.source := fromSource a.source := fromSource
a.addr_hi := toAddress >> log2Ceil(manager.beatBytes) a.addr_hi := addr_hi(toAddress)
a.mask := mask(toAddress, lgSize) a.mask := mask(toAddress, lgSize)
a.data := data a.data := data
(legal, a) (legal, a)
@ -388,7 +400,7 @@ class TLEdgeOut(
a.param := param a.param := param
a.size := lgSize a.size := lgSize
a.source := fromSource a.source := fromSource
a.addr_hi := toAddress >> log2Ceil(manager.beatBytes) a.addr_hi := addr_hi(toAddress)
a.mask := mask(toAddress, lgSize) a.mask := mask(toAddress, lgSize)
a.data := UInt(0) a.data := UInt(0)
(legal, a) (legal, a)
@ -403,8 +415,8 @@ class TLEdgeOut(
c.param := UInt(0) c.param := UInt(0)
c.size := lgSize c.size := lgSize
c.source := fromSource c.source := fromSource
c.addr_hi := toAddress >> log2Ceil(manager.beatBytes) c.addr_hi := addr_hi(toAddress)
c.addr_lo := toAddress c.addr_lo := addr_lo(toAddress)
c.data := UInt(0) c.data := UInt(0)
c.error := error c.error := error
c c
@ -419,8 +431,8 @@ class TLEdgeOut(
c.param := UInt(0) c.param := UInt(0)
c.size := lgSize c.size := lgSize
c.source := fromSource c.source := fromSource
c.addr_hi := toAddress >> log2Ceil(manager.beatBytes) c.addr_hi := addr_hi(toAddress)
c.addr_lo := toAddress c.addr_lo := addr_lo(toAddress)
c.data := data c.data := data
c.error := error c.error := error
c c
@ -433,8 +445,8 @@ class TLEdgeOut(
c.param := UInt(0) c.param := UInt(0)
c.size := lgSize c.size := lgSize
c.source := fromSource c.source := fromSource
c.addr_hi := toAddress >> log2Ceil(manager.beatBytes) c.addr_hi := addr_hi(toAddress)
c.addr_lo := toAddress c.addr_lo := addr_lo(toAddress)
c.data := UInt(0) c.data := UInt(0)
c.error := Bool(false) c.error := Bool(false)
c c
@ -455,7 +467,7 @@ class TLEdgeIn(
b.param := capPermissions b.param := capPermissions
b.size := lgSize b.size := lgSize
b.source := toSource b.source := toSource
b.addr_hi := fromAddress >> log2Ceil(manager.beatBytes) b.addr_hi := addr_hi(fromAddress)
b.mask := SInt(-1).asUInt b.mask := SInt(-1).asUInt
b.data := UInt(0) b.data := UInt(0)
(legal, b) (legal, b)
@ -469,7 +481,7 @@ class TLEdgeIn(
d.size := lgSize d.size := lgSize
d.source := toSource d.source := toSource
d.sink := fromSink d.sink := fromSink
d.addr_lo := fromAddress d.addr_lo := addr_lo(fromAddress)
d.data := UInt(0) d.data := UInt(0)
d.error := error d.error := error
d d
@ -483,7 +495,7 @@ class TLEdgeIn(
d.size := lgSize d.size := lgSize
d.source := toSource d.source := toSource
d.sink := fromSink d.sink := fromSink
d.addr_lo := fromAddress d.addr_lo := addr_lo(fromAddress)
d.data := data d.data := data
d.error := error d.error := error
d d
@ -496,7 +508,7 @@ class TLEdgeIn(
d.size := lgSize d.size := lgSize
d.source := toSource d.source := toSource
d.sink := fromSink d.sink := fromSink
d.addr_lo := fromAddress d.addr_lo := addr_lo(fromAddress)
d.data := UInt(0) d.data := UInt(0)
d.error := Bool(false) d.error := Bool(false)
d d
@ -511,7 +523,7 @@ class TLEdgeIn(
b.param := UInt(0) b.param := UInt(0)
b.size := lgSize b.size := lgSize
b.source := toSource b.source := toSource
b.addr_hi := fromAddress >> log2Ceil(manager.beatBytes) b.addr_hi := addr_hi(fromAddress)
b.mask := mask(fromAddress, lgSize) b.mask := mask(fromAddress, lgSize)
b.data := UInt(0) b.data := UInt(0)
(legal, b) (legal, b)
@ -525,7 +537,7 @@ class TLEdgeIn(
b.param := UInt(0) b.param := UInt(0)
b.size := lgSize b.size := lgSize
b.source := toSource b.source := toSource
b.addr_hi := fromAddress >> log2Ceil(manager.beatBytes) b.addr_hi := addr_hi(fromAddress)
b.mask := mask(fromAddress, lgSize) b.mask := mask(fromAddress, lgSize)
b.data := data b.data := data
(legal, b) (legal, b)
@ -539,7 +551,7 @@ class TLEdgeIn(
b.param := UInt(0) b.param := UInt(0)
b.size := lgSize b.size := lgSize
b.source := toSource b.source := toSource
b.addr_hi := fromAddress >> log2Ceil(manager.beatBytes) b.addr_hi := addr_hi(fromAddress)
b.mask := mask b.mask := mask
b.data := data b.data := data
(legal, b) (legal, b)
@ -553,7 +565,7 @@ class TLEdgeIn(
b.param := atomic b.param := atomic
b.size := lgSize b.size := lgSize
b.source := toSource b.source := toSource
b.addr_hi := fromAddress >> log2Ceil(manager.beatBytes) b.addr_hi := addr_hi(fromAddress)
b.mask := mask(fromAddress, lgSize) b.mask := mask(fromAddress, lgSize)
b.data := data b.data := data
(legal, b) (legal, b)
@ -567,7 +579,7 @@ class TLEdgeIn(
b.param := atomic b.param := atomic
b.size := lgSize b.size := lgSize
b.source := toSource b.source := toSource
b.addr_hi := fromAddress >> log2Ceil(manager.beatBytes) b.addr_hi := addr_hi(fromAddress)
b.mask := mask(fromAddress, lgSize) b.mask := mask(fromAddress, lgSize)
b.data := data b.data := data
(legal, b) (legal, b)
@ -581,7 +593,7 @@ class TLEdgeIn(
b.param := param b.param := param
b.size := lgSize b.size := lgSize
b.source := toSource b.source := toSource
b.addr_hi := fromAddress >> log2Ceil(manager.beatBytes) b.addr_hi := addr_hi(fromAddress)
b.mask := mask(fromAddress, lgSize) b.mask := mask(fromAddress, lgSize)
b.data := UInt(0) b.data := UInt(0)
(legal, b) (legal, b)
@ -597,7 +609,7 @@ class TLEdgeIn(
d.size := lgSize d.size := lgSize
d.source := toSource d.source := toSource
d.sink := fromSink d.sink := fromSink
d.addr_lo := fromAddress d.addr_lo := addr_lo(fromAddress)
d.data := UInt(0) d.data := UInt(0)
d.error := error d.error := error
d d
@ -613,7 +625,7 @@ class TLEdgeIn(
d.size := lgSize d.size := lgSize
d.source := toSource d.source := toSource
d.sink := fromSink d.sink := fromSink
d.addr_lo := fromAddress d.addr_lo := addr_lo(fromAddress)
d.data := data d.data := data
d.error := error d.error := error
d d
@ -627,7 +639,7 @@ class TLEdgeIn(
d.size := lgSize d.size := lgSize
d.source := toSource d.source := toSource
d.sink := fromSink d.sink := fromSink
d.addr_lo := fromAddress d.addr_lo := addr_lo(fromAddress)
d.data := UInt(0) d.data := UInt(0)
d.error := Bool(false) d.error := Bool(false)
d d

11
src/main/scala/uncore/tilelink2/WidthWidget.scala
View File

@ -32,11 +32,12 @@ class TLWidthWidget(innerBeatBytes: Int) extends LazyModule
val mask = Cat(edgeIn.mask(in.bits), rmask) val mask = Cat(edgeIn.mask(in.bits), rmask)
val size = edgeIn.size(in.bits) val size = edgeIn.size(in.bits)
val hasData = edgeIn.hasData(in.bits) val hasData = edgeIn.hasData(in.bits)
val addr_lo = in.bits match { val addr_all = in.bits match {
case x: TLAddrChannel => edgeIn.address(x) case x: TLAddrChannel => edgeIn.address(x)
case _ => UInt(0) case _ => UInt(0)
} }
val addr = addr_lo >> log2Ceil(outBytes) val addr_hi = edgeOut.addr_hi(addr_all)
val addr_lo = edgeOut.addr_lo(addr_all)
val count = RegInit(UInt(0, width = log2Ceil(ratio))) val count = RegInit(UInt(0, width = log2Ceil(ratio)))
val first = count === UInt(0) val first = count === UInt(0)
@ -72,9 +73,9 @@ class TLWidthWidget(innerBeatBytes: Int) extends LazyModule
edgeOut.data(out.bits) := dataOut edgeOut.data(out.bits) := dataOut
out.bits match { out.bits match {
case a: TLBundleA => a.addr_hi := addr; a.mask := maskOut case a: TLBundleA => a.addr_hi := addr_hi; a.mask := maskOut
case b: TLBundleB => b.addr_hi := addr; b.mask := maskOut case b: TLBundleB => b.addr_hi := addr_hi; b.mask := maskOut
case c: TLBundleC => c.addr_hi := addr; c.addr_lo := addr_lo case c: TLBundleC => c.addr_hi := addr_hi; c.addr_lo := addr_lo
case d: TLBundleD => () case d: TLBundleD => ()
// addr_lo gets padded with 0s on D channel, the only lossy transform in this core // addr_lo gets padded with 0s on D channel, the only lossy transform in this core
// this should be safe, because we only care about addr_log on D to determine which // this should be safe, because we only care about addr_log on D to determine which