From patchwork Sat Jan 19 16:02:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1027978 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-494357-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="wcsTJ6rA"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XtnCioYO"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hjJX5H9Pz9sBQ for ; Sun, 20 Jan 2019 03:02:51 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=moldGNwwodo6d0JOzh4MFRwSUAPykN2uXK1x+axdDfmH9szIds xy5s5xiGN+2MbjLPyTnsVhcji1H/4Nj0NQB9ATCckq4Hl+grhlZ/Gti8BFC8FaXV Aa/u9tbyBgoN3qYRqjTd3mmCOf9WdPEBVMFJGmbZr6CJjBOWHDFrs64z4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=aO78LVBIsGqK8fVmngOvYme8qc0=; b=wcsTJ6rAFY6Fddgia8YC KcMJ1haopMzStdklkesFtTFJKArXRvo94rtJV+mqm6FBR1OT9g0HsJxKvMOk7V65 072kHBpx3e8aiPeZqVMBNNt/o9x69m0+/X0A/qQo757rOhiUc+/tz6ZTRgTRxSvT VThn1/yTpACsXITMxCvmIoU= Received: (qmail 68656 invoked by alias); 19 Jan 2019 16:02:43 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 68644 invoked by uid 89); 19 Jan 2019 16:02:43 -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=UD:x86intrin.h, sk:__alway, x86intrinh, __inline X-HELO: mail-pl1-f196.google.com Received: from mail-pl1-f196.google.com (HELO mail-pl1-f196.google.com) (209.85.214.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 19 Jan 2019 16:02:38 +0000 Received: by mail-pl1-f196.google.com with SMTP id w4so7729826plz.1 for ; Sat, 19 Jan 2019 08:02:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=jgjEY4bU4GcQfDWvC+fzBPcJ0krSzEby0Gb80HAUlbg=; b=XtnCioYO/Gx6VELwPGpVWanCJdW8SXZBE+WRnt12VnrXWDg2GEshxs/fOqZSkVFaYC ojrz6OCxwVNhqe5HEQOjTPPjuf72+8VXD+iIUW96zJZE85f+/bGtv49Icl/yDXr9YnEP NFvtELSlfkKtFogbZYuX3wtUp2EwAoxCmttbLITPVrr49sqON/ueI9Xq81ifCaC2FsbN zIy7Nt3dWKUT3QSWJdlIjgFwrXeBmvkPRXGZTm73jCzZyItw/UyNZBuJIHh4OgO81kDu 9kpRJhhEBIkehrAeY0sGoarTZDv0Wjn0AToZQwUZLFlgkUJCSpwij3OO5VpFMwb9h/du UlNw== Received: from gnu-cfl-2.localdomain (c-73-93-86-59.hsd1.ca.comcast.net. [73.93.86.59]) by smtp.gmail.com with ESMTPSA id m20sm9812665pgb.56.2019.01.19.08.02.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 08:02:35 -0800 (PST) Received: by gnu-cfl-2.localdomain (Postfix, from userid 1000) id 007C7C009D; Sat, 19 Jan 2019 08:02:33 -0800 (PST) Date: Sat, 19 Jan 2019 08:02:33 -0800 From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Cc: Uros Bizjak Subject: [PATCH] i386: Move Intel intrinsics head files to Message-ID: <20190119160233.GA27159@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes 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 . OK for trunk? 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