chipsalliance · adkian-sifive · Jan 9, 2025 · Jan 21, 2025 · Jan 23, 2025
diff --git a/.../src/test/scala/chiselTest/LFSRSpec.scala → ...rc/test/scala-2/chiselTest/LFSRSpec.scala b/.../src/test/scala/chiselTest/LFSRSpec.scala → ...rc/test/scala-2/chiselTest/LFSRSpec.scala
diff --git a/.../chiselTest/MixedVecIntegrationSpec.scala → .../chiselTest/MixedVecIntegrationSpec.scala b/.../chiselTest/MixedVecIntegrationSpec.scala → .../chiselTest/MixedVecIntegrationSpec.scala
diff --git a/...est/scala/chiselTest/QueueFlushSpec.scala → ...t/scala-2/chiselTest/QueueFlushSpec.scala b/...est/scala/chiselTest/QueueFlushSpec.scala → ...t/scala-2/chiselTest/QueueFlushSpec.scala
diff --git a/...src/test/scala/chiselTest/QueueSpec.scala → ...c/test/scala-2/chiselTest/QueueSpec.scala b/...src/test/scala/chiselTest/QueueSpec.scala → ...c/test/scala-2/chiselTest/QueueSpec.scala
diff --git a/...ala/chiselTest/ShiftRegisterMemSpec.scala → ...a-2/chiselTest/ShiftRegisterMemSpec.scala b/...ala/chiselTest/ShiftRegisterMemSpec.scala → ...a-2/chiselTest/ShiftRegisterMemSpec.scala
diff --git a/...scala/chiselTest/VecIntegrationSpec.scala → ...ala-2/chiselTest/VecIntegrationSpec.scala b/...scala/chiselTest/VecIntegrationSpec.scala → ...ala-2/chiselTest/VecIntegrationSpec.scala
diff --git a/...scala/chiselTest/util/SparseVecSpec.scala → ...ala-2/chiselTest/util/SparseVecSpec.scala b/...scala/chiselTest/util/SparseVecSpec.scala → ...ala-2/chiselTest/util/SparseVecSpec.scala
diff --git a/...hiselTest/util/experimental/PlaSpec.scala → ...hiselTest/util/experimental/PlaSpec.scala b/...hiselTest/util/experimental/PlaSpec.scala → ...hiselTest/util/experimental/PlaSpec.scala
diff --git a/...hiselTest/util/experimental/TapSpec.scala → ...hiselTest/util/experimental/TapSpec.scala b/...hiselTest/util/experimental/TapSpec.scala → ...hiselTest/util/experimental/TapSpec.scala
diff --git a/...t/scala/chisel3/TypeEquivalenceSpec.scala → ...scala-2/chisel3/TypeEquivalenceSpec.scala b/...t/scala/chisel3/TypeEquivalenceSpec.scala → ...scala-2/chisel3/TypeEquivalenceSpec.scala
diff --git a/...el3/experimental/dataview/ReifySpec.scala → ...el3/experimental/dataview/ReifySpec.scala b/...el3/experimental/dataview/ReifySpec.scala → ...el3/experimental/dataview/ReifySpec.scala
diff --git a/...ala/chisel3/internal/IdentifierSpec.scala → ...a-2/chisel3/internal/IdentifierSpec.scala b/...ala/chisel3/internal/IdentifierSpec.scala → ...a-2/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/...cala/chisel3/internal/NamespaceSpec.scala → ...la-2/chisel3/internal/NamespaceSpec.scala b/...cala/chisel3/internal/NamespaceSpec.scala → ...la-2/chisel3/internal/NamespaceSpec.scala
diff --git a/...chisel3/stage/ChiselOptionsViewSpec.scala → ...chisel3/stage/ChiselOptionsViewSpec.scala b/...chisel3/stage/ChiselOptionsViewSpec.scala → ...chisel3/stage/ChiselOptionsViewSpec.scala
diff --git a/...est/scala/chisel3/testers/TestUtils.scala → ...t/scala-2/chisel3/testers/TestUtils.scala b/...est/scala/chisel3/testers/TestUtils.scala → ...t/scala-2/chisel3/testers/TestUtils.scala
diff --git a/src/test/scala/chisel3/util/BitPatSpec.scala → ...est/scala-2/chisel3/util/BitPatSpec.scala b/src/test/scala/chisel3/util/BitPatSpec.scala → ...est/scala-2/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/chiselTests/AdderTree.scala → src/test/scala-2/chiselTests/AdderTree.scala b/src/test/scala/chiselTests/AdderTree.scala → src/test/scala-2/chiselTests/AdderTree.scala
diff --git a/...a/chiselTests/AnalogIntegrationSpec.scala → ...2/chiselTests/AnalogIntegrationSpec.scala b/...a/chiselTests/AnalogIntegrationSpec.scala → ...2/chiselTests/AnalogIntegrationSpec.scala
diff --git a/src/test/scala/chiselTests/AnalogSpec.scala → ...test/scala-2/chiselTests/AnalogSpec.scala b/src/test/scala/chiselTests/AnalogSpec.scala → ...test/scala-2/chiselTests/AnalogSpec.scala
diff --git a/...a/chiselTests/AnnotatingDiamondSpec.scala → ...2/chiselTests/AnnotatingDiamondSpec.scala b/...a/chiselTests/AnnotatingDiamondSpec.scala → ...2/chiselTests/AnnotatingDiamondSpec.scala
diff --git a/...scala/chiselTests/AnnotationNoDedup.scala → ...ala-2/chiselTests/AnnotationNoDedup.scala b/...scala/chiselTests/AnnotationNoDedup.scala → ...ala-2/chiselTests/AnnotationNoDedup.scala
diff --git a/...st/scala/chiselTests/AsTypeOfTester.scala → .../scala-2/chiselTests/AsTypeOfTester.scala b/...st/scala/chiselTests/AsTypeOfTester.scala → .../scala-2/chiselTests/AsTypeOfTester.scala
diff --git a/src/test/scala/chiselTests/Assert.scala → src/test/scala-2/chiselTests/Assert.scala b/src/test/scala/chiselTests/Assert.scala → src/test/scala-2/chiselTests/Assert.scala
diff --git a/...st/scala/chiselTests/AsyncResetSpec.scala → .../scala-2/chiselTests/AsyncResetSpec.scala b/...st/scala/chiselTests/AsyncResetSpec.scala → .../scala-2/chiselTests/AsyncResetSpec.scala
diff --git a/...scala/chiselTests/AutoClonetypeSpec.scala → ...ala-2/chiselTests/AutoClonetypeSpec.scala b/...scala/chiselTests/AutoClonetypeSpec.scala → ...ala-2/chiselTests/AutoClonetypeSpec.scala
diff --git a/...ala/chiselTests/AutoNestedCloneSpec.scala → ...a-2/chiselTests/AutoNestedCloneSpec.scala b/...ala/chiselTests/AutoNestedCloneSpec.scala → ...a-2/chiselTests/AutoNestedCloneSpec.scala
diff --git a/...scala/chiselTests/BetterNamingTests.scala → ...ala-2/chiselTests/BetterNamingTests.scala b/...scala/chiselTests/BetterNamingTests.scala → ...ala-2/chiselTests/BetterNamingTests.scala
diff --git a/src/test/scala/chiselTests/BitwiseOps.scala → ...test/scala-2/chiselTests/BitwiseOps.scala b/src/test/scala/chiselTests/BitwiseOps.scala → ...test/scala-2/chiselTests/BitwiseOps.scala
diff --git a/src/test/scala/chiselTests/BlackBox.scala → src/test/scala-2/chiselTests/BlackBox.scala b/src/test/scala/chiselTests/BlackBox.scala → src/test/scala-2/chiselTests/BlackBox.scala
diff --git a/...test/scala/chiselTests/BlackBoxImpl.scala → ...st/scala-2/chiselTests/BlackBoxImpl.scala b/...test/scala/chiselTests/BlackBoxImpl.scala → ...st/scala-2/chiselTests/BlackBoxImpl.scala
diff --git a/...t/scala/chiselTests/BoringUtilsSpec.scala → ...scala-2/chiselTests/BoringUtilsSpec.scala b/...t/scala/chiselTests/BoringUtilsSpec.scala → ...scala-2/chiselTests/BoringUtilsSpec.scala
diff --git a/...cala/chiselTests/BoringUtilsTapSpec.scala → ...la-2/chiselTests/BoringUtilsTapSpec.scala b/...cala/chiselTests/BoringUtilsTapSpec.scala → ...la-2/chiselTests/BoringUtilsTapSpec.scala
diff --git a/...t/scala/chiselTests/BulkConnectSpec.scala → ...scala-2/chiselTests/BulkConnectSpec.scala b/...t/scala/chiselTests/BulkConnectSpec.scala → ...scala-2/chiselTests/BulkConnectSpec.scala
diff --git a/...cala/chiselTests/BundleElementsSpec.scala → ...la-2/chiselTests/BundleElementsSpec.scala b/...cala/chiselTests/BundleElementsSpec.scala → ...la-2/chiselTests/BundleElementsSpec.scala
diff --git a/...scala/chiselTests/BundleLiteralSpec.scala → ...ala-2/chiselTests/BundleLiteralSpec.scala b/...scala/chiselTests/BundleLiteralSpec.scala → ...ala-2/chiselTests/BundleLiteralSpec.scala
diff --git a/src/test/scala/chiselTests/BundleSpec.scala → ...test/scala-2/chiselTests/BundleSpec.scala b/src/test/scala/chiselTests/BundleSpec.scala → ...test/scala-2/chiselTests/BundleSpec.scala
diff --git a/src/test/scala/chiselTests/BundleWire.scala → ...test/scala-2/chiselTests/BundleWire.scala b/src/test/scala/chiselTests/BundleWire.scala → ...test/scala-2/chiselTests/BundleWire.scala
diff --git a/src/test/scala/chiselTests/ChiselEnum.scala → ...test/scala-2/chiselTests/ChiselEnum.scala b/src/test/scala/chiselTests/ChiselEnum.scala → ...test/scala-2/chiselTests/ChiselEnum.scala
diff --git a/src/test/scala/chiselTests/ChiselSpec.scala → ...test/scala-2/chiselTests/ChiselSpec.scala b/src/test/scala/chiselTests/ChiselSpec.scala → ...test/scala-2/chiselTests/ChiselSpec.scala
diff --git a/...chiselTests/ChiselTestUtilitiesSpec.scala → ...chiselTests/ChiselTestUtilitiesSpec.scala b/...chiselTests/ChiselTestUtilitiesSpec.scala → ...chiselTests/ChiselTestUtilitiesSpec.scala
diff --git a/src/test/scala/chiselTests/ClockSpec.scala → src/test/scala-2/chiselTests/ClockSpec.scala b/src/test/scala/chiselTests/ClockSpec.scala → src/test/scala-2/chiselTests/ClockSpec.scala
diff --git a/...t/scala/chiselTests/CloneModuleSpec.scala → ...scala-2/chiselTests/CloneModuleSpec.scala b/...t/scala/chiselTests/CloneModuleSpec.scala → ...scala-2/chiselTests/CloneModuleSpec.scala
diff --git a/...est/scala/chiselTests/ComplexAssign.scala → ...t/scala-2/chiselTests/ComplexAssign.scala b/...est/scala/chiselTests/ComplexAssign.scala → ...t/scala-2/chiselTests/ComplexAssign.scala
diff --git a/src/test/scala/chiselTests/ConnectSpec.scala → ...est/scala-2/chiselTests/ConnectSpec.scala b/src/test/scala/chiselTests/ConnectSpec.scala → ...est/scala-2/chiselTests/ConnectSpec.scala
diff --git a/...t/scala/chiselTests/ConnectableSpec.scala → ...scala-2/chiselTests/ConnectableSpec.scala b/...t/scala/chiselTests/ConnectableSpec.scala → ...scala-2/chiselTests/ConnectableSpec.scala
diff --git a/src/test/scala/chiselTests/ConstSpec.scala → src/test/scala-2/chiselTests/ConstSpec.scala b/src/test/scala/chiselTests/ConstSpec.scala → src/test/scala-2/chiselTests/ConstSpec.scala
diff --git a/src/test/scala/chiselTests/Counter.scala → src/test/scala-2/chiselTests/Counter.scala b/src/test/scala/chiselTests/Counter.scala → src/test/scala-2/chiselTests/Counter.scala
diff --git a/...test/scala/chiselTests/CustomBundle.scala → ...st/scala-2/chiselTests/CustomBundle.scala b/...test/scala/chiselTests/CustomBundle.scala → ...st/scala-2/chiselTests/CustomBundle.scala
diff --git a/src/test/scala/chiselTests/DPISpec.scala → src/test/scala-2/chiselTests/DPISpec.scala b/src/test/scala/chiselTests/DPISpec.scala → src/test/scala-2/chiselTests/DPISpec.scala
diff --git a/.../scala/chiselTests/DataEqualitySpec.scala → ...cala-2/chiselTests/DataEqualitySpec.scala b/.../scala/chiselTests/DataEqualitySpec.scala → ...cala-2/chiselTests/DataEqualitySpec.scala
diff --git a/src/test/scala/chiselTests/DataPrint.scala → src/test/scala-2/chiselTests/DataPrint.scala b/src/test/scala/chiselTests/DataPrint.scala → src/test/scala-2/chiselTests/DataPrint.scala
diff --git a/src/test/scala/chiselTests/Decoder.scala → src/test/scala-2/chiselTests/Decoder.scala b/src/test/scala/chiselTests/Decoder.scala → src/test/scala-2/chiselTests/Decoder.scala
diff --git a/...est/scala/chiselTests/DecoupledSpec.scala → ...t/scala-2/chiselTests/DecoupledSpec.scala b/...est/scala/chiselTests/DecoupledSpec.scala → ...t/scala-2/chiselTests/DecoupledSpec.scala
diff --git a/src/test/scala/chiselTests/DedupSpec.scala → src/test/scala-2/chiselTests/DedupSpec.scala b/src/test/scala/chiselTests/DedupSpec.scala → src/test/scala-2/chiselTests/DedupSpec.scala
diff --git a/src/test/scala/chiselTests/Direction.scala → src/test/scala-2/chiselTests/Direction.scala b/src/test/scala/chiselTests/Direction.scala → src/test/scala-2/chiselTests/Direction.scala
diff --git a/src/test/scala/chiselTests/DisableSpec.scala → ...est/scala-2/chiselTests/DisableSpec.scala b/src/test/scala/chiselTests/DisableSpec.scala → ...est/scala-2/chiselTests/DisableSpec.scala
diff --git a/...est/scala/chiselTests/DontTouchSpec.scala → ...t/scala-2/chiselTests/DontTouchSpec.scala b/...est/scala/chiselTests/DontTouchSpec.scala → ...t/scala-2/chiselTests/DontTouchSpec.scala
diff --git a/...ala/chiselTests/EnableShiftRegister.scala → ...a-2/chiselTests/EnableShiftRegister.scala b/...ala/chiselTests/EnableShiftRegister.scala → ...a-2/chiselTests/EnableShiftRegister.scala
diff --git a/src/test/scala/chiselTests/EnumSpec.scala → src/test/scala-2/chiselTests/EnumSpec.scala b/src/test/scala/chiselTests/EnumSpec.scala → src/test/scala-2/chiselTests/EnumSpec.scala
diff --git a/src/test/scala/chiselTests/ExtModule.scala → src/test/scala-2/chiselTests/ExtModule.scala b/src/test/scala/chiselTests/ExtModule.scala → src/test/scala-2/chiselTests/ExtModule.scala
diff --git a/...est/scala/chiselTests/ExtModuleImpl.scala → ...t/scala-2/chiselTests/ExtModuleImpl.scala b/...est/scala/chiselTests/ExtModuleImpl.scala → ...t/scala-2/chiselTests/ExtModuleImpl.scala
diff --git a/...scala/chiselTests/FixedIOModuleSpec.scala → ...ala-2/chiselTests/FixedIOModuleSpec.scala b/...scala/chiselTests/FixedIOModuleSpec.scala → ...ala-2/chiselTests/FixedIOModuleSpec.scala
diff --git a/src/test/scala/chiselTests/GCD.scala → src/test/scala-2/chiselTests/GCD.scala b/src/test/scala/chiselTests/GCD.scala → src/test/scala-2/chiselTests/GCD.scala
diff --git a/src/test/scala/chiselTests/Harness.scala → src/test/scala-2/chiselTests/Harness.scala b/src/test/scala/chiselTests/Harness.scala → src/test/scala-2/chiselTests/Harness.scala
diff --git a/...t/scala/chiselTests/IOCompatibility.scala → ...scala-2/chiselTests/IOCompatibility.scala b/...t/scala/chiselTests/IOCompatibility.scala → ...scala-2/chiselTests/IOCompatibility.scala
diff --git a/...st/scala/chiselTests/IllegalRefSpec.scala → .../scala-2/chiselTests/IllegalRefSpec.scala b/...st/scala/chiselTests/IllegalRefSpec.scala → .../scala-2/chiselTests/IllegalRefSpec.scala
diff --git a/...chiselTests/ImplicitConversionsSpec.scala → ...chiselTests/ImplicitConversionsSpec.scala b/...chiselTests/ImplicitConversionsSpec.scala → ...chiselTests/ImplicitConversionsSpec.scala
diff --git a/src/test/scala/chiselTests/InlineSpec.scala → ...test/scala-2/chiselTests/InlineSpec.scala b/src/test/scala/chiselTests/InlineSpec.scala → ...test/scala-2/chiselTests/InlineSpec.scala
diff --git a/.../scala/chiselTests/InstanceNameSpec.scala → ...cala-2/chiselTests/InstanceNameSpec.scala b/.../scala/chiselTests/InstanceNameSpec.scala → ...cala-2/chiselTests/InstanceNameSpec.scala
diff --git a/...t/scala/chiselTests/IntegerMathSpec.scala → ...scala-2/chiselTests/IntegerMathSpec.scala b/...t/scala/chiselTests/IntegerMathSpec.scala → ...scala-2/chiselTests/IntegerMathSpec.scala
diff --git a/...t/scala/chiselTests/IntrinsicModule.scala → ...scala-2/chiselTests/IntrinsicModule.scala b/...t/scala/chiselTests/IntrinsicModule.scala → ...scala-2/chiselTests/IntrinsicModule.scala
diff --git a/...est/scala/chiselTests/IntrinsicSpec.scala → ...t/scala-2/chiselTests/IntrinsicSpec.scala b/...est/scala/chiselTests/IntrinsicSpec.scala → ...t/scala-2/chiselTests/IntrinsicSpec.scala
diff --git a/...scala/chiselTests/InvalidateAPISpec.scala → ...ala-2/chiselTests/InvalidateAPISpec.scala b/...scala/chiselTests/InvalidateAPISpec.scala → ...ala-2/chiselTests/InvalidateAPISpec.scala
diff --git a/src/test/scala/chiselTests/LTLSpec.scala → src/test/scala-2/chiselTests/LTLSpec.scala b/src/test/scala/chiselTests/LTLSpec.scala → src/test/scala-2/chiselTests/LTLSpec.scala
diff --git a/src/test/scala/chiselTests/LayerSpec.scala → src/test/scala-2/chiselTests/LayerSpec.scala b/src/test/scala/chiselTests/LayerSpec.scala → src/test/scala-2/chiselTests/LayerSpec.scala
diff --git a/...est/scala/chiselTests/LazyCloneSpec.scala → ...t/scala-2/chiselTests/LazyCloneSpec.scala b/...est/scala/chiselTests/LazyCloneSpec.scala → ...t/scala-2/chiselTests/LazyCloneSpec.scala
diff --git a/...la/chiselTests/LiteralExtractorSpec.scala → ...-2/chiselTests/LiteralExtractorSpec.scala b/...la/chiselTests/LiteralExtractorSpec.scala → ...-2/chiselTests/LiteralExtractorSpec.scala
diff --git a/...ala/chiselTests/LiteralToTargetSpec.scala → ...a-2/chiselTests/LiteralToTargetSpec.scala b/...ala/chiselTests/LiteralToTargetSpec.scala → ...a-2/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/chiselTests/Math.scala → src/test/scala-2/chiselTests/Math.scala b/src/test/scala/chiselTests/Math.scala → src/test/scala-2/chiselTests/Math.scala
diff --git a/src/test/scala/chiselTests/Mem.scala → src/test/scala-2/chiselTests/Mem.scala b/src/test/scala/chiselTests/Mem.scala → src/test/scala-2/chiselTests/Mem.scala
diff --git a/...test/scala/chiselTests/MemorySearch.scala → ...st/scala-2/chiselTests/MemorySearch.scala b/...test/scala/chiselTests/MemorySearch.scala → ...st/scala-2/chiselTests/MemorySearch.scala
diff --git a/...test/scala/chiselTests/MixedVecSpec.scala → ...st/scala-2/chiselTests/MixedVecSpec.scala b/...test/scala/chiselTests/MixedVecSpec.scala → ...st/scala-2/chiselTests/MixedVecSpec.scala
diff --git a/.../scala/chiselTests/ModuleChoiceSpec.scala → ...cala-2/chiselTests/ModuleChoiceSpec.scala b/.../scala/chiselTests/ModuleChoiceSpec.scala → ...cala-2/chiselTests/ModuleChoiceSpec.scala
diff --git a/.../scala/chiselTests/ModulePrefixSpec.scala → ...cala-2/chiselTests/ModulePrefixSpec.scala b/.../scala/chiselTests/ModulePrefixSpec.scala → ...cala-2/chiselTests/ModulePrefixSpec.scala
diff --git a/src/test/scala/chiselTests/ModuleSpec.scala → ...test/scala-2/chiselTests/ModuleSpec.scala b/src/test/scala/chiselTests/ModuleSpec.scala → ...test/scala-2/chiselTests/ModuleSpec.scala
diff --git a/src/test/scala/chiselTests/MulLookup.scala → src/test/scala-2/chiselTests/MulLookup.scala b/src/test/scala/chiselTests/MulLookup.scala → src/test/scala-2/chiselTests/MulLookup.scala
diff --git a/src/test/scala/chiselTests/MultiAssign.scala → ...est/scala-2/chiselTests/MultiAssign.scala b/src/test/scala/chiselTests/MultiAssign.scala → ...est/scala-2/chiselTests/MultiAssign.scala
diff --git a/...st/scala/chiselTests/MultiClockSpec.scala → .../scala-2/chiselTests/MultiClockSpec.scala b/...st/scala/chiselTests/MultiClockSpec.scala → .../scala-2/chiselTests/MultiClockSpec.scala
diff --git a/src/test/scala/chiselTests/MuxSpec.scala → src/test/scala-2/chiselTests/MuxSpec.scala b/src/test/scala/chiselTests/MuxSpec.scala → src/test/scala-2/chiselTests/MuxSpec.scala
diff --git a/...scala/chiselTests/NamedModuleTester.scala → ...ala-2/chiselTests/NamedModuleTester.scala b/...scala/chiselTests/NamedModuleTester.scala → ...ala-2/chiselTests/NamedModuleTester.scala
diff --git a/...cala/chiselTests/NewAnnotationsSpec.scala → ...la-2/chiselTests/NewAnnotationsSpec.scala b/...cala/chiselTests/NewAnnotationsSpec.scala → ...la-2/chiselTests/NewAnnotationsSpec.scala
diff --git a/...est/scala/chiselTests/OneHotMuxSpec.scala → ...t/scala-2/chiselTests/OneHotMuxSpec.scala b/...est/scala/chiselTests/OneHotMuxSpec.scala → ...t/scala-2/chiselTests/OneHotMuxSpec.scala
diff --git a/...test/scala/chiselTests/OptionBundle.scala → ...st/scala-2/chiselTests/OptionBundle.scala b/...test/scala/chiselTests/OptionBundle.scala → ...st/scala-2/chiselTests/OptionBundle.scala
diff --git a/src/test/scala/chiselTests/Padding.scala → src/test/scala-2/chiselTests/Padding.scala b/src/test/scala/chiselTests/Padding.scala → src/test/scala-2/chiselTests/Padding.scala
diff --git a/...ala/chiselTests/ParameterizedModule.scala → ...a-2/chiselTests/ParameterizedModule.scala b/...ala/chiselTests/ParameterizedModule.scala → ...a-2/chiselTests/ParameterizedModule.scala
diff --git a/src/test/scala/chiselTests/PopCount.scala → src/test/scala-2/chiselTests/PopCount.scala b/src/test/scala/chiselTests/PopCount.scala → src/test/scala-2/chiselTests/PopCount.scala
diff --git a/src/test/scala/chiselTests/PortSpec.scala → src/test/scala-2/chiselTests/PortSpec.scala b/src/test/scala/chiselTests/PortSpec.scala → src/test/scala-2/chiselTests/PortSpec.scala
@@ -23,8 +23,8 @@ class PortSpec extends ChiselFreeSpec {
     chirrtl should include("input reset : UInt<1>")
     // other ports get source locators
     chirrtl should include(
-      "output in : { flip foo : UInt<1>, flip bar : UInt<8>} @[src/test/scala/chiselTests/PortSpec.scala"
+      "output in : { flip foo : UInt<1>, flip bar : UInt<8>} @[src/test/scala-2/chiselTests/PortSpec.scala"
     )
-    chirrtl should include("output out : UInt<1> @[src/test/scala/chiselTests/PortSpec.scala")
+    chirrtl should include("output out : UInt<1> @[src/test/scala-2/chiselTests/PortSpec.scala")
   }
 }
