From: Stefan Schulze Frielinghaus <[email protected]>
In ira_implicitly_set_insn_hard_regs() all potentially used registers
stemming from single register constraints are recorded. Since hard
register constraints are pretty similar, do the same for those, too.
This requires to setup the preferred alternatives which is done via
ira_setup_alts() and also implemented for hard register constraints by
this patch.
This fixes an ICE were previously sched1 swapped the order of the
instructions
(insn 10 9 6 2 (parallel [
(set (reg:DF 118)
(asm_operands:DF ("") ("={fr2}") 0 [
(reg:TF 121 [ a ])
]
[
(asm_input:TF ("{fr1}") t.i:5)
]
[] t.i:5))
(clobber (reg:SI 98 ca))
]) "t.i":5:3 -1
(expr_list:REG_DEAD (reg:TF 121 [ a ])
(expr_list:REG_UNUSED (reg:SI 98 ca)
(nil))))
...
(insn 13 6 14 2 (set (reg:DF 34 2)
(const_double:DF 0.0 [0x0.0p+0])) "t.i":6:3 606 {*movdf_hardfloat64}
(nil))
for the attached example. This led to an ICE because register 34/fr2
was then live while allocating for pseudo 121.
gcc/ChangeLog:
* ira-lives.cc (ira_implicitly_set_insn_hard_regs): Honor hard
register constraints.
* ira.cc (ira_setup_alts): Ditto.
gcc/testsuite/ChangeLog:
* gcc.target/powerpc/asm-hard-reg-1.c: New test.
---
Bootstrapped and regtested on aarch64, powerpc64le, s390, x86_64. Ok
for mainline?
gcc/ira-lives.cc | 7 +++++++
gcc/ira.cc | 6 ++++++
gcc/testsuite/gcc.target/powerpc/asm-hard-reg-1.c | 10 ++++++++++
3 files changed, 23 insertions(+)
create mode 100644 gcc/testsuite/gcc.target/powerpc/asm-hard-reg-1.c
diff --git a/gcc/ira-lives.cc b/gcc/ira-lives.cc
index 8b8387cdd17..04e586343c8 100644
--- a/gcc/ira-lives.cc
+++ b/gcc/ira-lives.cc
@@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see
#include "backend.h"
#include "target.h"
#include "rtl.h"
+#include "stmt.h"
#include "predict.h"
#include "df.h"
#include "memmodel.h"
@@ -971,6 +972,12 @@ ira_implicitly_set_insn_hard_regs (HARD_REG_SET *set,
if (regno >= 0)
add_to_hard_reg_set (set, mode, regno);
}
+ else if (c == '{')
+ {
+ int regno = decode_hard_reg_constraint (p);
+ gcc_assert (regno >= 0 && regno < FIRST_PSEUDO_REGISTER);
+ add_to_hard_reg_set (set, mode, regno);
+ }
}
}
}
diff --git a/gcc/ira.cc b/gcc/ira.cc
index 3d2c7592675..d65e1b97ed8 100644
--- a/gcc/ira.cc
+++ b/gcc/ira.cc
@@ -1843,6 +1843,12 @@ ira_setup_alts (rtx_insn *insn)
goto op_success;
break;
+ case '{':
+ if (REG_P (op) || SUBREG_P (op))
+ goto op_success;
+ win_p = true;
+ break;
+
default:
{
enum constraint_num cn = lookup_constraint (p);
diff --git a/gcc/testsuite/gcc.target/powerpc/asm-hard-reg-1.c
b/gcc/testsuite/gcc.target/powerpc/asm-hard-reg-1.c
new file mode 100644
index 00000000000..b0d8eb9d721
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/asm-hard-reg-1.c
@@ -0,0 +1,10 @@
+/* { dg-do compile } */
+
+long double a;
+double b;
+void c (double, double);
+void d (void)
+{
+ __asm__ ("" : "={fr2}" (b) : "{fr1}" (a));
+ c (0, 0);
+}
--
2.52.0
