Re-commit changes

Author: amirarjmand93

doc/src/api/vprinternals/vpr_router.rst

@@ -7,5 +7,9 @@ VPR Router
 .. toctree::
    :maxdepth: 1
 
+<<<<<<< HEAD
    router_heap
    router_lookahead
+=======
+   router_heap
+>>>>>>> a0e4a8d19 (Re-commit changes)

libs/libvtrutil/src/vtr_geometry.h

@@ -92,6 +92,7 @@ class Point {
     ///@brief Swap x and y values
     void swap();
 
+<<<<<<< HEAD
     /// @brief + operator
     Point<T> operator+(const Point<T>& rhs);
 
@@ -103,12 +104,20 @@ class Point {
 
     /// @brief -= operator
     Point<T>& operator-=(const Point<T>& rhs);
+=======
+    /// @brief += operator
+    Point<T>& operator+= (const Point<T>& rhs);
+
+    /// @brief += operator
+    Point<T>& operator-= (const Point<T>& rhs);
+>>>>>>> a0e4a8d19 (Re-commit changes)
 
   private:
     T x_;
     T y_;
 };
 
+
 /**
  * @brief A 2D rectangle
  *
@@ -208,11 +217,19 @@ class Rect {
     ///@brief set ymax to a point
     void set_ymax(T ymax_val);
 
+<<<<<<< HEAD
     /// @brief += operator; translates all corners of the rectangle by rhs
     Rect<T>& operator+=(const Point<T>& rhs);
 
     /// @brief -= operator; translates all corners of the rectangle by -rhs
     Rect<T>& operator-=(const Point<T>& rhs);
+=======
+    /// @brief += operator
+    Rect<T>& operator+= (const Point<T>& rhs);
+
+    /// @brief -= operator
+    Rect<T>& operator-= (const Point<T>& rhs);
+>>>>>>> a0e4a8d19 (Re-commit changes)
 
     ///@brief Equivalent to `*this = bounding_box(*this, other)`
     Rect<T>& expand_bounding_box(const Rect<T>& other);

libs/libvtrutil/src/vtr_geometry.tpp

@@ -59,6 +59,7 @@ void Point<T>::swap() {
 }
 
 template<class T>
+<<<<<<< HEAD
 Point<T> Point<T>::operator+(const Point<T>& rhs) {
     return {x_ + rhs.x_, y_ + rhs.y_};
 }
@@ -69,6 +70,8 @@ Point<T> Point<T>::operator-(const Point<T>& rhs) {
 }
 
 template<class T>
+=======
+>>>>>>> a0e4a8d19 (Re-commit changes)
 Point<T>& Point<T>::operator+=(const Point<T>& rhs) {
     x_ += rhs.x_;
     y_ += rhs.y_;

vpr/src/base/ShowSetup.cpp

@@ -382,7 +382,10 @@ static void ShowRouterOpts(const t_router_opts& RouterOpts) {
 
     if (TIMING_DRIVEN == RouterOpts.router_algorithm) {
         VTR_LOG("RouterOpts.astar_fac: %f\n", RouterOpts.astar_fac);
+<<<<<<< HEAD
         VTR_LOG("RouterOpts.astar_offset: %f\n", RouterOpts.astar_offset);
+=======
+>>>>>>> a0e4a8d19 (Re-commit changes)
         VTR_LOG("RouterOpts.router_profiler_astar_fac: %f\n", RouterOpts.router_profiler_astar_fac);
         VTR_LOG("RouterOpts.criticality_exp: %f\n", RouterOpts.criticality_exp);
         VTR_LOG("RouterOpts.max_criticality: %f\n", RouterOpts.max_criticality);

vpr/src/place/move_transactions.cpp

@@ -161,6 +161,11 @@ void t_pl_blocks_to_be_moved::clear_move_blocks() {
 
     //For run-time, we just reset size of blocks_affected.moved_blocks to zero, but do not free the blocks_affected
     //array to avoid memory allocation
+<<<<<<< HEAD
+=======
+
+    blocks_affected.num_moved_blocks = 0;
+>>>>>>> a0e4a8d19 (Re-commit changes)
 
     moved_blocks.resize(0);
 

vpr/src/place/move_transactions.h

@@ -3,6 +3,51 @@
 #include "vpr_types.h"
 #include "clustered_netlist_utils.h"
 
+<<<<<<< HEAD
+=======
+/* Stores the information of the move for a block that is       *
+ * moved during placement                                       *
+ * block_num: the index of the moved block                      *
+ * old_loc: the location the block is moved from                *
+ * new_loc: the location the block is moved to                  */
+struct t_pl_moved_block {
+    t_pl_moved_block() = default;
+    t_pl_moved_block(ClusterBlockId block_num_, const t_pl_loc& old_loc_, const t_pl_loc& new_loc_)
+        : block_num(block_num_)
+        , old_loc(old_loc_)
+        , new_loc(new_loc_) {}
+    ClusterBlockId block_num;
+    t_pl_loc old_loc;
+    t_pl_loc new_loc;
+};
+
+/* Stores the list of cluster blocks to be moved in a swap during       *
+ * placement.                                                   *
+ * Store the information on the blocks to be moved in a swap during     *
+ * placement, in the form of array of structs instead of struct with    *
+ * arrays for cache effifiency                                          *
+ *
+ * num_moved_blocks: total number of blocks moved when          *
+ *                   swapping two blocks.                       *
+ * moved blocks: a list of moved blocks data structure with     *
+ *               information on the move.                       *
+ *               [0...max_blocks-1]                       *
+ * affected_pins: pins affected by this move (used to           *
+ *                incrementally invalidate parts of the timing  *
+ *                graph.                                        */
+struct t_pl_blocks_to_be_moved {
+    explicit t_pl_blocks_to_be_moved(size_t max_blocks)
+        : moved_blocks(max_blocks) {}
+
+    int num_moved_blocks = 0;
+    std::vector<t_pl_moved_block> moved_blocks;
+    std::unordered_set<t_pl_loc> moved_from;
+    std::unordered_set<t_pl_loc> moved_to;
+
+    std::vector<ClusterPinId> affected_pins;
+};
+
+>>>>>>> a0e4a8d19 (Re-commit changes)
 enum class e_block_move_result {
     VALID,       //Move successful
     ABORT,       //Unable to perform move

vpr/src/place/move_utils.cpp

@@ -484,6 +484,30 @@ bool is_legal_swap_to_location(ClusterBlockId blk, t_pl_loc to) {
     return true;
 }
 
+<<<<<<< HEAD
+=======
+//Examines the currently proposed move and determine any empty locations
+std::set<t_pl_loc> determine_locations_emptied_by_move(t_pl_blocks_to_be_moved& blocks_affected) {
+    std::set<t_pl_loc> moved_from;
+    std::set<t_pl_loc> moved_to;
+
+    for (int iblk = 0; iblk < blocks_affected.num_moved_blocks; ++iblk) {
+        //When a block is moved its old location becomes free
+        moved_from.emplace(blocks_affected.moved_blocks[iblk].old_loc);
+
+        //But any block later moved to a position fills it
+        moved_to.emplace(blocks_affected.moved_blocks[iblk].new_loc);
+    }
+
+    std::set<t_pl_loc> empty_locs;
+    std::set_difference(moved_from.begin(), moved_from.end(),
+                        moved_to.begin(), moved_to.end(),
+                        std::inserter(empty_locs, empty_locs.begin()));
+
+    return empty_locs;
+}
+
+>>>>>>> a0e4a8d19 (Re-commit changes)
 #ifdef VTR_ENABLE_DEBUG_LOGGING
 void enable_placer_debug(const t_placer_opts& placer_opts,
                          ClusterBlockId blk_id) {