Skip to content

opt: Fix bad merge of #167996 #168110

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 1 commit into from
Nov 14, 2025
Merged

opt: Fix bad merge of #167996 #168110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions clang/lib/CodeGen/BackendUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion llvm/include/llvm/Target/TargetOptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/CodeGen/CommandFlags.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 1 addition & 2 deletions llvm/lib/CodeGen/TargetLoweringBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,8 +753,7 @@ TargetLoweringBase::TargetLoweringBase(const TargetMachine &tm)
: TM(tm),
RuntimeLibcallInfo(TM.getTargetTriple(), TM.Options.ExceptionModel,
TM.Options.FloatABIType, TM.Options.EABIVersion,
TM.Options.MCOptions.getABIName(),
TM.Options.VectorLibrary),
TM.Options.MCOptions.getABIName(), TM.Options.VecLib),
Libcalls(RuntimeLibcallInfo) {
initActions();

Expand Down
3 changes: 1 addition & 2 deletions llvm/tools/llc/llc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,8 +696,7 @@ static int compileModule(char **argv, LLVMContext &Context,
}

// Add an appropriate TargetLibraryInfo pass for the module's triple.
TargetLibraryInfoImpl TLII(M->getTargetTriple(),
Target->Options.VectorLibrary);
TargetLibraryInfoImpl TLII(M->getTargetTriple(), Target->Options.VecLib);

// The -disable-simplify-libcalls flag actually disables all builtin optzns.
if (DisableSimplifyLibCalls)
Expand Down
5 changes: 0 additions & 5 deletions llvm/tools/opt/optdriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading