Skip to content

[AP] Removed Old Cluster-Level AP Flow #3054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
15 changes: 0 additions & 15 deletions vpr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion vpr/src/base/SetupVPR.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions vpr/src/base/read_options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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. "
Expand Down
1 change: 0 additions & 1 deletion vpr/src/base/read_options.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 0 additions & 8 deletions vpr/src/base/vpr_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

/******************************************************************
Expand Down
Loading