use VTR_ASSERT_SAFE instead of VTR_ASSERT in placement context getters

Author: soheilshahrouz

vpr/src/base/load_flat_place.cpp

@@ -15,7 +15,7 @@ static void print_flat_cluster(FILE* fp, ClusterBlockId iblk,
     t_pl_loc loc = block_locs[iblk].loc;
     size_t bnum = size_t(iblk);
 
-    for (auto atom : atoms) {
+    for (AtomBlockId atom : atoms) {
         t_pb_graph_node* atom_pbgn = atom_ctx.lookup.atom_pb(atom)->pb_graph_node;
         fprintf(fp, "%s  %d %d %d %d #%zu %s\n", atom_ctx.nlist.block_name(atom).c_str(),
                                                 loc.x, loc.y, loc.sub_tile,
@@ -27,14 +27,16 @@ static void print_flat_cluster(FILE* fp, ClusterBlockId iblk,
 
 /* prints a flat placement file */
 void print_flat_placement(const char* flat_place_file) {
+    const auto& block_locs = g_vpr_ctx.placement().block_locs();
+    
     FILE* fp;
 
     ClusterAtomsLookup atoms_lookup;
     auto& cluster_ctx = g_vpr_ctx.clustering();
 
-    if (!g_vpr_ctx.placement().block_locs().empty()) {
+    if (!block_locs.empty()) {
         fp = fopen(flat_place_file, "w");
-        for (auto iblk : cluster_ctx.clb_nlist.blocks()) {
+        for (ClusterBlockId iblk : cluster_ctx.clb_nlist.blocks()) {
             auto atoms = atoms_lookup.atoms_in_cluster(iblk);
             print_flat_cluster(fp, iblk, atoms);
         }

vpr/src/base/vpr_context.h

@@ -400,14 +400,14 @@ struct PlacementContext : public Context {
 
   public:
 
-    const vtr::vector_map<ClusterBlockId, t_block_loc>& block_locs() const { VTR_ASSERT(loc_vars_are_accessible_); return place_loc_vars_.block_locs(); }
-    vtr::vector_map<ClusterBlockId, t_block_loc>& mutable_block_locs() { VTR_ASSERT(loc_vars_are_accessible_); return place_loc_vars_.mutable_block_locs(); }
-    const GridBlock& get_grid_blocks() const { VTR_ASSERT(loc_vars_are_accessible_); return place_loc_vars_.grid_blocks(); }
-    GridBlock& get_mutable_grid_blocks() { VTR_ASSERT(loc_vars_are_accessible_); return place_loc_vars_.mutable_grid_blocks(); }
-    vtr::vector_map<ClusterPinId, int>& mutable_physical_pins() { VTR_ASSERT(loc_vars_are_accessible_); return place_loc_vars_.mutable_physical_pins(); }
-    const vtr::vector_map<ClusterPinId, int>& physical_pins() const { VTR_ASSERT(loc_vars_are_accessible_); return place_loc_vars_.physical_pins(); }
-    PlaceLocVars& mutable_place_loc_vars() { VTR_ASSERT(loc_vars_are_accessible_); return place_loc_vars_; }
-    const PlaceLocVars& place_loc_vars() const { VTR_ASSERT(loc_vars_are_accessible_); return place_loc_vars_; }
+    const vtr::vector_map<ClusterBlockId, t_block_loc>& block_locs() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.block_locs(); }
+    vtr::vector_map<ClusterBlockId, t_block_loc>& mutable_block_locs() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.mutable_block_locs(); }
+    const GridBlock& get_grid_blocks() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.grid_blocks(); }
+    GridBlock& get_mutable_grid_blocks() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.mutable_grid_blocks(); }
+    vtr::vector_map<ClusterPinId, int>& mutable_physical_pins() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.mutable_physical_pins(); }
+    const vtr::vector_map<ClusterPinId, int>& physical_pins() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_.physical_pins(); }
+    PlaceLocVars& mutable_place_loc_vars() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_; }
+    const PlaceLocVars& place_loc_vars() const { VTR_ASSERT_SAFE(loc_vars_are_accessible_); return place_loc_vars_; }
 
     /**
      * @brief Makes place_loc_vars_ inaccessible through the getter methods.
@@ -416,15 +416,15 @@ struct PlacementContext : public Context {
      * guarantee that the placement stage code does not access block location variables
      * stored in the global state.
      */
-    void lock_loc_vars() { loc_vars_are_accessible_ = false; }
+    void lock_loc_vars() { VTR_ASSERT_SAFE(loc_vars_are_accessible_); loc_vars_are_accessible_ = false; }
 
     /**
      * @brief Makes place_loc_vars_ accessible through the getter methods.
      *
      * This method should be called at the end of the placement stage to
      * make the block location information accessible for subsequent stages.
      */
-    void unlock_loc_vars() { loc_vars_are_accessible_ = true; }
+    void unlock_loc_vars() { VTR_ASSERT_SAFE(!loc_vars_are_accessible_); loc_vars_are_accessible_ = true; }
 
     ///@brief The pl_macros array stores all the placement macros (usually carry chains).
     std::vector<t_pl_macro> pl_macros;