test/codegen: fix compilation of bitfield tests

mundaym · mundaym · commit 1da64686f85d · 2021-09-08T14:51:31.000Z
The codegen tests are currently skipped (see #48247) and the bitfield tests do not actually compile due to a duplicate function name (sbfiz5) added in CL 267602. Renaming the function fixes the issue. Updates #48247. Change-Id: I626fd5ef13732dc358e73ace9ddcc4cbb6ae5b21 Reviewed-on: https://go-review.googlesource.com/c/go/+/348391 Trust: Michael Munday <mike.munday@lowrisc.org> Run-TryBot: Michael Munday <mike.munday@lowrisc.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Cherry Mui <cherryyz@google.com>
diff --git a/test/codegen/bitfield.go b/test/codegen/bitfield.go
@@ -99,10 +99,6 @@ func sbfiz5(x int32) int32 {
 	return (x << 4) >> 3
 }
 
-func sbfiz5(x int32) int64 {
-	return int64(x+1) << 40 // arm64:"SBFIZ\t[$]40, R[0-9]+, [$]24",-"LSL"
-}
-
 func sbfiz6(x int16) int64 {
 	return int64(x+1) << 3 // arm64:"SBFIZ\t[$]3, R[0-9]+, [$]16",-"LSL"
 }
@@ -111,6 +107,10 @@ func sbfiz7(x int8) int64 {
 	return int64(x+1) << 62 // arm64:"SBFIZ\t[$]62, R[0-9]+, [$]2",-"LSL"
 }
 
+func sbfiz8(x int32) int64 {
+	return int64(x+1) << 40 // arm64:"SBFIZ\t[$]40, R[0-9]+, [$]24",-"LSL"
+}
+
 // sbfx
 func sbfx1(x int64) int64 {
 	return (x << 3) >> 4 // arm64:"SBFX\t[$]1, R[0-9]+, [$]60",-"LSL",-"ASR"

Original file line number	Diff line number	Diff line change
`@@ -99,10 +99,6 @@ func sbfiz5(x int32) int32 {`
`99`	`99`	`return (x << 4) >> 3`
`100`	`100`	`}`
`101`	`101`
`102`		`-func sbfiz5(x int32) int64 {`
`103`		`- return int64(x+1) << 40 // arm64:"SBFIZ\t[$]40, R[0-9]+, [$]24",-"LSL"`
`104`		`-}`
`105`		`-`
`106`	`102`	`func sbfiz6(x int16) int64 {`
`107`	`103`	`return int64(x+1) << 3 // arm64:"SBFIZ\t[$]3, R[0-9]+, [$]16",-"LSL"`
`108`	`104`	`}`
`@@ -111,6 +107,10 @@ func sbfiz7(x int8) int64 {`
`111`	`107`	`return int64(x+1) << 62 // arm64:"SBFIZ\t[$]62, R[0-9]+, [$]2",-"LSL"`
`112`	`108`	`}`
`113`	`109`
	`110`	`+func sbfiz8(x int32) int64 {`
	`111`	`+ return int64(x+1) << 40 // arm64:"SBFIZ\t[$]40, R[0-9]+, [$]24",-"LSL"`
	`112`	`+}`
	`113`	`+`
`114`	`114`	`// sbfx`
`115`	`115`	`func sbfx1(x int64) int64 {`
`116`	`116`	`return (x << 3) >> 4 // arm64:"SBFX\t[$]1, R[0-9]+, [$]60",-"LSL",-"ASR"`