From 734f56f7386fd31a8122c2ee68775d9991a98c93 Mon Sep 17 00:00:00 2001 From: Nirvedh Meshram Date: Mon, 3 Mar 2025 09:52:53 -0600 Subject: [PATCH 1/2] [NFC][mlir][linalg] Make conv_3d_ncdhw_fcdhw consistent with 2D variant --- .../mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mlir/include/mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.yaml b/mlir/include/mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.yaml index 496a323249e85..2bae43f887b04 100644 --- a/mlir/include/mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.yaml +++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.yaml @@ -4072,12 +4072,12 @@ structured_op: !LinalgStructuredOpConfig indexing_maps: !LinalgIndexingMapsConfig static_indexing_maps: - affine_map<(d0, d1, d2, d3, d4, d5, d6, d7, d8)[s0, s1, s2, s3, s4, s5, s6, - s7, s8, s9, s10, s11, s12, s13, s14] -> (d0, d8, d1 * s3 + d5 * s5, d2 * s7 - + d6 * s9, d3 * s11 + d7 * s13)> + s7, s8, s9, s10, s11, s12, s13, s14] -> (d0, d8, d2 * s3 + d5 * s5, d3 * s7 + + d6 * s9, d4 * s11 + d7 * s13)> - affine_map<(d0, d1, d2, d3, d4, d5, d6, d7, d8)[s0, s1, s2, s3, s4, s5, s6, - s7, s8, s9, s10, s11, s12, s13, s14] -> (d4, d8, d5, d6, d7)> + s7, s8, s9, s10, s11, s12, s13, s14] -> (d1, d8, d5, d6, d7)> - affine_map<(d0, d1, d2, d3, d4, d5, d6, d7, d8)[s0, s1, s2, s3, s4, s5, s6, - s7, s8, s9, s10, s11, s12, s13, s14] -> (d0, d4, d1, d2, d3)> + s7, s8, s9, s10, s11, s12, s13, s14] -> (d0, d1, d2, d3, d4)> iterator_types: - parallel - parallel From c92ba1061d09ff28af5c2400e78d091b3a14cf61 Mon Sep 17 00:00:00 2001 From: Nirvedh Meshram Date: Mon, 3 Mar 2025 14:03:30 -0600 Subject: [PATCH 2/2] fix input channel position in maps --- .../mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mlir/include/mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.yaml b/mlir/include/mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.yaml index 2bae43f887b04..b44af2defc3e4 100644 --- a/mlir/include/mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.yaml +++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgNamedStructuredOps.yaml @@ -4072,10 +4072,10 @@ structured_op: !LinalgStructuredOpConfig indexing_maps: !LinalgIndexingMapsConfig static_indexing_maps: - affine_map<(d0, d1, d2, d3, d4, d5, d6, d7, d8)[s0, s1, s2, s3, s4, s5, s6, - s7, s8, s9, s10, s11, s12, s13, s14] -> (d0, d8, d2 * s3 + d5 * s5, d3 * s7 - + d6 * s9, d4 * s11 + d7 * s13)> + s7, s8, s9, s10, s11, s12, s13, s14] -> (d0, d5, d2 * s3 + d6 * s5, d3 * s7 + + d7 * s9, d4 * s11 + d8 * s13)> - affine_map<(d0, d1, d2, d3, d4, d5, d6, d7, d8)[s0, s1, s2, s3, s4, s5, s6, - s7, s8, s9, s10, s11, s12, s13, s14] -> (d1, d8, d5, d6, d7)> + s7, s8, s9, s10, s11, s12, s13, s14] -> (d1, d5, d6, d7, d8)> - affine_map<(d0, d1, d2, d3, d4, d5, d6, d7, d8)[s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14] -> (d0, d1, d2, d3, d4)> iterator_types: