update configure to deep-copy syn directory tree

This commit is contained in:
Blaise Tine 2024-08-17 04:09:50 -07:00
parent 4b6f8efeaa
commit 20b82fd34d
5 changed files with 11 additions and 19 deletions

2
configure vendored
View file

@ -164,7 +164,7 @@ if [ "$OSVERSION" == "unsupported" ]; then
fi fi
# project subdirectories to build # project subdirectories to build
SUBDIRS=("." "!ci" "!perf" "hw*" "kernel*" "runtime*" "sim*" "tests*") SUBDIRS=("." "!ci" "!perf" "hw*" "!hw/syn*" "kernel*" "runtime*" "sim*" "tests*")
# Get the directory of the script # Get the directory of the script
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"

View file

@ -7,8 +7,6 @@ PREFIX ?= build$(XLEN)
TARGET ?= fpga TARGET ?= fpga
NUM_CORES ?= 1 NUM_CORES ?= 1
SRC_DIR := $(VORTEX_HOME)/hw/syn/altera/opae
RTL_DIR := $(VORTEX_HOME)/hw/rtl RTL_DIR := $(VORTEX_HOME)/hw/rtl
DPI_DIR := $(VORTEX_HOME)/hw/dpi DPI_DIR := $(VORTEX_HOME)/hw/dpi
AFU_DIR := $(RTL_DIR)/afu/opae AFU_DIR := $(RTL_DIR)/afu/opae
@ -105,17 +103,17 @@ $(IP_CACHE_DIR)/ip-gen.log:
$(SCRIPT_DIR)/ip_gen.sh $(IP_CACHE_DIR) $(SCRIPT_DIR)/ip_gen.sh $(IP_CACHE_DIR)
swconfig: vortex_afu.h swconfig: vortex_afu.h
vortex_afu.h: $(SRC_DIR)/vortex_afu.json vortex_afu.h: vortex_afu.json
afu_json_mgr json-info --afu-json=$^ --c-hdr=$@ afu_json_mgr json-info --afu-json=$^ --c-hdr=$@
$(BUILD_DIR)/setup.cfg: $(BUILD_DIR)/setup.cfg:
mkdir -p $(BUILD_DIR); cp $(SRC_DIR)/setup.cfg $(BUILD_DIR)/setup.cfg mkdir -p $(BUILD_DIR); cp setup.cfg $(BUILD_DIR)/setup.cfg
$(BUILD_DIR)/vortex_afu.qsf: $(BUILD_DIR)/vortex_afu.qsf:
mkdir -p $(BUILD_DIR); cp $(SRC_DIR)/vortex_afu.qsf $(BUILD_DIR)/vortex_afu.qsf mkdir -p $(BUILD_DIR); cp vortex_afu.qsf $(BUILD_DIR)/vortex_afu.qsf
$(BUILD_DIR)/vortex_afu.json: $(BUILD_DIR)/vortex_afu.json:
mkdir -p $(BUILD_DIR); cp $(SRC_DIR)/vortex_afu.json $(BUILD_DIR)/vortex_afu.json mkdir -p $(BUILD_DIR); cp vortex_afu.json $(BUILD_DIR)/vortex_afu.json
gen-sources: $(BUILD_DIR)/sources.txt gen-sources: $(BUILD_DIR)/sources.txt
$(BUILD_DIR)/sources.txt: $(BUILD_DIR)/sources.txt:

View file

@ -1,8 +1,6 @@
ROOT_DIR := $(realpath ../../../../../..) ROOT_DIR := $(realpath ../../../../../..)
include $(ROOT_DIR)/config.mk include $(ROOT_DIR)/config.mk
SRC_DIR := $(VORTEX_HOME)/hw/syn/altera/quartus
RTL_DIR := $(VORTEX_HOME)/hw/rtl RTL_DIR := $(VORTEX_HOME)/hw/rtl
AFU_DIR := $(RTL_DIR)/afu/opae AFU_DIR := $(RTL_DIR)/afu/opae
SCRIPT_DIR := $(VORTEX_HOME)/hw/scripts SCRIPT_DIR := $(VORTEX_HOME)/hw/scripts
@ -79,7 +77,7 @@ smart.log: $(PROJECT_FILES)
# Project initialization # Project initialization
$(PROJECT_FILES): gen-sources $(PROJECT_FILES): gen-sources
quartus_sh -t $(SRC_DIR)/project.tcl -project $(PROJECT) -family $(FAMILY) -device $(DEVICE) -top $(TOP_LEVEL_ENTITY) -src "$(SRC_FILE)" -sdc $(SRC_DIR)/project.sdc -inc "src" quartus_sh -t project.tcl -project $(PROJECT) -family $(FAMILY) -device $(DEVICE) -top $(TOP_LEVEL_ENTITY) -src "$(SRC_FILE)" -sdc project.sdc -inc "src"
syn.chg: syn.chg:
$(STAMP) syn.chg $(STAMP) syn.chg

