1
0

tilelink2: better width inference for {left,right}OR

This commit is contained in:
Wesley W. Terpstra 2017-04-27 13:21:25 -07:00
parent 40f18e6e43
commit 976af7a8c7

View File

@ -19,18 +19,18 @@ package object tilelink2
def UIntToOH1(x: UInt, width: Int) = ~(SInt(-1, width=width).asUInt << x)(width-1, 0) def UIntToOH1(x: UInt, width: Int) = ~(SInt(-1, width=width).asUInt << x)(width-1, 0)
def trailingZeros(x: Int) = if (x > 0) Some(log2Ceil(x & -x)) else None def trailingZeros(x: Int) = if (x > 0) Some(log2Ceil(x & -x)) else None
// Fill 1s from low bits to high bits // Fill 1s from low bits to high bits
def leftOR(x: UInt) = { def leftOR(x: UInt): UInt = leftOR(x, x.getWidth)
val w = x.getWidth def leftOR(x: UInt, w: Integer): UInt = {
def helper(s: Int, x: UInt): UInt = def helper(s: Int, x: UInt): UInt =
if (s >= w) x else helper(s+s, x | (x << s)(w-1,0)) if (s >= w) x else helper(s+s, x | (x << s)(w-1,0))
helper(1, x) helper(1, x)(w-1, 0)
} }
// Fill 1s form high bits to low bits // Fill 1s form high bits to low bits
def rightOR(x: UInt) = { def rightOR(x: UInt): UInt = rightOR(x, x.getWidth)
val w = x.getWidth def rightOR(x: UInt, w: Integer): UInt = {
def helper(s: Int, x: UInt): UInt = def helper(s: Int, x: UInt): UInt =
if (s >= w) x else helper(s+s, x | (x >> s)) if (s >= w) x else helper(s+s, x | (x >> s))
helper(1, x) helper(1, x)(w-1, 0)
} }
// This gets used everywhere, so make the smallest circuit possible ... // This gets used everywhere, so make the smallest circuit possible ...
// Given an address and size, create a mask of beatBytes size // Given an address and size, create a mask of beatBytes size