Skip to content

Commit 8b68da2

Browse files
ftynseftynse
committed
[mlir] move SCF headers to SCF/{IR,Transforms} respectively
This aligns the SCF dialect file layout with the majority of the dialects. Reviewed By: jpienaar Differential Revision: https://reviews.llvm.org/D128049
1 parent 4f1fa55 commit 8b68da2

File tree

102 files changed

+182
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+182
-189
lines changed

‎flang/lib/Optimizer/Transforms/AffineDemotion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "mlir/Dialect/Affine/Utils.h"
2626
#include "mlir/Dialect/Func/IR/FuncOps.h"
2727
#include "mlir/Dialect/MemRef/IR/MemRef.h"
28-
#include "mlir/Dialect/SCF/SCF.h"
28+
#include "mlir/Dialect/SCF/IR/SCF.h"
2929
#include "mlir/IR/BuiltinAttributes.h"
3030
#include "mlir/IR/IntegerSet.h"
3131
#include "mlir/IR/Visitors.h"

‎flang/lib/Optimizer/Transforms/AffinePromotion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "flang/Optimizer/Transforms/Passes.h"
2323
#include "mlir/Dialect/Affine/IR/AffineOps.h"
2424
#include "mlir/Dialect/Func/IR/FuncOps.h"
25-
#include "mlir/Dialect/SCF/SCF.h"
25+
#include "mlir/Dialect/SCF/IR/SCF.h"
2626
#include "mlir/IR/BuiltinAttributes.h"
2727
#include "mlir/IR/IntegerSet.h"
2828
#include "mlir/IR/Visitors.h"

‎flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "flang/Optimizer/Support/FIRContext.h"
1919
#include "flang/Optimizer/Transforms/Passes.h"
2020
#include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h"
21-
#include "mlir/Dialect/SCF/SCF.h"
21+
#include "mlir/Dialect/SCF/IR/SCF.h"
2222
#include "mlir/Transforms/DialectConversion.h"
2323
#include "llvm/Support/Debug.h"
2424

‎mlir/examples/toy/Ch6/mlir/LowerToLLVM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "mlir/Dialect/Func/IR/FuncOps.h"
4040
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
4141
#include "mlir/Dialect/MemRef/IR/MemRef.h"
42-
#include "mlir/Dialect/SCF/SCF.h"
42+
#include "mlir/Dialect/SCF/IR/SCF.h"
4343
#include "mlir/Pass/Pass.h"
4444
#include "mlir/Transforms/DialectConversion.h"
4545
#include "llvm/ADT/Sequence.h"

‎mlir/examples/toy/Ch7/mlir/LowerToLLVM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "mlir/Dialect/Func/IR/FuncOps.h"
4040
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
4141
#include "mlir/Dialect/MemRef/IR/MemRef.h"
42-
#include "mlir/Dialect/SCF/SCF.h"
42+
#include "mlir/Dialect/SCF/IR/SCF.h"
4343
#include "mlir/Pass/Pass.h"
4444
#include "mlir/Transforms/DialectConversion.h"
4545
#include "llvm/ADT/Sequence.h"

‎mlir/include/mlir/Dialect/Async/Transforms.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef MLIR_DIALECT_ASYNC_TRANSFORMS_H_
1414
#define MLIR_DIALECT_ASYNC_TRANSFORMS_H_
1515

16-
#include "mlir/Dialect/SCF/SCF.h"
16+
#include "mlir/Dialect/SCF/IR/SCF.h"
1717
#include "mlir/IR/ImplicitLocOpBuilder.h"
1818

