From patchwork Mon Jan 10 09:41:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Marie de Rodat X-Patchwork-Id: 1577834 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=kIqG+lFT; dkim-atps=neutral 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+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JXTRT6MWVz9s9c for ; Mon, 10 Jan 2022 20:43:49 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8AEB03891C21 for ; Mon, 10 Jan 2022 09:43:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8AEB03891C21 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1641807827; bh=Xh5SHKXTj2gq7O048zXmjeOZjCW4PtG78jXKf5lzqP0=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=kIqG+lFTxb+77ax2w/9aa3JZb8lPBKmCP22ZmXGwg/M/+f8dhNcK7zyzrS86//Nzr NOzaqUMpe/vpszhKsMikdg4O/ZYCj+G8TAcZlTUuk8ElRx/ZplGDBf0VF0nkn8Lwze ULCyssNaqJ+MsUh/AkJmdYPCbqNbexCgNCB03Cnw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by sourceware.org (Postfix) with ESMTPS id 6ED3F385841F for ; Mon, 10 Jan 2022 09:41:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6ED3F385841F Received: by mail-wr1-x431.google.com with SMTP id v6so25481464wra.8 for ; Mon, 10 Jan 2022 01:41:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=Xh5SHKXTj2gq7O048zXmjeOZjCW4PtG78jXKf5lzqP0=; b=lO4A8Sz7I6sRli3KosdpgHmUK4pCKeGQ6OriGUZ6S19GD59jLyfcsvbhJZMAqivYY4 a3jlzGXbhI0Eu0or32V8gq1GnfEgY9FdjPBFBXcYFH6+PLJBdLJT58A/MiZZZg1Ef9Vq DsU+59N5SY6H3/X5gJzR7nDcVMN28wR9Y3LX1ctqxZu6Y2R6Z8z97eyuUMx9cwf4mnAD ewnUyut6aSTrweZ2GIApwG2xjS5RFZDuX4hvRadZcblDWW458jitZX8FszPXfwGZj0lm FMQrrTWF6XW9NmY55J5FFHkTTdlKibS207LcJb8Kkny8of2Rh64Z78WEsr2MyMqItsNc pV1g== X-Gm-Message-State: AOAM530CjwSctN52l3Lm806xIoxXfO4ZhtDButnejh1h3RHlPLxTR0V9 eVrzx+h9ZuT4ii+YUQ0LV0ZxIPbVEVn9bA== X-Google-Smtp-Source: ABdhPJwMhbMOy2A2gKpN5J5KSXujNDV0zazw4lt+SbslF+L3wHYcCclMbbb5Iz46EBKifLv48Hix7A== X-Received: by 2002:a5d:5984:: with SMTP id n4mr65434851wri.380.1641807694533; Mon, 10 Jan 2022 01:41:34 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id u10sm6589150wrs.28.2022.01.10.01.41.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 01:41:33 -0800 (PST) Date: Mon, 10 Jan 2022 09:41:33 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Switch from __sync to __atomic builtins for atomic counters Message-ID: <20220110094133.GA586039@adacore.com> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Pierre-Marie de Rodat via Gcc-patches From: Pierre-Marie de Rodat Reply-To: Pierre-Marie de Rodat Cc: Piotr Trojanek Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Unit System.Atomic_Counters was using deprecated __sync GCC builtins. Now it uses __atomic builtins, which are recommended for new code. Tested on x86_64-pc-linux-gnu, committed on trunk gcc/ada/ * libgnat/s-atocou__builtin.adb (Decrement, Increment): Switch from __sync to __atomic builtins; use 'Address to be consistent with System.Atomic_Primitives. diff --git a/gcc/ada/libgnat/s-atocou__builtin.adb b/gcc/ada/libgnat/s-atocou__builtin.adb --- a/gcc/ada/libgnat/s-atocou__builtin.adb +++ b/gcc/ada/libgnat/s-atocou__builtin.adb @@ -29,21 +29,27 @@ -- -- ------------------------------------------------------------------------------ --- This package implements Atomic_Counter and Atomic_Unsigned operations --- for platforms where GCC supports __sync_add_and_fetch_4 and --- __sync_sub_and_fetch_4 builtins. +-- This package implements Atomic_Counter and Atomic_Unsigned operations for +-- platforms where GCC supports __atomic_add_fetch and __atomic_sub_fetch +-- builtins. + +with System.Atomic_Primitives; use System.Atomic_Primitives; package body System.Atomic_Counters is - procedure Sync_Add_And_Fetch - (Ptr : access Atomic_Unsigned; - Value : Atomic_Unsigned); - pragma Import (Intrinsic, Sync_Add_And_Fetch, "__sync_add_and_fetch_4"); + function Atomic_Add_Fetch + (Ptr : System.Address; + Val : Atomic_Unsigned; + Model : Mem_Model := Seq_Cst) + return Atomic_Unsigned; + pragma Import (Intrinsic, Atomic_Add_Fetch, "__atomic_add_fetch"); - function Sync_Sub_And_Fetch - (Ptr : access Atomic_Unsigned; - Value : Atomic_Unsigned) return Atomic_Unsigned; - pragma Import (Intrinsic, Sync_Sub_And_Fetch, "__sync_sub_and_fetch_4"); + function Atomic_Sub_Fetch + (Ptr : System.Address; + Val : Atomic_Unsigned; + Model : Mem_Model := Seq_Cst) + return Atomic_Unsigned; + pragma Import (Intrinsic, Atomic_Sub_Fetch, "__atomic_sub_fetch"); --------------- -- Decrement -- @@ -51,19 +57,19 @@ package body System.Atomic_Counters is procedure Decrement (Item : aliased in out Atomic_Unsigned) is begin - if Sync_Sub_And_Fetch (Item'Unchecked_Access, 1) = 0 then + if Atomic_Sub_Fetch (Item'Address, 1) = 0 then null; end if; end Decrement; function Decrement (Item : aliased in out Atomic_Unsigned) return Boolean is begin - return Sync_Sub_And_Fetch (Item'Unchecked_Access, 1) = 0; + return Atomic_Sub_Fetch (Item'Address, 1) = 0; end Decrement; function Decrement (Item : in out Atomic_Counter) return Boolean is begin - return Sync_Sub_And_Fetch (Item.Value'Unchecked_Access, 1) = 0; + return Atomic_Sub_Fetch (Item.Value'Address, 1) = 0; end Decrement; --------------- @@ -72,12 +78,16 @@ package body System.Atomic_Counters is procedure Increment (Item : aliased in out Atomic_Unsigned) is begin - Sync_Add_And_Fetch (Item'Unchecked_Access, 1); + if Atomic_Add_Fetch (Item'Address, 1) = 0 then + null; + end if; end Increment; procedure Increment (Item : in out Atomic_Counter) is begin - Sync_Add_And_Fetch (Item.Value'Unchecked_Access, 1); + if Atomic_Add_Fetch (Item.Value'Address, 1) = 0 then + null; + end if; end Increment; ----------------