From 80670c08d748b7d216f8906a0e7c956320cc17ae Mon Sep 17 00:00:00 2001 From: Howard Mao Date: Tue, 28 Jun 2016 13:15:56 -0700 Subject: [PATCH] changes to imports after uncore refactor --- groundtest/src/main/scala/cachetest.scala | 4 +++- groundtest/src/main/scala/comparator.scala | 5 +++-- groundtest/src/main/scala/dmatest.scala | 7 +++++-- groundtest/src/main/scala/generator.scala | 4 +++- groundtest/src/main/scala/nastitest.scala | 3 ++- groundtest/src/main/scala/regression.scala | 9 +++++---- groundtest/src/main/scala/tile.scala | 2 +- groundtest/src/main/scala/tracegen.scala | 4 +++- groundtest/src/main/scala/unittest.scala | 7 +++++-- 9 files changed, 30 insertions(+), 15 deletions(-) diff --git a/groundtest/src/main/scala/cachetest.scala b/groundtest/src/main/scala/cachetest.scala index 00bd26db..07dbe9ce 100644 --- a/groundtest/src/main/scala/cachetest.scala +++ b/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) diff --git a/groundtest/src/main/scala/comparator.scala b/groundtest/src/main/scala/comparator.scala index 289ea711..a9744d64 100644 --- a/groundtest/src/main/scala/comparator.scala +++ b/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, diff --git a/groundtest/src/main/scala/dmatest.scala b/groundtest/src/main/scala/dmatest.scala index c126364d..d2c1cbb9 100644 --- a/groundtest/src/main/scala/dmatest.scala +++ b/groundtest/src/main/scala/dmatest.scala @@ -1,8 +1,11 @@ package groundtest import Chisel._ -import uncore._ -import uncore.DmaRequest._ +import uncore.tilelink._ +import uncore.devices._ +import uncore.devices.DmaRequest._ +import uncore.util._ +import uncore.constants._ import rocket._ import junctions.{PAddrBits, HasAddrMapParameters} import cde.{Parameters, Field} diff --git a/groundtest/src/main/scala/generator.scala b/groundtest/src/main/scala/generator.scala index 913cf371..04ee4f33 100644 --- a/groundtest/src/main/scala/generator.scala +++ b/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 diff --git a/groundtest/src/main/scala/nastitest.scala b/groundtest/src/main/scala/nastitest.scala index 4071b04f..2873920a 100644 --- a/groundtest/src/main/scala/nastitest.scala +++ b/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 diff --git a/groundtest/src/main/scala/regression.scala b/groundtest/src/main/scala/regression.scala index 375a3e1d..7353400a 100644 --- a/groundtest/src/main/scala/regression.scala +++ b/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), diff --git a/groundtest/src/main/scala/tile.scala b/groundtest/src/main/scala/tile.scala index f9f40402..c958c109 100644 --- a/groundtest/src/main/scala/tile.scala +++ b/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 diff --git a/groundtest/src/main/scala/tracegen.scala b/groundtest/src/main/scala/tracegen.scala index 9a19e015..e0034a0b 100644 --- a/groundtest/src/main/scala/tracegen.scala +++ b/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 diff --git a/groundtest/src/main/scala/unittest.scala b/groundtest/src/main/scala/unittest.scala index c29c5945..272caf5a 100644 --- a/groundtest/src/main/scala/unittest.scala +++ b/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),