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/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_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

libs/libvtrutil/src/vtr_expr_eval.cpp

@@ -318,7 +318,7 @@ static void get_formula_object(const char* ch, int& ichar, const t_formula_data&
             //A number
             fobj->type = E_FML_NUMBER;
             fobj->data.num = mydata.get_var_value(
-                vtr::string_view(
+                std::string_view(
                     var_name.data(),
                     var_name.size()));
         } else if (is_variable(var_name)) {

libs/libvtrutil/src/vtr_expr_eval.h

@@ -4,10 +4,10 @@
 #include <vector>
 #include <stack>
 #include <cstring>
+#include <string_view>
 
 #include "vtr_util.h"
 #include "vtr_error.h"
-#include "vtr_string_view.h"
 #include "vtr_flat_map.h"
 #include "../../../vpr/src/draw/breakpoint_state_globals.h"
 
@@ -44,18 +44,10 @@ class t_formula_data {
     }
 
     ///@brief set the value of a specific part of the formula
-    void set_var_value(vtr::string_view var, int value) { vars_[var] = value; }
-
-    ///@brief set the value of a specific part of the formula (the var can be c-style string)
-    void set_var_value(const char* var, int value) { vars_[vtr::string_view(var)] = value; }
-
-    ///@brief get the value of a specific part of the formula
-    int get_var_value(const std::string& var) const {
-        return get_var_value(vtr::string_view(var.data(), var.size()));
-    }
+    void set_var_value(std::string_view var, int value) { vars_[var] = value; }
 
     ///@brief get the value of a specific part of the formula (the var can be c-style string)
-    int get_var_value(vtr::string_view var) const {
+    int get_var_value(std::string_view var) const {
         auto iter = vars_.find(var);
         if (iter == vars_.end()) {
             std::string copy(var.data(), var.size());
@@ -66,7 +58,7 @@ class t_formula_data {
     }
 
   private:
-    vtr::flat_map<vtr::string_view, int> vars_;
+    vtr::flat_map<std::string_view, int> vars_;
 };
 
 /**** Enums ****/

libs/libvtrutil/src/vtr_string_interning.h

@@ -49,10 +49,11 @@
 #include <cstdint>
 #include <algorithm>
 #include <array>
+#include <string_view>
 
 #include "vtr_strong_id.h"
-#include "vtr_string_view.h"
 #include "vtr_vector.h"
+#include "vtr_hash.h"
 
 namespace vtr {
 
@@ -132,15 +133,15 @@ class interned_string_iterator {
         std::fill(parts_.begin(), parts_.end(), StringId());
         part_idx_ = size_t(-1);
         str_idx_ = size_t(-1);
-        view_ = vtr::string_view();
+        view_ = std::string_view();
     }
 
     const string_internment* internment_;
     size_t num_parts_;
     std::array<StringId, kMaxParts> parts_;
     size_t part_idx_;
     size_t str_idx_;
-    vtr::string_view view_;
+    std::string_view view_;
 };
 
 ///@brief == operator
@@ -346,7 +347,7 @@ class string_internment {
      * If interned_string is ever called with two strings of the same value,
      * the interned_string will be equal.
      */
-    interned_string intern_string(vtr::string_view view) {
+    interned_string intern_string(std::string_view view) {
         size_t num_parts = 1;
         for (const auto& c : view) {
             if (c == kSplitChar) {
@@ -381,12 +382,10 @@ class string_internment {
 
     /**
      * @brief Retrieve a string part based on id.
-     *
      * This method should not generally be called directly.
      */
-    vtr::string_view get_string(StringId id) const {
-        auto& str = strings_[id];
-        return vtr::string_view(str.data(), str.size());
+    std::string_view get_string(StringId id) const {
+        return strings_[id];
     }
 
     ///@brief Number of unique string parts stored.
@@ -395,7 +394,7 @@ class string_internment {
     }
 
   private:
-    StringId intern_one_string(vtr::string_view view) {
+    StringId intern_one_string(std::string_view view) {
         temporary_.assign(view.begin(), view.end());
         StringId next_id(strings_.size());
         auto result = string_to_id_.insert(std::make_pair(temporary_, next_id));