diff --git a/...est/scala/chiselTests/PrintableSpec.scala → ...t/scala-2/chiselTests/PrintableSpec.scala b/...est/scala/chiselTests/PrintableSpec.scala → ...t/scala-2/chiselTests/PrintableSpec.scala
diff --git a/src/test/scala/chiselTests/Printf.scala → src/test/scala-2/chiselTests/Printf.scala b/src/test/scala/chiselTests/Printf.scala → src/test/scala-2/chiselTests/Printf.scala
diff --git a/src/test/scala/chiselTests/ProbeSpec.scala → src/test/scala-2/chiselTests/ProbeSpec.scala b/src/test/scala/chiselTests/ProbeSpec.scala → src/test/scala-2/chiselTests/ProbeSpec.scala
diff --git a/.../scala/chiselTests/PublicModuleSpec.scala → ...cala-2/chiselTests/PublicModuleSpec.scala b/.../scala/chiselTests/PublicModuleSpec.scala → ...cala-2/chiselTests/PublicModuleSpec.scala
diff --git a/...est/scala/chiselTests/RawModuleSpec.scala → ...t/scala-2/chiselTests/RawModuleSpec.scala b/...est/scala/chiselTests/RawModuleSpec.scala → ...t/scala-2/chiselTests/RawModuleSpec.scala
diff --git a/...test/scala/chiselTests/ReadOnlySpec.scala → ...st/scala-2/chiselTests/ReadOnlySpec.scala b/...test/scala/chiselTests/ReadOnlySpec.scala → ...st/scala-2/chiselTests/ReadOnlySpec.scala
diff --git a/...est/scala/chiselTests/RebindingSpec.scala → ...t/scala-2/chiselTests/RebindingSpec.scala b/...est/scala/chiselTests/RebindingSpec.scala → ...t/scala-2/chiselTests/RebindingSpec.scala
diff --git a/src/test/scala/chiselTests/RecordSpec.scala → ...test/scala-2/chiselTests/RecordSpec.scala b/src/test/scala/chiselTests/RecordSpec.scala → ...test/scala-2/chiselTests/RecordSpec.scala
diff --git a/...st/scala/chiselTests/ReduceTreeSpec.scala → .../scala-2/chiselTests/ReduceTreeSpec.scala b/...st/scala/chiselTests/ReduceTreeSpec.scala → .../scala-2/chiselTests/ReduceTreeSpec.scala
diff --git a/src/test/scala/chiselTests/Reg.scala → src/test/scala-2/chiselTests/Reg.scala b/src/test/scala/chiselTests/Reg.scala → src/test/scala-2/chiselTests/Reg.scala
diff --git a/src/test/scala/chiselTests/ResetSpec.scala → src/test/scala-2/chiselTests/ResetSpec.scala b/src/test/scala/chiselTests/ResetSpec.scala → src/test/scala-2/chiselTests/ResetSpec.scala
diff --git a/src/test/scala/chiselTests/Risc.scala → src/test/scala-2/chiselTests/Risc.scala b/src/test/scala/chiselTests/Risc.scala → src/test/scala-2/chiselTests/Risc.scala
diff --git a/src/test/scala/chiselTests/SIntOps.scala → src/test/scala-2/chiselTests/SIntOps.scala b/src/test/scala/chiselTests/SIntOps.scala → src/test/scala-2/chiselTests/SIntOps.scala
diff --git a/...scala/chiselTests/SourceLocatorSpec.scala → ...ala-2/chiselTests/SourceLocatorSpec.scala b/...scala/chiselTests/SourceLocatorSpec.scala → ...ala-2/chiselTests/SourceLocatorSpec.scala
@@ -9,7 +9,7 @@ import chisel3.experimental.hierarchy.Definition
 import firrtl.ir.FileInfo
 
 object SourceLocatorSpec {
-  val thisFile = "src/test/scala/chiselTests/SourceLocatorSpec.scala"
+  val thisFile = "src/test/scala-2/chiselTests/SourceLocatorSpec.scala"
 
   class RawModuleChild extends RawModule
   class ModuleChild extends Module
@@ -46,7 +46,7 @@ class SourceLocatorSpec extends ChiselFunSpec with Utils {
         val w = WireInit(UInt(1.W), 0.U)
       }
       val chirrtl = circt.stage.ChiselStage.emitCHIRRTL(new Top)
-      chirrtl should include("@[src/test/scala/chiselTests/SourceLocatorSpec.scala")
+      chirrtl should include("@[src/test/scala-2/chiselTests/SourceLocatorSpec.scala")
     }
   }
 

