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

New TileLink bundle names

Browse Source
This commit is contained in:
Henry Cook 2013-01-21 17:19:07 -08:00
parent 72bba81a76
commit 5b82d72eb7
4 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
riscv-rocket

@ -1 +1 @@
Subproject commit 2dda8064a3e102e364f337b56eb98bf93a0c67bb Subproject commit 062076bd5826671871c710ad8ef89b2237626600

66
src/main/scala/RocketChip.scala
View File

@ -376,40 +376,40 @@ class Top extends Component {
tile.io.host.ipi_rep <> Queue(hl.ipi_rep) tile.io.host.ipi_rep <> Queue(hl.ipi_rep)
error_mode = error_mode || Reg(tile.io.host.debug.error_mode) error_mode = error_mode || Reg(tile.io.host.debug.error_mode)
val x_init_q = Queue(tile.io.tilelink.xact_init) val x_init_q = Queue(tile.io.tilelink.acquire)
tl.xact_init.valid := x_init_q.valid tl.acquire.valid := x_init_q.valid
tl.xact_init.bits.payload := x_init_q.bits.payload tl.acquire.bits.payload := x_init_q.bits.payload
tl.xact_init.bits.header.src := UFix(i) tl.acquire.bits.header.src := UFix(i)
tl.xact_init.bits.header.dst := UFix(0) tl.acquire.bits.header.dst := UFix(0)
x_init_q.ready := tl.xact_init.ready x_init_q.ready := tl.acquire.ready
val x_init_data_q = Queue(tile.io.tilelink.xact_init_data) val x_init_data_q = Queue(tile.io.tilelink.acquire_data)
tl.xact_init_data.valid := x_init_data_q.valid tl.acquire_data.valid := x_init_data_q.valid
tl.xact_init_data.bits.payload := x_init_data_q.bits.payload tl.acquire_data.bits.payload := x_init_data_q.bits.payload
tl.xact_init_data.bits.header.src := UFix(i) tl.acquire_data.bits.header.src := UFix(i)
tl.xact_init_data.bits.header.dst := UFix(0) tl.acquire_data.bits.header.dst := UFix(0)
x_init_data_q.ready := tl.xact_init_data.ready x_init_data_q.ready := tl.acquire_data.ready
val x_finish_q = Queue(tile.io.tilelink.xact_finish) val x_finish_q = Queue(tile.io.tilelink.grant_ack)
tl.xact_finish.valid := x_finish_q.valid tl.grant_ack.valid := x_finish_q.valid
tl.xact_finish.bits.payload := x_finish_q.bits.payload tl.grant_ack.bits.payload := x_finish_q.bits.payload
tl.xact_finish.bits.header.src := UFix(i) tl.grant_ack.bits.header.src := UFix(i)
tl.xact_finish.bits.header.dst := UFix(0) tl.grant_ack.bits.header.dst := UFix(0)
x_finish_q.ready := tl.xact_finish.ready x_finish_q.ready := tl.grant_ack.ready
val p_rep_q = Queue(tile.io.tilelink.probe_rep, 1) val p_rep_q = Queue(tile.io.tilelink.release, 1)
tl.probe_rep.valid := p_rep_q.valid tl.release.valid := p_rep_q.valid
tl.probe_rep.bits.payload := p_rep_q.bits.payload tl.release.bits.payload := p_rep_q.bits.payload
tl.probe_rep.bits.header.src := UFix(i) tl.release.bits.header.src := UFix(i)
tl.probe_rep.bits.header.dst := UFix(0) tl.release.bits.header.dst := UFix(0)
p_rep_q.ready := tl.probe_rep.ready p_rep_q.ready := tl.release.ready
val p_rep_data_q = Queue(tile.io.tilelink.probe_rep_data) val p_rep_data_q = Queue(tile.io.tilelink.release_data)
tl.probe_rep_data.valid := p_rep_data_q.valid tl.release_data.valid := p_rep_data_q.valid
tl.probe_rep_data.bits.payload := p_rep_data_q.bits.payload tl.release_data.bits.payload := p_rep_data_q.bits.payload
tl.probe_rep_data.bits.header.src := UFix(i) tl.release_data.bits.header.src := UFix(i)
tl.probe_rep_data.bits.header.dst := UFix(0) tl.release_data.bits.header.dst := UFix(0)
p_rep_data_q.ready := tl.probe_rep_data.ready p_rep_data_q.ready := tl.release_data.ready
tile.io.tilelink.xact_abort <> Queue(tl.xact_abort) tile.io.tilelink.abort <> Queue(tl.abort)
tile.io.tilelink.xact_rep <> Queue(tl.xact_rep, 1, pipe = true) tile.io.tilelink.grant <> Queue(tl.grant, 1, pipe = true)
tile.io.tilelink.probe_req <> Queue(tl.probe_req) tile.io.tilelink.probe <> Queue(tl.probe)
il := hl.reset il := hl.reset
} }

16
src/main/scala/fpga.scala
View File

@ -66,14 +66,14 @@ class FPGATop extends Component {
when (tile.io.host.debug.error_mode) { io.debug.error_mode := Bool(true) } when (tile.io.host.debug.error_mode) { io.debug.error_mode := Bool(true) }
il := hl.reset il := hl.reset
tl.xact_init <> Queue(tile.io.tilelink.xact_init) tl.acquire <> Queue(tile.io.tilelink.acquire)
tl.xact_init_data <> Queue(tile.io.tilelink.xact_init_data) tl.acquire_data <> Queue(tile.io.tilelink.acquire_data)
tile.io.tilelink.xact_abort <> Queue(tl.xact_abort) tile.io.tilelink.abort <> Queue(tl.abort)
tile.io.tilelink.xact_rep <> Queue(tl.xact_rep) tile.io.tilelink.grant <> Queue(tl.grant)
tl.xact_finish <> Queue(tile.io.tilelink.xact_finish) tl.grant_ack <> Queue(tile.io.tilelink.grant_ack)
tile.io.tilelink.probe_req <> Queue(tl.probe_req) tile.io.tilelink.probe <> Queue(tl.probe)
tl.probe_rep <> Queue(tile.io.tilelink.probe_rep) tl.release <> Queue(tile.io.tilelink.release)
tl.probe_rep_data <> Queue(tile.io.tilelink.probe_rep_data) tl.release_data <> Queue(tile.io.tilelink.release_data)
//TODO: Set logcal network headers here //TODO: Set logcal network headers here
} }

2
uncore

@ -1 +1 @@
Subproject commit 473588578595beb849bcfed6d89c4e3ac9f08b06 Subproject commit 7270cf1702656098ffd217d28dac80ddc8c57a60