<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body>
Please apply one patch at a time and then push one by one as well. When there is a merge conflict try to resolve by yourself or ping me if it is too complicated.<br>
<br>
Aditya
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> Vishal Chebrolu <chebroluvishal@gmail.com><br>
<b>Sent:</b> Thursday, March 19, 2020 11:50:31 AM<br>
<b>To:</b> hiraditya@msn.com <hiraditya@msn.com>; llvm-dev@lists.llvm.org <llvm-dev@lists.llvm.org><br>
<b>Subject:</b> Re: [llvm-dev] GSoC 2020 Project "Improve MegreFunctions to incorporate MergeSimilarFunctions patches and ThinLTO Support"</font>
<div> </div>
</div>
<div>
<div dir="ltr">Hey Aditya,
<div><br>
</div>
<div>I'm planning to apply the patches one after the other to the LLVM trunk and then do "arc diff" to merge all the 5 patches together. However, being a newbie to LLVM code-review system, I'm stuck at applying the 2nd patch. I applied the 1st patch to the
LLVM trunk using the "arc patch Dxxxx" command and it worked fine. When I try to run the same command with the ID of the 2nd patch, I run into the error as given here: <a href="https://secure.phabricator.com/T12501">https://secure.phabricator.com/T12501</a>.</div>
<div>I don't know whether that issue was fixed or there's some way around. I also tried deleting the branch created by patching the 1st patch and tried to install the 2nd patch (D52898) from the master branch. I expected the 2nd patch to also commit the 1st
patch as there's a dependency between them. Even that throws the following error after applying the 1st patch (D52896):</div>
<div><br>
</div>
<div>Cherry Pick Failed! </div>
<div>Exception </div>
<div>Command failed with error #1! </div>
<div>COMMAND </div>
<div>git cherry-pick -- 'arcpatch-D52896' </div>
<div><br>
</div>
<div>STDOUT </div>
<div>(empty) </div>
<div><br>
</div>
<div>STDERR </div>
<div>warning: inexact rename detection was skipped due to too many files. </div>
<div>warning: you may want to set your merge.renamelimit variable to at least 8313 and retry the command. </div>
<div>error: could not apply ca94adea8e6... MergeSimilarFunctions 1/n: a code size pass to merge functions with small differences </div>
<div>hint: after resolving the conflicts, mark the corrected paths </div>
<div>hint: with 'git add <paths>' or 'git rm <paths>' </div>
<div>hint: and commit the result with 'git commit' </div>
<div><br>
</div>
<div>(Run with `--trace` for a full exception trace.)<br>
</div>
<div><br>
</div>
<div><br>
</div>
<div>I tried running with the --trace option. That doesn't help much either.</div>
<div>I see that the cherry-pick failed cause there were unstaged files after committing the first patch. </div>
<div><br>
</div>
<div>Regards,</div>
<div>Vishal</div>
</div>
<br>
<div class="x_gmail_quote">
<div dir="ltr" class="x_gmail_attr">On Thu, Mar 19, 2020 at 7:38 AM Ruijie Fang via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>> wrote:<br>
</div>
<blockquote class="x_gmail_quote" style="margin:0px 0px 0px 0.8ex; border-left:1px solid rgb(204,204,204); padding-left:1ex">
Hi Aditya,<br>
<br>
I'm starting to work on merging the patches --- One question, though,<br>
from someone who's still novice to the LLVM code review system:<br>
Should I merge your patches one by one into trunk, and then do a<br>
single "arc diff", or should I do multiple "arc patch" to first merge<br>
the five patches together (building on top of successive branches),<br>
and then all together into trunk, and then do an `arc diff`?<br>
<br>
Thanks,<br>
Ruijie<br>
<br>
On Wed, Mar 18, 2020 at 7:01 PM Aditya K <<a href="mailto:hiraditya@msn.com" target="_blank">hiraditya@msn.com</a>> wrote:<br>
><br>
> Hi Vishal, Ruijie,<br>
><br>
> Thanks for your interest in the project.<br>
> To get started, the first task would be to merge the 5 patches on top of trunk llvm.<br>
> The list of patches are listed in the project description: <a href="http://llvm.org/OpenProjects.html#llvm_mergesim" rel="noreferrer" target="_blank">
http://llvm.org/OpenProjects.html#llvm_mergesim</a><br>
> Please create an account in llvm phabricator (<a href="http://reviews.llvm.org" rel="noreferrer" target="_blank">reviews.llvm.org</a>) if you haven't already, and put your patches there.<br>
><br>
> Let me know if you have further questions; both llvm-dev and discord are good places to reach out. My userid is: hiraditya<br>
><br>
> Welcome to GSoC!<br>
><br>
> Best,<br>
> -Aditya<br>
<br>
<br>
<br>
--<br>
RJF<br>
<a href="mailto:ruijief@princeton.edu" target="_blank">ruijief@princeton.edu</a><br>
<br>
<br>
On Wed, Mar 18, 2020 at 7:01 PM Aditya K <<a href="mailto:hiraditya@msn.com" target="_blank">hiraditya@msn.com</a>> wrote:<br>
><br>
> Hi Vishal, Ruijie,<br>
><br>
> Thanks for your interest in the project.<br>
> To get started, the first task would be to merge the 5 patches on top of trunk llvm.<br>
> The list of patches are listed in the project description: <a href="http://llvm.org/OpenProjects.html#llvm_mergesim" rel="noreferrer" target="_blank">
http://llvm.org/OpenProjects.html#llvm_mergesim</a><br>
> Please create an account in llvm phabricator (<a href="http://reviews.llvm.org" rel="noreferrer" target="_blank">reviews.llvm.org</a>) if you haven't already, and put your patches there.<br>
><br>
> Let me know if you have further questions; both llvm-dev and discord are good places to reach out. My userid is: hiraditya<br>
><br>
> Welcome to GSoC!<br>
><br>
> Best,<br>
> -Aditya<br>
<br>
<br>
<br>
--<br>
RJF<br>
<a href="mailto:ruijief@princeton.edu" target="_blank">ruijief@princeton.edu</a><br>
_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><br>
</blockquote>
</div>
</div>
</body>
</html>