Merge pull request #3280 from verilog-to-routing/remove_vtr_string_view

Remove vtr::string_view

Author: soheilshahrouz

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

libs/libarchfpga/src/grid_types.h

@@ -131,4 +131,4 @@ struct t_grid_loc_def {
 enum class e_grid_def_type {
     AUTO,
     FIXED
-};
+};

libs/libarchfpga/src/interposer_types.h

@@ -33,8 +33,8 @@ inline const std::unordered_map<char, e_interposer_cut_dim> CHAR_INTERPOSER_DIM_
  * 
  */
 struct t_interdie_wire_inf {
-    std::string sg_name;  ///< Name of the scatter-gather pattern to be used for the interdie connection
-    std::string sg_link;  ///< Name of the scatter-gather link to be used for the interdie connection
+    std::string sg_name; ///< Name of the scatter-gather pattern to be used for the interdie connection
+    std::string sg_link; ///< Name of the scatter-gather link to be used for the interdie connection
     /**
      * @brief 
      * Contains starting and ending point (both inclusive) of scatter-gather instantiations and the increment/distance between the instantiations.
@@ -43,7 +43,7 @@ struct t_interdie_wire_inf {
      * Locations defined by this offset definition define the starting point or the gathering point of the SG pattern. The end or scatter point of the SG pattern is defined by the sg_link.
      */
     t_grid_loc_spec offset_definition;
-    int num;              ///< Number of scatter-gather instantiations per switchblock location
+    int num; ///< Number of scatter-gather instantiations per switchblock location
 };
 
 /**

libs/libarchfpga/src/read_fpga_interchange_arch.cpp

@@ -285,7 +285,7 @@ struct ArchReader {
         set_arch_file_name(arch_file);
 
         for (std::string str : ar_.getStrList()) {
-            auto interned_string = arch_->strings.intern_string(vtr::string_view(str.c_str()));
+            auto interned_string = arch_->strings.intern_string(str);
             arch_->interned_strings.push_back(interned_string);
         }
     }

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -2659,7 +2659,7 @@ static void process_block_type_locs(t_grid_def& grid_def,
             }
 
             t_interposer_cut_inf interposer_cut = parse_interposer_cut_tag(loc_spec_tag, loc_data);
-            
+
             if ((interposer_cut.dim == e_interposer_cut_dim::X && interposer_cut.loc >= grid_def.height) || (interposer_cut.dim == e_interposer_cut_dim::Y && interposer_cut.loc >= grid_def.width)) {
                 archfpga_throw(loc_data.filename_c_str(), loc_data.line(loc_spec_tag), "Interposer cut dimensions are outside of device bounds");
             }

libs/libarchfpga/src/read_xml_arch_file_interposer.cpp

@@ -36,7 +36,7 @@ t_interposer_cut_inf parse_interposer_cut_tag(pugi::xml_node interposer_cut_tag,
         interdie_wire.offset_definition.start_expr = pugiutil::get_attribute(interdie_wire_tag, "offset_start", loc_data).as_string();
         interdie_wire.offset_definition.end_expr = pugiutil::get_attribute(interdie_wire_tag, "offset_end", loc_data).as_string();
         interdie_wire.offset_definition.incr_expr = pugiutil::get_attribute(interdie_wire_tag, "offset_increment", loc_data).as_string();
-        
+
         interdie_wire.num = pugiutil::get_attribute(interdie_wire_tag, "num", loc_data).as_int();
 
         interposer.interdie_wires.push_back(interdie_wire);

libs/libarchfpga/src/read_xml_util.cpp

@@ -174,8 +174,8 @@ t_metadata_dict process_meta_data(vtr::string_internment& strings,
             std::string key = get_attribute(meta_tag, "name", loc_data).as_string();
 
             std::string value = meta_tag.child_value();
-            data.add(strings.intern_string(vtr::string_view(key.c_str())),
-                     strings.intern_string(vtr::string_view(value.c_str())));
+            data.add(strings.intern_string(key),
+                     strings.intern_string(value));
             meta_tag = meta_tag.next_sibling(meta_tag.name());
         }
     }

libs/librrgraph/src/base/rr_metadata.cpp

@@ -16,7 +16,7 @@ void add_rr_node_metadata(MetadataStorage<int>& rr_node_metadata, int src_node,
                                   value);
 }
 
-void add_rr_node_metadata(MetadataStorage<int>& rr_node_metadata, int src_node, vtr::string_view key, vtr::string_view value, const t_arch* arch) {
+void add_rr_node_metadata(MetadataStorage<int>& rr_node_metadata, int src_node, std::string_view key, std::string_view value, const t_arch* arch) {
     rr_node_metadata.add_metadata(src_node,
                                   arch->strings.intern_string(key),
                                   arch->strings.intern_string(value));
@@ -33,7 +33,7 @@ const t_metadata_value* rr_edge_metadata(const RRGraphBuilder& rr_graph_builder,
     return iter->second.one(key);
 }
 
-void add_rr_edge_metadata(MetadataStorage<std::tuple<int, int, short>>& rr_edge_metadata, int src_node, int sink_id, short switch_id, vtr::string_view key, vtr::string_view value, const t_arch* arch) {
+void add_rr_edge_metadata(MetadataStorage<std::tuple<int, int, short>>& rr_edge_metadata, int src_node, int sink_id, short switch_id, std::string_view key, std::string_view value, const t_arch* arch) {
     auto rr_edge = std::make_tuple(src_node, sink_id, switch_id);
     rr_edge_metadata.add_metadata(rr_edge,
                                   arch->strings.intern_string(key),

libs/librrgraph/src/base/rr_metadata.h

@@ -7,10 +7,10 @@ namespace vpr {
 
 const t_metadata_value* rr_node_metadata(const RRGraphBuilder& rr_graph_builder, int src_node, vtr::interned_string key);
 void add_rr_node_metadata(MetadataStorage<int>& rr_node_metadata, int src_node, vtr::interned_string key, vtr::interned_string value);
-void add_rr_node_metadata(MetadataStorage<int>& rr_node_metadata, int src_node, vtr::string_view key, vtr::string_view value, const t_arch* arch);
+void add_rr_node_metadata(MetadataStorage<int>& rr_node_metadata, int src_node, std::string_view key, std::string_view value, const t_arch* arch);
 
 const t_metadata_value* rr_edge_metadata(const RRGraphBuilder& rr_graph_builder, int src_node, int sink_node, short switch_id, vtr::interned_string key);
 void add_rr_edge_metadata(MetadataStorage<std::tuple<int, int, short>>& rr_edge_metadata, int src_node, int sink_node, short switch_id, vtr::interned_string key, vtr::interned_string value);
-void add_rr_edge_metadata(MetadataStorage<std::tuple<int, int, short>>& rr_edge_metadata, int src_node, int sink_node, short switch_id, vtr::string_view key, vtr::string_view value, const t_arch* arch);
+void add_rr_edge_metadata(MetadataStorage<std::tuple<int, int, short>>& rr_edge_metadata, int src_node, int sink_node, short switch_id, std::string_view key, std::string_view value, const t_arch* arch);
 
 } // namespace vpr

libs/librrgraph/src/io/rr_graph_uxsdcxx_serializer.h

@@ -55,12 +55,12 @@ class MetadataBind {
 
     void set_name(const char* name) {
         if (!ignore_) {
-            name_ = strings_->intern_string(vtr::string_view(name));
+            name_ = strings_->intern_string(name);
         }
     }
     void set_value(const char* value) {
         if (!ignore_) {
-            value_ = strings_->intern_string(vtr::string_view(value));
+            value_ = strings_->intern_string(value);
         }
     }
     void set_node_target(int inode) {
@@ -321,7 +321,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
         , rr_node_metadata_(rr_node_metadata)
         , rr_edge_metadata_(rr_edge_metadata)
         , strings_(strings)
-        , empty_(strings_->intern_string(vtr::string_view("")))
+        , empty_(strings_->intern_string(""))
         , report_error_(nullptr)
         , is_flat_(is_flat) {
         // Initialize internal data