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

make sure MixedAllocPutRegression uses a block that hasn't been cached already

Browse Source
This commit is contained in:
Howard Mao
2016-06-13 18:17:48 -07:00
parent fe8d81958f
commit 3e105eb352
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
groundtest/src/main/scala/regression.scala
View File

@@ -181,21 +181,23 @@ class MixedAllocPutRegression(implicit p: Parameters) extends Regression()(p) {
val put_beat = Vec(UInt(0), UInt(0), UInt(2))
val (put_acq_id, put_acq_done) = Counter(
state === s_put_send && io.mem.acquire.ready, 3)
state === s_put_send && io.mem.acquire.ready, put_data.size)
val (put_gnt_cnt, put_gnt_done) = Counter(
state === s_put_wait && io.mem.grant.valid, 3)
state === s_put_wait && io.mem.grant.valid, put_data.size)
val get_data = Vec(UInt("h2222222211111111"), UInt("h3333333333333333"))
val get_beat = Vec(UInt(0), UInt(2))
val (get_acq_id, get_acq_done) = Counter(
state === s_get_send && io.mem.acquire.ready, 2)
state === s_get_send && io.mem.acquire.ready, get_data.size)
val (get_gnt_cnt, get_gnt_done) = Counter(
state === s_get_wait && io.mem.grant.valid, 2)
state === s_get_wait && io.mem.grant.valid, get_data.size)
val blockAddr = memStartBlock + 15
val put_acquire = Put(
client_xact_id = put_acq_id,
addr_block = UInt(memStartBlock),
addr_block = UInt(blockAddr),
addr_beat = put_beat(put_acq_id),
data = put_data(put_acq_id),
wmask = put_wmask(put_acq_id),
@@ -203,7 +205,7 @@ class MixedAllocPutRegression(implicit p: Parameters) extends Regression()(p) {
val get_acquire = Get(
client_xact_id = get_acq_id,
addr_block = UInt(memStartBlock),
addr_block = UInt(blockAddr),
addr_beat = get_beat(get_acq_id))
io.mem.acquire.valid := (state === s_put_send) || (state === s_get_send)