move files over

chipsalliance · adkian-sifive · Oct 8, 2025 · Nov 19, 2025 · Nov 19, 2025 · Nov 19, 2025
commit 22f570b3c0299d5f906e3a25d3f34cb56d022ca7
diff --git a/...est/scala-2/chisel3/PlaceholderSpec.scala → src/test/scala/chisel3/PlaceholderSpec.scala b/...est/scala-2/chisel3/PlaceholderSpec.scala → src/test/scala/chisel3/PlaceholderSpec.scala
diff --git a/.../chisel3/internal/ContainsProbeSpec.scala → .../chisel3/internal/ContainsProbeSpec.scala b/.../chisel3/internal/ContainsProbeSpec.scala → .../chisel3/internal/ContainsProbeSpec.scala
diff --git a/...a-2/chisel3/internal/IdentifierSpec.scala → ...ala/chisel3/internal/IdentifierSpec.scala b/...a-2/chisel3/internal/IdentifierSpec.scala → ...ala/chisel3/internal/IdentifierSpec.scala
diff --git a/.../chisel3/internal/NameCollisionSpec.scala → .../chisel3/internal/NameCollisionSpec.scala b/.../chisel3/internal/NameCollisionSpec.scala → .../chisel3/internal/NameCollisionSpec.scala
diff --git a/...la-2/chisel3/internal/NamespaceSpec.scala → ...cala/chisel3/internal/NamespaceSpec.scala b/...la-2/chisel3/internal/NamespaceSpec.scala → ...cala/chisel3/internal/NamespaceSpec.scala
diff --git a/...chisel3/stage/ChiselOptionsViewSpec.scala → ...chisel3/stage/ChiselOptionsViewSpec.scala b/...chisel3/stage/ChiselOptionsViewSpec.scala → ...chisel3/stage/ChiselOptionsViewSpec.scala
@@ -3,7 +3,7 @@
 package chisel3.stage
 
 import firrtl.options.Viewer.view
-import firrtl.RenameMap
+import firrtl.{RenameMap, seqToAnnoSeq}
 
 import chisel3.ElaboratedCircuit
 import chisel3.stage._

diff --git a/...t/scala-2/chisel3/testers/TestUtils.scala → ...est/scala/chisel3/testers/TestUtils.scala b/...t/scala-2/chisel3/testers/TestUtils.scala → ...est/scala/chisel3/testers/TestUtils.scala
diff --git a/...est/scala-2/chisel3/util/BitPatSpec.scala → src/test/scala/chisel3/util/BitPatSpec.scala b/...est/scala-2/chisel3/util/BitPatSpec.scala → src/test/scala/chisel3/util/BitPatSpec.scala
diff --git a/.../experimental/decode/TruthTableSpec.scala → .../experimental/decode/TruthTableSpec.scala b/.../experimental/decode/TruthTableSpec.scala → .../experimental/decode/TruthTableSpec.scala
diff --git a/src/test/scala-2/chiselTests/AdderTree.scala → src/test/scala/chiselTests/AdderTree.scala b/src/test/scala-2/chiselTests/AdderTree.scala → src/test/scala/chiselTests/AdderTree.scala
@@ -20,7 +20,7 @@ class AdderTreeTester(bitWidth: Int, numsToAdd: List[Int]) extends Module {
   val dut = Module(new AdderTree(genType, numsToAdd.size))
   dut.io.numIn := VecInit(numsToAdd.map(x => x.asUInt(bitWidth.W)))
   val sumCorrect = dut.io.numOut === (numsToAdd.reduce(_ + _) % (1 << bitWidth)).asUInt(bitWidth.W)
-  assert(sumCorrect)
+  chisel3.assert(sumCorrect)
   stop()
 }
 

