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

fix comparator PutBlock data generation and debug output

Browse Source
This commit is contained in:
Howard Mao 2016-07-11 12:15:37 -07:00
parent 5a3d6a1583
commit e194677087
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
groundtest/src/main/scala/comparator.scala
View File

@ -189,6 +189,10 @@ class ComparatorSource(implicit val p: Parameters) extends Module
is (UInt("b110")) { is (UInt("b110")) {
printf("[acq %d]: PutPrefetch(addr_block = %x)\n", idx, addr_block) printf("[acq %d]: PutPrefetch(addr_block = %x)\n", idx, addr_block)
} }
is (UInt("b111")) {
printf("[acq %d]: Get(addr_block = %x, addr_beat = %x, addr_byte = %x, op_size = %x)\n",
idx, addr_block, addr_beat, get_addr_byte, get_operand_size)
}
} }
} }
idx := idx + UInt(1) idx := idx + UInt(1)
@ -241,8 +245,9 @@ class ComparatorClient(val target: Long)(implicit val p: Parameters) extends Mod
io.tl.acquire.bits.addr_block := buffer.bits.addr_block + offset io.tl.acquire.bits.addr_block := buffer.bits.addr_block + offset
io.tl.acquire.bits.client_xact_id := xact_id io.tl.acquire.bits.client_xact_id := xact_id
when (isMultiOut) { when (isMultiOut) {
val multiplier = beatOut + UInt(1, tlBeatAddrBits + 1)
io.tl.acquire.bits.addr_beat := beatOut io.tl.acquire.bits.addr_beat := beatOut
io.tl.acquire.bits.data := buffer.bits.data * (beatOut + UInt(1)) // mix the data up a bit io.tl.acquire.bits.data := buffer.bits.data * multiplier // mix the data up a bit
} }
when (io.tl.acquire.fire()) { when (io.tl.acquire.fire()) {
@ -281,7 +286,7 @@ class ComparatorClient(val target: Long)(implicit val p: Parameters) extends Mod
io.finished := !buffer.valid && !issued.reduce(_ || _) io.finished := !buffer.valid && !issued.reduce(_ || _)
val (idx, acq_done) = Counter( val (idx, acq_done) = Counter(
io.tl.acquire.fire() && io.tl.acquire.bits.first(), nOperations) io.tl.acquire.fire() && io.tl.acquire.bits.last(), nOperations)
debug(idx) debug(idx)
val timer = Module(new Timer(8192, xacts)) val timer = Module(new Timer(8192, xacts))