From patchwork Mon Apr 26 12:45:44 2021 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: 1470278 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: 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=K6gYR+CI; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FTPlS27tnz9sVw for ; Mon, 26 Apr 2021 22:46:12 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A7D37394FC05; Mon, 26 Apr 2021 12:46:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A7D37394FC05 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1619441164; bh=z/RaWsMhhv5vfXa1fgh53iqi+Ow/CuLXj9gagLCplwU=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=K6gYR+CIJWj3MWuSVEvZ8391kPivVmTzMPdB02pK/gdL6TxdWV55XOZymROb3MF/A OKlQMOKysjfzZTPAu8tRExRBQMO6oAT4eAVbvDWt5uvvqK+BeuKv6O/Drmb8VCC1mG lS5OxHM7gJcRE5Z+YSgGyh5MG2twtZ2xnoIjV8ns= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by sourceware.org (Postfix) with ESMTPS id 4222D389041B; Mon, 26 Apr 2021 12:46:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4222D389041B Received: by mail-ej1-f47.google.com with SMTP id n2so84201643ejy.7; Mon, 26 Apr 2021 05:46:00 -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=z/RaWsMhhv5vfXa1fgh53iqi+Ow/CuLXj9gagLCplwU=; b=ZrNZjkNKr5ul8PaVgeompKS+xc1waPqrSVkmYUgvZA0Jh5LO1GKs8Iln/ZaC57tDYb iJNYLRYe4g0jiG6RT28r/WHUqH0Tr6ToKN8vO2GCCy728ahcmiwE6TFiu++lC17CuEe6 n02VRWxS+UgzkbGWWZLE7Z0GPLO9U+d058IyENRGxtrqk0wvGGtUwoez4D/KG+kkrq2e eP9BemAVVIrNhX2AL4U2Ch6iOGISJqQTQHdCO+vfBBRCcSdbjvZnfjcDHRpdqzTMsBJQ 7gBvoVrOytVnOQoPvm9Kfc4JrFDAgilXJGzqt39+3c1gOLsAMVqd2qRN9P+PnS62Q/0t VC1A== X-Gm-Message-State: AOAM532uLoP4K7A0YJoh1w6tx3DRLSFsndzW0URbBX5zDenQe7/7WOp3 u/wz4xnk8psOIC6n+Gw4PwyEL0zv58qxVg== X-Google-Smtp-Source: ABdhPJxDQVaNp/YA25SiIkV+uzytrLhUdI/SDq72UygaVNurMsOIkKSc9G0v2C+F+ZwCbNKpYSJZcQ== X-Received: by 2002:a17:906:564f:: with SMTP id v15mr7655088ejr.96.1619441159158; Mon, 26 Apr 2021 05:45:59 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Apr 2021 05:45:58 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH 02/10] RISC-V: Emit proper memory ordering suffixes for AMOs [PR 100265] Date: Mon, 26 Apr 2021 14:45:44 +0200 Message-Id: <20210426124552.3316789-3-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 X-Spam-Status: No, score=-11.2 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_H2, 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-Patchwork-Original-From: Christoph Muellner via Gcc-patches From: =?utf-8?q?Christoph_M=C3=BCllner?= Reply-To: Christoph Muellner Cc: Kito Cheng Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" The ratified A extension supports '.aq', '.rl' and '.aqrl' as memory ordering suffixes. Let's emit them in case we get a '%A' conversion specifier for riscv_print_operand(). As '%A' was already used for a similar, but restricted, purpose (only '.aq' was emitted so far), this does not require any other changes. gcc/ PR 100265 * config/riscv/riscv.c (riscv_memmodel_needs_amo_acquire): Remove function. * config/riscv/riscv.c (riscv_print_amo_memory_ordering_suffix): Add function to emit AMO memory ordering suffixes. * config/riscv/riscv.c (riscv_print_operand): Call riscv_print_amo_memory_ordering_suffix() instead of riscv_memmodel_needs_amo_acquire(). --- gcc/config/riscv/riscv.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c index 9b5aedc77131..881eab66a481 100644 --- a/gcc/config/riscv/riscv.c +++ b/gcc/config/riscv/riscv.c @@ -3341,24 +3341,26 @@ riscv_print_operand_reloc (FILE *file, rtx op, bool hi_reloc) fputc (')', file); } -/* Return true if the .AQ suffix should be added to an AMO to implement the - acquire portion of memory model MODEL. */ +/* Print the memory ordering suffix for AMOs. */ -static bool -riscv_memmodel_needs_amo_acquire (const enum memmodel model) +static void +riscv_print_amo_memory_ordering_suffix (FILE *file, const enum memmodel model) { switch (model) { - case MEMMODEL_ACQ_REL: - case MEMMODEL_SEQ_CST: - case MEMMODEL_ACQUIRE: + case MEMMODEL_RELAXED: + break; case MEMMODEL_CONSUME: - return true; - + case MEMMODEL_ACQUIRE: + fputs (".aq", file); + break; case MEMMODEL_RELEASE: - case MEMMODEL_RELAXED: - return false; - + fputs (".rl", file); + break; + case MEMMODEL_ACQ_REL: + case MEMMODEL_SEQ_CST: + fputs (".aqrl", file); + break; default: gcc_unreachable (); } @@ -3423,8 +3425,7 @@ riscv_print_operand (FILE *file, rtx op, int letter) break; case 'A': - if (riscv_memmodel_needs_amo_acquire (model)) - fputs (".aq", file); + riscv_print_amo_memory_ordering_suffix (file, model); break; case 'F':