Author: Benjamin Kramer Date: 2020-08-28T21:14:20+02:00 New Revision: 8782c727655942c9aa4c80d698c9ba575510799c
URL: https://github.com/llvm/llvm-project/commit/8782c727655942c9aa4c80d698c9ba575510799c DIFF: https://github.com/llvm/llvm-project/commit/8782c727655942c9aa4c80d698c9ba575510799c.diff LOG: Strength-reduce SmallVectors to arrays. NFCI. Added: Modified: clang/lib/Driver/ToolChains/AMDGPU.cpp llvm/lib/IR/DebugInfoMetadata.cpp llvm/lib/Target/AArch64/AArch64ISelLowering.cpp llvm/lib/Transforms/Utils/SimplifyCFG.cpp mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp mlir/lib/Dialect/SPIRV/SPIRVOps.cpp Removed: ################################################################################ diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp index b11ce41de479..71acf3ed3281 100644 --- a/clang/lib/Driver/ToolChains/AMDGPU.cpp +++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp @@ -245,9 +245,9 @@ void RocmInstallationDetector::detectDeviceLibrary() { // - ${ROCM_ROOT}/lib/* // - ${ROCM_ROOT}/lib/bitcode/* // so try to detect these layouts. - static llvm::SmallVector<const char *, 2> SubDirsList[] = { + static constexpr std::array<const char *, 2> SubDirsList[] = { {"amdgcn", "bitcode"}, - {"lib"}, + {"lib", ""}, {"lib", "bitcode"}, }; diff --git a/llvm/lib/IR/DebugInfoMetadata.cpp b/llvm/lib/IR/DebugInfoMetadata.cpp index f20270810ed6..129a52b710c6 100644 --- a/llvm/lib/IR/DebugInfoMetadata.cpp +++ b/llvm/lib/IR/DebugInfoMetadata.cpp @@ -133,7 +133,7 @@ const DILocation *DILocation::getMergedLocation(const DILocation *LocA, } Optional<unsigned> DILocation::encodeDiscriminator(unsigned BD, unsigned DF, unsigned CI) { - SmallVector<unsigned, 3> Components = {BD, DF, CI}; + std::array<unsigned, 3> Components = {BD, DF, CI}; uint64_t RemainingWork = 0U; // We use RemainingWork to figure out if we have no remaining components to // encode. For example: if BD != 0 but DF == 0 && CI == 0, we don't need to diff --git a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index e68183dc46a2..e1b79393f25f 100644 --- a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -15710,8 +15710,8 @@ SDValue AArch64TargetLowering::LowerFixedLengthVectorSetccToSVE( auto Pg = getPredicateForFixedLengthVector(DAG, DL, InVT); EVT CmpVT = Pg.getValueType(); - SmallVector<SDValue, 4> CmpOps = {Pg, Op1, Op2, Op.getOperand(2)}; - auto Cmp = DAG.getNode(AArch64ISD::SETCC_MERGE_ZERO, DL, CmpVT, CmpOps); + auto Cmp = DAG.getNode(AArch64ISD::SETCC_MERGE_ZERO, DL, CmpVT, + {Pg, Op1, Op2, Op.getOperand(2)}); EVT PromoteVT = ContainerVT.changeTypeToInteger(); auto Promote = DAG.getBoolExtOrTrunc(Cmp, DL, PromoteVT, InVT); diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 75cb87345949..ae2471969160 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -3156,7 +3156,7 @@ static bool mergeConditionalStoreToAddress(BasicBlock *PTB, BasicBlock *PFB, return true; }; - const SmallVector<StoreInst *, 2> FreeStores = {PStore, QStore}; + const std::array<StoreInst *, 2> FreeStores = {PStore, QStore}; if (!MergeCondStoresAggressively && (!IsWorthwhile(PTB, FreeStores) || !IsWorthwhile(PFB, FreeStores) || !IsWorthwhile(QTB, FreeStores) || !IsWorthwhile(QFB, FreeStores))) diff --git a/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp b/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp index 126228bce25a..6c0c841451da 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp @@ -377,11 +377,10 @@ fuseProducerOfDep(OpBuilder &b, LinalgOp consumer, unsigned consumerIdx, Optional<FusionInfo> mlir::linalg::fuseProducerOf( OpBuilder &b, LinalgOp consumer, unsigned consumerIdx, const LinalgDependenceGraph &graph, OperationFolder *folder) { - SmallVector<LinalgDependenceGraph::DependenceType, 4> deps = { - LinalgDependenceGraph::DependenceType::RAW, - LinalgDependenceGraph::DependenceType::WAW, - }; - for (auto dep : deps) { + for (auto dep : { + LinalgDependenceGraph::DependenceType::RAW, + LinalgDependenceGraph::DependenceType::WAW, + }) { if (auto res = fuseProducerOfDep(b, consumer, consumerIdx, graph, folder, dep)) return res; diff --git a/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp b/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp index 7aeecdbbac35..83de4cc2e8fe 100644 --- a/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp +++ b/mlir/lib/Dialect/SPIRV/SPIRVOps.cpp @@ -2849,9 +2849,9 @@ static ParseResult parseCooperativeMatrixLoadNVOp(OpAsmParser &parser, parser.parseType(ptrType) || parser.parseKeywordType("as", elementType)) { return failure(); } - SmallVector<Type, 3> OperandType = {ptrType, strideType, columnMajorType}; - if (parser.resolveOperands(operandInfo, OperandType, parser.getNameLoc(), - state.operands)) { + if (parser.resolveOperands(operandInfo, + {ptrType, strideType, columnMajorType}, + parser.getNameLoc(), state.operands)) { return failure(); } @@ -2904,10 +2904,9 @@ static ParseResult parseCooperativeMatrixStoreNVOp(OpAsmParser &parser, parser.parseType(elementType)) { return failure(); } - SmallVector<Type, 4> OperandType = {ptrType, elementType, strideType, - columnMajorType}; - if (parser.resolveOperands(operandInfo, OperandType, parser.getNameLoc(), - state.operands)) { + if (parser.resolveOperands( + operandInfo, {ptrType, elementType, strideType, columnMajorType}, + parser.getNameLoc(), state.operands)) { return failure(); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits