add a 3D constraint file where are atoms are locked down

Author: soheilshahrouz

vpr/src/base/read_options.cpp

@@ -2146,20 +2146,20 @@ argparse::ArgumentParser create_arg_parser(const std::string& prog_name, t_optio
 
     place_grp.add_argument(args.place_constraint_expand, "--place_constraint_expand")
         .help(
-            "The value used to decide how much to expand the floorplan constraint region when writing"
-            "a floorplan constraint XML file. Takes in an integer value from zero to infinity."
-            "If the value is zero, the block stays at the same x, y location. If it is"
-            "greater than zero the constraint region expands by the specified value in each direction."
-            "For example, if 1 was specified, a block at the x, y location (1, 1) would have a constraint region"
+            "The value used to decide how much to expand the floorplan constraint region when writing "
+            "a floorplan constraint XML file. Takes in an integer value from zero to infinity. "
+            "If the value is zero, the block stays at the same x, y location. If it is "
+            "greater than zero the constraint region expands by the specified value in each direction. "
+            "For example, if 1 was specified, a block at the x, y location (1, 1) would have a constraint region "
             "of 2x2 centered around (1, 1), from (0, 0) to (2, 2).")
         .default_value("0")
         .show_in(argparse::ShowIn::HELP_ONLY);
 
     place_grp.add_argument<bool, ParseOnOff>(args.place_constraint_subtile, "--place_constraint_subtile")
         .help(
-            "The bool used to say whether to print subtile constraints when printing a floorplan constraints XML file."
-            "If it is off, no subtile locations are specified when printing the floorplan constraints."
-            "If it is on, the floorplan constraints are printed with the subtiles from current placement.")
+            "The bool used to say whether to print subtile constraints when printing a floorplan constraints XML file. "
+            "If it is off, no subtile locations are specified when printing the floorplan constraints. "
+            "If it is on, the floorplan constraints are printed with the subtiles from current placement. ")
         .default_value("off")
         .show_in(argparse::ShowIn::HELP_ONLY);
 

vpr/src/base/vpr_constraints_writer.cpp

@@ -12,14 +12,22 @@
 #include "globals.h"
 #include "pugixml.hpp"
 #include "pugixml_util.hpp"
-#include "echo_files.h"
 #include "clustered_netlist_utils.h"
 
 #include <fstream>
 #include "vpr_constraints_writer.h"
 #include "region.h"
 #include "re_cluster_util.h"
 
+/**
+ * @brief Create a partition with the given name and a single region.
+ *
+ * @param part_name The name of the partition to be created.
+ * @param region The region that the partition covers.
+ * @return A newly created partition with the giver name and region.
+ */
+static Partition create_partition(const std::string& part_name, const Region& region);
+
 void write_vpr_floorplan_constraints(const char* file_name, int expand, bool subtile, int horizontal_partitions, int vertical_partitions) {
     VprConstraints constraints;
 
@@ -54,7 +62,7 @@ void setup_vpr_floorplan_constraints_one_loc(VprConstraints& constraints, int ex
      * The PartitionRegion will be the location of the block in current placement, modified by the expansion factor.
      * The subtile can also optionally be set in the PartitionRegion, based on the value passed in by the user.
      */
-    for (auto blk_id : cluster_ctx.clb_nlist.blocks()) {
+    for (ClusterBlockId blk_id : cluster_ctx.clb_nlist.blocks()) {
         const std::string& part_name = cluster_ctx.clb_nlist.block_name(blk_id);
         PartitionId partid(part_id);
 
@@ -190,23 +198,26 @@ void setup_vpr_floorplan_constraints_cutpoints(VprConstraints& constraints, int
 
     int num_partitions = 0;
     for (const auto& [region, atoms] : region_atoms) {
-        Partition part;
         PartitionId partid(num_partitions);
         std::string part_name = "Part" + std::to_string(num_partitions);
-        create_partition(part, part_name, region);
+        Partition part = create_partition(part_name, region);
         constraints.mutable_place_constraints().add_partition(part);
 
-        for (auto blk_id : atoms) {
+        for (AtomBlockId blk_id : atoms) {
             constraints.mutable_place_constraints().add_constrained_atom(blk_id, partid);
         }
 
         num_partitions++;
     }
 }
 
-void create_partition(Partition& part, const std::string& part_name, const Region& region) {
+static Partition create_partition(const std::string& part_name, const Region& region) {
+    Partition part;
+
     part.set_name(part_name);
     PartitionRegion part_pr;
     part_pr.set_partition_region({region});
     part.set_part_region(part_pr);
+
+    return part;
 }

vpr/src/base/vpr_constraints_writer.h

@@ -64,6 +64,4 @@ void setup_vpr_floorplan_constraints_one_loc(VprConstraints& constraints, int ex
  */
 void setup_vpr_floorplan_constraints_cutpoints(VprConstraints& constraints, int horizontal_cutpoints, int vertical_cutpoints);
 
-void create_partition(Partition& part, const std::string& part_name, const Region& region);
-
 #endif /* VPR_SRC_BASE_VPR_CONSTRAINTS_WRITER_H_ */

vtr_flow/tasks/regression_tests/vtr_reg_nightly_test5/vpr_tight_floorplan_3d/config/config.txt

@@ -28,4 +28,4 @@ script_params_common =-starting_stage vpr --route_chan_width 300 --max_router_it
 script_params_list_add = -sdc_file sdc/samples/neuron_stratixiv_arch_timing.sdc -read_vpr_constraints tasks/regression_tests/vtr_reg_nightly_test5/vpr_tight_floorplan_3d/one_big_partition.xml
 script_params_list_add = -sdc_file sdc/samples/neuron_stratixiv_arch_timing.sdc -read_vpr_constraints tasks/regression_tests/vtr_reg_nightly_test5/vpr_tight_floorplan_3d/half_blocks_right_left.xml
 script_params_list_add = -sdc_file sdc/samples/neuron_stratixiv_arch_timing.sdc -read_vpr_constraints tasks/regression_tests/vtr_reg_nightly_test5/vpr_tight_floorplan_3d/half_blocks_up_down.xml
-script_params_list_add = -sdc_file sdc/samples/neuron_stratixiv_arch_timing.sdc -read_vpr_constraints tasks/regression_tests/vtr_reg_nightly_test5/vpr_tight_floorplan_3d/three_partitionregion_multiregion.xml
+script_params_list_add = -sdc_file sdc/samples/neuron_stratixiv_arch_timing.sdc -read_vpr_constraints tasks/regression_tests/vtr_reg_nightly_test5/vpr_tight_floorplan_3d/locked_down.xml