From patchwork Mon Jan 10 09:41:38 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: 1577839 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=p6eXDNJq; 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 (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JXTXK5x62z9s9c for ; Mon, 10 Jan 2022 20:48:00 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 460C33890435 for ; Mon, 10 Jan 2022 09:47:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 460C33890435 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1641808077; bh=kVNevkBoc/z7f/A/34DcrB5D/NsTJce1VkYm4q8NOD0=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=p6eXDNJqmnCHdgyWkzP9dTY1SgMBmwYz35ChSs/nDjrav5v8u5qU5DlQrqPHvOrj/ l9DItNwdYLKHWChETYKbWNkVb/49RgIgOghXIa5DcxSoMSxWLVl4RiL3xHxoWaLcoB JimqV2lvWC2lvcWrDRaC6ycs2Tpu05o0yjEk7OI4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id 1B1133891C27 for ; Mon, 10 Jan 2022 09:41:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1B1133891C27 Received: by mail-wr1-x430.google.com with SMTP id k30so7970118wrd.9 for ; Mon, 10 Jan 2022 01:41:40 -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=kVNevkBoc/z7f/A/34DcrB5D/NsTJce1VkYm4q8NOD0=; b=SodUaDRe5gzPFp7WmqaFK14omGfhrrrvp2z96X6UDpZE6YGdp8+HGnHedcKOP4KB5L yIfzWaYzlWkX5/CjS11zM6hp1m1TS0vn22bnTfoopPfUqxKdUergYrgpD01+FD0g9vxx GJfhAQpFZowxfkWVYlooSdU2EJ4S23SZfn32qPKtYRyieMza2df5YkxsGuSVM3JeJ7ZQ UwU+j/HuJDg2N06hwyCdWA5BS5G7Qupcxh5cZYhl4HAdmyODMrhIyVc2KlXVTPD8wD8W V5xfeZ2IVi3WW3bCltW4ihFk9LQaxBg+C7pU6yG9r8Lm28pzC+T3ROOZYcIwC0spEc8z dTlA== X-Gm-Message-State: AOAM531CJEsSXXdWk8a16SNIJ5R60moMKbA4A/Bio1G1WBPs68OsjMS8 OnDTXSftlcWTrHez51/IYPPjLM7TyrfhvA== X-Google-Smtp-Source: ABdhPJzA4km5E2onwN+p01qe+9HW162I3FDQ8Zm2tEBrrvPKwuxE/+rAxsxJjRRqMPWVmgO1W4WayA== X-Received: by 2002:adf:f151:: with SMTP id y17mr5557251wro.547.1641807699226; Mon, 10 Jan 2022 01:41:39 -0800 (PST) Received: from adacore.com ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id k7sm3997141wmi.37.2022.01.10.01.41.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 01:41:38 -0800 (PST) Date: Mon, 10 Jan 2022 09:41:38 +0000 To: gcc-patches@gcc.gnu.org Subject: [Ada] Switch from __sync to __atomic builtins for Lock_Free_Try_Write Message-ID: <20220110094138.GA586143@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" Routine Lock_Free_Try_Write 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-atopri.ads (Atomic_Compare_Exchange): Replaces deprecated Sync_Compare_And_Swap. * libgnat/s-atopri.adb (Lock_Free_Try_Write): Switch from __sync to __atomic builtins. diff --git a/gcc/ada/libgnat/s-atopri.adb b/gcc/ada/libgnat/s-atopri.adb --- a/gcc/ada/libgnat/s-atopri.adb +++ b/gcc/ada/libgnat/s-atopri.adb @@ -55,23 +55,16 @@ package body System.Atomic_Primitives is Expected : in out Atomic_Type; Desired : Atomic_Type) return Boolean is - function My_Sync_Compare_And_Swap is - new Sync_Compare_And_Swap (Atomic_Type); - - Actual : Atomic_Type; + function My_Atomic_Compare_Exchange is + new Atomic_Compare_Exchange (Atomic_Type); begin if Expected /= Desired then if Atomic_Type'Atomic_Always_Lock_Free then - Actual := My_Sync_Compare_And_Swap (Ptr, Expected, Desired); + return My_Atomic_Compare_Exchange (Ptr, Expected'Address, Desired); else raise Program_Error; end if; - - if Actual /= Expected then - Expected := Actual; - return False; - end if; end if; return True; diff --git a/gcc/ada/libgnat/s-atopri.ads b/gcc/ada/libgnat/s-atopri.ads --- a/gcc/ada/libgnat/s-atopri.ads +++ b/gcc/ada/libgnat/s-atopri.ads @@ -80,17 +80,20 @@ package System.Atomic_Primitives is generic type Atomic_Type is mod <>; - function Sync_Compare_And_Swap - (Ptr : Address; - Expected : Atomic_Type; - Desired : Atomic_Type) return Atomic_Type; + function Atomic_Compare_Exchange + (Ptr : Address; + Expected : Address; + Desired : Atomic_Type; + Weak : Boolean := False; + Success_Model : Mem_Model := Seq_Cst; + Failure_Model : Mem_Model := Seq_Cst) return Boolean; pragma Import - (Intrinsic, Sync_Compare_And_Swap, "__sync_val_compare_and_swap"); + (Intrinsic, Atomic_Compare_Exchange, "__atomic_compare_exchange_n"); - function Sync_Compare_And_Swap_8 is new Sync_Compare_And_Swap (uint8); - function Sync_Compare_And_Swap_16 is new Sync_Compare_And_Swap (uint16); - function Sync_Compare_And_Swap_32 is new Sync_Compare_And_Swap (uint32); - function Sync_Compare_And_Swap_64 is new Sync_Compare_And_Swap (uint64); + function Atomic_Compare_Exchange_8 is new Atomic_Compare_Exchange (uint8); + function Atomic_Compare_Exchange_16 is new Atomic_Compare_Exchange (uint16); + function Atomic_Compare_Exchange_32 is new Atomic_Compare_Exchange (uint32); + function Atomic_Compare_Exchange_64 is new Atomic_Compare_Exchange (uint64); function Atomic_Test_And_Set (Ptr : System.Address;