Skip to content

Commit

Permalink
[mlir] Add #include <optional> (NFC)
Browse files Browse the repository at this point in the history 
This patch adds #include <optional> to those files containing
llvm::Optional<...> or Optional<...>.

I'll post a separate patch to actually replace llvm::Optional with
std::optional.

This is part of an effort to migrate from llvm::Optional to
std::optional:

https://discourse.llvm.org/t/deprecating-llvm-optional-x-hasvalue-getvalue-getvalueor/63716
  • Loading branch information
@kazutakahirata
kazutakahirata committed Jan 14, 2023
1 parent a3e975d commit a1fe1f5
Show file tree
Hide file tree
Showing 223 changed files with 223 additions and 0 deletions.
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch1/include/toy/AST.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "llvm/Support/Casting.h"
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch1/include/toy/Parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <map>
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch2/include/toy/AST.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "llvm/Support/Casting.h"
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch2/include/toy/Parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <map>
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch3/include/toy/AST.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "llvm/Support/Casting.h"
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch3/include/toy/Parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <map>
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch4/include/toy/AST.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "llvm/Support/Casting.h"
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch4/include/toy/Parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <map>
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch5/include/toy/AST.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "llvm/Support/Casting.h"
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch5/include/toy/Parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <map>
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch6/include/toy/AST.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "llvm/Support/Casting.h"
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch6/include/toy/Parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <map>
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch7/include/toy/AST.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#include "llvm/Support/Casting.h"
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch7/include/toy/Parser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <map>
#include <utility>
#include <vector>
#include <optional>

