From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) by sourceware.org (Postfix) with ESMTPS id 711413892004; Mon, 26 Apr 2021 12:45:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 711413892004 Received: by mail-ej1-f42.google.com with SMTP id r12so84233184ejr.5; Mon, 26 Apr 2021 05:45:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/3d+lrh6uIZ1YKkyguRWwlNr+uX6QT9N6tGKAP0iLvw=; b=LqqrUJU+lt4hhLPBD8r6GpXq6SZIf32VlI3rEHc/JUPGqQUPd4K7dcEwt0Kezx4X4N XVQJ+d+EsTdrxMv3bPWX+MAkDCNYgvnIBSulVay32rbPrje9aIHftoIL+wVOV99sC2ub HTIRZdsqglsM7ic27uGU/x0rdr5zfS/fZRT+M0FlxMZ78MTO6v8YLaUixzZ3NWdvt7k5 6za3MSy4RBwC+04x5AUeymeh4mzGHbDE4ikqJ3kzrTMuUWa2wtbNe+oXjG+rwiUMGg+r 2UnqCp/KvDQUK074+bvjYBa4QubgRhmyVUfRDbXns0tkhcodq/va+irdcLQfzEpFMAcx jyGA== X-Gm-Message-State: AOAM5300O6BhiEAEQBABMi69wzuvrnDWj1DgvtrsdL7kbxmZ8icb98wB CyxVjPowc3t5iHwKK/x5Gm2nkB0LJlcTNQ== X-Google-Smtp-Source: ABdhPJzsspX/GjqNDB9uK8sgOAiWCuVeA1fN1s8oAj1QEfRgxVMLSsb0PC68yGobC/EunTs0pwOcmw== X-Received: by 2002:a17:906:7c82:: with SMTP id w2mr18513327ejo.448.1619441158253; Mon, 26 Apr 2021 05:45:58 -0700 (PDT) Received: from beast.fritz.box (62-178-178-158.cable.dynamic.surfer.at. [62.178.178.158]) by smtp.gmail.com with ESMTPSA id o20sm14126755eds.65.2021.04.26.05.45.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Apr 2021 05:45:57 -0700 (PDT) From: Christoph Muellner To: gcc-patches@gcc.gnu.org Cc: Jim Wilson , Kito Cheng , Christoph Muellner Subject: [PATCH 01/10] RISC-V: Simplify memory model code [PR 100265] Date: Mon, 26 Apr 2021 14:45:43 +0200 Message-Id: <20210426124552.3316789-2-cmuellner@gcc.gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210426124552.3316789-1-cmuellner@gcc.gnu.org> References: <20210426124552.3316789-1-cmuellner@gcc.gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2021 12:46:00 -0000 We don't have any special treatment of MEMMODEL_SYNC_* values, so let's hide them behind the memmodel_base() function. gcc/ PR 100265 * config/riscv/riscv.c (riscv_memmodel_needs_amo_acquire): Ignore MEMMODEL_SYNC_* values. * config/riscv/riscv.c (riscv_memmodel_needs_release_fence): Likewise. * config/riscv/riscv.c (riscv_print_operand): Eliminate MEMMODEL_SYNC_* values by calling memmodel_base(). --- gcc/config/riscv/riscv.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c index 17cdf705c328..9b5aedc77131 100644 --- a/gcc/config/riscv/riscv.c +++ b/gcc/config/riscv/riscv.c @@ -3345,20 +3345,17 @@ riscv_print_operand_reloc (FILE *file, rtx op, bool hi_reloc) acquire portion of memory model MODEL. */ static bool -riscv_memmodel_needs_amo_acquire (enum memmodel model) +riscv_memmodel_needs_amo_acquire (const enum memmodel model) { switch (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; @@ -3371,20 +3368,17 @@ riscv_memmodel_needs_amo_acquire (enum memmodel model) implement the release portion of memory model MODEL. */ static bool -riscv_memmodel_needs_release_fence (enum memmodel model) +riscv_memmodel_needs_release_fence (const enum memmodel model) { switch (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; @@ -3409,6 +3403,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) { @@ -3428,12 +3423,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.31.1