rename BufferSize to e_buffer_size

Author: soheilshahrouz

libs/libarchfpga/src/physical_types.h

@@ -971,7 +971,7 @@ struct t_pb_type {
     int num_pb = 0;
     char* blif_model = nullptr;
     LogicalModelId model_id;
-    enum e_pb_type_class class_type = UNKNOWN_CLASS;
+    e_pb_type_class class_type = UNKNOWN_CLASS;
 
     t_mode* modes = nullptr; /* [0..num_modes-1] */
     int num_modes = 0;
@@ -1074,8 +1074,8 @@ struct t_pin_to_pin_annotation {
 
     std::vector<std::pair<int, std::string>> annotation_entries;
 
-    enum e_pin_to_pin_annotation_type type;
-    enum e_pin_to_pin_annotation_format format;
+    e_pin_to_pin_annotation_type type;
+    e_pin_to_pin_annotation_format format;
 
     char* input_pins;
     char* output_pins;
@@ -1111,7 +1111,7 @@ struct t_pin_to_pin_annotation {
  *      parent_mode_index: Mode of parent as int
  */
 struct t_interconnect {
-    enum e_interconnect type;
+    e_interconnect type;
     char* name;
 
     char* input_string;
@@ -1783,7 +1783,7 @@ constexpr const char* VPR_DELAYLESS_SWITCH_NAME = "__vpr_delayless_switch__";
 /* An intracluster switch automatically added to the RRG by the flat router. */
 constexpr const char* VPR_INTERNAL_SWITCH_NAME = "__vpr_intra_cluster_switch__";
 
-enum class BufferSize {
+enum class e_buffer_size {
     AUTO,
     ABSOLUTE
 };
@@ -1826,7 +1826,7 @@ struct t_arch_switch_inf {
     float Cinternal = 0.;
     /// The area of each transistor in the segment's driving mux measured in minimum width transistor units
     float mux_trans_size = 1.;
-    BufferSize buf_size_type = BufferSize::AUTO;
+    e_buffer_size buf_size_type = e_buffer_size::AUTO;
     /// The area of the buffer. If set to zero, area should be calculated from R
     float buf_size = 0.;
     e_power_buffer_type power_buffer_type = POWER_BUFFER_TYPE_AUTO;

libs/libarchfpga/src/read_fpga_interchange_arch.cpp

@@ -2424,12 +2424,12 @@ struct ArchReader {
             as->set_Tdel(t_arch_switch_inf::UNDEFINED_FANIN, Tdel);
 
             if (as->type() == e_switch_type::SHORT || as->type() == e_switch_type::PASS_GATE) {
-                as->buf_size_type = BufferSize::ABSOLUTE;
+                as->buf_size_type = e_buffer_size::ABSOLUTE;
                 as->buf_size = 0;
                 as->power_buffer_type = POWER_BUFFER_TYPE_ABSOLUTE_SIZE;
                 as->power_buffer_size = 0.;
             } else {
-                as->buf_size_type = BufferSize::AUTO;
+                as->buf_size_type = e_buffer_size::AUTO;
                 as->buf_size = 0.;
                 as->power_buffer_type = POWER_BUFFER_TYPE_AUTO;
             }

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -4492,17 +4492,17 @@ static std::vector<t_arch_switch_inf> process_switches(pugi::xml_node Parent,
         if (arch_switch.type() == e_switch_type::SHORT
             || arch_switch.type() == e_switch_type::PASS_GATE) {
             //No buffers
-            arch_switch.buf_size_type = BufferSize::ABSOLUTE;
+            arch_switch.buf_size_type = e_buffer_size::ABSOLUTE;
             arch_switch.buf_size = 0.;
             arch_switch.power_buffer_type = POWER_BUFFER_TYPE_ABSOLUTE_SIZE;
             arch_switch.power_buffer_size = 0.;
         } else {
             auto buf_size_attrib = get_attribute(Node, "buf_size", loc_data, ReqOpt::OPTIONAL);
             if (!buf_size_attrib || buf_size_attrib.as_string() == std::string("auto")) {
-                arch_switch.buf_size_type = BufferSize::AUTO;
+                arch_switch.buf_size_type = e_buffer_size::AUTO;
                 arch_switch.buf_size = 0.;
             } else {
-                arch_switch.buf_size_type = BufferSize::ABSOLUTE;
+                arch_switch.buf_size_type = e_buffer_size::ABSOLUTE;
                 arch_switch.buf_size = buf_size_attrib.as_float();
             }
 

vpr/src/base/setup_vpr.cpp

@@ -394,7 +394,7 @@ static void setup_switches(const t_arch& Arch,
     device_ctx.arch_switch_inf[RoutingArch.delayless_switch].set_Tdel(t_arch_switch_inf::UNDEFINED_FANIN, 0.);
     device_ctx.arch_switch_inf[RoutingArch.delayless_switch].power_buffer_type = POWER_BUFFER_TYPE_NONE;
     device_ctx.arch_switch_inf[RoutingArch.delayless_switch].mux_trans_size = 0.;
-    device_ctx.arch_switch_inf[RoutingArch.delayless_switch].buf_size_type = BufferSize::ABSOLUTE;
+    device_ctx.arch_switch_inf[RoutingArch.delayless_switch].buf_size_type = e_buffer_size::ABSOLUTE;
     device_ctx.arch_switch_inf[RoutingArch.delayless_switch].buf_size = 0.;
     VTR_ASSERT_MSG(device_ctx.arch_switch_inf[RoutingArch.delayless_switch].buffered(), "Delayless switch expected to be buffered (isolating)");
     VTR_ASSERT_MSG(device_ctx.arch_switch_inf[RoutingArch.delayless_switch].configurable(), "Delayless switch expected to be configurable");

vpr/src/util/vpr_utils.cpp

@@ -1934,7 +1934,7 @@ t_arch_switch_inf create_internal_arch_sw(float delay) {
     arch_switch_inf.set_Tdel(t_arch_switch_inf::UNDEFINED_FANIN, delay);
     arch_switch_inf.power_buffer_type = POWER_BUFFER_TYPE_NONE;
     arch_switch_inf.mux_trans_size = 0.;
-    arch_switch_inf.buf_size_type = BufferSize::ABSOLUTE;
+    arch_switch_inf.buf_size_type = e_buffer_size::ABSOLUTE;
     arch_switch_inf.buf_size = 0.;
     arch_switch_inf.intra_tile = true;