From 74d5da6f4af737e950f2d1516ed88101abef1041 Mon Sep 17 00:00:00 2001 From: chick Date: Tue, 10 Aug 2021 15:40:58 -0700 Subject: [PATCH] Move src/ from tapeout to top level get rid of root --- build.sbt | 4 +- .../resources/barstools/iocell/vsrc/Analog.v | 0 .../resources/barstools/iocell/vsrc/IOCell.v | 0 .../barstools/iocell/chisel/Analog.scala | 0 .../barstools/iocell/chisel/IOCell.scala | 0 .../scala/barstools/macros/CostMetric.scala | 0 .../barstools/macros/MacroCompiler.scala | 0 .../scala/barstools/macros/SynFlops.scala | 0 .../main/scala/barstools/macros/Utils.scala | 0 .../transforms/AddSuffixToModuleNames.scala | 0 .../transforms/AvoidExtModuleCollisions.scala | 0 .../transforms/ConvertToExtModPass.scala | 0 .../tapeout/transforms/EnumerateModules.scala | 0 .../transforms/GenerateTopAndHarness.scala | 0 .../tapeout/transforms/ReParentCircuit.scala | 0 .../transforms/RemoveUnusedModules.scala | 0 .../tapeout/transforms/ResetInverter.scala | 0 .../tapeout/transforms/retime/Retime.scala | 0 .../transforms/stage/TapeoutStage.scala | 0 .../tapeout/transforms/utils/FileUtils.scala | 0 .../transforms/utils/LowerAnnotations.scala | 0 .../transforms/utils/ProgrammaticBundle.scala | 0 .../transforms/utils/YamlHelpers.scala | 0 .../main/scala/mdf/macrolib/ConfReader.scala | 0 .../scala/mdf/macrolib/FillerMacroBase.scala | 0 .../scala/mdf/macrolib/FlipChipMacro.scala | 0 .../main/scala/mdf/macrolib/IOMacro.scala | 0 .../main/scala/mdf/macrolib/MacroLib.scala | 0 .../main/scala/mdf/macrolib/SRAM.scala | 0 .../main/scala/mdf/macrolib/Utils.scala | 0 .../test/resources/PadAnnotationVerilogPart.v | 0 .../src => src}/test/resources/bumps.json | 0 .../test/resources/io_properties.json | 0 .../test/resources/lib-BOOMTest.json | 0 .../test/resources/lib-MaskPortTest.json | 0 .../test/resources/lib-WriteEnableTest.json | 0 .../scala/barstools/macros/CostFunction.scala | 0 .../scala/barstools/macros/Functional.scala | 0 .../barstools/macros/MacroCompilerSpec.scala | 0 .../test/scala/barstools/macros/Masks.scala | 0 .../scala/barstools/macros/MultiPort.scala | 0 .../scala/barstools/macros/SRAMCompiler.scala | 0 .../barstools/macros/SimpleSplitDepth.scala | 0 .../barstools/macros/SimpleSplitWidth.scala | 0 .../barstools/macros/SpecificExamples.scala | 0 .../scala/barstools/macros/SynFlops.scala | 0 .../tapeout/transforms/GenerateSpec.scala | 0 .../tapeout/transforms/GenerateTopSpec.scala | 0 .../tapeout/transforms/NoFileProblem.scala | 51 +++++++++++++++++++ .../transforms/ResetInverterSpec.scala | 0 .../transforms/retime/RetimeSpec.scala | 0 .../scala/mdf/macrolib/ConfReaderSpec.scala | 0 .../mdf/macrolib/FlipChipMacroSpec.scala | 0 .../test/scala/mdf/macrolib/IOMacroSpec.scala | 0 .../scala/mdf/macrolib/IOPropertiesSpec.scala | 0 .../scala/mdf/macrolib/MacroLibOutput.scala | 0 .../scala/mdf/macrolib/MacroLibSpec.scala | 0 57 files changed, 53 insertions(+), 2 deletions(-) rename {tapeout/src => src}/main/resources/barstools/iocell/vsrc/Analog.v (100%) rename {tapeout/src => src}/main/resources/barstools/iocell/vsrc/IOCell.v (100%) rename {tapeout/src => src}/main/scala/barstools/iocell/chisel/Analog.scala (100%) rename {tapeout/src => src}/main/scala/barstools/iocell/chisel/IOCell.scala (100%) rename {tapeout/src => src}/main/scala/barstools/macros/CostMetric.scala (100%) rename {tapeout/src => src}/main/scala/barstools/macros/MacroCompiler.scala (100%) rename {tapeout/src => src}/main/scala/barstools/macros/SynFlops.scala (100%) rename {tapeout/src => src}/main/scala/barstools/macros/Utils.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/AddSuffixToModuleNames.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/AvoidExtModuleCollisions.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/ConvertToExtModPass.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/EnumerateModules.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/GenerateTopAndHarness.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/ReParentCircuit.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/RemoveUnusedModules.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/ResetInverter.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/retime/Retime.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala (100%) rename {tapeout/src => src}/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala (100%) rename {tapeout/src => src}/main/scala/mdf/macrolib/ConfReader.scala (100%) rename {tapeout/src => src}/main/scala/mdf/macrolib/FillerMacroBase.scala (100%) rename {tapeout/src => src}/main/scala/mdf/macrolib/FlipChipMacro.scala (100%) rename {tapeout/src => src}/main/scala/mdf/macrolib/IOMacro.scala (100%) rename {tapeout/src => src}/main/scala/mdf/macrolib/MacroLib.scala (100%) rename {tapeout/src => src}/main/scala/mdf/macrolib/SRAM.scala (100%) rename {tapeout/src => src}/main/scala/mdf/macrolib/Utils.scala (100%) rename {tapeout/src => src}/test/resources/PadAnnotationVerilogPart.v (100%) rename {tapeout/src => src}/test/resources/bumps.json (100%) rename {tapeout/src => src}/test/resources/io_properties.json (100%) rename {tapeout/src => src}/test/resources/lib-BOOMTest.json (100%) rename {tapeout/src => src}/test/resources/lib-MaskPortTest.json (100%) rename {tapeout/src => src}/test/resources/lib-WriteEnableTest.json (100%) rename {tapeout/src => src}/test/scala/barstools/macros/CostFunction.scala (100%) rename {tapeout/src => src}/test/scala/barstools/macros/Functional.scala (100%) rename {tapeout/src => src}/test/scala/barstools/macros/MacroCompilerSpec.scala (100%) rename {tapeout/src => src}/test/scala/barstools/macros/Masks.scala (100%) rename {tapeout/src => src}/test/scala/barstools/macros/MultiPort.scala (100%) rename {tapeout/src => src}/test/scala/barstools/macros/SRAMCompiler.scala (100%) rename {tapeout/src => src}/test/scala/barstools/macros/SimpleSplitDepth.scala (100%) rename {tapeout/src => src}/test/scala/barstools/macros/SimpleSplitWidth.scala (100%) rename {tapeout/src => src}/test/scala/barstools/macros/SpecificExamples.scala (100%) rename {tapeout/src => src}/test/scala/barstools/macros/SynFlops.scala (100%) rename {tapeout/src => src}/test/scala/barstools/tapeout/transforms/GenerateSpec.scala (100%) rename {tapeout/src => src}/test/scala/barstools/tapeout/transforms/GenerateTopSpec.scala (100%) create mode 100644 src/test/scala/barstools/tapeout/transforms/NoFileProblem.scala rename {tapeout/src => src}/test/scala/barstools/tapeout/transforms/ResetInverterSpec.scala (100%) rename {tapeout/src => src}/test/scala/barstools/tapeout/transforms/retime/RetimeSpec.scala (100%) rename {tapeout/src => src}/test/scala/mdf/macrolib/ConfReaderSpec.scala (100%) rename {tapeout/src => src}/test/scala/mdf/macrolib/FlipChipMacroSpec.scala (100%) rename {tapeout/src => src}/test/scala/mdf/macrolib/IOMacroSpec.scala (100%) rename {tapeout/src => src}/test/scala/mdf/macrolib/IOPropertiesSpec.scala (100%) rename {tapeout/src => src}/test/scala/mdf/macrolib/MacroLibOutput.scala (100%) rename {tapeout/src => src}/test/scala/mdf/macrolib/MacroLibSpec.scala (100%) diff --git a/build.sbt b/build.sbt index 47e450be..2b75dbc1 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,7 @@ lazy val commonSettings = Seq( // //enablePlugins(sbtassembly.AssemblyPlugin) -lazy val tapeout = (project in file("tapeout")) +lazy val tapeout = (project in file(".")) .settings(commonSettings) .settings(scalacOptions in Test ++= Seq("-language:reflectiveCalls")) .settings(fork := true) @@ -39,4 +39,4 @@ lazy val tapeout = (project in file("tapeout")) ) .enablePlugins(sbtassembly.AssemblyPlugin) -lazy val root = (project in file(".")).aggregate(tapeout) +//lazy val root = (project in file(".")).aggregate(tapeout) diff --git a/tapeout/src/main/resources/barstools/iocell/vsrc/Analog.v b/src/main/resources/barstools/iocell/vsrc/Analog.v similarity index 100% rename from tapeout/src/main/resources/barstools/iocell/vsrc/Analog.v rename to src/main/resources/barstools/iocell/vsrc/Analog.v diff --git a/tapeout/src/main/resources/barstools/iocell/vsrc/IOCell.v b/src/main/resources/barstools/iocell/vsrc/IOCell.v similarity index 100% rename from tapeout/src/main/resources/barstools/iocell/vsrc/IOCell.v rename to src/main/resources/barstools/iocell/vsrc/IOCell.v diff --git a/tapeout/src/main/scala/barstools/iocell/chisel/Analog.scala b/src/main/scala/barstools/iocell/chisel/Analog.scala similarity index 100% rename from tapeout/src/main/scala/barstools/iocell/chisel/Analog.scala rename to src/main/scala/barstools/iocell/chisel/Analog.scala diff --git a/tapeout/src/main/scala/barstools/iocell/chisel/IOCell.scala b/src/main/scala/barstools/iocell/chisel/IOCell.scala similarity index 100% rename from tapeout/src/main/scala/barstools/iocell/chisel/IOCell.scala rename to src/main/scala/barstools/iocell/chisel/IOCell.scala diff --git a/tapeout/src/main/scala/barstools/macros/CostMetric.scala b/src/main/scala/barstools/macros/CostMetric.scala similarity index 100% rename from tapeout/src/main/scala/barstools/macros/CostMetric.scala rename to src/main/scala/barstools/macros/CostMetric.scala diff --git a/tapeout/src/main/scala/barstools/macros/MacroCompiler.scala b/src/main/scala/barstools/macros/MacroCompiler.scala similarity index 100% rename from tapeout/src/main/scala/barstools/macros/MacroCompiler.scala rename to src/main/scala/barstools/macros/MacroCompiler.scala diff --git a/tapeout/src/main/scala/barstools/macros/SynFlops.scala b/src/main/scala/barstools/macros/SynFlops.scala similarity index 100% rename from tapeout/src/main/scala/barstools/macros/SynFlops.scala rename to src/main/scala/barstools/macros/SynFlops.scala diff --git a/tapeout/src/main/scala/barstools/macros/Utils.scala b/src/main/scala/barstools/macros/Utils.scala similarity index 100% rename from tapeout/src/main/scala/barstools/macros/Utils.scala rename to src/main/scala/barstools/macros/Utils.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/AddSuffixToModuleNames.scala b/src/main/scala/barstools/tapeout/transforms/AddSuffixToModuleNames.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/AddSuffixToModuleNames.scala rename to src/main/scala/barstools/tapeout/transforms/AddSuffixToModuleNames.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/AvoidExtModuleCollisions.scala b/src/main/scala/barstools/tapeout/transforms/AvoidExtModuleCollisions.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/AvoidExtModuleCollisions.scala rename to src/main/scala/barstools/tapeout/transforms/AvoidExtModuleCollisions.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/ConvertToExtModPass.scala b/src/main/scala/barstools/tapeout/transforms/ConvertToExtModPass.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/ConvertToExtModPass.scala rename to src/main/scala/barstools/tapeout/transforms/ConvertToExtModPass.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/EnumerateModules.scala b/src/main/scala/barstools/tapeout/transforms/EnumerateModules.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/EnumerateModules.scala rename to src/main/scala/barstools/tapeout/transforms/EnumerateModules.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/GenerateTopAndHarness.scala b/src/main/scala/barstools/tapeout/transforms/GenerateTopAndHarness.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/GenerateTopAndHarness.scala rename to src/main/scala/barstools/tapeout/transforms/GenerateTopAndHarness.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/ReParentCircuit.scala b/src/main/scala/barstools/tapeout/transforms/ReParentCircuit.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/ReParentCircuit.scala rename to src/main/scala/barstools/tapeout/transforms/ReParentCircuit.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/RemoveUnusedModules.scala b/src/main/scala/barstools/tapeout/transforms/RemoveUnusedModules.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/RemoveUnusedModules.scala rename to src/main/scala/barstools/tapeout/transforms/RemoveUnusedModules.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/ResetInverter.scala b/src/main/scala/barstools/tapeout/transforms/ResetInverter.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/ResetInverter.scala rename to src/main/scala/barstools/tapeout/transforms/ResetInverter.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/retime/Retime.scala b/src/main/scala/barstools/tapeout/transforms/retime/Retime.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/retime/Retime.scala rename to src/main/scala/barstools/tapeout/transforms/retime/Retime.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala b/src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala rename to src/main/scala/barstools/tapeout/transforms/stage/TapeoutStage.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala b/src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala rename to src/main/scala/barstools/tapeout/transforms/utils/FileUtils.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala b/src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala rename to src/main/scala/barstools/tapeout/transforms/utils/LowerAnnotations.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala b/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala rename to src/main/scala/barstools/tapeout/transforms/utils/ProgrammaticBundle.scala diff --git a/tapeout/src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala b/src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala similarity index 100% rename from tapeout/src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala rename to src/main/scala/barstools/tapeout/transforms/utils/YamlHelpers.scala diff --git a/tapeout/src/main/scala/mdf/macrolib/ConfReader.scala b/src/main/scala/mdf/macrolib/ConfReader.scala similarity index 100% rename from tapeout/src/main/scala/mdf/macrolib/ConfReader.scala rename to src/main/scala/mdf/macrolib/ConfReader.scala diff --git a/tapeout/src/main/scala/mdf/macrolib/FillerMacroBase.scala b/src/main/scala/mdf/macrolib/FillerMacroBase.scala similarity index 100% rename from tapeout/src/main/scala/mdf/macrolib/FillerMacroBase.scala rename to src/main/scala/mdf/macrolib/FillerMacroBase.scala diff --git a/tapeout/src/main/scala/mdf/macrolib/FlipChipMacro.scala b/src/main/scala/mdf/macrolib/FlipChipMacro.scala similarity index 100% rename from tapeout/src/main/scala/mdf/macrolib/FlipChipMacro.scala rename to src/main/scala/mdf/macrolib/FlipChipMacro.scala diff --git a/tapeout/src/main/scala/mdf/macrolib/IOMacro.scala b/src/main/scala/mdf/macrolib/IOMacro.scala similarity index 100% rename from tapeout/src/main/scala/mdf/macrolib/IOMacro.scala rename to src/main/scala/mdf/macrolib/IOMacro.scala diff --git a/tapeout/src/main/scala/mdf/macrolib/MacroLib.scala b/src/main/scala/mdf/macrolib/MacroLib.scala similarity index 100% rename from tapeout/src/main/scala/mdf/macrolib/MacroLib.scala rename to src/main/scala/mdf/macrolib/MacroLib.scala diff --git a/tapeout/src/main/scala/mdf/macrolib/SRAM.scala b/src/main/scala/mdf/macrolib/SRAM.scala similarity index 100% rename from tapeout/src/main/scala/mdf/macrolib/SRAM.scala rename to src/main/scala/mdf/macrolib/SRAM.scala diff --git a/tapeout/src/main/scala/mdf/macrolib/Utils.scala b/src/main/scala/mdf/macrolib/Utils.scala similarity index 100% rename from tapeout/src/main/scala/mdf/macrolib/Utils.scala rename to src/main/scala/mdf/macrolib/Utils.scala diff --git a/tapeout/src/test/resources/PadAnnotationVerilogPart.v b/src/test/resources/PadAnnotationVerilogPart.v similarity index 100% rename from tapeout/src/test/resources/PadAnnotationVerilogPart.v rename to src/test/resources/PadAnnotationVerilogPart.v diff --git a/tapeout/src/test/resources/bumps.json b/src/test/resources/bumps.json similarity index 100% rename from tapeout/src/test/resources/bumps.json rename to src/test/resources/bumps.json diff --git a/tapeout/src/test/resources/io_properties.json b/src/test/resources/io_properties.json similarity index 100% rename from tapeout/src/test/resources/io_properties.json rename to src/test/resources/io_properties.json diff --git a/tapeout/src/test/resources/lib-BOOMTest.json b/src/test/resources/lib-BOOMTest.json similarity index 100% rename from tapeout/src/test/resources/lib-BOOMTest.json rename to src/test/resources/lib-BOOMTest.json diff --git a/tapeout/src/test/resources/lib-MaskPortTest.json b/src/test/resources/lib-MaskPortTest.json similarity index 100% rename from tapeout/src/test/resources/lib-MaskPortTest.json rename to src/test/resources/lib-MaskPortTest.json diff --git a/tapeout/src/test/resources/lib-WriteEnableTest.json b/src/test/resources/lib-WriteEnableTest.json similarity index 100% rename from tapeout/src/test/resources/lib-WriteEnableTest.json rename to src/test/resources/lib-WriteEnableTest.json diff --git a/tapeout/src/test/scala/barstools/macros/CostFunction.scala b/src/test/scala/barstools/macros/CostFunction.scala similarity index 100% rename from tapeout/src/test/scala/barstools/macros/CostFunction.scala rename to src/test/scala/barstools/macros/CostFunction.scala diff --git a/tapeout/src/test/scala/barstools/macros/Functional.scala b/src/test/scala/barstools/macros/Functional.scala similarity index 100% rename from tapeout/src/test/scala/barstools/macros/Functional.scala rename to src/test/scala/barstools/macros/Functional.scala diff --git a/tapeout/src/test/scala/barstools/macros/MacroCompilerSpec.scala b/src/test/scala/barstools/macros/MacroCompilerSpec.scala similarity index 100% rename from tapeout/src/test/scala/barstools/macros/MacroCompilerSpec.scala rename to src/test/scala/barstools/macros/MacroCompilerSpec.scala diff --git a/tapeout/src/test/scala/barstools/macros/Masks.scala b/src/test/scala/barstools/macros/Masks.scala similarity index 100% rename from tapeout/src/test/scala/barstools/macros/Masks.scala rename to src/test/scala/barstools/macros/Masks.scala diff --git a/tapeout/src/test/scala/barstools/macros/MultiPort.scala b/src/test/scala/barstools/macros/MultiPort.scala similarity index 100% rename from tapeout/src/test/scala/barstools/macros/MultiPort.scala rename to src/test/scala/barstools/macros/MultiPort.scala diff --git a/tapeout/src/test/scala/barstools/macros/SRAMCompiler.scala b/src/test/scala/barstools/macros/SRAMCompiler.scala similarity index 100% rename from tapeout/src/test/scala/barstools/macros/SRAMCompiler.scala rename to src/test/scala/barstools/macros/SRAMCompiler.scala diff --git a/tapeout/src/test/scala/barstools/macros/SimpleSplitDepth.scala b/src/test/scala/barstools/macros/SimpleSplitDepth.scala similarity index 100% rename from tapeout/src/test/scala/barstools/macros/SimpleSplitDepth.scala rename to src/test/scala/barstools/macros/SimpleSplitDepth.scala diff --git a/tapeout/src/test/scala/barstools/macros/SimpleSplitWidth.scala b/src/test/scala/barstools/macros/SimpleSplitWidth.scala similarity index 100% rename from tapeout/src/test/scala/barstools/macros/SimpleSplitWidth.scala rename to src/test/scala/barstools/macros/SimpleSplitWidth.scala diff --git a/tapeout/src/test/scala/barstools/macros/SpecificExamples.scala b/src/test/scala/barstools/macros/SpecificExamples.scala similarity index 100% rename from tapeout/src/test/scala/barstools/macros/SpecificExamples.scala rename to src/test/scala/barstools/macros/SpecificExamples.scala diff --git a/tapeout/src/test/scala/barstools/macros/SynFlops.scala b/src/test/scala/barstools/macros/SynFlops.scala similarity index 100% rename from tapeout/src/test/scala/barstools/macros/SynFlops.scala rename to src/test/scala/barstools/macros/SynFlops.scala diff --git a/tapeout/src/test/scala/barstools/tapeout/transforms/GenerateSpec.scala b/src/test/scala/barstools/tapeout/transforms/GenerateSpec.scala similarity index 100% rename from tapeout/src/test/scala/barstools/tapeout/transforms/GenerateSpec.scala rename to src/test/scala/barstools/tapeout/transforms/GenerateSpec.scala diff --git a/tapeout/src/test/scala/barstools/tapeout/transforms/GenerateTopSpec.scala b/src/test/scala/barstools/tapeout/transforms/GenerateTopSpec.scala similarity index 100% rename from tapeout/src/test/scala/barstools/tapeout/transforms/GenerateTopSpec.scala rename to src/test/scala/barstools/tapeout/transforms/GenerateTopSpec.scala diff --git a/src/test/scala/barstools/tapeout/transforms/NoFileProblem.scala b/src/test/scala/barstools/tapeout/transforms/NoFileProblem.scala new file mode 100644 index 00000000..da8e0acb --- /dev/null +++ b/src/test/scala/barstools/tapeout/transforms/NoFileProblem.scala @@ -0,0 +1,51 @@ +//// SPDX-License-Identifier: Apache-2.0 +// +//package barstools.tapeout.transforms +// +//import firrtl.AnnotationSeq +//import firrtl.options.{Shell, Stage, StageMain} +//import firrtl.stage.{FirrtlCli, FirrtlStage} +//import logger.Logger.OutputCaptor +//import logger.{LazyLogging, LogLevel, Logger} +//import org.scalatest.freespec.AnyFreeSpec +// +//import java.io.{ByteArrayOutputStream, PrintStream} +// +//class NoFileStage extends Stage { +// override val shell: Shell = new Shell(applicationName = "tapeout") with FirrtlCli +// +// override def run(annotations: AnnotationSeq): AnnotationSeq = { +// Logger.makeScope(annotations) { +// val annos = new FirrtlStage().execute(Array.empty, annotations) +// } +// annotations +// } +//} +// +//class NoFileGenerator(annotationSeq: AnnotationSeq) extends LazyLogging { +// +//} +// +//object NoFileGenerator extends StageMain(new NoFileStage) +// +//class NoFileProblem extends AnyFreeSpec { +// // "should fail in a way that discloses missing file" - { +// // (new NoFileStage).execute(Array("-i", "jackalope"), Seq.empty) +// // } +// +// "should fail in a way that discloses missing file with output capture" in { +// val buffer = new ByteArrayOutputStream() +// Console.withOut(new PrintStream(buffer)) { +// NoFileGenerator.main(Array("-i", "jackalope", "-ll", "info")) +// } +// println(buffer.toString) +// } +// +// "don't uses Console.withOut" in { +// val captor = new OutputCaptor +// Logger.setOutput(captor.printStream) +// Logger.setLevel(getClass.getName, LogLevel.Info) +// NoFileGenerator.main(Array("-i", "jackalope", "-ll", "info")) +// println(captor.getOutputAsString) +// } +//} diff --git a/tapeout/src/test/scala/barstools/tapeout/transforms/ResetInverterSpec.scala b/src/test/scala/barstools/tapeout/transforms/ResetInverterSpec.scala similarity index 100% rename from tapeout/src/test/scala/barstools/tapeout/transforms/ResetInverterSpec.scala rename to src/test/scala/barstools/tapeout/transforms/ResetInverterSpec.scala diff --git a/tapeout/src/test/scala/barstools/tapeout/transforms/retime/RetimeSpec.scala b/src/test/scala/barstools/tapeout/transforms/retime/RetimeSpec.scala similarity index 100% rename from tapeout/src/test/scala/barstools/tapeout/transforms/retime/RetimeSpec.scala rename to src/test/scala/barstools/tapeout/transforms/retime/RetimeSpec.scala diff --git a/tapeout/src/test/scala/mdf/macrolib/ConfReaderSpec.scala b/src/test/scala/mdf/macrolib/ConfReaderSpec.scala similarity index 100% rename from tapeout/src/test/scala/mdf/macrolib/ConfReaderSpec.scala rename to src/test/scala/mdf/macrolib/ConfReaderSpec.scala diff --git a/tapeout/src/test/scala/mdf/macrolib/FlipChipMacroSpec.scala b/src/test/scala/mdf/macrolib/FlipChipMacroSpec.scala similarity index 100% rename from tapeout/src/test/scala/mdf/macrolib/FlipChipMacroSpec.scala rename to src/test/scala/mdf/macrolib/FlipChipMacroSpec.scala diff --git a/tapeout/src/test/scala/mdf/macrolib/IOMacroSpec.scala b/src/test/scala/mdf/macrolib/IOMacroSpec.scala similarity index 100% rename from tapeout/src/test/scala/mdf/macrolib/IOMacroSpec.scala rename to src/test/scala/mdf/macrolib/IOMacroSpec.scala diff --git a/tapeout/src/test/scala/mdf/macrolib/IOPropertiesSpec.scala b/src/test/scala/mdf/macrolib/IOPropertiesSpec.scala similarity index 100% rename from tapeout/src/test/scala/mdf/macrolib/IOPropertiesSpec.scala rename to src/test/scala/mdf/macrolib/IOPropertiesSpec.scala diff --git a/tapeout/src/test/scala/mdf/macrolib/MacroLibOutput.scala b/src/test/scala/mdf/macrolib/MacroLibOutput.scala similarity index 100% rename from tapeout/src/test/scala/mdf/macrolib/MacroLibOutput.scala rename to src/test/scala/mdf/macrolib/MacroLibOutput.scala diff --git a/tapeout/src/test/scala/mdf/macrolib/MacroLibSpec.scala b/src/test/scala/mdf/macrolib/MacroLibSpec.scala similarity index 100% rename from tapeout/src/test/scala/mdf/macrolib/MacroLibSpec.scala rename to src/test/scala/mdf/macrolib/MacroLibSpec.scala