i386.c (override_options): Respect user disable of fancy 387 math, sse, mmx.

        * config/i386/i386.c (override_options): Respect user disable of
        fancy 387 math, sse, mmx.
        (construct_container): Generate error if we need an sse regster
        and sse has been disabled.
        * config/i386/i386.h (TARGET_SWITCHES): Disabling sse also disables
        later sse generations.  Disabling mmx also disables 3dnow.

From-SVN: r92530

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00cb8e9a643ccbfc78bb15c577eee02015f6228e..d911b36410ffed221d7fa1666eb05d665571783d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-22  Richard Henderson  <rth@redhat.com>
+
+       * config/i386/i386.c (override_options): Respect user disable of
+       fancy 387 math, sse, mmx.
+       (construct_container): Generate error if we need an sse regster
+       and sse has been disabled.
+       * config/i386/i386.h (TARGET_SWITCHES): Disabling sse also disables
+       later sse generations.  Disabling mmx also disables 3dnow.
+
 2004-12-22  Daniel Berlin  <dberlin@dberlin.org>
        
        * tree-inline.c (struct inline_data): Remove inlined_fns.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index a6273cadd6b8cec7cb662588f6d9b57aaec6c04a..ef5f37e13b1187e37422cdff8364931e74911e6e 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -1473,7 +1473,8 @@ override_options (void)
 
   /* If the architecture always has an FPU, turn off NO_FANCY_MATH_387,
      since the insns won't need emulation.  */
-  if (x86_arch_always_fancy_math_387 & (1 << ix86_arch))
+  if (!(target_flags_explicit & MASK_NO_FANCY_MATH_387)
+      && (x86_arch_always_fancy_math_387 & (1 << ix86_arch)))
     target_flags &= ~MASK_NO_FANCY_MATH_387;
 
   /* Likewise, if the target doesn't have a 387, or we've specified
@@ -1489,15 +1490,33 @@ override_options (void)
   if (TARGET_SSE2)
     target_flags |= MASK_SSE;
 
+  /* Turn on MMX builtins for -msse.  */
+  if (TARGET_SSE)
+    {
+      target_flags |= MASK_MMX & ~target_flags_explicit;
+      x86_prefetch_sse = true;
+    }
+
+  /* Turn on MMX builtins for 3Dnow.  */
+  if (TARGET_3DNOW)
+    target_flags |= MASK_MMX;
+
   if (TARGET_64BIT)
     {
       if (TARGET_ALIGN_DOUBLE)
        error ("-malign-double makes no sense in the 64bit mode");
       if (TARGET_RTD)
        error ("-mrtd calling convention not supported in the 64bit mode");
-      /* Enable by default the SSE and MMX builtins.  */
-      target_flags |= (MASK_SSE2 | MASK_SSE | MASK_MMX | MASK_128BIT_LONG_DOUBLE);
-      ix86_fpmath = FPMATH_SSE;
+
+      /* Enable by default the SSE and MMX builtins.  Do allow the user to
+        explicitly disable any of these.  In particular, disabling SSE and
+        MMX for kernel code is extremely useful.  */
+      target_flags
+       |= ((MASK_SSE2 | MASK_SSE | MASK_MMX | MASK_128BIT_LONG_DOUBLE)
+           & ~target_flags_explicit);
+
+      if (TARGET_SSE)
+       ix86_fpmath = FPMATH_SSE;
      }
   else
     {
@@ -1546,23 +1565,6 @@ override_options (void)
   if (! (ix86_fpmath & FPMATH_387))
     target_flags |= MASK_NO_FANCY_MATH_387;
 
-  /* It makes no sense to ask for just SSE builtins, so MMX is also turned
-     on by -msse.  */
-  if (TARGET_SSE)
-    {
-      target_flags |= MASK_MMX;
-      x86_prefetch_sse = true;
-    }
-
-  /* If it has 3DNow! it also has MMX so MMX is also turned on by -m3dnow */
-  if (TARGET_3DNOW)
-    {
-      target_flags |= MASK_MMX;
-      /* If we are targeting the Athlon architecture, enable the 3Dnow/MMX
-        extensions it adds.  */
-      if (x86_3dnow_a & (1 << ix86_arch))
-       target_flags |= MASK_3DNOW_A;
-    }
   if ((x86_accumulate_outgoing_args & TUNEMASK)
       && !(target_flags_explicit & MASK_ACCUMULATE_OUTGOING_ARGS)
       && !optimize_size)
@@ -1576,8 +1578,9 @@ override_options (void)
     internal_label_prefix_len = p - internal_label_prefix;
     *p = '\0';
   }
