Merge pull request #3054 from AlexandreSinger/feature-remove-old-ap-flow

[AP] Removed Old Cluster-Level AP Flow

Author: vaughnbetz

CMakeLists.txt

@@ -42,9 +42,6 @@ option(VTR_ENABLE_CAPNPROTO "Enable capnproto binary serialization support in VP
 #Allow the user to decide whether to compile the server module
 option(VPR_USE_SERVER "Specify whether vpr enables the server mode" ON)
 
-#Allow the user to enable/disable VPR analytic placement
-#VPR option --enable_analytic_placer is also required for Analytic Placement
-option(VPR_ANALYTIC_PLACE "Enable analytic placement in VPR." ON)
 option(VPR_ENABLE_INTERCHANGE "Enable FPGA interchange." ON)
 option(VPR_ENABLE_NOC_SAT_ROUTING "Enable NoC SAT routing." OFF)
 

vpr/CMakeLists.txt

@@ -91,21 +91,6 @@ else ()
     message(STATUS "Eigen3: Not Found. Some features may be disabled.")
 endif (TARGET Eigen3::Eigen)
 
-#VPR_ANALYTIC_PLACE is initialized in the root CMakeLists
-# NOTE: This is the cluster-level Analytical Placement which existed before the
-#       flat Analytical Placement flow.
-if(${VPR_ANALYTIC_PLACE})
-	message(STATUS "VPR Analytic Placement: Requested")
-	if (TARGET Eigen3::Eigen)
-		message(STATUS "VPR Analytic Placement dependency (Eigen3): Found")
-		message(STATUS "VPR Analytic Placement: Enabled")
-		target_compile_definitions(libvpr PUBLIC -DENABLE_ANALYTIC_PLACE)
-	else ()
-		message(STATUS "VPR Analytic Placement dependency (Eigen3): Not Found (Download manually with sudo apt install libeigen3-dev, and rebuild)")
-		message(STATUS "VPR Analytic Placement: Disabled")
-	endif(TARGET Eigen3::Eigen)
-endif()
-
 if (${VPR_ENABLE_NOC_SAT_ROUTING})
     message(STATUS "VPR NoC SAT Routing: Requested")
     find_package(ortools CONFIG REQUIRED)

vpr/src/base/SetupVPR.cpp

@@ -673,7 +673,6 @@ static void SetupPlacerOpts(const t_options& Options, t_placer_opts* PlacerOpts)
 
     PlacerOpts->effort_scaling = Options.place_effort_scaling;
     PlacerOpts->timing_update_type = Options.timing_update_type;
-    PlacerOpts->enable_analytic_placer = Options.enable_analytic_placer;
     PlacerOpts->place_static_move_prob = vtr::vector<e_move_type, float>(Options.place_static_move_prob.value().begin(),
                                                                          Options.place_static_move_prob.value().end());
     PlacerOpts->place_high_fanout_net = Options.place_high_fanout_net;

vpr/src/base/read_options.cpp

@@ -2244,13 +2244,6 @@ argparse::ArgumentParser create_arg_parser(const std::string& prog_name, t_optio
         .default_value("0")
         .show_in(argparse::ShowIn::HELP_ONLY);
 
-    place_grp.add_argument(args.enable_analytic_placer, "--enable_analytic_placer")
-        .help(
-            "Enables the analytic placer. "
-            "Once analytic placement is done, the result is passed through the quench phase of the annealing placer for local improvement")
-        .default_value("false")
-        .show_in(argparse::ShowIn::HELP_ONLY);
-
     place_grp.add_argument(args.place_static_move_prob, "--place_static_move_prob")
         .help(
             "The percentage probabilities of different moves in Simulated Annealing placement. "

vpr/src/base/read_options.h

@@ -139,7 +139,6 @@ struct t_options {
     argparse::ArgValue<int> placement_saves_per_temperature;
     argparse::ArgValue<e_place_effort_scaling> place_effort_scaling;
     argparse::ArgValue<e_place_delta_delay_algorithm> place_delta_delay_matrix_calculation_method;
-    argparse::ArgValue<bool> enable_analytic_placer;
     argparse::ArgValue<std::vector<float>> place_static_move_prob;
     argparse::ArgValue<int> place_high_fanout_net;
     argparse::ArgValue<e_place_bounding_box_mode> place_bounding_box_mode;

vpr/src/base/vpr_types.h

@@ -1071,14 +1071,6 @@ struct t_placer_opts {
     std::string allowed_tiles_for_delay_model;
 
     e_place_delta_delay_algorithm place_delta_delay_matrix_calculation_method;
-
-    /*
-     * @brief enables the analytic placer.
-     *
-     * Once analytic placement is done, the result is passed through the quench phase
-     * of the annealing placer for local improvement
-     */
-    bool enable_analytic_placer;
 };
 
 /******************************************************************