From e60b0d587574764e5838f0ef844dd0fc9c460fd9 Mon Sep 17 00:00:00 2001
From: Daniel Schultz <d.schultz@phytec.de>
Date: Thu, 7 Jan 2021 19:10:31 +0100
Subject: [PATCH] fuzzers: Deploy fabric data to a separate dir

Fabric data should be deployed to a separate directory inside the database
and all devices with the same fabric should access it.

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
---
 fuzzers/000-init-db/Makefile          | 5 ++++-
 fuzzers/005-tilegrid/Makefile         | 9 +++++----
 fuzzers/074-dump_all/Makefile         | 4 ++--
 fuzzers/074-dump_all/check_nodes.py   | 2 +-
 fuzzers/074-dump_all/generate_grid.py | 2 +-
 fuzzers/074-dump_all/node_names.py    | 2 +-
 fuzzers/Makefile                      | 4 ----
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/fuzzers/000-init-db/Makefile b/fuzzers/000-init-db/Makefile
index 2cb3a41a..033ed989 100644
--- a/fuzzers/000-init-db/Makefile
+++ b/fuzzers/000-init-db/Makefile
@@ -97,7 +97,10 @@ $(DB_FILES_PATH):
 ${XRAY_FAMILY_DIR}/${XRAY_PART}:
 	mkdir -p ${XRAY_FAMILY_DIR}/${XRAY_PART}
 
-pushdb: $(DB_FILES_PATH) ${XRAY_FAMILY_DIR}/${XRAY_PART}
+${XRAY_FAMILY_DIR}/${XRAY_FABRIC}:
+	mkdir -p ${XRAY_FAMILY_DIR}/${XRAY_FABRIC}
+
+pushdb: $(DB_FILES_PATH) ${XRAY_FAMILY_DIR}/${XRAY_PART} ${XRAY_FAMILY_DIR}/${XRAY_FABRIC}
 	@true
 
 run:
diff --git a/fuzzers/005-tilegrid/Makefile b/fuzzers/005-tilegrid/Makefile
index 35eb3b15..4143ddf0 100644
--- a/fuzzers/005-tilegrid/Makefile
+++ b/fuzzers/005-tilegrid/Makefile
@@ -44,22 +44,23 @@ else
 TILEGRID_TDB_DEPENDENCIES += dsp_int/$(BUILD_FOLDER)/segbits_tilegrid.tdb
 endif
 
-BASICDB_TILEGRID=$(BUILD_FOLDER)/basicdb/${XRAY_PART}/tilegrid.json
+BASICDB_TILEGRID=$(BUILD_FOLDER)/basicdb/${XRAY_FABRIC}/tilegrid.json
 
 database: $(BUILD_FOLDER)/tilegrid.json
 
 pushdb: $(BUILD_FOLDER)/tilegrid.json
-	cp $(BUILD_FOLDER)/tilegrid.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/tilegrid.json
+	cp $(BUILD_FOLDER)/tilegrid.json ${XRAY_FAMILY_DIR}/${XRAY_FABRIC}/tilegrid.json
 
 $(BUILD_FOLDER)/tiles/tiles.txt:
 	bash generate.sh $(BUILD_FOLDER)/tiles tiles
 
 ${BASICDB_TILEGRID}: generate.py $(BUILD_FOLDER)/tiles/tiles.txt
-	mkdir -p $(BUILD_FOLDER)/basicdb/${XRAY_PART}
+	mkdir -p $(BUILD_FOLDER)/basicdb/${XRAY_FABRIC}
+	ln -sf $(XRAY_DATABASE_DIR)/$(XRAY_DATABASE)/mapping $(BUILD_FOLDER)/basicdb/
 	cd $(BUILD_FOLDER) && python3 ${FUZDIR}/generate.py \
 		--tiles $(BUILD_DIR)/tiles/tiles.txt \
 		--pin_func $(BUILD_DIR)/tiles/pin_func.txt \
-		--out ${BUILD_DIR}/basicdb/${XRAY_PART}/tilegrid.json
+		--out ${BUILD_DIR}/basicdb/${XRAY_FABRIC}/tilegrid.json
 
 clb/$(BUILD_FOLDER)/segbits_tilegrid.tdb: ${BASICDB_TILEGRID}
 	cd clb && $(MAKE)
