Merge pull request #3144 from verilog-to-routing/strongid_decl_style

Move StrongID tag struct declarations into StrongID template argument

Author: AlexandreSinger

libs/libarchfpga/src/logic_types.h

@@ -62,10 +62,8 @@ struct t_model {
     bool never_prune = false;               ///< Don't remove from the netlist even if a block of this type has no output ports used and, therefore, unconnected to the rest of the netlist
 };
 
-// Tag for the logical model ID
-struct logical_model_id_tag;
 // A unique ID that represents a logical model in the architecture.
-typedef vtr::StrongId<logical_model_id_tag, size_t> LogicalModelId;
+typedef vtr::StrongId<struct logical_model_id_tag, size_t> LogicalModelId;
 
 /**
  * @brief A storage class containing all of the logical models in an FPGA

libs/librrgraph/src/base/rr_graph_fwd.h

@@ -15,16 +15,9 @@ class t_rr_graph_storage;
 
 class RRGraph;
 
-struct rr_node_id_tag;
-struct rr_edge_id_tag;
-struct rr_indexed_data_id_tag;
-struct rr_switch_id_tag;
-struct rr_segment_id_tag;
-struct rc_index_tag;
-
-typedef vtr::StrongId<rr_node_id_tag, uint32_t> RRNodeId;
-typedef vtr::StrongId<rr_edge_id_tag, uint32_t> RREdgeId;
-typedef vtr::StrongId<rr_indexed_data_id_tag, uint32_t> RRIndexedDataId;
-typedef vtr::StrongId<rr_switch_id_tag, uint16_t> RRSwitchId;
-typedef vtr::StrongId<rr_segment_id_tag, uint16_t> RRSegmentId;
-typedef vtr::StrongId<rc_index_tag, uint16_t> NodeRCIndex;
+typedef vtr::StrongId<struct rr_node_id_tag, uint32_t> RRNodeId;
+typedef vtr::StrongId<struct rr_edge_id_tag, uint32_t> RREdgeId;
+typedef vtr::StrongId<struct rr_indexed_data_id_tag, uint32_t> RRIndexedDataId;
+typedef vtr::StrongId<struct rr_switch_id_tag, uint16_t> RRSwitchId;
+typedef vtr::StrongId<struct rr_segment_id_tag, uint16_t> RRSegmentId;
+typedef vtr::StrongId<struct rc_index_tag, uint16_t> NodeRCIndex;

libs/libvtrutil/test/test_vector.cpp

@@ -5,8 +5,7 @@
 
 #include <ostream>
 
-struct test_tag;
-typedef vtr::StrongId<test_tag> TestId;
+typedef vtr::StrongId<struct test_tag> TestId;
 
 std::ostream& operator<<(std::ostream& os, const TestId id);
 

vpr/src/analytical_place/analytical_solver.h

@@ -39,8 +39,7 @@ class PreClusterTimingManager;
  * This gives a linearized ID for each of the moveable blocks from 0 to the
  * number of moveable blocks.
  */
-struct ap_row_id_tag {};
-typedef vtr::StrongId<ap_row_id_tag, size_t> APRowId;
+typedef vtr::StrongId<struct ap_row_id_tag, size_t> APRowId;
 
 /**
  * @brief The Analytical Solver base class

vpr/src/analytical_place/flat_placement_bins.h

@@ -19,13 +19,10 @@
 #include "vtr_vector.h"
 #include "vtr_vector_map.h"
 
-// The tag for the flat placement bin.
-struct flat_placement_bin_tag {};
-
 /**
  * @brief A unique ID to a flat placement bin.
  */
