cmd/compile,cmd/asm: fix function pointer call perf regression on ppc64

author Paul E. Murphy <murp@ibm.com>

Fri, 13 Nov 2020 20:44:25 +0000 (14:44 -0600)

committer Lynn Boger <laboger@linux.vnet.ibm.com>

Thu, 19 Nov 2020 18:23:23 +0000 (18:23 +0000)
author Paul E. Murphy <murp@ibm.com>
Fri, 13 Nov 2020 20:44:25 +0000 (14:44 -0600)
committer Lynn Boger <laboger@linux.vnet.ibm.com>
Thu, 19 Nov 2020 18:23:23 +0000 (18:23 +0000)
diff --git a/src/cmd/compile/internal/ppc64/ssa.go b/src/cmd/compile/internal/ppc64/ssa.go

index 3888aa6527b9f7efc6d4304826ded91f1439c13f..3e20c44a4c72b61d9514ec4b977c43d7c6784544 100644 (file)
--- a/src/cmd/compile/internal/ppc64/ssa.go
+++ b/src/cmd/compile/internal/ppc64/ssa.go
@@ -1781,6 +1781,9 @@ func ssaGenValue(s *gc.SSAGenState, v *ssa.Value) {
                 pp := s.Call(v)
                 pp.To.Reg = ppc64.REG_LR
  
+               // Insert a hint this is not a subroutine return.
+               pp.SetFrom3(obj.Addr{Type: obj.TYPE_CONST, Offset: 1})
+
                 if gc.Ctxt.Flag_shared {
                         // When compiling Go into PIC, the function we just
                         // called via pointer might have been implemented in
diff --git a/src/cmd/internal/obj/ppc64/asm9.go b/src/cmd/internal/obj/ppc64/asm9.go

index 775d27d8e80d3c0d1b73965a41dca8b0dc584661..41e263b2c073669ba007f4f3426569a1c4dc70a7 100644 (file)
--- a/src/cmd/internal/obj/ppc64/asm9.go
+++ b/src/cmd/internal/obj/ppc64/asm9.go
@@ -334,6 +334,7 @@ var optab = []Optab{
         {ABC, C_SCON, C_REG, C_NONE, C_SBRA, 16, 4, 0},
         {ABC, C_SCON, C_REG, C_NONE, C_LBRA, 17, 4, 0},
         {ABR, C_NONE, C_NONE, C_NONE, C_LR, 18, 4, 0},
+       {ABR, C_NONE, C_NONE, C_SCON, C_LR, 18, 4, 0},
         {ABR, C_NONE, C_NONE, C_NONE, C_CTR, 18, 4, 0},
         {ABR, C_REG, C_NONE, C_NONE, C_CTR, 18, 4, 0},
         {ABR, C_NONE, C_NONE, C_NONE, C_ZOREG, 15, 8, 0},
@@ -2844,6 +2845,7 @@ func (c *ctxt9) asmout(p *obj.Prog, o *Optab, out []uint32) {
  
         case 18: /* br/bl (lr/ctr); bc/bcl bo,bi,(lr/ctr) */
                 var v int32
+               var bh uint32 = 0
                 if p.As == ABC || p.As == ABCL {
                         v = c.regoff(&p.From) & 31
                 } else {
@@ -2865,6 +2867,15 @@ func (c *ctxt9) asmout(p *obj.Prog, o *Optab, out []uint32) {
                         v = 0
                 }
  
+               // Insert optional branch hint for bclr[l]/bcctr[l]
+               if p.From3Type() != obj.TYPE_NONE {
+                       bh = uint32(p.GetFrom3().Offset)
+                       if bh == 2 || bh > 3 {
+                               log.Fatalf("BH must be 0,1,3 for %v", p)
+                       }
+                       o1 |= bh << 11
+               }
+
                 if p.As == ABL || p.As == ABCL {
                         o1 |= 1
                 }
author	Paul E. Murphy <murp@ibm.com>
	Fri, 13 Nov 2020 20:44:25 +0000 (14:44 -0600)
committer	Lynn Boger <laboger@linux.vnet.ibm.com>
	Thu, 19 Nov 2020 18:23:23 +0000 (18:23 +0000)
src/cmd/compile/internal/ppc64/ssa.go		patch \| blob \| history
src/cmd/internal/obj/ppc64/asm9.go		patch \| blob \| history