81 lines
2.3 KiB
Diff
81 lines
2.3 KiB
Diff
From 76ae6cd70f2ad4137a6d0ce32f618bc6ef2ca0b9 Mon Sep 17 00:00:00 2001
|
|
From: Patrick O'Neill <patrick@rivosinc.com>
|
|
Date: Wed, 5 Apr 2023 09:44:33 -0700
|
|
Subject: [PATCH] RISC-V: Eliminate SYNC memory models
|
|
|
|
Remove references to MEMMODEL_SYNC_* models by converting via
|
|
memmodel_base().
|
|
|
|
2023-04-27 Patrick O'Neill <patrick@rivosinc.com>
|
|
|
|
gcc/ChangeLog:
|
|
|
|
* config/riscv/riscv.cc: Remove MEMMODEL_SYNC_* cases and
|
|
sanitize memmodel input with memmodel_base.
|
|
|
|
Signed-off-by: Patrick O'Neill <patrick@rivosinc.com>
|
|
---
|
|
gcc/config/riscv/riscv.cc | 11 +++--------
|
|
1 file changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
|
|
index 9c626904e893..11b897aca5c4 100644
|
|
--- a/gcc/config/riscv/riscv.cc
|
|
+++ b/gcc/config/riscv/riscv.cc
|
|
@@ -4294,14 +4294,11 @@ riscv_memmodel_needs_amo_acquire (enum memmodel model)
|
|
{
|
|
case MEMMODEL_ACQ_REL:
|
|
case MEMMODEL_SEQ_CST:
|
|
- case MEMMODEL_SYNC_SEQ_CST:
|
|
case MEMMODEL_ACQUIRE:
|
|
case MEMMODEL_CONSUME:
|
|
- case MEMMODEL_SYNC_ACQUIRE:
|
|
return true;
|
|
|
|
case MEMMODEL_RELEASE:
|
|
- case MEMMODEL_SYNC_RELEASE:
|
|
case MEMMODEL_RELAXED:
|
|
return false;
|
|
|
|
@@ -4320,14 +4317,11 @@ riscv_memmodel_needs_release_fence (enum memmodel model)
|
|
{
|
|
case MEMMODEL_ACQ_REL:
|
|
case MEMMODEL_SEQ_CST:
|
|
- case MEMMODEL_SYNC_SEQ_CST:
|
|
case MEMMODEL_RELEASE:
|
|
- case MEMMODEL_SYNC_RELEASE:
|
|
return true;
|
|
|
|
case MEMMODEL_ACQUIRE:
|
|
case MEMMODEL_CONSUME:
|
|
- case MEMMODEL_SYNC_ACQUIRE:
|
|
case MEMMODEL_RELAXED:
|
|
return false;
|
|
|
|
@@ -4366,6 +4360,7 @@ riscv_print_operand (FILE *file, rtx op, int letter)
|
|
}
|
|
machine_mode mode = GET_MODE (op);
|
|
enum rtx_code code = GET_CODE (op);
|
|
+ const enum memmodel model = memmodel_base (INTVAL (op));
|
|
|
|
switch (letter)
|
|
{
|
|
@@ -4503,12 +4498,12 @@ riscv_print_operand (FILE *file, rtx op, int letter)
|
|
break;
|
|
|
|
case 'A':
|
|
- if (riscv_memmodel_needs_amo_acquire ((enum memmodel) INTVAL (op)))
|
|
+ if (riscv_memmodel_needs_amo_acquire (model))
|
|
fputs (".aq", file);
|
|
break;
|
|
|
|
case 'F':
|
|
- if (riscv_memmodel_needs_release_fence ((enum memmodel) INTVAL (op)))
|
|
+ if (riscv_memmodel_needs_release_fence (model))
|
|
fputs ("fence iorw,ow; ", file);
|
|
break;
|
|
|
|
--
|
|
2.39.3
|
|
|