math: optimize math.Abs on mipsx

author Junxian Zhu <zhujunxian@oss.cipunited.com>

Fri, 14 Apr 2023 08:06:40 +0000 (16:06 +0800)

committer Cherry Mui <cherryyz@google.com>

Mon, 8 May 2023 15:53:28 +0000 (15:53 +0000)
author Junxian Zhu <zhujunxian@oss.cipunited.com>
Fri, 14 Apr 2023 08:06:40 +0000 (16:06 +0800)
committer Cherry Mui <cherryyz@google.com>
Mon, 8 May 2023 15:53:28 +0000 (15:53 +0000)
diff --git a/src/cmd/compile/internal/mips/ssa.go b/src/cmd/compile/internal/mips/ssa.go

index c42eba57866369e49cb186e9aa6b2e5730fb6078..2cfe57f7f4643a50e1c1db56cfd0ffc037e86a0e 100644 (file)
--- a/src/cmd/compile/internal/mips/ssa.go
+++ b/src/cmd/compile/internal/mips/ssa.go
@@ -363,6 +363,7 @@ func ssaGenValue(s *ssagen.State, v *ssa.Value) {
                 ssa.OpMIPSMOVDF,
                 ssa.OpMIPSNEGF,
                 ssa.OpMIPSNEGD,
+               ssa.OpMIPSABSD,
                 ssa.OpMIPSSQRTF,
                 ssa.OpMIPSSQRTD,
                 ssa.OpMIPSCLZ:
diff --git a/src/cmd/compile/internal/ssa/_gen/MIPS.rules b/src/cmd/compile/internal/ssa/_gen/MIPS.rules

index aeb117da1775071a1976c061126b5974f29b2b75..b36402dd0a9f590494b8b77e670048445517c3b6 100644 (file)
--- a/src/cmd/compile/internal/ssa/_gen/MIPS.rules
+++ b/src/cmd/compile/internal/ssa/_gen/MIPS.rules
@@ -37,6 +37,9 @@
  (Mod8 x y) => (Select0 (DIV (SignExt8to32 x) (SignExt8to32 y)))
  (Mod8u x y) => (Select0 (DIVU (ZeroExt8to32 x) (ZeroExt8to32 y)))
  
+// math package intrinsics
+(Abs ...) => (ABSD ...)
+
  // (x + y) / 2 with x>=y  becomes  (x - y) / 2 + y
  (Avg32u <t> x y) => (ADD (SRLconst <t> (SUB <t> x y) [1]) y)
  
diff --git a/src/cmd/compile/internal/ssa/_gen/MIPSOps.go b/src/cmd/compile/internal/ssa/_gen/MIPSOps.go

index ac209bbddadc419cde3d73732cec0887e282d9c5..b5d9d2547591eb5cc2aa4111b9305eb683b7592c 100644 (file)
--- a/src/cmd/compile/internal/ssa/_gen/MIPSOps.go
+++ b/src/cmd/compile/internal/ssa/_gen/MIPSOps.go
@@ -179,6 +179,7 @@ func init() {
                 {name: "NEG", argLength: 1, reg: gp11},                 // -arg0
                 {name: "NEGF", argLength: 1, reg: fp11, asm: "NEGF"},   // -arg0, float32
                 {name: "NEGD", argLength: 1, reg: fp11, asm: "NEGD"},   // -arg0, float64
+               {name: "ABSD", argLength: 1, reg: fp11, asm: "ABSD"},   // abs(arg0), float64
                 {name: "SQRTD", argLength: 1, reg: fp11, asm: "SQRTD"}, // sqrt(arg0), float64
                 {name: "SQRTF", argLength: 1, reg: fp11, asm: "SQRTF"}, // sqrt(arg0), float32
  
diff --git a/src/cmd/compile/internal/ssa/opGen.go b/src/cmd/compile/internal/ssa/opGen.go

index 2507e60f319407b50dcfd4ac41513bf42118bd55..b8ef89d76e571b26c08788abfd9e6ffcb485e43e 100644 (file)
--- a/src/cmd/compile/internal/ssa/opGen.go
+++ b/src/cmd/compile/internal/ssa/opGen.go
@@ -1872,6 +1872,7 @@ const (
         OpMIPSNEG
         OpMIPSNEGF
         OpMIPSNEGD
+       OpMIPSABSD
         OpMIPSSQRTD
         OpMIPSSQRTF
         OpMIPSSLL
@@ -25054,6 +25055,19 @@ var opcodeTable = [...]opInfo{
                         },
                 },
         },
+       {
+               name:   "ABSD",
+               argLen: 1,
+               asm:    mips.AABSD,
+               reg: regInfo{
+                       inputs: []inputInfo{
+                               {0, 35183835217920}, // F0 F2 F4 F6 F8 F10 F12 F14 F16 F18 F20 F22 F24 F26 F28 F30
+                       },
+                       outputs: []outputInfo{
+                               {0, 35183835217920}, // F0 F2 F4 F6 F8 F10 F12 F14 F16 F18 F20 F22 F24 F26 F28 F30
+                       },
+               },
+       },
         {
                 name:   "SQRTD",
                 argLen: 1,
diff --git a/src/cmd/compile/internal/ssa/rewriteMIPS.go b/src/cmd/compile/internal/ssa/rewriteMIPS.go

index b3650c4200e970bdab0e797eac8b4afd47b65fcc..1f44346b7f6eaaa24c0a5315a52d388210c7e1de 100644 (file)
--- a/src/cmd/compile/internal/ssa/rewriteMIPS.go
+++ b/src/cmd/compile/internal/ssa/rewriteMIPS.go
@@ -6,6 +6,9 @@ import "cmd/compile/internal/types"
  
  func rewriteValueMIPS(v *Value) bool {
         switch v.Op {
+       case OpAbs:
+               v.Op = OpMIPSABSD
+               return true
         case OpAdd16:
                 v.Op = OpMIPSADD
                 return true
diff --git a/src/cmd/compile/internal/ssagen/ssa.go b/src/cmd/compile/internal/ssagen/ssa.go

index 5d15ffbdf14e521ab3c783fc78d3a7aae707c5cf..37b5a26d5cbe0a10cd09767cdc80fd88a5acbf8d 100644 (file)
--- a/src/cmd/compile/internal/ssagen/ssa.go
+++ b/src/cmd/compile/internal/ssagen/ssa.go
@@ -4369,7 +4369,7 @@ func InitTables() {
                 func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                         return s.newValue1(ssa.OpAbs, types.Types[types.TFLOAT64], args[0])
                 },
-               sys.ARM64, sys.ARM, sys.PPC64, sys.RISCV64, sys.Wasm, sys.MIPS64)
+               sys.ARM64, sys.ARM, sys.PPC64, sys.RISCV64, sys.Wasm, sys.MIPS, sys.MIPS64)
         addF("math", "Copysign",
                 func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
                         return s.newValue2(ssa.OpCopysign, types.Types[types.TFLOAT64], args[0], args[1])
diff --git a/test/codegen/math.go b/test/codegen/math.go

index 79b11ca228f17c97ea55b04070a26b3201161e46..6b592754625b6afc93971edb27edcc39378a898e 100644 (file)
--- a/test/codegen/math.go
+++ b/test/codegen/math.go
@@ -82,6 +82,7 @@ func abs(x, y float64) {
         // wasm:"F64Abs"
         // arm/6:"ABSD\t"
         // mips64/hardfloat:"ABSD\t"
+       // mips/hardfloat:"ABSD\t"
         sink64[0] = math.Abs(x)
  
         // amd64:"BTRQ\t[$]63","PXOR"    (TODO: this should be BTSQ)
author	Junxian Zhu <zhujunxian@oss.cipunited.com>
	Fri, 14 Apr 2023 08:06:40 +0000 (16:06 +0800)
committer	Cherry Mui <cherryyz@google.com>
	Mon, 8 May 2023 15:53:28 +0000 (15:53 +0000)
src/cmd/compile/internal/mips/ssa.go		patch \| blob \| history
src/cmd/compile/internal/ssa/_gen/MIPS.rules		patch \| blob \| history
src/cmd/compile/internal/ssa/_gen/MIPSOps.go		patch \| blob \| history
src/cmd/compile/internal/ssa/opGen.go		patch \| blob \| history
src/cmd/compile/internal/ssa/rewriteMIPS.go		patch \| blob \| history
src/cmd/compile/internal/ssagen/ssa.go		patch \| blob \| history
test/codegen/math.go		patch \| blob \| history