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

Update paths

Browse Source
This commit is contained in:
Hansung Kim
2024-12-04 18:14:29 -08:00
parent 81595a9a9f
commit ba67263b40
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cyclotron

Submodule cyclotron updated: b6ad5b5454...d61fa682ad

21
radiance.mk
View File

@@ -3,16 +3,17 @@
############################################################## ##############################################################
VORTEX_SRC_DIR = $(base_dir)/generators/radiance/src/main/resources/vsrc/vortex VORTEX_SRC_DIR = $(base_dir)/generators/radiance/src/main/resources/vsrc/vortex
RADPIE_SRC_DIR = $(base_dir)/generators/radiance/radpie CYCLOTRON_SRC_DIR = $(base_dir)/generators/radiance/cyclotron
RADPIE_BUILD_DIR = $(RADPIE_SRC_DIR)/target/release CYCLOTRON_BUILD_DIR = $(CYCLOTRON_SRC_DIR)/target/release
RADIANCE_CSRC_DIR = $(base_dir)/generators/radiance/src/main/resources/csrc RADIANCE_CSRC_DIR = $(base_dir)/generators/radiance/src/main/resources/csrc
RADIANCE_VSRC_DIR = $(base_dir)/generators/radiance/src/main/resources/vsrc
################################################################## ##################################################################
# THE FOLLOWING MUST BE += operators # THE FOLLOWING MUST BE += operators
################################################################## ##################################################################
EXTRA_SIM_REQS += radpie EXTRA_SIM_REQS += cyclotron
EXTRA_SIM_LDFLAGS += -L$(RADPIE_BUILD_DIR) -Wl,-rpath,$(RADPIE_BUILD_DIR) -lradpie EXTRA_SIM_LDFLAGS += -L$(CYCLOTRON_BUILD_DIR) -Wl,-rpath,$(CYCLOTRON_BUILD_DIR) -lcyclotron
ifeq ($(shell echo $(CONFIG) | grep -E "SynConfig$$"),$(CONFIG)) ifeq ($(shell echo $(CONFIG) | grep -E "SynConfig$$"),$(CONFIG))
EXTRA_SIM_PREPROC_DEFINES += +define+SYNTHESIS +define+NDEBUG +define+DPI_DISABLE EXTRA_SIM_PREPROC_DEFINES += +define+SYNTHESIS +define+NDEBUG +define+DPI_DISABLE
endif endif
@@ -32,18 +33,20 @@ VCS_NONCC_OPTS += +vcs+initreg+random
# cargo handles building of Rust files all on its own, so make this a PHONY # cargo handles building of Rust files all on its own, so make this a PHONY
# target to run cargo unconditionally # target to run cargo unconditionally
.PHONY: radpie .PHONY: cyclotron
radpie: cyclotron:
cd $(RADPIE_SRC_DIR) && cargo build --release cd $(CYCLOTRON_SRC_DIR) && cargo build --release
EXTRA_SIM_REQS += vortex_vsrc.$(CONFIG) EXTRA_SIM_REQS += vortex_vsrc.$(CONFIG)
# below manipulation of RADIANCE_EXTERNAL_SRCS doesn't work if we try to reuse # below manipulation of RADIANCE_EXTERNAL_SRCS doesn't work if we try to reuse
# $(call lookup_srcs) from common.mk, the variable doesn't expand somehow # $(call lookup_srcs) from common.mk, the variable doesn't expand somehow
ifeq ($(shell which fdfd 2> /dev/null),) ifeq ($(shell which fdfd 2> /dev/null),)
RADIANCE_EXTERNAL_SRCS := $(shell find -L $(VORTEX_SRC_DIR) -type f -iname "*.sv" -o -iname "*.vh" -o -iname "*.v") # RADIANCE_EXTERNAL_SRCS := $(shell find -L $(VORTEX_SRC_DIR) -type f -iname "*.sv" -o -iname "*.vh" -o -iname "*.v")
RADIANCE_EXTERNAL_SRCS := $(shell find -L $(RADIANCE_VSRC_DIR) -type f -iname "*.sv" -o -iname "*.vh" -o -iname "*.v")
RADIANCE_EXTERNAL_SRCS += $(shell find -L $(RADIANCE_CSRC_DIR) -type f) RADIANCE_EXTERNAL_SRCS += $(shell find -L $(RADIANCE_CSRC_DIR) -type f)
else else
RADIANCE_EXTERNAL_SRCS := $(shell fdfind -L -t f -e "sv" -e "vh" -e "v" . $(VORTEX_SRC_DIR)) # RADIANCE_EXTERNAL_SRCS := $(shell fdfind -L -t f -e "sv" -e "vh" -e "v" . $(VORTEX_SRC_DIR))
RADIANCE_EXTERNAL_SRCS := $(shell fdfind -L -t f -e "sv" -e "vh" -e "v" . $(RADIANCE_VSRC_DIR))
RADIANCE_EXTERNAL_SRCS += $(shell fdfind -L -t f . $(RADIANCE_CSRC_DIR)) RADIANCE_EXTERNAL_SRCS += $(shell fdfind -L -t f . $(RADIANCE_CSRC_DIR))
endif endif