[mips] Allowed la instructions on 64-bit architectures.

[s.egerton]

Summary

This required the isSuperOrSubRegisterEq function in order to avoid
depending on the equality operator when comparing registers. This was
added in http://reviews.llvm.org/rL258400

[dsanders]

This change looks correct but it appears to expose a bug. One of the tests in macro-la-64bit.s emits different code to GAS. IAS gives:

2f0:   34068000        li      a2,0x8000
2f4:   00c6302d        daddu   a2,a2,a2

where the li clobbers the third operand of the daddu, whereas GAS emits:

2f0:   34018000        li      at,0x8000
2f4:   0026302d        daddu   a2,at,a2

Could you correct the relevant CHECK lines and fix the bug?

[s.egerton]

Added the -gpsize=0 option to the test cases so that the IAS will emit the same code as GAS.

[dsanders]

Just removing a 3 year old patch from my queue. Feel free to re-add me if this is still needed and you want me to take another look

lib/Target/Mips/AsmParser/MipsAsmParser.cpp

 }
 
 bool MipsAsmParser::expandLoadAddress(unsigned DstReg, unsigned BaseReg,
                                       const MCOperand &Offset,
                                       bool Is32BitAddress, SMLoc IDLoc,
                                       SmallVectorImpl<MCInst> &Instructions) {
   // la can't produce a usable address when addresses are 64-bit.
   if (Is32BitAddress && ABI.ArePtrs64bit()) {
-    // FIXME: Demote this to a warning and continue as if we had 'dla' instead.
-    //        We currently can't do this because we depend on the equality
-    //        operator and N64 can end up with a GPR32/GPR64 mismatch.
-    Error(IDLoc, "la used to load 64-bit address");
+    Warning(IDLoc, "la used to load 64-bit address");
     // Continue as if we had 'dla' instead.
     Is32BitAddress = false;
   }
 
   // dla requires 64-bit addresses.
   if (!Is32BitAddress && !hasMips3()) {
     Error(IDLoc, "instruction requires a 64-bit architecture");
     return true;

test/MC/Mips/macro-la-64bit.s

+# RUN: llvm-mc %s -triple=mips-unknown-linux -show-encoding -mcpu=mips32r2 | \
+# RUN:   FileCheck %s
+# RUN: llvm-mc %s -triple=mips-unknown-linux -show-encoding -mcpu=mips32r6 | \
+# RUN:   FileCheck %s
+
+.set mips64r2
+
+la $5, 0x00000001 # CHECK: addiu $5, $zero, 1      # encoding: [0x24,0x05,0x00,0x01]
+la $5, 0x00000002 # CHECK: addiu $5, $zero, 2      # encoding: [0x24,0x05,0x00,0x02]
+la $5, 0x00004000 # CHECK: addiu $5, $zero, 16384  # encoding: [0x24,0x05,0x40,0x00]
+la $5, 0x00008000 # CHECK: ori   $5, $zero, 32768  # encoding: [0x34,0x05,0x80,0x00]
+la $5, 0xffffffff # CHECK: addiu $5, $zero, -1     # encoding: [0x24,0x05,0xff,0xff]
+la $5, 0xfffffffe # CHECK: addiu $5, $zero, -2     # encoding: [0x24,0x05,0xff,0xfe]
+la $5, 0xffffc000 # CHECK: addiu $5, $zero, -16384 # encoding: [0x24,0x05,0xc0,0x00]
+la $5, 0xffff8000 # CHECK: addiu $5, $zero, -32768 # encoding: [0x24,0x05,0x80,0x00]
+
+la $5, 0x00010000 # CHECK: lui $5, 1      # encoding: [0x3c,0x05,0x00,0x01]
+la $5, 0x00020000 # CHECK: lui $5, 2      # encoding: [0x3c,0x05,0x00,0x02]
+la $5, 0x40000000 # CHECK: lui $5, 16384  # encoding: [0x3c,0x05,0x40,0x00]
+la $5, 0x80000000 # CHECK: lui $5, 32768  # encoding: [0x3c,0x05,0x80,0x00]
+la $5, 0xffff0000 # CHECK: lui $5, 65535  # encoding: [0x3c,0x05,0xff,0xff]
+la $5, 0xfffe0000 # CHECK: lui $5, 65534  # encoding: [0x3c,0x05,0xff,0xfe]
+la $5, 0xc0000000 # CHECK: lui $5, 49152  # encoding: [0x3c,0x05,0xc0,0x00]
+la $5, 0x80000000 # CHECK: lui $5, 32768  # encoding: [0x3c,0x05,0x80,0x00]
+
+la $5, 0x00010001 # CHECK: lui $5, 1        # encoding: [0x3c,0x05,0x00,0x01]
+                  # CHECK: ori $5, $5, 1    # encoding: [0x34,0xa5,0x00,0x01]
+la $5, 0x00020001 # CHECK: lui $5, 2        # encoding: [0x3c,0x05,0x00,0x02]
+                  # CHECK: ori $5, $5, 1    # encoding: [0x34,0xa5,0x00,0x01]
+la $5, 0x40000001 # CHECK: lui $5, 16384    # encoding: [0x3c,0x05,0x40,0x00]
+                  # CHECK: ori $5, $5, 1    # encoding: [0x34,0xa5,0x00,0x01]
+la $5, 0x80000001 # CHECK: lui $5, 32768    # encoding: [0x3c,0x05,0x80,0x00]
+                  # CHECK: ori $5, $5, 1    # encoding: [0x34,0xa5,0x00,0x01]
+la $5, 0x00010002 # CHECK: lui $5, 1        # encoding: [0x3c,0x05,0x00,0x01]
+                  # CHECK: ori $5, $5, 2    # encoding: [0x34,0xa5,0x00,0x02]
+la $5, 0x00020002 # CHECK: lui $5, 2        # encoding: [0x3c,0x05,0x00,0x02]
+                  # CHECK: ori $5, $5, 2    # encoding: [0x34,0xa5,0x00,0x02]
+la $5, 0x40000002 # CHECK: lui $5, 16384    # encoding: [0x3c,0x05,0x40,0x00]
+                  # CHECK: ori $5, $5, 2    # encoding: [0x34,0xa5,0x00,0x02]
+la $5, 0x80000002 # CHECK: lui $5, 32768    # encoding: [0x3c,0x05,0x80,0x00]
+                  # CHECK: ori $5, $5, 2    # encoding: [0x34,0xa5,0x00,0x02]
+la $5, 0x00014000 # CHECK: lui $5, 1        # encoding: [0x3c,0x05,0x00,0x01]
+                  # CHECK: ori $5, $5, 16384    # encoding: [0x34,0xa5,0x40,0x00]
+la $5, 0x00024000 # CHECK: lui $5, 2            # encoding: [0x3c,0x05,0x00,0x02]
+                  # CHECK: ori $5, $5, 16384    # encoding: [0x34,0xa5,0x40,0x00]
+la $5, 0x40004000 # CHECK: lui $5, 16384        # encoding: [0x3c,0x05,0x40,0x00]
+                  # CHECK: ori $5, $5, 16384    # encoding: [0x34,0xa5,0x40,0x00]
+la $5, 0x80004000 # CHECK: lui $5, 32768        # encoding: [0x3c,0x05,0x80,0x00]
+                  # CHECK: ori $5, $5, 16384    # encoding: [0x34,0xa5,0x40,0x00]
+la $5, 0x00018000 # CHECK: lui $5, 1            # encoding: [0x3c,0x05,0x00,0x01]
+                  # CHECK: ori $5, $5, 32768    # encoding: [0x34,0xa5,0x80,0x00]
+la $5, 0x00028000 # CHECK: lui $5, 2            # encoding: [0x3c,0x05,0x00,0x02]
+                  # CHECK: ori $5, $5, 32768    # encoding: [0x34,0xa5,0x80,0x00]
+la $5, 0x40008000 # CHECK: lui $5, 16384        # encoding: [0x3c,0x05,0x40,0x00]
+                  # CHECK: ori $5, $5, 32768    # encoding: [0x34,0xa5,0x80,0x00]
+la $5, 0x80008000 # CHECK: lui $5, 32768        # encoding: [0x3c,0x05,0x80,0x00]
+                  # CHECK: ori $5, $5, 32768    # encoding: [0x34,0xa5,0x80,0x00]
+la $5, 0xffff4000 # CHECK: lui $5, 65535        # encoding: [0x3c,0x05,0xff,0xff]
+                  # CHECK: ori $5, $5, 16384    # encoding: [0x34,0xa5,0x40,0x00]
+la $5, 0xfffe8000 # CHECK: lui $5, 65534        # encoding: [0x3c,0x05,0xff,0xfe]
+                  # CHECK: ori $5, $5, 32768    # encoding: [0x34,0xa5,0x80,0x00]
+la $5, 0xc0008000 # CHECK: lui $5, 49152        # encoding: [0x3c,0x05,0xc0,0x00]
+                  # CHECK: ori $5, $5, 32768    # encoding: [0x34,0xa5,0x80,0x00]
+la $5, 0x80008000 # CHECK: lui $5, 32768        # encoding: [0x3c,0x05,0x80,0x00]
+                  # CHECK: ori $5, $5, 32768    # encoding: [0x34,0xa5,0x80,0x00]
+
+la $5, 0x00000001($6) # CHECK: addiu $5, $6, 1         # encoding: [0x24,0xc5,0x00,0x01]
+la $5, 0x00000002($6) # CHECK: addiu $5, $6, 2         # encoding: [0x24,0xc5,0x00,0x02]
+la $5, 0x00004000($6) # CHECK: addiu $5, $6, 16384     # encoding: [0x24,0xc5,0x40,0x00]
+la $5, 0x00008000($6) # CHECK: ori   $5, $zero, 32768  # encoding: [0x34,0x05,0x80,0x00]
+                      # CHECK: addu $5, $5, $6         # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0xffffffff($6) # CHECK: addiu $5, $6, -1        # encoding: [0x24,0xc5,0xff,0xff]
+la $5, 0xfffffffe($6) # CHECK: addiu $5, $6, -2        # encoding: [0x24,0xc5,0xff,0xfe]
+la $5, 0xffffc000($6) # CHECK: addiu $5, $6, -16384    # encoding: [0x24,0xc5,0xc0,0x00]
+la $5, 0xffff8000($6) # CHECK: addiu $5, $6, -32768    # encoding: [0x24,0xc5,0x80,0x00]
+
+la $5, 0x00010000($6) # CHECK: lui $5, 1       # encoding: [0x3c,0x05,0x00,0x01]
+                      # CHECK: addu $5, $5, $6 # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x00020000($6) # CHECK: lui $5, 2       # encoding: [0x3c,0x05,0x00,0x02]
+                      # CHECK: addu $5, $5, $6 # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x40000000($6) # CHECK: lui $5, 16384   # encoding: [0x3c,0x05,0x40,0x00]
+                      # CHECK: addu $5, $5, $6 # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x80000000($6) # CHECK: lui $5, 32768   # encoding: [0x3c,0x05,0x80,0x00]
+                      # CHECK: addu $5, $5, $6 # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0xffff0000($6) # CHECK: lui $5, 65535   # encoding: [0x3c,0x05,0xff,0xff]
+                      # CHECK: addu $5, $5, $6 # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0xfffe0000($6) # CHECK: lui $5, 65534   # encoding: [0x3c,0x05,0xff,0xfe]
+                      # CHECK: addu $5, $5, $6 # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0xc0000000($6) # CHECK: lui $5, 49152   # encoding: [0x3c,0x05,0xc0,0x00]
+                      # CHECK: addu $5, $5, $6 # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x80000000($6) # CHECK: lui $5, 32768   # encoding: [0x3c,0x05,0x80,0x00]
+                      # CHECK: addu $5, $5, $6 # encoding: [0x00,0xa6,0x28,0x21]
+
+la $5, 0x00010001($6) # CHECK: lui $5, 1         # encoding: [0x3c,0x05,0x00,0x01]
+                      # CHECK: ori $5, $5, 1     # encoding: [0x34,0xa5,0x00,0x01]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x00020001($6) # CHECK: lui $5, 2         # encoding: [0x3c,0x05,0x00,0x02]
+                      # CHECK: ori $5, $5, 1     # encoding: [0x34,0xa5,0x00,0x01]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x40000001($6) # CHECK: lui $5, 16384     # encoding: [0x3c,0x05,0x40,0x00]
+                      # CHECK: ori $5, $5, 1     # encoding: [0x34,0xa5,0x00,0x01]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x80000001($6) # CHECK: lui $5, 32768     # encoding: [0x3c,0x05,0x80,0x00]
+                      # CHECK: ori $5, $5, 1     # encoding: [0x34,0xa5,0x00,0x01]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x00010002($6) # CHECK: lui $5, 1         # encoding: [0x3c,0x05,0x00,0x01]
+                      # CHECK: ori $5, $5, 2     # encoding: [0x34,0xa5,0x00,0x02]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x00020002($6) # CHECK: lui $5, 2         # encoding: [0x3c,0x05,0x00,0x02]
+                      # CHECK: ori $5, $5, 2     # encoding: [0x34,0xa5,0x00,0x02]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x40000002($6) # CHECK: lui $5, 16384     # encoding: [0x3c,0x05,0x40,0x00]
+                      # CHECK: ori $5, $5, 2     # encoding: [0x34,0xa5,0x00,0x02]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x80000002($6) # CHECK: lui $5, 32768     # encoding: [0x3c,0x05,0x80,0x00]
+                      # CHECK: ori $5, $5, 2     # encoding: [0x34,0xa5,0x00,0x02]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x00014000($6) # CHECK: lui $5, 1         # encoding: [0x3c,0x05,0x00,0x01]
+                      # CHECK: ori $5, $5, 16384 # encoding: [0x34,0xa5,0x40,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x00024000($6) # CHECK: lui $5, 2         # encoding: [0x3c,0x05,0x00,0x02]
+                      # CHECK: ori $5, $5, 16384 # encoding: [0x34,0xa5,0x40,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x40004000($6) # CHECK: lui $5, 16384     # encoding: [0x3c,0x05,0x40,0x00]
+                      # CHECK: ori $5, $5, 16384 # encoding: [0x34,0xa5,0x40,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x80004000($6) # CHECK: lui $5, 32768     # encoding: [0x3c,0x05,0x80,0x00]
+                      # CHECK: ori $5, $5, 16384 # encoding: [0x34,0xa5,0x40,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x00018000($6) # CHECK: lui $5, 1         # encoding: [0x3c,0x05,0x00,0x01]
+                      # CHECK: ori $5, $5, 32768 # encoding: [0x34,0xa5,0x80,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x00028000($6) # CHECK: lui $5, 2         # encoding: [0x3c,0x05,0x00,0x02]
+                      # CHECK: ori $5, $5, 32768 # encoding: [0x34,0xa5,0x80,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x40008000($6) # CHECK: lui $5, 16384     # encoding: [0x3c,0x05,0x40,0x00]
+                      # CHECK: ori $5, $5, 32768 # encoding: [0x34,0xa5,0x80,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x80008000($6) # CHECK: lui $5, 32768     # encoding: [0x3c,0x05,0x80,0x00]
+                      # CHECK: ori $5, $5, 32768 # encoding: [0x34,0xa5,0x80,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0xffff4000($6) # CHECK: lui $5, 65535     # encoding: [0x3c,0x05,0xff,0xff]
+                      # CHECK: ori $5, $5, 16384 # encoding: [0x34,0xa5,0x40,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0xfffe8000($6) # CHECK: lui $5, 65534     # encoding: [0x3c,0x05,0xff,0xfe]
+                      # CHECK: ori $5, $5, 32768 # encoding: [0x34,0xa5,0x80,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0xc0008000($6) # CHECK: lui $5, 49152     # encoding: [0x3c,0x05,0xc0,0x00]
+                      # CHECK: ori $5, $5, 32768 # encoding: [0x34,0xa5,0x80,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+la $5, 0x80008000($6) # CHECK: lui $5, 32768     # encoding: [0x3c,0x05,0x80,0x00]
+                      # CHECK: ori $5, $5, 32768 # encoding: [0x34,0xa5,0x80,0x00]
+                      # CHECK: addu $5, $5, $6   # encoding: [0x00,0xa6,0x28,0x21]
+
+la $6, 0x00000001($6) # CHECK: addiu $6, $6, 1         # encoding: [0x24,0xc6,0x00,0x01]
+la $6, 0x00000002($6) # CHECK: addiu $6, $6, 2         # encoding: [0x24,0xc6,0x00,0x02]
+la $6, 0x00004000($6) # CHECK: addiu $6, $6, 16384     # encoding: [0x24,0xc6,0x40,0x00]
+la $6, 0x00008000($6) # CHECK: ori   $1, $zero, 32768  # encoding: [0x34,0x01,0x80,0x00]
+                      # CHECK: addu $6, $1, $6         # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0xffffffff($6) # CHECK: addiu $6, $6, -1        # encoding: [0x24,0xc6,0xff,0xff]
+la $6, 0xfffffffe($6) # CHECK: addiu $6, $6, -2        # encoding: [0x24,0xc6,0xff,0xfe]
+la $6, 0xffffc000($6) # CHECK: addiu $6, $6, -16384    # encoding: [0x24,0xc6,0xc0,0x00]
+la $6, 0xffff8000($6) # CHECK: addiu $6, $6, -32768    # encoding: [0x24,0xc6,0x80,0x00]
+
+la $6, 0x00010000($6) # CHECK: lui $1, 1       # encoding: [0x3c,0x01,0x00,0x01]
+                      # CHECK: addu $6, $1, $6 # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x00020000($6) # CHECK: lui $1, 2       # encoding: [0x3c,0x01,0x00,0x02]
+                      # CHECK: addu $6, $1, $6 # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x40000000($6) # CHECK: lui $1, 16384   # encoding: [0x3c,0x01,0x40,0x00]
+                      # CHECK: addu $6, $1, $6 # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x80000000($6) # CHECK: lui $1, 32768   # encoding: [0x3c,0x01,0x80,0x00]
+                      # CHECK: addu $6, $1, $6 # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0xffff0000($6) # CHECK: lui $1, 65535   # encoding: [0x3c,0x01,0xff,0xff]
+                      # CHECK: addu $6, $1, $6 # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0xfffe0000($6) # CHECK: lui $1, 65534   # encoding: [0x3c,0x01,0xff,0xfe]
+                      # CHECK: addu $6, $1, $6 # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0xc0000000($6) # CHECK: lui $1, 49152   # encoding: [0x3c,0x01,0xc0,0x00]
+                      # CHECK: addu $6, $1, $6 # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x80000000($6) # CHECK: lui $1, 32768   # encoding: [0x3c,0x01,0x80,0x00]
+                      # CHECK: addu $6, $1, $6 # encoding: [0x00,0x26,0x30,0x21]
+
+la $6, 0x00010001($6) # CHECK: lui $1, 1         # encoding: [0x3c,0x01,0x00,0x01]
+                      # CHECK: ori $1, $1, 1     # encoding: [0x34,0x21,0x00,0x01]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x00020001($6) # CHECK: lui $1, 2         # encoding: [0x3c,0x01,0x00,0x02]
+                      # CHECK: ori $1, $1, 1     # encoding: [0x34,0x21,0x00,0x01]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x40000001($6) # CHECK: lui $1, 16384     # encoding: [0x3c,0x01,0x40,0x00]
+                      # CHECK: ori $1, $1, 1     # encoding: [0x34,0x21,0x00,0x01]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x80000001($6) # CHECK: lui $1, 32768     # encoding: [0x3c,0x01,0x80,0x00]
+                      # CHECK: ori $1, $1, 1     # encoding: [0x34,0x21,0x00,0x01]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x00010002($6) # CHECK: lui $1, 1         # encoding: [0x3c,0x01,0x00,0x01]
+                      # CHECK: ori $1, $1, 2     # encoding: [0x34,0x21,0x00,0x02]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x00020002($6) # CHECK: lui $1, 2         # encoding: [0x3c,0x01,0x00,0x02]
+                      # CHECK: ori $1, $1, 2     # encoding: [0x34,0x21,0x00,0x02]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x40000002($6) # CHECK: lui $1, 16384     # encoding: [0x3c,0x01,0x40,0x00]
+                      # CHECK: ori $1, $1, 2     # encoding: [0x34,0x21,0x00,0x02]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x80000002($6) # CHECK: lui $1, 32768     # encoding: [0x3c,0x01,0x80,0x00]
+                      # CHECK: ori $1, $1, 2     # encoding: [0x34,0x21,0x00,0x02]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x00014000($6) # CHECK: lui $1, 1         # encoding: [0x3c,0x01,0x00,0x01]
+                      # CHECK: ori $1, $1, 16384 # encoding: [0x34,0x21,0x40,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x00024000($6) # CHECK: lui $1, 2         # encoding: [0x3c,0x01,0x00,0x02]
+                      # CHECK: ori $1, $1, 16384 # encoding: [0x34,0x21,0x40,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x40004000($6) # CHECK: lui $1, 16384     # encoding: [0x3c,0x01,0x40,0x00]
+                      # CHECK: ori $1, $1, 16384 # encoding: [0x34,0x21,0x40,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x80004000($6) # CHECK: lui $1, 32768     # encoding: [0x3c,0x01,0x80,0x00]
+                      # CHECK: ori $1, $1, 16384 # encoding: [0x34,0x21,0x40,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x00018000($6) # CHECK: lui $1, 1         # encoding: [0x3c,0x01,0x00,0x01]
+                      # CHECK: ori $1, $1, 32768 # encoding: [0x34,0x21,0x80,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x00028000($6) # CHECK: lui $1, 2         # encoding: [0x3c,0x01,0x00,0x02]
+                      # CHECK: ori $1, $1, 32768 # encoding: [0x34,0x21,0x80,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x40008000($6) # CHECK: lui $1, 16384     # encoding: [0x3c,0x01,0x40,0x00]
+                      # CHECK: ori $1, $1, 32768 # encoding: [0x34,0x21,0x80,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x80008000($6) # CHECK: lui $1, 32768     # encoding: [0x3c,0x01,0x80,0x00]
+                      # CHECK: ori $1, $1, 32768 # encoding: [0x34,0x21,0x80,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0xffff4000($6) # CHECK: lui $1, 65535     # encoding: [0x3c,0x01,0xff,0xff]
+                      # CHECK: ori $1, $1, 16384 # encoding: [0x34,0x21,0x40,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0xfffe8000($6) # CHECK: lui $1, 65534     # encoding: [0x3c,0x01,0xff,0xfe]
+                      # CHECK: ori $1, $1, 32768 # encoding: [0x34,0x21,0x80,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0xc0008000($6) # CHECK: lui $1, 49152     # encoding: [0x3c,0x01,0xc0,0x00]
+                      # CHECK: ori $1, $1, 32768 # encoding: [0x34,0x21,0x80,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+la $6, 0x80008000($6) # CHECK: lui $1, 32768     # encoding: [0x3c,0x01,0x80,0x00]
+                      # CHECK: ori $1, $1, 32768 # encoding: [0x34,0x21,0x80,0x00]
+                      # CHECK: addu $6, $1, $6   # encoding: [0x00,0x26,0x30,0x21]
+
+symbol:           # CHECK-LABEL: symbol:
+.extern extern_sym
+.option pic0
+
+la $5, extern_sym
+
+# CHECK: lui $5, %hi(extern_sym)         # encoding: [0x3c,0x05,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %hi(extern_sym), kind: fixup_Mips_HI16
+# CHECK: addiu $5, $5, %lo(extern_sym)   # encoding: [0x24,0xa5,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %lo(extern_sym), kind: fixup_Mips_LO16
+
+la $5, extern_sym($8)
+
+# CHECK: lui $5, %hi(extern_sym)         # encoding: [0x3c,0x05,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %hi(extern_sym), kind: fixup_Mips_HI16
+# CHECK: addiu $5, $5, %lo(extern_sym)   # encoding: [0x24,0xa5,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %lo(extern_sym), kind: fixup_Mips_LO16
+# CHECK: addu $5, $5, $8                 # encoding: [0x00,0xa8,0x28,0x21]
+
+la $5, extern_sym($5)
+
+# CHECK: lui $1, %hi(extern_sym)         # encoding: [0x3c,0x01,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %hi(extern_sym), kind: fixup_Mips_HI16
+# CHECK: addiu $1, $1, %lo(extern_sym)   # encoding: [0x24,0x21,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %lo(extern_sym), kind: fixup_Mips_LO16
+# CHECK: addu $5, $1, $5                 # encoding: [0x00,0x25,0x28,0x21]
+
+la $5, extern_sym+8
+
+# CHECK: lui $5, %hi(extern_sym+8)       # encoding: [0x3c,0x05,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %hi(extern_sym+8), kind: fixup_Mips_HI16
+# CHECK: addiu $5, $5, %lo(extern_sym+8) # encoding: [0x24,0xa5,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %lo(extern_sym+8), kind: fixup_Mips_LO16
+
+la $5, extern_sym+8($8)
+
+# CHECK: lui $5, %hi(extern_sym+8)       # encoding: [0x3c,0x05,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %hi(extern_sym+8), kind: fixup_Mips_HI16
+# CHECK: addiu $5, $5, %lo(extern_sym+8) # encoding: [0x24,0xa5,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %lo(extern_sym+8), kind: fixup_Mips_LO16
+# CHECK: addu $5, $5, $8                 # encoding: [0x00,0xa8,0x28,0x21]
+
+la $5, extern_sym-8($5)
+
+# CHECK: lui $1, %hi(extern_sym-8)       # encoding: [0x3c,0x01,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %hi(extern_sym-8), kind: fixup_Mips_HI16
+# CHECK: addiu $1, $1, %lo(extern_sym-8) # encoding: [0x24,0x21,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %lo(extern_sym-8), kind: fixup_Mips_LO16
+# CHECK: addu $5, $1, $5                 # encoding: [0x00,0x25,0x28,0x21]
+
+la $5, extern_sym-8
+
+# CHECK: lui $5, %hi(extern_sym-8)       # encoding: [0x3c,0x05,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %hi(extern_sym-8), kind: fixup_Mips_HI16
+# CHECK: addiu $5, $5, %lo(extern_sym-8) # encoding: [0x24,0xa5,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %lo(extern_sym-8), kind: fixup_Mips_LO16
+
+la $5, extern_sym-8($8)
+
+# CHECK: lui $5, %hi(extern_sym-8)       # encoding: [0x3c,0x05,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %hi(extern_sym-8), kind: fixup_Mips_HI16
+# CHECK: addiu $5, $5, %lo(extern_sym-8) # encoding: [0x24,0xa5,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %lo(extern_sym-8), kind: fixup_Mips_LO16
+# CHECK: addu $5, $5, $8                 # encoding: [0x00,0xa8,0x28,0x21]
+
+la $5, extern_sym-8($5)
+
+# CHECK: lui $1, %hi(extern_sym-8)       # encoding: [0x3c,0x01,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %hi(extern_sym-8), kind: fixup_Mips_HI16
+# CHECK: addiu $1, $1, %lo(extern_sym-8) # encoding: [0x24,0x21,A,A]
+# CHECK:                                 #   fixup A - offset: 0, value: %lo(extern_sym-8), kind: fixup_Mips_LO16
+# CHECK: addu $5, $1, $5                 # encoding: [0x00,0x25,0x28,0x21]
+
+.option pic2

test/MC/Mips/macro-la-bad.s

 # RUN: not llvm-mc %s -arch=mips -mcpu=mips32r2 2>%t1
 # RUN: FileCheck %s < %t1 --check-prefix=O32
 # RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n32 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=N32
-# RUN: not llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 2>&1 | \
+# RUN: llvm-mc %s -arch=mips64 -mcpu=mips64 -target-abi n64 2>&1 | \
 # RUN:   FileCheck %s --check-prefix=N64
 
   .text
   la $5, 0x100000000
   # O32: :[[@LINE-1]]:3: error: instruction requires a 32-bit immediate
   # N32: :[[@LINE-2]]:3: error: instruction requires a 32-bit immediate
-  # N64: :[[@LINE-3]]:3: error: la used to load 64-bit address
+  # N64: :[[@LINE-3]]:3: warning: la used to load 64-bit address
 
   la $5, 0x100000000($6)
   # O32: :[[@LINE-1]]:3: error: instruction requires a 32-bit immediate
   # N32: :[[@LINE-2]]:3: error: instruction requires a 32-bit immediate
-  # N64: :[[@LINE-3]]:3: error: la used to load 64-bit address
+  # N64: :[[@LINE-3]]:3: warning: la used to load 64-bit address
 
-  # FIXME: These should be warnings but we lack la -> dla promotion at the
-  #        moment.
   la $5, symbol
-  # N32-NOT: :[[@LINE-1]]:3: error: la used to load 64-bit address
-  # N64:     :[[@LINE-2]]:3: error: la used to load 64-bit address
+  # N32-NOT: :[[@LINE-1]]:3: warning: la used to load 64-bit address
+  # N64:     :[[@LINE-2]]:3: warning: la used to load 64-bit address