From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 4CD50385697D; Mon, 3 Jul 2023 23:07:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4CD50385697D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1688425657; bh=UQcCPoOt9qyQ7VhQ6kCKX3Qbjz2QVJXLHs/xxQlgPos=; h=From:To:Subject:Date:From; b=DibPnr+Oq7BJvCdxGqCBSzVloCjhX9WSHE6zqWZXwKLYTTF6nUkhCXIDKVqLlc9Z3 ggZWEwzKG9Spfw+Qm1rxpNXgBWtqu4NOsuPmDtvN6NOkE9v0P0tuS5OP1nf83k7VzK qKFvqs6KWorIrBW5zoCnjDF2NB6AU3WdJpmD25v4= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-2273] libstdc++: Enable OpenMP 5.0 pragmas in PSTL headers X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 33245d6b87a284495304c9952813b6b83d5df99f X-Git-Newrev: 8bef8e713fd5f17c5dee45d9bb7ffca3cf3c0f9d Message-Id: <20230703230737.4CD50385697D@sourceware.org> Date: Mon, 3 Jul 2023 23:07:37 +0000 (GMT) List-Id: https://gcc.gnu.org/g:8bef8e713fd5f17c5dee45d9bb7ffca3cf3c0f9d commit r14-2273-g8bef8e713fd5f17c5dee45d9bb7ffca3cf3c0f9d Author: Jonathan Wakely Date: Fri Jun 30 11:17:56 2023 +0100 libstdc++: Enable OpenMP 5.0 pragmas in PSTL headers 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+. Diff: --- 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