public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-7829] Revert "x86: Skip ISA check for always_inline in system headers"
@ 2021-03-25 13:57 H.J. Lu
0 siblings, 0 replies; only message in thread
From: H.J. Lu @ 2021-03-25 13:57 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:de00a7bda94910835012bc7150be53b460a5c8b6
commit r11-7829-gde00a7bda94910835012bc7150be53b460a5c8b6
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Mar 25 06:57:37 2021 -0700
Revert "x86: Skip ISA check for always_inline in system headers"
This reverts commit 72982851d70dfbc547d83ed2bb45356b9ebe3ff0.
Diff:
---
gcc/config/i386/i386.c | 24 ++++++++----------------
gcc/testsuite/gcc.target/i386/pr98209.c | 13 -------------
gcc/testsuite/gcc.target/i386/pr99744-1.c | 16 ----------------
gcc/testsuite/gcc.target/i386/pr99744-2.c | 13 -------------
4 files changed, 8 insertions(+), 58 deletions(-)
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 1b4567e34ba..7c41302c75b 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -578,29 +578,21 @@ ix86_can_inline_p (tree caller, tree callee)
&& lookup_attribute ("always_inline",
DECL_ATTRIBUTES (callee)));
- /* NB: Skip ISA check for always_inline in system headers if caller
- has target attribute. */
- bool skip_isa_check = (always_inline
- && caller_tree != target_option_default_node
- && DECL_IN_SYSTEM_HEADER (callee));
-
cgraph_node *callee_node = cgraph_node::get (callee);
/* Callee's isa options should be a subset of the caller's, i.e. a SSE4
function can inline a SSE2 function but a SSE2 function can't inline
a SSE4 function. */
- if (!skip_isa_check
- && (((caller_opts->x_ix86_isa_flags & callee_opts->x_ix86_isa_flags)
- != callee_opts->x_ix86_isa_flags)
- || ((caller_opts->x_ix86_isa_flags2 & callee_opts->x_ix86_isa_flags2)
- != callee_opts->x_ix86_isa_flags2)))
+ if (((caller_opts->x_ix86_isa_flags & callee_opts->x_ix86_isa_flags)
+ != callee_opts->x_ix86_isa_flags)
+ || ((caller_opts->x_ix86_isa_flags2 & callee_opts->x_ix86_isa_flags2)
+ != callee_opts->x_ix86_isa_flags2))
ret = false;
/* See if we have the same non-isa options. */
- else if (!skip_isa_check
- && ((!always_inline
- && caller_opts->x_target_flags != callee_opts->x_target_flags)
- || ((caller_opts->x_target_flags & ~always_inline_safe_mask)
- != (callee_opts->x_target_flags & ~always_inline_safe_mask))))
+ else if ((!always_inline
+ && caller_opts->x_target_flags != callee_opts->x_target_flags)
+ || (caller_opts->x_target_flags & ~always_inline_safe_mask)
+ != (callee_opts->x_target_flags & ~always_inline_safe_mask))
ret = false;
/* See if arch, tune, etc. are the same. */
diff --git a/gcc/testsuite/gcc.target/i386/pr98209.c b/gcc/testsuite/gcc.target/i386/pr98209.c
deleted file mode 100644
index 4566d4c7fc3..00000000000
--- a/gcc/testsuite/gcc.target/i386/pr98209.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* { dg-do run { target *-*-linux* } } */
-/* { dg-options "-O2 -D_FORTIFY_SOURCE=2" } */
-
-#include <stdio.h>
-
-extern int main(int argc, char** argv)
- __attribute__ ((__target__ ("no-sse,no-mmx")));
-
-int main(int argc, char** argv)
-{
- printf ("hello!\n");
- return 0;
-}
diff --git a/gcc/testsuite/gcc.target/i386/pr99744-1.c b/gcc/testsuite/gcc.target/i386/pr99744-1.c
deleted file mode 100644
index 92535923a56..00000000000
--- a/gcc/testsuite/gcc.target/i386/pr99744-1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O0" } */
-
-#include <x86intrin.h>
-
-extern unsigned long long int curr_deadline;
-extern void bar (void);
-
-__attribute__ ((target("general-regs-only")))
-void
-foo (void)
-{
- if (__rdtsc () < curr_deadline)
- return;
- bar ();
-}
diff --git a/gcc/testsuite/gcc.target/i386/pr99744-2.c b/gcc/testsuite/gcc.target/i386/pr99744-2.c
deleted file mode 100644
index 4bb2a6bb6dc..00000000000
--- a/gcc/testsuite/gcc.target/i386/pr99744-2.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* { dg-do compile { target { ! ia32 } } } */
-/* { dg-options "-O2" } */
-
-#include <x86intrin.h>
-
-extern __m128i x, y;
-
-__attribute__ ((target("general-regs-only")))
-void
-foo (void)
-{
- x = _mm_move_epi64 (y); /* { dg-error "SSE register return with SSE disabled" } */
-}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-03-25 13:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-25 13:57 [gcc r11-7829] Revert "x86: Skip ISA check for always_inline in system headers" H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).