diff --git a/libs/libfabrickey/src/base/fabric_key.cpp b/libs/libfabrickey/src/base/fabric_key.cpp index 09299c337..3caf0ac29 100644 --- a/libs/libfabrickey/src/base/fabric_key.cpp +++ b/libs/libfabrickey/src/base/fabric_key.cpp @@ -277,7 +277,8 @@ void FabricKey::add_data_port_to_wl_shift_register_bank( wl_bank_data_ports_[region_id][bank_id].push_back(data_port); } -void FabricKey::reserve_module_keys(const FabricKeyModuleId& module_id, const size_t& num_keys) { +void FabricKey::reserve_module_keys(const FabricKeyModuleId& module_id, + const size_t& num_keys) { VTR_ASSERT(valid_module_id(module_id)); module_sub_keys_[module_id].reserve(num_keys); sub_key_ids_.reserve(sub_key_ids_.size() + num_keys); @@ -301,7 +302,8 @@ FabricKeyModuleId FabricKey::create_module(const std::string& name) { return module_id; } -FabricSubKeyId FabricKey::create_module_key(const FabricKeyModuleId& module_id) { +FabricSubKeyId FabricKey::create_module_key( + const FabricKeyModuleId& module_id) { VTR_ASSERT(valid_module_id(module_id)); /* Create a new id */ FabricSubKeyId key_id = FabricSubKeyId(sub_key_ids_.size()); @@ -313,17 +315,20 @@ FabricSubKeyId FabricKey::create_module_key(const FabricKeyModuleId& module_id) return key_id; } -void FabricKey::set_sub_key_name(const FabricSubKeyId& key_id, const std::string& name) { +void FabricKey::set_sub_key_name(const FabricSubKeyId& key_id, + const std::string& name) { VTR_ASSERT(valid_sub_key_id(key_id)); sub_key_names_[key_id] = name; } -void FabricKey::set_sub_key_value(const FabricSubKeyId& key_id, const size_t& value) { +void FabricKey::set_sub_key_value(const FabricSubKeyId& key_id, + const size_t& value) { VTR_ASSERT(valid_sub_key_id(key_id)); sub_key_values_[key_id] = value; } -void FabricKey::set_sub_key_alias(const FabricSubKeyId& key_id, const std::string& alias) { +void FabricKey::set_sub_key_alias(const FabricSubKeyId& key_id, + const std::string& alias) { VTR_ASSERT(valid_sub_key_id(key_id)); sub_key_alias_[key_id] = alias; } diff --git a/libs/libfabrickey/src/base/fabric_key.h b/libs/libfabrickey/src/base/fabric_key.h index 1765868f1..4f7e6a9de 100644 --- a/libs/libfabrickey/src/base/fabric_key.h +++ b/libs/libfabrickey/src/base/fabric_key.h @@ -153,14 +153,16 @@ class FabricKey { const openfpga::BasicPort& data_port); /* Reserve a number of keys to be memory efficent */ - void reserve_module_keys(const FabricKeyModuleId& module_id, const size_t& num_keys); + void reserve_module_keys(const FabricKeyModuleId& module_id, + const size_t& num_keys); /* Create a new key and add it to the library, return an id */ FabricModuleId create_module(const std::string& name); FabricSubKeyId create_module_key(const FabricKeyModuleId& module_id); /* Configure attributes of a sub key */ void set_sub_key_name(const FabricSubKeyId& key_id, const std::string& name); void set_sub_key_value(const FabricSubKeyId& key_id, const size_t& value); - void set_sub_key_alias(const FabricSubKeyId& key_id, const std::string& alias); + void set_sub_key_alias(const FabricSubKeyId& key_id, + const std::string& alias); public: /* Public invalidators/validators */ bool valid_region_id(const FabricRegionId& region_id) const; @@ -178,25 +180,19 @@ class FabricKey { /* ---- Top-level keys and regions ---- */ /* Unique ids for each region */ vtr::vector region_ids_; - /* Key ids for each region */ vtr::vector> region_key_ids_; /* Unique ids for each key */ vtr::vector key_ids_; - /* Names for each key */ vtr::vector key_names_; - /* Values for each key */ vtr::vector key_values_; - /* Values for each key */ vtr::vector> key_coordinates_; - /* Region for each key */ vtr::vector key_regions_; - /* Optional alias for each key, with which a key can also be represented */ vtr::vector key_alias_; diff --git a/libs/libfabrickey/src/io/read_xml_fabric_key.cpp b/libs/libfabrickey/src/io/read_xml_fabric_key.cpp index 8a523235a..038ca4ae7 100644 --- a/libs/libfabrickey/src/io/read_xml_fabric_key.cpp +++ b/libs/libfabrickey/src/io/read_xml_fabric_key.cpp @@ -15,8 +15,8 @@ /* Headers from openfpga util library */ #include "openfpga_port_parser.h" -#include "openfpga_tokenizer.h" #include "openfpga_reserved_words.h" +#include "openfpga_tokenizer.h" /* Headers from libarchfpga */ #include "arch_error.h" @@ -341,8 +341,8 @@ static void read_xml_fabric_key_top_module(pugi::xml_node& xml_module, bad_tag(xml_region, loc_data, xml_root, {XML_FABRIC_KEY_REGION_NODE_NAME}); } - num_keys += std::distance(xml_region.children().begin(), - xml_region.children().end()); + num_keys += + std::distance(xml_region.children().begin(), xml_region.children().end()); } fabric_key.reserve_keys(num_keys); @@ -369,14 +369,15 @@ static void read_xml_fabric_key_top_module(pugi::xml_node& xml_module, static void read_xml_fabric_key_module(pugi::xml_node& xml_module, const pugiutil::loc_data& loc_data, FabricKey& fabric_key) { - std::string name = - get_attribute(xml_module, - XML_FABRIC_KEY_MODULE_ATTRIBUTE_NAME_NAME, - loc_data).as_string(); - FabricKeyModuleId module_id = fabric_key.create_module(name); + std::string name = + get_attribute(xml_module, XML_FABRIC_KEY_MODULE_ATTRIBUTE_NAME_NAME, + loc_data) + .as_string(); + FabricKeyModuleId module_id = fabric_key.create_module(name); /* Parse all the sub keys */ - size_t num_keys = std::distance(xml_module.children().begin(), xml_module.children().end()); + size_t num_keys = + std::distance(xml_module.children().begin(), xml_module.children().end()); /* Reserve for better memory efficiency */ fabric_key.reserve_module_keys(module_id, num_keys); @@ -387,8 +388,7 @@ static void read_xml_fabric_key_module(pugi::xml_node& xml_module, for (pugi::xml_node xml_key : xml_module.children()) { /* Error out if the XML child has an invalid name! */ if (xml_key.name() != std::string(XML_FABRIC_KEY_KEY_NODE_NAME)) { - bad_tag(xml_key, loc_data, xml_module, - {XML_FABRIC_KEY_KEY_NODE_NAME}); + bad_tag(xml_key, loc_data, xml_module, {XML_FABRIC_KEY_KEY_NODE_NAME}); } read_xml_module_key(xml_key, loc_data, fabric_key, module_id); } @@ -396,16 +396,17 @@ static void read_xml_fabric_key_module(pugi::xml_node& xml_module, /******************************************************************** * Parse XML codes of a to an object of FabricKey - * - For top-level module, we expect a fixed name. If so, we use a special parser + * - For top-level module, we expect a fixed name. If so, we use a special + *parser * - For regular module, we follow regular parser *******************************************************************/ static void read_xml_fabric_key_by_modules(pugi::xml_node& xml_module, const pugiutil::loc_data& loc_data, FabricKey& fabric_key) { - std::string name = - get_attribute(xml_module, - XML_FABRIC_KEY_MODULE_ATTRIBUTE_NAME_NAME, - loc_data).as_string(); + std::string name = + get_attribute(xml_module, XML_FABRIC_KEY_MODULE_ATTRIBUTE_NAME_NAME, + loc_data) + .as_string(); if (name == std::string(FPGA_TOP_MODULE_NAME)) { read_xml_fabric_key_top_module(xml_module, loc_data, fabric_key); } else { @@ -432,7 +433,7 @@ FabricKey read_xml_fabric_key(const char* key_fname) { get_single_child(doc, XML_FABRIC_KEY_ROOT_NAME, loc_data); /* Under the root node, we expect only modules */ - size_t num_modules = + size_t num_modules = std::distance(xml_root.children().begin(), xml_root.children().end()); /* Reserve for memory efficiency */