-typedef vtr::StrongId<flat_placement_bin_tag, size_t> FlatPlacementBinId;
+typedef vtr::StrongId<struct flat_placement_bin_tag, size_t> FlatPlacementBinId;
 
 /**
  * @brief A container of bins which hold AP blocks and take up space on the FPGA.

vpr/src/analytical_place/full_legalizer.cpp

@@ -98,8 +98,7 @@ namespace {
 /// This is used for putting the molecules in bins for packing.
 // FIXME: Bring this into the device_grid.
 //  - Maybe this can be called DeviceRootTileId or something.
-struct device_tile_id_tag {};
-typedef vtr::StrongId<device_tile_id_tag, size_t> DeviceTileId;
+typedef vtr::StrongId<struct device_tile_id_tag, size_t> DeviceTileId;
 
 /**
  * @brief Helper class to place cluster in the AP context.

vpr/src/analytical_place/model_grouper.h

@@ -18,11 +18,8 @@
 // Forward declarations.
 class Prepacker;
 
-/// @brief Tag for the ModelGroupId
-struct model_group_id_tag;
-
 /// @brief A unique ID of a group of models created by the ModelGrouper class.
-typedef vtr::StrongId<model_group_id_tag, size_t> ModelGroupId;
+typedef vtr::StrongId<struct model_group_id_tag, size_t> ModelGroupId;
 
 /**
  * @brief A manager class for grouping together models that must be legalized

vpr/src/analytical_place/partial_legalizer.h

@@ -340,11 +340,8 @@ class PerPrimitiveDimPrefixSum2D {
     vtr::vector<PrimitiveVectorDim, vtr::PrefixSum2D<float>> dim_prefix_sum_;
 };
 
-/// @brief Tag for the PrimitiveGroupId
-struct primitive_group_id_tag;
-
 /// @brief A unique ID of a group of primitive dims created by the PrimitiveDimGrouper class.
-typedef vtr::StrongId<primitive_group_id_tag, size_t> PrimitiveGroupId;
+typedef vtr::StrongId<struct primitive_group_id_tag, size_t> PrimitiveGroupId;
 
 /**
  * @brief A manager class for grouping together dimensions of the primitive

vpr/src/analytical_place/primitive_vector_fwd.h

@@ -9,11 +9,8 @@
 #include <cstddef>
 #include "vtr_strong_id.h"
 
-/// @brief Tag for the PrimitiveVectorDim
-struct primitive_vector_dim_tag;
-
 /// @brief A unique dimension in the PrimtiveVector class.
-typedef vtr::StrongId<primitive_vector_dim_tag, size_t> PrimitiveVectorDim;
+typedef vtr::StrongId<struct primitive_vector_dim_tag, size_t> PrimitiveVectorDim;
 
 // Forward declaration of the Primitive Vector class.
 class PrimitiveVector;

vpr/src/base/netlist.h

@@ -939,10 +939,8 @@ class Netlist {
     NetId add_net(const std::string name, PinId driver, std::vector<PinId> sinks);
 
   protected: //Protected Base Types
-    struct string_id_tag;
-
     ///@brief A unique identifier for a string in the netlist
-    typedef vtr::StrongId<string_id_tag> StringId;
+    typedef vtr::StrongId<struct string_id_tag> StringId;
 
   protected: //Protected Base Members
     /*

vpr/src/base/netlist_fwd.h

@@ -15,16 +15,16 @@ struct general_pin_id_tag {};
 struct general_net_id_tag {};
 
 //A unique identifier for a block/primitive in the atom netlist
-typedef vtr::StrongId<general_blk_id_tag> ParentBlockId;
+typedef vtr::StrongId<struct general_blk_id_tag> ParentBlockId;
 
 //A unique identifier for a net in the atom netlist
-typedef vtr::StrongId<general_port_id_tag> ParentPortId;
+typedef vtr::StrongId<struct general_port_id_tag> ParentPortId;
 
 //A unique identifier for a port in the atom netlist
-typedef vtr::StrongId<general_pin_id_tag> ParentPinId;
+typedef vtr::StrongId<struct general_pin_id_tag> ParentPinId;
 
 //A unique identifier for a pin in the atom netlist
-typedef vtr::StrongId<general_net_id_tag> ParentNetId;
+typedef vtr::StrongId<struct general_net_id_tag> ParentNetId;
 
 template<typename BlockId, typename PortId, typename PinId, typename NetId>
 class Netlist;

vpr/src/base/partition.h

@@ -15,11 +15,8 @@
  * with L, T or other shapes can be created with a union of multiple rectangles.
  */
 
-/// @brief Type tag for PartitionId
-struct partition_id_tag;
-
 /// @brief A unique identifier for a partition
-typedef vtr::StrongId<partition_id_tag> PartitionId;
+typedef vtr::StrongId<struct partition_id_tag> PartitionId;
 
 class Partition {
   public:

vpr/src/noc/noc_data_types.h

@@ -8,20 +8,16 @@
 #include "vtr_strong_id.h"
 
 // data types used to index the routers and links within the noc
-struct noc_router_id_tag;
-struct noc_link_id_tag;
 
 /** Datatype to index routers within the NoC */
-typedef vtr::StrongId<noc_router_id_tag, int> NocRouterId;
+typedef vtr::StrongId<struct noc_router_id_tag, int> NocRouterId;
 /** Datatype to index links within the NoC */
-typedef vtr::StrongId<noc_link_id_tag, int> NocLinkId;
+typedef vtr::StrongId<struct noc_link_id_tag, int> NocLinkId;
 
 // data type to index traffic flows within the noc
-struct noc_traffic_flow_id_tag;
 
 /** Datatype to index traffic flows within the application */
-typedef vtr::StrongId<noc_traffic_flow_id_tag, int> NocTrafficFlowId;
+typedef vtr::StrongId<struct noc_traffic_flow_id_tag, int> NocTrafficFlowId;
 
 /** Data type to index NoC groups. */
-struct noc_group_id_tag;
-typedef vtr::StrongId<noc_group_id_tag, int> NocGroupId;
+typedef vtr::StrongId<struct noc_group_id_tag, int> NocGroupId;

vpr/src/pack/cluster_legalizer.h

@@ -34,8 +34,7 @@ struct t_lb_router_data;
 // A special ID to identify the legalization clusters. This is separate from the
 // ClusterBlockId since this legalizer is not necessarily tied to the Clustered
 // netlist, but is used as a sub-routine to it.
-struct legalization_cluster_id_tag;
-typedef vtr::StrongId<legalization_cluster_id_tag, size_t> LegalizationClusterId;
+typedef vtr::StrongId<struct legalization_cluster_id_tag, size_t> LegalizationClusterId;
 
 /**
  * @brief Holds information to be shared between molecules that represent the

vpr/src/pack/prepack.h

@@ -23,12 +23,10 @@ class LogicalModels;
 struct t_logical_block_type;
 
 // A unique ID used to identify a molecule generated by the prepacker.
-struct pack_molecule_id_tag;
-typedef vtr::StrongId<pack_molecule_id_tag, size_t> PackMoleculeId;
+typedef vtr::StrongId<struct pack_molecule_id_tag, size_t> PackMoleculeId;
 
 // A unique ID used to identify a chain of molecules generated by the prepacker.
-struct molecule_chain_id_tag;
-typedef vtr::StrongId<molecule_chain_id_tag, size_t> MoleculeChainId;
+typedef vtr::StrongId<struct molecule_chain_id_tag, size_t> MoleculeChainId;
 
 /**
  * @brief Holds general information to be shared between molecules that