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 @@ -1880,7 +1880,7 @@ os << "[:f64"; break; } - if (denseArrayAttr.getType().getRank()) + if (denseArrayAttr.size()) os << " "; denseArrayAttr.printWithoutBraces(os); os << "]"; diff --git a/mlir/lib/IR/BuiltinAttributes.cpp b/mlir/lib/IR/BuiltinAttributes.cpp --- a/mlir/lib/IR/BuiltinAttributes.cpp +++ b/mlir/lib/IR/BuiltinAttributes.cpp @@ -884,7 +884,7 @@ constexpr static auto eltType = DenseArrayBaseAttr::EltType::I8; static ShapedType getShapedType(MLIRContext *context, ArrayRef shape) { - return VectorType::get(shape, IntegerType::get(context, 8)); + return RankedTensorType::get(shape, IntegerType::get(context, 8)); } }; template <> @@ -892,7 +892,7 @@ constexpr static auto eltType = DenseArrayBaseAttr::EltType::I16; static ShapedType getShapedType(MLIRContext *context, ArrayRef shape) { - return VectorType::get(shape, IntegerType::get(context, 16)); + return RankedTensorType::get(shape, IntegerType::get(context, 16)); } }; template <> @@ -900,7 +900,7 @@ constexpr static auto eltType = DenseArrayBaseAttr::EltType::I32; static ShapedType getShapedType(MLIRContext *context, ArrayRef shape) { - return VectorType::get(shape, IntegerType::get(context, 32)); + return RankedTensorType::get(shape, IntegerType::get(context, 32)); } }; template <> @@ -908,7 +908,7 @@ constexpr static auto eltType = DenseArrayBaseAttr::EltType::I64; static ShapedType getShapedType(MLIRContext *context, ArrayRef shape) { - return VectorType::get(shape, IntegerType::get(context, 64)); + return RankedTensorType::get(shape, IntegerType::get(context, 64)); } }; template <> @@ -916,7 +916,7 @@ constexpr static auto eltType = DenseArrayBaseAttr::EltType::F32; static ShapedType getShapedType(MLIRContext *context, ArrayRef shape) { - return VectorType::get(shape, Float32Type::get(context)); + return RankedTensorType::get(shape, Float32Type::get(context)); } }; template <> @@ -924,7 +924,7 @@ constexpr static auto eltType = DenseArrayBaseAttr::EltType::F64; static ShapedType getShapedType(MLIRContext *context, ArrayRef shape) { - return VectorType::get(shape, Float64Type::get(context)); + return RankedTensorType::get(shape, Float64Type::get(context)); } }; } // namespace @@ -934,8 +934,8 @@ DenseArrayAttr DenseArrayAttr::get(MLIRContext *context, ArrayRef content) { auto size = static_cast(content.size()); - auto shapedType = denseArrayAttrEltTypeBuilder::getShapedType( - context, size ? ArrayRef{size} : ArrayRef{}); + auto shapedType = + denseArrayAttrEltTypeBuilder::getShapedType(context, size); auto eltType = denseArrayAttrEltTypeBuilder::eltType; auto rawArray = ArrayRef(reinterpret_cast(content.data()), content.size() * sizeof(T));