From 19e51f3df507efa9371ab44f49ef6637123f30bc Mon Sep 17 00:00:00 2001 From: chick Date: Wed, 3 Feb 2021 17:46:12 -0800 Subject: [PATCH] Make the directory structure match the packages All tests run as they did prior to the changes --- .../Analog.scala | 0 .../IOCell.scala | 0 .../{ => barstools/macros}/CostMetric.scala | 3 ++- .../{ => barstools/macros}/MacroCompiler.scala | 17 ++++++++--------- .../scala/{ => barstools/macros}/SynFlops.scala | 6 +++--- .../scala/{ => barstools/macros}/Utils.scala | 12 +++++------- .../{ => barstools/macros}/CostFunction.scala | 0 .../{ => barstools/macros}/Functional.scala | 0 .../macros}/MacroCompilerSpec.scala | 8 ++++---- .../scala/{ => barstools/macros}/Masks.scala | 2 -- .../{ => barstools/macros}/MultiPort.scala | 0 .../{ => barstools/macros}/SRAMCompiler.scala | 2 -- .../macros}/SimpleSplitDepth.scala | 2 -- .../macros}/SimpleSplitWidth.scala | 0 .../macros}/SpecificExamples.scala | 0 .../scala/{ => barstools/macros}/SynFlops.scala | 0 .../transforms/AddSuffixToModuleNames.scala | 10 +++++----- .../transforms/AvoidExtModuleCollisions.scala | 10 +++++----- .../transforms/ConvertToExtModPass.scala | 10 +++++----- .../tapeout}/transforms/EnumerateModules.scala | 0 .../tapeout}/transforms/Generate.scala | 2 +- .../tapeout}/transforms/ReParentCircuit.scala | 7 +++---- .../transforms/RemoveUnusedModules.scala | 10 +++++----- .../tapeout}/transforms/ResetInverter.scala | 0 .../tapeout}/transforms/retime/Retime.scala | 0 .../tapeout}/transforms/utils/FileUtils.scala | 0 .../transforms/utils/LowerAnnotations.scala | 0 .../transforms/utils/ProgrammaticBundle.scala | 0 .../tapeout}/transforms/utils/YamlHelpers.scala | 0 .../tapeout}/transforms/ResetInverterSpec.scala | 2 +- .../tapeout}/transforms/retime/RetimeSpec.scala | 8 +++----- 31 files changed, 50 insertions(+), 61 deletions(-) rename iocell/src/main/scala/{chisel => barstools.iocell.chisel}/Analog.scala (100%) rename iocell/src/main/scala/{chisel => barstools.iocell.chisel}/IOCell.scala (100%) rename macros/src/main/scala/{ => barstools/macros}/CostMetric.scala (99%) rename macros/src/main/scala/{ => barstools/macros}/MacroCompiler.scala (99%) rename macros/src/main/scala/{ => barstools/macros}/SynFlops.scala (98%) rename macros/src/main/scala/{ => barstools/macros}/Utils.scala (96%) rename macros/src/test/scala/{ => barstools/macros}/CostFunction.scala (100%) rename macros/src/test/scala/{ => barstools/macros}/Functional.scala (100%) rename macros/src/test/scala/{ => barstools/macros}/MacroCompilerSpec.scala (99%) rename macros/src/test/scala/{ => barstools/macros}/Masks.scala (99%) rename macros/src/test/scala/{ => barstools/macros}/MultiPort.scala (100%) rename macros/src/test/scala/{ => barstools/macros}/SRAMCompiler.scala (96%) rename macros/src/test/scala/{ => barstools/macros}/SimpleSplitDepth.scala (99%) rename macros/src/test/scala/{ => barstools/macros}/SimpleSplitWidth.scala (100%) rename macros/src/test/scala/{ => barstools/macros}/SpecificExamples.scala (100%) rename macros/src/test/scala/{ => barstools/macros}/SynFlops.scala (100%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/AddSuffixToModuleNames.scala (94%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/AvoidExtModuleCollisions.scala (83%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/ConvertToExtModPass.scala (89%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/EnumerateModules.scala (100%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/Generate.scala (99%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/ReParentCircuit.scala (89%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/RemoveUnusedModules.scala (91%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/ResetInverter.scala (100%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/retime/Retime.scala (100%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/utils/FileUtils.scala (100%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/utils/LowerAnnotations.scala (100%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/utils/ProgrammaticBundle.scala (100%) rename tapeout/src/main/scala/{ => barstools/tapeout}/transforms/utils/YamlHelpers.scala (100%) rename tapeout/src/test/scala/{ => barstools/tapeout}/transforms/ResetInverterSpec.scala (95%) rename tapeout/src/test/scala/{ => barstools/tapeout}/transforms/retime/RetimeSpec.scala (94%) diff --git a/iocell/src/main/scala/chisel/Analog.scala b/iocell/src/main/scala/barstools.iocell.chisel/Analog.scala similarity index 100% rename from iocell/src/main/scala/chisel/Analog.scala rename to iocell/src/main/scala/barstools.iocell.chisel/Analog.scala diff --git a/iocell/src/main/scala/chisel/IOCell.scala b/iocell/src/main/scala/barstools.iocell.chisel/IOCell.scala similarity index 100% rename from iocell/src/main/scala/chisel/IOCell.scala rename to iocell/src/main/scala/barstools.iocell.chisel/IOCell.scala diff --git a/macros/src/main/scala/CostMetric.scala b/macros/src/main/scala/barstools/macros/CostMetric.scala similarity index 99% rename from macros/src/main/scala/CostMetric.scala rename to macros/src/main/scala/barstools/macros/CostMetric.scala index b80324aa..45020163 100644 --- a/macros/src/main/scala/CostMetric.scala +++ b/macros/src/main/scala/barstools/macros/CostMetric.scala @@ -67,8 +67,9 @@ object OldMetric extends CostMetric with CostMetricCompanion { */ class ExternalMetric(path: String) extends CostMetric { import mdf.macrolib.Utils.writeMacroToPath + import java.io._ - import scala.language.postfixOps // for !! postfix op + import scala.language.postfixOps import sys.process._ override def cost(mem: Macro, lib: Macro): Option[Double] = { diff --git a/macros/src/main/scala/MacroCompiler.scala b/macros/src/main/scala/barstools/macros/MacroCompiler.scala similarity index 99% rename from macros/src/main/scala/MacroCompiler.scala rename to macros/src/main/scala/barstools/macros/MacroCompiler.scala index c057baa6..416f2d2c 100644 --- a/macros/src/main/scala/MacroCompiler.scala +++ b/macros/src/main/scala/barstools/macros/MacroCompiler.scala @@ -8,18 +8,17 @@ package barstools.macros -import firrtl._ -import firrtl.ir._ -import firrtl.PrimOps +import barstools.macros.Utils._ +import firrtl.CompilerUtils.getLoweringTransforms import firrtl.Utils._ import firrtl.annotations._ -import firrtl.transforms.{NoDCEAnnotation} -import firrtl.CompilerUtils.getLoweringTransforms -import mdf.macrolib.{PolarizedPort, PortPolarity, SRAMMacro, SRAMGroup, SRAMCompiler} -import scala.collection.mutable.{ArrayBuffer, HashMap} +import firrtl.ir._ +import firrtl.{PrimOps, _} +import mdf.macrolib._ + import java.io.{File, FileWriter} -import scala.io.{Source} -import Utils._ +import scala.collection.mutable.{ArrayBuffer, HashMap} +import scala.io.Source case class MacroCompilerException(msg: String) extends Exception(msg) diff --git a/macros/src/main/scala/SynFlops.scala b/macros/src/main/scala/barstools/macros/SynFlops.scala similarity index 98% rename from macros/src/main/scala/SynFlops.scala rename to macros/src/main/scala/barstools/macros/SynFlops.scala index f815b4cb..df7390d0 100644 --- a/macros/src/main/scala/SynFlops.scala +++ b/macros/src/main/scala/barstools/macros/SynFlops.scala @@ -2,11 +2,11 @@ package barstools.macros +import barstools.macros.Utils._ +import firrtl.Utils._ import firrtl._ import firrtl.ir._ -import firrtl.Utils._ -import firrtl.passes.MemPortUtils.{memPortField, memType} -import Utils._ +import firrtl.passes.MemPortUtils.memPortField class SynFlopsPass(synflops: Boolean, libs: Seq[Macro]) extends firrtl.passes.Pass { val extraMods = scala.collection.mutable.ArrayBuffer.empty[Module] diff --git a/macros/src/main/scala/Utils.scala b/macros/src/main/scala/barstools/macros/Utils.scala similarity index 96% rename from macros/src/main/scala/Utils.scala rename to macros/src/main/scala/barstools/macros/Utils.scala index c416ca6a..a65e3a8a 100644 --- a/macros/src/main/scala/Utils.scala +++ b/macros/src/main/scala/barstools/macros/Utils.scala @@ -2,14 +2,12 @@ package barstools.macros -import firrtl._ -import firrtl.ir._ -import firrtl.PrimOps -import firrtl.passes.memlib.{MemConf, MemPort, ReadPort, WritePort, ReadWritePort, MaskedWritePort, MaskedReadWritePort} import firrtl.Utils.BoolType -import mdf.macrolib.{Constant, MacroPort, SRAMMacro} -import mdf.macrolib.{PolarizedPort, PortPolarity, ActiveLow, ActiveHigh, NegativeEdge, PositiveEdge, MacroExtraPort} -import java.io.File +import firrtl.ir._ +import firrtl.passes.memlib._ +import firrtl.{PrimOps, _} +import mdf.macrolib.{Input => _, Output => _, _} + import scala.language.implicitConversions object MacroCompilerMath { diff --git a/macros/src/test/scala/CostFunction.scala b/macros/src/test/scala/barstools/macros/CostFunction.scala similarity index 100% rename from macros/src/test/scala/CostFunction.scala rename to macros/src/test/scala/barstools/macros/CostFunction.scala diff --git a/macros/src/test/scala/Functional.scala b/macros/src/test/scala/barstools/macros/Functional.scala similarity index 100% rename from macros/src/test/scala/Functional.scala rename to macros/src/test/scala/barstools/macros/Functional.scala diff --git a/macros/src/test/scala/MacroCompilerSpec.scala b/macros/src/test/scala/barstools/macros/MacroCompilerSpec.scala similarity index 99% rename from macros/src/test/scala/MacroCompilerSpec.scala rename to macros/src/test/scala/barstools/macros/MacroCompilerSpec.scala index 8cdcf354..cf84e500 100644 --- a/macros/src/test/scala/MacroCompilerSpec.scala +++ b/macros/src/test/scala/barstools/macros/MacroCompilerSpec.scala @@ -2,14 +2,13 @@ package barstools.macros +import firrtl.Parser.parse import firrtl.ir.{Circuit, NoInfo} import firrtl.passes.RemoveEmpty -import firrtl.Parser.parse - -import java.io.{File, StringWriter} - import mdf.macrolib.SRAMMacro +import java.io.File + abstract class MacroCompilerSpec extends org.scalatest.FlatSpec with org.scalatest.Matchers { import scala.language.implicitConversions implicit def String2SomeString(i: String): Option[String] = Some(i) @@ -122,6 +121,7 @@ abstract class MacroCompilerSpec extends org.scalatest.FlatSpec with org.scalate // A collection of standard SRAM generators. trait HasSRAMGenerator { import mdf.macrolib._ + import scala.language.implicitConversions implicit def Int2SomeInt(i: Int): Option[Int] = Some(i) implicit def BigInt2SomeBigInt(i: BigInt): Option[BigInt] = Some(i) diff --git a/macros/src/test/scala/Masks.scala b/macros/src/test/scala/barstools/macros/Masks.scala similarity index 99% rename from macros/src/test/scala/Masks.scala rename to macros/src/test/scala/barstools/macros/Masks.scala index a091a42a..f104c8f2 100644 --- a/macros/src/test/scala/Masks.scala +++ b/macros/src/test/scala/barstools/macros/Masks.scala @@ -1,7 +1,5 @@ package barstools.macros -import mdf.macrolib._ - // Test the ability of the compiler to deal with various mask combinations. trait MasksTestSettings { diff --git a/macros/src/test/scala/MultiPort.scala b/macros/src/test/scala/barstools/macros/MultiPort.scala similarity index 100% rename from macros/src/test/scala/MultiPort.scala rename to macros/src/test/scala/barstools/macros/MultiPort.scala diff --git a/macros/src/test/scala/SRAMCompiler.scala b/macros/src/test/scala/barstools/macros/SRAMCompiler.scala similarity index 96% rename from macros/src/test/scala/SRAMCompiler.scala rename to macros/src/test/scala/barstools/macros/SRAMCompiler.scala index 5cae4745..e4e62de7 100644 --- a/macros/src/test/scala/SRAMCompiler.scala +++ b/macros/src/test/scala/barstools/macros/SRAMCompiler.scala @@ -1,7 +1,5 @@ package barstools.macros -import mdf.macrolib._ - class SRAMCompiler extends MacroCompilerSpec with HasSRAMGenerator with HasSimpleWidthTestGenerator { val compiler = generateSRAMCompiler("awesome", "A") val verilog = s"v-SRAMCompiler.v" diff --git a/macros/src/test/scala/SimpleSplitDepth.scala b/macros/src/test/scala/barstools/macros/SimpleSplitDepth.scala similarity index 99% rename from macros/src/test/scala/SimpleSplitDepth.scala rename to macros/src/test/scala/barstools/macros/SimpleSplitDepth.scala index e3560f9a..f016dbc7 100644 --- a/macros/src/test/scala/SimpleSplitDepth.scala +++ b/macros/src/test/scala/barstools/macros/SimpleSplitDepth.scala @@ -1,7 +1,5 @@ package barstools.macros -import mdf.macrolib._ - // Test the depth splitting aspect of the memory compiler. // This file is for simple tests: one read-write port, powers of two sizes, etc. // For example, implementing a 4096x32 memory using four 1024x32 memories. diff --git a/macros/src/test/scala/SimpleSplitWidth.scala b/macros/src/test/scala/barstools/macros/SimpleSplitWidth.scala similarity index 100% rename from macros/src/test/scala/SimpleSplitWidth.scala rename to macros/src/test/scala/barstools/macros/SimpleSplitWidth.scala diff --git a/macros/src/test/scala/SpecificExamples.scala b/macros/src/test/scala/barstools/macros/SpecificExamples.scala similarity index 100% rename from macros/src/test/scala/SpecificExamples.scala rename to macros/src/test/scala/barstools/macros/SpecificExamples.scala diff --git a/macros/src/test/scala/SynFlops.scala b/macros/src/test/scala/barstools/macros/SynFlops.scala similarity index 100% rename from macros/src/test/scala/SynFlops.scala rename to macros/src/test/scala/barstools/macros/SynFlops.scala diff --git a/tapeout/src/main/scala/transforms/AddSuffixToModuleNames.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/AddSuffixToModuleNames.scala similarity index 94% rename from tapeout/src/main/scala/transforms/AddSuffixToModuleNames.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/AddSuffixToModuleNames.scala index 26de5425..1e7eaa26 100644 --- a/tapeout/src/main/scala/transforms/AddSuffixToModuleNames.scala +++ b/tapeout/src/main/scala/barstools/tapeout/transforms/AddSuffixToModuleNames.scala @@ -2,12 +2,12 @@ package barstools.tapeout.transforms -import firrtl._ -import firrtl.ir._ import firrtl.Mappers._ -import firrtl.annotations.{ModuleTarget, SingleTargetAnnotation, CircuitTarget} -import firrtl.stage.TransformManager.{TransformDependency} -import firrtl.stage.{Forms} +import firrtl._ +import firrtl.annotations.{CircuitTarget, ModuleTarget, SingleTargetAnnotation} +import firrtl.ir._ +import firrtl.stage.Forms +import firrtl.stage.TransformManager.TransformDependency case class KeepNameAnnotation(target: ModuleTarget) extends SingleTargetAnnotation[ModuleTarget] { diff --git a/tapeout/src/main/scala/transforms/AvoidExtModuleCollisions.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/AvoidExtModuleCollisions.scala similarity index 83% rename from tapeout/src/main/scala/transforms/AvoidExtModuleCollisions.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/AvoidExtModuleCollisions.scala index 76ca1006..43aea6c1 100644 --- a/tapeout/src/main/scala/transforms/AvoidExtModuleCollisions.scala +++ b/tapeout/src/main/scala/barstools/tapeout/transforms/AvoidExtModuleCollisions.scala @@ -3,12 +3,12 @@ package barstools.tapeout.transforms import firrtl._ +import firrtl.annotations.NoTargetAnnotation import firrtl.ir._ -import firrtl.annotations.{NoTargetAnnotation} -import firrtl.options.{Dependency} -import firrtl.stage.TransformManager.{TransformDependency} -import firrtl.stage.{Forms} -import firrtl.passes.memlib.{ReplSeqMem} +import firrtl.options.Dependency +import firrtl.passes.memlib.ReplSeqMem +import firrtl.stage.Forms +import firrtl.stage.TransformManager.TransformDependency case class LinkExtModulesAnnotation(mustLink: Seq[ExtModule]) extends NoTargetAnnotation diff --git a/tapeout/src/main/scala/transforms/ConvertToExtModPass.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/ConvertToExtModPass.scala similarity index 89% rename from tapeout/src/main/scala/transforms/ConvertToExtModPass.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/ConvertToExtModPass.scala index 04e645fd..e6d2272a 100644 --- a/tapeout/src/main/scala/transforms/ConvertToExtModPass.scala +++ b/tapeout/src/main/scala/barstools/tapeout/transforms/ConvertToExtModPass.scala @@ -3,12 +3,12 @@ package barstools.tapeout.transforms import firrtl._ +import firrtl.annotations.{ModuleTarget, ReferenceTarget, SingleTargetAnnotation} import firrtl.ir._ -import firrtl.annotations.{ModuleTarget, SingleTargetAnnotation, ReferenceTarget} -import firrtl.stage.TransformManager.{TransformDependency} -import firrtl.stage.{Forms} -import firrtl.options.{Dependency} -import firrtl.passes.memlib.{ReplSeqMem} +import firrtl.options.Dependency +import firrtl.passes.memlib.ReplSeqMem +import firrtl.stage.Forms +import firrtl.stage.TransformManager.TransformDependency case class ConvertToExtModAnnotation(target: ModuleTarget) extends SingleTargetAnnotation[ModuleTarget] { diff --git a/tapeout/src/main/scala/transforms/EnumerateModules.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/EnumerateModules.scala similarity index 100% rename from tapeout/src/main/scala/transforms/EnumerateModules.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/EnumerateModules.scala diff --git a/tapeout/src/main/scala/transforms/Generate.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/Generate.scala similarity index 99% rename from tapeout/src/main/scala/transforms/Generate.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/Generate.scala index 17b8781d..5abb71c1 100644 --- a/tapeout/src/main/scala/transforms/Generate.scala +++ b/tapeout/src/main/scala/barstools/tapeout/transforms/Generate.scala @@ -5,7 +5,7 @@ import firrtl.annotations._ import firrtl.ir._ import firrtl.passes.memlib.ReplSeqMemAnnotation import firrtl.stage.FirrtlCircuitAnnotation -import firrtl.transforms.{BlackBoxResourceFileNameAnno, DedupModules} +import firrtl.transforms.BlackBoxResourceFileNameAnno import logger.LazyLogging trait HasTapeoutOptions { self: ExecutionOptionsManager with HasFirrtlOptions => diff --git a/tapeout/src/main/scala/transforms/ReParentCircuit.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/ReParentCircuit.scala similarity index 89% rename from tapeout/src/main/scala/transforms/ReParentCircuit.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/ReParentCircuit.scala index cbf4d2f8..f7929ee6 100644 --- a/tapeout/src/main/scala/transforms/ReParentCircuit.scala +++ b/tapeout/src/main/scala/barstools/tapeout/transforms/ReParentCircuit.scala @@ -3,11 +3,10 @@ package barstools.tapeout.transforms import firrtl._ -import firrtl.ir._ import firrtl.annotations._ -import firrtl.options.{Dependency} -import firrtl.stage.TransformManager.{TransformDependency} -import firrtl.stage.{Forms} +import firrtl.options.Dependency +import firrtl.stage.Forms +import firrtl.stage.TransformManager.TransformDependency case class ReParentCircuitAnnotation(target: ModuleTarget) extends SingleTargetAnnotation[ModuleTarget] { diff --git a/tapeout/src/main/scala/transforms/RemoveUnusedModules.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/RemoveUnusedModules.scala similarity index 91% rename from tapeout/src/main/scala/transforms/RemoveUnusedModules.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/RemoveUnusedModules.scala index 3feb6736..7aac8978 100644 --- a/tapeout/src/main/scala/transforms/RemoveUnusedModules.scala +++ b/tapeout/src/main/scala/barstools/tapeout/transforms/RemoveUnusedModules.scala @@ -3,12 +3,12 @@ package barstools.tapeout.transforms import firrtl._ +import firrtl.annotations.ModuleTarget import firrtl.ir._ -import firrtl.annotations.{ModuleTarget} -import firrtl.stage.TransformManager.{TransformDependency} -import firrtl.options.{Dependency} -import firrtl.stage.{Forms} -import firrtl.passes.memlib.{ReplSeqMem} +import firrtl.options.Dependency +import firrtl.passes.memlib.ReplSeqMem +import firrtl.stage.Forms +import firrtl.stage.TransformManager.TransformDependency // Removes all the unused modules in a circuit by recursing through every // instance (starting at the main module) diff --git a/tapeout/src/main/scala/transforms/ResetInverter.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/ResetInverter.scala similarity index 100% rename from tapeout/src/main/scala/transforms/ResetInverter.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/ResetInverter.scala diff --git a/tapeout/src/main/scala/transforms/retime/Retime.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/retime/Retime.scala similarity index 100% rename from tapeout/src/main/scala/transforms/retime/Retime.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/retime/Retime.scala diff --git a/tapeout/src/main/scala/transforms/utils/FileUtils.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala similarity index 100% rename from tapeout/src/main/scala/transforms/utils/FileUtils.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala diff --git a/tapeout/src/main/scala/transforms/utils/LowerAnnotations.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala similarity index 100% rename from tapeout/src/main/scala/transforms/utils/LowerAnnotations.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala diff --git a/tapeout/src/main/scala/transforms/utils/ProgrammaticBundle.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala similarity index 100% rename from tapeout/src/main/scala/transforms/utils/ProgrammaticBundle.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala diff --git a/tapeout/src/main/scala/transforms/utils/YamlHelpers.scala b/tapeout/src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala similarity index 100% rename from tapeout/src/main/scala/transforms/utils/YamlHelpers.scala rename to tapeout/src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala diff --git a/tapeout/src/test/scala/transforms/ResetInverterSpec.scala b/tapeout/src/test/scala/barstools/tapeout/transforms/ResetInverterSpec.scala similarity index 95% rename from tapeout/src/test/scala/transforms/ResetInverterSpec.scala rename to tapeout/src/test/scala/barstools/tapeout/transforms/ResetInverterSpec.scala index 9f23c3a8..9a0a1f6d 100644 --- a/tapeout/src/test/scala/transforms/ResetInverterSpec.scala +++ b/tapeout/src/test/scala/barstools/tapeout/transforms/ResetInverterSpec.scala @@ -3,7 +3,7 @@ package barstools.tapeout.transforms import chisel3._ -import chisel3.stage.{ChiselStage, ChiselGeneratorAnnotation} +import chisel3.stage.{ChiselGeneratorAnnotation, ChiselStage} import firrtl.{EmittedFirrtlCircuitAnnotation, EmittedFirrtlModuleAnnotation} import org.scalatest.{FreeSpec, Matchers} diff --git a/tapeout/src/test/scala/transforms/retime/RetimeSpec.scala b/tapeout/src/test/scala/barstools/tapeout/transforms/retime/RetimeSpec.scala similarity index 94% rename from tapeout/src/test/scala/transforms/retime/RetimeSpec.scala rename to tapeout/src/test/scala/barstools/tapeout/transforms/retime/RetimeSpec.scala index 35678991..d5168292 100644 --- a/tapeout/src/test/scala/transforms/retime/RetimeSpec.scala +++ b/tapeout/src/test/scala/barstools/tapeout/transforms/retime/RetimeSpec.scala @@ -1,12 +1,10 @@ // See LICENSE for license details. -package barstools.tapeout.transforms.retime.test +package barstools.tapeout.transforms.retime import chisel3._ -import chisel3.stage.{ChiselStage, ChiselGeneratorAnnotation} -import firrtl.{EmittedFirrtlCircuitAnnotation, EmittedFirrtlModuleAnnotation} -import barstools.tapeout.transforms.retime.RetimeLib -import firrtl.FileUtils +import chisel3.stage.{ChiselGeneratorAnnotation, ChiselStage} +import firrtl.{EmittedFirrtlCircuitAnnotation, EmittedFirrtlModuleAnnotation, FileUtils} import logger.Logger import org.scalatest.{FlatSpec, Matchers}