release/22.x: [flang] Fix -fno-omit-frame-pointer (#180507)#181277
Merged
c-rhodes merged 1 commit intollvm:release/22.xfrom Feb 16, 2026
Merged
release/22.x: [flang] Fix -fno-omit-frame-pointer (#180507)#181277c-rhodes merged 1 commit intollvm:release/22.xfrom
c-rhodes merged 1 commit intollvm:release/22.xfrom
Conversation
llvmbot
temporarily deployed
to
main-branch-only
GitHub Actions
Inactive
Member
Author
|
@jeanPerier What do you think about merging this PR to the release branch? |
llvmbot
added
flang:driver
flang
llvmbot
temporarily deployed
to
main-branch-only
GitHub Actions
Inactive
llvmbot
temporarily deployed
to
main-branch-only
GitHub Actions
Inactive
llvmbot
temporarily deployed
to
main-branch-only
GitHub Actions
Inactive
Member
Author
|
@llvm/pr-subscribers-flang-fir-hlfir Author: None (llvmbot) ChangesBackport e2297da Requested by: @kawashima-fj Full diff: https://github.com/llvm/llvm-project/pull/181277.diff 3 Files Affected:
diff --git a/flang/include/flang/Optimizer/Transforms/Passes.td b/flang/include/flang/Optimizer/Transforms/Passes.td
index b40ef0aa0b319..d9f52025fe104 100644
--- a/flang/include/flang/Optimizer/Transforms/Passes.td
+++ b/flang/include/flang/Optimizer/Transforms/Passes.td
@@ -417,7 +417,8 @@ def FunctionAttr : Pass<"function-attr", "mlir::func::FuncOp"> {
clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::None, "None", ""),
clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::NonLeaf, "NonLeaf", ""),
clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::All, "All", ""),
- clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::Reserved, "Reserved", "")
+ clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::Reserved, "Reserved", ""),
+ clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::NonLeafNoReserve, "NonLeafNoReserve", "")
)}]>,
Option<"instrumentFunctionEntry", "instrument-function-entry",
"std::string", /*default=*/"",
diff --git a/flang/lib/Optimizer/Passes/Pipelines.cpp b/flang/lib/Optimizer/Passes/Pipelines.cpp
index cdac494c97e3a..1682890115c64 100644
--- a/flang/lib/Optimizer/Passes/Pipelines.cpp
+++ b/flang/lib/Optimizer/Passes/Pipelines.cpp
@@ -387,6 +387,9 @@ void createDefaultFIRCodeGenPassPipeline(mlir::PassManager &pm,
framePointerKind = mlir::LLVM::framePointerKind::FramePointerKind::All;
else if (config.FramePointerKind == llvm::FramePointerKind::Reserved)
framePointerKind = mlir::LLVM::framePointerKind::FramePointerKind::Reserved;
+ else if (config.FramePointerKind == llvm::FramePointerKind::NonLeafNoReserve)
+ framePointerKind =
+ mlir::LLVM::framePointerKind::FramePointerKind::NonLeafNoReserve;
else
framePointerKind = mlir::LLVM::framePointerKind::FramePointerKind::None;
diff --git a/flang/test/Driver/func-attr.f90 b/flang/test/Driver/func-attr.f90
index e8cab4fca2226..78bde6d46b1f7 100644
--- a/flang/test/Driver/func-attr.f90
+++ b/flang/test/Driver/func-attr.f90
@@ -4,6 +4,7 @@
! RUN: %flang_fc1 -triple aarch64-none-none -mframe-pointer=none -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-NONEFP
! RUN: %flang_fc1 -triple aarch64-none-none -mframe-pointer=non-leaf -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-NONLEAFFP
+! RUN: %flang_fc1 -triple aarch64-none-none -mframe-pointer=non-leaf-no-reserve -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-NONLEAFNORESERVEFP
! RUN: %flang_fc1 -triple aarch64-none-none -mframe-pointer=reserved -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-RESERVEDFP
! RUN: %flang_fc1 -triple aarch64-none-none -mframe-pointer=all -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-ALLFP
! RUN: not %flang_fc1 -triple aarch64-none-none -mframe-pointer=wrongval -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-WRONGVALUEFP
@@ -13,6 +14,9 @@
! CHECK-NONLEAFFP-LABEL: @func_()
! CHECK-NONLEAFFP-SAME: #0
+! CHECK-NONLEAFNORESERVEFP-LABEL: @func_()
+! CHECK-NONLEAFNORESERVEFP-SAME: #0
+
! CHECK-ALLFP-LABEL: @func_()
! CHECK-ALLFP-SAME: #0
@@ -21,6 +25,7 @@ end subroutine func
! CHECK-NONEFP-NOT: attributes #0 = { "frame-pointer"="{{.*}}" }
! CHECK-NONLEAFFP: attributes #0 = { "frame-pointer"="non-leaf" }
+! CHECK-NONLEAFNORESERVEFP: attributes #0 = { "frame-pointer"="non-leaf-no-reserve" }
! CHECK-RESERVEDFP: attributes #0 = { "frame-pointer"="reserved" }
! CHECK-ALLFP: attributes #0 = { "frame-pointer"="all" }
|
Member
Author
|
@llvm/pr-subscribers-flang-driver Author: None (llvmbot) ChangesBackport e2297da Requested by: @kawashima-fj Full diff: https://github.com/llvm/llvm-project/pull/181277.diff 3 Files Affected:
diff --git a/flang/include/flang/Optimizer/Transforms/Passes.td b/flang/include/flang/Optimizer/Transforms/Passes.td
index b40ef0aa0b319..d9f52025fe104 100644
--- a/flang/include/flang/Optimizer/Transforms/Passes.td
+++ b/flang/include/flang/Optimizer/Transforms/Passes.td
@@ -417,7 +417,8 @@ def FunctionAttr : Pass<"function-attr", "mlir::func::FuncOp"> {
clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::None, "None", ""),
clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::NonLeaf, "NonLeaf", ""),
clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::All, "All", ""),
- clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::Reserved, "Reserved", "")
+ clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::Reserved, "Reserved", ""),
+ clEnumValN(mlir::LLVM::framePointerKind::FramePointerKind::NonLeafNoReserve, "NonLeafNoReserve", "")
)}]>,
Option<"instrumentFunctionEntry", "instrument-function-entry",
"std::string", /*default=*/"",
diff --git a/flang/lib/Optimizer/Passes/Pipelines.cpp b/flang/lib/Optimizer/Passes/Pipelines.cpp
index cdac494c97e3a..1682890115c64 100644
--- a/flang/lib/Optimizer/Passes/Pipelines.cpp
+++ b/flang/lib/Optimizer/Passes/Pipelines.cpp
@@ -387,6 +387,9 @@ void createDefaultFIRCodeGenPassPipeline(mlir::PassManager &pm,
framePointerKind = mlir::LLVM::framePointerKind::FramePointerKind::All;
else if (config.FramePointerKind == llvm::FramePointerKind::Reserved)
framePointerKind = mlir::LLVM::framePointerKind::FramePointerKind::Reserved;
+ else if (config.FramePointerKind == llvm::FramePointerKind::NonLeafNoReserve)
+ framePointerKind =
+ mlir::LLVM::framePointerKind::FramePointerKind::NonLeafNoReserve;
else
framePointerKind = mlir::LLVM::framePointerKind::FramePointerKind::None;
diff --git a/flang/test/Driver/func-attr.f90 b/flang/test/Driver/func-attr.f90
index e8cab4fca2226..78bde6d46b1f7 100644
--- a/flang/test/Driver/func-attr.f90
+++ b/flang/test/Driver/func-attr.f90
@@ -4,6 +4,7 @@
! RUN: %flang_fc1 -triple aarch64-none-none -mframe-pointer=none -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-NONEFP
! RUN: %flang_fc1 -triple aarch64-none-none -mframe-pointer=non-leaf -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-NONLEAFFP
+! RUN: %flang_fc1 -triple aarch64-none-none -mframe-pointer=non-leaf-no-reserve -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-NONLEAFNORESERVEFP
! RUN: %flang_fc1 -triple aarch64-none-none -mframe-pointer=reserved -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-RESERVEDFP
! RUN: %flang_fc1 -triple aarch64-none-none -mframe-pointer=all -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-ALLFP
! RUN: not %flang_fc1 -triple aarch64-none-none -mframe-pointer=wrongval -emit-llvm -o - %s 2>&1| FileCheck %s --check-prefix=CHECK-WRONGVALUEFP
@@ -13,6 +14,9 @@
! CHECK-NONLEAFFP-LABEL: @func_()
! CHECK-NONLEAFFP-SAME: #0
+! CHECK-NONLEAFNORESERVEFP-LABEL: @func_()
+! CHECK-NONLEAFNORESERVEFP-SAME: #0
+
! CHECK-ALLFP-LABEL: @func_()
! CHECK-ALLFP-SAME: #0
@@ -21,6 +25,7 @@ end subroutine func
! CHECK-NONEFP-NOT: attributes #0 = { "frame-pointer"="{{.*}}" }
! CHECK-NONLEAFFP: attributes #0 = { "frame-pointer"="non-leaf" }
+! CHECK-NONLEAFNORESERVEFP: attributes #0 = { "frame-pointer"="non-leaf-no-reserve" }
! CHECK-RESERVEDFP: attributes #0 = { "frame-pointer"="reserved" }
! CHECK-ALLFP: attributes #0 = { "frame-pointer"="all" }
|
github-project-automation
bot
moved this from Needs Triage
to Needs Merge
in LLVM Release Status
The PR llvm#163775 added `FramePointerKind::NonLeafNoReserve`. However it seems it forgot to update some codes in Flang. By this bug, `frame-pointer` attribute in IR was not set even if `-fno-omit-frame-pointer` is specified. Fixes llvm#180118 (cherry picked from commit e2297da)
c-rhodes
force-pushed
the
issue180507
branch
from
3fe8105 to
2350d0f
Compare
github-project-automation
bot
moved this from Needs Merge
to Done
in LLVM Release Status
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport e2297da
Requested by: @kawashima-fj