diff mbox series

s390: Remove -m{,no-}lra option

Message ID 20240919140543.3583217-1-stefansf@gcc.gnu.org
State New
Headers show
Series s390: Remove -m{,no-}lra option | expand

Commit Message

Stefan Schulze Frielinghaus Sept. 19, 2024, 2:05 p.m. UTC 
I have been missing the two test cases and removed them since they
depend on -mno-lra.

-- 8< --

Since the old reload pass is about to be removed and we defaulted to LRA
for over a decade, remove option -m{,no-}lra.

PR target/113953

gcc/ChangeLog:

	* config/s390/s390.cc (s390_lra_p): Remove.
	(TARGET_LRA_P): Remove.
	* config/s390/s390.opt (mlra): Remove.
	* config/s390/s390.opt.urls (mlra): Remove.

gcc/testsuite/ChangeLog:

	* gcc.target/s390/TI-constants-nolra.c: Removed.
	* gcc.target/s390/pr79895.c: Removed.
---
 gcc/config/s390/s390.cc                       | 10 ----
 gcc/config/s390/s390.opt                      |  4 --
 gcc/config/s390/s390.opt.urls                 |  2 -
 .../gcc.target/s390/TI-constants-nolra.c      | 47 -------------------
 gcc/testsuite/gcc.target/s390/pr79895.c       |  9 ----
 5 files changed, 72 deletions(-)
 delete mode 100644 gcc/testsuite/gcc.target/s390/TI-constants-nolra.c
 delete mode 100644 gcc/testsuite/gcc.target/s390/pr79895.c

Comments

Sam James Sept. 19, 2024, 6:21 p.m. UTC | #1 
Stefan Schulze Frielinghaus <stefansf@gcc.gnu.org> writes:

> I have been missing the two test cases and removed them since they
> depend on -mno-lra.

Can't approve but it looks right. Thanks for handling it, especially so quickly!