1919
namespace mlir {

‎mlir/include/mlir/Dialect/Linalg/Utils/Utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h"
1313
#include "mlir/Dialect/Linalg/IR/Linalg.h"
14-
#include "mlir/Dialect/SCF/SCF.h"
14+
#include "mlir/Dialect/SCF/IR/SCF.h"
1515
#include "llvm/ADT/MapVector.h"
1616
#include "llvm/ADT/SetVector.h"
1717

‎mlir/include/mlir/Dialect/SCF/CMakeLists.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
add_mlir_dialect(SCFOps scf Ops)
2-
add_mlir_doc(SCFOps SCFDialect Dialects/ -gen-dialect-doc)
3-
4-
set(LLVM_TARGET_DEFINITIONS Passes.td)
5-
mlir_tablegen(Passes.h.inc -gen-pass-decls -name SCF)
6-
add_public_tablegen_target(MLIRSCFPassIncGen)
7-
add_dependencies(mlir-headers MLIRSCFPassIncGen)
8-
9-
add_mlir_doc(Passes SCFPasses ./ -gen-pass-doc)
10-
1+
add_subdirectory(IR)
112
add_subdirectory(TransformOps)
3+
add_subdirectory(Transforms)

‎mlir/include/mlir/Dialect/SCF/IR/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
add_mlir_dialect(SCFOps scf Ops)
2+
add_mlir_doc(SCFOps SCFDialect Dialects/ -gen-dialect-doc)
3+

‎mlir/include/mlir/Dialect/SCF/SCF.h renamed to ‎mlir/include/mlir/Dialect/SCF/IR/SCF.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ void buildTerminatedBody(OpBuilder &builder, Location loc);
2727
} // namespace scf
2828
} // namespace mlir
2929

30-
#include "mlir/Dialect/SCF/SCFOpsDialect.h.inc"
30+
#include "mlir/Dialect/SCF/IR/SCFOpsDialect.h.inc"
3131

3232
#define GET_OP_CLASSES
33-
#include "mlir/Dialect/SCF/SCFOps.h.inc"
33+
#include "mlir/Dialect/SCF/IR/SCFOps.h.inc"
3434

