[PATCH] D29854: WholeProgramDevirt: Implement importing for uniform ret val opt.
Peter Collingbourne via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 8 17:23:20 PST 2017
This revision was automatically updated to reflect the committed changes.
pcc marked an inline comment as done.
Closed by commit rL297350: WholeProgramDevirt: Implement importing for uniform ret val opt. (authored by pcc).
Changed prior to commit:
https://reviews.llvm.org/D29854?vs=88059&id=91114#toc
Repository:
rL LLVM
https://reviews.llvm.org/D29854
Files:
llvm/trunk/lib/Transforms/IPO/WholeProgramDevirt.cpp
llvm/trunk/test/Transforms/WholeProgramDevirt/Inputs/import-uniform-ret-val.yaml
llvm/trunk/test/Transforms/WholeProgramDevirt/import.ll
Index: llvm/trunk/test/Transforms/WholeProgramDevirt/Inputs/import-uniform-ret-val.yaml
===================================================================
--- llvm/trunk/test/Transforms/WholeProgramDevirt/Inputs/import-uniform-ret-val.yaml
+++ llvm/trunk/test/Transforms/WholeProgramDevirt/Inputs/import-uniform-ret-val.yaml
@@ -0,0 +1,19 @@
+---
+TypeIdMap:
+ typeid1:
+ WPDRes:
+ 0:
+ Kind: Indir
+ ResByArg:
+ 1:
+ Kind: UniformRetVal
+ Info: 42
+ typeid2:
+ WPDRes:
+ 8:
+ Kind: Indir
+ ResByArg:
+ 1:
+ Kind: UniformRetVal
+ Info: 42
+...
Index: llvm/trunk/test/Transforms/WholeProgramDevirt/import.ll
===================================================================
--- llvm/trunk/test/Transforms/WholeProgramDevirt/import.ll
+++ llvm/trunk/test/Transforms/WholeProgramDevirt/import.ll
@@ -1,8 +1,12 @@
; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-action=import -wholeprogramdevirt-read-summary=%S/Inputs/import-single-impl.yaml < %s | FileCheck --check-prefixes=CHECK,SINGLE-IMPL %s
+; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-action=import -wholeprogramdevirt-read-summary=%S/Inputs/import-uniform-ret-val.yaml < %s | FileCheck --check-prefixes=CHECK,UNIFORM-RET-VAL %s
target datalayout = "e-p:64:64"
target triple = "x86_64-unknown-linux-gnu"
+; Test cases where the argument values are known and we can apply virtual
+; constant propagation.
+
; CHECK: define i32 @call1
define i32 @call1(i8* %obj) {
%vtableptr = bitcast i8* %obj to [3 x i8*]**
@@ -15,9 +19,13 @@
%fptr_casted = bitcast i8* %fptr to i32 (i8*, i32)*
; SINGLE-IMPL: call i32 bitcast (void ()* @singleimpl1 to i32 (i8*, i32)*)
%result = call i32 %fptr_casted(i8* %obj, i32 1)
+ ; UNIFORM-RET-VAL: ret i32 42
ret i32 %result
}
+; Test cases where the argument values are unknown, so we cannot apply virtual
+; constant propagation.
+
; CHECK: define i1 @call2
define i1 @call2(i8* %obj) {
%vtableptr = bitcast i8* %obj to [1 x i8*]**
@@ -32,6 +40,7 @@
cont:
%fptr_casted = bitcast i8* %fptr to i1 (i8*, i32)*
; SINGLE-IMPL: call i1 bitcast (void ()* @singleimpl2 to i1 (i8*, i32)*)
+ ; UNIFORM-RET-VAL: call i1 %
%result = call i1 %fptr_casted(i8* %obj, i32 undef)
ret i1 %result
Index: llvm/trunk/lib/Transforms/IPO/WholeProgramDevirt.cpp
===================================================================
--- llvm/trunk/lib/Transforms/IPO/WholeProgramDevirt.cpp
+++ llvm/trunk/lib/Transforms/IPO/WholeProgramDevirt.cpp
@@ -1126,6 +1126,24 @@
applySingleImplDevirt(SlotInfo, SingleImpl, IsExported);
assert(!IsExported);
}
+
+ for (auto &CSByConstantArg : SlotInfo.ConstCSInfo) {
+ auto I = Res.ResByArg.find(CSByConstantArg.first);
+ if (I == Res.ResByArg.end())
+ continue;
+ auto &ResByArg = I->second;
+ // FIXME: We should figure out what to do about the "function name" argument
+ // to the apply* functions, as the function names are unavailable during the
+ // importing phase. For now we just pass the empty string. This does not
+ // impact correctness because the function names are just used for remarks.
+ switch (ResByArg.TheKind) {
+ case WholeProgramDevirtResolution::ByArg::UniformRetVal:
+ applyUniformRetValOpt(CSByConstantArg.second, "", ResByArg.Info);
+ break;
+ default:
+ break;
+ }
+ }
}
void DevirtModule::removeRedundantTypeTests() {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D29854.91114.patch
Type: text/x-patch
Size: 3507 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170309/e33b62bb/attachment.bin>
More information about the llvm-commits
mailing list