View file

@ -19,8 +19,6 @@ NUM_CORES ?= 1
PREFIX ?= build$(XLEN) PREFIX ?= build$(XLEN)
MAX_JOBS ?= 8 MAX_JOBS ?= 8
SRC_DIR := $(VORTEX_HOME)/hw/syn/xilinx/xrt
RTL_DIR := $(VORTEX_HOME)/hw/rtl RTL_DIR := $(VORTEX_HOME)/hw/rtl
DPI_DIR := $(VORTEX_HOME)/hw/dpi DPI_DIR := $(VORTEX_HOME)/hw/dpi
AFU_DIR := $(RTL_DIR)/afu/xrt AFU_DIR := $(RTL_DIR)/afu/xrt
@ -94,7 +92,7 @@ VPP_FLAGS += --connectivity.sp vortex_afu_1.m_axi_mem_0:HBM[0:15]
endif endif
VPP_FLAGS += --report_level 2 VPP_FLAGS += --report_level 2
VPP_FLAGS += --config $(SRC_DIR)/vitis.ini VPP_FLAGS += --config vitis.ini
# Enable perf counters # Enable perf counters
ifdef PERF ifdef PERF
@ -163,7 +161,7 @@ $(BUILD_DIR)/scope.json: $(BUILD_DIR)/vortex.xml
gen-xo: $(XO_CONTAINER) gen-xo: $(XO_CONTAINER)
$(XO_CONTAINER): $(BUILD_DIR)/sources.txt $(XO_CONTAINER): $(BUILD_DIR)/sources.txt
mkdir -p $(BUILD_DIR); cd $(BUILD_DIR); $(VIVADO) -mode batch -source $(SRC_DIR)/scripts/gen_xo.tcl -tclargs ../$(XO_CONTAINER) vortex_afu sources.txt $(SCRIPT_DIR) ../$(BUILD_DIR) mkdir -p $(BUILD_DIR); cd $(BUILD_DIR); $(VIVADO) -mode batch -source scripts/gen_xo.tcl -tclargs ../$(XO_CONTAINER) vortex_afu sources.txt $(SCRIPT_DIR) ../$(BUILD_DIR)
gen-bin: $(XCLBIN_CONTAINER) gen-bin: $(XCLBIN_CONTAINER)
$(XCLBIN_CONTAINER): $(XO_CONTAINER) $(SCOPE_JSON) $(XCLBIN_CONTAINER): $(XO_CONTAINER) $(SCOPE_JSON)

View file

@ -1,8 +1,6 @@
ROOT_DIR := $(realpath ../../..) ROOT_DIR := $(realpath ../../..)
include $(ROOT_DIR)/config.mk include $(ROOT_DIR)/config.mk
SRC_DIR := $(VORTEX_HOME)/hw/syn/yosys
TOP_LEVEL_ENTITY ?= Vortex TOP_LEVEL_ENTITY ?= Vortex
PREFIX ?= build PREFIX ?= build
NUM_CORES ?= 1 NUM_CORES ?= 1
@ -84,13 +82,13 @@ $(BUILD_DIR)/project.v: gen-sources
cd $(BUILD_DIR); $(SCRIPT_DIR)/sv2v.sh -t$(TOP_LEVEL_ENTITY) -Isrc -oproject.v cd $(BUILD_DIR); $(SCRIPT_DIR)/sv2v.sh -t$(TOP_LEVEL_ENTITY) -Isrc -oproject.v
build: $(BUILD_DIR)/project.v build: $(BUILD_DIR)/project.v
cd $(BUILD_DIR); $(SRC_DIR)/synth.sh -t$(TOP_LEVEL_ENTITY) -sproject.v cd $(BUILD_DIR); synth.sh -t$(TOP_LEVEL_ENTITY) -sproject.v
elaborate: $(BUILD_DIR)/project.v elaborate: $(BUILD_DIR)/project.v
cd $(BUILD_DIR); $(SRC_DIR)/synth.sh -t$(TOP_LEVEL_ENTITY) -sproject.v -P="elaborate" cd $(BUILD_DIR); synth.sh -t$(TOP_LEVEL_ENTITY) -sproject.v -P="elaborate"
synthesis: $(BUILD_DIR)/project.v synthesis: $(BUILD_DIR)/project.v
cd $(BUILD_DIR); $(SRC_DIR)/synth.sh -t$(TOP_LEVEL_ENTITY) -sproject.v -P="synthesis" cd $(BUILD_DIR); synth.sh -t$(TOP_LEVEL_ENTITY) -sproject.v -P="synthesis"
clean: clean:
$(RMDIR) $(BUILD_DIR) $(RMDIR) $(BUILD_DIR)