Add new junctions repo as submodule (contains externally facing buses and peripherals).

Bump all submodules.

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "zscale"]
 	path = zscale
 	url = https://github.com/ucb-bar/zscale
+[submodule "junctions"]
+	path = junctions
+	url = https://github.com/ucb-bar/junctions

Makefrag

@@ -14,7 +14,8 @@ SHELL := /bin/bash
 CHISEL_ARGS := $(MODEL) --W0W --backend $(BACKEND) --configInstance $(PROJECT).$(CONFIG) --compileInitializationUnoptimized --targetDir $(generated_dir)
 
 src_path = src/main/scala
-chisel_srcs = $(base_dir)/$(src_path)/*.scala $(base_dir)/rocket/$(src_path)/*.scala $(base_dir)/uncore/$(src_path)/*.scala $(base_dir)/zscale/$(src_path)/*.scala $(SRC_EXTENSION)
+default_submodules = . junctions uncore hardfloat rocket zscale
+chisel_srcs = $(addprefix $(base_dir)/,$(addsuffix /$(src_path)/*.scala,$(default_submodules)))
 
 disasm := 2>
 which_disasm := $(shell which spike-dasm)

project/build.scala

@@ -17,8 +17,9 @@ object BuildSettings extends Build {
 
   lazy val chisel    = project
   lazy val hardfloat = project.dependsOn(chisel)
-  lazy val uncore    = project.dependsOn(hardfloat)
-  lazy val rocket    = project.dependsOn(uncore)
+  lazy val junctions = project.dependsOn(chisel)
+  lazy val uncore    = project.dependsOn(junctions)
+  lazy val rocket    = project.dependsOn(hardfloat,uncore)
   lazy val zscale    = project.dependsOn(rocket)
   lazy val rocketchip = (project in file(".")).settings(chipSettings).dependsOn(zscale)
 

src/main/scala/Configs.scala

@@ -3,6 +3,7 @@
 package rocketchip
 
 import Chisel._
+import junctions._
 import uncore._
 import rocket._
 import rocket.Util._

src/main/scala/RocketChip.scala

@@ -3,6 +3,7 @@
 package rocketchip
 
 import Chisel._
+import junctions._
 import uncore._
 import rocket._
 import rocket.Util._
@@ -192,7 +193,7 @@ class OuterMemorySystem extends Module with TopLevelParameters {
     } else {
       val arb = Module(new RocketChipTileLinkArbiter(managerDepths = backendBuffering))(outerTLParams)
       val conv1 = Module(new NASTIMasterIOTileLinkIOConverter)(outerTLParams)
-      val conv2 = Module(new MemIONASTISlaveIOConverter)
+      val conv2 = Module(new MemIONASTISlaveIOConverter(params(CacheBlockOffsetBits)))
       val conv3 = Module(new MemPipeIOMemIOConverter(nMemReqs))
       arb.io.clients <> banks.map(_.outerTL)
       conv1.io.tl <> arb.io.managers.head
@@ -206,6 +207,6 @@ class OuterMemorySystem extends Module with TopLevelParameters {
 
   // Create a SerDes for backup memory port
   if(params(UseBackupMemoryPort)) {
-    VLSIUtils.doOuterMemorySystemSerdes(mem_channels, io.mem, io.mem_backup, io.mem_backup_en, nMemChannels)
+    VLSIUtils.doOuterMemorySystemSerdes(mem_channels, io.mem, io.mem_backup, io.mem_backup_en, nMemChannels, params(HTIFWidth))
   } else { io.mem <> mem_channels }
 }

src/main/scala/Testing.scala

@@ -66,7 +66,7 @@ run-$kind-tests-fast: $$(addprefix $$(output_dir)/, $$(addsuffix .run, $targets)
       } else { "\n" }
     }
 
-    val f = createOutputFile(s"${Driver.topComponent.name}.${Driver.chiselConfigClassName.get}.d")
+    val f = createOutputFile(s"${Driver.topComponent.get.name}.${Driver.chiselConfigClassName.get}.d")
     f.write(List(gen("asm", asmSuites.values.toSeq), gen("bmark", bmarkSuites.values.toSeq)).mkString("\n"))
     f.close
   }

src/main/scala/Vlsi.scala

@@ -3,6 +3,7 @@
 package rocketchip
 
 import Chisel._
+import junctions._
 import uncore._
 
 class MemDessert extends Module {
@@ -18,9 +19,10 @@ object VLSIUtils {
       mems: Seq[MemIO],
       backup: MemSerializedIO,
       en: Bool,
-      nMemChannels: Int) {
+      nMemChannels: Int,
+      htifWidth: Int) {
     val arb = Module(new MemIOArbiter(nMemChannels))
-    val mem_serdes = Module(new MemSerdes)
+    val mem_serdes = Module(new MemSerdes(htifWidth))
     mem_serdes.io.wide <> arb.io.outer
     mem_serdes.io.narrow <> backup
 

src/main/scala/ZscaleChip.scala

@@ -3,6 +3,7 @@
 package rocketchip
 
 import Chisel._
+import junctions._
 import uncore._
 import rocket._
 import zscale._