OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rs6000: Fix up #include <immintrin.h> or <x86gprintrin.h> [PR104239]

Browse Source 
r12-4717-g7d37abedf58d66 added immintrin.h and x86gprintrin.h headers
to rs6000, these headers are on x86 standalone headers that various
programs include directly rather than including them through
<x86intrin.h>.
Unfortunately, for that change the bmiintrin.h and bmi2intrin.h
headers haven't been adjusted, so the effect is that if one includes them
(without including also x86intrin.h first) #error will trigger.
Furthermore, when including such headers conditionally as some real-world
packages do, this means a regression.

The following patch fixes it and matches what the x86 bmi{,2}intrin.h
headers do.

2022-01-26  Jakub Jelinek  <jakub@redhat.com>

	PR target/104239
	* config/rs6000/bmiintrin.h: Test _X86GPRINTRIN_H_INCLUDED instead of
	_X86INTRIN_H_INCLUDED and adjust #error wording.
	* config/rs6000/bmi2intrin.h: Likewise.

	* gcc.target/powerpc/pr104239-1.c: New test.
	* gcc.target/powerpc/pr104239-2.c: New test.
This commit is contained in:
Jakub Jelinek 2022-01-26 22:07:29 +01:00
parent 9bf2179204
commit 2bf8da684b
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/config/rs6000/bmi2intrin.h
View File

@ -29,8 +29,8 @@
standard C or GNU C extensions, which are more portable and better
optimized across multiple targets. */
#if !defined _X86INTRIN_H_INCLUDED
# error "Never use <bmi2intrin.h> directly; include <x86intrin.h> instead."
#if !defined _X86GPRINTRIN_H_INCLUDED
# error "Never use <bmi2intrin.h> directly; include <x86gprintrin.h> instead."
#endif
#ifndef _BMI2INTRIN_H_INCLUDED

4
gcc/config/rs6000/bmiintrin.h
View File

@ -29,8 +29,8 @@
standard C or GNU C extensions, which are more portable and better
optimized across multiple targets. */
#if !defined _X86INTRIN_H_INCLUDED
# error "Never use <bmiintrin.h> directly; include <x86intrin.h> instead."
#if !defined _X86GPRINTRIN_H_INCLUDED
# error "Never use <bmiintrin.h> directly; include <x86gprintrin.h> instead."
#endif
#ifndef _BMIINTRIN_H_INCLUDED

10
gcc/testsuite/gcc.target/powerpc/pr104239-1.c Normal file
View File

@ -0,0 +1,10 @@
/* PR target/104239 */
/* { dg-do compile } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -DNO_WARN_X86_INTRINSICS" } */
/* { dg-require-effective-target powerpc_p8vector_ok } */
#if __has_include(<immintrin.h>)
#include <immintrin.h>
#endif
int i;

10
gcc/testsuite/gcc.target/powerpc/pr104239-2.c Normal file
View File

@ -0,0 +1,10 @@
/* PR target/104239 */
/* { dg-do compile } */
/* { dg-options "-O2 -mdejagnu-cpu=power8 -DNO_WARN_X86_INTRINSICS" } */
/* { dg-require-effective-target powerpc_p8vector_ok } */
#if __has_include(<x86gprintrin.h>)
#include <x86gprintrin.h>
#endif
int i;