mips.exp: Comment !CPU in the isa* pseudo-options.

	* gcc.target/mips/mips.exp: Comment !CPU in the isa* pseudo-options.
	(mips-dg-options): When matching isa* pseudo-options make
	'value' optional and accept ! entries.  Use $spec instead of
	$isa_spec in the isa pseudo-option error message.  Only
	perform the ISA-range check when 'value' is set.  If arch is
	matching any CPU in the ! entries switch to its generic ISA.
	* gcc.target/mips/branch-1.c: Pass isa=!octeon.
	* gcc.target/mips/dmult-1.c: Pass isa=64!octeon rather than
	-mips64.

From-SVN: r144306

4 files changed, 72 insertions, 27 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b8a1c03..38d67d5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2009-02-19  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* gcc.target/mips/mips.exp: Comment !CPU in the isa* pseudo-options.
+	(mips-dg-options): When matching isa* pseudo-options make
+	'value' optional and accept ! entries.  Use $spec instead of
+	$isa_spec in the isa pseudo-option error message.  Only
+	perform the ISA-range check when 'value' is set.  If arch is
+	matching any CPU in the ! entries switch to its generic ISA.
+	* gcc.target/mips/branch-1.c: Pass isa=!octeon.
+	* gcc.target/mips/dmult-1.c: Pass isa=64!octeon rather than
+	-mips64.
+
 2009-02-19  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/39175
diff --git a/gcc/testsuite/gcc.target/mips/branch-1.c b/gcc/testsuite/gcc.target/mips/branch-1.c
index fb71536..b70b264 100644
--- a/gcc/testsuite/gcc.target/mips/branch-1.c
+++ b/gcc/testsuite/gcc.target/mips/branch-1.c
@@ -1,6 +1,8 @@
-/* We should implement these "if" statements using an "andi" instruction
-   followed by a branch on zero.  */
-/* { dg-options "-O2" } */
+/* Octeon targets should use "bbit" instructions for these "if" statements,
+   but we test for "bbit" elsewhere.  On other targets, we should implement
+   the "if" statements using an "andi" instruction followed by a branch
+   on zero.  */
+/* { dg-options "-O2 isa=!octeon" } */
 
 void bar (void);
 NOMIPS16 void f1 (int x) { if (x & 4) bar (); }
diff --git a/gcc/testsuite/gcc.target/mips/dmult-1.c b/gcc/testsuite/gcc.target/mips/dmult-1.c
index 61e66c2..6d41204 100644
--- a/gcc/testsuite/gcc.target/mips/dmult-1.c
+++ b/gcc/testsuite/gcc.target/mips/dmult-1.c
@@ -1,4 +1,4 @@
-/* { dg-options "-mips64 -mgp64" } */
+/* { dg-options "isa=64!octeon -mgp64" } */
 /* { dg-final { scan-assembler "\tdmult\t" } } */
 /* { dg-final { scan-assembler "\tmflo\t" } } */
 /* { dg-final { scan-assembler-not "\tdmul\t" } } */
diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp
index c5d6089..40d50d5 100644
--- a/gcc/testsuite/gcc.target/mips/mips.exp
+++ b/gcc/testsuite/gcc.target/mips/mips.exp
@@ -135,10 +135,18 @@
 #	the value of the __mips_isa_rev macro, or 0 if it isn't defined.
 #
 # For example, "isa_rev>=1" selects a MIPS32 or MIPS64 processor,
-# "isa=4" selects a MIPS IV processor, and so on.  There are also
-# the following special pseudo-options:
+# "isa=4" selects a MIPS IV processor, and so on.
 #
-#   isa=loongson:
+# If certain processor-specific extensions are not applicable to the
+# test you can list them as !CPU in the isa or isa_rev options.  For
+# example, isa=64!octeon enforces MIPS64 while avoiding octeon.  You
+# can also use ! without an ISA value.  For example
+# isa=!octeon!loongson2e disables octeon and loongson2e if otherwise
+# you would compile for one of them.
+#
+# There are also the following special pseudo-options:
+#
+#   isa=loongson
 #	select a Loongson processor
 #
 #   addressing=absolute
@@ -173,6 +181,9 @@
 #	options.  For example, if the feature is present on revision 2
 #	processors and above, try to use "isa_rev>=2" instead of
 #	"-mips32r2" or "-mips64r2".
+#
+#   (6) If you need to disable processor-specific extensions use
+#	isa=!CPU instead of forcing a generic ISA.
 
 # Exit immediately if this isn't a MIPS target.
 if ![istarget mips*-*-*] {
@@ -825,29 +836,49 @@ proc mips-dg-options { args } {
 		set arch "-march=loongson2f"
 	    }
 	} else {
-	    if { ![regexp {^(isa(?:|_rev))(=|<=|>=)([0-9]+)$} $spec \
-		       dummy prop relation value] } {
-		error "Unrecognized isa specification: $isa_spec"
+	    # With ! and = the ISA value is optional.
+	    if { ![regexp {^(isa(?:|_rev))(=|<=|>=)([0-9]*)((?:![^!]+)*)$} \
+		       $spec dummy prop relation value nocpus]
+		 || ($value eq ""
+		     && ($relation ne "="
+			 || $nocpus eq ""))} {
+		error "Unrecognized isa specification: $spec"
 	    }
-	    set current [mips_arch_info $arch $prop]
-	    if { ($current < $value && ![string equal $relation "<="])
-		 || ($current > $value && ![string equal $relation ">="])
-		 || ([mips_have_test_option_p options "-mgp64"]
-		     && [mips_32bit_arch_p $arch]) } {
-		# The current setting is out of range; it cannot
-		# possibly be used.  Find a replacement that can.
-		if { [string equal $prop "isa"] } {
-		    set arch "-mips$value"
-		} elseif { $value == 0 } {
-		    set arch "-mips4"
-		} else {
-		    if { [mips_have_option_p options "-mgp32"] } {
-			set arch "-mips32"
+	    if { $value ne "" } {
+		set current [mips_arch_info $arch $prop]
+		if { ($current < $value && ![string equal $relation "<="])
+		     || ($current > $value && ![string equal $relation ">="])
+		     || ([mips_have_test_option_p options "-mgp64"]
+			 && [mips_32bit_arch_p $arch]) } {
+		    # The current setting is out of range; it cannot
+		    # possibly be used.  Find a replacement that can.
+		    if { [string equal $prop "isa"] } {
+			set arch "-mips$value"
+		    } elseif { $value == 0 } {
+			set arch "-mips4"
 		    } else {
-			set arch "-mips64"
+			if { [mips_have_option_p options "-mgp32"] } {
+			    set arch "-mips32"
+			} else {
+			    set arch "-mips64"
+			}
+			if { $value > 1 } {
+			    append arch "r$value"
+			}
 		    }
-		    if { $value > 1 } {
-			append arch "r$value"
+		}
+	    }
+	    # If we haven't switched to a generic ISA based on the
+	    # isa* value, do it here if the processor-specific
+	    # extension is not allowed.
+	    if { $nocpus ne ""
+		 && $arch eq [mips_option mips_base_options arch] } {
+		set cpu [regsub -- {-march=} $arch ""]
+		if { [regexp "!$cpu!" "$nocpus!"] } {
+		    set isa_rev [mips_arch_info $arch isa_rev]
+		    set arch "-mips[mips_arch_info $arch isa]"		
+		    if { $isa_rev > 1 } {
+			append arch "r$isa_rev"
 		    }
 		}
 	    }