rs6000: Testsuite changes to go with the previous commit

	== The actual changelog had
	==	Backport from trunk
	==	2020-06-22  Segher Boessenkool  <segher@kernel.crashing.org>
	== but the commit scripts refuse that

2020-06-30  Segher Boessenkool  <segher@kernel.crashing.org>

gcc/testsuite/ChangeLog:
	* gcc.target/powerpc/cpu-future.c: Something was done here.
	* gcc.target/powerpc/localentry-1.c: Something was done here.
	* gcc.target/powerpc/localentry-detect-1.c: Something was done here.
	* gcc.target/powerpc/mma-builtin-1.c: Something was done here.
	* gcc.target/powerpc/mma-builtin-2.c: Something was done here.
	* gcc.target/powerpc/mma-builtin-3.c: Something was done here.
	* gcc.target/powerpc/mma-builtin-4.c: Something was done here.
	* gcc.target/powerpc/mma-builtin-5.c: Something was done here.
	* gcc.target/powerpc/mma-builtin-6.c: Something was done here.
	* gcc.target/powerpc/notoc-direct-1.c: Something was done here.
	* gcc.target/powerpc/pcrel-sibcall-1.c: Something was done here.
	* gcc.target/powerpc/pr93122.c: Something was done here.
	* lib/target-supports.exp: Stuff.

diff --git a/gcc/testsuite/gcc.target/powerpc/cpu-future.c b/gcc/testsuite/gcc.target/powerpc/cpu-future.c
index ae406d08b238e3d7179b104ffbba5b6573badd54..723a8fb88ff839fa71b352e31c1a398710da9aa7 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/cpu-future.c
+++ b/gcc/testsuite/gcc.target/powerpc/cpu-future.c
@@ -1,7 +1,7 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
 
-/* Ensure -mcpu=future compiles cleanly.  */
+/* Ensure -mcpu=power10 compiles cleanly.  */
 
 void x (void) { }

diff --git a/gcc/testsuite/gcc.target/powerpc/localentry-1.c b/gcc/testsuite/gcc.target/powerpc/localentry-1.c
index 068b0c080bb7036470998ce38587379d0149753f..c3c51680cfe5daddd4729ffc251398bedf8aea0b 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/localentry-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/localentry-1.c
@@ -1,10 +1,10 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future -O2 -mpcrel" } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2 -mpcrel" } */
 /* { dg-require-effective-target powerpc_elfv2 } */
-/* { dg-require-effective-target powerpc_future_ok } */
+/* { dg-require-effective-target power10_ok } */
 
 /* Ensure we generate ".localentry fn,1" for both leaf and non-leaf functions.
-   At present, -mcpu=future does not enable pc-relative mode, so make sure we
+   At present, -mcpu=power10 does not enable pc-relative mode, so make sure we
    enable it to be able to check for .localentry.  */
 
 extern int y (int);

diff --git a/gcc/testsuite/gcc.target/powerpc/localentry-detect-1.c b/gcc/testsuite/gcc.target/powerpc/localentry-detect-1.c
index e67e7f824f8e55916243db5e3a7d5f4afdefbaed..9023b318bd4ee76a65dade86fbc0f30d3d10ee4b 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/localentry-detect-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/localentry-detect-1.c
@@ -1,11 +1,11 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target powerpc_elfv2 } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-O2 -mdejagnu-cpu=future" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-O2 -mdejagnu-cpu=power10" } */
 
-/* At present, -mcpu=future does not enable pc-relative mode.  Enable it here
+/* At present, -mcpu=power10 does not enable pc-relative mode.  Enable it here
    explicitly until it is turned on by default.  */
-#pragma GCC target ("cpu=future,pcrel")
+#pragma GCC target ("cpu=power10,pcrel")
 int localentry1 () { return 5; }
 
 #pragma GCC target ("cpu=power9,no-pcrel")

diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-1.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-1.c
index a971c869095acde79823e732d5635014fe3443ca..69ee826e1be912e1d261f3936ff8169da91c3a1a 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-1.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 typedef unsigned char  vec_t __attribute__((vector_size(16)));
 

diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-2.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-2.c
index cb8b30dd992d2db86f8c601c2111c21b2dc00092..0230d727657f1f935ad3dcbbfad44a17e4a78418 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-2.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 typedef unsigned char  vec_t __attribute__((vector_size(16)));
 

diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-3.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-3.c
index 5406707061e55342c36d12bb1f97c776f4d45f4b..29eb275499906d496dee65a3078b0ac82cbc82f3 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-3.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 void
 foo0 (void)

diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-4.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-4.c
index 138d1b46bc4f11a779b38aeebec4e2ac1c01f6a9..f3a857bb8c13844531e1b2c4939b83a445643bc8 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-4.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 typedef unsigned char vec_t __attribute__((vector_size(16)));
 

diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-5.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-5.c
index 0ee45b6bdfd882b07b0e6e4c59a3179afabd4f8d..43b6d3ac91e3e8f65223aadaed3c0ec36496f6bb 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-5.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 typedef unsigned char vec_t __attribute__((vector_size(16)));
 

diff --git a/gcc/testsuite/gcc.target/powerpc/mma-builtin-6.c b/gcc/testsuite/gcc.target/powerpc/mma-builtin-6.c
index c0b5eedd3d173242f1db124e67cf2641b838b2b6..0c6517211e3b32702258e6b8e743ba79891cc90d 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/mma-builtin-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/mma-builtin-6.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_future_ok } */
-/* { dg-options "-Wno-psabi -mdejagnu-cpu=future -O2" } */
+/* { dg-require-effective-target power10_ok } */
+/* { dg-options "-Wno-psabi -mdejagnu-cpu=power10 -O2" } */
 
 void
 foo (__vector_quad *dst)

diff --git a/gcc/testsuite/gcc.target/powerpc/notoc-direct-1.c b/gcc/testsuite/gcc.target/powerpc/notoc-direct-1.c
index 8603ff7706b8c4a31b4ecd0c2f12c18995bb259a..74187e1d5dc7c5e8acc060922d173eb53e443c1c 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/notoc-direct-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/notoc-direct-1.c
@@ -1,10 +1,10 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future -O2 -mpcrel" } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2 -mpcrel" } */
 /* { dg-require-effective-target powerpc_elfv2 } */
-/* { dg-require-effective-target powerpc_future_ok } */
+/* { dg-require-effective-target power10_ok } */
 
 /* Test that calls generated from PC-relative code are annotated with @notoc.
-   At present, -mcpu=future does not enable pc-relative mode.  Enable it here
+   At present, -mcpu=power10 does not enable pc-relative mode.  Enable it here
    explicitly until it is turned on by default.  */
 
 extern int yy0 (int);

diff --git a/gcc/testsuite/gcc.target/powerpc/pcrel-sibcall-1.c b/gcc/testsuite/gcc.target/powerpc/pcrel-sibcall-1.c
index 0cb40d45ace5dc204379b080a10a3a073c638464..dfcf8183ccda903111bf57291da90270fc528d35 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/pcrel-sibcall-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pcrel-sibcall-1.c
@@ -1,14 +1,14 @@
 /* { dg-do compile } */
-/* { dg-options "-mdejagnu-cpu=future -O2" } */
+/* { dg-options "-mdejagnu-cpu=power10 -O2" } */
 /* { dg-require-effective-target powerpc_elfv2 } */
-/* { dg-require-effective-target powerpc_future_ok } */
+/* { dg-require-effective-target power10_ok } */
 
 /* Test that potential sibcalls are not generated when the caller preserves the
-   TOC and the callee doesn't, or vice versa.  At present, -mcpu=future does
+   TOC and the callee doesn't, or vice versa.  At present, -mcpu=power10 does
    not enable pc-relative mode.  Enable it here explicitly until it is turned
    on by default.  */
 
-#pragma GCC target ("cpu=future,pcrel")
+#pragma GCC target ("cpu=power10,pcrel")
 int x (void) __attribute__((noinline));
 int y (void) __attribute__((noinline));
 int xx (void) __attribute__((noinline));
@@ -39,7 +39,7 @@ int xx (void)
   return 1;
 }
 
