From patchwork Fri May 27 06:07:19 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: 1636143 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=rlRAKJmg; 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 4L8ZGb2tn2z9sBB for ; Fri, 27 May 2022 16:12:39 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 39D7A382D478 for ; Fri, 27 May 2022 06:12:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 39D7A382D478 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1653631957; bh=ihAGyMR15/z7NYIasGROg0xxxIUpVp6Atp4Ka3jCFPk=; 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=rlRAKJmg/abfOGYvhSTOEkBAB+PwREyvBkBdX1f0fVNytLiUGNul6hq7FhTQlXitw 4M+/elMP7wWD+pNh42Zc75FR/kH4+uqzPiUurr+H3pA6smJ0xSBbAq8nm+Cq5MrMuH l1WYC6b/a4KNbDLACOrrIpyNd3vAF5oZ6TcAcZiM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by sourceware.org (Postfix) with ESMTPS id B3A03382D475; Fri, 27 May 2022 06:07:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B3A03382D475 Received: by mail-wr1-f41.google.com with SMTP id i9so4512409wrc.13; Thu, 26 May 2022 23:07:33 -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=ihAGyMR15/z7NYIasGROg0xxxIUpVp6Atp4Ka3jCFPk=; b=KgqdUFYPU+pusn+RDc+QcxBrSJ3FCCLWgXi2kuKOWV+3PGyIyo8hHszAvpgUpOGNh7 cwIBr/YMycowSBzGh3JijrmRkN9O1f3umnN2kSUtMpUpTlg3bzkYO7068qP/8vSfaCTf ePOziebIl3ae3zm7Kxlo3hkY+3yQFZeGcWRBA8rpqVxQNrJw1GtfTWh/8isJrYZvtJJ2 lMCUewsbnuviS2pjx/PB7zfevnJxsBY7CVl5xuwzbLx4zPtG/IodoTEqZfej+HRvFSYY RfhkUuKguwipGtp7Q4N0JkTZ9T/ZIOt8lWsxwNKQ+5Xg5JE6fQLLTyT6Mj4daa99Op5Q UPCg== X-Gm-Message-State: AOAM532yAlVChK36qcpXzI9va2Q5WyJgomMErhE+QOOAhFv0hkMqk4JN q2a48B2ajzyEOOhvxO8VzU4NM102JV3XfaYG X-Google-Smtp-Source: ABdhPJw1/jPAbTE0EG/tc9NjfvH/GfZ8Bsbfxgefon7JjLPx7PO9+xa0xy3/gMWx+GsUIZtVknZJnA== X-Received: by 2002:a05:6000:1685:b0:20f:e86d:2c96 with SMTP id y5-20020a056000168500b0020fe86d2c96mr16557813wrd.587.1653631652470; Thu, 26 May 2022 23:07:32 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 23:07:32 -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 5/9] RISC-V: Emit fences according to chosen memory model [PR 100265] Date: Fri, 27 May 2022 08:07:19 +0200 Message-Id: <20220527060723.235095-6-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=-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, KAM_MANYTO, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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" mem_thread_fence gets the desired memory model as operand. Let's emit fences according to this value (as defined in section "Code Porting and Mapping Guidelines" of the unpriv spec). gcc/ PR 100265 * config/riscv/sync.md (mem_thread_fence): Emit fences according to given operand. * config/riscv/sync.md (mem_fence): Add INSNs for different fence flavours. * config/riscv/sync.md (mem_thread_fence_1): Remove. --- gcc/config/riscv/sync.md | 41 +++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/gcc/config/riscv/sync.md b/gcc/config/riscv/sync.md index 86f4cef6af9..ae80f94f2e0 100644 --- a/gcc/config/riscv/sync.md +++ b/gcc/config/riscv/sync.md @@ -34,26 +34,41 @@ (define_code_attr atomic_optab ;; Memory barriers. (define_expand "mem_thread_fence" - [(match_operand:SI 0 "const_int_operand" "")] ;; model + [(match_operand:SI 0 "const_int_operand")] ;; model "" { - if (INTVAL (operands[0]) != MEMMODEL_RELAXED) - { - rtx mem = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode)); - MEM_VOLATILE_P (mem) = 1; - emit_insn (gen_mem_thread_fence_1 (mem, operands[0])); - } + enum memmodel model = memmodel_from_int (INTVAL (operands[0])); + if (!(is_mm_relaxed (model))) + emit_insn (gen_mem_fence (operands[0])); DONE; }) -;; Until the RISC-V memory model (hence its mapping from C++) is finalized, -;; conservatively emit a full FENCE. -(define_insn "mem_thread_fence_1" +(define_expand "mem_fence" + [(set (match_dup 1) + (unspec:BLK [(match_dup 1) (match_operand:SI 0 "const_int_operand")] + UNSPEC_MEMORY_BARRIER))] + "" +{ + operands[1] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode)); + MEM_VOLATILE_P (operands[1]) = 1; +}) + +(define_insn "*mem_fence" [(set (match_operand:BLK 0 "" "") - (unspec:BLK [(match_dup 0)] UNSPEC_MEMORY_BARRIER)) - (match_operand:SI 1 "const_int_operand" "")] ;; model + (unspec:BLK [(match_dup 0) (match_operand:SI 1 "const_int_operand")] + UNSPEC_MEMORY_BARRIER))] "" - "fence\tiorw,iorw") +{ + enum memmodel model = memmodel_from_int (INTVAL (operands[1])); + if (is_mm_consume (model) || is_mm_acquire (model)) + return "fence\tr, rw"; + else if (is_mm_release (model)) + return "fence\trw, w"; + else if (is_mm_acq_rel (model)) + return "fence.tso"; + else + return "fence\trw, rw"; +}) ;; Atomic memory operations.