diff --git a/fuzzers/074-dump_all/Makefile b/fuzzers/074-dump_all/Makefile
index ed9b8d52..d2dcabd5 100644
--- a/fuzzers/074-dump_all/Makefile
+++ b/fuzzers/074-dump_all/Makefile
@@ -21,8 +21,8 @@ pushdb:
 	cp $(BUILD_DIR)/output/tile_type_*.json ${XRAY_FAMILY_DIR}/
 	rm ${XRAY_FAMILY_DIR}/tile_type_*_site_type_*.json
 	cp $(BUILD_DIR)/output/site_type_*.json ${XRAY_FAMILY_DIR}/
-	cp $(BUILD_DIR)/output/tileconn.json ${XRAY_FAMILY_DIR}/$(XRAY_PART)/
-	cp $(BUILD_DIR)/output/node_wires.json ${XRAY_FAMILY_DIR}/$(XRAY_PART)/
+	cp $(BUILD_DIR)/output/tileconn.json ${XRAY_FAMILY_DIR}/$(XRAY_FABRIC)/
+	cp $(BUILD_DIR)/output/node_wires.json ${XRAY_FAMILY_DIR}/$(XRAY_FABRIC)/
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@) -p=$(MAX_VIVADO_PROCESS) -t=$(MAX_TILES_INSTANCE) -n=$(MAX_NODES_INSTANCE)
diff --git a/fuzzers/074-dump_all/check_nodes.py b/fuzzers/074-dump_all/check_nodes.py
index f4f4d391..6be280ea 100644
--- a/fuzzers/074-dump_all/check_nodes.py
+++ b/fuzzers/074-dump_all/check_nodes.py
@@ -59,7 +59,7 @@ def main():
     args = parser.parse_args()
 
     print('{} Reading tilegrid'.format(datetime.datetime.now()))
-    with open(os.path.join(util.get_db_root(), util.get_part(),
+    with open(os.path.join(util.get_db_root(), util.get_fabric(),
                            'tilegrid.json')) as f:
         tilegrid = json.load(f)
         grid = Grid(db=None, tilegrid=tilegrid)
diff --git a/fuzzers/074-dump_all/generate_grid.py b/fuzzers/074-dump_all/generate_grid.py
index 86754255..0c670e0b 100644
--- a/fuzzers/074-dump_all/generate_grid.py
+++ b/fuzzers/074-dump_all/generate_grid.py
@@ -592,7 +592,7 @@ def main():
     wire_map_file = os.path.join(args.output_dir, 'wiremap.pickle')
 
     print('{} Reading tilegrid'.format(datetime.datetime.now()))
-    with open(os.path.join(util.get_db_root(), util.get_part(),
+    with open(os.path.join(util.get_db_root(), util.get_fabric(),
                            'tilegrid.json')) as f:
         grid = json.load(f)
 
diff --git a/fuzzers/074-dump_all/node_names.py b/fuzzers/074-dump_all/node_names.py
index 64bca5b8..4f704a5c 100644
--- a/fuzzers/074-dump_all/node_names.py
+++ b/fuzzers/074-dump_all/node_names.py
@@ -56,7 +56,7 @@ def main():
 
     # Read tile grid and raw node data.
     print('{} Reading tilegrid'.format(datetime.datetime.now()))
-    with open(os.path.join(util.get_db_root(), util.get_part(),
+    with open(os.path.join(util.get_db_root(), util.get_fabric(),
                            'tilegrid.json')) as f:
         grid = Grid(db=None, tilegrid=json.load(f))
 
diff --git a/fuzzers/Makefile b/fuzzers/Makefile
index b9c4dde3..2d239466 100644
--- a/fuzzers/Makefile
+++ b/fuzzers/Makefile
@@ -169,9 +169,5 @@ quick:
 # roi_only runs the fuzzers required for supporting additional parts when building
 # a roi harness.
 roi_only: 000-init-db/run.${XRAY_PART}.ok 001-part-yaml/run.${XRAY_PART}.ok 075-pins/run.${XRAY_PART}.ok
-	# Copy tilegrid and tileconn
-	cp ${XRAY_FAMILY_DIR}/${XRAY_EQUIV_PART}/tilegrid.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/tilegrid.json
-	cp ${XRAY_FAMILY_DIR}/${XRAY_EQUIV_PART}/tileconn.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/tileconn.json
-	cp ${XRAY_FAMILY_DIR}/${XRAY_EQUIV_PART}/node_wires.json ${XRAY_FAMILY_DIR}/${XRAY_PART}/node_wires.json
 
 .PHONY: all clean clean_fuzzers clean_logs quick part_only roi_only