Checking if the move genrator handles DSP and RAM block movements

Author: Paula

vpr/main.ui

@@ -230,26 +230,6 @@
                 <property name="height">1</property>
               </packing>
            </child>
-	   <!--new code added for manual move starts here-->
-	   <child>
-	      <object class="GtkCheckButton" id="manualMove">
-		<property name="label" translatable="yes">Manual Move</property> 		<property name="visible">True</property>
-		<property name="can focus">True</property>
-                <property name="receives default">False</property>
-	        <property name="xalign">0</property>
-		<property name="active">False</property>
-	        <property name="draw_indicator">True</property>
-              </object>
-	      <packing>
-		<property name="left_attach">0</property>
-		<property name="top_attach">3</property>
-		<property name="width">1</property>
-		<property name="height">1</property>
-              </packing>
-           </child>
-
-
-
 	    <child>
               <object class="GtkCheckButton" id="clipRoutingUtil">
                 <property name="label" translatable="yes">Clip Routing Util</property>

vpr/src/draw/draw.cpp

@@ -197,32 +197,16 @@ static void set_block_text(GtkWidget *widget, gint /*response_id*/,
 		gpointer /*data*/);
 static void clip_routing_util(GtkWidget *widget, gint /*response_id*/,
 		gpointer /*data*/);
-static void manual_moves_callback(GtkWidget *widget, gint /*response_id*/,
-		gpointer /*data*/, ezgl::application *app);
 static void run_graphics_commands(std::string commands);
 
-<<<<<<< HEAD
-=======
-//Manual moves generator functions
-void manual_move_generator_window();
-void move_generator_button_callback(GtkWidget* /*widget*/, GtkWidget* grid);
 
->>>>>>> 69d872953e314b4bc008b304a5aa8f7e510b6a86
 /************************** File Scope Variables ****************************/
 
 //The arrow head position for turning/straight-thru connections in a switch box
 constexpr float SB_EDGE_TURN_ARROW_POSITION = 0.2;
 constexpr float SB_EDGE_STRAIGHT_ARROW_POSITION = 0.95;
 constexpr float EMPTY_BLOCK_LIGHTEN_FACTOR = 0.20;
 
-//struct that contains information about manual moves for drawing
-struct ManualMovesGlobal {
-     manual_move_info draw_manual_move_info;
-     GtkWidget* manual_move_window;
-     //Considering adding more informtion if needed*****
-};
-
-
 
 //Kelly's maximum contrast colors are selected to be easily distinguishable as described in:
 //  Kenneth Kelly, "Twenty-Two Colors of Maximum Contrast", Color Eng. 3(6), 1943
@@ -4570,16 +4554,6 @@ static void setup_default_ezgl_callbacks(ezgl::application *app) {
 	GObject *debugger = app->get_object("debugButton");
 	g_signal_connect(debugger, "clicked", G_CALLBACK(draw_debug_window), NULL);
 
-<<<<<<< HEAD
-=======
-    // Connect Debug Button
-    GObject* debugger = app->get_object("debugButton");
-    g_signal_connect(debugger, "clicked", G_CALLBACK(draw_debug_window), NULL);
-
-    //Manual Moves Button
-    GObject* manual_moves = app->get_object("manualMove");
-    g_signal_connect(manual_moves, "toggled", G_CALLBACK(move_generator_button_callback), app);
->>>>>>> 69d872953e314b4bc008b304a5aa8f7e510b6a86
 }
 
 // Callback function for Block Outline checkbox
@@ -4647,11 +4621,6 @@ void net_max_fanout(GtkWidget* /*widget*/, gint /*response_id*/,
 	application.refresh_drawing();
 }
 
