[cfe-dev] moving the clang-omp merge along

Thu May 29 06:43:38 PDT 2014

As far as I can tell the commit history of the OPENMP support into clang
trunk is represented
by the following commits…

https://github.com/llvm-mirror/clang/commit/9e6a299419ec5b0a4b08ae13d2c4b1170293222b
https://github.com/llvm-mirror/clang/commit/bf9865fc78da180dfca153535e2dee932d023a20
https://github.com/llvm-mirror/clang/commit/2c692c3166dd5d2f667c06cd0b0d47fbea391aa6
https://github.com/llvm-mirror/clang/commit/3390ed3341a0848f37333d55bb34bcff4b9364c2
https://github.com/llvm-mirror/clang/commit/1a751e402717efb1b1321ab310700ce79a302da8
https://github.com/llvm-mirror/clang/commit/60efcfe13b442a0e0b5f9d11a590eb8955687271
https://github.com/llvm-mirror/clang/commit/1d8bd5a9a45f2ce1e362d66c3ca6512b8422a6a5
https://github.com/llvm-mirror/clang/commit/0fbbbd5db8ee5ada8ddd0c401f8057d7d0f4e75f
https://github.com/llvm-mirror/clang/commit/5e162947b3757e51724e7522385a9fdf4511b1b7
https://github.com/llvm-mirror/clang/commit/fad839f4742722fb8346b9677c99f895988ca766
https://github.com/llvm-mirror/clang/commit/fce71a317d3df0b6aac8c2332798842ab9c1d6c2
https://github.com/llvm-mirror/clang/commit/c5ad6c52b912fd63cd772f922aab402b12021c16
https://github.com/llvm-mirror/clang/commit/18414560e68c02039c2574d86c2f884a33b04de8
https://github.com/llvm-mirror/clang/commit/bfa38388de6a8e39aa29284442650f49e3d2d713
https://github.com/llvm-mirror/clang/commit/9292dbd49443621fad5e63ec530bc136561294cd
https://github.com/llvm-mirror/clang/commit/f1e95d44ac2449a5c4285a5754ac033c72b114f6
https://github.com/llvm-mirror/clang/commit/ef95faf680799e3eb69eeddf7630a0cb4a0237f9
https://github.com/llvm-mirror/clang/commit/552b0f284f9d8b6b70ade5545744f82930aad0f9
https://github.com/llvm-mirror/clang/commit/f6e4bb6620b307c877046456b64f26a64dd13250
https://github.com/llvm-mirror/clang/commit/a100391cc47d7e9db05cc239b1919b958da71cb0
https://github.com/llvm-mirror/clang/commit/c814cd660a16bd49b5c9d09b73a56e8b60e99605
https://github.com/llvm-mirror/clang/commit/a465dc43f18a62a73536fb51fbc75172ef4fbbc3
https://github.com/llvm-mirror/clang/commit/567ad56d9f6860293112974319a079c560c31f68
https://github.com/llvm-mirror/clang/commit/68711dd20d21899e758c5f207dacd0cae8c4342e
https://github.com/llvm-mirror/clang/commit/fcd77d033b1a8a688001b8a87ccefc622fb09cc3
https://github.com/llvm-mirror/clang/commit/b293a9a424d50da3ff676493917c134d3789bd21
https://github.com/llvm-mirror/clang/commit/fec65ff9a65e73091d9f8117e6a072b79a6b8363
https://github.com/llvm-mirror/clang/commit/f343a494807eaba4cdc0470ad40719699dc752f3
https://github.com/llvm-mirror/clang/commit/316202f49ae868466ba214b770349dc211d07262
https://github.com/llvm-mirror/clang/commit/a3eb9f5811b85ce1b5158ad6691ea0a61dbb247d
https://github.com/llvm-mirror/clang/commit/67fafb973cfbd0ac08f3177a344e5cdd4fee4ae6
https://github.com/llvm-mirror/clang/commit/2c9a039c9bdfb19c769cd0224e30fc66e5ad49d4
https://github.com/llvm-mirror/clang/commit/0661f6d435fd4f159d7383291816eb90a621cc2d
https://github.com/llvm-mirror/clang/commit/9e4d5da66ba56954f8fa64f59d28f4d2335fd37f
https://github.com/llvm-mirror/clang/commit/15afb8ec13012c6640b683d0f9b831cc08dc3b87
https://github.com/llvm-mirror/clang/commit/271504f86c5b97c62d2fc378b26ece3709f473f1
https://github.com/llvm-mirror/clang/commit/1870c2d2e12b591397f244e9317a5d8fb9ec562d
https://github.com/llvm-mirror/clang/commit/154210ac5cbccd52c070afbd3b1ec86b21afafac
https://github.com/llvm-mirror/clang/commit/8492691ea87c0dc9523b2daf24e6ee7b5cbf442d
https://github.com/llvm-mirror/clang/commit/b23eb1cd646ef10df5e241edae5b31c743f2d9d8
https://github.com/llvm-mirror/clang/commit/7742deb9e03e5129dbe6148f5c9a55af73bd8535
https://github.com/llvm-mirror/clang/commit/7211ea47c1b502966ec02bb023fab59385caa591
https://github.com/llvm-mirror/clang/commit/a582422f20f4c9a7a2ebacabc5b5392b94e3e6b4
https://github.com/llvm-mirror/clang/commit/d195bc38fd424b0c928e3c354038a8ca6e2ccac3
https://github.com/llvm-mirror/clang/commit/d0dbb7e6d4f05f5d0a5978822476897fe3427787
https://github.com/llvm-mirror/clang/commit/543c4ae954f2bce5ac58ed22080f23cbd94794d2
https://github.com/llvm-mirror/clang/commit/0c018357b8bbb1f96bbf622a5807421e626b4228
https://github.com/llvm-mirror/clang/commit/4367829b41e89d2f3dfae94a97af40ffa01c56c9
https://github.com/llvm-mirror/clang/commit/8f1a2db8649eb151ee620273dcf34b700176430f
https://github.com/llvm-mirror/clang/commit/1dc6f745eb19c94527503012d798dc9b9b5ba6da
https://github.com/llvm-mirror/clang/commit/5806bb59d2d19a9b32b739589865d8bb1e2627c5
https://github.com/llvm-mirror/clang/commit/7a8918fe69d419c41956a7245874b0196e03127b
https://github.com/llvm-mirror/clang/commit/4fa7eab771ab8212e1058bd1a91061ff120c8fbb
https://github.com/llvm-mirror/clang/commit/6af701f29be43e49a25ab098c79940ae4cbb69c7
https://github.com/llvm-mirror/clang/commit/c640058aa7f224a71ce3b1d2601d84e1b57f82d3
https://github.com/llvm-mirror/clang/commit/08f8539f0acfc74cc2e04167940bb59a0b582cbf
https://github.com/llvm-mirror/clang/commit/50a70cd11801fd9a700d06e447095249c34c261f

