[COMMITTED] Regenerate riscv.opt.urls and i386.opt.urls

Message ID 20240520112138.286672-1-mark@klomp.org
State Committed
Commit 591bc70139d898c06b1d605ff4fed591ffd2e2e7
Headers
Series [COMMITTED] Regenerate riscv.opt.urls and i386.opt.urls |

Checks

Context Check Description
rivoscibot/toolchain-ci-rivos-lint warning Lint failed
rivoscibot/toolchain-ci-rivos-apply-patch warning Patch failed to apply to tip of tree.
rivoscibot/toolchain-ci-rivos-build--newlib-rv64gcv-lp64d-multilib success Build passed
rivoscibot/toolchain-ci-rivos-build--linux-rv64gcv-lp64d-multilib success Build passed
rivoscibot/toolchain-ci-rivos-build--newlib-rv64gc-lp64d-multilib success Build passed
rivoscibot/toolchain-ci-rivos-build--linux-rv32gc_zba_zbb_zbc_zbs-ilp32d-non-multilib success Build passed
rivoscibot/toolchain-ci-rivos-build--linux-rv64gc_zba_zbb_zbc_zbs-lp64d-non-multilib success Build passed
linaro-tcwg-bot/tcwg_gcc_build--master-arm warning Patch is already merged
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 warning Patch is already merged
rivoscibot/toolchain-ci-rivos-test success Testing passed

Commit Message

Mark Wielaard May 20, 2024, 11:21 a.m. UTC
  risc-v added an -mfence-tso option. i386 removed Xeon Phi ISA support
options. But the opt.urls files weren't regenerated.

Fixes: a6114c2a6911 ("RISC-V: Implement -m{,no}fence-tso")
Fixes: e1a7e2c54d52 ("i386: Remove Xeon Phi ISA support")

gcc/ChangeLog:

	* config/riscv/riscv.opt.urls: Regenerate.
	* config/i386/i386.opt.urls: Likewise.
---
 gcc/config/i386/i386.opt.urls   | 15 ---------------
 gcc/config/riscv/riscv.opt.urls |  3 +++
 2 files changed, 3 insertions(+), 15 deletions(-)
  

Comments

Jiang, Haochen May 20, 2024, 4:19 p.m. UTC | #1
Thanks for your help! I haven't noticed this file is newly added to GCC.
I suppose that is why the buildbot is reporting something the whole
afternoon for me.

So just for confirm, does that mean we will always need to run
gcc/regenerate-opt-urls.py after adding or removing options in GCC?
My current understanding is yes.

Thx,
Haochen

