update SetupGrid.cpp:count_grid_tiles to count the tiles on all layers

Author: amin1377

libs/libarchfpga/src/device_grid.h

@@ -28,16 +28,16 @@ class DeviceGrid {
 
     const std::string& name() const { return name_; }
 
-    ///@brief Return the width of the grid at the specified layer
-    size_t width() const { return grid_.dim_size(1); }
-    ///@brief Return the height of the grid at the specified layer
-    size_t height() const { return grid_.dim_size(2); }
-
     ///@brief Return the number of layers(number of dies)
     inline int get_num_layers() const {
         return (int)grid_.dim_size(0);
     }
 
+    ///@brief Return the width of the grid at the specified layer
+    size_t width() const { return grid_.dim_size(1); }
+    ///@brief Return the height of the grid at the specified layer
+    size_t height() const { return grid_.dim_size(2); }
+
     ///@brief Given t_grid_tile, return the x coordinate of the tile on the given layer
     inline int get_grid_loc_x(const t_grid_tile*& grid_loc) const {
         int layer_num = std::floor(static_cast<int>(grid_loc - &grid_.get(0)) / (width() * height()));

vpr/src/base/SetupGrid.cpp

@@ -800,5 +800,5 @@ float calculate_device_utilization(const DeviceGrid& grid, std::map<t_logical_bl
 }
 
 size_t count_grid_tiles(const DeviceGrid& grid) {
-    return grid.width() * grid.height();
+    return grid.get_num_layers() * grid.width() * grid.height();
 }