opt: Fix bad merge of #167996 (#168110)

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.
Signed-off-by: Hafidz Muzakky <[email protected]>

Author: arsenm

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;
   }
 

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.

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();

llvm/lib/CodeGen/TargetLoweringBase.cpp

@@ -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();
 

llvm/tools/llc/llc.cpp

@@ -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)

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();