luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

divided harness and extra parts creation 

There is an issue with the roi_harness creation, for which the
multi-process make does not correctly works for roi_harness target

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
This commit is contained in:
Alessandro Comodi 2020-01-22 15:49:37 +01:00
parent 5ae155fd9c
commit 0b623982e5
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/kokoro/db-full.sh vendored
View File

@ -91,7 +91,8 @@ echo "----------------------------------------"
# Generate extra files (additional part yaml's, harness, etc).
set +e
# Attempt to generate extras here, but don't check until after diff reporting.
make db-extras-${XRAY_SETTINGS}
make db-extras-${XRAY_SETTINGS}-harness
make db-extras-${XRAY_SETTINGS}-parts -j $CORES
EXTRAS_RET=$?
set -e
# Format the database

19
Makefile
View File

@ -161,7 +161,7 @@ $(foreach PART,$(XRAY_PARTS),$(eval $(call multiple-parts,$(PART))))
db-extras-artix7-parts: $(addprefix db-part-only-,$(ARTIX_PARTS))
db-extras-artix7:
db-extras-artix7-harness:
+source minitests/roi_harness/basys3-swbut.sh && $(MAKE) -C fuzzers roi_only
+source minitests/roi_harness/arty-uart.sh && $(MAKE) -C fuzzers roi_only
+source minitests/roi_harness/basys3-swbut.sh && \
@ -170,7 +170,7 @@ db-extras-artix7:
+source minitests/roi_harness/basys3-swbut.sh && \
$(MAKE) -C minitests/roi_harness \
XRAY_ROIV=../roi_base_div2.v \
HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/basys3/swbut_50 run copy
HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/basys3/swbut_50 copy
+source minitests/roi_harness/arty-uart.sh && \
$(MAKE) -C minitests/roi_harness \
HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/uart run copy
@ -180,17 +180,20 @@ db-extras-artix7:
+source minitests/roi_harness/arty-swbut.sh && \
$(MAKE) -C minitests/roi_harness \
HARNESS_DIR=$(XRAY_DATABASE_DIR)/artix7/harness/arty-a7/swbut run copy
# Generate multiple part support
+$(MAKE) db-extras-artix7-parts
db-extras-kintex7:
db-extras-kintex7-parts:
@true
db-extras-zynq7:
+source minitests/roi_harness/zybo-swbut.sh && $(MAKE) -C fuzzers roi_only
db-extras-kintex7-harness:
@true
db-extras-zynq7-parts:
@true
db-extras-zynq7-harness:
+source minitests/roi_harness/zybo-swbut.sh && \
$(MAKE) -C minitests/roi_harness \
HARNESS_DIR=$(XRAY_DATABASE_DIR)/zynq7/harness/zybo/swbut run
HARNESS_DIR=$(XRAY_DATABASE_DIR)/zynq7/harness/zybo/swbut run copy
db-check:
@true

4
fuzzers/Makefile
View File

@ -130,7 +130,7 @@ quick:
# Part only targets
# -----------------
${XRAY_FAMILY_DIR}/${XRAY_PART}/part.yaml:
$(addprefix ${XRAY_FAMILY_DIR}/${XRAY_PART}/part.,yaml json):
$(MAKE) -C 001-part-yaml run
${XRAY_FAMILY_DIR}/${XRAY_PART}/package_pins.csv:
@ -144,7 +144,7 @@ ${XRAY_FAMILY_DIR}/${XRAY_PART}/tileconn.json:
$(MAKE) -C 073-get_counts run
$(MAKE) -C 074-dump_all run
part_only_yaml: ${XRAY_FAMILY_DIR}/${XRAY_PART}/part.yaml
part_only_yaml: $(addprefix ${XRAY_FAMILY_DIR}/${XRAY_PART}/part.,yaml json)
part_only_tilegrid: ${XRAY_FAMILY_DIR}/${XRAY_PART}/tilegrid.json
part_only_tileconn: ${XRAY_FAMILY_DIR}/${XRAY_PART}/tileconn.json
part_only_pins: ${XRAY_FAMILY_DIR}/${XRAY_PART}/package_pins.csv