From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by sourceware.org (Postfix) with ESMTPS id 01772383D810; Fri, 27 May 2022 06:07:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 01772383D810 Received: by mail-wr1-f52.google.com with SMTP id p10so4517625wrg.12; Thu, 26 May 2022 23:07:29 -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=B1xrasSjTi4UtRVyW2ZgwXvyF8FBM6j/Bx9TZ3k2mtY=; b=ZCo+M9SDA9+r64QRsRwoXTo6r06+Si+3DaA0bBi91iYD7YMNWkgMKNv39t4DnJyfKz KHbXQX5ydmesDgjci63Ry1TeVWvvcTpAoiqhDJlMddFflwSWo14f8XQol/DjJn8OrhW4 sd/8i7mQLXK2Vl2WJxf/rhg83Y/1iwfE1uJ6s8Hf+7TZepiGbvy8v7KfvIYLuevZEUwk RMXbnksVDwUpQGNybRe807T1Emgug+HAEi1wqJGJXdYC9Wz1Gr1e2tQf5GaGaVLS19ht snpBLOl6jxgV1dvCyJ9q3bJRMVk8axusgHpSOPd+TVIAohdDLD6emCj5V9Ejevk9MiO2 NjcQ== X-Gm-Message-State: AOAM531fR6afn8mm8AprPKLfGygE715VYtLVn5ShrD1u6OCWEnLyIKr6 K7R0Ftfw1oQ90K35J0riGlekX467FGDsI2P6 X-Google-Smtp-Source: ABdhPJwzrS7BaWypbch6QYaJnPoSPqxuoO51ItSvuskNyooH00LywgmiQcFphQcIf2JHbMCwbdkFhg== X-Received: by 2002:a05:6000:1621:b0:20f:f723:ec49 with SMTP id v1-20020a056000162100b0020ff723ec49mr12655811wrb.284.1653631648859; Thu, 26 May 2022 23:07:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 23:07:28 -0700 (PDT) From: Christoph Muellner 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 2/9] RISC-V: Emit proper memory ordering suffixes for AMOs [PR 100265] Date: Fri, 27 May 2022 08:07:16 +0200 Message-Id: <20220527060723.235095-3-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 Content-Transfer-Encoding: 8bit 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-List-Received-Date: Fri, 27 May 2022 06:07:31 -0000 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.cc | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index 1a130f1fe3b..983a567c69c 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -3574,24 +3574,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 (); } @@ -3658,8 +3660,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': -- 2.35.3