[Im2Col] Support converting group convs to im2col #20611
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -62,54 +62,38 @@ static SmallVector<int64_t> getBasisFromShape(ArrayRef<int64_t> shape) { | |
| return basis; | ||
| } | ||
|
|
||
| < 10000 td class="blob-code blob-code-deletion js-file-line"> | ||
| // Computes `inputKPerm` that maps the input spatial and channel dimension order | ||
| // to filter's. | ||
|
There was a problem hiding this comment. The previous logic included dimensions shared between the input and filter, but group dimensions are included in that and we don't want them here. |
||
| static SmallVector<int64_t> | ||
| computeInputKPerm(AffineMap inputMap, AffineMap filterMap, | ||
| const mlir::linalg::ConvolutionDimensions &convDims) { | ||
| // Get reduction dims from input and filter in order of appearance. | ||
| auto reductionDims = | ||
| llvm::concat<const unsigned>(convDims.inputChannel, convDims.filterLoop); | ||
| SmallVector<int64_t> inputReductionDims; | ||
| for (AffineExpr dimExpr : inputMap.getResults()) { | ||
| for (unsigned reductionDim : reductionDims) { | ||
| if (dimExpr.isFunctionOfDim(reductionDim)) { | ||
| inputReductionDims.push_back(reductionDim); | ||
| } | ||
| } | ||
| } | ||
| SmallVector<int64_t> filterReductionDims; | ||
| for (AffineExpr dimExpr : filterMap.getResults()) { | ||
| for (unsigned reductionDim : reductionDims) { | ||
| if (dimExpr.isFunctionOfDim(reductionDim)) { | ||
| filterReductionDims.push_back(reductionDim); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Compute the permutation that maps inputSharedDims to filterSharedDims. | ||
| SmallVector<int64_t> inputKPerm; | ||
| for (int64_t dim : filterReductionDims) { | ||
| auto it = llvm::find(inputReductionDims, dim); | ||
| assert(it != inputReductionDims.end() && | ||
| "Filter dimension not found in input shared dimensions"); | ||
| inputKPerm.push_back(std::distance(inputReductionDims.begin(), it)); | ||
| } | ||
| return inputKPerm; | ||
| } | ||
|
|
@@ -211,18 +195,20 @@ class ConvertConvGeneric final | |
| rewriter.getIndexAttr(filterShape[maybeDim.value()])); | ||
| } | ||
|
|
||
| // Batch dims for the im2col also include the depth/group dimensions of the | ||
| // conv. | ||
| auto im2colBatchIterDims = | ||
| llvm::to_vector(llvm::concat<unsigned>(convDims.depth, convDims.batch)); | ||
| SmallVector<int64_t> batchPos(im2colBatchIterDims.size()); | ||
| for (int64_t convDim : im2colBatchIterDims) { | ||
| AffineExpr convDimExpr = getAffineDimExpr(convDim, getContext()); | ||
| int64_t im2colInputDim = inputMap.getResultPosition(convDimExpr).value(); | ||
|
|
||
| AffineExpr igemmDimExpr = igemmConvDetails.convToIgemmDimMap.at(convDim); | ||
| int64_t igemmInputDim = igemmConvDetails.getIgemmInputImageMap() | ||
| .getResultPosition(igemmDimExpr) | ||
| .value(); | ||
| batchPos[igemmInputDim] = im2colInputDim; | ||
|
There was a problem hiding this comment. Is this relying on say a dim like "d3" in the original map stays d3 in the new map. Wondering if this is a fairly safe assumption and if not should we guard against a wrong mapping if that doesnt happen. There was a problem hiding this comment. good point, I think with There was a problem hiding this comment. I've fixed this here by including the dimension mapping in |
||
| } | ||
|
|
||
| SmallVector<int64_t> mPos; | ||
|
|
@@ -236,7 +222,6 @@ class ConvertConvGeneric final | |
| for (auto [idx, e] : llvm::enumerate(outputMap.getResults())) { | ||
| if (e.isFunctionOfDim(outputImage)) { | ||
| mShape.push_back(outputShape[idx]); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -251,12 +236,11 @@ class ConvertConvGeneric final | |
| } | ||
| // The index at which the reduction dimension bounds starts in | ||
| // igemmLoopBounds. | ||
| int64_t reductionBoundIndex = | ||
| convDims.batch.size() + convDims.depth.size() + | ||
| convDims.outputImage.size() + convDims.outputChannel.size(); | ||
| SmallVector<int64_t> kShape(igemmLoopBounds.begin() + reductionBoundIndex, | ||
| igemmLoopBounds.end()); | ||
|
|
||
| SmallVector<OpFoldResult> mBasis = | ||
| getAsIndexOpFoldResult(getContext(), getBasisFromShape(mShape)); | ||
|
|
@@ -266,9 +250,17 @@ class ConvertConvGeneric final | |
| SmallVector<OpFoldResult> kOffset(kBasis.size(), rewriter.getIndexAttr(0)); | ||
| SmallVector<OpFoldResult> mOffset(mBasis.size(), rewriter.getIndexAttr(0)); | ||
|
|
||
| SmallVector<int64_t> inputKPerm = | ||
| computeInputKPerm(inputMap, filterMap, convDims); | ||
|
|
||
| auto loc = linalgOp.getLoc(); | ||
| // Shape of the resulting tensor from im2col. | ||
| SmallVector<int64_t> colTensorShape; | ||
| for (int64_t dim : batchPos) { | ||
| colTensorShape.push_back(inputShape[dim]); | ||
| } | ||
| colTensorShape.append(mShape); | ||
| colTensorShape.append(kShape); | ||
| Value colTensor = rewriter.create<tensor::EmptyOp>( | ||
| loc, colTensorShape, inputType.getElementType()); | ||
| Value img2ColTensor = | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.