Merge branch 'master' of https://github.com/verilog-to-routing/vtr-verilog-to-routing into read_rr_graph_run_flat

Author: amin1377

vpr/src/base/read_options.cpp

@@ -1633,7 +1633,7 @@ argparse::ArgumentParser create_arg_parser(const std::string& prog_name, t_optio
         .show_in(argparse::ShowIn::HELP_ONLY);
 
     file_grp.add_argument(args.read_initial_place_file, "--read_initial_place_file")
-        .help("Writes out the the placement chosen by the initial placement algorithm to the specified file")
+        .help("Reads the initial placement and continues the rest of the placement process from there.")
         .metavar("INITIAL_PLACE_FILE")
         .show_in(argparse::ShowIn::HELP_ONLY);
 

vpr/src/base/read_place.cpp

@@ -305,6 +305,14 @@ void read_place_body(std::ifstream& placement_file,
             loc.layer = block_layer;
 
             if (seen_blocks[blk_id] == 0) {
+                if (is_place_file && place_ctx.block_locs[blk_id].is_fixed) {
+                    const auto& contraint_loc =  place_ctx.block_locs[blk_id].loc;
+                    if (loc != contraint_loc) {
+                        VPR_THROW(VPR_ERROR_PLACE,
+                        "The new location assigned to cluster #%d is (%d,%d,%d,%d), which is inconsistent with the location specified in the constraint file (%d,%d,%d,%d).",
+                        blk_id, loc.x, loc.y, loc.layer, loc.sub_tile, contraint_loc.x, contraint_loc.y, contraint_loc.layer, contraint_loc.sub_tile);
+                    }
+                }
                 set_block_location(blk_id, loc);
             }
 

vpr/src/place/initial_placement.cpp

@@ -1187,12 +1187,13 @@ void initial_placement(const t_placer_opts& placer_opts,
     clear_all_grid_locs();
 
     /* Go through cluster blocks to calculate the tightest placement
-    * floorplan constraint for each constrained block
-    */
+     * floorplan constraint for each constrained block
+     */
     propagate_place_constraints();
 
     /*Mark the blocks that have already been locked to one spot via floorplan constraints
-    * as fixed, so they do not get moved during initial placement or later during the simulated annealing stage of placement*/
+     * as fixed, so they do not get moved during initial placement or later during the simulated annealing stage of placement
+     */
     mark_fixed_blocks();
 
     // Compute and store compressed floorplanning constraints

vpr/src/place/place.cpp

@@ -462,7 +462,7 @@ void try_place(const Netlist<>& net_list,
     if (!placer_opts.write_initial_place_file.empty()) {
         print_place(nullptr,
                     nullptr,
-                    (placer_opts.write_initial_place_file).c_str());
+                    placer_opts.write_initial_place_file.c_str());
     }
 
 #ifdef ENABLE_ANALYTIC_PLACE