From b2ee4b9a55978b7e10c47c0ed908d1697183b2ce Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Tue, 28 Dec 2021 10:02:07 -0800 Subject: [PATCH 1/4] Try running DSP fuzzers on Kintex7. Signed-off-by: Tim 'mithro' Ansell Signed-off-by: Steve --- fuzzers/005-tilegrid/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fuzzers/005-tilegrid/Makefile b/fuzzers/005-tilegrid/Makefile index 7a68788ab..a880d0713 100644 --- a/fuzzers/005-tilegrid/Makefile +++ b/fuzzers/005-tilegrid/Makefile @@ -30,6 +30,7 @@ TILEGRID_TDB_DEPENDENCIES += hclk_cmt/$(BUILD_FOLDER)/segbits_tilegrid.tdb TILEGRID_TDB_DEPENDENCIES += pll/$(BUILD_FOLDER)/segbits_tilegrid.tdb TILEGRID_TDB_DEPENDENCIES += hclk_ioi/$(BUILD_FOLDER)/segbits_tilegrid.tdb TILEGRID_TDB_DEPENDENCIES += mmcm/$(BUILD_FOLDER)/segbits_tilegrid.tdb +TILEGRID_TDB_DEPENDENCIES += dsp_int/$(BUILD_FOLDER)/segbits_tilegrid.tdb GENERATE_FULL_ARGS= # Artix7 only fuzzers @@ -51,11 +52,6 @@ ifeq (${XRAY_DATABASE}, kintex7) TILEGRID_TDB_DEPENDENCIES += orphan_int_column/$(BUILD_FOLDER)/segbits_tilegrid.tdb endif -# Disable DSP INT fuzzer on kintex7. It doesn't work, and isn't required. -ifneq (${XRAY_DATABASE}, kintex7) -TILEGRID_TDB_DEPENDENCIES += dsp_int/$(BUILD_FOLDER)/segbits_tilegrid.tdb -endif - BASICDB_TILEGRID=$(BUILD_FOLDER)/basicdb/${XRAY_FABRIC}/tilegrid.json database: $(BUILD_FOLDER)/tilegrid.json From 517fb10e2eb543a883c41ffe669501c0ada6c223 Mon Sep 17 00:00:00 2001 From: Steve Date: Thu, 27 Jan 2022 18:17:22 +0800 Subject: [PATCH 2/4] Fix wrong parameter in get_part_resources() The assertion error for `get_part_resources()` should print `res_mapping` instead of `part_mapping` (the latter isn't even defined in `get_part_resources()`) Signed-off-by: Steve --- prjxray/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prjxray/util.py b/prjxray/util.py index 6c285795e..3f717d3a0 100644 --- a/prjxray/util.py +++ b/prjxray/util.py @@ -64,7 +64,7 @@ def get_part_resources(file_path, part): with open(filename, 'r') as stream: res_mapping = yaml.load(stream, Loader=yaml.FullLoader) res = res_mapping.get(part, None) - assert res, "Part {} not found in {}".format(part, part_mapping) + assert res, "Part {} not found in {}".format(part, res_mapping) return res From 423ec7ce49182ae9bae2c10e63f0c8d8e58a7df8 Mon Sep 17 00:00:00 2001 From: Steve Date: Thu, 27 Jan 2022 20:59:12 +0800 Subject: [PATCH 3/4] Making changes so I can create a new commit sign off Signed-off-by: Steve --- prjxray/util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/prjxray/util.py b/prjxray/util.py index 3f717d3a0..3096c2385 100644 --- a/prjxray/util.py +++ b/prjxray/util.py @@ -64,6 +64,7 @@ def get_part_resources(file_path, part): with open(filename, 'r') as stream: res_mapping = yaml.load(stream, Loader=yaml.FullLoader) res = res_mapping.get(part, None) + #making a change to create a new commit and then sign off assert res, "Part {} not found in {}".format(part, res_mapping) return res From 59236e38a0b31be06f1710c7f49dc332d0555bdd Mon Sep 17 00:00:00 2001 From: Steve Date: Thu, 27 Jan 2022 21:04:44 +0800 Subject: [PATCH 4/4] Update util.py Signed-off-by: Steve --- prjxray/util.py | 1 - 1 file changed, 1 deletion(-) diff --git a/prjxray/util.py b/prjxray/util.py index 3096c2385..3f717d3a0 100644 --- a/prjxray/util.py +++ b/prjxray/util.py @@ -64,7 +64,6 @@ def get_part_resources(file_path, part): with open(filename, 'r') as stream: res_mapping = yaml.load(stream, Loader=yaml.FullLoader) res = res_mapping.get(part, None) - #making a change to create a new commit and then sign off assert res, "Part {} not found in {}".format(part, res_mapping) return res