> -----Original Message-----
> From: Mark Wielaard <mark@klomp.org>
> Sent: Monday, May 20, 2024 7:22 PM
> To: gcc-patches@gcc.gnu.org
> Cc: Palmer Dabbelt <palmer@rivosinc.com>; Jeff Law
> <jlaw@ventanamicro.com>; Jiang, Haochen <haochen.jiang@intel.com>; Hu,
> Lin1 <lin1.hu@intel.com>; Mark Wielaard <mark@klomp.org>
> Subject: [COMMITTED] Regenerate riscv.opt.urls and i386.opt.urls
> 
> risc-v added an -mfence-tso option. i386 removed Xeon Phi ISA support options.
> But the opt.urls files weren't regenerated.
> 
> Fixes: a6114c2a6911 ("RISC-V: Implement -m{,no}fence-tso")
> Fixes: e1a7e2c54d52 ("i386: Remove Xeon Phi ISA support")
> 
> gcc/ChangeLog:
> 
> 	* config/riscv/riscv.opt.urls: Regenerate.
> 	* config/i386/i386.opt.urls: Likewise.
> ---
>  gcc/config/i386/i386.opt.urls   | 15 ---------------
>  gcc/config/riscv/riscv.opt.urls |  3 +++
>  2 files changed, 3 insertions(+), 15 deletions(-)
> 
> diff --git a/gcc/config/i386/i386.opt.urls b/gcc/config/i386/i386.opt.urls index
> 81c5bb9a9270..40e8a8449367 100644
> --- a/gcc/config/i386/i386.opt.urls
> +++ b/gcc/config/i386/i386.opt.urls
> @@ -238,12 +238,6 @@ UrlSuffix(gcc/x86-Options.html#index-mavx2)
>  mavx512f
>  UrlSuffix(gcc/x86-Options.html#index-mavx512f)
> 
> -mavx512pf
> -UrlSuffix(gcc/x86-Options.html#index-mavx512pf)
> -
> -mavx512er
> -UrlSuffix(gcc/x86-Options.html#index-mavx512er)
> -
>  mavx512cd
>  UrlSuffix(gcc/x86-Options.html#index-mavx512cd)
> 
> @@ -262,12 +256,6 @@ UrlSuffix(gcc/x86-Options.html#index-mavx512ifma)
>  mavx512vbmi
>  UrlSuffix(gcc/x86-Options.html#index-mavx512vbmi)
> 
> -mavx5124fmaps
> -UrlSuffix(gcc/x86-Options.html#index-mavx5124fmaps)
> -
> -mavx5124vnniw
> -UrlSuffix(gcc/x86-Options.html#index-mavx5124vnniw)
> -
>  mavx512vpopcntdq
>  UrlSuffix(gcc/x86-Options.html#index-mavx512vpopcntdq)
> 
> @@ -409,9 +397,6 @@ UrlSuffix(gcc/x86-Options.html#index-mrdrnd)
>  mf16c
>  UrlSuffix(gcc/x86-Options.html#index-mf16c)
> 
> -mprefetchwt1
> -UrlSuffix(gcc/x86-Options.html#index-mprefetchwt1)
> -
>  mfentry
>  UrlSuffix(gcc/x86-Options.html#index-mfentry)
> 
> diff --git a/gcc/config/riscv/riscv.opt.urls b/gcc/config/riscv/riscv.opt.urls index
> 2f01ae5d6271..e02ef3ee3dd9 100644
> --- a/gcc/config/riscv/riscv.opt.urls
> +++ b/gcc/config/riscv/riscv.opt.urls
> @@ -91,3 +91,6 @@ UrlSuffix(gcc/RISC-V-Options.html#index-minline-strlen)
> 
>  ; skipping UrlSuffix for 'mtls-dialect=' due to finding no URLs
> 
> +mfence-tso
> +UrlSuffix(gcc/RISC-V-Options.html#index-mfence-tso)
> +
> --
> 2.45.1
  
David Malcolm May 20, 2024, 4:37 p.m. UTC | #2
On Mon, 2024-05-20 at 16:19 +0000, Jiang, Haochen wrote:
> Thanks for your help! I haven't noticed this file is newly added to
> GCC.
> I suppose that is why the buildbot is reporting something the whole
> afternoon for me.
> 
> So just for confirm, does that mean we will always need to run
> gcc/regenerate-opt-urls.py after adding or removing options in GCC?
> My current understanding is yes.

Yes please (and make sure you've got a clean build of the HTML docs
with the new options added when you do)

Though if you forget, the only problem will be some missing URLs at the
command line, and complaints from the CI.

Dave

> 
> Thx,
> Haochen
> 
> > -----Original Message-----
> > From: Mark Wielaard <mark@klomp.org>
> > Sent: Monday, May 20, 2024 7:22 PM
> > To: gcc-patches@gcc.gnu.org
> > Cc: Palmer Dabbelt <palmer@rivosinc.com>; Jeff Law
> > <jlaw@ventanamicro.com>; Jiang, Haochen <haochen.jiang@intel.com>;
> > Hu,
> > Lin1 <lin1.hu@intel.com>; Mark Wielaard <mark@klomp.org>
> > Subject: [COMMITTED] Regenerate riscv.opt.urls and i386.opt.urls
> > 
> > risc-v added an -mfence-tso option. i386 removed Xeon Phi ISA
> > support options.
> > But the opt.urls files weren't regenerated.
> > 
> > Fixes: a6114c2a6911 ("RISC-V: Implement -m{,no}fence-tso")
> > Fixes: e1a7e2c54d52 ("i386: Remove Xeon Phi ISA support")
> > 
> > gcc/ChangeLog:
> > 
> >         * config/riscv/riscv.opt.urls: Regenerate.
> >         * config/i386/i386.opt.urls: Likewise.
> > ---
> >  gcc/config/i386/i386.opt.urls   | 15 ---------------
> >  gcc/config/riscv/riscv.opt.urls |  3 +++
> >  2 files changed, 3 insertions(+), 15 deletions(-)
> > 
> > diff --git a/gcc/config/i386/i386.opt.urls
> > b/gcc/config/i386/i386.opt.urls index
> > 81c5bb9a9270..40e8a8449367 100644
> > --- a/gcc/config/i386/i386.opt.urls
> > +++ b/gcc/config/i386/i386.opt.urls
> > @@ -238,12 +238,6 @@ UrlSuffix(gcc/x86-Options.html#index-mavx2)
> >  mavx512f
> >  UrlSuffix(gcc/x86-Options.html#index-mavx512f)
> > 
> > -mavx512pf
> > -UrlSuffix(gcc/x86-Options.html#index-mavx512pf)
> > -
> > -mavx512er
> > -UrlSuffix(gcc/x86-Options.html#index-mavx512er)
> > -
> >  mavx512cd
> >  UrlSuffix(gcc/x86-Options.html#index-mavx512cd)
> > 
> > @@ -262,12 +256,6 @@ UrlSuffix(gcc/x86-Options.html#index-
> > mavx512ifma)
> >  mavx512vbmi
> >  UrlSuffix(gcc/x86-Options.html#index-mavx512vbmi)
> > 
> > -mavx5124fmaps
> > -UrlSuffix(gcc/x86-Options.html#index-mavx5124fmaps)
> > -
> > -mavx5124vnniw
> > -UrlSuffix(gcc/x86-Options.html#index-mavx5124vnniw)
> > -
> >  mavx512vpopcntdq
> >  UrlSuffix(gcc/x86-Options.html#index-mavx512vpopcntdq)
> > 
> > @@ -409,9 +397,6 @@ UrlSuffix(gcc/x86-Options.html#index-mrdrnd)
> >  mf16c
> >  UrlSuffix(gcc/x86-Options.html#index-mf16c)
> > 
> > -mprefetchwt1
> > -UrlSuffix(gcc/x86-Options.html#index-mprefetchwt1)
> > -
> >  mfentry
> >  UrlSuffix(gcc/x86-Options.html#index-mfentry)
> > 
> > diff --git a/gcc/config/riscv/riscv.opt.urls
> > b/gcc/config/riscv/riscv.opt.urls index
> > 2f01ae5d6271..e02ef3ee3dd9 100644
> > --- a/gcc/config/riscv/riscv.opt.urls
> > +++ b/gcc/config/riscv/riscv.opt.urls
> > @@ -91,3 +91,6 @@ UrlSuffix(gcc/RISC-V-Options.html#index-minline-
> > strlen)
> > 
> >  ; skipping UrlSuffix for 'mtls-dialect=' due to finding no URLs
> > 
> > +mfence-tso
> > +UrlSuffix(gcc/RISC-V-Options.html#index-mfence-tso)
> > +
> > --
> > 2.45.1
>
  
Mark Wielaard May 20, 2024, 4:51 p.m. UTC | #3
Hi,

On Mon, 2024-05-20 at 12:37 -0400, David Malcolm wrote:
> On Mon, 2024-05-20 at 16:19 +0000, Jiang, Haochen wrote:
> > Thanks for your help! I haven't noticed this file is newly added to
> > GCC.
> > I suppose that is why the buildbot is reporting something the whole
> > afternoon for me.
> > 
> > So just for confirm, does that mean we will always need to run
> > gcc/regenerate-opt-urls.py after adding or removing options in GCC?
> > My current understanding is yes.
> 
> Yes please (and make sure you've got a clean build of the HTML docs
> with the new options added when you do)
> 
> Though if you forget, the only problem will be some missing URLs at the
> command line, and complaints from the CI.

Also note that the CI will provide a diff that is most likely the
correct patch you need to apply. e.g. for the last issue:
https://builder.sourceware.org/buildbot/#/builders/269/builds/5194/steps/8/logs/stdio

It is still recommended you run regenerate-opt-urls yourself. But if
you just quickly want to shut up the buildbot then you cannot really go
wrong with just applying the diff it generated for you.

Cheers,

Mark
  

Patch

diff --git a/gcc/config/i386/i386.opt.urls b/gcc/config/i386/i386.opt.urls
index 81c5bb9a9270..40e8a8449367 100644
--- a/gcc/config/i386/i386.opt.urls
+++ b/gcc/config/i386/i386.opt.urls
@@ -238,12 +238,6 @@  UrlSuffix(gcc/x86-Options.html#index-mavx2)
 mavx512f
 UrlSuffix(gcc/x86-Options.html#index-mavx512f)
 
-mavx512pf
-UrlSuffix(gcc/x86-Options.html#index-mavx512pf)
-
-mavx512er
-UrlSuffix(gcc/x86-Options.html#index-mavx512er)
-
 mavx512cd
 UrlSuffix(gcc/x86-Options.html#index-mavx512cd)
 
@@ -262,12 +256,6 @@  UrlSuffix(gcc/x86-Options.html#index-mavx512ifma)
 mavx512vbmi
 UrlSuffix(gcc/x86-Options.html#index-mavx512vbmi)
 
-mavx5124fmaps
-UrlSuffix(gcc/x86-Options.html#index-mavx5124fmaps)
-
-mavx5124vnniw
-UrlSuffix(gcc/x86-Options.html#index-mavx5124vnniw)
-
 mavx512vpopcntdq
 UrlSuffix(gcc/x86-Options.html#index-mavx512vpopcntdq)
 
@@ -409,9 +397,6 @@  UrlSuffix(gcc/x86-Options.html#index-mrdrnd)
 mf16c
 UrlSuffix(gcc/x86-Options.html#index-mf16c)
 
-mprefetchwt1
-UrlSuffix(gcc/x86-Options.html#index-mprefetchwt1)
-
 mfentry
 UrlSuffix(gcc/x86-Options.html#index-mfentry)
 
diff --git a/gcc/config/riscv/riscv.opt.urls b/gcc/config/riscv/riscv.opt.urls
index 2f01ae5d6271..e02ef3ee3dd9 100644
--- a/gcc/config/riscv/riscv.opt.urls
+++ b/gcc/config/riscv/riscv.opt.urls
@@ -91,3 +91,6 @@  UrlSuffix(gcc/RISC-V-Options.html#index-minline-strlen)
 
 ; skipping UrlSuffix for 'mtls-dialect=' due to finding no URLs
 
+mfence-tso
+UrlSuffix(gcc/RISC-V-Options.html#index-mfence-tso)
+