diff options
author | Bob Wilson <bob.wilson@apple.com> | 2012-10-18 05:43:52 +0000 |
---|---|---|
committer | Bob Wilson <bob.wilson@apple.com> | 2012-10-18 05:43:52 +0000 |
commit | 3b9a911efcf280950f878a050728450423875639 (patch) | |
tree | 485f605df1211e84d3cf352d1e90ed96e2566891 /tools/opt/opt.cpp | |
parent | d22d5f9122de2c8527f1d8890ce2802a89e0db0c (diff) | |
download | external_llvm-3b9a911efcf280950f878a050728450423875639.zip external_llvm-3b9a911efcf280950f878a050728450423875639.tar.gz external_llvm-3b9a911efcf280950f878a050728450423875639.tar.bz2 |
Temporarily revert the TargetTransform changes.
The TargetTransform changes are breaking LTO bootstraps of clang. I am
working with Nadav to figure out the problem, but I am reverting it for now
to get our buildbots working.
This reverts svn commits: 165665 165669 165670 165786 165787 165997
and I have also reverted clang svn 165741
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@166168 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/opt/opt.cpp')
-rw-r--r-- | tools/opt/opt.cpp | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/tools/opt/opt.cpp b/tools/opt/opt.cpp index 8d8d731..706a7d5 100644 --- a/tools/opt/opt.cpp +++ b/tools/opt/opt.cpp @@ -18,7 +18,6 @@ #include "llvm/Module.h" #include "llvm/PassManager.h" #include "llvm/CallGraphSCCPass.h" -#include "llvm/CodeGen/CommandFlags.h" #include "llvm/Bitcode/ReaderWriter.h" #include "llvm/Assembly/PrintModulePass.h" #include "llvm/Analysis/Verifier.h" @@ -37,9 +36,7 @@ #include "llvm/Support/PluginLoader.h" #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/SystemUtils.h" -#include "llvm/Support/TargetRegistry.h" #include "llvm/Support/ToolOutputFile.h" -#include "llvm/MC/SubtargetFeature.h" #include "llvm/LinkAllPasses.h" #include "llvm/LinkAllVMCore.h" #include "llvm/Transforms/IPO/PassManagerBuilder.h" @@ -481,75 +478,6 @@ static void AddStandardLinkPasses(PassManagerBase &PM) { /*RunInliner=*/ !DisableInline); } -//===----------------------------------------------------------------------===// -// CodeGen-related helper functions. -// -static TargetOptions GetTargetOptions() { - TargetOptions Options; - Options.LessPreciseFPMADOption = EnableFPMAD; - Options.NoFramePointerElim = DisableFPElim; - Options.NoFramePointerElimNonLeaf = DisableFPElimNonLeaf; - Options.AllowFPOpFusion = FuseFPOps; - Options.UnsafeFPMath = EnableUnsafeFPMath; - Options.NoInfsFPMath = EnableNoInfsFPMath; - Options.NoNaNsFPMath = EnableNoNaNsFPMath; - Options.HonorSignDependentRoundingFPMathOption = - EnableHonorSignDependentRoundingFPMath; - Options.UseSoftFloat = GenerateSoftFloatCalls; - if (FloatABIForCalls != FloatABI::Default) - Options.FloatABIType = FloatABIForCalls; - Options.NoZerosInBSS = DontPlaceZerosInBSS; - Options.GuaranteedTailCallOpt = EnableGuaranteedTailCallOpt; - Options.DisableTailCalls = DisableTailCalls; - Options.StackAlignmentOverride = OverrideStackAlignment; - Options.RealignStack = EnableRealignStack; - Options.TrapFuncName = TrapFuncName; - Options.PositionIndependentExecutable = EnablePIE; - Options.EnableSegmentedStacks = SegmentedStacks; - Options.UseInitArray = UseInitArray; - Options.SSPBufferSize = SSPBufferSize; - return Options; -} - -CodeGenOpt::Level GetCodeGenOptLevel() { - if (OptLevelO1) - return CodeGenOpt::Less; - if (OptLevelO2) - return CodeGenOpt::Default; - if (OptLevelO3) - return CodeGenOpt::Aggressive; - return CodeGenOpt::None; -} - -// Returns the TargetMachine instance or zero if no triple is provided. -static TargetMachine* GetTargetMachine(std::string TripleStr) { - if (TripleStr.empty()) - return 0; - - // Get the target specific parser. - std::string Error; - Triple TheTriple(Triple::normalize(TargetTriple)); - - const Target *TheTarget = TargetRegistry::lookupTarget(MArch, TheTriple, - Error); - if (!TheTarget) { - return 0; - } - - // Package up features to be passed to target/subtarget - std::string FeaturesStr; - if (MAttrs.size()) { - SubtargetFeatures Features; - for (unsigned i = 0; i != MAttrs.size(); ++i) - Features.AddFeature(MAttrs[i]); - FeaturesStr = Features.getString(); - } - - return TheTarget->createTargetMachine(TheTriple.getTriple(), - MCPU, FeaturesStr, GetTargetOptions(), - RelocModel, CMModel, - GetCodeGenOptLevel()); -} //===----------------------------------------------------------------------===// // main for opt @@ -651,12 +579,6 @@ int main(int argc, char **argv) { if (TD) Passes.add(TD); - std::auto_ptr<TargetMachine> TM(GetTargetMachine(TargetTriple)); - if (TM.get()) { - Passes.add(new TargetTransformInfo(TM->getScalarTargetTransformInfo(), - TM->getVectorTargetTransformInfo())); - } - OwningPtr<FunctionPassManager> FPasses; if (OptLevelO1 || OptLevelO2 || OptLevelOs || OptLevelOz || OptLevelO3) { FPasses.reset(new FunctionPassManager(M.get())); |