From patchwork Tue Sep 28 19:31:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 1534053 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=KR1mn9T2; 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 (server2.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 4HJqbm6y2vz9t0k for ; Wed, 29 Sep 2021 05:40:20 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B6F3A385803B for ; Tue, 28 Sep 2021 19:40:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B6F3A385803B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1632858018; bh=6la+RJAGu99jH9ULEc80VaDNAE6tC6+k9c3vh3JaOfk=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=KR1mn9T2PU+HIWhAVU0e9yfgxBcTlaq4F8/PjGEvfPunGC78JR6+PFB3ipGJjza7M nWwh5LYrbNlWAxLvskTOEZa87FnpVVygH751R7DOR2JyARfhal7IsJGSzEu+EJB1pI EECWjbN23zbQgqG1binoAz+e95GPGAxSnHUH+e0Q= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 99962385803F for ; Tue, 28 Sep 2021 19:32:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 99962385803F Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-482-H8o84lZ9Mt2ua-R2nE0eHw-1; Tue, 28 Sep 2021 15:32:11 -0400 X-MC-Unique: H8o84lZ9Mt2ua-R2nE0eHw-1 Received: by mail-ua1-f71.google.com with SMTP id h11-20020ab0334b000000b002c99b6970aaso3123057uap.14 for ; Tue, 28 Sep 2021 12:32:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=6la+RJAGu99jH9ULEc80VaDNAE6tC6+k9c3vh3JaOfk=; b=daLB9i5A0jrsSJ5iK4817Ost0BlyazxDs47/VHq6JK/n0JT+gqoXllIfFOKYqPOgkH XKF/x2EMt309CV2E8xsiKWY6Z0dOMweF3uvoxu8C0M/XFe/wk9+G3wHar//MbeYupK5h 5TZ1coUm5fh7fVT4BpQPOOmAHfMm7aob5fJ5IClbMp5abxodZstDWaQivtjV1khQX2vy MxRq1YLQdMFfpLzy9e0C7J2N0xTTmxi+hxy9rN20Q1FBlKNxY6wWx7cbm+HBSCtQDyLW lCZ4QGLgYihzucCDtq9OFa1QyXXvxD/Bkv1eRKYZz9LkeS7M0C6IlFmVlu7YklOkU1tx ZD2A== X-Gm-Message-State: AOAM530yckqHZCgtESBv/ctZ9k0FZYVTHUpTOSkGTp04N2H4usdd+v2q +pDWAB9t9QJGL3UsC2J6D93zLn1vhGWwn9xWihPCNgTrAiX5Cb14ikg8FBdagK9CJthDUU+1FKx u8RHhT1xH9pzPTYZMp4ZGiSXs/AyMyOYGjQ== X-Received: by 2002:ab0:2888:: with SMTP id s8mr6725232uap.70.1632857531349; Tue, 28 Sep 2021 12:32:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymr3eGk+VIj7umjfEcchNjFHMk7H0E14+qOwJAjeckPib95HNDYmyh2hjxVl9Xo1tZh4iURdLvb+GpBKD1NjA= X-Received: by 2002:ab0:2888:: with SMTP id s8mr6725223uap.70.1632857531147; Tue, 28 Sep 2021 12:32:11 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: Date: Tue, 28 Sep 2021 20:31:53 +0100 Message-ID: Subject: [committed] libstdc++: Define macro before it is first checked To: Jonathan Wakely X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Cc: Thomas Rodgers , libstdc++ , gcc Patches Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" On Thu, 2 Sept 2021 at 22:25, Jonathan Wakely wrote: > > On Thu, 2 Sept 2021 at 19:00, Jonathan Wakely wrote: > > > > * include/bits/atomic_wait.h (_GLIBCXX_HAVE_PLATFORM_WAIT): > > Define before first attempt to check it. > > > > Tested x86_64-linux and powerpc64-linux, not committed yet. > > Actually ignore that ... I tested the wrong patch. This one introduces > a new FAIL, which I have a fix for, but it will have to wait for next > week. > > > > I think we need this, otherwise __platform_wait_uses_type is false > > for all T. This is the fixed patch. Tested x86_64-linux, pushed to trunk. commit aeaea265cea3a2b2e772af7825351a4ceef29aac Author: Jonathan Wakely Date: Tue Aug 31 15:51:09 2021 libstdc++: Define macro before it is first checked Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: * include/bits/atomic_wait.h (_GLIBCXX_HAVE_PLATFORM_WAIT): Define before first attempt to check it. diff --git a/libstdc++-v3/include/bits/atomic_wait.h b/libstdc++-v3/include/bits/atomic_wait.h index 07bb744d822..35c92644146 100644 --- a/libstdc++-v3/include/bits/atomic_wait.h +++ b/libstdc++-v3/include/bits/atomic_wait.h @@ -56,9 +56,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __detail { #ifdef _GLIBCXX_HAVE_LINUX_FUTEX +#define _GLIBCXX_HAVE_PLATFORM_WAIT 1 using __platform_wait_t = int; static constexpr size_t __platform_wait_alignment = 4; #else +// define _GLIBCX_HAVE_PLATFORM_WAIT and implement __platform_wait() +// and __platform_notify() if there is a more efficient primitive supported +// by the platform (e.g. __ulock_wait()/__ulock_wake()) which is better than +// a mutex/condvar based wait. using __platform_wait_t = uint64_t; static constexpr size_t __platform_wait_alignment = __alignof__(__platform_wait_t); @@ -70,7 +75,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef _GLIBCXX_HAVE_PLATFORM_WAIT = is_scalar_v<_Tp> && ((sizeof(_Tp) == sizeof(__detail::__platform_wait_t)) - && (alignof(_Tp*) >= __platform_wait_alignment)); + && (alignof(_Tp*) >= __detail::__platform_wait_alignment)); #else = false; #endif @@ -78,7 +83,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION namespace __detail { #ifdef _GLIBCXX_HAVE_LINUX_FUTEX -#define _GLIBCXX_HAVE_PLATFORM_WAIT 1 enum class __futex_wait_flags : int { #ifdef _GLIBCXX_HAVE_LINUX_FUTEX_PRIVATE @@ -118,11 +122,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static_cast(__futex_wait_flags::__wake_private), __all ? INT_MAX : 1); } -#else -// define _GLIBCX_HAVE_PLATFORM_WAIT and implement __platform_wait() -// and __platform_notify() if there is a more efficient primitive supported -// by the platform (e.g. __ulock_wait()/__ulock_wake()) which is better than -// a mutex/condvar based wait #endif inline void @@ -331,7 +330,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if constexpr (__platform_wait_uses_type<_Up>) { - __val == __old; + __builtin_memcpy(&__val, &__old, sizeof(__val)); } else {