From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2119) id 587523858CDB; Thu, 25 May 2023 23:15:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 587523858CDB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685056535; bh=COLtlpH6B3eUyeqILYhSDRDXLtsBZXOyLiWfewiKCbg=; h=From:To:Subject:Date:From; b=Luypyy7pzvOL0M980ipeH9RSYEtAEXgmxeDe3Mrdvuy2+++L9nr1y7OmeLvDot8gv 7QsYj+VYX9gCftKyG8mXJcxrpHMZZ3Bc0eIkvi281Po+wRmO6qzXRUkoidpkffbHfr vpfQwljaml58L/U897EGEfLudpEKCMS1YHMAZAyc= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jeff Law To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/riscv/heads/gcc-13-with-riscv-opts)] RISC-V: Eliminate SYNC memory models X-Act-Checkin: gcc X-Git-Author: Patrick O'Neill X-Git-Refname: refs/vendors/riscv/heads/gcc-13-with-riscv-opts X-Git-Oldrev: 2c67feaafd971b7f63dfae70654a4361480a7a03 X-Git-Newrev: 476313238562a00a9a008bdaea3a44116ddae431 Message-Id: <20230525231535.587523858CDB@sourceware.org> Date: Thu, 25 May 2023 23:15:35 +0000 (GMT) List-Id: https://gcc.gnu.org/g:476313238562a00a9a008bdaea3a44116ddae431 commit 476313238562a00a9a008bdaea3a44116ddae431 Author: Patrick O'Neill Date: Wed Apr 5 09:44:33 2023 -0700 RISC-V: Eliminate SYNC memory models Remove references to MEMMODEL_SYNC_* models by converting via memmodel_base(). 2023-04-27 Patrick O'Neill gcc/ChangeLog: * config/riscv/riscv.cc: Remove MEMMODEL_SYNC_* cases and sanitize memmodel input with memmodel_base. Signed-off-by: Patrick O'Neill Diff: --- 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 4c3cf7167a2..11af780fc3e 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -4304,14 +4304,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; @@ -4330,14 +4327,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; @@ -4376,6 +4370,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) { @@ -4513,12 +4508,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;