46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 4b6751b6a1fd054b33a57cfb942fb895b624f3e8 Mon Sep 17 00:00:00 2001
|
|
From: Patrick O'Neill <patrick@rivosinc.com>
|
|
Date: Wed, 5 Apr 2023 09:44:57 -0700
|
|
Subject: [PATCH] RISC-V: Enforce Libatomic LR/SC SEQ_CST
|
|
|
|
Replace LR.aq/SC.rl pairs with the SEQ_CST LR.aqrl/SC.rl pairs
|
|
recommended by table A.6 of the ISA manual.
|
|
|
|
2023-04-27 Patrick O'Neill <patrick@rivosinc.com>
|
|
|
|
libgcc/ChangeLog:
|
|
|
|
* config/riscv/atomic.c: Change LR.aq/SC.rl pairs into
|
|
sequentially consistent LR.aqrl/SC.rl pairs.
|
|
|
|
Signed-off-by: Patrick O'Neill <patrick@rivosinc.com>
|
|
---
|
|
libgcc/config/riscv/atomic.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libgcc/config/riscv/atomic.c b/libgcc/config/riscv/atomic.c
|
|
index 573d163ea049..bd2b033132ba 100644
|
|
--- a/libgcc/config/riscv/atomic.c
|
|
+++ b/libgcc/config/riscv/atomic.c
|
|
@@ -41,7 +41,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
unsigned old, tmp1, tmp2; \
|
|
\
|
|
asm volatile ("1:\n\t" \
|
|
- "lr.w.aq %[old], %[mem]\n\t" \
|
|
+ "lr.w.aqrl %[old], %[mem]\n\t" \
|
|
#insn " %[tmp1], %[old], %[value]\n\t" \
|
|
invert \
|
|
"and %[tmp1], %[tmp1], %[mask]\n\t" \
|
|
@@ -75,7 +75,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
unsigned old, tmp1; \
|
|
\
|
|
asm volatile ("1:\n\t" \
|
|
- "lr.w.aq %[old], %[mem]\n\t" \
|
|
+ "lr.w.aqrl %[old], %[mem]\n\t" \
|
|
"and %[tmp1], %[old], %[mask]\n\t" \
|
|
"bne %[tmp1], %[o], 1f\n\t" \
|
|
"and %[tmp1], %[old], %[not_mask]\n\t" \
|
|
--
|
|
2.39.3
|
|
|