diff --git a/mlir/include/mlir/IR/Attributes.h b/mlir/include/mlir/IR/Attributes.h
--- a/mlir/include/mlir/IR/Attributes.h
+++ b/mlir/include/mlir/IR/Attributes.h
@@ -142,11 +142,11 @@
   Unit,
 
   /// Elements Attributes.
-  DenseElements,
+  DenseIntOrFPElements,
   DenseStringElements,
   OpaqueElements,
   SparseElements,
-  FIRST_ELEMENTS_ATTR = DenseElements,
+  FIRST_ELEMENTS_ATTR = DenseIntOrFPElements,
   LAST_ELEMENTS_ATTR = SparseElements,
 
   /// Locations.
@@ -679,7 +679,7 @@
 
   /// Method for support type inquiry through isa, cast and dyn_cast.
   static bool classof(Attribute attr) {
-    return attr.getKind() == StandardAttributes::DenseElements ||
+    return attr.getKind() == StandardAttributes::DenseIntOrFPElements ||
            attr.getKind() == StandardAttributes::DenseStringElements;
   }
 
@@ -887,6 +887,11 @@
             ElementIterator<T>(rawData, splat, getNumElements())};
   }
 
+  llvm::iterator_range<ArrayRef<StringRef>::iterator> getValues() const {
+    auto stringRefs = getStringValues();
+    return {stringRefs.begin(), stringRefs.end()};
+  }
+
   /// Return the held element values as a range of Attributes.
   llvm::iterator_range<AttributeElementIterator> getAttributeValues() const;
   template <typename T, typename = typename std::enable_if<
@@ -947,6 +952,9 @@
   /// form the user might expect.
   ArrayRef<char> getRawData() const;
 
+  /// Return the raw StringRef data held by this attribute.
+  ArrayRef<StringRef> getStringRefs() const;
+
   //===--------------------------------------------------------------------===//
   // Mutation Utilities
   //===--------------------------------------------------------------------===//
@@ -992,6 +1000,8 @@
   bool isValidIntOrFloat(int64_t dataEltSize, bool isInt, bool isSigned) const;
 };
 
+// An attribute class for representing dense arrays of strings. The structure
+// storing and querying a list of densely packed strings.
 class DenseStringElementsAttr
     : public Attribute::AttrBase<DenseStringElementsAttr, DenseElementsAttr,
                                  detail::DenseStringElementsAttributeStorage> {
@@ -1004,9 +1014,6 @@
     return kind == StandardAttributes::DenseStringElements;
   }
 
-  /// Return the held element values as a range of StringRefs.
-  ArrayRef<StringRef> getStringValues() const;
-
   /// Overload of the raw 'get' method that asserts that the given type is of
   /// integer or floating-point type. This method is used to verify type
   /// invariants that the templatized 'get' method cannot.
@@ -1016,6 +1023,8 @@
   friend DenseElementsAttr;
 };
 
