changes to imports after uncore refactor

groundtest/src/main/scala/cachetest.scala

@@ -1,7 +1,9 @@
 package groundtest
 
 import Chisel._
-import uncore._
+import uncore.tilelink._
+import uncore.constants._
+import uncore.agents._
 import cde.{Parameters, Field}
 
 class CacheFillTest(implicit p: Parameters) extends GroundTest()(p)

groundtest/src/main/scala/comparator.scala

@@ -1,7 +1,8 @@
 package groundtest
 
 import Chisel._
-import uncore._
+import uncore.tilelink._
+import uncore.constants._
 import junctions._
 import rocket._
 import scala.util.Random
@@ -114,7 +115,7 @@ class ComparatorSource(implicit val p: Parameters) extends Module
   // Random transactions
   val get         = Get(client_xact_id, addr_block, addr_beat, get_addr_byte, get_operand_size, Bool(false))
   val getBlock    = GetBlock(client_xact_id, addr_block)
-  val put         = Put(client_xact_id, addr_block, addr_beat, data, wmask)
+  val put         = Put(client_xact_id, addr_block, addr_beat, data, Some(wmask))
   val putBlock    = PutBlock(client_xact_id, addr_block, UInt(0), data)
   val putAtomic   = if (atomics)
     PutAtomic(client_xact_id, addr_block, addr_beat,

groundtest/src/main/scala/dmatest.scala

@@ -1,8 +1,11 @@
 package groundtest
 
 import Chisel._
-import uncore._
+import uncore.tilelink._
-import uncore.DmaRequest._
+import uncore.devices._
+import uncore.devices.DmaRequest._
+import uncore.util._
+import uncore.constants._
 import rocket._
 import junctions.{PAddrBits, HasAddrMapParameters}
 import cde.{Parameters, Field}

groundtest/src/main/scala/generator.scala

@@ -1,7 +1,9 @@
 package groundtest
 
 import Chisel._
-import uncore._
+import uncore.tilelink._
+import uncore.devices.NTiles
+import uncore.constants._
 import junctions._
 import rocket._
 import scala.util.Random

groundtest/src/main/scala/nastitest.scala

@@ -1,7 +1,8 @@
 package groundtest
 
 import Chisel._
-import uncore._
+import uncore.tilelink._
+import uncore.converters._
 import junctions._
 import cde.Parameters
 

groundtest/src/main/scala/regression.scala

@@ -1,7 +1,9 @@
 package groundtest
 
 import Chisel._
-import uncore._
+import uncore.tilelink._
+import uncore.constants._
+import uncore.agents._
 import junctions.{ParameterizedBundle, HasAddrMapParameters}
 import rocket.HellaCacheIO
 import cde.{Parameters, Field}
@@ -219,7 +221,6 @@ class MixedAllocPutRegression(implicit p: Parameters) extends Regression()(p) {
     addr_block = test_block(put_acq_id),
     addr_beat = test_beat(put_acq_id),
     data = test_data(put_acq_id),
-    wmask = Acquire.fullWriteMask,
     alloc = test_alloc(put_acq_id))
 
   val get_acquire = Get(
@@ -306,7 +307,7 @@ class WriteMaskedPutBlockRegression(implicit p: Parameters) extends Regression()
     addr_block = UInt(memStartBlock + 7),
     addr_beat = put_beat,
     data = Mux(put_beat(0) === stage, put_data, UInt(0)),
-    wmask = Mux(put_beat(0) === stage, Acquire.fullWriteMask, Bits(0)))
+    wmask = Some(Mux(put_beat(0) === stage, Acquire.fullWriteMask, Bits(0))))
 
   val get_acq = GetBlock(
     client_xact_id = UInt(0),
@@ -477,7 +478,7 @@ class PutBeforePutBlockRegression(implicit p: Parameters) extends Regression()(p
     addr_block = UInt(memStartBlock),
     addr_beat = UInt(0),
     data = UInt(0),
-    wmask = UInt((1 << 8) - 1))
+    wmask = Some(UInt((1 << 8) - 1)))
 
   val put_block_acquire = PutBlock(
     client_xact_id = UInt(1),

groundtest/src/main/scala/tile.scala

@@ -2,7 +2,7 @@ package groundtest
 
 import Chisel._
 import rocket._
-import uncore._
+import uncore.tilelink._
 import junctions._
 import scala.util.Random
 import scala.collection.mutable.ListBuffer

groundtest/src/main/scala/tracegen.scala

@@ -17,7 +17,9 @@
 package groundtest
  
 import Chisel._
-import uncore._
+import uncore.tilelink._
+import uncore.constants._
+import uncore.devices.NTiles
 import junctions._
 import rocket._
 import scala.util.Random

groundtest/src/main/scala/unittest.scala

@@ -3,7 +3,10 @@ package groundtest
 import Chisel._
 import junctions._
 import junctions.NastiConstants._
-import uncore._
+import uncore.tilelink._
+import uncore.converters._
+import uncore.constants._
+import uncore.devices._
 import cde.Parameters
 
 abstract class UnitTest extends Module {
@@ -334,7 +337,7 @@ class TileLinkToSmiConverterTestDriver(implicit p: Parameters) extends Module {
       addr_block = addr >> UInt(blockOffsetBits),
       addr_beat = addr(blockOffsetBits - 1, byteAddrBits),
       data = Mux(count(0), data << UInt(32), data),
-      wmask = FillInterleaved(4, UIntToOH(count(0)))),
+      wmask = Some(FillInterleaved(4, UIntToOH(count(0))))),
     Get(
       client_xact_id = UInt(0),
       addr_block = addr >> UInt(blockOffsetBits),