From fee9fc9ffbd7ec95f53b6570bf8c6e3db9a679b5 Mon Sep 17 00:00:00 2001 From: krebbel Date: Fri, 18 Dec 2015 10:36:57 +0000 Subject: [PATCH] S/390: Allow to use r2 to r4 as literal pool base. gcc/ChangeLog * config/s390/s390.c (s390_init_frame_layout): Try r4 to r2 for the literal pool pointer. gcc/testsuite/ChangeLog * gcc.target/s390/litpool-r3-1.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@231813 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/config/s390/s390.c | 13 ++++++++++--- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.target/s390/litpool-r3-1.c | 16 ++++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/s390/litpool-r3-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index aab0e3abb3d2..802c8b8fd761 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-12-18 Dominik Vogt + + * config/s390/s390.c (s390_init_frame_layout): Try r4 to r2 for the + literal pool pointer. + 2015-12-18 Yuri Rumyantsev PR tree-optimization/68906 diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index ed684af1a66d..cba88bbb0fcc 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -9584,10 +9584,17 @@ s390_init_frame_layout (void) as base register to avoid save/restore overhead. */ if (!base_used) cfun->machine->base_reg = NULL_RTX; - else if (crtl->is_leaf && !df_regs_ever_live_p (5)) - cfun->machine->base_reg = gen_rtx_REG (Pmode, 5); else - cfun->machine->base_reg = gen_rtx_REG (Pmode, BASE_REGNUM); + { + int br = 0; + + if (crtl->is_leaf) + /* Prefer r5 (most likely to be free). */ + for (br = 5; br >= 2 && df_regs_ever_live_p (br); br--) + ; + cfun->machine->base_reg = + gen_rtx_REG (Pmode, (br > 0) ? br : BASE_REGNUM); + } s390_register_info (); s390_frame_info (); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index eee043417098..3053736ace68 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-12-18 Dominik Vogt + + * gcc.target/s390/litpool-r3-1.c: New test. + 2015-12-18 Yuri Rumyantsev PR tree-optimization/68906 diff --git a/gcc/testsuite/gcc.target/s390/litpool-r3-1.c b/gcc/testsuite/gcc.target/s390/litpool-r3-1.c new file mode 100644 index 000000000000..8ee50cf435a5 --- /dev/null +++ b/gcc/testsuite/gcc.target/s390/litpool-r3-1.c @@ -0,0 +1,16 @@ +/* Validate that r3 may be used as the literal pool pointer. Test that only on + 64-bit for z900 to simplify the test. It's not really different on 31-bit + or other cpus. */ + +/* { dg-do compile { target { lp64 } } } */ +/* { dg-options "-march=z900 -O2" } */ + +__int128 gi; +const int c = 0x12345678u; +int foo(void) +{ + gi += c; + return c; +} + +/* { dg-final { scan-assembler-times "\tlarl\t%r3,.L3" 1 } } */ -- 2.47.2