libs: arch: add is_empty function to phys/log types

Signed-off-by: Alessandro Comodi <[email protected]>

Author: acomodi

libs/libarchfpga/src/arch_util.cpp

@@ -555,9 +555,9 @@ t_port* findPortByName(const char* name, t_pb_type* pb_type, int* high_index, in
     return port;
 }
 
-t_physical_tile_type get_empty_physical_type(std::string name) {
+t_physical_tile_type get_empty_physical_type(const char* name) {
     t_physical_tile_type type;
-    type.name = vtr::strdup(name.c_str());
+    type.name = vtr::strdup(name);
     type.num_pins = 0;
     type.width = 1;
     type.height = 1;
@@ -569,16 +569,14 @@ t_physical_tile_type get_empty_physical_type(std::string name) {
     type.switchblock_switch_overrides = vtr::Matrix<int>({{size_t(type.width), size_t(type.height)}}, DEFAULT_SWITCH);
     type.is_input_type = false;
     type.is_output_type = false;
-    type.is_empty = true;
 
     return type;
 }
 
-t_logical_block_type get_empty_logical_type(std::string name) {
+t_logical_block_type get_empty_logical_type(const char* name) {
     t_logical_block_type type;
-    type.name = vtr::strdup(name.c_str());
+    type.name = vtr::strdup(name);
     type.pb_type = nullptr;
-    type.is_empty = true;
 
     return type;
 }

libs/libarchfpga/src/arch_util.h

@@ -15,7 +15,7 @@ void set_arch_file_name(const char* arch);
  */
 const char* get_arch_file_name();
 
-const std::string EMPTY_BLOCK_NAME("EMPTY");
+constexpr const char* EMPTY_BLOCK_NAME = "EMPTY";
 
 class InstPort {
   public:
@@ -65,12 +65,12 @@ t_port* findPortByName(const char* name, t_pb_type* pb_type, int* high_index, in
 /** @brief Returns and empty physical tile type, assigned with the given name argument.
  *         The default empty string is assigned if no name is provided
  */
-t_physical_tile_type get_empty_physical_type(std::string name = EMPTY_BLOCK_NAME);
+t_physical_tile_type get_empty_physical_type(const char* name = EMPTY_BLOCK_NAME);
 
 /** @brief Returns and empty logical block type, assigned with the given name argument.
  *         The default empty string is assigned if no name is provided
  */
-t_logical_block_type get_empty_logical_type(std::string name = EMPTY_BLOCK_NAME);
+t_logical_block_type get_empty_logical_type(const char* name = EMPTY_BLOCK_NAME);
 
 std::unordered_set<t_logical_block_type_ptr> get_equivalent_sites_set(t_physical_tile_type_ptr type);
 

libs/libarchfpga/src/physical_types.cpp

@@ -1,6 +1,9 @@
 #include "physical_types.h"
 #include "vtr_math.h"
 #include "vtr_util.h"
+#include "vtr_log.h"
+
+#include "arch_util.h"
 
 static bool switch_type_is_buffered(SwitchType type);
 static bool switch_type_is_configurable(SwitchType type);
@@ -129,6 +132,18 @@ int t_physical_tile_type::get_sub_tile_loc_from_pin(int pin_num) const {
     return OPEN;
 }
 
+bool t_physical_tile_type::is_empty() const {
+    return std::string(name) == std::string(EMPTY_BLOCK_NAME);
+}
+
+/*
+ * t_logical_block_type
+ */
+
+bool t_logical_block_type::is_empty() const {
+    return std::string(name) == std::string(EMPTY_BLOCK_NAME);
+}
+
 /**
  * t_pb_graph_node
  */

libs/libarchfpga/src/physical_types.h

@@ -655,7 +655,7 @@ struct t_physical_tile_type {
     bool is_output_type = false;
 
     // Is this t_physical_tile_type an empty type?
-    bool is_empty = false;
+    bool is_empty() const;
 };
 
 /* Holds the capacity range of a certain sub_tile block within the parent physical tile type.
@@ -833,7 +833,7 @@ struct t_logical_block_type {
                                                             ///>place this type of netlist block.
 
     // Is this t_logical_block_type empty?
-    bool is_empty = false;
+    bool is_empty() const;
 };
 
 /*************************************************************************************************

libs/libarchfpga/src/read_fpga_interchange_arch.cpp

@@ -969,7 +969,7 @@ struct ArchReader {
 
         int index = 0;
         // TODO: Make this dynamic depending on data from the interchange
-        auto EMPTY = get_empty_logical_type(std::string("NULL"));
+        auto EMPTY = get_empty_logical_type();
         EMPTY.index = index;
         ltypes_.push_back(EMPTY);
 
@@ -1857,7 +1857,7 @@ struct ArchReader {
 
     // Physical Tiles
     void process_tiles() {
-        auto EMPTY = get_empty_physical_type(std::string("NULL"));
+        auto EMPTY = get_empty_physical_type();
         int index = 0;
         EMPTY.index = index;
         ptypes_.push_back(EMPTY);

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -2780,7 +2780,7 @@ static void ProcessTiles(pugi::xml_node Node,
     /* Alloc the type list. Need one additional t_type_desctiptors:
      * 1: empty psuedo-type
      */
-    t_physical_tile_type EMPTY_PHYSICAL_TILE_TYPE = get_empty_physical_type(std::string("EMPTY"));
+    t_physical_tile_type EMPTY_PHYSICAL_TILE_TYPE = get_empty_physical_type();
     EMPTY_PHYSICAL_TILE_TYPE.index = 0;
     PhysicalTileTypes.push_back(EMPTY_PHYSICAL_TILE_TYPE);
 
@@ -3453,7 +3453,7 @@ static void ProcessComplexBlocks(vtr::string_internment* strings, pugi::xml_node
     /* Alloc the type list. Need one additional t_type_desctiptors:
      * 1: empty psuedo-type
      */
-    t_logical_block_type EMPTY_LOGICAL_BLOCK_TYPE = get_empty_logical_type(std::string("EMPTY"));
+    t_logical_block_type EMPTY_LOGICAL_BLOCK_TYPE = get_empty_logical_type();
     EMPTY_LOGICAL_BLOCK_TYPE.index = 0;
     LogicalBlockTypes.push_back(EMPTY_LOGICAL_BLOCK_TYPE);
 

vpr/src/base/SetupVPR.cpp

@@ -139,7 +139,7 @@ void SetupVPR(const t_options* Options,
     int num_inputs = 0;
     int num_outputs = 0;
     for (auto& type : device_ctx.physical_tile_types) {
-        if (type.is_empty) {
+        if (type.is_empty()) {
             VTR_ASSERT(device_ctx.EMPTY_PHYSICAL_TILE_TYPE == nullptr);
             VTR_ASSERT(type.num_pins == 0);
             device_ctx.EMPTY_PHYSICAL_TILE_TYPE = &type;
@@ -157,7 +157,7 @@ void SetupVPR(const t_options* Options,
     device_ctx.EMPTY_LOGICAL_BLOCK_TYPE = nullptr;
     int max_equivalent_tiles = 0;
     for (const auto& type : device_ctx.logical_block_types) {
-        if (type.is_empty) {
+        if (type.is_empty()) {
             VTR_ASSERT(device_ctx.EMPTY_LOGICAL_BLOCK_TYPE == nullptr);
             VTR_ASSERT(type.pb_type == nullptr);
             device_ctx.EMPTY_LOGICAL_BLOCK_TYPE = &type;