diff --git a/src/test/scala/chiselTests/Stack.scala → src/test/scala-2/chiselTests/Stack.scala b/src/test/scala/chiselTests/Stack.scala → src/test/scala-2/chiselTests/Stack.scala
diff --git a/src/test/scala/chiselTests/Stop.scala → src/test/scala-2/chiselTests/Stop.scala b/src/test/scala/chiselTests/Stop.scala → src/test/scala-2/chiselTests/Stop.scala
diff --git a/src/test/scala/chiselTests/SwitchSpec.scala → ...test/scala-2/chiselTests/SwitchSpec.scala b/src/test/scala/chiselTests/SwitchSpec.scala → ...test/scala-2/chiselTests/SwitchSpec.scala
diff --git a/src/test/scala/chiselTests/Tbl.scala → src/test/scala-2/chiselTests/Tbl.scala b/src/test/scala/chiselTests/Tbl.scala → src/test/scala-2/chiselTests/Tbl.scala
diff --git a/.../scala/chiselTests/TesterDriverSpec.scala → ...cala-2/chiselTests/TesterDriverSpec.scala b/.../scala/chiselTests/TesterDriverSpec.scala → ...cala-2/chiselTests/TesterDriverSpec.scala
diff --git a/...test/scala/chiselTests/ToTargetSpec.scala → ...st/scala-2/chiselTests/ToTargetSpec.scala b/...test/scala/chiselTests/ToTargetSpec.scala → ...st/scala-2/chiselTests/ToTargetSpec.scala
diff --git a/...est/scala/chiselTests/TypeAliasSpec.scala → ...t/scala-2/chiselTests/TypeAliasSpec.scala b/...est/scala/chiselTests/TypeAliasSpec.scala → ...t/scala-2/chiselTests/TypeAliasSpec.scala
@@ -245,7 +245,7 @@ class TypeAliasSpec extends ChiselFlatSpec with Utils {
       "Attempted to redeclare an existing type alias 'DifferentBundle' with a new Record structure"
     )
     msg should include("The alias was previously defined as:")
