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

wang2yn84 · 2025-06-24T21:04:35Z

[MLIR] Fix circular dependency introduced in In #144897. This PR is to break the dependency. by moving StateStack to IR folder

This commit resolves a circular dependency issue between mlir/Support and mlir/IR:

Move StateStack.h and StateStack.cpp from Support to IR folder
Update CMakeLists.txt files to reflect the new locations
Update Bazel BUILD file to maintain correct dependencies
Update includes in affected files (flang, Target/LLVMIR)

The circular dependency was caused by StateStack.h depending on IR/Visitors.h
while other IR files depended on Support. Moving StateStack to IR eliminates
this cycle while maintaining proper separation of concerns.

This change improves build performance and reduces compilation issues.

github-actions · 2025-06-24T21:04:55Z

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

llvmbot · 2025-06-24T21:05:27Z

@llvm/pr-subscribers-flang-fir-hlfir
@llvm/pr-subscribers-mlir

@llvm/pr-subscribers-mlir-core

Author: Lance Wang (wang2yn84)

Changes

In #144897, the StackState file is created in Support folder. However, it depends on the IR folder which forms a circular dependency. This PR is to break the dependency.

Full diff: https://github.com/llvm/llvm-project/pull/145598.diff

5 Files Affected:

(renamed) mlir/include/mlir/IR/StateStack.h (+3-3)
(modified) mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h (+1-1)
(modified) mlir/lib/IR/CMakeLists.txt (+1)
(renamed) mlir/lib/IR/StateStack.cpp (+1-1)
(modified) mlir/lib/Support/CMakeLists.txt (-1)

diff --git a/mlir/include/mlir/Support/StateStack.h b/mlir/include/mlir/IR/StateStack.h
similarity index 97%
rename from mlir/include/mlir/Support/StateStack.h
rename to mlir/include/mlir/IR/StateStack.h
index 44972fafe7fed..6a22e3b0d00a4 100644
--- a/mlir/include/mlir/Support/StateStack.h
+++ b/mlir/include/mlir/IR/StateStack.h
@@ -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"
@@ -125,4 +125,4 @@ struct isa_impl<T, ::mlir::StateStackFrame> {
 };
 } // namespace llvm
 
