From patchwork Fri May 27 06:07:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Christoph_M=C3=BCllner?= X-Patchwork-Id: 1636136 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=DdQqRjAm; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L8ZB65J7yz9sBB for ; Fri, 27 May 2022 16:08:46 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8D491382D47F for ; Fri, 27 May 2022 06:08:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D491382D47F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1653631724; bh=HdTvQ4/AECCBYGG/e2qqUrPcrhWnbQ6JvHYE5h6NkqU=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=DdQqRjAmTUdYXaka8kiyms/RH0K+xn99nFGaHcMk8d06OyLSR4WSOplqcYdhYk978 QRv1ZxpFIgYD/+gIv2VJRc180hu7BiJ666YZoc4CR7+G/z8pPU9C/oImnMVjjP8kyX 6YCW12ifgwPK2hzMRB69rV0uFIZzctvqhCRBM6Ig= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by sourceware.org (Postfix) with ESMTPS id EB742383B7A6; Fri, 27 May 2022 06:07:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EB742383B7A6 Received: by mail-wr1-f47.google.com with SMTP id z15so4517355wrg.11; Thu, 26 May 2022 23:07:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HdTvQ4/AECCBYGG/e2qqUrPcrhWnbQ6JvHYE5h6NkqU=; b=tOW9bIGugMVicZvXuPGaym4ByH1jsbmM/OBNd24UsyB9Xow3Kfr2W1BumBzYX+s1Hd PQqDNh9paZB6G+BZHZWLn+7mrrYfKvvorDIuEjNjh3FL0uDESdDo2UIU8oouPFv0FuB4 tn7IazfQ/+IqTv4H3onViqXPCkD+ASc+tHGu/veOoG18vW9sPUs9rGxQ16Ik1YnkvyJb r7SmLAJVmm3Dm4gWUkuOVTaqqmMQK5P+QOc0ujpn0pRWlVFhHYiKpTQtvwcmo/NxukBv ClSRb3bu8iLA13mqe5KlSn79kv5egxzjAoBydGnMpYL9VEUmMUjLVg6g+uZgdymzL/4/ Dwow== X-Gm-Message-State: AOAM533y7Y76Oeba+nsP35vN7wzJGMPmmW8hY/Rr3IVFq89GrOakm6t2 f/tg2gFCFcFqhq1RCIjYFgWJ/9xAJI8wVPY0 X-Google-Smtp-Source: ABdhPJyrnrSZF2kG/AU3k+AvODRZatXjEHIIK6yWiscNHubACnhp3Tccd4gfcS5cyrzLBGySkq256A== X-Received: by 2002:a5d:59ad:0:b0:20f:e3bc:c719 with SMTP id p13-20020a5d59ad000000b0020fe3bcc719mr17710218wrr.562.1653631647784; Thu, 26 May 2022 23:07:27 -0700 (PDT) Received: from beast.fritz.box (62-178-148-172.cable.dynamic.surfer.at. [62.178.148.172]) by smtp.gmail.com with ESMTPSA id t125-20020a1c4683000000b00395f15d993fsm1169860wma.5.2022.05.26.23.07.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 23:07:27 -0700 (PDT) To: gcc-patches@gcc.gnu.org, Kito Cheng , Jim Wilson , Andrew Waterman , Philipp Tomsich , Christoph Muellner , Aaron Durbin , Patrick O'Neill , Vineet Gupta Subject: [PATCH v3 1/9] RISC-V: Simplify memory model code [PR 100265] Date: Fri, 27 May 2022 08:07:15 +0200 Message-Id: <20220527060723.235095-2-cmuellner@gcc.gnu.org> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220527060723.235095-1-cmuellner@gcc.gnu.org> References: <20220527060723.235095-1-cmuellner@gcc.gnu.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.3 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, KAM_MANYTO, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Christoph Muellner via Gcc-patches From: =?utf-8?q?Christoph_M=C3=BCllner?= Reply-To: Christoph Muellner Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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.cc | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index f83dc796d88..1a130f1fe3b 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -3578,20 +3578,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; @@ -3604,20 +3601,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; @@ -3644,6 +3638,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) { @@ -3663,12 +3658,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;