diff options
| author | Tres Popp <tpopp@google.com> | 2023-05-08 16:33:54 +0200 |
|---|---|---|
| committer | Tres Popp <tpopp@google.com> | 2023-05-12 11:21:25 +0200 |
| commit | 5550c821897ab77e664977121a0e90ad5be1ff59 (patch) | |
| tree | 1947e879997b2fccdb629789362c42310d1f1f84 /mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp | |
| parent | 5c8ce6d5761ed6a9a39ef5a77aa45d8b6095e0f5 (diff) | |
[mlir] Move casting calls from methods to function calls
The MLIR classes Type/Attribute/Operation/Op/Value support
cast/dyn_cast/isa/dyn_cast_or_null functionality through llvm's doCast
functionality in addition to defining methods with the same name.
This change begins the migration of uses of the method to the
corresponding function call as has been decided as more consistent.
Note that there still exist classes that only define methods directly,
such as AffineExpr, and this does not include work currently to support
a functional cast/isa call.
Caveats include:
- This clang-tidy script probably has more problems.
- This only touches C++ code, so nothing that is being generated.
Context:
- https://mlir.llvm.org/deprecation/ at "Use the free function variants
for dyn_cast/cast/isa/…"
- Original discussion at https://discourse.llvm.org/t/preferred-casting-style-going-forward/68443
Implementation:
This first patch was created with the following steps. The intention is
to only do automated changes at first, so I waste less time if it's
reverted, and so the first mass change is more clear as an example to
other teams that will need to follow similar steps.
Steps are described per line, as comments are removed by git:
0. Retrieve the change from the following to build clang-tidy with an
additional check:
https://github.com/llvm/llvm-project/compare/main...tpopp:llvm-project:tidy-cast-check
1. Build clang-tidy
2. Run clang-tidy over your entire codebase while disabling all checks
and enabling the one relevant one. Run on all header files also.
3. Delete .inc files that were also modified, so the next build rebuilds
them to a pure state.
4. Some changes have been deleted for the following reasons:
- Some files had a variable also named cast
- Some files had not included a header file that defines the cast
functions
- Some files are definitions of the classes that have the casting
methods, so the code still refers to the method instead of the
function without adding a prefix or removing the method declaration
at the same time.
```
ninja -C $BUILD_DIR clang-tidy
run-clang-tidy -clang-tidy-binary=$BUILD_DIR/bin/clang-tidy -checks='-*,misc-cast-functions'\
-header-filter=mlir/ mlir/* -fix
rm -rf $BUILD_DIR/tools/mlir/**/*.inc
git restore mlir/lib/IR mlir/lib/Dialect/DLTI/DLTI.cpp\
mlir/lib/Dialect/Complex/IR/ComplexDialect.cpp\
mlir/lib/**/IR/\
mlir/lib/Dialect/SparseTensor/Transforms/SparseVectorization.cpp\
mlir/lib/Dialect/Vector/Transforms/LowerVectorMultiReduction.cpp\
mlir/test/lib/Dialect/Test/TestTypes.cpp\
mlir/test/lib/Dialect/Transform/TestTransformDialectExtension.cpp\
mlir/test/lib/Dialect/Test/TestAttributes.cpp\
mlir/unittests/TableGen/EnumsGenTest.cpp\
mlir/test/python/lib/PythonTestCAPI.cpp\
mlir/include/mlir/IR/
```
Differential Revision: https://reviews.llvm.org/D150123
Diffstat (limited to 'mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp')
| -rw-r--r-- | mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp b/mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp index 50017b7bcef9..35171b3e077e 100644 --- a/mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp +++ b/mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp @@ -43,7 +43,7 @@ static int getNumBits(Type type) { // TODO: This does not take into account any memory layout or widening // constraints. E.g., a vector<3xi57> may report to occupy 3x57=171 bit, even // though in practice it will likely be stored as in a 4xi64 vector register. - if (auto vectorType = type.dyn_cast<VectorType>()) + if (auto vectorType = dyn_cast<VectorType>(type)) return vectorType.getNumElements() * vectorType.getElementTypeBitWidth(); return type.getIntOrFloatBitWidth(); } @@ -95,7 +95,7 @@ struct VectorBroadcastConvert final if (!resultType) return failure(); - if (resultType.isa<spirv::ScalarType>()) { + if (isa<spirv::ScalarType>(resultType)) { rewriter.replaceOp(castOp, adaptor.getSource()); return success(); } @@ -116,7 +116,7 @@ struct VectorExtractOpConvert final matchAndRewrite(vector::ExtractOp extractOp, OpAdaptor adaptor, ConversionPatternRewriter &rewriter) const override { // Only support extracting a scalar value now. - VectorType resultVectorType = extractOp.getType().dyn_cast<VectorType>(); + VectorType resultVectorType = dyn_cast<VectorType>(extractOp.getType()); if (resultVectorType && resultVectorType.getNumElements() > 1) return failure(); @@ -124,7 +124,7 @@ struct VectorExtractOpConvert final if (!dstType) return failure(); - if (adaptor.getVector().getType().isa<spirv::ScalarType>()) { + if (isa<spirv::ScalarType>(adaptor.getVector().getType())) { rewriter.replaceOp(extractOp, adaptor.getVector()); return success(); } @@ -156,7 +156,7 @@ struct VectorExtractStridedSliceOpConvert final Value srcVector = adaptor.getOperands().front(); // Extract vector<1xT> case. - if (dstType.isa<spirv::ScalarType>()) { + if (isa<spirv::ScalarType>(dstType)) { rewriter.replaceOpWithNewOp<spirv::CompositeExtractOp>(extractOp, srcVector, offset); return success(); @@ -203,7 +203,7 @@ struct VectorInsertOpConvert final return success(); } - if (insertOp.getSourceType().isa<VectorType>() || + if (isa<VectorType>(insertOp.getSourceType()) || !spirv::CompositeType::isValid(insertOp.getDestVectorType())) return failure(); int32_t id = getFirstIntValue(insertOp.getPosition()); @@ -224,7 +224,7 @@ struct VectorExtractElementOpConvert final if (!resultType) return failure(); - if (adaptor.getVector().getType().isa<spirv::ScalarType>()) { + if (isa<spirv::ScalarType>(adaptor.getVector().getType())) { rewriter.replaceOp(extractOp, adaptor.getVector()); return success(); } @@ -252,7 +252,7 @@ struct VectorInsertElementOpConvert final if (!vectorType) return failure(); - if (vectorType.isa<spirv::ScalarType>()) { + if (isa<spirv::ScalarType>(vectorType)) { rewriter.replaceOp(insertOp, adaptor.getSource()); return success(); } @@ -285,18 +285,17 @@ struct VectorInsertStridedSliceOpConvert final return failure(); uint64_t offset = getFirstIntValue(insertOp.getOffsets()); - if (srcVector.getType().isa<spirv::ScalarType>()) { - assert(!dstVector.getType().isa<spirv::ScalarType>()); + if (isa<spirv::ScalarType>(srcVector.getType())) { + assert(!isa<spirv::ScalarType>(dstVector.getType())); rewriter.replaceOpWithNewOp<spirv::CompositeInsertOp>( insertOp, dstVector.getType(), srcVector, dstVector, rewriter.getI32ArrayAttr(offset)); return success(); } - uint64_t totalSize = - dstVector.getType().cast<VectorType>().getNumElements(); + uint64_t totalSize = cast<VectorType>(dstVector.getType()).getNumElements(); uint64_t insertSize = - srcVector.getType().cast<VectorType>().getNumElements(); + cast<VectorType>(srcVector.getType()).getNumElements(); SmallVector<int32_t, 2> indices(totalSize); std::iota(indices.begin(), indices.end(), 0); @@ -324,7 +323,7 @@ struct VectorReductionPattern final if (!resultType) return failure(); - auto srcVectorType = adaptor.getVector().getType().dyn_cast<VectorType>(); + auto srcVectorType = dyn_cast<VectorType>(adaptor.getVector().getType()); if (!srcVectorType || srcVectorType.getRank() != 1) return rewriter.notifyMatchFailure(reduceOp, "not 1-D vector source"); @@ -393,10 +392,10 @@ public: Type dstType = getTypeConverter()->convertType(op.getType()); if (!dstType) return failure(); - if (dstType.isa<spirv::ScalarType>()) { + if (isa<spirv::ScalarType>(dstType)) { rewriter.replaceOp(op, adaptor.getInput()); } else { - auto dstVecType = dstType.cast<VectorType>(); + auto dstVecType = cast<VectorType>(dstType); SmallVector<Value, 4> source(dstVecType.getNumElements(), adaptor.getInput()); rewriter.replaceOpWithNewOp<spirv::CompositeConstructOp>(op, dstType, @@ -422,7 +421,7 @@ struct VectorShuffleOpConvert final if (oldSourceType.getNumElements() > 1) { SmallVector<int32_t, 4> components = llvm::to_vector<4>( llvm::map_range(shuffleOp.getMask(), [](Attribute attr) -> int32_t { - return attr.cast<IntegerAttr>().getValue().getZExtValue(); + return cast<IntegerAttr>(attr).getValue().getZExtValue(); })); rewriter.replaceOpWithNewOp<spirv::VectorShuffleOp>( shuffleOp, newResultType, adaptor.getV1(), adaptor.getV2(), |
