opt: Fix bad merge of #167996 #168110
Merged
opt: Fix bad merge of #167996 #168110
+13
−20
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
llvmbot
added
clang
Member
|
@llvm/pr-subscribers-clang-codegen Author: Matt Arsenault (arsenm) ChangesAfter the base branch was moved to main, this somehow ended up Also fix other build error with gcc bots. Full diff: https://github.com/llvm/llvm-project/pull/168110.diff 4 Files Affected:
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
index f1e20403ad668..6f63e6470270e 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -483,31 +483,31 @@ static bool initTargetOptions(const CompilerInstance &CI,
switch (CodeGenOpts.getVecLib()) {
case llvm::driver::VectorLibrary::NoLibrary:
- Options.VectorLibrary = llvm::VectorLibrary::NoLibrary;
+ Options.VecLib = llvm::VectorLibrary::NoLibrary;
break;
case llvm::driver::VectorLibrary::Accelerate:
- Options.VectorLibrary = llvm::VectorLibrary::Accelerate;
+ Options.VecLib = llvm::VectorLibrary::Accelerate;
break;
case llvm::driver::VectorLibrary::Darwin_libsystem_m:
- Options.VectorLibrary = llvm::VectorLibrary::DarwinLibSystemM;
+ Options.VecLib = llvm::VectorLibrary::DarwinLibSystemM;
break;
case llvm::driver::VectorLibrary::LIBMVEC:
- Options.VectorLibrary = llvm::VectorLibrary::LIBMVEC;
+ Options.VecLib = llvm::VectorLibrary::LIBMVEC;
break;
case llvm::driver::VectorLibrary::MASSV:
- Options.VectorLibrary = llvm::VectorLibrary::MASSV;
+ Options.VecLib = llvm::VectorLibrary::MASSV;
break;
case llvm::driver::VectorLibrary::SVML:
- Options.VectorLibrary = llvm::VectorLibrary::SVML;
+ Options.VecLib = llvm::VectorLibrary::SVML;
break;
case llvm::driver::VectorLibrary::SLEEF:
- Options.VectorLibrary = llvm::VectorLibrary::SLEEFGNUABI;
+ Options.VecLib = llvm::VectorLibrary::SLEEFGNUABI;
break;
case llvm::driver::VectorLibrary::ArmPL:
- Options.VectorLibrary = llvm::VectorLibrary::ArmPL;
+ Options.VecLib = llvm::VectorLibrary::ArmPL;
break;
case llvm::driver::VectorLibrary::AMDLIBM:
- Options.VectorLibrary = llvm::VectorLibrary::AMDLIBM;
+ Options.VecLib = llvm::VectorLibrary::AMDLIBM;
break;
}
diff --git a/llvm/include/llvm/Target/TargetOptions.h b/llvm/include/llvm/Target/TargetOptions.h
index b9258c0fee692..0312515d11798 100644
--- a/llvm/include/llvm/Target/TargetOptions.h
+++ b/llvm/include/llvm/Target/TargetOptions.h
@@ -411,7 +411,7 @@ class TargetOptions {
DebuggerKind DebuggerTuning = DebuggerKind::Default;
/// Vector math library to use.
- VectorLibrary VectorLibrary = VectorLibrary::NoLibrary;
+ VectorLibrary VecLib = VectorLibrary::NoLibrary;
private:
/// Flushing mode to assume in default FP environment.
diff --git a/llvm/lib/CodeGen/CommandFlags.cpp b/llvm/lib/CodeGen/CommandFlags.cpp
index 02a6bb9357ad0..8f92ee30e221a 100644
--- a/llvm/lib/CodeGen/CommandFlags.cpp
+++ b/llvm/lib/CodeGen/CommandFlags.cpp
@@ -632,7 +632,7 @@ codegen::InitTargetOptionsFromCodeGenFlags(const Triple &TheTriple) {
Options.EnableTLSDESC =
getExplicitEnableTLSDESC().value_or(TheTriple.hasDefaultTLSDESC());
Options.ExceptionModel = getExceptionModel();
- Options.VectorLibrary = getVectorLibrary();
+ Options.VecLib = getVectorLibrary();
Options.EmitStackSizeSection = getEnableStackSizeSection();
Options.EnableMachineFunctionSplitter = getEnableMachineFunctionSplitter();
Options.EnableStaticDataPartitioning = getEnableStaticDataPartitioning();
diff --git a/llvm/tools/opt/optdriver.cpp b/llvm/tools/opt/optdriver.cpp
index c65cae54b9530..d24c8abef31d0 100644
--- a/llvm/tools/opt/optdriver.cpp
+++ b/llvm/tools/opt/optdriver.cpp
@@ -680,11 +680,6 @@ optMain(int argc, char **argv,
"", // FIXME: Get ABI name from MCOptions
VecLib);
- // FIXME: Get ABI name from MCOptions
- RTLIB::RuntimeLibcallsInfo RTLCI(ModuleTriple, codegen::getExceptionModel(),
- codegen::getFloatABIForCalls(),
- codegen::getEABIVersion());
-
// The -disable-simplify-libcalls flag actually disables all builtin optzns.
if (DisableSimplifyLibCalls)
TLII.disableAllFunctions();
|
Member
|
@llvm/pr-subscribers-clang Author: Matt Arsenault (arsenm) ChangesAfter the base branch was moved to main, this somehow ended up Also fix other build error with gcc bots. Full diff: https://github.com/llvm/llvm-project/pull/168110.diff 4 Files Affected:
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
index f1e20403ad668..6f63e6470270e 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -483,31 +483,31 @@ static bool initTargetOptions(const CompilerInstance &CI,
switch (CodeGenOpts.getVecLib()) {
case llvm::driver::VectorLibrary::NoLibrary:
- Options.VectorLibrary = llvm::VectorLibrary::NoLibrary;
+ Options.VecLib = llvm::VectorLibrary::NoLibrary;
break;
case llvm::driver::VectorLibrary::Accelerate:
- Options.VectorLibrary = llvm::VectorLibrary::Accelerate;
+ Options.VecLib = llvm::VectorLibrary::Accelerate;
break;
case llvm::driver::VectorLibrary::Darwin_libsystem_m:
- Options.VectorLibrary = llvm::VectorLibrary::DarwinLibSystemM;
+ Options.VecLib = llvm::VectorLibrary::DarwinLibSystemM;
break;
case llvm::driver::VectorLibrary::LIBMVEC:
- Options.VectorLibrary = llvm::VectorLibrary::LIBMVEC;
+ Options.VecLib = llvm::VectorLibrary::LIBMVEC;
break;
case llvm::driver::VectorLibrary::MASSV:
- Options.VectorLibrary = llvm::VectorLibrary::MASSV;
+ Options.VecLib = llvm::VectorLibrary::MASSV;
break;
case llvm::driver::VectorLibrary::SVML:
- Options.VectorLibrary = llvm::VectorLibrary::SVML;
+ Options.VecLib = llvm::VectorLibrary::SVML;
break;
case llvm::driver::VectorLibrary::SLEEF:
- Options.VectorLibrary = llvm::VectorLibrary::SLEEFGNUABI;
+ Options.VecLib = llvm::VectorLibrary::SLEEFGNUABI;
break;
case llvm::driver::VectorLibrary::ArmPL:
- Options.VectorLibrary = llvm::VectorLibrary::ArmPL;
+ Options.VecLib = llvm::VectorLibrary::ArmPL;
break;
case llvm::driver::VectorLibrary::AMDLIBM:
- Options.VectorLibrary = llvm::VectorLibrary::AMDLIBM;
+ Options.VecLib = llvm::VectorLibrary::AMDLIBM;
break;
}
diff --git a/llvm/include/llvm/Target/TargetOptions.h b/llvm/include/llvm/Target/TargetOptions.h
index b9258c0fee692..0312515d11798 100644
--- a/llvm/include/llvm/Target/TargetOptions.h
+++ b/llvm/include/llvm/Target/TargetOptions.h
@@ -411,7 +411,7 @@ class TargetOptions {
DebuggerKind DebuggerTuning = DebuggerKind::Default;
/// Vector math library to use.
- VectorLibrary VectorLibrary = VectorLibrary::NoLibrary;
+ VectorLibrary VecLib = VectorLibrary::NoLibrary;
private:
/// Flushing mode to assume in default FP environment.
diff --git a/llvm/lib/CodeGen/CommandFlags.cpp b/llvm/lib/CodeGen/CommandFlags.cpp
index 02a6bb9357ad0..8f92ee30e221a 100644
--- a/llvm/lib/CodeGen/CommandFlags.cpp
+++ b/llvm/lib/CodeGen/CommandFlags.cpp
@@ -632,7 +632,7 @@ codegen::InitTargetOptionsFromCodeGenFlags(const Triple &TheTriple) {
Options.EnableTLSDESC =
getExplicitEnableTLSDESC().value_or(TheTriple.hasDefaultTLSDESC());
Options.ExceptionModel = getExceptionModel();
- Options.VectorLibrary = getVectorLibrary();
+ Options.VecLib = getVectorLibrary();
Options.EmitStackSizeSection = getEnableStackSizeSection();
Options.EnableMachineFunctionSplitter = getEnableMachineFunctionSplitter();
Options.EnableStaticDataPartitioning = getEnableStaticDataPartitioning();
diff --git a/llvm/tools/opt/optdriver.cpp b/llvm/tools/opt/optdriver.cpp
index c65cae54b9530..d24c8abef31d0 100644
--- a/llvm/tools/opt/optdriver.cpp
+++ b/llvm/tools/opt/optdriver.cpp
@@ -680,11 +680,6 @@ optMain(int argc, char **argv,
"", // FIXME: Get ABI name from MCOptions
VecLib);
- // FIXME: Get ABI name from MCOptions
- RTLIB::RuntimeLibcallsInfo RTLCI(ModuleTriple, codegen::getExceptionModel(),
- codegen::getFloatABIForCalls(),
- codegen::getEABIVersion());
-
// The -disable-simplify-libcalls flag actually disables all builtin optzns.
if (DisableSimplifyLibCalls)
TLII.disableAllFunctions();
|
After the base branch was moved to main, this somehow ended up adding a second definition of RTLCI, instead of modifying the existing one. Also fix other build error with gcc bots.
arsenm
force-pushed
the
users/arsenm/build-fix-167996
branch
from
cac3e7b to
9f6826a
Compare
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.
After the base branch was moved to main, this somehow ended up
adding a second definition of RTLCI, instead of modifying the
existing one.
Also fix other build error with gcc bots.