Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 0 additions & 122 deletions mlir/lib/Dialect/Linalg/Utils/Utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -597,9 +597,6 @@ class ConvMatcherBuilder {
// Matchers for specific convolution operation.
//===----------------------------------------------------------------------===//

// #inputMap = affine_map<(W, w) -> (W + w)>
// #filterMap = affine_map<(W, w) -> (w)>
// #outputMap = affine_map<(W, w) -> (W)>
template <>
bool isaConvolutionOpOfType<linalg::Conv1DOp>(LinalgOp op,
SmallVector<int64_t> *dilations,
Expand All @@ -621,9 +618,6 @@ bool isaConvolutionOpOfType<linalg::Conv1DOp>(LinalgOp op,
.matchBody();
}

// #inputMap = affine_map<(N, W, F, w, c) -> (N, W + w, c)>
// #filterMap = affine_map<(N, W, F, w, c) -> (w, c, F)>
// #outputMap = affine_map<(N, W, F, w, c) -> (N, W, F)>
template <>
bool isaConvolutionOpOfType<linalg::Conv1DNwcWcfOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand All @@ -648,9 +642,6 @@ bool isaConvolutionOpOfType<linalg::Conv1DNwcWcfOp>(
.matchBody();
}

// #inputMap = affine_map<(N, F, W, c, w) -> (N, c, W + w)>
// #filterMap = affine_map<(N, F, W, c, w) -> (F, c, w)>
// #outputMap = affine_map<(N, F, W, c, w) -> (N, F, W)>
template <>
bool isaConvolutionOpOfType<linalg::Conv1DNcwFcwOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand All @@ -675,9 +666,6 @@ bool isaConvolutionOpOfType<linalg::Conv1DNcwFcwOp>(
.matchBody();
}

// #inputMap = affine_map<(H, W, h, w) -> (H + h, W + w)>
// #filterMap = affine_map<(H, W, h, w) -> (h, w)>
// #outputMap = affine_map<(H, W, h, w) -> (H, W)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DOp>(LinalgOp op,
SmallVector<int64_t> *dilations,
Expand All @@ -702,9 +690,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DOp>(LinalgOp op,
.matchBody();
}

// #inputMap = affine_map<(N, H, W, F, h, w, c) -> (N, H + h, W + w, c)>
// #filterMap = affine_map<(N, H, W, F, h, w, c) -> (h, w, c, F)>
// #outputMap = affine_map<(N, H, W, F, h, w, c) -> (N, H, W, F)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DNhwcHwcfOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -732,10 +717,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DNhwcHwcfOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, F, h, w, c) -> (N, H + h, W + w, c)>
// #filterMap = affine_map<(N, H, W, F, h, w, c) -> (h, w, c, F)>
// #scalarMap = affine_map<(N, H, W, F, h, w, c) -> ()>
// #outputMap = affine_map<(N, H, W, F, h, w, c) -> (N, H, W, F)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DNhwcHwcfQOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -765,9 +746,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DNhwcHwcfQOp>(
.matchBody(/*containsZeroPointOffset=*/true);
}

// #inputMap = affine_map<(N, H, W, F, h, w, c) -> (N, H + h, W + w, c)>
// #filterMap = affine_map<(N, H, W, F, h, w, c) -> (F, h, w, c)>
// #outputMap = affine_map<(N, H, W, F, h, w, c) -> (N, H, W, F)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DNhwcFhwcOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -795,10 +773,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DNhwcFhwcOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, F, h, w, c) -> (N, H + h, W + w, c)>
// #filterMap = affine_map<(N, H, W, F, h, w, c) -> (F, h, w, c)>
// #scalarMap = affine_map<(N, H, W, F, h, w, c) -> ()>
// #outputMap = affine_map<(N, H, W, F, h, w, c) -> (N, H, W, F)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DNhwcFhwcQOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -828,9 +802,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DNhwcFhwcQOp>(
.matchBody(/*containsZeroPointOffset=*/true);
}

// #inputMap = affine_map<(N, F, H, W, c, h, w) -> (N, c, H + h, W + w)>
// #filterMap = affine_map<(N, F, H, W, c, h, w) -> (F, c, h, w)>
// #outputMap = affine_map<(N, F, H, W, c, h, w) -> (N, F, H, W)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DNchwFchwOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -858,10 +829,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DNchwFchwOp>(
.matchBody();
}

// #inputMap = affine_map<(N, F, H, W, c, h, w) -> (N, c, H + h, W + w)>
// #filterMap = affine_map<(N, F, H, W, c, h, w) -> (F, c, h, w)>
// #scalarMap = affine_map<(N, F, H, W, c, h, w) -> ()>
// #outputMap = affine_map<(N, F, H, W, c, h, w) -> (N, F, H, W)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DNchwFchwQOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -891,9 +858,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DNchwFchwQOp>(
.matchBody(/*containsZeroPointOffset=*/true);
}

