This is an archive of the discontinued LLVM Phabricator instance.

Differential D118241

[mlir] Move SCF utils implementations to SCF/Utils.
ClosedPublic

Authored by akuegel on Jan 26 2022, 4:29 AM.

Details

Reviewers
rriddle
aartbik
bondhugula
nicolasvasilache
Summary

There are cases where other targets only use the utils, not the transforms.
So it makes sense to move them to their own target.

Diff Detail

Event Timeline

akuegel created this revision.Jan 26 2022, 4:29 AM
Herald added a reviewer: aartbik. · View Herald TranscriptJan 26 2022, 4:29 AM
Herald added a reviewer: bondhugula. · View Herald Transcript
Herald added subscribers: sdasgup3, wenzhicui, wrengr and 22 others. · View Herald Transcript
akuegel requested review of this revision.Jan 26 2022, 4:29 AM
Herald added a reviewer: nicolasvasilache. · View Herald TranscriptJan 26 2022, 4:29 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
herhut added a subscriber: herhut.Jan 26 2022, 4:39 AM
herhut added inline comments.
mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
51–52

Can one use the transforms without the utils? Otherwise maybe the former should depend on the latter.

utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
2420

This is now outdated, as the files have moved.

akuegel added inline comments.Jan 26 2022, 4:49 AM
mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt
51–52

Currently the transforms themselves use the Utils, which is why this dependency needs to be in this direction. Utils don't use Transforms though, which is why the split is even possible :)

utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
2420

As far as I can tell, they are still in Dialect/SCF directory:

https://github.com/llvm/llvm-project/blob/main/mlir/include/mlir/Dialect/SCF/Utils.h

We could move them also to a separate Utils subdirectory, then this exclude wouldn't be needed. But that would require also to changing several header includes. Might make sense to do in a followup patch?

akuegel added inline comments.Jan 26 2022, 7:29 AM
utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
2420

Also, maybe I misunderstood the concern: the exclusion would not necessarily be needed because the headers are also part of the new target. But keeping them in this target has the opportunity to cause linker errors. Users of the headers might depend on the Dialect, but not on the Utils target with the implementation. This will work fine until a binary is built where the missing implementation dependency will be noticed.

rriddle added inline comments.Jan 26 2022, 10:20 PM
mlir/lib/Dialect/SCF/Utils/AffineCanonicalizationUtils.cpp
13

Same here, can this be moved to SCF/Utils/AffineCanonicalizationUtils.h?

mlir/lib/Dialect/SCF/Utils/Utils.cpp
1

While you are here, can you fix this?

13

Can the header also be moved to SCF/Utils/Utils.h?

mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt
23

Why is transforms necessary now?

akuegel updated this revision to Diff 403527.Jan 27 2022, 12:25 AM

Address review comments.

Herald added a subscriber: zzheng. · View Herald TranscriptJan 27 2022, 12:25 AM
akuegel marked 2 inline comments as done.Jan 27 2022, 12:27 AM
akuegel added inline comments.
mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt
23

It was already necessary before, mlir/lib/Dialect/SparseTensor/Transforms/Sparsification.cpp includes mlir/Dialect/SCF/Transforms.h
I noticed this missing dependency while comparing with the BUILD.bazel file.
If you prefer, I can land it in a separate change.

utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
2420

River has also requested to move the headers, so I did that now as part of this patch. This makes it possible to remove the exclusion. I would still like to exclude Transforms.h, otherwise we have the same problem here that someone who uses SCFTransforms might forget to depend on that target. We already have a precedence for that case in the CMakeLists.txt file for SparseTensorTransforms which was missing this dependency (although this exclusion here won't fix cmake ;-) ).

Harbormaster completed remote builds in B145937: Diff 403527.Jan 27 2022, 8:58 AM
rriddle accepted this revision.Jan 27 2022, 10:40 AM
rriddle added inline comments.
mlir/include/mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h
13–14

This will need a tweak.

mlir/include/mlir/Dialect/SCF/Utils/Utils.h
12–13

This will need a tweak.

This revision is now accepted and ready to land.Jan 27 2022, 10:40 AM
akuegel updated this revision to Diff 403901.Jan 27 2022, 11:24 PM

Adjust header guard.

akuegel marked 2 inline comments as done.Jan 27 2022, 11:26 PM
Harbormaster completed remote builds in B146206: Diff 403901.Jan 27 2022, 11:40 PM
akuegel closed this revision.Jan 28 2022, 3:17 AM
akuegel added a comment.Jan 28 2022, 4:26 AM

Landed as https://github.com/llvm/llvm-project/commit/f40475c7fd71d8b525d04536191c70ae0c87cc22

I used the wrong commit message, sorry about that.

Revision Contents

PathSize
mlir/
include/
mlir/
Dialect/
Linalg/
Transforms/
2 lines
SCF/
2 lines
Utils/
6 lines
6 lines
lib/
Dialect/
Affine/
Transforms/
2 lines
2 lines
Linalg/
Transforms/
1 line
2 lines
2 lines
2 lines
SCF/
1 line
Transforms/
4 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
Utils/
Transforms/
2 lines
4 lines
Utils/
19 lines
SparseTensor/
Transforms/
2 lines
test/
lib/
Dialect/
SCF/
1 line
2 lines
2 lines
2 lines
utils/
bazel/
llvm-project-overlay/
mlir/
44 lines
test/
1 line

Diff 403901

mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h

//===- Transforms.h - Linalg transformations as patterns --------*- C++ -*-===// //===- Transforms.h - Linalg transformations as patterns --------*- C++ -*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef MLIR_DIALECT_LINALG_TRANSFORMS_TRANSFORMS_H #ifndef MLIR_DIALECT_LINALG_TRANSFORMS_TRANSFORMS_H
#define MLIR_DIALECT_LINALG_TRANSFORMS_TRANSFORMS_H #define MLIR_DIALECT_LINALG_TRANSFORMS_TRANSFORMS_H
#include <utility> #include <utility>
#include "mlir/Conversion/VectorToSCF/VectorToSCF.h" #include "mlir/Conversion/VectorToSCF/VectorToSCF.h"
#include "mlir/Dialect/Linalg/Utils/Utils.h" #include "mlir/Dialect/Linalg/Utils/Utils.h"
#include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/MemRef/IR/MemRef.h"
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
#include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Tensor/IR/Tensor.h"
#include "mlir/Dialect/Utils/StaticValueUtils.h" #include "mlir/Dialect/Utils/StaticValueUtils.h"
#include "mlir/Dialect/Vector/VectorTransforms.h" #include "mlir/Dialect/Vector/VectorTransforms.h"
#include "mlir/Dialect/X86Vector/Transforms.h" #include "mlir/Dialect/X86Vector/Transforms.h"
#include "mlir/IR/PatternMatch.h" #include "mlir/IR/PatternMatch.h"
#include "mlir/Transforms/DialectConversion.h" #include "mlir/Transforms/DialectConversion.h"
#include "llvm/ADT/SmallBitVector.h" #include "llvm/ADT/SmallBitVector.h"
#include "llvm/ADT/SmallSet.h" #include "llvm/ADT/SmallSet.h"
▲ Show 20 Lines • Show All 1,339 Lines • Show Last 20 Lines

mlir/include/mlir/Dialect/SCF/AffineCanonicalizationUtils.h

  • This file was moved to mlir/include/mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h.

mlir/include/mlir/Dialect/SCF/Transforms.h

//===- Transforms.h - SCF dialect transformation utilities ------*- C++ -*-===// //===- Transforms.h - SCF dialect transformation utilities ------*- C++ -*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This header file defines transformations on SCF operations. // This header file defines transformations on SCF operations.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef MLIR_DIALECT_SCF_TRANSFORMS_H_ #ifndef MLIR_DIALECT_SCF_TRANSFORMS_H_
#define MLIR_DIALECT_SCF_TRANSFORMS_H_ #define MLIR_DIALECT_SCF_TRANSFORMS_H_
#include "mlir/Dialect/SCF/AffineCanonicalizationUtils.h" #include "mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h"
#include "mlir/Support/LLVM.h" #include "mlir/Support/LLVM.h"
#include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/ArrayRef.h"
namespace mlir { namespace mlir {
class AffineMap; class AffineMap;
class ConversionTarget; class ConversionTarget;
struct LogicalResult; struct LogicalResult;
▲ Show 20 Lines • Show All 139 Lines • Show Last 20 Lines

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

  • This file was moved to mlir/include/mlir/Dialect/SCF/Utils/Utils.h.

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

  • This file was moved from mlir/include/mlir/Dialect/SCF/AffineCanonicalizationUtils.h.
//===- AffineCanonicalizationUtils.h ----------------------------*- C++ -*-===// //===- AffineCanonicalizationUtils.h ----------------------------*- C++ -*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This header file defines utility functions to canonicalize affine ops // This header file defines utility functions to canonicalize affine ops
// within SCF op regions. // within SCF op regions.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef MLIR_DIALECT_SCF_AFFINECANONICALIZATIONUTILS_H_ #ifndef MLIR_DIALECT_SCF_UTILS_AFFINECANONICALIZATIONUTILS_H_
rriddleUnsubmitted
Done
ReplyInline Actions

This will need a tweak.

rriddle: This will need a tweak.
#define MLIR_DIALECT_SCF_AFFINECANONICALIZATIONUTILS_H_ #define MLIR_DIALECT_SCF_UTILS_AFFINECANONICALIZATIONUTILS_H_
#include "mlir/Support/LLVM.h" #include "mlir/Support/LLVM.h"
namespace mlir { namespace mlir {
class AffineMap; class AffineMap;
struct LogicalResult; struct LogicalResult;
class Operation; class Operation;
class RewriterBase; class RewriterBase;
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
LogicalResult rewritePeeledMinMaxOp(RewriterBase &rewriter, Operation *op, LogicalResult rewritePeeledMinMaxOp(RewriterBase &rewriter, Operation *op,
AffineMap map, ValueRange operands, AffineMap map, ValueRange operands,
bool isMin, Value iv, Value ub, Value step, bool isMin, Value iv, Value ub, Value step,
bool insideLoop); bool insideLoop);
} // namespace scf } // namespace scf
} // namespace mlir } // namespace mlir
#endif // MLIR_DIALECT_SCF_AFFINECANONICALIZATIONUTILS_H_ #endif // MLIR_DIALECT_SCF_UTILS_AFFINECANONICALIZATIONUTILS_H_

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

  • This file was moved from mlir/include/mlir/Dialect/SCF/Utils.h.
//===- Utils.h - SCF dialect utilities --------------------------*- C++ -*-===// //===- Utils.h - SCF dialect utilities --------------------------*- C++ -*-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This header file defines prototypes for various SCF utilities. // This header file defines prototypes for various SCF utilities.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef MLIR_DIALECT_SCF_UTILS_H_ #ifndef MLIR_DIALECT_SCF_UTILS_UTILS_H_
rriddleUnsubmitted
Done
ReplyInline Actions

This will need a tweak.

rriddle: This will need a tweak.
#define MLIR_DIALECT_SCF_UTILS_H_ #define MLIR_DIALECT_SCF_UTILS_UTILS_H_
#include "mlir/IR/PatternMatch.h" #include "mlir/IR/PatternMatch.h"
#include "mlir/Support/LLVM.h" #include "mlir/Support/LLVM.h"
#include "mlir/Support/LogicalResult.h" #include "mlir/Support/LogicalResult.h"
#include "llvm/ADT/STLExtras.h" #include "llvm/ADT/STLExtras.h"
namespace mlir { namespace mlir {
class FuncOp; class FuncOp;
▲ Show 20 Lines • Show All 131 Lines • ▼ Show 20 Lines
/// (the first op being another AffineFor, and the second op - a terminator). /// (the first op being another AffineFor, and the second op - a terminator).
/// A loop is perfectly nested iff: the first op in the loop's body is another /// A loop is perfectly nested iff: the first op in the loop's body is another
/// AffineForOp, and the second op is a terminator). /// AffineForOp, and the second op is a terminator).
void getPerfectlyNestedLoops(SmallVectorImpl<scf::ForOp> &nestedLoops, void getPerfectlyNestedLoops(SmallVectorImpl<scf::ForOp> &nestedLoops,
scf::ForOp root); scf::ForOp root);
} // namespace mlir } // namespace mlir
#endif // MLIR_DIALECT_SCF_UTILS_H_ #endif // MLIR_DIALECT_SCF_UTILS_UTILS_H_

mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt

Show All 23 Linesadd_mlir_dialect_library(MLIRAffineTransforms
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRAffine MLIRAffine
MLIRAffineAnalysis MLIRAffineAnalysis
MLIRAffineUtils MLIRAffineUtils
MLIRArithmetic MLIRArithmetic
MLIRIR MLIRIR
MLIRMemRef MLIRMemRef
MLIRPass MLIRPass
MLIRSCFTransforms MLIRSCFUtils
MLIRSideEffectInterfaces MLIRSideEffectInterfaces
MLIRStandard MLIRStandard
MLIRTransformUtils MLIRTransformUtils
MLIRVector MLIRVector
MLIRVectorToLLVM MLIRVectorToLLVM
) )

mlir/lib/Dialect/Affine/Transforms/LoopCoalescing.cpp

//===- LoopCoalescing.cpp - Pass transforming loop nests into single loops-===// //===- LoopCoalescing.cpp - Pass transforming loop nests into single loops-===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "PassDetail.h" #include "PassDetail.h"
#include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/IR/AffineOps.h"
#include "mlir/Dialect/Affine/LoopUtils.h" #include "mlir/Dialect/Affine/LoopUtils.h"
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
#include "mlir/Transforms/Passes.h" #include "mlir/Transforms/Passes.h"
#include "mlir/Transforms/RegionUtils.h" #include "mlir/Transforms/RegionUtils.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#define PASS_NAME "loop-coalescing" #define PASS_NAME "loop-coalescing"
#define DEBUG_TYPE PASS_NAME #define DEBUG_TYPE PASS_NAME
using namespace mlir; using namespace mlir;
▲ Show 20 Lines • Show All 80 Lines • Show Last 20 Lines

mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Linesadd_mlir_dialect_library(MLIRLinalgTransforms
MLIRMemRef MLIRMemRef
MLIRLinalg MLIRLinalg
MLIRLinalgAnalysis MLIRLinalgAnalysis
MLIRLinalgBufferizableOpInterfaceImpl MLIRLinalgBufferizableOpInterfaceImpl
MLIRLinalgUtils MLIRLinalgUtils
MLIRModuleBufferization MLIRModuleBufferization
MLIRSCF MLIRSCF
MLIRSCFBufferizableOpInterfaceImpl MLIRSCFBufferizableOpInterfaceImpl
MLIRSCFTransforms MLIRSCFTransforms
MLIRSCFUtils
herhutUnsubmitted
Not Done
ReplyInline Actions

Can one use the transforms without the utils? Otherwise maybe the former should depend on the latter.

herhut: Can one use the transforms without the utils? Otherwise maybe the former should depend on the…
akuegelAuthorUnsubmitted
Done
ReplyInline Actions

Currently the transforms themselves use the Utils, which is why this dependency needs to be in this direction. Utils don't use Transforms though, which is why the split is even possible :)

akuegel: Currently the transforms themselves use the Utils, which is why this dependency needs to be in…
MLIRStdBufferizableOpInterfaceImpl MLIRStdBufferizableOpInterfaceImpl
MLIRPass MLIRPass
MLIRStandard MLIRStandard
MLIRStandardOpsTransforms MLIRStandardOpsTransforms
MLIRStandardToLLVM MLIRStandardToLLVM
MLIRTensor MLIRTensor
MLIRTensorTransforms MLIRTensorTransforms
MLIRTransforms MLIRTransforms
MLIRTransformUtils MLIRTransformUtils
MLIRVector MLIRVector
MLIRVectorBufferizableOpInterfaceImpl MLIRVectorBufferizableOpInterfaceImpl
MLIRX86VectorTransforms MLIRX86VectorTransforms
MLIRVectorToSCF MLIRVectorToSCF
) )

mlir/lib/Dialect/Linalg/Transforms/HoistPadding.cpp

Show All 9 Lines
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "mlir/Dialect/Linalg/Transforms/HoistPadding.h" #include "mlir/Dialect/Linalg/Transforms/HoistPadding.h"
#include "mlir/Analysis/SliceAnalysis.h" #include "mlir/Analysis/SliceAnalysis.h"
#include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/IR/Linalg.h"
#include "mlir/Dialect/Linalg/Transforms/Transforms.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Tensor/IR/Tensor.h"
#include "mlir/Dialect/Vector/VectorOps.h" #include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/Dialect/Vector/VectorUtils.h" #include "mlir/Dialect/Vector/VectorUtils.h"
#include "mlir/IR/AsmState.h" #include "mlir/IR/AsmState.h"
#include "mlir/IR/BuiltinOps.h" #include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/Dominance.h" #include "mlir/IR/Dominance.h"
#include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringRef.h"
▲ Show 20 Lines • Show All 529 Lines • Show Last 20 Lines

mlir/lib/Dialect/Linalg/Transforms/Hoisting.cpp

Show All 12 Lines
#include "mlir/Dialect/Linalg/Transforms/Hoisting.h" #include "mlir/Dialect/Linalg/Transforms/Hoisting.h"
#include "mlir/Analysis/SliceAnalysis.h" #include "mlir/Analysis/SliceAnalysis.h"
#include "mlir/Dialect/Affine/Analysis/AffineStructures.h" #include "mlir/Dialect/Affine/Analysis/AffineStructures.h"
#include "mlir/Dialect/Affine/IR/AffineValueMap.h" #include "mlir/Dialect/Affine/IR/AffineValueMap.h"
#include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/IR/Linalg.h"
#include "mlir/Dialect/Linalg/Transforms/Transforms.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Tensor/IR/Tensor.h"
#include "mlir/Dialect/Vector/VectorOps.h" #include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/Dialect/Vector/VectorUtils.h" #include "mlir/Dialect/Vector/VectorUtils.h"
#include "mlir/IR/BuiltinOps.h" #include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/Dominance.h" #include "mlir/IR/Dominance.h"
#include "mlir/Transforms/GreedyPatternRewriteDriver.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
#include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringRef.h"
▲ Show 20 Lines • Show All 482 Lines • Show Last 20 Lines

mlir/lib/Dialect/Linalg/Transforms/Loops.cpp

//===- Loops.cpp - conversion from Linalg named and generic ops to loops --===// //===- Loops.cpp - conversion from Linalg named and generic ops to loops --===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "PassDetail.h" #include "PassDetail.h"
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
#include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/IR/Linalg.h"
#include "mlir/Dialect/Linalg/Passes.h" #include "mlir/Dialect/Linalg/Passes.h"
#include "mlir/Dialect/Linalg/Transforms/Transforms.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h"
#include "mlir/Dialect/Linalg/Utils/Utils.h" #include "mlir/Dialect/Linalg/Utils/Utils.h"
#include "mlir/Dialect/SCF/AffineCanonicalizationUtils.h"
#include "mlir/Dialect/SCF/Transforms.h" #include "mlir/Dialect/SCF/Transforms.h"
#include "mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h"
#include "mlir/Dialect/StandardOps/Utils/Utils.h" #include "mlir/Dialect/StandardOps/Utils/Utils.h"
#include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineExpr.h"
#include "mlir/IR/AffineMap.h" #include "mlir/IR/AffineMap.h"
#include "mlir/IR/BlockAndValueMapping.h" #include "mlir/IR/BlockAndValueMapping.h"
#include "mlir/Support/LLVM.h" #include "mlir/Support/LLVM.h"
#include "mlir/Transforms/DialectConversion.h" #include "mlir/Transforms/DialectConversion.h"
#include "mlir/Transforms/FoldUtils.h" #include "mlir/Transforms/FoldUtils.h"
#include "mlir/Transforms/GreedyPatternRewriteDriver.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
▲ Show 20 Lines • Show All 543 Lines • Show Last 20 Lines

mlir/lib/Dialect/SCF/CMakeLists.txt

Show All 11 Linesadd_mlir_dialect_library(MLIRSCF
MLIRBufferization MLIRBufferization
MLIRIR MLIRIR
MLIRLoopLikeInterface MLIRLoopLikeInterface
MLIRSideEffectInterfaces MLIRSideEffectInterfaces
MLIRStandard MLIRStandard
) )
add_subdirectory(Transforms) add_subdirectory(Transforms)
add_subdirectory(Utils)

mlir/lib/Dialect/SCF/Transforms/AffineCanonicalizationUtils.cpp

  • This file was moved to mlir/lib/Dialect/SCF/Utils/AffineCanonicalizationUtils.cpp.

mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt

add_mlir_dialect_library(MLIRSCFTransforms add_mlir_dialect_library(MLIRSCFTransforms
AffineCanonicalizationUtils.cpp
Bufferize.cpp Bufferize.cpp
ForToWhile.cpp ForToWhile.cpp
LoopCanonicalization.cpp LoopCanonicalization.cpp
LoopPipelining.cpp LoopPipelining.cpp
LoopRangeFolding.cpp LoopRangeFolding.cpp
LoopSpecialization.cpp LoopSpecialization.cpp
ParallelLoopCollapsing.cpp ParallelLoopCollapsing.cpp
ParallelLoopFusion.cpp ParallelLoopFusion.cpp
ParallelLoopTiling.cpp ParallelLoopTiling.cpp
StructuralTypeConversions.cpp StructuralTypeConversions.cpp
Utils.cpp
ADDITIONAL_HEADER_DIRS ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SCF ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SCF
DEPENDS DEPENDS
MLIRSCFPassIncGen MLIRSCFPassIncGen
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRAffine MLIRAffine
MLIRAffineAnalysis MLIRAffineAnalysis
MLIRArithmetic MLIRArithmetic
MLIRBufferizationTransforms MLIRBufferizationTransforms
MLIRDialectUtils
MLIRIR MLIRIR
MLIRMemRef MLIRMemRef
MLIRPass MLIRPass
MLIRSCF MLIRSCF
MLIRSCFUtils
MLIRStandard MLIRStandard
MLIRSupport MLIRSupport
MLIRTensor MLIRTensor
MLIRTransforms MLIRTransforms
MLIRTransformUtils MLIRTransformUtils
) )

mlir/lib/Dialect/SCF/Transforms/LoopCanonicalization.cpp

//===- LoopCanonicalization.cpp - Cross-dialect canonicalization patterns -===// //===- LoopCanonicalization.cpp - Cross-dialect canonicalization patterns -===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This file contains cross-dialect canonicalization patterns that cannot be // This file contains cross-dialect canonicalization patterns that cannot be
// actual canonicalization patterns due to undesired additional dependencies. // actual canonicalization patterns due to undesired additional dependencies.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "PassDetail.h" #include "PassDetail.h"
#include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/IR/AffineOps.h"
#include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/MemRef/IR/MemRef.h"
#include "mlir/Dialect/SCF/AffineCanonicalizationUtils.h"
#include "mlir/Dialect/SCF/Passes.h" #include "mlir/Dialect/SCF/Passes.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Transforms.h" #include "mlir/Dialect/SCF/Transforms.h"
#include "mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h"
#include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Tensor/IR/Tensor.h"
#include "mlir/IR/PatternMatch.h" #include "mlir/IR/PatternMatch.h"
#include "mlir/Transforms/GreedyPatternRewriteDriver.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
#include "llvm/ADT/TypeSwitch.h" #include "llvm/ADT/TypeSwitch.h"
using namespace mlir; using namespace mlir;
using namespace mlir::scf; using namespace mlir::scf;
▲ Show 20 Lines • Show All 181 Lines • Show Last 20 Lines

mlir/lib/Dialect/SCF/Transforms/LoopPipelining.cpp

//===- LoopPipelining.cpp - Code to perform loop software pipelining-------===// //===- LoopPipelining.cpp - Code to perform loop software pipelining-------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This file implements loop software pipelining // This file implements loop software pipelining
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "PassDetail.h" #include "PassDetail.h"
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Transforms.h" #include "mlir/Dialect/SCF/Transforms.h"
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/IR/BlockAndValueMapping.h" #include "mlir/IR/BlockAndValueMapping.h"
#include "mlir/IR/PatternMatch.h" #include "mlir/IR/PatternMatch.h"
#include "mlir/Support/MathExtras.h" #include "mlir/Support/MathExtras.h"
using namespace mlir; using namespace mlir;
using namespace mlir::scf; using namespace mlir::scf;
▲ Show 20 Lines • Show All 447 Lines • Show Last 20 Lines

mlir/lib/Dialect/SCF/Transforms/LoopRangeFolding.cpp

Show All 9 Lines
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "PassDetail.h" #include "PassDetail.h"
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
#include "mlir/Dialect/SCF/Passes.h" #include "mlir/Dialect/SCF/Passes.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Transforms.h" #include "mlir/Dialect/SCF/Transforms.h"
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/IR/BlockAndValueMapping.h" #include "mlir/IR/BlockAndValueMapping.h"
using namespace mlir; using namespace mlir;
using namespace mlir::scf; using namespace mlir::scf;
namespace { namespace {
struct ForLoopRangeFolding struct ForLoopRangeFolding
▲ Show 20 Lines • Show All 61 Lines • Show Last 20 Lines

mlir/lib/Dialect/SCF/Transforms/LoopSpecialization.cpp

Show All 9 Lines
// vectorization. // vectorization.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "PassDetail.h" #include "PassDetail.h"
#include "mlir/Dialect/Affine/Analysis/AffineStructures.h" #include "mlir/Dialect/Affine/Analysis/AffineStructures.h"
#include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/IR/AffineOps.h"
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
#include "mlir/Dialect/SCF/AffineCanonicalizationUtils.h"
#include "mlir/Dialect/SCF/Passes.h" #include "mlir/Dialect/SCF/Passes.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Transforms.h" #include "mlir/Dialect/SCF/Transforms.h"
#include "mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/Dialect/Utils/StaticValueUtils.h" #include "mlir/Dialect/Utils/StaticValueUtils.h"
#include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineExpr.h"
#include "mlir/IR/BlockAndValueMapping.h" #include "mlir/IR/BlockAndValueMapping.h"
#include "mlir/IR/PatternMatch.h" #include "mlir/IR/PatternMatch.h"
#include "mlir/Transforms/GreedyPatternRewriteDriver.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/DenseMap.h"
▲ Show 20 Lines • Show All 251 Lines • Show Last 20 Lines

mlir/lib/Dialect/SCF/Transforms/ParallelLoopCollapsing.cpp

//===- ParallelLoopCollapsing.cpp - Pass collapsing parallel loop indices -===// //===- ParallelLoopCollapsing.cpp - Pass collapsing parallel loop indices -===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "PassDetail.h" #include "PassDetail.h"
#include "mlir/Dialect/SCF/Passes.h" #include "mlir/Dialect/SCF/Passes.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
#include "mlir/Transforms/RegionUtils.h" #include "mlir/Transforms/RegionUtils.h"
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#define DEBUG_TYPE "parallel-loop-collapsing" #define DEBUG_TYPE "parallel-loop-collapsing"
using namespace mlir; using namespace mlir;
Show All 25 Lines

mlir/lib/Dialect/SCF/Transforms/ParallelLoopTiling.cpp

Show All 10 Lines
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "PassDetail.h" #include "PassDetail.h"
#include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/IR/AffineOps.h"
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
#include "mlir/Dialect/SCF/Passes.h" #include "mlir/Dialect/SCF/Passes.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Transforms.h" #include "mlir/Dialect/SCF/Transforms.h"
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/Dialect/StandardOps/IR/Ops.h"
using namespace mlir; using namespace mlir;
using namespace mlir::scf; using namespace mlir::scf;
/// Tile a parallel loop of the form /// Tile a parallel loop of the form
/// scf.parallel (%i0, %i1) = (%arg0, %arg1) to (%arg2, %arg3) /// scf.parallel (%i0, %i1) = (%arg0, %arg1) to (%arg2, %arg3)
/// step (%arg4, %arg5) /// step (%arg4, %arg5)
▲ Show 20 Lines • Show All 187 Lines • Show Last 20 Lines

mlir/lib/Dialect/SCF/Transforms/Utils.cpp

  • This file was moved to mlir/lib/Dialect/SCF/Utils/Utils.cpp.

mlir/lib/Dialect/SCF/Utils/AffineCanonicalizationUtils.cpp

  • This file was moved from mlir/lib/Dialect/SCF/Transforms/AffineCanonicalizationUtils.cpp.
//===- AffineCanonicalizationUtils.cpp - Affine Canonicalization in SCF ---===// //===- AffineCanonicalizationUtils.cpp - Affine Canonicalization in SCF ---===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Utility functions to canonicalize affine ops within SCF op regions. // Utility functions to canonicalize affine ops within SCF op regions.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "mlir/Dialect/SCF/AffineCanonicalizationUtils.h" #include "mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h"
rriddleUnsubmitted
Done
ReplyInline Actions

Same here, can this be moved to SCF/Utils/AffineCanonicalizationUtils.h?

rriddle: Same here, can this be moved to `SCF/Utils/AffineCanonicalizationUtils.h`?
#include "mlir/Dialect/Affine/Analysis/AffineStructures.h" #include "mlir/Dialect/Affine/Analysis/AffineStructures.h"
#include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/IR/AffineOps.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/Utils/StaticValueUtils.h" #include "mlir/Dialect/Utils/StaticValueUtils.h"
#include "mlir/IR/AffineMap.h" #include "mlir/IR/AffineMap.h"
#include "mlir/IR/Matchers.h" #include "mlir/IR/Matchers.h"
#include "mlir/IR/PatternMatch.h" #include "mlir/IR/PatternMatch.h"
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
▲ Show 20 Lines • Show All 304 Lines • Show Last 20 Lines

mlir/lib/Dialect/SCF/Utils/CMakeLists.txt

  • This file was added.
add_mlir_dialect_library(MLIRSCFUtils
AffineCanonicalizationUtils.cpp
Utils.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SCF
LINK_LIBS PUBLIC
MLIRAffine
MLIRAffineAnalysis
MLIRAnalysis
MLIRArithmetic
MLIRDialectUtils
MLIRIR
MLIRSCF
MLIRStandard
MLIRSupport
MLIRTransforms
)

mlir/lib/Dialect/SCF/Utils/Utils.cpp

  • This file was moved from mlir/lib/Dialect/SCF/Transforms/Utils.cpp.
//===- LoopUtils.cpp ---- Misc utilities for loop transformation ----------===// //===- Utils.cpp ---- Misc utilities for loop transformation ----------===//
rriddleUnsubmitted
Not Done
ReplyInline Actions

While you are here, can you fix this?

rriddle: While you are here, can you fix this?
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This file implements miscellaneous loop transformation routines. // This file implements miscellaneous loop transformation routines.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
rriddleUnsubmitted
Done
ReplyInline Actions

Can the header also be moved to SCF/Utils/Utils.h?

rriddle: Can the header also be moved to `SCF/Utils/Utils.h`?
#include "mlir/Analysis/SliceAnalysis.h" #include "mlir/Analysis/SliceAnalysis.h"
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/IR/BlockAndValueMapping.h" #include "mlir/IR/BlockAndValueMapping.h"
#include "mlir/IR/BuiltinOps.h" #include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/PatternMatch.h" #include "mlir/IR/PatternMatch.h"
#include "mlir/Support/MathExtras.h" #include "mlir/Support/MathExtras.h"
▲ Show 20 Lines • Show All 901 Lines • Show Last 20 Lines

mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt

Show All 14 Linesadd_mlir_dialect_library(MLIRSparseTensorTransforms
MLIRBufferization MLIRBufferization
MLIRIR MLIRIR
MLIRLLVMIR MLIRLLVMIR
MLIRLinalg MLIRLinalg
MLIRLinalgTransforms MLIRLinalgTransforms
MLIRMemRef MLIRMemRef
MLIRPass MLIRPass
MLIRSCF MLIRSCF
MLIRSCFTransforms
rriddleUnsubmitted
Not Done
ReplyInline Actions

Why is transforms necessary now?

rriddle: Why is transforms necessary now?
akuegelAuthorUnsubmitted
Done
ReplyInline Actions

It was already necessary before, mlir/lib/Dialect/SparseTensor/Transforms/Sparsification.cpp includes mlir/Dialect/SCF/Transforms.h
I noticed this missing dependency while comparing with the BUILD.bazel file.
If you prefer, I can land it in a separate change.

akuegel: It was already necessary before, mlir/lib/Dialect/SparseTensor/Transforms/Sparsification.cpp…
MLIRSCFUtils
MLIRStandard MLIRStandard
MLIRSparseTensor MLIRSparseTensor
MLIRSparseTensorUtils MLIRSparseTensorUtils
MLIRTensor MLIRTensor
MLIRTransforms MLIRTransforms
MLIRVector MLIRVector
) )

mlir/test/lib/Dialect/SCF/CMakeLists.txt

# Exclude tests from libMLIR.so # Exclude tests from libMLIR.so
add_mlir_library(MLIRSCFTestPasses add_mlir_library(MLIRSCFTestPasses
TestLoopParametricTiling.cpp TestLoopParametricTiling.cpp
TestLoopUnrolling.cpp TestLoopUnrolling.cpp
TestSCFUtils.cpp TestSCFUtils.cpp
EXCLUDE_FROM_LIBMLIR EXCLUDE_FROM_LIBMLIR
LINK_LIBS PUBLIC LINK_LIBS PUBLIC
MLIRPass MLIRPass
MLIRSCF MLIRSCF
MLIRSCFTransforms MLIRSCFTransforms
MLIRSCFUtils
MLIRTransformUtils MLIRTransformUtils
) )

mlir/test/lib/Dialect/SCF/TestLoopParametricTiling.cpp

//===- TestLoopParametricTiling.cpp --- Parametric loop tiling pass -------===// //===- TestLoopParametricTiling.cpp --- Parametric loop tiling pass -------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This file implements a pass to parametrically tile nests of standard loops. // This file implements a pass to parametrically tile nests of standard loops.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
#include "mlir/IR/Builders.h" #include "mlir/IR/Builders.h"
#include "mlir/Pass/Pass.h" #include "mlir/Pass/Pass.h"
using namespace mlir; using namespace mlir;
namespace { namespace {
// Extracts fixed-range loops for top-level loop nests with ranges defined in // Extracts fixed-range loops for top-level loop nests with ranges defined in
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines

mlir/test/lib/Dialect/SCF/TestLoopUnrolling.cpp

//===-------- TestLoopUnrolling.cpp --- loop unrolling test pass ----------===// //===-------- TestLoopUnrolling.cpp --- loop unrolling test pass ----------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This file implements a pass to unroll loops by a specified unroll factor. // This file implements a pass to unroll loops by a specified unroll factor.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/IR/Builders.h" #include "mlir/IR/Builders.h"
#include "mlir/Pass/Pass.h" #include "mlir/Pass/Pass.h"
using namespace mlir; using namespace mlir;
namespace { namespace {
▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines

mlir/test/lib/Dialect/SCF/TestSCFUtils.cpp

//===- TestSCFUtils.cpp --- Pass to test independent SCF dialect utils ----===// //===- TestSCFUtils.cpp --- Pass to test independent SCF dialect utils ----===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// This file implements a pass to test SCF dialect utils. // This file implements a pass to test SCF dialect utils.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" #include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
#include "mlir/Dialect/SCF/SCF.h" #include "mlir/Dialect/SCF/SCF.h"
#include "mlir/Dialect/SCF/Transforms.h" #include "mlir/Dialect/SCF/Transforms.h"
#include "mlir/Dialect/SCF/Utils.h" #include "mlir/Dialect/SCF/Utils/Utils.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/IR/Builders.h" #include "mlir/IR/Builders.h"
#include "mlir/IR/PatternMatch.h" #include "mlir/IR/PatternMatch.h"
#include "mlir/Pass/Pass.h" #include "mlir/Pass/Pass.h"
#include "mlir/Transforms/GreedyPatternRewriteDriver.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h"
#include "mlir/Transforms/Passes.h" #include "mlir/Transforms/Passes.h"
#include "llvm/ADT/SetVector.h" #include "llvm/ADT/SetVector.h"
▲ Show 20 Lines • Show All 123 Lines • Show Last 20 Lines

utils/bazel/llvm-project-overlay/mlir/BUILD.bazel

Show First 20 Lines • Show All 1,793 Lines • ▼ Show 20 Lines deps = [
":BufferizationDialect", ":BufferizationDialect",
":BufferizationTransforms", ":BufferizationTransforms",
":DialectUtils", ":DialectUtils",
":IR", ":IR",
":MemRefDialect", ":MemRefDialect",
":Pass", ":Pass",
":SCFDialect", ":SCFDialect",
":SCFPassIncGen", ":SCFPassIncGen",
":SCFUtils",
":StandardOps", ":StandardOps",
":Support", ":Support",
":TensorDialect", ":TensorDialect",
":Transforms", ":Transforms",
"//llvm:Support", "//llvm:Support",
], ],
) )
▲ Show 20 Lines • Show All 147 Lines • ▼ Show 20 Lines deps = [
":BufferizationDialect", ":BufferizationDialect",
":IR", ":IR",
":LLVMDialect", ":LLVMDialect",
":LinalgOps", ":LinalgOps",
":LinalgTransforms", ":LinalgTransforms",
":MemRefDialect", ":MemRefDialect",
":Pass", ":Pass",
":SCFDialect", ":SCFDialect",
":SCFTransforms",
":SCFUtils",
":SparseTensor", ":SparseTensor",
":SparseTensorPassIncGen", ":SparseTensorPassIncGen",
":SparseTensorUtils", ":SparseTensorUtils",
":StandardOps", ":StandardOps",
":StandardOpsTransforms", ":StandardOpsTransforms",
":TensorDialect", ":TensorDialect",
":Transforms", ":Transforms",
":VectorOps", ":VectorOps",
▲ Show 20 Lines • Show All 259 Lines • ▼ Show 20 Lines deps = [
":AffinePassIncGen", ":AffinePassIncGen",
":AffineUtils", ":AffineUtils",
":Analysis", ":Analysis",
":ArithmeticDialect", ":ArithmeticDialect",
":IR", ":IR",
":MemRefDialect", ":MemRefDialect",
":Pass", ":Pass",
":SCFDialect", ":SCFDialect",
":SCFUtils",
":StandardOps", ":StandardOps",
":Support", ":Support",
":Transforms", ":Transforms",
":VectorOps", ":VectorOps",
"//llvm:Support", "//llvm:Support",
], ],
) )
▲ Show 20 Lines • Show All 155 Lines • ▼ Show 20 Lines
cc_library( cc_library(
name = "SCFDialect", name = "SCFDialect",
srcs = glob( srcs = glob(
[ [
"lib/Dialect/SCF/*.cpp", "lib/Dialect/SCF/*.cpp",
"lib/Dialect/SCF/*.h", "lib/Dialect/SCF/*.h",
], ],
), ),
hdrs = glob([ hdrs = glob(
[
"include/mlir/Dialect/SCF/*.h", "include/mlir/Dialect/SCF/*.h",
]), ],
exclude = [
"include/mlir/Dialect/SCF/Transforms.h",
herhutUnsubmitted
Not Done
ReplyInline Actions

This is now outdated, as the files have moved.

herhut: This is now outdated, as the files have moved.
akuegelAuthorUnsubmitted
Not Done
ReplyInline Actions

As far as I can tell, they are still in Dialect/SCF directory:

https://github.com/llvm/llvm-project/blob/main/mlir/include/mlir/Dialect/SCF/Utils.h

We could move them also to a separate Utils subdirectory, then this exclude wouldn't be needed. But that would require also to changing several header includes. Might make sense to do in a followup patch?

akuegel: As far as I can tell, they are still in Dialect/SCF directory: https://github.com/llvm/llvm…
akuegelAuthorUnsubmitted
Not Done
ReplyInline Actions

Also, maybe I misunderstood the concern: the exclusion would not necessarily be needed because the headers are also part of the new target. But keeping them in this target has the opportunity to cause linker errors. Users of the headers might depend on the Dialect, but not on the Utils target with the implementation. This will work fine until a binary is built where the missing implementation dependency will be noticed.

akuegel: Also, maybe I misunderstood the concern: the exclusion would not necessarily be needed because…
akuegelAuthorUnsubmitted
Done
ReplyInline Actions

River has also requested to move the headers, so I did that now as part of this patch. This makes it possible to remove the exclusion. I would still like to exclude Transforms.h, otherwise we have the same problem here that someone who uses SCFTransforms might forget to depend on that target. We already have a precedence for that case in the CMakeLists.txt file for SparseTensorTransforms which was missing this dependency (although this exclusion here won't fix cmake ;-) ).

akuegel: River has also requested to move the headers, so I did that now as part of this patch. This…
],
),
includes = ["include"], includes = ["include"],
deps = [ deps = [
":ArithmeticDialect", ":ArithmeticDialect",
":BufferizationDialect", ":BufferizationDialect",
":ControlFlowInterfaces", ":ControlFlowInterfaces",
":IR", ":IR",
":LoopLikeInterface", ":LoopLikeInterface",
":Pass", ":Pass",
":SCFIncGen", ":SCFIncGen",
":SCFPassIncGen", ":SCFPassIncGen",
":StandardOps", ":StandardOps",
":Support", ":Support",
"//llvm:Support", "//llvm:Support",
], ],
) )
cc_library( cc_library(
name = "SCFUtils",
srcs = glob(
[
"lib/Dialect/SCF/Utils/*.cpp",
],
),
hdrs = glob(
[
"include/mlir/Dialect/SCF/Utils/*.h",
],
),
includes = ["include"],
deps = [
":Affine",
":AffineAnalysis",
":Analysis",
":ArithmeticDialect",
":DialectUtils",
":IR",
":SCFDialect",
":StandardOps",
":Support",
":Transforms",
"//llvm:Support",
],
)
cc_library(
name = "LinalgInterfaces", name = "LinalgInterfaces",
srcs = ["lib/Dialect/Linalg/IR/LinalgInterfaces.cpp"], srcs = ["lib/Dialect/Linalg/IR/LinalgInterfaces.cpp"],
hdrs = ["include/mlir/Dialect/Linalg/IR/LinalgInterfaces.h"], hdrs = ["include/mlir/Dialect/Linalg/IR/LinalgInterfaces.h"],
includes = ["include"], includes = ["include"],
deps = [ deps = [
":Affine", ":Affine",
":ArithmeticDialect", ":ArithmeticDialect",
":DialectUtils", ":DialectUtils",
▲ Show 20 Lines • Show All 4,431 Lines • ▼ Show 20 Lines deps = [
":LinalgStructuredOpsIncGen", ":LinalgStructuredOpsIncGen",
":MathDialect", ":MathDialect",
":MemRefDialect", ":MemRefDialect",
":ModuleBufferization", ":ModuleBufferization",
":Pass", ":Pass",
":SCFBufferizableOpInterfaceImpl", ":SCFBufferizableOpInterfaceImpl",
":SCFDialect", ":SCFDialect",
":SCFTransforms", ":SCFTransforms",
":SCFUtils",
":StandardOps", ":StandardOps",
":StandardOpsTransforms", ":StandardOpsTransforms",
":StdBufferizableOpInterfaceImpl", ":StdBufferizableOpInterfaceImpl",
":Support", ":Support",
":TensorDialect", ":TensorDialect",
":TensorTransforms", ":TensorTransforms",
":TensorUtils", ":TensorUtils",
":TransformUtils", ":TransformUtils",
▲ Show 20 Lines • Show All 1,308 Lines • Show Last 20 Lines

utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel

Show First 20 Lines • Show All 451 Lines • ▼ Show 20 Linescc_library(
deps = [ deps = [
"//llvm:Support", "//llvm:Support",
"//mlir:ArithmeticDialect", "//mlir:ArithmeticDialect",
"//mlir:IR", "//mlir:IR",
"//mlir:MathDialect", "//mlir:MathDialect",
"//mlir:Pass", "//mlir:Pass",
"//mlir:SCFDialect", "//mlir:SCFDialect",
"//mlir:SCFTransforms", "//mlir:SCFTransforms",
"//mlir:SCFUtils",
"//mlir:StandardOps", "//mlir:StandardOps",
"//mlir:TransformUtils", "//mlir:TransformUtils",
], ],
) )
cc_library( cc_library(
name = "TestShapeDialect", name = "TestShapeDialect",
srcs = [ srcs = [
▲ Show 20 Lines • Show All 91 Lines • Show Last 20 Lines