[mips] Add Triple::getABIVariant() to form a triple variant accordingly to the ABI

[atanasyan]

Summary

LLVM tools like llc and llvm-mc accept (via command line arguments) both target triple / architecture's name and ABI's name. To merge this information and form a new target triple this change introduces new Triple class member function getABIVariant(). This routine changes a target triple accordingly to the provided ABI's name. For example, accepting mips-linux-gnu as a target triple and n32 as an ABI's name it forms mips64-linux-gnuabin32.

This patch depends on D38799.

[atanasyan]

Ping?

[rengolin]

include/llvm/ADT/Triple.h

750

If this is Mips specific it should bear the name, like the ARM stuff.

include/llvm/ADT/Triple.h

public:
   llvm::Triple getLittleEndianArchVariant() const;
 
   /// Get the (LLVM) name of the minimum ARM CPU for the arch we are targeting.
   ///
   /// \param Arch the architecture name (e.g., "armv7s"). If it is an empty
   /// string then the triple's arch name is used.
   StringRef getARMCPUForArch(StringRef Arch = StringRef()) const;
 
+  /// Form a triple variant with provided ABI.
+  ///
+  /// \param ABIName the name of ABI (e.g., "o32", "n32" etc).
+  llvm::Triple getABIVariant(StringRef ABIName) const;
+
   /// Tests whether the target triple is little endian.
   ///
   /// \returns true if the triple is little endian, false otherwise.
   bool isLittleEndian() const;
 
   /// Test whether target triples are compatible.
   bool isCompatibleWith(const Triple &Other) const;
 

lib/Support/Triple.cpp

default:
     default:
       return "arm7tdmi";
     }
   }
 
   llvm_unreachable("invalid arch name");
 }
 
+llvm::Triple Triple::getABIVariant(StringRef ABIName) const {
+  if (ABIName.empty())
+    return *this;
+
+  switch (getArch()) {
+  default:
+    return *this;
+  case mips:
+  case mipsel:
+  case mips64:
+  case mips64el: {
+    Triple T;
+    StringRef EnvironmentTypeName = getEnvironmentTypeName(getEnvironment());
+    if (ABIName == "o32") {
+      T = get32BitArchVariant();
+      T.setEnvironmentName(EnvironmentTypeName);
+    } else if (ABIName == "n32") {
+      T = get64BitArchVariant();
+      T.setEnvironmentName((EnvironmentTypeName + "abin32").str());
+    } else if (ABIName == "n64") {
+      T = get64BitArchVariant();
+      T.setEnvironmentName((EnvironmentTypeName + "abi64").str());
+    } else {
+      T = *this;
+      T.setEnvironment(UnknownEnvironment);
+    }
+    return T;
+  }
+  }
+}
+
 Triple::MipsABI Triple::getMipsABI() const {
   if (getEnvironmentName().endswith("abin32"))
     return N32;
   if (getEnvironmentName().endswith("abi64"))
     return N64;
   switch (getArch()) {
   case mips:
   case mipsel:
     return O32;
   case mips64:
   case mips64el:
     return N64;
   default:
     llvm_unreachable("non-MIPS arch name");
   }
 }

test/CodeGen/Mips/compactbranches/no-beqzc-bnezc.ll

if.then:
     ret i64 1
 
   if.end:
     ret i64 0
 }
 
 define i32 @f6(i32 %a) {
 ; CHECK-LABEL: f6:
-; CHECK: beqzc ${{[0-9]+}}, $BB
+; CHECK: beqzc ${{[0-9]+}}, {{\$|\.L}}BB
 
   %cmp = icmp eq i32 %a, 0
   br i1 %cmp, label %if.then, label %if.end
 
   if.then:
     ret i32 1
 
   if.end:
     ret i32 0
 }
 
 define i32 @f7(i32 %a) {
 ; CHECK-LABEL: f7:
-; CHECK: bnezc ${{[0-9]+}}, $BB
+; CHECK: bnezc ${{[0-9]+}}, {{\$|\.L}}BB
 
   %cmp = icmp eq i32 0, %a
   br i1 %cmp, label %if.then, label %if.end
 
   if.then:
     ret i32 1
 
   if.end:
     ret i32 0
 }

