Move a bunch more things into util package

A lot of utility code was just being imported willy-nilly from one
package to another. This moves the common code into util to make things
more sensible. The code moved were

 * The AsyncQueue and AsyncDecoupledCrossing from junctions.
 * All of the code in rocket's util.scala
 * The BlackBox asynchronous reset registers from uncore.tilelink2
 * The implicit definitions from uncore.util

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.ParameterizedBundle
+import util._
 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.ParameterizedBundle
+import util._
 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}
 

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 uncore.util.{AsyncResetRegVec}
+import util.{AsyncResetRegVec, AsyncQueue, AsyncScope}
 
 // A very simple flow control state machine, run in the specified clock domain
 class BusyRegisterCrossing(clock: Clock, reset: Bool)

src/main/scala/uncore/util/BlackBoxRegs.scala

@@ -1,110 +0,0 @@
-package uncore.util
-
-import Chisel._
-
-import cde.{Parameters}
-
-/** This black-boxes an Async Reset
-  *  (or Set)
-  * Register.
-  *  
-  * Because Chisel doesn't support
-  * parameterized black boxes, 
-  * we unfortunately have to 
-  * instantiate a number of these.
-  *  
-  *  We also have to hard-code the set/
-  *  reset behavior.
-  *  
-  *  Do not confuse an asynchronous
-  *  reset signal with an asynchronously
-  *  reset reg. You should still 
-  *  properly synchronize your reset 
-  *  deassertion.
-  *  
-  *  @param d Data input
-  *  @param q Data Output
-  *  @param clk Clock Input
-  *  @param rst Reset Input
-  *  @param en Write Enable Input
-  *  
-  */
-
-abstract class AbstractBBReg extends BlackBox {
-
-  val io = new Bundle {
-    val d = Bool(INPUT)
-    val q = Bool(OUTPUT)
-    val en = Bool(INPUT)
-
-    val clk = Clock(INPUT)
-    val rst = Bool(INPUT)
-  }
-
-}
-
-class AsyncResetReg  extends AbstractBBReg
-class AsyncSetReg extends AbstractBBReg
-
-class SimpleRegIO(val w: Int) extends Bundle{
-
-  val d = UInt(INPUT, width = w)
-  val q = UInt(OUTPUT, width = w)
-
-  val en = Bool(INPUT)
-
-}
-
-class AsyncResetRegVec(val w: Int, val init: BigInt) extends Module {
-
-  val io = new SimpleRegIO(w)
-
-  val bb_d = Mux(io.en, io.d, io.q)
-
-  val async_regs: List[AbstractBBReg] = List.tabulate(w)(
-    i => Module (
-      if (((init >> i) % 2) > 0)
-        new AsyncSetReg
-      else
-        new AsyncResetReg)
-  )
-
-  io.q := async_regs.map(_.io.q).asUInt
-
-  for ((reg, idx) <- async_regs.zipWithIndex) {
-    reg.io.clk := clock
-    reg.io.rst := reset
-    reg.io.d   := bb_d(idx)
-    reg.io.en  := io.en
-  }
-
-}
-
-object AsyncResetReg {
-  def apply(d: Bool, clk: Clock, rst: Bool, init: Boolean): Bool = {
-    val reg: AbstractBBReg =
-      if (init) Module (new AsyncSetReg)
-      else Module(new AsyncResetReg)
-    reg.io.d := d
-    reg.io.clk := clk
-    reg.io.rst := rst
-    reg.io.en  := Bool(true)
-    reg.io.q
-  }
-
-  def apply(d: Bool, clk: Clock, rst: Bool): Bool = apply(d, clk, rst, false)
-
-  def apply(updateData: UInt, resetData: BigInt, enable: Bool): UInt = {
-    val w = updateData.getWidth max resetData.bitLength
-    val reg = Module(new AsyncResetRegVec(w, resetData))
-    reg.io.d := updateData
-    reg.io.en := enable
-    reg.io.q
-  }
-
-  def apply(updateData: UInt, resetData: BigInt): UInt = apply(updateData, resetData, enable=Bool(true))
-
-  def apply(updateData: UInt, enable: Bool): UInt = apply(updateData, resetData=BigInt(0), enable)
-
-  def apply(updateData: UInt): UInt = apply(updateData, resetData=BigInt(0), enable=Bool(true))
-}

src/main/scala/uncore/util/Package.scala

@@ -1,25 +0,0 @@
-package uncore
-
-import Chisel._
-
-package object util {
-  implicit class UIntIsOneOf(val x: UInt) extends AnyVal {
-    def isOneOf(s: Seq[UInt]): Bool = s.map(x === _).reduce(_||_)
-  
-    def isOneOf(u1: UInt, u2: UInt*): Bool = isOneOf(u1 +: u2.toSeq)
-  }
-
-  implicit class SeqToAugmentedSeq[T <: Data](val x: Seq[T]) extends AnyVal {
-    def apply(idx: UInt): T = {
-      if (x.size == 1) {
-        x.head
-      } else {
-        val half = 1 << (log2Ceil(x.size) - 1)
-        val newIdx = idx & UInt(half - 1)
-        Mux(idx >= UInt(half), x.drop(half)(newIdx), x.take(half)(newIdx))
-      }
-    }
-
-    def asUInt(): UInt = Cat(x.map(_.asUInt).reverse)
-  }
-}