| Message ID | 20200213224457.GL17695@tucnak |
|---|---|
| State | New |
| Headers | show |
| Series | Backports to 9.3 | expand |
On Thu, Feb 13, 2020 at 2:46 PM Jakub Jelinek <jakub@redhat.com> wrote: > > Hi! > > I've backported following 15 commits from trunk to 9.3 branch, > bootstrapped/regtested on x86_64-linux and i686-linux, committed. > Hi Jakub, Are you preparing for GCC 9.3? I'd like to include this in GCC 9.3: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=1d69147af203d4dcd2270429f90c93f1a37ddfff It is very safe. Uros asked me to wait for a week before backporting to GCC 9 branch. I am planning to do it next Thursday. Thanks.
On Fri, Feb 14, 2020 at 07:45:43AM -0800, H.J. Lu wrote: > Are you preparing for GCC 9.3? I'd like to include this in GCC 9.3: > > https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=1d69147af203d4dcd2270429f90c93f1a37ddfff > > It is very safe. Uros asked me to wait for a week before backporting to > GCC 9 branch. I am planning to do it next Thursday. Richi wants to do 8.4 first, am backporting a lot of patches to that now. I'd say we should aim for 8.4 rc next week or say on Monday 24th and release a week after that and 9.3 maybe one week later than that. Jakub
On Fri, Feb 14, 2020 at 7:51 AM Jakub Jelinek <jakub@redhat.com> wrote: > > On Fri, Feb 14, 2020 at 07:45:43AM -0800, H.J. Lu wrote: > > Are you preparing for GCC 9.3? I'd like to include this in GCC 9.3: > > > > https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=1d69147af203d4dcd2270429f90c93f1a37ddfff > > > > It is very safe. Uros asked me to wait for a week before backporting to > > GCC 9 branch. I am planning to do it next Thursday. > > Richi wants to do 8.4 first, am backporting a lot of patches to that now. > I'd say we should aim for 8.4 rc next week or say on Monday 24th I am planning to back it to both GCC 8 and 9 branches next Thursday. I think I will be fine. > and release a week after that and 9.3 maybe one week later than that. > > Jakub > Thanks.
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1916dab20d1..2029c67bf02 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2020-02-13 Jakub Jelinek <jakub@redhat.com> + + Backported from mainline + 2020-01-23 Jakub Jelinek <jakub@redhat.com> + + PR rtl-optimization/93402 + * postreload.c (reload_combine_recognize_pattern): Don't try to adjust + USE insns. + 2020-02-11 Tamar Christina <tamar.christina@arm.com> Backport from mainline diff --git a/gcc/postreload.c b/gcc/postreload.c index 728aa9b0ed5..b76c7b0b758 100644 --- a/gcc/postreload.c +++ b/gcc/postreload.c @@ -1081,6 +1081,10 @@ reload_combine_recognize_pattern (rtx_insn *insn) struct reg_use *use = reg_state[regno].reg_use + i; if (GET_MODE (*use->usep) != mode) return false; + /* Don't try to adjust (use (REGX)). */ + if (GET_CODE (PATTERN (use->insn)) == USE + && &XEXP (PATTERN (use->insn), 0) == use->usep) + return false; } /* Look for (set (REGX) (CONST_INT)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1dcf894a92a..bec5eba5033 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2020-02-13 Jakub Jelinek <jakub@redhat.com> + + Backported from mainline + 2020-01-23 Jakub Jelinek <jakub@redhat.com> + + PR rtl-optimization/93402 + * gcc.c-torture/execute/pr93402.c: New test. + 2020-02-11 Tamar Christina <tamar.christina@arm.com> Backport from mainline diff --git a/gcc/testsuite/gcc.c-torture/execute/pr93402.c b/gcc/testsuite/gcc.c-torture/execute/pr93402.c new file mode 100644 index 00000000000..6487797d0aa --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/pr93402.c @@ -0,0 +1,21 @@ +/* PR rtl-optimization/93402 */ + +struct S { unsigned int a; unsigned long long b; }; + +__attribute__((noipa)) struct S +foo (unsigned long long x) +{ + struct S ret; + ret.a = 0; + ret.b = x * 11111111111ULL + 111111111111ULL; + return ret; +} + +int +main () +{ + struct S a = foo (1); + if (a.a != 0 || a.b != 122222222222ULL) + __builtin_abort (); + return 0; +}
Hi! I've backported following 15 commits from trunk to 9.3 branch, bootstrapped/regtested on x86_64-linux and i686-linux, committed. r10-6186-g32667e04c7153d97d09d81c1af073d400f0c719a r10-6273-gbff948aa337807260344c83ac9079d6386410094 r10-6314-gaa1b56967d85bfc80d71341395f862ec2b30ca36 r10-6315-g8d7c0bf876fa784101f9ad9e3bba82cc065357da r10-6358-g56b92750f83724177d2c6eae30c208e935a56a37 r10-6444-gb843bcb89519293404bb00d2ed09aae529b54d7f r10-6460-g5a8ad97b6e4823d4ded00a3ce8d80e4bf93368d4 r10-6470-gcf785618ecc90e3f063b99572de48cb91aa5ab5d r10-6471-gcb3f06480a17f98579704b9927632627a3814c5c r10-6522-g79ab8c4321b2dc940bb706a7432a530e26f0df1a r10-6565-gf57aa9503ff170ff6c8549718bd736f6c8168bab r10-6593-g62fc0a6ce28c502fc6a7b7c09157840bf98f945f r10-6612-gdc6d0f89d4be3ed7fde73417606a78c73d954cdf r10-6617-gae2b8ede40a81a83f50d1e705972bc46fafd4ce5 r10-6625-gbacdd5e978dad84e9c547b0d5c7fed14b8d75157 Jakub From 3b2fbe3e723b20ea9089e5f45c55b79feb37085b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek <jakub@redhat.com> Date: Thu, 23 Jan 2020 20:08:22 +0100 Subject: [PATCH 01/15] postreload: Fix up postreload combine [PR93402] The following testcase is miscompiled, because the postreload pass changes: -(insn 14 13 23 2 (parallel [ - (set (reg:DI 1 dx [94]) - (plus:DI (reg:DI 1 dx [95]) - (reg:DI 5 di [92]))) - (clobber (reg:CC 17 flags)) - ]) "pr93402.c":8:30 186 {*adddi_1} - (expr_list:REG_EQUAL (plus:DI (reg:DI 5 di [92]) - (const_int 111111111111 [0x19debd01c7])) - (nil))) -(insn 23 14 25 2 (set (reg:SI 0 ax) +(insn 23 13 25 2 (set (reg:SI 0 ax) (const_int 0 [0])) "pr93402.c":10:1 67 {*movsi_internal} (nil)) (insn 25 23 26 2 (use (reg:SI 0 ax)) "pr93402.c":10:1 -1 (nil)) -(insn 26 25 35 2 (use (reg:DI 1 dx)) "pr93402.c":10:1 -1 +(insn 26 25 35 2 (use (plus:DI (reg:DI 1 dx [95]) + (reg:DI 5 di [92]))) "pr93402.c":10:1 -1 (nil)) A USE insn is not a normal insn and verify_changes called from apply_change_group is happy about any changes into it. The following patch avoids this optimization if we were to change the USE operand (this routine only changes a reg into (plus reg reg2)). 2020-01-23 Jakub Jelinek <jakub@redhat.com> PR rtl-optimization/93402 * postreload.c (reload_combine_recognize_pattern): Don't try to adjust USE insns. * gcc.c-torture/execute/pr93402.c: New test. --- gcc/ChangeLog | 9 ++++++++ gcc/postreload.c | 4 ++++ gcc/testsuite/ChangeLog | 8 +++++++ gcc/testsuite/gcc.c-torture/execute/pr93402.c | 21 +++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr93402.c