cmd/compile/internal/ssa: generalize prove to all booleans
* Refacts a bit saving and restoring parents restrictions
* Shaves ~100k from pkg/tools/linux_amd64,
but most of the savings come from the rewrite rules.
* Improves on the following artificial test case:
func f1(a4 bool, a6 bool) bool {
return a6 || (a6 || (a6 || a4)) || (a6 || (a4 || a6 || (false || a6)))
}
Change-Id: I714000f75a37a3a6617c6e6834c75bd23674215f
Reviewed-on: https://go-review.googlesource.com/20306
Reviewed-by: Keith Randall <khr@golang.org>
Run-TryBot: Alexandru Moșoi <alexandru@mosoi.ro>
TryBot-Result: Gobot Gobot <gobot@golang.org>
diff --git a/src/cmd/compile/internal/ssa/rewritegeneric.go b/src/cmd/compile/internal/ssa/rewritegeneric.go
index 331c93d..bf19300 100644
--- a/src/cmd/compile/internal/ssa/rewritegeneric.go
+++ b/src/cmd/compile/internal/ssa/rewritegeneric.go
@@ -2487,6 +2487,18 @@
func rewriteValuegeneric_OpIsInBounds(v *Value, config *Config) bool {
b := v.Block
_ = b
+ // match: (IsInBounds x x)
+ // cond:
+ // result: (ConstBool [0])
+ for {
+ x := v.Args[0]
+ if v.Args[1] != x {
+ break
+ }
+ v.reset(OpConstBool)
+ v.AuxInt = 0
+ return true
+ }
// match: (IsInBounds (And32 (Const32 [c]) _) (Const32 [d]))
// cond: inBounds32(c, d)
// result: (ConstBool [1])
@@ -2568,6 +2580,18 @@
func rewriteValuegeneric_OpIsSliceInBounds(v *Value, config *Config) bool {
b := v.Block
_ = b
+ // match: (IsSliceInBounds x x)
+ // cond:
+ // result: (ConstBool [1])
+ for {
+ x := v.Args[0]
+ if v.Args[1] != x {
+ break
+ }
+ v.reset(OpConstBool)
+ v.AuxInt = 1
+ return true
+ }
// match: (IsSliceInBounds (And32 (Const32 [c]) _) (Const32 [d]))
// cond: sliceInBounds32(c, d)
// result: (ConstBool [1])
@@ -2612,6 +2636,34 @@
v.AuxInt = 1
return true
}
+ // match: (IsSliceInBounds (Const32 [0]) _)
+ // cond:
+ // result: (ConstBool [1])
+ for {
+ if v.Args[0].Op != OpConst32 {
+ break
+ }
+ if v.Args[0].AuxInt != 0 {
+ break
+ }
+ v.reset(OpConstBool)
+ v.AuxInt = 1
+ return true
+ }
+ // match: (IsSliceInBounds (Const64 [0]) _)
+ // cond:
+ // result: (ConstBool [1])
+ for {
+ if v.Args[0].Op != OpConst64 {
+ break
+ }
+ if v.Args[0].AuxInt != 0 {
+ break
+ }
+ v.reset(OpConstBool)
+ v.AuxInt = 1
+ return true
+ }
// match: (IsSliceInBounds (Const32 [c]) (Const32 [d]))
// cond:
// result: (ConstBool [b2i(sliceInBounds32(c,d))])
@@ -2644,6 +2696,24 @@
v.AuxInt = b2i(sliceInBounds64(c, d))
return true
}
+ // match: (IsSliceInBounds (SliceLen x) (SliceCap x))
+ // cond:
+ // result: (ConstBool [1])
+ for {
+ if v.Args[0].Op != OpSliceLen {
+ break
+ }
+ x := v.Args[0].Args[0]
+ if v.Args[1].Op != OpSliceCap {
+ break
+ }
+ if v.Args[1].Args[0] != x {
+ break
+ }
+ v.reset(OpConstBool)
+ v.AuxInt = 1
+ return true
+ }
return false
}
func rewriteValuegeneric_OpLeq16(v *Value, config *Config) bool {
@@ -6709,6 +6779,21 @@
v.AuxInt = c
return true
}
+ // match: (SliceCap (SliceMake _ _ (SliceCap x)))
+ // cond:
+ // result: (SliceCap x)
+ for {
+ if v.Args[0].Op != OpSliceMake {
+ break
+ }
+ if v.Args[0].Args[2].Op != OpSliceCap {
+ break
+ }
+ x := v.Args[0].Args[2].Args[0]
+ v.reset(OpSliceCap)
+ v.AddArg(x)
+ return true
+ }
return false
}
func rewriteValuegeneric_OpSliceLen(v *Value, config *Config) bool {
@@ -6731,6 +6816,21 @@
v.AuxInt = c
return true
}
+ // match: (SliceLen (SliceMake _ (SliceLen x) _))
+ // cond:
+ // result: (SliceLen x)
+ for {
+ if v.Args[0].Op != OpSliceMake {
+ break
+ }
+ if v.Args[0].Args[1].Op != OpSliceLen {
+ break
+ }
+ x := v.Args[0].Args[1].Args[0]
+ v.reset(OpSliceLen)
+ v.AddArg(x)
+ return true
+ }
return false
}
func rewriteValuegeneric_OpSlicePtr(v *Value, config *Config) bool {
@@ -6753,6 +6853,21 @@
v.AuxInt = c
return true
}
+ // match: (SlicePtr (SliceMake (SlicePtr x) _ _))
+ // cond:
+ // result: (SlicePtr x)
+ for {
+ if v.Args[0].Op != OpSliceMake {
+ break
+ }
+ if v.Args[0].Args[0].Op != OpSlicePtr {
+ break
+ }
+ x := v.Args[0].Args[0].Args[0]
+ v.reset(OpSlicePtr)
+ v.AddArg(x)
+ return true
+ }
return false
}
func rewriteValuegeneric_OpStore(v *Value, config *Config) bool {
