merge conflict with origin/master

Author: amin1377

libs/libarchfpga/src/arch_util.cpp

@@ -611,6 +611,7 @@ void alloc_and_load_default_child_for_pb_type(t_pb_type* pb_type,
     copy->num_clock_pins = pb_type->num_clock_pins;
     copy->num_input_pins = pb_type->num_input_pins;
     copy->num_output_pins = pb_type->num_output_pins;
+    copy->num_pins = pb_type->num_pins;
     copy->num_pb = 1;
 
     /* Power */
@@ -630,6 +631,8 @@ void alloc_and_load_default_child_for_pb_type(t_pb_type* pb_type,
         copy->ports[i].name = vtr::strdup(pb_type->ports[i].name);
         copy->ports[i].port_class = vtr::strdup(pb_type->ports[i].port_class);
         copy->ports[i].port_index_by_type = pb_type->ports[i].port_index_by_type;
+        copy->ports[i].index = pb_type->ports[i].index;
+        copy->ports[i].absolute_first_pin_index = pb_type->ports[i].absolute_first_pin_index;
 
         copy->ports[i].port_power = (t_port_power*)vtr::calloc(1,
                                                                sizeof(t_port_power));

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -3407,9 +3407,9 @@ static void ProcessSubTiles(pugi::xml_node Node,
         SubTile.num_phy_pins = pin_counts.total() * capacity;
 
         /* Assign pin counts to the Physical Tile Type */
-        PhysicalTileType->num_input_pins += pin_counts.input;
-        PhysicalTileType->num_output_pins += pin_counts.output;
-        PhysicalTileType->num_clock_pins += pin_counts.clock;
+        PhysicalTileType->num_input_pins += capacity * pin_counts.input;
+        PhysicalTileType->num_output_pins += capacity * pin_counts.output;
+        PhysicalTileType->num_clock_pins += capacity * pin_counts.clock;
         PhysicalTileType->num_pins += capacity * pin_counts.total();
         PhysicalTileType->num_inst_pins += pin_counts.total();
 

vpr/src/draw/draw.cpp

@@ -442,6 +442,7 @@ static void initial_setup_NO_PICTURE_to_ROUTING(ezgl::application* app,
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(search_type), "Net Name");
     gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(search_type),
                                    "RR Node ID");
+    gtk_combo_box_set_active((GtkComboBox*)search_type, 0); // default set to Block ID which has an index 0
 
     button_for_toggle_nets();
     button_for_net_max_fanout();

vpr/src/draw/search_bar.cpp

@@ -58,6 +58,13 @@ void search_and_highlight(GtkWidget* /*widget*/, ezgl::application* app) {
 
     GObject* combo_box = (GObject*)app->get_object("SearchType");
     gchar* type = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo_box));
+    //Checking that a type is selected
+    if (type && type[0] == '\0') {
+        warning_dialog_box("Please select a search type");
+        app->refresh_drawing();
+        return;
+    }
+
     std::string search_type(type);
 
     // reset

vpr/src/power/power_callibrate.cpp

@@ -329,8 +329,8 @@ float power_usage_mux_for_callibration(int num_inputs, float transistor_size) {
     float* dens;
     float* prob;
 
-    dens = (float*)vtr::malloc(num_inputs * sizeof(float));
-    prob = (float*)vtr::malloc(num_inputs * sizeof(float));
+    dens = new float[num_inputs];
+    prob = new float[num_inputs];
     for (int i = 0; i < num_inputs; i++) {
         dens[i] = 2;
         prob[i] = 0.5;
@@ -340,8 +340,8 @@ float power_usage_mux_for_callibration(int num_inputs, float transistor_size) {
                                power_get_mux_arch(num_inputs, transistor_size), prob, dens, 0,
                                false, power_callib_period);
 
-    free(dens);
-    free(prob);
+    delete[] dens;
+    delete[] prob;
 
     return power_sum_usage(&power_usage);
 }
@@ -356,7 +356,7 @@ float power_usage_lut_for_callibration(int num_inputs, float transistor_size) {
     /* Initialize an SRAM pattern that guarantees the outputs toggle with
      * every input toggle.
      */
-    SRAM_bits = (char*)vtr::malloc(((1 << lut_size) + 1) * sizeof(char));
+    SRAM_bits = new char[((1 << lut_size) + 1)];
     for (int i = 1; i <= lut_size; i++) {
         if (i == 1) {
             SRAM_bits[0] = '1';
@@ -369,18 +369,18 @@ float power_usage_lut_for_callibration(int num_inputs, float transistor_size) {
         SRAM_bits[1 << i] = '\0';
     }
 
-    dens = (float*)vtr::malloc(lut_size * sizeof(float));
-    prob = (float*)vtr::malloc(lut_size * sizeof(float));
+    dens = new float[lut_size];
+    prob = new float[lut_size];
     for (int i = 0; i < lut_size; i++) {
         dens[i] = 1;
         prob[i] = 0.5;
     }
     power_usage_lut(&power_usage, lut_size, transistor_size, SRAM_bits, prob,
                     dens, power_callib_period);
 
-    free(SRAM_bits);
-    free(dens);
-    free(prob);
+    delete[] SRAM_bits;
+    delete[] dens;
+    delete[] prob;
 
     return power_sum_usage(&power_usage);
 }