test/MC/Mips/expansion-jal-sym-pic.s

 # O32: addiu  $25, $25, %lo($tmp0)    # encoding: [0x27,0x39,A,A]
 # O32:                                #   fixup A - offset: 0, value: %lo($tmp0), kind:   fixup_Mips_LO16
 
 # ELF-O32:      8f 99 00 00 lw $25, 0($gp)
 # ELF-O32-NEXT:                 R_MIPS_GOT16 .text
 # ELF-O32-NEXT: 27 39 00 58   addiu $25, $25, 88
 # ELF-O32-NEXT:                 R_MIPS_LO16 .text
 
-# N32: lw  $25, %got_disp($tmp0)($gp) # encoding: [0x8f,0x99,A,A]
-# N32:                                #   fixup A - offset: 0, value: %got_disp($tmp0), kind:   fixup_Mips_GOT_DISP
+# N32: lw  $25, %got_disp(.Ltmp0)($gp) # encoding: [0x8f,0x99,A,A]
+# N32:                                 #   fixup A - offset: 0, value: %got_disp(.Ltmp0), kind:   fixup_Mips_GOT_DISP
 
 # ELF-N32:      8f 99 00 00 lw $25, 0($gp)
 # ELF-N32-NEXT:                 R_MIPS_GOT_DISP .Ltmp0
 
 # N64: ld  $25, %got_disp(.Ltmp0)($gp) # encoding: [0xdf,0x99,A,A]
 # N64:                                 #   fixup A - offset: 0, value: %got_disp(.Ltmp0), kind:   fixup_Mips_GOT_DISP
 
 # ELF-N64:      df 99 00 00 ld $25, 0($gp)

