WholeProgramDevirt: Examine the function body when deciding whether functions are readnone.

The goal is to get an analysis result even for de-refineable functions.

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@295472 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Peter Collingbourne 2017-02-17 18:17:04 +00:00
parent c60bc7e2e2
commit 72258b42b0
2 changed files with 81 additions and 18 deletions

View File

@ -35,6 +35,8 @@
#include "llvm/ADT/iterator_range.h" #include "llvm/ADT/iterator_range.h"
#include "llvm/ADT/MapVector.h" #include "llvm/ADT/MapVector.h"
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallVector.h"
#include "llvm/Analysis/AliasAnalysis.h"
#include "llvm/Analysis/BasicAliasAnalysis.h"
#include "llvm/Analysis/TypeMetadataUtils.h" #include "llvm/Analysis/TypeMetadataUtils.h"
#include "llvm/IR/CallSite.h" #include "llvm/IR/CallSite.h"
#include "llvm/IR/Constants.h" #include "llvm/IR/Constants.h"
@ -63,6 +65,7 @@
#include "llvm/Support/FileSystem.h" #include "llvm/Support/FileSystem.h"
#include "llvm/Support/MathExtras.h" #include "llvm/Support/MathExtras.h"
#include "llvm/Transforms/IPO.h" #include "llvm/Transforms/IPO.h"
#include "llvm/Transforms/IPO/FunctionAttrs.h"
#include "llvm/Transforms/Utils/Evaluator.h" #include "llvm/Transforms/Utils/Evaluator.h"
#include <algorithm> #include <algorithm>
#include <cstddef> #include <cstddef>
@ -326,6 +329,7 @@ void VTableSlotInfo::addCallSite(Value *VTable, CallSite CS,
struct DevirtModule { struct DevirtModule {
Module &M; Module &M;
function_ref<AAResults &(Function &)> AARGetter;
PassSummaryAction Action; PassSummaryAction Action;
ModuleSummaryIndex *Summary; ModuleSummaryIndex *Summary;
@ -349,8 +353,9 @@ struct DevirtModule {
// true. // true.
std::map<CallInst *, unsigned> NumUnsafeUsesForTypeTest; std::map<CallInst *, unsigned> NumUnsafeUsesForTypeTest;
DevirtModule(Module &M, PassSummaryAction Action, ModuleSummaryIndex *Summary) DevirtModule(Module &M, function_ref<AAResults &(Function &)> AARGetter,
: M(M), Action(Action), Summary(Summary), PassSummaryAction Action, ModuleSummaryIndex *Summary)
: M(M), AARGetter(AARGetter), Action(Action), Summary(Summary),
Int8Ty(Type::getInt8Ty(M.getContext())), Int8Ty(Type::getInt8Ty(M.getContext())),
Int8PtrTy(Type::getInt8PtrTy(M.getContext())), Int8PtrTy(Type::getInt8PtrTy(M.getContext())),
Int32Ty(Type::getInt32Ty(M.getContext())), Int32Ty(Type::getInt32Ty(M.getContext())),
@ -401,7 +406,8 @@ struct DevirtModule {
// Lower the module using the action and summary passed as command line // Lower the module using the action and summary passed as command line
// arguments. For testing purposes only. // arguments. For testing purposes only.
static bool runForTesting(Module &M); static bool runForTesting(Module &M,
function_ref<AAResults &(Function &)> AARGetter);
}; };
struct WholeProgramDevirt : public ModulePass { struct WholeProgramDevirt : public ModulePass {
@ -425,14 +431,23 @@ struct WholeProgramDevirt : public ModulePass {
if (skipModule(M)) if (skipModule(M))
return false; return false;
if (UseCommandLine) if (UseCommandLine)
return DevirtModule::runForTesting(M); return DevirtModule::runForTesting(M, LegacyAARGetter(*this));
return DevirtModule(M, Action, Summary).run(); return DevirtModule(M, LegacyAARGetter(*this), Action, Summary).run();
}
void getAnalysisUsage(AnalysisUsage &AU) const override {
AU.addRequired<AssumptionCacheTracker>();
AU.addRequired<TargetLibraryInfoWrapperPass>();
} }
}; };
} // end anonymous namespace } // end anonymous namespace
INITIALIZE_PASS(WholeProgramDevirt, "wholeprogramdevirt", INITIALIZE_PASS_BEGIN(WholeProgramDevirt, "wholeprogramdevirt",
"Whole program devirtualization", false, false)
INITIALIZE_PASS_DEPENDENCY(AssumptionCacheTracker)
INITIALIZE_PASS_DEPENDENCY(TargetLibraryInfoWrapperPass)
INITIALIZE_PASS_END(WholeProgramDevirt, "wholeprogramdevirt",
"Whole program devirtualization", false, false) "Whole program devirtualization", false, false)
char WholeProgramDevirt::ID = 0; char WholeProgramDevirt::ID = 0;
@ -442,13 +457,18 @@ ModulePass *llvm::createWholeProgramDevirtPass(PassSummaryAction Action,
} }
PreservedAnalyses WholeProgramDevirtPass::run(Module &M, PreservedAnalyses WholeProgramDevirtPass::run(Module &M,
ModuleAnalysisManager &) { ModuleAnalysisManager &AM) {
if (!DevirtModule(M, PassSummaryAction::None, nullptr).run()) auto &FAM = AM.getResult<FunctionAnalysisManagerModuleProxy>(M).getManager();
auto AARGetter = [&](Function &F) -> AAResults & {
return FAM.getResult<AAManager>(F);
};
if (!DevirtModule(M, AARGetter, PassSummaryAction::None, nullptr).run())
return PreservedAnalyses::all(); return PreservedAnalyses::all();
return PreservedAnalyses::none(); return PreservedAnalyses::none();
} }
bool DevirtModule::runForTesting(Module &M) { bool DevirtModule::runForTesting(
Module &M, function_ref<AAResults &(Function &)> AARGetter) {
ModuleSummaryIndex Summary; ModuleSummaryIndex Summary;
// Handle the command-line summary arguments. This code is for testing // Handle the command-line summary arguments. This code is for testing
@ -464,7 +484,7 @@ bool DevirtModule::runForTesting(Module &M) {
ExitOnErr(errorCodeToError(In.error())); ExitOnErr(errorCodeToError(In.error()));
} }
bool Changed = DevirtModule(M, ClSummaryAction, &Summary).run(); bool Changed = DevirtModule(M, AARGetter, ClSummaryAction, &Summary).run();
if (!ClWriteSummary.empty()) { if (!ClWriteSummary.empty()) {
ExitOnError ExitOnErr( ExitOnError ExitOnErr(
@ -754,8 +774,17 @@ bool DevirtModule::tryVirtualConstProp(
// Make sure that each function is defined, does not access memory, takes at // Make sure that each function is defined, does not access memory, takes at
// least one argument, does not use its first argument (which we assume is // least one argument, does not use its first argument (which we assume is
// 'this'), and has the same return type. // 'this'), and has the same return type.
//
// Note that we test whether this copy of the function is readnone, rather
// than testing function attributes, which must hold for any copy of the
// function, even a less optimized version substituted at link time. This is
// sound because the virtual constant propagation optimizations effectively
// inline all implementations of the virtual function into each call site,
// rather than using function attributes to perform local optimization.
for (VirtualCallTarget &Target : TargetsForSlot) { for (VirtualCallTarget &Target : TargetsForSlot) {
if (Target.Fn->isDeclaration() || !Target.Fn->doesNotAccessMemory() || if (Target.Fn->isDeclaration() ||
computeFunctionBodyMemoryAccess(*Target.Fn, AARGetter(*Target.Fn)) !=
MAK_ReadNone ||
Target.Fn->arg_empty() || !Target.Fn->arg_begin()->use_empty() || Target.Fn->arg_empty() || !Target.Fn->arg_begin()->use_empty() ||
Target.Fn->getReturnType() != RetType) Target.Fn->getReturnType() != RetType)
return false; return false;

View File

@ -1,21 +1,37 @@
; RUN: opt -S -wholeprogramdevirt %s | FileCheck %s ; RUN: opt -S -wholeprogramdevirt %s | FileCheck %s
; RUN: opt -S -passes=wholeprogramdevirt %s | FileCheck %s
target datalayout = "e-p:64:64" target datalayout = "e-p:64:64"
target triple = "x86_64-unknown-linux-gnu" target triple = "x86_64-unknown-linux-gnu"
@vt1 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf1 to i8*)], !type !0 @vt1 = constant [2 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf1a to i8*), i8* bitcast (i32 (i8*, i32)* @vf1b to i8*)], !type !0
@vt2 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2 to i8*)], !type !0 @vt2 = constant [2 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2a to i8*), i8* bitcast (i32 (i8*, i32)* @vf2b to i8*)], !type !0
define i32 @vf1(i8* %this, i32 %arg) { @sink = external global i32
define i32 @vf1a(i8* %this, i32 %arg) {
store i32 %arg, i32* @sink
ret i32 %arg ret i32 %arg
} }
define i32 @vf2(i8* %this, i32 %arg) { define i32 @vf2a(i8* %this, i32 %arg) {
store i32 %arg, i32* @sink
ret i32 %arg ret i32 %arg
} }
; CHECK: define i32 @call define i32 @vf1b(i8* %this, i32 %arg) {
define i32 @call(i8* %obj) { ret i32 %arg
}
define i32 @vf2b(i8* %this, i32 %arg) {
ret i32 %arg
}
; Test that we don't apply VCP if the virtual function body accesses memory,
; even if the function returns a constant.
; CHECK: define i32 @call1
define i32 @call1(i8* %obj) {
%vtableptr = bitcast i8* %obj to [1 x i8*]** %vtableptr = bitcast i8* %obj to [1 x i8*]**
%vtable = load [1 x i8*]*, [1 x i8*]** %vtableptr %vtable = load [1 x i8*]*, [1 x i8*]** %vtableptr
%vtablei8 = bitcast [1 x i8*]* %vtable to i8* %vtablei8 = bitcast [1 x i8*]* %vtable to i8*
@ -29,6 +45,24 @@ define i32 @call(i8* %obj) {
ret i32 %result ret i32 %result
} }
; Test that we can apply VCP regardless of the function attributes by analyzing
; the function body itself.
; CHECK: define i32 @call2
define i32 @call2(i8* %obj) {
%vtableptr = bitcast i8* %obj to [1 x i8*]**
%vtable = load [1 x i8*]*, [1 x i8*]** %vtableptr
%vtablei8 = bitcast [1 x i8*]* %vtable to i8*
%p = call i1 @llvm.type.test(i8* %vtablei8, metadata !"typeid")
call void @llvm.assume(i1 %p)
%fptrptr = getelementptr [1 x i8*], [1 x i8*]* %vtable, i32 0, i32 1
%fptr = load i8*, i8** %fptrptr
%fptr_casted = bitcast i8* %fptr to i32 (i8*, i32)*
%result = call i32 %fptr_casted(i8* %obj, i32 1)
; CHECK: ret i32 1
ret i32 %result
}
declare i1 @llvm.type.test(i8*, metadata) declare i1 @llvm.type.test(i8*, metadata)
declare void @llvm.assume(i1) declare void @llvm.assume(i1)