-#endif // MLIR_SUPPORT_STACKFRAME_H
+#endif // MLIR_IR_STACKFRAME_H
diff --git a/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h b/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h
index 79e8bb6add0da..197be5f30b5b0 100644
--- a/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h
+++ b/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h
@@ -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"
diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt
index 4cabac185171c..997782df8c5f3 100644
--- a/mlir/lib/IR/CMakeLists.txt
+++ b/mlir/lib/IR/CMakeLists.txt
@@ -32,6 +32,7 @@ add_mlir_library(MLIRIR
   PatternMatch.cpp
   Region.cpp
   RegionKindInterface.cpp
+  StateStack.cpp
   SymbolTable.cpp
   TensorEncoding.cpp
   Types.cpp
diff --git a/mlir/lib/Support/StateStack.cpp b/mlir/lib/IR/StateStack.cpp
similarity index 92%
rename from mlir/lib/Support/StateStack.cpp
rename to mlir/lib/IR/StateStack.cpp
index a9bb3ffb2e1b0..22fdcd73c625b 100644
--- a/mlir/lib/Support/StateStack.cpp
+++ b/mlir/lib/IR/StateStack.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Support/StateStack.h"
+#include "mlir/IR/StateStack.h"
 
 namespace mlir {
 
diff --git a/mlir/lib/Support/CMakeLists.txt b/mlir/lib/Support/CMakeLists.txt
index 02b6c694a28fd..488decd52ae64 100644
--- a/mlir/lib/Support/CMakeLists.txt
+++ b/mlir/lib/Support/CMakeLists.txt
@@ -11,7 +11,6 @@ add_mlir_library(MLIRSupport
   FileUtilities.cpp
   InterfaceSupport.cpp
   RawOstreamExtras.cpp
-  StateStack.cpp
   StorageUniquer.cpp
   Timing.cpp
   ToolUtilities.cpp

llvmbot · 2025-06-24T21:05:27Z

@llvm/pr-subscribers-mlir-llvm

Author: Lance Wang (wang2yn84)

Changes

In #144897, the StackState file is created in Support folder. However, it depends on the IR folder which forms a circular dependency. This PR is to break the dependency.

Full diff: https://github.com/llvm/llvm-project/pull/145598.diff

5 Files Affected:

(renamed) mlir/include/mlir/IR/StateStack.h (+3-3)
(modified) mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h (+1-1)
(modified) mlir/lib/IR/CMakeLists.txt (+1)
(renamed) mlir/lib/IR/StateStack.cpp (+1-1)
(modified) mlir/lib/Support/CMakeLists.txt (-1)

diff --git a/mlir/include/mlir/Support/StateStack.h b/mlir/include/mlir/IR/StateStack.h
similarity index 97%
rename from mlir/include/mlir/Support/StateStack.h
rename to mlir/include/mlir/IR/StateStack.h
index 44972fafe7fed..6a22e3b0d00a4 100644
--- a/mlir/include/mlir/Support/StateStack.h
+++ b/mlir/include/mlir/IR/StateStack.h
@@ -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"
@@ -125,4 +125,4 @@ struct isa_impl<T, ::mlir::StateStackFrame> {
 };
 } // namespace llvm
 
-#endif // MLIR_SUPPORT_STACKFRAME_H
+#endif // MLIR_IR_STACKFRAME_H
diff --git a/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h b/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h
index 79e8bb6add0da..197be5f30b5b0 100644
--- a/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h
+++ b/mlir/include/mlir/Target/LLVMIR/ModuleTranslation.h
@@ -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"
diff --git a/mlir/lib/IR/CMakeLists.txt b/mlir/lib/IR/CMakeLists.txt
index 4cabac185171c..997782df8c5f3 100644
--- a/mlir/lib/IR/CMakeLists.txt
+++ b/mlir/lib/IR/CMakeLists.txt
@@ -32,6 +32,7 @@ add_mlir_library(MLIRIR
   PatternMatch.cpp
   Region.cpp
   RegionKindInterface.cpp
+  StateStack.cpp
   SymbolTable.cpp
   TensorEncoding.cpp
   Types.cpp
diff --git a/mlir/lib/Support/StateStack.cpp b/mlir/lib/IR/StateStack.cpp
similarity index 92%
rename from mlir/lib/Support/StateStack.cpp
rename to mlir/lib/IR/StateStack.cpp
index a9bb3ffb2e1b0..22fdcd73c625b 100644
--- a/mlir/lib/Support/StateStack.cpp
+++ b/mlir/lib/IR/StateStack.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Support/StateStack.h"
+#include "mlir/IR/StateStack.h"
 
 namespace mlir {
 
diff --git a/mlir/lib/Support/CMakeLists.txt b/mlir/lib/Support/CMakeLists.txt
index 02b6c694a28fd..488decd52ae64 100644
--- a/mlir/lib/Support/CMakeLists.txt
+++ b/mlir/lib/Support/CMakeLists.txt
@@ -11,7 +11,6 @@ add_mlir_library(MLIRSupport
   FileUtilities.cpp
   InterfaceSupport.cpp
   RawOstreamExtras.cpp
-  StateStack.cpp
   StorageUniquer.cpp
   Timing.cpp
   ToolUtilities.cpp

This commit resolves a circular dependency issue between mlir/Support and mlir/IR: - Move StateStack.h and StateStack.cpp from Support to IR folder - Update CMakeLists.txt files to reflect the new locations - Update Bazel BUILD file to maintain correct dependencies - Update includes in affected files (flang, Target/LLVMIR) The circular dependency was caused by StateStack.h depending on IR/Visitors.h while other IR files depended on Support. Moving StateStack to IR eliminates this cycle while maintaining proper separation of concerns. This change improves build performance and reduces compilation issues.

github-actions · 2025-06-25T04:00:33Z

@wang2yn84 Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

ftynse · 2025-06-25T06:32:41Z

Thank you for the hotfix. The proper way of action would have been to revert the PR in question, or at least notify the author of the problem.

…5598) [MLIR] Fix circular dependency introduced in In llvm#144897. This PR is to break the dependency. by moving StateStack to IR folder This commit resolves a circular dependency issue between mlir/Support and mlir/IR: - Move StateStack.h and StateStack.cpp from Support to IR folder - Update CMakeLists.txt files to reflect the new locations - Update Bazel BUILD file to maintain correct dependencies - Update includes in affected files (flang, Target/LLVMIR) The circular dependency was caused by StateStack.h depending on IR/Visitors.h while other IR files depended on Support. Moving StateStack to IR eliminates this cycle while maintaining proper separation of concerns.

llvmbot added mlir:core MLIR Core Infrastructure mlir:llvm mlir labels Jun 24, 2025

itf approved these changes Jun 24, 2025

View reviewed changes

itf added a commit to itf/llvm-project that referenced this pull request Jun 24, 2025

[bazel] Remove IR dependency from support after llvm#145598

66093b2

itf added a commit to itf/llvm-project that referenced this pull request Jun 24, 2025

[bazel] Remove IR dependency from Support after llvm#145598

bb38827

wang2yn84 force-pushed the lance-dev branch from 0e3490c to 9c68a81 Compare June 24, 2025 23:38

llvmbot added flang Flang issues not falling into any other category flang:fir-hlfir labels Jun 24, 2025

wang2yn84 force-pushed the lance-dev branch 2 times, most recently from 75680f8 to cedf9bb Compare June 25, 2025 00:13

wang2yn84 requested review from rupprecht, keith and aaronmondal as code owners June 25, 2025 00:13

llvmbot added the bazel "Peripheral" support tier build system: utils/bazel label Jun 25, 2025

wang2yn84 force-pushed the lance-dev branch from cedf9bb to 81c5c82 Compare June 25, 2025 00:23

Merge branch 'main' into lance-dev

c2adbf8

itf mentioned this pull request Jun 25, 2025

[bazel] Add //mlir:IR to Support for #144897 #145569

Merged

itf merged commit 77af8bf into llvm:main Jun 25, 2025
7 checks passed

ftynse mentioned this pull request Jun 25, 2025

[mlir][NFC] Move LLVM::ModuleTranslation::SaveStack to a shared header #144897

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

wang2yn84 commented Jun 24, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jun 24, 2025

Uh oh!

llvmbot commented Jun 24, 2025 •

edited

Loading

Uh oh!

llvmbot commented Jun 24, 2025

Uh oh!

Uh oh!

github-actions bot commented Jun 25, 2025

Uh oh!

ftynse commented Jun 25, 2025

Uh oh!

Uh oh!

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

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

Uh oh!

Conversation

wang2yn84 commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jun 24, 2025

Uh oh!

llvmbot commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Jun 24, 2025

Uh oh!

Uh oh!

github-actions bot commented Jun 25, 2025

Uh oh!

ftynse commented Jun 25, 2025

Uh oh!

Uh oh!

wang2yn84 commented Jun 24, 2025 •

edited

Loading

llvmbot commented Jun 24, 2025 •

edited

Loading