[Flang] Fix options for FunctionAttr pass #126819
Merged
Conversation
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
For non-basic types GenericOptionParser::findArgStrForValue will return null when the specific values are not found. Add the enum, much like the debug-level option in AddDebugInfo to resolve this problem. Also change tuneCPU to be std::string or it will also have the same problem.
llvmbot
added
flang
|
@llvm/pr-subscribers-flang-fir-hlfir Author: Scott Manley (rscottmanley) ChangesFor non-basic types GenericOptionParser::findArgStrForValue will return null, ultimately an llvm_unreachable, when the specific values are not found. Add the enum, much like the debug-level option in AddDebugInfo to resolve this problem. Also change tuneCPU to be std::string or it will also fail. Full diff: https://github.com/llvm/llvm-project/pull/126819.diff 1 Files Affected:
diff --git a/flang/include/flang/Optimizer/Transforms/Passes.td b/flang/include/flang/Optimizer/Transforms/Passes.td
index 61f8b0835c958..0b6e0119c16c3 100644
--- a/flang/include/flang/Optimizer/Transforms/Passes.td
+++ b/flang/include/flang/Optimizer/Transforms/Passes.td
@@ -383,30 +383,33 @@ def FunctionAttr : Pass<"function-attr", "mlir::func::FuncOp"> {
freeing up an additional register in numerous functions. However, this
approach can make debugging unfeasible on certain machines.
}];
- let options = [
- Option<"framePointerKind", "frame-pointer",
- "mlir::LLVM::framePointerKind::FramePointerKind",
- /*default=*/"mlir::LLVM::framePointerKind::FramePointerKind{}",
- "frame pointer">,
- Option<"noInfsFPMath", "no-infs-fp-math",
- "bool", /*default=*/"false",
- "Set the no-infs-fp-math attribute on functions in the module.">,
- Option<"noNaNsFPMath", "no-nans-fp-math",
- "bool", /*default=*/"false",
- "Set the no-nans-fp-math attribute on functions in the module.">,
- Option<"approxFuncFPMath", "approx-func-fp-math",
- "bool", /*default=*/"false",
+ let options =
+ [Option<"framePointerKind", "frame-pointer",
+ "mlir::LLVM::framePointerKind::FramePointerKind",
+ /*default=*/"mlir::LLVM::framePointerKind::FramePointerKind{}",
+ "frame pointer", [{::llvm::cl::values(
+ 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", "")
+ )}]>,
+ Option<"noInfsFPMath", "no-infs-fp-math", "bool", /*default=*/"false",
+ "Set the no-infs-fp-math attribute on functions in the module.">,
+ Option<"noNaNsFPMath", "no-nans-fp-math", "bool", /*default=*/"false",
+ "Set the no-nans-fp-math attribute on functions in the module.">,
+ Option<
+ "approxFuncFPMath", "approx-func-fp-math", "bool",
+ /*default=*/"false",
"Set the approx-func-fp-math attribute on functions in the module.">,
- Option<"noSignedZerosFPMath", "no-signed-zeros-fp-math",
- "bool", /*default=*/"false",
- "Set the no-signed-zeros-fp-math attribute on functions in the module.">,
- Option<"unsafeFPMath", "unsafe-fp-math",
- "bool", /*default=*/"false",
- "Set the unsafe-fp-math attribute on functions in the module.">,
- Option<"tuneCPU", "tune-cpu",
- "llvm::StringRef", /*default=*/"llvm::StringRef{}",
- "Set the tune-cpu attribute on functions in the module.">,
-];
+ Option<"noSignedZerosFPMath", "no-signed-zeros-fp-math", "bool",
+ /*default=*/"false",
+ "Set the no-signed-zeros-fp-math attribute on functions in the "
+ "module.">,
+ Option<"unsafeFPMath", "unsafe-fp-math", "bool", /*default=*/"false",
+ "Set the unsafe-fp-math attribute on functions in the module.">,
+ Option<"tuneCPU", "tune-cpu", "std::string", /*default=*/"",
+ "Set the tune-cpu attribute on functions in the module.">,
+ ];
}
def AssumedRankOpConversion : Pass<"fir-assumed-rank-op", "mlir::ModuleOp"> {
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/89/builds/16448 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/157/builds/19806 Here is the relevant piece of the build log for the reference |
flovent
pushed a commit
to flovent/llvm-project
that referenced
this pull request
Feb 13, 2025
For non-basic types GenericOptionParser::findArgStrForValue will return null, ultimately an llvm_unreachable, when the specific values are not found. Add the enum, much like the debug-level option in AddDebugInfo to resolve this problem. Also change tuneCPU to be std::string or it will also fail.
joaosaffran
pushed a commit
to joaosaffran/llvm-project
that referenced
this pull request
Feb 14, 2025
For non-basic types GenericOptionParser::findArgStrForValue will return null, ultimately an llvm_unreachable, when the specific values are not found. Add the enum, much like the debug-level option in AddDebugInfo to resolve this problem. Also change tuneCPU to be std::string or it will also fail.
sivan-shani
pushed a commit
to sivan-shani/llvm-project
that referenced
this pull request
Feb 24, 2025
For non-basic types GenericOptionParser::findArgStrForValue will return null, ultimately an llvm_unreachable, when the specific values are not found. Add the enum, much like the debug-level option in AddDebugInfo to resolve this problem. Also change tuneCPU to be std::string or it will also fail.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For non-basic types GenericOptionParser::findArgStrForValue will return null, ultimately an llvm_unreachable, when the specific values are not found. Add the enum, much like the debug-level option in AddDebugInfo to resolve this problem. Also change tuneCPU to be std::string or it will also fail.