Merge pull request #751 from os-fpga/finished_merging_packer_fix

finished merging packer_fix

Author: serge-dsa

CMakeLists.txt

@@ -133,7 +133,7 @@ FILE(COPY ${PACKER_SRC_DIR}/cluster.cpp
           ${PACKER_SRC_DIR}/cluster_util.h
           ${PACKER_SRC_DIR}/output_clustering.cpp
           ${PACKER_SRC_DIR}/output_clustering.h
-#          ${PACKER_SRC_DIR}/cluster_router.cpp
+          ${PACKER_SRC_DIR}/cluster_router.cpp
           ${PACKER_SRC_DIR}/post_routing_pb_pin_fixup.cpp
           DESTINATION
           ${VPR_DEST_DIR}/src/pack)

include/packer_fix/cluster.cpp

@@ -398,8 +398,8 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
                     * Since some of the primitives might fail legality, this structure temporarily
                     * stores PartitionRegion information while the cluster is packed*/
                     PartitionRegion temp_cluster_pr;
+                    NocGroupId temp_cluster_noc_grp_id = NocGroupId::INVALID();
 
-                    #if 0
                     start_new_cluster(helper_ctx.cluster_placement_stats, helper_ctx.primitives_list,
                                     clb_index, istart,
                                     num_used_type_instances,
@@ -413,8 +413,7 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
                                     packer_opts.enable_pin_feasibility_filter,
                                     balance_block_type_utilization,
                                     packer_opts.feasible_block_array_size,
-                                    temp_cluster_pr);
-                    #endif ////00000000000000000000000000000000000000000000000000
+                                    temp_cluster_pr, temp_cluster_noc_grp_id);
 
                     //initial molecule in cluster has been processed
                     cluster_stats.num_molecules_processed++;
@@ -497,7 +496,6 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
                         break;
                         }
 
-                        #if 0
                         try_fill_cluster(packer_opts,
                                         cur_cluster_placement_stats_ptr,
                                         prev_molecule,
@@ -520,12 +518,12 @@ std::map<t_logical_block_type_ptr, size_t> do_clustering(const t_packer_opts& pa
                                         router_data,
                                         target_ext_pin_util,
                                         temp_cluster_pr,
+                                        temp_cluster_noc_grp_id,
                                         block_pack_status,
                                         clustering_data.unclustered_list_head,
                                         unclustered_list_head_size,
                                         net_output_feeds_driving_block_input,
                                         primitive_candidate_block_types);
-                          #endif ////////000000000000000
 
                         i++;
 

planning/src/main.cpp

@@ -1,4 +1,4 @@
-static const char* _pln_VERSION_STR = "pln0243";
+static const char* _pln_VERSION_STR = "pln0244";
 
 #include "RS/rsEnv.h"
 #include "util/pln_log.h"