add forward decls and include needed header files in read_place.h

Author: soheilshahrouz

vpr/src/base/read_place.cpp

@@ -1,9 +1,7 @@
 #include <cstdio>
 #include <cstring>
 #include <fstream>
-#include <algorithm>
 
-#include "vtr_assert.h"
 #include "vtr_util.h"
 #include "vtr_log.h"
 #include "vtr_digest.h"
@@ -16,7 +14,6 @@
 #include "read_place.h"
 #include "read_xml_arch_file.h"
 #include "place_util.h"
-#include "placer_context.h"
 
 static void read_place_header(std::ifstream& placement_file,
                               const char* net_file,

vpr/src/base/read_place.h

@@ -1,7 +1,14 @@
 #ifndef READ_PLACE_H
 #define READ_PLACE_H
 
+#include "vtr_vector_map.h"
+
+#include <string>
+
+
 class PlacerContext;
+class ClusterBlockId;
+struct t_block_loc;
 
 /**
  * This function is for reading a place file when placement is skipped.

vpr/src/draw/draw.cpp

@@ -570,7 +570,7 @@ void free_draw_structs() {
 #endif /* NO_GRAPHICS */
 }
 
-void place_loc_vars(float width_val, const PlaceLocVars& place_loc_vars) {
+void init_draw_coords(float width_val, const PlaceLocVars& place_loc_vars) {
 #ifndef NO_GRAPHICS
     /* Load the arrays containing the left and bottom coordinates of the clbs   *
      * forming the FPGA.  tile_width_val sets the width and height of a drawn    *

vpr/src/place/initial_noc_placement.cpp

@@ -31,6 +31,8 @@ static bool accept_noc_swap(double delta_cost, double prob);
  * @brief Places a constrained NoC router within its partition region.
  *
  *   @param router_blk_id NoC router cluster block ID
+ *   @param place_loc_vars Placement block location information. To be
+ *   filled with the location where pl_macro is placed.
  */
 static void place_constrained_noc_router(ClusterBlockId router_blk_id,
                                          PlaceLocVars& place_loc_vars);
@@ -41,6 +43,8 @@ static void place_constrained_noc_router(ClusterBlockId router_blk_id,
  *   @param unfixed_routers Contains the cluster block ID for all unconstrained
  *   NoC routers.
  *   @param seed Used for shuffling NoC routers.
+ *   @param place_loc_vars Placement block location information. To be filled
+ *   with the location where pl_macro is placed.
  */
 static void place_noc_routers_randomly(std::vector<ClusterBlockId>& unfixed_routers,
                                        int seed,
@@ -50,6 +54,8 @@ static void place_noc_routers_randomly(std::vector<ClusterBlockId>& unfixed_rout
  * @brief Runs a simulated annealing optimizer for NoC routers.
  *
  *   @param noc_opts Contains weighting factors for NoC cost terms.
+ *   @param place_loc_vars Placement block location information.
+ *   To be filled with the location where pl_macro is placed.
  */
 static void noc_routers_anneal(const t_noc_opts& noc_opts,
                                PlaceLocVars& place_loc_vars);

vpr/src/place/initial_noc_placment.h

@@ -10,6 +10,9 @@
  * to minimize NoC costs.
  *
  *   @param noc_opts NoC-related options. Used to calculate NoC-related costs.
+ *   @param placer_opts Contain the placement algorithm options including the seed.
+ *   @param place_loc_vars Placement block location information. To be filled
+ *   with the location  where pl_macro is placed.
  */
 void initial_noc_placement(const t_noc_opts& noc_opts,
                            const t_placer_opts& placer_opts,

vpr/src/place/place_util.h

@@ -14,11 +14,12 @@
 #include "vtr_vector_map.h"
 #include "globals.h"
 
-#include "placer_context.h"
+
 
 // forward declaration of t_placer_costs so that it can be used an argument
 // in NocCostTerms constructor
 class t_placer_costs;
+class PlaceLocVars;
 
 /**
  * @brief Data structure that stores different cost terms for NoC placement.