Skip to content

[mlir]Moves the StateStack to IR folder from Support folder. #145598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 25, 2025
Merged

[mlir]Moves the StateStack to IR folder from Support folder. #145598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81c5c82
[MLIR] Fix circular dependency by moving StateStack to IR folder
wang2yn84 Jun 25, 2025
c2adbf8
Merge branch 'main' into lance-dev
wang2yn84 Jun 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flang/lib/Lower/Bridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
#include "mlir/IR/BuiltinAttributes.h"
#include "mlir/IR/Matchers.h"
#include "mlir/IR/PatternMatch.h"
#include "mlir/IR/StateStack.h"
#include "mlir/Parser/Parser.h"
#include "mlir/Support/StateStack.h"
#include "mlir/Transforms/RegionUtils.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringSet.h"
Expand Down
2 changes: 1 addition & 1 deletion flang/lib/Lower/OpenMP/OpenMP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include "flang/Support/OpenMP-utils.h"
#include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h"
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
#include "mlir/Support/StateStack.h"
#include "mlir/IR/StateStack.h"
#include "mlir/Transforms/RegionUtils.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/Frontend/OpenMP/OMPConstants.h"
Expand Down
6 changes: 3 additions & 3 deletions mlir/include/mlir/Support/StateStack.h → mlir/include/mlir/IR/StateStack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef MLIR_SUPPORT_STACKFRAME_H
#define MLIR_SUPPORT_STACKFRAME_H
#ifndef MLIR_IR_STACKFRAME_H
#define MLIR_IR_STACKFRAME_H

#include "mlir/IR/Visitors.h"
#include "mlir/Support/TypeID.h"
Expand Down Expand Up @@ -125,4 +125,4 @@ struct isa_impl<T, ::mlir::StateStackFrame> {
};
} // namespace llvm

#endif // MLIR_SUPPORT_STACKFRAME_H
#endif // MLIR_IR_STACKFRAME_H
2 changes: 1 addition & 1 deletion mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#include "mlir/Dialect/LLVMIR/LLVMInterfaces.h"
#include "mlir/IR/Operation.h"
#include "mlir/IR/StateStack.h"
#include "mlir/IR/SymbolTable.h"
#include "mlir/IR/Value.h"
#include "mlir/Support/StateStack.h"
#include "mlir/Target/LLVMIR/Export.h"
#include "mlir/Target/LLVMIR/LLVMTranslationInterface.h"
#include "mlir/Target/LLVMIR/TypeToLLVM.h"
Expand Down
1 change: 1 addition & 0 deletions mlir/lib/IR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ add_mlir_library(MLIRIR
PatternMatch.cpp
Region.cpp
RegionKindInterface.cpp
StateStack.cpp
SymbolTable.cpp
TensorEncoding.cpp
Types.cpp
Expand Down
2 changes: 1 addition & 1 deletion mlir/lib/Support/StateStack.cpp → mlir/lib/IR/StateStack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include "mlir/Support/StateStack.h"
#include "mlir/IR/StateStack.h"

namespace mlir {

Expand Down
1 change: 0 additions & 1 deletion mlir/lib/Support/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ add_mlir_library(MLIRSupport
FileUtilities.cpp
InterfaceSupport.cpp
RawOstreamExtras.cpp
StateStack.cpp
StorageUniquer.cpp
Timing.cpp
ToolUtilities.cpp
Expand Down
6 changes: 1 addition & 5 deletions utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4845,11 +4845,7 @@ cc_library(
]),
hdrs = glob(["include/mlir/Support/*.h"]),
includes = ["include"],
deps = [
"//llvm:Support",
"//mlir:IR",
],
)
deps = ["//llvm:Support"],)

cc_library(
name = "Debug",
Expand Down