From 2def0dfea79401b5c55a89ff0dcdf60f5be53fdd Mon Sep 17 00:00:00 2001 From: alonamid Date: Thu, 7 Mar 2019 14:18:24 -0800 Subject: [PATCH] change dir structure --- .gitmodules | 6 +++--- Makefrag | 14 +++++++------- build.sbt | 10 +++++----- rocket-chip => generators/rocket-chip | 0 testchipip => generators/testchipip | 0 {verisim => sims/verisim}/.gitignore | 0 {verisim => sims/verisim}/Makefile | 2 +- {verisim => sims/verisim}/Makefrag-verilator | 0 {vsim => sims/vsim}/.gitignore | 0 {vsim => sims/vsim}/Makefile | 2 +- barstools => tools/barstools | 0 11 files changed, 17 insertions(+), 17 deletions(-) rename rocket-chip => generators/rocket-chip (100%) rename testchipip => generators/testchipip (100%) rename {verisim => sims/verisim}/.gitignore (100%) rename {verisim => sims/verisim}/Makefile (99%) rename {verisim => sims/verisim}/Makefrag-verilator (100%) rename {vsim => sims/vsim}/.gitignore (100%) rename {vsim => sims/vsim}/Makefile (98%) rename barstools => tools/barstools (100%) diff --git a/.gitmodules b/.gitmodules index fb609717..1efe8129 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "rocket-chip"] - path = rocket-chip + path = generators/rocket-chip url = https://github.com/ucb-bar/rocket-chip.git [submodule "testchipip"] - path = testchipip + path = generators/testchipip url = https://github.com/ucb-bar/testchipip.git [submodule "barstools"] - path = barstools + path = tools/barstools url = https://github.com/ucb-bar/barstools.git diff --git a/Makefrag b/Makefrag index 7cc4df34..3d90d8c9 100644 --- a/Makefrag +++ b/Makefrag @@ -1,5 +1,5 @@ -ROCKETCHIP_DIR=$(base_dir)/rocket-chip -TESTCHIP_DIR = $(base_dir)/testchipip +ROCKETCHIP_DIR=$(base_dir)/generators/rocket-chip +TESTCHIP_DIR = $(base_dir)/generators/testchipip SCALA_VERSION=2.12.4 SCALA_VERSION_MAJOR=$(basename $(SCALA_VERSION)) @@ -9,7 +9,7 @@ SBT ?= java -Xmx2G -Xss8M -XX:MaxPermSize=256M -jar $(ROCKETCHIP_DIR)/sbt-launch lookup_scala_srcs = $(shell find $(1)/ -iname "*.scala" 2> /dev/null) PACKAGES=rocket-chip testchipip -SCALA_SOURCES=$(foreach pkg,$(PACKAGES),$(call lookup_scala_srcs,$(base_dir)/$(pkg)/src/main/scala)) $(call lookup_scala_srcs,$(base_dir)/src/main/scala) +SCALA_SOURCES=$(foreach pkg,$(PACKAGES),$(call lookup_scala_srcs,$(base_dir)/generators/$(pkg)/src/main/scala)) $(call lookup_scala_srcs,$(base_dir)/src/main/scala) ROCKET_CLASSES ?= "$(ROCKETCHIP_DIR)/target/scala-$(SCALA_VERSION_MAJOR)/classes:$(ROCKETCHIP_DIR)/chisel3/target/scala-$(SCALA_VERSION_MAJOR)/*" TESTCHIPIP_CLASSES ?= "$(TESTCHIP_DIR)/target/scala-$(SCALA_VERSION_MAJOR)/classes" @@ -39,16 +39,16 @@ REPL_SEQ_MEM = --repl-seq-mem -c:$(MODEL):-o:$(SMEMS_CONF) # This should match whatever the commonSettings version is in build.sbt BARSTOOLS_VER=1.0 -TAPEOUT_JAR=$(base_dir)/barstools/tapeout/target/scala-$(SCALA_VERSION_MAJOR)/tapeout-assembly-$(BARSTOOLS_VER).jar -MACROCOMPILER_JAR=$(base_dir)/barstools/macros/target/scala-$(SCALA_VERSION_MAJOR)/barstools-macros-assembly-$(BARSTOOLS_VER).jar +TAPEOUT_JAR=$(base_dir)/tools/barstools/tapeout/target/scala-$(SCALA_VERSION_MAJOR)/tapeout-assembly-$(BARSTOOLS_VER).jar +MACROCOMPILER_JAR=$(base_dir)/tools/barstools/macros/target/scala-$(SCALA_VERSION_MAJOR)/barstools-macros-assembly-$(BARSTOOLS_VER).jar TAPEOUT ?= java -Xmx8G -Xss8M -cp $(ROCKET_CLASSES):$(TESTCHIPIP_CLASSES):$(TAPEOUT_JAR) MACROCOMPILER ?= java -Xmx8G -Xss8M -cp $(ROCKET_CLASSES):$(TESTCHIPIP_CLASSES):$(MACROCOMPILER_JAR) -$(TAPEOUT_JAR): $(call lookup_scala_srcs, $(base_dir)/barstools/tapeout/src/main/scala) +$(TAPEOUT_JAR): $(call lookup_scala_srcs, $(base_dir)/tools/barstools/tapeout/src/main/scala) cd $(base_dir) && $(SBT) "tapeout/assembly" -$(MACROCOMPILER_JAR): $(call lookup_scala_srcs, $(base_dir)/barstools/macros/src/main/scala) $(call lookup_scala_srcs, $(base_dir)/barstools/mdf/scalalib/src/main/scala) +$(MACROCOMPILER_JAR): $(call lookup_scala_srcs, $(base_dir)/tools/barstools/macros/src/main/scala) $(call lookup_scala_srcs, $(base_dir)/tools/barstools/mdf/scalalib/src/main/scala) cd $(base_dir) && $(SBT) "barstools-macros/assembly" .PHONY: jars diff --git a/build.sbt b/build.sbt index 553ca61b..2d217ba4 100644 --- a/build.sbt +++ b/build.sbt @@ -19,9 +19,9 @@ lazy val commonSettings = Seq( Resolver.sonatypeRepo("releases"), Resolver.mavenLocal)) -lazy val rocketchip = RootProject(file("rocket-chip")) +lazy val rocketchip = RootProject(file("generators/rocket-chip")) -lazy val testchipip = project.settings(commonSettings) +lazy val testchipip = (project in file("generators/testchipip")).settings(commonSettings) .dependsOn(rocketchip) // Checks for -DROCKET_USE_MAVEN. @@ -39,12 +39,12 @@ def conditionalDependsOn(prj: Project): Project = { lazy val example = conditionalDependsOn(project in file(".")) .settings(commonSettings) -lazy val tapeout = conditionalDependsOn(project in file("./barstools/tapeout/")) +lazy val tapeout = conditionalDependsOn(project in file("./tools/barstools/tapeout/")) .settings(commonSettings) -lazy val mdf = (project in file("./barstools/mdf/scalalib/")) +lazy val mdf = (project in file("./tools/barstools/mdf/scalalib/")) -lazy val `barstools-macros` = conditionalDependsOn(project in file("./barstools/macros/")) +lazy val `barstools-macros` = conditionalDependsOn(project in file("./tools/barstools/macros/")) .enablePlugins(sbtassembly.AssemblyPlugin) .settings(commonSettings) .dependsOn(mdf) diff --git a/rocket-chip b/generators/rocket-chip similarity index 100% rename from rocket-chip rename to generators/rocket-chip diff --git a/testchipip b/generators/testchipip similarity index 100% rename from testchipip rename to generators/testchipip diff --git a/verisim/.gitignore b/sims/verisim/.gitignore similarity index 100% rename from verisim/.gitignore rename to sims/verisim/.gitignore diff --git a/verisim/Makefile b/sims/verisim/Makefile similarity index 99% rename from verisim/Makefile rename to sims/verisim/Makefile index dc3a219e..9cab741c 100644 --- a/verisim/Makefile +++ b/sims/verisim/Makefile @@ -1,4 +1,4 @@ -base_dir=$(abspath ..) +base_dir=$(abspath ../..) sim_dir=$(abspath .) PROJECT ?= example diff --git a/verisim/Makefrag-verilator b/sims/verisim/Makefrag-verilator similarity index 100% rename from verisim/Makefrag-verilator rename to sims/verisim/Makefrag-verilator diff --git a/vsim/.gitignore b/sims/vsim/.gitignore similarity index 100% rename from vsim/.gitignore rename to sims/vsim/.gitignore diff --git a/vsim/Makefile b/sims/vsim/Makefile similarity index 98% rename from vsim/Makefile rename to sims/vsim/Makefile index bd8afc29..c0ed1bc1 100644 --- a/vsim/Makefile +++ b/sims/vsim/Makefile @@ -1,4 +1,4 @@ -base_dir=$(abspath ..) +base_dir=$(abspath ../..) sim_dir=$(abspath .) PROJECT ?= example diff --git a/barstools b/tools/barstools similarity index 100% rename from barstools rename to tools/barstools