From patchwork Fri Jun 30 20:15:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 114873 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10633784vqr; Fri, 30 Jun 2023 13:17:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlHPZ55p27obQ8VsW2/qGXbYrkVII5yYrcoAApB9w6nAzROcDRSASawwnlBsQzXFZm6TDBlu X-Received: by 2002:a05:6402:1848:b0:51d:8967:325f with SMTP id v8-20020a056402184800b0051d8967325fmr2619975edy.36.1688156261266; Fri, 30 Jun 2023 13:17:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688156261; cv=none; d=google.com; s=arc-20160816; b=i1EEsNqDSWK/23sOfbT3F8eE409e6qC2ggnPjkpm6YWUGyYci7YramcaXadfdFhtHS CbmSk9mCL31m0iYdXp4s6depDXZ/WDYYPZSIF/XrkaQvZddTmcRpGu7HWsbCthHkqBeA 6VQhCP0aZ+INcQ0q2vg0Bu7X0vBybozHHFs78+S1M67+UcHlbr6EzxT1KUI6RTu0m/XM R6PYCesXVXTCA1O23SDiIryiymNUsT/jejAs23j1as+ZtmDce2jz+SJWmxO1aiTFolIR /DxkPkBDcLlqjJEqNgugG7GnPTErYQ98KCAsf2Abf4Vc6K0QVNfpTKaVlp9Cy5Ni+ptd o32A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=Jv+s4cLGs69mskqc+FqzF6S+hcjk3QpOajHOIs7L/y8=; fh=jhMQlp4zwcOe6qIYNyHBY8O5ESqdwhh0/4B3hQPFqLg=; b=qwbiMIZ2mIzeuDx37/wnJGU+FMBrrVJR7Er0HbLHsJu0TK6oo1TSqhvzC0PBCJjVC0 KrOEiMQr6p1fRYjpZGizOnzpQyQAAkav2D0ILK0d4x41UqkRu2ZOjyXWpAZBcQ2++ehe o4TOy54kfUzKo9ztjiuW4iKrnxcIenPJ8zhvI8R9M4G9YQdpNbuMe1Ih3rRxSmnOcYFU psOPPzBy5HEcWFV5Ai4RSgxWc8YIn8z80q76TL/5iYT0u8DNqthJP0DV5/fameBSnjwn WPOS8yhZ0PD3CBRrr5CMKRBWEE6g1WkJLeD0/gRp+VVQb1OsuxRKeSkRkvP8T+NHmyLK RgRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=cOUcKm2j; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id w7-20020a50fa87000000b0051debdf4aa0si1664266edr.399.2023.06.30.13.17.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 13:17:41 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=cOUcKm2j; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 251C53883001 for ; Fri, 30 Jun 2023 20:17:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 251C53883001 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1688156247; bh=Jv+s4cLGs69mskqc+FqzF6S+hcjk3QpOajHOIs7L/y8=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=cOUcKm2jPcYiYSz2QkIOyHIbPOfI3kwrFOSgJ4LjR+BE6Hm64OW43B5h3024aaG07 grxcZc+J4/sFASCpKCIy8C69Wh3gmX7j1k+QCocH1/bR6YVGrYYNmeE84P/AJaS7CD K0xkKeb3H8tEtQ7uiJG1dJ709mFvVKt9gzLsXANY= 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 ESMTPS id 1B6A43858023 for ; Fri, 30 Jun 2023 20:16:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1B6A43858023 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-202-Uw57Bd_pNTiJc4R4YaweCA-1; Fri, 30 Jun 2023 16:16:38 -0400 X-MC-Unique: Uw57Bd_pNTiJc4R4YaweCA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 13BC2800CA9; Fri, 30 Jun 2023 20:16:38 +0000 (UTC) Received: from localhost (unknown [10.42.28.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3A8740C2063; Fri, 30 Jun 2023 20:16:37 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Cc: Jakub Jelinek , Thomas Rodgers Subject: [PATCH] libstdc++: Enable OpenMP 5.0 pragmas in PSTL headers Date: Fri, 30 Jun 2023 21:15:54 +0100 Message-ID: <20230630201637.766018-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.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_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770160139877056391?= X-GMAIL-MSGID: =?utf-8?q?1770160139877056391?= Jakub made a similar change a few yeas ago, but I think it got lost in the recent PSTL rebase. Tested x86_64-linux. Does this look OK for trunk? -- >8 -- This reapplies r10-1314-g32bab8b6ad0a90 which was lost in the recent PSTL rebase from upstream. * include/pstl/pstl_config.h (_PSTL_PRAGMA_SIMD_SCAN, _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN, _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN): Define to OpenMP 5.0 pragmas even for GCC 10.0+. (_PSTL_UDS_PRESENT): Define to 1 for GCC 10.0+. --- libstdc++-v3/include/pstl/pstl_config.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/pstl/pstl_config.h b/libstdc++-v3/include/pstl/pstl_config.h index 74d2139c736..ccb9dd32838 100644 --- a/libstdc++-v3/include/pstl/pstl_config.h +++ b/libstdc++-v3/include/pstl/pstl_config.h @@ -82,7 +82,8 @@ # define _PSTL_PRAGMA_FORCEINLINE #endif -#if defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900 +#if (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900) || \ + (!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 100000) # define _PSTL_PRAGMA_SIMD_SCAN(PRM) _PSTL_PRAGMA(omp simd reduction(inscan, PRM)) # define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan inclusive(PRM)) # define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan exclusive(PRM)) @@ -126,7 +127,8 @@ # define _PSTL_UDR_PRESENT #endif -#if defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900 && __INTEL_COMPILER_BUILD_DATE >= 20180626 +#if (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1900 && __INTEL_COMPILER_BUILD_DATE >= 20180626) || \ + (!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 100000) # define _PSTL_UDS_PRESENT #endif