Skip to content

cmd/compile/internal: add intrinsic rule for sync atomic and/or 32/64 on RISCV64 #13

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

Open
hbrooks wants to merge 1 commit into
base: master
Choose a base branch
from
Open

cmd/compile/internal: add intrinsic rule for sync atomic and/or 32/64 on RISCV64 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions src/cmd/compile/internal/riscv64/ssa.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,15 @@ func ssaGenValue(s *ssagen.State, v *ssa.Value) {
p.To.Reg = v.Args[0].Reg()
p.RegTo2 = riscv.REG_ZERO

case ssa.OpRISCV64LoweredAtomicAnd32value, ssa.OpRISCV64LoweredAtomicAnd64value,
ssa.OpRISCV64LoweredAtomicOr32value, ssa.OpRISCV64LoweredAtomicOr64value:
p := s.Prog(v.Op.Asm())
p.From.Type = obj.TYPE_REG
p.From.Reg = v.Args[1].Reg()
p.To.Type = obj.TYPE_MEM
p.To.Reg = v.Args[0].Reg()
p.RegTo2 = v.Reg0()

case ssa.OpRISCV64LoweredZero:
ptr := v.Args[0].Reg()
sc := v.AuxValAndOff()
Expand Down
5 changes: 5 additions & 0 deletions src/cmd/compile/internal/ssa/_gen/RISCV64.rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,11 @@

(AtomicAnd32 ...) => (LoweredAtomicAnd32 ...)

(AtomicAnd32value ...) => (LoweredAtomicAnd32value ...)
(AtomicAnd64value ...) => (LoweredAtomicAnd64value ...)
(AtomicOr32value ...) => (LoweredAtomicOr32value ...)
(AtomicOr64value ...) => (LoweredAtomicOr64value ...)

(AtomicCompareAndSwap32 ptr old new mem) => (LoweredAtomicCas32 ptr (SignExt32to64 old) new mem)
(AtomicCompareAndSwap64 ...) => (LoweredAtomicCas64 ...)

Expand Down
6 changes: 6 additions & 0 deletions src/cmd/compile/internal/ssa/_gen/RISCV64Ops.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,12 @@ func init() {
{name: "LoweredAtomicAnd32", argLength: 3, reg: gpatomic, asm: "AMOANDW", faultOnNilArg0: true, hasSideEffects: true},
{name: "LoweredAtomicOr32", argLength: 3, reg: gpatomic, asm: "AMOORW", faultOnNilArg0: true, hasSideEffects: true},

// Atomic 32/64 bit AND/OR that return the old value.
{name: "LoweredAtomicAnd32value", argLength: 3, reg: gpxchg, resultNotInArgs: true, asm: "AMOANDW", faultOnNilArg0: true, hasSideEffects: true},
{name: "LoweredAtomicAnd64value", argLength: 3, reg: gpxchg, resultNotInArgs: true, asm: "AMOANDD", faultOnNilArg0: true, hasSideEffects: true},
{name: "LoweredAtomicOr32value", argLength: 3, reg: gpxchg, resultNotInArgs: true, asm: "AMOORW", faultOnNilArg0: true, hasSideEffects: true},
{name: "LoweredAtomicOr64value", argLength: 3, reg: gpxchg, resultNotInArgs: true, asm: "AMOORD", faultOnNilArg0: true, hasSideEffects: true},

// Lowering pass-throughs
{name: "LoweredNilCheck", argLength: 2, faultOnNilArg0: true, nilCheck: true, reg: regInfo{inputs: []regMask{gpspMask}}}, // arg0=ptr,arg1=mem, returns void. Faults if ptr is nil.
{name: "LoweredGetClosurePtr", reg: regInfo{outputs: []regMask{regCtxt}}}, // scheduler ensures only at beginning of entry block
Expand Down
72 changes: 72 additions & 0 deletions src/cmd/compile/internal/ssa/opGen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions src/cmd/compile/internal/ssa/rewriteRISCV64.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions src/cmd/compile/internal/ssagen/intrinsics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,31 +662,31 @@ func initIntrinsics(cfg *intrinsicBuildConfig) {
s.vars[memVar] = p1
return p0
},
sys.AMD64, sys.Loong64)
sys.AMD64, sys.Loong64, sys.RISCV64)
addF("internal/runtime/atomic", "And32",
func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
v := s.newValue3(ssa.OpAtomicAnd32value, types.NewTuple(types.Types[types.TUINT32], types.TypeMem), args[0], args[1], s.mem())
p0, p1 := s.split(v)
s.vars[memVar] = p1
return p0
},
sys.AMD64, sys.Loong64)
sys.AMD64, sys.Loong64, sys.RISCV64)
addF("internal/runtime/atomic", "Or64",
func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
v := s.newValue3(ssa.OpAtomicOr64value, types.NewTuple(types.Types[types.TUINT64], types.TypeMem), args[0], args[1], s.mem())
p0, p1 := s.split(v)
s.vars[memVar] = p1
return p0
},
sys.AMD64, sys.Loong64)
sys.AMD64, sys.Loong64, sys.RISCV64)
addF("internal/runtime/atomic", "Or32",
func(s *state, n *ir.CallExpr, args []*ssa.Value) *ssa.Value {
v := s.newValue3(ssa.OpAtomicOr32value, types.NewTuple(types.Types[types.TUINT32], types.TypeMem), args[0], args[1], s.mem())
p0, p1 := s.split(v)
s.vars[memVar] = p1
return p0
},
sys.AMD64, sys.Loong64)
sys.AMD64, sys.Loong64, sys.RISCV64)