>
> -- 8< --
>
> Since the old reload pass is about to be removed and we defaulted to LRA
> for over a decade, remove option -m{,no-}lra.
>
> PR target/113953
>
> gcc/ChangeLog:
>
> 	* config/s390/s390.cc (s390_lra_p): Remove.
> 	(TARGET_LRA_P): Remove.
> 	* config/s390/s390.opt (mlra): Remove.
> 	* config/s390/s390.opt.urls (mlra): Remove.
>
> gcc/testsuite/ChangeLog:
>
> 	* gcc.target/s390/TI-constants-nolra.c: Removed.
> 	* gcc.target/s390/pr79895.c: Removed.
> ---
>  gcc/config/s390/s390.cc                       | 10 ----
>  gcc/config/s390/s390.opt                      |  4 --
>  gcc/config/s390/s390.opt.urls                 |  2 -
>  .../gcc.target/s390/TI-constants-nolra.c      | 47 -------------------
>  gcc/testsuite/gcc.target/s390/pr79895.c       |  9 ----
>  5 files changed, 72 deletions(-)
>  delete mode 100644 gcc/testsuite/gcc.target/s390/TI-constants-nolra.c
>  delete mode 100644 gcc/testsuite/gcc.target/s390/pr79895.c
>
> diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
> index c9172d1153a..25d43ae3e13 100644
> --- a/gcc/config/s390/s390.cc
> +++ b/gcc/config/s390/s390.cc
> @@ -11342,13 +11342,6 @@ s390_can_change_mode_class (machine_mode from_mode,
>    return true;
>  }
>  
> -/* Return true if we use LRA instead of reload pass.  */
> -static bool
> -s390_lra_p (void)
> -{
> -  return s390_lra_flag;
> -}
> -
>  /* Return true if register FROM can be eliminated via register TO.  */
>  
>  static bool
> @@ -18444,9 +18437,6 @@ s390_c_mode_for_floating_type (enum tree_index ti)
>  #undef TARGET_LEGITIMATE_CONSTANT_P
>  #define TARGET_LEGITIMATE_CONSTANT_P s390_legitimate_constant_p
>  
> -#undef TARGET_LRA_P
> -#define TARGET_LRA_P s390_lra_p
> -
>  #undef TARGET_CAN_ELIMINATE
>  #define TARGET_CAN_ELIMINATE s390_can_eliminate
>  
> diff --git a/gcc/config/s390/s390.opt b/gcc/config/s390/s390.opt
> index a5b5aa95a12..23ea4b8232d 100644
> --- a/gcc/config/s390/s390.opt
> +++ b/gcc/config/s390/s390.opt
> @@ -229,10 +229,6 @@ Set the branch costs for conditional branch instructions.  Reasonable
>  values are small, non-negative integers.  The default branch cost is
>  1.
>  
> -mlra
> -Target Var(s390_lra_flag) Init(1) Save
> -Use LRA instead of reload.
> -
>  mpic-data-is-text-relative
>  Target Var(s390_pic_data_is_text_relative) Init(TARGET_DEFAULT_PIC_DATA_IS_TEXT_RELATIVE)
>  Assume data segments are relative to text segment.
> diff --git a/gcc/config/s390/s390.opt.urls b/gcc/config/s390/s390.opt.urls
> index ab1e761efa8..bc772d2ffc7 100644
> --- a/gcc/config/s390/s390.opt.urls
> +++ b/gcc/config/s390/s390.opt.urls
> @@ -74,8 +74,6 @@ UrlSuffix(gcc/S_002f390-and-zSeries-Options.html#index-mzarch)
>  
>  ; skipping UrlSuffix for 'mbranch-cost=' due to finding no URLs
>  
> -; skipping UrlSuffix for 'mlra' due to finding no URLs
> -
>  ; skipping UrlSuffix for 'mpic-data-is-text-relative' due to finding no URLs
>  
>  ; skipping UrlSuffix for 'mindirect-branch=' due to finding no URLs
> diff --git a/gcc/testsuite/gcc.target/s390/TI-constants-nolra.c b/gcc/testsuite/gcc.target/s390/TI-constants-nolra.c
> deleted file mode 100644
> index b9948fc4aa5..00000000000
> --- a/gcc/testsuite/gcc.target/s390/TI-constants-nolra.c
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -/* { dg-do compile { target int128 } } */
> -/* { dg-options "-O3 -mno-lra" } */
> -
> -/* 2x lghi */
> -__int128 a() {
> -  return 0;
> -}
> -
> -/* 2x lghi */
> -__int128 b() {
> -  return -1;
> -}
> -
> -/* 2x lghi */
> -__int128 c() {
> -  return -2;
> -}
> -
> -/* lghi + llilh */
> -__int128 d() {
> -  return 16000 << 16;
> -}
> -
> -/* lghi + llihf */
> -__int128 e() {
> -  return (unsigned long long)80000 << 32;
> -}
> -
> -/* lghi + llihf */
> -__int128 f() {
> -  return (unsigned __int128)80000 << 96;
> -}
> -
> -/* llihf + llihf - this is handled via movti_bigconst pattern */
> -__int128 g() {
> -  return ((unsigned __int128)80000 << 96) | ((unsigned __int128)80000 << 32);
> -}
> -
> -/* Literal pool */
> -__int128 h() {
> -  return ((unsigned __int128)80000 << 32) | 1;
> -}
> -
> -/* Literal pool */
> -__int128 i() {
> -  return (((unsigned __int128)80000 << 32) | 1) << 64;
> -}
> diff --git a/gcc/testsuite/gcc.target/s390/pr79895.c b/gcc/testsuite/gcc.target/s390/pr79895.c
> deleted file mode 100644
> index 02374e4b8a8..00000000000
> --- a/gcc/testsuite/gcc.target/s390/pr79895.c
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -/* { dg-do compile { target int128 } } */
> -/* { dg-options "-O1 -mno-lra" } */
> -
> -unsigned __int128 g;
> -void
> -foo ()
> -{
> -  g = (unsigned __int128)1 << 127;
> -}
Andreas Krebbel Sept. 20, 2024, 10:57 a.m. UTC | #2 
On 9/19/24 16:05, Stefan Schulze Frielinghaus wrote:
> I have been missing the two test cases and removed them since they
> depend on -mno-lra.
>
> -- 8< --
>
> Since the old reload pass is about to be removed and we defaulted to LRA
> for over a decade, remove option -m{,no-}lra.
>
> PR target/113953
>
> gcc/ChangeLog:
>
> 	* config/s390/s390.cc (s390_lra_p): Remove.
> 	(TARGET_LRA_P): Remove.
> 	* config/s390/s390.opt (mlra): Remove.
> 	* config/s390/s390.opt.urls (mlra): Remove.
>
> gcc/testsuite/ChangeLog:
>
> 	* gcc.target/s390/TI-constants-nolra.c: Removed.
> 	* gcc.target/s390/pr79895.c: Removed.

Ok. Thanks!


Andreas



> ---
>   gcc/config/s390/s390.cc                       | 10 ----
>   gcc/config/s390/s390.opt                      |  4 --
>   gcc/config/s390/s390.opt.urls                 |  2 -
>   .../gcc.target/s390/TI-constants-nolra.c      | 47 -------------------
>   gcc/testsuite/gcc.target/s390/pr79895.c       |  9 ----
>   5 files changed, 72 deletions(-)
>   delete mode 100644 gcc/testsuite/gcc.target/s390/TI-constants-nolra.c
>   delete mode 100644 gcc/testsuite/gcc.target/s390/pr79895.c
>
> diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
> index c9172d1153a..25d43ae3e13 100644
> --- a/gcc/config/s390/s390.cc
> +++ b/gcc/config/s390/s390.cc
> @@ -11342,13 +11342,6 @@ s390_can_change_mode_class (machine_mode from_mode,
>     return true;
>   }
>   
> -/* Return true if we use LRA instead of reload pass.  */
> -static bool
> -s390_lra_p (void)
> -{
> -  return s390_lra_flag;
> -}
> -
>   /* Return true if register FROM can be eliminated via register TO.  */
>   
>   static bool
> @@ -18444,9 +18437,6 @@ s390_c_mode_for_floating_type (enum tree_index ti)
>   #undef TARGET_LEGITIMATE_CONSTANT_P
>   #define TARGET_LEGITIMATE_CONSTANT_P s390_legitimate_constant_p
>   
> -#undef TARGET_LRA_P
> -#define TARGET_LRA_P s390_lra_p
> -
>   #undef TARGET_CAN_ELIMINATE
>   #define TARGET_CAN_ELIMINATE s390_can_eliminate
>   
> diff --git a/gcc/config/s390/s390.opt b/gcc/config/s390/s390.opt
> index a5b5aa95a12..23ea4b8232d 100644
> --- a/gcc/config/s390/s390.opt
> +++ b/gcc/config/s390/s390.opt
> @@ -229,10 +229,6 @@ Set the branch costs for conditional branch instructions.  Reasonable
>   values are small, non-negative integers.  The default branch cost is
>   1.
>   
> -mlra
> -Target Var(s390_lra_flag) Init(1) Save
> -Use LRA instead of reload.
> -
>   mpic-data-is-text-relative
>   Target Var(s390_pic_data_is_text_relative) Init(TARGET_DEFAULT_PIC_DATA_IS_TEXT_RELATIVE)
>   Assume data segments are relative to text segment.
> diff --git a/gcc/config/s390/s390.opt.urls b/gcc/config/s390/s390.opt.urls
> index ab1e761efa8..bc772d2ffc7 100644
> --- a/gcc/config/s390/s390.opt.urls
> +++ b/gcc/config/s390/s390.opt.urls
> @@ -74,8 +74,6 @@ UrlSuffix(gcc/S_002f390-and-zSeries-Options.html#index-mzarch)
>   
>   ; skipping UrlSuffix for 'mbranch-cost=' due to finding no URLs
>   
> -; skipping UrlSuffix for 'mlra' due to finding no URLs
> -
>   ; skipping UrlSuffix for 'mpic-data-is-text-relative' due to finding no URLs
>   
>   ; skipping UrlSuffix for 'mindirect-branch=' due to finding no URLs
> diff --git a/gcc/testsuite/gcc.target/s390/TI-constants-nolra.c b/gcc/testsuite/gcc.target/s390/TI-constants-nolra.c
> deleted file mode 100644
> index b9948fc4aa5..00000000000
> --- a/gcc/testsuite/gcc.target/s390/TI-constants-nolra.c
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -/* { dg-do compile { target int128 } } */
> -/* { dg-options "-O3 -mno-lra" } */
> -
> -/* 2x lghi */
> -__int128 a() {
> -  return 0;
> -}
> -
> -/* 2x lghi */
> -__int128 b() {
> -  return -1;
> -}
> -
> -/* 2x lghi */
> -__int128 c() {
> -  return -2;
> -}
> -
> -/* lghi + llilh */
> -__int128 d() {
> -  return 16000 << 16;
> -}
> -
> -/* lghi + llihf */
> -__int128 e() {
> -  return (unsigned long long)80000 << 32;
> -}
> -
> -/* lghi + llihf */
> -__int128 f() {
> -  return (unsigned __int128)80000 << 96;
> -}
> -
> -/* llihf + llihf - this is handled via movti_bigconst pattern */
> -__int128 g() {
> -  return ((unsigned __int128)80000 << 96) | ((unsigned __int128)80000 << 32);
> -}
> -
> -/* Literal pool */
> -__int128 h() {
> -  return ((unsigned __int128)80000 << 32) | 1;
> -}
> -
> -/* Literal pool */
> -__int128 i() {
> -  return (((unsigned __int128)80000 << 32) | 1) << 64;
> -}
> diff --git a/gcc/testsuite/gcc.target/s390/pr79895.c b/gcc/testsuite/gcc.target/s390/pr79895.c
> deleted file mode 100644
> index 02374e4b8a8..00000000000
> --- a/gcc/testsuite/gcc.target/s390/pr79895.c
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -/* { dg-do compile { target int128 } } */
> -/* { dg-options "-O1 -mno-lra" } */
> -
> -unsigned __int128 g;
> -void
> -foo ()
> -{
> -  g = (unsigned __int128)1 << 127;
> -}
diff mbox series

Patch

diff --git a/gcc/config/s390/s390.cc b/gcc/config/s390/s390.cc
index c9172d1153a..25d43ae3e13 100644
--- a/gcc/config/s390/s390.cc
+++ b/gcc/config/s390/s390.cc
@@ -11342,13 +11342,6 @@  s390_can_change_mode_class (machine_mode from_mode,
   return true;
 }
 
-/* Return true if we use LRA instead of reload pass.  */
-static bool
-s390_lra_p (void)
-{
-  return s390_lra_flag;
-}
-
 /* Return true if register FROM can be eliminated via register TO.  */
 
 static bool
@@ -18444,9 +18437,6 @@  s390_c_mode_for_floating_type (enum tree_index ti)
 #undef TARGET_LEGITIMATE_CONSTANT_P
 #define TARGET_LEGITIMATE_CONSTANT_P s390_legitimate_constant_p
 
-#undef TARGET_LRA_P
-#define TARGET_LRA_P s390_lra_p
-
 #undef TARGET_CAN_ELIMINATE
 #define TARGET_CAN_ELIMINATE s390_can_eliminate
 
diff --git a/gcc/config/s390/s390.opt b/gcc/config/s390/s390.opt
index a5b5aa95a12..23ea4b8232d 100644
--- a/gcc/config/s390/s390.opt
+++ b/gcc/config/s390/s390.opt
@@ -229,10 +229,6 @@  Set the branch costs for conditional branch instructions.  Reasonable
 values are small, non-negative integers.  The default branch cost is
 1.
 
-mlra
-Target Var(s390_lra_flag) Init(1) Save
-Use LRA instead of reload.
-
 mpic-data-is-text-relative
 Target Var(s390_pic_data_is_text_relative) Init(TARGET_DEFAULT_PIC_DATA_IS_TEXT_RELATIVE)
 Assume data segments are relative to text segment.
diff --git a/gcc/config/s390/s390.opt.urls b/gcc/config/s390/s390.opt.urls
index ab1e761efa8..bc772d2ffc7 100644
--- a/gcc/config/s390/s390.opt.urls
+++ b/gcc/config/s390/s390.opt.urls
@@ -74,8 +74,6 @@  UrlSuffix(gcc/S_002f390-and-zSeries-Options.html#index-mzarch)
 
 ; skipping UrlSuffix for 'mbranch-cost=' due to finding no URLs
 
-; skipping UrlSuffix for 'mlra' due to finding no URLs
-
 ; skipping UrlSuffix for 'mpic-data-is-text-relative' due to finding no URLs
 
 ; skipping UrlSuffix for 'mindirect-branch=' due to finding no URLs
diff --git a/gcc/testsuite/gcc.target/s390/TI-constants-nolra.c b/gcc/testsuite/gcc.target/s390/TI-constants-nolra.c
deleted file mode 100644
index b9948fc4aa5..00000000000
--- a/gcc/testsuite/gcc.target/s390/TI-constants-nolra.c
+++ /dev/null
@@ -1,47 +0,0 @@ 
-/* { dg-do compile { target int128 } } */
-/* { dg-options "-O3 -mno-lra" } */
-
-/* 2x lghi */
-__int128 a() {
-  return 0;
-}
-
-/* 2x lghi */
-__int128 b() {
-  return -1;
-}
-
-/* 2x lghi */
-__int128 c() {
-  return -2;
-}
-
-/* lghi + llilh */
-__int128 d() {
-  return 16000 << 16;
-}
-
-/* lghi + llihf */
-__int128 e() {
-  return (unsigned long long)80000 << 32;
-}
-
-/* lghi + llihf */
-__int128 f() {
-  return (unsigned __int128)80000 << 96;
-}
-
-/* llihf + llihf - this is handled via movti_bigconst pattern */
-__int128 g() {
-  return ((unsigned __int128)80000 << 96) | ((unsigned __int128)80000 << 32);
-}
-
-/* Literal pool */
-__int128 h() {
-  return ((unsigned __int128)80000 << 32) | 1;
-}
-
-/* Literal pool */
-__int128 i() {
-  return (((unsigned __int128)80000 << 32) | 1) << 64;
-}
diff --git a/gcc/testsuite/gcc.target/s390/pr79895.c b/gcc/testsuite/gcc.target/s390/pr79895.c
deleted file mode 100644
index 02374e4b8a8..00000000000
--- a/gcc/testsuite/gcc.target/s390/pr79895.c
+++ /dev/null
@@ -1,9 +0,0 @@ 
-/* { dg-do compile { target int128 } } */
-/* { dg-options "-O1 -mno-lra" } */
-
-unsigned __int128 g;
-void
-foo ()
-{
-  g = (unsigned __int128)1 << 127;
-}