Removing use if the iree_input dialect from linalgext. (#20255)

Signed-off-by: Elias Joseph <[email protected]>

Author: benvanik

compiler/src/iree/compiler/Dialect/LinalgExt/Transforms/BUILD.bazel

@@ -52,7 +52,7 @@ iree_compiler_cc_library(
         ":PassesIncGen",
         "//compiler/src/iree/compiler/Dialect/LinalgExt/IR",
         "//compiler/src/iree/compiler/Dialect/LinalgExt/Utils",
-        "//llvm-external-projects/iree-dialects:IREEInputDialect",
+        "//compiler/src/iree/compiler/Dialect/Util/IR",
         "@llvm-project//llvm:Support",
         "@llvm-project//mlir:AffineDialect",
         "@llvm-project//mlir:AffineUtils",

compiler/src/iree/compiler/Dialect/LinalgExt/Transforms/CMakeLists.txt

@@ -41,7 +41,6 @@ iree_cc_library(
     "TransposeFusion.cpp"
   DEPS
     ::PassesIncGen
-    IREEInputDialect
     LLVMSupport
     MLIRAffineDialect
     MLIRAffineUtils
@@ -72,6 +71,7 @@ iree_cc_library(
     MLIRTransforms
     iree::compiler::Dialect::LinalgExt::IR
     iree::compiler::Dialect::LinalgExt::Utils
+    iree::compiler::Dialect::Util::IR
   PUBLIC
 )
 

compiler/src/iree/compiler/Dialect/LinalgExt/Transforms/PadContractionToBlockSize.cpp

@@ -4,9 +4,9 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree-dialects/Dialect/Input/InputDialect.h"
-#include "iree-dialects/Dialect/Input/InputOps.h"
 #include "iree/compiler/Dialect/LinalgExt/Transforms/Passes.h"
+#include "iree/compiler/Dialect/Util/IR/UtilDialect.h"
+#include "iree/compiler/Dialect/Util/IR/UtilOps.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
 #include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
@@ -63,7 +63,7 @@ static bool padTensor(Location loc, OpOperand *operand,
       // Dynamic dim.
       Value inputDimValue = builder.create<tensor::DimOp>(loc, original, i);
       Value alignedDim =
-          builder.create<IREE::Input::AlignOp>(loc, inputDimValue, alignment);
+          builder.create<IREE::Util::AlignOp>(loc, inputDimValue, alignment);
       newPaddingSizes[i] = alignedDim;
       needsPad = true;
     }
@@ -93,7 +93,7 @@ struct PadContractionToBlockSizePass final
       PadContractionToBlockSizePass>::PadContractionToBlockSizePassBase;
 
   void getDependentDialects(DialectRegistry &registry) const override {
-    registry.insert<IREE::Input::IREEInputDialect>();
+    registry.insert<IREE::Util::UtilDialect>();
   }
 
   void runOnOperation() override {

compiler/src/iree/compiler/Dialect/LinalgExt/Transforms/test/pad_contraction_to_block_size.mlir

@@ -47,7 +47,7 @@ func.func @pad_matmul_noop(%arg0 : tensor<256x512xf32>, %arg1 : tensor<512x1024x
 // CHECK:           %[[LHS_DIM0:.*]] = arith.constant 0 : index
 // CHECK:           %[[LHS_DIM:.*]] = tensor.dim %arg0, %[[LHS_DIM0]] : tensor<?x512xf32>
 // CHECK:           %[[LHS_ALIGN:.*]] = arith.constant 16 : index
-// CHECK:           %[[LHS_DIM_ALIGNED:.*]] = iree_input.align %[[LHS_DIM]], %[[LHS_ALIGN]] : index
+// CHECK:           %[[LHS_DIM_ALIGNED:.*]] = util.align %[[LHS_DIM]], %[[LHS_ALIGN]] : index
 // CHECK:           %[[LHS_ZERO:.*]] = arith.constant 0.000000e+00 : f32
 // CHECK:           %[[LHS_PADDED:.*]] = tensor.pad %arg0 low[0, 0] high{{\[}}%[[LHS_DIM_ALIGNED]], 0]   {
 // CHECK:           } : tensor<?x512xf32> to tensor<?x512xf32>
@@ -73,12 +73,12 @@ func.func @pad_matmul_dynamic_row(%arg0 : tensor<?x512xf32>, %arg1 : tensor<512x
 // Should trigger column alignment (32).
 // Pad RHS:
 // CHECK:           %[[RHS_ALIGNMENT:.*]] = arith.constant 32 : index
-// CHECK:           %[[RHS_ALIGNED_DIM:.*]] = iree_input.align %{{.*}}, %[[RHS_ALIGNMENT]] : index
+// CHECK:           %[[RHS_ALIGNED_DIM:.*]] = util.align %{{.*}}, %[[RHS_ALIGNMENT]] : index
 // CHECK:           %[[RHS_PADDED:.*]] = tensor.pad %arg1 low[0, 0] high[0, %[[RHS_ALIGNED_DIM]]]  {
 // CHECK:           } : tensor<512x?xf32> to tensor<512x?xf32>
 // Pad Output:
 // CHECK:           %[[OUTPUT_ALIGNMENT:.*]] = arith.constant 32 : index
-// CHECK:           %[[OUTPUT_ALIGNED_DIM:.*]] = iree_input.align %{{.*}}, %[[OUTPUT_ALIGNMENT]] : index
+// CHECK:           %[[OUTPUT_ALIGNED_DIM:.*]] = util.align %{{.*}}, %[[OUTPUT_ALIGNMENT]] : index
 // CHECK:           %[[OUTPUT_PADDED:.*]] = tensor.pad %arg2 low[0, 0] high[0, %[[OUTPUT_ALIGNED_DIM]]]  {
 // CHECK:           } : tensor<256x?xf32> to tensor<256x?xf32>
 // Matmul: