From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 0819D3858D20 for ; Mon, 26 Jun 2023 18:58:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0819D3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687805884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6XbJkL8ZueWrRehiMkTJoF7vBzb+frgVdcAzUqQG8ZM=; b=MVM3MVcV3UImfiOnyUx9ahFxSTgkoi4i95r+Awdjylc9C6Ya9XXDaciT5UESrTQaQAJEA5 2Z4D23MOOQL064Yl+Mdf2nLUUytHeQIUsjcpB48thkBZM8T6tdt5ASxjjpBZPOFt8Aw8uo xZl30ICm3JG5R3Xmo32UN2Pw2AKEEo8= Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-340-b-omDmLbOd2o6znlrK1Gjg-1; Mon, 26 Jun 2023 14:58:01 -0400 X-MC-Unique: b-omDmLbOd2o6znlrK1Gjg-1 Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-262c488c1d3so1103839a91.3 for ; Mon, 26 Jun 2023 11:58:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687805880; x=1690397880; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Zc01isBH/iJY72BsfEQHhXT0rbI6TkxLTYTeX6caF/Q=; b=I2lOHcU9fjY7XsenQSLXwsxLUwb321BR3mbu6aRFqxu2B6UreWVPi7zia3sVXAx0Gt cIiR9gF2hlT4k7JX/T3la0OPdk3I8JLHX5FvcB52/IwMKtYr9cWgkymmrfmWkHzqjux+ YN8DS7Orj/wqZJdye/qlqABMoykK6MNLamkUDPQytGLwPY/Jz/opfmO3jzfbGZRJHUCp mg6c89OsqRZkYpW2T0F6jTezEeBPdOfDe5agOJkq9un9oqf0ec3exsYNhceAaayL+NlT 2C2kOyKmEvllDrLBUcCd8qClIrjdqkJYDAAxIOaHJJSx+HciP5MqqBrh90uqP98YMmbP V9PQ== X-Gm-Message-State: AC+VfDwfWKqaqNbxh+JTLdUGuMXQNeGevVhY8FOt8Y/rRey2WnlQxXng dgJ3ft7+wyuXFCfAXgSvRSaWzc6kexPLC/kp/TfQgiCtnbazNDNnXJZJsvv1lruC4IvzsnRdzvq n7puj2NxDI+58s6BOPDMQVQ0sjG+LhHKTklrsO0cV0Q== X-Received: by 2002:a17:90a:f2c7:b0:263:d04:ef62 with SMTP id gt7-20020a17090af2c700b002630d04ef62mr720806pjb.27.1687805880494; Mon, 26 Jun 2023 11:58:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7puupRMcUFcpqWszUHyYylxMh6NXnEl06hq0Xud+2xbQiG8iSKeAi7OWM2qKnBlFCrSq55eYEIZP6EG5SldA8= X-Received: by 2002:a17:90a:f2c7:b0:263:d04:ef62 with SMTP id gt7-20020a17090af2c700b002630d04ef62mr720793pjb.27.1687805880227; Mon, 26 Jun 2023 11:58:00 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Thomas Rodgers Date: Mon, 26 Jun 2023 11:57:49 -0700 Message-ID: Subject: Re: [PATCH] libstdc++: Synchronize PSTL with upstream To: Jonathan Wakely Cc: "libstdc++" , gcc Patches X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="000000000000f0f3ac05ff0cede1" X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --000000000000f0f3ac05ff0cede1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, May 17, 2023 at 12:32=E2=80=AFPM Jonathan Wakely wrote: > -template > - _OutputIterator > -__brick_generate_n(_OutputIterator __first, _Size __count, _Generator > __g, /* is_vector =3D */ std::true_type) noexcept > +template > > Missing uglification on Size. > > +_RandomAccessIterator > +__brick_generate_n(_RandomAccessIterator __first, Size __count, > _Generator __g, > + /* is_vector =3D */ std::true_type) noexcept > { > return __unseq_backend::__simd_generate_n(__first, __count, __g); > } > > -template > - _OutputIterator > -__brick_generate_n(_OutputIterator __first, _Size __count, _Generator > __g, /* is_vector =3D */ std::false_type) noexcept > +template > > Missing uglification on OutputIterator and Size. > > +OutputIterator > +__brick_generate_n(OutputIterator __first, Size __count, _Generator __g, > /* is_vector =3D */ std::false_type) noexcept > > > -template _BinaryOperation> > -_ForwardIterator2 > -__brick_adjacent_difference(_ForwardIterator1 __first, _ForwardIterator1 > __last, _ForwardIterator2 __d_first, > - _BinaryOperation __op, /*is_vector=3D*/std::true_type) noexcept > +template class BinaryOperation> > > Missing uglification on BinaryOperation. > > +_RandomAccessIterator2 > +__brick_adjacent_difference(_RandomAccessIterator1 __first, > _RandomAccessIterator1 __last, > + _RandomAccessIterator2 __d_first, > BinaryOperation __op, > + /*is_vector=3D*/std::true_type) noexcept > > > The above problems exist on the declaration and the definitions. > > > --- a/libstdc++-v3/include/pstl/glue_execution_defs.h > +++ b/libstdc++-v3/include/pstl/glue_execution_defs.h > @@ -18,8 +18,8 @@ namespace std > { > // Type trait > using __pstl::execution::is_execution_policy; > -#if _PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT > -# if __INTEL_COMPILER > +#if defined(_PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT) > +# if defined(__INTEL_COMPILER) > template > constexpr bool is_execution_policy_v =3D is_execution_policy::value; > # else > > Pre-existing, but that T should be _Tp, but it only affects the Intel > compiler branch, so meh. > > Please fix these and report them upstream too. > Ack. > > All the actual code changes look good. > > I think I'd prefer if __pattern_partial_sort_copy used > std::uninitialized_copy instead of a loop and placement-new, but that > doesn't need to hold this up. We could optimize some uses of > std::conjunction and std::conditional to use our own __and_ and > __conditional, but I'm not sure it's worth diverging from upstream to do > that. > > Please fix the naming bugs noted above and push to trunk, thanks! > There were a handful of additional missed uglifications in - * libstdc++-v3/include/pstl/glue_algorithm_impl.h * libstdc++-v3/include/pstl/unseq_backend_simd.h That are in this commit, but not in the patch as reviewed. Tested x86_64-linux. Pushed to trunk. > > +Reviewed-by: Jonathan Wakely > > > > > > --000000000000f0f3ac05ff0cede1--