do not return smallVector

Signed-off-by: dchigarev <[email protected]>

Author: dchigarev

include/gc/Transforms/Utils/ValueUtils.h

@@ -55,8 +55,9 @@ bool hasSharedMemSpace(mlir::Value memref);
 
 // Go through all parent 'memref.subview' ops for the given `memref`
 // and return the folded offsets of all subviews and the root memref.
-std::tuple<SmallVector<Value>, Value>
-computeSubviewOffsets(PatternRewriter &rewriter, Location loc, Value memref);
+void computeSubviewOffsets(PatternRewriter &rewriter, Location loc,
+                           Value memref, SmallVector<Value> &resultOffsets,
+                           Value &resultRootMemref);
 
 // Return the strides of the memref
 SmallVector<OpFoldResult> getMemrefStrides(PatternRewriter &rewriter,

lib/gc/Transforms/GPU/LinalgToXeGPU.cpp

@@ -835,10 +835,12 @@ static SmallVector<Value> createSLMDescTiles(PatternRewriter &rewriter,
   auto srcType = cast<MemRefType>(src.getType());
   assert(srcType.getRank() == 2 && "Expected a 2D memref");
 
+  SmallVector<Value> offsets;
+  Value rootMemref;
   // 'imex::ConvertGPUXToSPIRVPass' doesn't allow 'memref.subview' ops in the
   // GPU kernel. We have to merge the subview offsets into the descriptor
   // offset.
-  auto [offsets, rootMemref] = utils::computeSubviewOffsets(rewriter, loc, src);
+  utils::computeSubviewOffsets(rewriter, loc, src, offsets, rootMemref);
   auto rootStridesFold = utils::getMemrefStrides(rewriter, loc, rootMemref);
   auto rootStrides =
       getValueOrCreateConstantIndexOp(rewriter, loc, rootStridesFold);

lib/gc/Transforms/Utils/ValueUtils.cpp

@@ -198,25 +198,26 @@ bool hasSharedMemSpace(mlir::Value memref) {
   return false;
 }
 
-std::tuple<SmallVector<Value>, Value>
-computeSubviewOffsets(PatternRewriter &rewriter, Location loc, Value memref) {
+void computeSubviewOffsets(PatternRewriter &rewriter, Location loc,
+                           Value memref, SmallVector<Value> &resultOffsets,
+                           Value &resultRootMemref) {
   auto fillVal = rewriter.create<arith::ConstantIndexOp>(loc, 0);
   auto origShape = dyn_cast<MemRefType>(memref.getType()).getShape();
 
-  SmallVector<Value> resolvedOffsets(origShape.size(), fillVal);
+  resultOffsets.clear();
+  resultOffsets.append(origShape.size(), fillVal);
+  resultRootMemref = memref;
 
-  while (auto subViewOp = memref.getDefiningOp<memref::SubViewOp>()) {
-    auto currentOffsets = getAsOpFoldResult(resolvedOffsets);
-    resolvedOffsets.clear();
+  while (auto subViewOp = resultRootMemref.getDefiningOp<memref::SubViewOp>()) {
+    auto currentOffsets = getAsOpFoldResult(resultOffsets);
+    resultOffsets.clear();
 
     affine::resolveIndicesIntoOpWithOffsetsAndStrides(
-        rewriter, memref.getLoc(), subViewOp.getMixedOffsets(),
+        rewriter, resultRootMemref.getLoc(), subViewOp.getMixedOffsets(),
         subViewOp.getMixedStrides(), subViewOp.getDroppedDims(), currentOffsets,
-        resolvedOffsets);
-    memref = subViewOp.getOperand(0);
+        resultOffsets);
+    resultRootMemref = subViewOp.getOperand(0);
   }
-
-  return std::make_tuple(std::move(resolvedOffsets), memref);
 }
 
 SmallVector<OpFoldResult> getMemrefStrides(PatternRewriter &rewriter,