Hi,
This fixes the FMV powerpc tests I recently committed, and hopefully makes them
work on a wider range of target configurations.
I plan to commit this on Monday if no one has any objections.
Thanks,
Alfie
--- >8 ---
As discussed on the BZ page, this removes the tests on the symbols in the
resolver which proved overly specific, and modifies the branch instruction tests
to work more broadly.
PR testsuite/120519
gcc/testsuite/ChangeLog:
* g++.target/powerpc/mvc-symbols1.C: Modify tests.
* g++.target/powerpc/mvc-symbols2.C: Ditto.
* g++.target/powerpc/mvc-symbols3.C: Ditto.
* g++.target/powerpc/mvc-symbols4.C: Ditto.
---
gcc/testsuite/g++.target/powerpc/mvc-symbols1.C | 10 ++--------
gcc/testsuite/g++.target/powerpc/mvc-symbols2.C | 6 ------
gcc/testsuite/g++.target/powerpc/mvc-symbols3.C | 10 ++--------
gcc/testsuite/g++.target/powerpc/mvc-symbols4.C | 6 ------
4 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/gcc/testsuite/g++.target/powerpc/mvc-symbols1.C
b/gcc/testsuite/g++.target/powerpc/mvc-symbols1.C
index 9424382bf14..ba5492ab451 100644
--- a/gcc/testsuite/g++.target/powerpc/mvc-symbols1.C
+++ b/gcc/testsuite/g++.target/powerpc/mvc-symbols1.C
@@ -28,20 +28,14 @@ int bar(int x)
/* { dg-final { scan-assembler-times "\n_Z3foov\.cpu_power6:\n" 1 } } */
/* { dg-final { scan-assembler-times "\n_Z3foov\.cpu_power6x:\n" 1 } } */
/* { dg-final { scan-assembler-times "\n_Z3foov\.resolver:\n" 1 } } */
-/* { dg-final { scan-assembler-times "\n\tbl _Z3foov\n" 1 } } */
+/* { dg-final { scan-assembler-times "\n\tbl _Z3foov(\n|@)" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.type\t_Z3foov,
@gnu_indirect_function\n" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.set\t_Z3foov,_Z3foov\.resolver\n"
1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3foov\.default\n" 1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3foov\.cpu_power6\n" 1 } }
*/
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3foov\.cpu_power6x\n" 0 }
} */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.default:\n" 1 } } */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.cpu_power6:\n" 1 } } */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.cpu_power6x:\n" 1 } } */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.resolver:\n" 1 } } */
-/* { dg-final { scan-assembler-times "\n\tbl _Z3fooi\n" 1 } } */
+/* { dg-final { scan-assembler-times "\n\tbl _Z3fooi(\n|@)" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.type\t_Z3fooi,
@gnu_indirect_function\n" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.set\t_Z3fooi,_Z3fooi\.resolver\n"
1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3fooi\.default\n" 1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3fooi\.cpu_power6\n" 0 } }
*/
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3fooi\.cpu_power6x\n" 1 }
} */
diff --git a/gcc/testsuite/g++.target/powerpc/mvc-symbols2.C
b/gcc/testsuite/g++.target/powerpc/mvc-symbols2.C
index edf54480efd..fe96dc4a7a3 100644
--- a/gcc/testsuite/g++.target/powerpc/mvc-symbols2.C
+++ b/gcc/testsuite/g++.target/powerpc/mvc-symbols2.C
@@ -20,9 +20,6 @@ int foo (int)
/* { dg-final { scan-assembler-times "\n_Z3foov\.resolver:\n" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.type\t_Z3foov,
@gnu_indirect_function\n" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.set\t_Z3foov,_Z3foov\.resolver\n"
1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3foov\.default\n" 1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3foov\.cpu_power6\n" 1 } }
*/
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3foov\.cpu_power6x\n" 0 }
} */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.default:\n" 1 } } */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.cpu_power6:\n" 1 } } */
@@ -30,6 +27,3 @@ int foo (int)
/* { dg-final { scan-assembler-times "\n_Z3fooi\.resolver:\n" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.type\t_Z3fooi,
@gnu_indirect_function\n" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.set\t_Z3fooi,_Z3fooi\.resolver\n"
1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3fooi\.default\n" 1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3fooi\.cpu_power6\n" 0 } }
*/
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3fooi\.cpu_power6x\n" 1 }
} */
diff --git a/gcc/testsuite/g++.target/powerpc/mvc-symbols3.C
b/gcc/testsuite/g++.target/powerpc/mvc-symbols3.C
index ca79c7f979c..c44acafb8e3 100644
--- a/gcc/testsuite/g++.target/powerpc/mvc-symbols3.C
+++ b/gcc/testsuite/g++.target/powerpc/mvc-symbols3.C
@@ -22,20 +22,14 @@ int bar(int x)
/* { dg-final { scan-assembler-times "\n_Z3foov\.cpu_power6:\n" 0 } } */
/* { dg-final { scan-assembler-times "\n_Z3foov\.cpu_power6x:\n" 0 } } */
/* { dg-final { scan-assembler-times "\n_Z3foov\.resolver:\n" 1 } } */
-/* { dg-final { scan-assembler-times "\n\tbl _Z3foov\n" 1 } } */
+/* { dg-final { scan-assembler-times "\n\tbl _Z3foov(\n|@)" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.type\t_Z3foov,
@gnu_indirect_function\n" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.set\t_Z3foov,_Z3foov\.resolver\n"
1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3foov\.default\n" 1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3foov\.cpu_power6\n" 1 } }
*/
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3foov\.cpu_power6x\n" 0 }
} */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.default:\n" 0 } } */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.cpu_power6:\n" 0 } } */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.cpu_power6x:\n" 0 } } */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.resolver:\n" 1 } } */
-/* { dg-final { scan-assembler-times "\n\tbl _Z3fooi\n" 1 } } */
+/* { dg-final { scan-assembler-times "\n\tbl _Z3fooi(\n|@)" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.type\t_Z3fooi,
@gnu_indirect_function\n" 1 } } */
/* { dg-final { scan-assembler-times "\n\t\.set\t_Z3fooi,_Z3fooi\.resolver\n"
1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3foov\.default\n" 1 } } */
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3fooi\.cpu_power6\n" 0 } }
*/
-/* { dg-final { scan-assembler-times "\n\t\.quad\t_Z3fooi\.cpu_power6x\n" 1 }
} */
diff --git a/gcc/testsuite/g++.target/powerpc/mvc-symbols4.C
b/gcc/testsuite/g++.target/powerpc/mvc-symbols4.C
index ec111f53d93..fe558f94f29 100644
--- a/gcc/testsuite/g++.target/powerpc/mvc-symbols4.C
+++ b/gcc/testsuite/g++.target/powerpc/mvc-symbols4.C
@@ -14,9 +14,6 @@ int foo (int);
/* { dg-final { scan-assembler-times "\n_Z3foov\.resolver:\n" 0 } } */
/* { dg-final { scan-assembler-times "\n\t\.type\t_Z3foov,
@gnu_indirect_function\n" 0 } } */
/* { dg-final { scan-assembler-times "\n\t\.set\t_Z3foov,_Z3foov\.resolver\n"
0 } } */
-/* { dg-final { scan-assembler-times "\n\tlis \[\\d\]+,_Z3foov\.default@ha\n"
0 } } */
-/* { dg-final { scan-assembler-times "\n\tlis
\[\\d\]+,_Z3foov\.cpu_power6@ha\n" 0 } } */
-/* { dg-final { scan-assembler-times "\n\tlis
\[\\d\]+,_Z3foov\.cpu_power6x@ha\n" 0 } } */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.default:\n" 0 } } */
/* { dg-final { scan-assembler-times "\n_Z3fooi\.cpu_power6:\n" 0 } } */
@@ -24,6 +21,3 @@ int foo (int);
/* { dg-final { scan-assembler-times "\n_Z3fooi\.resolver:\n" 0 } } */
/* { dg-final { scan-assembler-times "\n\t\.type\t_Z3fooi,
@gnu_indirect_function\n" 0 } } */
/* { dg-final { scan-assembler-times "\n\t\.set\t_Z3fooi,_Z3fooi\.resolver\n"
0 } } */
-/* { dg-final { scan-assembler-times "\n\tlis \[\\d\]+,_Z3fooi\.default@ha\n"
0 } } */
-/* { dg-final { scan-assembler-times "\n\tlis
\[\\d\]+,_Z3fooi\.cpu_power6@ha\n" 0 } } */
-/* { dg-final { scan-assembler-times "\n\tlis
\[\\d\]+,_Z3fooi\.cpu_power6x@ha\n" 0 } } */
--
2.34.1