3535
namespace mlir {
3636
namespace scf {

‎mlir/include/mlir/Dialect/SCF/SCFOps.td renamed to ‎mlir/include/mlir/Dialect/SCF/IR/SCFOps.td

File renamed without changes.

‎mlir/include/mlir/Dialect/SCF/BufferizableOpInterfaceImpl.h renamed to ‎mlir/include/mlir/Dialect/SCF/Transforms/BufferizableOpInterfaceImpl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef MLIR_DIALECT_SCF_BUFFERIZABLEOPINTERFACEIMPL_H
10-
#define MLIR_DIALECT_SCF_BUFFERIZABLEOPINTERFACEIMPL_H
9+
#ifndef MLIR_DIALECT_SCF_TRANSFORMS_BUFFERIZABLEOPINTERFACEIMPL_H
10+
#define MLIR_DIALECT_SCF_TRANSFORMS_BUFFERIZABLEOPINTERFACEIMPL_H
1111

1212
namespace mlir {
1313
class DialectRegistry;

‎mlir/include/mlir/Dialect/SCF/Transforms/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set(LLVM_TARGET_DEFINITIONS Passes.td)
2+
mlir_tablegen(Passes.h.inc -gen-pass-decls -name SCF)
3+
add_public_tablegen_target(MLIRSCFPassIncGen)
4+
add_dependencies(mlir-headers MLIRSCFPassIncGen)
5+
6+
add_mlir_doc(Passes SCFPasses ./ -gen-pass-doc)
7+

‎mlir/include/mlir/Dialect/SCF/Passes.h renamed to ‎mlir/include/mlir/Dialect/SCF/Transforms/Passes.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef MLIR_DIALECT_SCF_PASSES_H_
14-
#define MLIR_DIALECT_SCF_PASSES_H_
13+
#ifndef MLIR_DIALECT_SCF_TRANSFORMS_PASSES_H_
14+
#define MLIR_DIALECT_SCF_TRANSFORMS_PASSES_H_
1515

1616
#include "mlir/Pass/Pass.h"
1717

@@ -65,8 +65,8 @@ std::unique_ptr<Pass> createForToWhileLoopPass();
6565

6666
/// Generate the code for registering passes.
6767
#define GEN_PASS_REGISTRATION
68-
#include "mlir/Dialect/SCF/Passes.h.inc"
68+
#include "mlir/Dialect/SCF/Transforms/Passes.h.inc"
6969

7070
} // namespace mlir
7171

72-
#endif // MLIR_DIALECT_SCF_PASSES_H_
72+
#endif // MLIR_DIALECT_SCF_TRANSFORMS_PASSES_H_

‎mlir/include/mlir/Dialect/SCF/Passes.td renamed to ‎mlir/include/mlir/Dialect/SCF/Transforms/Passes.td

File renamed without changes.

‎mlir/include/mlir/Dialect/SCF/Patterns.h renamed to ‎mlir/include/mlir/Dialect/SCF/Transforms/Patterns.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef MLIR_DIALECT_SCF_PATTERNS_H
10-
#define MLIR_DIALECT_SCF_PATTERNS_H
9+
#ifndef MLIR_DIALECT_SCF_TRANSFORMS_PATTERNS_H
10+
#define MLIR_DIALECT_SCF_TRANSFORMS_PATTERNS_H
1111

12-
#include "mlir/Dialect/SCF/SCF.h"
13-
#include "mlir/Dialect/SCF/Transforms.h"
12+
#include "mlir/Dialect/SCF/IR/SCF.h"
13+
#include "mlir/Dialect/SCF/Transforms/Transforms.h"
1414
#include "mlir/IR/PatternMatch.h"
1515

1616
namespace mlir {
@@ -51,4 +51,4 @@ class ForLoopPipeliningPattern : public OpRewritePattern<ForOp> {
5151
} // namespace scf
5252
} // namespace mlir
5353

54-
#endif // MLIR_DIALECT_SCF_PATTERNS_H
54+
#endif // MLIR_DIALECT_SCF_TRANSFORMS_PATTERNS_H

‎mlir/include/mlir/Dialect/SCF/TileUsingInterface.h renamed to ‎mlir/include/mlir/Dialect/SCF/Transforms/TileUsingInterface.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#ifndef MLIR_DIALECT_SCF_TILEUSINGINTERFACE_H
10-
#define MLIR_DIALECT_SCF_TILEUSINGINTERFACE_H
9+
#ifndef MLIR_DIALECT_SCF_TRANSFORMS_TILEUSINGINTERFACE_H
10+
#define MLIR_DIALECT_SCF_TRANSFORMS_TILEUSINGINTERFACE_H
1111

12-
#include "mlir/Dialect/SCF/SCF.h"
12+
#include "mlir/Dialect/SCF/IR/SCF.h"
1313
#include "mlir/IR/PatternMatch.h"
1414
#include "mlir/Interfaces/TilingInterface.h"
1515

@@ -84,4 +84,4 @@ struct TileUsingSCFForOp : public OpInterfaceRewritePattern<TilingInterface> {
8484
} // namespace scf
8585
} // namespace mlir
8686

87-
#endif // MLIR_DIALECT_SCF_TILEUSINGINTERFACE_H
87+
#endif // MLIR_DIALECT_SCF_TRANSFORMS_TILEUSINGINTERFACE_H

‎mlir/include/mlir/Dialect/SCF/Transforms.h renamed to ‎mlir/include/mlir/Dialect/SCF/Transforms/Transforms.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#ifndef MLIR_DIALECT_SCF_TRANSFORMS_H_
14-
#define MLIR_DIALECT_SCF_TRANSFORMS_H_
13+
#ifndef MLIR_DIALECT_SCF_TRANSFORMS_TRANSFORMS_H_
14+
#define MLIR_DIALECT_SCF_TRANSFORMS_TRANSFORMS_H_
1515

1616
#include "mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h"
1717
#include "mlir/Support/LLVM.h"
@@ -171,4 +171,4 @@ void populateSCFForLoopCanonicalizationPatterns(RewritePatternSet &patterns);
171171
} // namespace scf
172172
} // namespace mlir
173173

174-
#endif // MLIR_DIALECT_SCF_TRANSFORMS_H_
174+
#endif // MLIR_DIALECT_SCF_TRANSFORMS_TRANSFORMS_H_