// #inputMap = affine_map<(N, G, F, H, W, c, h, w) -> (N, G, c, H + h, W + w)>
// #filterMap = affine_map<(N, G, F, H, W, c, h, w) -> (F, G, c, h, w)>
// #outputMap = affine_map<(N, G, F, H, W, c, h, w) -> (N, G, F, H, W)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DNgchwFgchwOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -923,9 +887,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DNgchwFgchwOp>(
.matchBody();
}

// #inputMap = affine_map<(N, G, F, H, W, c, h, w) -> (N, G, c, H + h, W + w)>
// #filterMap = affine_map<(N, G, F, H, W, c, h, w) -> (G, F, c, h, w)>
// #outputMap = affine_map<(N, G, F, H, W, c, h, w) -> (N, G, F, H, W)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DNgchwGfchwOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -955,10 +916,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DNgchwGfchwOp>(
.matchBody();
}

// #inputMap = affine_map<(N, G, F, H, W, c, h, w) -> (N, G, c, H + h, W + w)>
// #filterMap = affine_map<(N, G, F, H, W, c, h, w) -> (G, F, c, h, w)>
// #scalarMap = affine_map<(N, G, F, H, W, c, h, w) -> ()>
// #outputMap = affine_map<(N, G, F, H, W, c, h, w) -> (N, G, F, H, W)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DNgchwGfchwQOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -990,9 +947,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DNgchwGfchwQOp>(
.matchBody(/*containsZeroPointOffset=*/true);
}

// #inputMap = affine_map<(N, H, W, G, F, h, w, c) -> (N, H + h, W + w, G, c)>
// #filterMap = affine_map<(N, H, W, G, F, h, w, c) -> (G, F, h, w, c)>
// #outputMap = affine_map<(N, H, W, G, F, h, w, c) -> (N, H, W, G, F)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DNhwgcGfhwcOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1022,10 +976,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DNhwgcGfhwcOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, G, F, h, w, c) -> (N, H + h, W + w, G, c)>
// #filterMap = affine_map<(N, H, W, G, F, h, w, c) -> (G, F, h, w, c)>
// #scalarMap = affine_map<(N, H, W, G, F, h, w, c) -> ()>
// #outputMap = affine_map<(N, H, W, G, F, h, w, c) -> (N, H, W, G, F)>
template <>
bool isaConvolutionOpOfType<linalg::Conv2DNhwgcGfhwcQOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1057,9 +1007,6 @@ bool isaConvolutionOpOfType<linalg::Conv2DNhwgcGfhwcQOp>(
.matchBody(/*containsZeroPointOffset=*/true);
}

