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

Make some requirement failures more verbose (#608)

Browse Source 
* tilelink: verbose requires in xbar

* diplomacy: verbose requires
This commit is contained in:
Henry Cook 2017-03-23 21:55:11 -07:00 committed by GitHub
parent bd08f10816
commit 797c18b8db
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/scala/diplomacy/Parameters.scala
View File

@ -19,8 +19,8 @@ object RegionType {
// A non-empty half-open range; [start, end) // A non-empty half-open range; [start, end)
case class IdRange(start: Int, end: Int) case class IdRange(start: Int, end: Int)
{ {
require (start >= 0) require (start >= 0, s"Ids cannot be negative, but got: $start.")
require (start < end) // not empty require (start < end, "Id ranges cannot be empty.")
// This is a strict partial ordering // This is a strict partial ordering
def <(x: IdRange) = end <= x.start def <(x: IdRange) = end <= x.start
@ -48,11 +48,11 @@ case class TransferSizes(min: Int, max: Int)
{ {
def this(x: Int) = this(x, x) def this(x: Int) = this(x, x)
require (min <= max) require (min <= max, s"Min transfer $min > max transfer $max")
require (min >= 0 && max >= 0) require (min >= 0 && max >= 0, s"TransferSizes must be positive, got: ($min, $max)")
require (max == 0 || isPow2(max)) require (max == 0 || isPow2(max), s"TransferSizes must be a power of 2, got: $max")
require (min == 0 || isPow2(min)) require (min == 0 || isPow2(min), s"TransferSizes must be a power of 2, got: $min")
require (max == 0 || min != 0) // 0 is forbidden unless (0,0) require (max == 0 || min != 0, s"TransferSize 0 is forbidden unless (0,0), got: ($min, $max)")
def none = min == 0 def none = min == 0
def contains(x: Int) = isPow2(x) && min <= x && x <= max def contains(x: Int) = isPow2(x) && min <= x && x <= max
@ -81,8 +81,8 @@ case class AddressRange(base: BigInt, size: BigInt) extends Ordered[AddressRange
{ {
val end = base + size val end = base + size
require (base >= 0) require (base >= 0, s"AddressRange base must be positive, got: $base")
require (size > 0) require (size > 0, s"AddressRange size must be > 0, got: $size")
def compare(x: AddressRange) = { def compare(x: AddressRange) = {
val primary = (this.base - x.base).signum val primary = (this.base - x.base).signum
@ -109,8 +109,8 @@ case class AddressRange(base: BigInt, size: BigInt) extends Ordered[AddressRange
case class AddressSet(base: BigInt, mask: BigInt) extends Ordered[AddressSet] case class AddressSet(base: BigInt, mask: BigInt) extends Ordered[AddressSet]
{ {
// Forbid misaligned base address (and empty sets) // Forbid misaligned base address (and empty sets)
require ((base & mask) == 0) require ((base & mask) == 0, s"Mis-aligned AddressSets are forbidden, got: ($base, $mask)")
require (base >= 0) // TL2 address widths are not fixed => negative is ambiguous require (base >= 0, s"AddressSet negative base is ambiguous: $base") // TL2 address widths are not fixed => negative is ambiguous
// We do allow negative mask (=> ignore all high bits) // We do allow negative mask (=> ignore all high bits)
def contains(x: BigInt) = ((x ^ base) & ~mask) == 0 def contains(x: BigInt) = ((x ^ base) & ~mask) == 0

8
src/main/scala/uncore/tilelink2/Xbar.scala
View File

@ -40,8 +40,8 @@ class TLXbar(policy: TLArbiter.Policy = TLArbiter.lowestIndexFirst)(implicit p:
numClientPorts = 1 to 32, numClientPorts = 1 to 32,
numManagerPorts = 1 to 32, numManagerPorts = 1 to 32,
clientFn = { seq => clientFn = { seq =>
// An unsafe atomic port can not be combined with any other! require (!seq.exists(_.unsafeAtomics) || seq.size == 1,
require (!seq.exists(_.unsafeAtomics) || seq.size == 1) "An unsafe atomic port can not be combined with any other!")
seq(0).copy( seq(0).copy(
minLatency = seq.map(_.minLatency).min, minLatency = seq.map(_.minLatency).min,
clients = (mapInputIds(seq) zip seq) flatMap { case (range, port) => clients = (mapInputIds(seq) zip seq) flatMap { case (range, port) =>
@ -58,8 +58,8 @@ class TLXbar(policy: TLArbiter.Policy = TLArbiter.lowestIndexFirst)(implicit p:
minLatency = seq.map(_.minLatency).min, minLatency = seq.map(_.minLatency).min,
endSinkId = outputIdRanges.map(_.map(_.end).getOrElse(0)).max, endSinkId = outputIdRanges.map(_.map(_.end).getOrElse(0)).max,
managers = ManagerUnification(seq.flatMap { port => managers = ManagerUnification(seq.flatMap { port =>
// println(s"${port.managers.map(_.name)} ${port.beatBytes} vs ${seq(0).managers.map(_.name)} ${seq(0).beatBytes}") require (port.beatBytes == seq(0).beatBytes,
require (port.beatBytes == seq(0).beatBytes) s"Xbar data widths don't match: ${port.managers.map(_.name)} has ${port.beatBytes}B vs ${seq(0).managers.map(_.name)} has ${seq(0).beatBytes}B")
val fifoIdMapper = fifoIdFactory() val fifoIdMapper = fifoIdFactory()
port.managers map { manager => manager.copy( port.managers map { manager => manager.copy(
fifoId = manager.fifoId.map(fifoIdMapper(_)) fifoId = manager.fifoId.map(fifoIdMapper(_))