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

Added initial brainstorm for parameter hierarchical flattening, does not compile ;)

Browse Source
This commit is contained in:
Adam Izraelevitz 2014-08-04 14:06:52 -07:00 committed by Henry Cook
parent 812353bace
commit 4e6d69892d
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rocket/src/main/scala/core.scala
View File

@ -9,7 +9,7 @@ case object HasFPU extends Field[Boolean]
class RocketIO(implicit conf: RocketConfiguration) extends Bundle class RocketIO(implicit conf: RocketConfiguration) extends Bundle
{ {
val host = new HTIFIO(conf.tl.ln.nClients) val host = new HTIFIO(params[Int]("nClients"))
val imem = new CPUFrontendIO()(conf.icache) val imem = new CPUFrontendIO()(conf.icache)
val dmem = new HellaCacheIO()(conf.dcache) val dmem = new HellaCacheIO()(conf.dcache)
val ptw = new DatapathPTWIO()(conf.as).flip val ptw = new DatapathPTWIO()(conf.as).flip
@ -18,7 +18,20 @@ class RocketIO(implicit conf: RocketConfiguration) extends Bundle
class Core(implicit conf: RocketConfiguration) extends Module class Core(implicit conf: RocketConfiguration) extends Module
{ {
//xprlen
//hasfpu
//hasrocc
//fastloadword
//fastloadbyte
//as <- unfolded
//fpuparams
val io = new RocketIO val io = new RocketIO
//nClients
//icache
//dcache
val ctrl = Module(new Control) val ctrl = Module(new Control)
val dpath = Module(new Datapath) val dpath = Module(new Datapath)

12
rocket/src/main/scala/ctrl.scala
View File

@ -43,7 +43,7 @@ class CtrlDpathIO(implicit conf: RocketConfiguration) extends Bundle
// exception handling // exception handling
val retire = Bool(OUTPUT) val retire = Bool(OUTPUT)
val exception = Bool(OUTPUT) val exception = Bool(OUTPUT)
val cause = UInt(OUTPUT, conf.xprlen) val cause = UInt(OUTPUT, params[Int]("xprlen"))
val badvaddr_wen = Bool(OUTPUT) // high for a load/store access fault val badvaddr_wen = Bool(OUTPUT) // high for a load/store access fault
// inputs from datapath // inputs from datapath
val inst = Bits(INPUT, 32) val inst = Bits(INPUT, 32)
@ -316,8 +316,8 @@ class Control(implicit conf: RocketConfiguration) extends Module
} }
var decode_table = XDecode.table var decode_table = XDecode.table
if (!params(HasFPU)) decode_table ++= FDecode.table if (params(HasFPU)) decode_table ++= FDecode.table
if (!conf.rocc.isEmpty) decode_table ++= RoCCDecode.table if (params[Boolean]("HasRoCC")) decode_table ++= RoCCDecode.table
val cs = DecodeLogic(io.dpath.inst, XDecode.decode_default, decode_table) val cs = DecodeLogic(io.dpath.inst, XDecode.decode_default, decode_table)
@ -401,7 +401,7 @@ class Control(implicit conf: RocketConfiguration) extends Module
val id_reg_fence = Reg(init=Bool(false)) val id_reg_fence = Reg(init=Bool(false))
val sr = io.dpath.status val sr = io.dpath.status
var id_interrupts = (0 until sr.ip.getWidth).map(i => (sr.im(i) && sr.ip(i), UInt(BigInt(1) << (conf.xprlen-1) | i))) var id_interrupts = (0 until sr.ip.getWidth).map(i => (sr.im(i) && sr.ip(i), UInt(BigInt(1) << (params[Int]("xprlen")-1) | i)))
val (id_interrupt_unmasked, id_interrupt_cause) = checkExceptions(id_interrupts) val (id_interrupt_unmasked, id_interrupt_cause) = checkExceptions(id_interrupts)
val id_interrupt = io.dpath.status.ei && id_interrupt_unmasked val id_interrupt = io.dpath.status.ei && id_interrupt_unmasked
@ -437,7 +437,7 @@ class Control(implicit conf: RocketConfiguration) extends Module
val id_amo_rl = io.dpath.inst(25) val id_amo_rl = io.dpath.inst(25)
val id_fence_next = id_fence || id_amo && id_amo_rl val id_fence_next = id_fence || id_amo && id_amo_rl
val id_mem_busy = !io.dmem.ordered || ex_reg_mem_val val id_mem_busy = !io.dmem.ordered || ex_reg_mem_val
val id_rocc_busy = Bool(!conf.rocc.isEmpty) && val id_rocc_busy = Bool(params[Boolean]("HasRoCC")) &&
(io.rocc.busy || ex_reg_rocc_val || mem_reg_rocc_val || wb_reg_rocc_val) (io.rocc.busy || ex_reg_rocc_val || mem_reg_rocc_val || wb_reg_rocc_val)
id_reg_fence := id_fence_next || id_reg_fence && id_mem_busy id_reg_fence := id_fence_next || id_reg_fence && id_mem_busy
val id_do_fence = id_rocc_busy && id_fence || val id_do_fence = id_rocc_busy && id_fence ||
@ -690,7 +690,7 @@ class Control(implicit conf: RocketConfiguration) extends Module
// stall for RAW/WAW hazards on PCRs, LB/LH, and mul/div in memory stage. // stall for RAW/WAW hazards on PCRs, LB/LH, and mul/div in memory stage.
val mem_mem_cmd_bh = val mem_mem_cmd_bh =
if (conf.fastLoadWord) Bool(!conf.fastLoadByte) && mem_reg_slow_bypass if (params[Boolean]("fastLoadWord")) Bool(!params[Boolean]("fastLoadByte")) && mem_reg_slow_bypass
else Bool(true) else Bool(true)
val data_hazard_mem = mem_reg_wen && val data_hazard_mem = mem_reg_wen &&
(id_renx1_not0 && id_raddr1 === io.dpath.mem_waddr || (id_renx1_not0 && id_raddr1 === io.dpath.mem_waddr ||