diff --git a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td --- a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td +++ b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td @@ -29,6 +29,7 @@ let useDefaultAttributePrinterParser = 1; let hasConstantMaterializer = 1; + let usePropertiesForAttributes = 1; let dependentDialects = ["arith::ArithDialect"]; } diff --git a/mlir/lib/Dialect/Vector/IR/VectorOps.cpp b/mlir/lib/Dialect/Vector/IR/VectorOps.cpp --- a/mlir/lib/Dialect/Vector/IR/VectorOps.cpp +++ b/mlir/lib/Dialect/Vector/IR/VectorOps.cpp @@ -1153,8 +1153,9 @@ ValueRange operands, DictionaryAttr attributes, OpaqueProperties properties, RegionRange, SmallVectorImpl<Type> &inferredReturnTypes) { - ExtractOp::Adaptor op(operands, attributes); - auto vectorType = llvm::cast<VectorType>(op.getVector().getType()); + ExtractOp::Adaptor op(operands, attributes + *properties.as<ExtractOp::Properties *>()); + auto vectorType = op.getVector().getType().cast<VectorType>(); if (static_cast<int64_t>(op.getPosition().size()) == vectorType.getRank()) { inferredReturnTypes.push_back(vectorType.getElementType()); } else { @@ -2089,8 +2090,9 @@ ValueRange operands, DictionaryAttr attributes, OpaqueProperties properties, RegionRange, SmallVectorImpl<Type> &inferredReturnTypes) { - ShuffleOp::Adaptor op(operands, attributes); - auto v1Type = llvm::cast<VectorType>(op.getV1().getType()); + ShuffleOp::Adaptor op(operands, attributes + *properties.as<ShuffleOp::Properties *>()); + auto v1Type = op.getV1().getType().cast<VectorType>(); auto v1Rank = v1Type.getRank(); // Construct resulting type: leading dimension matches mask // length, all trailing dimensions match the operands.