Skip to content

runtime/internal/atomic: add mips operators for And/Or #63297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

runtime/internal/atomic: add mips operators for And/Or #63297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6ba98de
runtime/internal/atomic: add And/Or operators for mips
mauri870 Sep 29, 2023
a2b62cb
use Cas64 in And64/Or64
mauri870 Sep 29, 2023
ed31946
remove redundant MOV
mauri870 Sep 30, 2023
386046e
Merge remote-tracking branch 'origin' into feature/sync-atomic-and-or…
mauri870 Jan 30, 2024
65fdc32
fix jmp to pc relative
mauri870 Jan 30, 2024
322aaae
Merge branch 'master' into feature/sync-atomic-and-or-mips
mauri870 Feb 23, 2024
d739b16
fix tab identation
mauri870 Feb 27, 2024
95dca2a
Merge branch 'master' into feature/sync-atomic-and-or-mips
mauri870 May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/internal/runtime/atomic/atomic_andor_generic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build arm || mips || mipsle || mips64 || mips64le || wasm
//go:build arm || wasm

package atomic

Expand Down
18 changes: 18 additions & 0 deletions src/internal/runtime/atomic/atomic_mips64x.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,24 @@ func And(ptr *uint32, val uint32)
//go:noescape
func Or(ptr *uint32, val uint32)

//go:noescape
func And32(ptr *uint32, val uint32) uint32

//go:noescape
func Or32(ptr *uint32, val uint32) uint32

//go:noescape
func And64(ptr *uint64, val uint64) uint64

//go:noescape
func Or64(ptr *uint64, val uint64) uint64

//go:noescape
func Anduintptr(ptr *uintptr, val uintptr) uintptr

//go:noescape
func Oruintptr(ptr *uintptr, val uintptr) uintptr

//go:noescape
func Cas64(ptr *uint64, old, new uint64) bool

Expand Down
64 changes: 64 additions & 0 deletions src/internal/runtime/atomic/atomic_mips64x.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,70 @@ TEXT ·And(SB), NOSPLIT, $0-12
SYNC
RET

// func Or32(addr *uint32, v uint32) old uint32
TEXT ·Or32(SB), NOSPLIT, $0-20
MOVV ptr+0(FP), R1
MOVW val+8(FP), R2

SYNC
LL (R1), R3
OR R2, R3, R4
SC R4, (R1)
BEQ R4, -3(PC)
SYNC
MOVW R3, ret+16(FP)
RET

// func And32(addr *uint32, v uint32) old uint32
TEXT ·And32(SB), NOSPLIT, $0-20
MOVV ptr+0(FP), R1
MOVW val+8(FP), R2

SYNC
LL (R1), R3
AND R2, R3, R4
SC R4, (R1)
BEQ R4, -3(PC)
SYNC
MOVW R3, ret+16(FP)
RET

// func Or64(addr *uint64, v uint64) old uint64
TEXT ·Or64(SB), NOSPLIT, $0-24
MOVV ptr+0(FP), R1
MOVV val+8(FP), R2

SYNC
LLV (R1), R3
OR R2, R3, R4
SCV R4, (R1)
BEQ R4, -3(PC)
SYNC
MOVV R3, ret+16(FP)
RET

// func And64(addr *uint64, v uint64) old uint64
TEXT ·And64(SB), NOSPLIT, $0-24
MOVV ptr+0(FP), R1
MOVV val+8(FP), R2

SYNC
LLV (R1), R3
AND R2, R3, R4
SCV R4, (R1)
BEQ R4, -3(PC)
SYNC
MOVV R3, ret+16(FP)
RET

// func Anduintptr(addr *uintptr, v uintptr) old uintptr
TEXT ·Anduintptr(SB), NOSPLIT, $0-24
JMP ·And64(SB)

// func Oruintptr(addr *uintptr, v uintptr) old uintptr
TEXT ·Oruintptr(SB), NOSPLIT, $0-24
JMP ·Or64(SB)

// uint32 ·Load(uint32 volatile* ptr)
TEXT ·Load(SB),NOSPLIT|NOFRAME,$0-12
MOVV ptr+0(FP), R1
Expand Down
32 changes: 32 additions & 0 deletions src/internal/runtime/atomic/atomic_mipsx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,26 @@ func Store64(addr *uint64, val uint64) {
return
}

//go:nosplit
func Or64(addr *uint64, val uint64) (old uint64) {
for {
old = *addr
if Cas64(addr, old, old|val) {
return old
}
}
}

//go:nosplit
func And64(addr *uint64, val uint64) (old uint64) {
for {
old = *addr
if Cas64(addr, old, old&val) {
return old
}
}
}

//go:noescape
func Xadd(ptr *uint32, delta int32) uint32

Expand Down Expand Up @@ -143,6 +163,18 @@ func And(ptr *uint32, val uint32)
//go:noescape
func Or(ptr *uint32, val uint32)

//go:noescape
func And32(ptr *uint32, val uint32) uint32

//go:noescape
func Or32(ptr *uint32, val uint32) uint32

//go:noescape
func Anduintptr(ptr *uintptr, val uintptr) uintptr

//go:noescape
func Oruintptr(ptr *uintptr, val uintptr) uintptr

//go:noescape
func Store(ptr *uint32, val uint32)

Expand Down
36 changes: 36 additions & 0 deletions src/internal/runtime/atomic/atomic_mipsx.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,42 @@ TEXT ·And(SB), NOSPLIT, $0-8
SYNC
RET

// func Or32(addr *uint32, v uint32) old uint32
TEXT ·Or32(SB), NOSPLIT, $0-12
MOVW ptr+0(FP), R1
MOVW val+4(FP), R2

SYNC
LL (R1), R3
OR R2, R3, R4
SC R4, (R1)
BEQ R4, -4(PC)
SYNC
MOVW R3, ret+8(FP)
RET

// func And32(addr *uint32, v uint32) old uint32
TEXT ·And32(SB), NOSPLIT, $0-12
MOVW ptr+0(FP), R1
MOVW val+4(FP), R2

SYNC
LL (R1), R3
AND R2, R3, R4
SC R4, (R1)
BEQ R4, -4(PC)
SYNC
MOVW R3, ret+8(FP)
RET

// func Anduintptr(addr *uintptr, v uintptr) old uintptr
TEXT ·Anduintptr(SB), NOSPLIT, $0-12
JMP ·And32(SB)

// func Oruintptr(addr *uintptr, v uintptr) old uintptr
TEXT ·Oruintptr(SB), NOSPLIT, $0-12
JMP ·Or32(SB)

TEXT ·spinLock(SB),NOSPLIT,$0-4
MOVW state+0(FP), R1
MOVW $1, R2
Expand Down