OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

p9-options-1.c: New test. 

gcc/testsuite/ChangeLog:

2017-03-23  Kelvin Nilsen  <kelvin@gcc.gnu.org>

	* gcc.target/powerpc/p9-options-1.c: New test.

gcc/ChangeLog:

2017-03-23  Kelvin Nilsen  <kelvin@gcc.gnu.org>

	* config/rs6000/rs6000.c (rs6000_option_override_internal): Change
	handling of certain combinations of target options, including the
	combinations -mpower8-vector vs. -mno-vsx, -mpower9-vector vs.
	-mno-power8-vector, and -mpower9_dform vs. -mno-power9-vector.

From-SVN: r246428
This commit is contained in:
Kelvin Nilsen 2017-03-23 22:12:06 +00:00
parent 01e3c2296a
commit 842392c856
4 changed files with 87 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2017-03-23 Kelvin Nilsen <kelvin@gcc.gnu.org>
* config/rs6000/rs6000.c (rs6000_option_override_internal): Change
handling of certain combinations of target options, including the
combinations -mpower8-vector vs. -mno-vsx, -mpower9-vector vs.
-mno-power8-vector, and -mpower9_dform vs. -mno-power9-vector.
2017-03-23 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
PR target/71436

55
gcc/config/rs6000/rs6000.c
View File

@ -4315,9 +4315,22 @@ rs6000_option_override_internal (bool global_init_p)
if (TARGET_P8_VECTOR && !TARGET_VSX)
{
if (rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR)
if ((rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR)
&& (rs6000_isa_flags_explicit & OPTION_MASK_VSX))
error ("-mpower8-vector requires -mvsx");
rs6000_isa_flags &= ~OPTION_MASK_P8_VECTOR;
else if ((rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR) == 0)
{
rs6000_isa_flags &= ~OPTION_MASK_P8_VECTOR;
if (rs6000_isa_flags_explicit & OPTION_MASK_VSX)
rs6000_isa_flags_explicit |= OPTION_MASK_P8_VECTOR;
}
else
{
/* OPTION_MASK_P8_VECTOR is explicit, and OPTION_MASK_VSX is
not explicit. */
rs6000_isa_flags |= OPTION_MASK_VSX;
rs6000_isa_flags_explicit |= OPTION_MASK_VSX;
}
}
if (TARGET_VSX_TIMODE && !TARGET_VSX)
@ -4517,9 +4530,22 @@ rs6000_option_override_internal (bool global_init_p)
error messages. However, if users have managed to select
power9-vector without selecting power8-vector, they
already know about undocumented flags. */
if (rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR)
if ((rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR) &&
(rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR))
error ("-mpower9-vector requires -mpower8-vector");
rs6000_isa_flags &= ~OPTION_MASK_P9_VECTOR;
else if ((rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR) == 0)
{
rs6000_isa_flags &= ~OPTION_MASK_P9_VECTOR;
if (rs6000_isa_flags_explicit & OPTION_MASK_P8_VECTOR)
rs6000_isa_flags_explicit |= OPTION_MASK_P9_VECTOR;
}
else
{
/* OPTION_MASK_P9_VECTOR is explicit and
OPTION_MASK_P8_VECTOR is not explicit. */
rs6000_isa_flags |= OPTION_MASK_P8_VECTOR;
rs6000_isa_flags_explicit |= OPTION_MASK_P8_VECTOR;
}
}
/* -mpower9-dform turns on both -mpower9-dform-scalar and
@ -4548,10 +4574,25 @@ rs6000_option_override_internal (bool global_init_p)
error messages. However, if users have managed to select
power9-dform without selecting power9-vector, they
already know about undocumented flags. */
if (rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR)
if ((rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR)
&& (rs6000_isa_flags_explicit & (OPTION_MASK_P9_DFORM_SCALAR
| OPTION_MASK_P9_DFORM_VECTOR)))
error ("-mpower9-dform requires -mpower9-vector");
rs6000_isa_flags &= ~(OPTION_MASK_P9_DFORM_SCALAR
| OPTION_MASK_P9_DFORM_VECTOR);
else if (rs6000_isa_flags_explicit & OPTION_MASK_P9_VECTOR)
{
rs6000_isa_flags &=
~(OPTION_MASK_P9_DFORM_SCALAR | OPTION_MASK_P9_DFORM_VECTOR);
rs6000_isa_flags_explicit |=
(OPTION_MASK_P9_DFORM_SCALAR | OPTION_MASK_P9_DFORM_VECTOR);
}
else
{
/* We know that OPTION_MASK_P9_VECTOR is not explicit and
OPTION_MASK_P9_DFORM_SCALAR or OPTION_MASK_P9_DORM_VECTOR
may be explicit. */
rs6000_isa_flags |= OPTION_MASK_P9_VECTOR;
rs6000_isa_flags_explicit |= OPTION_MASK_P9_VECTOR;
}
}
if (TARGET_P9_DFORM_SCALAR && !TARGET_UPPER_REGS_DF)

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2017-03-23 Kelvin Nilsen <kelvin@gcc.gnu.org>
* gcc.target/powerpc/p9-options-1.c: New test.
2017-03-23 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
PR target/71436

28
gcc/testsuite/gcc.target/powerpc/p9-options-1.c Normal file
View File

@ -0,0 +1,28 @@
/* { dg-do compile { target { powerpc*-*-* } } } */
/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power9" } } */
/* { dg-require-effective-target powerpc_p9vector_ok } */
/* { dg-options "-mcpu=power9 -mno-power9-vector" } */
#include <altivec.h>
/* This program's "test for excess errors" demonstrates that combining
the target options -mcpu=power9 and -mno-power9-vector does not
result in an error. A previous version of the compiler aborted
with the error message:
"power9-dform requires power9-vector."
when these two options were used in combination.
The newer version of the compiler, instead, automatically disables
power9-dform when the -mno-power9-vector command-line option is
specified. */
int
test_any_equal (vector bool char *arg1_p, vector bool char *arg2_p)
{
vector bool char arg_1 = *arg1_p;
vector bool char arg_2 = *arg2_p;
return vec_any_eq (arg_1, arg_2);
}