forked from OSchip/llvm-project
[CodeGenPrepare] Revert r331783
The patch r331783 caused regression in one of our internal application. So revert it now, will investigate it further. llvm-svn: 333305
This commit is contained in:
Guozhi Wei
parent
d17cd90268
commit
03005d3f03
|
|
@ -3390,47 +3390,6 @@ bool TypePromotionHelper::canGetThrough(const Instruction *Inst,
|
|||
(IsSExt && BinOp->hasNoSignedWrap())))
|
||||
return true;
|
||||
|
||||
// ext(and(opnd, cst)) --> and(ext(opnd), ext(cst))
|
||||
if ((Inst->getOpcode() == Instruction::And ||
|
||||
Inst->getOpcode() == Instruction::Or))
|
||||
return true;
|
||||
|
||||
// ext(xor(opnd, cst)) --> xor(ext(opnd), ext(cst))
|
||||
if (Inst->getOpcode() == Instruction::Xor) {
|
||||
const ConstantInt *Cst = dyn_cast<ConstantInt>(Inst->getOperand(1));
|
||||
// Make sure it is not a NOT.
|
||||
if (Cst && !Cst->getValue().isAllOnesValue())
|
||||
return true;
|
||||
}
|
||||
|
||||
// zext(shrl(opnd, cst)) --> shrl(zext(opnd), zext(cst))
|
||||
// It may change a poisoned value into a regular value, like
|
||||
// zext i32 (shrl i8 %val, 12) --> shrl i32 (zext i8 %val), 12
|
||||
// poisoned value regular value
|
||||
// It should be OK since undef covers valid value.
|
||||
if (Inst->getOpcode() == Instruction::LShr && !IsSExt)
|
||||
return true;
|
||||
|
||||
// and(ext(shl(opnd, cst)), cst) --> and(shl(ext(opnd), ext(cst)), cst)
|
||||
// It may change a poisoned value into a regular value, like
|
||||
// zext i32 (shl i8 %val, 12) --> shl i32 (zext i8 %val), 12
|
||||
// poisoned value regular value
|
||||
// It should be OK since undef covers valid value.
|
||||
if (Inst->getOpcode() == Instruction::Shl && Inst->hasOneUse()) {
|
||||
const Instruction *ExtInst =
|
||||
dyn_cast<const Instruction>(*Inst->user_begin());
|
||||
if (ExtInst->hasOneUse()) {
|
||||
const Instruction *AndInst =
|
||||
dyn_cast<const Instruction>(*ExtInst->user_begin());
|
||||
if (AndInst && AndInst->getOpcode() == Instruction::And) {
|
||||
const ConstantInt *Cst = dyn_cast<ConstantInt>(AndInst->getOperand(1));
|
||||
if (Cst &&
|
||||
Cst->getValue().isIntN(Inst->getType()->getIntegerBitWidth()))
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Check if we can do the following simplification.
|
||||
// ext(trunc(opnd)) --> ext(opnd)
|
||||
if (!isa<TruncInst>(Inst))
|
||||
|
|
|
|||
|
|
@ -79,8 +79,9 @@ define i1 @test4() nounwind {
|
|||
; CHECK-LABEL: test4:
|
||||
; CHECK: # %bb.0: # %entry
|
||||
; CHECK-NEXT: movsbl {{.*}}(%rip), %edx
|
||||
; CHECK-NEXT: movzbl %dl, %ecx
|
||||
; CHECK-NEXT: shrl $7, %ecx
|
||||
; CHECK-NEXT: movl %edx, %eax
|
||||
; CHECK-NEXT: shrb $7, %al
|
||||
; CHECK-NEXT: movzbl %al, %ecx
|
||||
; CHECK-NEXT: xorl $1, %ecx
|
||||
; CHECK-NEXT: # kill: def $cl killed $cl killed $ecx
|
||||
; CHECK-NEXT: sarl %cl, %edx
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
define fastcc i32 @t() nounwind {
|
||||
; CHECK-LABEL: t:
|
||||
; CHECK: # %bb.0: # %walkExprTree.exit
|
||||
; CHECK-NEXT: movzwl 0, %eax
|
||||
; CHECK-NEXT: movl 0, %eax
|
||||
; CHECK-NEXT: orl $2, %eax
|
||||
; CHECK-NEXT: movw %ax, 0
|
||||
; CHECK-NEXT: shrl $3, %eax
|
||||
|
|
|
|||
|
|
@ -88,6 +88,22 @@ entry:
|
|||
ret i64 %1
|
||||
}
|
||||
|
||||
; Don't do the folding if the other operand isn't a constant.
|
||||
define i64 @test7(i8* %data, i8 %logop) {
|
||||
; CHECK-LABEL: test7:
|
||||
; CHECK: movb
|
||||
; CHECK-NEXT: shrb
|
||||
; CHECK-NEXT: orb
|
||||
; CHECK-NEXT: movzbl
|
||||
; CHECK-NEXT: retq
|
||||
entry:
|
||||
%bf.load = load i8, i8* %data, align 4
|
||||
%bf.clear = lshr i8 %bf.load, 2
|
||||
%0 = or i8 %bf.clear, %logop
|
||||
%1 = zext i8 %0 to i64
|
||||
ret i64 %1
|
||||
}
|
||||
|
||||
; Load is folded with sext.
|
||||
define i64 @test8(i8* %data) {
|
||||
; CHECK-LABEL: test8:
|
||||
|
|
|
|||
|
|
@ -1,128 +0,0 @@
|
|||
; RUN: opt < %s -codegenprepare -S -mtriple=x86_64-unknown-unknown | FileCheck %s
|
||||
|
||||
|
||||
@a = global [10 x i8] zeroinitializer, align 1
|
||||
declare void @foo()
|
||||
|
||||
; ext(and(ld, cst)) -> and(ext(ld), ext(cst))
|
||||
define void @test1(i32* %p, i32 %ll) {
|
||||
; CHECK-LABEL: @test1
|
||||
; CHECK-NEXT: entry:
|
||||
; CHECK-NEXT: load
|
||||
; CHECK-NEXT: zext
|
||||
; CHECK-NEXT: and
|
||||
entry:
|
||||
%tmp = load i8, i8* getelementptr inbounds ([10 x i8], [10 x i8]* @a, i64 0, i64 0), align 1
|
||||
%and = and i8 %tmp, 60
|
||||
%cmp = icmp ugt i8 %and, 20
|
||||
br i1 %cmp, label %if.then, label %if.end
|
||||
|
||||
if.then: ; preds = %entry
|
||||
%conv2 = zext i8 %and to i32
|
||||
%add = add nsw i32 %conv2, %ll
|
||||
store i32 %add, i32* %p, align 4
|
||||
br label %if.end
|
||||
|
||||
if.end: ; preds = %if.then, %entry
|
||||
tail call void @foo()
|
||||
ret void
|
||||
}
|
||||
|
||||
; ext(or(ld, cst)) -> or(ext(ld), ext(cst))
|
||||
define void @test2(i32* %p, i32 %ll) {
|
||||
; CHECK-LABEL: @test2
|
||||
; CHECK-NEXT: entry:
|
||||
; CHECK-NEXT: load
|
||||
; CHECK-NEXT: zext
|
||||
; CHECK-NEXT: or
|
||||
entry:
|
||||
%tmp = load i8, i8* getelementptr inbounds ([10 x i8], [10 x i8]* @a, i64 0, i64 0), align 1
|
||||
%or = or i8 %tmp, 60
|
||||
%cmp = icmp ugt i8 %or, 20
|
||||
br i1 %cmp, label %if.then, label %if.end
|
||||
|
||||
if.then: ; preds = %entry
|
||||
%conv2 = zext i8 %or to i32
|
||||
%add = add nsw i32 %conv2, %ll
|
||||
store i32 %add, i32* %p, align 4
|
||||
br label %if.end
|
||||
|
||||
if.end: ; preds = %if.then, %entry
|
||||
tail call void @foo()
|
||||
ret void
|
||||
}
|
||||
|
||||
; ext(and(shl(ld, cst), cst)) -> and(shl(ext(ld), ext(cst)), ext(cst))
|
||||
define void @test3(i32* %p, i32 %ll) {
|
||||
; CHECK-LABEL: @test3
|
||||
; CHECK-NEXT: entry:
|
||||
; CHECK-NEXT: load
|
||||
; CHECK-NEXT: zext
|
||||
; CHECK-NEXT: shl
|
||||
; CHECK-NEXT: and
|
||||
entry:
|
||||
%tmp = load i8, i8* getelementptr inbounds ([10 x i8], [10 x i8]* @a, i64 0, i64 0), align 1
|
||||
%shl = shl i8 %tmp, 2
|
||||
%and = and i8 %shl, 60
|
||||
%cmp = icmp ugt i8 %and, 20
|
||||
br i1 %cmp, label %if.then, label %if.end
|
||||
|
||||
if.then: ; preds = %entry
|
||||
%conv2 = zext i8 %and to i32
|
||||
%add = add nsw i32 %conv2, %ll
|
||||
store i32 %add, i32* %p, align 4
|
||||
br label %if.end
|
||||
|
||||
if.end: ; preds = %if.then, %entry
|
||||
tail call void @foo()
|
||||
ret void
|
||||
}
|
||||
|
||||
; zext(shrl(ld, cst)) -> shrl(zext(ld), zext(cst))
|
||||
define void @test4(i32* %p, i32 %ll) {
|
||||
; CHECK-LABEL: @test4
|
||||
; CHECK-NEXT: entry:
|
||||
; CHECK-NEXT: load
|
||||
; CHECK-NEXT: zext
|
||||
; CHECK-NEXT: lshr
|
||||
entry:
|
||||
%tmp = load i8, i8* getelementptr inbounds ([10 x i8], [10 x i8]* @a, i64 0, i64 0), align 1
|
||||
%lshr = lshr i8 %tmp, 2
|
||||
%cmp = icmp ugt i8 %lshr, 20
|
||||
br i1 %cmp, label %if.then, label %if.end
|
||||
|
||||
if.then: ; preds = %entry
|
||||
%conv2 = zext i8 %lshr to i32
|
||||
%add = add nsw i32 %conv2, %ll
|
||||
store i32 %add, i32* %p, align 4
|
||||
br label %if.end
|
||||
|
||||
if.end: ; preds = %if.then, %entry
|
||||
tail call void @foo()
|
||||
ret void
|
||||
}
|
||||
|
||||
; ext(xor(ld, cst)) -> xor(ext(ld), ext(cst))
|
||||
define void @test5(i32* %p, i32 %ll) {
|
||||
; CHECK-LABEL: @test5
|
||||
; CHECK-NEXT: entry:
|
||||
; CHECK-NEXT: load
|
||||
; CHECK-NEXT: zext
|
||||
; CHECK-NEXT: xor
|
||||
entry:
|
||||
%tmp = load i8, i8* getelementptr inbounds ([10 x i8], [10 x i8]* @a, i64 0, i64 0), align 1
|
||||
%xor = xor i8 %tmp, 60
|
||||
%cmp = icmp ugt i8 %xor, 20
|
||||
br i1 %cmp, label %if.then, label %if.end
|
||||
|
||||
if.then: ; preds = %entry
|
||||
%conv2 = zext i8 %xor to i32
|
||||
%add = add nsw i32 %conv2, %ll
|
||||
store i32 %add, i32* %p, align 4
|
||||
br label %if.end
|
||||
|
||||
if.end: ; preds = %if.then, %entry
|
||||
tail call void @foo()
|
||||
ret void
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue