replica
/
firesim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fixes

This commit is contained in:
abejgonzalez 2023-05-29 17:03:02 -07:00
parent c48caf3952
commit 63199b38b7
7 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sim/make/chipyard.mk
View File

@ -22,10 +22,17 @@ SBT ?= java -jar $(rocketchip_dir)/sbt-launch.jar $(SBT_OPTS)
# (1) - classpath of the fat jar
# (2) - main class
# (3) - main class arguments
define run_scala_main
define run_jar_scala_main
cd $(base_dir) && java -cp $(1) $(2) $(3)
endef
# (1) - sbt project
# (2) - main class
# (3) - main class arguments
define run_scala_main
cd $(base_dir) && $(SBT) ";project $(1); runMain $(2) $(3)"
endef
# (1) - sbt project to assemble
# (2) - classpath file(s) to create
define run_sbt_assembly

4
sim/make/goldengate.mk
View File

@ -28,7 +28,7 @@ $(simulator_verilog) $(simulator_xdc) $(header) $(fame_annos): $(simulator_veril
# Run the 1.3 version instead (checked-in). If dedup must be completely disabled,
# pass --no-legacy-dedup as well
$(simulator_verilog).intermediate: $(FIRRTL_FILE) $(ANNO_FILE) $(FIRESIM_MAIN_CP)
$(call run_scala_main,$(FIRESIM_MAIN_CP),midas.stage.GoldenGateMain,\
$(call run_jar_scala_main,$(FIRESIM_MAIN_CP),midas.stage.GoldenGateMain,\
-i $(FIRRTL_FILE) \
-td $(GENERATED_DIR) \
-faf $(ANNO_FILE) \
@ -50,7 +50,7 @@ $(simulator_verilog).intermediate: $(FIRRTL_FILE) $(ANNO_FILE) $(FIRESIM_MAIN_CP
.PHONY: conf
conf: $(fame_annos) $(FIRESIM_MAIN_CP)
mkdir -p $(GENERATED_DIR)
$(call run_scala_main,$(FIRESIM_MAIN_CP),midas.stage.RuntimeConfigGeneratorMain,\
$(call run_jar_scala_main,$(FIRESIM_MAIN_CP),midas.stage.RuntimeConfigGeneratorMain,\
-td $(GENERATED_DIR) \
-faf $(fame_annos) \
-ggcp $(PLATFORM_CONFIG_PACKAGE) \

18
sim/make/scala-build.mk
View File

@ -70,17 +70,10 @@ firesim_main_srcs = $(foreach dir, $(firesim_source_dirs), \
firesim_test_srcs = $(foreach dir, $(firesim_source_dirs), \
$(call find_sources_in_dir, $(dir), 'src/test/scala'))
# Dummy rule building a token file which compiles all scala sources of the main
# FireSim project. This ensures that SBT is invoked once in parallel builds.
$(BUILD_DIR)/firesim.build: $(SCALA_BUILDTOOL_DEPS) $(firesim_main_srcs) $(firesim_test_srcs)
@mkdir -p $(@D)
$(SBT) "set showSuccess := false; project $(FIRESIM_SBT_PROJECT); compile; package"
@touch $@
FIRESIM_MAIN_CP := $(BUILD_DIR)/firesim-main.jar
# if *_CLASSPATH is a true java classpath, it can be colon-delimited list of paths (on *nix)
FIRESIM_MAIN_CP_TARGETS := $(subst :, ,$(FIRESIM_MAIN_CP))
$(FIRESIM_MAIN_CP): $(BUILD_DIR)/firesim.build
$(FIRESIM_MAIN_CP): $(SCALA_BUILDTOOL_DEPS) $(firesim_main_srcs) $(firesim_test_srcs)
@mkdir -p $(@D)
$(call run_sbt_assembly,$(FIRESIM_SBT_PROJECT),$(FIRESIM_MAIN_CP))
@ -91,15 +84,10 @@ ifneq ($(FIRESIM_SBT_PROJECT),$(TARGET_SBT_PROJECT))
target_srcs = $(foreach dir,$(TARGET_SOURCE_DIRS), \
$(call find_sources_in_dir, $(dir), 'src/main/scala'))
$(BUILD_DIR)/target.build: $(BUILD_DIR)/firesim.build $(target_srcs)
@mkdir -p $(@D)
$(SBT) "set showSuccess := false; project $(TARGET_SBT_PROJECT); compile; package"
@touch $@
TARGET_CP := $(BUILD_DIR)/target.jar
# if *_CLASSPATH is a true java classpath, it can be colon-delimited list of paths (on *nix)
TARGET_CP_TARGETS ?= $(subst :, ,$(TARGET_CP))
$(TARGET_CP): $(BUILD_DIR)/target.build
$(TARGET_CP): $(target_srcs) | $(FIRESIM_MAIN_CP)
@mkdir -p $(@D)
$(call run_sbt_assembly,$(TARGET_SBT_PROJECT),$(TARGET_CP))
@ -123,7 +111,7 @@ test: $(FIRESIM_MAIN_CP) $(TARGET_CP)
.PHONY: testOnly
testOnly: $(FIRESIM_MAIN_CP) $(TARGET_CP)
$(call run_scala_main,$(FIRESIM_MAIN_CP),org.scalatest.run,$(SCALA_TEST))
cd $(base_dir) && $(SBT) ";project $(FIRESIM_SBT_PROJECT); testOnly $(SCALA_TEST)"
################################################################################
# ScalaDoc

2
sim/src/main/makefrag/bridges/build.mk
View File

@ -4,7 +4,7 @@ vcs_args = +vcs+initreg+0 +vcs+initmem+0
$(FIRRTL_FILE) $(ANNO_FILE): $(TARGET_CP)
@mkdir -p $(@D)
$(call run_scala_main,$(TARGET_CP),freechips.rocketchip.system.Generator,\
$(call run_jar_scala_main,$(TARGET_CP),freechips.rocketchip.system.Generator,\
--target-dir $(GENERATED_DIR) \
--name $(long_name) \
--top-module $(DESIGN_PACKAGE).$(DESIGN) \

2
sim/src/main/makefrag/fasedtests/build.mk
View File

@ -2,7 +2,7 @@
$(FIRRTL_FILE) $(ANNO_FILE): $(TARGET_CP)
@mkdir -p $(@D)
$(call run_scala_main,$(TARGET_CP),freechips.rocketchip.system.Generator,\
$(call run_jar_scala_main,$(TARGET_CP),freechips.rocketchip.system.Generator,\
--target-dir $(GENERATED_DIR) \
--name $(long_name) \
--top-module $(DESIGN_PACKAGE).$(DESIGN) \

2
sim/src/main/makefrag/firesim/build.mk
View File

@ -2,7 +2,7 @@
$(FIRRTL_FILE) $(ANNO_FILE): $(TARGET_CP)
@mkdir -p $(@D)
$(call run_scala_main,$(TARGET_CP),chipyard.Generator,\
$(call run_jar_scala_main,$(TARGET_CP),chipyard.Generator,\
--target-dir $(GENERATED_DIR) \
--name $(long_name) \
--top-module $(DESIGN_PACKAGE).$(DESIGN) \

2
sim/src/main/makefrag/midasexamples/build.mk
View File

@ -2,7 +2,7 @@
$(FIRRTL_FILE) $(ANNO_FILE): $(TARGET_CP)
@mkdir -p $(@D)
$(call run_scala_main,$(TARGET_CP),freechips.rocketchip.system.Generator,\
$(call run_jar_scala_main,$(TARGET_CP),freechips.rocketchip.system.Generator,\
--target-dir $(GENERATED_DIR) \
--name $(long_name) \
--top-module $(DESIGN_PACKAGE).$(DESIGN) \