test/MC/Mips/macro-li.d.s

 
 li.d  $4, 0.0
 # O32:     addiu   $4, $zero, 0                # encoding: [0x00,0x00,0x04,0x24]
 # O32:     addiu   $5, $zero, 0                # encoding: [0x00,0x00,0x05,0x24]
 # N32-N64: daddiu  $4, $zero, 0                # encoding: [0x00,0x00,0x04,0x64]
 
 li.d  $4, 1.12345
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1072822694
 # ALL:  .4byte  3037400872
 # ALL:  .text
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # O32-N32-NO-PIC:  addiu   $1, $1, %lo([[LABEL]])     # encoding: [A,A,0x21,0x24]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]

 # O32:   addiu   $5, $zero, 0                # encoding: [0x00,0x00,0x05,0x24]
 
 li.d  $4, 1.0
 # ALL:   lui     $4, 16368                   # encoding: [0xf0,0x3f,0x04,0x3c]
 # O32:   addiu   $5, $zero, 0                # encoding: [0x00,0x00,0x05,0x24]
 
 li.d  $4, 12345678910
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1107754720
 # ALL:  .4byte  3790602240
 # ALL:  .text
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # O32-N32-NO-PIC:  addiu   $1, $1, %lo([[LABEL]])     # encoding: [A,A,0x21,0x24]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]

 # N64-PIC:         daddiu  $1, $1, %lo([[LABEL]])     # encoding: [A,A,0x21,0x64]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 # O32:             lw      $4, 0($1)                  # encoding: [0x00,0x00,0x24,0x8c]
 # O32:             lw      $5, 4($1)                  # encoding: [0x04,0x00,0x25,0x8c]
 # N32-N64:         ld      $4, 0($1)                  # encoding: [0x00,0x00,0x24,0xdc]
 
 li.d  $4, 12345678910.0
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1107754720
 # ALL:  .4byte  3790602240
 # ALL:  .text
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # O32-N32-NO-PIC:  addiu   $1, $1, %lo([[LABEL]])     # encoding: [A,A,0x21,0x24]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]

 # N64-PIC:         daddiu  $1, $1, %lo([[LABEL]])     # encoding: [A,A,0x21,0x64]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 # O32:             lw      $4, 0($1)                  # encoding: [0x00,0x00,0x24,0x8c]
 # O32:             lw      $5, 4($1)                  # encoding: [0x04,0x00,0x25,0x8c]
 # N32-N64:         ld      $4, 0($1)                  # encoding: [0x00,0x00,0x24,0xdc]
 
 li.d  $4, 0.4
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1071225241
 # ALL:  .4byte  2576980378
 # ALL:  .text
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # O32-N32-NO-PIC:  addiu   $1, $1, %lo([[LABEL]])     # encoding: [A,A,0x21,0x24]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]

 # N32-N64:         ld      $4, 0($1)                  # encoding: [0x00,0x00,0x24,0xdc]
 
 li.d  $4, 1.5
 # ALL:  lui     $4, 16376               # encoding: [0xf8,0x3f,0x04,0x3c]
 # O32:  addiu   $5, $zero, 0            # encoding: [0x00,0x00,0x05,0x24]
 
 li.d  $4, 12345678910.12345678910
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1107754720
 # ALL:  .4byte  3790666967
 # ALL:  .text
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # O32-N32-NO-PIC:  addiu   $1, $1, %lo([[LABEL]])     # encoding: [A,A,0x21,0x24]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]

 # N64-PIC:                                            #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 # O32:             lw      $4, 0($1)                  # encoding: [0x00,0x00,0x24,0x8c]
 # O32:             lw      $5, 4($1)                  # encoding: [0x04,0x00,0x25,0x8c]
 # N32-N64:         ld      $4, 0($1)                  # encoding: [0x00,0x00,0x24,0xdc]
 
 
 li.d  $4, 12345678910123456789.12345678910
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1139108501
 # ALL:  .4byte  836738583
 # ALL:  .text
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # O32-N32-NO-PIC:  addiu   $1, $1, %lo([[LABEL]])     # encoding: [A,A,0x21,0x24]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]

 # CHECK-MIPS32r2: addiu   $1, $zero, 0       # encoding: [0x00,0x00,0x01,0x24]
 # CHECK-MIPS32r2: mtc1    $zero, $f4         # encoding: [0x00,0x20,0x80,0x44]
 # CHECK-MIPS32r2: mthc1   $1, $f4            # encoding: [0x00,0x20,0xe1,0x44]
 # N32-N64:        addiu   $1, $zero, 0       # encoding: [0x00,0x00,0x01,0x24]
 # N32-N64:        dmtc1   $1, $f4            # encoding: [0x00,0x20,0xa1,0x44]
 
 li.d  $f4, 1.12345
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1072822694
 # ALL:  .4byte  3037400872
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]

 # CHECK-MIPS32r2: lui     $1, 16368          # encoding: [0xf0,0x3f,0x01,0x3c]
 # CHECK-MIPS32r2: mtc1    $zero, $f4         # encoding: [0x00,0x20,0x80,0x44]
 # CHECK-MIPS32r2: mthc1   $1, $f4            # encoding: [0x00,0x20,0xe1,0x44]
 # N32-N64:        lui     $1, 16368          # encoding: [0xf0,0x3f,0x01,0x3c]
 # N32-N64:        dmtc1   $1, $f4            # encoding: [0x00,0x20,0xa1,0x44]
 
 li.d  $f4, 12345678910
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1107754720
 # ALL:  .4byte  3790602240
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %highest([[LABEL]]), kind: fixup_Mips_HIGHEST
 # N64-NO-PIC:      daddiu  $1, $1, %higher([[LABEL]]) # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %higher([[LABEL]]), kind: fixup_Mips_HIGHER
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # N64-NO-PIC:      daddiu  $1, $1, %hi([[LABEL]])     # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # ALL:             ldc1    $f4, %lo([[LABEL]])($1)    # encoding: [A,A,0x24,0xd4]
 # ALL:                                                #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 
 li.d  $f4, 12345678910.0
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1107754720
 # ALL:  .4byte  3790602240
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %highest([[LABEL]]), kind: fixup_Mips_HIGHEST
 # N64-NO-PIC:      daddiu  $1, $1, %higher([[LABEL]]) # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %higher([[LABEL]]), kind: fixup_Mips_HIGHER
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # N64-NO-PIC:      daddiu  $1, $1, %hi([[LABEL]])     # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # ALL:             ldc1    $f4, %lo([[LABEL]])($1)    # encoding: [A,A,0x24,0xd4]
 # ALL:                                                #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 
 li.d  $f4, 0.4
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1071225241
 # ALL:  .4byte  2576980378
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]

 # CHECK-MIPS32r2: lui     $1, 16388          # encoding: [0x04,0x40,0x01,0x3c]
 # CHECK-MIPS32r2: mtc1    $zero, $f4         # encoding: [0x00,0x20,0x80,0x44]
 # CHECK-MIPS32r2: mthc1   $1, $f4            # encoding: [0x00,0x20,0xe1,0x44]
 # N32-N64:        lui     $1, 16388          # encoding: [0x04,0x40,0x01,0x3c]
 # N32-N64:        dmtc1   $1, $f4            # encoding: [0x00,0x20,0xa1,0x44]
 
 li.d  $f4, 2.515625
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1074012160
 # ALL:  .4byte  0
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %highest([[LABEL]]), kind: fixup_Mips_HIGHEST
 # N64-NO-PIC:      daddiu  $1, $1, %higher([[LABEL]]) # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %higher([[LABEL]]), kind: fixup_Mips_HIGHER
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # N64-NO-PIC:      daddiu  $1, $1, %hi([[LABEL]])     # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # ALL:             ldc1    $f4, %lo([[LABEL]])($1)    # encoding: [A,A,0x24,0xd4]
 # ALL:                                                #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 
 li.d  $f4, 12345678910.12345678910
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1107754720
 # ALL:  .4byte  3790666967
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %highest([[LABEL]]), kind: fixup_Mips_HIGHEST
 # N64-NO-PIC:      daddiu  $1, $1, %higher([[LABEL]]) # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %higher([[LABEL]]), kind: fixup_Mips_HIGHER
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # N64-NO-PIC:      daddiu  $1, $1, %hi([[LABEL]])     # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # ALL:             ldc1    $f4, %lo([[LABEL]])($1)    # encoding: [A,A,0x24,0xd4]
 # ALL:                                                #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 
 li.d  $f4, 12345678910123456789.12345678910
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:   [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1139108501
 # ALL:  .4byte  836738583
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]

