wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #551 from ucb-bar/firrtl-test-jar

Browse Source 
Assemble the firrtl-test.jar and put it in its own directory
This commit is contained in:
David Biancolin
2020-05-14 17:30:52 -07:00
committed by GitHub
parent 3e57a5f539 ebe993cefe
commit 1b1f477619
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@@ -2,7 +2,7 @@ import Tests._
// This gives us a nicer handle to the root project instead of using the // This gives us a nicer handle to the root project instead of using the
// implicit one // implicit one
lazy val chipyardRoot = RootProject(file(".")) lazy val chipyardRoot = Project("chipyardRoot", file("."))
lazy val commonSettings = Seq( lazy val commonSettings = Seq(
organization := "edu.berkeley.cs", organization := "edu.berkeley.cs",

7
common.mk
View File

@@ -36,6 +36,7 @@ TESTCHIPIP_CLASSES ?= "$(TESTCHIP_DIR)/target/scala-$(SCALA_VERSION_MAJOR)/class
# jar creation variables and rules # jar creation variables and rules
######################################################################################### #########################################################################################
FIRRTL_JAR := $(base_dir)/lib/firrtl.jar FIRRTL_JAR := $(base_dir)/lib/firrtl.jar
FIRRTL_TEST_JAR := $(base_dir)/test_lib/firrtl-test.jar
$(FIRRTL_JAR): $(call lookup_srcs,$(CHIPYARD_FIRRTL_DIR),scala) $(FIRRTL_JAR): $(call lookup_srcs,$(CHIPYARD_FIRRTL_DIR),scala)
$(MAKE) -C $(CHIPYARD_FIRRTL_DIR) SBT="$(SBT)" root_dir=$(CHIPYARD_FIRRTL_DIR) build-scala $(MAKE) -C $(CHIPYARD_FIRRTL_DIR) SBT="$(SBT)" root_dir=$(CHIPYARD_FIRRTL_DIR) build-scala
@@ -43,6 +44,12 @@ $(FIRRTL_JAR): $(call lookup_srcs,$(CHIPYARD_FIRRTL_DIR),scala)
cp -p $(CHIPYARD_FIRRTL_DIR)/utils/bin/firrtl.jar $@ cp -p $(CHIPYARD_FIRRTL_DIR)/utils/bin/firrtl.jar $@
touch $@ touch $@
$(FIRRTL_TEST_JAR): $(call lookup_srcs,$(CHIPYARD_FIRRTL_DIR),scala)
cd $(CHIPYARD_FIRRTL_DIR) && $(SBT) "test:assembly"
mkdir -p $(@D)
cp -p $(CHIPYARD_FIRRTL_DIR)/utils/bin/firrtl-test.jar $@
touch $@
######################################################################################### #########################################################################################
# create list of simulation file inputs # create list of simulation file inputs
######################################################################################### #########################################################################################

2
sims/firesim

Submodule sims/firesim updated: 6482be6d2e...4ec7325ac6