Update Linalg header from "LinalgOps.h" to "Linalg.h". (iree-org#119)

Update the Linalg headers after https://reviews.llvm.org/D115728 and bumping the LLVM version.
shabalind · Dec 15, 2021 · d18325f · d18325f
1 parent 789ca6c
commit d18325f
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 16 deletions.
diff --git a/experimental/ModelBuilder/ModelBuilder.cpp b/experimental/ModelBuilder/ModelBuilder.cpp
@@ -11,7 +11,7 @@
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/GPU/GPUDialect.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/OpenMP/OpenMPDialect.h"
 #include "mlir/Dialect/SCF/SCF.h"

diff --git a/experimental/ModelBuilder/ModelBuilder.h b/experimental/ModelBuilder/ModelBuilder.h
@@ -41,7 +41,7 @@
 
 #include "mlir/Dialect/GPU/GPUDialect.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/Math/IR/Math.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/SCF/SCF.h"

diff --git a/include/Dialects/LinalgExt/PassDetail.h b/include/Dialects/LinalgExt/PassDetail.h
@@ -11,7 +11,7 @@
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Async/IR/Async.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/SCF/SCF.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"

diff --git a/include/Dialects/LinalgTransform/LinalgTransformOps.h b/include/Dialects/LinalgTransform/LinalgTransformOps.h
@@ -9,7 +9,7 @@
 #ifndef MLIR_DIALECT_LINALG_IR_LINALGTRANSFORMOPS_H
 #define MLIR_DIALECT_LINALG_IR_LINALGTRANSFORMOPS_H
 
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/IR/OpDefinition.h"
 
 #include "Dialects/LinalgTransform/LinalgTransformOpsDialect.h.inc"

diff --git a/lib/Dialects/LinalgExt/Transforms/InParallelToAsync.cpp b/lib/Dialects/LinalgExt/Transforms/InParallelToAsync.cpp
@@ -17,7 +17,7 @@
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
 #include "mlir/Dialect/Async/IR/Async.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/SCF/SCF.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
 #include "mlir/IR/AffineExpr.h"

diff --git a/lib/Dialects/LinalgExt/Transforms/InParallelToSequentialFor.cpp b/lib/Dialects/LinalgExt/Transforms/InParallelToSequentialFor.cpp
@@ -15,7 +15,7 @@
 #include "Transforms/Utils.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/SCF/SCF.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
 #include "mlir/IR/AffineExpr.h"

diff --git a/lib/Dialects/LinalgExt/Transforms/TileToInParallel.cpp b/lib/Dialects/LinalgExt/Transforms/TileToInParallel.cpp
@@ -16,7 +16,7 @@
 #include "Transforms/Utils.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/SCF/SCF.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
 #include "mlir/IR/AffineExpr.h"
@@ -79,7 +79,7 @@ struct TileOpToInParallelRewriter
         ab.mul(AV(i).bind(inParallelOp.getThreadIndex()), AV(M).bind(step));
     // clang-format off
     Value size = ab.min(
-      ValueRange{ab.sub(AV(i).bind(totalSize), AV(j).bind(offset)), 
+      ValueRange{ab.sub(AV(i).bind(totalSize), AV(j).bind(offset)),
       step});
     // clang-format on
 

diff --git a/lib/Dialects/LinalgExt/Transforms/TileToSequentialFor.cpp b/lib/Dialects/LinalgExt/Transforms/TileToSequentialFor.cpp
@@ -13,7 +13,7 @@
 #include "Transforms/Utils.h"
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/SCF/SCF.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
 #include "mlir/IR/AffineExpr.h"
@@ -73,7 +73,7 @@ struct TileOpToSCFRewriter : public OpRewritePattern<linalg_ext::TileOp> {
     Value offset = forOp.getInductionVar();
     // clang-format off
     Value size = ab.min(
-      ValueRange{ab.sub(AV(i).bind(totalSize), AV(j).bind(offset)), 
+      ValueRange{ab.sub(AV(i).bind(totalSize), AV(j).bind(offset)),
       step});
     // clang-format on
     SmallVector<Value> implicitSubtensorExtracts;

diff --git a/lib/Dialects/LinalgExt/Transforms/TilingExternalModels.cpp b/lib/Dialects/LinalgExt/Transforms/TilingExternalModels.cpp
@@ -9,7 +9,7 @@
 #include "Dialects/LinalgExt/Passes.h"
 
 #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/Linalg/Utils/Utils.h"
 #include "mlir/Interfaces/TilingInterface.h"
 #include "llvm/ADT/STLExtras.h"

diff --git a/lib/Dialects/VectorExt/Transform/VectorMaskingUtils.cpp b/lib/Dialects/VectorExt/Transform/VectorMaskingUtils.cpp
@@ -9,7 +9,7 @@
 #include "Dialects/VectorExt/VectorMaskingUtils.h"
 #include "Dialects/VectorExt/VectorExtOps.h"
 #include "VisitorUtils.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/Vector/VectorOps.h"
 #include "mlir/IR/AffineMap.h"
 #include "mlir/Support/LogicalResult.h"

diff --git a/lib/LinalgTensorCodegenDriver.cpp b/lib/LinalgTensorCodegenDriver.cpp
@@ -29,7 +29,7 @@
 #include "mlir/Dialect/Linalg/ComprehensiveBufferize/SCFInterfaceImpl.h"
 #include "mlir/Dialect/Linalg/ComprehensiveBufferize/TensorInterfaceImpl.h"
 #include "mlir/Dialect/Linalg/ComprehensiveBufferize/VectorInterfaceImpl.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/Linalg/Passes.h"
 #include "mlir/Dialect/Linalg/Transforms/CodegenStrategy.h"
 #include "mlir/Dialect/Linalg/Transforms/Hoisting.h"

diff --git a/lib/Transforms/FuseFillIntoReduction.cpp b/lib/Transforms/FuseFillIntoReduction.cpp
@@ -9,7 +9,7 @@
 #include "Transforms/PassDetail.h"
 #include "Transforms/Passes.h"
 #include "Transforms/Transforms.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/SCF/SCF.h"
 #include "mlir/Dialect/Tensor/IR/Tensor.h"
 

diff --git a/pinned-llvm-version b/pinned-llvm-version
@@ -1 +1 @@
-7787a8f1b7077d9efb53f5023fe044b70ad527b4
+b88f4f271bb3e18b0676f1a21caa2450fc0eeb88
diff --git a/test/lib/Dialect/VectorExt/TestVectorMaskingUtils.cpp b/test/lib/Dialect/VectorExt/TestVectorMaskingUtils.cpp
@@ -12,7 +12,7 @@
 
 #include "Dialects/VectorExt/VectorExtOps.h"
 #include "Dialects/VectorExt/VectorMaskingUtils.h"
-#include "mlir/Dialect/Linalg/IR/LinalgOps.h"
+#include "mlir/Dialect/Linalg/IR/Linalg.h"
 #include "mlir/Dialect/Vector/VectorOps.h"
 #include "mlir/IR/Visitors.h"
 #include "mlir/Pass/Pass.h"