[llvm] 3acccf0 - [MC] Don't print () around $ names
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Sun Mar 30 16:38:22 PDT 2025
Author: Fangrui Song
Date: 2025-03-30T16:38:16-07:00
New Revision: 3acccf042ab8a7b7e663bb2b2fac328d9bf65b38
URL: https://github.com/llvm/llvm-project/commit/3acccf042ab8a7b7e663bb2b2fac328d9bf65b38
DIFF: https://github.com/llvm/llvm-project/commit/3acccf042ab8a7b7e663bb2b2fac328d9bf65b38.diff
LOG: [MC] Don't print () around $ names
This MIPS behavior from edb9d84dcc4824865e86f963e52d67eb50dde7f5 (2010)
is obsoleted and misleading. This caused confusion in
https://reviews.llvm.org/D123702 ([NVPTX] Disable parens for identifiers
starting with '$')
Note: $tmp was rejected by AsmParser before
https://reviews.llvm.org/D75111 (2020)
Added:
Modified:
llvm/include/llvm/MC/MCAsmInfo.h
llvm/include/llvm/MC/MCExpr.h
llvm/lib/MC/MCExpr.cpp
llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCExpr.cpp
llvm/lib/Target/Mips/MCTargetDesc/MipsInstPrinter.cpp
llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp
llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCAsmInfo.cpp
llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.cpp
llvm/test/CodeGen/AArch64/arm64ec-exit-thunks.ll
llvm/test/CodeGen/AArch64/arm64ec-hybrid-patchable.ll
llvm/test/CodeGen/AArch64/pr58516.ll
llvm/test/CodeGen/AArch64/win-catchpad-nested-cxx.ll
llvm/test/CodeGen/AArch64/wineh-catchret-label-generation.ll
llvm/test/CodeGen/AArch64/wineh-try-catch.ll
llvm/test/CodeGen/Mips/ehframe-indirect.ll
llvm/test/CodeGen/Mips/indirect-jump-hazard/long-branch.ll
llvm/test/CodeGen/Mips/jtstat.ll
llvm/test/CodeGen/Mips/load-store-left-right.ll
llvm/test/CodeGen/Mips/longbranch.ll
llvm/test/CodeGen/Mips/mcount.ll
llvm/test/CodeGen/Mips/micromips-mtc-mfc.ll
llvm/test/CodeGen/Mips/mips16ex.ll
llvm/test/CodeGen/Mips/reloc-jalr.ll
llvm/test/CodeGen/Mips/shrink-wrapping.ll
llvm/test/CodeGen/Mips/unalignedload.ll
llvm/test/CodeGen/Mips/xray-mips-attribute-instrumentation.ll
llvm/test/CodeGen/X86/catchpad-reuse.ll
llvm/test/CodeGen/X86/dollar-name.ll
llvm/test/CodeGen/X86/seh-unwind-inline-asm-codegen.ll
llvm/test/CodeGen/X86/stack-coloring-wineh.ll
llvm/test/CodeGen/X86/win-catchpad-nested-cxx.ll
llvm/test/CodeGen/X86/win-catchpad.ll
llvm/test/CodeGen/X86/win-cleanuppad.ll
llvm/test/CodeGen/X86/win-funclet-cfi.ll
llvm/test/CodeGen/X86/win32-eh.ll
llvm/test/CodeGen/X86/windows-seh-EHa-CppCatchDotDotDot.ll
llvm/test/CodeGen/X86/windows-seh-EHa-CppDtors01.ll
llvm/test/DebugInfo/COFF/jump-table.ll
llvm/test/MC/ARM/arm-branches.s
llvm/test/MC/AsmParser/dollars-in-identifiers.s
llvm/test/MC/MachO/dollar-identifier.s
llvm/test/MC/Mips/expansion-jal-sym-pic.s
llvm/test/MC/Mips/macro-div.s
llvm/test/MC/Mips/macro-divu.s
llvm/test/MC/Mips/macro-rem.s
llvm/test/MC/Mips/macro-remu.s
llvm/test/MC/Mips/mips-fpu-instructions.s
llvm/test/MC/Mips/mips1/valid.s
llvm/test/MC/Mips/mips2/valid.s
llvm/test/MC/Mips/mips32/valid.s
llvm/test/MC/Mips/mips32r2/valid.s
llvm/test/MC/Mips/mips32r3/valid.s
llvm/test/MC/Mips/mips32r5/valid.s
llvm/test/MC/Mips/mips32r6/valid.s
llvm/test/MC/Mips/mips64r6/valid.s
llvm/test/MC/Mips/mips_directives.s
llvm/test/MC/Mips/reloc-directive-label-offset.s
Removed:
################################################################################
diff --git a/llvm/include/llvm/MC/MCAsmInfo.h b/llvm/include/llvm/MC/MCAsmInfo.h
index d7beebf614516..3134ee02f54be 100644
--- a/llvm/include/llvm/MC/MCAsmInfo.h
+++ b/llvm/include/llvm/MC/MCAsmInfo.h
@@ -650,9 +650,6 @@ class MCAsmInfo {
bool doDwarfFDESymbolsUseAbsDiff() const { return DwarfFDESymbolsUseAbsDiff; }
bool useDwarfRegNumForCFI() const { return DwarfRegNumForCFI; }
bool useParensForSymbolVariant() const { return UseParensForSymbolVariant; }
- bool useParensForDollarSignNames() const {
- return UseParensForDollarSignNames;
- }
bool supportsExtendedDwarfLocDirective() const {
return SupportsExtendedDwarfLocDirective;
}
diff --git a/llvm/include/llvm/MC/MCExpr.h b/llvm/include/llvm/MC/MCExpr.h
index edecfe4dd4112..d6829f2bcc734 100644
--- a/llvm/include/llvm/MC/MCExpr.h
+++ b/llvm/include/llvm/MC/MCExpr.h
@@ -81,8 +81,7 @@ class MCExpr {
/// \name Utility Methods
/// @{
- void print(raw_ostream &OS, const MCAsmInfo *MAI,
- bool InParens = false) const;
+ void print(raw_ostream &OS, const MCAsmInfo *MAI) const;
void dump() const;
/// Returns whether the given symbol is used anywhere in the expression or
diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp
index dd45a94ea892a..253247561354b 100644
--- a/llvm/lib/MC/MCExpr.cpp
+++ b/llvm/lib/MC/MCExpr.cpp
@@ -40,7 +40,7 @@ STATISTIC(MCExprEvaluate, "Number of MCExpr evaluations");
// VariantKind printing and formatting utilize MAI. operator<< (dump and some
// target code) specifies MAI as nullptr and should be avoided when MAI is
// needed.
-void MCExpr::print(raw_ostream &OS, const MCAsmInfo *MAI, bool InParens) const {
+void MCExpr::print(raw_ostream &OS, const MCAsmInfo *MAI) const {
switch (getKind()) {
case MCExpr::Target:
return cast<MCTargetExpr>(this)->printImpl(OS, MAI);
@@ -75,17 +75,7 @@ void MCExpr::print(raw_ostream &OS, const MCAsmInfo *MAI, bool InParens) const {
case MCExpr::SymbolRef: {
const MCSymbolRefExpr &SRE = cast<MCSymbolRefExpr>(*this);
const MCSymbol &Sym = SRE.getSymbol();
- // Parenthesize names that start with $ so that they don't look like
- // absolute names.
- bool UseParens = MAI && MAI->useParensForDollarSignNames() && !InParens &&
- Sym.getName().starts_with('$');
-
- if (UseParens) {
- OS << '(';
- Sym.print(OS, MAI);
- OS << ')';
- } else
- Sym.print(OS, MAI);
+ Sym.print(OS, MAI);
const MCSymbolRefExpr::VariantKind Kind = SRE.getKind();
if (Kind != MCSymbolRefExpr::VK_None) {
diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCExpr.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCExpr.cpp
index 7fff2e515b046..678a7be1f2456 100644
--- a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCExpr.cpp
+++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCExpr.cpp
@@ -77,7 +77,7 @@ void AMDGPUMCExpr::printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const {
break;
}
for (const auto *It = Args.begin(); It != Args.end(); ++It) {
- (*It)->print(OS, MAI, /*InParens=*/false);
+ (*It)->print(OS, MAI);
if ((It + 1) != Args.end())
OS << ", ";
}
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsInstPrinter.cpp b/llvm/lib/Target/Mips/MCTargetDesc/MipsInstPrinter.cpp
index dc7e887167d30..d743f00da273b 100644
--- a/llvm/lib/Target/Mips/MCTargetDesc/MipsInstPrinter.cpp
+++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsInstPrinter.cpp
@@ -138,7 +138,7 @@ void MipsInstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
}
assert(Op.isExpr() && "unknown operand kind in printOperand");
- Op.getExpr()->print(O, &MAI, true);
+ Op.getExpr()->print(O, &MAI);
}
void MipsInstPrinter::printJumpOperand(const MCInst *MI, unsigned OpNo,
diff --git a/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp b/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp
index d5eca7b65b2b1..39dc329d80222 100644
--- a/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp
+++ b/llvm/lib/Target/Mips/MCTargetDesc/MipsMCExpr.cpp
@@ -45,7 +45,7 @@ void MipsMCExpr::printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const {
case MEK_DTPREL:
// MEK_DTPREL is used for marking TLS DIEExpr only
// and contains a regular sub-expression.
- getSubExpr()->print(OS, MAI, true);
+ getSubExpr()->print(OS, MAI);
return;
case MEK_CALL_HI16:
OS << "%call_hi";
@@ -125,7 +125,7 @@ void MipsMCExpr::printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const {
if (Expr->evaluateAsAbsolute(AbsVal))
OS << AbsVal;
else
- Expr->print(OS, MAI, true);
+ Expr->print(OS, MAI);
OS << ')';
}
diff --git a/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCAsmInfo.cpp b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCAsmInfo.cpp
index b453024ba3725..614b3214fd275 100644
--- a/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCAsmInfo.cpp
+++ b/llvm/lib/Target/NVPTX/MCTargetDesc/NVPTXMCAsmInfo.cpp
@@ -58,10 +58,6 @@ NVPTXMCAsmInfo::NVPTXMCAsmInfo(const Triple &TheTriple,
UseIntegratedAssembler = false;
- // Avoid using parens for identifiers starting with $ - ptxas does
- // not expect them.
- UseParensForDollarSignNames = false;
-
// ptxas does not support DWARF `.file fileno directory filename'
// syntax as of v11.X.
EnableDwarfFileDirectoryDefault = false;
diff --git a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.cpp b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.cpp
index 5f4991b51d246..da7e9098f7544 100644
--- a/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.cpp
+++ b/llvm/lib/Target/Xtensa/MCTargetDesc/XtensaInstPrinter.cpp
@@ -100,7 +100,7 @@ void XtensaInstPrinter::printBranchTarget(const MCInst *MI, int OpNum,
OS << '+';
OS << Val;
} else if (MC.isExpr())
- MC.getExpr()->print(OS, &MAI, true);
+ MC.getExpr()->print(OS, &MAI);
else
llvm_unreachable("Invalid operand");
}
@@ -115,7 +115,7 @@ void XtensaInstPrinter::printJumpTarget(const MCInst *MI, int OpNum,
OS << '+';
OS << Val;
} else if (MC.isExpr())
- MC.getExpr()->print(OS, &MAI, true);
+ MC.getExpr()->print(OS, &MAI);
else
llvm_unreachable("Invalid operand");
;
@@ -131,7 +131,7 @@ void XtensaInstPrinter::printCallOperand(const MCInst *MI, int OpNum,
OS << '+';
OS << Val;
} else if (MC.isExpr())
- MC.getExpr()->print(OS, &MAI, true);
+ MC.getExpr()->print(OS, &MAI);
else
llvm_unreachable("Invalid operand");
}
@@ -149,7 +149,7 @@ void XtensaInstPrinter::printL32RTarget(const MCInst *MI, int OpNum,
O << ". ";
O << Value;
} else if (MC.isExpr())
- MC.getExpr()->print(O, &MAI, true);
+ MC.getExpr()->print(O, &MAI);
else
llvm_unreachable("Invalid operand");
}
diff --git a/llvm/test/CodeGen/AArch64/arm64ec-exit-thunks.ll b/llvm/test/CodeGen/AArch64/arm64ec-exit-thunks.ll
index dcc675839b714..cba7a8100930f 100644
--- a/llvm/test/CodeGen/AArch64/arm64ec-exit-thunks.ll
+++ b/llvm/test/CodeGen/AArch64/arm64ec-exit-thunks.ll
@@ -35,8 +35,8 @@ declare void @no_op() nounwind;
; CHECK-NEXT: adrp x11, no_op
; CHECK-NEXT: add x11, x11, :lo12:no_op
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_check_icall]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$v$v)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$v$v)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$v$v
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$v$v
; CHECK-NEXT: blr x8
; CHECK-NEXT: .seh_startepilogue
; CHECK-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
@@ -82,8 +82,8 @@ declare i64 @simple_integers(i8, i16, i32, i64) nounwind;
; CHECK-NEXT: adrp x11, simple_integers
; CHECK-NEXT: add x11, x11, :lo12:simple_integers
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_check_icall]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$i8$i8i8i8i8)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$i8$i8i8i8i8)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$i8$i8i8i8i8
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$i8$i8i8i8i8
; CHECK-NEXT: blr x8
; CHECK-NEXT: .seh_startepilogue
; CHECK-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
@@ -129,8 +129,8 @@ declare double @simple_floats(float, double) nounwind;
; CHECK-NEXT: adrp x11, simple_floats
; CHECK-NEXT: add x11, x11, :lo12:simple_floats
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_check_icall]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$d$fd)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$d$fd)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$d$fd
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$d$fd
; CHECK-NEXT: blr x8
; CHECK-NEXT: .seh_startepilogue
; CHECK-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
@@ -176,8 +176,8 @@ declare void @has_varargs(...) nounwind;
; CHECK-NEXT: adrp x11, has_varargs
; CHECK-NEXT: add x11, x11, :lo12:has_varargs
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_check_icall]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$v$varargs)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$v$varargs)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$v$varargs
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$v$varargs
; CHECK-NEXT: blr x8
; CHECK-NEXT: .seh_startepilogue
; CHECK-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
@@ -223,8 +223,8 @@ declare void @has_sret(ptr sret([100 x i8])) nounwind;
; CHECK-NEXT: adrp x11, has_sret
; CHECK-NEXT: add x11, x11, :lo12:has_sret
; CHECK-NEXT: ldr x9, [x9, :lo12:__os_arm64x_check_icall]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$m100$v)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$m100$v)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$m100$v
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$m100$v
; CHECK-NEXT: blr x9
; CHECK-NEXT: .seh_startepilogue
; CHECK-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
@@ -271,8 +271,8 @@ declare void @has_aligned_sret(ptr align 32 sret(%TSRet)) nounwind;
; CHECK: adrp x11, has_aligned_sret
; CHECK: add x11, x11, :lo12:has_aligned_sret
; CHECK: ldr x9, [x9, :lo12:__os_arm64x_check_icall]
-; CHECK: adrp x10, ($iexit_thunk$cdecl$m16$v)
-; CHECK: add x10, x10, :lo12:($iexit_thunk$cdecl$m16$v)
+; CHECK: adrp x10, $iexit_thunk$cdecl$m16$v
+; CHECK: add x10, x10, :lo12:$iexit_thunk$cdecl$m16$v
; CHECK: blr x9
; CHECK: .seh_startepilogue
; CHECK: ldr x30, [sp], #16 // 8-byte Folded Reload
@@ -325,8 +325,8 @@ declare [2 x i8] @small_array([2 x i8], [2 x float]) nounwind;
; CHECK-NEXT: adrp x11, small_array
; CHECK-NEXT: add x11, x11, :lo12:small_array
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_check_icall]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$m2$m2F8)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$m2$m2F8)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$m2$m2F8
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$m2$m2F8
; CHECK-NEXT: blr x8
; CHECK-NEXT: .seh_startepilogue
; CHECK-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
@@ -382,8 +382,8 @@ declare [3 x i64] @large_array([3 x i64], [2 x double], [2 x [2 x i64]]) nounwin
; CHECK-NEXT: adrp x11, large_array
; CHECK-NEXT: add x11, x11, :lo12:large_array
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_check_icall]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$m24$m24D16m32)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$m24$m24D16m32)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$m24$m24D16m32
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$m24$m24D16m32
; CHECK-NEXT: blr x8
; CHECK-NEXT: .seh_startepilogue
; CHECK-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
@@ -446,8 +446,8 @@ declare %T2 @simple_struct(%T1, %T2, %T3, %T4) nounwind;
; CHECK-NEXT: adrp x11, simple_struct
; CHECK-NEXT: add x11, x11, :lo12:simple_struct
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_check_icall]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$m8$i8m8m16m24)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$m8$i8m8m16m24)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$m8$i8m8m16m24
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$m8$i8m8m16m24
; CHECK-NEXT: blr x8
; CHECK-NEXT: .seh_startepilogue
; CHECK-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
@@ -499,8 +499,8 @@ declare <4 x i8> @small_vector(<4 x i8> %0) nounwind;
; CHECK-NEXT: adrp x11, small_vector
; CHECK-NEXT: add x11, x11, :lo12:small_vector
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_check_icall]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$m$m)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$m$m)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$m$m
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$m$m
; CHECK-NEXT: blr x8
; CHECK-NEXT: .seh_startepilogue
; CHECK-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
@@ -549,8 +549,8 @@ declare <8 x i16> @large_vector(<8 x i16> %0) nounwind;
; CHECK-NEXT: adrp x11, large_vector
; CHECK-NEXT: add x11, x11, :lo12:large_vector
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_check_icall]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$m16$m16)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$m16$m16)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$m16$m16
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$m16$m16
; CHECK-NEXT: blr x8
; CHECK-NEXT: .seh_startepilogue
; CHECK-NEXT: ldr x30, [sp], #16 // 8-byte Folded Reload
diff --git a/llvm/test/CodeGen/AArch64/arm64ec-hybrid-patchable.ll b/llvm/test/CodeGen/AArch64/arm64ec-hybrid-patchable.ll
index 1ed6a273338ab..20ff5fc5bc5e1 100644
--- a/llvm/test/CodeGen/AArch64/arm64ec-hybrid-patchable.ll
+++ b/llvm/test/CodeGen/AArch64/arm64ec-hybrid-patchable.ll
@@ -81,8 +81,8 @@ define dso_local void @caller() nounwind {
; CHECK-NEXT: adrp x11, func
; CHECK-NEXT: add x11, x11, :lo12:func
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_check_icall]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$v$v)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$v$v)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$v$v
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$v$v
; CHECK-NEXT: str x11, [sp, #8]
; CHECK-NEXT: blr x8
; CHECK-NEXT: blr x11
@@ -111,8 +111,8 @@ define dso_local void @caller() nounwind {
; CHECK-NEXT: adrp x11, func
; CHECK-NEXT: add x11, x11, :lo12:func
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_dispatch_call]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$i8$v)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$i8$v)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$i8$v
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$i8$v
; CHECK-NEXT: adrp x9, "#func$hp_target"
; CHECK-NEXT: add x9, x9, :lo12:"#func$hp_target"
; CHECK-NEXT: blr x8
@@ -138,8 +138,8 @@ define dso_local void @caller() nounwind {
; CHECK-NEXT: adrp x11, has_varargs
; CHECK-NEXT: add x11, x11, :lo12:has_varargs
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_dispatch_call]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$v$varargs)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$v$varargs)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$v$varargs
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$v$varargs
; CHECK-NEXT: adrp x9, "#has_varargs$hp_target"
; CHECK-NEXT: add x9, x9, :lo12:"#has_varargs$hp_target"
; CHECK-NEXT: blr x8
@@ -165,8 +165,8 @@ define dso_local void @caller() nounwind {
; CHECK-NEXT: adrp x11, has_sret
; CHECK-NEXT: add x11, x11, :lo12:has_sret
; CHECK-NEXT: ldr x12, [x9, :lo12:__os_arm64x_dispatch_call]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$m100$v)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$m100$v)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$m100$v
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$m100$v
; CHECK-NEXT: adrp x9, "#has_sret$hp_target"
; CHECK-NEXT: add x9, x9, :lo12:"#has_sret$hp_target"
; CHECK-NEXT: blr x12
@@ -192,8 +192,8 @@ define dso_local void @caller() nounwind {
; CHECK-NEXT: adrp x11, exp
; CHECK-NEXT: add x11, x11, :lo12:exp
; CHECK-NEXT: ldr x8, [x8, :lo12:__os_arm64x_dispatch_call]
-; CHECK-NEXT: adrp x10, ($iexit_thunk$cdecl$v$v)
-; CHECK-NEXT: add x10, x10, :lo12:($iexit_thunk$cdecl$v$v)
+; CHECK-NEXT: adrp x10, $iexit_thunk$cdecl$v$v
+; CHECK-NEXT: add x10, x10, :lo12:$iexit_thunk$cdecl$v$v
; CHECK-NEXT: adrp x9, "#exp$hp_target"
; CHECK-NEXT: add x9, x9, :lo12:"#exp$hp_target"
; CHECK-NEXT: blr x8
diff --git a/llvm/test/CodeGen/AArch64/pr58516.ll b/llvm/test/CodeGen/AArch64/pr58516.ll
index 3361ded48d4e2..d1775a2e707b6 100644
--- a/llvm/test/CodeGen/AArch64/pr58516.ll
+++ b/llvm/test/CodeGen/AArch64/pr58516.ll
@@ -56,7 +56,7 @@ define void @osfx(ptr %this) comdat personality ptr @__CxxFrameHandler3 {
; CHECK-NEXT: ret
; CHECK-NEXT: .seh_endfunclet
; CHECK-NEXT: .seh_handlerdata
-; CHECK-NEXT: .word ($cppxdata$osfx)@IMGREL
+; CHECK-NEXT: .word $cppxdata$osfx at IMGREL
; CHECK-NEXT: .section .text,"xr",discard,osfx
; CHECK-NEXT: .seh_endproc
; CHECK-NEXT: .def "?catch$3@?0?osfx at 4HA";
diff --git a/llvm/test/CodeGen/AArch64/win-catchpad-nested-cxx.ll b/llvm/test/CodeGen/AArch64/win-catchpad-nested-cxx.ll
index 6d0e9d6929709..0203c337cc68b 100644
--- a/llvm/test/CodeGen/AArch64/win-catchpad-nested-cxx.ll
+++ b/llvm/test/CodeGen/AArch64/win-catchpad-nested-cxx.ll
@@ -45,12 +45,12 @@ handler2:
; CHECK-LABEL: $cppxdata$try_in_catch:
; CHECK-NEXT: .word 429065506
; CHECK-NEXT: .word 4
-; CHECK-NEXT: .word ($stateUnwindMap$try_in_catch)
+; CHECK-NEXT: .word $stateUnwindMap$try_in_catch
; CHECK-NEXT: .word 2
-; CHECK-NEXT: .word ($tryMap$try_in_catch)
+; CHECK-NEXT: .word $tryMap$try_in_catch
; ip2state num + ptr
; CHECK-NEXT: .word 7
-; CHECK-NEXT: .word ($ip2state$try_in_catch)
+; CHECK-NEXT: .word $ip2state$try_in_catch
; unwindhelp offset
; CHECK-NEXT: .word -16
; CHECK-NEXT: .word 0
@@ -62,12 +62,12 @@ handler2:
; CHECK-NEXT: .word 0
; CHECK-NEXT: .word 3
; CHECK-NEXT: .word 1
-; CHECK-NEXT: .word ($handlerMap$0$try_in_catch)
+; CHECK-NEXT: .word $handlerMap$0$try_in_catch
; CHECK-NEXT: .word 2
; CHECK-NEXT: .word 2
; CHECK-NEXT: .word 3
; CHECK-NEXT: .word 1
-; CHECK-NEXT: .word ($handlerMap$1$try_in_catch)
+; CHECK-NEXT: .word $handlerMap$1$try_in_catch
; CHECK: $handlerMap$0$try_in_catch:
; CHECK-NEXT: .word 64
diff --git a/llvm/test/CodeGen/AArch64/wineh-catchret-label-generation.ll b/llvm/test/CodeGen/AArch64/wineh-catchret-label-generation.ll
index 1f30865c98e19..3f7df585c52b4 100644
--- a/llvm/test/CodeGen/AArch64/wineh-catchret-label-generation.ll
+++ b/llvm/test/CodeGen/AArch64/wineh-catchret-label-generation.ll
@@ -35,7 +35,7 @@ define fastcc ptr @test_function(i1 %0, ptr %_Fmtfl.i.i, i1 %1) personality ptr
; CHECK-NEXT: ret
; CHECK-NEXT: .seh_endfunclet
; CHECK-NEXT: .seh_handlerdata
-; CHECK-NEXT: .word ($cppxdata$test_function)@IMGREL
+; CHECK-NEXT: .word $cppxdata$test_function at IMGREL
; CHECK-NEXT: .text
; CHECK-NEXT: .seh_endproc
; CHECK-NEXT: .def "?catch$5@?0?test_function at 4HA";
diff --git a/llvm/test/CodeGen/AArch64/wineh-try-catch.ll b/llvm/test/CodeGen/AArch64/wineh-try-catch.ll
index c3b5a8968d7bb..e10b05e2488fd 100644
--- a/llvm/test/CodeGen/AArch64/wineh-try-catch.ll
+++ b/llvm/test/CodeGen/AArch64/wineh-try-catch.ll
@@ -76,11 +76,11 @@
; CHECK-LABEL: "$cppxdata$?func@@YAHXZ":
; CHECK-NEXT: .word 429065506 // MagicNumber
; CHECK-NEXT: .word 2 // MaxState
-; CHECK-NEXT: .word ("$stateUnwindMap$?func@@YAHXZ")@IMGREL // UnwindMap
+; CHECK-NEXT: .word "$stateUnwindMap$?func@@YAHXZ"@IMGREL // UnwindMap
; CHECK-NEXT: .word 1 // NumTryBlocks
-; CHECK-NEXT: .word ("$tryMap$?func@@YAHXZ")@IMGREL // TryBlockMap
+; CHECK-NEXT: .word "$tryMap$?func@@YAHXZ"@IMGREL // TryBlockMap
; CHECK-NEXT: .word 4 // IPMapEntries
-; CHECK-NEXT: .word ("$ip2state$?func@@YAHXZ")@IMGREL // IPToStateXData
+; CHECK-NEXT: .word "$ip2state$?func@@YAHXZ"@IMGREL // IPToStateXData
; CHECK-NEXT: .word -16 // UnwindHelp
; UNWIND: Function: ?func@@YAHXZ (0x0)
diff --git a/llvm/test/CodeGen/Mips/ehframe-indirect.ll b/llvm/test/CodeGen/Mips/ehframe-indirect.ll
index 1cd2b86a8e158..901095cc6e7f6 100644
--- a/llvm/test/CodeGen/Mips/ehframe-indirect.ll
+++ b/llvm/test/CodeGen/Mips/ehframe-indirect.ll
@@ -51,7 +51,7 @@ declare void @foo()
; O32: [[PC_LABEL:\$tmp[0-9]+]]:
; N32: [[PC_LABEL:\.Ltmp[0-9]+]]:
; N64: [[PC_LABEL:\.Ltmp[0-9]+]]:
-; O32: .4byte ($_ZTISt9exception.DW.stub)-([[PC_LABEL]])
+; O32: .4byte $_ZTISt9exception.DW.stub-[[PC_LABEL]]
; N32: .4byte .L_ZTISt9exception.DW.stub-[[PC_LABEL]]
; N64: .4byte .L_ZTISt9exception.DW.stub-[[PC_LABEL]]
; O32: $_ZTISt9exception.DW.stub:
diff --git a/llvm/test/CodeGen/Mips/indirect-jump-hazard/long-branch.ll b/llvm/test/CodeGen/Mips/indirect-jump-hazard/long-branch.ll
index e8771feefad33..df15658b54f52 100644
--- a/llvm/test/CodeGen/Mips/indirect-jump-hazard/long-branch.ll
+++ b/llvm/test/CodeGen/Mips/indirect-jump-hazard/long-branch.ll
@@ -34,9 +34,9 @@ define void @test1(i32 signext %s) {
; O32-PIC-NEXT: # %bb.1: # %entry
; O32-PIC-NEXT: addiu $sp, $sp, -8
; O32-PIC-NEXT: sw $ra, 0($sp)
-; O32-PIC-NEXT: lui $1, %hi(($BB0_4)-($BB0_2))
+; O32-PIC-NEXT: lui $1, %hi($BB0_4-$BB0_2)
; O32-PIC-NEXT: bal $BB0_2
-; O32-PIC-NEXT: addiu $1, $1, %lo(($BB0_4)-($BB0_2))
+; O32-PIC-NEXT: addiu $1, $1, %lo($BB0_4-$BB0_2)
; O32-PIC-NEXT: $BB0_2: # %entry
; O32-PIC-NEXT: addu $1, $ra, $1
; O32-PIC-NEXT: lw $ra, 0($sp)
@@ -59,8 +59,8 @@ define void @test1(i32 signext %s) {
; O32-R6-PIC-NEXT: # %bb.1: # %entry
; O32-R6-PIC-NEXT: addiu $sp, $sp, -8
; O32-R6-PIC-NEXT: sw $ra, 0($sp)
-; O32-R6-PIC-NEXT: lui $1, %hi(($BB0_4)-($BB0_2))
-; O32-R6-PIC-NEXT: addiu $1, $1, %lo(($BB0_4)-($BB0_2))
+; O32-R6-PIC-NEXT: lui $1, %hi($BB0_4-$BB0_2)
+; O32-R6-PIC-NEXT: addiu $1, $1, %lo($BB0_4-$BB0_2)
; O32-R6-PIC-NEXT: balc $BB0_2
; O32-R6-PIC-NEXT: $BB0_2: # %entry
; O32-R6-PIC-NEXT: addu $1, $ra, $1
diff --git a/llvm/test/CodeGen/Mips/jtstat.ll b/llvm/test/CodeGen/Mips/jtstat.ll
index 21d7aba6aaa61..233ff110f137c 100644
--- a/llvm/test/CodeGen/Mips/jtstat.ll
+++ b/llvm/test/CodeGen/Mips/jtstat.ll
@@ -59,13 +59,13 @@ sw.epilog: ; preds = %entry, %sw.bb7, %sw
; CHECK-STATIC16: li ${{[0-9]+}}, %hi($JTI{{[0-9]+}}_{{[0-9]+}})
; CHECK-STATIC16: lw ${{[0-9]+}}, %lo($JTI{{[0-9]+}}_{{[0-9]+}})(${{[0-9]+}})
; CHECK-STATIC16: $JTI{{[0-9]+}}_{{[0-9]+}}:
-; CHECK-STATIC16: .4byte ($BB0_{{[0-9]+}})
-; CHECK-STATIC16: .4byte ($BB0_{{[0-9]+}})
-; CHECK-STATIC16: .4byte ($BB0_{{[0-9]+}})
-; CHECK-STATIC16: .4byte ($BB0_{{[0-9]+}})
-; CHECK-STATIC16: .4byte ($BB0_{{[0-9]+}})
-; CHECK-STATIC16: .4byte ($BB0_{{[0-9]+}})
-; CHECK-STATIC16: .4byte ($BB0_{{[0-9]+}})
-; CHECK-STATIC16: .4byte ($BB0_{{[0-9]+}})
-; CHECK-STATIC16: .4byte ($BB0_{{[0-9]+}})
-; CHECK-STATIC16: .4byte ($BB0_{{[0-9]+}})
+; CHECK-STATIC16: .4byte $BB0_{{[0-9]+}}
+; CHECK-STATIC16: .4byte $BB0_{{[0-9]+}}
+; CHECK-STATIC16: .4byte $BB0_{{[0-9]+}}
+; CHECK-STATIC16: .4byte $BB0_{{[0-9]+}}
+; CHECK-STATIC16: .4byte $BB0_{{[0-9]+}}
+; CHECK-STATIC16: .4byte $BB0_{{[0-9]+}}
+; CHECK-STATIC16: .4byte $BB0_{{[0-9]+}}
+; CHECK-STATIC16: .4byte $BB0_{{[0-9]+}}
+; CHECK-STATIC16: .4byte $BB0_{{[0-9]+}}
+; CHECK-STATIC16: .4byte $BB0_{{[0-9]+}}
diff --git a/llvm/test/CodeGen/Mips/load-store-left-right.ll b/llvm/test/CodeGen/Mips/load-store-left-right.ll
index 0b7e51cbf7dc6..3f318654d83b8 100644
--- a/llvm/test/CodeGen/Mips/load-store-left-right.ll
+++ b/llvm/test/CodeGen/Mips/load-store-left-right.ll
@@ -944,7 +944,7 @@ define void @pass_array_byval() nounwind {
; MIPS32-EL-NEXT: lbu $1, 6($1)
; MIPS32-EL-NEXT: sll $1, $1, 16
; MIPS32-EL-NEXT: lw $25, %call16(extern_func)($gp)
-; MIPS32-EL-NEXT: .reloc ($tmp0), R_MIPS_JALR, extern_func
+; MIPS32-EL-NEXT: .reloc $tmp0, R_MIPS_JALR, extern_func
; MIPS32-EL-NEXT: $tmp0:
; MIPS32-EL-NEXT: jalr $25
; MIPS32-EL-NEXT: or $5, $2, $1
@@ -970,7 +970,7 @@ define void @pass_array_byval() nounwind {
; MIPS32-EB-NEXT: lbu $1, 6($1)
; MIPS32-EB-NEXT: sll $1, $1, 8
; MIPS32-EB-NEXT: lw $25, %call16(extern_func)($gp)
-; MIPS32-EB-NEXT: .reloc ($tmp0), R_MIPS_JALR, extern_func
+; MIPS32-EB-NEXT: .reloc $tmp0, R_MIPS_JALR, extern_func
; MIPS32-EB-NEXT: $tmp0:
; MIPS32-EB-NEXT: jalr $25
; MIPS32-EB-NEXT: or $5, $2, $1
@@ -991,7 +991,7 @@ define void @pass_array_byval() nounwind {
; MIPS32R6-EL-NEXT: sll $3, $3, 16
; MIPS32R6-EL-NEXT: lw $4, 0($1)
; MIPS32R6-EL-NEXT: lw $25, %call16(extern_func)($gp)
-; MIPS32R6-EL-NEXT: .reloc ($tmp0), R_MIPS_JALR, extern_func
+; MIPS32R6-EL-NEXT: .reloc $tmp0, R_MIPS_JALR, extern_func
; MIPS32R6-EL-NEXT: $tmp0:
; MIPS32R6-EL-NEXT: jalr $25
; MIPS32R6-EL-NEXT: or $5, $2, $3
@@ -1013,7 +1013,7 @@ define void @pass_array_byval() nounwind {
; MIPS32R6-EB-NEXT: sll $3, $3, 16
; MIPS32R6-EB-NEXT: lw $4, 0($1)
; MIPS32R6-EB-NEXT: lw $25, %call16(extern_func)($gp)
-; MIPS32R6-EB-NEXT: .reloc ($tmp0), R_MIPS_JALR, extern_func
+; MIPS32R6-EB-NEXT: .reloc $tmp0, R_MIPS_JALR, extern_func
; MIPS32R6-EB-NEXT: $tmp0:
; MIPS32R6-EB-NEXT: jalr $25
; MIPS32R6-EB-NEXT: or $5, $3, $2
diff --git a/llvm/test/CodeGen/Mips/longbranch.ll b/llvm/test/CodeGen/Mips/longbranch.ll
index d348f03295811..66ee3859ae448 100644
--- a/llvm/test/CodeGen/Mips/longbranch.ll
+++ b/llvm/test/CodeGen/Mips/longbranch.ll
@@ -58,9 +58,9 @@ define void @test1(i32 signext %s) {
; O32-PIC-NEXT: # %bb.1: # %entry
; O32-PIC-NEXT: addiu $sp, $sp, -8
; O32-PIC-NEXT: sw $ra, 0($sp)
-; O32-PIC-NEXT: lui $1, %hi(($BB0_4)-($BB0_2))
+; O32-PIC-NEXT: lui $1, %hi($BB0_4-$BB0_2)
; O32-PIC-NEXT: bal $BB0_2
-; O32-PIC-NEXT: addiu $1, $1, %lo(($BB0_4)-($BB0_2))
+; O32-PIC-NEXT: addiu $1, $1, %lo($BB0_4-$BB0_2)
; O32-PIC-NEXT: $BB0_2: # %entry
; O32-PIC-NEXT: addu $1, $ra, $1
; O32-PIC-NEXT: lw $ra, 0($sp)
@@ -98,8 +98,8 @@ define void @test1(i32 signext %s) {
; O32-R6-PIC-NEXT: # %bb.1: # %entry
; O32-R6-PIC-NEXT: addiu $sp, $sp, -8
; O32-R6-PIC-NEXT: sw $ra, 0($sp)
-; O32-R6-PIC-NEXT: lui $1, %hi(($BB0_4)-($BB0_2))
-; O32-R6-PIC-NEXT: addiu $1, $1, %lo(($BB0_4)-($BB0_2))
+; O32-R6-PIC-NEXT: lui $1, %hi($BB0_4-$BB0_2)
+; O32-R6-PIC-NEXT: addiu $1, $1, %lo($BB0_4-$BB0_2)
; O32-R6-PIC-NEXT: balc $BB0_2
; O32-R6-PIC-NEXT: $BB0_2: # %entry
; O32-R6-PIC-NEXT: addu $1, $ra, $1
@@ -212,9 +212,9 @@ define void @test1(i32 signext %s) {
; MICROMIPS-NEXT: # %bb.1: # %entry
; MICROMIPS-NEXT: addiu $sp, $sp, -8
; MICROMIPS-NEXT: sw $ra, 0($sp)
-; MICROMIPS-NEXT: lui $1, %hi(($BB0_4)-($BB0_2))
+; MICROMIPS-NEXT: lui $1, %hi($BB0_4-$BB0_2)
; MICROMIPS-NEXT: bal $BB0_2
-; MICROMIPS-NEXT: addiu $1, $1, %lo(($BB0_4)-($BB0_2))
+; MICROMIPS-NEXT: addiu $1, $1, %lo($BB0_4-$BB0_2)
; MICROMIPS-NEXT: $BB0_2: # %entry
; MICROMIPS-NEXT: addu $1, $ra, $1
; MICROMIPS-NEXT: lw $ra, 0($sp)
@@ -261,8 +261,8 @@ define void @test1(i32 signext %s) {
; MICROMIPSR6PIC-NEXT: # %bb.1: # %entry
; MICROMIPSR6PIC-NEXT: addiu $sp, $sp, -8
; MICROMIPSR6PIC-NEXT: sw $ra, 0($sp)
-; MICROMIPSR6PIC-NEXT: lui $1, %hi(($BB0_4)-($BB0_2))
-; MICROMIPSR6PIC-NEXT: addiu $1, $1, %lo(($BB0_4)-($BB0_2))
+; MICROMIPSR6PIC-NEXT: lui $1, %hi($BB0_4-$BB0_2)
+; MICROMIPSR6PIC-NEXT: addiu $1, $1, %lo($BB0_4-$BB0_2)
; MICROMIPSR6PIC-NEXT: balc $BB0_2
; MICROMIPSR6PIC-NEXT: $BB0_2: # %entry
; MICROMIPSR6PIC-NEXT: addu $1, $ra, $1
@@ -285,9 +285,9 @@ define void @test1(i32 signext %s) {
; NACL-NEXT: # %bb.1:
; NACL-NEXT: addiu $sp, $sp, -8
; NACL-NEXT: sw $ra, 0($sp)
-; NACL-NEXT: lui $1, %hi(($BB0_4)-($BB0_2))
+; NACL-NEXT: lui $1, %hi($BB0_4-$BB0_2)
; NACL-NEXT: bal $BB0_2
-; NACL-NEXT: addiu $1, $1, %lo(($BB0_4)-($BB0_2))
+; NACL-NEXT: addiu $1, $1, %lo($BB0_4-$BB0_2)
; NACL-NEXT: $BB0_2:
; NACL-NEXT: addu $1, $ra, $1
; NACL-NEXT: lw $ra, 0($sp)
diff --git a/llvm/test/CodeGen/Mips/mcount.ll b/llvm/test/CodeGen/Mips/mcount.ll
index 41100e6cbeb6f..713666ddee649 100644
--- a/llvm/test/CodeGen/Mips/mcount.ll
+++ b/llvm/test/CodeGen/Mips/mcount.ll
@@ -40,7 +40,7 @@ define void @foo() {
; MIPS32-PIC-NEXT: addu $gp, $2, $25
; MIPS32-PIC-NEXT: lw $25, %call16(_mcount)($gp)
; MIPS32-PIC-NEXT: move $1, $ra
-; MIPS32-PIC-NEXT: .reloc ($tmp0), R_MIPS_JALR, _mcount
+; MIPS32-PIC-NEXT: .reloc $tmp0, R_MIPS_JALR, _mcount
; MIPS32-PIC-NEXT: $tmp0:
; MIPS32-PIC-NEXT: jalr $25
; MIPS32-PIC-NEXT: addiu $sp, $sp, -8
@@ -107,7 +107,7 @@ define void @foo() {
; MIPS32-MM-PIC-NEXT: addu $gp, $2, $25
; MIPS32-MM-PIC-NEXT: lw $25, %call16(_mcount)($gp)
; MIPS32-MM-PIC-NEXT: move $1, $ra
-; MIPS32-MM-PIC-NEXT: .reloc ($tmp0), R_MICROMIPS_JALR, _mcount
+; MIPS32-MM-PIC-NEXT: .reloc $tmp0, R_MICROMIPS_JALR, _mcount
; MIPS32-MM-PIC-NEXT: $tmp0:
; MIPS32-MM-PIC-NEXT: jalr $25
; MIPS32-MM-PIC-NEXT: addiu $sp, $sp, -8
diff --git a/llvm/test/CodeGen/Mips/micromips-mtc-mfc.ll b/llvm/test/CodeGen/Mips/micromips-mtc-mfc.ll
index e23f0760d8d91..66b484b47550f 100644
--- a/llvm/test/CodeGen/Mips/micromips-mtc-mfc.ll
+++ b/llvm/test/CodeGen/Mips/micromips-mtc-mfc.ll
@@ -12,11 +12,11 @@ define double @foo(double %a, double %b) {
; MM2-NEXT: mthc1 $zero, $f2 # encoding: [0x54,0x02,0x38,0x3b]
; MM2-NEXT: c.ule.d $f12, $f2 # encoding: [0x54,0x4c,0x05,0xfc]
; MM2-NEXT: bc1t $BB0_2 # encoding: [0x43,0xa0,A,A]
-; MM2-NEXT: # fixup A - offset: 0, value: ($BB0_2), kind: fixup_MICROMIPS_PC16_S1
+; MM2-NEXT: # fixup A - offset: 0, value: $BB0_2, kind: fixup_MICROMIPS_PC16_S1
; MM2-NEXT: nop # encoding: [0x00,0x00,0x00,0x00]
; MM2-NEXT: # %bb.1: # %entry
; MM2-NEXT: j $BB0_2 # encoding: [0b110101AA,A,A,A]
-; MM2-NEXT: # fixup A - offset: 0, value: ($BB0_2), kind: fixup_MICROMIPS_26_S1
+; MM2-NEXT: # fixup A - offset: 0, value: $BB0_2, kind: fixup_MICROMIPS_26_S1
; MM2-NEXT: nop # encoding: [0x00,0x00,0x00,0x00]
; MM2-NEXT: $BB0_2: # %return
; MM2-NEXT: jrc $ra # encoding: [0x45,0xbf]
diff --git a/llvm/test/CodeGen/Mips/mips16ex.ll b/llvm/test/CodeGen/Mips/mips16ex.ll
index 7dbccc7b223bd..fb9a44e767516 100644
--- a/llvm/test/CodeGen/Mips/mips16ex.ll
+++ b/llvm/test/CodeGen/Mips/mips16ex.ll
@@ -2,7 +2,7 @@
;16: main:
;16-NEXT: [[TMP:.*]]:
-;16-NEXT: .set $func_begin0, ([[TMP]])
+;16-NEXT: .set $func_begin0, [[TMP]]
;16-NEXT: .cfi_startproc
;16-NEXT: .cfi_personality
@.str = private unnamed_addr constant [7 x i8] c"hello\0A\00", align 1
diff --git a/llvm/test/CodeGen/Mips/reloc-jalr.ll b/llvm/test/CodeGen/Mips/reloc-jalr.ll
index 88bbfa7fdfc36..f7cdfbb64c285 100644
--- a/llvm/test/CodeGen/Mips/reloc-jalr.ll
+++ b/llvm/test/CodeGen/Mips/reloc-jalr.ll
@@ -102,9 +102,9 @@ entry:
; ALL-LABEL: checkCall:
; ALL-NOT: MIPS_JALR
call void @foo()
-; JALR-32: .reloc ([[TMPLABEL:\$.+]]), R_MIPS_JALR, foo
+; JALR-32: .reloc [[TMPLABEL:\$.+]], R_MIPS_JALR, foo
; JALR-64: .reloc [[TMPLABEL:\..+]], R_MIPS_JALR, foo
-; JALR-MM: .reloc ([[TMPLABEL:\$.+]]), R_MICROMIPS_JALR, foo
+; JALR-MM: .reloc [[TMPLABEL:\$.+]], R_MICROMIPS_JALR, foo
; NORELOC-NOT: .reloc
; JALR-ALL-NEXT: [[TMPLABEL]]:
; JALR-32R2-NEXT: jalr $25
@@ -121,9 +121,9 @@ entry:
; ALL-LABEL: checkTailCall:
; ALL-NOT: MIPS_JALR
tail call void @foo()
-; JALR-32: .reloc ([[TMPLABEL:\$.+]]), R_MIPS_JALR, foo
+; JALR-32: .reloc [[TMPLABEL:\$.+]], R_MIPS_JALR, foo
; JALR-64: .reloc [[TMPLABEL:\..+]], R_MIPS_JALR, foo
-; JALR-MM: .reloc ([[TMPLABEL:\$.+]]), R_MICROMIPS_JALR, foo
+; JALR-MM: .reloc [[TMPLABEL:\$.+]], R_MICROMIPS_JALR, foo
; JALR-ALL-NEXT: [[TMPLABEL]]:
; NORELOC-NOT: .reloc
; TAILCALL-32R2-NEXT: jr $25
diff --git a/llvm/test/CodeGen/Mips/shrink-wrapping.ll b/llvm/test/CodeGen/Mips/shrink-wrapping.ll
index b08d2f1b64678..8153338253465 100644
--- a/llvm/test/CodeGen/Mips/shrink-wrapping.ll
+++ b/llvm/test/CodeGen/Mips/shrink-wrapping.ll
@@ -243,9 +243,9 @@ define i32 @foo2(i32 signext %a) {
; SHRINK-WRAP-PIC-NEXT: # %bb.1:
; SHRINK-WRAP-PIC-NEXT: addiu $sp, $sp, -8
; SHRINK-WRAP-PIC-NEXT: sw $ra, 0($sp)
-; SHRINK-WRAP-PIC-NEXT: lui $1, %hi(($BB1_4)-($BB1_2))
+; SHRINK-WRAP-PIC-NEXT: lui $1, %hi($BB1_4-$BB1_2)
; SHRINK-WRAP-PIC-NEXT: bal $BB1_2
-; SHRINK-WRAP-PIC-NEXT: addiu $1, $1, %lo(($BB1_4)-($BB1_2))
+; SHRINK-WRAP-PIC-NEXT: addiu $1, $1, %lo($BB1_4-$BB1_2)
; SHRINK-WRAP-PIC-NEXT: $BB1_2:
; SHRINK-WRAP-PIC-NEXT: addu $1, $ra, $1
; SHRINK-WRAP-PIC-NEXT: lw $ra, 0($sp)
@@ -272,9 +272,9 @@ define i32 @foo2(i32 signext %a) {
; NO-SHRINK-WRAP-PIC-NEXT: # %bb.1:
; NO-SHRINK-WRAP-PIC-NEXT: addiu $sp, $sp, -8
; NO-SHRINK-WRAP-PIC-NEXT: sw $ra, 0($sp)
-; NO-SHRINK-WRAP-PIC-NEXT: lui $1, %hi(($BB1_4)-($BB1_2))
+; NO-SHRINK-WRAP-PIC-NEXT: lui $1, %hi($BB1_4-$BB1_2)
; NO-SHRINK-WRAP-PIC-NEXT: bal $BB1_2
-; NO-SHRINK-WRAP-PIC-NEXT: addiu $1, $1, %lo(($BB1_4)-($BB1_2))
+; NO-SHRINK-WRAP-PIC-NEXT: addiu $1, $1, %lo($BB1_4-$BB1_2)
; NO-SHRINK-WRAP-PIC-NEXT: $BB1_2:
; NO-SHRINK-WRAP-PIC-NEXT: addu $1, $ra, $1
; NO-SHRINK-WRAP-PIC-NEXT: lw $ra, 0($sp)
diff --git a/llvm/test/CodeGen/Mips/unalignedload.ll b/llvm/test/CodeGen/Mips/unalignedload.ll
index 912998ab9d038..5c78519e6481f 100644
--- a/llvm/test/CodeGen/Mips/unalignedload.ll
+++ b/llvm/test/CodeGen/Mips/unalignedload.ll
@@ -26,7 +26,7 @@ define void @bar1() nounwind {
; MIPS32-EL-NEXT: lbu $1, 3($1)
; MIPS32-EL-NEXT: sll $1, $1, 8
; MIPS32-EL-NEXT: lw $25, %call16(foo2)($gp)
-; MIPS32-EL-NEXT: .reloc ($tmp0), R_MIPS_JALR, foo2
+; MIPS32-EL-NEXT: .reloc $tmp0, R_MIPS_JALR, foo2
; MIPS32-EL-NEXT: $tmp0:
; MIPS32-EL-NEXT: jalr $25
; MIPS32-EL-NEXT: or $4, $1, $2
@@ -47,7 +47,7 @@ define void @bar1() nounwind {
; MIPS32-EB-NEXT: lbu $1, 2($1)
; MIPS32-EB-NEXT: sll $1, $1, 24
; MIPS32-EB-NEXT: lw $25, %call16(foo2)($gp)
-; MIPS32-EB-NEXT: .reloc ($tmp0), R_MIPS_JALR, foo2
+; MIPS32-EB-NEXT: .reloc $tmp0, R_MIPS_JALR, foo2
; MIPS32-EB-NEXT: $tmp0:
; MIPS32-EB-NEXT: jalr $25
; MIPS32-EB-NEXT: or $4, $1, $2
@@ -65,7 +65,7 @@ define void @bar1() nounwind {
; MIPS32R6-EL-NEXT: lw $1, %got(s2)($gp)
; MIPS32R6-EL-NEXT: lhu $4, 2($1)
; MIPS32R6-EL-NEXT: lw $25, %call16(foo2)($gp)
-; MIPS32R6-EL-NEXT: .reloc ($tmp0), R_MIPS_JALR, foo2
+; MIPS32R6-EL-NEXT: .reloc $tmp0, R_MIPS_JALR, foo2
; MIPS32R6-EL-NEXT: $tmp0:
; MIPS32R6-EL-NEXT: jalrc $25
; MIPS32R6-EL-NEXT: lw $ra, 20($sp) # 4-byte Folded Reload
@@ -82,7 +82,7 @@ define void @bar1() nounwind {
; MIPS32R6-EB-NEXT: lw $1, %got(s2)($gp)
; MIPS32R6-EB-NEXT: lhu $1, 2($1)
; MIPS32R6-EB-NEXT: lw $25, %call16(foo2)($gp)
-; MIPS32R6-EB-NEXT: .reloc ($tmp0), R_MIPS_JALR, foo2
+; MIPS32R6-EB-NEXT: .reloc $tmp0, R_MIPS_JALR, foo2
; MIPS32R6-EB-NEXT: $tmp0:
; MIPS32R6-EB-NEXT: jalr $25
; MIPS32R6-EB-NEXT: sll $4, $1, 16
@@ -113,7 +113,7 @@ define void @bar2() nounwind {
; MIPS32-EL-NEXT: lbu $1, 6($1)
; MIPS32-EL-NEXT: sll $1, $1, 16
; MIPS32-EL-NEXT: lw $25, %call16(foo4)($gp)
-; MIPS32-EL-NEXT: .reloc ($tmp1), R_MIPS_JALR, foo4
+; MIPS32-EL-NEXT: .reloc $tmp1, R_MIPS_JALR, foo4
; MIPS32-EL-NEXT: $tmp1:
; MIPS32-EL-NEXT: jalr $25
; MIPS32-EL-NEXT: or $5, $2, $1
@@ -139,7 +139,7 @@ define void @bar2() nounwind {
; MIPS32-EB-NEXT: lbu $1, 6($1)
; MIPS32-EB-NEXT: sll $1, $1, 8
; MIPS32-EB-NEXT: lw $25, %call16(foo4)($gp)
-; MIPS32-EB-NEXT: .reloc ($tmp1), R_MIPS_JALR, foo4
+; MIPS32-EB-NEXT: .reloc $tmp1, R_MIPS_JALR, foo4
; MIPS32-EB-NEXT: $tmp1:
; MIPS32-EB-NEXT: jalr $25
; MIPS32-EB-NEXT: or $5, $2, $1
@@ -160,7 +160,7 @@ define void @bar2() nounwind {
; MIPS32R6-EL-NEXT: sll $3, $3, 16
; MIPS32R6-EL-NEXT: lw $4, 0($1)
; MIPS32R6-EL-NEXT: lw $25, %call16(foo4)($gp)
-; MIPS32R6-EL-NEXT: .reloc ($tmp1), R_MIPS_JALR, foo4
+; MIPS32R6-EL-NEXT: .reloc $tmp1, R_MIPS_JALR, foo4
; MIPS32R6-EL-NEXT: $tmp1:
; MIPS32R6-EL-NEXT: jalr $25
; MIPS32R6-EL-NEXT: or $5, $2, $3
@@ -182,7 +182,7 @@ define void @bar2() nounwind {
; MIPS32R6-EB-NEXT: sll $3, $3, 16
; MIPS32R6-EB-NEXT: lw $4, 0($1)
; MIPS32R6-EB-NEXT: lw $25, %call16(foo4)($gp)
-; MIPS32R6-EB-NEXT: .reloc ($tmp1), R_MIPS_JALR, foo4
+; MIPS32R6-EB-NEXT: .reloc $tmp1, R_MIPS_JALR, foo4
; MIPS32R6-EB-NEXT: $tmp1:
; MIPS32R6-EB-NEXT: jalr $25
; MIPS32R6-EB-NEXT: or $5, $3, $2
diff --git a/llvm/test/CodeGen/Mips/xray-mips-attribute-instrumentation.ll b/llvm/test/CodeGen/Mips/xray-mips-attribute-instrumentation.ll
index f49ee02eb6b70..26cea577699f6 100644
--- a/llvm/test/CodeGen/Mips/xray-mips-attribute-instrumentation.ll
+++ b/llvm/test/CodeGen/Mips/xray-mips-attribute-instrumentation.ll
@@ -53,8 +53,8 @@ define i32 @foo() nounwind noinline uwtable "function-instrument"="xray-always"
; CHECK-MIPS64-NEXT: .8byte .Lxray_sled_0-[[TMP]]
; CHECK-MIPS64-NEXT: .8byte .Lfunc_begin0-([[TMP]]+8)
; CHECK-MIPS32: [[TMP:\$tmp[0-9]+]]:
-; CHECK-MIPS32-NEXT: .4byte ($xray_sled_0)-([[TMP]])
-; CHECK-MIPS32-NEXT: .4byte ($func_begin0)-(([[TMP]])+4)
+; CHECK-MIPS32-NEXT: .4byte $xray_sled_0-[[TMP]]
+; CHECK-MIPS32-NEXT: .4byte $func_begin0-([[TMP]]+4)
; We test multiple returns in a single function to make sure we're getting all
; of them with XRay instrumentation.
@@ -135,8 +135,8 @@ NotEqual:
; CHECK-MIPS64: .8byte .Lxray_sled_3
; CHECK-MIPS64: .8byte .Lxray_sled_4
; CHECK-MIPS32: [[TMP:\$tmp[0-9]+]]:
-; CHECK-MIPS32-NEXT: .4byte ($xray_sled_2)-([[TMP]])
+; CHECK-MIPS32-NEXT: .4byte $xray_sled_2-[[TMP]]
; CHECK-MIPS32: [[TMP:\$tmp[0-9]+]]:
-; CHECK-MIPS32-NEXT: .4byte ($xray_sled_3)-([[TMP]])
+; CHECK-MIPS32-NEXT: .4byte $xray_sled_3-[[TMP]]
; CHECK-MIPS32: [[TMP:\$tmp[0-9]+]]:
-; CHECK-MIPS32-NEXT: .4byte ($xray_sled_4)-([[TMP]])
+; CHECK-MIPS32-NEXT: .4byte $xray_sled_4-[[TMP]]
diff --git a/llvm/test/CodeGen/X86/catchpad-reuse.ll b/llvm/test/CodeGen/X86/catchpad-reuse.ll
index 8f30e806ea85a..163980fddf04f 100644
--- a/llvm/test/CodeGen/X86/catchpad-reuse.ll
+++ b/llvm/test/CodeGen/X86/catchpad-reuse.ll
@@ -19,11 +19,11 @@
; CHECK: $cppxdata$main:
; CHECK-NEXT: .long 429065506 # MagicNumber
; CHECK-NEXT: .long 4 # MaxState
-; CHECK-NEXT: .long ($stateUnwindMap$main)@IMGREL # UnwindMap
+; CHECK-NEXT: .long $stateUnwindMap$main at IMGREL # UnwindMap
; CHECK-NEXT: .long 2 # NumTryBlocks
-; CHECK-NEXT: .long ($tryMap$main)@IMGREL # TryBlockMap
+; CHECK-NEXT: .long $tryMap$main at IMGREL # TryBlockMap
; CHECK-NEXT: .long 5 # IPMapEntries
-; CHECK-NEXT: .long ($ip2state$main)@IMGREL # IPToStateXData
+; CHECK-NEXT: .long $ip2state$main at IMGREL # IPToStateXData
; CHECK-NEXT: .long 32 # UnwindHelp
; CHECK-NEXT: .long 0 # ESTypeList
; CHECK-NEXT: .long 1 # EHFlags
@@ -33,12 +33,12 @@
; CHECK-NEXT: .long 1 # TryHigh
; CHECK-NEXT: .long 2 # CatchHigh
; CHECK-NEXT: .long 1 # NumCatches
-; CHECK-NEXT: .long ($handlerMap$0$main)@IMGREL # HandlerArray
+; CHECK-NEXT: .long $handlerMap$0$main at IMGREL # HandlerArray
; CHECK-NEXT: .long 0 # TryLow
; CHECK-NEXT: .long 2 # TryHigh
; CHECK-NEXT: .long 3 # CatchHigh
; CHECK-NEXT: .long 1 # NumCatches
-; CHECK-NEXT: .long ($handlerMap$1$main)@IMGREL # HandlerArray
+; CHECK-NEXT: .long $handlerMap$1$main at IMGREL # HandlerArray
; CHECK: $handlerMap$0$main:
; CHECK-NEXT: .long 0 # Adjectives
diff --git a/llvm/test/CodeGen/X86/dollar-name.ll b/llvm/test/CodeGen/X86/dollar-name.ll
index bc8cf5fb46537..fc9d6a77f66e5 100644
--- a/llvm/test/CodeGen/X86/dollar-name.ll
+++ b/llvm/test/CodeGen/X86/dollar-name.ll
@@ -5,9 +5,9 @@
@"$qux" = external dso_local global i32
define i32 @"$foo"() nounwind {
-; CHECK: movl ($bar),
-; CHECK: addl ($qux),
-; CHECK: calll ($hen)
+; CHECK: movl $bar,
+; CHECK: addl $qux,
+; CHECK: calll $hen
%m = load i32, ptr @"$bar"
%n = load i32, ptr @"$qux"
%t = add i32 %m, %n
diff --git a/llvm/test/CodeGen/X86/seh-unwind-inline-asm-codegen.ll b/llvm/test/CodeGen/X86/seh-unwind-inline-asm-codegen.ll
index 63a3188aaad7b..2c576df1b7549 100644
--- a/llvm/test/CodeGen/X86/seh-unwind-inline-asm-codegen.ll
+++ b/llvm/test/CodeGen/X86/seh-unwind-inline-asm-codegen.ll
@@ -42,11 +42,11 @@ declare dso_local void @printf(ptr, ...)
; CHECK-LABEL: $cppxdata$test:
; CHECK-NEXT: .long 429065506 # MagicNumber
; CHECK-NEXT: .long 1 # MaxState
-; CHECK-NEXT: .long ($stateUnwindMap$test)@IMGREL # UnwindMap
+; CHECK-NEXT: .long $stateUnwindMap$test at IMGREL # UnwindMap
; CHECK-NEXT: .long 0 # NumTryBlocks
; CHECK-NEXT: .long 0 # TryBlockMap
; CHECK-NEXT: .long 3 # IPMapEntries
-; CHECK-NEXT: .long ($ip2state$test)@IMGREL # IPToStateXData
+; CHECK-NEXT: .long $ip2state$test at IMGREL # IPToStateXData
; CHECK-NEXT: .long 40 # UnwindHelp
; CHECK-NEXT: .long 0 # ESTypeList
; CHECK-NEXT: .long 1 # EHFlags
diff --git a/llvm/test/CodeGen/X86/stack-coloring-wineh.ll b/llvm/test/CodeGen/X86/stack-coloring-wineh.ll
index 198f1bf198620..e2de2ff4a392e 100644
--- a/llvm/test/CodeGen/X86/stack-coloring-wineh.ll
+++ b/llvm/test/CodeGen/X86/stack-coloring-wineh.ll
@@ -96,7 +96,7 @@ define void @pr66984(ptr %arg) personality ptr @__CxxFrameHandler3 {
; X86_64-NEXT: .seh_endepilogue
; X86_64-NEXT: retq
; X86_64-NEXT: .seh_handlerdata
-; X86_64-NEXT: .long ($cppxdata$pr66984)@IMGREL
+; X86_64-NEXT: .long $cppxdata$pr66984 at IMGREL
; X86_64-NEXT: .text
; X86_64-NEXT: .seh_endproc
; X86_64-NEXT: .def "?catch$2@?0?pr66984 at 4HA";
@@ -124,7 +124,7 @@ define void @pr66984(ptr %arg) personality ptr @__CxxFrameHandler3 {
; X86_64-NEXT: .seh_endepilogue
; X86_64-NEXT: retq # CATCHRET
; X86_64-NEXT: .seh_handlerdata
-; X86_64-NEXT: .long ($cppxdata$pr66984)@IMGREL
+; X86_64-NEXT: .long $cppxdata$pr66984 at IMGREL
; X86_64-NEXT: .text
; X86_64-NEXT: .seh_endproc
; X86_64-NEXT: .def "?dtor$4@?0?pr66984 at 4HA";
diff --git a/llvm/test/CodeGen/X86/win-catchpad-nested-cxx.ll b/llvm/test/CodeGen/X86/win-catchpad-nested-cxx.ll
index b5d914153ffd3..bfb9c43b3fd16 100644
--- a/llvm/test/CodeGen/X86/win-catchpad-nested-cxx.ll
+++ b/llvm/test/CodeGen/X86/win-catchpad-nested-cxx.ll
@@ -48,14 +48,14 @@ handler2:
; X64-LABEL: $cppxdata$try_in_catch:
; CHECK-NEXT: .long 429065506
; CHECK-NEXT: .long 4
-; CHECK-NEXT: .long ($stateUnwindMap$try_in_catch)
+; CHECK-NEXT: .long $stateUnwindMap$try_in_catch
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long ($tryMap$try_in_catch)
+; CHECK-NEXT: .long $tryMap$try_in_catch
; ip2state num + ptr
; X86-NEXT: .long 0
; X86-NEXT: .long 0
; X64-NEXT: .long 7
-; X64-NEXT: .long ($ip2state$try_in_catch)
+; X64-NEXT: .long $ip2state$try_in_catch
; unwindhelp offset
; X64-NEXT: .long 40
; CHECK-NEXT: .long 0
@@ -67,24 +67,24 @@ handler2:
; X86-NEXT: .long 2
; X86-NEXT: .long 3
; X86-NEXT: .long 1
-; X86-NEXT: .long ($handlerMap$0$try_in_catch)
+; X86-NEXT: .long $handlerMap$0$try_in_catch
; X86-NEXT: .long 0
; X86-NEXT: .long 0
; X86-NEXT: .long 3
; X86-NEXT: .long 1
-; X86-NEXT: .long ($handlerMap$1$try_in_catch)
+; X86-NEXT: .long $handlerMap$1$try_in_catch
; X64-LABEL: $tryMap$try_in_catch:
; X64-NEXT: .long 0
; X64-NEXT: .long 0
; X64-NEXT: .long 3
; X64-NEXT: .long 1
-; X64-NEXT: .long ($handlerMap$0$try_in_catch)
+; X64-NEXT: .long $handlerMap$0$try_in_catch
; X64-NEXT: .long 2
; X64-NEXT: .long 2
; X64-NEXT: .long 3
; X64-NEXT: .long 1
-; X64-NEXT: .long ($handlerMap$1$try_in_catch)
+; X64-NEXT: .long $handlerMap$1$try_in_catch
; CHECK: $handlerMap$0$try_in_catch:
; CHECK-NEXT: .long 64
diff --git a/llvm/test/CodeGen/X86/win-catchpad.ll b/llvm/test/CodeGen/X86/win-catchpad.ll
index ceca37710e9ec..249194610e9f8 100644
--- a/llvm/test/CodeGen/X86/win-catchpad.ll
+++ b/llvm/test/CodeGen/X86/win-catchpad.ll
@@ -183,11 +183,11 @@ try.cont:
; X64: $cppxdata$try_catch_catch:
; X64-NEXT: .long 429065506
; X64-NEXT: .long 2
-; X64-NEXT: .long ($stateUnwindMap$try_catch_catch)@IMGREL
+; X64-NEXT: .long $stateUnwindMap$try_catch_catch at IMGREL
; X64-NEXT: .long 1
-; X64-NEXT: .long ($tryMap$try_catch_catch)@IMGREL
+; X64-NEXT: .long $tryMap$try_catch_catch at IMGREL
; X64-NEXT: .long 5
-; X64-NEXT: .long ($ip2state$try_catch_catch)@IMGREL
+; X64-NEXT: .long $ip2state$try_catch_catch at IMGREL
; X64-NEXT: .long 48
; X64-NEXT: .long 0
; X64-NEXT: .long 1
@@ -197,7 +197,7 @@ try.cont:
; X64-NEXT: .long 0
; X64-NEXT: .long 1
; X64-NEXT: .long 2
-; X64-NEXT: .long ($handlerMap$0$try_catch_catch)@IMGREL
+; X64-NEXT: .long $handlerMap$0$try_catch_catch at IMGREL
; X64: $handlerMap$0$try_catch_catch:
; X64-NEXT: .long 0
@@ -325,11 +325,11 @@ try.cont:
; X64-LABEL: $cppxdata$branch_to_normal_dest:
; X64-NEXT: .long 429065506
; X64-NEXT: .long 2
-; X64-NEXT: .long ($stateUnwindMap$branch_to_normal_dest)@IMGREL
+; X64-NEXT: .long $stateUnwindMap$branch_to_normal_dest at IMGREL
; X64-NEXT: .long 1
-; X64-NEXT: .long ($tryMap$branch_to_normal_dest)@IMGREL
+; X64-NEXT: .long $tryMap$branch_to_normal_dest at IMGREL
; X64-NEXT: .long 4
-; X64-NEXT: .long ($ip2state$branch_to_normal_dest)@IMGREL
+; X64-NEXT: .long $ip2state$branch_to_normal_dest at IMGREL
; X64-NEXT: .long 40
; X64-NEXT: .long 0
; X64-NEXT: .long 1
@@ -345,7 +345,7 @@ try.cont:
; X64-NEXT: .long 0
; X64-NEXT: .long 1
; X64-NEXT: .long 1
-; X64-NEXT: .long ($handlerMap$0$branch_to_normal_dest)@IMGREL
+; X64-NEXT: .long $handlerMap$0$branch_to_normal_dest at IMGREL
; X64-LABEL: $handlerMap$0$branch_to_normal_dest:
; X64-NEXT: .long 64
diff --git a/llvm/test/CodeGen/X86/win-cleanuppad.ll b/llvm/test/CodeGen/X86/win-cleanuppad.ll
index 452f0a8e36d8d..e3f7f5be0049e 100644
--- a/llvm/test/CodeGen/X86/win-cleanuppad.ll
+++ b/llvm/test/CodeGen/X86/win-cleanuppad.ll
@@ -39,11 +39,11 @@ ehcleanup: ; preds = %entry
; CHECK: $cppxdata$simple_cleanup:
; CHECK-NEXT: .long 429065506
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long ($stateUnwindMap$simple_cleanup)@IMGREL
+; CHECK-NEXT: .long $stateUnwindMap$simple_cleanup at IMGREL
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 3
-; CHECK-NEXT: .long ($ip2state$simple_cleanup)@IMGREL
+; CHECK-NEXT: .long $ip2state$simple_cleanup at IMGREL
; UnwindHelp offset should match the -2 store above
; CHECK-NEXT: .long 40
; CHECK-NEXT: .long 0
@@ -114,7 +114,7 @@ cleanup.outer: ; preds = %invoke.cont.1, %c
; X86: L__ehtable$nested_cleanup:
; X86: .long 429065506
; X86: .long 2
-; X86: .long ($stateUnwindMap$nested_cleanup)
+; X86: .long $stateUnwindMap$nested_cleanup
; X86: .long 0
; X86: .long 0
; X86: .long 0
@@ -167,11 +167,11 @@ cleanup.outer: ; preds = %invoke.cont.1, %c
; X64: $cppxdata$nested_cleanup:
; X64-NEXT: .long 429065506
; X64-NEXT: .long 2
-; X64-NEXT: .long ($stateUnwindMap$nested_cleanup)@IMGREL
+; X64-NEXT: .long $stateUnwindMap$nested_cleanup at IMGREL
; X64-NEXT: .long 0
; X64-NEXT: .long 0
; X64-NEXT: .long 5
-; X64-NEXT: .long ($ip2state$nested_cleanup)@IMGREL
+; X64-NEXT: .long $ip2state$nested_cleanup at IMGREL
; X64-NEXT: .long 56
; X64-NEXT: .long 0
; X64-NEXT: .long 1
diff --git a/llvm/test/CodeGen/X86/win-funclet-cfi.ll b/llvm/test/CodeGen/X86/win-funclet-cfi.ll
index f9a1e2f0d2880..96b55772e05e4 100644
--- a/llvm/test/CodeGen/X86/win-funclet-cfi.ll
+++ b/llvm/test/CodeGen/X86/win-funclet-cfi.ll
@@ -61,7 +61,7 @@ declare i32 @__CxxFrameHandler3(...)
; Don't emit a reference to the LSDA.
; CHECK: .seh_handlerdata
-; CHECK-NOT: .long ("$cppxdata$?f@@YAXXZ")@IMGREL
+; CHECK-NOT: .long "$cppxdata$?f@@YAXXZ"@IMGREL
; CHECK-NEXT: .text
; CHECK: .seh_endproc
@@ -92,6 +92,6 @@ declare i32 @__CxxFrameHandler3(...)
; Emit a reference to the LSDA.
; CHECK: .seh_handlerdata
-; CHECK-NEXT: .long ("$cppxdata$?f@@YAXXZ")@IMGREL
+; CHECK-NEXT: .long "$cppxdata$?f@@YAXXZ"@IMGREL
; CHECK-NEXT: .text
; CHECK: .seh_endproc
diff --git a/llvm/test/CodeGen/X86/win32-eh.ll b/llvm/test/CodeGen/X86/win32-eh.ll
index d3d19ede546d6..857df9882be47 100644
--- a/llvm/test/CodeGen/X86/win32-eh.ll
+++ b/llvm/test/CodeGen/X86/win32-eh.ll
@@ -201,9 +201,9 @@ catch:
; CHECK-LABEL: L__ehtable$use_CxxFrameHandler3:
; CHECK-NEXT: .long 429065506
; CHECK-NEXT: .long 2
-; CHECK-NEXT: .long ($stateUnwindMap$use_CxxFrameHandler3)
+; CHECK-NEXT: .long $stateUnwindMap$use_CxxFrameHandler3
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long ($tryMap$use_CxxFrameHandler3)
+; CHECK-NEXT: .long $tryMap$use_CxxFrameHandler3
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 0
; CHECK-NEXT: .long 0
diff --git a/llvm/test/CodeGen/X86/windows-seh-EHa-CppCatchDotDotDot.ll b/llvm/test/CodeGen/X86/windows-seh-EHa-CppCatchDotDotDot.ll
index 944ffab24a5d1..785c2606186a6 100644
--- a/llvm/test/CodeGen/X86/windows-seh-EHa-CppCatchDotDotDot.ll
+++ b/llvm/test/CodeGen/X86/windows-seh-EHa-CppCatchDotDotDot.ll
@@ -1,10 +1,10 @@
; RUN: llc -verify-machineinstrs < %s | FileCheck %s
; CHECK-LABEL: "$cppxdata$?crash@@YAXH at Z":
-; CHECK: .long ("$stateUnwindMap$?crash@@YAXH at Z")
-; CHECK: .long ("$tryMap$?crash@@YAXH at Z")@IMGREL # TryBlockMap
+; CHECK: .long "$stateUnwindMap$?crash@@YAXH at Z"
+; CHECK: .long "$tryMap$?crash@@YAXH at Z"@IMGREL # TryBlockMap
; CHECK-NEXT: .long 6 # IPMapEntries
-; CHECK-NEXT: .long ("$ip2state$?crash@@YAXH at Z")
+; CHECK-NEXT: .long "$ip2state$?crash@@YAXH at Z"
; CHECK-LABEL: "$stateUnwindMap$?crash@@YAXH at Z":
; CHECK-NEXT: .long -1
@@ -19,7 +19,7 @@
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 2
; CHECK-NEXT: .long 1
-; CHECK-NEXT: .long ("$handlerMap$
+; CHECK-NEXT: .long "$handlerMap$
; CHECK: "$handlerMap$0$?crash@@YAXH at Z"
; CHECK-NEXT: .long 0
diff --git a/llvm/test/CodeGen/X86/windows-seh-EHa-CppDtors01.ll b/llvm/test/CodeGen/X86/windows-seh-EHa-CppDtors01.ll
index 54c1d838a30fd..6c6e9c3b66804 100644
--- a/llvm/test/CodeGen/X86/windows-seh-EHa-CppDtors01.ll
+++ b/llvm/test/CodeGen/X86/windows-seh-EHa-CppDtors01.ll
@@ -1,8 +1,8 @@
; RUN: llc -verify-machineinstrs < %s | FileCheck %s
; CHECK-LABEL: "$cppxdata$?crash@@YAXH at Z":
-; CHECK: .long ("$stateUnwindMap$?crash@@YAXH at Z")
-; CHECK: .long ("$ip2state$?crash@@YAXH at Z")
+; CHECK: .long "$stateUnwindMap$?crash@@YAXH at Z"
+; CHECK: .long "$ip2state$?crash@@YAXH at Z"
; CHECK-LABEL: "$stateUnwindMap$?crash@@YAXH at Z":
; CHECK: .long -1
diff --git a/llvm/test/DebugInfo/COFF/jump-table.ll b/llvm/test/DebugInfo/COFF/jump-table.ll
index a8039809c8b77..3eda2438ea88a 100644
--- a/llvm/test/DebugInfo/COFF/jump-table.ll
+++ b/llvm/test/DebugInfo/COFF/jump-table.ll
@@ -58,7 +58,7 @@
; CHECK: {{\.?}}LJTI0_0:
; I686-NEXT: .long LBB0_[[#]]
; X64-NEXT: .long .LBB0_[[#]]-.LJTI0_0
-; A32-NEXT: .byte (($MBB0_[[#]])-(.LCPI0_0+4))/2
+; A32-NEXT: .byte ($MBB0_[[#]]-(.LCPI0_0+4))/2
; A64-NEXT: .byte (.LBB0_[[FIRSTBLOCK:[0-9]+]]-.LBB0_[[FIRSTBLOCK]])>>2
; NOTE: thumbv7a places the jump tables just after the branch, so check for the other branch now
; A32: .LCPI0_1:
@@ -66,7 +66,7 @@
; CHECK: {{\.?}}LJTI0_1:
; I686-NEXT: .long LBB0_[[#]]
; X64-NEXT: .long .LBB0_[[#]]-.LJTI0_1
-; A32-NEXT: .byte (($MBB0_[[#]])-(.LCPI0_1+4))/2
+; A32-NEXT: .byte ($MBB0_[[#]]-(.LCPI0_1+4))/2
; A64-NEXT: .byte (.LBB0_[[SECONDBLOCK:[0-9]+]]-.LBB0_[[SECONDBLOCK]])>>2
; Verify CodeView
diff --git a/llvm/test/MC/ARM/arm-branches.s b/llvm/test/MC/ARM/arm-branches.s
index e18fa5de12584..5af5a28612ac1 100644
--- a/llvm/test/MC/ARM/arm-branches.s
+++ b/llvm/test/MC/ARM/arm-branches.s
@@ -28,13 +28,13 @@
bl $4
beq $4 + 4
-@ CHECK: b ($foo) @ encoding: [A,A,A,0xea]
-@ CHECK: bl ($foo) @ encoding: [A,A,A,0xeb]
-@ CHECK: beq ($foo) @ encoding: [A,A,A,0x0a]
-@ CHECK: blx ($foo) @ encoding: [A,A,A,0xfa]
-@ CHECK: b #($foo)+4 @ encoding: [A,A,A,0xea]
-@ CHECK: bl ($4) @ encoding: [A,A,A,0xeb]
-@ CHECK: beq #($4)+4 @ encoding: [A,A,A,0x0a]
+@ CHECK: b $foo @ encoding: [A,A,A,0xea]
+@ CHECK: bl $foo @ encoding: [A,A,A,0xeb]
+@ CHECK: beq $foo @ encoding: [A,A,A,0x0a]
+@ CHECK: blx $foo @ encoding: [A,A,A,0xfa]
+@ CHECK: b #$foo+4 @ encoding: [A,A,A,0xea]
+@ CHECK: bl $4 @ encoding: [A,A,A,0xeb]
+@ CHECK: beq #$4+4 @ encoding: [A,A,A,0x0a]
@------------------------------------------------------------------------------
@ Leading '$' should be allowed to introduce an expression
diff --git a/llvm/test/MC/AsmParser/dollars-in-identifiers.s b/llvm/test/MC/AsmParser/dollars-in-identifiers.s
index e56959062ad9d..2fd35535d356f 100644
--- a/llvm/test/MC/AsmParser/dollars-in-identifiers.s
+++ b/llvm/test/MC/AsmParser/dollars-in-identifiers.s
@@ -3,5 +3,5 @@
// CHECK: .globl $foo
.globl $foo
-// CHECK: .long ($foo)
+// CHECK: .long $foo
.long ($foo)
diff --git a/llvm/test/MC/MachO/dollar-identifier.s b/llvm/test/MC/MachO/dollar-identifier.s
index ca6993f7f4040..7eff63354b660 100644
--- a/llvm/test/MC/MachO/dollar-identifier.s
+++ b/llvm/test/MC/MachO/dollar-identifier.s
@@ -1,4 +1,4 @@
// RUN: llvm-mc -triple x86_64-apple-darwin10 %s | FileCheck %s
.long $1
-// CHECK: .long ($1)
+// CHECK: .long $1
diff --git a/llvm/test/MC/Mips/expansion-jal-sym-pic.s b/llvm/test/MC/Mips/expansion-jal-sym-pic.s
index c7b5ccc1880bd..6f1b7c9d81b42 100644
--- a/llvm/test/MC/Mips/expansion-jal-sym-pic.s
+++ b/llvm/test/MC/Mips/expansion-jal-sym-pic.s
@@ -55,7 +55,7 @@ local_label:
# O32: # fixup A - offset: 0, value: %got(local_label), kind: fixup_Mips_GOT
# O32: addiu $25, $25, %lo(local_label) # encoding: [0x27,0x39,A,A]
# O32: # fixup A - offset: 0, value: %lo(local_label), kind: fixup_Mips_LO16
-# O32-NEXT: .reloc ($tmp0), R_MIPS_JALR, local_label
+# O32-NEXT: .reloc $tmp0, R_MIPS_JALR, local_label
# ELF-O32: 8f 99 00 00 lw $25, 0($gp)
# ELF-O32-NEXT: R_MIPS_GOT16 .text
@@ -68,7 +68,7 @@ local_label:
# XO32-NEXT: # fixup A - offset: 0, value: %got(local_label), kind: fixup_Mips_GOT
# XO32-NEXT: addiu $25, $25, %lo(local_label) # encoding: [0x27,0x39,A,A]
# XO32-NEXT: # fixup A - offset: 0, value: %lo(local_label), kind: fixup_Mips_LO16
-# XO32-NEXT: .reloc ($tmp0), R_MIPS_JALR, local_label
+# XO32-NEXT: .reloc $tmp0, R_MIPS_JALR, local_label
# ELF-XO32: 8f 99 00 00 lw $25, 0($gp)
# ELF-XO32-NEXT: R_MIPS_GOT16 .text
@@ -117,7 +117,7 @@ local_label:
# O32-MM: # fixup A - offset: 0, value: %got(local_label), kind: fixup_MICROMIPS_GOT16
# O32-MM: addiu $25, $25, %lo(local_label) # encoding: [0x33,0x39,A,A]
# O32-MM: # fixup A - offset: 0, value: %lo(local_label), kind: fixup_MICROMIPS_LO16
-# O32-MM-NEXT: .reloc ($tmp0), R_MICROMIPS_JALR, local_label
+# O32-MM-NEXT: .reloc $tmp0, R_MICROMIPS_JALR, local_label
# MIPS: jalr $25 # encoding: [0x03,0x20,0xf8,0x09]
# MM: jalr $ra, $25 # encoding: [0x03,0xf9,0x0f,0x3c]
@@ -212,7 +212,7 @@ local_label:
# Expanding "jal weak_label":
# O32: lw $25, %call16(weak_label)($gp) # encoding: [0x8f,0x99,A,A]
# O32: # fixup A - offset: 0, value: %call16(weak_label), kind: fixup_Mips_CALL16
-# O32-NEXT: .reloc ($tmp1), R_MIPS_JALR, weak_label
+# O32-NEXT: .reloc $tmp1, R_MIPS_JALR, weak_label
# ELF-O32: 8f 99 00 00 lw $25, 0($gp)
# ELF-O32-NEXT: R_MIPS_CALL16 weak_label
@@ -224,7 +224,7 @@ local_label:
# XO32-NEXT: addu $25, $25, $gp # encoding: [0x03,0x3c,0xc8,0x21]
# XO32-NEXT: lw $25, %call_lo(weak_label)($25) # encoding: [0x8f,0x39,A,A]
# XO32-NEXT: # fixup A - offset: 0, value: %call_lo(weak_label), kind: fixup_Mips_CALL_LO16
-# XO32-NEXT: .reloc ($tmp1), R_MIPS_JALR, weak_label
+# XO32-NEXT: .reloc $tmp1, R_MIPS_JALR, weak_label
# ELF-XO32: 3c 19 00 00 lui $25, 0
# ELF-XO32-MEXT: R_MIPS_CALL_HI16 weak_label
@@ -284,7 +284,7 @@ local_label:
# O32-MM: lw $25, %call16(weak_label)($gp) # encoding: [0xff,0x3c,A,A]
# O32-MM: # fixup A - offset: 0, value: %call16(weak_label), kind: fixup_MICROMIPS_CALL16
-# O32-MM-NEXT: .reloc ($tmp1), R_MICROMIPS_JALR, weak_label
+# O32-MM-NEXT: .reloc $tmp1, R_MICROMIPS_JALR, weak_label
# MIPS: jalr $25 # encoding: [0x03,0x20,0xf8,0x09]
# MM: jalr $ra, $25 # encoding: [0x03,0xf9,0x0f,0x3c]
@@ -392,7 +392,7 @@ local_label:
# Expanding "jal global_label":
# O32: lw $25, %call16(global_label)($gp) # encoding: [0x8f,0x99,A,A]
# O32-NEXT: # fixup A - offset: 0, value: %call16(global_label), kind: fixup_Mips_CALL16
-# O32-NEXT: .reloc ($tmp2), R_MIPS_JALR, global_label
+# O32-NEXT: .reloc $tmp2, R_MIPS_JALR, global_label
# ELF-O32: 8f 99 00 00 lw $25, 0($gp)
# ELF-O32-NEXT: R_MIPS_CALL16 global_label
@@ -404,7 +404,7 @@ local_label:
# XO32-NEXT: addu $25, $25, $gp # encoding: [0x03,0x3c,0xc8,0x21]
# XO32-NEXT: lw $25, %call_lo(global_label)($25) # encoding: [0x8f,0x39,A,A]
# XO32-NEXT: # fixup A - offset: 0, value: %call_lo(global_label), kind: fixup_Mips_CALL_LO16
-# XO32-NEXT: .reloc ($tmp2), R_MIPS_JALR, global_label
+# XO32-NEXT: .reloc $tmp2, R_MIPS_JALR, global_label
# ELF-XO32: 3c 19 00 00 lui $25, 0
# ELF-XO32-NEXT: R_MIPS_CALL_HI16 global_label
@@ -464,7 +464,7 @@ local_label:
# O32-MM: lw $25, %call16(global_label)($gp) # encoding: [0xff,0x3c,A,A]
# O32-MM-NEXT: # fixup A - offset: 0, value: %call16(global_label), kind: fixup_MICROMIPS_CALL16
-# O32-MM-NEXT: .reloc ($tmp2), R_MICROMIPS_JALR, global_label
+# O32-MM-NEXT: .reloc $tmp2, R_MICROMIPS_JALR, global_label
# MIPS: jalr $25 # encoding: [0x03,0x20,0xf8,0x09]
# MM: jalr $ra, $25 # encoding: [0x03,0xf9,0x0f,0x3c]
@@ -580,7 +580,7 @@ local_label:
# XO32-NEXT: # fixup A - offset: 0, value: %got(.text), kind: fixup_Mips_GOT
# XO32-NEXT: addiu $25, $25, %lo(.text) # encoding: [0x27,0x39,A,A]
# XO32-NEXT: # fixup A - offset: 0, value: %lo(.text), kind: fixup_Mips_LO16
-# XO32-NEXT: .reloc ($tmp3), R_MIPS_JALR, .text
+# XO32-NEXT: .reloc $tmp3, R_MIPS_JALR, .text
# ELF-XO32: 8f 99 00 00 lw $25, 0($gp)
# ELF-XO32-NEXT: R_MIPS_GOT16 .text
@@ -623,7 +623,7 @@ local_label:
# O32-MM-NEXT: # fixup A - offset: 0, value: %got(.text), kind: fixup_MICROMIPS_GOT16
# O32-MM-NEXT: addiu $25, $25, %lo(.text) # encoding: [0x33,0x39,A,A]
# O32-MM-NEXT: # fixup A - offset: 0, value: %lo(.text), kind: fixup_MICROMIPS_LO16
-# O42-MM-NEXT: .reloc ($tmp3), R_MICROMIPS_JALR, .text
+# O42-MM-NEXT: .reloc $tmp3, R_MICROMIPS_JALR, .text
# MIPS: jalr $25 # encoding: [0x03,0x20,0xf8,0x09]
# MM: jalr $ra, $25 # encoding: [0x03,0xf9,0x0f,0x3c]
@@ -689,7 +689,7 @@ local_label:
# O32-MM-NEXT: # fixup A - offset: 0, value: %got(.text+8), kind: fixup_MICROMIPS_GOT16
# O32-MM-NEXT: addiu $25, $25, %lo(.text+8) # encoding: [0x33,0x39,A,A]
# O32-MM-NEXT: # fixup A - offset: 0, value: %lo(.text+8), kind: fixup_MICROMIPS_LO16
-# O42-MM-NEXT: .reloc ($tmp4), R_MICROMIPS_JALR, .text
+# O42-MM-NEXT: .reloc $tmp4, R_MICROMIPS_JALR, .text
# MIPS: jalr $25 # encoding: [0x03,0x20,0xf8,0x09]
# MM: jalr $ra, $25 # encoding: [0x03,0xf9,0x0f,0x3c]
@@ -704,7 +704,7 @@ local_label:
# O32-NEXT: # fixup A - offset: 0, value: %got($tmp4), kind: fixup_Mips_GOT
# O32-NEXT: addiu $25, $25, %lo($tmp4) # encoding: [0x27,0x39,A,A]
# O32-NEXT: # fixup A - offset: 0, value: %lo($tmp4), kind: fixup_Mips_LO16
-# O32-NEXT: .reloc ($tmp5), R_MIPS_JALR, ($tmp4)
+# O32-NEXT: .reloc $tmp5, R_MIPS_JALR, $tmp4
# ELF-O32: 8f 99 00 00 lw $25, 0($gp)
# ELF-O32-NEXT: R_MIPS_GOT16 .text
@@ -717,7 +717,7 @@ local_label:
# XO32-NEXT: # fixup A - offset: 0, value: %got($tmp4), kind: fixup_Mips_GOT
# XO32-NEXT: addiu $25, $25, %lo($tmp4) # encoding: [0x27,0x39,A,A]
# XO32-NEXT: # fixup A - offset: 0, value: %lo($tmp4), kind: fixup_Mips_LO16
-# XO32-NEXT: .reloc ($tmp5), R_MIPS_JALR, ($tmp4)
+# XO32-NEXT: .reloc $tmp5, R_MIPS_JALR, $tmp4
# ELF-XO32: 8f 99 00 00 lw $25, 0($gp)
# ELF-XO32-NEXT: R_MIPS_GOT16 .text
@@ -760,7 +760,7 @@ local_label:
# O32-MM-NEXT: # fixup A - offset: 0, value: %got($tmp4), kind: fixup_MICROMIPS_GOT16
# O32-MM-NEXT: addiu $25, $25, %lo($tmp4) # encoding: [0x33,0x39,A,A]
# O32-MM-NEXT: # fixup A - offset: 0, value: %lo($tmp4), kind: fixup_MICROMIPS_LO16
-# O32-MM-NEXT: .reloc ($tmp5), R_MICROMIPS_JALR, ($tmp4)
+# O32-MM-NEXT: .reloc $tmp5, R_MICROMIPS_JALR, $tmp4
# MIPS: jalr $25 # encoding: [0x03,0x20,0xf8,0x09]
# MM: jalr $ra, $25 # encoding: [0x03,0xf9,0x0f,0x3c]
@@ -769,10 +769,10 @@ local_label:
jal 1f+8
nop
-# O32: lw $25, %got(($tmp4)+8)($gp) # encoding: [0x8f,0x99,A,A]
-# O32-NEXT: # fixup A - offset: 0, value: %got(($tmp4)+8), kind: fixup_Mips_GOT
-# O32-NEXT: addiu $25, $25, %lo(($tmp4)+8) # encoding: [0x27,0x39,A,A]
-# O32-NEXT: # fixup A - offset: 0, value: %lo(($tmp4)+8), kind: fixup_Mips_LO16
+# O32: lw $25, %got($tmp4+8)($gp) # encoding: [0x8f,0x99,A,A]
+# O32-NEXT: # fixup A - offset: 0, value: %got($tmp4+8), kind: fixup_Mips_GOT
+# O32-NEXT: addiu $25, $25, %lo($tmp4+8) # encoding: [0x27,0x39,A,A]
+# O32-NEXT: # fixup A - offset: 0, value: %lo($tmp4+8), kind: fixup_Mips_LO16
# O32-NOT: .reloc
# ELF-O32: 8f 99 00 00 lw $25, 0($gp)
@@ -782,10 +782,10 @@ local_label:
# ELF-O32-NEXT: 03 20 f8 09 jalr $25
# ELF-O32-NEXT: 00 00 00 00 nop
-# XO32: lw $25, %got(($tmp4)+8)($gp) # encoding: [0x8f,0x99,A,A]
-# XO32-NEXT: # fixup A - offset: 0, value: %got(($tmp4)+8), kind: fixup_Mips_GOT
-# XO32-NEXT: addiu $25, $25, %lo(($tmp4)+8) # encoding: [0x27,0x39,A,A]
-# XO32-NEXT: # fixup A - offset: 0, value: %lo(($tmp4)+8), kind: fixup_Mips_LO16
+# XO32: lw $25, %got($tmp4+8)($gp) # encoding: [0x8f,0x99,A,A]
+# XO32-NEXT: # fixup A - offset: 0, value: %got($tmp4+8), kind: fixup_Mips_GOT
+# XO32-NEXT: addiu $25, $25, %lo($tmp4+8) # encoding: [0x27,0x39,A,A]
+# XO32-NEXT: # fixup A - offset: 0, value: %lo($tmp4+8), kind: fixup_Mips_LO16
# XO32-NOT: .reloc
# ELF-XO32: 8f 99 00 00 lw $25, 0($gp)
@@ -829,10 +829,10 @@ local_label:
# ELF-XN64-NEXT: 03 20 f8 09 jalr $25
# ELF-XN64-NEXT: R_MIPS_JALR/R_MIPS_NONE/R_MIPS_NONE .Ltmp0
-# O32-MM: lw $25, %got(($tmp4)+8)($gp) # encoding: [0xff,0x3c,A,A]
-# O32-MM-NEXT: # fixup A - offset: 0, value: %got(($tmp4)+8), kind: fixup_MICROMIPS_GOT16
-# O32-MM-NEXT: addiu $25, $25, %lo(($tmp4)+8) # encoding: [0x33,0x39,A,A]
-# O32-MM-NEXT: # fixup A - offset: 0, value: %lo(($tmp4)+8), kind: fixup_MICROMIPS_LO16
+# O32-MM: lw $25, %got($tmp4+8)($gp) # encoding: [0xff,0x3c,A,A]
+# O32-MM-NEXT: # fixup A - offset: 0, value: %got($tmp4+8), kind: fixup_MICROMIPS_GOT16
+# O32-MM-NEXT: addiu $25, $25, %lo($tmp4+8) # encoding: [0x33,0x39,A,A]
+# O32-MM-NEXT: # fixup A - offset: 0, value: %lo($tmp4+8), kind: fixup_MICROMIPS_LO16
# O32-MM-NOT: .reloc
# MIPS: jalr $25 # encoding: [0x03,0x20,0xf8,0x09]
@@ -848,7 +848,7 @@ local_label:
# O32-FIXME: # fixup A - offset: 0, value: %got(forward_local), kind: fixup_Mips_GOT
# O32-FIXME: addiu $25, $25, %lo(forward_local) # encoding: [0x27,0x39,A,A]
# O32-FIXME:: # fixup A - offset: 0, value: %lo(forward_local), kind: fixup_Mips_LO16
-# O32-FIXME: .reloc ($tmp6), R_MIPS_JALR, forward_local
+# O32-FIXME: .reloc $tmp6, R_MIPS_JALR, forward_local
# ELF-O32: 8f 99 00 00 lw $25, 0($gp)
# ELF-O32-NEXT: R_MIPS_GOT16 .text
@@ -873,7 +873,7 @@ local_label:
# O32-MM-FIXME: # fixup A - offset: 0, value: %got(forward_local), kind: fixup_MICROMIPS_GOT16
# O32-MM-FIXME: addiu $25, $25, %lo(forward_local) # encoding: [0x33,0x39,A,A]
# O32-MM-FIXME: # fixup A - offset: 0, value: %lo(forward_local), kind: fixup_MICROMIPS_LO16
-# O32-MM-FIXME: .reloc ($tmp6), R_MIPS_JALR, forward_local
+# O32-MM-FIXME: .reloc $tmp6, R_MIPS_JALR, forward_local
# MIPS: jalr $25 # encoding: [0x03,0x20,0xf8,0x09]
# MM: jalr $ra, $25 # encoding: [0x03,0xf9,0x0f,0x3c]
@@ -887,7 +887,7 @@ local_label:
# O32-FIXME: # fixup A - offset: 0, value: %got(forward_local+8), kind: fixup_Mips_GOT
# O32-FIXME: addiu $25, $25, %lo(forward_local+8) # encoding: [0x27,0x39,A,A]
# O32-FIXME:: # fixup A - offset: 0, value: %lo(forward_local+8), kind: fixup_Mips_LO16
-# O32-FIXME: .reloc ($tmp7), R_MIPS_JALR, forward_local
+# O32-FIXME: .reloc $tmp7, R_MIPS_JALR, forward_local
# ELF-O32: 8f 99 00 00 lw $25, 0($gp)
# ELF-O32-NEXT: R_MIPS_GOT16 .text
@@ -912,7 +912,7 @@ local_label:
# O32-MM-FIXME: # fixup A - offset: 0, value: %got(forward_local), kind: fixup_MICROMIPS_GOT16
# O32-MM-FIXME: addiu $25, $25, %lo(forward_local) # encoding: [0x33,0x39,A,A]
# O32-MM-FIXME: # fixup A - offset: 0, value: %lo(forward_local), kind: fixup_MICROMIPS_LO16
-# O32-MM-FIXME: .reloc ($tmp6), R_MIPS_JALR, forward_local
+# O32-MM-FIXME: .reloc $tmp6, R_MIPS_JALR, forward_local
# MIPS: jalr $25 # encoding: [0x03,0x20,0xf8,0x09]
# MM: jalr $ra, $25 # encoding: [0x03,0xf9,0x0f,0x3c]
diff --git a/llvm/test/MC/Mips/macro-div.s b/llvm/test/MC/Mips/macro-div.s
index 8ce30d745bcf5..884618b667894 100644
--- a/llvm/test/MC/Mips/macro-div.s
+++ b/llvm/test/MC/Mips/macro-div.s
@@ -5,16 +5,16 @@
div $25,$11
# CHECK-NOTRAP: bnez $11, $tmp0 # encoding: [0x15,0x60,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp0)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp0-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: div $zero, $25, $11 # encoding: [0x03,0x2b,0x00,0x1a]
# CHECK-NOTRAP: break 7 # encoding: [0x00,0x07,0x00,0x0d]
# CHECK-NOTRAP: $tmp0:
# CHECK-NOTRAP: addiu $1, $zero, -1 # encoding: [0x24,0x01,0xff,0xff]
# CHECK-NOTRAP: bne $11, $1, $tmp1 # encoding: [0x15,0x61,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp1)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp1-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: lui $1, 32768 # encoding: [0x3c,0x01,0x80,0x00]
# CHECK-NOTRAP: bne $25, $1, $tmp1 # encoding: [0x17,0x21,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp1)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp1-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-NOTRAP: break 6 # encoding: [0x00,0x06,0x00,0x0d]
# CHECK-NOTRAP: $tmp1:
@@ -23,7 +23,7 @@
# CHECK-TRAP: div $zero, $25, $11 # encoding: [0x03,0x2b,0x00,0x1a]
# CHECK-TRAP: addiu $1, $zero, -1 # encoding: [0x24,0x01,0xff,0xff]
# CHECK-TRAP: bne $11, $1, $tmp0 # encoding: [0x15,0x61,A,A]
-# CHECK-TRAP: # fixup A - offset: 0, value: ($tmp0)-4, kind: fixup_Mips_PC16
+# CHECK-TRAP: # fixup A - offset: 0, value: $tmp0-4, kind: fixup_Mips_PC16
# CHECK-TRAP: lui $1, 32768 # encoding: [0x3c,0x01,0x80,0x00]
# CHECK-TRAP: teq $25, $1, 6 # encoding: [0x03,0x21,0x01,0xb4]
# CHECK-TRAP: $tmp0:
@@ -31,16 +31,16 @@
div $24,$12
# CHECK-NOTRAP: bnez $12, $tmp2 # encoding: [0x15,0x80,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp2)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp2-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: div $zero, $24, $12 # encoding: [0x03,0x0c,0x00,0x1a]
# CHECK-NOTRAP: break 7 # encoding: [0x00,0x07,0x00,0x0d]
# CHECK-NOTRAP: $tmp2:
# CHECK-NOTRAP: addiu $1, $zero, -1 # encoding: [0x24,0x01,0xff,0xff]
# CHECK-NOTRAP: bne $12, $1, $tmp3 # encoding: [0x15,0x81,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp3)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp3-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: lui $1, 32768 # encoding: [0x3c,0x01,0x80,0x00]
# CHECK-NOTRAP: bne $24, $1, $tmp3 # encoding: [0x17,0x01,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp3)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp3-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-NOTRAP: break 6 # encoding: [0x00,0x06,0x00,0x0d]
# CHECK-NOTRAP: $tmp3:
@@ -49,7 +49,7 @@
# CHECK-TRAP: div $zero, $24, $12 # encoding: [0x03,0x0c,0x00,0x1a]
# CHECK-TRAP: addiu $1, $zero, -1 # encoding: [0x24,0x01,0xff,0xff]
# CHECK-TRAP: bne $12, $1, $tmp1 # encoding: [0x15,0x81,A,A]
-# CHECK-TRAP: # fixup A - offset: 0, value: ($tmp1)-4, kind: fixup_Mips_PC16
+# CHECK-TRAP: # fixup A - offset: 0, value: $tmp1-4, kind: fixup_Mips_PC16
# CHECK-TRAP: lui $1, 32768 # encoding: [0x3c,0x01,0x80,0x00]
# CHECK-TRAP: teq $24, $1, 6 # encoding: [0x03,0x01,0x01,0xb4]
# CHECK-TRAP: $tmp1:
@@ -127,16 +127,16 @@
div $4,$5,$6
# CHECK-NOTRAP: bnez $6, $tmp4 # encoding: [0x14,0xc0,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp4)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp4-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: div $zero, $5, $6 # encoding: [0x00,0xa6,0x00,0x1a]
# CHECK-NOTRAP: break 7 # encoding: [0x00,0x07,0x00,0x0d]
# CHECK-NOTRAP: $tmp4:
# CHECK-NOTRAP: addiu $1, $zero, -1 # encoding: [0x24,0x01,0xff,0xff]
# CHECK-NOTRAP: bne $6, $1, $tmp5 # encoding: [0x14,0xc1,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp5)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp5-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: lui $1, 32768 # encoding: [0x3c,0x01,0x80,0x00]
# CHECK-NOTRAP: bne $5, $1, $tmp5 # encoding: [0x14,0xa1,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp5)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp5-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-NOTRAP: break 6 # encoding: [0x00,0x06,0x00,0x0d]
# CHECK-NOTRAP: $tmp5:
@@ -145,7 +145,7 @@
# CHECK-TRAP: div $zero, $5, $6 # encoding: [0x00,0xa6,0x00,0x1a]
# CHECK-TRAP: addiu $1, $zero, -1 # encoding: [0x24,0x01,0xff,0xff]
# CHECK-TRAP: bne $6, $1, $tmp2 # encoding: [0x14,0xc1,A,A]
-# CHECK-TRAP: # fixup A - offset: 0, value: ($tmp2)-4, kind: fixup_Mips_PC16
+# CHECK-TRAP: # fixup A - offset: 0, value: $tmp2-4, kind: fixup_Mips_PC16
# CHECK-TRAP: lui $1, 32768 # encoding: [0x3c,0x01,0x80,0x00]
# CHECK-TRAP: teq $5, $1, 6 # encoding: [0x00,0xa1,0x01,0xb4]
# CHECK-TRAP: $tmp2:
diff --git a/llvm/test/MC/Mips/macro-divu.s b/llvm/test/MC/Mips/macro-divu.s
index a3e8ae067c747..8b4b3ea4dbec2 100644
--- a/llvm/test/MC/Mips/macro-divu.s
+++ b/llvm/test/MC/Mips/macro-divu.s
@@ -5,7 +5,7 @@
divu $25,$11
# CHECK-NOTRAP: bnez $11, $tmp0 # encoding: [0x15,0x60,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp0)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp0-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: divu $zero, $25, $11 # encoding: [0x03,0x2b,0x00,0x1b]
# CHECK-NOTRAP: break 7 # encoding: [0x00,0x07,0x00,0x0d]
# CHECK-NOTRAP: $tmp0:
@@ -13,7 +13,7 @@
divu $24,$12
# CHECK-NOTRAP: bnez $12, $tmp1 # encoding: [0x15,0x80,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp1)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp1-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: divu $zero, $24, $12 # encoding: [0x03,0x0c,0x00,0x1b]
# CHECK-NOTRAP: break 7 # encoding: [0x00,0x07,0x00,0x0d]
# CHECK-NOTRAP: $tmp1:
@@ -30,7 +30,7 @@
divu $4,$5,$6
# CHECK-NOTRAP: bnez $6, $tmp2 # encoding: [0x14,0xc0,A,A]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp2)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp2-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: divu $zero, $5, $6 # encoding: [0x00,0xa6,0x00,0x1b]
# CHECK-NOTRAP: break 7 # encoding: [0x00,0x07,0x00,0x0d]
# CHECK-NOTRAP: $tmp2:
diff --git a/llvm/test/MC/Mips/macro-rem.s b/llvm/test/MC/Mips/macro-rem.s
index 40812949664d6..a33c4a098ed69 100644
--- a/llvm/test/MC/Mips/macro-rem.s
+++ b/llvm/test/MC/Mips/macro-rem.s
@@ -5,16 +5,16 @@
rem $4,$5
# CHECK-NOTRAP: bnez $5, $tmp0 # encoding: [A,A,0xa0,0x14]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp0)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp0-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: div $zero, $4, $5 # encoding: [0x1a,0x00,0x85,0x00]
# CHECK-NOTRAP: break 7 # encoding: [0x0d,0x00,0x07,0x00]
# CHECK-NOTRAP: $tmp0
# CHECK-NOTRAP: addiu $1, $zero, -1 # encoding: [0xff,0xff,0x01,0x24]
# CHECK-NOTRAP: bne $5, $1, $tmp1 # encoding: [A,A,0xa1,0x14]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp1)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp1-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: lui $1, 32768 # encoding: [0x00,0x80,0x01,0x3c]
# CHECK-NOTRAP: bne $4, $1, $tmp1 # encoding: [A,A,0x81,0x14]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp1)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp1-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: nop # encoding: [0x00,0x00,0x00,0x00]
# CHECK-NOTRAP: break 6 # encoding: [0x0d,0x00,0x06,0x00]
# CHECK-NOTRAP: $tmp1
diff --git a/llvm/test/MC/Mips/macro-remu.s b/llvm/test/MC/Mips/macro-remu.s
index 5e7b150e2105e..6520d17426419 100644
--- a/llvm/test/MC/Mips/macro-remu.s
+++ b/llvm/test/MC/Mips/macro-remu.s
@@ -5,7 +5,7 @@
remu $4,$5
# CHECK-NOTRAP: bnez $5, $tmp0 # encoding: [A,A,0xa0,0x14]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp0)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp0-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: divu $zero, $4, $5 # encoding: [0x1b,0x00,0x85,0x00]
# CHECK-NOTRAP: break 7 # encoding: [0x0d,0x00,0x07,0x00]
# CHECK-NOTRAP: mfhi $4 # encoding: [0x10,0x20,0x00,0x00]
@@ -82,7 +82,7 @@
remu $4,$5,$6
# CHECK-NOTRAP: bnez $6, $tmp1 # encoding: [A,A,0xc0,0x14]
-# CHECK-NOTRAP: # fixup A - offset: 0, value: ($tmp1)-4, kind: fixup_Mips_PC16
+# CHECK-NOTRAP: # fixup A - offset: 0, value: $tmp1-4, kind: fixup_Mips_PC16
# CHECK-NOTRAP: divu $zero, $5, $6 # encoding: [0x1b,0x00,0xa6,0x00]
# CHECK-NOTRAP: break 7 # encoding: [0x0d,0x00,0x07,0x00]
# CHECK-NOTRAP: $tmp1
diff --git a/llvm/test/MC/Mips/mips-fpu-instructions.s b/llvm/test/MC/Mips/mips-fpu-instructions.s
index 733231afb793c..e740372a5e9f1 100644
--- a/llvm/test/MC/Mips/mips-fpu-instructions.s
+++ b/llvm/test/MC/Mips/mips-fpu-instructions.s
@@ -141,7 +141,7 @@
# FP move instructions
#------------------------------------------------------------------------------
# CHECK: bc1f $BB_1 # encoding: [A,A,0x00,0x45]
-# CHECK: # fixup A - offset: 0, value: ($BB_1)-4, kind: fixup_Mips_PC16
+# CHECK: # fixup A - offset: 0, value: $BB_1-4, kind: fixup_Mips_PC16
# CHECK: cfc1 $6, $0 # encoding: [0x00,0x00,0x46,0x44]
# CHECK: ctc1 $10, $31 # encoding: [0x00,0xf8,0xca,0x44]
diff --git a/llvm/test/MC/Mips/mips1/valid.s b/llvm/test/MC/Mips/mips1/valid.s
index a67c93846ac98..95d4312845c34 100644
--- a/llvm/test/MC/Mips/mips1/valid.s
+++ b/llvm/test/MC/Mips/mips1/valid.s
@@ -52,7 +52,7 @@ a:
# CHECK-NEXT: # <MCInst #{{[0-9]+}} EHB
# CHECK-NOT: # <MCInst #{{[0-9]+}} EHB_MM
j 1f # CHECK: j $tmp0 # encoding: [0b000010AA,A,A,A]
- # CHECK: # fixup A - offset: 0, value: ($tmp0), kind: fixup_Mips_26
+ # CHECK: # fixup A - offset: 0, value: $tmp0, kind: fixup_Mips_26
j a # CHECK: j a # encoding: [0b000010AA,A,A,A]
# CHECK: # fixup A - offset: 0, value: a, kind: fixup_Mips_26
j 1328 # CHECK: j 1328 # encoding: [0x08,0x00,0x01,0x4c]
diff --git a/llvm/test/MC/Mips/mips2/valid.s b/llvm/test/MC/Mips/mips2/valid.s
index 83cd39cfb36ca..de529a9578ced 100644
--- a/llvm/test/MC/Mips/mips2/valid.s
+++ b/llvm/test/MC/Mips/mips2/valid.s
@@ -72,7 +72,7 @@ a:
floor.w.s $f8,$f9 # CHECK: floor.w.s $f8, $f9 # encoding: [0x46,0x00,0x4a,0x0f]
# CHECK: # <MCInst #{{.*}} FLOOR_W_S
j 1f # CHECK: j $tmp0 # encoding: [0b000010AA,A,A,A]
- # CHECK: # fixup A - offset: 0, value: ($tmp0), kind: fixup_Mips_26
+ # CHECK: # fixup A - offset: 0, value: $tmp0, kind: fixup_Mips_26
j a # CHECK: j a # encoding: [0b000010AA,A,A,A]
# CHECK: # fixup A - offset: 0, value: a, kind: fixup_Mips_26
j 1328 # CHECK: j 1328 # encoding: [0x08,0x00,0x01,0x4c]
diff --git a/llvm/test/MC/Mips/mips32/valid.s b/llvm/test/MC/Mips/mips32/valid.s
index aebf1713cb5e7..bc619e8a48863 100644
--- a/llvm/test/MC/Mips/mips32/valid.s
+++ b/llvm/test/MC/Mips/mips32/valid.s
@@ -109,7 +109,7 @@ a:
floor.w.s $f8,$f9 # CHECK: floor.w.s $f8, $f9 # encoding: [0x46,0x00,0x4a,0x0f]
# CHECK: # <MCInst #{{.*}} FLOOR_W_S
j 1f # CHECK: j $tmp0 # encoding: [0b000010AA,A,A,A]
- # CHECK: # fixup A - offset: 0, value: ($tmp0), kind: fixup_Mips_26
+ # CHECK: # fixup A - offset: 0, value: $tmp0, kind: fixup_Mips_26
j a # CHECK: j a # encoding: [0b000010AA,A,A,A]
# CHECK: # fixup A - offset: 0, value: a, kind: fixup_Mips_26
j 1328 # CHECK: j 1328 # encoding: [0x08,0x00,0x01,0x4c]
diff --git a/llvm/test/MC/Mips/mips32r2/valid.s b/llvm/test/MC/Mips/mips32r2/valid.s
index d292ecc064c18..6f0edfb277476 100644
--- a/llvm/test/MC/Mips/mips32r2/valid.s
+++ b/llvm/test/MC/Mips/mips32r2/valid.s
@@ -115,7 +115,7 @@ a:
floor.w.s $f8,$f9 # CHECK: floor.w.s $f8, $f9 # encoding: [0x46,0x00,0x4a,0x0f]
# CHECK: # <MCInst #{{.*}} FLOOR_W_S
j 1f # CHECK: j $tmp0 # encoding: [0b000010AA,A,A,A]
- # CHECK: # fixup A - offset: 0, value: ($tmp0), kind: fixup_Mips_26
+ # CHECK: # fixup A - offset: 0, value: $tmp0, kind: fixup_Mips_26
j a # CHECK: j a # encoding: [0b000010AA,A,A,A]
# CHECK: # fixup A - offset: 0, value: a, kind: fixup_Mips_26
j 1328 # CHECK: j 1328 # encoding: [0x08,0x00,0x01,0x4c]
diff --git a/llvm/test/MC/Mips/mips32r3/valid.s b/llvm/test/MC/Mips/mips32r3/valid.s
index 137aee6811744..277e6febae42e 100644
--- a/llvm/test/MC/Mips/mips32r3/valid.s
+++ b/llvm/test/MC/Mips/mips32r3/valid.s
@@ -115,7 +115,7 @@ a:
floor.w.s $f8,$f9 # CHECK: floor.w.s $f8, $f9 # encoding: [0x46,0x00,0x4a,0x0f]
# CHECK: # <MCInst #{{.*}} FLOOR_W_S
j 1f # CHECK: j $tmp0 # encoding: [0b000010AA,A,A,A]
- # CHECK: # fixup A - offset: 0, value: ($tmp0), kind: fixup_Mips_26
+ # CHECK: # fixup A - offset: 0, value: $tmp0, kind: fixup_Mips_26
j a # CHECK: j a # encoding: [0b000010AA,A,A,A]
# CHECK: # fixup A - offset: 0, value: a, kind: fixup_Mips_26
j 1328 # CHECK: j 1328 # encoding: [0x08,0x00,0x01,0x4c]
diff --git a/llvm/test/MC/Mips/mips32r5/valid.s b/llvm/test/MC/Mips/mips32r5/valid.s
index bf75a2c000bff..5ff8da29434bf 100644
--- a/llvm/test/MC/Mips/mips32r5/valid.s
+++ b/llvm/test/MC/Mips/mips32r5/valid.s
@@ -116,7 +116,7 @@ a:
floor.w.s $f8,$f9 # CHECK: floor.w.s $f8, $f9 # encoding: [0x46,0x00,0x4a,0x0f]
# CHECK: # <MCInst #{{.*}} FLOOR_W_S
j 1f # CHECK: j $tmp0 # encoding: [0b000010AA,A,A,A]
- # CHECK: # fixup A - offset: 0, value: ($tmp0), kind: fixup_Mips_26
+ # CHECK: # fixup A - offset: 0, value: $tmp0, kind: fixup_Mips_26
j a # CHECK: j a # encoding: [0b000010AA,A,A,A]
# CHECK: # fixup A - offset: 0, value: a, kind: fixup_Mips_26
j 1328 # CHECK: j 1328 # encoding: [0x08,0x00,0x01,0x4c]
diff --git a/llvm/test/MC/Mips/mips32r6/valid.s b/llvm/test/MC/Mips/mips32r6/valid.s
index 0d705b6f24261..f205adbe8127a 100644
--- a/llvm/test/MC/Mips/mips32r6/valid.s
+++ b/llvm/test/MC/Mips/mips32r6/valid.s
@@ -188,7 +188,7 @@ a:
class.s $f2, $f4 # CHECK: class.s $f2, $f4 # encoding: [0x46,0x00,0x20,0x9b]
class.d $f2, $f4 # CHECK: class.d $f2, $f4 # encoding: [0x46,0x20,0x20,0x9b]
j 1f # CHECK: j $tmp0 # encoding: [0b000010AA,A,A,A]
- # CHECK: # fixup A - offset: 0, value: ($tmp0), kind: fixup_Mips_26
+ # CHECK: # fixup A - offset: 0, value: $tmp0, kind: fixup_Mips_26
j a # CHECK: j a # encoding: [0b000010AA,A,A,A]
# CHECK: # fixup A - offset: 0, value: a, kind: fixup_Mips_26
j 1328 # CHECK: j 1328 # encoding: [0x08,0x00,0x01,0x4c]
diff --git a/llvm/test/MC/Mips/mips64r6/valid.s b/llvm/test/MC/Mips/mips64r6/valid.s
index ff6e1d73fbeb4..a6b0261b6cc85 100644
--- a/llvm/test/MC/Mips/mips64r6/valid.s
+++ b/llvm/test/MC/Mips/mips64r6/valid.s
@@ -156,7 +156,7 @@ a:
floor.w.s $f8,$f9 # CHECK: floor.w.s $f8, $f9 # encoding: [0x46,0x00,0x4a,0x0f]
# CHECK: # <MCInst #{{.*}} FLOOR_W_S
j 1f # CHECK: j $tmp0 # encoding: [0b000010AA,A,A,A]
- # CHECK: # fixup A - offset: 0, value: ($tmp0), kind: fixup_Mips_26
+ # CHECK: # fixup A - offset: 0, value: $tmp0, kind: fixup_Mips_26
j a # CHECK: j a # encoding: [0b000010AA,A,A,A]
# CHECK: # fixup A - offset: 0, value: a, kind: fixup_Mips_26
j 1328 # CHECK: j 1328 # encoding: [0x08,0x00,0x01,0x4c]
diff --git a/llvm/test/MC/Mips/mips_directives.s b/llvm/test/MC/Mips/mips_directives.s
index 7431fa19abaca..b4e25f039d35c 100644
--- a/llvm/test/MC/Mips/mips_directives.s
+++ b/llvm/test/MC/Mips/mips_directives.s
@@ -29,7 +29,7 @@ $JTI0_0:
.word 0x77fffffc
# CHECK: $JTI0_0:
-# CHECK: .gpword ($BB0_2)
+# CHECK: .gpword $BB0_2
# CHECK: .4byte 2013265916
.set at=$12
.set macro
diff --git a/llvm/test/MC/Mips/reloc-directive-label-offset.s b/llvm/test/MC/Mips/reloc-directive-label-offset.s
index 2c31414d40163..257bfeb10d151 100644
--- a/llvm/test/MC/Mips/reloc-directive-label-offset.s
+++ b/llvm/test/MC/Mips/reloc-directive-label-offset.s
@@ -16,22 +16,22 @@ foo: # ASM-LABEL: foo:
nop
1:
nop
- .reloc 1b, R_MIPS_NONE, foo # ASM-32: .reloc ($tmp0), R_MIPS_NONE, foo
+ .reloc 1b, R_MIPS_NONE, foo # ASM-32: .reloc $tmp0, R_MIPS_NONE, foo
# ASM-64: .reloc .Ltmp0, R_MIPS_NONE, foo
nop
- .reloc 1f, R_MIPS_32, foo # ASM-32: .reloc ($tmp1), R_MIPS_32, foo
+ .reloc 1f, R_MIPS_32, foo # ASM-32: .reloc $tmp1, R_MIPS_32, foo
# ASM-64: .reloc .Ltmp1, R_MIPS_32, foo
1:
nop
- .reloc 1f, R_MIPS_CALL16, foo # ASM-32: .reloc ($tmp2), R_MIPS_CALL16, foo
+ .reloc 1f, R_MIPS_CALL16, foo # ASM-32: .reloc $tmp2, R_MIPS_CALL16, foo
# ASM-64: .reloc .Ltmp2, R_MIPS_CALL16, foo
1:
nop
- .reloc 2f, R_MIPS_GOT_DISP, foo # ASM-32: .reloc ($tmp3), R_MIPS_GOT_DISP, foo
+ .reloc 2f, R_MIPS_GOT_DISP, foo # ASM-32: .reloc $tmp3, R_MIPS_GOT_DISP, foo
# ASM-64: .reloc .Ltmp3, R_MIPS_GOT_DISP, foo
nop
- .reloc 3f, R_MIPS_GOT_PAGE, foo # ASM-32: .reloc ($tmp4), R_MIPS_GOT_PAGE, foo
+ .reloc 3f, R_MIPS_GOT_PAGE, foo # ASM-32: .reloc $tmp4, R_MIPS_GOT_PAGE, foo
# ASM-64: .reloc .Ltmp4, R_MIPS_GOT_PAGE, foo
nop
bar:
More information about the llvm-commits
mailing list