// Aliases for atomic load operations
alias("internal/runtime/atomic", "Loadint32", "internal/runtime/atomic", "Load", all...)
Expand Down Expand Up @@ -1333,16 +1333,16 @@ func initIntrinsics(cfg *intrinsicBuildConfig) {
alias("sync/atomic", "AddUintptr", "internal/runtime/atomic", "Xadd", p4...)
alias("sync/atomic", "AddUintptr", "internal/runtime/atomic", "Xadd64", p8...)

alias("sync/atomic", "AndInt32", "internal/runtime/atomic", "And32", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64)
alias("sync/atomic", "AndUint32", "internal/runtime/atomic", "And32", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64)
alias("sync/atomic", "AndInt64", "internal/runtime/atomic", "And64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64)
alias("sync/atomic", "AndUint64", "internal/runtime/atomic", "And64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64)
alias("sync/atomic", "AndUintptr", "internal/runtime/atomic", "And64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64)
alias("sync/atomic", "OrInt32", "internal/runtime/atomic", "Or32", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64)
alias("sync/atomic", "OrUint32", "internal/runtime/atomic", "Or32", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64)
alias("sync/atomic", "OrInt64", "internal/runtime/atomic", "Or64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64)
alias("sync/atomic", "OrUint64", "internal/runtime/atomic", "Or64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64)
alias("sync/atomic", "OrUintptr", "internal/runtime/atomic", "Or64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64)
alias("sync/atomic", "AndInt32", "internal/runtime/atomic", "And32", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64, sys.ArchRISCV64)
alias("sync/atomic", "AndUint32", "internal/runtime/atomic", "And32", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64, sys.ArchRISCV64)
alias("sync/atomic", "AndInt64", "internal/runtime/atomic", "And64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64, sys.ArchRISCV64)
alias("sync/atomic", "AndUint64", "internal/runtime/atomic", "And64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64, sys.ArchRISCV64)
alias("sync/atomic", "AndUintptr", "internal/runtime/atomic", "And64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64, sys.ArchRISCV64)
alias("sync/atomic", "OrInt32", "internal/runtime/atomic", "Or32", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64, sys.ArchRISCV64)
alias("sync/atomic", "OrUint32", "internal/runtime/atomic", "Or32", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64, sys.ArchRISCV64)
alias("sync/atomic", "OrInt64", "internal/runtime/atomic", "Or64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64, sys.ArchRISCV64)
alias("sync/atomic", "OrUint64", "internal/runtime/atomic", "Or64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64, sys.ArchRISCV64)
alias("sync/atomic", "OrUintptr", "internal/runtime/atomic", "Or64", sys.ArchARM64, sys.ArchAMD64, sys.ArchLoong64, sys.ArchRISCV64)

/******** math/big ********/
alias("math/big", "mulWW", "math/bits", "Mul64", p8...)
Expand Down
14 changes: 14 additions & 0 deletions src/cmd/compile/internal/ssagen/intrinsics_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,6 +1072,8 @@ var wantIntrinsics = map[testIntrinsicKey]struct{}{
{"ppc64le", "crypto/internal/constanttime", "Select"}: struct{}{},
{"ppc64le", "crypto/internal/constanttime", "boolToUint8"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "And"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "And32"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "And64"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "And8"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "Cas"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "Cas64"}: struct{}{},
Expand All @@ -1092,6 +1094,8 @@ var wantIntrinsics = map[testIntrinsicKey]struct{}{
{"riscv64", "internal/runtime/atomic", "Loaduint"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "Loaduintptr"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "Or"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "Or32"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "Or64"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "Or8"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "Store"}: struct{}{},
{"riscv64", "internal/runtime/atomic", "Store64"}: struct{}{},
Expand Down Expand Up @@ -1167,6 +1171,11 @@ var wantIntrinsics = map[testIntrinsicKey]struct{}{
{"riscv64", "sync/atomic", "AddUint32"}: struct{}{},
{"riscv64", "sync/atomic", "AddUint64"}: struct{}{},
{"riscv64", "sync/atomic", "AddUintptr"}: struct{}{},
{"riscv64", "sync/atomic", "AndInt32"}: struct{}{},
{"riscv64", "sync/atomic", "AndInt64"}: struct{}{},
{"riscv64", "sync/atomic", "AndUint32"}: struct{}{},
{"riscv64", "sync/atomic", "AndUint64"}: struct{}{},
{"riscv64", "sync/atomic", "AndUintptr"}: struct{}{},
{"riscv64", "sync/atomic", "CompareAndSwapInt32"}: struct{}{},
{"riscv64", "sync/atomic", "CompareAndSwapInt64"}: struct{}{},
{"riscv64", "sync/atomic", "CompareAndSwapUint32"}: struct{}{},
Expand All @@ -1178,6 +1187,11 @@ var wantIntrinsics = map[testIntrinsicKey]struct{}{
{"riscv64", "sync/atomic", "LoadUint32"}: struct{}{},
{"riscv64", "sync/atomic", "LoadUint64"}: struct{}{},
{"riscv64", "sync/atomic", "LoadUintptr"}: struct{}{},
{"riscv64", "sync/atomic", "OrInt32"}: struct{}{},
{"riscv64", "sync/atomic", "OrInt64"}: struct{}{},
{"riscv64", "sync/atomic", "OrUint32"}: struct{}{},
{"riscv64", "sync/atomic", "OrUint64"}: struct{}{},
{"riscv64", "sync/atomic", "OrUintptr"}: struct{}{},
{"riscv64", "sync/atomic", "StoreInt32"}: struct{}{},
{"riscv64", "sync/atomic", "StoreInt64"}: struct{}{},
{"riscv64", "sync/atomic", "StoreUint32"}: struct{}{},
Expand Down
9 changes: 9 additions & 0 deletions test/codegen/atomics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ func (c *Counter) Increment() {
// arm64/v8.0:".*arm64HasATOMICS"
// arm64/v8.1:-".*arm64HasATOMICS"
// amd64:"LOCK" -"CMPXCHG"
// riscv64:"AMOADDW" -"JAL"
atomic.AddInt32(&c.count, 1)
}

Expand All @@ -35,12 +36,14 @@ func atomicLogical64(x *atomic.Uint64) uint64 {
// arm64/v8.1:-".*arm64HasATOMICS"
// On amd64, make sure we use LOCK+AND instead of CMPXCHG when we don't use the result.
// amd64:"LOCK" -"CMPXCHGQ"
// riscv64:"AMOANDD" -"JAL"
x.And(11)
// arm64/v8.0:"LDCLRALD"
// arm64/v8.1:"LDCLRALD"
// arm64/v8.0:".*arm64HasATOMICS"
// arm64/v8.1:-".*arm64HasATOMICS"
// amd64:"LOCK" "CMPXCHGQ"
// riscv64:"AMOANDD" -"JAL"
r += x.And(22)

// arm64/v8.0:"LDORALD"
Expand All @@ -49,12 +52,14 @@ func atomicLogical64(x *atomic.Uint64) uint64 {
// arm64/v8.1:-".*arm64HasATOMICS"
// On amd64, make sure we use LOCK+OR instead of CMPXCHG when we don't use the result.
// amd64:"LOCK" -"CMPXCHGQ"
// riscv64:"AMOORD" -"JAL"
x.Or(33)
// arm64/v8.0:"LDORALD"
// arm64/v8.1:"LDORALD"
// arm64/v8.0:".*arm64HasATOMICS"
// arm64/v8.1:-".*arm64HasATOMICS"
// amd64:"LOCK" "CMPXCHGQ"
// riscv64:"AMOORD" -"JAL"
r += x.Or(44)

return r
Expand All @@ -69,12 +74,14 @@ func atomicLogical32(x *atomic.Uint32) uint32 {
// arm64/v8.1:-".*arm64HasATOMICS"
// On amd64, make sure we use LOCK+AND instead of CMPXCHG when we don't use the result.
// amd64:"LOCK" -"CMPXCHGL"
// riscv64:"AMOANDW" -"JAL"
x.And(11)
// arm64/v8.0:"LDCLRALW"
// arm64/v8.1:"LDCLRALW"
// arm64/v8.0:".*arm64HasATOMICS"
// arm64/v8.1:-".*arm64HasATOMICS"
// amd64:"LOCK" "CMPXCHGL"
// riscv64:"AMOANDW" -"JAL"
r += x.And(22)

// arm64/v8.0:"LDORALW"
Expand All @@ -83,12 +90,14 @@ func atomicLogical32(x *atomic.Uint32) uint32 {
// arm64/v8.1:-".*arm64HasATOMICS"
// On amd64, make sure we use LOCK+OR instead of CMPXCHG when we don't use the result.
// amd64:"LOCK" -"CMPXCHGL"
// riscv64:"AMOORW" -"JAL"
x.Or(33)
// arm64/v8.0:"LDORALW"
// arm64/v8.1:"LDORALW"
// arm64/v8.0:".*arm64HasATOMICS"
// arm64/v8.1:-".*arm64HasATOMICS"
// amd64:"LOCK" "CMPXCHGL"
// riscv64:"AMOORW" -"JAL"
r += x.Or(44)

return r
Expand Down