From e50d14415e0a2ca5b4349c17d1015542fac32c33 Mon Sep 17 00:00:00 2001 From: Henry Cook Date: Tue, 12 Sep 2017 17:35:28 -0700 Subject: [PATCH] tilelink: more verbose requires --- src/main/scala/tilelink/Fragmenter.scala | 3 +-- src/main/scala/tilelink/Parameters.scala | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/scala/tilelink/Fragmenter.scala b/src/main/scala/tilelink/Fragmenter.scala index 1aafe1b0..0903227e 100644 --- a/src/main/scala/tilelink/Fragmenter.scala +++ b/src/main/scala/tilelink/Fragmenter.scala @@ -66,8 +66,7 @@ class TLFragmenter(val minSize: Int, val maxSize: Int, val alwaysMin: Boolean = require (fifoId.isDefined && managers.map(_.fifoId == fifoId).reduce(_ && _)) require (manager.endSinkId <= 1) - // We don't support fragmenting to sub-beat accesses - require (minSize >= beatBytes) + require (minSize >= beatBytes, s"We don't support fragmenting ($minSize) to sub-beat ($beatBytes) accesses") // We can't support devices which are cached on both sides of us require (!edgeOut.manager.anySupportAcquireB || !edgeIn.client.anySupportProbe) diff --git a/src/main/scala/tilelink/Parameters.scala b/src/main/scala/tilelink/Parameters.scala index d36c9229..50eb607c 100644 --- a/src/main/scala/tilelink/Parameters.scala +++ b/src/main/scala/tilelink/Parameters.scala @@ -30,12 +30,12 @@ case class TLManagerParameters( address.foreach { a => require (a.finite) } address.combinations(2).foreach { case Seq(x,y) => require (!x.overlaps(y), s"$x and $y overlap.") } - require (supportsPutFull.contains(supportsPutPartial)) - require (supportsPutFull.contains(supportsArithmetic)) - require (supportsPutFull.contains(supportsLogical)) - require (supportsGet.contains(supportsArithmetic)) - require (supportsGet.contains(supportsLogical)) - require (supportsAcquireB.contains(supportsAcquireT)) + require (supportsPutFull.contains(supportsPutPartial), s"PutFull($supportsPutFull) < PutPartial($supportsPutPartial)") + require (supportsPutFull.contains(supportsArithmetic), s"PutFull($supportsPutFull) < Arithmetic($supportsArithmetic)") + require (supportsPutFull.contains(supportsLogical), s"PutFull($supportsPutFull) < Logical($supportsLogical)") + require (supportsGet.contains(supportsArithmetic), s"Get($supportsGet) < Arithmetic($supportsArithmetic)") + require (supportsGet.contains(supportsLogical), s"Get($supportsGet) < Logical($supportsLogical)") + require (supportsAcquireB.contains(supportsAcquireT), s"AcquireB($supportsAcquireB) < AcquireT($supportsAcquireT)") // Make sure that the regionType agrees with the capabilities require (!supportsAcquireB || regionType >= RegionType.UNCACHED) // acquire -> uncached, tracked, cached