-#pragma GCC target ("cpu=future,pcrel")
+#pragma GCC target ("cpu=power10,pcrel")
 int notoc_call (void)
 {
   return xx ();

diff --git a/gcc/testsuite/gcc.target/powerpc/pr93122.c b/gcc/testsuite/gcc.target/powerpc/pr93122.c
index a440a05c98a0f684fb7f4cfaf79f1eda362ba559..8ea4eb6a48bbe2974bef9ccf1f04191de741f1c2 100644 (file)
--- a/gcc/testsuite/gcc.target/powerpc/pr93122.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr93122.c
@@ -1,7 +1,7 @@
 /* PR target/93122 */
-/* { dg-require-effective-target powerpc_future_ok } */
+/* { dg-require-effective-target power10_ok } */
 /* { dg-do compile { target lp64 } } */
-/* { dg-options "-fstack-clash-protection -mprefixed -mfuture" } */
+/* { dg-options "-fstack-clash-protection -mprefixed -mcpu=power10" } */
 
 void bar (char *);
 

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 094bb5218aaebb02762696dc2c5a2d6742cb7c6c..d19cb2b3c0605047bfbdef0cd4d853d012b59100 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -2196,13 +2196,13 @@ proc check_p9modulo_hw_available { } {
 }
 
 
-# Return 1 if the target supports executing FUTURE instructions, 0 otherwise.
+# Return 1 if the target supports executing power10 instructions, 0 otherwise.
 # Cache the result.  It is assumed that if a simulator does not support the
-# FUTURE instructions, that it will generate an error and this test will fail.
+# power10 instructions, that it will generate an error and this test will fail.
 
-proc check_powerpc_future_hw_available { } {
-    return [check_cached_effective_target powerpc_future_hw_available {
-       check_runtime_nocache powerpc_future_hw_available {
+proc check_power10_hw_available { } {
+    return [check_cached_effective_target power10_hw_available {
+       check_runtime_nocache power10_hw_available {
            int main()
            {
                /* Set e first and use +r to check if pli actually works.  */
@@ -2210,7 +2210,7 @@ proc check_powerpc_future_hw_available { } {
                asm ("pli %0,%1" : "+r" (e) : "n" (0x12345));
                return (e == 0x12345);
            }
-       } "-mfuture"
+       } "-mcpu=power10"
     }]
 }
 
@@ -2652,7 +2652,7 @@ proc check_effective_target_p8 {  } {
   } ""]
 }
 
-# Return 1 if we're generating code for power9 and future platforms.
+# Return 1 if we're generating code for power9 or later platforms.
 
 proc check_effective_target_p9+ {  } {
   return [check_no_compiler_messages_nocache p9+ assembly {
@@ -5810,19 +5810,19 @@ proc check_effective_target_has_arch_pwr9 { } {
        }]
 }
 
-# Return 1 if this is a PowerPC target supporting -mfuture.
-# Limit this to 64-bit linux systems for now until other
-# targets support FUTURE.
+# Return 1 if this is a PowerPC target supporting -mcpu=power10.
+# Limit this to 64-bit linux systems for now until other targets support
+# power10.
 
-proc check_effective_target_powerpc_future_ok { } {
+proc check_effective_target_power10_ok { } {
     if { ([istarget powerpc64*-*-linux*]) } {
-       return [check_no_compiler_messages powerpc_future_ok object {
+       return [check_no_compiler_messages power10_ok object {
            int main (void) {
                long e;
                asm ("pli %0,%1" : "=r" (e) : "n" (0x12345));
                return e;
            }
-       } "-mfuture"]
+       } "-mcpu=power10"]
     } else {
        return 0
     }
@@ -7769,6 +7769,7 @@ proc is-effective-target { arg } {
          "named_sections" { set selected [check_named_sections_available] }
          "gc_sections"    { set selected [check_gc_sections_available] }
          "cxa_atexit"     { set selected [check_cxa_atexit_available] }
+         "power10_hw" { set selected [check_power10_hw_available] }
          default          { error "unknown effective target keyword `$arg'" }
        }
     }