[llvm-dev] GSoC 2020 Project "Improve MegreFunctions to incorporate MergeSimilarFunctions patches and ThinLTO Support"

[Aditya K via llvm-dev]

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.

Aditya
________________________________
From: Vishal Chebrolu <chebroluvishal at gmail.com>
Sent: Thursday, March 19, 2020 11:50:31 AM
To: hiraditya at msn.com <hiraditya at msn.com>; llvm-dev at lists.llvm.org <llvm-dev at lists.llvm.org>
Subject: Re: [llvm-dev] GSoC 2020 Project "Improve MegreFunctions to incorporate MergeSimilarFunctions patches and ThinLTO Support"

Hey Aditya,

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: https://secure.phabricator.com/T12501.
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):

Cherry Pick Failed!
Exception
Command failed with error #1!
COMMAND
git cherry-pick -- 'arcpatch-D52896'

STDOUT
(empty)

STDERR
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 8313 and retry the command.
error: could not apply ca94adea8e6... MergeSimilarFunctions 1/n: a code size pass to merge functions with small differences
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

(Run with `--trace` for a full exception trace.)


I tried running with the --trace option. That doesn't help much either.
I see that the cherry-pick failed cause there were unstaged files after committing the first patch.

Regards,
Vishal

On Thu, Mar 19, 2020 at 7:38 AM Ruijie Fang via llvm-dev <llvm-dev at lists.llvm.org<mailto:llvm-dev at lists.llvm.org>> wrote:
Hi Aditya,

I'm starting to work on merging the patches --- One question, though,
from someone who's still novice to the LLVM code review system:
Should I merge your patches one by one into trunk, and then do a
single "arc diff", or should I do multiple "arc patch" to first merge
the five patches together (building on top of successive branches),
and then all together into trunk, and then do an `arc diff`?

Thanks,
Ruijie

On Wed, Mar 18, 2020 at 7:01 PM Aditya K <hiraditya at msn.com<mailto:hiraditya at msn.com>> wrote:
>
> Hi Vishal, Ruijie,
>
> Thanks for your interest in the project.
> To get started, the first task would be to merge the 5 patches on top of trunk llvm.
> The list of patches are listed in the project description: http://llvm.org/OpenProjects.html#llvm_mergesim
> Please create an account in llvm phabricator (reviews.llvm.org<http://reviews.llvm.org>) if you haven't already, and put your patches there.
>
> Let me know if you have further questions; both llvm-dev and discord are good places to reach out. My userid is: hiraditya
>
> Welcome to GSoC!
>
> Best,
> -Aditya



--
RJF
ruijief at princeton.edu<mailto:ruijief at princeton.edu>


On Wed, Mar 18, 2020 at 7:01 PM Aditya K <hiraditya at msn.com<mailto:hiraditya at msn.com>> wrote:
>
> Hi Vishal, Ruijie,
>
> Thanks for your interest in the project.
> To get started, the first task would be to merge the 5 patches on top of trunk llvm.
> The list of patches are listed in the project description: http://llvm.org/OpenProjects.html#llvm_mergesim
> Please create an account in llvm phabricator (reviews.llvm.org<http://reviews.llvm.org>) if you haven't already, and put your patches there.
>
> Let me know if you have further questions; both llvm-dev and discord are good places to reach out. My userid is: hiraditya
>
> Welcome to GSoC!
>
> Best,
> -Aditya



--
RJF
ruijief at princeton.edu<mailto:ruijief at princeton.edu>
_______________________________________________
LLVM Developers mailing list
llvm-dev at lists.llvm.org<mailto:llvm-dev at lists.llvm.org>
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20200320/d5bf9bcb/attachment.html>