-  /* When scheduling description is not available, disable scheduler pass so it
-     won't slow down the compilation and make x87 code slower.  */
+
+  /* When scheduling description is not available, disable scheduler pass
+     so it won't slow down the compilation and make x87 code slower.  */
   if (!TARGET_SCHEDULE)
     flag_schedule_insns_after_reload = flag_schedule_insns = 0;
 }
@@ -2543,6 +2546,22 @@ construct_container (enum machine_mode mode, enum machine_mode orig_mode,
   if (needed_intregs > nintregs || needed_sseregs > nsseregs)
     return NULL;
 
+  /* We allowed the user to turn off SSE for kernel mode.  Don't crash if
+     some less clueful developer tries to use floating-point anyway.  */
+  if (needed_sseregs && !TARGET_SSE)
+    {
+      static bool issued_error;
+      if (!issued_error)
+       {
+         issued_error = true;
+         if (in_return)
+           error ("SSE register return with SSE disabled");
+         else
+           error ("SSE register argument with SSE disabled");
+       }
+      return NULL;
+    }
+
   /* First construct simple cases.  Avoid SCmode, since we want to use
      single register to pass this type.  */
   if (n == 1 && mode != SCmode)

diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
index 383617214ddfc432dcfb58c41f86fbf6f3629b56..d4d7f1ca420d5cd158f3497aed6b9a4dae412cb4 100644 (file)
--- a/gcc/config/i386/i386.h
+++ b/gcc/config/i386/i386.h
@@ -393,19 +393,19 @@ extern int x86_prefetch_sse;
     N_("Do not use push instructions to save outgoing arguments") },         \
   { "mmx",                      MASK_MMX,                                    \
     N_("Support MMX built-in functions") },                                  \
-  { "no-mmx",                   -MASK_MMX,                                   \
+  { "no-mmx",                   -(MASK_MMX|MASK_3DNOW|MASK_3DNOW_A),         \
     N_("Do not support MMX built-in functions") },                           \
   { "3dnow",                     MASK_3DNOW,                                 \
     N_("Support 3DNow! built-in functions") },                               \
-  { "no-3dnow",                  -MASK_3DNOW,                                \
+  { "no-3dnow",                  -(MASK_3DNOW|MASK_3DNOW_A),                 \
     N_("Do not support 3DNow! built-in functions") },                        \
   { "sse",                      MASK_SSE,                                    \
     N_("Support MMX and SSE built-in functions and code generation") },              \
-  { "no-sse",                   -MASK_SSE,                                   \
+  { "no-sse",                   -(MASK_SSE|MASK_SSE2|MASK_SSE3),             \
     N_("Do not support MMX and SSE built-in functions and code generation") },\
   { "sse2",                     MASK_SSE2,                                   \
     N_("Support MMX, SSE and SSE2 built-in functions and code generation") }, \
-  { "no-sse2",                  -MASK_SSE2,                                  \
+  { "no-sse2",                  -(MASK_SSE2|MASK_SSE3),                      \
     N_("Do not support MMX, SSE and SSE2 built-in functions and code generation") },    \
   { "sse3",                     MASK_SSE3,                                   \
     N_("Support MMX, SSE, SSE2 and SSE3 built-in functions and code generation") },\

diff --git a/gcc/testsuite/gcc.target/i386/amd64-abi-1.c b/gcc/testsuite/gcc.target/i386/amd64-abi-1.c
new file mode 100644 (file)
index 0000000..a83f074
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/amd64-abi-1.c
@@ -0,0 +1,5 @@
+/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-options "-mno-sse" } */
+
+double foo(void) { return 0; } /* { dg-error "SSE disabled" } */
+void bar(double x) { }

diff --git a/gcc/testsuite/gcc.target/i386/defines-1.c b/gcc/testsuite/gcc.target/i386/defines-1.c
new file mode 100644 (file)
index 0000000..acc39f3
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/defines-1.c
@@ -0,0 +1,6 @@
+/* { dg-do compile } */
+/* { dg-options "-march=nocona -mno-sse" } */
+
+#if defined(__SSE__) || defined(__SSE2__) || defined(__SSE3__)
+#error
+#endif

diff --git a/gcc/testsuite/gcc.target/i386/defines-2.c b/gcc/testsuite/gcc.target/i386/defines-2.c
new file mode 100644 (file)
index 0000000..4383a05
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/defines-2.c
@@ -0,0 +1,6 @@
+/* { dg-do compile } */
+/* { dg-options "-march=athlon64 -mno-mmx" } */
+
+#if defined(__MMX__) || defined(__3dNOW__) || defined(__3dNOW_A__)
+#error
+#endif