admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #328 from xushiwei/q

Browse Source 
llgo/ssa: AtomicCmpXchg fix
This commit is contained in:
xushiwei
2024-06-16 17:07:20 +08:00
committed by GitHub
parent 6f6d9b39ba 4a3446a0a5
commit 3ff5caef94
5 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_demo/catomic/atomic.go
View File

@@ -13,10 +13,10 @@ func main() {
ret := atomic.Add(&v, 1) ret := atomic.Add(&v, 1)
println("ret:", ret, "v:", v) println("ret:", ret, "v:", v)
ret = atomic.CompareAndExchange(&v, 100, 102) ret, _ = atomic.CompareAndExchange(&v, 100, 102)
println("ret:", ret, "vs 100, v:", v) println("ret:", ret, "vs 100, v:", v)
ret = atomic.CompareAndExchange(&v, 101, 102) ret, _ = atomic.CompareAndExchange(&v, 101, 102)
println("ret:", ret, "vs 101, v:", v) println("ret:", ret, "vs 101, v:", v)
ret = atomic.Sub(&v, 1) ret = atomic.Sub(&v, 1)

2
c/sync/atomic/atomic.go
View File

@@ -68,4 +68,4 @@ func Store[T integer](ptr *T, v T) {}
func Exchange[T integer](ptr *T, v T) T { return v } func Exchange[T integer](ptr *T, v T) T { return v }
// llgo:link CompareAndExchange llgo.atomicCmpXchg // llgo:link CompareAndExchange llgo.atomicCmpXchg
func CompareAndExchange[T integer](ptr *T, old, new T) T { return old } func CompareAndExchange[T integer](ptr *T, old, new T) (T, bool) { return old, false }

16
cl/_testlibc/atomic/in.go
View File

@@ -11,15 +11,15 @@ func main() {
atomic.Store(&v, 100) atomic.Store(&v, 100)
c.Printf(c.Str("store: %ld\n"), atomic.Load(&v)) c.Printf(c.Str("store: %ld\n"), atomic.Load(&v))
atomic.Add(&v, 1) ret := atomic.Add(&v, 1)
c.Printf(c.Str("v: %ld\n"), v) c.Printf(c.Str("ret: %ld, v: %ld\n"), ret, v)
atomic.CompareAndExchange(&v, 100, 102) ret, _ = atomic.CompareAndExchange(&v, 100, 102)
c.Printf(c.Str("v: %ld\n"), v) c.Printf(c.Str("ret: %ld vs 100, v: %ld\n"), ret, v)
atomic.CompareAndExchange(&v, 101, 102) ret, _ = atomic.CompareAndExchange(&v, 101, 102)
c.Printf(c.Str("v: %ld\n"), v) c.Printf(c.Str("ret: %ld vs 101, v: %ld\n"), ret, v)
atomic.Sub(&v, 1) ret = atomic.Sub(&v, 1)
c.Printf(c.Str("v: %ld\n"), v) c.Printf(c.Str("ret: %ld, v: %ld\n"), ret, v)
} }

30
cl/_testlibc/atomic/out.ll
View File

