<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><meta http-equiv=Content-Type content="text/html; charset=utf-8"><meta name=Generator content="Microsoft Word 15 (filtered medium)"><style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman",serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri",sans-serif;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]--></head><body lang=EN-US link=blue vlink=purple><div class=WordSection1><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D'>Hi Artem, <o:p></o:p></span></p><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D'><o:p> </o:p></span></p><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D'>I’ve uploaded a patch to remove the alignment. <o:p></o:p></span></p><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D'><o:p> </o:p></span></p><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D'>Thanks,<o:p></o:p></span></p><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D'>-Betul<o:p></o:p></span></p><p class=MsoNormal><span style='font-size:11.0pt;font-family:"Calibri",sans-serif;color:#1F497D'><o:p> </o:p></span></p><p class=MsoNormal><b><span style='font-size:11.0pt;font-family:"Calibri",sans-serif'>From:</span></b><span style='font-size:11.0pt;font-family:"Calibri",sans-serif'> Artem Belevich [mailto:tra@google.com] <br><b>Sent:</b> Tuesday, March 29, 2016 3:15 PM<br><b>To:</b> Betul Buyukkurt <betulb@codeaurora.org><br><b>Cc:</b> cfe-commits <cfe-commits@lists.llvm.org><br><b>Subject:</b> Re: r264783 - [PGO] Move the instrumentation point closer to the value site.<o:p></o:p></span></p><p class=MsoNormal><o:p> </o:p></p><div><p class=MsoNormal>Hi,<o:p></o:p></p><div><p class=MsoNormal><o:p> </o:p></p></div><div><p class=MsoNormal>FYI, <span style='font-size:9.5pt;background:white'>cxx</span><span style='font-size:9.5pt'>-<span style='background:white'>indirect</span>-<span style='background:white'>call</span>.<span style='background:white'>cpp</span> </span>test fails on platforms with different alignment. It may help to either use specific target or change your patterns to accommodate other targets.<o:p></o:p></p></div><div><p class=MsoNormal><o:p> </o:p></p></div><div><p class=MsoNormal>--Artem<o:p></o:p></p></div><div><p class=MsoNormal><o:p> </o:p></p></div><div><p class=MsoNormal>******************** TEST 'Clang :: Profile/cxx-indirect-call.cpp' FAILED ********************<o:p></o:p></p></div><div><div><p class=MsoNormal>Script:<o:p></o:p></p></div><div><p class=MsoNormal>--<o:p></o:p></p></div><div><p class=MsoNormal>/usr/local/google/home/tra/work/llvm/build/gpu/release/./bin/clang --driver-mode=g++ /work/tra/llvm/tools/clang/test/Profile/cxx-indirect-call.cpp -o - -emit-llvm -S -fprofile-instr-generate -mllvm -enable-value-profiling -fexceptions -target x86_64-unknown-linux-gnu | /usr/local/google/home/tra/work/llvm/build/gpu/release/./bin/FileCheck /work/tra/llvm/tools/clang/test/Profile/cxx-indirect-call.cpp<o:p></o:p></p></div><div><p class=MsoNormal>--<o:p></o:p></p></div><div><p class=MsoNormal>Exit Code: 1<o:p></o:p></p></div><div><p class=MsoNormal><o:p> </o:p></p></div><div><p class=MsoNormal>Command Output (stderr):<o:p></o:p></p></div><div><p class=MsoNormal>--<o:p></o:p></p></div><div><p class=MsoNormal>/work/tra/llvm/tools/clang/test/Profile/cxx-indirect-call.cpp:8:11: error: expected string not found in input<o:p></o:p></p></div><div><p class=MsoNormal>// CHECK: [[REG1:%[0-9]+]] = load void ()*, void ()** @foo, align 4<o:p></o:p></p></div><div><p class=MsoNormal> ^<o:p></o:p></p></div><div><p class=MsoNormal><stdin>:1:1: note: scanning from here<o:p></o:p></p></div><div><p class=MsoNormal>; ModuleID = '/work/tra/llvm/tools/clang/test/Profile/cxx-indirect-call.cpp'<o:p></o:p></p></div><div><p class=MsoNormal>^<o:p></o:p></p></div><div><p class=MsoNormal><stdin>:27:2: note: possible intended match here<o:p></o:p></p></div><div><p class=MsoNormal> %11 = load void ()*, void ()** @foo, align 8<o:p></o:p></p></div><div><p class=MsoNormal> ^<o:p></o:p></p></div><div><p class=MsoNormal><o:p> </o:p></p></div><div><p class=MsoNormal>--<o:p></o:p></p></div></div><div><p class=MsoNormal><o:p> </o:p></p></div><div><p class=MsoNormal><o:p> </o:p></p><div><p class=MsoNormal><o:p> </o:p></p><div><p class=MsoNormal>On Tue, Mar 29, 2016 at 1:44 PM, Betul Buyukkurt via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<o:p></o:p></p><blockquote style='border:none;border-left:solid #CCCCCC 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in'><p class=MsoNormal>Author: betulb<br>Date: Tue Mar 29 15:44:09 2016<br>New Revision: 264783<br><br>URL: <a href="http://llvm.org/viewvc/llvm-project?rev=264783&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=264783&view=rev</a><br>Log:<br>[PGO] Move the instrumentation point closer to the value site.<br><br>For terminator instructions, the value profiling instrumentation<br>happens in a basic block other than where the value site resides.<br>This CR moves the instrumentation point prior to the value site.<br>Mostly NFC.<br><br><br>Added:<br> cfe/trunk/test/Profile/cxx-indirect-call.cpp<br>Modified:<br> cfe/trunk/lib/CodeGen/CodeGenPGO.cpp<br> cfe/trunk/test/Profile/c-indirect-call.c<br><br>Modified: cfe/trunk/lib/CodeGen/CodeGenPGO.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenPGO.cpp?rev=264783&r1=264782&r2=264783&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenPGO.cpp?rev=264783&r1=264782&r2=264783&view=diff</a><br>==============================================================================<br>--- cfe/trunk/lib/CodeGen/CodeGenPGO.cpp (original)<br>+++ cfe/trunk/lib/CodeGen/CodeGenPGO.cpp Tue Mar 29 15:44:09 2016<br>@@ -757,10 +757,10 @@ void CodeGenPGO::valueProfile(CGBuilderT<br><br> bool InstrumentValueSites = CGM.getCodeGenOpts().hasProfileClangInstr();<br> if (InstrumentValueSites && RegionCounterMap) {<br>- llvm::LLVMContext &Ctx = CGM.getLLVMContext();<br>- auto *I8PtrTy = llvm::Type::getInt8PtrTy(Ctx);<br>+ auto BuilderInsertPoint = Builder.saveIP();<br>+ Builder.SetInsertPoint(ValueSite);<br> llvm::Value *Args[5] = {<br>- llvm::ConstantExpr::getBitCast(FuncNameVar, I8PtrTy),<br>+ llvm::ConstantExpr::getBitCast(FuncNameVar, Builder.getInt8PtrTy()),<br> Builder.getInt64(FunctionHash),<br> Builder.CreatePtrToInt(ValuePtr, Builder.getInt64Ty()),<br> Builder.getInt32(ValueKind),<br>@@ -768,6 +768,7 @@ void CodeGenPGO::valueProfile(CGBuilderT<br> };<br> Builder.CreateCall(<br> CGM.getIntrinsic(llvm::Intrinsic::instrprof_value_profile), Args);<br>+ Builder.restoreIP(BuilderInsertPoint);<br> return;<br> }<br><br><br>Modified: cfe/trunk/test/Profile/c-indirect-call.c<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-indirect-call.c?rev=264783&r1=264782&r2=264783&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/c-indirect-call.c?rev=264783&r1=264782&r2=264783&view=diff</a><br>==============================================================================<br>--- cfe/trunk/test/Profile/c-indirect-call.c (original)<br>+++ cfe/trunk/test/Profile/c-indirect-call.c Tue Mar 29 15:44:09 2016<br>@@ -1,13 +1,14 @@<br>-// Check the data structures emitted by instrumentation.<br>+// Check the value profiling instrinsics emitted by instrumentation.<br>+<br> // RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name c-indirect-call.c %s -o - -emit-llvm -fprofile-instrument=clang -mllvm -enable-value-profiling | FileCheck %s<br><br> void (*foo)(void);<br><br> int main(void) {<br> // CHECK: [[REG1:%[0-9]+]] = load void ()*, void ()** @foo, align 8<br>-// CHECK-NEXT: call void [[REG1]]()<br> // CHECK-NEXT: [[REG2:%[0-9]+]] = ptrtoint void ()* [[REG1]] to i64<br> // CHECK-NEXT: call void @__llvm_profile_instrument_target(i64 [[REG2]], i8* bitcast ({{.*}}* @__profd_main to i8*), i32 0)<br>+// CHECK-NEXT: call void [[REG1]]()<br> foo();<br> return 0;<br> }<br><br>Added: cfe/trunk/test/Profile/cxx-indirect-call.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-indirect-call.cpp?rev=264783&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Profile/cxx-indirect-call.cpp?rev=264783&view=auto</a><br>==============================================================================<br>--- cfe/trunk/test/Profile/cxx-indirect-call.cpp (added)<br>+++ cfe/trunk/test/Profile/cxx-indirect-call.cpp Tue Mar 29 15:44:09 2016<br>@@ -0,0 +1,21 @@<br>+// Check the value profiling instrinsics emitted by instrumentation.<br>+<br>+// RUN: %clangxx %s -o - -emit-llvm -S -fprofile-instr-generate -mllvm -enable-value-profiling -fexceptions -target %itanium_abi_triple | FileCheck %s<br>+<br>+void (*foo) (void);<br>+<br>+int main(int argc, const char *argv[]) {<br>+// CHECK: [[REG1:%[0-9]+]] = load void ()*, void ()** @foo, align 4<br>+// CHECK-NEXT: [[REG2:%[0-9]+]] = ptrtoint void ()* [[REG1]] to i64<br>+// CHECK-NEXT: call void @__llvm_profile_instrument_target(i64 [[REG2]], i8* bitcast ({{.*}}* @__profd_main to i8*), i32 0)<br>+// CHECK-NEXT: invoke void [[REG1]]()<br>+ try {<br>+ foo();<br>+ } catch (int) {}<br>+ return 0;<br>+}<br>+<br>+// CHECK: declare void @__llvm_profile_instrument_target(i64, i8*, i32)<br>+<br>+<br>+<br><br><br>_______________________________________________<br>cfe-commits mailing list<br><a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br><a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><o:p></o:p></p></blockquote></div><p class=MsoNormal><br><br clear=all><o:p></o:p></p><div><p class=MsoNormal><o:p> </o:p></p></div><p class=MsoNormal>-- <o:p></o:p></p><div><div><p class=MsoNormal>--Artem Belevich<o:p></o:p></p></div></div></div></div></div></div></body></html>