‎mlir/include/mlir/Dialect/SCF/Utils/Utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef MLIR_DIALECT_SCF_UTILS_UTILS_H_
1414
#define MLIR_DIALECT_SCF_UTILS_UTILS_H_
1515

16-
#include "mlir/Dialect/SCF/SCF.h"
16+
#include "mlir/Dialect/SCF/IR/SCF.h"
1717
#include "mlir/IR/PatternMatch.h"
1818
#include "mlir/Support/LLVM.h"
1919
#include "mlir/Support/LogicalResult.h"

‎mlir/include/mlir/InitAllDialects.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
#include "mlir/Dialect/PDL/IR/PDL.h"
4747
#include "mlir/Dialect/PDLInterp/IR/PDLInterp.h"
4848
#include "mlir/Dialect/Quant/QuantOps.h"
49-
#include "mlir/Dialect/SCF/BufferizableOpInterfaceImpl.h"
50-
#include "mlir/Dialect/SCF/SCF.h"
49+
#include "mlir/Dialect/SCF/IR/SCF.h"
5150
#include "mlir/Dialect/SCF/TransformOps/SCFTransformOps.h"
51+
#include "mlir/Dialect/SCF/Transforms/BufferizableOpInterfaceImpl.h"
5252
#include "mlir/Dialect/SPIRV/IR/SPIRVDialect.h"
5353
#include "mlir/Dialect/Shape/IR/Shape.h"
5454
#include "mlir/Dialect/Shape/Transforms/BufferizableOpInterfaceImpl.h"

‎mlir/include/mlir/InitAllPasses.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "mlir/Dialect/MemRef/Transforms/Passes.h"
2727
#include "mlir/Dialect/NVGPU/Passes.h"
2828
#include "mlir/Dialect/Quant/Passes.h"
29-
#include "mlir/Dialect/SCF/Passes.h"
29+
#include "mlir/Dialect/SCF/Transforms/Passes.h"
3030
#include "mlir/Dialect/SPIRV/Transforms/Passes.h"
3131
#include "mlir/Dialect/Shape/Transforms/Passes.h"
3232
#include "mlir/Dialect/SparseTensor/Pipelines/Passes.h"

‎mlir/lib/CAPI/Dialect/SCF.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "mlir/Dialect/SCF/SCF.h"
9+
#include "mlir/Dialect/SCF/IR/SCF.h"
1010
#include "mlir-c/Dialect/SCF.h"
1111
#include "mlir/CAPI/Registration.h"
1212

‎mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "mlir/Dialect/Affine/IR/AffineOps.h"
1818
#include "mlir/Dialect/Affine/Utils.h"
1919
#include "mlir/Dialect/MemRef/IR/MemRef.h"
20-
#include "mlir/Dialect/SCF/SCF.h"
20+
#include "mlir/Dialect/SCF/IR/SCF.h"
2121
#include "mlir/Dialect/Vector/IR/VectorOps.h"
2222
#include "mlir/IR/BlockAndValueMapping.h"
2323
#include "mlir/IR/IntegerSet.h"

‎mlir/lib/Conversion/LinalgToLLVM/LinalgToLLVM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
2121
#include "mlir/Dialect/Linalg/IR/Linalg.h"
2222
#include "mlir/Dialect/Linalg/Passes.h"
23-
#include "mlir/Dialect/SCF/SCF.h"
23+
#include "mlir/Dialect/SCF/IR/SCF.h"
2424
#include "mlir/IR/AffineExpr.h"
2525
#include "mlir/IR/AffineMap.h"
2626
#include "mlir/IR/Attributes.h"

‎mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "mlir/Dialect/Linalg/IR/Linalg.h"
1616
#include "mlir/Dialect/Linalg/Transforms/Transforms.h"
1717
#include "mlir/Dialect/MemRef/IR/MemRef.h"
18-
#include "mlir/Dialect/SCF/SCF.h"
18+
#include "mlir/Dialect/SCF/IR/SCF.h"
1919

2020
using namespace mlir;
2121
using namespace mlir::linalg;

