[llvm-commits] [llvm] r85657 - in /llvm/trunk: include/llvm/LinkAllPasses.h include/llvm/Transforms/Scalar.h lib/CodeGen/LLVMTargetMachine.cpp lib/Transforms/Scalar/CMakeLists.txt lib/Transforms/Scalar/CodeGenLICM.cpp
Dan Gohman
gohman at apple.com
Sat Oct 31 07:35:41 PDT 2009
Author: djg
Date: Sat Oct 31 09:35:41 2009
New Revision: 85657
URL: http://llvm.org/viewvc/llvm-project?rev=85657&view=rev
Log:
Remove CodeGenLICM. It's largely obsoleted by MachineLICM's new ability
to unfold loop-invariant loads.
Removed:
llvm/trunk/lib/Transforms/Scalar/CodeGenLICM.cpp
Modified:
llvm/trunk/include/llvm/LinkAllPasses.h
llvm/trunk/include/llvm/Transforms/Scalar.h
llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp
llvm/trunk/lib/Transforms/Scalar/CMakeLists.txt
Modified: llvm/trunk/include/llvm/LinkAllPasses.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/LinkAllPasses.h?rev=85657&r1=85656&r2=85657&view=diff
==============================================================================
--- llvm/trunk/include/llvm/LinkAllPasses.h (original)
+++ llvm/trunk/include/llvm/LinkAllPasses.h Sat Oct 31 09:35:41 2009
@@ -123,7 +123,6 @@
(void) llvm::createNullProfilerRSPass();
(void) llvm::createRSProfilingPass();
(void) llvm::createInstCountPass();
- (void) llvm::createCodeGenLICMPass();
(void) llvm::createCodeGenPreparePass();
(void) llvm::createGVNPass();
(void) llvm::createMemCpyOptPass();
Modified: llvm/trunk/include/llvm/Transforms/Scalar.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/Scalar.h?rev=85657&r1=85656&r2=85657&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Transforms/Scalar.h (original)
+++ llvm/trunk/include/llvm/Transforms/Scalar.h Sat Oct 31 09:35:41 2009
@@ -307,12 +307,6 @@
//===----------------------------------------------------------------------===//
//
-// CodeGenLICM - This pass performs late LICM; hoisting constants out of loops.
-//
-Pass *createCodeGenLICMPass();
-
-//===----------------------------------------------------------------------===//
-//
// InstructionNamer - Give any unnamed non-void instructions "tmp" names.
//
FunctionPass *createInstructionNamerPass();
Modified: llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp?rev=85657&r1=85656&r2=85657&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp (original)
+++ llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp Sat Oct 31 09:35:41 2009
@@ -39,8 +39,6 @@
cl::desc("Dump emitter generated instructions as assembly"));
static cl::opt<bool> PrintGCInfo("print-gc", cl::Hidden,
cl::desc("Dump garbage collector data"));
-static cl::opt<bool> HoistConstants("hoist-constants", cl::Hidden,
- cl::desc("Hoist constants out of loops"));
static cl::opt<bool> VerifyMachineCode("verify-machineinstrs", cl::Hidden,
cl::desc("Verify generated machine code"),
cl::init(getenv("LLVM_VERIFY_MACHINEINSTRS")!=NULL));
@@ -255,11 +253,8 @@
// Make sure that no unreachable blocks are instruction selected.
PM.add(createUnreachableBlockEliminationPass());
- if (OptLevel != CodeGenOpt::None) {
- if (HoistConstants)
- PM.add(createCodeGenLICMPass());
+ if (OptLevel != CodeGenOpt::None)
PM.add(createCodeGenPreparePass(getTargetLowering()));
- }
PM.add(createStackProtectorPass(getTargetLowering()));
Modified: llvm/trunk/lib/Transforms/Scalar/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/CMakeLists.txt?rev=85657&r1=85656&r2=85657&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/CMakeLists.txt (original)
+++ llvm/trunk/lib/Transforms/Scalar/CMakeLists.txt Sat Oct 31 09:35:41 2009
@@ -2,7 +2,6 @@
ABCD.cpp
ADCE.cpp
BasicBlockPlacement.cpp
- CodeGenLICM.cpp
CodeGenPrepare.cpp
CondPropagate.cpp
ConstantProp.cpp
Removed: llvm/trunk/lib/Transforms/Scalar/CodeGenLICM.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/CodeGenLICM.cpp?rev=85656&view=auto
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/CodeGenLICM.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/CodeGenLICM.cpp (removed)
@@ -1,112 +0,0 @@
-//===- CodeGenLICM.cpp - LICM a function for code generation --------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-// This function performs late LICM, hoisting constants out of loops that
-// are not valid immediates. It should not be followed by instcombine,
-// because instcombine would quickly stuff the constants back into the loop.
-//
-//===----------------------------------------------------------------------===//
-
-#define DEBUG_TYPE "codegen-licm"
-#include "llvm/Transforms/Scalar.h"
-#include "llvm/Constants.h"
-#include "llvm/DerivedTypes.h"
-#include "llvm/Instructions.h"
-#include "llvm/IntrinsicInst.h"
-#include "llvm/LLVMContext.h"
-#include "llvm/Analysis/LoopPass.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/ADT/DenseMap.h"
-using namespace llvm;
-
-namespace {
- class CodeGenLICM : public LoopPass {
- virtual bool runOnLoop(Loop *L, LPPassManager &LPM);
- virtual void getAnalysisUsage(AnalysisUsage &AU) const;
- public:
- static char ID; // Pass identification, replacement for typeid
- explicit CodeGenLICM() : LoopPass(&ID) {}
- };
-}
-
-char CodeGenLICM::ID = 0;
-static RegisterPass<CodeGenLICM> X("codegen-licm",
- "hoist constants out of loops");
-
-Pass *llvm::createCodeGenLICMPass() {
- return new CodeGenLICM();
-}
-
-bool CodeGenLICM::runOnLoop(Loop *L, LPPassManager &) {
- bool Changed = false;
-
- // Only visit outermost loops.
- if (L->getParentLoop()) return Changed;
-
- Instruction *PreheaderTerm = L->getLoopPreheader()->getTerminator();
- DenseMap<Constant *, BitCastInst *> HoistedConstants;
-
- for (Loop::block_iterator I = L->block_begin(), E = L->block_end();
- I != E; ++I) {
- BasicBlock *BB = *I;
- for (BasicBlock::iterator BBI = BB->begin(), BBE = BB->end();
- BBI != BBE; ++BBI) {
- Instruction *I = BBI;
- // TODO: For now, skip all intrinsic instructions, because some of them
- // can require their operands to be constants, and we don't want to
- // break that.
- if (isa<IntrinsicInst>(I))
- continue;
- // LLVM represents fneg as -0.0-x; don't hoist the -0.0 out.
- if (BinaryOperator::isFNeg(I) ||
- BinaryOperator::isNeg(I) ||
- BinaryOperator::isNot(I))
- continue;
- for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i) {
- // Don't hoist out switch case constants.
- if (isa<SwitchInst>(I) && i == 1)
- break;
- // Don't hoist out shuffle masks.
- if (isa<ShuffleVectorInst>(I) && i == 2)
- break;
- Value *Op = I->getOperand(i);
- Constant *C = dyn_cast<Constant>(Op);
- if (!C) continue;
- // TODO: Ask the target which constants are legal. This would allow
- // us to add support for hoisting ConstantInts and GlobalValues too.
- if (isa<ConstantFP>(C) ||
- isa<ConstantVector>(C) ||
- isa<ConstantAggregateZero>(C)) {
- BitCastInst *&BC = HoistedConstants[C];
- if (!BC)
- BC = new BitCastInst(C, C->getType(), "hoist", PreheaderTerm);
- I->setOperand(i, BC);
- Changed = true;
- }
- }
- }
- }
-
- return Changed;
-}
-
-void CodeGenLICM::getAnalysisUsage(AnalysisUsage &AU) const {
- // This pass preserves just about everything. List some popular things here.
- AU.setPreservesCFG();
- AU.addPreservedID(LoopSimplifyID);
- AU.addPreserved<LoopInfo>();
- AU.addPreserved<AliasAnalysis>();
- AU.addPreserved("scalar-evolution");
- AU.addPreserved("iv-users");
- AU.addPreserved("lda");
- AU.addPreserved("live-values");
-
- // Hoisting requires a loop preheader.
- AU.addRequiredID(LoopSimplifyID);
-}
More information about the llvm-commits
mailing list