From 05402ca65a6696a8f20a3dbcb18f47ba3bdfa268 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 13 Feb 2021 16:08:29 +0100 Subject: [PATCH] passes: Enable split4 with selective scheduling 2 [PR98439] As mentioned in the PR, we have 5 split passes (+ splitting during final). split1 is before RA and is unconditional, split2 is after RA and is gated on optimize > 0, split3 is before sched2 and is gated on defined(INSN_SCHEDULING) && optimize > 0 && flag_schedule_insns_after_reload split4 is before regstack and is gated on HAVE_ATTR_length && defined (STACK_REGS) && !gate (split3) split5 is before shorten_branches and is gated on HAVE_ATTR_length && !defined (STACK_REGS) and the splitting during final works only when !HAVE_ATTR_length. STACK_REGS is a macro enabled only on i386/x86_64. The problem with the following testcase is that split3 before sched2 is the last splitting pass for the target/command line options set, but selective scheduling unlike normal scheduling can create new instructions that need to be split, which means we ICE during final as there are insns that require splitting but nothing split them. This patch fixes it by doing split4 also when -fselective-scheduling2 is enabled on x86 and split3 has been run. As that option isn't on by default, it should slow down compilation only for those that enable that option. 2021-02-13 Jakub Jelinek PR rtl-optimization/98439 * recog.c (pass_split_before_regstack::gate): Enable even when pass_split_before_sched2 is enabled if -fselective-scheduling2 is on. * gcc.target/i386/pr98439.c: New test. --- gcc/recog.c | 7 ++++++- gcc/testsuite/gcc.target/i386/pr98439.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr98439.c diff --git a/gcc/recog.c b/gcc/recog.c index 1f43237edad..abbc49f3f9b 100644 --- a/gcc/recog.c +++ b/gcc/recog.c @@ -4532,8 +4532,13 @@ pass_split_before_regstack::gate (function *) /* If flow2 creates new instructions which need splitting and scheduling after reload is not done, they might not be split until final which doesn't allow splitting - if HAVE_ATTR_length. */ + if HAVE_ATTR_length. Selective scheduling can result in + further instructions that need splitting. */ +#ifdef INSN_SCHEDULING + return !enable_split_before_sched2 () || flag_selective_scheduling2; +#else return !enable_split_before_sched2 (); +#endif #else return false; #endif diff --git a/gcc/testsuite/gcc.target/i386/pr98439.c b/gcc/testsuite/gcc.target/i386/pr98439.c new file mode 100644 index 00000000000..02fc40abd4d --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr98439.c @@ -0,0 +1,12 @@ +/* PR rtl-optimization/98439 */ +/* { dg-do compile } */ +/* { dg-options "-march=nehalem -O2 -fselective-scheduling2 -fno-cprop-registers" } */ + +int v; +int bar (int, int, int, int, int, int, int); + +int +foo (void) +{ + return bar (0, 0, 0, 0, 0, 0, v > 0 ? v : 0); +} -- 2.30.2