Change default target architecture from Mips1 to Mips32r1 in preparation for

removing support for Mips1 and Mips2.

This change and the ones that follow have been discussed with and approved by
Bruno.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139344 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/Mips/Mips.td b/lib/Target/Mips/Mips.td
index 433cd57f34e0870c585350a5d7c6b5b76124aee8..4087c82d7e68479636407287c27d8dbb6ff087bb 100644 (file)
--- a/lib/Target/Mips/Mips.td
+++ b/lib/Target/Mips/Mips.td
@@ -79,6 +79,7 @@ def : Proc<"r3000", [FeatureMips1]>;
 def : Proc<"mips2", [FeatureMips2]>;
 def : Proc<"r6000", [FeatureMips2]>;
 
 def : Proc<"mips2", [FeatureMips2]>;
 def : Proc<"r6000", [FeatureMips2]>;
 

+def : Proc<"mips32r1", [FeatureMips32]>;

 def : Proc<"4ke", [FeatureMips32r2]>;
 
 // Allegrex is a 32bit subset of r4000, both for integer and fp registers,
 def : Proc<"4ke", [FeatureMips32r2]>;
 
 // Allegrex is a 32bit subset of r4000, both for integer and fp registers,

diff --git a/lib/Target/Mips/MipsSubtarget.cpp b/lib/Target/Mips/MipsSubtarget.cpp
index c273d0a2cd7fb24c4e6ebb3f552b7bbf0b404064..dd115fdecf9780a9f5816768b7bb4ea960e8c174 100644 (file)
--- a/lib/Target/Mips/MipsSubtarget.cpp
+++ b/lib/Target/Mips/MipsSubtarget.cpp
@@ -31,8 +31,7 @@ MipsSubtarget::MipsSubtarget(const std::string &TT, const std::string &CPU,
 {
   std::string CPUName = CPU;
   if (CPUName.empty())
 {
   std::string CPUName = CPU;
   if (CPUName.empty())

-    CPUName = "mips1";
-  MipsArchVersion = Mips1;
+    CPUName = "mips32r1";

 
   // Parse features string.
   ParseSubtargetFeatures(CPUName, FS);
 
   // Parse features string.
   ParseSubtargetFeatures(CPUName, FS);

diff --git a/test/CodeGen/Mips/2010-07-20-Select.ll b/test/CodeGen/Mips/2010-07-20-Select.ll
index e5e2c54737707fece96100189f0103a3433b6291..31e56ff27d1d623b2054856bd5553eebcff3b96d 100644 (file)
--- a/test/CodeGen/Mips/2010-07-20-Select.ll
+++ b/test/CodeGen/Mips/2010-07-20-Select.ll
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=mips -relocation-model=static | FileCheck %s
-; RUN: llc < %s -march=mips -relocation-model=static -regalloc=basic | FileCheck %s
+; RUN: llc < %s -march=mips -relocation-model=static -mcpu=mips1 | FileCheck %s
+; RUN: llc < %s -march=mips -relocation-model=static -regalloc=basic -mcpu=mips1 | FileCheck %s

 ; Fix PR7473
 
 define i32 @main() nounwind readnone {
 ; Fix PR7473
 
 define i32 @main() nounwind readnone {

diff --git a/test/CodeGen/Mips/fpcmp.ll b/test/CodeGen/Mips/fpcmp.ll
index c89ffe67f1b9012de54c2dc14da8b51fd8333bcf..24de2ffd6382398feb5a3374ab4145056862664b 100644 (file)
--- a/test/CodeGen/Mips/fpcmp.ll
+++ b/test/CodeGen/Mips/fpcmp.ll
@@ -1,5 +1,5 @@
 ; RUN: llc  < %s -march=mipsel -mcpu=4ke | FileCheck %s -check-prefix=CHECK-MIPS32R2
 ; RUN: llc  < %s -march=mipsel -mcpu=4ke | FileCheck %s -check-prefix=CHECK-MIPS32R2

-; RUN: llc  < %s -march=mipsel | FileCheck %s -check-prefix=CHECK-MIPS1
+; RUN: llc  < %s -march=mipsel -mcpu=mips1 | FileCheck %s -check-prefix=CHECK-MIPS1

 
 @g1 = external global i32
 
 
 @g1 = external global i32
 

diff --git a/test/CodeGen/Mips/mips1f64ldst.ll b/test/CodeGen/Mips/mips1f64ldst.ll
index 1860755634c17a729903553d999a7ea46ab7d3c5..28683be743458c6280ef4735949f3d0311419891 100644 (file)
--- a/test/CodeGen/Mips/mips1f64ldst.ll
+++ b/test/CodeGen/Mips/mips1f64ldst.ll
@@ -1,5 +1,5 @@
-; RUN: llc  < %s -march=mipsel  | FileCheck %s -check-prefix=CHECK-EL
-; RUN: llc  < %s -march=mips  | FileCheck %s -check-prefix=CHECK-EB
+; RUN: llc  < %s -march=mipsel -mcpu=mips1 | FileCheck %s -check-prefix=CHECK-EL
+; RUN: llc  < %s -march=mips -mcpu=mips1 | FileCheck %s -check-prefix=CHECK-EB

 
 @g1 = common global double 0.000000e+00, align 8
 @g2 = common global double 0.000000e+00, align 8
 
 @g1 = common global double 0.000000e+00, align 8
 @g2 = common global double 0.000000e+00, align 8

diff --git a/test/CodeGen/Mips/select.ll b/test/CodeGen/Mips/select.ll
index 3ea4c4b2e33b63e54ac2769f26904aa7b60f3906..623c2a3e556465b36eefd1576ae88608270edf11 100644 (file)
--- a/test/CodeGen/Mips/select.ll
+++ b/test/CodeGen/Mips/select.ll
@@ -1,5 +1,5 @@
 ; RUN: llc  < %s -march=mipsel -mcpu=4ke | FileCheck %s -check-prefix=CHECK-MIPS32R2
 ; RUN: llc  < %s -march=mipsel -mcpu=4ke | FileCheck %s -check-prefix=CHECK-MIPS32R2

-; RUN: llc  < %s -march=mipsel | FileCheck %s -check-prefix=CHECK-MIPS1
+; RUN: llc  < %s -march=mipsel -mcpu=mips1 | FileCheck %s -check-prefix=CHECK-MIPS1

 
 @d2 = external global double
 @d3 = external global double
 
 @d2 = external global double
 @d3 = external global double