From 4a3446a0a51dd038b1c0c3640f55b4bf10aafc4c Mon Sep 17 00:00:00 2001 From: xushiwei Date: Sun, 16 Jun 2024 17:03:41 +0800 Subject: [PATCH] llgo/ssa: AtomicCmpXchg fix --- _demo/catomic/atomic.go | 4 ++-- c/sync/atomic/atomic.go | 2 +- cl/_testlibc/atomic/in.go | 16 ++++++++-------- cl/_testlibc/atomic/out.ll | 30 +++++++++++++++++------------- ssa/memory.go | 5 +++-- 5 files changed, 31 insertions(+), 26 deletions(-) diff --git a/_demo/catomic/atomic.go b/_demo/catomic/atomic.go index c4688aa7..589c5ebf 100644 --- a/_demo/catomic/atomic.go +++ b/_demo/catomic/atomic.go @@ -13,10 +13,10 @@ func main() { ret := atomic.Add(&v, 1) println("ret:", ret, "v:", v) - ret = atomic.CompareAndExchange(&v, 100, 102) + ret, _ = atomic.CompareAndExchange(&v, 100, 102) 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) ret = atomic.Sub(&v, 1) diff --git a/c/sync/atomic/atomic.go b/c/sync/atomic/atomic.go index d7548a8d..41a6c3e7 100644 --- a/c/sync/atomic/atomic.go +++ b/c/sync/atomic/atomic.go @@ -68,4 +68,4 @@ func Store[T integer](ptr *T, v T) {} func Exchange[T integer](ptr *T, v T) T { return v } // 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 } diff --git a/cl/_testlibc/atomic/in.go b/cl/_testlibc/atomic/in.go index ed847a2d..7f17b60f 100644 --- a/cl/_testlibc/atomic/in.go +++ b/cl/_testlibc/atomic/in.go @@ -11,15 +11,15 @@ func main() { atomic.Store(&v, 100) c.Printf(c.Str("store: %ld\n"), atomic.Load(&v)) - atomic.Add(&v, 1) - c.Printf(c.Str("v: %ld\n"), v) + ret := atomic.Add(&v, 1) + c.Printf(c.Str("ret: %ld, v: %ld\n"), ret, v) - atomic.CompareAndExchange(&v, 100, 102) - c.Printf(c.Str("v: %ld\n"), v) + ret, _ = atomic.CompareAndExchange(&v, 100, 102) + c.Printf(c.Str("ret: %ld vs 100, v: %ld\n"), ret, v) - atomic.CompareAndExchange(&v, 101, 102) - c.Printf(c.Str("v: %ld\n"), v) + ret, _ = atomic.CompareAndExchange(&v, 101, 102) + c.Printf(c.Str("ret: %ld vs 101, v: %ld\n"), ret, v) - atomic.Sub(&v, 1) - c.Printf(c.Str("v: %ld\n"), v) + ret = atomic.Sub(&v, 1) + c.Printf(c.Str("ret: %ld, v: %ld\n"), ret, v) } diff --git a/cl/_testlibc/atomic/out.ll b/cl/_testlibc/atomic/out.ll index 80b97edd..bbe00131 100644 --- a/cl/_testlibc/atomic/out.ll +++ b/cl/_testlibc/atomic/out.ll @@ -5,10 +5,10 @@ source_filename = "main" @__llgo_argc = global i32 0, align 4 @__llgo_argv = global ptr null, align 8 @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 -@2 = private unnamed_addr constant [8 x i8] c"v: %ld\0A\00", align 1 -@3 = private unnamed_addr constant [8 x i8] c"v: %ld\0A\00", align 1 -@4 = 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 [25 x i8] c"ret: %ld vs 100, 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 [18 x i8] c"ret: %ld, v: %ld\0A\00", align 1 define void @main.init() { _llgo_0: @@ -35,16 +35,20 @@ _llgo_0: %4 = call i32 (ptr, ...) @printf(ptr @0, i64 %3) %5 = atomicrmw add ptr %2, i64 1 seq_cst, align 8 %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 - %9 = load i64, ptr %2, align 4 - %10 = call i32 (ptr, ...) @printf(ptr @2, i64 %9) - %11 = cmpxchg ptr %2, i64 101, i64 102 seq_cst seq_cst, align 8 - %12 = load i64, ptr %2, align 4 - %13 = call i32 (ptr, ...) @printf(ptr @3, i64 %12) - %14 = atomicrmw sub ptr %2, i64 1 seq_cst, align 8 - %15 = load i64, ptr %2, align 4 - %16 = call i32 (ptr, ...) @printf(ptr @4, i64 %15) + %9 = extractvalue { i64, i1 } %8, 0 + %10 = extractvalue { i64, i1 } %8, 1 + %11 = load i64, ptr %2, align 4 + %12 = call i32 (ptr, ...) @printf(ptr @2, i64 %9, i64 %11) + %13 = cmpxchg ptr %2, i64 101, i64 102 seq_cst seq_cst, align 8 + %14 = extractvalue { i64, i1 } %13, 0 + %15 = extractvalue { i64, i1 } %13, 1 + %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 } diff --git a/ssa/memory.go b/ssa/memory.go index 244122ee..b021ca00 100644 --- a/ssa/memory.go +++ b/ssa/memory.go @@ -246,13 +246,14 @@ func (b Builder) AtomicCmpXchg(ptr, old, new Expr) Expr { if debugInstr { 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) new = b.ChangeType(t, new) ret := b.impl.CreateAtomicCmpXchg( ptr.impl, old.impl, new.impl, 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.