‎mlir/lib/Conversion/OpenACCToSCF/OpenACCToSCF.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "mlir/Conversion/OpenACCToSCF/ConvertOpenACCToSCF.h"
1111
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
1212
#include "mlir/Dialect/OpenACC/OpenACC.h"
13-
#include "mlir/Dialect/SCF/SCF.h"
13+
#include "mlir/Dialect/SCF/IR/SCF.h"
1414
#include "mlir/Transforms/DialectConversion.h"
1515

1616
using namespace mlir;

‎mlir/lib/Conversion/SCFToControlFlow/SCFToControlFlow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "../PassDetail.h"
1616
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
1717
#include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h"
18-
#include "mlir/Dialect/SCF/SCF.h"
18+
#include "mlir/Dialect/SCF/IR/SCF.h"
1919
#include "mlir/IR/BlockAndValueMapping.h"
2020
#include "mlir/IR/Builders.h"
2121
#include "mlir/IR/BuiltinOps.h"

‎mlir/lib/Conversion/SCFToGPU/SCFToGPU.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "mlir/Dialect/GPU/IR/GPUDialect.h"
2121
#include "mlir/Dialect/GPU/Transforms/ParallelLoopMapper.h"
2222
#include "mlir/Dialect/MemRef/IR/MemRef.h"
23-
#include "mlir/Dialect/SCF/SCF.h"
23+
#include "mlir/Dialect/SCF/IR/SCF.h"
2424
#include "mlir/IR/AffineExpr.h"
2525
#include "mlir/IR/BlockAndValueMapping.h"
2626
#include "mlir/IR/Builders.h"

‎mlir/lib/Conversion/SCFToGPU/SCFToGPUPass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
1414
#include "mlir/Dialect/Complex/IR/Complex.h"
1515
#include "mlir/Dialect/GPU/IR/GPUDialect.h"
16-
#include "mlir/Dialect/SCF/SCF.h"
16+
#include "mlir/Dialect/SCF/IR/SCF.h"
1717
#include "mlir/Transforms/DialectConversion.h"
1818

1919
#include "llvm/ADT/ArrayRef.h"

‎mlir/lib/Conversion/SCFToOpenMP/SCFToOpenMP.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
2020
#include "mlir/Dialect/MemRef/IR/MemRef.h"
2121
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
22-
#include "mlir/Dialect/SCF/SCF.h"
22+
#include "mlir/Dialect/SCF/IR/SCF.h"
2323
#include "mlir/IR/ImplicitLocOpBuilder.h"
2424
#include "mlir/IR/SymbolTable.h"
2525
#include "mlir/Transforms/DialectConversion.h"

‎mlir/lib/Conversion/SCFToSPIRV/SCFToSPIRV.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "mlir/Conversion/SCFToSPIRV/SCFToSPIRV.h"
14-
#include "mlir/Dialect/SCF/SCF.h"
14+
#include "mlir/Dialect/SCF/IR/SCF.h"
1515
#include "mlir/Dialect/SPIRV/IR/SPIRVDialect.h"
1616
#include "mlir/Dialect/SPIRV/IR/SPIRVOps.h"
1717
#include "mlir/Dialect/SPIRV/Transforms/SPIRVConversion.h"

‎mlir/lib/Conversion/SCFToSPIRV/SCFToSPIRVPass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "mlir/Conversion/FuncToSPIRV/FuncToSPIRV.h"
1818
#include "mlir/Conversion/MemRefToSPIRV/MemRefToSPIRV.h"
1919
#include "mlir/Conversion/SCFToSPIRV/SCFToSPIRV.h"
20-
#include "mlir/Dialect/SCF/SCF.h"
20+
#include "mlir/Dialect/SCF/IR/SCF.h"
2121
#include "mlir/Dialect/SPIRV/IR/SPIRVDialect.h"
2222
#include "mlir/Dialect/SPIRV/Transforms/SPIRVConversion.h"
2323

‎mlir/lib/Conversion/ShapeToStandard/ConvertShapeConstraints.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include "../PassDetail.h"
1212
#include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h"
13-
#include "mlir/Dialect/SCF/SCF.h"
13+
#include "mlir/Dialect/SCF/IR/SCF.h"
1414
#include "mlir/Dialect/Shape/IR/Shape.h"
1515
#include "mlir/Dialect/Tensor/IR/Tensor.h"
1616
#include "mlir/IR/PatternMatch.h"

