From patchwork Wed May 5 19:36:42 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: 1474543 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=OrC2JIKf; 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 4Fb6RW2LSGz9sPf for ; Thu, 6 May 2021 05:37:11 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 074EB396C83D; Wed, 5 May 2021 19:37:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 074EB396C83D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1620243425; bh=ujo7aBAL5RbzXJ88+dC9nooQBca2cNV11OT1NwUMyK0=; 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=OrC2JIKf4FOA8fUQB4pA/7SqiW/6fMFiINAZaR8ZU84FZFWJzXFyqm/Aru0EUYZCj yIEJqWHGAlidkZ6E60mQrCPM8RDT4k57RQKQEoe19bWQP8T6vGoJ0IarbAHbvd4tvX UJIZo09dT5CEKtKkPo1NHuaUR6EDcgInpjZzdEoM= 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 15BAC385043F; Wed, 5 May 2021 19:37:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 15BAC385043F Received: by mail-ej1-f47.google.com with SMTP id f24so4647705ejc.6; Wed, 05 May 2021 12:37:02 -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=ujo7aBAL5RbzXJ88+dC9nooQBca2cNV11OT1NwUMyK0=; b=Y2R/Q6pesaoIZem0yhGVo7j/k4t4XeYwdxfPBnZ2FIaFN4Xe3Ftmg/CH8GlPVIrrVO bxNkZw0+d2o9JUBi3dlA3LyeKvomKjUrLN1Wj48hlPWtf2cGF9BMkf0nvNY6iyniVFa1 LJ9af7LSwfW44t2LSHringrxa3DPq5AKFT9GqMfAOLMOeAd4nywgsas4vcbPgN6QE3j7 cHJ5o8B/WVGYN0XdibQ1cCMd/JB8yCWvBCeL7HGmNqUkfKUPByEh/+kmsQ3t7yTIK3Rx kylipEhtqFHSG5gH0HJVlDRBEht29p1gF3i39MX5rt0o5DRfb3fg8o4opptpV1kTZye0 +i8Q== X-Gm-Message-State: AOAM532P01sWofH1C7NP19ZlZNVtDObz2dQo5GaQ9afhkfLaQugRC/X4 PnO/UtKAJX/Uk05hTG3kD4pppuV3LRNUexJi X-Google-Smtp-Source: ABdhPJwrXylpTIf8H8C+ik/A7R1bFK2CJP8Vtqvur4QKRNK5IF9NYM2gz+MPHXblYAx8ymfI/30pwA== X-Received: by 2002:a17:906:170d:: with SMTP id c13mr329168eje.491.1620243420828; Wed, 05 May 2021 12:37:00 -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 t7sm60531eds.26.2021.05.05.12.36.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 12:37:00 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH v2 01/10] RISC-V: Simplify memory model code [PR 100265] Date: Wed, 5 May 2021 21:36:42 +0200 Message-Id: <20210505193651.2075405-2-cmuellner@gcc.gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210505193651.2075405-1-cmuellner@gcc.gnu.org> References: <20210505193651.2075405-1-cmuellner@gcc.gnu.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 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" 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 27665e5b58f9..545f3d0cb82c 100644 --- a/gcc/config/riscv/riscv.c +++ b/gcc/config/riscv/riscv.c @@ -3350,20 +3350,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; @@ -3376,20 +3373,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; @@ -3414,6 +3408,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) { @@ -3433,12 +3428,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;