mirror of
https://github.com/golang/go.git
synced 2025-05-05 15:43:04 +00:00
runtime,internal: move runtime/internal/math to internal/runtime/math
Cleanup and friction reduction. Updates #65355. Change-Id: I6c4fcd409d044c00d16561fe9ed2257877d73f5b Reviewed-on: https://go-review.googlesource.com/c/go/+/600435 Reviewed-by: Keith Randall <khr@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Keith Randall <khr@golang.org>
This commit is contained in:
parent
fe87b586c0
commit
f9eb3e3cd5
@ -1931,7 +1931,7 @@
|
|||||||
|
|
||||||
((REV|REVW) ((REV|REVW) p)) => p
|
((REV|REVW) ((REV|REVW) p)) => p
|
||||||
|
|
||||||
// runtime/internal/math.MulUintptr intrinsics
|
// internal/runtime/math.MulUintptr intrinsics
|
||||||
|
|
||||||
(Select0 (Mul64uover x y)) => (MUL x y)
|
(Select0 (Mul64uover x y)) => (MUL x y)
|
||||||
(Select1 (Mul64uover x y)) => (NotEqual (CMPconst (UMULH <typ.UInt64> x y) [0]))
|
(Select1 (Mul64uover x y)) => (NotEqual (CMPconst (UMULH <typ.UInt64> x y) [0]))
|
||||||
|
@ -4241,7 +4241,7 @@ func InitTables() {
|
|||||||
},
|
},
|
||||||
all...)
|
all...)
|
||||||
}
|
}
|
||||||
addF("runtime/internal/math", "MulUintptr",
|
addF("internal/runtime/math", "MulUintptr",
|
||||||
func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
|
func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
|
||||||
if s.config.PtrSize == 4 {
|
if s.config.PtrSize == 4 {
|
||||||
return s.newValue2(ssa.OpMul32uover, types.NewTuple(types.Types[types.TUINT], types.Types[types.TUINT]), args[0], args[1])
|
return s.newValue2(ssa.OpMul32uover, types.NewTuple(types.Types[types.TUINT], types.Types[types.TUINT]), args[0], args[1])
|
||||||
@ -5025,14 +5025,14 @@ func InitTables() {
|
|||||||
},
|
},
|
||||||
sys.AMD64, sys.ARM64, sys.PPC64, sys.S390X, sys.MIPS64, sys.RISCV64, sys.Loong64)
|
sys.AMD64, sys.ARM64, sys.PPC64, sys.S390X, sys.MIPS64, sys.RISCV64, sys.Loong64)
|
||||||
alias("math/bits", "Mul", "math/bits", "Mul64", p8...)
|
alias("math/bits", "Mul", "math/bits", "Mul64", p8...)
|
||||||
alias("runtime/internal/math", "Mul64", "math/bits", "Mul64", p8...)
|
alias("internal/runtime/math", "Mul64", "math/bits", "Mul64", p8...)
|
||||||
addF("math/bits", "Add64",
|
addF("math/bits", "Add64",
|
||||||
func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
|
func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
|
||||||
return s.newValue3(ssa.OpAdd64carry, types.NewTuple(types.Types[types.TUINT64], types.Types[types.TUINT64]), args[0], args[1], args[2])
|
return s.newValue3(ssa.OpAdd64carry, types.NewTuple(types.Types[types.TUINT64], types.Types[types.TUINT64]), args[0], args[1], args[2])
|
||||||
},
|
},
|
||||||
sys.AMD64, sys.ARM64, sys.PPC64, sys.S390X, sys.RISCV64, sys.Loong64, sys.MIPS64)
|
sys.AMD64, sys.ARM64, sys.PPC64, sys.S390X, sys.RISCV64, sys.Loong64, sys.MIPS64)
|
||||||
alias("math/bits", "Add", "math/bits", "Add64", p8...)
|
alias("math/bits", "Add", "math/bits", "Add64", p8...)
|
||||||
alias("runtime/internal/math", "Add64", "math/bits", "Add64", all...)
|
alias("internal/runtime/math", "Add64", "math/bits", "Add64", all...)
|
||||||
addF("math/bits", "Sub64",
|
addF("math/bits", "Sub64",
|
||||||
func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
|
func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
|
||||||
return s.newValue3(ssa.OpSub64borrow, types.NewTuple(types.Types[types.TUINT64], types.Types[types.TUINT64]), args[0], args[1], args[2])
|
return s.newValue3(ssa.OpSub64borrow, types.NewTuple(types.Types[types.TUINT64], types.Types[types.TUINT64]), args[0], args[1], args[2])
|
||||||
|
@ -98,7 +98,7 @@ func TestIntendedInlining(t *testing.T) {
|
|||||||
"traceEnabled",
|
"traceEnabled",
|
||||||
},
|
},
|
||||||
"runtime/internal/sys": {},
|
"runtime/internal/sys": {},
|
||||||
"runtime/internal/math": {
|
"internal/runtime/math": {
|
||||||
"MulUintptr",
|
"MulUintptr",
|
||||||
},
|
},
|
||||||
"bytes": {
|
"bytes": {
|
||||||
|
@ -799,7 +799,7 @@ func walkUnsafeSlice(n *ir.BinaryExpr, init *ir.Nodes) ir.Node {
|
|||||||
return walkExpr(typecheck.Expr(h), init)
|
return walkExpr(typecheck.Expr(h), init)
|
||||||
}
|
}
|
||||||
|
|
||||||
var math_MulUintptr = &types.Sym{Pkg: types.NewPkg("runtime/internal/math", "math"), Name: "MulUintptr"}
|
var math_MulUintptr = &types.Sym{Pkg: types.NewPkg("internal/runtime/math", "math"), Name: "MulUintptr"}
|
||||||
|
|
||||||
func walkUnsafeString(n *ir.BinaryExpr, init *ir.Nodes) ir.Node {
|
func walkUnsafeString(n *ir.BinaryExpr, init *ir.Nodes) ir.Node {
|
||||||
ptr := safeExpr(n.X, init)
|
ptr := safeExpr(n.X, init)
|
||||||
|
@ -47,7 +47,7 @@ var runtimePkgs = []string{
|
|||||||
|
|
||||||
"internal/runtime/atomic",
|
"internal/runtime/atomic",
|
||||||
"internal/runtime/exithook",
|
"internal/runtime/exithook",
|
||||||
"runtime/internal/math",
|
"internal/runtime/math",
|
||||||
"runtime/internal/sys",
|
"runtime/internal/sys",
|
||||||
"internal/runtime/syscall",
|
"internal/runtime/syscall",
|
||||||
|
|
||||||
|
@ -87,7 +87,7 @@ var depsRules = `
|
|||||||
< internal/runtime/syscall
|
< internal/runtime/syscall
|
||||||
< internal/runtime/atomic
|
< internal/runtime/atomic
|
||||||
< internal/runtime/exithook
|
< internal/runtime/exithook
|
||||||
< runtime/internal/math
|
< internal/runtime/math
|
||||||
< runtime
|
< runtime
|
||||||
< sync/atomic
|
< sync/atomic
|
||||||
< internal/race
|
< internal/race
|
||||||
|
@ -28,7 +28,7 @@ package coverage
|
|||||||
// slot: 3 path='internal/goos'
|
// slot: 3 path='internal/goos'
|
||||||
// slot: 4 path='runtime/internal/sys' hard-coded id: 5
|
// slot: 4 path='runtime/internal/sys' hard-coded id: 5
|
||||||
// slot: 5 path='internal/abi' hard-coded id: 4
|
// slot: 5 path='internal/abi' hard-coded id: 4
|
||||||
// slot: 6 path='runtime/internal/math' hard-coded id: 6
|
// slot: 6 path='internal/runtime/math' hard-coded id: 6
|
||||||
// slot: 7 path='internal/bytealg' hard-coded id: 7
|
// slot: 7 path='internal/bytealg' hard-coded id: 7
|
||||||
// slot: 8 path='internal/goexperiment'
|
// slot: 8 path='internal/goexperiment'
|
||||||
// slot: 9 path='internal/runtime/syscall' hard-coded id: 8
|
// slot: 9 path='internal/runtime/syscall' hard-coded id: 8
|
||||||
@ -52,7 +52,7 @@ var rtPkgs = [...]string{
|
|||||||
"internal/chacha8rand",
|
"internal/chacha8rand",
|
||||||
"runtime/internal/sys",
|
"runtime/internal/sys",
|
||||||
"internal/abi",
|
"internal/abi",
|
||||||
"runtime/internal/math",
|
"internal/runtime/math",
|
||||||
"internal/bytealg",
|
"internal/bytealg",
|
||||||
"internal/goexperiment",
|
"internal/goexperiment",
|
||||||
"internal/runtime/syscall",
|
"internal/runtime/syscall",
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
package math_test
|
package math_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
. "runtime/internal/math"
|
. "internal/runtime/math"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
@ -86,7 +86,7 @@ import (
|
|||||||
"internal/abi"
|
"internal/abi"
|
||||||
"internal/goarch"
|
"internal/goarch"
|
||||||
"internal/runtime/atomic"
|
"internal/runtime/atomic"
|
||||||
"runtime/internal/math"
|
"internal/runtime/math"
|
||||||
"runtime/internal/sys"
|
"runtime/internal/sys"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
)
|
)
|
||||||
|
@ -20,7 +20,7 @@ package runtime
|
|||||||
import (
|
import (
|
||||||
"internal/abi"
|
"internal/abi"
|
||||||
"internal/runtime/atomic"
|
"internal/runtime/atomic"
|
||||||
"runtime/internal/math"
|
"internal/runtime/math"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
package runtime
|
package runtime
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"runtime/internal/math"
|
"internal/runtime/math"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ import (
|
|||||||
"internal/goarch"
|
"internal/goarch"
|
||||||
"internal/goos"
|
"internal/goos"
|
||||||
"internal/runtime/atomic"
|
"internal/runtime/atomic"
|
||||||
"runtime/internal/math"
|
"internal/runtime/math"
|
||||||
"runtime/internal/sys"
|
"runtime/internal/sys"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
)
|
)
|
||||||
|
@ -57,7 +57,7 @@ import (
|
|||||||
"internal/abi"
|
"internal/abi"
|
||||||
"internal/goarch"
|
"internal/goarch"
|
||||||
"internal/runtime/atomic"
|
"internal/runtime/atomic"
|
||||||
"runtime/internal/math"
|
"internal/runtime/math"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ package runtime
|
|||||||
import (
|
import (
|
||||||
"internal/chacha8rand"
|
"internal/chacha8rand"
|
||||||
"internal/goarch"
|
"internal/goarch"
|
||||||
"runtime/internal/math"
|
"internal/runtime/math"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
_ "unsafe" // for go:linkname
|
_ "unsafe" // for go:linkname
|
||||||
)
|
)
|
||||||
|
@ -7,7 +7,7 @@ package runtime
|
|||||||
import (
|
import (
|
||||||
"internal/abi"
|
"internal/abi"
|
||||||
"internal/goarch"
|
"internal/goarch"
|
||||||
"runtime/internal/math"
|
"internal/runtime/math"
|
||||||
"runtime/internal/sys"
|
"runtime/internal/sys"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
)
|
)
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
package runtime
|
package runtime
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"runtime/internal/math"
|
"internal/runtime/math"
|
||||||
"unsafe"
|
"unsafe"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user