From e6091fb3ff1e447da44b903d2eb56f728764eafa Mon Sep 17 00:00:00 2001 From: tangxifan Date: Thu, 18 Feb 2021 21:56:30 -0700 Subject: [PATCH 1/2] [Tool] Now throw fatal error on mismatch in configurable regions between fabric key and architecture definition --- openfpga/src/fabric/build_top_module.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openfpga/src/fabric/build_top_module.cpp b/openfpga/src/fabric/build_top_module.cpp index 568dd9e37..9e1bd7857 100644 --- a/openfpga/src/fabric/build_top_module.cpp +++ b/openfpga/src/fabric/build_top_module.cpp @@ -368,14 +368,14 @@ int build_top_module(ModuleManager& module_manager, compact_routing_hierarchy); } else { VTR_ASSERT_SAFE(false == fabric_key.empty()); - /* Give a warning message that the fabric key may overwrite existing region organization. - * Only applicable when number of regions defined in configuration protocol is different - * than the number of regions defined in the fabric key + /* Throw a fatal error when the fabric key has a mismatch in region organization. + * between architecture file and fabric key */ if (size_t(config_protocol.num_regions()) != fabric_key.regions().size()) { - VTR_LOG_WARN("Fabric key will overwrite the region organization (='%ld') than architecture definition (=%d)!\n", - fabric_key.regions().size(), - config_protocol.num_regions()); + VTR_LOG_ERROR("Fabric key has a different number of configurable regions (='%ld') than architecture definition (=%d)!\n", + fabric_key.regions().size(), + config_protocol.num_regions()); + return CMD_EXEC_FATAL_ERROR; } status = load_top_module_memory_modules_from_fabric_key(module_manager, top_module, From 01b9bf2a02559d5d771ca7666244f4bd87331993 Mon Sep 17 00:00:00 2001 From: tangxifan Date: Thu, 18 Feb 2021 21:58:30 -0700 Subject: [PATCH 2/2] [Doc] Update num_region XML for config protocol --- docs/source/manual/arch_lang/config_protocol.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/manual/arch_lang/config_protocol.rst b/docs/source/manual/arch_lang/config_protocol.rst index 519d0b6d5..1fb03f9f3 100644 --- a/docs/source/manual/arch_lang/config_protocol.rst +++ b/docs/source/manual/arch_lang/config_protocol.rst @@ -13,7 +13,7 @@ Template .. code-block:: xml - + .. option:: type="scan_chain|memory_bank|standalone"