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

RocketChip: rename mem to mem_axi in preparation for new bus type

Browse Source
This commit is contained in:
Wesley W. Terpstra 2016-06-01 15:33:24 -07:00 committed by Andrew Waterman
parent 2086c0d603
commit d2b505f2d2
2 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ class BasicTopIO(implicit val p: Parameters) extends ParameterizedBundle()(p)
} }
class TopIO(implicit p: Parameters) extends BasicTopIO()(p) { class TopIO(implicit p: Parameters) extends BasicTopIO()(p) {
val mem = Vec(nMemChannels, new NastiIO) val mem_axi = Vec(nMemChannels, new NastiIO)
val interrupts = Vec(p(NExtInterrupts), Bool()).asInput val interrupts = Vec(p(NExtInterrupts), Bool()).asInput
val mmio_axi = Vec(p(NExtMMIOAXIChannels), new NastiIO) val mmio_axi = Vec(p(NExtMMIOAXIChannels), new NastiIO)
val mmio_ahb = Vec(p(NExtMMIOAHBChannels), new HastiMasterIO) val mmio_ahb = Vec(p(NExtMMIOAHBChannels), new HastiMasterIO)
@ -157,7 +157,7 @@ class Top(topParams: Parameters) extends Module with HasTopLevelParameters {
io.mmio_axi <> uncore.io.mmio_axi io.mmio_axi <> uncore.io.mmio_axi
io.mmio_ahb <> uncore.io.mmio_ahb io.mmio_ahb <> uncore.io.mmio_ahb
io.mem <> uncore.io.mem io.mem_axi <> uncore.io.mem_axi
} }
/** Wrapper around everything that isn't a Tile. /** Wrapper around everything that isn't a Tile.
@ -169,7 +169,7 @@ class Uncore(implicit val p: Parameters) extends Module
with HasTopLevelParameters { with HasTopLevelParameters {
val io = new Bundle { val io = new Bundle {
val host = new HostIO(htifW) val host = new HostIO(htifW)
val mem = Vec(nMemChannels, new NastiIO) val mem_axi = Vec(nMemChannels, new NastiIO)
val tiles_cached = Vec(nCachedTilePorts, new ClientTileLinkIO).flip val tiles_cached = Vec(nCachedTilePorts, new ClientTileLinkIO).flip
val tiles_uncached = Vec(nUncachedTilePorts, new ClientUncachedTileLinkIO).flip val tiles_uncached = Vec(nUncachedTilePorts, new ClientUncachedTileLinkIO).flip
val prci = Vec(nTiles, new PRCITileIO).asOutput val prci = Vec(nTiles, new PRCITileIO).asOutput
@ -193,7 +193,7 @@ class Uncore(implicit val p: Parameters) extends Module
buildMMIONetwork(p.alterPartial({case TLId => "MMIO_Outermost"})) buildMMIONetwork(p.alterPartial({case TLId => "MMIO_Outermost"}))
// Wire the htif to the memory port(s) and host interface // Wire the htif to the memory port(s) and host interface
io.mem <> outmemsys.io.mem io.mem_axi <> outmemsys.io.mem_axi
if(p(UseHtifClockDiv)) { if(p(UseHtifClockDiv)) {
VLSIUtils.padOutHTIFWithDividedClock(htif.io.host, scrFile.io.scr, io.host, htifW) VLSIUtils.padOutHTIFWithDividedClock(htif.io.host, scrFile.io.scr, io.host, htifW)
} else { } else {
@ -270,7 +270,7 @@ class OuterMemorySystem(implicit val p: Parameters) extends Module with HasTopLe
val tiles_uncached = Vec(nUncachedTilePorts, new ClientUncachedTileLinkIO).flip val tiles_uncached = Vec(nUncachedTilePorts, new ClientUncachedTileLinkIO).flip
val htif_uncached = (new ClientUncachedTileLinkIO).flip val htif_uncached = (new ClientUncachedTileLinkIO).flip
val incoherent = Vec(nTiles, Bool()).asInput val incoherent = Vec(nTiles, Bool()).asInput
val mem = Vec(nMemChannels, new NastiIO) val mem_axi = Vec(nMemChannels, new NastiIO)
val mmio = new ClientUncachedTileLinkIO()(p.alterPartial({case TLId => "L2toMMIO"})) val mmio = new ClientUncachedTileLinkIO()(p.alterPartial({case TLId => "L2toMMIO"}))
} }
@ -325,7 +325,7 @@ class OuterMemorySystem(implicit val p: Parameters) extends Module with HasTopLe
TileLinkWidthAdapter(unwrap.io.out, icPort) TileLinkWidthAdapter(unwrap.io.out, icPort)
} }
for ((nasti, tl) <- io.mem zip mem_ic.io.out) { for ((nasti, tl) <- io.mem_axi zip mem_ic.io.out) {
TopUtils.connectTilelinkNasti(nasti, tl)(outermostTLParams) TopUtils.connectTilelinkNasti(nasti, tl)(outermostTLParams)
// Memory cache type should be normal non-cacheable bufferable // Memory cache type should be normal non-cacheable bufferable
// TODO why is this happening here? Would 0000 (device) be OK instead? // TODO why is this happening here? Would 0000 (device) be OK instead?

144
src/main/scala/TestBench.scala
View File

@ -151,55 +151,55 @@ object TestBenchGeneration extends FileSystemUtilities {
""" } mkString """ } mkString
val nasti_connections = (0 until nMemChannel) map { i => s""" val nasti_connections = (0 until nMemChannel) map { i => s"""
.io_mem_${i}_ar_valid (ar_valid_delay_$i), .io_mem_axi_${i}_ar_valid (ar_valid_delay_$i),
.io_mem_${i}_ar_ready (ar_ready_delay_$i), .io_mem_axi_${i}_ar_ready (ar_ready_delay_$i),
.io_mem_${i}_ar_bits_addr (ar_addr_delay_$i), .io_mem_axi_${i}_ar_bits_addr (ar_addr_delay_$i),
.io_mem_${i}_ar_bits_id (ar_id_delay_$i), .io_mem_axi_${i}_ar_bits_id (ar_id_delay_$i),
.io_mem_${i}_ar_bits_size (ar_size_delay_$i), .io_mem_axi_${i}_ar_bits_size (ar_size_delay_$i),
.io_mem_${i}_ar_bits_len (ar_len_delay_$i), .io_mem_axi_${i}_ar_bits_len (ar_len_delay_$i),
.io_mem_${i}_ar_bits_burst (), .io_mem_axi_${i}_ar_bits_burst (),
.io_mem_${i}_ar_bits_lock (), .io_mem_axi_${i}_ar_bits_lock (),
.io_mem_${i}_ar_bits_cache (), .io_mem_axi_${i}_ar_bits_cache (),
.io_mem_${i}_ar_bits_prot (), .io_mem_axi_${i}_ar_bits_prot (),
.io_mem_${i}_ar_bits_qos (), .io_mem_axi_${i}_ar_bits_qos (),
.io_mem_${i}_ar_bits_region (), .io_mem_axi_${i}_ar_bits_region (),
.io_mem_${i}_ar_bits_user (), .io_mem_axi_${i}_ar_bits_user (),
.io_mem_${i}_aw_valid (aw_valid_delay_$i), .io_mem_axi_${i}_aw_valid (aw_valid_delay_$i),
.io_mem_${i}_aw_ready (aw_ready_delay_$i), .io_mem_axi_${i}_aw_ready (aw_ready_delay_$i),
.io_mem_${i}_aw_bits_addr (aw_addr_delay_$i), .io_mem_axi_${i}_aw_bits_addr (aw_addr_delay_$i),
.io_mem_${i}_aw_bits_id (aw_id_delay_$i), .io_mem_axi_${i}_aw_bits_id (aw_id_delay_$i),
.io_mem_${i}_aw_bits_size (aw_size_delay_$i), .io_mem_axi_${i}_aw_bits_size (aw_size_delay_$i),
.io_mem_${i}_aw_bits_len (aw_len_delay_$i), .io_mem_axi_${i}_aw_bits_len (aw_len_delay_$i),
.io_mem_${i}_aw_bits_burst (), .io_mem_axi_${i}_aw_bits_burst (),
.io_mem_${i}_aw_bits_lock (), .io_mem_axi_${i}_aw_bits_lock (),
.io_mem_${i}_aw_bits_cache (), .io_mem_axi_${i}_aw_bits_cache (),
.io_mem_${i}_aw_bits_prot (), .io_mem_axi_${i}_aw_bits_prot (),
.io_mem_${i}_aw_bits_qos (), .io_mem_axi_${i}_aw_bits_qos (),
.io_mem_${i}_aw_bits_region (), .io_mem_axi_${i}_aw_bits_region (),
.io_mem_${i}_aw_bits_user (), .io_mem_axi_${i}_aw_bits_user (),
.io_mem_${i}_w_valid (w_valid_delay_$i), .io_mem_axi_${i}_w_valid (w_valid_delay_$i),
.io_mem_${i}_w_ready (w_ready_delay_$i), .io_mem_axi_${i}_w_ready (w_ready_delay_$i),
.io_mem_${i}_w_bits_id (), .io_mem_axi_${i}_w_bits_id (),
.io_mem_${i}_w_bits_strb (w_strb_delay_$i), .io_mem_axi_${i}_w_bits_strb (w_strb_delay_$i),
.io_mem_${i}_w_bits_data (w_data_delay_$i), .io_mem_axi_${i}_w_bits_data (w_data_delay_$i),
.io_mem_${i}_w_bits_last (w_last_delay_$i), .io_mem_axi_${i}_w_bits_last (w_last_delay_$i),
.io_mem_${i}_w_bits_user (), .io_mem_axi_${i}_w_bits_user (),
.io_mem_${i}_r_valid (r_valid_delay_$i), .io_mem_axi_${i}_r_valid (r_valid_delay_$i),
.io_mem_${i}_r_ready (r_ready_delay_$i), .io_mem_axi_${i}_r_ready (r_ready_delay_$i),
.io_mem_${i}_r_bits_resp (r_resp_delay_$i), .io_mem_axi_${i}_r_bits_resp (r_resp_delay_$i),
.io_mem_${i}_r_bits_id (r_id_delay_$i), .io_mem_axi_${i}_r_bits_id (r_id_delay_$i),
.io_mem_${i}_r_bits_data (r_data_delay_$i), .io_mem_axi_${i}_r_bits_data (r_data_delay_$i),
.io_mem_${i}_r_bits_last (r_last_delay_$i), .io_mem_axi_${i}_r_bits_last (r_last_delay_$i),
.io_mem_${i}_r_bits_user (1'b0), .io_mem_axi_${i}_r_bits_user (1'b0),
.io_mem_${i}_b_valid (b_valid_delay_$i), .io_mem_axi_${i}_b_valid (b_valid_delay_$i),
.io_mem_${i}_b_ready (b_ready_delay_$i), .io_mem_axi_${i}_b_ready (b_ready_delay_$i),
.io_mem_${i}_b_bits_resp (b_resp_delay_$i), .io_mem_axi_${i}_b_bits_resp (b_resp_delay_$i),
.io_mem_${i}_b_bits_id (b_id_delay_$i), .io_mem_axi_${i}_b_bits_id (b_id_delay_$i),
.io_mem_${i}_b_bits_user (1'b0), .io_mem_axi_${i}_b_bits_user (1'b0),
""" } mkString """ } mkString
@ -323,37 +323,37 @@ object TestBenchGeneration extends FileSystemUtilities {
val nMemChannel = p(NMemoryChannels) val nMemChannel = p(NMemoryChannels)
val assigns = (0 until nMemChannel).map { i => s""" val assigns = (0 until nMemChannel).map { i => s"""
mem_ar_valid[$i] = &tile.Top__io_mem_${i}_ar_valid; mem_ar_valid[$i] = &tile.Top__io_mem_axi_${i}_ar_valid;
mem_ar_ready[$i] = &tile.Top__io_mem_${i}_ar_ready; mem_ar_ready[$i] = &tile.Top__io_mem_axi_${i}_ar_ready;
mem_ar_bits_addr[$i] = &tile.Top__io_mem_${i}_ar_bits_addr; mem_ar_bits_addr[$i] = &tile.Top__io_mem_axi_${i}_ar_bits_addr;
mem_ar_bits_id[$i] = &tile.Top__io_mem_${i}_ar_bits_id; mem_ar_bits_id[$i] = &tile.Top__io_mem_axi_${i}_ar_bits_id;
mem_ar_bits_size[$i] = &tile.Top__io_mem_${i}_ar_bits_size; mem_ar_bits_size[$i] = &tile.Top__io_mem_axi_${i}_ar_bits_size;
mem_ar_bits_len[$i] = &tile.Top__io_mem_${i}_ar_bits_len; mem_ar_bits_len[$i] = &tile.Top__io_mem_axi_${i}_ar_bits_len;
mem_aw_valid[$i] = &tile.Top__io_mem_${i}_aw_valid; mem_aw_valid[$i] = &tile.Top__io_mem_axi_${i}_aw_valid;
mem_aw_ready[$i] = &tile.Top__io_mem_${i}_aw_ready; mem_aw_ready[$i] = &tile.Top__io_mem_axi_${i}_aw_ready;
mem_aw_bits_addr[$i] = &tile.Top__io_mem_${i}_aw_bits_addr; mem_aw_bits_addr[$i] = &tile.Top__io_mem_axi_${i}_aw_bits_addr;
mem_aw_bits_id[$i] = &tile.Top__io_mem_${i}_aw_bits_id; mem_aw_bits_id[$i] = &tile.Top__io_mem_axi_${i}_aw_bits_id;
mem_aw_bits_size[$i] = &tile.Top__io_mem_${i}_aw_bits_size; mem_aw_bits_size[$i] = &tile.Top__io_mem_axi_${i}_aw_bits_size;
mem_aw_bits_len[$i] = &tile.Top__io_mem_${i}_aw_bits_len; mem_aw_bits_len[$i] = &tile.Top__io_mem_axi_${i}_aw_bits_len;
mem_w_valid[$i] = &tile.Top__io_mem_${i}_w_valid; mem_w_valid[$i] = &tile.Top__io_mem_axi_${i}_w_valid;
mem_w_ready[$i] = &tile.Top__io_mem_${i}_w_ready; mem_w_ready[$i] = &tile.Top__io_mem_axi_${i}_w_ready;
mem_w_bits_data[$i] = &tile.Top__io_mem_${i}_w_bits_data; mem_w_bits_data[$i] = &tile.Top__io_mem_axi_${i}_w_bits_data;
mem_w_bits_strb[$i] = &tile.Top__io_mem_${i}_w_bits_strb; mem_w_bits_strb[$i] = &tile.Top__io_mem_axi_${i}_w_bits_strb;
mem_w_bits_last[$i] = &tile.Top__io_mem_${i}_w_bits_last; mem_w_bits_last[$i] = &tile.Top__io_mem_axi_${i}_w_bits_last;
mem_b_valid[$i] = &tile.Top__io_mem_${i}_b_valid; mem_b_valid[$i] = &tile.Top__io_mem_axi_${i}_b_valid;
mem_b_ready[$i] = &tile.Top__io_mem_${i}_b_ready; mem_b_ready[$i] = &tile.Top__io_mem_axi_${i}_b_ready;
mem_b_bits_resp[$i] = &tile.Top__io_mem_${i}_b_bits_resp; mem_b_bits_resp[$i] = &tile.Top__io_mem_axi_${i}_b_bits_resp;
mem_b_bits_id[$i] = &tile.Top__io_mem_${i}_b_bits_id; mem_b_bits_id[$i] = &tile.Top__io_mem_axi_${i}_b_bits_id;
mem_r_valid[$i] = &tile.Top__io_mem_${i}_r_valid; mem_r_valid[$i] = &tile.Top__io_mem_axi_${i}_r_valid;
mem_r_ready[$i] = &tile.Top__io_mem_${i}_r_ready; mem_r_ready[$i] = &tile.Top__io_mem_axi_${i}_r_ready;
mem_r_bits_resp[$i] = &tile.Top__io_mem_${i}_r_bits_resp; mem_r_bits_resp[$i] = &tile.Top__io_mem_axi_${i}_r_bits_resp;
mem_r_bits_id[$i] = &tile.Top__io_mem_${i}_r_bits_id; mem_r_bits_id[$i] = &tile.Top__io_mem_axi_${i}_r_bits_id;
mem_r_bits_data[$i] = &tile.Top__io_mem_${i}_r_bits_data; mem_r_bits_data[$i] = &tile.Top__io_mem_axi_${i}_r_bits_data;
mem_r_bits_last[$i] = &tile.Top__io_mem_${i}_r_bits_last; mem_r_bits_last[$i] = &tile.Top__io_mem_axi_${i}_r_bits_last;
""" }.mkString """ }.mkString