<div dir="ltr">ping?<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, May 3, 2018 at 11:16 AM, Galina Kistanova <span dir="ltr"><<a href="mailto:gkistanova@gmail.com" target="_blank">gkistanova@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hi Peter,<br><br>One of added tests shows inconsistent results on expensive-checks builder.<br>It fails time to time:<br><br><a href="http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/9404" target="_blank">http://lab.llvm.org:8011/<wbr>builders/llvm-clang-x86_64-<wbr>expensive-checks-win/builds/<wbr>9404</a><br><a href="http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/9407" target="_blank">http://lab.llvm.org:8011/<wbr>builders/llvm-clang-x86_64-<wbr>expensive-checks-win/builds/<wbr>9407</a><br>etc.<br>the last:<br><a href="http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/9426" target="_blank">http://lab.llvm.org:8011/<wbr>builders/llvm-clang-x86_64-<wbr>expensive-checks-win/builds/<wbr>9426</a><br><br>. . . <br>********************<br>Failing Tests (1):<br> LLVM :: Transforms/LowerTypeTests/<wbr>icall-branch-funnel.ll<br><br>Please have a look at this?<br><br>Thanks<span class="HOEnZb"><font color="#888888"><br><br>Galina</font></span><div><div class="h5"><br><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Mar 9, 2018 at 11:11 AM, Peter Collingbourne via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="m_907298409020627020HOEnZb"><div class="m_907298409020627020h5">Author: pcc<br>
Date: Fri Mar 9 11:11:44 2018<br>
New Revision: 327163<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=327163&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=327163&view=rev</a><br>
Log:<br>
Use branch funnels for virtual calls when retpoline mitigation is enabled.<br>
<br>
The retpoline mitigation for variant 2 of CVE-2017-5715 inhibits the<br>
branch predictor, and as a result it can lead to a measurable loss of<br>
performance. We can reduce the performance impact of retpolined virtual<br>
calls by replacing them with a special construct known as a branch<br>
funnel, which is an instruction sequence that implements virtual calls<br>
to a set of known targets using a binary tree of direct branches. This<br>
allows the processor to speculately execute valid implementations of the<br>
virtual function without allowing for speculative execution of of calls<br>
to arbitrary addresses.<br>
<br>
This patch extends the whole-program devirtualization pass to replace<br>
certain virtual calls with calls to branch funnels, which are<br>
represented using a new llvm.icall.jumptable intrinsic. It also extends<br>
the LowerTypeTests pass to recognize the new intrinsic, generate code<br>
for the branch funnels (x86_64 only for now) and lay out virtual tables<br>
as required for each branch funnel.<br>
<br>
The implementation supports full LTO as well as ThinLTO, and extends the<br>
ThinLTO summary format used for whole-program devirtualization to<br>
support branch funnels.<br>
<br>
For more details see RFC:<br>
<a href="http://lists.llvm.org/pipermail/llvm-dev/2018-January/120672.html" rel="noreferrer" target="_blank">http://lists.llvm.org/pipermai<wbr>l/llvm-dev/2018-January/<wbr>120672.html</a><br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D42453" rel="noreferrer" target="_blank">https://reviews.llvm.org/D4245<wbr>3</a><br>
<br>
</div></div>Added:<br>
llvm/trunk/test/CodeGen/X86/ic<wbr>all-branch-funnel.ll<br>
llvm/trunk/test/Transforms/Low<wbr>erTypeTests/icall-branch-funne<wbr>l.ll<br>
llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/Inputs/import-<wbr>branch-funnel.yaml<br>
llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/Inputs/import-<wbr>vcp-branch-funnel.yaml<br>
llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/branch-funnel.<wbr>ll<br>
Modified:<br>
llvm/trunk/include/llvm/ADT/Po<wbr>interUnion.h<br>
llvm/trunk/include/llvm/CodeGe<wbr>n/TargetOpcodes.def<br>
llvm/trunk/include/llvm/IR/Int<wbr><a href="http://rinsics.td">rinsics.td</a><br>
llvm/trunk/include/llvm/IR/Mod<wbr>uleSummaryIndex.h<br>
llvm/trunk/include/llvm/IR/Mod<wbr>uleSummaryIndexYAML.h<br>
llvm/trunk/include/llvm/Target<wbr>/Target.td<br>
llvm/trunk/lib/CodeGen/Selecti<wbr>onDAG/SelectionDAGBuilder.cpp<br>
llvm/trunk/lib/IR/Verifier.cpp<br>
llvm/trunk/lib/Target/X86/X86E<wbr>xpandPseudo.cpp<br>
llvm/trunk/lib/Transforms/IPO/<wbr>LowerTypeTests.cpp<br>
llvm/trunk/lib/Transforms/IPO/<wbr>WholeProgramDevirt.cpp<br>
llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/import.ll<br>
<br>
Modified: llvm/trunk/include/llvm/ADT/Po<wbr>interUnion.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ADT/PointerUnion.h?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/include/llvm/<wbr>ADT/PointerUnion.h?rev=327163&<wbr>r1=327162&r2=327163&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/ADT/Po<wbr>interUnion.h (original)<br>
+++ llvm/trunk/include/llvm/ADT/Po<wbr>interUnion.h Fri Mar 9 11:11:44 2018<br>
@@ -346,6 +346,12 @@ struct PointerLikeTypeTraits<PointerU<wbr>nio<br>
};<br>
};<br>
<br>
+template <typename PT1, typename PT2, typename PT3><br>
+bool operator<(PointerUnion3<PT1, PT2, PT3> lhs,<br>
+ PointerUnion3<PT1, PT2, PT3> rhs) {<br>
+ return lhs.getOpaqueValue() < rhs.getOpaqueValue();<br>
+}<br>
+<br>
/// A pointer union of four pointer types. See documentation for PointerUnion<br>
/// for usage.<br>
template <typename PT1, typename PT2, typename PT3, typename PT4><br>
<br>
Modified: llvm/trunk/include/llvm/CodeGe<wbr>n/TargetOpcodes.def<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/TargetOpcodes.def?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/include/llvm/<wbr>CodeGen/TargetOpcodes.def?rev=<wbr>327163&r1=327162&r2=327163&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/CodeGe<wbr>n/TargetOpcodes.def (original)<br>
+++ llvm/trunk/include/llvm/CodeGe<wbr>n/TargetOpcodes.def Fri Mar 9 11:11:44 2018<br>
@@ -187,6 +187,8 @@ HANDLE_TARGET_OPCODE(PATCHABLE<wbr>_TAIL_CALL<br>
/// patched to insert instrumentation instructions.<br>
HANDLE_TARGET_OPCODE(PATCHABL<wbr>E_EVENT_CALL)<br>
<br>
+HANDLE_TARGET_OPCODE(ICALL_BR<wbr>ANCH_FUNNEL)<br>
+<br>
/// The following generic opcodes are not supposed to appear after ISel.<br>
/// This is something we might want to relax, but for now, this is convenient<br>
/// to produce diagnostics.<br>
<br>
Modified: llvm/trunk/include/llvm/IR/Int<wbr><a href="http://rinsics.td">rinsics.td</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/Intrinsics.td?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/include/llvm/<wbr>IR/Intrinsics.td?rev=327163&<wbr>r1=327162&r2=327163&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/IR/Int<wbr><a href="http://rinsics.td">rinsics.td</a> (original)<br>
+++ llvm/trunk/include/llvm/IR/Int<wbr><a href="http://rinsics.td">rinsics.td</a> Fri Mar 9 11:11:44 2018<br>
@@ -874,6 +874,10 @@ def int_type_checked_load : Intrinsic<[l<br>
[llvm_ptr_ty, llvm_i32_ty, llvm_metadata_ty],<br>
[IntrNoMem]>;<br>
<br>
+// Create a branch funnel that implements an indirect call to a limited set of<br>
+// callees. This needs to be a musttail call.<br>
+def int_icall_branch_funnel : Intrinsic<[], [llvm_vararg_ty], []>;<br>
+<br>
def int_load_relative: Intrinsic<[llvm_ptr_ty], [llvm_ptr_ty, llvm_anyint_ty],<br>
[IntrReadMem, IntrArgMemOnly]>;<br>
<br>
<br>
Modified: llvm/trunk/include/llvm/IR/Mod<wbr>uleSummaryIndex.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/ModuleSummaryIndex.h?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/include/llvm/<wbr>IR/ModuleSummaryIndex.h?rev=<wbr>327163&r1=327162&r2=327163&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/IR/Mod<wbr>uleSummaryIndex.h (original)<br>
+++ llvm/trunk/include/llvm/IR/Mod<wbr>uleSummaryIndex.h Fri Mar 9 11:11:44 2018<br>
@@ -656,8 +656,11 @@ struct TypeTestResolution {<br>
<br>
struct WholeProgramDevirtResolution {<br>
enum Kind {<br>
- Indir, ///< Just do a regular virtual call<br>
- SingleImpl, ///< Single implementation devirtualization<br>
+ Indir, ///< Just do a regular virtual call<br>
+ SingleImpl, ///< Single implementation devirtualization<br>
+ BranchFunnel, ///< When retpoline mitigation is enabled, use a branch funnel<br>
+ ///< that is defined in the merged module. Otherwise same as<br>
+ ///< Indir.<br>
} TheKind = Indir;<br>
<br>
std::string SingleImplName;<br>
<br>
Modified: llvm/trunk/include/llvm/IR/Mod<wbr>uleSummaryIndexYAML.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/ModuleSummaryIndexYAML.h?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/include/llvm/<wbr>IR/ModuleSummaryIndexYAML.h?<wbr>rev=327163&r1=327162&r2=<wbr>327163&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/IR/Mod<wbr>uleSummaryIndexYAML.h (original)<br>
+++ llvm/trunk/include/llvm/IR/Mod<wbr>uleSummaryIndexYAML.h Fri Mar 9 11:11:44 2018<br>
@@ -98,6 +98,8 @@ template <> struct ScalarEnumerationTrai<br>
static void enumeration(IO &io, WholeProgramDevirtResolution::<wbr>Kind &value) {<br>
io.enumCase(value, "Indir", WholeProgramDevirtResolution::<wbr>Indir);<br>
io.enumCase(value, "SingleImpl", WholeProgramDevirtResolution::<wbr>SingleImpl);<br>
+ io.enumCase(value, "BranchFunnel",<br>
+ WholeProgramDevirtResolution::<wbr>BranchFunnel);<br>
}<br>
};<br>
<br>
<br>
Modified: llvm/trunk/include/llvm/Target<wbr>/Target.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/Target.td?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/include/llvm/<wbr>Target/Target.td?rev=327163&<wbr>r1=327162&r2=327163&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/include/llvm/Target<wbr>/Target.td (original)<br>
+++ llvm/trunk/include/llvm/Target<wbr>/Target.td Fri Mar 9 11:11:44 2018<br>
@@ -1140,6 +1140,12 @@ def FENTRY_CALL : StandardPseudoInstruct<br>
let mayStore = 1;<br>
let hasSideEffects = 1;<br>
}<br>
+def ICALL_BRANCH_FUNNEL : StandardPseudoInstruction {<br>
+ let OutOperandList = (outs unknown:$dst);<br>
+ let InOperandList = (ins variable_ops);<br>
+ let AsmString = "";<br>
+ let hasSideEffects = 1;<br>
+}<br>
<br>
// Generic opcodes used in GlobalISel.<br>
include "llvm/Target/GenericOpcodes.td<wbr>"<br>
<br>
Modified: llvm/trunk/lib/CodeGen/Selecti<wbr>onDAG/SelectionDAGBuilder.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/lib/CodeGen/<wbr>SelectionDAG/SelectionDAGBuild<wbr>er.cpp?rev=327163&r1=327162&<wbr>r2=327163&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/CodeGen/Selecti<wbr>onDAG/SelectionDAGBuilder.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/Selecti<wbr>onDAG/SelectionDAGBuilder.cpp Fri Mar 9 11:11:44 2018<br>
@@ -6043,6 +6043,60 @@ SelectionDAGBuilder::visitIntr<wbr>insicCall(<br>
case Intrinsic::experimental_vector<wbr>_reduce_fmin:<br>
visitVectorReduce(I, Intrinsic);<br>
return nullptr;<br>
+<br>
+ case Intrinsic::icall_branch_funnel<wbr>: {<br>
+ SmallVector<SDValue, 16> Ops;<br>
+ Ops.push_back(DAG.getRoot());<br>
+ Ops.push_back(getValue(I.getAr<wbr>gOperand(0)));<br>
+<br>
+ int64_t Offset;<br>
+ auto *Base = dyn_cast<GlobalObject>(GetPoin<wbr>terBaseWithConstantOffset(<br>
+ I.getArgOperand(1), Offset, DAG.getDataLayout()));<br>
+ if (!Base)<br>
+ report_fatal_error(<br>
+ "llvm.icall.branch.funnel operand must be a GlobalValue");<br>
+ Ops.push_back(DAG.getTargetGlo<wbr>balAddress(Base, getCurSDLoc(), MVT::i64, 0));<br>
+<br>
+ struct BranchFunnelTarget {<br>
+ int64_t Offset;<br>
+ SDValue Target;<br>
+ };<br>
+ SmallVector<BranchFunnelTarget<wbr>, 8> Targets;<br>
+<br>
+ for (unsigned Op = 1, N = I.getNumArgOperands(); Op != N; Op += 2) {<br>
+ auto *ElemBase = dyn_cast<GlobalObject>(GetPoin<wbr>terBaseWithConstantOffset(<br>
+ I.getArgOperand(Op), Offset, DAG.getDataLayout()));<br>
+ if (ElemBase != Base)<br>
+ report_fatal_error("all llvm.icall.branch.funnel operands must refer "<br>
+ "to the same GlobalValue");<br>
+<br>
+ SDValue Val = getValue(I.getArgOperand(Op + 1));<br>
+ auto *GA = dyn_cast<GlobalAddressSDNode>(<wbr>Val);<br>
+ if (!GA)<br>
+ report_fatal_error(<br>
+ "llvm.icall.branch.funnel operand must be a GlobalValue");<br>
+ Targets.push_back({Offset, DAG.getTargetGlobalAddress(<br>
+ GA->getGlobal(), getCurSDLoc(),<br>
+ Val.getValueType(), GA->getOffset())});<br>
+ }<br>
+ std::sort(Targets.begin(), Targets.end(),<br>
+ [](const BranchFunnelTarget &T1, const BranchFunnelTarget &T2) {<br>
+ return T1.Offset < T2.Offset;<br>
+ });<br>
+<br>
+ for (auto &T : Targets) {<br>
+ Ops.push_back(DAG.getTargetCon<wbr>stant(T.Offset, getCurSDLoc(), MVT::i32));<br>
+ Ops.push_back(T.Target);<br>
+ }<br>
+<br>
+ SDValue N(DAG.getMachineNode(TargetOpc<wbr>ode::ICALL_BRANCH_FUNNEL,<br>
+ getCurSDLoc(), MVT::Other, Ops),<br>
+ 0);<br>
+ DAG.setRoot(N);<br>
+ setValue(&I, N);<br>
+ HasTailCall = true;<br>
+ return nullptr;<br>
+ }<br>
}<br>
}<br>
<br>
<br>
Modified: llvm/trunk/lib/IR/Verifier.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Verifier.cpp?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/lib/IR/Verifi<wbr>er.cpp?rev=327163&r1=327162&<wbr>r2=327163&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/IR/Verifier.cpp (original)<br>
+++ llvm/trunk/lib/IR/Verifier.cpp Fri Mar 9 11:11:44 2018<br>
@@ -2864,17 +2864,20 @@ void Verifier::verifyMustTailCall(C<wbr>allIn<br>
Function *F = CI.getParent()->getParent();<br>
FunctionType *CallerTy = F->getFunctionType();<br>
FunctionType *CalleeTy = CI.getFunctionType();<br>
- Assert(CallerTy->getNumParams(<wbr>) == CalleeTy->getNumParams(),<br>
- "cannot guarantee tail call due to mismatched parameter counts", &CI);<br>
+ if (!CI.getCalledFunction() || !CI.getCalledFunction()->isInt<wbr>rinsic()) {<br>
+ Assert(CallerTy->getNumParams(<wbr>) == CalleeTy->getNumParams(),<br>
+ "cannot guarantee tail call due to mismatched parameter counts",<br>
+ &CI);<br>
+ for (int I = 0, E = CallerTy->getNumParams(); I != E; ++I) {<br>
+ Assert(<br>
+ isTypeCongruent(CallerTy->getP<wbr>aramType(I), CalleeTy->getParamType(I)),<br>
+ "cannot guarantee tail call due to mismatched parameter types", &CI);<br>
+ }<br>
+ }<br>
Assert(CallerTy->isVarArg() == CalleeTy->isVarArg(),<br>
"cannot guarantee tail call due to mismatched varargs", &CI);<br>
Assert(isTypeCongruent(Caller<wbr>Ty->getReturnType(), CalleeTy->getReturnType()),<br>
"cannot guarantee tail call due to mismatched return types", &CI);<br>
- for (int I = 0, E = CallerTy->getNumParams(); I != E; ++I) {<br>
- Assert(<br>
- isTypeCongruent(CallerTy->getP<wbr>aramType(I), CalleeTy->getParamType(I)),<br>
- "cannot guarantee tail call due to mismatched parameter types", &CI);<br>
- }<br>
<br>
// - The calling conventions of the caller and callee must match.<br>
Assert(F->getCallingConv() == CI.getCallingConv(),<br>
<br>
Modified: llvm/trunk/lib/Target/X86/X86E<wbr>xpandPseudo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ExpandPseudo.cpp?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/lib/Target/X8<wbr>6/X86ExpandPseudo.cpp?rev=3271<wbr>63&r1=327162&r2=327163&view=<wbr>diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Target/X86/X86E<wbr>xpandPseudo.cpp (original)<br>
+++ llvm/trunk/lib/Target/X86/X86E<wbr>xpandPseudo.cpp Fri Mar 9 11:11:44 2018<br>
@@ -59,12 +59,112 @@ public:<br>
}<br>
<br>
private:<br>
+ void ExpandICallBranchFunnel(Machin<wbr>eBasicBlock *MBB,<br>
+ MachineBasicBlock::iterator MBBI);<br>
+<br>
bool ExpandMI(MachineBasicBlock &MBB, MachineBasicBlock::iterator MBBI);<br>
bool ExpandMBB(MachineBasicBlock &MBB);<br>
};<br>
char X86ExpandPseudo::ID = 0;<br>
} // End anonymous namespace.<br>
<br>
+void X86ExpandPseudo::ExpandICallBr<wbr>anchFunnel(<br>
+ MachineBasicBlock *MBB, MachineBasicBlock::iterator MBBI) {<br>
+ MachineBasicBlock *JTMBB = MBB;<br>
+ MachineInstr *JTInst = &*MBBI;<br>
+ MachineFunction *MF = MBB->getParent();<br>
+ const BasicBlock *BB = MBB->getBasicBlock();<br>
+ auto InsPt = MachineFunction::iterator(MBB)<wbr>;<br>
+ ++InsPt;<br>
+<br>
+ std::vector<std::pair<MachineB<wbr>asicBlock *, unsigned>> TargetMBBs;<br>
+ DebugLoc DL = JTInst->getDebugLoc();<br>
+ MachineOperand Selector = JTInst->getOperand(0);<br>
+ const GlobalValue *CombinedGlobal = JTInst->getOperand(1).getGloba<wbr>l();<br>
+<br>
+ auto CmpTarget = [&](unsigned Target) {<br>
+ BuildMI(*MBB, MBBI, DL, TII->get(X86::LEA64r), X86::R11)<br>
+ .addReg(X86::RIP)<br>
+ .addImm(1)<br>
+ .addReg(0)<br>
+ .addGlobalAddress(CombinedGlob<wbr>al,<br>
+ JTInst->getOperand(2 + 2 * Target).getImm())<br>
+ .addReg(0);<br>
+ BuildMI(*MBB, MBBI, DL, TII->get(X86::CMP64rr))<br>
+ .add(Selector)<br>
+ .addReg(X86::R11);<br>
+ };<br>
+<br>
+ auto CreateMBB = [&]() {<br>
+ auto *NewMBB = MF->CreateMachineBasicBlock(BB<wbr>);<br>
+ MBB->addSuccessor(NewMBB);<br>
+ return NewMBB;<br>
+ };<br>
+<br>
+ auto EmitCondJump = [&](unsigned Opcode, MachineBasicBlock *ThenMBB) {<br>
+ BuildMI(*MBB, MBBI, DL, TII->get(Opcode)).addMBB(ThenM<wbr>BB);<br>
+<br>
+ auto *ElseMBB = CreateMBB();<br>
+ MF->insert(InsPt, ElseMBB);<br>
+ MBB = ElseMBB;<br>
+ MBBI = MBB->end();<br>
+ };<br>
+<br>
+ auto EmitCondJumpTarget = [&](unsigned Opcode, unsigned Target) {<br>
+ auto *ThenMBB = CreateMBB();<br>
+ TargetMBBs.push_back({ThenMBB, Target});<br>
+ EmitCondJump(Opcode, ThenMBB);<br>
+ };<br>
+<br>
+ auto EmitTailCall = [&](unsigned Target) {<br>
+ BuildMI(*MBB, MBBI, DL, TII->get(X86::TAILJMPd64))<br>
+ .add(JTInst->getOperand(3 + 2 * Target));<br>
+ };<br>
+<br>
+ std::function<void(unsigned, unsigned)> EmitBranchFunnel =<br>
+ [&](unsigned FirstTarget, unsigned NumTargets) {<br>
+ if (NumTargets == 1) {<br>
+ EmitTailCall(FirstTarget);<br>
+ return;<br>
+ }<br>
+<br>
+ if (NumTargets == 2) {<br>
+ CmpTarget(FirstTarget + 1);<br>
+ EmitCondJumpTarget(X86::JB_1, FirstTarget);<br>
+ EmitTailCall(FirstTarget + 1);<br>
+ return;<br>
+ }<br>
+<br>
+ if (NumTargets < 6) {<br>
+ CmpTarget(FirstTarget + 1);<br>
+ EmitCondJumpTarget(X86::JB_1, FirstTarget);<br>
+ EmitCondJumpTarget(X86::JE_1, FirstTarget + 1);<br>
+ EmitBranchFunnel(FirstTarget + 2, NumTargets - 2);<br>
+ return;<br>
+ }<br>
+<br>
+ auto *ThenMBB = CreateMBB();<br>
+ CmpTarget(FirstTarget + (NumTargets / 2));<br>
+ EmitCondJump(X86::JB_1, ThenMBB);<br>
+ EmitCondJumpTarget(X86::JE_1, FirstTarget + (NumTargets / 2));<br>
+ EmitBranchFunnel(FirstTarget + (NumTargets / 2) + 1,<br>
+ NumTargets - (NumTargets / 2) - 1);<br>
+<br>
+ MF->insert(InsPt, ThenMBB);<br>
+ MBB = ThenMBB;<br>
+ MBBI = MBB->end();<br>
+ EmitBranchFunnel(FirstTarget, NumTargets / 2);<br>
+ };<br>
+<br>
+ EmitBranchFunnel(0, (JTInst->getNumOperands() - 2) / 2);<br>
+ for (auto P : TargetMBBs) {<br>
+ MF->insert(InsPt, P.first);<br>
+ BuildMI(P.first, DL, TII->get(X86::TAILJMPd64))<br>
+ .add(JTInst->getOperand(3 + 2 * P.second));<br>
+ }<br>
+ JTMBB->erase(JTInst);<br>
+}<br>
+<br>
/// If \p MBBI is a pseudo instruction, this method expands<br>
/// it to the corresponding (sequence of) actual instruction(s).<br>
/// \returns true if \p MBBI has been expanded.<br>
@@ -259,6 +359,9 @@ bool X86ExpandPseudo::ExpandMI(Mach<wbr>ineBa<br>
MBBI->eraseFromParent();<br>
return true;<br>
}<br>
+ case TargetOpcode::ICALL_BRANCH_FUN<wbr>NEL:<br>
+ ExpandICallBranchFunnel(&MBB, MBBI);<br>
+ return true;<br>
}<br>
llvm_unreachable("Previous switch has a fallthrough?");<br>
}<br>
<br>
Modified: llvm/trunk/lib/Transforms/IPO/<wbr>LowerTypeTests.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/LowerTypeTests.cpp?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/lib/Transform<wbr>s/IPO/LowerTypeTests.cpp?rev=<wbr>327163&r1=327162&r2=327163&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Transforms/IPO/<wbr>LowerTypeTests.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/IPO/<wbr>LowerTypeTests.cpp Fri Mar 9 11:11:44 2018<br>
@@ -8,6 +8,8 @@<br>
//===------------------------<wbr>------------------------------<wbr>----------------===//<br>
//<br>
// This pass lowers type metadata and calls to the llvm.type.test intrinsic.<br>
+// It also ensures that globals are properly laid out for the<br>
+// llvm.icall.branch.funnel intrinsic.<br>
// See <a href="http://llvm.org/docs/TypeMetadata.html" rel="noreferrer" target="_blank">http://llvm.org/docs/TypeMetad<wbr>ata.html</a> for more information.<br>
//<br>
//===------------------------<wbr>------------------------------<wbr>----------------===//<br>
@@ -25,6 +27,7 @@<br>
#include "llvm/ADT/TinyPtrVector.h"<br>
#include "llvm/ADT/Triple.h"<br>
#include "llvm/Analysis/TypeMetadataUti<wbr>ls.h"<br>
+#include "llvm/Analysis/ValueTracking.h<wbr>"<br>
#include "llvm/IR/Attributes.h"<br>
#include "llvm/IR/BasicBlock.h"<br>
#include "llvm/IR/Constant.h"<br>
@@ -291,6 +294,29 @@ public:<br>
}<br>
};<br>
<br>
+struct ICallBranchFunnel final<br>
+ : TrailingObjects<ICallBranchFun<wbr>nel, GlobalTypeMember *> {<br>
+ static ICallBranchFunnel *create(BumpPtrAllocator &Alloc, CallInst *CI,<br>
+ ArrayRef<GlobalTypeMember *> Targets) {<br>
+ auto *Call = static_cast<ICallBranchFunnel *>(<br>
+ Alloc.Allocate(totalSizeToAllo<wbr>c<GlobalTypeMember *>(Targets.size()),<br>
+ alignof(ICallBranchFunnel)));<br>
+ Call->CI = CI;<br>
+ Call->NTargets = Targets.size();<br>
+ std::uninitialized_copy(Target<wbr>s.begin(), Targets.end(),<br>
+ Call->getTrailingObjects<Globa<wbr>lTypeMember *>());<br>
+ return Call;<br>
+ }<br>
+<br>
+ CallInst *CI;<br>
+ ArrayRef<GlobalTypeMember *> targets() const {<br>
+ return makeArrayRef(getTrailingObject<wbr>s<GlobalTypeMember *>(), NTargets);<br>
+ }<br>
+<br>
+private:<br>
+ size_t NTargets;<br>
+};<br>
+<br>
class LowerTypeTestsModule {<br>
Module &M;<br>
<br>
@@ -372,6 +398,7 @@ class LowerTypeTestsModule {<br>
const DenseMap<GlobalTypeMember *, uint64_t> &GlobalLayout);<br>
Value *lowerTypeTestCall(Metadata *TypeId, CallInst *CI,<br>
const TypeIdLowering &TIL);<br>
+<br>
void buildBitSetsFromGlobalVariable<wbr>s(ArrayRef<Metadata *> TypeIds,<br>
ArrayRef<GlobalTypeMember *> Globals);<br>
unsigned getJumpTableEntrySize();<br>
@@ -383,11 +410,13 @@ class LowerTypeTestsModule {<br>
void buildBitSetsFromFunctions(Arra<wbr>yRef<Metadata *> TypeIds,<br>
ArrayRef<GlobalTypeMember *> Functions);<br>
void buildBitSetsFromFunctionsNativ<wbr>e(ArrayRef<Metadata *> TypeIds,<br>
- ArrayRef<GlobalTypeMember *> Functions);<br>
+ ArrayRef<GlobalTypeMember *> Functions);<br>
void buildBitSetsFromFunctionsWASM(<wbr>ArrayRef<Metadata *> TypeIds,<br>
ArrayRef<GlobalTypeMember *> Functions);<br>
- void buildBitSetsFromDisjointSet(Ar<wbr>rayRef<Metadata *> TypeIds,<br>
- ArrayRef<GlobalTypeMember *> Globals);<br>
+ void<br>
+ buildBitSetsFromDisjointSet(Ar<wbr>rayRef<Metadata *> TypeIds,<br>
+ ArrayRef<GlobalTypeMember *> Globals,<br>
+ ArrayRef<ICallBranchFunnel *> ICallBranchFunnels);<br>
<br>
void replaceWeakDeclarationWithJump<wbr>TablePtr(Function *F, Constant *JT);<br>
void moveInitializerToModuleConstru<wbr>ctor(GlobalVariable *GV);<br>
@@ -1462,7 +1491,8 @@ void LowerTypeTestsModule::buildBit<wbr>SetsF<br>
}<br>
<br>
void LowerTypeTestsModule::buildBit<wbr>SetsFromDisjointSet(<br>
- ArrayRef<Metadata *> TypeIds, ArrayRef<GlobalTypeMember *> Globals) {<br>
+ ArrayRef<Metadata *> TypeIds, ArrayRef<GlobalTypeMember *> Globals,<br>
+ ArrayRef<ICallBranchFunnel *> ICallBranchFunnels) {<br>
DenseMap<Metadata *, uint64_t> TypeIdIndices;<br>
for (unsigned I = 0; I != TypeIds.size(); ++I)<br>
TypeIdIndices[TypeIds[I]] = I;<br>
@@ -1471,15 +1501,25 @@ void LowerTypeTestsModule::buildBit<wbr>SetsF<br>
// the type identifier.<br>
std::vector<std::set<uint64_<wbr>t>> TypeMembers(TypeIds.size());<br>
unsigned GlobalIndex = 0;<br>
+ DenseMap<GlobalTypeMember *, uint64_t> GlobalIndices;<br>
for (GlobalTypeMember *GTM : Globals) {<br>
for (MDNode *Type : GTM->types()) {<br>
// Type = { offset, type identifier }<br>
- unsigned TypeIdIndex = TypeIdIndices[Type->getOperand<wbr>(1)];<br>
- TypeMembers[TypeIdIndex].inser<wbr>t(GlobalIndex);<br>
+ auto I = TypeIdIndices.find(Type->getOp<wbr>erand(1));<br>
+ if (I != TypeIdIndices.end())<br>
+ TypeMembers[I->second].insert(<wbr>GlobalIndex);<br>
}<br>
+ GlobalIndices[GTM] = GlobalIndex;<br>
GlobalIndex++;<br>
}<br>
<br>
+ for (ICallBranchFunnel *JT : ICallBranchFunnels) {<br>
+ TypeMembers.emplace_back();<br>
+ std::set<uint64_t> &TMSet = TypeMembers.back();<br>
+ for (GlobalTypeMember *T : JT->targets())<br>
+ TMSet.insert(GlobalIndices[T])<wbr>;<br>
+ }<br>
+<br>
// Order the sets of indices by size. The GlobalLayoutBuilder works best<br>
// when given small index sets first.<br>
std::stable_sort(<br>
@@ -1567,8 +1607,11 @@ bool LowerTypeTestsModule::runForTe<wbr>sting<br>
bool LowerTypeTestsModule::lower() {<br>
Function *TypeTestFunc =<br>
M.getFunction(Intrinsic::getN<wbr>ame(Intrinsic::type_test));<br>
- if ((!TypeTestFunc || TypeTestFunc->use_empty()) && !ExportSummary &&<br>
- !ImportSummary)<br>
+ Function *ICallBranchFunnelFunc =<br>
+ M.getFunction(Intrinsic::getNa<wbr>me(Intrinsic::icall_branch_<wbr>funnel));<br>
+ if ((!TypeTestFunc || TypeTestFunc->use_empty()) &&<br>
+ (!ICallBranchFunnelFunc || ICallBranchFunnelFunc->use_emp<wbr>ty()) &&<br>
+ !ExportSummary && !ImportSummary)<br>
return false;<br>
<br>
if (ImportSummary) {<br>
@@ -1580,6 +1623,10 @@ bool LowerTypeTestsModule::lower() {<br>
}<br>
}<br>
<br>
+ if (ICallBranchFunnelFunc && !ICallBranchFunnelFunc->use_em<wbr>pty())<br>
+ report_fatal_error(<br>
+ "unexpected call to llvm.icall.branch.funnel during import phase");<br>
+<br>
SmallVector<Function *, 8> Defs;<br>
SmallVector<Function *, 8> Decls;<br>
for (auto &F : M) {<br>
@@ -1604,8 +1651,8 @@ bool LowerTypeTestsModule::lower() {<br>
// Equivalence class set containing type identifiers and the globals that<br>
// reference them. This is used to partition the set of type identifiers in<br>
// the module into disjoint sets.<br>
- using GlobalClassesTy =<br>
- EquivalenceClasses<PointerUnio<wbr>n<GlobalTypeMember *, Metadata *>>;<br>
+ using GlobalClassesTy = EquivalenceClasses<<br>
+ PointerUnion3<GlobalTypeMember *, Metadata *, ICallBranchFunnel *>>;<br>
GlobalClassesTy GlobalClasses;<br>
<br>
// Verify the type metadata and build a few data structures to let us<br>
@@ -1688,14 +1735,13 @@ bool LowerTypeTestsModule::lower() {<br>
}<br>
}<br>
<br>
+ DenseMap<GlobalObject *, GlobalTypeMember *> GlobalTypeMembers;<br>
for (GlobalObject &GO : M.global_objects()) {<br>
if (isa<GlobalVariable>(GO) && GO.isDeclarationForLinker())<br>
continue;<br>
<br>
Types.clear();<br>
GO.getMetadata(LLVMContext::M<wbr>D_type, Types);<br>
- if (Types.empty())<br>
- continue;<br>
<br>
bool IsDefinition = !GO.isDeclarationForLinker();<br>
bool IsExported = false;<br>
@@ -1706,6 +1752,7 @@ bool LowerTypeTestsModule::lower() {<br>
<br>
auto *GTM =<br>
GlobalTypeMember::create(Allo<wbr>c, &GO, IsDefinition, IsExported, Types);<br>
+ GlobalTypeMembers[&GO] = GTM;<br>
for (MDNode *Type : Types) {<br>
verifyTypeMDNode(&GO, Type);<br>
auto &Info = TypeIdInfo[Type->getOperand(1)<wbr>];<br>
@@ -1746,6 +1793,43 @@ bool LowerTypeTestsModule::lower() {<br>
}<br>
}<br>
<br>
+ if (ICallBranchFunnelFunc) {<br>
+ for (const Use &U : ICallBranchFunnelFunc->uses()) {<br>
+ if (Arch != Triple::x86_64)<br>
+ report_fatal_error(<br>
+ "llvm.icall.branch.funnel not supported on this target");<br>
+<br>
+ auto CI = cast<CallInst>(U.getUser());<br>
+<br>
+ std::vector<GlobalTypeMember *> Targets;<br>
+ if (CI->getNumArgOperands() % 2 != 1)<br>
+ report_fatal_error("number of arguments should be odd");<br>
+<br>
+ GlobalClassesTy::member_iterat<wbr>or CurSet;<br>
+ for (unsigned I = 1; I != CI->getNumArgOperands(); I += 2) {<br>
+ int64_t Offset;<br>
+ auto *Base = dyn_cast<GlobalObject>(GetPoin<wbr>terBaseWithConstantOffset(<br>
+ CI->getOperand(I), Offset, M.getDataLayout()));<br>
+ if (!Base)<br>
+ report_fatal_error(<br>
+ "Expected branch funnel operand to be global value");<br>
+<br>
+ GlobalTypeMember *GTM = GlobalTypeMembers[Base];<br>
+ Targets.push_back(GTM);<br>
+ GlobalClassesTy::member_iterat<wbr>or NewSet =<br>
+ GlobalClasses.findLeader(Globa<wbr>lClasses.insert(GTM));<br>
+ if (I == 1)<br>
+ CurSet = NewSet;<br>
+ else<br>
+ CurSet = GlobalClasses.unionSets(CurSet<wbr>, NewSet);<br>
+ }<br>
+<br>
+ GlobalClasses.unionSets(<br>
+ CurSet, GlobalClasses.findLeader(Globa<wbr>lClasses.insert(<br>
+ ICallBranchFunnel::create(Allo<wbr>c, CI, Targets))));<br>
+ }<br>
+ }<br>
+<br>
if (ExportSummary) {<br>
DenseMap<GlobalValue::GUID, TinyPtrVector<Metadata *>> MetadataByGUID;<br>
for (auto &P : TypeIdInfo) {<br>
@@ -1798,13 +1882,16 @@ bool LowerTypeTestsModule::lower() {<br>
// Build the list of type identifiers in this disjoint set.<br>
std::vector<Metadata *> TypeIds;<br>
std::vector<GlobalTypeMember *> Globals;<br>
+ std::vector<ICallBranchFunnel *> ICallBranchFunnels;<br>
for (GlobalClassesTy::member_itera<wbr>tor MI =<br>
GlobalClasses.member_begin(S.f<wbr>irst);<br>
MI != GlobalClasses.member_end(); ++MI) {<br>
- if ((*MI).is<Metadata *>())<br>
+ if (MI->is<Metadata *>())<br>
TypeIds.push_back(MI->get<Met<wbr>adata *>());<br>
- else<br>
+ else if (MI->is<GlobalTypeMember *>())<br>
Globals.push_back(MI->get<Glo<wbr>balTypeMember *>());<br>
+ else<br>
+ ICallBranchFunnels.push_back(M<wbr>I->get<ICallBranchFunnel *>());<br>
}<br>
<br>
// Order type identifiers by global index for determinism. This ordering is<br>
@@ -1814,7 +1901,7 @@ bool LowerTypeTestsModule::lower() {<br>
});<br>
<br>
// Build bitsets for this disjoint set.<br>
- buildBitSetsFromDisjointSet(Ty<wbr>peIds, Globals);<br>
+ buildBitSetsFromDisjointSet(Ty<wbr>peIds, Globals, ICallBranchFunnels);<br>
}<br>
<br>
allocateByteArrays();<br>
<br>
Modified: llvm/trunk/lib/Transforms/IPO/<wbr>WholeProgramDevirt.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/WholeProgramDevirt.cpp?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/lib/Transform<wbr>s/IPO/WholeProgramDevirt.cpp?<wbr>rev=327163&r1=327162&r2=<wbr>327163&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Transforms/IPO/<wbr>WholeProgramDevirt.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/IPO/<wbr>WholeProgramDevirt.cpp Fri Mar 9 11:11:44 2018<br>
@@ -316,12 +316,17 @@ struct CallSiteInfo {<br>
/// cases we are directly operating on the call sites at the IR level.<br>
std::vector<VirtualCallSite> CallSites;<br>
<br>
+ /// Whether all call sites represented by this CallSiteInfo, including those<br>
+ /// in summaries, have been devirtualized. This starts off as true because a<br>
+ /// default constructed CallSiteInfo represents no call sites.<br>
+ bool AllCallSitesDevirted = true;<br>
+<br>
// These fields are used during the export phase of ThinLTO and reflect<br>
// information collected from function summaries.<br>
<br>
/// Whether any function summary contains an llvm.assume(llvm.type.test) for<br>
/// this slot.<br>
- bool SummaryHasTypeTestAssumeUsers;<br>
+ bool SummaryHasTypeTestAssumeUsers = false;<br>
<br>
/// CFI-specific: a vector containing the list of function summaries that use<br>
/// the llvm.type.checked.load intrinsic and therefore will require<br>
@@ -337,8 +342,22 @@ struct CallSiteInfo {<br>
!SummaryTypeCheckedLoadUsers.e<wbr>mpty();<br>
}<br>
<br>
- /// As explained in the comment for SummaryTypeCheckedLoadUsers.<br>
- void markDevirt() { SummaryTypeCheckedLoadUsers.cl<wbr>ear(); }<br>
+ void markSummaryHasTypeTestAssumeUs<wbr>ers() {<br>
+ SummaryHasTypeTestAssumeUsers = true;<br>
+ AllCallSitesDevirted = false;<br>
+ }<br>
+<br>
+ void addSummaryTypeCheckedLoadUser(<wbr>FunctionSummary *FS) {<br>
+ SummaryTypeCheckedLoadUsers.pu<wbr>sh_back(FS);<br>
+ AllCallSitesDevirted = false;<br>
+ }<br>
+<br>
+ void markDevirt() {<br>
+ AllCallSitesDevirted = true;<br>
+<br>
+ // As explained in the comment for SummaryTypeCheckedLoadUsers.<br>
+ SummaryTypeCheckedLoadUsers.cl<wbr>ear();<br>
+ }<br>
};<br>
<br>
// Call site information collected for a specific VTableSlot.<br>
@@ -373,7 +392,9 @@ CallSiteInfo &VTableSlotInfo::findCallSi<br>
<br>
void VTableSlotInfo::addCallSite(Va<wbr>lue *VTable, CallSite CS,<br>
unsigned *NumUnsafeUses) {<br>
- findCallSiteInfo(CS).CallSites<wbr>.push_back({VTable, CS, NumUnsafeUses});<br>
+ auto &CSI = findCallSiteInfo(CS);<br>
+ CSI.AllCallSitesDevirted = false;<br>
+ CSI.CallSites.push_back({VTabl<wbr>e, CS, NumUnsafeUses});<br>
}<br>
<br>
struct DevirtModule {<br>
@@ -438,6 +459,12 @@ struct DevirtModule {<br>
VTableSlotInfo &SlotInfo,<br>
WholeProgramDevirtResolution *Res);<br>
<br>
+ void applyICallBranchFunnel(VTableS<wbr>lotInfo &SlotInfo, Constant *JT,<br>
+ bool &IsExported);<br>
+ void tryICallBranchFunnel(MutableAr<wbr>rayRef<VirtualCallTarget> TargetsForSlot,<br>
+ VTableSlotInfo &SlotInfo,<br>
+ WholeProgramDevirtResolution *Res, VTableSlot Slot);<br>
+<br>
bool tryEvaluateFunctionsWithArgs(<br>
MutableArrayRef<VirtualCallTa<wbr>rget> TargetsForSlot,<br>
ArrayRef<uint64_t> Args);<br>
@@ -471,6 +498,8 @@ struct DevirtModule {<br>
StringRef Name, IntegerType *IntTy,<br>
uint32_t Storage);<br>
<br>
+ Constant *getMemberAddr(const TypeMemberInfo *M);<br>
+<br>
void applyUniqueRetValOpt(CallSiteI<wbr>nfo &CSInfo, StringRef FnName, bool IsOne,<br>
Constant *UniqueMemberAddr);<br>
bool tryUniqueRetValOpt(unsigned BitWidth,<br>
@@ -726,10 +755,9 @@ void DevirtModule::applySingleImplD<wbr>evirt<br>
if (VCallSite.NumUnsafeUses)<br>
--*VCallSite.NumUnsafeUses;<br>
}<br>
- if (CSInfo.isExported()) {<br>
+ if (CSInfo.isExported())<br>
IsExported = true;<br>
- CSInfo.markDevirt();<br>
- }<br>
+ CSInfo.markDevirt();<br>
};<br>
Apply(SlotInfo.CSInfo);<br>
for (auto &P : SlotInfo.ConstCSInfo)<br>
@@ -785,6 +813,134 @@ bool DevirtModule::trySingleImplDev<wbr>irt(<br>
return true;<br>
}<br>
<br>
+void DevirtModule::tryICallBranchFu<wbr>nnel(<br>
+ MutableArrayRef<VirtualCallTar<wbr>get> TargetsForSlot, VTableSlotInfo &SlotInfo,<br>
+ WholeProgramDevirtResolution *Res, VTableSlot Slot) {<br>
+ Triple T(M.getTargetTriple());<br>
+ if (T.getArch() != Triple::x86_64)<br>
+ return;<br>
+<br>
+ const unsigned kBranchFunnelThreshold = 10;<br>
+ if (TargetsForSlot.size() > kBranchFunnelThreshold)<br>
+ return;<br>
+<br>
+ bool HasNonDevirt = !SlotInfo.CSInfo.AllCallSitesD<wbr>evirted;<br>
+ if (!HasNonDevirt)<br>
+ for (auto &P : SlotInfo.ConstCSInfo)<br>
+ if (!P.second.AllCallSitesDevirte<wbr>d) {<br>
+ HasNonDevirt = true;<br>
+ break;<br>
+ }<br>
+<br>
+ if (!HasNonDevirt)<br>
+ return;<br>
+<br>
+ FunctionType *FT =<br>
+ FunctionType::get(Type::getVoi<wbr>dTy(M.getContext()), {Int8PtrTy}, true);<br>
+ Function *JT;<br>
+ if (isa<MDString>(Slot.TypeID)) {<br>
+ JT = Function::Create(FT, Function::ExternalLinkage,<br>
+ getGlobalName(Slot, {}, "branch_funnel"), &M);<br>
+ JT->setVisibility(GlobalValue:<wbr>:HiddenVisibility);<br>
+ } else {<br>
+ JT = Function::Create(FT, Function::InternalLinkage, "branch_funnel", &M);<br>
+ }<br>
+ JT->addAttribute(1, Attribute::Nest);<br>
+<br>
+ std::vector<Value *> JTArgs;<br>
+ JTArgs.push_back(JT->arg_begin<wbr>());<br>
+ for (auto &T : TargetsForSlot) {<br>
+ JTArgs.push_back(getMemberAddr<wbr>(<a href="http://T.TM" rel="noreferrer" target="_blank">T.TM</a>));<br>
+ JTArgs.push_back(T.Fn);<br>
+ }<br>
+<br>
+ BasicBlock *BB = BasicBlock::Create(M.getContex<wbr>t(), "", JT, nullptr);<br>
+ Constant *Intr =<br>
+ Intrinsic::getDeclaration(&M, llvm::Intrinsic::icall_branch_<wbr>funnel, {});<br>
+<br>
+ auto *CI = CallInst::Create(Intr, JTArgs, "", BB);<br>
+ CI->setTailCallKind(CallInst::<wbr>TCK_MustTail);<br>
+ ReturnInst::Create(M.getContex<wbr>t(), nullptr, BB);<br>
+<br>
+ bool IsExported = false;<br>
+ applyICallBranchFunnel(SlotInf<wbr>o, JT, IsExported);<br>
+ if (IsExported)<br>
+ Res->TheKind = WholeProgramDevirtResolution::<wbr>BranchFunnel;<br>
+}<br>
+<br>
+void DevirtModule::applyICallBranch<wbr>Funnel(VTableSlotInfo &SlotInfo,<br>
+ Constant *JT, bool &IsExported) {<br>
+ auto Apply = [&](CallSiteInfo &CSInfo) {<br>
+ if (CSInfo.isExported())<br>
+ IsExported = true;<br>
+ if (CSInfo.AllCallSitesDevirted)<br>
+ return;<br>
+ for (auto &&VCallSite : CSInfo.CallSites) {<br>
+ CallSite CS = VCallSite.CS;<br>
+<br>
+ // Jump tables are only profitable if the retpoline mitigation is enabled.<br>
+ Attribute FSAttr = CS.getCaller()->getFnAttribute<wbr>("target-features");<br>
+ if (FSAttr.hasAttribute(Attribute<wbr>::None) ||<br>
+ !FSAttr.getValueAsString().con<wbr>tains("+retpoline"))<br>
+ continue;<br>
+<br>
+ if (RemarksEnabled)<br>
+ VCallSite.emitRemark("branch-f<wbr>unnel", JT->getName(), OREGetter);<br>
+<br>
+ // Pass the address of the vtable in the nest register, which is r10 on<br>
+ // x86_64.<br>
+ std::vector<Type *> NewArgs;<br>
+ NewArgs.push_back(Int8PtrTy);<br>
+ for (Type *T : CS.getFunctionType()->params()<wbr>)<br>
+ NewArgs.push_back(T);<br>
+ PointerType *NewFT = PointerType::getUnqual(<br>
+ FunctionType::get(CS.getFuncti<wbr>onType()->getReturnType(), NewArgs,<br>
+ CS.getFunctionType()->isVarArg<wbr>()));<br>
+<br>
+ IRBuilder<> IRB(CS.getInstruction());<br>
+ std::vector<Value *> Args;<br>
+ Args.push_back(IRB.CreateBitCa<wbr>st(VCallSite.VTable, Int8PtrTy));<br>
+ for (unsigned I = 0; I != CS.getNumArgOperands(); ++I)<br>
+ Args.push_back(CS.getArgOperan<wbr>d(I));<br>
+<br>
+ CallSite NewCS;<br>
+ if (CS.isCall())<br>
+ NewCS = IRB.CreateCall(IRB.CreateBitCa<wbr>st(JT, NewFT), Args);<br>
+ else<br>
+ NewCS = IRB.CreateInvoke(<br>
+ IRB.CreateBitCast(JT, NewFT),<br>
+ cast<InvokeInst>(CS.getInstruc<wbr>tion())->getNormalDest(),<br>
+ cast<InvokeInst>(CS.getInstruc<wbr>tion())->getUnwindDest(), Args);<br>
+ NewCS.setCallingConv(CS.getCal<wbr>lingConv());<br>
+<br>
+ AttributeList Attrs = CS.getAttributes();<br>
+ std::vector<AttributeSet> NewArgAttrs;<br>
+ NewArgAttrs.push_back(Attribut<wbr>eSet::get(<br>
+ M.getContext(), ArrayRef<Attribute>{Attribute:<wbr>:get(<br>
+ M.getContext(), Attribute::Nest)}));<br>
+ for (unsigned I = 0; I + 2 < Attrs.getNumAttrSets(); ++I)<br>
+ NewArgAttrs.push_back(Attrs.ge<wbr>tParamAttributes(I));<br>
+ NewCS.setAttributes(<br>
+ AttributeList::get(M.getContex<wbr>t(), Attrs.getFnAttributes(),<br>
+ Attrs.getRetAttributes(), NewArgAttrs));<br>
+<br>
+ CS->replaceAllUsesWith(NewCS.g<wbr>etInstruction());<br>
+ CS->eraseFromParent();<br>
+<br>
+ // This use is no longer unsafe.<br>
+ if (VCallSite.NumUnsafeUses)<br>
+ --*VCallSite.NumUnsafeUses;<br>
+ }<br>
+ // Don't mark as devirtualized because there may be callers compiled without<br>
+ // retpoline mitigation, which would mean that they are lowered to<br>
+ // llvm.type.test and therefore require an llvm.type.test resolution for the<br>
+ // type identifier.<br>
+ };<br>
+ Apply(SlotInfo.CSInfo);<br>
+ for (auto &P : SlotInfo.ConstCSInfo)<br>
+ Apply(P.second);<br>
+}<br>
+<br>
bool DevirtModule::tryEvaluateFunct<wbr>ionsWithArgs(<br>
MutableArrayRef<VirtualCallTa<wbr>rget> TargetsForSlot,<br>
ArrayRef<uint64_t> Args) {<br>
@@ -937,6 +1093,12 @@ void DevirtModule::applyUniqueRetVa<wbr>lOpt(<br>
CSInfo.markDevirt();<br>
}<br>
<br>
+Constant *DevirtModule::getMemberAddr(c<wbr>onst TypeMemberInfo *M) {<br>
+ Constant *C = ConstantExpr::getBitCast(M->Bi<wbr>ts->GV, Int8PtrTy);<br>
+ return ConstantExpr::getGetElementPtr<wbr>(Int8Ty, C,<br>
+ ConstantInt::get(Int64Ty, M->Offset));<br>
+}<br>
+<br>
bool DevirtModule::tryUniqueRetValO<wbr>pt(<br>
unsigned BitWidth, MutableArrayRef<VirtualCallTar<wbr>get> TargetsForSlot,<br>
CallSiteInfo &CSInfo, WholeProgramDevirtResolution::<wbr>ByArg *Res,<br>
@@ -956,12 +1118,7 @@ bool DevirtModule::tryUniqueRetValO<wbr>pt(<br>
// checked for a uniform return value in tryUniformRetValOpt.<br>
assert(UniqueMember);<br>
<br>
- Constant *UniqueMemberAddr =<br>
- ConstantExpr::getBitCast(Uniqu<wbr>eMember->Bits->GV, Int8PtrTy);<br>
- UniqueMemberAddr = ConstantExpr::getGetElementPtr<wbr>(<br>
- Int8Ty, UniqueMemberAddr,<br>
- ConstantInt::get(Int64Ty, UniqueMember->Offset));<br>
-<br>
+ Constant *UniqueMemberAddr = getMemberAddr(UniqueMember);<br>
if (CSInfo.isExported()) {<br>
Res->TheKind = WholeProgramDevirtResolution::<wbr>ByArg::UniqueRetVal;<br>
Res->Info = IsOne;<br>
@@ -1348,6 +1505,14 @@ void DevirtModule::importResolution<wbr>(VTab<br>
break;<br>
}<br>
}<br>
+<br>
+ if (Res.TheKind == WholeProgramDevirtResolution::<wbr>BranchFunnel) {<br>
+ auto *JT = M.getOrInsertFunction(getGloba<wbr>lName(Slot, {}, "branch_funnel"),<br>
+ Type::getVoidTy(M.getContext(<wbr>)));<br>
+ bool IsExported = false;<br>
+ applyICallBranchFunnel(SlotInf<wbr>o, JT, IsExported);<br>
+ assert(!IsExported);<br>
+ }<br>
}<br>
<br>
void DevirtModule::removeRedundantT<wbr>ypeTests() {<br>
@@ -1417,14 +1582,13 @@ bool DevirtModule::run() {<br>
// FIXME: Only add live functions.<br>
for (FunctionSummary::VFuncId VF : FS->type_test_assume_vcalls()) {<br>
for (Metadata *MD : MetadataByGUID[VF.GUID]) {<br>
- CallSlots[{MD, VF.Offset}].CSInfo.SummaryHasT<wbr>ypeTestAssumeUsers =<br>
- true;<br>
+ CallSlots[{MD, VF.Offset}]<br>
+ .CSInfo.markSummaryHasTypeTest<wbr>AssumeUsers();<br>
}<br>
}<br>
for (FunctionSummary::VFuncId VF : FS->type_checked_load_vcalls()<wbr>) {<br>
for (Metadata *MD : MetadataByGUID[VF.GUID]) {<br>
- CallSlots[{MD, VF.Offset}]<br>
- .CSInfo.SummaryTypeCheckedLoad<wbr>Users.push_back(FS);<br>
+ CallSlots[{MD, VF.Offset}].CSInfo.addSummaryT<wbr>ypeCheckedLoadUser(FS);<br>
}<br>
}<br>
for (const FunctionSummary::ConstVCall &VC :<br>
@@ -1432,7 +1596,7 @@ bool DevirtModule::run() {<br>
for (Metadata *MD : MetadataByGUID[VC.VFunc.GUID]) {<br>
CallSlots[{MD, VC.VFunc.Offset}]<br>
.ConstCSInfo[VC.Args]<br>
- .SummaryHasTypeTestAssumeUsers = true;<br>
+ .markSummaryHasTypeTestAssumeU<wbr>sers();<br>
}<br>
}<br>
for (const FunctionSummary::ConstVCall &VC :<br>
@@ -1440,7 +1604,7 @@ bool DevirtModule::run() {<br>
for (Metadata *MD : MetadataByGUID[VC.VFunc.GUID]) {<br>
CallSlots[{MD, VC.VFunc.Offset}]<br>
.ConstCSInfo[VC.Args]<br>
- .SummaryTypeCheckedLoadUsers.p<wbr>ush_back(FS);<br>
+ .addSummaryTypeCheckedLoadUser<wbr>(FS);<br>
}<br>
}<br>
}<br>
@@ -1464,9 +1628,12 @@ bool DevirtModule::run() {<br>
cast<MDString>(S.first.TypeID)<wbr>->getString())<br>
.WPDRes[S.first.ByteOffset];<br>
<br>
- if (!trySingleImplDevirt(TargetsF<wbr>orSlot, S.second, Res) &&<br>
- tryVirtualConstProp(TargetsFor<wbr>Slot, S.second, Res, S.first))<br>
- DidVirtualConstProp = true;<br>
+ if (!trySingleImplDevirt(TargetsF<wbr>orSlot, S.second, Res)) {<br>
+ DidVirtualConstProp |=<br>
+ tryVirtualConstProp(TargetsFor<wbr>Slot, S.second, Res, S.first);<br>
+<br>
+ tryICallBranchFunnel(TargetsFo<wbr>rSlot, S.second, Res, S.first);<br>
+ }<br>
<br>
// Collect functions devirtualized at least for one call site for stats.<br>
if (RemarksEnabled)<br>
<br>
Added: llvm/trunk/test/CodeGen/X86/ic<wbr>all-branch-funnel.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/icall-branch-funnel.ll?rev=327163&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/CodeGen/<wbr>X86/icall-branch-funnel.ll?<wbr>rev=327163&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/CodeGen/X86/ic<wbr>all-branch-funnel.ll (added)<br>
+++ llvm/trunk/test/CodeGen/X86/ic<wbr>all-branch-funnel.ll Fri Mar 9 11:11:44 2018<br>
@@ -0,0 +1,170 @@<br>
+; RUN: llc -mtriple=x86_64-unknown-linux < %s | FileCheck %s<br>
+<br>
+@g = external global i8<br>
+<br>
+declare void @f0()<br>
+declare void @f1()<br>
+declare void @f2()<br>
+declare void @f3()<br>
+declare void @f4()<br>
+declare void @f5()<br>
+declare void @f6()<br>
+declare void @f7()<br>
+declare void @f8()<br>
+declare void @f9()<br>
+<br>
+declare void @llvm.icall.branch.funnel(...)<br>
+<br>
+define void @jt2(i8* nest, ...) {<br>
+ ; CHECK: jt2:<br>
+ ; CHECK: leaq g+1(%rip), %r11<br>
+ ; CHECK-NEXT: cmpq %r11, %r10<br>
+ ; CHECK-NEXT: jae .LBB0_1<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f0<br>
+ ; CHECK-NEXT: .LBB0_1:<br>
+ ; CHECK-NEXT: jmp f1<br>
+ musttail call void (...) @llvm.icall.branch.funnel(<br>
+ i8* %0,<br>
+ i8* getelementptr (i8, i8* @g, i64 0), void ()* @f0,<br>
+ i8* getelementptr (i8, i8* @g, i64 1), void ()* @f1,<br>
+ ...<br>
+ )<br>
+ ret void<br>
+}<br>
+<br>
+define void @jt3(i8* nest, ...) {<br>
+ ; CHECK: jt3:<br>
+ ; CHECK: leaq g+1(%rip), %r11<br>
+ ; CHECK-NEXT: cmpq %r11, %r10<br>
+ ; CHECK-NEXT: jae .LBB1_1<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f0<br>
+ ; CHECK-NEXT: .LBB1_1:<br>
+ ; CHECK-NEXT: jne .LBB1_2<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f1<br>
+ ; CHECK-NEXT: .LBB1_2:<br>
+ ; CHECK-NEXT: jmp f2<br>
+ musttail call void (...) @llvm.icall.branch.funnel(<br>
+ i8* %0,<br>
+ i8* getelementptr (i8, i8* @g, i64 0), void ()* @f0,<br>
+ i8* getelementptr (i8, i8* @g, i64 2), void ()* @f2,<br>
+ i8* getelementptr (i8, i8* @g, i64 1), void ()* @f1,<br>
+ ...<br>
+ )<br>
+ ret void<br>
+}<br>
+<br>
+define void @jt7(i8* nest, ...) {<br>
+ ; CHECK: jt7:<br>
+ ; CHECK: leaq g+3(%rip), %r11<br>
+ ; CHECK-NEXT: cmpq %r11, %r10<br>
+ ; CHECK-NEXT: jae .LBB2_1<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: leaq g+1(%rip), %r11<br>
+ ; CHECK-NEXT: cmpq %r11, %r10<br>
+ ; CHECK-NEXT: jae .LBB2_6<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f0<br>
+ ; CHECK-NEXT: .LBB2_1:<br>
+ ; CHECK-NEXT: jne .LBB2_2<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f3<br>
+ ; CHECK-NEXT: .LBB2_6:<br>
+ ; CHECK-NEXT: jne .LBB2_7<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f1<br>
+ ; CHECK-NEXT: .LBB2_2:<br>
+ ; CHECK-NEXT: leaq g+5(%rip), %r11<br>
+ ; CHECK-NEXT: cmpq %r11, %r10<br>
+ ; CHECK-NEXT: jae .LBB2_3<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f4<br>
+ ; CHECK-NEXT: .LBB2_7:<br>
+ ; CHECK-NEXT: jmp f2<br>
+ ; CHECK-NEXT: .LBB2_3:<br>
+ ; CHECK-NEXT: jne .LBB2_4<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f5<br>
+ ; CHECK-NEXT: .LBB2_4:<br>
+ ; CHECK-NEXT: jmp f6<br>
+ musttail call void (...) @llvm.icall.branch.funnel(<br>
+ i8* %0,<br>
+ i8* getelementptr (i8, i8* @g, i64 0), void ()* @f0,<br>
+ i8* getelementptr (i8, i8* @g, i64 1), void ()* @f1,<br>
+ i8* getelementptr (i8, i8* @g, i64 2), void ()* @f2,<br>
+ i8* getelementptr (i8, i8* @g, i64 3), void ()* @f3,<br>
+ i8* getelementptr (i8, i8* @g, i64 4), void ()* @f4,<br>
+ i8* getelementptr (i8, i8* @g, i64 5), void ()* @f5,<br>
+ i8* getelementptr (i8, i8* @g, i64 6), void ()* @f6,<br>
+ ...<br>
+ )<br>
+ ret void<br>
+}<br>
+<br>
+define void @jt10(i8* nest, ...) {<br>
+ ; CHECK: jt10:<br>
+ ; CHECK: leaq g+5(%rip), %r11<br>
+ ; CHECK-NEXT: cmpq %r11, %r10<br>
+ ; CHECK-NEXT: jae .LBB3_1<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: leaq g+1(%rip), %r11<br>
+ ; CHECK-NEXT: cmpq %r11, %r10<br>
+ ; CHECK-NEXT: jae .LBB3_7<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f0<br>
+ ; CHECK-NEXT: .LBB3_1:<br>
+ ; CHECK-NEXT: jne .LBB3_2<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f5<br>
+ ; CHECK-NEXT: .LBB3_7:<br>
+ ; CHECK-NEXT: jne .LBB3_8<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f1<br>
+ ; CHECK-NEXT: .LBB3_2:<br>
+ ; CHECK-NEXT: leaq g+7(%rip), %r11<br>
+ ; CHECK-NEXT: cmpq %r11, %r10<br>
+ ; CHECK-NEXT: jae .LBB3_3<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f6<br>
+ ; CHECK-NEXT: .LBB3_8:<br>
+ ; CHECK-NEXT: leaq g+3(%rip), %r11<br>
+ ; CHECK-NEXT: cmpq %r11, %r10<br>
+ ; CHECK-NEXT: jae .LBB3_9<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f2<br>
+ ; CHECK-NEXT: .LBB3_3:<br>
+ ; CHECK-NEXT: jne .LBB3_4<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f7<br>
+ ; CHECK-NEXT: .LBB3_9:<br>
+ ; CHECK-NEXT: jne .LBB3_10<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f3<br>
+ ; CHECK-NEXT: .LBB3_4:<br>
+ ; CHECK-NEXT: leaq g+9(%rip), %r11<br>
+ ; CHECK-NEXT: cmpq %r11, %r10<br>
+ ; CHECK-NEXT: jae .LBB3_5<br>
+ ; CHECK-NEXT: #<br>
+ ; CHECK-NEXT: jmp f8<br>
+ ; CHECK-NEXT: .LBB3_10:<br>
+ ; CHECK-NEXT: jmp f4<br>
+ ; CHECK-NEXT: .LBB3_5:<br>
+ ; CHECK-NEXT: jmp f9<br>
+ musttail call void (...) @llvm.icall.branch.funnel(<br>
+ i8* %0,<br>
+ i8* getelementptr (i8, i8* @g, i64 0), void ()* @f0,<br>
+ i8* getelementptr (i8, i8* @g, i64 1), void ()* @f1,<br>
+ i8* getelementptr (i8, i8* @g, i64 2), void ()* @f2,<br>
+ i8* getelementptr (i8, i8* @g, i64 3), void ()* @f3,<br>
+ i8* getelementptr (i8, i8* @g, i64 4), void ()* @f4,<br>
+ i8* getelementptr (i8, i8* @g, i64 5), void ()* @f5,<br>
+ i8* getelementptr (i8, i8* @g, i64 6), void ()* @f6,<br>
+ i8* getelementptr (i8, i8* @g, i64 7), void ()* @f7,<br>
+ i8* getelementptr (i8, i8* @g, i64 8), void ()* @f8,<br>
+ i8* getelementptr (i8, i8* @g, i64 9), void ()* @f9,<br>
+ ...<br>
+ )<br>
+ ret void<br>
+}<br>
<br>
Added: llvm/trunk/test/Transforms/Low<wbr>erTypeTests/icall-branch-funne<wbr>l.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LowerTypeTests/icall-branch-funnel.ll?rev=327163&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/Transfor<wbr>ms/LowerTypeTests/icall-<wbr>branch-funnel.ll?rev=327163&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/Low<wbr>erTypeTests/icall-branch-funne<wbr>l.ll (added)<br>
+++ llvm/trunk/test/Transforms/Low<wbr>erTypeTests/icall-branch-funne<wbr>l.ll Fri Mar 9 11:11:44 2018<br>
@@ -0,0 +1,46 @@<br>
+; RUN: opt -S -lowertypetests < %s | FileCheck %s<br>
+<br>
+target datalayout = "e-p:64:64"<br>
+target triple = "x86_64-unknown-linux"<br>
+<br>
+; CHECK: @0 = private constant { i32, [0 x i8], i32 } { i32 1, [0 x i8] zeroinitializer, i32 2 }<br>
+; CHECK: @f1 = alias void (), void ()* @.cfi.jumptable<br>
+; CHECK: @f2 = alias void (), bitcast ([8 x i8]* getelementptr inbounds ([2 x [8 x i8]], [2 x [8 x i8]]* bitcast (void ()* @.cfi.jumptable to [2 x [8 x i8]]*), i64 0, i64 1) to void ()*)<br>
+; CHECK: @g1 = alias i32, getelementptr inbounds ({ i32, [0 x i8], i32 }, { i32, [0 x i8], i32 }* @0, i32 0, i32 0)<br>
+; CHECK: @g2 = alias i32, getelementptr inbounds ({ i32, [0 x i8], i32 }, { i32, [0 x i8], i32 }* @0, i32 0, i32 2)<br>
+<br>
+@g1 = constant i32 1<br>
+@g2 = constant i32 2<br>
+<br>
+define void @f1() {<br>
+ ret void<br>
+}<br>
+<br>
+define void @f2() {<br>
+ ret void<br>
+}<br>
+<br>
+declare void @g1f()<br>
+declare void @g2f()<br>
+<br>
+define void @jt2(i8* nest, ...) {<br>
+ musttail call void (...) @llvm.icall.branch.funnel(<br>
+ i8* %0,<br>
+ i32* @g1, void ()* @g1f,<br>
+ i32* @g2, void ()* @g2f,<br>
+ ...<br>
+ )<br>
+ ret void<br>
+}<br>
+<br>
+define void @jt3(i8* nest, ...) {<br>
+ musttail call void (...) @llvm.icall.branch.funnel(<br>
+ i8* %0,<br>
+ void ()* @f1, void ()* @f1,<br>
+ void ()* @f2, void ()* @f2,<br>
+ ...<br>
+ )<br>
+ ret void<br>
+}<br>
+<br>
+declare void @llvm.icall.branch.funnel(...)<br>
<br>
Added: llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/Inputs/import-<wbr>branch-funnel.yaml<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/WholeProgramDevirt/Inputs/import-branch-funnel.yaml?rev=327163&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/Transfor<wbr>ms/WholeProgramDevirt/Inputs/<wbr>import-branch-funnel.yaml?rev=<wbr>327163&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/Inputs/import-<wbr>branch-funnel.yaml (added)<br>
+++ llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/Inputs/import-<wbr>branch-funnel.yaml Fri Mar 9 11:11:44 2018<br>
@@ -0,0 +1,11 @@<br>
+---<br>
+TypeIdMap:<br>
+ typeid1:<br>
+ WPDRes:<br>
+ 0:<br>
+ Kind: BranchFunnel<br>
+ typeid2:<br>
+ WPDRes:<br>
+ 8:<br>
+ Kind: BranchFunnel<br>
+...<br>
<br>
Added: llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/Inputs/import-<wbr>vcp-branch-funnel.yaml<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/WholeProgramDevirt/Inputs/import-vcp-branch-funnel.yaml?rev=327163&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/Transfor<wbr>ms/WholeProgramDevirt/Inputs/<wbr>import-vcp-branch-funnel.yaml?<wbr>rev=327163&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/Inputs/import-<wbr>vcp-branch-funnel.yaml (added)<br>
+++ llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/Inputs/import-<wbr>vcp-branch-funnel.yaml Fri Mar 9 11:11:44 2018<br>
@@ -0,0 +1,23 @@<br>
+---<br>
+TypeIdMap:<br>
+ typeid1:<br>
+ WPDRes:<br>
+ 0:<br>
+ Kind: BranchFunnel<br>
+ ResByArg:<br>
+ 1:<br>
+ Kind: VirtualConstProp<br>
+ Info: 0<br>
+ Byte: 42<br>
+ Bit: 0<br>
+ typeid2:<br>
+ WPDRes:<br>
+ 8:<br>
+ Kind: BranchFunnel<br>
+ ResByArg:<br>
+ 3:<br>
+ Kind: VirtualConstProp<br>
+ Info: 0<br>
+ Byte: 43<br>
+ Bit: 128<br>
+...<br>
<br>
Added: llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/branch-funnel.<wbr>ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/WholeProgramDevirt/branch-funnel.ll?rev=327163&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/Transfor<wbr>ms/WholeProgramDevirt/branch-<wbr>funnel.ll?rev=327163&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/branch-funnel.<wbr>ll (added)<br>
+++ llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/branch-funnel.<wbr>ll Fri Mar 9 11:11:44 2018<br>
@@ -0,0 +1,155 @@<br>
+; RUN: opt -S -wholeprogramdevirt %s | FileCheck --check-prefixes=CHECK,RETP %s<br>
+; RUN: sed -e 's,+retpoline,-retpoline,g' %s | opt -S -wholeprogramdevirt | FileCheck --check-prefixes=CHECK,NORETP %s<br>
+; RUN: opt -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=export -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/export.yaml -wholeprogramdevirt-write-summ<wbr>ary=%t -S -o - %s | FileCheck --check-prefixes=CHECK,RETP %s<br>
+; RUN: FileCheck --check-prefix=SUMMARY %s < %t<br>
+<br>
+; SUMMARY: TypeIdMap: <br>
+; SUMMARY-NEXT: typeid1: <br>
+; SUMMARY-NEXT: TTRes: <br>
+; SUMMARY-NEXT: Kind: Unsat<br>
+; SUMMARY-NEXT: SizeM1BitWidth: 0<br>
+; SUMMARY-NEXT: AlignLog2: 0<br>
+; SUMMARY-NEXT: SizeM1: 0<br>
+; SUMMARY-NEXT: BitMask: 0<br>
+; SUMMARY-NEXT: InlineBits: 0<br>
+; SUMMARY-NEXT: WPDRes: <br>
+; SUMMARY-NEXT: 0: <br>
+; SUMMARY-NEXT: Kind: BranchFunnel<br>
+; SUMMARY-NEXT: SingleImplName: ''<br>
+; SUMMARY-NEXT: ResByArg: <br>
+; SUMMARY-NEXT: typeid2: <br>
+; SUMMARY-NEXT: TTRes: <br>
+; SUMMARY-NEXT: Kind: Unsat<br>
+; SUMMARY-NEXT: SizeM1BitWidth: 0<br>
+; SUMMARY-NEXT: AlignLog2: 0<br>
+; SUMMARY-NEXT: SizeM1: 0<br>
+; SUMMARY-NEXT: BitMask: 0<br>
+; SUMMARY-NEXT: InlineBits: 0<br>
+; SUMMARY-NEXT: WPDRes: <br>
+; SUMMARY-NEXT: 0: <br>
+; SUMMARY-NEXT: Kind: Indir<br>
+; SUMMARY-NEXT: SingleImplName: ''<br>
+; SUMMARY-NEXT: ResByArg: <br>
+; SUMMARY-NEXT: typeid3: <br>
+; SUMMARY-NEXT: TTRes: <br>
+; SUMMARY-NEXT: Kind: Unsat<br>
+; SUMMARY-NEXT: SizeM1BitWidth: 0<br>
+; SUMMARY-NEXT: AlignLog2: 0<br>
+; SUMMARY-NEXT: SizeM1: 0<br>
+; SUMMARY-NEXT: BitMask: 0<br>
+; SUMMARY-NEXT: InlineBits: 0<br>
+; SUMMARY-NEXT: WPDRes: <br>
+; SUMMARY-NEXT: 0: <br>
+; SUMMARY-NEXT: Kind: BranchFunnel<br>
+; SUMMARY-NEXT: SingleImplName: ''<br>
+; SUMMARY-NEXT: ResByArg: <br>
+<br>
+target datalayout = "e-p:64:64"<br>
+target triple = "x86_64-unknown-linux-gnu"<br>
+<br>
+@vt1_1 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf1_1 to i8*)], !type !0<br>
+@vt1_2 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf1_2 to i8*)], !type !0<br>
+<br>
+declare i32 @vf1_1(i8* %this, i32 %arg)<br>
+declare i32 @vf1_2(i8* %this, i32 %arg)<br>
+<br>
+@vt2_1 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2_1 to i8*)], !type !1<br>
+@vt2_2 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2_2 to i8*)], !type !1<br>
+@vt2_3 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2_3 to i8*)], !type !1<br>
+@vt2_4 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2_4 to i8*)], !type !1<br>
+@vt2_5 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2_5 to i8*)], !type !1<br>
+@vt2_6 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2_6 to i8*)], !type !1<br>
+@vt2_7 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2_7 to i8*)], !type !1<br>
+@vt2_8 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2_8 to i8*)], !type !1<br>
+@vt2_9 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2_9 to i8*)], !type !1<br>
+@vt2_10 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2_10 to i8*)], !type !1<br>
+@vt2_11 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf2_11 to i8*)], !type !1<br>
+<br>
+declare i32 @vf2_1(i8* %this, i32 %arg)<br>
+declare i32 @vf2_2(i8* %this, i32 %arg)<br>
+declare i32 @vf2_3(i8* %this, i32 %arg)<br>
+declare i32 @vf2_4(i8* %this, i32 %arg)<br>
+declare i32 @vf2_5(i8* %this, i32 %arg)<br>
+declare i32 @vf2_6(i8* %this, i32 %arg)<br>
+declare i32 @vf2_7(i8* %this, i32 %arg)<br>
+declare i32 @vf2_8(i8* %this, i32 %arg)<br>
+declare i32 @vf2_9(i8* %this, i32 %arg)<br>
+declare i32 @vf2_10(i8* %this, i32 %arg)<br>
+declare i32 @vf2_11(i8* %this, i32 %arg)<br>
+<br>
+@vt3_1 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf3_1 to i8*)], !type !2<br>
+@vt3_2 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf3_2 to i8*)], !type !2<br>
+<br>
+declare i32 @vf3_1(i8* %this, i32 %arg)<br>
+declare i32 @vf3_2(i8* %this, i32 %arg)<br>
+<br>
+@vt4_1 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf4_1 to i8*)], !type !3<br>
+@vt4_2 = constant [1 x i8*] [i8* bitcast (i32 (i8*, i32)* @vf4_2 to i8*)], !type !3<br>
+<br>
+declare i32 @vf4_1(i8* %this, i32 %arg)<br>
+declare i32 @vf4_2(i8* %this, i32 %arg)<br>
+<br>
+; CHECK: define i32 @fn1<br>
+define i32 @fn1(i8* %obj) #0 {<br>
+ %vtableptr = bitcast i8* %obj to [1 x i8*]**<br>
+ %vtable = load [1 x i8*]*, [1 x i8*]** %vtableptr<br>
+ %vtablei8 = bitcast [1 x i8*]* %vtable to i8*<br>
+ %p = call i1 @llvm.type.test(i8* %vtablei8, metadata !"typeid1")<br>
+ call void @llvm.assume(i1 %p)<br>
+ %fptrptr = getelementptr [1 x i8*], [1 x i8*]* %vtable, i32 0, i32 0<br>
+ %fptr = load i8*, i8** %fptrptr<br>
+ %fptr_casted = bitcast i8* %fptr to i32 (i8*, i32)*<br>
+ ; RETP: {{.*}} = bitcast {{.*}} to i8*<br>
+ ; RETP: [[VT1:%.*]] = bitcast {{.*}} to i8*<br>
+ ; RETP: call i32 bitcast (void (i8*, ...)* @__typeid_typeid1_0_branch_fun<wbr>nel to i32 (i8*, i8*, i32)*)(i8* nest [[VT1]], i8* %obj, i32 1)<br>
+ %result = call i32 %fptr_casted(i8* %obj, i32 1)<br>
+ ; NORETP: call i32 %<br>
+ ret i32 %result<br>
+}<br>
+<br>
+; CHECK: define i32 @fn2<br>
+define i32 @fn2(i8* %obj) #0 {<br>
+ %vtableptr = bitcast i8* %obj to [1 x i8*]**<br>
+ %vtable = load [1 x i8*]*, [1 x i8*]** %vtableptr<br>
+ %vtablei8 = bitcast [1 x i8*]* %vtable to i8*<br>
+ %p = call i1 @llvm.type.test(i8* %vtablei8, metadata !"typeid2")<br>
+ call void @llvm.assume(i1 %p)<br>
+ %fptrptr = getelementptr [1 x i8*], [1 x i8*]* %vtable, i32 0, i32 0<br>
+ %fptr = load i8*, i8** %fptrptr<br>
+ %fptr_casted = bitcast i8* %fptr to i32 (i8*, i32)*<br>
+ ; CHECK: call i32 %<br>
+ %result = call i32 %fptr_casted(i8* %obj, i32 1)<br>
+ ret i32 %result<br>
+}<br>
+<br>
+; CHECK: define i32 @fn3<br>
+define i32 @fn3(i8* %obj) #0 {<br>
+ %vtableptr = bitcast i8* %obj to [1 x i8*]**<br>
+ %vtable = load [1 x i8*]*, [1 x i8*]** %vtableptr<br>
+ %vtablei8 = bitcast [1 x i8*]* %vtable to i8*<br>
+ %p = call i1 @llvm.type.test(i8* %vtablei8, metadata !4)<br>
+ call void @llvm.assume(i1 %p)<br>
+ %fptrptr = getelementptr [1 x i8*], [1 x i8*]* %vtable, i32 0, i32 0<br>
+ %fptr = load i8*, i8** %fptrptr<br>
+ %fptr_casted = bitcast i8* %fptr to i32 (i8*, i32)*<br>
+ ; RETP: call i32 bitcast (void (i8*, ...)* @branch_funnel to<br>
+ ; NORETP: call i32 %<br>
+ %result = call i32 %fptr_casted(i8* %obj, i32 1)<br>
+ ret i32 %result<br>
+}<br>
+<br>
+; CHECK: define internal void @branch_funnel(i8* nest, ...)<br>
+<br>
+; CHECK: define hidden void @__typeid_typeid1_0_branch_fun<wbr>nel(i8* nest, ...)<br>
+; CHECK-NEXT: call void (...) @llvm.icall.branch.funnel(i8* %0, i8* bitcast ([1 x i8*]* @vt1_1 to i8*), i32 (i8*, i32)* @vf1_1, i8* bitcast ([1 x i8*]* @vt1_2 to i8*), i32 (i8*, i32)* @vf1_2, ...)<br>
+<br>
+declare i1 @llvm.type.test(i8*, metadata)<br>
+declare void @llvm.assume(i1)<br>
+<br>
+!0 = !{i32 0, !"typeid1"}<br>
+!1 = !{i32 0, !"typeid2"}<br>
+!2 = !{i32 0, !"typeid3"}<br>
+!3 = !{i32 0, !4}<br>
+!4 = distinct !{}<br>
+<br>
+attributes #0 = { "target-features"="+retpoline" }<br>
<br>
Modified: llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/import.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/WholeProgramDevirt/import.ll?rev=327163&r1=327162&r2=327163&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/Transfor<wbr>ms/WholeProgramDevirt/import.<wbr>ll?rev=327163&r1=327162&r2=<wbr>327163&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/import.ll (original)<br>
+++ llvm/trunk/test/Transforms/Who<wbr>leProgramDevirt/import.ll Fri Mar 9 11:11:44 2018<br>
@@ -1,10 +1,12 @@<br>
; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-single-<wbr>impl.yaml < %s | FileCheck --check-prefixes=CHECK,SINGLE-<wbr>IMPL %s<br>
-; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-uniform-<wbr>ret-val.yaml < %s | FileCheck --check-prefixes=CHECK,UNIFORM<wbr>-RET-VAL %s<br>
-; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-unique-<wbr>ret-val0.yaml < %s | FileCheck --check-prefixes=CHECK,UNIQUE-<wbr>RET-VAL0 %s<br>
-; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-unique-<wbr>ret-val1.yaml < %s | FileCheck --check-prefixes=CHECK,UNIQUE-<wbr>RET-VAL1 %s<br>
-; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-vcp.yaml < %s | FileCheck --check-prefixes=CHECK,VCP,VCP<wbr>-X86,VCP64 %s<br>
+; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-uniform-<wbr>ret-val.yaml < %s | FileCheck --check-prefixes=CHECK,INDIR,U<wbr>NIFORM-RET-VAL %s<br>
+; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-unique-<wbr>ret-val0.yaml < %s | FileCheck --check-prefixes=CHECK,INDIR,U<wbr>NIQUE-RET-VAL0 %s<br>
+; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-unique-<wbr>ret-val1.yaml < %s | FileCheck --check-prefixes=CHECK,INDIR,U<wbr>NIQUE-RET-VAL1 %s<br>
+; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-vcp.yaml < %s | FileCheck --check-prefixes=CHECK,VCP,VCP<wbr>-X86,VCP64,INDIR %s<br>
; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-vcp.yaml -mtriple=i686-unknown-linux -data-layout=e-p:32:32 < %s | FileCheck --check-prefixes=CHECK,VCP,VCP<wbr>-X86,VCP32 %s<br>
; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-vcp.yaml -mtriple=armv7-unknown-linux -data-layout=e-p:32:32 < %s | FileCheck --check-prefixes=CHECK,VCP,VCP<wbr>-ARM %s<br>
+; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-vcp-branch<wbr>-funnel.yaml < %s | FileCheck --check-prefixes=CHECK,VCP,VCP<wbr>-X86,VCP64,BRANCH-FUNNEL %s<br>
+; RUN: opt -S -wholeprogramdevirt -wholeprogramdevirt-summary-ac<wbr>tion=import -wholeprogramdevirt-read-summa<wbr>ry=%S/Inputs/import-branch-<wbr>funnel.yaml < %s | FileCheck --check-prefixes=CHECK,BRANCH-<wbr>FUNNEL,BRANCH-FUNNEL-NOVCP %s<br>
<br>
target datalayout = "e-p:64:64"<br>
target triple = "x86_64-unknown-linux-gnu"<br>
@@ -18,7 +20,7 @@ target triple = "x86_64-unknown-linux-gn<br>
; constant propagation.<br>
<br>
; CHECK: define i32 @call1<br>
-define i32 @call1(i8* %obj) {<br>
+define i32 @call1(i8* %obj) #0 {<br>
%vtableptr = bitcast i8* %obj to [3 x i8*]**<br>
%vtable = load [3 x i8*]*, [3 x i8*]** %vtableptr<br>
%vtablei8 = bitcast [3 x i8*]* %vtable to i8*<br>
@@ -27,16 +29,18 @@ define i32 @call1(i8* %obj) {<br>
%fptrptr = getelementptr [3 x i8*], [3 x i8*]* %vtable, i32 0, i32 0<br>
%fptr = load i8*, i8** %fptrptr<br>
%fptr_casted = bitcast i8* %fptr to i32 (i8*, i32)*<br>
+ ; CHECK: {{.*}} = bitcast {{.*}} to i8*<br>
+ ; VCP: [[VT1:%.*]] = bitcast {{.*}} to i8*<br>
; SINGLE-IMPL: call i32 bitcast (void ()* @singleimpl1 to i32 (i8*, i32)*)<br>
%result = call i32 %fptr_casted(i8* %obj, i32 1)<br>
; UNIFORM-RET-VAL: ret i32 42<br>
- ; VCP: {{.*}} = bitcast {{.*}} to i8*<br>
- ; VCP: [[VT1:%.*]] = bitcast {{.*}} to i8*<br>
; VCP-X86: [[GEP1:%.*]] = getelementptr i8, i8* [[VT1]], i32 ptrtoint (i8* @__typeid_typeid1_0_1_byte to i32)<br>
; VCP-ARM: [[GEP1:%.*]] = getelementptr i8, i8* [[VT1]], i32 42<br>
; VCP: [[BC1:%.*]] = bitcast i8* [[GEP1]] to i32*<br>
; VCP: [[LOAD1:%.*]] = load i32, i32* [[BC1]]<br>
; VCP: ret i32 [[LOAD1]]<br>
+ ; BRANCH-FUNNEL-NOVCP: [[VT1:%.*]] = bitcast {{.*}} to i8*<br>
+ ; BRANCH-FUNNEL-NOVCP: call i32 bitcast (void ()* @__typeid_typeid1_0_branch_fun<wbr>nel to i32 (i8*, i8*, i32)*)(i8* nest [[VT1]], i8* %obj, i32 1)<br>
ret i32 %result<br>
}<br>
<br>
@@ -44,7 +48,8 @@ define i32 @call1(i8* %obj) {<br>
; constant propagation.<br>
<br>
; CHECK: define i1 @call2<br>
-define i1 @call2(i8* %obj) {<br>
+define i1 @call2(i8* %obj) #0 {<br>
+ ; BRANCH-FUNNEL: [[VT1:%.*]] = bitcast {{.*}} to i8*<br>
%vtableptr = bitcast i8* %obj to [1 x i8*]**<br>
%vtable = load [1 x i8*]*, [1 x i8*]** %vtableptr<br>
%vtablei8 = bitcast [1 x i8*]* %vtable to i8*<br>
@@ -57,9 +62,8 @@ define i1 @call2(i8* %obj) {<br>
cont:<br>
%fptr_casted = bitcast i8* %fptr to i1 (i8*, i32)*<br>
; SINGLE-IMPL: call i1 bitcast (void ()* @singleimpl2 to i1 (i8*, i32)*)<br>
- ; UNIFORM-RET-VAL: call i1 %<br>
- ; UNIQUE-RET-VAL0: call i1 %<br>
- ; UNIQUE-RET-VAL1: call i1 %<br>
+ ; INDIR: call i1 %<br>
+ ; BRANCH-FUNNEL: call i1 bitcast (void ()* @__typeid_typeid2_8_branch_fun<wbr>nel to i1 (i8*, i8*, i32)*)(i8* nest [[VT1]], i8* %obj, i32 undef)<br>
%result = call i1 %fptr_casted(i8* %obj, i32 undef)<br>
ret i1 %result<br>
<br>
@@ -69,7 +73,7 @@ trap:<br>
}<br>
<br>
; CHECK: define i1 @call3<br>
-define i1 @call3(i8* %obj) {<br>
+define i1 @call3(i8* %obj) #0 {<br>
%vtableptr = bitcast i8* %obj to [1 x i8*]**<br>
%vtable = load [1 x i8*]*, [1 x i8*]** %vtableptr<br>
%vtablei8 = bitcast [1 x i8*]* %vtable to i8*<br>
@@ -91,6 +95,8 @@ cont:<br>
; VCP-ARM: [[AND2:%.*]] = and i8 [[LOAD2]], -128<br>
; VCP: [[ICMP2:%.*]] = icmp ne i8 [[AND2]], 0<br>
; VCP: ret i1 [[ICMP2]]<br>
+ ; BRANCH-FUNNEL-NOVCP: [[VT2:%.*]] = bitcast {{.*}} to i8*<br>
+ ; BRANCH-FUNNEL-NOVCP: call i1 bitcast (void ()* @__typeid_typeid2_8_branch_fun<wbr>nel to i1 (i8*, i8*, i32)*)(i8* nest [[VT2]], i8* %obj, i32 3)<br>
ret i1 %result<br>
<br>
trap:<br>
@@ -111,3 +117,5 @@ declare void @llvm.assume(i1)<br>
declare void @llvm.trap()<br>
declare {i8*, i1} @llvm.type.checked.load(i8*, i32, metadata)<br>
declare i1 @llvm.type.test(i8*, metadata)<br>
+<br>
+attributes #0 = { "target-features"="+retpoline" }<br>
<div class="m_907298409020627020HOEnZb"><div class="m_907298409020627020h5"><br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div></div></div></div>
</blockquote></div><br></div>