From: Ivo Raisr <ivosh@ivosh.net>
Date: Tue, 26 Sep 2017 07:33:27 +0000 (+0200)
Subject: Cherry pick 07e286ea303b2dfcb7188dcb6092b5025623b800 from master.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f37548612d0380adee6d446d4048ff608bb9d836;p=thirdparty%2Fvalgrind.git

Cherry pick 07e286ea303b2dfcb7188dcb6092b5025623b800 from master.

Reorder allocatable registers for s390x so that the callee saved are listed first.

Helper calls always trash all caller saved registers. By listing the callee saved
first then VEX register allocator (both v2 and v3) is more likely to pick them
and does not need to spill that much before helper calls.
---

diff --git a/VEX/priv/host_s390_defs.c b/VEX/priv/host_s390_defs.c
index ab2d0b276e..327674acab 100644
--- a/VEX/priv/host_s390_defs.c
+++ b/VEX/priv/host_s390_defs.c
@@ -397,20 +397,30 @@ getRRegUniverse_S390(void)
       fpr_index[i] = -1;
 
    /* Add the registers that are available to the register allocator.
-      GPRs:  registers 1..11 are available
-      FPRs:  registers 0..15 are available
+      GPRs:  registers 6..11 are callee saved, list them first
+             registers 1..5 are caller saved, list them after
+      FPRs:  registers 8..15 are callee saved, list them first
+             registers 0..7 are caller saved, list them after
              FPR12 - FPR15 are also used as register pairs for 128-bit
              floating point operations
    */
    ru->allocable_start[HRcInt64] = ru->size;
-   for (UInt regno = 1; regno <= 11; ++regno) {
+   for (UInt regno = 6; regno <= 11; ++regno) {
+      gpr_index[regno] = ru->size;
+      ru->regs[ru->size++] = s390_hreg_gpr(regno);
+   }
+   for (UInt regno = 1; regno <= 5; ++regno) {
       gpr_index[regno] = ru->size;
       ru->regs[ru->size++] = s390_hreg_gpr(regno);
    }
    ru->allocable_end[HRcInt64] = ru->size - 1;
 
    ru->allocable_start[HRcFlt64] = ru->size;
-   for (UInt regno = 0; regno <= 15; ++regno) {
+   for (UInt regno = 8; regno <= 15; ++regno) {
+      fpr_index[regno] = ru->size;
+      ru->regs[ru->size++] = s390_hreg_fpr(regno);
+   }
+   for (UInt regno = 0; regno <= 7; ++regno) {
       fpr_index[regno] = ru->size;
       ru->regs[ru->size++] = s390_hreg_fpr(regno);
    }