-    msg should include("@[src/test/scala/chiselTests/TypeAliasSpec.scala")
+    msg should include("@[src/test/scala-2/chiselTests/TypeAliasSpec.scala")
   }
 
   "Bundles with unsanitary names" should "properly sanitize" in {

diff --git a/src/test/scala/chiselTests/UIntOps.scala → src/test/scala-2/chiselTests/UIntOps.scala b/src/test/scala/chiselTests/UIntOps.scala → src/test/scala-2/chiselTests/UIntOps.scala
diff --git a/src/test/scala/chiselTests/Util.scala → src/test/scala-2/chiselTests/Util.scala b/src/test/scala/chiselTests/Util.scala → src/test/scala-2/chiselTests/Util.scala
diff --git a/src/test/scala/chiselTests/ValidSpec.scala → src/test/scala-2/chiselTests/ValidSpec.scala b/src/test/scala/chiselTests/ValidSpec.scala → src/test/scala-2/chiselTests/ValidSpec.scala
diff --git a/src/test/scala/chiselTests/Vec.scala → src/test/scala-2/chiselTests/Vec.scala b/src/test/scala/chiselTests/Vec.scala → src/test/scala-2/chiselTests/Vec.scala
diff --git a/...st/scala/chiselTests/VecLiteralSpec.scala → .../scala-2/chiselTests/VecLiteralSpec.scala b/...st/scala/chiselTests/VecLiteralSpec.scala → .../scala-2/chiselTests/VecLiteralSpec.scala
diff --git a/...t/scala/chiselTests/VecToTargetSpec.scala → ...scala-2/chiselTests/VecToTargetSpec.scala b/...t/scala/chiselTests/VecToTargetSpec.scala → ...scala-2/chiselTests/VecToTargetSpec.scala
diff --git a/...st/scala/chiselTests/VectorPacketIO.scala → .../scala-2/chiselTests/VectorPacketIO.scala b/...st/scala/chiselTests/VectorPacketIO.scala → .../scala-2/chiselTests/VectorPacketIO.scala
diff --git a/.../scala/chiselTests/VerificationSpec.scala → ...cala-2/chiselTests/VerificationSpec.scala b/.../scala/chiselTests/VerificationSpec.scala → ...cala-2/chiselTests/VerificationSpec.scala
diff --git a/src/test/scala/chiselTests/WarningSpec.scala → ...est/scala-2/chiselTests/WarningSpec.scala b/src/test/scala/chiselTests/WarningSpec.scala → ...est/scala-2/chiselTests/WarningSpec.scala
diff --git a/src/test/scala/chiselTests/WhenSpec.scala → src/test/scala-2/chiselTests/WhenSpec.scala b/src/test/scala/chiselTests/WhenSpec.scala → src/test/scala-2/chiselTests/WhenSpec.scala
diff --git a/src/test/scala/chiselTests/WidthSpec.scala → src/test/scala-2/chiselTests/WidthSpec.scala b/src/test/scala/chiselTests/WidthSpec.scala → src/test/scala-2/chiselTests/WidthSpec.scala
diff --git a/src/test/scala/chiselTests/WireSpec.scala → src/test/scala-2/chiselTests/WireSpec.scala b/src/test/scala/chiselTests/WireSpec.scala → src/test/scala-2/chiselTests/WireSpec.scala
diff --git a/...st/scala/chiselTests/aop/SelectSpec.scala → .../scala-2/chiselTests/aop/SelectSpec.scala b/...st/scala/chiselTests/aop/SelectSpec.scala → .../scala-2/chiselTests/aop/SelectSpec.scala
diff --git a/...Tests/experimental/AutoBlackBoxSpec.scala → ...Tests/experimental/AutoBlackBoxSpec.scala b/...Tests/experimental/AutoBlackBoxSpec.scala → ...Tests/experimental/AutoBlackBoxSpec.scala
diff --git a/...Tests/experimental/AutoTypenameSpec.scala → ...Tests/experimental/AutoTypenameSpec.scala b/...Tests/experimental/AutoTypenameSpec.scala → ...Tests/experimental/AutoTypenameSpec.scala
diff --git a/...experimental/CIRCTSRAMInterfaceSpec.scala → ...experimental/CIRCTSRAMInterfaceSpec.scala b/...experimental/CIRCTSRAMInterfaceSpec.scala → ...experimental/CIRCTSRAMInterfaceSpec.scala
diff --git a/...a/chiselTests/experimental/DataView.scala → ...2/chiselTests/experimental/DataView.scala b/...a/chiselTests/experimental/DataView.scala → ...2/chiselTests/experimental/DataView.scala
diff --git a/...xperimental/DataViewIntegrationSpec.scala → ...xperimental/DataViewIntegrationSpec.scala b/...xperimental/DataViewIntegrationSpec.scala → ...xperimental/DataViewIntegrationSpec.scala
diff --git a/...sts/experimental/DataViewTargetSpec.scala → ...sts/experimental/DataViewTargetSpec.scala b/...sts/experimental/DataViewTargetSpec.scala → ...sts/experimental/DataViewTargetSpec.scala
diff --git a/...chiselTests/experimental/FlatIOSpec.scala → ...chiselTests/experimental/FlatIOSpec.scala b/...chiselTests/experimental/FlatIOSpec.scala → ...chiselTests/experimental/FlatIOSpec.scala
diff --git a/...chiselTests/experimental/ForceNames.scala → ...chiselTests/experimental/ForceNames.scala b/...chiselTests/experimental/ForceNames.scala → ...chiselTests/experimental/ForceNames.scala
diff --git a/.../experimental/ModuleDataProductSpec.scala → .../experimental/ModuleDataProductSpec.scala b/.../experimental/ModuleDataProductSpec.scala → .../experimental/ModuleDataProductSpec.scala
diff --git a/...elTests/experimental/OpaqueTypeSpec.scala → ...elTests/experimental/OpaqueTypeSpec.scala b/...elTests/experimental/OpaqueTypeSpec.scala → ...elTests/experimental/OpaqueTypeSpec.scala
diff --git a/.../experimental/ProgrammaticPortsSpec.scala → .../experimental/ProgrammaticPortsSpec.scala b/.../experimental/ProgrammaticPortsSpec.scala → .../experimental/ProgrammaticPortsSpec.scala
diff --git a/...al/SerializableModuleElaboratorSpec.scala → ...al/SerializableModuleElaboratorSpec.scala b/...al/SerializableModuleElaboratorSpec.scala → ...al/SerializableModuleElaboratorSpec.scala
diff --git a/...tal/SerializableModuleGeneratorSpec.scala → ...tal/SerializableModuleGeneratorSpec.scala b/...tal/SerializableModuleGeneratorSpec.scala → ...tal/SerializableModuleGeneratorSpec.scala
diff --git a/.../chiselTests/experimental/TraceSpec.scala → .../chiselTests/experimental/TraceSpec.scala b/.../chiselTests/experimental/TraceSpec.scala → .../chiselTests/experimental/TraceSpec.scala
diff --git a/...cala/chiselTests/experimental/Tuple.scala → ...la-2/chiselTests/experimental/Tuple.scala b/...cala/chiselTests/experimental/Tuple.scala → ...la-2/chiselTests/experimental/Tuple.scala
diff --git a/.../experimental/hierarchy/Annotations.scala → .../experimental/hierarchy/Annotations.scala b/.../experimental/hierarchy/Annotations.scala → .../experimental/hierarchy/Annotations.scala
diff --git a/...perimental/hierarchy/DefinitionSpec.scala → ...perimental/hierarchy/DefinitionSpec.scala b/...perimental/hierarchy/DefinitionSpec.scala → ...perimental/hierarchy/DefinitionSpec.scala
diff --git a/...sts/experimental/hierarchy/Examples.scala → ...sts/experimental/hierarchy/Examples.scala b/...sts/experimental/hierarchy/Examples.scala → ...sts/experimental/hierarchy/Examples.scala
diff --git a/...experimental/hierarchy/InstanceSpec.scala → ...experimental/hierarchy/InstanceSpec.scala b/...experimental/hierarchy/InstanceSpec.scala → ...experimental/hierarchy/InstanceSpec.scala
diff --git a/...erimental/hierarchy/InstantiateSpec.scala → ...erimental/hierarchy/InstantiateSpec.scala b/...erimental/hierarchy/InstantiateSpec.scala → ...erimental/hierarchy/InstantiateSpec.scala
diff --git a/...l/hierarchy/SeparateElaborationSpec.scala → ...l/hierarchy/SeparateElaborationSpec.scala b/...l/hierarchy/SeparateElaborationSpec.scala → ...l/hierarchy/SeparateElaborationSpec.scala
diff --git a/...lTests/experimental/hierarchy/Utils.scala → ...lTests/experimental/hierarchy/Utils.scala b/...lTests/experimental/hierarchy/Utils.scala → ...lTests/experimental/hierarchy/Utils.scala
diff --git a/...scala/chiselTests/interface/Drivers.scala → ...ala-2/chiselTests/interface/Drivers.scala b/...scala/chiselTests/interface/Drivers.scala → ...ala-2/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/...a/chiselTests/naming/NamePluginSpec.scala → ...2/chiselTests/naming/NamePluginSpec.scala b/...a/chiselTests/naming/NamePluginSpec.scala → ...2/chiselTests/naming/NamePluginSpec.scala
diff --git a/...scala/chiselTests/naming/PrefixSpec.scala → ...ala-2/chiselTests/naming/PrefixSpec.scala b/...scala/chiselTests/naming/PrefixSpec.scala → ...ala-2/chiselTests/naming/PrefixSpec.scala
diff --git a/...ala/chiselTests/naming/TypenameSpec.scala → ...a-2/chiselTests/naming/TypenameSpec.scala b/...ala/chiselTests/naming/TypenameSpec.scala → ...a-2/chiselTests/naming/TypenameSpec.scala
diff --git a/...la/chiselTests/properties/ClassSpec.scala → ...-2/chiselTests/properties/ClassSpec.scala b/...la/chiselTests/properties/ClassSpec.scala → ...-2/chiselTests/properties/ClassSpec.scala
diff --git a/...a/chiselTests/properties/ObjectSpec.scala → ...2/chiselTests/properties/ObjectSpec.scala b/...a/chiselTests/properties/ObjectSpec.scala → ...2/chiselTests/properties/ObjectSpec.scala
diff --git a/...chiselTests/properties/PropertySpec.scala → ...chiselTests/properties/PropertySpec.scala b/...chiselTests/properties/PropertySpec.scala → ...chiselTests/properties/PropertySpec.scala
@@ -787,7 +787,7 @@ class PropertySpec extends ChiselFlatSpec with FileCheck {
     }))
 
     e.getMessage should include(
-      "Property expressions are currently only supported in RawModules @[src/test/scala/chiselTests/properties/PropertySpec.scala"
+      "Property expressions are currently only supported in RawModules @[src/test/scala-2/chiselTests/properties/PropertySpec.scala"
     )
   }
 
