From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 101460 invoked by alias); 20 Jan 2019 12:03:06 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 101448 invoked by uid 89); 20 Jan 2019 12:03:05 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-it1-f193.google.com Received: from mail-it1-f193.google.com (HELO mail-it1-f193.google.com) (209.85.166.193) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 20 Jan 2019 12:03:01 +0000 Received: by mail-it1-f193.google.com with SMTP id m8so4838814itk.0 for ; Sun, 20 Jan 2019 04:03:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=Tw9tumkOkgvKNe2phq3kKD5WX5RBnLhCI+MWxifAIiE=; b=ZEnpMxWUtNuyqTog89PFrvMtXvlk41WQKzPnf1uH9wTvNNrjiggLOHe0VAoFnvEDpk qqmv5p434jqip3HXo7Nt7Xs9t4YdkUfEmQEkDFYXt6OwiZDPn6U2DlZ1FESafLWUmgC9 7/QWvjYC6+U0QnqgxOi0hFiRsGvvc5CijlAP/Xlk8ZcoyOdTDxsnkxvSdRoWqFUwB2A3 YLSrVlQzKqp1LMIin8oYz5sd6POa4IYnOMFDfCqY1QgTkh6QNf+Pzwo2CmMcPJ7niFxN +UqXDeefslfdwiMp3M2KmDQ+/t2e3sacmRIK6n5l2RQAMC9hF+lCO4+hvg+QoswOPqdj 5r/A== MIME-Version: 1.0 Received: by 2002:a02:6f53:0:0:0:0:0 with HTTP; Sun, 20 Jan 2019 04:02:58 -0800 (PST) In-Reply-To: <20190119160233.GA27159@gmail.com> References: <20190119160233.GA27159@gmail.com> From: Uros Bizjak Date: Sun, 20 Jan 2019 12:03:00 -0000 Message-ID: Subject: Re: [PATCH] i386: Move Intel intrinsics head files to To: "H.J. Lu" Cc: gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" X-SW-Source: 2019-01/txt/msg01143.txt.bz2 On 1/19/19, H.J. Lu wrote: > According to Intel Intrinsics Guide: > > https://software.intel.com/sites/landingpage/IntrinsicsGuide/ > > Intel intrinsics should be available by including . This > patch moves remaining Intel intrinsics head files from to > . I can't find the quoted requirement in the provided link. > OK for trunk? You will need a RM approval for a non-regression fix patch at this point. Uros. > H.J. > --- > PR target/71659 > * config/i386/adxintrin.h: Just check _IMMINTRIN_H_INCLUDED. > * config/i386/clflushoptintrin.h: Check _IMMINTRIN_H_INCLUDED > instead of _X86INTRIN_H_INCLUDED. > * onfig/i386/clwbintrin.h: Likewise. > * config/i386/pkuintrin.h: Likewise. > * config/i386/prfchwintrin.h: Likewise. > * config/i386/rdseedintrin.h: Likewise. > * config/i386/wbnoinvdintrin.h: Likewise. > * config/i386/xsavecintrin.h: Likewise. > * config/i386/xsavesintrin.h: Likewise. > * config/i386/fxsrintrin.h: Enable _IMMINTRIN_H_INCLUDED check. > * config/i386/xsaveintrin.h: Likewise. > * config/i386/xsaveoptintrin.h: Likewise. > * config/i386/x86intrin.h: Move "#include" , > , , , > , , , > , , , > and to ... > * config/i386/immintrin.h: Here. > --- > gcc/config/i386/adxintrin.h | 4 ++-- > gcc/config/i386/clflushoptintrin.h | 4 ++-- > gcc/config/i386/clwbintrin.h | 4 ++-- > gcc/config/i386/fxsrintrin.h | 6 +++--- > gcc/config/i386/immintrin.h | 24 ++++++++++++++++++++++++ > gcc/config/i386/pkuintrin.h | 4 ++-- > gcc/config/i386/prfchwintrin.h | 4 ++-- > gcc/config/i386/rdseedintrin.h | 4 ++-- > gcc/config/i386/wbnoinvdintrin.h | 4 ++-- > gcc/config/i386/x86intrin.h | 28 ---------------------------- > gcc/config/i386/xsavecintrin.h | 4 ++-- > gcc/config/i386/xsaveintrin.h | 6 +++--- > gcc/config/i386/xsaveoptintrin.h | 6 +++--- > gcc/config/i386/xsavesintrin.h | 4 ++-- > 14 files changed, 51 insertions(+), 55 deletions(-) > > diff --git a/gcc/config/i386/adxintrin.h b/gcc/config/i386/adxintrin.h > index e01b77ddb4b..e8cb004390c 100644 > --- a/gcc/config/i386/adxintrin.h > +++ b/gcc/config/i386/adxintrin.h > @@ -21,8 +21,8 @@ > see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > . */ > > -#if !defined _X86INTRIN_H_INCLUDED && !defined _IMMINTRIN_H_INCLUDED > -# error "Never use directly; include instead." > +#if !defined _IMMINTRIN_H_INCLUDED > +# error "Never use directly; include instead." > #endif > > #ifndef _ADXINTRIN_H_INCLUDED > diff --git a/gcc/config/i386/clflushoptintrin.h > b/gcc/config/i386/clflushoptintrin.h > index 1e720c2515c..89aa0f68fc2 100644 > --- a/gcc/config/i386/clflushoptintrin.h > +++ b/gcc/config/i386/clflushoptintrin.h > @@ -21,8 +21,8 @@ > see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > . */ > > -#if !defined _X86INTRIN_H_INCLUDED > -# error "Never use directly; include > instead." > +#if !defined _IMMINTRIN_H_INCLUDED > +# error "Never use directly; include > instead." > #endif > > #ifndef _CLFLUSHOPTINTRIN_H_INCLUDED > diff --git a/gcc/config/i386/clwbintrin.h b/gcc/config/i386/clwbintrin.h > index 217fb3babf2..68b20ea1635 100644 > --- a/gcc/config/i386/clwbintrin.h > +++ b/gcc/config/i386/clwbintrin.h > @@ -21,8 +21,8 @@ > see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > . */ > > -#if !defined _X86INTRIN_H_INCLUDED > -# error "Never use directly; include > instead." > +#if !defined _IMMINTRIN_H_INCLUDED > +# error "Never use directly; include > instead." > #endif > > #ifndef _CLWBINTRIN_H_INCLUDED > diff --git a/gcc/config/i386/fxsrintrin.h b/gcc/config/i386/fxsrintrin.h > index ff6c6f848eb..c4b12cf25f3 100644 > --- a/gcc/config/i386/fxsrintrin.h > +++ b/gcc/config/i386/fxsrintrin.h > @@ -21,9 +21,9 @@ > see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > . */ > > -/* #if !defined _X86INTRIN_H_INCLUDED && !defined _IMMINTRIN_H_INCLUDED */ > -/* # error "Never use directly; include > instead." */ > -/* #endif */ > +#if !defined _IMMINTRIN_H_INCLUDED > +# error "Never use directly; include > instead." > +#endif > > #ifndef _FXSRINTRIN_H_INCLUDED > #define _FXSRINTRIN_H_INCLUDED > diff --git a/gcc/config/i386/immintrin.h b/gcc/config/i386/immintrin.h > index 6ce00012b42..10e1f27c605 100644 > --- a/gcc/config/i386/immintrin.h > +++ b/gcc/config/i386/immintrin.h > @@ -38,6 +38,16 @@ > > #include > > +#include > + > +#include > + > +#include > + > +#include > + > +#include > + > #include > > #include > @@ -120,6 +130,20 @@ > > #include > > +#include > + > +#include > + > +#include > + > +#include > + > +#include > + > +#include > + > +#include > + > extern __inline void > __attribute__((__gnu_inline__, __always_inline__, __artificial__)) > _wbinvd (void) > diff --git a/gcc/config/i386/pkuintrin.h b/gcc/config/i386/pkuintrin.h > index 727bec5dda8..be46522f0c0 100644 > --- a/gcc/config/i386/pkuintrin.h > +++ b/gcc/config/i386/pkuintrin.h > @@ -21,8 +21,8 @@ > see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > . */ > > -#if !defined _X86INTRIN_H_INCLUDED > -# error "Never use directly; include instead." > +#if !defined _IMMINTRIN_H_INCLUDED > +# error "Never use directly; include instead." > #endif > > #ifndef _PKUINTRIN_H_INCLUDED > diff --git a/gcc/config/i386/prfchwintrin.h > b/gcc/config/i386/prfchwintrin.h > index dab46395cd4..3ecf9088ee6 100644 > --- a/gcc/config/i386/prfchwintrin.h > +++ b/gcc/config/i386/prfchwintrin.h > @@ -21,8 +21,8 @@ > see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > . */ > > -#if !defined _X86INTRIN_H_INCLUDED && !defined _MM3DNOW_H_INCLUDED > -# error "Never use directly; include or > instead." > +#if !defined _IMMINTRIN_H_INCLUDED && !defined _MM3DNOW_H_INCLUDED > +# error "Never use directly; include or > instead." > #endif > > #ifndef _PRFCHWINTRIN_H_INCLUDED > diff --git a/gcc/config/i386/rdseedintrin.h > b/gcc/config/i386/rdseedintrin.h > index 56c7ec85535..73c07637970 100644 > --- a/gcc/config/i386/rdseedintrin.h > +++ b/gcc/config/i386/rdseedintrin.h > @@ -21,8 +21,8 @@ > see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > . */ > > -#if !defined _X86INTRIN_H_INCLUDED > -# error "Never use directly; include > instead." > +#if !defined _IMMINTRIN_H_INCLUDED > +# error "Never use directly; include > instead." > #endif > > #ifndef _RDSEEDINTRIN_H_INCLUDED > diff --git a/gcc/config/i386/wbnoinvdintrin.h > b/gcc/config/i386/wbnoinvdintrin.h > index 9312a0082c9..5393698c6bb 100644 > --- a/gcc/config/i386/wbnoinvdintrin.h > +++ b/gcc/config/i386/wbnoinvdintrin.h > @@ -1,5 +1,5 @@ > -#ifndef _X86INTRIN_H_INCLUDED > -#error "Never use directly; include > instead." > +#ifndef _IMMINTRIN_H_INCLUDED > +#error "Never use directly; include > instead." > #endif > > #ifndef _WBNOINVDINTRIN_H_INCLUDED > diff --git a/gcc/config/i386/x86intrin.h b/gcc/config/i386/x86intrin.h > index 0eb8d88aeb8..6a08806ed7c 100644 > --- a/gcc/config/i386/x86intrin.h > +++ b/gcc/config/i386/x86intrin.h > @@ -43,38 +43,10 @@ > > #include > > -#include > - > -#include > - > -#include > - > -#include > - > -#include > - > -#endif /* __iamcu__ */ > - > -#include > - > -#ifndef __iamcu__ > - > -#include > - > -#include > - > -#include > - > -#include > - > #include > > #include > > -#include > - > -#include > - > #endif /* __iamcu__ */ > > #endif /* _X86INTRIN_H_INCLUDED */ > diff --git a/gcc/config/i386/xsavecintrin.h > b/gcc/config/i386/xsavecintrin.h > index c61f2d69b2a..d7aa43534e5 100644 > --- a/gcc/config/i386/xsavecintrin.h > +++ b/gcc/config/i386/xsavecintrin.h > @@ -21,8 +21,8 @@ > see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > . */ > > -#if !defined _X86INTRIN_H_INCLUDED > -# error "Never use directly; include > instead." > +#if !defined _IMMINTRIN_H_INCLUDED > +# error "Never use directly; include > instead." > #endif > > #ifndef _XSAVECINTRIN_H_INCLUDED > diff --git a/gcc/config/i386/xsaveintrin.h b/gcc/config/i386/xsaveintrin.h > index 3ab1c108c8c..77f9667b63b 100644 > --- a/gcc/config/i386/xsaveintrin.h > +++ b/gcc/config/i386/xsaveintrin.h > @@ -21,9 +21,9 @@ > see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > . */ > > -/* #if !defined _X86INTRIN_H_INCLUDED && !defined _IMMINTRIN_H_INCLUDED */ > -/* # error "Never use directly; include > instead." */ > -/* #endif */ > +#if !defined _IMMINTRIN_H_INCLUDED > +# error "Never use directly; include > instead." > +#endif > > #ifndef _XSAVEINTRIN_H_INCLUDED > #define _XSAVEINTRIN_H_INCLUDED > diff --git a/gcc/config/i386/xsaveoptintrin.h > b/gcc/config/i386/xsaveoptintrin.h > index ae62107b647..2a0bf0b334e 100644 > --- a/gcc/config/i386/xsaveoptintrin.h > +++ b/gcc/config/i386/xsaveoptintrin.h > @@ -21,9 +21,9 @@ > see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > . */ > > -/* #if !defined _X86INTRIN_H_INCLUDED && !defined _IMMINTRIN_H_INCLUDED */ > -/* # error "Never use directly; include > instead." */ > -/* #endif */ > +#if !defined _IMMINTRIN_H_INCLUDED > +# error "Never use directly; include > instead." > +#endif > > #ifndef _XSAVEOPTINTRIN_H_INCLUDED > #define _XSAVEOPTINTRIN_H_INCLUDED > diff --git a/gcc/config/i386/xsavesintrin.h > b/gcc/config/i386/xsavesintrin.h > index 1abc0b331c5..9d9d035a111 100644 > --- a/gcc/config/i386/xsavesintrin.h > +++ b/gcc/config/i386/xsavesintrin.h > @@ -21,8 +21,8 @@ > see the files COPYING3 and COPYING.RUNTIME respectively. If not, see > . */ > > -#if !defined _X86INTRIN_H_INCLUDED > -# error "Never use directly; include > instead." > +#if !defined _IMMINTRIN_H_INCLUDED > +# error "Never use directly; include > instead." > #endif > > #ifndef _XSAVESINTRIN_H_INCLUDED > -- > 2.20.1 > >