Merge pull request #360 from ucb-bar/move-to-util

Move a bunch more things into util package

src/main/scala/coreplex/BaseCoreplex.scala

@@ -11,7 +11,7 @@ import uncore.devices._
 import uncore.util._
 import uncore.converters._
 import rocket._
-import rocket.Util._
+import util._
 
 /** Number of memory channels */
 case object NMemoryChannels extends Field[Int]
@@ -148,7 +148,7 @@ abstract class BaseCoreplexModule[+L <: BaseCoreplex, +B <: BaseCoreplexBundle](
       tile.interrupts.meip := plic.io.harts(plic.cfg.context(i, 'M'))
       tile.interrupts.seip.foreach(_ := plic.io.harts(plic.cfg.context(i, 'S')))
       tile.interrupts.debug := debugModule.io.debugInterrupts(i)
-      tile.hartid := i
+      tile.hartid := UInt(i)
       tile.resetVector := io.resetVector
     }
 

src/main/scala/coreplex/Configs.scala

@@ -10,7 +10,7 @@ import uncore.agents._
 import uncore.devices._
 import uncore.converters._
 import rocket._
-import rocket.Util._
+import util._
 import util.ConfigUtils._
 import rocketchip.{GlobalAddrMap, NCoreplexExtClients}
 import cde.{Parameters, Config, Dump, Knob, CDEMatchError}

src/main/scala/coreplex/Coreplex.scala

@@ -5,6 +5,7 @@ import cde.{Parameters, Field}
 import junctions._
 import uncore.tilelink._
 import uncore.util._
