@@ -99,14 +99,12 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
99
99
const t_analysis_opts& analysis_opts,
100
100
const t_arch* arch,
101
101
t_pack_molecule* molecule_head,
102
- int num_models,
103
102
const std::unordered_set<AtomNetId>& is_clock,
103
+ const std::unordered_set<AtomNetId>& is_global,
104
104
const std::unordered_map<AtomBlockId, t_pb_graph_node*>& expected_lowest_cost_pb_gnode,
105
105
bool allow_unrelated_clustering,
106
106
bool balance_block_type_utilization,
107
107
std::vector<t_lb_type_rr_node>* lb_type_rr_graphs,
108
- const t_ext_pin_util_targets& ext_pin_util_targets,
109
- const t_pack_high_fanout_thresholds& high_fanout_thresholds,
110
108
AttractionInfo& attraction_groups,
111
109
bool & floorplan_regions_overfull,
112
110
t_clustering_data& clustering_data) {
@@ -237,7 +235,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
237
235
238
236
auto seed_atoms = initialize_seed_atoms (packer_opts.cluster_seed_type , max_molecule_stats, atom_criticality);
239
237
240
- istart = get_highest_gain_seed_molecule (& seedindex, seed_atoms);
238
+ istart = get_highest_gain_seed_molecule (seedindex, seed_atoms);
241
239
242
240
print_pack_status_header ();
243
241
@@ -405,7 +403,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
405
403
clb_index, istart,
406
404
num_used_type_instances,
407
405
packer_opts.target_device_utilization ,
408
- num_models, helper_ctx.max_cluster_size ,
406
+ helper_ctx. num_models , helper_ctx.max_cluster_size ,
409
407
arch, packer_opts.device_layout ,
410
408
lb_type_rr_graphs, &router_data,
411
409
detailed_routing_stage, &cluster_ctx.clb_nlist ,
@@ -435,11 +433,11 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
435
433
// Progress dot for seed-block
436
434
fflush (stdout);
437
435
438
- t_ext_pin_util target_ext_pin_util = ext_pin_util_targets .get_pin_util (cluster_ctx.clb_nlist .block_type (clb_index)->name );
439
- int high_fanout_threshold = high_fanout_thresholds.get_threshold (cluster_ctx.clb_nlist .block_type (clb_index)->name );
436
+ t_ext_pin_util target_ext_pin_util = helper_ctx. target_external_pin_util .get_pin_util (cluster_ctx.clb_nlist .block_type (clb_index)->name );
437
+ int high_fanout_threshold = helper_ctx. high_fanout_thresholds .get_threshold (cluster_ctx.clb_nlist .block_type (clb_index)->name );
440
438
update_cluster_stats (istart, clb_index,
441
439
is_clock, // Set of clock nets
442
- is_clock , // Set of global nets (currently all clocks)
440
+ is_global , // Set of global nets (currently all clocks)
443
441
packer_opts.global_clocks ,
444
442
packer_opts.alpha , packer_opts.beta ,
445
443
packer_opts.timing_driven , packer_opts.connection_driven ,
@@ -505,7 +503,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
505
503
helper_ctx.primitives_list ,
506
504
cluster_stats,
507
505
helper_ctx.total_clb_num ,
508
- num_models,
506
+ helper_ctx. num_models ,
509
507
helper_ctx.max_cluster_size ,
510
508
clb_index,
511
509
detailed_routing_stage,
@@ -514,6 +512,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
514
512
allow_unrelated_clustering,
515
513
high_fanout_threshold,
516
514
is_clock,
515
+ is_global,
517
516
timing_info,
518
517
router_data,
519
518
target_ext_pin_util,
@@ -627,7 +626,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
627
626
clb_index, istart,
628
627
num_used_type_instances,
629
628
packer_opts.target_device_utilization ,
630
- num_models, helper_ctx.max_cluster_size ,
629
+ helper_ctx. num_models , helper_ctx.max_cluster_size ,
631
630
arch, packer_opts.device_layout ,
632
631
lb_type_rr_graphs, &router_data,
633
632
detailed_routing_stage, &cluster_ctx.clb_nlist ,
@@ -657,11 +656,11 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
657
656
// Progress dot for seed-block
658
657
fflush (stdout);
659
658
660
- t_ext_pin_util target_ext_pin_util = ext_pin_util_targets .get_pin_util (cluster_ctx.clb_nlist .block_type (clb_index)->name );
661
- int high_fanout_threshold = high_fanout_thresholds.get_threshold (cluster_ctx.clb_nlist .block_type (clb_index)->name );
659
+ t_ext_pin_util target_ext_pin_util = helper_ctx. target_external_pin_util .get_pin_util (cluster_ctx.clb_nlist .block_type (clb_index)->name );
660
+ int high_fanout_threshold = helper_ctx. high_fanout_thresholds .get_threshold (cluster_ctx.clb_nlist .block_type (clb_index)->name );
662
661
update_cluster_stats (istart, clb_index,
663
662
is_clock, // Set of clock nets
664
- is_clock , // Set of global nets (currently all clocks)
663
+ is_global , // Set of global nets (currently all clocks)
665
664
packer_opts.global_clocks ,
666
665
packer_opts.alpha , packer_opts.beta ,
667
666
packer_opts.timing_driven , packer_opts.connection_driven ,
@@ -721,7 +720,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
721
720
helper_ctx.primitives_list ,
722
721
cluster_stats,
723
722
helper_ctx.total_clb_num ,
724
- num_models,
723
+ helper_ctx. num_models ,
725
724
helper_ctx.max_cluster_size ,
726
725
clb_index,
727
726
detailed_routing_stage,
@@ -730,6 +729,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
730
729
allow_unrelated_clustering,
731
730
high_fanout_threshold,
732
731
is_clock,
732
+ is_global,
733
733
timing_info,
734
734
router_data,
735
735
target_ext_pin_util,
0 commit comments