Merge branch 'master' into manual_moves_fix

Author: haydar-c

doc/src/api/libarchfpga/grid_types.rst

@@ -0,0 +1,14 @@
+========
+Grid Specification Types
+========
+
+These types are used to capture user's intended grid specification, i.e., which tiles go where in the device. These specifications will be later turned into a flattened device grid according to the device's size.
+
+.. doxygenstruct:: t_grid_loc_spec
+   :project: vpr
+   :members:
+
+.. doxygenstruct:: t_grid_loc_def
+   :project: vpr
+   :members:
+   

doc/src/api/libarchfpga/index.rst

@@ -0,0 +1,12 @@
+.. _libarchfpga:
+
+LIBARCHFPGA
+=======
+
+.. toctree::
+   :maxdepth: 1
+
+   physical_types
+   grid_types
+   scatter_gather_types
+   interposer_types

doc/src/api/libarchfpga/interposer_types.rst

@@ -0,0 +1,13 @@
+========
+Interposer Types
+========
+
+These types are used to store information about interposer based architectures.
+
+.. doxygenstruct:: t_interposer_cut_inf
+   :project: vpr
+   :members:
+
+.. doxygenstruct:: t_interdie_wire_inf
+   :project: vpr
+   :members:

doc/src/api/libarchfpga/physical_types.rst

@@ -0,0 +1,33 @@
+========
+Physical Types
+========
+
+These types are used to capture user's intended architecture specification.
+
+.. doxygenstruct:: t_arch
+   :project: vpr
+   :members:
+
+.. doxygenstruct:: t_arch_switch_inf
+   :project: vpr
+   :members:
+
+.. doxygenstruct:: t_segment_inf
+   :project: vpr
+   :members:
+
+.. doxygenstruct:: t_physical_tile_loc
+   :project: vpr
+   :members:
+
+.. doxygenstruct:: t_sub_tile
+   :project: vpr
+   :members:
+
+.. doxygenstruct:: t_layer_def
+   :project: vpr
+   :members:
+
+.. doxygenstruct:: t_grid_def
+   :project: vpr
+   :members:

doc/src/api/libarchfpga/scatter_gather_types.rst

@@ -0,0 +1,17 @@
+========
+Scatter-Gather Types
+========
+
+These types store information about about scatter-gather routing patterns
+
+.. doxygenstruct:: t_scatter_gather_pattern
+   :project: vpr
+   :members:
+
+.. doxygenstruct:: t_sg_link
+   :project: vpr
+   :members:
+
+.. doxygenstruct:: t_sg_location
+   :project: vpr
+   :members:

doc/src/api/vtrutil/containers.rst

@@ -99,12 +99,6 @@ vtr_array_view
    :project: vtr
    :members:
 
-vtr_string_view
----------------
-.. doxygenclass:: vtr::string_view
-   :project: vtr
-   :members:
-
 vtr_cache
 ---------
 .. doxygenclass:: vtr::Cache

doc/src/arch/reference.rst

@@ -581,6 +581,32 @@ Grid Layout Example
 
     Example FPGA grid
 
+
+.. arch:tag:: <interposer_cut dim=x|y loc="int"/>
+
+    :req_param dim: Dimension or axis of the cut. 'X' or 'x' means a horizontal cut while 'Y' or 'y' means a vertical cut.
+    :req_param loc: Location of the cut. Cuts are done above or to the right of the tiles at coordinate 'loc'. For example a cut with dim=x and loc=0 would cut the vertical wires above tiles in the 0th row. Currently only integer values are supported.
+
+    .. note:: Interposers are experimental and are currently not supported by VPR and using the related tags will not actually result in any changes to the flow.
+    Defines an interposer cut for modelling 2.5D interposer-based architectures. An interposer cut will cut all connections at location 'loc' along the axis 'dim' Leaving the two sides completely unconnected.
+    To reconnect the two sides, this tag can have multiple <interdie_wire> tags as children to specify the connection between the two sides.
+
+.. arch:tag:: <interdie_wire sg_name="string" sg_link="string" offset_start="expr" offset_end="expr" offset_increment="expr" num="int"/>
+
+    :req_param sg_name: Name of the scatter-gather pattern to be used for the interdie connection.
+    :req_param sg_link: Name of the scatter-gather link to be used for the interdie connection.
+    :req_param offset_start: Starting point of scatter-gather instantiations.
+    :req_param offset_end: Ending point of scatter-gather instantiations
+    :req_param offset_increment: Increment/distance between scatter-gather instantiations.
+    :req_param num: Number of scatter-gather instantiations per switchblock location.
+
+    Defines the interdie wiring between the two sides of the cut. Connectivity is defined using scatter-gather patterns. Starting at 'offset_start' from location of the cut and moving by 'offset_increment' until we reach the location of 'offset_end' away from the cut, 'num' scatter-gather patterns defined by 'sg_name' and 'sg_link' will be instantiated.
+    Note that these offset points always define the starting point of the scatter-gather pattern's sg_link. offset_start, offset_end and offset_increment can be integer values or expressions involving W and H (device width and height.)
+
+    .. figure:: scatter_gather_images/interposer_diagram.png
+        
+        An example of how specifying interposers in VTR works. Connections between the two sides of a cut are first severed after which the two sides are reconnected using scatter_gather patterns. In this example the length of the sg_link wire used is 3. Note that there are 'num' of each pattern at each switchblock location.
+
 .. _arch_device_info:
 
 FPGA Device Information

doc/src/arch/scatter_gather_images/interposer_diagram.png

@@ -64,6 +64,7 @@ For more specific documentation about VPR see :ref:`vpr`.
    api/vtrutil/index
    api/ezgl/index
    api/vprinternals/index
+   api/libarchfpga/index
 
 Indices and tables
 ==================

doc/src/index.rst

@@ -101,10 +101,10 @@ void PrintArchInfo(FILE* Echo, const t_arch* arch) {
     //Layout
     fprintf(Echo, "*************************************************\n");
     for (const auto& grid_layout : arch->grid_layouts) {
-        if (grid_layout.grid_type == GridDefType::AUTO) {
+        if (grid_layout.grid_type == e_grid_def_type::AUTO) {
             fprintf(Echo, "Layout: '%s' Type: auto Aspect_Ratio: %f\n", grid_layout.name.c_str(), grid_layout.aspect_ratio);
         } else {
-            VTR_ASSERT(grid_layout.grid_type == GridDefType::FIXED);
+            VTR_ASSERT(grid_layout.grid_type == e_grid_def_type::FIXED);
             fprintf(Echo, "Layout: '%s' Type: fixed Width: %d Height %d\n", grid_layout.name.c_str(), grid_layout.width, grid_layout.height);
         }
     }