-bool get_manual_move_flag() {
-	GObject *manual_moves = application.get_object("manualMove");
-	return gtk_toggle_button_get_active((GtkToggleButton*) manual_moves);
-}
-
 static void set_force_pause(GtkWidget* /*widget*/, gint /*response_id*/,
 		gpointer /*data*/) {
 	t_draw_state *draw_state = get_draw_state_vars();

vpr/src/draw/draw.h

@@ -103,9 +103,6 @@ void clear_colored_locations();
 // otherwise, the function returns false (the location isn't among the highlighted locations)
 bool highlight_loc_with_specific_color(int x, int y, ezgl::color& loc_color);
 
-//Returns if the option for manual moves has been activated or not. Useful for place.cpp file.
-bool get_manual_move_flag();
-
 #endif /* NO_GRAPHICS */
 
 #endif /* DRAW_H */

vpr/src/draw/manual_moves.cpp

@@ -41,16 +41,16 @@ void draw_manual_moves_window(std::string block_id) {
 		GtkWidget *calculate_cost_button = gtk_button_new_with_label("Calculate Costs");
 
 		//Add all to grid
-		gtk_grid_attach((GtkGrid*) grid, block_label, 0, 0, 1, 1);
-		gtk_grid_attach((GtkGrid*) grid, block_entry, 0, 1, 1, 1);
-		gtk_grid_attach((GtkGrid*) grid, to_label, 2, 0, 1, 1);
-		gtk_grid_attach((GtkGrid*) grid, x, 1, 1, 1, 1);
-		gtk_grid_attach((GtkGrid*) grid, x_position_entry, 2, 1, 1, 1);
-		gtk_grid_attach((GtkGrid*) grid, y, 1, 2, 1, 1);
-		gtk_grid_attach((GtkGrid*) grid, y_position_entry, 2, 2, 1, 1);
-		gtk_grid_attach((GtkGrid*) grid, subtile, 1, 3, 1, 1);
-		gtk_grid_attach((GtkGrid*) grid, subtile_position_entry, 2, 3, 1, 1);
-		gtk_grid_attach((GtkGrid*) grid, calculate_cost_button, 0, 4, 3, 1); //spans three columns
+		gtk_grid_attach((GtkGrid*)grid, block_label, 0, 0, 1, 1);
+		gtk_grid_attach((GtkGrid*)grid, block_entry, 0, 1, 1, 1);
+		gtk_grid_attach((GtkGrid*)grid, to_label, 2, 0, 1, 1);
+		gtk_grid_attach((GtkGrid*)grid, x, 1, 1, 1, 1);
+		gtk_grid_attach((GtkGrid*)grid, x_position_entry, 2, 1, 1, 1);
+		gtk_grid_attach((GtkGrid*)grid, y, 1, 2, 1, 1);
+		gtk_grid_attach((GtkGrid*)grid, y_position_entry, 2, 2, 1, 1);
+		gtk_grid_attach((GtkGrid*)grid, subtile, 1, 3, 1, 1);
+		gtk_grid_attach((GtkGrid*)grid, subtile_position_entry, 2, 3, 1, 1);
+		gtk_grid_attach((GtkGrid*)grid, calculate_cost_button, 0, 4, 3, 1); //spans three columns
 
 		//Set margins
 		gtk_widget_set_margin_bottom(grid, 20);
@@ -73,7 +73,7 @@ void draw_manual_moves_window(std::string block_id) {
 	}
 }
 
-void calculate_cost_callback(GtkWidget* /*widget*/, GtkWidget *grid) {
+void calculate_cost_callback(GtkWidget* /*widget*/, GtkWidget* grid) {
 
 	int block_id;
 	int x_location;
@@ -92,9 +92,7 @@ void calculate_cost_callback(GtkWidget* /*widget*/, GtkWidget *grid) {
 	if (string_is_a_number(block_id_string)) { //for block ID
 		block_id = std::atoi(block_id_string.c_str());
 	} else { //for block name
-		block_id = size_t(
-				cluster_ctx.clb_nlist.find_block(
-						gtk_entry_get_text((GtkEntry*) block_entry)));
+		block_id = size_t(cluster_ctx.clb_nlist.find_block(gtk_entry_get_text((GtkEntry*) block_entry)));
 	}
 	//if the block is not found 
 	if ((!cluster_ctx.clb_nlist.valid_block_id(ClusterBlockId(block_id)))) {
@@ -104,8 +102,7 @@ void calculate_cost_callback(GtkWidget* /*widget*/, GtkWidget *grid) {
 
 	GtkWidget *x_position_entry = gtk_grid_get_child_at((GtkGrid*) grid, 2, 1);
 	GtkWidget *y_position_entry = gtk_grid_get_child_at((GtkGrid*) grid, 2, 2);
-	GtkWidget *subtile_position_entry = gtk_grid_get_child_at((GtkGrid*) grid,
-			2, 3);
+	GtkWidget *subtile_position_entry = gtk_grid_get_child_at((GtkGrid*) grid, 2, 3);
 
 	x_location = std::atoi(gtk_entry_get_text((GtkEntry*) x_position_entry));
 	y_location = std::atoi(gtk_entry_get_text((GtkEntry*) y_position_entry));
@@ -119,10 +116,8 @@ void calculate_cost_callback(GtkWidget* /*widget*/, GtkWidget *grid) {
 	//If the block requested is already in that location.
 	ClusterBlockId current_block = ClusterBlockId(block_id);
 	t_pl_loc current_block_loc = place_ctx.block_locs[current_block].loc;
-	if (x_location == current_block_loc.x && y_location == current_block_loc.y
-			&& subtile_location == current_block_loc.sub_tile) {
-		invalid_breakpoint_entry_window(
-				"The block is currently in this location");
+	if (x_location == current_block_loc.x && y_location == current_block_loc.y && subtile_location == current_block_loc.sub_tile) {
+		invalid_breakpoint_entry_window("The block is currently in this location");
 		valid_input = false;
 	}
 	//Checks if all fields from the user input window are complete.
@@ -162,10 +157,16 @@ bool string_is_a_number(std::string block_id) {
 	return true;
 }
 
+bool get_manual_move_flag() {
+	GObject *manual_moves = application.get_object("manualMove");
+	return gtk_toggle_button_get_active((GtkToggleButton*) manual_moves);
+}
+
 ManualMovesGlobals* get_manual_moves_global() {
 	return &manual_moves_global;
 }
 
+
 //Manual Move Generator function
 e_create_move ManualMoveGenerator::propose_move(
 		t_pl_blocks_to_be_moved &blocks_affected, float /*rlim*/) {

vpr/src/draw/manual_moves.h

@@ -54,6 +54,7 @@ void draw_manual_moves_window(std::string block_id);
 void close_manual_moves_window();
 void calculate_cost_callback(GtkWidget* /*widget*/, GtkWidget* grid);
 bool string_is_a_number(std::string block_id);
+bool get_manual_move_flag();
 void cost_summary_dialog();
 ManualMovesGlobals* get_manual_moves_global();
 void update_manual_move_costs(double d_cost, double d_timing, double d_bounding_box, e_move_result& move_outcome);

vpr/src/place/move_utils.h

@@ -171,25 +171,6 @@ void compressed_grid_to_loc(t_logical_block_type_ptr blk_type, int cx, int cy, t
  */
 bool find_compatible_compressed_loc_in_range(t_logical_block_type_ptr type, int min_cx, int max_cx, int min_cy, int max_cy, int delta_cx, int cx_from, int cy_from, int& cx_to, int& cy_to, bool is_median);
 
-<<<<<<< HEAD
 std::string e_move_result_to_string(e_move_result move_outcome);
-=======
-//Manual moves struct: Contains the values needed for a manual move (e.g. block_ID, block_name, x_position, y_position, cost, timing, if input is valid, and if the move is acepted.
-struct manual_move_info {
-    int block_id = -1;
-    std::string block_name = NULL;
-    int x_position = -1;
-    int y_position = -1;
-    float delta_cost = 0;
-    float delta_timing = 0;
-    bool valid_input = true;
-    e_move_result user_move_outcome = ABORTED;
-    e_move_result placer_move_outcome = ABORTED;
-    //considering adding more attributes needed for manual moves******
-};
-
-
-
->>>>>>> 69d872953e314b4bc008b304a5aa8f7e510b6a86
 
 #endif