This assumes that everyone has been labeling the comments in their commits
with OpenMP.
There was at least one instance where this was misspelled.

On Wed, May 28, 2014 at 11:39 PM, Alp Toker <alp at nuanti.com> wrote:

>
> On 29/05/2014 04:21, Jack Howarth wrote:
>
>> Philip,
>>     From observing many merges in FSF gcc over the years, it is crazy to
>> take a new branch, selectively pull in small sections
>>
>
> "Crazy"? Selectively pulling in small chunks is the only realistic way to
> deal with the task.
>
>
>  and then take long breaks where the two start to rapidly fork. If a
>> branch is to be merged, the process should at least be scheduled such that
>> the process will take place over a known period of time so attempts can be
>> made to keep the two in sync or at least keep track of where the two have
>> begun to diverge. At the moment, there are quite a few files introduced
>> from clang-omp that are no longer in sync and the svn web browser access
>> doesn't seem to allow you to easily view the commit history on individual
>> files
>>
>
> Jack, are you seriously talking about taking on a merge of this scale
> using the *SVN web interface*.. and then complaining about that to Philip?
>
> There are tools for that: Consider using clang's own
> format/tooling/refactoring together with git to track upstream changes and
> automate the sync work for your out-of-tree branch.
>
> It's no wonder you're getting stuck if you were trying to coordinate the
> effort with WebSVN, after all the one thing you can be sure of is that
> upstream code won't stay still in the LLVM project.
>
> Alp.
>
>
>
>  to see if they have been changed since the original commits.
>>              Jack
>>
>>
>> On Wed, May 28, 2014 at 8:25 PM, Philip Reames <listmail at philipreames.com<mailto:
>> listmail at philipreames.com>> wrote:
>>
>>     I would strongly recommend that you get your current branch in
>>     sync with clang-TOT as a first step.  Once this done, you should
>>     separate individual patches and submit them for review. Based on
>>     previous history, the community is unlikely to accept a single
>>     massive change set.
>>
>>     p.s. The tone of your last sentence is less than ideal. These are
>>     the folks actually working on getting the work you are interested
>>     merged into upstream.  You should thank them, not critique them.
>> (I'm not one of them, btw.)
>>
>>     Philip
>>
>>
>>     On 05/28/2014 03:19 PM, Jack Howarth wrote:
>>
>>>     Andrey Bokhanko expressed interest in getting the clang-omp
>>>     merge done in time for the 3.5 release but wants guidance on the
>>>     process. I suggested starting with the creation a new clang-omp
>>>     branch upstream rebased on clang trunk  for generation of merge
>>>     patch. Unfortunately merging the  current changes from the
>>>     clang-omp (based on clang 3.4) to a clang-omp (based on clang
>>>     trunk)  looks very difficult as selective patches have been
>>>     committed into clang trunk from clang-omp and don't appear to
>>>     have been kept synchronized with the current changes from
>>>     upstream. Does anyone know if these new files from previous
>>>     commits out of clang-omp contain any local changes which haven't
>>>     been back ported to clang-omp? It would seem that postponing this
>>>     merge will just make the process harder as time goes on if
>>>     selective merges from clang-omp into clang trunk continue in the
>>>     interim. Hopefully the folks who did the original selective
>>>     commits would help detangle this mess.
>>>                Jack
>>>
>>>
>>>     _______________________________________________
>>>     cfe-dev mailing list
>>>     cfe-dev at cs.uiuc.edu  <mailto:cfe-dev at cs.uiuc.edu>
>>>     http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev
>>>
>>
>>
>>     _______________________________________________
>>     cfe-dev mailing list
>>     cfe-dev at cs.uiuc.edu <mailto:cfe-dev at cs.uiuc.edu>
>>
>>     http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev
>>
>>
>>
>>
>> _______________________________________________
>> cfe-dev mailing list
>> cfe-dev at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-dev
>>
>
> --
> http://www.nuanti.com
> the browser experts
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-dev/attachments/20140529/992032a0/attachment.html>