Message ID | 3d7613f7-464e-41ad-f87b-2f8b5fabd774@codesourcery.com |
---|---|
State | New |
Headers | show |
Series | wwwdocs: Document devel/omp/gcc-10 branch | expand |
On 6/10/20 3:34 PM, Kwok Cheung Yeung wrote: > This patch updates the previous entry on the website for > devel/omp/gcc-9 to refer to the new branch instead. This removes > references to the old branch, as new development should occur on the > newer branch. Can you move the old entry to "Inactive Development Branches" instead? > + Please send patch emails with a short-hand <code>[og10]</code> tag in the > subject line, and use <code>ChangeLog.omp</code> files.</dd> Do we still need ChangeLog.omp or not? I got used to not adding it on mainline. If it is needed, I probably need to add one for my last commit. Tobias ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter
Hi! On 2020-06-10T17:15:41+0200, Tobias Burnus <tobias@codesourcery.com> wrote: > On 6/10/20 3:34 PM, Kwok Cheung Yeung wrote: >> This patch updates the previous entry on the website for >> devel/omp/gcc-9 to refer to the new branch instead. This removes >> references to the old branch, as new development should occur on the >> newer branch. > > Can you move the old entry to "Inactive Development Branches" instead? Right, please look up in the revision history of how we did that same procedure in the past, then do the same thing now, and it'll qualify "as obvious". ;-) >> + Please send patch emails with a short-hand <code>[og10]</code> tag in the >> subject line, and use <code>ChangeLog.omp</code> files.</dd> > > Do we still need ChangeLog.omp or not? Yes, I wanted to raise this question too -- and that's a general concern for any branches that are not handled by the automatic "commit log to 'ChangeLog' files" updating machinery. The automated system runs once a day. I guess it's generally deemed acceptable if the source code state (commits) and the 'ChangeLog' files state is out of sync for one day. There surely must be some mechanism in place to make sure that actual GCC tarball etc. releases do have complete 'ChangeLog' files state. However, if at an arbitrary point in time, a merge is done, for example, from releases/gcc-10 branch into devel/omp/gcc-10 branch, and then a tarball etc. release is done from the latter, that may not have complete 'ChangeLog' files state, if it wasn't complete at the time of the merge. So that's something to take care of when doing such merges -- or at tarball etc. release time, possibly manually running the updating machinery. > I got used to not adding it > on mainline. If it is needed, I probably need to add one for my last > commit. Indeed the other concern is that people will simply forget to update 'ChangeLog.omp' etc. files given that we're no longer doing it for the GCC main branches. Should we stop doing the manual updates on development branches, too, and extent the automated system to go over all branches? (I suppose, per GNU etc. policy, we cannot just have no 'ChangeLog.*' files on development branches, even if no tarball etc. releases are published from them.) Is it sufficient to keep "ChangeLog state" in the commit log (as we're now doing for GCC main branches), and then run the updating machinery on demand, say, before tarball etc. releases are published? Or should we simply live with the inconsistency between GCC main branches (automatic 'ChangeLog' files updates), and development branches (manual 'ChangeLog' files updates)? Anybody got any clever idea? And sorry, if that has been discussed before, I have not yet read up all the relevant emails. Grüße Thomas ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter
On Wed, Jun 10, 2020 at 05:47:54PM +0200, Thomas Schwinge wrote: > The automated system runs once a day. I guess it's generally deemed > acceptable if the source code state (commits) and the 'ChangeLog' files > state is out of sync for one day. There surely must be some mechanism in > place to make sure that actual GCC tarball etc. releases do have complete > 'ChangeLog' files state. Martin has provided a way to generate patches for all the standard branches instead of checking them in. I think it would be really much better to have a way to ask either for a patch on stdout for the HEAD (i.e. only on that branch find last DATESTAMP bump and generate ChangeLog entries since then) or just apply the changes to the ChangeLog directly. At least that is something I'd prefer for gcc_release and e.g. the distro snapshots. For the topic branches, there is the additional problem that it is (semi)-regularly synced from mainline or some release branch and thus is getting the DATESTAMP update commits which are now normally used as the anchors for ChangeLog generation. The commits that are not from the tracked branch can be intermixed with the inherited commits though and so the question is what should we generate and into which files. Jakub
The inactive development branches are sorted alphabetically except for the openacc-gcc-*-branch entries, which are grouped with the gomp*-branch entries. Would it be better to place devel/omp/gcc-9 alphabetically (in which case it will go between debuglocus and dwarf4), or by topic (in which case it should probably go after openacc-gcc-9-branch)? Kwok On 10/06/2020 4:15 pm, Tobias Burnus wrote: > On 6/10/20 3:34 PM, Kwok Cheung Yeung wrote: >> This patch updates the previous entry on the website for devel/omp/gcc-9 to >> refer to the new branch instead. This removes references to the old branch, as >> new development should occur on the newer branch. > > Can you move the old entry to "Inactive Development Branches" instead? >
Hi Kwok! On 2020-06-10T17:23:58+0100, Kwok Cheung Yeung <kcy@codesourcery.com> wrote: > On 10/06/2020 4:15 pm, Tobias Burnus wrote: >> On 6/10/20 3:34 PM, Kwok Cheung Yeung wrote: >>> This patch updates the previous entry on the website for devel/omp/gcc-9 to >>> refer to the new branch instead. This removes references to the old branch, as >>> new development should occur on the newer branch. >> >> Can you move the old entry to "Inactive Development Branches" instead? > > The inactive development branches are sorted alphabetically except for the > openacc-gcc-*-branch entries, which are grouped with the gomp*-branch entries. > Would it be better to place devel/omp/gcc-9 alphabetically (in which case it > will go between debuglocus and dwarf4) For obvious reasons, very most of all items on this list of inactive development branches pre-date the Git conversion, which is when we added the convention that shared development branches go into the 'devel/' namespace. So the current list does not reflect that current practice, so given old practice, the 'devel/omp/gcc-9' etc. branches wouldn't sort into 'd' but into 'o'. > or by topic (in which case it should > probably go after openacc-gcc-9-branch)? By topic makes most sense to me. And, 'devel/omp/gcc-9' definitively should group right next to 'openacc-gcc-9-branch', as it began as a direct translation of the latter. For historical reasons, I have a (at least slight) preference to keep all these branches right after the 'gomp-4_0-branch' -- where it all began. This is a history chapter, after all. And anyway, changing any of that would be a separate thing from simply documenting the new 'devel/omp/gcc-10' branch, and retiring the 'devel/omp/gcc-9' branch. Grüße Thomas ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter
I have now moved the entry for devel/omp/gcc-9 into the inactive branches section and reworded it slightly. Okay to push? Thanks Kwok On 12/06/2020 9:35 am, Thomas Schwinge wrote: >> or by topic (in which case it should >> probably go after openacc-gcc-9-branch)? > > By topic makes most sense to me. And, 'devel/omp/gcc-9' definitively > should group right next to 'openacc-gcc-9-branch', as it began as a > direct translation of the latter. > > For historical reasons, I have a (at least slight) preference to keep all > these branches right after the 'gomp-4_0-branch' -- where it all began. > This is a history chapter, after all. > commit b719899acf24974fd4c51f14538b426f99259384 Author: Kwok Cheung Yeung <kcy@codesourcery.com> Date: Wed Jun 10 06:08:06 2020 -0700 Document devel/omp/gcc-10 branch This also moves the old devel/omp/gcc-9 branch to the inactive branches section. diff --git a/htdocs/git.html b/htdocs/git.html index 8c28bc0..f7f87a9 100644 --- a/htdocs/git.html +++ b/htdocs/git.html @@ -280,15 +280,15 @@ in Git.</p> Makarov <a href="mailto:vmakarov@redhat.com">vmakarov@redhat.com</a>. </dd> - <dt><a href="https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=shortlog;h=refs/heads/devel/omp/gcc-9">devel/omp/gcc-9</a></dt> + <dt><a href="https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=shortlog;h=refs/heads/devel/omp/gcc-10">devel/omp/gcc-10</a></dt> <dd>This branch is for collaborative development of <a href="https://gcc.gnu.org/wiki/OpenACC">OpenACC</a> and <a href="https://gcc.gnu.org/wiki/openmp">OpenMP</a> support and related functionality, such as <a href="https://gcc.gnu.org/wiki/Offloading">offloading</a> support (OMP: offloading and multi processing). - The branch is based on releases/gcc-9. - Please send patch emails with a short-hand <code>[og9]</code> tag in the + The branch is based on releases/gcc-10. + Please send patch emails with a short-hand <code>[og10]</code> tag in the subject line, and use <code>ChangeLog.omp</code> files.</dd> <dt>unified-autovect</dt> @@ -944,8 +944,16 @@ merged.</p> <dd>These branches were used for development of <a href="https://gcc.gnu.org/wiki/OpenACC">OpenACC support</a> and related functionality, based on gcc-7-branch, gcc-8-branch, and gcc-9-branch - respectively. - Work is now proceeding on the devel/omp/gcc-9 branch.</dd> + respectively.</dd> + + <dt><a href="https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=shortlog;h=refs/heads/devel/omp/gcc-9">devel/omp/gcc-9</a></dt> + <dd>This branch was used for collaborative development of + <a href="https://gcc.gnu.org/wiki/OpenACC">OpenACC</a> and + <a href="https://gcc.gnu.org/wiki/openmp">OpenMP</a> support and related + functionality as the successor to openacc-gcc-9-branch after the move to + Git. + The branch was based on releases/gcc-9. + Development has now moved to the devel/omp/gcc-10 branch.</dd> <dt>hammer-3_3-branch</dt> <dd>The goal of this branch was to have a stable compiler based on GCC 3.3
Hi Kwok! On 2020-06-15T22:08:50+0100, Kwok Cheung Yeung <kcy@codesourcery.com> wrote: > I have now moved the entry for devel/omp/gcc-9 into the inactive branches > section and reworded it slightly. > > Okay to push? Yes, thanks. Reviewed-by: Thomas Schwinge <thomas@codesourcery.com> Grüße Thomas > On 12/06/2020 9:35 am, Thomas Schwinge wrote: >>> or by topic (in which case it should >>> probably go after openacc-gcc-9-branch)? >> >> By topic makes most sense to me. And, 'devel/omp/gcc-9' definitively >> should group right next to 'openacc-gcc-9-branch', as it began as a >> direct translation of the latter. >> >> For historical reasons, I have a (at least slight) preference to keep all >> these branches right after the 'gomp-4_0-branch' -- where it all began. >> This is a history chapter, after all. >> > commit b719899acf24974fd4c51f14538b426f99259384 > Author: Kwok Cheung Yeung <kcy@codesourcery.com> > Date: Wed Jun 10 06:08:06 2020 -0700 > > Document devel/omp/gcc-10 branch > > This also moves the old devel/omp/gcc-9 branch to the inactive branches > section. > > diff --git a/htdocs/git.html b/htdocs/git.html > index 8c28bc0..f7f87a9 100644 > --- a/htdocs/git.html > +++ b/htdocs/git.html > @@ -280,15 +280,15 @@ in Git.</p> > Makarov <a href="mailto:vmakarov@redhat.com">vmakarov@redhat.com</a>. > </dd> > > - <dt><a href="https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=shortlog;h=refs/heads/devel/omp/gcc-9">devel/omp/gcc-9</a></dt> > + <dt><a href="https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=shortlog;h=refs/heads/devel/omp/gcc-10">devel/omp/gcc-10</a></dt> > <dd>This branch is for collaborative development of > <a href="https://gcc.gnu.org/wiki/OpenACC">OpenACC</a> and > <a href="https://gcc.gnu.org/wiki/openmp">OpenMP</a> support and related > functionality, such > as <a href="https://gcc.gnu.org/wiki/Offloading">offloading</a> support (OMP: > offloading and multi processing). > - The branch is based on releases/gcc-9. > - Please send patch emails with a short-hand <code>[og9]</code> tag in the > + The branch is based on releases/gcc-10. > + Please send patch emails with a short-hand <code>[og10]</code> tag in the > subject line, and use <code>ChangeLog.omp</code> files.</dd> > > <dt>unified-autovect</dt> > @@ -944,8 +944,16 @@ merged.</p> > <dd>These branches were used for development of > <a href="https://gcc.gnu.org/wiki/OpenACC">OpenACC support</a> and related > functionality, based on gcc-7-branch, gcc-8-branch, and gcc-9-branch > - respectively. > - Work is now proceeding on the devel/omp/gcc-9 branch.</dd> > + respectively.</dd> > + > + <dt><a href="https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=shortlog;h=refs/heads/devel/omp/gcc-9">devel/omp/gcc-9</a></dt> > + <dd>This branch was used for collaborative development of > + <a href="https://gcc.gnu.org/wiki/OpenACC">OpenACC</a> and > + <a href="https://gcc.gnu.org/wiki/openmp">OpenMP</a> support and related > + functionality as the successor to openacc-gcc-9-branch after the move to > + Git. > + The branch was based on releases/gcc-9. > + Development has now moved to the devel/omp/gcc-10 branch.</dd> > > <dt>hammer-3_3-branch</dt> > <dd>The goal of this branch was to have a stable compiler based on GCC 3.3 ----------------- Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter
diff --git a/htdocs/git.html b/htdocs/git.html index 8c28bc0..292a27a 100644 --- a/htdocs/git.html +++ b/htdocs/git.html @@ -280,15 +280,15 @@ in Git.</p> Makarov <a href="mailto:vmakarov@redhat.com">vmakarov@redhat.com</a>. </dd> - <dt><a href="https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=shortlog;h=refs/heads/devel/omp/gcc-9">devel/omp/gcc-9</a></dt> + <dt><a href="https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=shortlog;h=refs/heads/devel/omp/gcc-10">devel/omp/gcc-10</a></dt> <dd>This branch is for collaborative development of <a href="https://gcc.gnu.org/wiki/OpenACC">OpenACC</a> and <a href="https://gcc.gnu.org/wiki/openmp">OpenMP</a> support and related functionality, such as <a href="https://gcc.gnu.org/wiki/Offloading">offloading</a> support (OMP: offloading and multi processing). - The branch is based on releases/gcc-9. - Please send patch emails with a short-hand <code>[og9]</code> tag in the + The branch is based on releases/gcc-10. + Please send patch emails with a short-hand <code>[og10]</code> tag in the subject line, and use <code>ChangeLog.omp</code> files.</dd> <dt>unified-autovect</dt>