On Wed, Oct 11, 2017 at 03:39:21PM -0400, Vladimir Makarov wrote:
> The following patch fixes
>
> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82353
>
> LRA did not update hard reg liveness on bb borders for hard regs which are
> part of insn patterns like CFLAGS reg. It was ok for inheritance in EBB
> which creates only moves and they usually have no embedded hard regs in the
> patterns. But LRA rematerialization needs this. So this patch implements
> such hard reg liveness updates.
>
> The patch was successfully bootstrapped and tested on x86-64.
>
> Committed as rev. 253656.
Thanks for the fix, however I believe we do not want C++ tests in
gcc.target/*/, those are historically handled in g++.dg/ (and if we wanted
to have them, we'd introduce g++.target/*/), furthermore the test requires
working -fsanitize=undefined and such tests belog into g++.dg/ubsan/
if they are in C++. And finally, the test fails on i386, where we
rematerialize something else, so I think we should just limit it to lp64.
Tested on x86_64-linux -m32/-m64, and verified with cc1plus before your
change, ok for trunk?
2017-10-11 Jakub Jelinek <ja...@redhat.com>
PR target/82353
* gcc.target/i386/i386.exp (tests): Revert the '.C' extension change.
* gcc.target/i386/pr82353.C: Moved to ...
* g++.dg/ubsan/pr82353.C: ... here. Restrict to i?86/x86_64 && lp64.
--- gcc/testsuite/gcc.target/i386/i386.exp.jj 2017-10-11 22:37:51.000000000
+0200
+++ gcc/testsuite/gcc.target/i386/i386.exp 2017-10-11 22:59:47.455746874
+0200
@@ -445,7 +445,7 @@ if [runtest_file_p $runtests $srcdir/$su
}
# Everything else.
-set tests [lsort [glob -nocomplain $srcdir/$subdir/*.\[cCS\]]]
+set tests [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]]
set tests [prune $tests $srcdir/$subdir/vect-args.c]
# Main loop.
--- gcc/testsuite/gcc.target/i386/pr82353.C.jj 2017-10-11 22:37:51.000000000
+0200
+++ gcc/testsuite/gcc.target/i386/pr82353.C 2017-10-11 23:01:37.618390302
+0200
@@ -1,60 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -std=c++11 -fsanitize=undefined
-fno-sanitize-recover=undefined -w -fdump-rtl-reload" } */
-
-extern unsigned long tf_2_var_1, tf_2_var_21;
-extern bool tf_2_var_2, tf_2_var_24, tf_2_var_6, tf_2_var_5;
-extern unsigned char tf_2_var_16, tf_2_var_31;
-extern short tf_2_var_69;
-extern unsigned tf_2_var_233;
-struct tf_2_struct_1 {
- short member_1_0 : 27;
- long member_1_1 : 10;
-};
-struct a {
- int member_2_0 : 5;
-};
-struct tf_2_struct_3 {
- static tf_2_struct_1 member_3_0;
-};
-struct tf_2_struct_4 {
- static unsigned member_4_0;
- a member_4_1;
-};
-struct tf_2_struct_5 {
- tf_2_struct_1 member_5_2;
- tf_2_struct_4 member_5_4;
-};
-struct tf_2_struct_6 {
- tf_2_struct_5 member_6_2;
- short member_6_4;
-} extern tf_2_struct_obj_2;
-extern tf_2_struct_3 tf_2_struct_obj_8;
-tf_2_struct_1 a;
-tf_2_struct_5 b;
-tf_2_struct_1 tf_2_struct_3::member_3_0;
-unsigned tf_2_struct_4::member_4_0;
-void tf_2_init() {
- a.member_1_1 = tf_2_struct_obj_2.member_6_2.member_5_2.member_1_1 = 5;
-}
-void tf_2_foo() {
- int c = tf_2_struct_obj_2.member_6_2.member_5_4.member_4_1.member_2_0 -
- -~tf_2_struct_obj_2.member_6_4 * char(90284000534361);
- tf_2_struct_obj_8.member_3_0.member_1_0 =
- tf_2_var_24 >
- tf_2_var_21 * a.member_1_0 * tf_2_var_2 - tf_2_var_5 % a.member_1_1;
- if ((~(tf_2_var_31 * tf_2_var_6) &&
- -~tf_2_struct_obj_2.member_6_4 * 90284000534361) %
- ~tf_2_var_31 * tf_2_var_6)
- b.member_5_2.member_1_0 << tf_2_var_16 << tf_2_var_1;
- tf_2_var_233 = -~tf_2_struct_obj_2.member_6_4 * char(90284000534361);
- int d(tf_2_struct_obj_2.member_6_4);
- if (b.member_5_2.member_1_0)
- b.member_5_2.member_1_1 = c;
- bool e(~-~tf_2_struct_obj_2.member_6_4);
- a.member_1_1 % e;
- if (tf_2_var_5 / tf_2_struct_obj_2.member_6_2.member_5_2.member_1_1)
- b.member_5_4.member_4_0 = tf_2_var_21 * a.member_1_0 * tf_2_var_2;
- tf_2_var_69 = tf_2_var_6;
-}
-
-/* { dg-final { scan-rtl-dump-not "Inserting rematerialization insn" "reload"
} } */
--- gcc/testsuite/g++.dg/ubsan/pr82353.C.jj 2017-10-11 23:00:59.442860406
+0200
+++ gcc/testsuite/g++.dg/ubsan/pr82353.C 2017-10-11 23:04:27.264301238
+0200
@@ -0,0 +1,60 @@
+/* { dg-do compile { target { { i?86-*-* x86_64-*-* } && lp64 } } } */
+/* { dg-options "-O2 -std=c++11 -fsanitize=undefined
-fno-sanitize-recover=undefined -w -fdump-rtl-reload" } */
+
+extern unsigned long tf_2_var_1, tf_2_var_21;
+extern bool tf_2_var_2, tf_2_var_24, tf_2_var_6, tf_2_var_5;
+extern unsigned char tf_2_var_16, tf_2_var_31;
+extern short tf_2_var_69;
+extern unsigned tf_2_var_233;
+struct tf_2_struct_1 {
+ short member_1_0 : 27;
+ long member_1_1 : 10;
+};
+struct a {
+ int member_2_0 : 5;
+};
+struct tf_2_struct_3 {
+ static tf_2_struct_1 member_3_0;
+};
+struct tf_2_struct_4 {
+ static unsigned member_4_0;
+ a member_4_1;
+};
+struct tf_2_struct_5 {
+ tf_2_struct_1 member_5_2;
+ tf_2_struct_4 member_5_4;
+};
+struct tf_2_struct_6 {
+ tf_2_struct_5 member_6_2;
+ short member_6_4;
+} extern tf_2_struct_obj_2;
+extern tf_2_struct_3 tf_2_struct_obj_8;
+tf_2_struct_1 a;
+tf_2_struct_5 b;
+tf_2_struct_1 tf_2_struct_3::member_3_0;
+unsigned tf_2_struct_4::member_4_0;
+void tf_2_init() {
+ a.member_1_1 = tf_2_struct_obj_2.member_6_2.member_5_2.member_1_1 = 5;
+}
+void tf_2_foo() {
+ int c = tf_2_struct_obj_2.member_6_2.member_5_4.member_4_1.member_2_0 -
+ -~tf_2_struct_obj_2.member_6_4 * char(90284000534361);
+ tf_2_struct_obj_8.member_3_0.member_1_0 =
+ tf_2_var_24 >
+ tf_2_var_21 * a.member_1_0 * tf_2_var_2 - tf_2_var_5 % a.member_1_1;
+ if ((~(tf_2_var_31 * tf_2_var_6) &&
+ -~tf_2_struct_obj_2.member_6_4 * 90284000534361) %
+ ~tf_2_var_31 * tf_2_var_6)
+ b.member_5_2.member_1_0 << tf_2_var_16 << tf_2_var_1;
+ tf_2_var_233 = -~tf_2_struct_obj_2.member_6_4 * char(90284000534361);
+ int d(tf_2_struct_obj_2.member_6_4);
+ if (b.member_5_2.member_1_0)
+ b.member_5_2.member_1_1 = c;
+ bool e(~-~tf_2_struct_obj_2.member_6_4);
+ a.member_1_1 % e;
+ if (tf_2_var_5 / tf_2_struct_obj_2.member_6_2.member_5_2.member_1_1)
+ b.member_5_4.member_4_0 = tf_2_var_21 * a.member_1_0 * tf_2_var_2;
+ tf_2_var_69 = tf_2_var_6;
+}
+
+/* { dg-final { scan-rtl-dump-not "Inserting rematerialization insn" "reload"
} } */
Jakub
