Skip to content

Commit

Permalink
cmd/compile: disable "redundant zeroextensions" optimization for Sele…
Browse files Browse the repository at this point in the history
…ct on AMD64

A Select Op could produce a value with upper 32 bits NOT zeroed,
for example, Div32 is lowered to (Select0 (DIVL x y)).

In theory, we could look into the argument of a Select to decide
whether the upper bits are zeroed. As it is late in release cycle,
just disable this optimization for Select for now.

Fixes golang#23305.

Change-Id: Icf665a2af9ccb0a7ba0ae00c683c9e349638bf85
Reviewed-on: https://go-review.googlesource.com/85736
Run-TryBot: Cherry Zhang <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: Matthew Dempsky <[email protected]>
Reviewed-by: Ilya Tocar <[email protected]>
  • Loading branch information
cherrymui committed Jan 2, 2018
1 parent 2ba3fd4 commit 7f1c4b3
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/cmd/compile/internal/ssa/rewrite.go
Original file line number Diff line number Diff line change
Expand Up @@ -646,8 +646,12 @@ func zeroUpper32Bits(x *Value, depth int) bool {
OpAMD64ANDL, OpAMD64ANDLconst, OpAMD64ORL, OpAMD64ORLconst,
OpAMD64XORL, OpAMD64XORLconst, OpAMD64NEGL, OpAMD64NOTL:
return true
case OpArg, OpSelect0, OpSelect1:
case OpArg:
return x.Type.Width == 4
case OpSelect0, OpSelect1:
// Disabled for now. See issue 23305.
// TODO: we could look into the arg of the Select to decide.
return false
case OpPhi:
// Phis can use each-other as an arguments, instead of tracking visited values,
// just limit recursion depth.
Expand Down
28 changes: 28 additions & 0 deletions test/fixedbugs/issue23305.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// run

// Copyright 2018 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

func mask1(a, b uint64) uint64 {
op1 := int32(a)
op2 := int32(b)
return uint64(uint32(op1 / op2))
}

var mask2 = mask1

func main() {
res1 := mask1(0x1, 0xfffffffeffffffff)
res2 := mask2(0x1, 0xfffffffeffffffff)
if res1 != 0xffffffff {
println("got", res1, "want", 0xffffffff)
panic("FAIL")
}
if res2 != 0xffffffff {
println("got", res2, "want", 0xffffffff)
panic("FAIL")
}
}

0 comments on commit 7f1c4b3

Please sign in to comment.