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

AsyncQueue: disambiguiate the reset_n signal names

Browse Source
This commit is contained in:
Wesley W. Terpstra 2016-10-08 11:22:12 -07:00
parent 5ee53c61d6
commit ffb734ac0e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/scala/util/AsyncQueue.scala
View File

@ -41,10 +41,10 @@ class AsyncQueueSource[T <: Data](gen: T, depth: Int, sync: Int) extends Module
// extend the sink reset to a full cycle (assertion latency <= 1 cycle) // extend the sink reset to a full cycle (assertion latency <= 1 cycle)
val catch_reset_n = AsyncResetReg(Bool(true), clock, !io.sink_reset_n) val catch_reset_n = AsyncResetReg(Bool(true), clock, !io.sink_reset_n)
// reset_n has a 1 cycle shorter path to ready than ridx does // reset_n has a 1 cycle shorter path to ready than ridx does
val reset_n = AsyncGrayCounter(catch_reset_n.asUInt, sync)(0) val sink_reset_n = AsyncGrayCounter(catch_reset_n.asUInt, sync)(0)
val mem = Reg(Vec(depth, gen)) //This does NOT need to be asynchronously reset. val mem = Reg(Vec(depth, gen)) //This does NOT need to be asynchronously reset.
val widx = GrayCounter(bits+1, io.enq.fire(), !reset_n) val widx = GrayCounter(bits+1, io.enq.fire(), !sink_reset_n)
val ridx = AsyncGrayCounter(io.ridx, sync) val ridx = AsyncGrayCounter(io.ridx, sync)
val ready = widx =/= (ridx ^ UInt(depth | depth >> 1)) val ready = widx =/= (ridx ^ UInt(depth | depth >> 1))
@ -52,7 +52,7 @@ class AsyncQueueSource[T <: Data](gen: T, depth: Int, sync: Int) extends Module
when (io.enq.fire()) { mem(index) := io.enq.bits } when (io.enq.fire()) { mem(index) := io.enq.bits }
val ready_reg = AsyncResetReg(ready.asUInt)(0) val ready_reg = AsyncResetReg(ready.asUInt)(0)
io.enq.ready := ready_reg && reset_n io.enq.ready := ready_reg && sink_reset_n
val widx_reg = AsyncResetReg(widx) val widx_reg = AsyncResetReg(widx)
io.widx := widx_reg io.widx := widx_reg
@ -60,7 +60,7 @@ class AsyncQueueSource[T <: Data](gen: T, depth: Int, sync: Int) extends Module
io.mem := mem io.mem := mem
// It is a fatal error to reset half a Queue while it still has data // It is a fatal error to reset half a Queue while it still has data
assert (reset_n || widx === ridx) assert (sink_reset_n || widx === ridx)
} }
class AsyncQueueSink[T <: Data](gen: T, depth: Int, sync: Int) extends Module { class AsyncQueueSink[T <: Data](gen: T, depth: Int, sync: Int) extends Module {
@ -79,9 +79,9 @@ class AsyncQueueSink[T <: Data](gen: T, depth: Int, sync: Int) extends Module {
// extend the source reset to a full cycle (assertion latency <= 1 cycle) // extend the source reset to a full cycle (assertion latency <= 1 cycle)
val catch_reset_n = AsyncResetReg(Bool(true), clock, !io.source_reset_n) val catch_reset_n = AsyncResetReg(Bool(true), clock, !io.source_reset_n)
// reset_n has a 1 cycle shorter path to valid than widx does // reset_n has a 1 cycle shorter path to valid than widx does
val reset_n = AsyncGrayCounter(catch_reset_n.asUInt, sync)(0) val source_reset_n = AsyncGrayCounter(catch_reset_n.asUInt, sync)(0)
val ridx = GrayCounter(bits+1, io.deq.fire(), !reset_n) val ridx = GrayCounter(bits+1, io.deq.fire(), !source_reset_n)
val widx = AsyncGrayCounter(io.widx, sync) val widx = AsyncGrayCounter(io.widx, sync)
val valid = ridx =/= widx val valid = ridx =/= widx
@ -97,13 +97,13 @@ class AsyncQueueSink[T <: Data](gen: T, depth: Int, sync: Int) extends Module {
io.deq.bits := RegEnable(io.mem(index), valid) io.deq.bits := RegEnable(io.mem(index), valid)
val valid_reg = AsyncResetReg(valid.asUInt)(0) val valid_reg = AsyncResetReg(valid.asUInt)(0)
io.deq.valid := valid_reg && reset_n io.deq.valid := valid_reg && source_reset_n
val ridx_reg = AsyncResetReg(ridx) val ridx_reg = AsyncResetReg(ridx)
io.ridx := ridx_reg io.ridx := ridx_reg
// It is a fatal error to reset half a Queue while it still has data // It is a fatal error to reset half a Queue while it still has data
assert (reset_n || widx === ridx) assert (source_reset_n || widx === ridx)
} }
class AsyncQueue[T <: Data](gen: T, depth: Int = 8, sync: Int = 3) extends Crossing[T] { class AsyncQueue[T <: Data](gen: T, depth: Int = 8, sync: Int = 3) extends Crossing[T] {