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

Final Reg standardization

Browse Source
This commit is contained in:
Henry Cook 2013-08-15 16:37:58 -07:00
parent 9b70ecf546
commit 784e017bae
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,7 @@ class Uncore(htif_width: Int, tileList: Seq[ClientCoherenceAgent])(implicit conf
htif.io.host.in.bits := hio.io.in_fast.bits htif.io.host.in.bits := hio.io.in_fast.bits
hio.io.in_fast.ready := Mux(hio.io.in_fast.bits(htif_width), Bool(true), htif.io.host.in.ready) hio.io.in_fast.ready := Mux(hio.io.in_fast.bits(htif_width), Bool(true), htif.io.host.in.ready)
io.host.clk := hio.io.clk_slow io.host.clk := hio.io.clk_slow
io.host.clk_edge := RegUpdate(io.host.clk && !RegUpdate(io.host.clk)) io.host.clk_edge := Reg(next=io.host.clk && !Reg(next=io.host.clk))
} }
class TopIO(htifWidth: Int) extends Bundle { class TopIO(htifWidth: Int) extends Bundle {
@ -268,12 +268,12 @@ class Top extends Module {
val tile = tileList(i) val tile = tileList(i)
tile.io.tilelink <> tl tile.io.tilelink <> tl
il := hl.reset il := hl.reset
tile.io.host.reset := RegUpdate(RegUpdate(hl.reset)) tile.io.host.reset := Reg(next=Reg(next=hl.reset))
tile.io.host.pcr_req <> Queue(hl.pcr_req) tile.io.host.pcr_req <> Queue(hl.pcr_req)
hl.pcr_rep <> Queue(tile.io.host.pcr_rep) hl.pcr_rep <> Queue(tile.io.host.pcr_rep)
hl.ipi_req <> Queue(tile.io.host.ipi_req) hl.ipi_req <> Queue(tile.io.host.ipi_req)
tile.io.host.ipi_rep <> Queue(hl.ipi_rep) tile.io.host.ipi_rep <> Queue(hl.ipi_rep)
error_mode = error_mode || RegUpdate(tile.io.host.debug.error_mode) error_mode = error_mode || Reg(next=tile.io.host.debug.error_mode)
} }
io.host <> uncore.io.host io.host <> uncore.io.host

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

@ -113,7 +113,7 @@ class FPGATop extends Module {
tile.io.tilelink <> tl tile.io.tilelink <> tl
il := hl.reset il := hl.reset
tile.io.host.reset := RegUpdate(RegUpdate(hl.reset)) tile.io.host.reset := Reg(next=Reg(next=hl.reset))
tile.io.host.pcr_req <> Queue(hl.pcr_req) tile.io.host.pcr_req <> Queue(hl.pcr_req)
hl.pcr_rep <> Queue(tile.io.host.pcr_rep) hl.pcr_rep <> Queue(tile.io.host.pcr_rep)
hl.ipi_req <> Queue(tile.io.host.ipi_req) hl.ipi_req <> Queue(tile.io.host.ipi_req)
@ -176,8 +176,8 @@ class Slave extends AXISlave
require(dw >= top.io.mem.req_cmd.bits.addr.getWidth + 1 + 1) require(dw >= top.io.mem.req_cmd.bits.addr.getWidth + 1 + 1)
// write cr1 -> mem.resp (nonblocking) // write cr1 -> mem.resp (nonblocking)
val in_count = RegReset(UInt(0, log2Up(memw/dw))) val in_count = Reg(init=UInt(0, log2Up(memw/dw)))
val rf_count = RegReset(UInt(0, log2Up(REFILL_CYCLES))) val rf_count = Reg(init=UInt(0, log2Up(REFILL_CYCLES)))
require(memw % dw == 0 && isPow2(memw/dw)) require(memw % dw == 0 && isPow2(memw/dw))
val in_reg = Reg(top.io.mem.resp.bits.data) val in_reg = Reg(top.io.mem.resp.bits.data)
top.io.mem.resp.bits.data := Cat(io.in.bits, in_reg(in_reg.getWidth-1,dw)) top.io.mem.resp.bits.data := Cat(io.in.bits, in_reg(in_reg.getWidth-1,dw))
@ -194,7 +194,7 @@ class Slave extends AXISlave
} }
// read cr2 -> mem.req_data (blocking) // read cr2 -> mem.req_data (blocking)
val out_count = RegReset(UInt(0, log2Up(memw/dw))) val out_count = Reg(init=UInt(0, log2Up(memw/dw)))
top.io.mem.req_data.ready := ren(2) && out_count.andR top.io.mem.req_data.ready := ren(2) && out_count.andR
rdata(2) := top.io.mem.req_data.bits.data >> (out_count * UInt(dw)) rdata(2) := top.io.mem.req_data.bits.data >> (out_count * UInt(dw))
rvalid(2) := top.io.mem.req_data.valid rvalid(2) := top.io.mem.req_data.valid

2
src/main/scala/network.scala
View File

@ -40,7 +40,7 @@ class TileLinkHeaderAppender[T <: SourcedMessage with HasPhysicalAddress, U <: S
} else { } else {
val meta_has_data = conf.co.messageHasData(meta_q.bits.payload) val meta_has_data = conf.co.messageHasData(meta_q.bits.payload)
val addr_q = Module(new Queue(io.in.meta.bits.payload.addr.clone, 2, pipe = true, flow = true)) val addr_q = Module(new Queue(io.in.meta.bits.payload.addr.clone, 2, pipe = true, flow = true))
val data_cnt = RegReset(UInt(0, width = log2Up(REFILL_CYCLES))) val data_cnt = Reg(init=UInt(0, width = log2Up(REFILL_CYCLES)))
val data_cnt_up = data_cnt + UInt(1) val data_cnt_up = data_cnt + UInt(1)
io.out.meta.bits.payload := meta_q.bits.payload io.out.meta.bits.payload := meta_q.bits.payload