diff options
| author | Daniel Sanders <daniel.sanders@imgtec.com> | 2014-04-10 13:16:49 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2014-04-10 13:16:49 +0000 |
| commit | ca275d2a142f9aa4f375d361bcde6ffda00e182b (patch) | |
| tree | ad984a1e698a43bc349c7139adf62950ed2e37e8 /llvm | |
| parent | 12fbced6e8685debf879803b6f2c1e143b92da61 (diff) | |
| download | bcm5719-llvm-ca275d2a142f9aa4f375d361bcde6ffda00e182b.tar.gz bcm5719-llvm-ca275d2a142f9aa4f375d361bcde6ffda00e182b.zip | |
[mips] Switch the MIPS-III and MIPS-IV assembler tests to use -mcpu=mips4.
Summary:
It is now the smallest superset for these ISA's.
FeatureMips4 now contains FeatureFPIdx since [ls][dw]xc1 were added in MIPS-IV.
Made the FPIdx feature bit lowercase so that it can be used in the -mattr option.
Depends on D3274
Reviewers: matheusalmeida
Reviewed By: matheusalmeida
Differential Revision: http://reviews.llvm.org/D3275
llvm-svn: 205964
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/Mips/Mips.td | 4 | ||||
| -rw-r--r-- | llvm/test/MC/Mips/mips3/valid-xfail.s | 4 | ||||
| -rw-r--r-- | llvm/test/MC/Mips/mips3/valid.s | 6 | ||||
| -rw-r--r-- | llvm/test/MC/Mips/mips4/valid-xfail.s | 3 | ||||
| -rw-r--r-- | llvm/test/MC/Mips/mips4/valid.s | 3 |
5 files changed, 9 insertions, 11 deletions
diff --git a/llvm/lib/Target/Mips/Mips.td b/llvm/lib/Target/Mips/Mips.td index 10a469972f4..7a8198c150d 100644 --- a/llvm/lib/Target/Mips/Mips.td +++ b/llvm/lib/Target/Mips/Mips.td @@ -54,7 +54,7 @@ def FeatureSwap : SubtargetFeature<"swap", "HasSwap", "true", "Enable 'byte/half swap' instructions.">; def FeatureBitCount : SubtargetFeature<"bitcount", "HasBitCount", "true", "Enable 'count leading bits' instructions.">; -def FeatureFPIdx : SubtargetFeature<"FPIdx", "HasFPIdx", "true", +def FeatureFPIdx : SubtargetFeature<"fpidx", "HasFPIdx", "true", "Enable 'FP indexed load/store' instructions.">; def FeatureMips32 : SubtargetFeature<"mips32", "MipsArchVersion", "Mips32", "Mips32 ISA Support", @@ -65,7 +65,7 @@ def FeatureMips32r2 : SubtargetFeature<"mips32r2", "MipsArchVersion", FeatureFPIdx]>; def FeatureMips4 : SubtargetFeature<"mips4", "MipsArchVersion", "Mips4", "MIPS IV ISA Support", - [FeatureGP64Bit, FeatureFP64Bit, + [FeatureGP64Bit, FeatureFP64Bit, FeatureFPIdx, FeatureCondMov]>; def FeatureMips64 : SubtargetFeature<"mips64", "MipsArchVersion", "Mips64", "Mips64 ISA Support", diff --git a/llvm/test/MC/Mips/mips3/valid-xfail.s b/llvm/test/MC/Mips/mips3/valid-xfail.s index 740663e2314..42fa09f20a2 100644 --- a/llvm/test/MC/Mips/mips3/valid-xfail.s +++ b/llvm/test/MC/Mips/mips3/valid-xfail.s @@ -2,8 +2,8 @@ # they aren't implemented yet). # This test is set up to XPASS if any instruction generates an encoding. # -# FIXME: Test MIPS-III instead of MIPS64 -# RUN: not llvm-mc %s -triple=mips-unknown-linux -show-encoding -mcpu=mips64 | not FileCheck %s +# FIXME: Test MIPS-III instead of MIPS-IV +# RUN: not llvm-mc %s -triple=mips-unknown-linux -show-encoding -mcpu=mips4 | not FileCheck %s # CHECK-NOT: encoding # XFAIL: * diff --git a/llvm/test/MC/Mips/mips3/valid.s b/llvm/test/MC/Mips/mips3/valid.s index dc9b48cd399..baa9b7354cc 100644 --- a/llvm/test/MC/Mips/mips3/valid.s +++ b/llvm/test/MC/Mips/mips3/valid.s @@ -1,10 +1,10 @@ # Instructions that are valid # -# FIXME: Test MIPS-III instead of MIPS64 -# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64 | FileCheck %s +# FIXME: Test MIPS-III instead of MIPS-IV +# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips4 | FileCheck %s .set noat - abs.d $f7,$f25 # CHECK:encoding + abs.d $f7,$f25 # CHECK: encoding abs.s $f9,$f16 add $s7,$s2,$a1 add.d $f1,$f7,$f29 diff --git a/llvm/test/MC/Mips/mips4/valid-xfail.s b/llvm/test/MC/Mips/mips4/valid-xfail.s index baf5c53bd6d..9120943dce2 100644 --- a/llvm/test/MC/Mips/mips4/valid-xfail.s +++ b/llvm/test/MC/Mips/mips4/valid-xfail.s @@ -2,8 +2,7 @@ # they aren't implemented yet). # This test is set up to XPASS if any instruction generates an encoding. # -# FIXME: Test MIPS-IV instead of MIPS64 -# RUN: not llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64 | not FileCheck %s +# RUN: not llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips4 | not FileCheck %s # CHECK-NOT: encoding # XFAIL: * diff --git a/llvm/test/MC/Mips/mips4/valid.s b/llvm/test/MC/Mips/mips4/valid.s index 8dc2a239fee..a3d1759e8ec 100644 --- a/llvm/test/MC/Mips/mips4/valid.s +++ b/llvm/test/MC/Mips/mips4/valid.s @@ -1,7 +1,6 @@ # Instructions that are valid # -# FIXME: Test MIPS-IV instead of MIPS64 -# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64 | FileCheck %s +# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips4 | FileCheck %s .set noat abs.d $f7,$f25 # CHECK: encoding |
