Address chisel3 changes to DataMirror, AutoCloneType and new deprecat…

…ion warnings (#619)
ucb-bar · Feb 14, 2023 · fed4822 · fed4822
1 parent cc7ba49
commit fed4822
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/build.sbt b/build.sbt
@@ -60,13 +60,16 @@ scalacOptions ++= Seq(
   "-Xcheckinit",
   // do not warn about firrtl imports, once the firrtl repo is removed, we will need to import the code
   "-Wconf:cat=deprecation&msg=Importing from firrtl is deprecated:s",
+  // do not warn about firrtl deprecations
+  "-Wconf:cat=deprecation&msg=will not be supported as part of the migration to the MLIR-based FIRRTL Compiler:s",
   // TODO: remove FixedPoint support after 3.6 release
   "-Wconf:cat=deprecation&msg=class FixedPoint:s",
   "-Wconf:cat=deprecation&msg=class BinaryPoint:s",
   "-Wconf:cat=deprecation&msg=object FixedPoint:s",
   "-Wconf:cat=deprecation&msg=class fromDoubleToLiteral:s",
   "-Wconf:cat=deprecation&msg=class fromBigDecimalToLiteral:s",
   "-Wconf:cat=deprecation&msg=trait HasBinaryPoint:s",
+  "-Wconf:cat=deprecation&msg=object UnknownBinaryPoint:s",
   // TODO: remove Interval support after 3.6 release
   "-Wconf:cat=deprecation&msg=class Interval:s",
   "-Wconf:cat=deprecation&msg=object Interval:s",

diff --git a/src/main/scala/chiseltest/experimental/UncheckedClockPoke.scala b/src/main/scala/chiseltest/experimental/UncheckedClockPoke.scala
@@ -5,7 +5,8 @@ package chiseltest.experimental
 import chiseltest.UnpokeableException
 import chiseltest.internal.Context
 import chisel3._
-import chisel3.experimental.{DataMirror, Direction}
+import chisel3.reflect._
+import chisel3.experimental.Direction
 
 package object UncheckedClockPoke {
 

diff --git a/src/main/scala/chiseltest/internal/BackendExecutive.scala b/src/main/scala/chiseltest/internal/BackendExecutive.scala
@@ -2,7 +2,8 @@
 
 package chiseltest.internal
 
-import chisel3.experimental.{BaseModule, DataMirror}
+import chisel3.experimental.BaseModule
+import chisel3.reflect.DataMirror
 import chisel3.{Data, Element, Module, Record, Vec}
 import chiseltest.coverage.Coverage
 import chiseltest.simulator.{Compiler, DebugPrintWrapper, Simulator}

diff --git a/src/main/scala/chiseltest/internal/PeekPokeTesterBackend.scala b/src/main/scala/chiseltest/internal/PeekPokeTesterBackend.scala
@@ -1,7 +1,7 @@
 package chiseltest.internal
 
 import chisel3._
-import chisel3.experimental.DataMirror
+import chisel3.reflect.DataMirror
 import chiseltest.defaults
 import chiseltest.iotesters.PeekPokeTester
 import chiseltest.simulator.SimulatorContext

diff --git a/src/main/scala/chiseltest/package.scala b/src/main/scala/chiseltest/package.scala
@@ -3,7 +3,8 @@
 import scala.language.implicitConversions
 import chiseltest.internal._
 import chisel3._
-import chisel3.experimental.{DataMirror, Direction, FixedPoint, Interval}
+import chisel3.experimental.{Direction, FixedPoint, Interval}
+import chisel3.reflect.DataMirror
 import chisel3.experimental.BundleLiterals._
 import chisel3.experimental.VecLiterals._
 import chisel3.internal.firrtl.KnownBinaryPoint

diff --git a/src/test/scala/chiseltest/tests/TestUtils.scala b/src/test/scala/chiseltest/tests/TestUtils.scala
@@ -3,8 +3,6 @@
 package chiseltest.tests
 
 import chisel3._
-import chisel3.experimental.{AutoCloneType, DataMirror}
-import chisel3.internal.requireIsChiselType
 import chisel3.util._
 
 import scala.collection.immutable.ListMap
@@ -43,7 +41,7 @@ class QueueModule[T <: Data](ioType: T, entries: Int) extends Module {
 }
 
 /** borrowed from chiselTests/RecordSpec.scala */
-final class CustomBundle(elts: (String, Data)*) extends Record with AutoCloneType {
+final class CustomBundle(elts: (String, Data)*) extends Record {
   val elements = ListMap(elts.map { case (field, elt) => field -> elt.cloneType }: _*)
   def apply(elt: String): Data = elements(elt)
 }