This is an archive of the discontinued LLVM Phabricator instance.

Differential D3275

[mips] Switch the MIPS-III and MIPS-IV assembler tests to use -mcpu=mips4.
ClosedPublic

Authored by dsanders on Apr 3 2014, 5:43 AM.

Details

Reviewers
matheusalmeida
Commits
rGca275d2a142f: [mips] Switch the MIPS-III and MIPS-IV assembler tests to use -mcpu=mips4.
rL205964: [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

Diff Detail

Event Timeline

matheusalmeida accepted this revision.Apr 3 2014, 6:40 AM

LGTM.

dsanders closed this revision.Apr 10 2014, 6:23 AM

Revision Contents

PathSize
lib/
Target/
Mips/
4 lines
test/
MC/
Mips/
mips3/
4 lines
6 lines
mips4/
3 lines
3 lines

Diff 8336

lib/Target/Mips/Mips.td

Show First 20 Lines • Show All 48 Lines • ▼ Show 20 Lines
def FeatureSEInReg : SubtargetFeature<"seinreg", "HasSEInReg", "true", def FeatureSEInReg : SubtargetFeature<"seinreg", "HasSEInReg", "true",
"Enable 'signext in register' instructions.">; "Enable 'signext in register' instructions.">;
def FeatureCondMov : SubtargetFeature<"condmov", "HasCondMov", "true", def FeatureCondMov : SubtargetFeature<"condmov", "HasCondMov", "true",
"Enable 'conditional move' instructions.">; "Enable 'conditional move' instructions.">;
def FeatureSwap : SubtargetFeature<"swap", "HasSwap", "true", def FeatureSwap : SubtargetFeature<"swap", "HasSwap", "true",
"Enable 'byte/half swap' instructions.">; "Enable 'byte/half swap' instructions.">;
def FeatureBitCount : SubtargetFeature<"bitcount", "HasBitCount", "true", def FeatureBitCount : SubtargetFeature<"bitcount", "HasBitCount", "true",
"Enable 'count leading bits' instructions.">; "Enable 'count leading bits' instructions.">;
def FeatureFPIdx : SubtargetFeature<"FPIdx", "HasFPIdx", "true", def FeatureFPIdx : SubtargetFeature<"fpidx", "HasFPIdx", "true",
"Enable 'FP indexed load/store' instructions.">; "Enable 'FP indexed load/store' instructions.">;
def FeatureMips32 : SubtargetFeature<"mips32", "MipsArchVersion", "Mips32", def FeatureMips32 : SubtargetFeature<"mips32", "MipsArchVersion", "Mips32",
"Mips32 ISA Support", "Mips32 ISA Support",
[FeatureCondMov, FeatureBitCount]>; [FeatureCondMov, FeatureBitCount]>;
def FeatureMips32r2 : SubtargetFeature<"mips32r2", "MipsArchVersion", def FeatureMips32r2 : SubtargetFeature<"mips32r2", "MipsArchVersion",
"Mips32r2", "Mips32r2 ISA Support", "Mips32r2", "Mips32r2 ISA Support",
[FeatureMips32, FeatureSEInReg, FeatureSwap, [FeatureMips32, FeatureSEInReg, FeatureSwap,
FeatureFPIdx]>; FeatureFPIdx]>;
def FeatureMips4 : SubtargetFeature<"mips4", "MipsArchVersion", def FeatureMips4 : SubtargetFeature<"mips4", "MipsArchVersion",
"Mips4", "MIPS IV ISA Support", "Mips4", "MIPS IV ISA Support",
[FeatureGP64Bit, FeatureFP64Bit, [FeatureGP64Bit, FeatureFP64Bit, FeatureFPIdx,
FeatureCondMov]>; FeatureCondMov]>;
def FeatureMips64 : SubtargetFeature<"mips64", "MipsArchVersion", def FeatureMips64 : SubtargetFeature<"mips64", "MipsArchVersion",
"Mips64", "Mips64 ISA Support", "Mips64", "Mips64 ISA Support",
[FeatureMips4, FeatureMips32, FeatureFPIdx]>; [FeatureMips4, FeatureMips32, FeatureFPIdx]>;
def FeatureMips64r2 : SubtargetFeature<"mips64r2", "MipsArchVersion", def FeatureMips64r2 : SubtargetFeature<"mips64r2", "MipsArchVersion",
"Mips64r2", "Mips64r2 ISA Support", "Mips64r2", "Mips64r2 ISA Support",
[FeatureMips64, FeatureMips32r2]>; [FeatureMips64, FeatureMips32r2]>;
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines

test/MC/Mips/mips3/valid-xfail.s

# Instructions that should be valid but currently fail for known reasons (e.g. # Instructions that should be valid but currently fail for known reasons (e.g.
# they aren't implemented yet). # they aren't implemented yet).
# This test is set up to XPASS if any instruction generates an encoding. # This test is set up to XPASS if any instruction generates an encoding.
# #
# FIXME: Test MIPS-III instead of MIPS64 # FIXME: Test MIPS-III instead of MIPS-IV
# RUN: not llvm-mc %s -triple=mips-unknown-linux -show-encoding -mcpu=mips64 | not FileCheck %s # RUN: not llvm-mc %s -triple=mips-unknown-linux -show-encoding -mcpu=mips4 | not FileCheck %s
# CHECK-NOT: encoding # CHECK-NOT: encoding
# XFAIL: * # XFAIL: *
.set noat .set noat
lwc3 $10,-32265($k0) lwc3 $10,-32265($k0)
tlbp tlbp
tlbr tlbr
tlbwi tlbwi
tlbwr tlbwr

test/MC/Mips/mips3/valid.s

# Instructions that are valid # Instructions that are valid
# #
# FIXME: Test MIPS-III instead of MIPS64 # FIXME: Test MIPS-III instead of MIPS-IV
# 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 .set noat
abs.d $f7,$f25 # CHECK:encoding abs.d $f7,$f25 # CHECK: encoding
abs.s $f9,$f16 abs.s $f9,$f16
add $s7,$s2,$a1 add $s7,$s2,$a1
add.d $f1,$f7,$f29 add.d $f1,$f7,$f29
add.s $f8,$f21,$f24 add.s $f8,$f21,$f24
addi $t5,$t1,26322 addi $t5,$t1,26322
addu $t1,$a0,$a2 addu $t1,$a0,$a2
and $s7,$v0,$t4 and $s7,$v0,$t4
c.ngl.d $f29,$f29 c.ngl.d $f29,$f29
▲ Show 20 Lines • Show All 130 Lines • Show Last 20 Lines

test/MC/Mips/mips4/valid-xfail.s

# Instructions that should be valid but currently fail for known reasons (e.g. # Instructions that should be valid but currently fail for known reasons (e.g.
# they aren't implemented yet). # they aren't implemented yet).
# This test is set up to XPASS if any instruction generates an encoding. # 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=mips4 | not FileCheck %s
# RUN: not llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64 | not FileCheck %s
# CHECK-NOT: encoding # CHECK-NOT: encoding
# XFAIL: * # XFAIL: *
.set noat .set noat
c.eq.d $fcc1,$f15,$f15 c.eq.d $fcc1,$f15,$f15
c.eq.s $fcc5,$f24,$f17 c.eq.s $fcc5,$f24,$f17
c.f.d $fcc4,$f11,$f21 c.f.d $fcc4,$f11,$f21
c.f.s $fcc4,$f30,$f7 c.f.s $fcc4,$f30,$f7
Show All 40 Lines

test/MC/Mips/mips4/valid.s

# Instructions that are valid # Instructions that are valid
# #
# FIXME: Test MIPS-IV instead of MIPS64 # RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips4 | FileCheck %s
# RUN: llvm-mc %s -triple=mips64-unknown-linux -show-encoding -mcpu=mips64 | FileCheck %s
.set noat .set noat
abs.d $f7,$f25 # CHECK: encoding abs.d $f7,$f25 # CHECK: encoding
abs.s $f9,$f16 abs.s $f9,$f16
add $s7,$s2,$a1 add $s7,$s2,$a1
add.d $f1,$f7,$f29 add.d $f1,$f7,$f29
add.s $f8,$f21,$f24 add.s $f8,$f21,$f24
addi $t5,$t1,26322 addi $t5,$t1,26322
▲ Show 20 Lines • Show All 149 Lines • Show Last 20 Lines