test/MC/Mips/macro-li.s.s

 # ALL:   mtc1    $1, $f4                     # encoding: [0x00,0x20,0x81,0x44]
 
 li.s  $f4, 0.0
 # ALL:   addiu   $1, $zero, 0                # encoding: [0x00,0x00,0x01,0x24]
 # ALL:   mtc1    $1, $f4                     # encoding: [0x00,0x20,0x81,0x44]
 
 li.s  $f4, 1.12345
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1066388790
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT

 # ALL:   mtc1    $1, $f4                     # encoding: [0x00,0x20,0x81,0x44]
 
 li.s  $f4, 1.0
 # ALL:   lui     $1, 16256                   # encoding: [0x80,0x3f,0x01,0x3c]
 # ALL:   mtc1    $1, $f4                     # encoding: [0x00,0x20,0x81,0x44]
 
 li.s  $f4, 12345678910
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1345844999
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %highest([[LABEL]]), kind: fixup_Mips_HIGHEST
 # N64-NO-PIC:      daddiu  $1, $1, %higher([[LABEL]]) # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %higher([[LABEL]]), kind: fixup_Mips_HIGHER
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # N64-NO-PIC:      daddiu  $1, $1, %hi([[LABEL]])     # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # ALL:             lwc1    $f4, %lo([[LABEL]])($1)    # encoding: [A,A,0x24,0xc4]
 # ALL:                                                #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 
 li.s  $f4, 12345678910.0
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1345844999
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %highest([[LABEL]]), kind: fixup_Mips_HIGHEST
 # N64-NO-PIC:      daddiu  $1, $1, %higher([[LABEL]]) # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %higher([[LABEL]]), kind: fixup_Mips_HIGHER
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # N64-NO-PIC:      daddiu  $1, $1, %hi([[LABEL]])     # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # ALL:             lwc1    $f4, %lo([[LABEL]])($1)    # encoding: [A,A,0x24,0xc4]
 # ALL:                                                #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 
 
 li.s  $f4, 0.4
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1053609165
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT

 # ALL:                                                #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 
 li.s  $f4, 1.5
 # ALL:   lui     $1, 16320                   # encoding: [0xc0,0x3f,0x01,0x3c]
 # ALL:   mtc1    $1, $f4                     # encoding: [0x00,0x20,0x81,0x44]
 
 li.s  $f4, 12345678910.12345678910
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1345844999
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # N64-NO-PIC:      lui     $1, %highest([[LABEL]])    # encoding: [A,A,0x01,0x3c]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %highest([[LABEL]]), kind: fixup_Mips_HIGHEST
 # N64-NO-PIC:      daddiu  $1, $1, %higher([[LABEL]]) # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %higher([[LABEL]]), kind: fixup_Mips_HIGHER
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # N64-NO-PIC:      daddiu  $1, $1, %hi([[LABEL]])     # encoding: [A,A,0x21,0x64]
 # N64-NO-PIC:                                         #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-NO-PIC:      dsll    $1, $1, 16                 # encoding: [0x38,0x0c,0x01,0x00]
 # ALL:             lwc1    $f4, %lo([[LABEL]])($1)    # encoding: [A,A,0x24,0xc4]
 # ALL:                                                #   fixup A - offset: 0, value: %lo([[LABEL]]), kind: fixup_Mips_LO16
 
 li.s  $f4, 12345678910123456789.12345678910
 # ALL:  .section  .rodata,"a",@progbits
