From c6bcc832a17874be95f1c4086b61c4a43f3b0c51 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Sun, 20 Sep 2015 13:43:39 -0700
Subject: [PATCH] Chisel3: Don't use Vec.fill for IOs

---
 src/main/scala/Network.scala    |  4 ++--
 src/main/scala/RocketChip.scala | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/scala/Network.scala b/src/main/scala/Network.scala
index cfdf8364..03be1e3f 100644
--- a/src/main/scala/Network.scala
+++ b/src/main/scala/Network.scala
@@ -33,8 +33,8 @@ abstract class RocketChipNetwork(
   val nClients = params(TLNClients)
   val nManagers = params(TLNManagers)
   val io = new Bundle {
-    val clients = Vec.fill(nClients){new ClientTileLinkIO}.flip
-    val managers = Vec.fill(nManagers){new ManagerTileLinkIO}.flip
+    val clients = Vec(new ClientTileLinkIO, nClients).flip
+    val managers = Vec(new ManagerTileLinkIO, nManagers).flip
   }
 
   val clients = io.clients.zipWithIndex.map { 
diff --git a/src/main/scala/RocketChip.scala b/src/main/scala/RocketChip.scala
index ab0d3544..fadffba8 100644
--- a/src/main/scala/RocketChip.scala
+++ b/src/main/scala/RocketChip.scala
@@ -61,7 +61,7 @@ class TopIO extends BasicTopIO {
 }
 
 class MultiChannelTopIO extends BasicTopIO with TopLevelParameters {
-  val mem = Vec.fill(nMemChannels){ new MemIO }
+  val mem = Vec(new MemIO, nMemChannels)
 }
 
 /** Top-level module for the chip */
@@ -116,10 +116,10 @@ class MultiChannelTop extends Module with TopLevelParameters {
 class Uncore extends Module with TopLevelParameters {
   val io = new Bundle {
     val host = new HostIO
-    val mem = Vec.fill(nMemChannels){ new MemIO }
-    val tiles_cached = Vec.fill(nTiles){new ClientTileLinkIO}.flip
-    val tiles_uncached = Vec.fill(nTiles){new ClientUncachedTileLinkIO}.flip
-    val htif = Vec.fill(nTiles){new HTIFIO}.flip
+    val mem = Vec(new MemIO, nMemChannels)
+    val tiles_cached = Vec(new ClientTileLinkIO, nTiles).flip
+    val tiles_uncached = Vec(new ClientUncachedTileLinkIO, nTiles).flip
+    val htif = Vec(new HTIFIO, nTiles).flip
     val mem_backup_ctrl = new MemBackupCtrlIO
   }
 
@@ -148,11 +148,11 @@ class Uncore extends Module with TopLevelParameters {
   */ 
 class OuterMemorySystem extends Module with TopLevelParameters {
   val io = new Bundle {
-    val tiles_cached = Vec.fill(nTiles){new ClientTileLinkIO}.flip
-    val tiles_uncached = Vec.fill(nTiles){new ClientUncachedTileLinkIO}.flip
+    val tiles_cached = Vec(new ClientTileLinkIO, nTiles).flip
+    val tiles_uncached = Vec(new ClientUncachedTileLinkIO, nTiles).flip
     val htif_uncached = (new ClientUncachedTileLinkIO).flip
-    val incoherent = Vec.fill(nTiles){Bool()}.asInput
-    val mem = Vec.fill(nMemChannels){ new MemIO }
+    val incoherent = Vec(Bool(), nTiles).asInput
+    val mem = Vec(new MemIO, nMemChannels)
     val mem_backup = new MemSerializedIO(htifW)
     val mem_backup_en = Bool(INPUT)
   }