@@ -876,7 +876,7 @@ class PropertySpec extends ChiselFlatSpec with FileCheck {
     }))
 
     e.getMessage should include(
-      "Property expressions are currently only supported in RawModules @[src/test/scala/chiselTests/properties/PropertySpec.scala"
+      "Property expressions are currently only supported in RawModules @[src/test/scala-2/chiselTests/properties/PropertySpec.scala"
     )
   }
 

diff --git a/...ts/reflect/CheckTypeEquivalenceSpec.scala → ...ts/reflect/CheckTypeEquivalenceSpec.scala b/...ts/reflect/CheckTypeEquivalenceSpec.scala → ...ts/reflect/CheckTypeEquivalenceSpec.scala
diff --git a/.../chiselTests/reflect/DataMirrorSpec.scala → .../chiselTests/reflect/DataMirrorSpec.scala b/.../chiselTests/reflect/DataMirrorSpec.scala → .../chiselTests/reflect/DataMirrorSpec.scala
diff --git a/...sts/simulator/EphemeraSimulatorSpec.scala → ...sts/simulator/EphemeraSimulatorSpec.scala b/...sts/simulator/EphemeraSimulatorSpec.scala → ...sts/simulator/EphemeraSimulatorSpec.scala
diff --git a/...est/scala/chiselTests/simulator/GCD.scala → ...t/scala-2/chiselTests/simulator/GCD.scala b/...est/scala/chiselTests/simulator/GCD.scala → ...t/scala-2/chiselTests/simulator/GCD.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/...chiselTests/simulator/SimulatorSpec.scala → ...chiselTests/simulator/SimulatorSpec.scala b/...chiselTests/simulator/SimulatorSpec.scala → ...chiselTests/simulator/SimulatorSpec.scala
@@ -91,7 +91,7 @@ class SimulatorSpec extends AnyFunSpec with Matchers {
       }
       thrown.getMessage must include("Observed value '12' != 5.")
       (thrown.getMessage must include).regex(
-        """ @\[src/test/scala/chiselTests/simulator/SimulatorSpec\.scala:\d+:\d+\]"""
+        """ @\[src/test/scala-2/chiselTests/simulator/SimulatorSpec\.scala:\d+:\d+\]"""
       )
       thrown.getMessage must include("gcd.io.result.expect(5)")
       thrown.getMessage must include("                    ^")

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
@@ -163,7 +163,7 @@ class WarningConfigurationSpec extends AnyFunSpec with Matchers with chiselTests
 
       info("including when rooted")
       val args3 =
