6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-19 19:30:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix some 80 column violations.

Browse Source 
Fix DecomposeSimpleLinearExpr to handle simple constants better.
Don't nuke gep(bitcast(allocation)) if the bitcast(allocation) will
fold the allocation.  This fixes PR1728 and Instcombine/malloc3.ll


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42891 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2007-10-12 05:30:59 +00:00
parent cb324cfc32
commit 6a94de2990
1 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/Transforms/Scalar/InstructionCombining.cpp
View File

@ -6190,33 +6190,29 @@ static Value *DecomposeSimpleLinearExpr(Value *Val, unsigned &Scale,
assert(Val->getType() == Type::Int32Ty && "Unexpected allocation size type!"); assert(Val->getType() == Type::Int32Ty && "Unexpected allocation size type!");
if (ConstantInt *CI = dyn_cast<ConstantInt>(Val)) { if (ConstantInt *CI = dyn_cast<ConstantInt>(Val)) {
Offset = CI->getZExtValue(); Offset = CI->getZExtValue();
Scale = 1; Scale = 0;
return ConstantInt::get(Type::Int32Ty, 0); return ConstantInt::get(Type::Int32Ty, 0);
} else if (Instruction *I = dyn_cast<Instruction>(Val)) { } else if (BinaryOperator *I = dyn_cast<BinaryOperator>(Val)) {
if (I->getNumOperands() == 2) { if (ConstantInt *RHS = dyn_cast<ConstantInt>(I->getOperand(1))) {
if (ConstantInt *CUI = dyn_cast<ConstantInt>(I->getOperand(1))) { if (I->getOpcode() == Instruction::Shl) {
if (I->getOpcode() == Instruction::Shl) { // This is a value scaled by '1 << the shift amt'.
// This is a value scaled by '1 << the shift amt'. Scale = 1U << RHS->getZExtValue();
Scale = 1U << CUI->getZExtValue(); Offset = 0;
Offset = 0; return I->getOperand(0);
return I->getOperand(0); } else if (I->getOpcode() == Instruction::Mul) {
} else if (I->getOpcode() == Instruction::Mul) { // This value is scaled by 'RHS'.
// This value is scaled by 'CUI'. Scale = RHS->getZExtValue();
Scale = CUI->getZExtValue(); Offset = 0;
Offset = 0; return I->getOperand(0);
return I->getOperand(0); } else if (I->getOpcode() == Instruction::Add) {
} else if (I->getOpcode() == Instruction::Add) { // We have X+C. Check to see if we really have (X*C2)+C1,
// We have X+C. Check to see if we really have (X*C2)+C1, // where C1 is divisible by C2.
// where C1 is divisible by C2. unsigned SubScale;
unsigned SubScale; Value *SubVal =
Value *SubVal = DecomposeSimpleLinearExpr(I->getOperand(0), SubScale, Offset);
DecomposeSimpleLinearExpr(I->getOperand(0), SubScale, Offset); Offset += RHS->getZExtValue();
Offset += CUI->getZExtValue(); Scale = SubScale;
if (SubScale > 1 && (Offset % SubScale == 0)) { return SubVal;
Scale = SubScale;
return SubVal;
}
}
} }
} }
} }
@ -7670,7 +7666,8 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) {
Changed = true; Changed = true;
} }
// If MemCpyInst length is 1/2/4/8 bytes then replace memcpy with load/store // If MemCpyInst length is 1/2/4/8 bytes then replace memcpy with
// load/store.
ConstantInt *MemOpLength = dyn_cast<ConstantInt>(CI.getOperand(3)); ConstantInt *MemOpLength = dyn_cast<ConstantInt>(CI.getOperand(3));
if (isa<MemCpyInst>(MI)) if (isa<MemCpyInst>(MI))
if (MemOpLength) { if (MemOpLength) {
@ -7704,10 +7701,11 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) {
if (Size == 1) if (Size == 1)
NewPtrTy = PointerType::get(Type::Int64Ty); NewPtrTy = PointerType::get(Type::Int64Ty);
} }
if (NewPtrTy) if (NewPtrTy) {
{ Value *Src =
Value *Src = InsertCastBefore(Instruction::BitCast, CI.getOperand(2), NewPtrTy, CI); InsertCastBefore(Instruction::BitCast,CI.getOperand(2),NewPtrTy,CI);
Value *Dest = InsertCastBefore(Instruction::BitCast, CI.getOperand(1), NewPtrTy, CI); Value *Dest =
InsertCastBefore(Instruction::BitCast,CI.getOperand(1),NewPtrTy,CI);
Value *L = new LoadInst(Src, "tmp", false, Align, &CI); Value *L = new LoadInst(Src, "tmp", false, Align, &CI);
Value *NS = new StoreInst(L, Dest, false, Align, &CI); Value *NS = new StoreInst(L, Dest, false, Align, &CI);
CI.replaceAllUsesWith(NS); CI.replaceAllUsesWith(NS);
@ -8639,10 +8637,19 @@ Instruction *InstCombiner::visitGetElementPtrInst(GetElementPtrInst &GEP) {
// If this GEP instruction doesn't move the pointer, and if the input operand // If this GEP instruction doesn't move the pointer, and if the input operand
// is a bitcast of another pointer, just replace the GEP with a bitcast of the // is a bitcast of another pointer, just replace the GEP with a bitcast of the
// real input to the dest type. // real input to the dest type.
if (GEP.hasAllZeroIndices() && isa<BitCastInst>(GEP.getOperand(0))) if (GEP.hasAllZeroIndices()) {
return new BitCastInst(cast<BitCastInst>(GEP.getOperand(0))->getOperand(0), if (BitCastInst *BCI = dyn_cast<BitCastInst>(GEP.getOperand(0))) {
GEP.getType()); // If the bitcast is of an allocation, and the allocation will be
// converted to match the type of the cast, don't touch this.
if (isa<AllocationInst>(BCI->getOperand(0))) {
// See if the bitcast simplifies, if so, don't nuke this GEP yet.
if (Instruction *I = visitBitCast(*BCI))
return &GEP;
}
return new BitCastInst(BCI->getOperand(0), GEP.getType());
}
}
// Combine Indices - If the source pointer to this getelementptr instruction // Combine Indices - If the source pointer to this getelementptr instruction
// is a getelementptr instruction, combine the indices of the two // is a getelementptr instruction, combine the indices of the two
// getelementptr instructions into a single instruction. // getelementptr instructions into a single instruction.