From c4f1af2bdfbf0c616b82efa954aecbfa47bb561d Mon Sep 17 00:00:00 2001 From: Aart Bik Date: Tue, 15 Nov 2022 15:37:31 -0800 Subject: [PATCH] [mlir][sparse] avoid single small vector, set exact number 3 Reviewed By: wrengr Differential Revision: https://reviews.llvm.org/D138071 --- .../Dialect/SparseTensor/Transforms/SparseBufferRewriting.cpp | 4 ++-- .../Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/SparseBufferRewriting.cpp b/mlir/lib/Dialect/SparseTensor/Transforms/SparseBufferRewriting.cpp index 75fa3e8b347c..b5e9826b703d 100644 --- a/mlir/lib/Dialect/SparseTensor/Transforms/SparseBufferRewriting.cpp +++ b/mlir/lib/Dialect/SparseTensor/Transforms/SparseBufferRewriting.cpp @@ -490,8 +490,8 @@ static void createPartitionFunc(OpBuilder &builder, ModuleOp module, Value i = lo; Value j = builder.create(loc, hi, c1); - SmallVector operands{i, j, p}; - SmallVector types{i.getType(), j.getType(), p.getType()}; + SmallVector operands{i, j, p}; // exactly three + SmallVector types{i.getType(), j.getType(), p.getType()}; scf::WhileOp whileOp = builder.create(loc, types, operands); // The before-region of the WhileOp. diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp b/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp index 77b3e5bf6af9..c97556c8205e 100644 --- a/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp +++ b/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorCodegen.cpp @@ -543,8 +543,8 @@ static void genEndInsert(OpBuilder &builder, Location loc, RankedTensorType rtp, Value hi = genLoad(builder, loc, fields[memSizesIdx], mz); Value zero = constantIndex(builder, loc, 0); Value one = constantIndex(builder, loc, 1); - SmallVector inits; // only one - inits.push_back(genLoad(builder, loc, fields[field], zero)); + // Vector of only one, but needed by createFor's prototype. + SmallVector inits{genLoad(builder, loc, fields[field], zero)}; scf::ForOp loop = createFor(builder, loc, hi, inits, one); Value i = loop.getInductionVar(); Value oldv = loop.getRegionIterArg(0);