mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-31 12:41:49 +01:00
Re-apply r238452, the bug was in clang and was fixed in r260567.
Original commit message: [InstCombine] Fold IntToPtr and PtrToInt into preceding loads. Currently we only fold a BitCast into a Load when the BitCast is its only user. Do the same for any no-op cast. Patch by Philip Pfaffe! Differential Revision: http://reviews.llvm.org/D9152 llvm-svn: 260612
This commit is contained in:
parent
c1c7e55502
commit
b60e3f65de
@ -495,12 +495,17 @@ static Instruction *combineLoadToOperationType(InstCombiner &IC, LoadInst &LI) {
|
||||
}
|
||||
|
||||
// Fold away bit casts of the loaded value by loading the desired type.
|
||||
// We can do this for BitCastInsts as well as casts from and to pointer types,
|
||||
// as long as those are noops (i.e., the source or dest type have the same
|
||||
// bitwidth as the target's pointers).
|
||||
if (LI.hasOneUse())
|
||||
if (auto *BC = dyn_cast<BitCastInst>(LI.user_back())) {
|
||||
LoadInst *NewLoad = combineLoadToNewType(IC, LI, BC->getDestTy());
|
||||
BC->replaceAllUsesWith(NewLoad);
|
||||
IC.eraseInstFromFunction(*BC);
|
||||
return &LI;
|
||||
if (auto* CI = dyn_cast<CastInst>(LI.user_back())) {
|
||||
if (CI->isNoopCast(DL)) {
|
||||
LoadInst *NewLoad = combineLoadToNewType(IC, LI, CI->getDestTy());
|
||||
CI->replaceAllUsesWith(NewLoad);
|
||||
IC.eraseInstFromFunction(*CI);
|
||||
return &LI;
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: We should also canonicalize loads of vectors when their elements are
|
||||
|
79
test/Transforms/InstCombine/load-bitcast32.ll
Normal file
79
test/Transforms/InstCombine/load-bitcast32.ll
Normal file
@ -0,0 +1,79 @@
|
||||
; RUN: opt -instcombine -S < %s | FileCheck %s
|
||||
|
||||
target datalayout = "p:32:32:32"
|
||||
|
||||
|
||||
define i64* @test1(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test1(
|
||||
; CHECK: load i64, i64*
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i64*
|
||||
%b = load i64, i64* %a
|
||||
%c = inttoptr i64 %b to i64*
|
||||
|
||||
ret i64* %c
|
||||
}
|
||||
|
||||
define i32* @test2(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test2(
|
||||
; CHECK: load i32*, i32**
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i32*
|
||||
%b = load i32, i32* %a
|
||||
%c = inttoptr i32 %b to i32*
|
||||
|
||||
ret i32* %c
|
||||
}
|
||||
|
||||
define i64* @test3(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test3(
|
||||
; CHECK: load i64*, i64**
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i32*
|
||||
%b = load i32, i32* %a
|
||||
%c = inttoptr i32 %b to i64*
|
||||
|
||||
ret i64* %c
|
||||
}
|
||||
|
||||
define i64 @test4(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test4(
|
||||
; CHECK: load i32, i32*
|
||||
; CHECK: zext
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i64**
|
||||
%b = load i64*, i64** %a
|
||||
%c = ptrtoint i64* %b to i64
|
||||
|
||||
ret i64 %c
|
||||
}
|
||||
|
||||
define i32 @test5(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test5(
|
||||
; CHECK: load i32, i32*
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i32**
|
||||
%b = load i32*, i32** %a
|
||||
%c = ptrtoint i32* %b to i32
|
||||
|
||||
ret i32 %c
|
||||
}
|
||||
|
||||
define i64 @test6(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test6(
|
||||
; CHECK: load i32, i32*
|
||||
; CHECK: zext
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i32**
|
||||
%b = load i32*, i32** %a
|
||||
%c = ptrtoint i32* %b to i64
|
||||
|
||||
ret i64 %c
|
||||
}
|
||||
|
78
test/Transforms/InstCombine/load-bitcast64.ll
Normal file
78
test/Transforms/InstCombine/load-bitcast64.ll
Normal file
@ -0,0 +1,78 @@
|
||||
; RUN: opt -instcombine -S < %s | FileCheck %s
|
||||
|
||||
target datalayout = "p:64:64:64"
|
||||
|
||||
|
||||
define i64* @test1(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test1(
|
||||
; CHECK: load i64*, i64**
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i64*
|
||||
%b = load i64, i64* %a
|
||||
%c = inttoptr i64 %b to i64*
|
||||
|
||||
ret i64* %c
|
||||
}
|
||||
|
||||
define i32* @test2(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test2(
|
||||
; CHECK: load i32, i32*
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i32*
|
||||
%b = load i32, i32* %a
|
||||
%c = inttoptr i32 %b to i32*
|
||||
|
||||
ret i32* %c
|
||||
}
|
||||
|
||||
define i64* @test3(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test3(
|
||||
; CHECK: load i32, i32*
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i32*
|
||||
%b = load i32, i32* %a
|
||||
%c = inttoptr i32 %b to i64*
|
||||
|
||||
ret i64* %c
|
||||
}
|
||||
|
||||
define i64 @test4(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test4(
|
||||
; CHECK: load i64, i64*
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i64**
|
||||
%b = load i64*, i64** %a
|
||||
%c = ptrtoint i64* %b to i64
|
||||
|
||||
ret i64 %c
|
||||
}
|
||||
|
||||
define i32 @test5(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test5(
|
||||
; CHECK: load i64, i64*
|
||||
; CHECK: trunc
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i32**
|
||||
%b = load i32*, i32** %a
|
||||
%c = ptrtoint i32* %b to i32
|
||||
|
||||
ret i32 %c
|
||||
}
|
||||
|
||||
define i64 @test6(i8* %x) {
|
||||
entry:
|
||||
; CHECK-LABEL: @test6(
|
||||
; CHECK: load i64, i64*
|
||||
; CHECK: ret
|
||||
%a = bitcast i8* %x to i32**
|
||||
%b = load i32*, i32** %a
|
||||
%c = ptrtoint i32* %b to i64
|
||||
|
||||
ret i64 %c
|
||||
}
|
||||
|
@ -72,14 +72,14 @@ entry:
|
||||
%yo107 = call i64 @llvm.objectsize.i64.p0i8(i8* %b, i1 false)
|
||||
%call50 = call i8* @__memmove_chk(i8* %b, i8* %a, i64 %add180, i64 %yo107)
|
||||
; CHECK: %strlen = call i64 @strlen(i8* %b)
|
||||
; CHECK-NEXT: [[STRCHR:%[0-9a-zA-Z_-]+]] = getelementptr i8, i8* %b, i64 %strlen
|
||||
; CHECK-NEXT: %strchr2 = getelementptr i8, i8* %b, i64 %strlen
|
||||
%call51i = call i8* @strrchr(i8* %b, i32 0)
|
||||
%d = load i8*, i8** %c, align 8
|
||||
%sub182 = ptrtoint i8* %d to i64
|
||||
%sub183 = ptrtoint i8* %b to i64
|
||||
%sub184 = sub i64 %sub182, %sub183
|
||||
%add52.i.i = add nsw i64 %sub184, 1
|
||||
; CHECK: call void @llvm.memset.p0i8.i64(i8* [[STRCHR]]
|
||||
; CHECK: call void @llvm.memset.p0i8.i64(i8* %strchr2
|
||||
%call185 = call i8* @__memset_chk(i8* %call51i, i32 0, i64 %add52.i.i, i64 -1)
|
||||
ret i32 4
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user