namespace toy {

Expand Down
1 change: 1 addition & 0 deletions mlir/examples/toy/Ch7/mlir/MLIRGen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include "llvm/ADT/ScopedHashTable.h"
#include "llvm/Support/raw_ostream.h"
#include <numeric>
#include <optional>

using namespace mlir::toy;
using namespace toy;
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Analysis/DataFlow/ConstantPropagationAnalysis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#define MLIR_ANALYSIS_DATAFLOW_CONSTANTPROPAGATIONANALYSIS_H

#include "mlir/Analysis/DataFlow/SparseAnalysis.h"
#include <optional>

namespace mlir {
namespace dataflow {
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Analysis/DataFlow/DeadCodeAnalysis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "mlir/Analysis/DataFlowFramework.h"
#include "mlir/IR/SymbolTable.h"
#include "llvm/ADT/SmallPtrSet.h"
#include <optional>

namespace mlir {

Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Analysis/Presburger/IntegerRelation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "mlir/Analysis/Presburger/PresburgerSpace.h"
#include "mlir/Analysis/Presburger/Utils.h"
#include "mlir/Support/LogicalResult.h"
#include <optional>

namespace mlir {
namespace presburger {
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Analysis/Presburger/PWMAFunction.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include "mlir/Analysis/Presburger/IntegerRelation.h"
#include "mlir/Analysis/Presburger/PresburgerRelation.h"
#include <optional>

namespace mlir {
namespace presburger {
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Analysis/Presburger/PresburgerRelation.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#define MLIR_ANALYSIS_PRESBURGER_PRESBURGERRELATION_H

#include "mlir/Analysis/Presburger/IntegerRelation.h"
#include <optional>

namespace mlir {
namespace presburger {
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Analysis/Presburger/Simplex.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/Support/StringSaver.h"
#include "llvm/Support/raw_ostream.h"
#include <optional>

namespace mlir {
namespace presburger {
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Analysis/Presburger/Utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "llvm/ADT/SmallBitVector.h"

#include "mlir/Analysis/Presburger/Matrix.h"
#include <optional>

namespace mlir {
namespace presburger {
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Conversion/MathToLibm/MathToLibm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#define MLIR_CONVERSION_MATHTOLIBM_MATHTOLIBM_H_

#include "mlir/Transforms/DialectConversion.h"
#include <optional>

namespace mlir {
template <typename T>
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "mlir/IR/Value.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/SmallVector.h"
#include <optional>

namespace mlir {

Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Affine/Analysis/AffineStructures.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "mlir/IR/AffineExpr.h"
#include "mlir/IR/OpDefinition.h"
#include "mlir/Support/LogicalResult.h"
#include <optional>

namespace mlir {

Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Affine/Analysis/LoopAnalysis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "mlir/Support/LLVM.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
#include <optional>

namespace mlir {

Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Affine/Analysis/Utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "mlir/Support/LLVM.h"
#include "llvm/ADT/SmallVector.h"
#include <memory>
#include <optional>

namespace mlir {

Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Affine/LoopUtils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "mlir/IR/Block.h"
#include "mlir/Support/LLVM.h"
#include "mlir/Support/LogicalResult.h"
#include <optional>

namespace mlir {
class AffineForOp;
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Affine/Utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include "mlir/Dialect/Affine/Analysis/AffineAnalysis.h"
#include "mlir/Dialect/Affine/IR/AffineOps.h"
#include <optional>

namespace mlir {

Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "mlir/IR/PatternMatch.h"
#include "mlir/Support/LLVM.h"
#include "llvm/ADT/SetVector.h"
#include <optional>

#include "mlir/Dialect/Bufferization/IR/BufferizationEnums.h.inc"

Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/CommonFolders.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "mlir/IR/BuiltinTypes.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/STLExtras.h"
#include <optional>

namespace mlir {
/// Performs constant folding `calculate` with element-wise behavior on the two
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Func/Transforms/DecomposeCallGraphTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#define MLIR_DIALECT_FUNC_TRANSFORMS_DECOMPOSECALLGRAPHTYPES_H

#include "mlir/Transforms/DialectConversion.h"
#include <optional>

namespace mlir {

Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/GPU/Transforms/Passes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include "mlir/Dialect/GPU/IR/GPUDialect.h"
#include "mlir/Pass/Pass.h"
#include <optional>

namespace llvm {
class TargetMachine;
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/LLVMIR/LLVMAttrs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
#include "mlir/IR/OpImplementation.h"
#include <optional>

#include "mlir/Dialect/LLVMIR/LLVMOpsEnums.h.inc"

Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/LLVMIR/LLVMTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "mlir/IR/SubElementInterfaces.h"
#include "mlir/IR/Types.h"
#include "mlir/Interfaces/DataLayoutInterfaces.h"
#include <optional>

namespace llvm {
class ElementCount;
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "mlir/Dialect/Linalg/IR/Linalg.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/OpDefinition.h"
#include <optional>

namespace mlir {
namespace func {
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Linalg/IR/Linalg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "mlir/Interfaces/SideEffectInterfaces.h"
#include "mlir/Interfaces/TilingInterface.h"
#include "mlir/Interfaces/ViewLikeInterface.h"
#include <optional>

namespace mlir {
namespace linalg {
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Linalg/Utils/Utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "mlir/Dialect/SCF/IR/SCF.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/StringSet.h"
#include <optional>

namespace mlir {
class AffineExpr;
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/MemRef/IR/MemRef.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "mlir/Interfaces/ShapedOpInterfaces.h"
#include "mlir/Interfaces/SideEffectInterfaces.h"
#include "mlir/Interfaces/ViewLikeInterface.h"
#include <optional>

namespace mlir {

Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/SCF/Utils/Utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "mlir/Support/LLVM.h"
#include "mlir/Support/LogicalResult.h"
#include "llvm/ADT/STLExtras.h"
#include <optional>

namespace mlir {
class Location;
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/SPIRV/IR/TargetAndABI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "mlir/Dialect/SPIRV/IR/SPIRVAttributes.h"
#include "mlir/Support/LLVM.h"
#include "llvm/ADT/SmallSet.h"
#include <optional>

namespace mlir {
class Operation;
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/SparseTensor/Utils/Merger.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "mlir/Dialect/SparseTensor/IR/Enums.h"
#include "mlir/IR/Value.h"
#include "llvm/ADT/BitVector.h"
#include <optional>

namespace mlir {
namespace sparse_tensor {
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Tosa/Utils/ConversionUtils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "mlir/Dialect/Tensor/IR/Tensor.h"
#include "mlir/Dialect/Utils/StructuredOpsUtils.h"
#include "mlir/IR/PatternMatch.h"
#include <optional>

namespace mlir {
namespace tosa {
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Transform/IR/TransformDialect.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "mlir/Support/LLVM.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/StringMap.h"
#include <optional>

namespace mlir {
namespace transform {
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Transform/Utils/DiagnosedSilenceableFailure.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include "mlir/IR/Diagnostics.h"
#include "mlir/IR/Operation.h"
#include <optional>

#ifndef MLIR_DIALECT_TRANSFORM_UTILS_DIAGNOSEDSILENCEABLEFAILURE_H
#define MLIR_DIALECT_TRANSFORM_UTILS_DIAGNOSEDSILENCEABLEFAILURE_H
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Utils/IndexingUtils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "mlir/Support/LLVM.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/SmallVector.h"
#include <optional>

namespace mlir {
class ArrayAttr;
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Utils/ReshapeOpsUtils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "mlir/IR/PatternMatch.h"
#include "mlir/Support/LLVM.h"
#include "llvm/ADT/StringRef.h"
#include <optional>

namespace mlir {

Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Vector/Transforms/VectorRewritePatterns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#define MLIR_DIALECT_VECTOR_TRANSFORMS_VECTORREWRITEPATTERNS_H

#include <utility>
#include <optional>

#include "mlir/Dialect/Vector/IR/VectorOps.h"
#include "mlir/Dialect/Vector/Utils/VectorUtils.h"
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/ExecutionEngine/ExecutionEngine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

#include <functional>
#include <memory>
#include <optional>

namespace llvm {
template <typename T>
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/ExecutionEngine/MemRefUtils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <functional>
#include <initializer_list>
#include <memory>
#include <optional>

#ifndef MLIR_EXECUTIONENGINE_MEMREFUTILS_H_
#define MLIR_EXECUTIONENGINE_MEMREFUTILS_H_
Expand Down
Loading

0 comments on commit a1fe1f5

Please sign in to comment.