[mips] [IAS] Merge the micromips-expressions.s test into expr1.s. NFC.

Summary: Also did some minor reformatting in the resulting test.

Reviewers: dsanders

Reviewed By: dsanders

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D9702

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

diff --git a/test/MC/Mips/expr1.s b/test/MC/Mips/expr1.s
index 67664c1a2ae4033ef8753e6e47e5da91361dea5e..7959315a809a7b649cc53ce4196c093c3125ea6d 100644 (file)
--- a/test/MC/Mips/expr1.s
+++ b/test/MC/Mips/expr1.s
@@ -1,18 +1,36 @@
-# RUN: llvm-mc  %s -triple=mipsel-unknown-linux -show-encoding -mcpu=mips32r2 | FileCheck %s
+# RUN: llvm-mc  %s -triple=mipsel-unknown-linux -mcpu=mips32r2 -show-encoding | \
+# RUN:   FileCheck %s --check-prefix=32R2-EL
+# RUN: llvm-mc  %s -triple=mipsel-unknown-linux -mcpu=mips32r2 -mattr=micromips -show-encoding | \
+# RUN:   FileCheck %s --check-prefix=MM-32R2-EL
+
 # Check that the assembler can handle the expressions as operands.
-# CHECK:  .text
-# CHECK:  .globl  foo
-# CHECK:  foo:
-# CHECK:  lw   $4, %lo(foo)($4)    # encoding: [A,A,0x84,0x8c]
-# CHECK:                           #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_Mips_LO16
-# CHECK:  lw   $4, 56($4)          # encoding: [0x38,0x00,0x84,0x8c]
-# CHECK:  lw   $4, %lo(foo+8)($4)  # encoding: [0x08'A',A,0x84,0x8c]
-# CHECK:                           #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_Mips_LO16
-# CHECK:  lw   $4, %lo(foo+8)($4)  # encoding: [0x08'A',A,0x84,0x8c]
-# CHECK:                           #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_Mips_LO16
-# CHECK:  lw   $4, %lo(foo+8)($4)  # encoding: [0x08'A',A,0x84,0x8c]
-# CHECK:                           #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_Mips_LO16
-# CHECK:  .space  64
+# 32R2-EL: .text
+# 32R2-EL: .globl  foo
+# 32R2-EL: foo:
+# 32R2-EL: lw   $4, %lo(foo)($4)       # encoding: [A,A,0x84,0x8c]
+# 32R2-EL:                             #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_Mips_LO16
+# 32R2-EL: lw   $4, 56($4)             # encoding: [0x38,0x00,0x84,0x8c]
+# 32R2-EL: lw   $4, %lo(foo+8)($4)     # encoding: [0x08'A',A,0x84,0x8c]
+# 32R2-EL:                             #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_Mips_LO16
+# 32R2-EL: lw   $4, %lo(foo+8)($4)     # encoding: [0x08'A',A,0x84,0x8c]
+# 32R2-EL:                             #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_Mips_LO16
+# 32R2-EL: lw   $4, %lo(foo+8)($4)     # encoding: [0x08'A',A,0x84,0x8c]
+# 32R2-EL:                             #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_Mips_LO16
+# 32R2-EL: .space  64
+
+# MM-32R2-EL: .text
+# MM-32R2-EL: .globl  foo
+# MM-32R2-EL: foo:
+# MM-32R2-EL: lw   $4, %lo(foo)($4)    # encoding: [0x84'A',0xfc'A',0x00,0x00]
+# MM-32R2-EL:                          #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_MICROMIPS_LO16
+# MM-32R2-EL: lw   $4, 56($4)          # encoding: [0x84,0xfc,0x38,0x00]
+# MM-32R2-EL: lw   $4, %lo(foo+8)($4)  # encoding: [0x84'A',0xfc'A',0x08,0x00]
+# MM-32R2-EL:                          #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_MICROMIPS_LO16
+# MM-32R2-EL: lw   $4, %lo(foo+8)($4)  # encoding: [0x84'A',0xfc'A',0x08,0x00]
+# MM-32R2-EL:                          #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_MICROMIPS_LO16
+# MM-32R2-EL: lw   $4, %lo(foo+8)($4)  # encoding: [0x84'A',0xfc'A',0x08,0x00]
+# MM-32R2-EL:                          #   fixup A - offset: 0, value: foo@ABS_LO, kind: fixup_MICROMIPS_LO16
+# MM-32R2-EL: .space  64
 
   .globl  foo
   .ent  foo

diff --git a/test/MC/Mips/micromips-expressions.s b/test/MC/Mips/micromips-expressions.s
deleted file mode 100644 (file)
index 509e980..0000000
--- a/test/MC/Mips/micromips-expressions.s
+++ /dev/null
@@ -1,35 +0,0 @@
-# RUN: llvm-mc  %s -triple=mipsel-unknown-linux -show-encoding \
-# RUN: -mcpu=mips32r2 -mattr=micromips | FileCheck %s
-# Check that the assembler can handle the expressions as operands.
-# CHECK:  .text
-# CHECK:  .globl  foo
-# CHECK:  foo:
-# CHECK:  lw   $4, %lo(foo)($4)    # encoding: [0x84'A',0xfc'A',0x00,0x00]
-# CHECK:                           # fixup A - offset: 0,
-# CHECK:                             value: foo@ABS_LO,
-# CHECK:                             kind: fixup_MICROMIPS_LO16
-# CHECK:  lw   $4, 56($4)          # encoding: [0x84,0xfc,0x38,0x00]
-# CHECK:  lw   $4, %lo(foo+8)($4)  # encoding: [0x84'A',0xfc'A',0x08,0x00]
-# CHECK:                           # fixup A - offset: 0,
-# CHECK:                             value: foo@ABS_LO,
-# CHECK:                             kind: fixup_MICROMIPS_LO16
-# CHECK:  lw   $4, %lo(foo+8)($4)  # encoding: [0x84'A',0xfc'A',0x08,0x00]
-# CHECK:                           # fixup A - offset: 0,
-# CHECK:                             value: foo@ABS_LO,
-# CHECK:                             kind: fixup_MICROMIPS_LO16
-# CHECK:  lw   $4, %lo(foo+8)($4)  # encoding: [0x84'A',0xfc'A',0x08,0x00]
-# CHECK:                           # fixup A - offset: 0,
-# CHECK:                             value: foo@ABS_LO,
-# CHECK:                             kind: fixup_MICROMIPS_LO16
-# CHECK:  .space  64
-
-  .globl  foo
-  .ent  foo
-foo:
-  lw  $4,%lo(foo)($4)
-  lw  $4,((10 + 4) * 4)($4)
-  lw  $4,%lo (2 * 4) + foo($4)
-  lw  $4,%lo((2 * 4) + foo)($4)
-  lw  $4,(((%lo ((2 * 4) + foo))))($4)
-  .space  64
-  .end  foo