Async covers (#1085)
* cover: support covering cross-product of ready-valid * tilelink: AsyncCrossing now has covers for all flow control logic
This commit is contained in:
parent
9e77045213
commit
4ccdbecb63
@ -6,6 +6,7 @@ import Chisel._
|
|||||||
import freechips.rocketchip.config.Parameters
|
import freechips.rocketchip.config.Parameters
|
||||||
import freechips.rocketchip.diplomacy._
|
import freechips.rocketchip.diplomacy._
|
||||||
import freechips.rocketchip.util._
|
import freechips.rocketchip.util._
|
||||||
|
import freechips.rocketchip.util.property._
|
||||||
import freechips.rocketchip.coreplex.{CrossingWrapper, AsynchronousCrossing}
|
import freechips.rocketchip.coreplex.{CrossingWrapper, AsynchronousCrossing}
|
||||||
|
|
||||||
class TLAsyncCrossingSource(sync: Int = 3)(implicit p: Parameters) extends LazyModule
|
class TLAsyncCrossingSource(sync: Int = 3)(implicit p: Parameters) extends LazyModule
|
||||||
@ -20,11 +21,16 @@ class TLAsyncCrossingSource(sync: Int = 3)(implicit p: Parameters) extends LazyM
|
|||||||
|
|
||||||
out.a <> ToAsyncBundle(in.a, depth, sync)
|
out.a <> ToAsyncBundle(in.a, depth, sync)
|
||||||
in.d <> FromAsyncBundle(out.d, sync)
|
in.d <> FromAsyncBundle(out.d, sync)
|
||||||
|
cover(in.a, "TL_ASYNC_CROSSING_SOURCE_A", "MemorySystem;;TLAsyncCrossingSource Channel A")
|
||||||
|
cover(in.d, "TL_ASYNC_CROSSING_SOURCE_D", "MemorySystem;;TLAsyncCrossingSource Channel D")
|
||||||
|
|
||||||
if (bce) {
|
if (bce) {
|
||||||
in.b <> FromAsyncBundle(out.b, sync)
|
in.b <> FromAsyncBundle(out.b, sync)
|
||||||
out.c <> ToAsyncBundle(in.c, depth, sync)
|
out.c <> ToAsyncBundle(in.c, depth, sync)
|
||||||
out.e <> ToAsyncBundle(in.e, depth, sync)
|
out.e <> ToAsyncBundle(in.e, depth, sync)
|
||||||
|
cover(in.b, "TL_ASYNC_CROSSING_SOURCE_B", "MemorySystem;;TLAsyncCrossingSource Channel B")
|
||||||
|
cover(in.c, "TL_ASYNC_CROSSING_SOURCE_C", "MemorySystem;;TLAsyncCrossingSource Channel C")
|
||||||
|
cover(in.e, "TL_ASYNC_CROSSING_SOURCE_E", "MemorySystem;;TLAsyncCrossingSource Channel E")
|
||||||
} else {
|
} else {
|
||||||
in.b.valid := Bool(false)
|
in.b.valid := Bool(false)
|
||||||
in.c.ready := Bool(true)
|
in.c.ready := Bool(true)
|
||||||
@ -48,11 +54,16 @@ class TLAsyncCrossingSink(depth: Int = 8, sync: Int = 3)(implicit p: Parameters)
|
|||||||
|
|
||||||
out.a <> FromAsyncBundle(in.a, sync)
|
out.a <> FromAsyncBundle(in.a, sync)
|
||||||
in.d <> ToAsyncBundle(out.d, depth, sync)
|
in.d <> ToAsyncBundle(out.d, depth, sync)
|
||||||
|
cover(out.a, "TL_ASYNC_CROSSING_SINK_A", "MemorySystem;;TLAsyncCrossingSink Channel A")
|
||||||
|
cover(out.d, "TL_ASYNC_CROSSING_SINK_D", "MemorySystem;;TLAsyncCrossingSink Channel D")
|
||||||
|
|
||||||
if (bce) {
|
if (bce) {
|
||||||
in.b <> ToAsyncBundle(out.b, depth, sync)
|
in.b <> ToAsyncBundle(out.b, depth, sync)
|
||||||
out.c <> FromAsyncBundle(in.c, sync)
|
out.c <> FromAsyncBundle(in.c, sync)
|
||||||
out.e <> FromAsyncBundle(in.e, sync)
|
out.e <> FromAsyncBundle(in.e, sync)
|
||||||
|
cover(out.b, "TL_ASYNC_CROSSING_SINK_B", "MemorySystem;;TLAsyncCrossingSinkChannel B")
|
||||||
|
cover(out.c, "TL_ASYNC_CROSSING_SINK_C", "MemorySystem;;TLAsyncCrossingSink Channel C")
|
||||||
|
cover(out.e, "TL_ASYNC_CROSSING_SINK_E", "MemorySystem;;TLAsyncCrossingSink Channel E")
|
||||||
} else {
|
} else {
|
||||||
in.b.widx := UInt(0)
|
in.b.widx := UInt(0)
|
||||||
in.c.ridx := UInt(0)
|
in.c.ridx := UInt(0)
|
||||||
|
@ -4,6 +4,7 @@ package freechips.rocketchip.util.property
|
|||||||
|
|
||||||
import Chisel._
|
import Chisel._
|
||||||
import chisel3.internal.sourceinfo.{SourceInfo, SourceLine}
|
import chisel3.internal.sourceinfo.{SourceInfo, SourceLine}
|
||||||
|
import chisel3.util.{ReadyValidIO}
|
||||||
import freechips.rocketchip.config.{Field, Parameters}
|
import freechips.rocketchip.config.{Field, Parameters}
|
||||||
|
|
||||||
case object PropertyLibrary extends Field[BasePropertyLibrary](new DefaultPropertyLibrary)
|
case object PropertyLibrary extends Field[BasePropertyLibrary](new DefaultPropertyLibrary)
|
||||||
@ -54,5 +55,10 @@ object cover {
|
|||||||
def apply(cond: Bool, label: String, message: String)(implicit sourceInfo: SourceInfo, p: Parameters): Unit = {
|
def apply(cond: Bool, label: String, message: String)(implicit sourceInfo: SourceInfo, p: Parameters): Unit = {
|
||||||
p(PropertyLibrary).generateProperty(CoverPropertyParameters(cond, label, message))
|
p(PropertyLibrary).generateProperty(CoverPropertyParameters(cond, label, message))
|
||||||
}
|
}
|
||||||
|
def apply[T <: Data](rv: ReadyValidIO[T], label: String, message: String)(implicit sourceInfo: SourceInfo, p: Parameters): Unit = {
|
||||||
|
apply( rv.valid && rv.ready, label + "_FIRE", message + ": valid and ready")
|
||||||
|
apply( rv.valid && !rv.ready, label + "_STALL", message + ": valid and not ready")
|
||||||
|
apply(!rv.valid && rv.ready, label + "_IDLE", message + ": not valid and ready")
|
||||||
|
apply(!rv.valid && !rv.ready, label + "_FULL", message + ": not valid and not ready")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user