Bump IREE to 05bbcf1385146d075829cd940a52bf06961614d0

nod-ai · Oct 17, 2024 · 7402884 · 7402884
1 parent 79e5983
commit 7402884
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/...iler/plugins/target/AMD-AIE/iree-amd-aie/Test/transform_dialect/matmul_fill_spec_pad.mlir b/...iler/plugins/target/AMD-AIE/iree-amd-aie/Test/transform_dialect/matmul_fill_spec_pad.mlir
@@ -53,7 +53,7 @@ module attributes { transform.with_named_sequence } {
     %padded, %pad, %__ = transform.structured.pad %tiled_matmul {
       padding_values=[0 : i32, 0 : i32, 0 : i32],
       padding_dimensions=[0, 1, 2],
-      pack_paddings=[1, 1, 1],
+      nofold_flags=[1, 1, 1],
       copy_back_op="linalg.copy"
     } : (!transform.any_op) -> (!transform.any_op, !transform.any_op, !transform.any_op)
     %pad_dps = transform.structured.rewrite_in_destination_passing_style %pad : (!transform.any_op) -> !transform.any_op
@@ -89,7 +89,7 @@ module attributes { transform.with_named_sequence } {
     %padded_1, %pad_1, %_ = transform.structured.pad %tiled_matmul_1 {
       padding_values=[0 : i32, 0 : i32, 0 : i32],
       padding_dimensions=[0, 1, 2],
-      pack_paddings=[0, 0, 1],
+      nofold_flags=[0, 0, 1],
       copy_back_op="linalg.copy"
     } : (!transform.any_op) -> (!transform.any_op, !transform.any_op, !transform.any_op)
     %pad_1_dps = transform.structured.rewrite_in_destination_passing_style %pad_1 : (!transform.any_op) -> !transform.any_op
@@ -114,7 +114,7 @@ module attributes { transform.with_named_sequence } {
     %padded_reduction, %pad_reduction, %___ = transform.structured.pad %tiled_reduction {
       padding_values=[0 : i32, 0 : i32, 0 : i32],
       padding_dimensions=[0, 1, 2],
-      pack_paddings=[1, 1, 0],
+      nofold_flags=[1, 1, 0],
       copy_back_op="linalg.copy"
     } : (!transform.any_op) -> (!transform.any_op, !transform.any_op, !transform.any_op)
     %pad_2_dps = transform.structured.rewrite_in_destination_passing_style %pad_reduction : (!transform.any_op) -> !transform.any_op

diff --git a/...plugins/target/AMD-AIE/iree-amd-aie/Test/transform_dialect/matmul_fill_spec_pad_pack.mlir b/...plugins/target/AMD-AIE/iree-amd-aie/Test/transform_dialect/matmul_fill_spec_pad_pack.mlir
@@ -52,7 +52,7 @@ module attributes { transform.with_named_sequence } {
     %padded, %pad, %__ = transform.structured.pad %tiled_matmul {
       padding_values=[0 : i32, 0 : i32, 0 : i32],
       padding_dimensions=[0, 1, 2],
-      pack_paddings=[1, 1, 1],
+      nofold_flags=[1, 1, 1],
       copy_back_op="linalg.copy"
     } : (!transform.any_op) -> (!transform.any_op, !transform.any_op, !transform.any_op)
     %pad_dps = transform.structured.rewrite_in_destination_passing_style %pad : (!transform.any_op) -> !transform.any_op

diff --git a/...ns/target/AMD-AIE/iree-amd-aie/Test/transform_dialect/matmul_fill_spec_pad_pack_peel.mlir b/...ns/target/AMD-AIE/iree-amd-aie/Test/transform_dialect/matmul_fill_spec_pad_pack_peel.mlir
@@ -61,7 +61,7 @@ module attributes { transform.with_named_sequence } {
       padding_values=[0 : i32, 0 : i32, 0 : i32],
       padding_dimensions=[0, 1, 2],
       pad_to_multiple_of=[64, 64, 64],
-      pack_paddings=[1, 1, 1],
+      nofold_flags=[1, 1, 1],
       copy_back_op="linalg.copy"
     } : (!transform.any_op) -> (!transform.any_op, !transform.any_op, !transform.any_op)
     %pad_dps = transform.structured.rewrite_in_destination_passing_style %pad : (!transform.any_op) -> !transform.any_op

diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEPad.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEPad.cpp
@@ -62,11 +62,11 @@ getFirstLevelLinalgPaddingOptions(IRRewriter &rewriter,
   // For the operations with 2 input and 1 output operands, the packPadding
   // option should be [1, 1, 1]. For `linalg.conv_2d_nhwc_hwcf_q` op, there are
   // 5 operands, and the packPadding options should be [1, 1, 0, 0, 1].
-  SmallVector<bool> packPaddings(linalgOp->getNumOperands(), false);
-  packPaddings[0] = true;
-  packPaddings[1] = true;
-  packPaddings.back() = true;
-  options.packPaddings = packPaddings;
+  SmallVector<bool> nofoldFlags(linalgOp->getNumOperands(), false);
+  nofoldFlags[0] = true;
+  nofoldFlags[1] = true;
+  nofoldFlags.back() = true;
+  options.nofoldFlags = nofoldFlags;
 
   options.paddingDimensions = getPaddingDimensions(linalgOp);
   SmallVector<int64_t> padToMultipleOf(options.paddingDimensions.size(), 1);
@@ -87,9 +87,9 @@ getSecondLevelLinalgPaddingOptions(IRRewriter &rewriter,
   options.paddingValues = paddingValues;
 
   // In the second level, we only pad the output operand.
-  SmallVector<bool> packPaddings(linalgOp->getNumOperands(), false);
-  packPaddings.back() = true;
-  options.packPaddings = packPaddings;
+  SmallVector<bool> nofoldFlags(linalgOp->getNumOperands(), false);
+  nofoldFlags.back() = true;
+  options.nofoldFlags = nofoldFlags;
 
   options.paddingDimensions = getPaddingDimensions(linalgOp);
   SmallVector<int64_t> padToMultipleOf(options.paddingDimensions.size(), 1);
@@ -110,10 +110,10 @@ getThirdLevelLinalgPaddingOptions(IRRewriter &rewriter,
   options.paddingValues = paddingValues;
 
   // In the third level, we only pad the input operands.
-  SmallVector<bool> packPaddings(linalgOp->getNumOperands(), false);
-  packPaddings[0] = true;
-  packPaddings[1] = true;
-  options.packPaddings = packPaddings;
+  SmallVector<bool> nofoldFlags(linalgOp->getNumOperands(), false);
+  nofoldFlags[0] = true;
+  nofoldFlags[1] = true;
+  options.nofoldFlags = nofoldFlags;
 
   options.paddingDimensions = getPaddingDimensions(linalgOp);
   SmallVector<int64_t> padToMultipleOf(options.paddingDimensions.size(), 1);

diff --git a/third_party/iree b/third_party/iree