From 5173b7bf2d369b4b49e964c2f9bcbc560b780ec6 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Mon, 17 Dec 2018 18:36:47 -0800 Subject: [PATCH 1/4] get_db_root(): allow overriding Signed-off-by: John McMaster --- prjxray/util.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/prjxray/util.py b/prjxray/util.py index 8329f496..dec5e82d 100644 --- a/prjxray/util.py +++ b/prjxray/util.py @@ -5,6 +5,11 @@ from .db import Database def get_db_root(): + # Used during tilegrid db bootstrap + ret = os.getenv("XRAY_DATABASE_ROOT", None) + if ret: + return ret + return "%s/%s" % ( os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE")) From fbb464d5ba4538ad3dcbb5766f37c5d640e757bd Mon Sep 17 00:00:00 2001 From: John McMaster Date: Mon, 17 Dec 2018 18:38:10 -0800 Subject: [PATCH 2/4] tilegrid:tilegrid_basic.json => dir/tilegrid.json for XRAY_DATABASE_ROOT Signed-off-by: John McMaster --- fuzzers/005-tilegrid/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fuzzers/005-tilegrid/Makefile b/fuzzers/005-tilegrid/Makefile index 3ff18819..52db4f31 100644 --- a/fuzzers/005-tilegrid/Makefile +++ b/fuzzers/005-tilegrid/Makefile @@ -11,8 +11,9 @@ pushdb: build/tiles/tiles.txt: bash generate.sh build/tiles tiles -build/tilegrid_basic.json: generate.py build/tiles/tiles.txt - cd build && python3 ${FUZDIR}/generate.py --tiles $(FUZDIR)/build/tiles/tiles.txt --out ${BUILD_DIR}/tilegrid_basic.json +build/basicdb/tilegrid.json: generate.py build/tiles/tiles.txt + mkdir -p build/basicdb + cd build && python3 ${FUZDIR}/generate.py --tiles $(FUZDIR)/build/tiles/tiles.txt --out ${BUILD_DIR}/basicdb/tilegrid.json build/clb/deltas: bash generate.sh build/clb clb @@ -25,9 +26,9 @@ build/iob/deltas: bash generate.sh build/iob iob build/tilegrid_tdb.json: iob/build/segbits_tilegrid.tdb - python3 add_tdb.py --fn-in build/tilegrid_basic.json --fn-out build/tilegrid_tdb.json + python3 add_tdb.py --fn-in build/basicdb/tilegrid.json --fn-out build/tilegrid_tdb.json -iob/build/segbits_tilegrid.tdb: build/tilegrid_basic.json +iob/build/segbits_tilegrid.tdb: build/basicdb/tilegrid.json cd iob && $(MAKE) # FIXME: review IOB From 358876463e934216acf6f497c44ba2971336568e Mon Sep 17 00:00:00 2001 From: John McMaster Date: Mon, 17 Dec 2018 18:38:49 -0800 Subject: [PATCH 3/4] tilegrid: clean iob dir Signed-off-by: John McMaster --- fuzzers/005-tilegrid/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/fuzzers/005-tilegrid/Makefile b/fuzzers/005-tilegrid/Makefile index 52db4f31..1ddca0ab 100644 --- a/fuzzers/005-tilegrid/Makefile +++ b/fuzzers/005-tilegrid/Makefile @@ -45,6 +45,7 @@ run: clean: rm -rf build + cd iob && $(MAKE) clean .PHONY: database pushdb clean run From a17c8b8d1db87bae76320609a9499b7b6359422f Mon Sep 17 00:00:00 2001 From: John McMaster Date: Mon, 17 Dec 2018 18:39:17 -0800 Subject: [PATCH 4/4] tilegrid iob: use XRAY_DATABASE_ROOT Signed-off-by: John McMaster --- fuzzers/005-tilegrid/iob/generate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fuzzers/005-tilegrid/iob/generate.sh b/fuzzers/005-tilegrid/iob/generate.sh index 7d49e204..e66d1317 100644 --- a/fuzzers/005-tilegrid/iob/generate.sh +++ b/fuzzers/005-tilegrid/iob/generate.sh @@ -7,7 +7,7 @@ source ${XRAY_GENHEADER} # Some projects have hard coded top.v, others are generated if [ -f $FUZDIR/top.py ] ; then - python3 $FUZDIR/top.py >top.v + XRAY_DATABASE_ROOT=$FUZDIR/../build/basicdb python3 $FUZDIR/top.py >top.v fi vivado -mode batch -source $FUZDIR/generate.tcl