// #inputMap = affine_map<(D, H, W, d, h, w) -> (D + d, H + h, W + w)>
// #filterMap = affine_map<(D, H, W, d, h, w) -> (d, h, w)>
// #outputMap = affine_map<(D, H, W, d, h, w) -> (D, H, W)>
template <>
bool isaConvolutionOpOfType<linalg::Conv3DOp>(LinalgOp op,
SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1088,10 +1035,6 @@ bool isaConvolutionOpOfType<linalg::Conv3DOp>(LinalgOp op,
.matchBody();
}

// #inputMap = affine_map<(N, D, H, W, F, d, h, w, c)
// -> (N, D + d, H + h, W + w, c)>
// #filterMap = affine_map<(N, D, H, W, F, d, h, w, c) -> (d, h, w, c, F)>
// #outputMap = affine_map<(N, D, H, W, F, d, h, w, c) -> (N, D, H, W, F)>
template <>
bool isaConvolutionOpOfType<linalg::Conv3DNdhwcDhwcfOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1123,11 +1066,6 @@ bool isaConvolutionOpOfType<linalg::Conv3DNdhwcDhwcfOp>(
.matchBody();
}

// #inputMap = affine_map<(N, D, H, W, F, d, h, w, c)
// -> (N, D + d, H + h, W + w, c)>
// #filterMap = affine_map<(N, D, H, W, F, d, h, w, c) -> (d, h, w, c, F)>
// #scalarMap = affine_map<(N, D, H, W, F, d, h, w, c) -> ()>
// #outputMap = affine_map<(N, D, H, W, F, d, h, w, c) -> (N, D, H, W, F)>
template <>
bool isaConvolutionOpOfType<linalg::Conv3DNdhwcDhwcfQOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1161,10 +1099,6 @@ bool isaConvolutionOpOfType<linalg::Conv3DNdhwcDhwcfQOp>(
.matchBody(/*containsZeroPointOffset=*/true);
}

// #inputMap = affine_map<(N, F, D, H, W, c, d, h, w)
// -> (N, c, D + d, H + h, W + w)>
// #filterMap = affine_map<(N, F, D, H, W, c, d, h, w) -> (F, c, d, h, w)>
// #outputMap = affine_map<(N, F, D, H, W, c, d, h, w) -> (N, F, D, H, W)>
template <>
bool isaConvolutionOpOfType<linalg::Conv3DNcdhwFcdhwOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1196,9 +1130,6 @@ bool isaConvolutionOpOfType<linalg::Conv3DNcdhwFcdhwOp>(
.matchBody();
}

// #inputMap = affine_map<(N, W, C, w) -> (N, C, W + w)>
// #filterMap = affine_map<(N, W, C, w) -> (C, w)>
// #outputMap = affine_map<(N, W, C, w) -> (N, C, W)>
template <>
bool isaConvolutionOpOfType<linalg::DepthwiseConv1DNcwCwOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand All @@ -1222,9 +1153,6 @@ bool isaConvolutionOpOfType<linalg::DepthwiseConv1DNcwCwOp>(
.matchBody();
}

// #inputMap = affine_map<(N, W, C, w) -> (N, W + w, C)>
// #filterMap = affine_map<(N, W, C, w) -> (w, C)>
// #outputMap = affine_map<(N, W, C, w) -> (N, W, C)>
template <>
bool isaConvolutionOpOfType<linalg::DepthwiseConv1DNwcWcOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand All @@ -1248,9 +1176,6 @@ bool isaConvolutionOpOfType<linalg::DepthwiseConv1DNwcWcOp>(
.matchBody();
}

// #inputMap = affine_map<(N, W, C, CM, w) -> (N, W + w, C)>
// #filterMap = affine_map<(N, W, C, CM, w) -> (w, C, CM)>
// #outputMap = affine_map<(N, W, C, CM, w) -> (N, W, C, CM)>
template <>
bool isaConvolutionOpOfType<linalg::DepthwiseConv1DNwcWcmOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand All @@ -1275,9 +1200,6 @@ bool isaConvolutionOpOfType<linalg::DepthwiseConv1DNwcWcmOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, C, h, w) -> (N, C, H + h, W + w)>
// #filterMap = affine_map<(N, H, W, C, h, w) -> (C, h, w)>
// #outputMap = affine_map<(N, H, W, C, h, w) -> (N, C, H, W)>
template <>
bool isaConvolutionOpOfType<linalg::DepthwiseConv2DNchwChwOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand All @@ -1304,9 +1226,6 @@ bool isaConvolutionOpOfType<linalg::DepthwiseConv2DNchwChwOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, C, h, w) -> (N, H + h, W + w, C)>
// #filterMap = affine_map<(N, H, W, C, h, w) -> (h, w, C)>
// #outputMap = affine_map<(N, H, W, C, h, w) -> (N, H, W, C)>
template <>
bool isaConvolutionOpOfType<linalg::DepthwiseConv2DNhwcHwcOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand All @@ -1333,10 +1252,6 @@ bool isaConvolutionOpOfType<linalg::DepthwiseConv2DNhwcHwcOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, C, h, w) -> (N, H + h, W + w, C)>
// #filterMap = affine_map<(N, H, W, C, h, w) -> (h, w, C)>
// #scalarMap = affine_map<(N, H, W, C, h, w) -> ()>
// #outputMap = affine_map<(N, H, W, C, h, w) -> (N, H, W, C)>
template <>
bool isaConvolutionOpOfType<linalg::DepthwiseConv2DNhwcHwcQOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1365,9 +1280,6 @@ bool isaConvolutionOpOfType<linalg::DepthwiseConv2DNhwcHwcQOp>(
.matchBody(/*containsZeroPointOffset=*/true);
}

// #inputMap = affine_map<(N, H, W, C, CM, h, w) -> (N, H + h, W + w, C)>
// #filterMap = affine_map<(N, H, W, C, CM, h, w) -> (h, w, C, CM)>
// #outputMap = affine_map<(N, H, W, C, CM, h, w) -> (N, H, W, C, CM)>
template <>
bool isaConvolutionOpOfType<linalg::DepthwiseConv2DNhwcHwcmOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1395,10 +1307,6 @@ bool isaConvolutionOpOfType<linalg::DepthwiseConv2DNhwcHwcmOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, C, CM, h, w) -> (N, H + h, W + w, C)>
// #filterMap = affine_map<(N, H, W, C, CM, h, w) -> (h, w, C, CM)>
// #scalarMap = affine_map<(N, H, W, C, CM, h, w) -> ()>
// #outputMap = affine_map<(N, H, W, C, CM, h, w) -> (N, H, W, C, CM)>
template <>
bool isaConvolutionOpOfType<linalg::DepthwiseConv2DNhwcHwcmQOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1428,12 +1336,6 @@ bool isaConvolutionOpOfType<linalg::DepthwiseConv2DNhwcHwcmQOp>(
.matchBody(/*containsZeroPointOffset=*/true);
}