-# ALL:  [[LABEL:\$tmp[0-9]+]]:
+# ALL:  [[LABEL:(\$|\.L)tmp[0-9]+]]:
 # ALL:  .4byte  1596675242
 # ALL:  .text
 # O32-N32-PIC:     lw      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0x8f]
 # O32-N32-PIC:                                        #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT
 # O32-N32-NO-PIC:  lui     $1, %hi([[LABEL]])         # encoding: [A,A,0x01,0x3c]
 # O32-N32-NO-PIC:                                     #   fixup A - offset: 0, value: %hi([[LABEL]]), kind: fixup_Mips_HI16
 # N64-PIC:         ld      $1, %got([[LABEL]])($gp)   # encoding: [A,A,0x81,0xdf]
 # N64-PIC:                                            #   fixup A - offset: 0, value: %got([[LABEL]]), kind: fixup_Mips_GOT

tools/llc/llc.cpp

static int compileModule(char **argv, LLVMContext &Context) {
   std::string Error;
   const Target *TheTarget = TargetRegistry::lookupTarget(MArch, TheTriple,
                                                          Error);
   if (!TheTarget) {
     errs() << argv[0] << ": " << Error;
     return 1;
   }
 
+  TheTriple = TheTriple.getABIVariant(ABIName);
+
   std::string CPUStr = getCPUStr(), FeaturesStr = getFeaturesStr();
 
   CodeGenOpt::Level OLvl = CodeGenOpt::Default;
   switch (OptLevel) {
   default:
     errs() << argv[0] << ": invalid optimization level.\n";
     return 1;
   case ' ': break;

tools/llvm-mc/llvm-mc.cpp

static const Target *GetTarget(const char *ProgName) {
   std::string Error;
   const Target *TheTarget = TargetRegistry::lookupTarget(ArchName, TheTriple,
                                                          Error);
   if (!TheTarget) {
     errs() << ProgName << ": " << Error;
     return nullptr;
   }
 
+  TheTriple = TheTriple.getABIVariant(ABIName);
+
   // Update the triple name and return the found target.
   TripleName = TheTriple.getTriple();
   return TheTarget;
 }
 
 static std::unique_ptr<ToolOutputFile> GetOutputStream() {
   if (OutputFilename == "")
     OutputFilename = "-";

unittests/ADT/TripleTest.cpp

TEST(TripleTest, ParseMipsABI) {
 
   T = Triple("mips64-unknown-linux-gnuabi64");
   EXPECT_EQ(Triple::mips64, T.getArch());
   EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
   EXPECT_EQ(Triple::Linux, T.getOS());
   EXPECT_EQ(Triple::GNU, T.getEnvironment());
   EXPECT_EQ(Triple::N64, T.getMipsABI());
 }
+
+TEST(TripleTest, ABIVariant) {
+  Triple T = Triple("mips-img-linux").getABIVariant("");;
+  EXPECT_EQ(Triple::mips, T.getArch());
+  EXPECT_EQ(Triple::ImaginationTechnologies, T.getVendor());
+  EXPECT_EQ(Triple::Linux, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+  EXPECT_EQ(Triple::O32, T.getMipsABI());
+
+  T = Triple("mips-img-linux").getABIVariant("o32");
+  EXPECT_EQ(Triple::mips, T.getArch());
+  EXPECT_EQ(Triple::ImaginationTechnologies, T.getVendor());
+  EXPECT_EQ(Triple::Linux, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+  EXPECT_EQ(Triple::O32, T.getMipsABI());
+
+  T = Triple("mips-img-linux").getABIVariant("n32");
+  EXPECT_EQ(Triple::mips64, T.getArch());
+  EXPECT_EQ(Triple::ImaginationTechnologies, T.getVendor());
+  EXPECT_EQ(Triple::Linux, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+  EXPECT_EQ(Triple::N32, T.getMipsABI());
+
+  T = Triple("mips-img-linux").getABIVariant("n64");
+  EXPECT_EQ(Triple::mips64, T.getArch());
+  EXPECT_EQ(Triple::ImaginationTechnologies, T.getVendor());
+  EXPECT_EQ(Triple::Linux, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+  EXPECT_EQ(Triple::N64, T.getMipsABI());
+
+  T = Triple("mips64-img-linux").getABIVariant("o32");
+  EXPECT_EQ(Triple::mips, T.getArch());
+  EXPECT_EQ(Triple::ImaginationTechnologies, T.getVendor());
+  EXPECT_EQ(Triple::Linux, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+  EXPECT_EQ(Triple::O32, T.getMipsABI());
+
+  T = Triple("mips64-img-linux-gnuabin32").getABIVariant("o32");
+  EXPECT_EQ(Triple::mips, T.getArch());
+  EXPECT_EQ(Triple::ImaginationTechnologies, T.getVendor());
+  EXPECT_EQ(Triple::Linux, T.getOS());
+  EXPECT_EQ(Triple::GNU, T.getEnvironment());
+  EXPECT_EQ(Triple::O32, T.getMipsABI());
+
+  T = Triple("mips64-img-linux-gnuabin32").getABIVariant("n64");
+  EXPECT_EQ(Triple::mips64, T.getArch());
+  EXPECT_EQ(Triple::ImaginationTechnologies, T.getVendor());
+  EXPECT_EQ(Triple::Linux, T.getOS());
+  EXPECT_EQ(Triple::GNU, T.getEnvironment());
+  EXPECT_EQ(Triple::N64, T.getMipsABI());
+}
 } // end anonymous namespace