enum class e_pic_type

soheilshahrouz · soheilshahrouz · commit a492b43f7456 · 2025-10-08T19:53:36.000-04:00
diff --git a/vpr/src/base/vpr_api.cpp b/vpr/src/base/vpr_api.cpp
@@ -1062,8 +1062,8 @@ RouteStatus vpr_route_flow(const Netlist<>& net_list,
             print_switch_usage();
         }
 
-        //Update interactive graphics
-        update_screen(ScreenUpdatePriority::MAJOR, graphics_msg.c_str(), ROUTING, timing_info);
+        // Update interactive graphics
+        update_screen(ScreenUpdatePriority::MAJOR, graphics_msg.c_str(), e_pic_type::ROUTING, timing_info);
     }
 
     return route_status;
diff --git a/vpr/src/base/vpr_types.h b/vpr/src/base/vpr_types.h
@@ -383,12 +383,12 @@ enum class e_sched_type {
 };
 /* Annealing schedule */
 
-enum pic_type {
+/// Specifies what is shown on screen
+enum class e_pic_type {
     NO_PICTURE,
     PLACEMENT,
     ROUTING
 };
-/* What's on screen? */
 
 enum pfreq {
     PLACE_NEVER,
diff --git a/vpr/src/draw/draw.cpp b/vpr/src/draw/draw.cpp
@@ -183,7 +183,7 @@ static void draw_main_canvas(ezgl::renderer* g) {
     drawplace(g);
     draw_internal_draw_subblk(g);
 
-    if (draw_state->pic_on_screen == ROUTING) { // ROUTING on screen
+    if (draw_state->pic_on_screen == e_pic_type::ROUTING) { // ROUTING on screen
 
         draw_rr(g);
 
@@ -259,12 +259,12 @@ static void on_stage_change_setup(ezgl::application* app, bool is_new_window) {
 
     t_draw_state* draw_state = get_draw_state_vars();
 
-    if (draw_state->pic_on_screen == PLACEMENT) {
+    if (draw_state->pic_on_screen == e_pic_type::PLACEMENT) {
         hide_widget("RoutingMenuButton", app);
 
         draw_state->save_graphics_file_base = "vpr_placement";
 
-    } else if (draw_state->pic_on_screen == ROUTING) {
+    } else if (draw_state->pic_on_screen == e_pic_type::ROUTING) {
         show_widget("RoutingMenuButton", app);
 
         draw_state->save_graphics_file_base = "vpr_routing";
@@ -278,7 +278,10 @@ static void on_stage_change_setup(ezgl::application* app, bool is_new_window) {
 
 #endif //NO_GRAPHICS
 
-void update_screen(ScreenUpdatePriority priority, const char* msg, enum pic_type pic_on_screen_val, std::shared_ptr<const SetupTimingInfo> setup_timing_info) {
+void update_screen(ScreenUpdatePriority priority,
+                   const char* msg,
+                   e_pic_type pic_on_screen_val,
+                   std::shared_ptr<const SetupTimingInfo> setup_timing_info) {
 #ifndef NO_GRAPHICS
 
     /* Updates the screen if the user has requested graphics.  The priority  *
@@ -301,10 +304,9 @@ void update_screen(ScreenUpdatePriority priority, const char* msg, enum pic_type
 
         state_change = true;
 
-        if (draw_state->pic_on_screen == NO_PICTURE) {
+        if (draw_state->pic_on_screen == e_pic_type::NO_PICTURE) {
             // Only add the canvas the first time we open graphics
-            application.add_canvas("MainCanvas", draw_main_canvas,
-                                   initial_world);
+            application.add_canvas("MainCanvas", draw_main_canvas, initial_world);
         }
 
         draw_state->setup_timing_info = setup_timing_info;
diff --git a/vpr/src/draw/draw.h b/vpr/src/draw/draw.h
@@ -40,7 +40,10 @@ extern ezgl::application application;
 
 #endif /* NO_GRAPHICS */
 
-void update_screen(ScreenUpdatePriority priority, const char* msg, enum pic_type pic_on_screen_val, std::shared_ptr<const SetupTimingInfo> timing_info);
+void update_screen(ScreenUpdatePriority priority,
+                   const char* msg,
+                   e_pic_type pic_on_screen_val,
+                   std::shared_ptr<const SetupTimingInfo> timing_info);
 
 //FIXME: Currently broken if no rr-graph is loaded
 /**
diff --git a/vpr/src/draw/draw_interposer.cpp b/vpr/src/draw/draw_interposer.cpp
@@ -23,7 +23,7 @@ void draw_interposer_cuts(ezgl::renderer* g) {
     g->set_line_dash(ezgl::line_dash::asymmetric_5_3);
     g->set_line_width(2);
 
-    const float offset_factor = draw_state->pic_on_screen == PLACEMENT ? -0.5f : -0.5f / device_ctx.chan_width.max;
+    const float offset_factor = draw_state->pic_on_screen == e_pic_type::PLACEMENT ? -0.5f : -0.5f / device_ctx.chan_width.max;
 
     for (size_t layer = 0; layer < grid.get_num_layers(); layer++) {
         if (!draw_state->draw_layer_display[layer].visible) {
@@ -41,11 +41,11 @@ void draw_interposer_cuts(ezgl::renderer* g) {
         }
     }
 
-    if (draw_state->pic_on_screen == PLACEMENT || draw_state->pic_on_screen == ROUTING) {
+    if (draw_state->pic_on_screen == e_pic_type::PLACEMENT || draw_state->pic_on_screen == e_pic_type::ROUTING) {
         for (const auto& [start, end] : lines_to_draw) {
             g->draw_line(start, end);
         }
     } else {
-        VTR_ASSERT(draw_state->pic_on_screen == NO_PICTURE);
+        VTR_ASSERT(draw_state->pic_on_screen == e_pic_type::NO_PICTURE);
     }
 }
diff --git a/vpr/src/draw/draw_toggle_functions.cpp b/vpr/src/draw/draw_toggle_functions.cpp
@@ -310,7 +310,7 @@ void toggle_crit_path_cbk(GtkSwitch*, gboolean state, ezgl::application* app) {
     gtk_widget_set_sensitive(GTK_WIDGET(app->get_object("ToggleCritPathFlylines")), state);
     gtk_widget_set_sensitive(GTK_WIDGET(app->get_object("ToggleCritPathDelays")), state);
 
-    if (draw_state->setup_timing_info && draw_state->pic_on_screen == ROUTING) {
+    if (draw_state->setup_timing_info && draw_state->pic_on_screen == e_pic_type::ROUTING) {
         gtk_widget_set_sensitive(GTK_WIDGET(app->get_object("ToggleCritPathRouting")), state);
     }
 
@@ -343,7 +343,7 @@ void toggle_expansion_cost_cbk(GtkComboBoxText* self, ezgl::application* app) {
     } else if (strcmp(combo_box_content, "Expected (with edges)") == 0) {
         new_state = DRAW_ROUTER_EXPANSION_COST_EXPECTED_WITH_EDGES;
     } else {
-        VPR_THROW(VPR_ERROR_DRAW, "Unrecognzied draw RR cost option");
+        VPR_THROW(VPR_ERROR_DRAW, "Unrecognized draw RR cost option");
     }
 
     g_free(combo_box_content);
diff --git a/vpr/src/draw/draw_types.h b/vpr/src/draw/draw_types.h
@@ -179,7 +179,7 @@ struct t_draw_layer_display {
  */
 struct t_draw_state {
     ///@brief What to draw on the screen (ROUTING, PLACEMENT, NO_PICTURE)
-    pic_type pic_on_screen = NO_PICTURE;
+    e_pic_type pic_on_screen = e_pic_type::NO_PICTURE;
 
     ///@brief Whether to draw nets or not
     bool show_nets = false;
diff --git a/vpr/src/draw/manual_moves.cpp b/vpr/src/draw/manual_moves.cpp
@@ -93,10 +93,6 @@ void draw_manual_moves_window(const std::string& block_id) {
 
 void calculate_cost_callback(GtkWidget* /*widget*/, GtkWidget* grid) {
     int block_id = -1;
-    int x_location = -1;
-    int y_location = -1;
-    int layer_location = -1;
-    int subtile_location = -1;
     bool valid_input = true;
 
     t_draw_state* draw_state = get_draw_state_vars();
@@ -119,10 +115,10 @@ void calculate_cost_callback(GtkWidget* /*widget*/, GtkWidget* grid) {
     GtkWidget* layer_position_entry = gtk_grid_get_child_at((GtkGrid*)grid, 2, 3);
     GtkWidget* subtile_position_entry = gtk_grid_get_child_at((GtkGrid*)grid, 2, 4);
 
-    x_location = std::atoi(gtk_entry_get_text((GtkEntry*)x_position_entry));
-    y_location = std::atoi(gtk_entry_get_text((GtkEntry*)y_position_entry));
-    layer_location = std::atoi(gtk_entry_get_text((GtkEntry*)layer_position_entry));
-    subtile_location = std::atoi(gtk_entry_get_text((GtkEntry*)subtile_position_entry));
+    int x_location = std::atoi(gtk_entry_get_text((GtkEntry*)x_position_entry));
+    int y_location = std::atoi(gtk_entry_get_text((GtkEntry*)y_position_entry));
+    int layer_location = std::atoi(gtk_entry_get_text((GtkEntry*)layer_position_entry));
+    int subtile_location = std::atoi(gtk_entry_get_text((GtkEntry*)subtile_position_entry));
 
     if (std::string(gtk_entry_get_text((GtkEntry*)block_entry)).empty() || std::string(gtk_entry_get_text((GtkEntry*)x_position_entry)).empty() || std::string(gtk_entry_get_text((GtkEntry*)y_position_entry)).empty() || std::string(gtk_entry_get_text((GtkEntry*)layer_position_entry)).empty() || std::string(gtk_entry_get_text((GtkEntry*)subtile_position_entry)).empty()) {
         invalid_breakpoint_entry_window("Not all fields are complete");
@@ -324,7 +320,7 @@ e_create_move manual_move_display_and_propose(ManualMoveGenerator& manual_move_g
                                               const t_placer_opts& placer_opts,
                                               const PlacerCriticalities* criticalities) {
     draw_manual_moves_window("");
-    update_screen(ScreenUpdatePriority::MAJOR, " ", PLACEMENT, nullptr);
+    update_screen(ScreenUpdatePriority::MAJOR, " ", e_pic_type::PLACEMENT, nullptr);
     move_type = e_move_type::MANUAL_MOVE;
     t_propose_action proposed_action{move_type, -1}; //no need to specify block type in manual move "propose_move" function
     return manual_move_generator.propose_move(blocks_affected, proposed_action, rlim, placer_opts, criticalities);
diff --git a/vpr/src/draw/ui_setup.cpp b/vpr/src/draw/ui_setup.cpp
@@ -272,7 +272,7 @@ void crit_path_button_setup(ezgl::application* app) {
  */
 void hide_crit_path_routing(ezgl::application* app) {
     t_draw_state* draw_state = get_draw_state_vars();
-    bool state = draw_state->setup_timing_info && draw_state->pic_on_screen == ROUTING && draw_state->show_crit_path;
+    bool state = draw_state->setup_timing_info && draw_state->pic_on_screen == e_pic_type::ROUTING && draw_state->show_crit_path;
 
     gtk_widget_set_sensitive(GTK_WIDGET(app->get_object("ToggleCritPathRouting")), state);
 }
@@ -283,7 +283,7 @@ void hide_draw_routing(ezgl::application* app) {
 
     // Enable the option to draw routing only during the routing stage
     int route_item_index = get_item_index_by_text(toggle_nets, "Routing");
-    if (draw_state->pic_on_screen == PLACEMENT) {
+    if (draw_state->pic_on_screen == e_pic_type::PLACEMENT) {
         if (route_item_index != -1) {
             gtk_combo_box_text_remove(toggle_nets, route_item_index);
         }
diff --git a/vpr/src/place/place.cpp b/vpr/src/place/place.cpp
@@ -156,6 +156,6 @@ static void update_screen_debug();
 //This function with no arguments is useful for calling from a debugger to
 //look at the intermediate implemetnation state.
 static void update_screen_debug() {
-    update_screen(ScreenUpdatePriority::MAJOR, "DEBUG", PLACEMENT, nullptr);
+    update_screen(ScreenUpdatePriority::MAJOR, "DEBUG", e_pic_type::PLACEMENT, nullptr);
 }
 #endif
diff --git a/vpr/src/place/placement_log_printer.cpp b/vpr/src/place/placement_log_printer.cpp
@@ -98,7 +98,7 @@ void PlacementLogPrinter::print_place_status(float elapsed_sec) const {
     sprintf(msg_.data(), "Cost: %g  BB Cost %g  TD Cost %g  Temperature: %g",
             costs.cost, costs.bb_cost, costs.timing_cost, annealing_state.t);
 
-    update_screen(ScreenUpdatePriority::MINOR, msg_.data(), PLACEMENT, timing_info);
+    update_screen(ScreenUpdatePriority::MINOR, msg_.data(), e_pic_type::PLACEMENT, timing_info);
 }
 
 void PlacementLogPrinter::print_resources_utilization() const {
@@ -217,7 +217,7 @@ void PlacementLogPrinter::print_initial_placement_stats() const {
             costs.cost, costs.bb_cost, costs.timing_cost, placer_opts.place_chan_width);
 
     // Draw the initial placement
-    update_screen(ScreenUpdatePriority::MAJOR, msg_.data(), PLACEMENT, timing_info);
+    update_screen(ScreenUpdatePriority::MAJOR, msg_.data(), e_pic_type::PLACEMENT, timing_info);
 
     if (placer_opts.placement_saves_per_temperature >= 1) {
         std::string filename = vtr::string_fmt("placement_%03d_%03d.place", 0, 0);
@@ -270,7 +270,7 @@ void PlacementLogPrinter::print_post_placement_stats() const {
             placer_.costs_.cost, placer_.costs_.bb_cost, placer_.costs_.timing_cost, placer_.placer_opts_.place_chan_width);
     VTR_LOG("Placement cost: %g, bb_cost: %g, td_cost: %g, \n", placer_.costs_.cost,
             placer_.costs_.bb_cost, placer_.costs_.timing_cost);
-    update_screen(ScreenUpdatePriority::MAJOR, msg_.data(), PLACEMENT, placer_.timing_info_);
+    update_screen(ScreenUpdatePriority::MAJOR, msg_.data(), e_pic_type::PLACEMENT, placer_.timing_info_);
 
     // print the noc costs info
     if (placer_.noc_opts_.noc) {
diff --git a/vpr/src/place/placer_breakpoint.cpp b/vpr/src/place/placer_breakpoint.cpp
@@ -57,7 +57,7 @@ void stop_placement_and_check_breakpoints(t_pl_blocks_to_be_moved& blocks_affect
         msg += vtr::string_fmt(", Delta_cost: %1.6f (bb_delta_cost= %1.5f , timing_delta_c= %6.1e)", delta_c, bb_delta_c, timing_delta_c);
 
         highlight_moved_block_and_its_terminals(blocks_affected);
-        update_screen(ScreenUpdatePriority::MAJOR, msg.c_str(), PLACEMENT, nullptr);
+        update_screen(ScreenUpdatePriority::MAJOR, msg.c_str(), e_pic_type::PLACEMENT, nullptr);
     }
 }
 
diff --git a/vpr/src/route/route.cpp b/vpr/src/route/route.cpp
@@ -342,9 +342,9 @@ bool route(const Netlist<>& net_list,
 
         //Update graphics
         if (itry == 1) {
-            update_screen(first_iteration_priority, ("Initial Route: " + iteration_msg).c_str(), ROUTING, timing_info);
+            update_screen(first_iteration_priority, ("Initial Route: " + iteration_msg).c_str(), e_pic_type::ROUTING, timing_info);
         } else {
-            update_screen(ScreenUpdatePriority::MINOR, ("Route: " + iteration_msg).c_str(), ROUTING, timing_info);
+            update_screen(ScreenUpdatePriority::MINOR, ("Route: " + iteration_msg).c_str(), e_pic_type::ROUTING, timing_info);
         }
 
         if (router_opts.save_routing_per_iteration) {
diff --git a/vpr/src/route/route_net.tpp b/vpr/src/route/route_net.tpp
@@ -340,7 +340,7 @@ inline NetResultFlags pre_route_to_clock_root(ConnectionRouterType& router,
                 net_list.net_name(net_id).c_str(),
                 size_t(net_id));
         if (f_router_debug) {
-            update_screen(ScreenUpdatePriority::MAJOR, "Unable to route connection.", ROUTING, nullptr);
+            update_screen(ScreenUpdatePriority::MAJOR, "Unable to route connection.", e_pic_type::ROUTING, nullptr);
         }
         router.reset_path_costs();
         out.success = false;
@@ -361,7 +361,7 @@ inline NetResultFlags pre_route_to_clock_root(ConnectionRouterType& router,
 
     if (f_router_debug) {
         std::string msg = vtr::string_fmt("Routed Net %zu connection to RR node %d successfully", size_t(net_id), sink_node);
-        update_screen(ScreenUpdatePriority::MAJOR, msg.c_str(), ROUTING, nullptr);
+        update_screen(ScreenUpdatePriority::MAJOR, msg.c_str(), e_pic_type::ROUTING, nullptr);
     }
 
     if (new_branch)
@@ -472,7 +472,7 @@ inline NetResultFlags route_sink(ConnectionRouterType& router,
                 net_list.net_name(net_id).c_str(),
                 size_t(net_id));
         if (f_router_debug) {
-            update_screen(ScreenUpdatePriority::MAJOR, "Unable to route connection.", ROUTING, nullptr);
+            update_screen(ScreenUpdatePriority::MAJOR, "Unable to route connection.", e_pic_type::ROUTING, nullptr);
         }
         flags.success = false;
         router.reset_path_costs();
@@ -488,7 +488,7 @@ inline NetResultFlags route_sink(ConnectionRouterType& router,
 
     if (f_router_debug) {
         std::string msg = vtr::string_fmt("Routed Net %zu connection %d to RR node %d successfully", size_t(net_id), itarget, sink_node);
-        update_screen(ScreenUpdatePriority::MAJOR, msg.c_str(), ROUTING, nullptr);
+        update_screen(ScreenUpdatePriority::MAJOR, msg.c_str(), e_pic_type::ROUTING, nullptr);
     }
 
     if (budgeting_inf.if_set() && cheapest.rcv_path_backward_delay != std::numeric_limits<float>::infinity() && cost_params.delay_budget) {
diff --git a/vpr/src/route/route_utils.cpp b/vpr/src/route/route_utils.cpp
@@ -692,7 +692,7 @@ void update_router_info_and_check_bp(bp_router_type type, int net_id) {
     }
     if (hit_bp) {
         breakpoint_info_window(get_bp_state_globals()->get_glob_breakpoint_state()->bp_description, *get_bp_state_globals()->get_glob_breakpoint_state(), false);
-        update_screen(ScreenUpdatePriority::MAJOR, "Breakpoint Encountered", ROUTING, nullptr);
+        update_screen(ScreenUpdatePriority::MAJOR, "Breakpoint Encountered", e_pic_type::ROUTING, nullptr);
     }
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1062,8 +1062,8 @@ RouteStatus vpr_route_flow(const Netlist<>& net_list,`
`1062`	`1062`	`print_switch_usage();`
`1063`	`1063`	`}`
`1064`	`1064`
`1065`		`- //Update interactive graphics`
`1066`		`- update_screen(ScreenUpdatePriority::MAJOR, graphics_msg.c_str(), ROUTING, timing_info);`
	`1065`	`+ // Update interactive graphics`
	`1066`	`+ update_screen(ScreenUpdatePriority::MAJOR, graphics_msg.c_str(), e_pic_type::ROUTING, timing_info);`
`1067`	`1067`	`}`
`1068`	`1068`
`1069`	`1069`	`return route_status;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ void draw_interposer_cuts(ezgl::renderer* g) {`
`23`	`23`	`g->set_line_dash(ezgl::line_dash::asymmetric_5_3);`
`24`	`24`	`g->set_line_width(2);`
`25`	`25`
`26`		`- const float offset_factor = draw_state->pic_on_screen == PLACEMENT ? -0.5f : -0.5f / device_ctx.chan_width.max;`
	`26`	`+ const float offset_factor = draw_state->pic_on_screen == e_pic_type::PLACEMENT ? -0.5f : -0.5f / device_ctx.chan_width.max;`
`27`	`27`
`28`	`28`	`for (size_t layer = 0; layer < grid.get_num_layers(); layer++) {`
`29`	`29`	`if (!draw_state->draw_layer_display[layer].visible) {`
`@@ -41,11 +41,11 @@ void draw_interposer_cuts(ezgl::renderer* g) {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- if (draw_state->pic_on_screen == PLACEMENT \|\| draw_state->pic_on_screen == ROUTING) {`
	`44`	`+ if (draw_state->pic_on_screen == e_pic_type::PLACEMENT \|\| draw_state->pic_on_screen == e_pic_type::ROUTING) {`
`45`	`45`	`for (const auto& [start, end] : lines_to_draw) {`
`46`	`46`	`g->draw_line(start, end);`
`47`	`47`	`}`
`48`	`48`	`} else {`
`49`		`- VTR_ASSERT(draw_state->pic_on_screen == NO_PICTURE);`
	`49`	`+ VTR_ASSERT(draw_state->pic_on_screen == e_pic_type::NO_PICTURE);`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ void toggle_crit_path_cbk(GtkSwitch, gboolean state, ezgl::application app) {`
`310`	`310`	`gtk_widget_set_sensitive(GTK_WIDGET(app->get_object("ToggleCritPathFlylines")), state);`
`311`	`311`	`gtk_widget_set_sensitive(GTK_WIDGET(app->get_object("ToggleCritPathDelays")), state);`
`312`	`312`
`313`		`- if (draw_state->setup_timing_info && draw_state->pic_on_screen == ROUTING) {`
	`313`	`+ if (draw_state->setup_timing_info && draw_state->pic_on_screen == e_pic_type::ROUTING) {`
`314`	`314`	`gtk_widget_set_sensitive(GTK_WIDGET(app->get_object("ToggleCritPathRouting")), state);`
`315`	`315`	`}`
`316`	`316`
`@@ -343,7 +343,7 @@ void toggle_expansion_cost_cbk(GtkComboBoxText* self, ezgl::application* app) {`
`343`	`343`	`} else if (strcmp(combo_box_content, "Expected (with edges)") == 0) {`
`344`	`344`	`new_state = DRAW_ROUTER_EXPANSION_COST_EXPECTED_WITH_EDGES;`
`345`	`345`	`} else {`
`346`		`- VPR_THROW(VPR_ERROR_DRAW, "Unrecognzied draw RR cost option");`
	`346`	`+ VPR_THROW(VPR_ERROR_DRAW, "Unrecognized draw RR cost option");`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`g_free(combo_box_content);`
Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,6 @@ static void update_screen_debug();`
`156`	`156`	`//This function with no arguments is useful for calling from a debugger to`
`157`	`157`	`//look at the intermediate implemetnation state.`
`158`	`158`	`static void update_screen_debug() {`
`159`		`- update_screen(ScreenUpdatePriority::MAJOR, "DEBUG", PLACEMENT, nullptr);`
	`159`	`+ update_screen(ScreenUpdatePriority::MAJOR, "DEBUG", e_pic_type::PLACEMENT, nullptr);`
`160`	`160`	`}`
`161`	`161`	`#endif`