Merge branch 'master' into iterator_range

Author: compnerd

include/glow/IR/Type.h

@@ -89,9 +89,6 @@ struct Type final {
     numSizes_ = dims.size();
   }
 
-  /// Print the textual representation of the type.
-  std::string asString() const;
-
   /// An empty type.
   Type() : elementType_(ElemKind::IndexTy) { numSizes_ = 0; }
 
@@ -195,4 +192,8 @@ inline bool operator==(const Type &LHS, const Type &RHS) {
 
 } // namespace glow
 
+namespace std {
+std::string to_string(const glow::Type &);
+}
+
 #endif // GLOW_IR_TYPE_H

include/glow/Support/ADT.h

@@ -12,6 +12,7 @@
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/iterator_range.h"
+#include "llvm/ADT/StringRef.h"
 
 namespace glow {
 using llvm::iterator_range;
@@ -108,332 +109,7 @@ inline bool operator!=(MutableArrayRef<T> LHS, MutableArrayRef<T> RHS) {
   return !(LHS == RHS);
 }
 
-/// StringRef - Represent a constant reference to a string, i.e. a character
-/// array and a length, which need not be null terminated.
-///
-/// This class does not own the string data, it is expected to be used in
-/// situations where the character data resides in some other buffer, whose
-/// lifetime extends past that of the StringRef. For this reason, it is not in
-/// general safe to store a StringRef.
-class StringRef {
-public:
-  static const size_t npos = ~size_t(0);
-
-  using iterator = const char *;
-  using const_iterator = const char *;
-  using size_type = size_t;
-
-private:
-  /// The start of the string, in an external buffer.
-  const char *Data = nullptr;
-
-  /// The length of the string.
-  size_t Length = 0;
-
-  // Workaround memcmp issue with null pointers (undefined behavior)
-  // by providing a specialized version
-  static int compareMemory(const char *Lhs, const char *Rhs, size_t Length) {
-    if (Length == 0) {
-      return 0;
-    }
-    return ::memcmp(Lhs, Rhs, Length);
-  }
-
-public:
-  /// Construct an empty string ref.
-  StringRef() = default;
-
-  /// Disable conversion from nullptr.  This prevents things like
-  /// if (S == nullptr)
-  StringRef(std::nullptr_t) = delete;
-
-  /// Construct a string ref from a cstring.
-  StringRef(const char *Str) : Data(Str), Length(Str ? ::strlen(Str) : 0) {}
-
-  /// Construct a string ref from a pointer and length.
-  constexpr StringRef(const char *data, size_t length)
-      : Data(data), Length(length) {}
-
-  /// Construct a string ref from an std::string.
-  StringRef(const std::string &Str) : Data(Str.data()), Length(Str.length()) {}
-
-  static StringRef withNullAsEmpty(const char *data) {
-    return StringRef(data ? data : "");
-  }
-
-  iterator begin() const { return Data; }
-  iterator end() const { return Data + Length; }
-
-  const unsigned char *bytes_begin() const {
-    return reinterpret_cast<const unsigned char *>(begin());
-  }
-  const unsigned char *bytes_end() const {
-    return reinterpret_cast<const unsigned char *>(end());
-  }
-  iterator_range<const unsigned char *> bytes() const {
-    return make_range(bytes_begin(), bytes_end());
-  }
-
-  /// data - Get a pointer to the start of the string (which may not be null
-  /// terminated).
-  const char *data() const { return Data; }
-
-  /// empty - Check if the string is empty.
-  bool empty() const { return Length == 0; }
-
-  /// size - Get the string size.
-  size_t size() const { return Length; }
-
-  /// front - Get the first character in the string.
-  char front() const {
-    assert(!empty());
-    return Data[0];
-  }
-
-  /// back - Get the last character in the string.
-  char back() const {
-    assert(!empty());
-    return Data[Length - 1];
-  }
-
-  // copy - Allocate copy in Allocator and return StringRef to it.
-  template <typename Allocator> StringRef copy(Allocator &A) const {
-    // Don't request a length 0 copy from the allocator.
-    if (empty())
-      return StringRef();
-    char *S = A.template Allocate<char>(Length);
-    std::copy(begin(), end(), S);
-    return StringRef(S, Length);
-  }
-
-  /// equals - Check for string equality, this is more efficient than
-  /// compare() when the relative ordering of inequal strings isn't needed.
-  bool equals(StringRef RHS) const {
-    return (Length == RHS.Length &&
-            compareMemory(Data, RHS.Data, RHS.Length) == 0);
-  }
-
-  /// compare - Compare two strings; the result is -1, 0, or 1 if this string
-  /// is lexicographically less than, equal to, or greater than the \p RHS.
-  int compare(StringRef RHS) const {
-    // Check the prefix for a mismatch.
-    if (int Res = compareMemory(Data, RHS.Data, std::min(Length, RHS.Length)))
-      return Res < 0 ? -1 : 1;
-
-    // Otherwise the prefixes match, so we only need to check the lengths.
-    if (Length == RHS.Length)
-      return 0;
-    return Length < RHS.Length ? -1 : 1;
-  }
-
-  /// str - Get the contents as an std::string.
-  std::string str() const {
-    if (!Data)
-      return std::string();
-    return std::string(Data, Length);
-  }
-
-  char operator[](size_t Index) const {
-    assert(Index < Length && "Invalid index!");
-    return Data[Index];
-  }
-
-  /// Disallow accidental assignment from a temporary std::string.
-  ///
-  /// The declaration here is extra complicated so that `stringRef = {}`
-  /// and `stringRef = "abc"` continue to select the move assignment operator.
-  template <typename T>
-  typename std::enable_if<std::is_same<T, std::string>::value, StringRef>::type
-      &
-      operator=(T &&Str) = delete;
-
-  operator std::string() const { return str(); }
-
-  /// Check if this string starts with the given \p Prefix.
-  bool startswith(StringRef Prefix) const {
-    return Length >= Prefix.Length &&
-           compareMemory(Data, Prefix.Data, Prefix.Length) == 0;
-  }
-
-  /// Check if this string ends with the given \p Suffix.
-  bool endswith(StringRef Suffix) const {
-    return Length >= Suffix.Length &&
-           compareMemory(end() - Suffix.Length, Suffix.Data, Suffix.Length) ==
-               0;
-  }
-
-  /// Search for the first character \p C in the string.
-  ///
-  /// \returns The index of the first occurrence of \p C, or npos if not
-  /// found.
-  size_t find(char C, size_t From = 0) const {
-    size_t FindBegin = std::min(From, Length);
-    if (FindBegin < Length) { // Avoid calling memchr with nullptr.
-      // Just forward to memchr, which is faster than a hand-rolled loop.
-      if (const void *P = ::memchr(Data + FindBegin, C, Length - FindBegin))
-        return static_cast<const char *>(P) - Data;
-    }
-    return npos;
-  }
-
-  /// Search for the last character \p C in the string.
-  ///
-  /// \returns The index of the last occurrence of \p C, or npos if not
-  /// found.
-  size_t rfind(char C, size_t From = npos) const {
-    From = std::min(From, Length);
-    size_t i = From;
-    while (i != 0) {
-      --i;
-      if (Data[i] == C)
-        return i;
-    }
-    return npos;
-  }
-
-  /// Find the first character in the string that is \p C, or npos if not
-  /// found. Same as find.
-  size_t find_first_of(char C, size_t From = 0) const { return find(C, From); }
-
-  /// Find the last character in the string that is \p C, or npos if not
-  /// found.
-  size_t find_last_of(char C, size_t From = npos) const {
-    return rfind(C, From);
-  }
-
-  /// Return the number of occurrences of \p C in the string.
-  size_t count(char C) const {
-    size_t Count = 0;
-    for (size_t i = 0, e = Length; i != e; ++i)
-      if (Data[i] == C)
-        ++Count;
-    return Count;
-  }
-
-  /// Return a reference to the substring from [Start, Start + N).
-  ///
-  /// \param Start The index of the starting character in the substring; if
-  /// the index is npos or greater than the length of the string then the
-  /// empty substring will be returned.
-  ///
-  /// \param N The number of characters to included in the substring. If N
-  /// exceeds the number of characters remaining in the string, the string
-  /// suffix (starting with \p Start) will be returned.
-  StringRef substr(size_t Start, size_t N = npos) const {
-    Start = std::min(Start, Length);
-    return StringRef(Data + Start, std::min(N, Length - Start));
-  }
-
-  /// Return a StringRef equal to 'this' but with only the first \p N
-  /// elements remaining.  If \p N is greater than the length of the
-  /// string, the entire string is returned.
-  StringRef take_front(size_t N = 1) const {
-    if (N >= size())
-      return *this;
-    return drop_back(size() - N);
-  }
-
-  /// Return a StringRef equal to 'this' but with only the last \p N
-  /// elements remaining.  If \p N is greater than the length of the
-  /// string, the entire string is returned.
-  StringRef take_back(size_t N = 1) const {
-    if (N >= size())
-      return *this;
-    return drop_front(size() - N);
-  }
-
-  /// Return a StringRef equal to 'this' but with the first \p N elements
-  /// dropped.
-  StringRef drop_front(size_t N = 1) const {
-    assert(size() >= N && "Dropping more elements than exist");
-    return substr(N);
-  }
-
-  /// Return a StringRef equal to 'this' but with the last \p N elements
-  /// dropped.
-  StringRef drop_back(size_t N = 1) const {
-    assert(size() >= N && "Dropping more elements than exist");
-    return substr(0, size() - N);
-  }
-
-  /// Returns true if this StringRef has the given prefix and removes that
-  /// prefix.
-  bool consume_front(StringRef Prefix) {
-    if (!startswith(Prefix))
-      return false;
-
-    *this = drop_front(Prefix.size());
-    return true;
-  }
-
-  /// Returns true if this StringRef has the given suffix and removes that
-  /// suffix.
-  bool consume_back(StringRef Suffix) {
-    if (!endswith(Suffix))
-      return false;
-
-    *this = drop_back(Suffix.size());
-    return true;
-  }
-
-  /// Return a reference to the substring from [Start, End).
-  ///
-  /// \param Start The index of the starting character in the substring; if
-  /// the index is npos or greater than the length of the string then the
-  /// empty substring will be returned.
-  ///
-  /// \param End The index following the last character to include in the
-  /// substring. If this is npos or exceeds the number of characters
-  /// remaining in the string, the string suffix (starting with \p Start)
-  /// will be returned. If this is less than \p Start, an empty string will
-  /// be returned.
-  StringRef slice(size_t Start, size_t End) const {
-    Start = std::min(Start, Length);
-    End = std::min(std::max(Start, End), Length);
-    return StringRef(Data + Start, End - Start);
-  }
-
-  /// Split into two substrings around the first occurrence of a separator
-  /// character.
-  ///
-  /// If \p Separator is in the string, then the result is a pair (LHS, RHS)
-  /// such that (*this == LHS + Separator + RHS) is true and RHS is
-  /// maximal. If \p Separator is not in the string, then the result is a
-  /// pair (LHS, RHS) where (*this == LHS) and (RHS == "").
-  ///
-  /// \param Separator The character to split on.
-  /// \returns The split substrings.
-  std::pair<StringRef, StringRef> split(char Separator) const {
-    size_t Idx = find(Separator);
-    if (Idx == npos)
-      return std::make_pair(*this, StringRef());
-    return std::make_pair(slice(0, Idx), slice(Idx + 1, npos));
-  }
-};
-
-inline bool operator==(StringRef LHS, StringRef RHS) { return LHS.equals(RHS); }
-
-inline bool operator!=(StringRef LHS, StringRef RHS) { return !(LHS == RHS); }
-
-inline bool operator<(StringRef LHS, StringRef RHS) {
-  return LHS.compare(RHS) == -1;
-}
-
-inline bool operator<=(StringRef LHS, StringRef RHS) {
-  return LHS.compare(RHS) != 1;
-}
-
-inline bool operator>(StringRef LHS, StringRef RHS) {
-  return LHS.compare(RHS) == 1;
-}
-
-inline bool operator>=(StringRef LHS, StringRef RHS) {
-  return LHS.compare(RHS) != -1;
-}
-
-inline std::string &operator+=(std::string &buffer, StringRef string) {
-  return buffer.append(string.data(), string.size());
-}
+using llvm::StringRef;
 
 } // namespace glow
 

src/glow/IR/Instrs.cpp

@@ -90,15 +90,15 @@ const char *WeightVar::getInitKindStr() const {
 
 std::string WeightVar::getExtraDesc() const {
   auto sp = ", ";
-  auto r = getType()->asString();
+  auto r = std::to_string(*getType());
   if (getInitKind() != InitKind::kExtern) {
     r += std::string(sp) + getInitKindStr() + sp + std::to_string(val_);
   }
   return r;
 }
 
 std::string AllocActivationInst::getExtraDesc() const {
-  return getType()->asString();
+  return std::to_string(*getType());
 }
 
 /// Check that the type of the first operand matches the type of the second