maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[PGO] Update ICP pass for recent byval type changes 

Fixes verifier errors encountered in PR42413.

Reviewers: xur, t.p.northover, inglorion, gbiv, george.burgess.iv

Differential Revision: https://reviews.llvm.org/D63842

llvm-svn: 364861
This commit is contained in:
Reid Kleckner 2019-07-01 22:43:39 +00:00
parent 86e4d7ea35
commit d72163947a
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/Transforms/Utils/CallPromotionUtils.cpp
View File

@ -412,6 +412,15 @@ Instruction *llvm::promoteCall(CallSite CS, Function *Callee,
// Remove any incompatible attributes for the argument.
AttrBuilder ArgAttrs(CallerPAL.getParamAttributes(ArgNo));
ArgAttrs.remove(AttributeFuncs::typeIncompatible(FormalTy));
// If byval is used, this must be a pointer type, and the byval type must
// match the element type. Update it if present.
if (ArgAttrs.getByValType()) {
Type *NewTy = Callee->getParamByValType(ArgNo);
ArgAttrs.addByValAttr(
NewTy ? NewTy : cast<PointerType>(FormalTy)->getElementType());
}
NewArgAttrs.push_back(AttributeSet::get(Ctx, ArgAttrs));
AttributeChanged = true;
} else

47
llvm/test/Transforms/PGOProfile/indirect_call_promotion_byval.ll Normal file
View File

@ -0,0 +1,47 @@
; RUN: opt < %s -pgo-icall-prom -S -icp-total-percent-threshold=10 | FileCheck %s
; RUN: opt < %s -passes=pgo-icall-prom -S -icp-total-percent-threshold=10 | FileCheck %s
; PR42413: Previously the call promotion code did not correctly update the byval
; attribute. Check that it does. This situation can come up in LTO scenarios
; where struct types end up not matching.
target triple = "i686-unknown-linux-gnu"
%struct.Foo.1 = type { i32 }
%struct.Foo.2 = type { i32 }
@foo = common global i32 (%struct.Foo.2*)* null, align 8
define i32 @func4(%struct.Foo.1* byval(%struct.Foo.1) %p) {
entry:
%gep = getelementptr inbounds %struct.Foo.1, %struct.Foo.1* %p, i32 0, i32 0
%v = load i32, i32* %gep
ret i32 %v
}
define i32 @func5(%struct.Foo.1* byval %p) {
entry:
%gep = getelementptr inbounds %struct.Foo.1, %struct.Foo.1* %p, i32 0, i32 0
%v = load i32, i32* %gep
ret i32 %v
}
define i32 @bar(%struct.Foo.2* %f2) {
entry:
%tmp = load i32 (%struct.Foo.2*)*, i32 (%struct.Foo.2*)** @foo, align 8
%call = call i32 %tmp(%struct.Foo.2* byval(%struct.Foo.2) %f2), !prof !1
ret i32 %call
}
!1 = !{!"VP", i32 0, i64 3000, i64 7651369219802541373, i64 1000, i64 3667884930908592509, i64 1000}
; CHECK: define i32 @bar(%struct.Foo.2* %f2)
; Cast %struct.Foo.2* to %struct.Foo.1* and use byval(%struct.Foo.2).
; CHECK: %[[cast:[^ ]*]] = bitcast %struct.Foo.2* %f2 to %struct.Foo.1*
; CHECK: call i32 @func4(%struct.Foo.1* byval(%struct.Foo.1) %[[cast]])
; Same but when callee doesn't have explicit byval type.
; CHECK: %[[cast:[^ ]*]] = bitcast %struct.Foo.2* %f2 to %struct.Foo.1*
; CHECK: call i32 @func5(%struct.Foo.1* byval(%struct.Foo.1) %[[cast]])
; Original call stays the same.
; CHECK: call i32 %tmp(%struct.Foo.2* byval(%struct.Foo.2) %f2)