Remove inversePerm and invertPermutation, add check-lines

Author: banach-space

mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp

@@ -5765,33 +5765,6 @@ ArrayRef<int64_t> UnPackOp::getAllOuterDims() {
   return getSourceType().getShape().take_front(destRank);
 }
 
-static SmallVector<int64_t>
-inversePerm(const llvm::SmallVector<int64_t> &perm) {
-  const size_t n = perm.size();
-  llvm::SmallVector<int64_t> invPerm(n);
-
-  for (size_t i = 0; i < n; ++i) {
-    assert(perm[i] >= 0 && static_cast<size_t>(perm[i]) < n &&
-           "Invalid permutation entry");
-    invPerm[perm[i]] = i;
-  }
-
-  return invPerm;
-}
-
-/// Compute the inverse of a permutation. Assumes `perm` is a valid permutation
-/// of 0...n-1.
-static SmallVector<int64_t> invertPermutation(SmallVector<int64_t> perm) {
-  const size_t permLen = perm.size();
-  llvm::SmallVector<int64_t> inv(permLen);
-  for (size_t i = 0; i < permLen; ++i) {
-    assert(perm[i] >= 0 && static_cast<size_t>(perm[i]) < permLen &&
-           "Invalid permutation entry");
-    inv[perm[i]] = i;
-  }
-  return inv;
-}
-
 SmallVector<int64_t> UnPackOp::getTiledOuterDims() {
   auto innerDimsPos = getInnerDimsPos();
   SmallVector<int64_t> outerDims(getAllOuterDims());
@@ -5800,7 +5773,7 @@ SmallVector<int64_t> UnPackOp::getTiledOuterDims() {
   // Invert outer-dims-perm and use it to restore the original order
   // of the outer dims.
   SmallVector<int64_t> outerDimPermInv(getOuterDimsPerm());
-  inversePerm(outerDimPermInv);
+  invertPermutationVector(outerDimPermInv);
   if (!outerDimPermInv.empty())
     applyPermutationToVector(outerDims, outerDimPermInv);
 

mlir/test/Dialect/Linalg/decompose-unpack.mlir

@@ -218,3 +218,5 @@ func.func @negative_non_unit_tiled_outer_dim(%src: tensor<1x126x1x1x8xf32>, %des
 
   return %unpack : tensor<1x1x1x1001xf32>
 }
+// CHECK-LABEL: @negative_non_unit_tiled_outer_dim(
+// CHECK: linalg.unpack