+// An attribute class for specializing behavior of Int and Floating-point
+// densely packed string arrays.
 class DenseIntOrFPElementsAttr
     : public Attribute::AttrBase<DenseIntOrFPElementsAttr, DenseElementsAttr,
                                  detail::DenseIntOrFPElementsAttributeStorage> {
@@ -1025,7 +1034,7 @@
 
   /// Method for support type inquiry through isa, cast and dyn_cast.
   static bool kindof(unsigned kind) {
-    return kind == StandardAttributes::DenseElements;
+    return kind == StandardAttributes::DenseIntOrFPElements;
   }
 
 protected:
@@ -1319,7 +1328,7 @@
             typename... Args>
   RetT process(Args &... args) const {
     switch (attrKind) {
-    case StandardAttributes::DenseElements:
+    case StandardAttributes::DenseIntOrFPElements:
       return ProcessFn<DenseIteratorT>()(args...);
     case StandardAttributes::SparseElements:
       return ProcessFn<SparseIteratorT>()(args...);
diff --git a/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp b/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp
--- a/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp
+++ b/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp
@@ -1316,7 +1316,7 @@
              << opType << ") does not match value type (" << valueType << ")";
     return success();
   } break;
-  case StandardAttributes::DenseElements:
+  case StandardAttributes::DenseIntOrFPElements:
   case StandardAttributes::SparseElements: {
     if (valueType == opType)
       break;
diff --git a/mlir/lib/IR/AsmPrinter.cpp b/mlir/lib/IR/AsmPrinter.cpp
--- a/mlir/lib/IR/AsmPrinter.cpp
+++ b/mlir/lib/IR/AsmPrinter.cpp
@@ -1395,7 +1395,7 @@
     os << '"' << "0x" << llvm::toHex(eltsAttr.getValue()) << "\">";
     break;
   }
-  case StandardAttributes::DenseElements: {
+  case StandardAttributes::DenseIntOrFPElements: {
     auto eltsAttr = attr.cast<DenseElementsAttr>();
     if (printerFlags.shouldElideElementsAttr(eltsAttr)) {
       printElidedElementsAttr(os);
@@ -1554,7 +1554,6 @@
 
   // Special case for 0-d and splat tensors.
   if (attr.isSplat()) {
-    // TODO(suderman): Add a print for a single value.
     printDenseStringElement(attr, os, 0);
     return;
   }
diff --git a/mlir/lib/IR/AttributeDetail.h b/mlir/lib/IR/AttributeDetail.h
--- a/mlir/lib/IR/AttributeDetail.h
+++ b/mlir/lib/IR/AttributeDetail.h
@@ -586,9 +586,8 @@
 
     // If the data is already known to be a splat, the key hash value is
     // directly the data buffer.
-    if (isKnownSplat) {
+    if (isKnownSplat)
       return KeyTy(ty, data, llvm::hash_value(data), isKnownSplat);
-    }
 
     // Handle the simple case of only one element.
     size_t numElements = ty.getNumElements();
@@ -628,10 +627,9 @@
 
     // Compute the amount data needed to store the ArrayRef and StringRef
     // contents.
-    size_t dataSize = sizeof(ArrayRef<StringRef>) * numEntries;
-    for (int i = 0; i < numEntries; i++) {
+    size_t dataSize = sizeof(StringRef) * numEntries;
+    for (int i = 0; i < numEntries; i++)
       dataSize += data[i].size();
-    }
 
     char *rawData = reinterpret_cast<char *>(
         allocator.allocate(dataSize, alignof(uint64_t)));
diff --git a/mlir/lib/IR/Attributes.cpp b/mlir/lib/IR/Attributes.cpp
--- a/mlir/lib/IR/Attributes.cpp
+++ b/mlir/lib/IR/Attributes.cpp
@@ -411,7 +411,7 @@
 /// element, then a null attribute is returned.
 Attribute ElementsAttr::getValue(ArrayRef<uint64_t> index) const {
   switch (getKind()) {
-  case StandardAttributes::DenseElements:
+  case StandardAttributes::DenseIntOrFPElements:
     return cast<DenseElementsAttr>().getValue(index);
   case StandardAttributes::OpaqueElements:
     return cast<OpaqueElementsAttr>().getValue(index);
@@ -442,7 +442,7 @@
 ElementsAttr::mapValues(Type newElementType,
                         function_ref<APInt(const APInt &)> mapping) const {
   switch (getKind()) {
-  case StandardAttributes::DenseElements:
+  case StandardAttributes::DenseIntOrFPElements:
     return cast<DenseElementsAttr>().mapValues(newElementType, mapping);
   default:
     llvm_unreachable("unsupported ElementsAttr subtype");
@@ -453,7 +453,7 @@
 ElementsAttr::mapValues(Type newElementType,
                         function_ref<APInt(const APFloat &)> mapping) const {
   switch (getKind()) {
-  case StandardAttributes::DenseElements:
+  case StandardAttributes::DenseIntOrFPElements:
     return cast<DenseElementsAttr>().mapValues(newElementType, mapping);
   default:
     llvm_unreachable("unsupported ElementsAttr subtype");
@@ -814,6 +814,10 @@
   return static_cast<DenseIntOrFPElementsAttributeStorage *>(impl)->data;
 }
 
+ArrayRef<StringRef> DenseElementsAttr::getStringRefs() const {
+  return static_cast<DenseStringElementsAttributeStorage *>(impl)->data;
+}
+
 /// Return a new DenseElementsAttr that has the same data as the current
 /// attribute, but has been reshaped to 'newType'. The new type must have the
 /// same total number of elements as well as element type.
@@ -851,9 +855,6 @@
                    type, values, (values.size() == 1));
 }
 
-ArrayRef<StringRef> DenseStringElementsAttr::getStringValues() const {
-  return static_cast<DenseStringElementsAttributeStorage *>(impl)->data;
-}
 
 //===----------------------------------------------------------------------===//
 // DenseIntOrFPElementsAttr
@@ -884,8 +885,8 @@
   assert((type.isa<RankedTensorType>() || type.isa<VectorType>()) &&
          "type must be ranked tensor or vector");
   assert(type.hasStaticShape() && "type must have static shape");
-  return Base::get(type.getContext(), StandardAttributes::DenseElements, type,
-                   data, isSplat);
+  return Base::get(type.getContext(), StandardAttributes::DenseIntOrFPElements,
+                   type, data, isSplat);
 }
 
 /// Overload of the 'getRaw' method that asserts that the given type is of