// #inputMap = affine_map<(N, D, H, W, d, h, w, C)
// -> (N, D + d, H + h, W + w, C)>
// #filterMap = affine_map<(N, D, H, W, d, h, w, C)
// -> (d, h, w, C)>
// #outputMap = affine_map<(N, D, H, W, d, h, w, C)
// -> (N, D, H, W, C)>
template <>
bool isaConvolutionOpOfType<linalg::DepthwiseConv3DNdhwcDhwcOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1464,9 +1366,6 @@ bool isaConvolutionOpOfType<linalg::DepthwiseConv3DNdhwcDhwcOp>(
.matchBody();
}

// #inputMap = affine_map<(N, D, H, W, d, h, w, C) -> (N, C, D + d, H + h, W +
// w)> #filterMap = affine_map<(N, D, H, W, d, h, w, C) -> (C, d, h, w)>
// #outputMap = affine_map<(N, D, H, W, d, h, w, C) -> (N, C, D, H, W)>
template <>
bool isaConvolutionOpOfType<linalg::DepthwiseConv3DNcdhwCdhwOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1497,12 +1396,6 @@ bool isaConvolutionOpOfType<linalg::DepthwiseConv3DNcdhwCdhwOp>(
.matchBody();
}

// #inputMap = affine_map<(N, D, H, W, CM, d, h, w, C)
// -> (N, D + d, H + h, W + w, C)>
// #filterMap = affine_map<(N, D, H, W, CM, d, h, w, C)
// -> (d, h, w, C, CM)>
// #outputMap = affine_map<(N, D, H, W, CM, d, h, w, C)
// -> (N, D, H, W, C, CM)>
template <>
bool isaConvolutionOpOfType<linalg::DepthwiseConv3DNdhwcDhwcmOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1534,9 +1427,6 @@ bool isaConvolutionOpOfType<linalg::DepthwiseConv3DNdhwcDhwcmOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, C, h, w) -> (N, H + h, W + w, C)>
// #filterMap = affine_map<(N, H, W, C, h, w) -> (h, w)>
// #outputMap = affine_map<(N, H, W, C, h, w) -> (N, H, W, C)>
template <>
bool isaConvolutionOpOfType<linalg::PoolingNhwcMaxOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1564,9 +1454,6 @@ bool isaConvolutionOpOfType<linalg::PoolingNhwcMaxOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, C, h, w) -> (N, H + h, W + w, C)>
// #filterMap = affine_map<(N, H, W, C, h, w) -> (h, w)>
// #outputMap = affine_map<(N, H, W, C, h, w) -> (N, H, W, C)>
template <>
bool isaConvolutionOpOfType<linalg::PoolingNhwcMinOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1594,9 +1481,6 @@ bool isaConvolutionOpOfType<linalg::PoolingNhwcMinOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, C, h, w) -> (N, H + h, W + w, C)>
// #filterMap = affine_map<(N, H, W, C, h, w) -> (h, w)>
// #outputMap = affine_map<(N, H, W, C, h, w) -> (N, H, W, C)>
template <>
bool isaConvolutionOpOfType<linalg::PoolingNhwcSumOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1624,9 +1508,6 @@ bool isaConvolutionOpOfType<linalg::PoolingNhwcSumOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, C, h, w) -> (N, H + h, W + w, C)>
// #filterMap = affine_map<(N, H, W, C, h, w) -> (h, w)>
// #outputMap = affine_map<(N, H, W, C, h, w) -> (N, H, W, C)>
template <>
bool isaConvolutionOpOfType<linalg::PoolingNhwcMaxUnsignedOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down Expand Up @@ -1654,9 +1535,6 @@ bool isaConvolutionOpOfType<linalg::PoolingNhwcMaxUnsignedOp>(
.matchBody();
}

// #inputMap = affine_map<(N, H, W, C, h, w) -> (N, H + h, W + w, C)>
// #filterMap = affine_map<(N, H, W, C, h, w) -> (h, w)>
// #outputMap = affine_map<(N, H, W, C, h, w) -> (N, H, W, C)>
template <>
bool isaConvolutionOpOfType<linalg::PoolingNhwcMinUnsignedOp>(
LinalgOp op, SmallVector<int64_t> *dilations,
Expand Down