store pointers to TimingInfo in PlacerSetupSlacks and PlacerCriticalities and NetPinTimingInvalidator

Author: soheilshahrouz

vpr/src/place/annealer.cpp

@@ -471,7 +471,7 @@ e_move_result PlacementAnnealer::try_swap_(MoveGenerator& move_generator,
              */
 
             // Invalidates timing of modified connections for incremental timing updates.
-            pin_timing_invalidator_->invalidate_affected_connections(blocks_affected_, timing_info_);
+            pin_timing_invalidator_->invalidate_affected_connections(blocks_affected_);
 
             /* Update the connection_timing_cost and connection_delay
              * values from the temporary values. */
@@ -532,7 +532,7 @@ e_move_result PlacementAnnealer::try_swap_(MoveGenerator& move_generator,
                 /* Invalidates timing of modified connections for incremental
                  * timing updates. These invalidations are accumulated for a
                  * big timing update in the outer loop. */
-                pin_timing_invalidator_->invalidate_affected_connections(blocks_affected_, timing_info_);
+                pin_timing_invalidator_->invalidate_affected_connections(blocks_affected_);
 
                 /* Update the connection_timing_cost and connection_delay
                  * values from the temporary values. */
@@ -588,7 +588,7 @@ e_move_result PlacementAnnealer::try_swap_(MoveGenerator& move_generator,
                 /* Re-invalidate the affected sink pins since the proposed
                  * move is rejected, and the same blocks are reverted to
                  * their original positions. */
-                pin_timing_invalidator_->invalidate_affected_connections(blocks_affected_, timing_info_);
+                pin_timing_invalidator_->invalidate_affected_connections(blocks_affected_);
 
                 // Revert the timing update
                 update_timing_classes(crit_params, timing_info_, criticalities_,

vpr/src/place/place_timing_update.cpp

@@ -45,7 +45,7 @@ void initialize_timing_info(const PlaceCritParams& crit_params,
     //by passing in all the clb sink pins
     for (ClusterNetId net_id : clb_nlist.nets()) {
         for (ClusterPinId pin_id : clb_nlist.net_sinks(net_id)) {
-            pin_timing_invalidator->invalidate_connection(pin_id, timing_info);
+            pin_timing_invalidator->invalidate_connection(pin_id);
         }
     }
 
@@ -142,10 +142,10 @@ void update_timing_classes(const PlaceCritParams& crit_params,
     timing_info->update();
 
     /* Update the placer's criticalities (e.g. sharpen with crit_exponent). */
-    criticalities->update_criticalities(timing_info, crit_params, placer_state);
+    criticalities->update_criticalities(crit_params, placer_state);
 
     /* Update the placer's raw setup slacks. */
-    setup_slacks->update_setup_slacks(timing_info);
+    setup_slacks->update_setup_slacks();
 
     /* Clear invalidation state. */
     pin_timing_invalidator->reset();

vpr/src/place/placer.cpp

@@ -172,16 +172,20 @@ void Placer::alloc_and_init_timing_objects_(const Netlist<>& net_list,
 
    timing_info_ = make_setup_timing_info(placement_delay_calc_, placer_opts_.timing_update_type);
 
-   placer_setup_slacks_ = std::make_unique<PlacerSetupSlacks>(cluster_ctx.clb_nlist, netlist_pin_lookup_);
+   placer_setup_slacks_ = std::make_unique<PlacerSetupSlacks>(cluster_ctx.clb_nlist,
+                                                              netlist_pin_lookup_,
+                                                              timing_info_);
 
-   placer_criticalities_ = std::make_unique<PlacerCriticalities>(cluster_ctx.clb_nlist, netlist_pin_lookup_);
+   placer_criticalities_ = std::make_unique<PlacerCriticalities>(cluster_ctx.clb_nlist,
+                                                                 netlist_pin_lookup_,
+                                                                 timing_info_);
 
    pin_timing_invalidator_ = make_net_pin_timing_invalidator(placer_opts_.timing_update_type,
                                                              net_list,
                                                              netlist_pin_lookup_,
                                                              atom_ctx.nlist,
                                                              atom_ctx.lookup,
-                                                             *timing_info_->timing_graph(),
+                                                             timing_info_,
                                                              is_flat_);
 
    // First time compute timing and costs, compute from scratch

vpr/src/place/placer.h

@@ -130,10 +130,11 @@ class Placer {
      *
      * 3. Constructs `PlacerSetupSlacks` and `PlacerCriticalities` objects,
      *    which translate arrival and required times into slacks and criticalities,
-     *    respectively.
+     *    respectively. These objects hold pointers to timing_info_.
      *
      * 4. Creates a `NetPinTimingInvalidator` object to mark timing edges
-     *    corresponding to the pins of moved blocks as invalid.
+     *    corresponding to the pins of moved blocks as invalid. This object
+     *    holds a pointer to timing_info_.
      *
      * 5. Performs a full timing analysis by marking all pins as invalid.
      *

vpr/src/place/timing_place.cpp

@@ -16,9 +16,12 @@
 #include "timing_info.h"
 
 ///@brief Allocates space for the timing_place_crit_ data structure.
-PlacerCriticalities::PlacerCriticalities(const ClusteredNetlist& clb_nlist, const ClusteredPinAtomPinsLookup& netlist_pin_lookup)
+PlacerCriticalities::PlacerCriticalities(const ClusteredNetlist& clb_nlist,
+                                         const ClusteredPinAtomPinsLookup& netlist_pin_lookup,
+                                         std::shared_ptr<const SetupTimingInfo> timing_info)
     : clb_nlist_(clb_nlist)
     , pin_lookup_(netlist_pin_lookup)
+    , timing_info_(std::move(timing_info))
     , timing_place_crit_(make_net_pins_matrix(clb_nlist_, std::numeric_limits<float>::quiet_NaN())) {
 }
 
@@ -32,8 +35,7 @@ PlacerCriticalities::PlacerCriticalities(const ClusteredNetlist& clb_nlist, cons
  *
  * If the criticality exponent has changed, we also need to update from scratch.
  */
-void PlacerCriticalities::update_criticalities(const SetupTimingInfo* timing_info,
-                                               const PlaceCritParams& crit_params,
+void PlacerCriticalities::update_criticalities(const PlaceCritParams& crit_params,
                                                PlacerState& placer_state) {
     /* If update is not enabled, exit the routine. */
     if (!update_enabled) {
@@ -44,7 +46,7 @@ void PlacerCriticalities::update_criticalities(const SetupTimingInfo* timing_inf
 
     /* Determine what pins need updating */
     if (!recompute_required && crit_params.crit_exponent == last_crit_exponent_) {
-        incr_update_criticalities(timing_info);
+        incr_update_criticalities();
     } else {
         recompute_criticalities();
 
@@ -63,7 +65,7 @@ void PlacerCriticalities::update_criticalities(const SetupTimingInfo* timing_inf
         ClusterNetId clb_net = clb_nlist_.pin_net(clb_pin);
         int pin_index_in_net = clb_nlist_.pin_net_index(clb_pin);
         // Routing for placement is not flat (at least for the time being)
-        float clb_pin_crit = calculate_clb_net_pin_criticality(*timing_info, pin_lookup_, ParentPinId(size_t(clb_pin)), /*is_flat=*/false);
+        float clb_pin_crit = calculate_clb_net_pin_criticality(*timing_info_, pin_lookup_, ParentPinId(size_t(clb_pin)), /*is_flat=*/false);
 
         float new_crit = pow(clb_pin_crit, crit_params.crit_exponent);
         /*
@@ -114,10 +116,10 @@ void PlacerCriticalities::set_recompute_required() {
  * atom pin criticalities.
  */
 
-void PlacerCriticalities::incr_update_criticalities(const SetupTimingInfo* timing_info) {
+void PlacerCriticalities::incr_update_criticalities() {
     cluster_pins_with_modified_criticality_.clear();
 
-    for (AtomPinId atom_pin : timing_info->pins_with_modified_setup_criticality()) {
+    for (AtomPinId atom_pin : timing_info_->pins_with_modified_setup_criticality()) {
         ClusterPinId clb_pin = pin_lookup_.connected_clb_pin(atom_pin);
 
         //Some atom pins correspond to connections which are completely
@@ -164,9 +166,12 @@ PlacerCriticalities::pin_range PlacerCriticalities::pins_with_modified_criticali
 /**************************************/
 
 ///@brief Allocates space for the timing_place_setup_slacks_ data structure.
-PlacerSetupSlacks::PlacerSetupSlacks(const ClusteredNetlist& clb_nlist, const ClusteredPinAtomPinsLookup& netlist_pin_lookup)
+PlacerSetupSlacks::PlacerSetupSlacks(const ClusteredNetlist& clb_nlist,
+                                     const ClusteredPinAtomPinsLookup& netlist_pin_lookup,
+                                     std::shared_ptr<const SetupTimingInfo> timing_info)
     : clb_nlist_(clb_nlist)
     , pin_lookup_(netlist_pin_lookup)
+    , timing_info_(std::move(timing_info))
     , timing_place_setup_slacks_(make_net_pins_matrix(clb_nlist_, std::numeric_limits<float>::quiet_NaN())) {
 }
 
@@ -180,7 +185,7 @@ PlacerSetupSlacks::PlacerSetupSlacks(const ClusteredNetlist& clb_nlist, const Cl
  * In this case, `recompute_required` would be true, and we update all setup slacks
  * from scratch.
  */
-void PlacerSetupSlacks::update_setup_slacks(const SetupTimingInfo* timing_info) {
+void PlacerSetupSlacks::update_setup_slacks() {
     /* If update is not enabled, exit the routine. */
     if (!update_enabled) {
         /* re-computation is required on the next iteration */
@@ -190,7 +195,7 @@ void PlacerSetupSlacks::update_setup_slacks(const SetupTimingInfo* timing_info)
 
     /* Determine what pins need updating */
     if (!recompute_required) {
-        incr_update_setup_slacks(timing_info);
+        incr_update_setup_slacks();
     } else {
         recompute_setup_slacks();
     }
@@ -200,7 +205,7 @@ void PlacerSetupSlacks::update_setup_slacks(const SetupTimingInfo* timing_info)
         ClusterNetId clb_net = clb_nlist_.pin_net(clb_pin);
         int pin_index_in_net = clb_nlist_.pin_net_index(clb_pin);
 
-        float clb_pin_setup_slack = calculate_clb_net_pin_setup_slack(*timing_info, pin_lookup_, clb_pin);
+        float clb_pin_setup_slack = calculate_clb_net_pin_setup_slack(*timing_info_, pin_lookup_, clb_pin);
 
         timing_place_setup_slacks_[clb_net][pin_index_in_net] = clb_pin_setup_slack;
     }
@@ -217,10 +222,10 @@ void PlacerSetupSlacks::update_setup_slacks(const SetupTimingInfo* timing_info)
  * Note we use the set of pins reported by the *timing_info* as having modified
  * setup slacks, rather than those marked as modified by the timing analyzer.
  */
-void PlacerSetupSlacks::incr_update_setup_slacks(const SetupTimingInfo* timing_info) {
+void PlacerSetupSlacks::incr_update_setup_slacks() {
     cluster_pins_with_modified_setup_slack_.clear();
 
-    for (AtomPinId atom_pin : timing_info->pins_with_modified_setup_slack()) {
+    for (AtomPinId atom_pin : timing_info_->pins_with_modified_setup_slack()) {
         ClusterPinId clb_pin = pin_lookup_.connected_clb_pin(atom_pin);
 
         //Some atom pins correspond to connections which are completely

vpr/src/place/timing_place.h

@@ -101,7 +101,9 @@ class PlacerCriticalities {
     typedef vtr::Range<net_iterator> net_range;
 
   public: //Lifetime
-    PlacerCriticalities(const ClusteredNetlist& clb_nlist, const ClusteredPinAtomPinsLookup& netlist_pin_lookup);
+    PlacerCriticalities(const ClusteredNetlist& clb_nlist,
+                        const ClusteredPinAtomPinsLookup& netlist_pin_lookup,
+                        std::shared_ptr<const SetupTimingInfo> timing_info);
     PlacerCriticalities(const PlacerCriticalities&) = delete;
     PlacerCriticalities& operator=(const PlacerCriticalities&) = delete;
 
@@ -125,8 +127,7 @@ class PlacerCriticalities {
      * If out of sync, then the criticalities cannot be incrementally updated on
      * during the next timing analysis iteration.
      */
-    void update_criticalities(const SetupTimingInfo* timing_info,
-                              const PlaceCritParams& crit_params,
+    void update_criticalities(const PlaceCritParams& crit_params,
                               PlacerState& placer_state);
 
     ///@bried Enable the recompute_required flag to enforce from scratch update.
@@ -151,6 +152,9 @@ class PlacerCriticalities {
     ///@brief The lookup table that maps atom pins to clb pins.
     const ClusteredPinAtomPinsLookup& pin_lookup_;
 
+    ///@brief A pointer to the setup timing analyzer
+    std::shared_ptr<const SetupTimingInfo> timing_info_;
+
     /**
      * @brief The matrix that stores criticality value for each connection.
      *
@@ -168,7 +172,7 @@ class PlacerCriticalities {
     vtr::vec_id_set<ClusterPinId> cluster_pins_with_modified_criticality_;
 
     ///@brief Incremental update. See timing_place.cpp for more.
-    void incr_update_criticalities(const SetupTimingInfo* timing_info);
+    void incr_update_criticalities();
 
     ///@brief Flag that turns on/off the update_criticalities() routine.
     bool update_enabled = true;
@@ -215,7 +219,9 @@ class PlacerSetupSlacks {
     typedef vtr::Range<net_iterator> net_range;
 
   public: //Lifetime
-    PlacerSetupSlacks(const ClusteredNetlist& clb_nlist, const ClusteredPinAtomPinsLookup& netlist_pin_lookup);
+    PlacerSetupSlacks(const ClusteredNetlist& clb_nlist,
+                      const ClusteredPinAtomPinsLookup& netlist_pin_lookup,
+                      std::shared_ptr<const SetupTimingInfo> timing_info);
     PlacerSetupSlacks(const PlacerSetupSlacks& clb_nlist) = delete;
     PlacerSetupSlacks& operator=(const PlacerSetupSlacks& clb_nlist) = delete;
 
@@ -232,14 +238,14 @@ class PlacerSetupSlacks {
   public: //Modifiers
     /**
      * @brief Updates setup slacks based on the atom netlist setup slacks provided
-     *        by timing_info.
+     *        by timing_info_.
      *
      * Should consistently call this method after the most recent timing analysis to
      * keep the setup slacks stored in this class in sync with the timing analyzer.
      * If out of sync, then the setup slacks cannot be incrementally updated on
      * during the next timing analysis iteration.
      */
-    void update_setup_slacks(const SetupTimingInfo* timing_info);
+    void update_setup_slacks();
 
     ///@bried Enable the recompute_required flag to enforce from scratch update.
     void set_recompute_required() { recompute_required = true; }
@@ -256,6 +262,7 @@ class PlacerSetupSlacks {
   private: //Data
     const ClusteredNetlist& clb_nlist_;
     const ClusteredPinAtomPinsLookup& pin_lookup_;
+    std::shared_ptr<const SetupTimingInfo> timing_info_;
 
     /**
      * @brief The matrix that stores raw setup slack values for each connection.
@@ -268,7 +275,7 @@ class PlacerSetupSlacks {
     vtr::vec_id_set<ClusterPinId> cluster_pins_with_modified_setup_slack_;
 
     ///@brief Incremental update. See timing_place.cpp for more.
-    void incr_update_setup_slacks(const SetupTimingInfo* timing_info);
+    void incr_update_setup_slacks();
 
     ///@brief Incremental update. See timing_place.cpp for more.
     void recompute_setup_slacks();

vpr/src/route/route.cpp

@@ -202,7 +202,7 @@ bool route(const Netlist<>& net_list,
         netlist_pin_lookup,
         atom_ctx.nlist,
         atom_ctx.lookup,
-        *timing_info->timing_graph(),
+        timing_info,
         is_flat);
 
     std::unique_ptr<NetlistRouter> netlist_router = make_netlist_router(

vpr/src/route/route_net.h

@@ -93,7 +93,7 @@ inline void update_net_delay_from_isink(float* net_delay,
         //Delay changed, invalidate for incremental timing update
         VTR_ASSERT_SAFE(timing_info);
         ParentPinId pin = net_list.net_pin(inet, isink);
-        pin_timing_invalidator->invalidate_connection(pin, timing_info);
+        pin_timing_invalidator->invalidate_connection(pin);
     }
 
     net_delay[isink] = new_delay;