+import util._
 import rocket._
 
 trait DirectConnection {

src/main/scala/groundtest/BusMasterTest.scala

@@ -4,7 +4,7 @@ import Chisel._
 import uncore.tilelink._
 import uncore.agents._
 import uncore.coherence.{InnerTLId, OuterTLId}
-import uncore.util._
+import util._
 import junctions.HasAddrMapParameters
 import cde.Parameters
 

src/main/scala/groundtest/CacheFillTest.scala

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

src/main/scala/groundtest/Regression.scala

@@ -4,9 +4,8 @@ import Chisel._
 import uncore.tilelink._
 import uncore.constants._
 import uncore.agents._
-import uncore.util._
+import util._
 import junctions.HasAddrMapParameters
-import util.{ParameterizedBundle, SimpleTimer}
 import rocket.HellaCacheIO
 import cde.{Parameters, Field}
 

src/main/scala/junctions/nasti.scala

@@ -4,7 +4,7 @@ package junctions
 import Chisel._
 import scala.math.max
 import scala.collection.mutable.ArraySeq
-import util.{ParameterizedBundle, HellaPeekingArbiter}
+import util._
 import cde.{Parameters, Field}
 
 case object NastiKey extends Field[NastiParameters]

src/main/scala/rocket/breakpoint.scala

@@ -3,8 +3,8 @@
 package rocket
 
 import Chisel._
-import Util._
+import util._
-import uncore.util._
+import Chisel.ImplicitConversions._
 import cde.Parameters
 
 class BPControl(implicit p: Parameters) extends CoreBundle()(p) {

src/main/scala/rocket/btb.scala

@@ -4,10 +4,9 @@ package rocket
 
 import Chisel._
 import cde.{Parameters, Field}
-import Util._
+import util._
-import uncore.util._
+import Chisel.ImplicitConversions._
 import uncore.agents.PseudoLRU
-import util.ParameterizedBundle
 
 case object BtbKey extends Field[BtbParameters]
 

src/main/scala/rocket/csr.scala

@@ -3,12 +3,11 @@
 package rocket
 
 import Chisel._
-import Util._
-import uncore.util._
 import Instructions._
 import cde.{Parameters, Field}
 import uncore.devices._
-import uncore.util._
+import util._
+import Chisel.ImplicitConversions._
 import junctions.AddrMap
 
 class MStatus extends Bundle {
@@ -261,7 +260,7 @@ class CSRFile(implicit p: Parameters) extends CoreModule()(p)
   val s_interrupts = Mux(!reg_debug && (reg_mstatus.prv < PRV.S || (reg_mstatus.prv === PRV.S && reg_mstatus.sie)), pending_interrupts & reg_mideleg, UInt(0))
   val all_interrupts = m_interrupts | s_interrupts
   val interruptMSB = BigInt(1) << (xLen-1)
-  val interruptCause = interruptMSB + PriorityEncoder(all_interrupts)
+  val interruptCause = UInt(interruptMSB) + PriorityEncoder(all_interrupts)
   io.interrupt := all_interrupts.orR && !io.singleStep || reg_singleStepped
   io.interrupt_cause := interruptCause
   io.bp := reg_bp take nBreakpoints
@@ -269,7 +268,7 @@ class CSRFile(implicit p: Parameters) extends CoreModule()(p)
   // debug interrupts are only masked by being in debug mode
   when (Bool(usingDebug) && reg_dcsr.debugint && !reg_debug) {
     io.interrupt := true
-    io.interrupt_cause := interruptMSB + CSR.debugIntCause
+    io.interrupt_cause := UInt(interruptMSB) + CSR.debugIntCause
   }
 
   val system_insn = io.rw.cmd === CSR.I
@@ -602,10 +601,10 @@ class CSRFile(implicit p: Parameters) extends CoreModule()(p)
       when (decoded_addr(CSRs.sbadaddr)) { reg_sbadaddr := wdata(vaddrBitsExtended-1,0) }
       when (decoded_addr(CSRs.mideleg))  { reg_mideleg := wdata & delegable_interrupts }
       when (decoded_addr(CSRs.medeleg))  { reg_medeleg := wdata & delegable_exceptions }
-      when (decoded_addr(CSRs.mscounteren)) { reg_mscounteren := wdata & delegable_counters }
+      when (decoded_addr(CSRs.mscounteren)) { reg_mscounteren := wdata & UInt(delegable_counters) }
     }
     if (usingUser) {
-      when (decoded_addr(CSRs.mucounteren)) { reg_mucounteren := wdata & delegable_counters }
+      when (decoded_addr(CSRs.mucounteren)) { reg_mucounteren := wdata & UInt(delegable_counters) }
     }
     if (nBreakpoints > 0) {
       when (decoded_addr(CSRs.tselect)) { reg_tselect := wdata }

src/main/scala/rocket/dcache.scala

@@ -7,10 +7,11 @@ import junctions._
 import uncore.tilelink._
 import uncore.agents._
 import uncore.coherence._
-import uncore.util._
 import uncore.constants._
+import uncore.util._
+import util._
+import Chisel.ImplicitConversions._
 import cde.{Parameters, Field}
-import Util._
 
 class DCacheDataReq(implicit p: Parameters) extends L1HellaCacheBundle()(p) {
   val addr = Bits(width = untagBits)

src/main/scala/rocket/fpu.scala

@@ -4,10 +4,10 @@ package rocket
 
 import Chisel._
 import Instructions._
-import Util._
+import util._
+import Chisel.ImplicitConversions._
 import FPConstants._
 import uncore.constants.MemoryOpConstants._
-import uncore.util._
 import cde.{Parameters, Field}
 
 case class FPUConfig(

src/main/scala/rocket/frontend.scala

@@ -2,7 +2,8 @@ package rocket
 
 import Chisel._
 import uncore.tilelink._
-import Util._
+import util._
+import Chisel.ImplicitConversions._
 import cde.{Parameters, Field}
 
 class FrontendReq(implicit p: Parameters) extends CoreBundle()(p) {

src/main/scala/rocket/ibuf.scala

@@ -3,9 +3,9 @@
 package rocket
 
 import Chisel._
-import Util._
+import util._
+import Chisel.ImplicitConversions._
 import cde.{Parameters, Field}
-import util.ParameterizedBundle
 
 class Instruction(implicit val p: Parameters) extends ParameterizedBundle with HasCoreParameters {
   val pf0 = Bool() // page fault on first half of instruction

src/main/scala/rocket/icache.scala

@@ -4,7 +4,8 @@ import Chisel._
 import uncore.agents._
 import uncore.tilelink._
 import uncore.util._
-import Util._
+import util._
+import Chisel.ImplicitConversions._
 import cde.{Parameters, Field}
 
 trait HasL1CacheParameters extends HasCacheParameters with HasCoreParameters {

src/main/scala/rocket/idecode.scala

@@ -7,7 +7,8 @@ import Instructions._
 import uncore.constants.MemoryOpConstants._
 import ALU._
 import cde.Parameters
-import Util._
+import util._
+import Chisel.ImplicitConversions._
 
 abstract trait DecodeConstants extends HasCoreParameters
 {

src/main/scala/rocket/multiplier.scala

@@ -4,7 +4,8 @@ package rocket
 
 import Chisel._
 import ALU._
-import Util._
+import util._
+import Chisel.ImplicitConversions._
 
 class MultiplierReq(dataBits: Int, tagBits: Int) extends Bundle {
   val fn = Bits(width = SZ_ALU_FN)

src/main/scala/rocket/nbdcache.scala

@@ -6,11 +6,11 @@ import Chisel._
 import uncore.tilelink._
 import uncore.coherence._
 import uncore.agents._
-import uncore.util._
 import uncore.constants._
-import util.{ParameterizedBundle, DecoupledHelper}
+import uncore.util._
+import util._
+import Chisel.ImplicitConversions._
 import cde.{Parameters, Field}
-import Util._
 
 case class DCacheConfig(
   nMSHRs: Int = 1,

src/main/scala/rocket/package.scala

@@ -1,4 +1,3 @@
 // See LICENSE for license details.
 
-package object rocket extends 
+package object rocket extends rocket.constants.ScalarOpConstants
-  rocket.constants.ScalarOpConstants

src/main/scala/rocket/ptw.scala

@@ -5,8 +5,8 @@ package rocket
 import Chisel._
 import uncore.agents._
 import uncore.constants._
-import Util._
+import util._
-import uncore.util._
+import Chisel.ImplicitConversions._
 import cde.{Parameters, Field}
 
 class PTWReq(implicit p: Parameters) extends CoreBundle()(p) {

src/main/scala/rocket/rocc.scala

@@ -6,7 +6,8 @@ import Chisel._
 import uncore.tilelink._
 import uncore.constants._
 import uncore.agents.CacheName
-import Util._
+import util._
+import Chisel.ImplicitConversions._
 import cde.{Parameters, Field}
 
 case object RoccMaxTaggedMemXacts extends Field[Int]

src/main/scala/rocket/rocket.scala

@@ -7,8 +7,8 @@ import uncore.devices._
 import uncore.agents.CacheName
 import uncore.constants._
 import junctions.HasAddrMapParameters
-import util.ParameterizedBundle
+import util._
-import Util._
+import Chisel.ImplicitConversions._
 import cde.{Parameters, Field}
 
 case object XLen extends Field[Int]

src/main/scala/rocket/rvc.scala

@@ -2,9 +2,8 @@ package rocket
 
 import Chisel._
 import Chisel.ImplicitConversions._
-import Util._
+import util._
 import cde.Parameters
-import uncore.util._
 
 class ExpandedInstruction extends Bundle {
   val bits = UInt(width = 32)

src/main/scala/rocket/tile.scala

@@ -7,7 +7,7 @@ import uncore.tilelink._
 import uncore.agents._
 import uncore.converters._
 import uncore.devices._
-import Util._
+import util._
 import cde.{Parameters, Field}
 
 case object BuildRoCC extends Field[Seq[RoccParameters]]

src/main/scala/rocket/tlb.scala

@@ -3,13 +3,13 @@
 package rocket
 
 import Chisel._
-import Util._
+import util._
+import Chisel.ImplicitConversions._
 import junctions._
 import scala.math._
 import cde.{Parameters, Field}
 import uncore.agents.PseudoLRU
 import uncore.coherence._
-import uncore.util._
 
 case object PgLevels extends Field[Int]
 case object ASIdBits extends Field[Int]

src/main/scala/rocket/util.scala

@@ -1,177 +0,0 @@
-// See LICENSE for license details.
-
-package rocket
-
-import Chisel._
-import uncore.util._
-import scala.math._
-import cde.{Parameters, Field}
-
-object Util {
-  implicit def uintToBitPat(x: UInt): BitPat = BitPat(x)
-  implicit def intToUInt(x: Int): UInt = UInt(x)
-  implicit def bigIntToUInt(x: BigInt): UInt = UInt(x)
-  implicit def booleanToBool(x: Boolean): Bits = Bool(x)
-  implicit def intSeqToUIntSeq(x: Seq[Int]): Seq[UInt] = x.map(UInt(_))
-  implicit def wcToUInt(c: WideCounter): UInt = c.value
-
-  implicit class UIntToAugmentedUInt(val x: UInt) extends AnyVal {
-    def sextTo(n: Int): UInt =
-      if (x.getWidth == n) x
-      else Cat(Fill(n - x.getWidth, x(x.getWidth-1)), x)
-
-    def extract(hi: Int, lo: Int): UInt = {
-      if (hi == lo-1) UInt(0)
-      else x(hi, lo)
-    }
-  }
-
-  implicit class BooleanToAugmentedBoolean(val x: Boolean) extends AnyVal {
-    def toInt: Int = if (x) 1 else 0
-
-    // this one's snagged from scalaz
-    def option[T](z: => T): Option[T] = if (x) Some(z) else None
-  }
-}
-
-object MuxT {
-  def apply[T <: Data, U <: Data](cond: Bool, con: (T, U), alt: (T, U)): (T, U) =
-    (Mux(cond, con._1, alt._1), Mux(cond, con._2, alt._2))
-
-  def apply[T <: Data, U <: Data, W <: Data](cond: Bool, con: (T, U, W), alt: (T, U, W)): (T, U, W) =
-    (Mux(cond, con._1, alt._1), Mux(cond, con._2, alt._2), Mux(cond, con._3, alt._3))
-}
-
-import Util._
-
-object Str
-{
-  def apply(s: String): UInt = {
-    var i = BigInt(0)
-    require(s.forall(validChar _))
-    for (c <- s)
-      i = (i << 8) | c
-    UInt(i, s.length*8)
-  }
-  def apply(x: Char): UInt = {
-    require(validChar(x))
-    UInt(x.toInt, 8)
-  }
-  def apply(x: UInt): UInt = apply(x, 10)
-  def apply(x: UInt, radix: Int): UInt = {
-    val rad = UInt(radix)
-    val w = x.getWidth
-    require(w > 0)
-
-    var q = x
-    var s = digit(q % rad)
-    for (i <- 1 until ceil(log(2)/log(radix)*w).toInt) {
-      q = q / rad
-      s = Cat(Mux(Bool(radix == 10) && q === UInt(0), Str(' '), digit(q % rad)), s)
-    }
-    s
-  }
-  def apply(x: SInt): UInt = apply(x, 10)
-  def apply(x: SInt, radix: Int): UInt = {
-    val neg = x < SInt(0)
-    val abs = x.abs
-    if (radix != 10) {
-      Cat(Mux(neg, Str('-'), Str(' ')), Str(abs, radix))
-    } else {
-      val rad = UInt(radix)
-      val w = abs.getWidth
-      require(w > 0)
-
-      var q = abs
-      var s = digit(q % rad)
-      var needSign = neg
-      for (i <- 1 until ceil(log(2)/log(radix)*w).toInt) {
-        q = q / rad
-        val placeSpace = q === UInt(0)
-        val space = Mux(needSign, Str('-'), Str(' '))
-        needSign = needSign && !placeSpace
-        s = Cat(Mux(placeSpace, space, digit(q % rad)), s)
-      }
-      Cat(Mux(needSign, Str('-'), Str(' ')), s)
-    }
-  }
-
-  private def digit(d: UInt): UInt = Mux(d < UInt(10), Str('0')+d, Str(('a'-10).toChar)+d)(7,0)
-  private def validChar(x: Char) = x == (x & 0xFF)
-}
-
-object Split
-{
-  // is there a better way to do do this?
-  def apply(x: Bits, n0: Int) = {
-    val w = checkWidth(x, n0)
-    (x(w-1,n0), x(n0-1,0))
-  }
-  def apply(x: Bits, n1: Int, n0: Int) = {
-    val w = checkWidth(x, n1, n0)
-    (x(w-1,n1), x(n1-1,n0), x(n0-1,0))
-  }
-  def apply(x: Bits, n2: Int, n1: Int, n0: Int) = {
-    val w = checkWidth(x, n2, n1, n0)
-    (x(w-1,n2), x(n2-1,n1), x(n1-1,n0), x(n0-1,0))
-  }
-
-  private def checkWidth(x: Bits, n: Int*) = {
-    val w = x.getWidth
-    def decreasing(x: Seq[Int]): Boolean =
-      if (x.tail.isEmpty) true
-      else x.head >= x.tail.head && decreasing(x.tail)
-    require(decreasing(w :: n.toList))
-    w
-  }
-}
-
-// a counter that clock gates most of its MSBs using the LSB carry-out
-case class WideCounter(width: Int, inc: UInt = UInt(1), reset: Boolean = true)
-{
-  private val isWide = width > 2*inc.getWidth
-  private val smallWidth = if (isWide) inc.getWidth max log2Up(width) else width
-  private val small = if (reset) Reg(init=UInt(0, smallWidth)) else Reg(UInt(width = smallWidth))
-  private val nextSmall = small +& inc
-  small := nextSmall
-
-  private val large = if (isWide) {
-    val r = if (reset) Reg(init=UInt(0, width - smallWidth)) else Reg(UInt(width = width - smallWidth))
-    when (nextSmall(smallWidth)) { r := r +& UInt(1) }
-    r
-  } else null
-
-  val value = if (isWide) Cat(large, small) else small
-  lazy val carryOut = {
-    val lo = (small ^ nextSmall) >> 1
-    if (!isWide) lo else {
-      val hi = Mux(nextSmall(smallWidth), large ^ (large +& UInt(1)), UInt(0)) >> 1
-      Cat(hi, lo)
-    }
-  }
-
-  def := (x: UInt) = {
-    small := x
-    if (isWide) large := x >> smallWidth
-  }
-}
-
-object Random
-{
-  def apply(mod: Int, random: UInt): UInt = {
-    if (isPow2(mod)) random(log2Up(mod)-1,0)
-    else PriorityEncoder(partition(apply(1 << log2Up(mod*8), random), mod))
-  }
-  def apply(mod: Int): UInt = apply(mod, randomizer)
-  def oneHot(mod: Int, random: UInt): UInt = {
-    if (isPow2(mod)) UIntToOH(random(log2Up(mod)-1,0))
-    else PriorityEncoderOH(partition(apply(1 << log2Up(mod*8), random), mod)).asUInt
-  }
-  def oneHot(mod: Int): UInt = oneHot(mod, randomizer)
-
-  private def randomizer = LFSR16()
-  private def round(x: Double): Int =
-    if (x.toInt.toDouble == x) x.toInt else (x.toInt + 1) & -2
-  private def partition(value: UInt, slices: Int) =
-    Seq.tabulate(slices)(i => value < round((i << value.getWidth).toDouble / slices))
-}

src/main/scala/rocketchip/BaseTop.scala

@@ -8,9 +8,8 @@ import junctions._
 import uncore.tilelink._
 import uncore.tilelink2._
 import uncore.devices._
-import util.{ParameterizedBundle, ConfigStringOutput, GraphMLOutput}
+import util._
 import rocket._
-import rocket.Util._
 import coreplex._
 
 // the following parameters will be refactored properly with TL2

src/main/scala/rocketchip/Configs.scala

@@ -5,12 +5,12 @@ package rocketchip
 import Chisel._
 import junctions._
 import rocket._
-import rocket.Util._
 import uncore.agents._
 import uncore.tilelink._
 import uncore.tilelink2.{LazyModule}
 import uncore.devices._
 import uncore.converters._
+import util._
 import coreplex._
 import scala.math.max
 import scala.collection.mutable.{LinkedHashSet, ListBuffer}

src/main/scala/rocketchip/DebugTransport.scala

@@ -3,6 +3,7 @@ package rocketchip
 import Chisel._
 import uncore.devices.{DebugBusIO, AsyncDebugBusTo, AsyncDebugBusFrom, DebugBusReq, DebugBusResp, DMKey}
 import junctions._
+import util._
 import cde.{Parameters, Field}
 
 case object IncludeJtagDTM extends Field[Boolean]

src/main/scala/rocketchip/Periphery.scala

@@ -12,7 +12,7 @@ import uncore.converters._
 import uncore.devices._
 import uncore.agents._
 import uncore.util._
-import rocket.Util._
+import util._
 import rocket.XLen
 import scala.math.max
 import coreplex._

src/main/scala/rocketchip/TestHarness.scala

@@ -4,10 +4,9 @@ package rocketchip
 
 import Chisel._
 import cde.{Parameters, Field}
-import rocket.Util._
-import util.LatencyPipe
 import junctions._
 import junctions.NastiConstants._
+import util.LatencyPipe
 
 case object BuildExampleTop extends Field[Parameters => ExampleTop]
 case object SimMemLatency extends Field[Int]
@@ -32,7 +31,7 @@ class TestHarness(q: Parameters) extends Module {
   require(dut.io.mmio_tl.isEmpty)
 
   for (int <- dut.io.interrupts)
-    int := false
+    int := Bool(false)
 
   if (dut.io.mem_axi.nonEmpty) {
     val memSize = p(GlobalAddrMap)("mem").size
@@ -83,12 +82,12 @@ class SimAXIMem(size: BigInt)(implicit p: Parameters) extends NastiModule()(p) {
   val rValid = Reg(init = Bool(false))
   val ar = RegEnable(io.axi.ar.bits, io.axi.ar.fire())
   io.axi.ar.ready := !rValid
-  when (io.axi.ar.fire()) { rValid := true }
+  when (io.axi.ar.fire()) { rValid := Bool(true) }
   when (io.axi.r.fire()) {
     assert(ar.burst === NastiConstants.BURST_INCR)
     ar.addr := ar.addr + (UInt(1) << ar.size)
-    ar.len := ar.len - 1
+    ar.len := ar.len - UInt(1)
-    when (ar.len === UInt(0)) { rValid := false }
+    when (ar.len === UInt(0)) { rValid := Bool(false) }
   }
 
   val w = io.axi.w.bits
@@ -101,15 +100,15 @@ class SimAXIMem(size: BigInt)(implicit p: Parameters) extends NastiModule()(p) {
   val aw = RegEnable(io.axi.aw.bits, io.axi.aw.fire())
   io.axi.aw.ready := !wValid && !bValid
   io.axi.w.ready := wValid
-  when (io.axi.b.fire()) { bValid := false }
+  when (io.axi.b.fire()) { bValid := Bool(false) }
-  when (io.axi.aw.fire()) { wValid := true }
+  when (io.axi.aw.fire()) { wValid := Bool(true) }
   when (io.axi.w.fire()) {
     assert(aw.burst === NastiConstants.BURST_INCR)
     aw.addr := aw.addr + (UInt(1) << aw.size)
-    aw.len := aw.len - 1
+    aw.len := aw.len - UInt(1)
     when (aw.len === UInt(0)) {
-      wValid := false
+      wValid := Bool(false)
-      bValid := true
+      bValid := Bool(true)
     }
 
     def row = mem((aw.addr >> log2Ceil(nastiXDataBits/8))(log2Ceil(depth)-1, 0))
@@ -143,9 +142,9 @@ class SimDTM(implicit p: Parameters) extends BlackBox {
     io.reset := tbreset
     dutio <> io.debug
 
-    tbsuccess := dutsuccess || io.exit === 1
+    tbsuccess := dutsuccess || io.exit === UInt(1)
-    when (io.exit >= 2) {
+    when (io.exit >= UInt(2)) {
-      printf("*** FAILED *** (exit code = %d)\n", io.exit >> 1)
+      printf("*** FAILED *** (exit code = %d)\n", io.exit >> UInt(1))
       stop(1)
     }
   }

src/main/scala/rocketchip/Utils.scala

@@ -6,9 +6,9 @@ import cde.{Parameters, Dump}
 import junctions._
 import uncore.devices._
 import rocket._
-import rocket.Util._
 import coreplex._
 import uncore.tilelink2._
+import util._
 
 import java.nio.file.{Files, Paths}
 import java.nio.{ByteBuffer, ByteOrder}

src/main/scala/uncore/agents/Agents.scala

@@ -5,11 +5,11 @@ package uncore.agents
 import Chisel._
 import cde.{Parameters, Field}
 import junctions.PAddrBits
-import util.ParameterizedBundle
 import uncore.tilelink._
 import uncore.converters._
 import uncore.coherence._
 import uncore.util._
+import util._
 
 case object NReleaseTransactors extends Field[Int]
 case object NProbeTransactors extends Field[Int]

src/main/scala/uncore/agents/Broadcast.scala

@@ -7,6 +7,7 @@ import uncore.coherence._
 import uncore.tilelink._
 import uncore.constants._
 import uncore.util._
+import util._
 import cde.Parameters
 
 class L2BroadcastHub(implicit p: Parameters) extends HierarchicalCoherenceAgent()(p) {

src/main/scala/uncore/agents/Cache.scala

@@ -11,6 +11,7 @@ import uncore.coherence._
 import uncore.tilelink._
 import uncore.constants._
 import uncore.util._
+import util._
 import cde.{Parameters, Field}
 
 case object CacheName extends Field[String]

src/main/scala/uncore/agents/Ecc.scala

@@ -3,7 +3,7 @@
 package uncore.agents
 
 import Chisel._
-import uncore.util._
+import util._
 
 abstract class Decoding
 {

src/main/scala/uncore/agents/Trackers.scala

@@ -6,8 +6,7 @@ import Chisel._
 import uncore.coherence._
 import uncore.tilelink._
 import uncore.util._
-import uncore.util._
+import util._
-import util.ParameterizedBundle
 import cde.{Field, Parameters}
 import scala.math.max
 

src/main/scala/uncore/coherence/Policies.scala

@@ -5,7 +5,7 @@ package uncore.coherence
 import Chisel._
 import uncore.tilelink._
 import uncore.constants._
-import uncore.util._
+import util._
 
 /** The entire CoherencePolicy API consists of the following three traits:
   * HasCustomTileLinkMessageTypes, used to define custom messages

src/main/scala/uncore/devices/Bram.scala

@@ -6,6 +6,7 @@ import unittest.UnitTest
 import junctions._
 import uncore.tilelink._
 import uncore.util._
+import util._
 import HastiConstants._
 
 class BRAMSlave(depth: Int)(implicit val p: Parameters) extends Module

src/main/scala/uncore/devices/Debug.scala

@@ -5,8 +5,7 @@ package uncore.devices
 import Chisel._
 import junctions._
 import uncore.tilelink._
-import uncore.util._
+import util._
-import util.ParameterizedBundle
 import cde.{Parameters, Config, Field}
 
 // *****************************************

src/main/scala/uncore/devices/Prci.scala

@@ -3,11 +3,11 @@
 package uncore.devices
 
 import Chisel._
-import rocket.Util._
 import junctions._
 import junctions.NastiConstants._
 import uncore.tilelink2._
 import uncore.util._
+import util._
 import scala.math.{min,max}
 import cde.{Parameters, Field}
 
@@ -52,7 +52,7 @@ trait CoreplexLocalInterrupterModule extends Module with HasRegMap with MixCorep
 
   val time = Seq.fill(timeWidth/regWidth)(Reg(init=UInt(0, width = regWidth)))
   when (io.rtcTick) {
-    val newTime = time.asUInt + 1
+    val newTime = time.asUInt + UInt(1)
     for ((reg, i) <- time zip (0 until timeWidth by regWidth))
       reg := newTime >> i
   }

src/main/scala/uncore/tilelink/Crossing.scala

@@ -1,7 +1,7 @@
 package uncore.tilelink
 
 import Chisel._
-import junctions._
+import util._
 
 object AsyncClientUncachedTileLinkCrossing {
   def apply(from_clock: Clock, from_reset: Bool, from_source: ClientUncachedTileLinkIO, to_clock: Clock, to_reset: Bool, depth: Int = 8, sync: Int = 3): ClientUncachedTileLinkIO = {

src/main/scala/uncore/tilelink/Definitions.scala

@@ -4,9 +4,9 @@ package uncore.tilelink
 import Chisel._
 import junctions._
 import uncore.coherence.CoherencePolicy
-import uncore.util._
-import scala.math.max
 import uncore.constants._
+import util._
+import scala.math.max
 import cde.{Parameters, Field}
 
 case object CacheBlockOffsetBits extends Field[Int]

src/main/scala/uncore/tilelink/Drivers.scala

@@ -4,6 +4,7 @@ import Chisel._
 import junctions._
 import uncore.constants._
 import uncore.util._
+import util._
 import cde.Parameters
 
 abstract class Driver(implicit p: Parameters) extends TLModule()(p) {

src/main/scala/uncore/tilelink2/Crossing.scala

@@ -4,7 +4,7 @@ package uncore.tilelink2
 
 import Chisel._
 import chisel3.internal.sourceinfo.SourceInfo
-import junctions._
+import util._
 
 class TLAsyncCrossing(depth: Int = 8, sync: Int = 3) extends LazyModule
 {

src/main/scala/uncore/tilelink2/RegField.scala

@@ -4,7 +4,7 @@ package uncore.tilelink2
 
 import Chisel._
 import chisel3.util.{Irrevocable, IrrevocableIO}
-import uncore.util.{SimpleRegIO}
+import util.{SimpleRegIO}
 
 case class RegReadFn private(combinational: Boolean, fn: (Bool, Bool) => (Bool, Bool, UInt))
 object RegReadFn

src/main/scala/uncore/tilelink2/RegisterCrossing.scala

@@ -4,8 +4,7 @@ package uncore.tilelink2
 
 import Chisel._
 import chisel3.util.{Irrevocable, IrrevocableIO}
-import junctions._
+import util.{AsyncResetRegVec, AsyncQueue, AsyncScope}
-import uncore.util.{AsyncResetRegVec}
 
 // A very simple flow control state machine, run in the specified clock domain
 class BusyRegisterCrossing(clock: Clock, reset: Bool)

src/main/scala/util/AsyncQueue.scala

@@ -1,8 +1,7 @@
 // See LICENSE for license details.
 
-package junctions
+package util
 import Chisel._
-import uncore.util.{AsyncResetRegVec, AsyncResetReg}
 
 object GrayCounter {
   def apply(bits: Int, increment: Bool = Bool(true)): UInt = {
@@ -18,11 +17,10 @@ object AsyncGrayCounter {
     val syncv = List.fill(sync)(Module (new AsyncResetRegVec(w = in.getWidth, 0)))
     syncv.last.io.d := in
     syncv.last.io.en := Bool(true)
-      (syncv.init zip syncv.tail).foreach { case (sink, source) => {
+      (syncv.init zip syncv.tail).foreach { case (sink, source) =>
         sink.io.d := source.io.q
         sink.io.en := Bool(true)
       }
-      }
     syncv(0).io.d
   }
 }

src/main/scala/util/BlackBoxRegs.scala

@@ -1,4 +1,4 @@
-package uncore.util
+package util
 
 import Chisel._
 

src/main/scala/util/Counters.scala

@@ -2,6 +2,7 @@ package util
 
 import Chisel._
 import cde.Parameters
+import scala.math.max
 
 // Produces 0-width value when counting to 1
 class ZCounter(val n: Int) {
@@ -34,3 +35,33 @@ object TwoWayCounter {
     cnt
   }
 }
+
+// a counter that clock gates most of its MSBs using the LSB carry-out
+case class WideCounter(width: Int, inc: UInt = UInt(1), reset: Boolean = true)
+{
+  private val isWide = width > 2*inc.getWidth
+  private val smallWidth = if (isWide) inc.getWidth max log2Up(width) else width
+  private val small = if (reset) Reg(init=UInt(0, smallWidth)) else Reg(UInt(width = smallWidth))
+  private val nextSmall = small +& inc
+  small := nextSmall
+
+  private val large = if (isWide) {
+    val r = if (reset) Reg(init=UInt(0, width - smallWidth)) else Reg(UInt(width = width - smallWidth))
+    when (nextSmall(smallWidth)) { r := r +& UInt(1) }
+    r
+  } else null
+
+  val value = if (isWide) Cat(large, small) else small
+  lazy val carryOut = {
+    val lo = (small ^ nextSmall) >> 1
+    if (!isWide) lo else {
+      val hi = Mux(nextSmall(smallWidth), large ^ (large +& UInt(1)), UInt(0)) >> 1
+      Cat(hi, lo)
+    }
+  }
+
+  def := (x: UInt) = {
+    small := x
+    if (isWide) large := x >> smallWidth
+  }
+}

src/main/scala/util/Crossing.scala

@@ -1,4 +1,4 @@
-package junctions
+package util
 
 import Chisel._
 import chisel3.util.{DecoupledIO, Decoupled, Irrevocable, IrrevocableIO, ReadyValidIO}

src/main/scala/util/Misc.scala

@@ -2,6 +2,7 @@ package util
 
 import Chisel._
 import cde.Parameters
+import scala.math._
 
 class ParameterizedBundle(implicit p: Parameters) extends Bundle {
   override def cloneType = {
@@ -26,3 +27,113 @@ class DecoupledHelper(val rvs: Seq[Bool]) {
     (rvs.filter(_ ne exclude) ++ includes).reduce(_ && _)
   }
 }
+
+object MuxT {
+  def apply[T <: Data, U <: Data](cond: Bool, con: (T, U), alt: (T, U)): (T, U) =
+    (Mux(cond, con._1, alt._1), Mux(cond, con._2, alt._2))
+
+  def apply[T <: Data, U <: Data, W <: Data](cond: Bool, con: (T, U, W), alt: (T, U, W)): (T, U, W) =
+    (Mux(cond, con._1, alt._1), Mux(cond, con._2, alt._2), Mux(cond, con._3, alt._3))
+}
+
+object Str
+{
+  def apply(s: String): UInt = {
+    var i = BigInt(0)
+    require(s.forall(validChar _))
+    for (c <- s)
+      i = (i << 8) | c
+    UInt(i, s.length*8)
+  }
+  def apply(x: Char): UInt = {
+    require(validChar(x))
+    UInt(x.toInt, 8)
+  }
+  def apply(x: UInt): UInt = apply(x, 10)
+  def apply(x: UInt, radix: Int): UInt = {
+    val rad = UInt(radix)
+    val w = x.getWidth
+    require(w > 0)
+
+    var q = x
+    var s = digit(q % rad)
+    for (i <- 1 until ceil(log(2)/log(radix)*w).toInt) {
+      q = q / rad
+      s = Cat(Mux(Bool(radix == 10) && q === UInt(0), Str(' '), digit(q % rad)), s)
+    }
+    s
+  }
+  def apply(x: SInt): UInt = apply(x, 10)
+  def apply(x: SInt, radix: Int): UInt = {
+    val neg = x < SInt(0)
+    val abs = x.abs
+    if (radix != 10) {
+      Cat(Mux(neg, Str('-'), Str(' ')), Str(abs, radix))
+    } else {
+      val rad = UInt(radix)
+      val w = abs.getWidth
+      require(w > 0)
+
+      var q = abs
+      var s = digit(q % rad)
+      var needSign = neg
+      for (i <- 1 until ceil(log(2)/log(radix)*w).toInt) {
+        q = q / rad
+        val placeSpace = q === UInt(0)
+        val space = Mux(needSign, Str('-'), Str(' '))
+        needSign = needSign && !placeSpace
+        s = Cat(Mux(placeSpace, space, digit(q % rad)), s)
+      }
+      Cat(Mux(needSign, Str('-'), Str(' ')), s)
+    }
+  }
+
+  private def digit(d: UInt): UInt = Mux(d < UInt(10), Str('0')+d, Str(('a'-10).toChar)+d)(7,0)
+  private def validChar(x: Char) = x == (x & 0xFF)
+}
+
+object Split
+{
+  // is there a better way to do do this?
+  def apply(x: Bits, n0: Int) = {
+    val w = checkWidth(x, n0)
+    (x(w-1,n0), x(n0-1,0))
+  }
+  def apply(x: Bits, n1: Int, n0: Int) = {
+    val w = checkWidth(x, n1, n0)
+    (x(w-1,n1), x(n1-1,n0), x(n0-1,0))
+  }
+  def apply(x: Bits, n2: Int, n1: Int, n0: Int) = {
+    val w = checkWidth(x, n2, n1, n0)
+    (x(w-1,n2), x(n2-1,n1), x(n1-1,n0), x(n0-1,0))
+  }
+
+  private def checkWidth(x: Bits, n: Int*) = {
+    val w = x.getWidth
+    def decreasing(x: Seq[Int]): Boolean =
+      if (x.tail.isEmpty) true
+      else x.head >= x.tail.head && decreasing(x.tail)
+    require(decreasing(w :: n.toList))
+    w
+  }
+}
+
+object Random
+{
+  def apply(mod: Int, random: UInt): UInt = {
+    if (isPow2(mod)) random(log2Up(mod)-1,0)
+    else PriorityEncoder(partition(apply(1 << log2Up(mod*8), random), mod))
+  }
+  def apply(mod: Int): UInt = apply(mod, randomizer)
+  def oneHot(mod: Int, random: UInt): UInt = {
+    if (isPow2(mod)) UIntToOH(random(log2Up(mod)-1,0))
+    else PriorityEncoderOH(partition(apply(1 << log2Up(mod*8), random), mod)).asUInt
+  }
+  def oneHot(mod: Int): UInt = oneHot(mod, randomizer)
+
+  private def randomizer = LFSR16()
+  private def round(x: Double): Int =
+    if (x.toInt.toDouble == x) x.toInt else (x.toInt + 1) & -2
+  private def partition(value: UInt, slices: Int) =
+    Seq.tabulate(slices)(i => value < UInt(round((i << value.getWidth).toDouble / slices)))
+}

src/main/scala/util/Package.scala

@@ -1,5 +1,3 @@
-package uncore
-
 import Chisel._
 
 package object util {
@@ -22,4 +20,25 @@ package object util {
 
     def asUInt(): UInt = Cat(x.map(_.asUInt).reverse)
   }
+
+  implicit def uintToBitPat(x: UInt): BitPat = BitPat(x)
+  implicit def wcToUInt(c: WideCounter): UInt = c.value
+
+  implicit class UIntToAugmentedUInt(val x: UInt) extends AnyVal {
+    def sextTo(n: Int): UInt =
+      if (x.getWidth == n) x
+      else Cat(Fill(n - x.getWidth, x(x.getWidth-1)), x)
+
+    def extract(hi: Int, lo: Int): UInt = {
+      if (hi == lo-1) UInt(0)
+      else x(hi, lo)
+    }
+  }
+
+  implicit class BooleanToAugmentedBoolean(val x: Boolean) extends AnyVal {
+    def toInt: Int = if (x) 1 else 0
+
+    // this one's snagged from scalaz
+    def option[T](z: => T): Option[T] = if (x) Some(z) else None
+  }
 }