‎mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "../PassDetail.h"
1212
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
1313
#include "mlir/Dialect/Func/IR/FuncOps.h"
14-
#include "mlir/Dialect/SCF/SCF.h"
14+
#include "mlir/Dialect/SCF/IR/SCF.h"
1515
#include "mlir/Dialect/Shape/IR/Shape.h"
1616
#include "mlir/Dialect/Tensor/IR/Tensor.h"
1717
#include "mlir/IR/BlockAndValueMapping.h"

‎mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
1515
#include "mlir/Dialect/Linalg/IR/Linalg.h"
1616
#include "mlir/Dialect/Math/IR/Math.h"
17-
#include "mlir/Dialect/SCF/SCF.h"
17+
#include "mlir/Dialect/SCF/IR/SCF.h"
1818
#include "mlir/Dialect/Tensor/IR/Tensor.h"
1919
#include "mlir/Dialect/Tensor/Utils/Utils.h"
2020
#include "mlir/Dialect/Tosa/IR/TosaOps.h"

‎mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
1515
#include "mlir/Dialect/Linalg/IR/Linalg.h"
1616
#include "mlir/Dialect/Math/IR/Math.h"
17-
#include "mlir/Dialect/SCF/SCF.h"
17+
#include "mlir/Dialect/SCF/IR/SCF.h"
1818
#include "mlir/Dialect/Tensor/IR/Tensor.h"
1919
#include "mlir/Dialect/Tensor/Utils/Utils.h"
2020
#include "mlir/Dialect/Tosa/IR/TosaOps.h"

‎mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamedPass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
1616
#include "mlir/Dialect/Linalg/IR/Linalg.h"
1717
#include "mlir/Dialect/Math/IR/Math.h"
18-
#include "mlir/Dialect/SCF/SCF.h"
18+
#include "mlir/Dialect/SCF/IR/SCF.h"
1919
#include "mlir/Dialect/Tensor/IR/Tensor.h"
2020
#include "mlir/Dialect/Tosa/IR/TosaOps.h"
2121
#include "mlir/Dialect/Tosa/Transforms/PassDetail.h"

‎mlir/lib/Conversion/TosaToLinalg/TosaToLinalgPass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
1616
#include "mlir/Dialect/Linalg/IR/Linalg.h"
1717
#include "mlir/Dialect/Math/IR/Math.h"
18-
#include "mlir/Dialect/SCF/SCF.h"
18+
#include "mlir/Dialect/SCF/IR/SCF.h"
1919
#include "mlir/Dialect/Tensor/IR/Tensor.h"
2020
#include "mlir/Dialect/Tosa/IR/TosaOps.h"
2121
#include "mlir/Dialect/Tosa/Transforms/PassDetail.h"

‎mlir/lib/Conversion/TosaToSCF/TosaToSCF.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "mlir/Conversion/TosaToSCF/TosaToSCF.h"
14-
#include "mlir/Dialect/SCF/SCF.h"
14+
#include "mlir/Dialect/SCF/IR/SCF.h"
1515
#include "mlir/Dialect/Tensor/IR/Tensor.h"
1616
#include "mlir/Dialect/Tosa/IR/TosaOps.h"
1717
#include "mlir/IR/BlockAndValueMapping.h"

‎mlir/lib/Conversion/TosaToSCF/TosaToSCFPass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "../PassDetail.h"
1414
#include "mlir/Conversion/TosaToSCF/TosaToSCF.h"
15-
#include "mlir/Dialect/SCF/SCF.h"
15+
#include "mlir/Dialect/SCF/IR/SCF.h"
1616
#include "mlir/Dialect/Tensor/IR/Tensor.h"
1717
#include "mlir/Dialect/Tosa/IR/TosaOps.h"
1818
#include "mlir/Dialect/Tosa/Transforms/PassDetail.h"

0 commit comments

Comments
 (0)