[MLIR] Continue renaming of "SideEffects"

MLIRSideEffects -> MLIRSideEffectInterfaces SideEffects.h -> SideEffectInterfaces.h SideEffects.cpp -> SideEffectInterface.cpp Note that I haven't renamed TableGen/SideEffects.h or TableGen/SideEffects.cpp find -name "*.h" -exec sed -i "s/SideEffects.h/SideEffectInterfaces.h/" "{}" \; find -name "CMakeLists.txt" -exec sed -i "s/MLIRSideEffects/MLIRSideEffectInterfaces/" "{}" \; Differential Revision: https://reviews.llvm.org/D79890
2020-05-13 10:27:19 -07:00 · 2020-05-13 10:27:19 -07:00 · eb623ae832
parent 802b427f20
commit eb623ae832
48 changed files with 54 additions and 54 deletions
--- a/mlir/examples/standalone/include/Standalone/StandaloneOps.h
+++ b/mlir/examples/standalone/include/Standalone/StandaloneOps.h
@ -11,7 +11,7 @@

 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 namespace mlir {
 namespace standalone {
--- a/mlir/examples/toy/Ch2/CMakeLists.txt
+++ b/mlir/examples/toy/Ch2/CMakeLists.txt
@ -22,5 +22,5 @@ target_link_libraries(toyc-ch2
    MLIRAnalysis
    MLIRIR
    MLIRParser
-    MLIRSideEffects
+    MLIRSideEffectInterfaces
    MLIRTransforms)
--- a/mlir/examples/toy/Ch2/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch2/include/toy/Dialect.h
@ -16,7 +16,7 @@

 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/Function.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 namespace mlir {
 namespace toy {
--- a/mlir/examples/toy/Ch3/CMakeLists.txt
+++ b/mlir/examples/toy/Ch3/CMakeLists.txt
@ -30,6 +30,6 @@ target_link_libraries(toyc-ch3
    MLIRIR
    MLIRParser
    MLIRPass
-    MLIRSideEffects
+    MLIRSideEffectInterfaces
    MLIRTransforms)

--- a/mlir/examples/toy/Ch3/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch3/include/toy/Dialect.h
@ -16,7 +16,7 @@

 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/Function.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 namespace mlir {
 namespace toy {
--- a/mlir/examples/toy/Ch4/CMakeLists.txt
+++ b/mlir/examples/toy/Ch4/CMakeLists.txt
@ -33,6 +33,6 @@ target_link_libraries(toyc-ch4
    MLIRIR
    MLIRParser
    MLIRPass
-    MLIRSideEffects
+    MLIRSideEffectInterfaces
    MLIRTransforms)

--- a/mlir/examples/toy/Ch4/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch4/include/toy/Dialect.h
@ -17,7 +17,7 @@
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/Function.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "toy/ShapeInferenceInterface.h"

 namespace mlir {
--- a/mlir/examples/toy/Ch5/CMakeLists.txt
+++ b/mlir/examples/toy/Ch5/CMakeLists.txt
@ -36,6 +36,6 @@ target_link_libraries(toyc-ch5
    MLIRIR
    MLIRParser
    MLIRPass
-    MLIRSideEffects
+    MLIRSideEffectInterfaces
    MLIRSupport
    MLIRTransforms)
--- a/mlir/examples/toy/Ch5/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch5/include/toy/Dialect.h
@ -17,7 +17,7 @@
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/Function.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "toy/ShapeInferenceInterface.h"

 namespace mlir {
--- a/mlir/examples/toy/Ch6/CMakeLists.txt
+++ b/mlir/examples/toy/Ch6/CMakeLists.txt
@ -44,7 +44,7 @@ target_link_libraries(toyc-ch6
    MLIRLLVMIR
    MLIRParser
    MLIRPass
-    MLIRSideEffects
+    MLIRSideEffectInterfaces
    MLIRSupport
    MLIRTargetLLVMIR
    MLIRTransforms
--- a/mlir/examples/toy/Ch6/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch6/include/toy/Dialect.h
@ -17,7 +17,7 @@
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/Function.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "toy/ShapeInferenceInterface.h"

 namespace mlir {
--- a/mlir/examples/toy/Ch7/CMakeLists.txt
+++ b/mlir/examples/toy/Ch7/CMakeLists.txt
@ -43,7 +43,7 @@ target_link_libraries(toyc-ch7
    MLIRIR
    MLIRParser
    MLIRPass
-    MLIRSideEffects
+    MLIRSideEffectInterfaces
    MLIRTargetLLVMIR
    MLIRTransforms
    )
--- a/mlir/examples/toy/Ch7/include/toy/Dialect.h
+++ b/mlir/examples/toy/Ch7/include/toy/Dialect.h
@ -17,7 +17,7 @@
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/Function.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "toy/ShapeInferenceInterface.h"

 namespace mlir {
--- a/mlir/include/mlir/Dialect/AVX512/AVX512Dialect.h
+++ b/mlir/include/mlir/Dialect/AVX512/AVX512Dialect.h
@ -15,7 +15,7 @@

 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 namespace mlir {
 namespace avx512 {
--- a/mlir/include/mlir/Dialect/Affine/IR/AffineOps.h
+++ b/mlir/include/mlir/Dialect/Affine/IR/AffineOps.h
@ -20,7 +20,7 @@
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/Interfaces/LoopLikeInterface.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 namespace mlir {
 class AffineApplyOp;
--- a/mlir/include/mlir/Dialect/GPU/GPUDialect.h
+++ b/mlir/include/mlir/Dialect/GPU/GPUDialect.h
@ -19,7 +19,7 @@
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/OpImplementation.h"
 #include "mlir/IR/SymbolTable.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 namespace mlir {
 class FuncOp;
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMDialect.h
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMDialect.h
@ -21,7 +21,7 @@
 #include "mlir/IR/TypeSupport.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "llvm/IR/DerivedTypes.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
--- a/mlir/include/mlir/Dialect/LLVMIR/NVVMDialect.h
+++ b/mlir/include/mlir/Dialect/LLVMIR/NVVMDialect.h
@ -16,7 +16,7 @@

 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 namespace mlir {
 namespace NVVM {
--- a/mlir/include/mlir/Dialect/LLVMIR/ROCDLDialect.h
+++ b/mlir/include/mlir/Dialect/LLVMIR/ROCDLDialect.h
@ -24,7 +24,7 @@

 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 namespace mlir {
 namespace ROCDL {
--- a/mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.h
+++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.h
@ -22,7 +22,7 @@
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/TypeUtilities.h"
 #include "mlir/IR/Types.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Interfaces/ViewLikeInterface.h"
 #include "mlir/Support/LLVM.h"

--- a/mlir/include/mlir/Dialect/Quant/QuantOps.h
+++ b/mlir/include/mlir/Dialect/Quant/QuantOps.h
@ -15,7 +15,7 @@
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "llvm/Support/MathExtras.h"

 namespace mlir {
--- a/mlir/include/mlir/Dialect/SCF/SCF.h
+++ b/mlir/include/mlir/Dialect/SCF/SCF.h
@ -19,7 +19,7 @@
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
 #include "mlir/Interfaces/LoopLikeInterface.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 namespace mlir {
 namespace scf {
--- a/mlir/include/mlir/Dialect/SPIRV/SPIRVOps.h
+++ b/mlir/include/mlir/Dialect/SPIRV/SPIRVOps.h
@ -16,7 +16,7 @@
 #include "mlir/Dialect/SPIRV/SPIRVTypes.h"
 #include "mlir/IR/Function.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "llvm/Support/PointerLikeTypeTraits.h"

 namespace mlir {
--- a/mlir/include/mlir/Dialect/Shape/IR/Shape.h
+++ b/mlir/include/mlir/Dialect/Shape/IR/Shape.h
@ -18,7 +18,7 @@
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/OpImplementation.h"
 #include "mlir/Interfaces/InferTypeOpInterface.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 namespace mlir {
 namespace shape {
--- a/mlir/include/mlir/Dialect/StandardOps/IR/Ops.h
+++ b/mlir/include/mlir/Dialect/StandardOps/IR/Ops.h
@ -20,7 +20,7 @@
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/Interfaces/CallInterfaces.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Interfaces/ViewLikeInterface.h"

 // Pull in all enum type definitions and utility function declarations.
--- a/mlir/include/mlir/Dialect/Vector/VectorOps.h
+++ b/mlir/include/mlir/Dialect/Vector/VectorOps.h
@ -17,7 +17,7 @@
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 namespace mlir {
 class MLIRContext;
--- a/mlir/include/mlir/Interfaces/SideEffectInterfaces.h
+++ b/mlir/include/mlir/Interfaces/SideEffectInterfaces.h
@ -1,4 +1,4 @@
-//===- SideEffects.h - SideEffect in MLIR -----------------------*- C++ -*-===//
+//===- SideEffectInterfaces.h - SideEffect in MLIR --------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
--- a/mlir/lib/Dialect/AVX512/CMakeLists.txt
+++ b/mlir/lib/Dialect/AVX512/CMakeLists.txt
@ -9,6 +9,6 @@ add_mlir_dialect_library(MLIRAVX512

  LINK_LIBS PUBLIC
  MLIRIR
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRVectorToLLVM
  )
--- a/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/EDSC/CMakeLists.txt
@ -12,6 +12,6 @@ add_mlir_dialect_library(MLIRAffineEDSC
  MLIREDSC
  MLIRIR
  MLIRLoopLikeInterface
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRStandardOps
  )
--- a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt
@ -12,6 +12,6 @@ add_mlir_dialect_library(MLIRAffineOps
  MLIREDSC
  MLIRIR
  MLIRLoopLikeInterface
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRStandardOps
  )
--- a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
+++ b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt
@ -20,7 +20,7 @@ add_mlir_dialect_library(MLIRAffineTransforms
  MLIREDSC
  MLIRIR
  MLIRPass
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRStandardOps
  MLIRTransformUtils
  MLIRVector
--- a/mlir/lib/Dialect/GPU/CMakeLists.txt
+++ b/mlir/lib/Dialect/GPU/CMakeLists.txt
@ -20,7 +20,7 @@ add_mlir_dialect_library(MLIRGPU
  MLIRLLVMIR
  MLIRSCF
  MLIRPass
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRStandardOps
  MLIRSupport
  MLIRTransformUtils
--- a/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
+++ b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt
@ -23,7 +23,7 @@ add_mlir_dialect_library(MLIRLLVMIR
  MLIRControlFlowInterfaces
  MLIROpenMP
  MLIRIR
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRSupport
  )

@ -45,7 +45,7 @@ add_mlir_dialect_library(MLIRLLVMAVX512
  LINK_LIBS PUBLIC
  MLIRIR
  MLIRLLVMIR
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  )

 add_mlir_dialect_library(MLIRNVVMIR
@ -66,7 +66,7 @@ add_mlir_dialect_library(MLIRNVVMIR
  LINK_LIBS PUBLIC
  MLIRIR
  MLIRLLVMIR
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  )

 add_mlir_dialect_library(MLIRROCDLIR
@ -86,6 +86,6 @@ add_mlir_dialect_library(MLIRROCDLIR

  LINK_LIBS PUBLIC
  MLIRIR
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRVectorToLLVM
  )
--- a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt
@ -12,7 +12,7 @@ add_mlir_dialect_library(MLIRLinalgOps

  LINK_LIBS PUBLIC
  MLIRIR
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRViewLikeInterface
  MLIRStandardOps
  )
--- a/mlir/lib/Dialect/Quant/CMakeLists.txt
+++ b/mlir/lib/Dialect/Quant/CMakeLists.txt
@ -19,7 +19,7 @@ add_mlir_dialect_library(MLIRQuant
  LINK_LIBS PUBLIC
  MLIRIR
  MLIRPass
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRSupport
  MLIRStandardOps
  MLIRTransformUtils
--- a/mlir/lib/Dialect/SCF/CMakeLists.txt
+++ b/mlir/lib/Dialect/SCF/CMakeLists.txt
@ -12,7 +12,7 @@ add_mlir_dialect_library(MLIRSCF
  MLIREDSC
  MLIRIR
  MLIRLoopLikeInterface
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRStandardOps
  )

--- a/mlir/lib/Dialect/SPIRV/CMakeLists.txt
+++ b/mlir/lib/Dialect/SPIRV/CMakeLists.txt
@ -32,7 +32,7 @@ add_mlir_dialect_library(MLIRSPIRV
  MLIRControlFlowInterfaces
  MLIRIR
  MLIRParser
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRSupport
  MLIRTransforms
  )
--- a/mlir/lib/Dialect/Shape/CMakeLists.txt
+++ b/mlir/lib/Dialect/Shape/CMakeLists.txt
@ -11,5 +11,5 @@ add_mlir_dialect_library(MLIRShape
  MLIRDialect
  MLIRInferTypeOpInterface
  MLIRIR
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  )
--- a/mlir/lib/Dialect/StandardOps/CMakeLists.txt
+++ b/mlir/lib/Dialect/StandardOps/CMakeLists.txt
@ -14,7 +14,7 @@ add_mlir_dialect_library(MLIRStandardOps
  MLIRControlFlowInterfaces
  MLIREDSC
  MLIRIR
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  MLIRViewLikeInterface
  )

--- a/mlir/lib/Dialect/Vector/CMakeLists.txt
+++ b/mlir/lib/Dialect/Vector/CMakeLists.txt
@ -18,5 +18,5 @@ add_mlir_dialect_library(MLIRVector
  MLIRAffineOps
  MLIRSCF
  MLIRLoopAnalysis
-  MLIRSideEffects
+  MLIRSideEffectInterfaces
  )
--- a/mlir/lib/Interfaces/CMakeLists.txt
+++ b/mlir/lib/Interfaces/CMakeLists.txt
@ -4,7 +4,7 @@ set(LLVM_OPTIONAL_SOURCES
  DerivedAttributeOpInterface.cpp
  InferTypeOpInterface.cpp
  LoopLikeInterface.cpp
-  SideEffects.cpp
+  SideEffectInterfaces.cpp
  ViewLikeInterface.cpp
  )

@ -73,8 +73,8 @@ add_mlir_library(MLIRLoopLikeInterface
  MLIRIR
  )

-add_mlir_library(MLIRSideEffects
-  SideEffects.cpp
+add_mlir_library(MLIRSideEffectInterfaces
+  SideEffectInterfaces.cpp

  ADDITIONAL_HEADER_DIRS
  ${MLIR_MAIN_INCLUDE_DIR}/mlir/Interfaces
--- a/mlir/lib/Interfaces/SideEffectInterfaces.cpp
+++ b/mlir/lib/Interfaces/SideEffectInterfaces.cpp
@ -1,4 +1,4 @@
-//===- SideEffects.cpp - SideEffects in MLIR ------------------------------===//
+//===- SideEffectInterfaces.cpp - SideEffects in MLIR ---------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 using namespace mlir;

--- a/mlir/lib/Transforms/Inliner.cpp
+++ b/mlir/lib/Transforms/Inliner.cpp
@ -16,7 +16,7 @@
 #include "PassDetail.h"
 #include "mlir/Analysis/CallGraph.h"
 #include "mlir/IR/PatternMatch.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Transforms/InliningUtils.h"
 #include "mlir/Transforms/Passes.h"
 #include "llvm/ADT/SCCIterator.h"
--- a/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp
+++ b/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp
@ -16,7 +16,7 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/Function.h"
 #include "mlir/Interfaces/LoopLikeInterface.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
--- a/mlir/lib/Transforms/SCCP.cpp
+++ b/mlir/lib/Transforms/SCCP.cpp
@ -18,7 +18,7 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Transforms/FoldUtils.h"
 #include "mlir/Transforms/Passes.h"
--- a/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp
+++ b/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp
@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//

 #include "mlir/IR/PatternMatch.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"
 #include "mlir/Transforms/FoldUtils.h"
 #include "mlir/Transforms/RegionUtils.h"
 #include "llvm/ADT/DenseMap.h"
--- a/mlir/lib/Transforms/Utils/RegionUtils.cpp
+++ b/mlir/lib/Transforms/Utils/RegionUtils.cpp
@ -12,7 +12,7 @@
 #include "mlir/IR/RegionGraphTraits.h"
 #include "mlir/IR/Value.h"
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 #include "llvm/ADT/DepthFirstIterator.h"
 #include "llvm/ADT/PostOrderIterator.h"
--- a/mlir/test/lib/Dialect/Test/TestDialect.h
+++ b/mlir/test/lib/Dialect/Test/TestDialect.h
@ -24,7 +24,7 @@
 #include "mlir/Interfaces/ControlFlowInterfaces.h"
 #include "mlir/Interfaces/DerivedAttributeOpInterface.h"
 #include "mlir/Interfaces/InferTypeOpInterface.h"
-#include "mlir/Interfaces/SideEffects.h"
+#include "mlir/Interfaces/SideEffectInterfaces.h"

 #include "TestOpEnums.h.inc"