@@ -5,10 +5,10 @@ source_filename = "main"
@__llgo_argc = global i32 0, align 4 @__llgo_argc = global i32 0, align 4
@__llgo_argv = global ptr null, align 8 @__llgo_argv = global ptr null, align 8
@0 = private unnamed_addr constant [12 x i8] c"store: %ld\0A\00", align 1 @0 = private unnamed_addr constant [12 x i8] c"store: %ld\0A\00", align 1
@1 = private unnamed_addr constant [8 x i8] c"v: %ld\0A\00", align 1 @1 = private unnamed_addr constant [18 x i8] c"ret: %ld, v: %ld\0A\00", align 1
@2 = private unnamed_addr constant [8 x i8] c"v: %ld\0A\00", align 1 @2 = private unnamed_addr constant [25 x i8] c"ret: %ld vs 100, v: %ld\0A\00", align 1
@3 = private unnamed_addr constant [8 x i8] c"v: %ld\0A\00", align 1 @3 = private unnamed_addr constant [25 x i8] c"ret: %ld vs 101, v: %ld\0A\00", align 1
@4 = private unnamed_addr constant [8 x i8] c"v: %ld\0A\00", align 1 @4 = private unnamed_addr constant [18 x i8] c"ret: %ld, v: %ld\0A\00", align 1
define void @main.init() { define void @main.init() {
_llgo_0: _llgo_0:
@@ -35,16 +35,20 @@ _llgo_0:
%4 = call i32 (ptr, ...) @printf(ptr @0, i64 %3) %4 = call i32 (ptr, ...) @printf(ptr @0, i64 %3)
%5 = atomicrmw add ptr %2, i64 1 seq_cst, align 8 %5 = atomicrmw add ptr %2, i64 1 seq_cst, align 8
%6 = load i64, ptr %2, align 4 %6 = load i64, ptr %2, align 4
%7 = call i32 (ptr, ...) @printf(ptr @1, i64 %6) %7 = call i32 (ptr, ...) @printf(ptr @1, i64 %5, i64 %6)
%8 = cmpxchg ptr %2, i64 100, i64 102 seq_cst seq_cst, align 8 %8 = cmpxchg ptr %2, i64 100, i64 102 seq_cst seq_cst, align 8
%9 = load i64, ptr %2, align 4 %9 = extractvalue { i64, i1 } %8, 0
%10 = call i32 (ptr, ...) @printf(ptr @2, i64 %9) %10 = extractvalue { i64, i1 } %8, 1
%11 = cmpxchg ptr %2, i64 101, i64 102 seq_cst seq_cst, align 8 %11 = load i64, ptr %2, align 4
%12 = load i64, ptr %2, align 4 %12 = call i32 (ptr, ...) @printf(ptr @2, i64 %9, i64 %11)
%13 = call i32 (ptr, ...) @printf(ptr @3, i64 %12) %13 = cmpxchg ptr %2, i64 101, i64 102 seq_cst seq_cst, align 8
%14 = atomicrmw sub ptr %2, i64 1 seq_cst, align 8 %14 = extractvalue { i64, i1 } %13, 0
%15 = load i64, ptr %2, align 4 %15 = extractvalue { i64, i1 } %13, 1
%16 = call i32 (ptr, ...) @printf(ptr @4, i64 %15) %16 = load i64, ptr %2, align 4
%17 = call i32 (ptr, ...) @printf(ptr @3, i64 %14, i64 %16)
%18 = atomicrmw sub ptr %2, i64 1 seq_cst, align 8
%19 = load i64, ptr %2, align 4
%20 = call i32 (ptr, ...) @printf(ptr @4, i64 %18, i64 %19)
ret i32 0 ret i32 0
} }

5
ssa/memory.go
View File

@@ -246,13 +246,14 @@ func (b Builder) AtomicCmpXchg(ptr, old, new Expr) Expr {
if debugInstr { if debugInstr {
log.Printf("AtomicCmpXchg %v, %v, %v\n", ptr.impl, old.impl, new.impl) log.Printf("AtomicCmpXchg %v, %v, %v\n", ptr.impl, old.impl, new.impl)
} }
t := b.Prog.Elem(ptr.Type) prog := b.Prog
t := prog.Elem(ptr.Type)
old = b.ChangeType(t, old) old = b.ChangeType(t, old)
new = b.ChangeType(t, new) new = b.ChangeType(t, new)
ret := b.impl.CreateAtomicCmpXchg( ret := b.impl.CreateAtomicCmpXchg(
ptr.impl, old.impl, new.impl, ptr.impl, old.impl, new.impl,
llvm.AtomicOrderingSequentiallyConsistent, llvm.AtomicOrderingSequentiallyConsistent, false) llvm.AtomicOrderingSequentiallyConsistent, llvm.AtomicOrderingSequentiallyConsistent, false)
return Expr{ret, t} return Expr{ret, prog.Struct(t, prog.Bool())}
} }
// Load returns the value at the pointer ptr. // Load returns the value at the pointer ptr.