Merge pull request verilog-to-routing#9 from antmicro/round_robin_packing

round robin packing

Author: litghost

libs/libarchfpga/src/cad_types.h

@@ -36,6 +36,7 @@ struct t_pack_patterns {
 
 	bool is_chain; /* Does this pattern chain across logic blocks */
 	t_pb_graph_pin *chain_root_pin; /* pointer to logic block input pin that drives this chain from the preceding logic block */
+	int usage; /* how many atoms have been packed into molecules using this pack pattern */
 };
 
 struct t_model_chain_pattern {

vpr/src/base/SetupVPR.cpp

@@ -408,6 +408,7 @@ void SetupPackerOpts(const t_options& Options,
 	PackerOpts->beta = Options.beta_clustering;
 	PackerOpts->debug_clustering = Options.debug_clustering;
 	PackerOpts->enable_pin_feasibility_filter = Options.enable_clustering_pin_feasibility_filter;
+	PackerOpts->enable_round_robin_prepacking = Options.enable_round_robin_prepacking;
 	PackerOpts->target_external_pin_util = parse_target_external_pin_util(Options.target_external_pin_util);
     PackerOpts->target_device_utilization = Options.target_device_utilization;
 

vpr/src/base/read_options.cpp

@@ -677,6 +677,11 @@ static argparse::ArgumentParser create_arg_parser(std::string prog_name, t_optio
             .default_value("on")
             .show_in(argparse::ShowIn::HELP_ONLY);
 
+    pack_grp.add_argument<bool,ParseOnOff>(args.enable_round_robin_prepacking, "--round_robin_prepacking")
+            .help("")
+            .default_value("off")
+            .show_in(argparse::ShowIn::HELP_ONLY);
+    
     pack_grp.add_argument(args.target_external_pin_util, "--target_ext_pin_util")
             .help("Sets the external pin utilization target during clustering.\n"
                   "Value Ranges:\n"

vpr/src/base/read_options.h

@@ -69,6 +69,7 @@ struct t_options {
     argparse::ArgValue<bool> enable_clustering_pin_feasibility_filter;
     argparse::ArgValue<std::vector<std::string>> target_external_pin_util;
     argparse::ArgValue<bool> debug_clustering;
+    argparse::ArgValue<bool> enable_round_robin_prepacking;
 
     /* Placement options */
     argparse::ArgValue<int> Seed;

vpr/src/base/vpr_types.h

@@ -732,16 +732,17 @@ struct t_packer_opts {
 	float alpha;
 	float beta;
 	float inter_cluster_net_delay;
-    float target_device_utilization;
+	float target_device_utilization;
 	bool auto_compute_inter_cluster_net_delay;
 	bool allow_unrelated_clustering;
 	bool connection_driven;
 	bool debug_clustering;
-    bool enable_pin_feasibility_filter;
-    t_ext_pin_util_targets target_external_pin_util;
+	bool enable_pin_feasibility_filter;
+	bool enable_round_robin_prepacking;
+	t_ext_pin_util_targets target_external_pin_util;
 	e_stage_action doPacking;
 	enum e_packer_algorithm packer_algorithm;
-    std::string device_layout;
+	std::string device_layout;
 	std::string hmetis_input_file;
 };
 
@@ -1162,7 +1163,7 @@ struct t_vpr_setup {
 	t_placer_opts PlacerOpts; /* Options for placer */
 	t_annealing_sched AnnealSched; /* Placement option annealing schedule */
 	t_router_opts RouterOpts; /* router options */
-    t_analysis_opts AnalysisOpts; /* Analysis options */
+	t_analysis_opts AnalysisOpts; /* Analysis options */
 	t_det_routing_arch RoutingArch; /* routing architecture */
 	std::vector <t_lb_type_rr_node> *PackerRRGraph;
 	t_segment_inf * Segments; /* wires in routing architecture */
@@ -1172,9 +1173,9 @@ struct t_vpr_setup {
 	bool gen_netlist_as_blif; /* option to print out post-pack/pre-place netlist as blif */
 	int GraphPause; /* user interactiveness graphics option */
 	t_power_opts PowerOpts;
-    std::string device_layout;
-    e_constant_net_method constant_net_method; //How constant nets should be handled
-    e_clock_modeling clock_modeling; //How clocks should be handled
+	std::string device_layout;
+	e_constant_net_method constant_net_method; //How constant nets should be handled
+	e_clock_modeling clock_modeling; //How clocks should be handled
 };
 
 class RouteStatus {

vpr/src/pack/pack.cpp

@@ -93,10 +93,11 @@ void try_pack(t_packer_opts *packer_opts,
 
 	vtr::printf_info("Begin prepacking.\n");
 	list_of_packing_patterns = alloc_and_load_pack_patterns(&num_packing_patterns);
-    list_of_pack_molecules = alloc_and_load_pack_molecules(list_of_packing_patterns,
+	list_of_pack_molecules = alloc_and_load_pack_molecules(list_of_packing_patterns,
                                 atom_molecules,
                                 expected_lowest_cost_pb_gnode,
-                                num_packing_patterns);
+                                num_packing_patterns,
+                                packer_opts->enable_round_robin_prepacking);
 	vtr::printf_info("Finish prepacking.\n");
 
 	if(packer_opts->auto_compute_inter_cluster_net_delay) {