-        Array("--warn-conf", "src=src/test/scala/**/WarningConfigurationSpec.scala:s,any:e", "--throw-on-first-error")
+        Array("--warn-conf", "src=src/test/scala-2/**/WarningConfigurationSpec.scala:s,any:e", "--throw-on-first-error")
       ChiselStage.emitCHIRRTL(new ModuleWithWarning, args3)
     }
 

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/...lTests/util/AttributeAnnotationSpec.scala → ...lTests/util/AttributeAnnotationSpec.scala b/...lTests/util/AttributeAnnotationSpec.scala → ...lTests/util/AttributeAnnotationSpec.scala
diff --git a/...t/scala/chiselTests/util/BitSetSpec.scala → ...scala-2/chiselTests/util/BitSetSpec.scala b/...t/scala/chiselTests/util/BitSetSpec.scala → ...scala-2/chiselTests/util/BitSetSpec.scala
diff --git a/.../scala/chiselTests/util/BitwiseSpec.scala → ...cala-2/chiselTests/util/BitwiseSpec.scala b/.../scala/chiselTests/util/BitwiseSpec.scala → ...cala-2/chiselTests/util/BitwiseSpec.scala
diff --git a/...test/scala/chiselTests/util/CatSpec.scala → ...st/scala-2/chiselTests/util/CatSpec.scala b/...test/scala/chiselTests/util/CatSpec.scala → ...st/scala-2/chiselTests/util/CatSpec.scala
diff --git a/...est/scala/chiselTests/util/PipeSpec.scala → ...t/scala-2/chiselTests/util/PipeSpec.scala b/...est/scala/chiselTests/util/PipeSpec.scala → ...t/scala-2/chiselTests/util/PipeSpec.scala
diff --git a/...la/chiselTests/util/PriorityMuxSpec.scala → ...-2/chiselTests/util/PriorityMuxSpec.scala b/...la/chiselTests/util/PriorityMuxSpec.scala → ...-2/chiselTests/util/PriorityMuxSpec.scala
diff --git a/...test/scala/chiselTests/util/RegSpec.scala → ...st/scala-2/chiselTests/util/RegSpec.scala b/...test/scala/chiselTests/util/RegSpec.scala → ...st/scala-2/chiselTests/util/RegSpec.scala
diff --git a/...est/scala/chiselTests/util/SRAMSpec.scala → ...t/scala-2/chiselTests/util/SRAMSpec.scala b/...est/scala/chiselTests/util/SRAMSpec.scala → ...t/scala-2/chiselTests/util/SRAMSpec.scala
diff --git a/...la/chiselTests/util/circt/ClockGate.scala → ...-2/chiselTests/util/circt/ClockGate.scala b/...la/chiselTests/util/circt/ClockGate.scala → ...-2/chiselTests/util/circt/ClockGate.scala
diff --git a/...cala/chiselTests/util/circt/IsXSpec.scala → ...la-2/chiselTests/util/circt/IsXSpec.scala b/...cala/chiselTests/util/circt/IsXSpec.scala → ...la-2/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/...a/chiselTests/util/circt/SizeOfSpec.scala → ...2/chiselTests/util/circt/SizeOfSpec.scala b/...a/chiselTests/util/circt/SizeOfSpec.scala → ...2/chiselTests/util/circt/SizeOfSpec.scala
diff --git a/...la/chiselTests/util/circt/Synthesis.scala → ...-2/chiselTests/util/circt/Synthesis.scala b/...la/chiselTests/util/circt/Synthesis.scala → ...-2/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/...la/chiselTests/util/random/PRNGSpec.scala → ...-2/chiselTests/util/random/PRNGSpec.scala b/...la/chiselTests/util/random/PRNGSpec.scala → ...-2/chiselTests/util/random/PRNGSpec.scala
diff --git a/...est/scala/circtTests/ConventionSpec.scala → ...t/scala-2/circtTests/ConventionSpec.scala b/...est/scala/circtTests/ConventionSpec.scala → ...t/scala-2/circtTests/ConventionSpec.scala
diff --git a/.../circtTests/OutputDirAnnotationSpec.scala → .../circtTests/OutputDirAnnotationSpec.scala b/.../circtTests/OutputDirAnnotationSpec.scala → .../circtTests/OutputDirAnnotationSpec.scala
diff --git a/...ala/circtTests/stage/ChiselMainSpec.scala → ...a-2/circtTests/stage/ChiselMainSpec.scala b/...ala/circtTests/stage/ChiselMainSpec.scala → ...a-2/circtTests/stage/ChiselMainSpec.scala
diff --git a/...la/circtTests/stage/ChiselStageSpec.scala → ...-2/circtTests/stage/ChiselStageSpec.scala b/...la/circtTests/stage/ChiselStageSpec.scala → ...-2/circtTests/stage/ChiselStageSpec.scala
@@ -593,7 +593,7 @@ class ChiselStageSpec extends AnyFunSpec with Matchers with chiselTests.Utils {
       val lines = stdout.split("\n")
       // Fuzzy includes aren't ideal but there is ANSI color in these strings that is hard to match
       lines(0) should include(
-        "src/test/scala/circtTests/stage/ChiselStageSpec.scala 97:9: Negative shift amounts are illegal (got -1)"
+        "src/test/scala-2/circtTests/stage/ChiselStageSpec.scala 97:9: Negative shift amounts are illegal (got -1)"
       )
       lines(1) should include("    3.U >> -1")
       lines(2) should include("        ^")
@@ -614,7 +614,7 @@ class ChiselStageSpec extends AnyFunSpec with Matchers with chiselTests.Utils {
       // Fuzzy includes aren't ideal but there is ANSI color in these strings that is hard to match
       lines.size should equal(2)
       lines(0) should include(
-        "src/test/scala/circtTests/stage/ChiselStageSpec.scala 97:9: Negative shift amounts are illegal (got -1)"
+        "src/test/scala-2/circtTests/stage/ChiselStageSpec.scala 97:9: Negative shift amounts are illegal (got -1)"
       )
       (lines(1) should not).include("3.U >> -1")
     }

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/cookbook/Bundle2UInt.scala → src/test/scala-2/cookbook/Bundle2UInt.scala b/src/test/scala/cookbook/Bundle2UInt.scala → src/test/scala-2/cookbook/Bundle2UInt.scala
diff --git a/src/test/scala/cookbook/CookbookSpec.scala → src/test/scala-2/cookbook/CookbookSpec.scala b/src/test/scala/cookbook/CookbookSpec.scala → src/test/scala-2/cookbook/CookbookSpec.scala
diff --git a/src/test/scala/cookbook/FSM.scala → src/test/scala-2/cookbook/FSM.scala b/src/test/scala/cookbook/FSM.scala → src/test/scala-2/cookbook/FSM.scala
diff --git a/src/test/scala/cookbook/RegOfVec.scala → src/test/scala-2/cookbook/RegOfVec.scala b/src/test/scala/cookbook/RegOfVec.scala → src/test/scala-2/cookbook/RegOfVec.scala
diff --git a/src/test/scala/cookbook/UInt2Bundle.scala → src/test/scala-2/cookbook/UInt2Bundle.scala b/src/test/scala/cookbook/UInt2Bundle.scala → src/test/scala-2/cookbook/UInt2Bundle.scala
diff --git a/src/test/scala/cookbook/UInt2VecOfBool.scala → ...est/scala-2/cookbook/UInt2VecOfBool.scala b/src/test/scala/cookbook/UInt2VecOfBool.scala → ...est/scala-2/cookbook/UInt2VecOfBool.scala
diff --git a/src/test/scala/cookbook/VecOfBool2UInt.scala → ...est/scala-2/cookbook/VecOfBool2UInt.scala b/src/test/scala/cookbook/VecOfBool2UInt.scala → ...est/scala-2/cookbook/VecOfBool2UInt.scala
diff --git a/...xamples/ImplicitStateVendingMachine.scala → ...xamples/ImplicitStateVendingMachine.scala b/...xamples/ImplicitStateVendingMachine.scala → ...xamples/ImplicitStateVendingMachine.scala
diff --git a/...scala/examples/SimpleVendingMachine.scala → ...ala-2/examples/SimpleVendingMachine.scala b/...scala/examples/SimpleVendingMachine.scala → ...ala-2/examples/SimpleVendingMachine.scala
diff --git a/...la/examples/VendingMachineGenerator.scala → ...-2/examples/VendingMachineGenerator.scala b/...la/examples/VendingMachineGenerator.scala → ...-2/examples/VendingMachineGenerator.scala
diff --git a/.../scala/examples/VendingMachineUtils.scala → ...cala-2/examples/VendingMachineUtils.scala b/.../scala/examples/VendingMachineUtils.scala → ...cala-2/examples/VendingMachineUtils.scala