riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #245 from lnis-uofu/dev 

Throw fatal error when the number of configurable region is different between fabric key and architecture definition
This commit is contained in:
ganeshgore 2021-02-22 09:48:23 -07:00 committed by GitHub
parent d6a02a985e 01b9bf2a02
commit 4315660bf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/manual/arch_lang/config_protocol.rst
View File

@ -13,7 +13,7 @@ Template
.. code-block:: xml .. code-block:: xml
<configuration_protocol> <configuration_protocol>
<organization type="<string>" circuit_model_name="<string>"/> <organization type="<string>" circuit_model_name="<string>" num_regions="<int>"/>
</configuration_protocol> </configuration_protocol>
.. option:: type="scan_chain|memory_bank|standalone" .. option:: type="scan_chain|memory_bank|standalone"

12
openfpga/src/fabric/build_top_module.cpp
View File

@ -368,14 +368,14 @@ int build_top_module(ModuleManager& module_manager,
compact_routing_hierarchy); compact_routing_hierarchy);
} else { } else {
VTR_ASSERT_SAFE(false == fabric_key.empty()); VTR_ASSERT_SAFE(false == fabric_key.empty());
/* Give a warning message that the fabric key may overwrite existing region organization. /* Throw a fatal error when the fabric key has a mismatch in region organization.
* Only applicable when number of regions defined in configuration protocol is different * between architecture file and fabric key
* than the number of regions defined in the fabric key
*/ */
if (size_t(config_protocol.num_regions()) != fabric_key.regions().size()) { 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", VTR_LOG_ERROR("Fabric key has a different number of configurable regions (='%ld') than architecture definition (=%d)!\n",
fabric_key.regions().size(), fabric_key.regions().size(),
config_protocol.num_regions()); config_protocol.num_regions());
return CMD_EXEC_FATAL_ERROR;
} }
status = load_top_module_memory_modules_from_fabric_key(module_manager, top_module, status = load_top_module_memory_modules_from_fabric_key(module_manager, top_module,