diff --git a/...2/chiselTests/AnalogIntegrationSpec.scala → ...a/chiselTests/AnalogIntegrationSpec.scala b/...2/chiselTests/AnalogIntegrationSpec.scala → ...a/chiselTests/AnalogIntegrationSpec.scala
diff --git a/...test/scala-2/chiselTests/AnalogSpec.scala → src/test/scala/chiselTests/AnalogSpec.scala b/...test/scala-2/chiselTests/AnalogSpec.scala → src/test/scala/chiselTests/AnalogSpec.scala
diff --git a/...2/chiselTests/AnnotatingDiamondSpec.scala → ...a/chiselTests/AnnotatingDiamondSpec.scala b/...2/chiselTests/AnnotatingDiamondSpec.scala → ...a/chiselTests/AnnotatingDiamondSpec.scala
diff --git a/...-2/chiselTests/AnnotationInlineSpec.scala → ...la/chiselTests/AnnotationInlineSpec.scala b/...-2/chiselTests/AnnotationInlineSpec.scala → ...la/chiselTests/AnnotationInlineSpec.scala
diff --git a/...ala-2/chiselTests/AnnotationNoDedup.scala → ...scala/chiselTests/AnnotationNoDedup.scala b/...ala-2/chiselTests/AnnotationNoDedup.scala → ...scala/chiselTests/AnnotationNoDedup.scala
diff --git a/.../scala-2/chiselTests/AsTypeOfTester.scala → ...st/scala/chiselTests/AsTypeOfTester.scala b/.../scala-2/chiselTests/AsTypeOfTester.scala → ...st/scala/chiselTests/AsTypeOfTester.scala
diff --git a/src/test/scala-2/chiselTests/Assert.scala → src/test/scala/chiselTests/Assert.scala b/src/test/scala-2/chiselTests/Assert.scala → src/test/scala/chiselTests/Assert.scala
diff --git a/.../scala-2/chiselTests/AsyncResetSpec.scala → ...st/scala/chiselTests/AsyncResetSpec.scala b/.../scala-2/chiselTests/AsyncResetSpec.scala → ...st/scala/chiselTests/AsyncResetSpec.scala
diff --git a/...ala-2/chiselTests/AutoClonetypeSpec.scala → ...scala/chiselTests/AutoClonetypeSpec.scala b/...ala-2/chiselTests/AutoClonetypeSpec.scala → ...scala/chiselTests/AutoClonetypeSpec.scala
@@ -344,7 +344,7 @@ class AutoClonetypeSpec extends AnyFlatSpec with Matchers {
     }
     emitCHIRRTL {
       new Module {
-        implicit val x = 8
+        implicit val x: Int = 8
         val in = IO(Input(new MyBundle))
         val out = IO(Output(new MyBundle))
         out := in

diff --git a/...a-2/chiselTests/AutoNestedCloneSpec.scala → ...ala/chiselTests/AutoNestedCloneSpec.scala b/...a-2/chiselTests/AutoNestedCloneSpec.scala → ...ala/chiselTests/AutoNestedCloneSpec.scala
diff --git a/...ala-2/chiselTests/BetterNamingTests.scala → ...scala/chiselTests/BetterNamingTests.scala b/...ala-2/chiselTests/BetterNamingTests.scala → ...scala/chiselTests/BetterNamingTests.scala
diff --git a/...test/scala-2/chiselTests/BitwiseOps.scala → src/test/scala/chiselTests/BitwiseOps.scala b/...test/scala-2/chiselTests/BitwiseOps.scala → src/test/scala/chiselTests/BitwiseOps.scala
diff --git a/src/test/scala-2/chiselTests/BlackBox.scala → src/test/scala/chiselTests/BlackBox.scala b/src/test/scala-2/chiselTests/BlackBox.scala → src/test/scala/chiselTests/BlackBox.scala
diff --git a/...st/scala-2/chiselTests/BlackBoxImpl.scala → ...test/scala/chiselTests/BlackBoxImpl.scala b/...st/scala-2/chiselTests/BlackBoxImpl.scala → ...test/scala/chiselTests/BlackBoxImpl.scala
diff --git a/src/test/scala-2/chiselTests/BoolSpec.scala → src/test/scala/chiselTests/BoolSpec.scala b/src/test/scala-2/chiselTests/BoolSpec.scala → src/test/scala/chiselTests/BoolSpec.scala
diff --git a/...scala-2/chiselTests/BoringUtilsSpec.scala → ...t/scala/chiselTests/BoringUtilsSpec.scala b/...scala-2/chiselTests/BoringUtilsSpec.scala → ...t/scala/chiselTests/BoringUtilsSpec.scala
diff --git a/...scala-2/chiselTests/BulkConnectSpec.scala → ...t/scala/chiselTests/BulkConnectSpec.scala b/...scala-2/chiselTests/BulkConnectSpec.scala → ...t/scala/chiselTests/BulkConnectSpec.scala
diff --git a/...la-2/chiselTests/BundleElementsSpec.scala → ...cala/chiselTests/BundleElementsSpec.scala b/...la-2/chiselTests/BundleElementsSpec.scala → ...cala/chiselTests/BundleElementsSpec.scala
diff --git a/...ala-2/chiselTests/BundleLiteralSpec.scala → ...scala/chiselTests/BundleLiteralSpec.scala b/...ala-2/chiselTests/BundleLiteralSpec.scala → ...scala/chiselTests/BundleLiteralSpec.scala
diff --git a/...test/scala-2/chiselTests/BundleWire.scala → src/test/scala/chiselTests/BundleWire.scala b/...test/scala-2/chiselTests/BundleWire.scala → src/test/scala/chiselTests/BundleWire.scala
diff --git a/...test/scala-2/chiselTests/ChiselEnum.scala → src/test/scala/chiselTests/ChiselEnum.scala b/...test/scala-2/chiselTests/ChiselEnum.scala → src/test/scala/chiselTests/ChiselEnum.scala
diff --git a/...chiselTests/ChiselTestUtilitiesSpec.scala → ...chiselTests/ChiselTestUtilitiesSpec.scala b/...chiselTests/ChiselTestUtilitiesSpec.scala → ...chiselTests/ChiselTestUtilitiesSpec.scala
diff --git a/src/test/scala-2/chiselTests/ClockSpec.scala → src/test/scala/chiselTests/ClockSpec.scala b/src/test/scala-2/chiselTests/ClockSpec.scala → src/test/scala/chiselTests/ClockSpec.scala
diff --git a/...scala-2/chiselTests/CloneModuleSpec.scala → ...t/scala/chiselTests/CloneModuleSpec.scala b/...scala-2/chiselTests/CloneModuleSpec.scala → ...t/scala/chiselTests/CloneModuleSpec.scala
diff --git a/...t/scala-2/chiselTests/ComplexAssign.scala → ...est/scala/chiselTests/ComplexAssign.scala b/...t/scala-2/chiselTests/ComplexAssign.scala → ...est/scala/chiselTests/ComplexAssign.scala
diff --git a/...est/scala-2/chiselTests/ConnectSpec.scala → src/test/scala/chiselTests/ConnectSpec.scala b/...est/scala-2/chiselTests/ConnectSpec.scala → src/test/scala/chiselTests/ConnectSpec.scala
diff --git a/...scala-2/chiselTests/ConnectableSpec.scala → ...t/scala/chiselTests/ConnectableSpec.scala b/...scala-2/chiselTests/ConnectableSpec.scala → ...t/scala/chiselTests/ConnectableSpec.scala
diff --git a/src/test/scala-2/chiselTests/ConstSpec.scala → src/test/scala/chiselTests/ConstSpec.scala b/src/test/scala-2/chiselTests/ConstSpec.scala → src/test/scala/chiselTests/ConstSpec.scala
diff --git a/src/test/scala-2/chiselTests/Counter.scala → src/test/scala/chiselTests/Counter.scala b/src/test/scala-2/chiselTests/Counter.scala → src/test/scala/chiselTests/Counter.scala
diff --git a/...st/scala-2/chiselTests/CustomBundle.scala → ...test/scala/chiselTests/CustomBundle.scala b/...st/scala-2/chiselTests/CustomBundle.scala → ...test/scala/chiselTests/CustomBundle.scala
diff --git a/src/test/scala-2/chiselTests/DPISpec.scala → src/test/scala/chiselTests/DPISpec.scala b/src/test/scala-2/chiselTests/DPISpec.scala → src/test/scala/chiselTests/DPISpec.scala
diff --git a/...cala-2/chiselTests/DataEqualitySpec.scala → .../scala/chiselTests/DataEqualitySpec.scala b/...cala-2/chiselTests/DataEqualitySpec.scala → .../scala/chiselTests/DataEqualitySpec.scala
diff --git a/src/test/scala-2/chiselTests/DataPrint.scala → src/test/scala/chiselTests/DataPrint.scala b/src/test/scala-2/chiselTests/DataPrint.scala → src/test/scala/chiselTests/DataPrint.scala
diff --git a/src/test/scala-2/chiselTests/Decoder.scala → src/test/scala/chiselTests/Decoder.scala b/src/test/scala-2/chiselTests/Decoder.scala → src/test/scala/chiselTests/Decoder.scala
diff --git a/...t/scala-2/chiselTests/DecoupledSpec.scala → ...est/scala/chiselTests/DecoupledSpec.scala b/...t/scala-2/chiselTests/DecoupledSpec.scala → ...est/scala/chiselTests/DecoupledSpec.scala
diff --git a/src/test/scala-2/chiselTests/DedupSpec.scala → src/test/scala/chiselTests/DedupSpec.scala b/src/test/scala-2/chiselTests/DedupSpec.scala → src/test/scala/chiselTests/DedupSpec.scala
diff --git a/src/test/scala-2/chiselTests/Direction.scala → src/test/scala/chiselTests/Direction.scala b/src/test/scala-2/chiselTests/Direction.scala → src/test/scala/chiselTests/Direction.scala
diff --git a/...est/scala-2/chiselTests/DisableSpec.scala → src/test/scala/chiselTests/DisableSpec.scala b/...est/scala-2/chiselTests/DisableSpec.scala → src/test/scala/chiselTests/DisableSpec.scala
diff --git a/...t/scala-2/chiselTests/DontTouchSpec.scala → ...est/scala/chiselTests/DontTouchSpec.scala b/...t/scala-2/chiselTests/DontTouchSpec.scala → ...est/scala/chiselTests/DontTouchSpec.scala
diff --git a/...a-2/chiselTests/EnableShiftRegister.scala → ...ala/chiselTests/EnableShiftRegister.scala b/...a-2/chiselTests/EnableShiftRegister.scala → ...ala/chiselTests/EnableShiftRegister.scala
diff --git a/src/test/scala-2/chiselTests/EnumSpec.scala → src/test/scala/chiselTests/EnumSpec.scala b/src/test/scala-2/chiselTests/EnumSpec.scala → src/test/scala/chiselTests/EnumSpec.scala
diff --git a/src/test/scala-2/chiselTests/ExtModule.scala → src/test/scala/chiselTests/ExtModule.scala b/src/test/scala-2/chiselTests/ExtModule.scala → src/test/scala/chiselTests/ExtModule.scala
diff --git a/...t/scala-2/chiselTests/ExtModuleImpl.scala → ...est/scala/chiselTests/ExtModuleImpl.scala b/...t/scala-2/chiselTests/ExtModuleImpl.scala → ...est/scala/chiselTests/ExtModuleImpl.scala
diff --git a/...ala-2/chiselTests/FixedIOModuleSpec.scala → ...scala/chiselTests/FixedIOModuleSpec.scala b/...ala-2/chiselTests/FixedIOModuleSpec.scala → ...scala/chiselTests/FixedIOModuleSpec.scala
diff --git a/src/test/scala-2/chiselTests/GCD.scala → src/test/scala/chiselTests/GCD.scala b/src/test/scala-2/chiselTests/GCD.scala → src/test/scala/chiselTests/GCD.scala
diff --git a/...scala-2/chiselTests/IOCompatibility.scala → ...t/scala/chiselTests/IOCompatibility.scala b/...scala-2/chiselTests/IOCompatibility.scala → ...t/scala/chiselTests/IOCompatibility.scala
diff --git a/.../scala-2/chiselTests/IllegalRefSpec.scala → ...st/scala/chiselTests/IllegalRefSpec.scala b/.../scala-2/chiselTests/IllegalRefSpec.scala → ...st/scala/chiselTests/IllegalRefSpec.scala
diff --git a/...chiselTests/ImplicitConversionsSpec.scala → ...chiselTests/ImplicitConversionsSpec.scala b/...chiselTests/ImplicitConversionsSpec.scala → ...chiselTests/ImplicitConversionsSpec.scala
diff --git a/...test/scala-2/chiselTests/InlineSpec.scala → src/test/scala/chiselTests/InlineSpec.scala b/...test/scala-2/chiselTests/InlineSpec.scala → src/test/scala/chiselTests/InlineSpec.scala
diff --git a/...cala-2/chiselTests/InstanceNameSpec.scala → .../scala/chiselTests/InstanceNameSpec.scala b/...cala-2/chiselTests/InstanceNameSpec.scala → .../scala/chiselTests/InstanceNameSpec.scala
diff --git a/...scala-2/chiselTests/IntegerMathSpec.scala → ...t/scala/chiselTests/IntegerMathSpec.scala b/...scala-2/chiselTests/IntegerMathSpec.scala → ...t/scala/chiselTests/IntegerMathSpec.scala
diff --git a/...scala-2/chiselTests/IntrinsicModule.scala → ...t/scala/chiselTests/IntrinsicModule.scala b/...scala-2/chiselTests/IntrinsicModule.scala → ...t/scala/chiselTests/IntrinsicModule.scala
diff --git a/...t/scala-2/chiselTests/IntrinsicSpec.scala → ...est/scala/chiselTests/IntrinsicSpec.scala b/...t/scala-2/chiselTests/IntrinsicSpec.scala → ...est/scala/chiselTests/IntrinsicSpec.scala
diff --git a/...ala-2/chiselTests/InvalidateAPISpec.scala → ...scala/chiselTests/InvalidateAPISpec.scala b/...ala-2/chiselTests/InvalidateAPISpec.scala → ...scala/chiselTests/InvalidateAPISpec.scala
diff --git a/...t/scala-2/chiselTests/LazyCloneSpec.scala → ...est/scala/chiselTests/LazyCloneSpec.scala b/...t/scala-2/chiselTests/LazyCloneSpec.scala → ...est/scala/chiselTests/LazyCloneSpec.scala
diff --git a/...-2/chiselTests/LiteralExtractorSpec.scala → ...la/chiselTests/LiteralExtractorSpec.scala b/...-2/chiselTests/LiteralExtractorSpec.scala → ...la/chiselTests/LiteralExtractorSpec.scala
diff --git a/...a-2/chiselTests/LiteralToTargetSpec.scala → ...ala/chiselTests/LiteralToTargetSpec.scala b/...a-2/chiselTests/LiteralToTargetSpec.scala → ...ala/chiselTests/LiteralToTargetSpec.scala
diff --git a/.../chiselTests/LoadMemoryFromFileSpec.scala → .../chiselTests/LoadMemoryFromFileSpec.scala b/.../chiselTests/LoadMemoryFromFileSpec.scala → .../chiselTests/LoadMemoryFromFileSpec.scala
diff --git a/src/test/scala-2/chiselTests/LogUtils.scala → src/test/scala/chiselTests/LogUtils.scala b/src/test/scala-2/chiselTests/LogUtils.scala → src/test/scala/chiselTests/LogUtils.scala
diff --git a/src/test/scala-2/chiselTests/Math.scala → src/test/scala/chiselTests/Math.scala b/src/test/scala-2/chiselTests/Math.scala → src/test/scala/chiselTests/Math.scala
diff --git a/src/test/scala-2/chiselTests/Mem.scala → src/test/scala/chiselTests/Mem.scala b/src/test/scala-2/chiselTests/Mem.scala → src/test/scala/chiselTests/Mem.scala
diff --git a/...st/scala-2/chiselTests/MemorySearch.scala → ...test/scala/chiselTests/MemorySearch.scala b/...st/scala-2/chiselTests/MemorySearch.scala → ...test/scala/chiselTests/MemorySearch.scala
diff --git a/...st/scala-2/chiselTests/MixedVecSpec.scala → ...test/scala/chiselTests/MixedVecSpec.scala b/...st/scala-2/chiselTests/MixedVecSpec.scala → ...test/scala/chiselTests/MixedVecSpec.scala
diff --git a/...cala-2/chiselTests/ModuleChoiceSpec.scala → .../scala/chiselTests/ModuleChoiceSpec.scala b/...cala-2/chiselTests/ModuleChoiceSpec.scala → .../scala/chiselTests/ModuleChoiceSpec.scala
diff --git a/...test/scala-2/chiselTests/ModuleSpec.scala → src/test/scala/chiselTests/ModuleSpec.scala b/...test/scala-2/chiselTests/ModuleSpec.scala → src/test/scala/chiselTests/ModuleSpec.scala
diff --git a/src/test/scala-2/chiselTests/MulLookup.scala → src/test/scala/chiselTests/MulLookup.scala b/src/test/scala-2/chiselTests/MulLookup.scala → src/test/scala/chiselTests/MulLookup.scala
diff --git a/...est/scala-2/chiselTests/MultiAssign.scala → src/test/scala/chiselTests/MultiAssign.scala b/...est/scala-2/chiselTests/MultiAssign.scala → src/test/scala/chiselTests/MultiAssign.scala
diff --git a/.../scala-2/chiselTests/MultiClockSpec.scala → ...st/scala/chiselTests/MultiClockSpec.scala b/.../scala-2/chiselTests/MultiClockSpec.scala → ...st/scala/chiselTests/MultiClockSpec.scala
diff --git a/src/test/scala-2/chiselTests/MuxSpec.scala → src/test/scala/chiselTests/MuxSpec.scala b/src/test/scala-2/chiselTests/MuxSpec.scala → src/test/scala/chiselTests/MuxSpec.scala
diff --git a/...ala-2/chiselTests/NamedModuleTester.scala → ...scala/chiselTests/NamedModuleTester.scala b/...ala-2/chiselTests/NamedModuleTester.scala → ...scala/chiselTests/NamedModuleTester.scala
diff --git a/...t/scala-2/chiselTests/OneHotMuxSpec.scala → ...est/scala/chiselTests/OneHotMuxSpec.scala b/...t/scala-2/chiselTests/OneHotMuxSpec.scala → ...est/scala/chiselTests/OneHotMuxSpec.scala
diff --git a/...st/scala-2/chiselTests/OptionBundle.scala → ...test/scala/chiselTests/OptionBundle.scala b/...st/scala-2/chiselTests/OptionBundle.scala → ...test/scala/chiselTests/OptionBundle.scala
diff --git a/src/test/scala-2/chiselTests/Padding.scala → src/test/scala/chiselTests/Padding.scala b/src/test/scala-2/chiselTests/Padding.scala → src/test/scala/chiselTests/Padding.scala
diff --git a/...a-2/chiselTests/ParameterizedModule.scala → ...ala/chiselTests/ParameterizedModule.scala b/...a-2/chiselTests/ParameterizedModule.scala → ...ala/chiselTests/ParameterizedModule.scala
diff --git a/src/test/scala-2/chiselTests/PopCount.scala → src/test/scala/chiselTests/PopCount.scala b/src/test/scala-2/chiselTests/PopCount.scala → src/test/scala/chiselTests/PopCount.scala
diff --git a/src/test/scala-2/chiselTests/PortSpec.scala → src/test/scala/chiselTests/PortSpec.scala b/src/test/scala-2/chiselTests/PortSpec.scala → src/test/scala/chiselTests/PortSpec.scala
diff --git a/...t/scala-2/chiselTests/PrintableSpec.scala → ...est/scala/chiselTests/PrintableSpec.scala b/...t/scala-2/chiselTests/PrintableSpec.scala → ...est/scala/chiselTests/PrintableSpec.scala
diff --git a/src/test/scala-2/chiselTests/Printf.scala → src/test/scala/chiselTests/Printf.scala b/src/test/scala-2/chiselTests/Printf.scala → src/test/scala/chiselTests/Printf.scala
diff --git a/src/test/scala-2/chiselTests/ProbeSpec.scala → src/test/scala/chiselTests/ProbeSpec.scala b/src/test/scala-2/chiselTests/ProbeSpec.scala → src/test/scala/chiselTests/ProbeSpec.scala
diff --git a/...t/scala-2/chiselTests/PropertyUtils.scala → ...est/scala/chiselTests/PropertyUtils.scala b/...t/scala-2/chiselTests/PropertyUtils.scala → ...est/scala/chiselTests/PropertyUtils.scala
diff --git a/...cala-2/chiselTests/PublicModuleSpec.scala → .../scala/chiselTests/PublicModuleSpec.scala b/...cala-2/chiselTests/PublicModuleSpec.scala → .../scala/chiselTests/PublicModuleSpec.scala
diff --git a/...t/scala-2/chiselTests/RawModuleSpec.scala → ...est/scala/chiselTests/RawModuleSpec.scala b/...t/scala-2/chiselTests/RawModuleSpec.scala → ...est/scala/chiselTests/RawModuleSpec.scala
diff --git a/...st/scala-2/chiselTests/ReadOnlySpec.scala → ...test/scala/chiselTests/ReadOnlySpec.scala b/...st/scala-2/chiselTests/ReadOnlySpec.scala → ...test/scala/chiselTests/ReadOnlySpec.scala
diff --git a/...t/scala-2/chiselTests/RebindingSpec.scala → ...est/scala/chiselTests/RebindingSpec.scala b/...t/scala-2/chiselTests/RebindingSpec.scala → ...est/scala/chiselTests/RebindingSpec.scala
diff --git a/...test/scala-2/chiselTests/RecordSpec.scala → src/test/scala/chiselTests/RecordSpec.scala b/...test/scala-2/chiselTests/RecordSpec.scala → src/test/scala/chiselTests/RecordSpec.scala
diff --git a/.../scala-2/chiselTests/ReduceTreeSpec.scala → ...st/scala/chiselTests/ReduceTreeSpec.scala b/.../scala-2/chiselTests/ReduceTreeSpec.scala → ...st/scala/chiselTests/ReduceTreeSpec.scala
diff --git a/src/test/scala-2/chiselTests/RegSpec.scala → src/test/scala/chiselTests/RegSpec.scala b/src/test/scala-2/chiselTests/RegSpec.scala → src/test/scala/chiselTests/RegSpec.scala
diff --git a/src/test/scala-2/chiselTests/ResetSpec.scala → src/test/scala/chiselTests/ResetSpec.scala b/src/test/scala-2/chiselTests/ResetSpec.scala → src/test/scala/chiselTests/ResetSpec.scala
diff --git a/src/test/scala-2/chiselTests/Risc.scala → src/test/scala/chiselTests/Risc.scala b/src/test/scala-2/chiselTests/Risc.scala → src/test/scala/chiselTests/Risc.scala
diff --git a/src/test/scala-2/chiselTests/SIntOps.scala → src/test/scala/chiselTests/SIntOps.scala b/src/test/scala-2/chiselTests/SIntOps.scala → src/test/scala/chiselTests/SIntOps.scala
diff --git a/...test/scala-2/chiselTests/SimLogSpec.scala → src/test/scala/chiselTests/SimLogSpec.scala b/...test/scala-2/chiselTests/SimLogSpec.scala → src/test/scala/chiselTests/SimLogSpec.scala
diff --git a/...ala-2/chiselTests/SourceLocatorSpec.scala → ...scala/chiselTests/SourceLocatorSpec.scala b/...ala-2/chiselTests/SourceLocatorSpec.scala → ...scala/chiselTests/SourceLocatorSpec.scala
diff --git a/src/test/scala-2/chiselTests/Stack.scala → src/test/scala/chiselTests/Stack.scala b/src/test/scala-2/chiselTests/Stack.scala → src/test/scala/chiselTests/Stack.scala
diff --git a/src/test/scala-2/chiselTests/Stop.scala → src/test/scala/chiselTests/Stop.scala b/src/test/scala-2/chiselTests/Stop.scala → src/test/scala/chiselTests/Stop.scala
diff --git a/...test/scala-2/chiselTests/SwitchSpec.scala → src/test/scala/chiselTests/SwitchSpec.scala b/...test/scala-2/chiselTests/SwitchSpec.scala → src/test/scala/chiselTests/SwitchSpec.scala
diff --git a/src/test/scala-2/chiselTests/Tbl.scala → src/test/scala/chiselTests/Tbl.scala b/src/test/scala-2/chiselTests/Tbl.scala → src/test/scala/chiselTests/Tbl.scala
diff --git a/...t/scala-2/chiselTests/TypeAliasSpec.scala → ...est/scala/chiselTests/TypeAliasSpec.scala b/...t/scala-2/chiselTests/TypeAliasSpec.scala → ...est/scala/chiselTests/TypeAliasSpec.scala
diff --git a/src/test/scala-2/chiselTests/UIntOps.scala → src/test/scala/chiselTests/UIntOps.scala b/src/test/scala-2/chiselTests/UIntOps.scala → src/test/scala/chiselTests/UIntOps.scala
diff --git a/...cala-2/chiselTests/UnitTestMainSpec.scala → .../scala/chiselTests/UnitTestMainSpec.scala b/...cala-2/chiselTests/UnitTestMainSpec.scala → .../scala/chiselTests/UnitTestMainSpec.scala
diff --git a/src/test/scala-2/chiselTests/Util.scala → src/test/scala/chiselTests/Util.scala b/src/test/scala-2/chiselTests/Util.scala → src/test/scala/chiselTests/Util.scala
diff --git a/src/test/scala-2/chiselTests/ValidSpec.scala → src/test/scala/chiselTests/ValidSpec.scala b/src/test/scala-2/chiselTests/ValidSpec.scala → src/test/scala/chiselTests/ValidSpec.scala
diff --git a/src/test/scala-2/chiselTests/Vec.scala → src/test/scala/chiselTests/Vec.scala b/src/test/scala-2/chiselTests/Vec.scala → src/test/scala/chiselTests/Vec.scala
diff --git a/.../scala-2/chiselTests/VecLiteralSpec.scala → ...st/scala/chiselTests/VecLiteralSpec.scala b/.../scala-2/chiselTests/VecLiteralSpec.scala → ...st/scala/chiselTests/VecLiteralSpec.scala
diff --git a/...scala-2/chiselTests/VecToTargetSpec.scala → ...t/scala/chiselTests/VecToTargetSpec.scala b/...scala-2/chiselTests/VecToTargetSpec.scala → ...t/scala/chiselTests/VecToTargetSpec.scala
diff --git a/.../scala-2/chiselTests/VectorPacketIO.scala → ...st/scala/chiselTests/VectorPacketIO.scala b/.../scala-2/chiselTests/VectorPacketIO.scala → ...st/scala/chiselTests/VectorPacketIO.scala
diff --git a/...cala-2/chiselTests/VerificationSpec.scala → .../scala/chiselTests/VerificationSpec.scala b/...cala-2/chiselTests/VerificationSpec.scala → .../scala/chiselTests/VerificationSpec.scala
diff --git a/...est/scala-2/chiselTests/WarningSpec.scala → src/test/scala/chiselTests/WarningSpec.scala b/...est/scala-2/chiselTests/WarningSpec.scala → src/test/scala/chiselTests/WarningSpec.scala
diff --git a/src/test/scala-2/chiselTests/WhenSpec.scala → src/test/scala/chiselTests/WhenSpec.scala b/src/test/scala-2/chiselTests/WhenSpec.scala → src/test/scala/chiselTests/WhenSpec.scala
diff --git a/src/test/scala-2/chiselTests/WidthSpec.scala → src/test/scala/chiselTests/WidthSpec.scala b/src/test/scala-2/chiselTests/WidthSpec.scala → src/test/scala/chiselTests/WidthSpec.scala
diff --git a/src/test/scala-2/chiselTests/WireSpec.scala → src/test/scala/chiselTests/WireSpec.scala b/src/test/scala-2/chiselTests/WireSpec.scala → src/test/scala/chiselTests/WireSpec.scala
diff --git a/.../scala-2/chiselTests/aop/SelectSpec.scala → ...st/scala/chiselTests/aop/SelectSpec.scala b/.../scala-2/chiselTests/aop/SelectSpec.scala → ...st/scala/chiselTests/aop/SelectSpec.scala
diff --git a/...ala-2/chiselTests/interface/Drivers.scala → ...scala/chiselTests/interface/Drivers.scala b/...ala-2/chiselTests/interface/Drivers.scala → ...scala/chiselTests/interface/Drivers.scala
diff --git a/...chiselTests/interface/InterfaceSpec.scala → ...chiselTests/interface/InterfaceSpec.scala b/...chiselTests/interface/InterfaceSpec.scala → ...chiselTests/interface/InterfaceSpec.scala
diff --git a/...s/interface/ParametricInterfaceSpec.scala → ...s/interface/ParametricInterfaceSpec.scala b/...s/interface/ParametricInterfaceSpec.scala → ...s/interface/ParametricInterfaceSpec.scala
diff --git a/...Tests/interface/TappedInterfaceSpec.scala → ...Tests/interface/TappedInterfaceSpec.scala b/...Tests/interface/TappedInterfaceSpec.scala → ...Tests/interface/TappedInterfaceSpec.scala
diff --git a/...Tests/naming/IdentifierProposerSpec.scala → ...Tests/naming/IdentifierProposerSpec.scala b/...Tests/naming/IdentifierProposerSpec.scala → ...Tests/naming/IdentifierProposerSpec.scala
diff --git a/...2/chiselTests/naming/NamePluginSpec.scala → ...a/chiselTests/naming/NamePluginSpec.scala b/...2/chiselTests/naming/NamePluginSpec.scala → ...a/chiselTests/naming/NamePluginSpec.scala
diff --git a/...ala-2/chiselTests/naming/PrefixSpec.scala → ...scala/chiselTests/naming/PrefixSpec.scala b/...ala-2/chiselTests/naming/PrefixSpec.scala → ...scala/chiselTests/naming/PrefixSpec.scala
diff --git a/...a-2/chiselTests/naming/TypenameSpec.scala → ...ala/chiselTests/naming/TypenameSpec.scala b/...a-2/chiselTests/naming/TypenameSpec.scala → ...ala/chiselTests/naming/TypenameSpec.scala
diff --git a/...-2/chiselTests/properties/ClassSpec.scala → ...la/chiselTests/properties/ClassSpec.scala b/...-2/chiselTests/properties/ClassSpec.scala → ...la/chiselTests/properties/ClassSpec.scala
diff --git a/...2/chiselTests/properties/ObjectSpec.scala → ...a/chiselTests/properties/ObjectSpec.scala b/...2/chiselTests/properties/ObjectSpec.scala → ...a/chiselTests/properties/ObjectSpec.scala
diff --git a/...chiselTests/properties/PropertySpec.scala → ...chiselTests/properties/PropertySpec.scala b/...chiselTests/properties/PropertySpec.scala → ...chiselTests/properties/PropertySpec.scala
diff --git a/...ts/simulator/EphemeralSimulatorSpec.scala → ...ts/simulator/EphemeralSimulatorSpec.scala b/...ts/simulator/EphemeralSimulatorSpec.scala → ...ts/simulator/EphemeralSimulatorSpec.scala
diff --git a/...t/scala-2/chiselTests/simulator/GCD.scala → ...est/scala/chiselTests/simulator/GCD.scala b/...t/scala-2/chiselTests/simulator/GCD.scala → ...est/scala/chiselTests/simulator/GCD.scala
diff --git a/...selTests/simulator/HasSimulatorSpec.scala → ...selTests/simulator/HasSimulatorSpec.scala b/...selTests/simulator/HasSimulatorSpec.scala → ...selTests/simulator/HasSimulatorSpec.scala
diff --git a/...selTests/simulator/LayerControlSpec.scala → ...selTests/simulator/LayerControlSpec.scala b/...selTests/simulator/LayerControlSpec.scala → ...selTests/simulator/LayerControlSpec.scala
diff --git a/...selTests/simulator/OptionalIOModule.scala → ...selTests/simulator/OptionalIOModule.scala b/...selTests/simulator/OptionalIOModule.scala → ...selTests/simulator/OptionalIOModule.scala
diff --git a/...iselTests/simulator/PeekPokeAPISpec.scala → ...iselTests/simulator/PeekPokeAPISpec.scala b/...iselTests/simulator/PeekPokeAPISpec.scala → ...iselTests/simulator/PeekPokeAPISpec.scala
diff --git a/...lTests/simulator/PeekPokeTestModule.scala → ...lTests/simulator/PeekPokeTestModule.scala b/...lTests/simulator/PeekPokeTestModule.scala → ...lTests/simulator/PeekPokeTestModule.scala
diff --git a/...chiselTests/simulator/SimulatorSpec.scala → ...chiselTests/simulator/SimulatorSpec.scala b/...chiselTests/simulator/SimulatorSpec.scala → ...chiselTests/simulator/SimulatorSpec.scala
diff --git a/...s/simulator/scalatest/ChiselSimSpec.scala → ...s/simulator/scalatest/ChiselSimSpec.scala b/...s/simulator/scalatest/ChiselSimSpec.scala → ...s/simulator/scalatest/ChiselSimSpec.scala
diff --git a/...mulator/scalatest/HasCliOptionsSpec.scala → ...mulator/scalatest/HasCliOptionsSpec.scala b/...mulator/scalatest/HasCliOptionsSpec.scala → ...mulator/scalatest/HasCliOptionsSpec.scala
diff --git a/...elTests/stage/ChiselAnnotationsSpec.scala → ...elTests/stage/ChiselAnnotationsSpec.scala b/...elTests/stage/ChiselAnnotationsSpec.scala → ...elTests/stage/ChiselAnnotationsSpec.scala
diff --git a/...ests/stage/WarningConfigurationSpec.scala → ...ests/stage/WarningConfigurationSpec.scala b/...ests/stage/WarningConfigurationSpec.scala → ...ests/stage/WarningConfigurationSpec.scala
diff --git a/...AddImplicitOutputAnnotationFileSpec.scala → ...AddImplicitOutputAnnotationFileSpec.scala b/...AddImplicitOutputAnnotationFileSpec.scala → ...AddImplicitOutputAnnotationFileSpec.scala
diff --git a/...ge/phases/AddImplicitOutputFileSpec.scala → ...ge/phases/AddImplicitOutputFileSpec.scala b/...ge/phases/AddImplicitOutputFileSpec.scala → ...ge/phases/AddImplicitOutputFileSpec.scala
diff --git a/...ses/AddSerializationAnnotationsSpec.scala → ...ses/AddSerializationAnnotationsSpec.scala b/...ses/AddSerializationAnnotationsSpec.scala → ...ses/AddSerializationAnnotationsSpec.scala
diff --git a/...chiselTests/stage/phases/ChecksSpec.scala → ...chiselTests/stage/phases/ChecksSpec.scala b/...chiselTests/stage/phases/ChecksSpec.scala → ...chiselTests/stage/phases/ChecksSpec.scala
diff --git a/...hiselTests/stage/phases/ConvertSpec.scala → ...hiselTests/stage/phases/ConvertSpec.scala b/...hiselTests/stage/phases/ConvertSpec.scala → ...hiselTests/stage/phases/ConvertSpec.scala
diff --git a/...selTests/stage/phases/ElaborateSpec.scala → ...selTests/stage/phases/ElaborateSpec.scala b/...selTests/stage/phases/ElaborateSpec.scala → ...selTests/stage/phases/ElaborateSpec.scala
diff --git a/...hiselTests/stage/phases/EmitterSpec.scala → ...hiselTests/stage/phases/EmitterSpec.scala b/...hiselTests/stage/phases/EmitterSpec.scala → ...hiselTests/stage/phases/EmitterSpec.scala
diff --git a/...2/chiselTests/testing/FileCheckSpec.scala → ...a/chiselTests/testing/FileCheckSpec.scala b/...2/chiselTests/testing/FileCheckSpec.scala → ...a/chiselTests/testing/FileCheckSpec.scala
diff --git a/...sts/testing/HasTestingDirectorySpec.scala → ...sts/testing/HasTestingDirectorySpec.scala b/...sts/testing/HasTestingDirectorySpec.scala → ...sts/testing/HasTestingDirectorySpec.scala
diff --git a/.../testing/scalatest/HasConfigMapSpec.scala → .../testing/scalatest/HasConfigMapSpec.scala b/.../testing/scalatest/HasConfigMapSpec.scala → .../testing/scalatest/HasConfigMapSpec.scala
diff --git a/...ting/scalatest/TestingDirectorySpec.scala → ...ting/scalatest/TestingDirectorySpec.scala b/...ting/scalatest/TestingDirectorySpec.scala → ...ting/scalatest/TestingDirectorySpec.scala
diff --git a/...lTests/util/AttributeAnnotationSpec.scala → ...lTests/util/AttributeAnnotationSpec.scala b/...lTests/util/AttributeAnnotationSpec.scala → ...lTests/util/AttributeAnnotationSpec.scala
diff --git a/...scala-2/chiselTests/util/BitSetSpec.scala → ...t/scala/chiselTests/util/BitSetSpec.scala b/...scala-2/chiselTests/util/BitSetSpec.scala → ...t/scala/chiselTests/util/BitSetSpec.scala
diff --git a/...cala-2/chiselTests/util/BitwiseSpec.scala → .../scala/chiselTests/util/BitwiseSpec.scala b/...cala-2/chiselTests/util/BitwiseSpec.scala → .../scala/chiselTests/util/BitwiseSpec.scala
diff --git a/...st/scala-2/chiselTests/util/CatSpec.scala → ...test/scala/chiselTests/util/CatSpec.scala b/...st/scala-2/chiselTests/util/CatSpec.scala → ...test/scala/chiselTests/util/CatSpec.scala
diff --git a/...t/scala-2/chiselTests/util/PipeSpec.scala → ...est/scala/chiselTests/util/PipeSpec.scala b/...t/scala-2/chiselTests/util/PipeSpec.scala → ...est/scala/chiselTests/util/PipeSpec.scala
diff --git a/...-2/chiselTests/util/PriorityMuxSpec.scala → ...la/chiselTests/util/PriorityMuxSpec.scala b/...-2/chiselTests/util/PriorityMuxSpec.scala → ...la/chiselTests/util/PriorityMuxSpec.scala
diff --git a/...st/scala-2/chiselTests/util/RegSpec.scala → ...test/scala/chiselTests/util/RegSpec.scala b/...st/scala-2/chiselTests/util/RegSpec.scala → ...test/scala/chiselTests/util/RegSpec.scala
diff --git a/...t/scala-2/chiselTests/util/SRAMSpec.scala → ...est/scala/chiselTests/util/SRAMSpec.scala b/...t/scala-2/chiselTests/util/SRAMSpec.scala → ...est/scala/chiselTests/util/SRAMSpec.scala
diff --git a/...-2/chiselTests/util/circt/ClockGate.scala → ...la/chiselTests/util/circt/ClockGate.scala b/...-2/chiselTests/util/circt/ClockGate.scala → ...la/chiselTests/util/circt/ClockGate.scala
diff --git a/...la-2/chiselTests/util/circt/IsXSpec.scala → ...cala/chiselTests/util/circt/IsXSpec.scala b/...la-2/chiselTests/util/circt/IsXSpec.scala → ...cala/chiselTests/util/circt/IsXSpec.scala
diff --git a/...elTests/util/circt/PlusArgsTestSpec.scala → ...elTests/util/circt/PlusArgsTestSpec.scala b/...elTests/util/circt/PlusArgsTestSpec.scala → ...elTests/util/circt/PlusArgsTestSpec.scala
diff --git a/...lTests/util/circt/PlusArgsValueSpec.scala → ...lTests/util/circt/PlusArgsValueSpec.scala b/...lTests/util/circt/PlusArgsValueSpec.scala → ...lTests/util/circt/PlusArgsValueSpec.scala
diff --git a/...2/chiselTests/util/circt/SizeOfSpec.scala → ...a/chiselTests/util/circt/SizeOfSpec.scala b/...2/chiselTests/util/circt/SizeOfSpec.scala → ...a/chiselTests/util/circt/SizeOfSpec.scala
diff --git a/...-2/chiselTests/util/circt/Synthesis.scala → ...la/chiselTests/util/circt/Synthesis.scala b/...-2/chiselTests/util/circt/Synthesis.scala → ...la/chiselTests/util/circt/Synthesis.scala
diff --git a/.../util/experimental/DecoderTableSpec.scala → .../util/experimental/DecoderTableSpec.scala b/.../util/experimental/DecoderTableSpec.scala → .../util/experimental/DecoderTableSpec.scala
diff --git a/...-2/chiselTests/util/random/PRNGSpec.scala → ...la/chiselTests/util/random/PRNGSpec.scala b/...-2/chiselTests/util/random/PRNGSpec.scala → ...la/chiselTests/util/random/PRNGSpec.scala
diff --git a/...t/scala-2/circtTests/ConventionSpec.scala → ...est/scala/circtTests/ConventionSpec.scala b/...t/scala-2/circtTests/ConventionSpec.scala → ...est/scala/circtTests/ConventionSpec.scala
diff --git a/.../circtTests/OutputDirAnnotationSpec.scala → .../circtTests/OutputDirAnnotationSpec.scala b/.../circtTests/OutputDirAnnotationSpec.scala → .../circtTests/OutputDirAnnotationSpec.scala
diff --git a/...a-2/circtTests/stage/ChiselMainSpec.scala → ...ala/circtTests/stage/ChiselMainSpec.scala b/...a-2/circtTests/stage/ChiselMainSpec.scala → ...ala/circtTests/stage/ChiselMainSpec.scala
diff --git a/...-2/circtTests/stage/ChiselStageSpec.scala → ...la/circtTests/stage/ChiselStageSpec.scala b/...-2/circtTests/stage/ChiselStageSpec.scala → ...la/circtTests/stage/ChiselStageSpec.scala
diff --git a/...ge/phases/AddImplicitOutputFileSpec.scala → ...ge/phases/AddImplicitOutputFileSpec.scala b/...ge/phases/AddImplicitOutputFileSpec.scala → ...ge/phases/AddImplicitOutputFileSpec.scala
diff --git a/src/test/scala-2/cookbook/Bundle2UInt.scala → src/test/scala/cookbook/Bundle2UInt.scala b/src/test/scala-2/cookbook/Bundle2UInt.scala → src/test/scala/cookbook/Bundle2UInt.scala
diff --git a/src/test/scala-2/cookbook/CookbookSpec.scala → src/test/scala/cookbook/CookbookSpec.scala b/src/test/scala-2/cookbook/CookbookSpec.scala → src/test/scala/cookbook/CookbookSpec.scala
diff --git a/src/test/scala-2/cookbook/FSM.scala → src/test/scala/cookbook/FSM.scala b/src/test/scala-2/cookbook/FSM.scala → src/test/scala/cookbook/FSM.scala
diff --git a/src/test/scala-2/cookbook/RegOfVec.scala → src/test/scala/cookbook/RegOfVec.scala b/src/test/scala-2/cookbook/RegOfVec.scala → src/test/scala/cookbook/RegOfVec.scala
diff --git a/src/test/scala-2/cookbook/UInt2Bundle.scala → src/test/scala/cookbook/UInt2Bundle.scala b/src/test/scala-2/cookbook/UInt2Bundle.scala → src/test/scala/cookbook/UInt2Bundle.scala
diff --git a/...est/scala-2/cookbook/UInt2VecOfBool.scala → src/test/scala/cookbook/UInt2VecOfBool.scala b/...est/scala-2/cookbook/UInt2VecOfBool.scala → src/test/scala/cookbook/UInt2VecOfBool.scala
diff --git a/...est/scala-2/cookbook/VecOfBool2UInt.scala → src/test/scala/cookbook/VecOfBool2UInt.scala b/...est/scala-2/cookbook/VecOfBool2UInt.scala → src/test/scala/cookbook/VecOfBool2UInt.scala
diff --git a/...xamples/ImplicitStateVendingMachine.scala → ...xamples/ImplicitStateVendingMachine.scala b/...xamples/ImplicitStateVendingMachine.scala → ...xamples/ImplicitStateVendingMachine.scala
diff --git a/...ala-2/examples/SimpleVendingMachine.scala → ...scala/examples/SimpleVendingMachine.scala b/...ala-2/examples/SimpleVendingMachine.scala → ...scala/examples/SimpleVendingMachine.scala
diff --git a/...-2/examples/VendingMachineGenerator.scala → ...la/examples/VendingMachineGenerator.scala b/...-2/examples/VendingMachineGenerator.scala → ...la/examples/VendingMachineGenerator.scala
diff --git a/...cala-2/examples/VendingMachineUtils.scala → .../scala/examples/VendingMachineUtils.scala b/...cala-2/examples/VendingMachineUtils.scala → .../scala/examples/VendingMachineUtils.scala