diff --git a/build.sbt b/build.sbt index cf97adba..c133667e 100644 --- a/build.sbt +++ b/build.sbt @@ -2,31 +2,33 @@ import Dependencies._ -lazy val commonSettings = Seq( - organization := "edu.berkeley.cs", - version := "0.1-SNAPSHOT", - scalaVersion := "2.11.8", - scalacOptions := Seq("-deprecation", "-feature", "-language:reflectiveCalls"), - libraryDependencies ++= commonDependencies -) - val defaultVersions = Map( "chisel3" -> "3.1-SNAPSHOT", "chisel-iotesters" -> "1.2-SNAPSHOT" ) -lazy val mdf = RootProject(file("mdf/scalalib")) +lazy val commonSettings = Seq( + organization := "edu.berkeley.cs", + version := "0.1-SNAPSHOT", + scalaVersion := "2.11.8", + scalacOptions := Seq("-deprecation", "-feature", "-language:reflectiveCalls"), + libraryDependencies ++= commonDependencies, + libraryDependencies ++= Seq("chisel3","chisel-iotesters").map { + dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) + }, + resolvers ++= Seq( + Resolver.sonatypeRepo("snapshots"), + Resolver.sonatypeRepo("releases") + ) +) -lazy val tapeout = (project in file("tapeout")) +lazy val mdf = (project in file("mdf/scalalib")) +lazy val macros = (project in file("macros")) .dependsOn(mdf) .settings(commonSettings) - .settings( - libraryDependencies ++= Seq("chisel3","chisel-iotesters").map { - dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep)) - }, - resolvers ++= Seq( - Resolver.sonatypeRepo("snapshots"), - Resolver.sonatypeRepo("releases") - ) - ) + +lazy val tapeout = (project in file("tapeout")) + .settings(commonSettings) .settings(scalacOptions in Test ++= Seq("-language:reflectiveCalls")) + +lazy val root = (project in file(".")).aggregate(macros, tapeout) diff --git a/tapeout/src/main/scala/transforms/macros/MacroCompiler.scala b/macros/src/main/scala/MacroCompiler.scala similarity index 99% rename from tapeout/src/main/scala/transforms/macros/MacroCompiler.scala rename to macros/src/main/scala/MacroCompiler.scala index 54c35cc9..ea800956 100644 --- a/tapeout/src/main/scala/transforms/macros/MacroCompiler.scala +++ b/macros/src/main/scala/MacroCompiler.scala @@ -1,6 +1,6 @@ // See LICENSE for license details. -package barstools.tapeout.transforms.macros +package barstools.macros import firrtl._ import firrtl.ir._ diff --git a/tapeout/src/main/scala/transforms/macros/SynFlops.scala b/macros/src/main/scala/SynFlops.scala similarity index 98% rename from tapeout/src/main/scala/transforms/macros/SynFlops.scala rename to macros/src/main/scala/SynFlops.scala index c4a84872..e005196a 100644 --- a/tapeout/src/main/scala/transforms/macros/SynFlops.scala +++ b/macros/src/main/scala/SynFlops.scala @@ -1,6 +1,6 @@ // See LICENSE for license details. -package barstools.tapeout.transforms.macros +package barstools.macros import firrtl._ import firrtl.ir._ diff --git a/tapeout/src/main/scala/transforms/macros/Utils.scala b/macros/src/main/scala/Utils.scala similarity index 98% rename from tapeout/src/main/scala/transforms/macros/Utils.scala rename to macros/src/main/scala/Utils.scala index 19591f4c..9a2a11b8 100644 --- a/tapeout/src/main/scala/transforms/macros/Utils.scala +++ b/macros/src/main/scala/Utils.scala @@ -1,6 +1,6 @@ // See LICENSE for license details. -package barstools.tapeout.transforms.macros +package barstools.macros import firrtl._ import firrtl.ir._ diff --git a/tapeout/src/test/resources/macros/lib-1024x8-mrw.json b/macros/src/test/resources/lib-1024x8-mrw.json similarity index 100% rename from tapeout/src/test/resources/macros/lib-1024x8-mrw.json rename to macros/src/test/resources/lib-1024x8-mrw.json diff --git a/tapeout/src/test/resources/macros/lib-1024x8-n28.json b/macros/src/test/resources/lib-1024x8-n28.json similarity index 100% rename from tapeout/src/test/resources/macros/lib-1024x8-n28.json rename to macros/src/test/resources/lib-1024x8-n28.json diff --git a/tapeout/src/test/resources/macros/lib-1024x8-r-mw.json b/macros/src/test/resources/lib-1024x8-r-mw.json similarity index 100% rename from tapeout/src/test/resources/macros/lib-1024x8-r-mw.json rename to macros/src/test/resources/lib-1024x8-r-mw.json diff --git a/tapeout/src/test/resources/macros/lib-1024x8-sleep.json b/macros/src/test/resources/lib-1024x8-sleep.json similarity index 100% rename from tapeout/src/test/resources/macros/lib-1024x8-sleep.json rename to macros/src/test/resources/lib-1024x8-sleep.json diff --git a/tapeout/src/test/resources/macros/lib-2048x10-rw.json b/macros/src/test/resources/lib-2048x10-rw.json similarity index 100% rename from tapeout/src/test/resources/macros/lib-2048x10-rw.json rename to macros/src/test/resources/lib-2048x10-rw.json diff --git a/tapeout/src/test/resources/macros/lib-2048x16-n28.json b/macros/src/test/resources/lib-2048x16-n28.json similarity index 100% rename from tapeout/src/test/resources/macros/lib-2048x16-n28.json rename to macros/src/test/resources/lib-2048x16-n28.json diff --git a/tapeout/src/test/resources/macros/lib-2048x8-mrw-re.json b/macros/src/test/resources/lib-2048x8-mrw-re.json similarity index 100% rename from tapeout/src/test/resources/macros/lib-2048x8-mrw-re.json rename to macros/src/test/resources/lib-2048x8-mrw-re.json diff --git a/tapeout/src/test/resources/macros/lib-2048x8-mrw.json b/macros/src/test/resources/lib-2048x8-mrw.json similarity index 100% rename from tapeout/src/test/resources/macros/lib-2048x8-mrw.json rename to macros/src/test/resources/lib-2048x8-mrw.json diff --git a/tapeout/src/test/resources/macros/lib-32x32-2rw.json b/macros/src/test/resources/lib-32x32-2rw.json similarity index 100% rename from tapeout/src/test/resources/macros/lib-32x32-2rw.json rename to macros/src/test/resources/lib-32x32-2rw.json diff --git a/tapeout/src/test/resources/macros/lib-32x80-mrw.json b/macros/src/test/resources/lib-32x80-mrw.json similarity index 100% rename from tapeout/src/test/resources/macros/lib-32x80-mrw.json rename to macros/src/test/resources/lib-32x80-mrw.json diff --git a/tapeout/src/test/resources/macros/mem-2000x8-mrw.json b/macros/src/test/resources/mem-2000x8-mrw.json similarity index 100% rename from tapeout/src/test/resources/macros/mem-2000x8-mrw.json rename to macros/src/test/resources/mem-2000x8-mrw.json diff --git a/tapeout/src/test/resources/macros/mem-2048x16-mrw-2.json b/macros/src/test/resources/mem-2048x16-mrw-2.json similarity index 100% rename from tapeout/src/test/resources/macros/mem-2048x16-mrw-2.json rename to macros/src/test/resources/mem-2048x16-mrw-2.json diff --git a/tapeout/src/test/resources/macros/mem-2048x16-mrw.json b/macros/src/test/resources/mem-2048x16-mrw.json similarity index 100% rename from tapeout/src/test/resources/macros/mem-2048x16-mrw.json rename to macros/src/test/resources/mem-2048x16-mrw.json diff --git a/tapeout/src/test/resources/macros/mem-2048x20-mrw.json b/macros/src/test/resources/mem-2048x20-mrw.json similarity index 100% rename from tapeout/src/test/resources/macros/mem-2048x20-mrw.json rename to macros/src/test/resources/mem-2048x20-mrw.json diff --git a/tapeout/src/test/resources/macros/mem-2048x8-mrw.json b/macros/src/test/resources/mem-2048x8-mrw.json similarity index 100% rename from tapeout/src/test/resources/macros/mem-2048x8-mrw.json rename to macros/src/test/resources/mem-2048x8-mrw.json diff --git a/tapeout/src/test/resources/macros/mem-2048x8-r-mw.json b/macros/src/test/resources/mem-2048x8-r-mw.json similarity index 100% rename from tapeout/src/test/resources/macros/mem-2048x8-r-mw.json rename to macros/src/test/resources/mem-2048x8-r-mw.json diff --git a/tapeout/src/test/resources/macros/mem-24x52-r-w.json b/macros/src/test/resources/mem-24x52-r-w.json similarity index 100% rename from tapeout/src/test/resources/macros/mem-24x52-r-w.json rename to macros/src/test/resources/mem-24x52-r-w.json diff --git a/tapeout/src/test/resources/macros/mem-32x160-mrw.json b/macros/src/test/resources/mem-32x160-mrw.json similarity index 100% rename from tapeout/src/test/resources/macros/mem-32x160-mrw.json rename to macros/src/test/resources/mem-32x160-mrw.json diff --git a/tapeout/src/test/resources/macros/mylib.json b/macros/src/test/resources/mylib.json similarity index 100% rename from tapeout/src/test/resources/macros/mylib.json rename to macros/src/test/resources/mylib.json diff --git a/tapeout/src/test/resources/macros/rocketchip.json b/macros/src/test/resources/rocketchip.json similarity index 100% rename from tapeout/src/test/resources/macros/rocketchip.json rename to macros/src/test/resources/rocketchip.json diff --git a/tapeout/src/test/scala/transforms/macros/MacroCompilerSpec.scala b/macros/src/test/scala/MacroCompilerSpec.scala similarity index 99% rename from tapeout/src/test/scala/transforms/macros/MacroCompilerSpec.scala rename to macros/src/test/scala/MacroCompilerSpec.scala index c42d4b77..5ef71fc6 100644 --- a/tapeout/src/test/scala/transforms/macros/MacroCompilerSpec.scala +++ b/macros/src/test/scala/MacroCompilerSpec.scala @@ -1,6 +1,5 @@ -package barstools.tapeout.transforms.macros.test +package barstools.macros -import barstools.tapeout.transforms.macros._ import firrtl.ir.{Circuit, NoInfo} import firrtl.passes.RemoveEmpty import firrtl.Parser.parse diff --git a/tapeout/src/test/scala/transforms/macros/SimpleSplitDepth.scala b/macros/src/test/scala/SimpleSplitDepth.scala similarity index 99% rename from tapeout/src/test/scala/transforms/macros/SimpleSplitDepth.scala rename to macros/src/test/scala/SimpleSplitDepth.scala index d25aeb27..94322fe1 100644 --- a/tapeout/src/test/scala/transforms/macros/SimpleSplitDepth.scala +++ b/macros/src/test/scala/SimpleSplitDepth.scala @@ -1,4 +1,4 @@ -package barstools.tapeout.transforms.macros.test +package barstools.macros import firrtl.Utils.ceilLog2 import mdf.macrolib._ diff --git a/tapeout/src/test/scala/transforms/macros/SimpleSplitWidth.scala b/macros/src/test/scala/SimpleSplitWidth.scala similarity index 99% rename from tapeout/src/test/scala/transforms/macros/SimpleSplitWidth.scala rename to macros/src/test/scala/SimpleSplitWidth.scala index 1e172d64..f4c9faf1 100644 --- a/tapeout/src/test/scala/transforms/macros/SimpleSplitWidth.scala +++ b/macros/src/test/scala/SimpleSplitWidth.scala @@ -1,4 +1,4 @@ -//~ package barstools.tapeout.transforms.macros.test +//~ package barstools.macros //~ import java.io.File diff --git a/tapeout/src/test/scala/transforms/macros/SynFlops.scala b/macros/src/test/scala/SynFlops.scala similarity index 100% rename from tapeout/src/test/scala/transforms/macros/SynFlops.scala rename to macros/src/test/scala/SynFlops.scala