[llvm] [BPF] Use ".L" local prefix label for basic blocks (PR #95103)

via llvm-commits llvm-commits at lists.llvm.org
Wed Jun 12 02:28:36 PDT 2024


https://github.com/aengelke updated https://github.com/llvm/llvm-project/pull/95103

>From a0446a3d1ae118fa1155d5e4c4def99a0e82693f Mon Sep 17 00:00:00 2001
From: Alexis Engelke <engelke at in.tum.de>
Date: Tue, 11 Jun 2024 14:21:44 +0200
Subject: [PATCH 1/3] [BPF] Use local prefix label for basic block

Previously, PrivateLabelPrefix was default-initialized to "L", so basic
block labels were added to the symbol table. This seems like an
oversight, so use ".L" for all private labels.
---
 llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h |  1 +
 llvm/test/CodeGen/BPF/cttz-ctlz.ll              | 16 ++++++++--------
 llvm/test/CodeGen/BPF/gotol.ll                  | 12 ++++++------
 llvm/test/CodeGen/BPF/objdump_cond_op.ll        |  9 +++------
 llvm/test/CodeGen/BPF/objdump_cond_op_2.ll      |  6 ++----
 llvm/test/CodeGen/BPF/sanity.ll                 | 14 +++++++-------
 6 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h b/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
index 7b2168458c930..6c2a955fb5aa4 100644
--- a/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
+++ b/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
@@ -25,6 +25,7 @@ class BPFMCAsmInfo : public MCAsmInfo {
       IsLittleEndian = false;
 
     PrivateGlobalPrefix = ".L";
+    PrivateLabelPrefix = PrivateGlobalPrefix;
     WeakRefDirective = "\t.weak\t";
 
     UsesELFSectionDirectiveForBSS = true;
diff --git a/llvm/test/CodeGen/BPF/cttz-ctlz.ll b/llvm/test/CodeGen/BPF/cttz-ctlz.ll
index f42b2e2d10871..69fe0276c8a23 100644
--- a/llvm/test/CodeGen/BPF/cttz-ctlz.ll
+++ b/llvm/test/CodeGen/BPF/cttz-ctlz.ll
@@ -31,7 +31,7 @@ define i32 @cttz_i32(i32 %a) {
 ; CHECK-NEXT:    r2 = r1
 ; CHECK-NEXT:    r2 <<= 32
 ; CHECK-NEXT:    r2 >>= 32
-; CHECK-NEXT:    if r2 == 0 goto LBB1_2
+; CHECK-NEXT:    if r2 == 0 goto .LBB1_2
 ; CHECK-NEXT:  # %bb.1: # %cond.false
 ; CHECK-NEXT:    r2 = r1
 ; CHECK-NEXT:    r2 = -r2
@@ -43,7 +43,7 @@ define i32 @cttz_i32(i32 %a) {
 ; CHECK-NEXT:    r2 = {{\.?LCPI[0-9]+_[0-9]+}} ll
 ; CHECK-NEXT:    r2 += r1
 ; CHECK-NEXT:    r0 = *(u8 *)(r2 + 0)
-; CHECK-NEXT:  LBB1_2: # %cond.end
+; CHECK-NEXT:  .LBB1_2: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i32 @llvm.cttz.i32(i32 %a, i1 0)
     ret i32 %ret
@@ -73,7 +73,7 @@ define i64 @cttz_i64(i64 %a) {
 ; CHECK-LABEL: cttz_i64:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    r0 = 64
-; CHECK-NEXT:    if r1 == 0 goto LBB3_2
+; CHECK-NEXT:    if r1 == 0 goto .LBB3_2
 ; CHECK-NEXT:  # %bb.1: # %cond.false
 ; CHECK-NEXT:    r2 = r1
 ; CHECK-NEXT:    r2 = -r2
@@ -84,7 +84,7 @@ define i64 @cttz_i64(i64 %a) {
 ; CHECK-NEXT:    r2 = {{\.?LCPI[0-9]+_[0-9]+}} ll
 ; CHECK-NEXT:    r2 += r1
 ; CHECK-NEXT:    r0 = *(u8 *)(r2 + 0)
-; CHECK-NEXT:  LBB3_2: # %cond.end
+; CHECK-NEXT:  .LBB3_2: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i64 @llvm.cttz.i64(i64 %a, i1 0)
     ret i64 %ret
@@ -152,7 +152,7 @@ define i32 @ctlz_i32(i32 %a) {
 ; CHECK-NEXT:    r2 = r1
 ; CHECK-NEXT:    r2 <<= 32
 ; CHECK-NEXT:    r2 >>= 32
-; CHECK-NEXT:    if r2 == 0 goto LBB5_2
+; CHECK-NEXT:    if r2 == 0 goto .LBB5_2
 ; CHECK-NEXT:  # %bb.1: # %cond.false
 ; CHECK-NEXT:    r2 = 4294967294 ll
 ; CHECK-NEXT:    r3 = r1
@@ -197,7 +197,7 @@ define i32 @ctlz_i32(i32 %a) {
 ; CHECK-NEXT:    r1 = 4278190080 ll
 ; CHECK-NEXT:    r0 &= r1
 ; CHECK-NEXT:    r0 >>= 24
-; CHECK-NEXT:  LBB5_2: # %cond.end
+; CHECK-NEXT:  .LBB5_2: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i32 @llvm.ctlz.i32(i32 %a, i1 0)
     ret i32 %ret
@@ -256,7 +256,7 @@ define i64 @ctlz_i64(i64 %a) {
 ; CHECK-LABEL: ctlz_i64:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    r0 = 64
-; CHECK-NEXT:    if r1 == 0 goto LBB7_2
+; CHECK-NEXT:    if r1 == 0 goto .LBB7_2
 ; CHECK-NEXT:  # %bb.1: # %cond.false
 ; CHECK-NEXT:    r2 = r1
 ; CHECK-NEXT:    r2 >>= 1
@@ -296,7 +296,7 @@ define i64 @ctlz_i64(i64 %a) {
 ; CHECK-NEXT:    r1 = 72340172838076673 ll
 ; CHECK-NEXT:    r0 *= r1
 ; CHECK-NEXT:    r0 >>= 56
-; CHECK-NEXT:  LBB7_2: # %cond.end
+; CHECK-NEXT:  .LBB7_2: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i64 @llvm.ctlz.i64(i64 %a, i1 0)
     ret i64 %ret
diff --git a/llvm/test/CodeGen/BPF/gotol.ll b/llvm/test/CodeGen/BPF/gotol.ll
index 0c7d9291f72da..20e5ad180db83 100644
--- a/llvm/test/CodeGen/BPF/gotol.ll
+++ b/llvm/test/CodeGen/BPF/gotol.ll
@@ -38,8 +38,8 @@ entry:
 ; case (3): conditional jmp followed by an unconditional jmp
 ; CHECK:        w0 = w2
 ; CHECK-NEXT:   if w1 < w2 goto
-; CHECK:        gotol LBB0_4    # encoding: [0x06'A',A,A,A,0x00,0x00,0x00,0x00]
-; CHECK-NEXT:                   # fixup A - offset: 0, value: LBB0_4, kind: FK_BPF_PCRel_4
+; CHECK:        gotol .LBB0_4   # encoding: [0x06'A',A,A,A,0x00,0x00,0x00,0x00]
+; CHECK-NEXT:                   # fixup A - offset: 0, value: .LBB0_4, kind: FK_BPF_PCRel_4
 
 begin:                                            ; preds = %next2, %next
   %s.0 = phi i32 [ %mul3, %next ], [ %mul7, %next2 ]
@@ -49,12 +49,12 @@ begin:                                            ; preds = %next2, %next
 
 ; case (2): conditional jmp
 ; CHECK:        w0 *= w1
-; CHECK-NEXT:   if w0 > w2 goto LBB0_7
-; CHECK:        goto LBB0_4
-; CHECK-LABEL:  LBB0_7:
+; CHECK-NEXT:   if w0 > w2 goto .LBB0_7
+; CHECK:        goto .LBB0_4
+; CHECK-LABEL:  .LBB0_7:
 ; CHECK:        gotol
 
-; CHECK-LABEL:  LBB0_4:
+; CHECK-LABEL:  .LBB0_4:
 
 if.then2:                                         ; preds = %begin
   %mul = mul i32 %div, %div
diff --git a/llvm/test/CodeGen/BPF/objdump_cond_op.ll b/llvm/test/CodeGen/BPF/objdump_cond_op.ll
index 4a4fa84376cc8..3b2e6c1922fc4 100644
--- a/llvm/test/CodeGen/BPF/objdump_cond_op.ll
+++ b/llvm/test/CodeGen/BPF/objdump_cond_op.ll
@@ -27,7 +27,7 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   br label %13
 ; CHECK: r1 <<= 32
 ; CHECK: r1 >>= 32
-; CHECK: if r1 != 2 goto +6 <LBB0_2>
+; CHECK: if r1 != 2 goto +6 <test+0x48>
 
 ; <label>:8:                                      ; preds = %2
   %9 = icmp eq i32 %0, %1
@@ -38,32 +38,29 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
 ; CHECK: r0 = *(u32 *)(r1 + 0)
 ; CHECK: r0 *= r0
 ; CHECK: r0 <<= 1
-; CHECK: goto +7 <LBB0_4>
+; CHECK: goto +7 <test+0x80>
 
 ; <label>:11:                                     ; preds = %8
   %12 = shl nsw i32 %10, 2
   br label %13
 
-; CHECK-LABEL: <LBB0_2>:
 ; CHECK: r3 = 0 ll
 ; CHECK: r0 = *(u32 *)(r3 + 0)
 ; CHECK: r2 <<= 32
 ; CHECK: r2 >>= 32
-; CHECK: if r1 == r2 goto +4 <LBB0_5>
+; CHECK: if r1 == r2 goto +4 <test+0x98>
 ; CHECK: r0 <<= 2
 
 ; <label>:13:                                     ; preds = %4, %11
   %14 = phi i32 [ %12, %11 ], [ %7, %4 ]
   store i32 %14, ptr @gbl, align 4
   br label %15
-; CHECK-LABEL: <LBB0_4>:
 ; CHECK: r1 = 0 ll
 ; CHECK: *(u32 *)(r1 + 0) = r0
 
 ; <label>:15:                                     ; preds = %8, %13
   %16 = phi i32 [ %14, %13 ], [ %10, %8 ]
   ret i32 %16
-; CHECK-LABEL: <LBB0_5>:
 ; CHECK: exit
 }
 attributes #0 = { norecurse nounwind }
diff --git a/llvm/test/CodeGen/BPF/objdump_cond_op_2.ll b/llvm/test/CodeGen/BPF/objdump_cond_op_2.ll
index 4edd52a463ea9..8c9e91d4a80ea 100644
--- a/llvm/test/CodeGen/BPF/objdump_cond_op_2.ll
+++ b/llvm/test/CodeGen/BPF/objdump_cond_op_2.ll
@@ -14,8 +14,7 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
 
 ; <label>:4:                                      ; preds = %2
   br label %5
-; CHECK: if r4 s>= r3 goto +10 <LBB0_2>
-; CHECK-LABEL: <LBB0_1>:
+; CHECK: if r4 s>= r3 goto +10 <test+0x90>
 
 ; <label>:5:                                      ; preds = %4, %5
   %6 = phi i32 [ %9, %5 ], [ 0, %4 ]
@@ -27,12 +26,11 @@ define i32 @test(i32, i32) local_unnamed_addr #0 {
   %12 = icmp slt i32 %10, %11
   br i1 %12, label %5, label %13
 ; CHECK: r1 = r3
-; CHECK: if r2 s> r3 goto -10 <LBB0_1>
+; CHECK: if r2 s> r3 goto -10 <test+0x40>
 
 ; <label>:13:                                     ; preds = %5, %2
   %14 = phi i32 [ 0, %2 ], [ %9, %5 ]
   ret i32 %14
-; CHECK-LABEL: <LBB0_2>:
 ; CHECK: exit
 }
 attributes #0 = { norecurse nounwind readnone }
diff --git a/llvm/test/CodeGen/BPF/sanity.ll b/llvm/test/CodeGen/BPF/sanity.ll
index 117d1bb7d9522..e84adea8b1990 100644
--- a/llvm/test/CodeGen/BPF/sanity.ll
+++ b/llvm/test/CodeGen/BPF/sanity.ll
@@ -1,4 +1,4 @@
-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 4
 ; RUN: llc < %s -mtriple=bpfel-- | FileCheck %s
 
 @foo_printf.fmt = private unnamed_addr constant [9 x i8] c"hello  \0A\00", align 1
@@ -76,10 +76,10 @@ define signext i8 @foo_cmp(i8 signext %a, i8 signext %b) #0 {
 ; CHECK-LABEL: foo_cmp:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    r0 = r1
-; CHECK-NEXT:    if r2 s> r0 goto LBB5_2
+; CHECK-NEXT:    if r2 s> r0 goto .LBB5_2
 ; CHECK-NEXT:  # %bb.1:
 ; CHECK-NEXT:    r0 = r2
-; CHECK-NEXT:  LBB5_2:
+; CHECK-NEXT:  .LBB5_2:
 ; CHECK-NEXT:    exit
   %1 = icmp slt i8 %a, %b
   %a.b = select i1 %1, i8 %a, i8 %b
@@ -91,18 +91,18 @@ define i32 @foo_muldiv(i8 signext %a, i16 signext %b, i32 %c, i64 %d) #0 {
 ; CHECK-LABEL: foo_muldiv:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    r0 = r2
-; CHECK-NEXT:    if r1 == 0 goto LBB6_2
+; CHECK-NEXT:    if r1 == 0 goto .LBB6_2
 ; CHECK-NEXT:  # %bb.1:
 ; CHECK-NEXT:    r0 *= r3
-; CHECK-NEXT:    goto LBB6_3
-; CHECK-NEXT:  LBB6_2:
+; CHECK-NEXT:    goto .LBB6_3
+; CHECK-NEXT:  .LBB6_2:
 ; CHECK-NEXT:    r3 <<= 32
 ; CHECK-NEXT:    r3 >>= 32
 ; CHECK-NEXT:    r4 <<= 32
 ; CHECK-NEXT:    r4 >>= 32
 ; CHECK-NEXT:    r4 /= r3
 ; CHECK-NEXT:    r0 = r4
-; CHECK-NEXT:  LBB6_3:
+; CHECK-NEXT:  .LBB6_3:
 ; CHECK-NEXT:    exit
   %1 = icmp eq i8 %a, 0
   br i1 %1, label %5, label %2

>From f4545a7d5a27aa1aa7a709e872e8787b749b6f5d Mon Sep 17 00:00:00 2001
From: Alexis Engelke <engelke at in.tum.de>
Date: Tue, 11 Jun 2024 21:27:15 +0200
Subject: [PATCH 2/3] Change private global to "L" (the default of MCAsmInfo)

---
 .../Target/BPF/MCTargetDesc/BPFMCAsmInfo.h    |  2 -
 llvm/lib/Target/TargetLoweringObjectFile.cpp  |  2 +-
 .../CodeGen/BPF/BTF/builtin-btf-type-id-2.ll  |  2 +-
 .../BPF/BTF/builtin-btf-type-id-local.ll      |  2 +-
 .../CodeGen/BPF/BTF/builtin-btf-type-id.ll    |  6 +-
 llvm/test/CodeGen/BPF/BTF/filename.ll         |  4 +-
 llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll    |  4 +-
 llvm/test/CodeGen/BPF/BTF/func-non-void.ll    |  6 +-
 llvm/test/CodeGen/BPF/BTF/func-source.ll      |  4 +-
 llvm/test/CodeGen/BPF/BTF/func-typedef.ll     |  6 +-
 llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll  |  4 +-
 llvm/test/CodeGen/BPF/BTF/func-void.ll        |  4 +-
 .../BPF/CORE/anon-struct-argument-pragma.ll   |  2 +-
 .../BPF/CORE/anon-union-localvar-attr.ll      |  2 +-
 .../BPF/CORE/anon-union-localvar-pragma.ll    |  2 +-
 .../test/CodeGen/BPF/CORE/btf-id-duplicate.ll |  4 +-
 .../CodeGen/BPF/CORE/field-reloc-alu32.ll     |  2 +-
 .../BPF/CORE/field-reloc-bitfield-1-bpfeb.ll  | 66 +++++++++----------
 .../BPF/CORE/field-reloc-bitfield-1.ll        | 66 +++++++++----------
 .../BPF/CORE/field-reloc-bitfield-2-bpfeb.ll  |  6 +-
 .../BPF/CORE/field-reloc-bitfield-2.ll        |  6 +-
 .../field-reloc-bitfield-record-align16.ll    |  2 +-
 .../CodeGen/BPF/CORE/field-reloc-duplicate.ll |  4 +-
 .../CodeGen/BPF/CORE/field-reloc-st-imm.ll    |  8 +--
 .../CodeGen/BPF/CORE/intrinsic-array-2.ll     |  2 +-
 llvm/test/CodeGen/BPF/CORE/intrinsic-array.ll |  2 +-
 .../CORE/intrinsic-fieldinfo-byte-size-1.ll   |  8 +--
 .../CORE/intrinsic-fieldinfo-byte-size-2.ll   |  6 +-
 .../CORE/intrinsic-fieldinfo-byte-size-3.ll   |  4 +-
 .../CORE/intrinsic-fieldinfo-byte-size-4.ll   |  2 +-
 .../CORE/intrinsic-fieldinfo-existence-1.ll   |  8 +--
 .../CORE/intrinsic-fieldinfo-existence-2.ll   |  4 +-
 .../CORE/intrinsic-fieldinfo-existence-3.ll   |  4 +-
 .../CORE/intrinsic-fieldinfo-existence-4.ll   |  2 +-
 .../intrinsic-fieldinfo-lshift-1-bpfeb.ll     |  8 +--
 .../BPF/CORE/intrinsic-fieldinfo-lshift-1.ll  |  8 +--
 .../BPF/CORE/intrinsic-fieldinfo-lshift-2.ll  |  4 +-
 .../BPF/CORE/intrinsic-fieldinfo-rshift-1.ll  |  8 +--
 .../BPF/CORE/intrinsic-fieldinfo-rshift-2.ll  |  4 +-
 .../BPF/CORE/intrinsic-fieldinfo-rshift-3.ll  |  4 +-
 .../CORE/intrinsic-fieldinfo-signedness-1.ll  |  8 +--
 .../CORE/intrinsic-fieldinfo-signedness-2.ll  |  6 +-
 .../CORE/intrinsic-fieldinfo-signedness-3.ll  |  4 +-
 .../test/CodeGen/BPF/CORE/intrinsic-struct.ll |  2 +-
 ...nsic-typeinfo-enum-value-opaque-pointer.ll |  6 +-
 .../BPF/CORE/intrinsic-typeinfo-enum-value.ll |  6 +-
 .../BPF/CORE/intrinsic-typeinfo-type-exist.ll |  6 +-
 .../BPF/CORE/intrinsic-typeinfo-type-match.ll |  6 +-
 .../CORE/intrinsic-typeinfo-type-size-1.ll    |  6 +-
 .../CORE/intrinsic-typeinfo-type-size-2.ll    |  6 +-
 llvm/test/CodeGen/BPF/CORE/intrinsic-union.ll |  2 +-
 .../BPF/CORE/offset-reloc-access-str.ll       |  4 +-
 .../CodeGen/BPF/CORE/offset-reloc-basic.ll    |  2 +-
 .../BPF/CORE/offset-reloc-cast-array-1.ll     |  4 +-
 .../BPF/CORE/offset-reloc-cast-array-2.ll     |  4 +-
 .../BPF/CORE/offset-reloc-cast-struct-1.ll    |  4 +-
 .../BPF/CORE/offset-reloc-cast-struct-2.ll    |  4 +-
 .../BPF/CORE/offset-reloc-cast-struct-3.ll    |  4 +-
 .../BPF/CORE/offset-reloc-cast-union-1.ll     |  4 +-
 .../BPF/CORE/offset-reloc-cast-union-2.ll     |  4 +-
 .../CodeGen/BPF/CORE/offset-reloc-end-load.ll |  2 +-
 .../CodeGen/BPF/CORE/offset-reloc-end-ret.ll  |  2 +-
 .../BPF/CORE/offset-reloc-fieldinfo-1.ll      | 12 ++--
 .../CORE/offset-reloc-fieldinfo-2-bpfeb.ll    | 16 ++---
 .../BPF/CORE/offset-reloc-fieldinfo-2.ll      | 16 ++---
 .../CodeGen/BPF/CORE/offset-reloc-global-1.ll |  2 +-
 .../CodeGen/BPF/CORE/offset-reloc-global-2.ll |  2 +-
 .../CodeGen/BPF/CORE/offset-reloc-global-3.ll |  2 +-
 .../BPF/CORE/offset-reloc-middle-chain.ll     |  6 +-
 .../BPF/CORE/offset-reloc-multi-array-1.ll    |  2 +-
 .../BPF/CORE/offset-reloc-multi-array-2.ll    |  2 +-
 .../BPF/CORE/offset-reloc-multilevel.ll       |  2 +-
 .../BPF/CORE/offset-reloc-pointer-1.ll        |  2 +-
 .../BPF/CORE/offset-reloc-pointer-2.ll        |  2 +-
 .../CORE/offset-reloc-simplify-patchable-1.ll | 24 +++----
 .../CORE/offset-reloc-simplify-patchable-2.ll | 38 +++++------
 .../CORE/offset-reloc-simplify-patchable-3.ll | 28 ++++----
 .../BPF/CORE/offset-reloc-struct-anonymous.ll |  2 +-
 .../BPF/CORE/offset-reloc-struct-array.ll     |  2 +-
 .../BPF/CORE/offset-reloc-typedef-array.ll    |  2 +-
 .../BPF/CORE/offset-reloc-typedef-struct-2.ll |  2 +-
 .../BPF/CORE/offset-reloc-typedef-struct.ll   |  2 +-
 .../BPF/CORE/offset-reloc-typedef-union-2.ll  |  2 +-
 .../BPF/CORE/offset-reloc-typedef-union.ll    |  2 +-
 .../CodeGen/BPF/CORE/offset-reloc-typedef.ll  |  4 +-
 .../CodeGen/BPF/CORE/offset-reloc-union.ll    |  2 +-
 .../CORE/simplify-patchable-liveness-bug.ll   | 20 +++---
 .../BPF/GlobalISel/ir-translator-ret.ll       |  2 +-
 llvm/test/CodeGen/BPF/cttz-ctlz.ll            | 16 ++---
 llvm/test/CodeGen/BPF/gotol.ll                | 12 ++--
 llvm/test/CodeGen/BPF/sanity.ll               | 12 ++--
 llvm/test/MC/BPF/insn-unit.s                  |  1 -
 92 files changed, 313 insertions(+), 316 deletions(-)

diff --git a/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h b/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
index 6c2a955fb5aa4..8a3c9fb47cc00 100644
--- a/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
+++ b/llvm/lib/Target/BPF/MCTargetDesc/BPFMCAsmInfo.h
@@ -24,8 +24,6 @@ class BPFMCAsmInfo : public MCAsmInfo {
     if (TT.getArch() == Triple::bpfeb)
       IsLittleEndian = false;
 
-    PrivateGlobalPrefix = ".L";
-    PrivateLabelPrefix = PrivateGlobalPrefix;
     WeakRefDirective = "\t.weak\t";
 
     UsesELFSectionDirectiveForBSS = true;
diff --git a/llvm/lib/Target/TargetLoweringObjectFile.cpp b/llvm/lib/Target/TargetLoweringObjectFile.cpp
index 26e9f9eb3f327..1206863010aa2 100644
--- a/llvm/lib/Target/TargetLoweringObjectFile.cpp
+++ b/llvm/lib/Target/TargetLoweringObjectFile.cpp
@@ -129,7 +129,7 @@ MCSymbol *TargetLoweringObjectFile::getSymbolWithGlobalValueBase(
   assert(!Suffix.empty());
 
   SmallString<60> NameStr;
-  NameStr += GV->getParent()->getDataLayout().getPrivateGlobalPrefix();
+  NameStr += getContext().getAsmInfo()->getPrivateGlobalPrefix();
   TM.getNameWithPrefix(NameStr, GV, *Mang);
   NameStr.append(Suffix.begin(), Suffix.end());
   return getContext().getOrCreateSymbol(NameStr);
diff --git a/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-2.ll b/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-2.ll
index 63c56c4dfec57..e034656e06330 100644
--- a/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-2.ll
+++ b/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-2.ll
@@ -39,7 +39,7 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   20
 ; CHECK-NEXT:        .long   7
diff --git a/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-local.ll b/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-local.ll
index 763b7345dcb83..28801fe5e4122 100644
--- a/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-local.ll
+++ b/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id-local.ll
@@ -39,7 +39,7 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   20
 ; CHECK-NEXT:        .long   7
diff --git a/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id.ll b/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id.ll
index 2fb8d25a2e07b..ab46b1b1cf1a6 100644
--- a/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id.ll
+++ b/llvm/test/CodeGen/BPF/BTF/builtin-btf-type-id.ll
@@ -83,15 +83,15 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   7                               # Field reloc section string offset=7
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   3
 ; CHECK-NEXT:        .long   48
 ; CHECK-NEXT:        .long   6
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   10
 ; CHECK-NEXT:        .long   48
 ; CHECK-NEXT:        .long   6
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   48
 ; CHECK-NEXT:        .long   7
diff --git a/llvm/test/CodeGen/BPF/BTF/filename.ll b/llvm/test/CodeGen/BPF/BTF/filename.ll
index 2ae03a64770e9..5ec74c7c2d607 100644
--- a/llvm/test/CodeGen/BPF/BTF/filename.ll
+++ b/llvm/test/CodeGen/BPF/BTF/filename.ll
@@ -53,12 +53,12 @@ define dso_local i32 @test() local_unnamed_addr #0 !dbg !7 {
 ; CHECK-NEXT:        .long   8                       # FuncInfo
 ; CHECK-NEXT:        .long   10                      # FuncInfo section string offset=10
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Lfunc_begin{{[0-9]+}}
+; CHECK-NEXT:        .long   Lfunc_begin{{[0-9]+}}
 ; CHECK-NEXT:        .long   3
 ; CHECK-NEXT:        .long   16                      # LineInfo
 ; CHECK-NEXT:        .long   10                      # LineInfo section string offset=10
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   16
 ; CHECK-NEXT:        .long   0
 ; CHECK-NEXT:        .long   1038                    # Line 1 Col 14
diff --git a/llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll b/llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll
index ea93225e8d588..9abd0b8fcc6f9 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-func-ptr.ll
@@ -84,12 +84,12 @@ entry:
 ; CHECK-NEXT:        .long   8                       # FuncInfo
 ; CHECK-NEXT:        .long   11                      # FuncInfo section string offset=11
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   Lfunc_begin0
 ; CHECK-NEXT:        .long   3
 ; CHECK-NEXT:        .long   16                      # LineInfo
 ; CHECK-NEXT:        .long   11                      # LineInfo section string offset=11
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   17
 ; CHECK-NEXT:        .long   0
 ; CHECK-NEXT:        .long   3091                    # Line 3 Col 19
diff --git a/llvm/test/CodeGen/BPF/BTF/func-non-void.ll b/llvm/test/CodeGen/BPF/BTF/func-non-void.ll
index 428dfac2e53d5..5ff9e92063121 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-non-void.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-non-void.ll
@@ -58,16 +58,16 @@ define dso_local i32 @f1(i32 returned) local_unnamed_addr #0 !dbg !7 {
 ; CHECK-NEXT:        .long   8                       # FuncInfo
 ; CHECK-NEXT:        .long   11                      # FuncInfo section string offset=11
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   Lfunc_begin0
 ; CHECK-NEXT:        .long   3
 ; CHECK-NEXT:        .long   16                      # LineInfo
 ; CHECK-NEXT:        .long   11                      # LineInfo section string offset=11
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   Lfunc_begin0
 ; CHECK-NEXT:        .long   17
 ; CHECK-NEXT:        .long   0
 ; CHECK-NEXT:        .long   1024                    # Line 1 Col 0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   17
 ; CHECK-NEXT:        .long   0
 ; CHECK-NEXT:        .long   1042                    # Line 1 Col 18
diff --git a/llvm/test/CodeGen/BPF/BTF/func-source.ll b/llvm/test/CodeGen/BPF/BTF/func-source.ll
index 63814d766e6a2..868aa826da277 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-source.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-source.ll
@@ -53,12 +53,12 @@ entry:
 ; CHECK-NEXT:        .long   8                       # FuncInfo
 ; CHECK-NEXT:        .long   3                       # FuncInfo section string offset=3
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   Lfunc_begin0
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   16                      # LineInfo
 ; CHECK-NEXT:        .long   3                       # LineInfo section string offset=3
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   9
 ; CHECK-NEXT:        .long   18
 ; CHECK-NEXT:        .long   1040                    # Line 1 Col 16
diff --git a/llvm/test/CodeGen/BPF/BTF/func-typedef.ll b/llvm/test/CodeGen/BPF/BTF/func-typedef.ll
index ac0813f8a342f..bda2f27255d32 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-typedef.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-typedef.ll
@@ -71,16 +71,16 @@ entry:
 ; CHECK-NEXT:        .long   8                       # FuncInfo
 ; CHECK-NEXT:        .long   20                      # FuncInfo section string offset=20
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   Lfunc_begin0
 ; CHECK-NEXT:        .long   5
 ; CHECK-NEXT:        .long   16                      # LineInfo
 ; CHECK-NEXT:        .long   20                      # LineInfo section string offset=20
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   Lfunc_begin0
 ; CHECK-NEXT:        .long   26
 ; CHECK-NEXT:        .long   0
 ; CHECK-NEXT:        .long   3072                    # Line 3 Col 0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   26
 ; CHECK-NEXT:        .long   0
 ; CHECK-NEXT:        .long   3092                    # Line 3 Col 20
diff --git a/llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll b/llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll
index 95c2f9d4e1c8f..243f2ba770372 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-unused-arg.ll
@@ -58,12 +58,12 @@ define dso_local i32 @f1(i32) local_unnamed_addr #0 !dbg !7 {
 ; CHECK-NEXT:        .long   8                       # FuncInfo
 ; CHECK-NEXT:        .long   11                      # FuncInfo section string offset=11
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   Lfunc_begin0
 ; CHECK-NEXT:        .long   3
 ; CHECK-NEXT:        .long   16                      # LineInfo
 ; CHECK-NEXT:        .long   11                      # LineInfo section string offset=11
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   17
 ; CHECK-NEXT:        .long   0
 ; CHECK-NEXT:        .long   1042                    # Line 1 Col 18
diff --git a/llvm/test/CodeGen/BPF/BTF/func-void.ll b/llvm/test/CodeGen/BPF/BTF/func-void.ll
index 94770dba455e0..c4638533dfcfd 100644
--- a/llvm/test/CodeGen/BPF/BTF/func-void.ll
+++ b/llvm/test/CodeGen/BPF/BTF/func-void.ll
@@ -47,12 +47,12 @@ define dso_local void @f1() local_unnamed_addr #0 !dbg !7 {
 ; CHECK-NEXT:        .long   8                       # FuncInfo
 ; CHECK-NEXT:        .long   4                       # FuncInfo section string offset=4
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Lfunc_begin0
+; CHECK-NEXT:        .long   Lfunc_begin0
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   16                      # LineInfo
 ; CHECK-NEXT:        .long   4                       # LineInfo section string offset=4
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   10
 ; CHECK-NEXT:        .long   0
 ; CHECK-NEXT:        .long   1040                    # Line 1 Col 16
diff --git a/llvm/test/CodeGen/BPF/CORE/anon-struct-argument-pragma.ll b/llvm/test/CodeGen/BPF/CORE/anon-struct-argument-pragma.ll
index 46507e3338211..bf12d91267ace 100644
--- a/llvm/test/CodeGen/BPF/CORE/anon-struct-argument-pragma.ll
+++ b/llvm/test/CodeGen/BPF/CORE/anon-struct-argument-pragma.ll
@@ -46,7 +46,7 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   59                              # Field reloc section string offset=59
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp[[#]]
+; CHECK-NEXT:        .long   Ltmp[[#]]
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   65
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/anon-union-localvar-attr.ll b/llvm/test/CodeGen/BPF/CORE/anon-union-localvar-attr.ll
index dd8c86897275e..7df73114b2fc8 100644
--- a/llvm/test/CodeGen/BPF/CORE/anon-union-localvar-attr.ll
+++ b/llvm/test/CodeGen/BPF/CORE/anon-union-localvar-attr.ll
@@ -47,7 +47,7 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp[[#]]
+; CHECK-NEXT:        .long   Ltmp[[#]]
 ; CHECK-NEXT:        .long   7
 ; CHECK-NEXT:        .long   101
 ; CHECK-NEXT:        .long   1
diff --git a/llvm/test/CodeGen/BPF/CORE/anon-union-localvar-pragma.ll b/llvm/test/CodeGen/BPF/CORE/anon-union-localvar-pragma.ll
index d2fee10d27710..11ae69dc3d1b0 100644
--- a/llvm/test/CodeGen/BPF/CORE/anon-union-localvar-pragma.ll
+++ b/llvm/test/CodeGen/BPF/CORE/anon-union-localvar-pragma.ll
@@ -50,7 +50,7 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp[[#]]
+; CHECK-NEXT:        .long   Ltmp[[#]]
 ; CHECK-NEXT:        .long   7
 ; CHECK-NEXT:        .long   101
 ; CHECK-NEXT:        .long   1
diff --git a/llvm/test/CodeGen/BPF/CORE/btf-id-duplicate.ll b/llvm/test/CodeGen/BPF/CORE/btf-id-duplicate.ll
index 23a461752e1b8..c23cab4ba8850 100644
--- a/llvm/test/CodeGen/BPF/CORE/btf-id-duplicate.ll
+++ b/llvm/test/CodeGen/BPF/CORE/btf-id-duplicate.ll
@@ -49,11 +49,11 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   20                              # Field reloc section string offset=20
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   26
 ; CHECK-NEXT:        .long   6
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   26
 ; CHECK-NEXT:        .long   6
diff --git a/llvm/test/CodeGen/BPF/CORE/field-reloc-alu32.ll b/llvm/test/CodeGen/BPF/CORE/field-reloc-alu32.ll
index 40a2432d67850..43f494e10bc81 100644
--- a/llvm/test/CodeGen/BPF/CORE/field-reloc-alu32.ll
+++ b/llvm/test/CodeGen/BPF/CORE/field-reloc-alu32.ll
@@ -34,7 +34,7 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   7                       # Field reloc section string offset=7
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   19
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1-bpfeb.ll b/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1-bpfeb.ll
index 63a0945edf152..fb5c1db0080c3 100644
--- a/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1-bpfeb.ll
+++ b/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1-bpfeb.ll
@@ -27,67 +27,67 @@ target triple = "bpfeb"
 ; Function Attrs: nounwind readnone
 define dso_local i32 @test(ptr %arg) local_unnamed_addr #0 !dbg !13 {
 ; CHECK-ALU64-LABEL: test:
-; CHECK-ALU64:       .Ltest$local:
-; CHECK-ALU64-NEXT:    .type .Ltest$local, at function
-; CHECK-ALU64-NEXT:  .Lfunc_begin0:
+; CHECK-ALU64:       Ltest$local:
+; CHECK-ALU64-NEXT:    .type Ltest$local, at function
+; CHECK-ALU64-NEXT:  Lfunc_begin0:
 ; CHECK-ALU64-NEXT:    .loc 1 11 0 # test.c:11:0
 ; CHECK-ALU64-NEXT:    .cfi_sections .debug_frame
 ; CHECK-ALU64-NEXT:    .cfi_startproc
 ; CHECK-ALU64-NEXT:  # %bb.0: # %entry
 ; CHECK-ALU64-NEXT:    #DEBUG_VALUE: test:arg <- $r1
-; CHECK-ALU64-NEXT:  .Ltmp0:
+; CHECK-ALU64-NEXT:  Ltmp0:
 ; CHECK-ALU64-NEXT:    r1 = 16
-; CHECK-ALU64-NEXT:  .Ltmp1:
-; CHECK-ALU64-NEXT:  .Ltmp2:
-; CHECK-ALU64-NEXT:  .Ltmp3:
+; CHECK-ALU64-NEXT:  Ltmp1:
+; CHECK-ALU64-NEXT:  Ltmp2:
+; CHECK-ALU64-NEXT:  Ltmp3:
 ; CHECK-ALU64-NEXT:    r0 = 8
-; CHECK-ALU64-NEXT:  .Ltmp4:
+; CHECK-ALU64-NEXT:  Ltmp4:
 ; CHECK-ALU64-NEXT:    .loc 1 12 69 prologue_end # test.c:12:69
-; CHECK-ALU64-NEXT:  .Ltmp5:
-; CHECK-ALU64-NEXT:  .Ltmp6:
+; CHECK-ALU64-NEXT:  Ltmp5:
+; CHECK-ALU64-NEXT:  Ltmp6:
 ; CHECK-ALU64-NEXT:    r0 += r1
-; CHECK-ALU64-NEXT:  .Ltmp7:
+; CHECK-ALU64-NEXT:  Ltmp7:
 ; CHECK-ALU64-NEXT:    r1 = 45
 ; CHECK-ALU64-NEXT:    .loc 1 13 67 # test.c:13:67
-; CHECK-ALU64-NEXT:  .Ltmp8:
+; CHECK-ALU64-NEXT:  Ltmp8:
 ; CHECK-ALU64-NEXT:    r0 += r1
 ; CHECK-ALU64-NEXT:    .loc 1 12 3 # test.c:12:3
-; CHECK-ALU64-NEXT:  .Ltmp9:
+; CHECK-ALU64-NEXT:  Ltmp9:
 ; CHECK-ALU64-NEXT:    exit
-; CHECK-ALU64-NEXT:  .Ltmp10:
-; CHECK-ALU64-NEXT:  .Ltmp11:
+; CHECK-ALU64-NEXT:  Ltmp10:
+; CHECK-ALU64-NEXT:  Ltmp11:
 ;
 ; CHECK-ALU32-LABEL: test:
-; CHECK-ALU32:       .Ltest$local:
-; CHECK-ALU32-NEXT:    .type .Ltest$local, at function
-; CHECK-ALU32-NEXT:  .Lfunc_begin0:
+; CHECK-ALU32:       Ltest$local:
+; CHECK-ALU32-NEXT:    .type Ltest$local, at function
+; CHECK-ALU32-NEXT:  Lfunc_begin0:
 ; CHECK-ALU32-NEXT:    .loc 1 11 0 # test.c:11:0
 ; CHECK-ALU32-NEXT:    .cfi_sections .debug_frame
 ; CHECK-ALU32-NEXT:    .cfi_startproc
 ; CHECK-ALU32-NEXT:  # %bb.0: # %entry
 ; CHECK-ALU32-NEXT:    #DEBUG_VALUE: test:arg <- $r1
-; CHECK-ALU32-NEXT:  .Ltmp0:
+; CHECK-ALU32-NEXT:  Ltmp0:
 ; CHECK-ALU32-NEXT:    r1 = 16
-; CHECK-ALU32-NEXT:  .Ltmp1:
-; CHECK-ALU32-NEXT:  .Ltmp2:
-; CHECK-ALU32-NEXT:  .Ltmp3:
+; CHECK-ALU32-NEXT:  Ltmp1:
+; CHECK-ALU32-NEXT:  Ltmp2:
+; CHECK-ALU32-NEXT:  Ltmp3:
 ; CHECK-ALU32-NEXT:    r0 = 8
-; CHECK-ALU32-NEXT:  .Ltmp4:
+; CHECK-ALU32-NEXT:  Ltmp4:
 ; CHECK-ALU32-NEXT:    .loc 1 12 69 prologue_end # test.c:12:69
-; CHECK-ALU32-NEXT:  .Ltmp5:
-; CHECK-ALU32-NEXT:  .Ltmp6:
+; CHECK-ALU32-NEXT:  Ltmp5:
+; CHECK-ALU32-NEXT:  Ltmp6:
 ; CHECK-ALU32-NEXT:    w0 += w1
-; CHECK-ALU32-NEXT:  .Ltmp7:
+; CHECK-ALU32-NEXT:  Ltmp7:
 ; CHECK-ALU32-NEXT:    r1 = 45
 ; CHECK-ALU32-NEXT:    .loc 1 13 67 # test.c:13:67
-; CHECK-ALU32-NEXT:  .Ltmp8:
+; CHECK-ALU32-NEXT:  Ltmp8:
 ; CHECK-ALU32-NEXT:    w0 += w1
 ; CHECK-ALU32-NEXT:    # kill: def $w0 killed $w0 killed $r0
 ; CHECK-ALU32-NEXT:    .loc 1 12 3 # test.c:12:3
-; CHECK-ALU32-NEXT:  .Ltmp9:
+; CHECK-ALU32-NEXT:  Ltmp9:
 ; CHECK-ALU32-NEXT:    exit
-; CHECK-ALU32-NEXT:  .Ltmp10:
-; CHECK-ALU32-NEXT:  .Ltmp11:
+; CHECK-ALU32-NEXT:  Ltmp10:
+; CHECK-ALU32-NEXT:  Ltmp11:
 entry:
   call void @llvm.dbg.value(metadata ptr %arg, metadata !30, metadata !DIExpression()), !dbg !31
   %0 = tail call ptr @llvm.preserve.struct.access.index.p0.p0.ss(ptr elementtype(%struct.s) %arg, i32 5, i32 6), !dbg !32, !llvm.preserve.access.index !18
@@ -108,15 +108,15 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   89                      # Field reloc section string offset=89
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   95
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   95
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   95
 ; CHECK-NEXT:        .long   4
diff --git a/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1.ll b/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1.ll
index 33462198eab15..b88cd9223006a 100644
--- a/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-1.ll
@@ -27,67 +27,67 @@ target triple = "bpfel"
 ; Function Attrs: nounwind readnone
 define dso_local i32 @test(ptr %arg) local_unnamed_addr #0 !dbg !13 {
 ; CHECK-ALU64-LABEL: test:
-; CHECK-ALU64:       .Ltest$local:
-; CHECK-ALU64-NEXT:    .type .Ltest$local, at function
-; CHECK-ALU64-NEXT:  .Lfunc_begin0:
+; CHECK-ALU64:       Ltest$local:
+; CHECK-ALU64-NEXT:    .type Ltest$local, at function
+; CHECK-ALU64-NEXT:  Lfunc_begin0:
 ; CHECK-ALU64-NEXT:    .loc 1 11 0 # test.c:11:0
 ; CHECK-ALU64-NEXT:    .cfi_sections .debug_frame
 ; CHECK-ALU64-NEXT:    .cfi_startproc
 ; CHECK-ALU64-NEXT:  # %bb.0: # %entry
 ; CHECK-ALU64-NEXT:    #DEBUG_VALUE: test:arg <- $r1
-; CHECK-ALU64-NEXT:  .Ltmp0:
+; CHECK-ALU64-NEXT:  Ltmp0:
 ; CHECK-ALU64-NEXT:    r1 = 16
-; CHECK-ALU64-NEXT:  .Ltmp1:
-; CHECK-ALU64-NEXT:  .Ltmp2:
-; CHECK-ALU64-NEXT:  .Ltmp3:
+; CHECK-ALU64-NEXT:  Ltmp1:
+; CHECK-ALU64-NEXT:  Ltmp2:
+; CHECK-ALU64-NEXT:  Ltmp3:
 ; CHECK-ALU64-NEXT:    r0 = 8
-; CHECK-ALU64-NEXT:  .Ltmp4:
+; CHECK-ALU64-NEXT:  Ltmp4:
 ; CHECK-ALU64-NEXT:    .loc 1 12 69 prologue_end # test.c:12:69
-; CHECK-ALU64-NEXT:  .Ltmp5:
-; CHECK-ALU64-NEXT:  .Ltmp6:
+; CHECK-ALU64-NEXT:  Ltmp5:
+; CHECK-ALU64-NEXT:  Ltmp6:
 ; CHECK-ALU64-NEXT:    r0 += r1
-; CHECK-ALU64-NEXT:  .Ltmp7:
+; CHECK-ALU64-NEXT:  Ltmp7:
 ; CHECK-ALU64-NEXT:    r1 = 18
 ; CHECK-ALU64-NEXT:    .loc 1 13 67 # test.c:13:67
-; CHECK-ALU64-NEXT:  .Ltmp8:
+; CHECK-ALU64-NEXT:  Ltmp8:
 ; CHECK-ALU64-NEXT:    r0 += r1
 ; CHECK-ALU64-NEXT:    .loc 1 12 3 # test.c:12:3
-; CHECK-ALU64-NEXT:  .Ltmp9:
+; CHECK-ALU64-NEXT:  Ltmp9:
 ; CHECK-ALU64-NEXT:    exit
-; CHECK-ALU64-NEXT:  .Ltmp10:
-; CHECK-ALU64-NEXT:  .Ltmp11:
+; CHECK-ALU64-NEXT:  Ltmp10:
+; CHECK-ALU64-NEXT:  Ltmp11:
 ;
 ; CHECK-ALU32-LABEL: test:
-; CHECK-ALU32:       .Ltest$local:
-; CHECK-ALU32-NEXT:    .type .Ltest$local, at function
-; CHECK-ALU32-NEXT:  .Lfunc_begin0:
+; CHECK-ALU32:       Ltest$local:
+; CHECK-ALU32-NEXT:    .type Ltest$local, at function
+; CHECK-ALU32-NEXT:  Lfunc_begin0:
 ; CHECK-ALU32-NEXT:    .loc 1 11 0 # test.c:11:0
 ; CHECK-ALU32-NEXT:    .cfi_sections .debug_frame
 ; CHECK-ALU32-NEXT:    .cfi_startproc
 ; CHECK-ALU32-NEXT:  # %bb.0: # %entry
 ; CHECK-ALU32-NEXT:    #DEBUG_VALUE: test:arg <- $r1
-; CHECK-ALU32-NEXT:  .Ltmp0:
+; CHECK-ALU32-NEXT:  Ltmp0:
 ; CHECK-ALU32-NEXT:    r1 = 16
-; CHECK-ALU32-NEXT:  .Ltmp1:
-; CHECK-ALU32-NEXT:  .Ltmp2:
-; CHECK-ALU32-NEXT:  .Ltmp3:
+; CHECK-ALU32-NEXT:  Ltmp1:
+; CHECK-ALU32-NEXT:  Ltmp2:
+; CHECK-ALU32-NEXT:  Ltmp3:
 ; CHECK-ALU32-NEXT:    r0 = 8
-; CHECK-ALU32-NEXT:  .Ltmp4:
+; CHECK-ALU32-NEXT:  Ltmp4:
 ; CHECK-ALU32-NEXT:    .loc 1 12 69 prologue_end # test.c:12:69
-; CHECK-ALU32-NEXT:  .Ltmp5:
-; CHECK-ALU32-NEXT:  .Ltmp6:
+; CHECK-ALU32-NEXT:  Ltmp5:
+; CHECK-ALU32-NEXT:  Ltmp6:
 ; CHECK-ALU32-NEXT:    w0 += w1
-; CHECK-ALU32-NEXT:  .Ltmp7:
+; CHECK-ALU32-NEXT:  Ltmp7:
 ; CHECK-ALU32-NEXT:    r1 = 18
 ; CHECK-ALU32-NEXT:    .loc 1 13 67 # test.c:13:67
-; CHECK-ALU32-NEXT:  .Ltmp8:
+; CHECK-ALU32-NEXT:  Ltmp8:
 ; CHECK-ALU32-NEXT:    w0 += w1
 ; CHECK-ALU32-NEXT:    # kill: def $w0 killed $w0 killed $r0
 ; CHECK-ALU32-NEXT:    .loc 1 12 3 # test.c:12:3
-; CHECK-ALU32-NEXT:  .Ltmp9:
+; CHECK-ALU32-NEXT:  Ltmp9:
 ; CHECK-ALU32-NEXT:    exit
-; CHECK-ALU32-NEXT:  .Ltmp10:
-; CHECK-ALU32-NEXT:  .Ltmp11:
+; CHECK-ALU32-NEXT:  Ltmp10:
+; CHECK-ALU32-NEXT:  Ltmp11:
 entry:
   call void @llvm.dbg.value(metadata ptr %arg, metadata !30, metadata !DIExpression()), !dbg !31
   %0 = tail call ptr @llvm.preserve.struct.access.index.p0.p0.ss(ptr elementtype(%struct.s) %arg, i32 5, i32 6), !dbg !32, !llvm.preserve.access.index !18
@@ -108,15 +108,15 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   89                      # Field reloc section string offset=89
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   95
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   95
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   95
 ; CHECK-NEXT:        .long   4
diff --git a/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2-bpfeb.ll b/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2-bpfeb.ll
index 8f344f2df9d70..6bc3ded889466 100644
--- a/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2-bpfeb.ll
+++ b/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2-bpfeb.ll
@@ -56,15 +56,15 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   40                      # Field reloc section string offset=40
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   46
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   46
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   46
 ; CHECK-NEXT:        .long   4
diff --git a/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2.ll b/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2.ll
index 903fcb2b30a0c..1e001de56483b 100644
--- a/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-2.ll
@@ -56,15 +56,15 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   40                      # Field reloc section string offset=40
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   46
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   46
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   46
 ; CHECK-NEXT:        .long   4
diff --git a/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-record-align16.ll b/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-record-align16.ll
index a89524264637d..414e3784e3a26 100644
--- a/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-record-align16.ll
+++ b/llvm/test/CodeGen/BPF/CORE/field-reloc-bitfield-record-align16.ll
@@ -60,7 +60,7 @@ entry:
 ; CHECK:        .long   16                              # FieldReloc
 ; CHECK:        .long   9                               # Field reloc section string offset=9
 ; CHECK:        .long   1
-; CHECK:        .long   .Ltmp[[#]]
+; CHECK:        .long   Ltmp[[#]]
 ; CHECK:        .long   4
 ; CHECK:        .long   105
 ; CHECK:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/field-reloc-duplicate.ll b/llvm/test/CodeGen/BPF/CORE/field-reloc-duplicate.ll
index 126bd0a98369e..9bf114a3949f9 100644
--- a/llvm/test/CodeGen/BPF/CORE/field-reloc-duplicate.ll
+++ b/llvm/test/CodeGen/BPF/CORE/field-reloc-duplicate.ll
@@ -51,11 +51,11 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   20                              # Field reloc section string offset=20
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   26
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   26
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/field-reloc-st-imm.ll b/llvm/test/CodeGen/BPF/CORE/field-reloc-st-imm.ll
index 73a8903298a1b..538dcfcd22637 100644
--- a/llvm/test/CodeGen/BPF/CORE/field-reloc-st-imm.ll
+++ b/llvm/test/CodeGen/BPF/CORE/field-reloc-st-imm.ll
@@ -56,13 +56,13 @@ entry:
   ret void, !dbg !40
 }
 
-; CHECK: [[L0:.Ltmp.*]]:
+; CHECK: [[L0:Ltmp.*]]:
 ; CHECK:       *(u8 *)(r1 + 0) = 1
-; CHECK: [[L2:.Ltmp.*]]:
+; CHECK: [[L2:Ltmp.*]]:
 ; CHECK:       *(u16 *)(r1 + 2) = 2
-; CHECK: [[L4:.Ltmp.*]]:
+; CHECK: [[L4:Ltmp.*]]:
 ; CHECK:       *(u32 *)(r1 + 4) = 3
-; CHECK: [[L6:.Ltmp.*]]:
+; CHECK: [[L6:Ltmp.*]]:
 ; CHECK:       *(u64 *)(r1 + 8) = 4
 
 ; CHECK:       .section        .BTF
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-array-2.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-array-2.ll
index 90681d3c56e7d..d460e72930d01 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-array-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-array-2.ll
@@ -34,7 +34,7 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   10                      # Field reloc section string offset=10
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   22
 ; CHECK-NEXT:        .long   2
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-array.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-array.ll
index d6bed6c308e67..2f08feec5307e 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-array.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-array.ll
@@ -24,7 +24,7 @@ entry:
   ret i32 %call, !dbg !21
 }
 ; CHECK-LABEL: test
-; CHECK:       [[RELOC:.Ltmp[0-9]+]]
+; CHECK:       [[RELOC:Ltmp[0-9]+]]
 ; CHECK:       r2 = 20
 ; CHECK:       r1 += r2
 ; CHECK:       call get_value
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-1.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-1.ll
index a8280579ea509..98115f25c03b3 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-1.ll
@@ -67,19 +67,19 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   43                      # Field reloc section string offset=43
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   49
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   92
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   98
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   104
 ; CHECK-NEXT:        .long   1
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-2.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-2.ll
index 39c02da24da42..da3d8649833f3 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-2.ll
@@ -57,15 +57,15 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   42                      # Field reloc section string offset=42
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   48
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   89
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   95
 ; CHECK-NEXT:        .long   1
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-3.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-3.ll
index f63a3ee4de703..3241ce1679b77 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-3.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-3.ll
@@ -50,11 +50,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   54                      # Field reloc section string offset=54
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   60
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   105
 ; CHECK-NEXT:        .long   1
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-4.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-4.ll
index fda759275ab02..f76aee3d18732 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-4.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-byte-size-4.ll
@@ -35,7 +35,7 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   31                      # Field reloc section string offset=31
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   3
 ; CHECK-NEXT:        .long   37
 ; CHECK-NEXT:        .long   1
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-1.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-1.ll
index cab5474145b46..df4f276306555 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-1.ll
@@ -67,19 +67,19 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   64                      # Field reloc section string offset=64
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   70
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   111
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   7
 ; CHECK-NEXT:        .long   70
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   7
 ; CHECK-NEXT:        .long   111
 ; CHECK-NEXT:        .long   2
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-2.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-2.ll
index 2c56c0d1d704b..a3d0c86850fba 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-2.ll
@@ -49,11 +49,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   55                      # Field reloc section string offset=55
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   61
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   104
 ; CHECK-NEXT:        .long   2
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-3.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-3.ll
index 020b53238767c..7932110c49621 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-3.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-3.ll
@@ -49,11 +49,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   54                      # Field reloc section string offset=54
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   60
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   105
 ; CHECK-NEXT:        .long   2
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-4.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-4.ll
index 67ad819108c7f..34a22aaad16c4 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-4.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-existence-4.ll
@@ -48,7 +48,7 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   {{[0-9]+}}                      # Field reloc section string
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   2
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1-bpfeb.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1-bpfeb.ll
index f4180c0d0de35..23086fd8426e9 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1-bpfeb.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1-bpfeb.ll
@@ -68,19 +68,19 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   43                      # Field reloc section string offset=43
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   49
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   92
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   98
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   104
 ; CHECK-NEXT:        .long   4
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1.ll
index 342a9b7029196..aa471eeac2f67 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-1.ll
@@ -68,19 +68,19 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   43                      # Field reloc section string offset=43
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   49
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   92
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   98
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   104
 ; CHECK-NEXT:        .long   4
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-2.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-2.ll
index 13c79563d4fcb..35d3ec06cfaa3 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-lshift-2.ll
@@ -50,11 +50,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   43                      # Field reloc section string offset=43
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   49
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   92
 ; CHECK-NEXT:        .long   4
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-1.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-1.ll
index 7790273a4978d..8a33353780b99 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-1.ll
@@ -67,19 +67,19 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   43                      # Field reloc section string offset=43
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   49
 ; CHECK-NEXT:        .long   5
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   92
 ; CHECK-NEXT:        .long   5
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   98
 ; CHECK-NEXT:        .long   5
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   104
 ; CHECK-NEXT:        .long   5
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-2.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-2.ll
index f41c6a788f6e7..892d3deef1bc4 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-2.ll
@@ -49,11 +49,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   42                      # Field reloc section string offset=42
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   48
 ; CHECK-NEXT:        .long   5
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   91
 ; CHECK-NEXT:        .long   5
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-3.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-3.ll
index 2ede30701e95b..e913fe885ebde 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-3.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-rshift-3.ll
@@ -50,11 +50,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   59                      # Field reloc section string offset=59
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   65
 ; CHECK-NEXT:        .long   5
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   110
 ; CHECK-NEXT:        .long   5
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-1.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-1.ll
index 9242183d15a33..7b164ca81d6b7 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-1.ll
@@ -67,19 +67,19 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   64                      # Field reloc section string offset=64
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   70
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   111
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   7
 ; CHECK-NEXT:        .long   70
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   7
 ; CHECK-NEXT:        .long   111
 ; CHECK-NEXT:        .long   3
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-2.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-2.ll
index d5fbc657d4ba7..e1c03d6413a71 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-2.ll
@@ -62,15 +62,15 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   65                      # Field reloc section string offset=65
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   71
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   114
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   120
 ; CHECK-NEXT:        .long   3
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-3.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-3.ll
index 5a2a1b7031c33..a3dbc58604259 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-3.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-fieldinfo-signedness-3.ll
@@ -56,11 +56,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   81                      # Field reloc section string offset=81
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   87
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   132
 ; CHECK-NEXT:        .long   3
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-struct.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-struct.ll
index 8b95b1c48e79f..af92370b2b286 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-struct.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-struct.ll
@@ -24,7 +24,7 @@ entry:
 }
 
 ; CHECK-LABEL: test
-; CHECK:       [[RELOC:.Ltmp[0-9]+]]
+; CHECK:       [[RELOC:Ltmp[0-9]+]]
 ; CHECK:       r2 = 4
 ; CHECK:       r1 += r2
 ; CHECK:       call get_value
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value-opaque-pointer.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value-opaque-pointer.ll
index b6013bb07590f..5b97216e0a532 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value-opaque-pointer.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value-opaque-pointer.ll
@@ -48,15 +48,15 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   29
 ; CHECK-NEXT:        .long   10
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   55
 ; CHECK-NEXT:        .long   11
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   5
 ; CHECK-NEXT:        .long   29
 ; CHECK-NEXT:        .long   11
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value.ll
index 88658b66972c8..9ccdff7774f50 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-enum-value.ll
@@ -67,15 +67,15 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   29
 ; CHECK-NEXT:        .long   10
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   55
 ; CHECK-NEXT:        .long   11
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   5
 ; CHECK-NEXT:        .long   29
 ; CHECK-NEXT:        .long   11
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-exist.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-exist.ll
index 0bdf954c8debe..31dc8b1e1a2be 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-exist.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-exist.ll
@@ -45,15 +45,15 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   8
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   7
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   8
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   10
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   8
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-match.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-match.ll
index 8a8fd1e00db67..20e07778bc2a9 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-match.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-match.ll
@@ -46,15 +46,15 @@ define dso_local i32 @test() #0 !dbg !18 {
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   12
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   7
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   12
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   10
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   12
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-1.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-1.ll
index ddd371159721e..c53ce41c88b02 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-1.ll
@@ -45,15 +45,15 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   9
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   7
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   9
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   10
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   9
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-2.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-2.ll
index b2f8e485a0814..1f9729b7a965c 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-typeinfo-type-size-2.ll
@@ -51,15 +51,15 @@ entry:
 ; CHECK:             .long   16                              # FieldReloc
 ; CHECK-NEXT:        .long   10                              # Field reloc section string offset=10
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   4
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   9
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   7
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   9
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   10
 ; CHECK-NEXT:        .long   23
 ; CHECK-NEXT:        .long   9
diff --git a/llvm/test/CodeGen/BPF/CORE/intrinsic-union.ll b/llvm/test/CodeGen/BPF/CORE/intrinsic-union.ll
index ef360929014fd..a89cb7f5110f4 100644
--- a/llvm/test/CodeGen/BPF/CORE/intrinsic-union.ll
+++ b/llvm/test/CodeGen/BPF/CORE/intrinsic-union.ll
@@ -23,7 +23,7 @@ entry:
   ret i32 %call, !dbg !21
 }
 ; CHECK-LABEL: test
-; CHECK:       [[RELOC:.Ltmp[0-9]+]]
+; CHECK:       [[RELOC:Ltmp[0-9]+]]
 ; CHECK:       r2 = 0
 ; CHECK:       r1 += r2
 ; CHECK:       call get_value
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-access-str.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-access-str.ll
index 5da2bbd43fa09..dfea1260080dc 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-access-str.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-access-str.ll
@@ -37,11 +37,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   [[SEC_INDEX]]           # Field reloc section string offset=[[SEC_INDEX]]
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   {{[0-9]+}}
 ; CHECK-NEXT:        .long   [[ACCESS_STR]]
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   {{[0-9]+}}
 ; CHECK-NEXT:        .long   [[ACCESS_STR]]
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-basic.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-basic.ll
index 024ed04f6e5e1..4e8cb5fe78077 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-basic.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-basic.ll
@@ -116,7 +116,7 @@ define dso_local i32 @bpf_prog(ptr) local_unnamed_addr #0 !dbg !15 {
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   43                      # Field reloc section string offset=43
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   86
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-1.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-1.ll
index e12221ecb3528..4a017640be017 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-1.ll
@@ -51,11 +51,11 @@ entry:
 ; CHECK:              .long   16                      # FieldReloc
 ; CHECK-NEXT:         .long   46                      # Field reloc section string offset=46
 ; CHECK-NEXT:         .long   2
-; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:         .long   [[TID1]]
 ; CHECK-NEXT:         .long   52
 ; CHECK-NEXT:         .long   0
-; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:         .long   [[TID2]]
 ; CHECK-NEXT:         .long   107
 ; CHECK-NEXT:         .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-2.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-2.ll
index 1764c9d12a36b..39b4f3e938c96 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-array-2.ll
@@ -53,11 +53,11 @@ entry:
 ; CHECK:              .long   16                      # FieldReloc
 ; CHECK-NEXT:         .long   46                      # Field reloc section string offset=46
 ; CHECK-NEXT:         .long   2
-; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:         .long   [[TID1]]
 ; CHECK-NEXT:         .long   52
 ; CHECK-NEXT:         .long   0
-; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:         .long   [[TID2]]
 ; CHECK-NEXT:         .long   107
 ; CHECK-NEXT:         .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-1.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-1.ll
index bbff3f6695ea9..a8944e7985ad3 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-1.ll
@@ -51,11 +51,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   [[SEC_STR]]             # Field reloc section string offset=[[SEC_STR]]
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   [[V3_TID]]
 ; CHECK-NEXT:        .long   [[ACCESS_STR]]
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   [[V1_TID]]
 ; CHECK-NEXT:        .long   [[ACCESS_STR]]
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-2.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-2.ll
index bdc17e626ec30..222df0762959b 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-2.ll
@@ -51,11 +51,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   39                      # Field reloc section string offset=39
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   [[TID1]]
 ; CHECK-NEXT:        .long   45
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   [[TID2]]
 ; CHECK-NEXT:        .long   45
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-3.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-3.ll
index dea6e406678f0..7836be14a5f78 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-3.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-struct-3.ll
@@ -51,11 +51,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   57                      # Field reloc section string offset=57
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   [[TID1]]
 ; CHECK-NEXT:        .long   63
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   [[TID2]]
 ; CHECK-NEXT:        .long   118
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-1.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-1.ll
index 98fdfded2fee4..07bedecfe1ec2 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-1.ll
@@ -52,11 +52,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   39                      # Field reloc section string offset=39
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   [[TID1]]
 ; CHECK-NEXT:        .long   45
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   [[TID2]]
 ; CHECK-NEXT:        .long   45
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-2.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-2.ll
index 7b6369912111c..4838ad555d4b9 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-cast-union-2.ll
@@ -53,11 +53,11 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   57                      # Field reloc section string offset=57
 ; CHECK-NEXT:        .long   2
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   [[TID1]]
 ; CHECK-NEXT:        .long   63
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   [[TID2]]
 ; CHECK-NEXT:        .long   118
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-end-load.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-end-load.ll
index 7980c02bde428..7714eafd093d8 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-end-load.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-end-load.ll
@@ -36,7 +36,7 @@ entry:
 ; CHECK:       .long   16                      # FieldReloc
 ; CHECK-NEXT:  .long   20                      # Field reloc section string offset=20
 ; CHECK-NEXT:  .long   1
-; CHECK-NEXT:  .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:  .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:  .long   2
 ; CHECK-NEXT:  .long   26
 ; CHECK-NEXT:  .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-end-ret.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-end-ret.ll
index 2aadbdfd3aafb..0256372bcdb07 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-end-ret.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-end-ret.ll
@@ -36,7 +36,7 @@ entry:
 ; CHECK:       .long   16                      # FieldReloc
 ; CHECK-NEXT:  .long   20                      # Field reloc section string offset=20
 ; CHECK-NEXT:  .long   1
-; CHECK-NEXT:  .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:  .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:  .long   2
 ; CHECK-NEXT:  .long   63
 ; CHECK-NEXT:  .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-1.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-1.ll
index a0febc3a98a76..e9419713fbb3c 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-1.ll
@@ -88,27 +88,27 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   30                      # Field reloc section string offset=30
 ; CHECK-NEXT:        .long   6
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   73
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   73
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   73
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   73
 ; CHECK-NEXT:        .long   5
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   73
 ; CHECK-NEXT:        .long   5
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   73
 ; CHECK-NEXT:        .long   3
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2-bpfeb.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2-bpfeb.ll
index 6fdf985aec641..fbc25cdd89445 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2-bpfeb.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2-bpfeb.ll
@@ -123,35 +123,35 @@ sw.epilog:                                        ; preds = %entry, %sw.bb9, %sw
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   30                      # Field reloc section string offset=30
 ; CHECK-NEXT:        .long   8
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   5
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   5
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   3
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2.ll
index 5cbafa15d643b..dbc6869714ee8 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-fieldinfo-2.ll
@@ -123,35 +123,35 @@ sw.epilog:                                        ; preds = %entry, %sw.bb9, %sw
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   30                      # Field reloc section string offset=30
 ; CHECK-NEXT:        .long   8
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   4
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   5
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   5
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   36
 ; CHECK-NEXT:        .long   3
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-1.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-1.ll
index 7657b7897bb25..0e9a8c59dd408 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-1.ll
@@ -40,7 +40,7 @@ entry:
 ; CHECK:              .long   16                      # FieldReloc
 ; CHECK-NEXT:         .long   10                      # Field reloc section string offset=10
 ; CHECK-NEXT:         .long   1
-; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:         .long   [[TID1]]
 ; CHECK-NEXT:         .long   23
 ; CHECK-NEXT:         .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-2.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-2.ll
index bed14ab4ea15d..506b731939e96 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-2.ll
@@ -42,7 +42,7 @@ entry:
 ; CHECK:              .long   16                      # FieldReloc
 ; CHECK-NEXT:         .long   10                      # Field reloc section string offset=10
 ; CHECK-NEXT:         .long   1
-; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:         .long   [[TID1]]
 ; CHECK-NEXT:         .long   23
 ; CHECK-NEXT:         .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-3.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-3.ll
index 49b89e2e49277..371c42cdcd386 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-3.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-global-3.ll
@@ -40,7 +40,7 @@ entry:
 ; CHECK:              .long   16                      # FieldReloc
 ; CHECK-NEXT:         .long   10                      # Field reloc section string offset=10
 ; CHECK-NEXT:         .long   1
-; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:         .long   [[TID1]]
 ; CHECK-NEXT:         .long   23
 ; CHECK-NEXT:         .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-middle-chain.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-middle-chain.ll
index e5f86c2a473f9..887f8bd1f8ea7 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-middle-chain.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-middle-chain.ll
@@ -53,15 +53,15 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   29                      # Field reloc section string offset=29
 ; CHECK-NEXT:        .long   3
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   72
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   76
 ; CHECK-NEXT:        .long   0
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   82
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-1.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-1.ll
index 8ca3ef5d3f6cc..bbae4ffd1eda2 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-1.ll
@@ -41,7 +41,7 @@ entry:
 ; CHECK:              .long   16                      # FieldReloc
 ; CHECK-NEXT:         .long   52                      # Field reloc section string offset=52
 ; CHECK-NEXT:         .long   1
-; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:         .long   [[TID1]]
 ; CHECK-NEXT:         .long   58
 ; CHECK-NEXT:         .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-2.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-2.ll
index b2ba5a8386bd4..020ece0d13e50 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-multi-array-2.ll
@@ -42,7 +42,7 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   52                      # Field reloc section string offset=52
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   [[TID1]]
 ; CHECK-NEXT:        .long   58
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-multilevel.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-multilevel.ll
index e00bbb85d7234..41e9c4b0330cb 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-multilevel.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-multilevel.ll
@@ -124,7 +124,7 @@ define dso_local i32 @bpf_prog(ptr) local_unnamed_addr #0 !dbg !15 {
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   57                      # Field reloc section string offset=57
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   100
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-1.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-1.ll
index b4d18449dd378..0841de1b1be02 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-1.ll
@@ -37,7 +37,7 @@ entry:
 ; CHECK:              .long   16                      # FieldReloc
 ; CHECK-NEXT:         .long   26                      # Field reloc section string offset=26
 ; CHECK-NEXT:         .long   1
-; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:         .long   [[TID1]]
 ; CHECK-NEXT:         .long   32
 ; CHECK-NEXT:         .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-2.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-2.ll
index 87b88bc925b4f..d2979b6ae83d4 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-pointer-2.ll
@@ -37,7 +37,7 @@ entry:
 ; CHECK:              .long   16                      # FieldReloc
 ; CHECK-NEXT:         .long   26                      # Field reloc section string offset=26
 ; CHECK-NEXT:         .long   1
-; CHECK-NEXT:         .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:         .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:         .long   [[TID1]]
 ; CHECK-NEXT:         .long   32
 ; CHECK-NEXT:         .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-1.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-1.ll
index 60d32e42bb7d1..81a41e082aa41 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-1.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-1.ll
@@ -56,23 +56,23 @@ entry:
 
 ; CHECK: foo:
 ; CHECK:      prologue_end
-; CHECK-NEXT: .Ltmp[[LABEL_UB:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL_UB:.*]]:
+; CHECK-NEXT: Ltmp
 ; V2-NEXT:            *(u8 *)(r1 + 0) = r2
 ; V4-NEXT:            *(u8 *)(r1 + 0) = w2
 ; CHECK-NEXT:         .loc
-; CHECK-NEXT: .Ltmp[[LABEL_UH:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL_UH:.*]]:
+; CHECK-NEXT: Ltmp
 ; V2-NEXT:            *(u16 *)(r1 + 2) = r2
 ; V4-NEXT:            *(u16 *)(r1 + 2) = w2
 ; CHECK-NEXT:         .loc
-; CHECK-NEXT: .Ltmp[[LABEL_UW:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL_UW:.*]]:
+; CHECK-NEXT: Ltmp
 ; V2-NEXT:            *(u32 *)(r1 + 4) = r2
 ; V4-NEXT:            *(u32 *)(r1 + 4) = w2
 ; CHECK-NEXT:         .loc
-; CHECK-NEXT: .Ltmp[[LABEL_UD:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL_UD:.*]]:
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:         *(u64 *)(r1 + 8) = r2
 
 ; CHECK: .section .BTF
@@ -85,19 +85,19 @@ entry:
 ; CHECK: .ascii  "0:3"   # string offset=[[STR_UD:.*]]
 
 ; CHECK:     # FieldReloc
-; CHECK:      .long .Ltmp[[LABEL_UB]]
+; CHECK:      .long Ltmp[[LABEL_UB]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_UB]]
 ; CHECK-NEXT: .long 0
-; CHECK:      .long .Ltmp[[LABEL_UH]]
+; CHECK:      .long Ltmp[[LABEL_UH]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_UH]]
 ; CHECK-NEXT: .long 0
-; CHECK:      .long .Ltmp[[LABEL_UW]]
+; CHECK:      .long Ltmp[[LABEL_UW]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_UW]]
 ; CHECK-NEXT: .long 0
-; CHECK:      .long .Ltmp[[LABEL_UD]]
+; CHECK:      .long Ltmp[[LABEL_UD]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_UD]]
 ; CHECK-NEXT: .long 0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-2.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-2.ll
index 0f568507a6e01..47ea7904c8860 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-2.ll
@@ -61,38 +61,38 @@ entry:
 
 ; CHECK: bar:
 ; CHECK:      prologue_end
-; CHECK-NEXT: .Ltmp[[LABEL_UB:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL_UB:.*]]:
+; CHECK-NEXT: Ltmp
 ; V2-NEXT:        r1 = *(u8 *)(r6 + 0)
 ; V4-NEXT:        w1 = *(u8 *)(r6 + 0)
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     call cu
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp[[LABEL_UH:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL_UH:.*]]:
+; CHECK-NEXT: Ltmp
 ; V2-NEXT:        r1 = *(u16 *)(r6 + 2)
 ; V4-NEXT:        w1 = *(u16 *)(r6 + 2)
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     call cu
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp[[LABEL_UW:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL_UW:.*]]:
+; CHECK-NEXT: Ltmp
 ; V2-NEXT:        r1 = *(u32 *)(r6 + 4)
 ; V4-NEXT:        w1 = *(u32 *)(r6 + 4)
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     call cu
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp[[LABEL_UD:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL_UD:.*]]:
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     r1 = *(u64 *)(r6 + 8)
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     call cu
 
 ; CHECK: .section .BTF
@@ -105,19 +105,19 @@ entry:
 ; CHECK: .ascii  "0:3"   # string offset=[[STR_UD:.*]]
 
 ; CHECK:     # FieldReloc
-; CHECK:      .long .Ltmp[[LABEL_UB]]
+; CHECK:      .long Ltmp[[LABEL_UB]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_UB]]
 ; CHECK-NEXT: .long 0
-; CHECK:      .long .Ltmp[[LABEL_UH]]
+; CHECK:      .long Ltmp[[LABEL_UH]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_UH]]
 ; CHECK-NEXT: .long 0
-; CHECK:      .long .Ltmp[[LABEL_UW]]
+; CHECK:      .long Ltmp[[LABEL_UW]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_UW]]
 ; CHECK-NEXT: .long 0
-; CHECK:      .long .Ltmp[[LABEL_UD]]
+; CHECK:      .long Ltmp[[LABEL_UD]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_UD]]
 ; CHECK-NEXT: .long 0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-3.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-3.ll
index 6ea8ede95836e..9d3e53842c370 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-3.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-simplify-patchable-3.ll
@@ -52,27 +52,27 @@ entry:
 
 ; CHECK: buz:
 ; CHECK:      prologue_end
-; CHECK-NEXT: .Ltmp[[LABEL_SB:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL_SB:.*]]:
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     r1 = *(s8 *)(r6 + 0)
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     call cs
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp[[LABEL_SH:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL_SH:.*]]:
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     r1 = *(s16 *)(r6 + 2)
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     call cs
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp[[LABEL_SW:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL_SW:.*]]:
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     r1 = *(s32 *)(r6 + 4)
 ; CHECK-NEXT:     .loc
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:     call cs
 
 ; CHECK: .section .BTF
@@ -84,15 +84,15 @@ entry:
 ; CHECK: .ascii  "0:2"   # string offset=[[STR_SW:.*]]
 
 ; CHECK:     # FieldReloc
-; CHECK:      .long .Ltmp[[LABEL_SB]]
+; CHECK:      .long Ltmp[[LABEL_SB]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_SB]]
 ; CHECK-NEXT: .long 0
-; CHECK:      .long .Ltmp[[LABEL_SH]]
+; CHECK:      .long Ltmp[[LABEL_SH]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_SH]]
 ; CHECK-NEXT: .long 0
-; CHECK:      .long .Ltmp[[LABEL_SW]]
+; CHECK:      .long Ltmp[[LABEL_SW]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_SW]]
 ; CHECK-NEXT: .long 0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-anonymous.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-anonymous.ll
index 8ebbfeaac6a27..cb7e6d86b9338 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-anonymous.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-anonymous.ll
@@ -134,7 +134,7 @@ define dso_local i32 @bpf_prog(ptr) local_unnamed_addr #0 !dbg !15 {
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   66                      # Field reloc section string offset=66
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   109
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-array.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-array.ll
index 64ec2504551cf..2f1cfb6b0075e 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-array.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-struct-array.ll
@@ -137,7 +137,7 @@ define dso_local i32 @bpf_prog(ptr) local_unnamed_addr #0 !dbg !15 {
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   77                      # Field reloc section string offset=77
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   120
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-array.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-array.ll
index ed462e1b35b10..d8ff657ee6e3b 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-array.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-array.ll
@@ -30,7 +30,7 @@ entry:
 }
 
 ; CHECK:        .cfi_startproc
-; CHECK: [[RELOC:.Ltmp[0-9]+]]:
+; CHECK: [[RELOC:Ltmp[0-9]+]]:
 ; CHECK:         r2 = 4
 ; CHECK:         r1 += r2
 ; CHECK:         call get_value
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct-2.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct-2.ll
index 6b806ae87e6d3..5da3d21bc4687 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct-2.ll
@@ -44,7 +44,7 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   20                      # Field reloc section string offset=20
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   26
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct.ll
index c2b5a116e9cd0..95b4bc3af8c9a 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-struct.ll
@@ -29,7 +29,7 @@ entry:
 }
 
 ; CHECK:        .cfi_startproc
-; CHECK:        [[RELOC:.Ltmp[0-9]+]]:
+; CHECK:        [[RELOC:Ltmp[0-9]+]]:
 ; CHECK:        r2 = 4
 ; CHECK:        r1 += r2
 ; CHECK:        call get_value
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union-2.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union-2.ll
index a63b7e7296d36..5b950bb65c00c 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union-2.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union-2.ll
@@ -44,7 +44,7 @@ entry:
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   20                      # Field reloc section string offset=20
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   26
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union.ll
index 4b3d178cffba6..f0827a8fad7e0 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef-union.ll
@@ -29,7 +29,7 @@ entry:
 }
 
 ; CHECK:        .cfi_startproc
-; CHECK: [[RELOC:.Ltmp[0-9]+]]:
+; CHECK: [[RELOC:Ltmp[0-9]+]]:
 ; CHECK:         r2 = 0
 ; CHECK:         r1 += r2
 ; CHECK:         call get_value
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef.ll
index e757327919e2a..36104271da364 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-typedef.ll
@@ -35,7 +35,7 @@ entry:
 }
 
 ; CHECK:         .cfi_startproc
-; CHECK: [[RELOC:.Ltmp[0-9]+]]:
+; CHECK: [[RELOC:Ltmp[0-9]+]]:
 ; CHECK:         r2 = 12
 ; CHECK:         r1 += r2
 ; CHECK:         call get_value
@@ -48,7 +48,7 @@ entry:
 ; CHECK:         .long   16                      # FieldReloc
 ; CHECK-NEXT:    .long   [[SEC_STR:[0-9]+]]      # Field reloc section string offset=[[SEC_STR:[0-9]+]]
 ; CHECK-NEXT:    .long   1
-; CHECK-NEXT:    .long   [[RELOC:.Ltmp[0-9]+]]
+; CHECK-NEXT:    .long   [[RELOC:Ltmp[0-9]+]]
 ; CHECK-NEXT:    .long   [[TYPE_ID:[0-9]+]]
 ; CHECK-NEXT:    .long   [[ACCESS_STR:[0-9]+]]
 ; CHECK-NEXT:    .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/offset-reloc-union.ll b/llvm/test/CodeGen/BPF/CORE/offset-reloc-union.ll
index 824eba9af8f52..3f4a272d52a04 100644
--- a/llvm/test/CodeGen/BPF/CORE/offset-reloc-union.ll
+++ b/llvm/test/CodeGen/BPF/CORE/offset-reloc-union.ll
@@ -139,7 +139,7 @@ define dso_local i32 @bpf_prog(ptr) local_unnamed_addr #0 !dbg !15 {
 ; CHECK:             .long   16                      # FieldReloc
 ; CHECK-NEXT:        .long   54                      # Field reloc section string offset=54
 ; CHECK-NEXT:        .long   1
-; CHECK-NEXT:        .long   .Ltmp{{[0-9]+}}
+; CHECK-NEXT:        .long   Ltmp{{[0-9]+}}
 ; CHECK-NEXT:        .long   2
 ; CHECK-NEXT:        .long   97
 ; CHECK-NEXT:        .long   0
diff --git a/llvm/test/CodeGen/BPF/CORE/simplify-patchable-liveness-bug.ll b/llvm/test/CodeGen/BPF/CORE/simplify-patchable-liveness-bug.ll
index d8fd7cce193b9..cf59c94a86e07 100644
--- a/llvm/test/CodeGen/BPF/CORE/simplify-patchable-liveness-bug.ll
+++ b/llvm/test/CodeGen/BPF/CORE/simplify-patchable-liveness-bug.ll
@@ -38,20 +38,20 @@ entry:
 
 ; CHECK:      foo:
 ; CHECK:              prologue_end
-; CHECK-NEXT: .Ltmp[[LABEL1:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL1:.*]]:
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:         r[[#A:]] = *(u64 *)(r1 + 0)
 ; CHECK-NEXT:         .loc
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:         *(u64 *)(r2 + 0) = r[[#A]]
 ; CHECK-NEXT:         .loc
-; CHECK-NEXT: .Ltmp[[LABEL2:.*]]:
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp[[LABEL2:.*]]:
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:         r[[#B:]] = *(u64 *)(r1 + 0)
-; CHECK-NEXT: .Ltmp
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:         .loc
-; CHECK-NEXT: .Ltmp
+; CHECK-NEXT: Ltmp
 ; CHECK-NEXT:         *(u64 *)(r2 + 0) = r[[#B]]
 
 ; CHECK: .section .BTF
@@ -61,11 +61,11 @@ entry:
 ; CHECK: .ascii  "0:0"   # string offset=[[STR_A:.*]]
 
 ; CHECK:     # FieldReloc
-; CHECK:      .long .Ltmp[[LABEL1]]
+; CHECK:      .long Ltmp[[LABEL1]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_A]]
 ; CHECK-NEXT: .long 0
-; CHECK:      .long .Ltmp[[LABEL2]]
+; CHECK:      .long Ltmp[[LABEL2]]
 ; CHECK-NEXT: .long [[ID]]
 ; CHECK-NEXT: .long [[STR_A]]
 ; CHECK-NEXT: .long 0
diff --git a/llvm/test/CodeGen/BPF/GlobalISel/ir-translator-ret.ll b/llvm/test/CodeGen/BPF/GlobalISel/ir-translator-ret.ll
index 031e82dcb67bd..4217e4288d8ed 100644
--- a/llvm/test/CodeGen/BPF/GlobalISel/ir-translator-ret.ll
+++ b/llvm/test/CodeGen/BPF/GlobalISel/ir-translator-ret.ll
@@ -7,6 +7,6 @@ define void @f() {
 ; ISEL-LABEL: f:
 ; ISEL:       # %bb.0:
 ; ISEL-NEXT:  exit
-; ISEL-NEXT: .Lfunc_end0:
+; ISEL-NEXT: Lfunc_end0:
   ret void
 }
diff --git a/llvm/test/CodeGen/BPF/cttz-ctlz.ll b/llvm/test/CodeGen/BPF/cttz-ctlz.ll
index 69fe0276c8a23..f42b2e2d10871 100644
--- a/llvm/test/CodeGen/BPF/cttz-ctlz.ll
+++ b/llvm/test/CodeGen/BPF/cttz-ctlz.ll
@@ -31,7 +31,7 @@ define i32 @cttz_i32(i32 %a) {
 ; CHECK-NEXT:    r2 = r1
 ; CHECK-NEXT:    r2 <<= 32
 ; CHECK-NEXT:    r2 >>= 32
-; CHECK-NEXT:    if r2 == 0 goto .LBB1_2
+; CHECK-NEXT:    if r2 == 0 goto LBB1_2
 ; CHECK-NEXT:  # %bb.1: # %cond.false
 ; CHECK-NEXT:    r2 = r1
 ; CHECK-NEXT:    r2 = -r2
@@ -43,7 +43,7 @@ define i32 @cttz_i32(i32 %a) {
 ; CHECK-NEXT:    r2 = {{\.?LCPI[0-9]+_[0-9]+}} ll
 ; CHECK-NEXT:    r2 += r1
 ; CHECK-NEXT:    r0 = *(u8 *)(r2 + 0)
-; CHECK-NEXT:  .LBB1_2: # %cond.end
+; CHECK-NEXT:  LBB1_2: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i32 @llvm.cttz.i32(i32 %a, i1 0)
     ret i32 %ret
@@ -73,7 +73,7 @@ define i64 @cttz_i64(i64 %a) {
 ; CHECK-LABEL: cttz_i64:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    r0 = 64
-; CHECK-NEXT:    if r1 == 0 goto .LBB3_2
+; CHECK-NEXT:    if r1 == 0 goto LBB3_2
 ; CHECK-NEXT:  # %bb.1: # %cond.false
 ; CHECK-NEXT:    r2 = r1
 ; CHECK-NEXT:    r2 = -r2
@@ -84,7 +84,7 @@ define i64 @cttz_i64(i64 %a) {
 ; CHECK-NEXT:    r2 = {{\.?LCPI[0-9]+_[0-9]+}} ll
 ; CHECK-NEXT:    r2 += r1
 ; CHECK-NEXT:    r0 = *(u8 *)(r2 + 0)
-; CHECK-NEXT:  .LBB3_2: # %cond.end
+; CHECK-NEXT:  LBB3_2: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i64 @llvm.cttz.i64(i64 %a, i1 0)
     ret i64 %ret
@@ -152,7 +152,7 @@ define i32 @ctlz_i32(i32 %a) {
 ; CHECK-NEXT:    r2 = r1
 ; CHECK-NEXT:    r2 <<= 32
 ; CHECK-NEXT:    r2 >>= 32
-; CHECK-NEXT:    if r2 == 0 goto .LBB5_2
+; CHECK-NEXT:    if r2 == 0 goto LBB5_2
 ; CHECK-NEXT:  # %bb.1: # %cond.false
 ; CHECK-NEXT:    r2 = 4294967294 ll
 ; CHECK-NEXT:    r3 = r1
@@ -197,7 +197,7 @@ define i32 @ctlz_i32(i32 %a) {
 ; CHECK-NEXT:    r1 = 4278190080 ll
 ; CHECK-NEXT:    r0 &= r1
 ; CHECK-NEXT:    r0 >>= 24
-; CHECK-NEXT:  .LBB5_2: # %cond.end
+; CHECK-NEXT:  LBB5_2: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i32 @llvm.ctlz.i32(i32 %a, i1 0)
     ret i32 %ret
@@ -256,7 +256,7 @@ define i64 @ctlz_i64(i64 %a) {
 ; CHECK-LABEL: ctlz_i64:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    r0 = 64
-; CHECK-NEXT:    if r1 == 0 goto .LBB7_2
+; CHECK-NEXT:    if r1 == 0 goto LBB7_2
 ; CHECK-NEXT:  # %bb.1: # %cond.false
 ; CHECK-NEXT:    r2 = r1
 ; CHECK-NEXT:    r2 >>= 1
@@ -296,7 +296,7 @@ define i64 @ctlz_i64(i64 %a) {
 ; CHECK-NEXT:    r1 = 72340172838076673 ll
 ; CHECK-NEXT:    r0 *= r1
 ; CHECK-NEXT:    r0 >>= 56
-; CHECK-NEXT:  .LBB7_2: # %cond.end
+; CHECK-NEXT:  LBB7_2: # %cond.end
 ; CHECK-NEXT:    exit
     %ret = call i64 @llvm.ctlz.i64(i64 %a, i1 0)
     ret i64 %ret
diff --git a/llvm/test/CodeGen/BPF/gotol.ll b/llvm/test/CodeGen/BPF/gotol.ll
index 20e5ad180db83..0c7d9291f72da 100644
--- a/llvm/test/CodeGen/BPF/gotol.ll
+++ b/llvm/test/CodeGen/BPF/gotol.ll
@@ -38,8 +38,8 @@ entry:
 ; case (3): conditional jmp followed by an unconditional jmp
 ; CHECK:        w0 = w2
 ; CHECK-NEXT:   if w1 < w2 goto
-; CHECK:        gotol .LBB0_4   # encoding: [0x06'A',A,A,A,0x00,0x00,0x00,0x00]
-; CHECK-NEXT:                   # fixup A - offset: 0, value: .LBB0_4, kind: FK_BPF_PCRel_4
+; CHECK:        gotol LBB0_4    # encoding: [0x06'A',A,A,A,0x00,0x00,0x00,0x00]
+; CHECK-NEXT:                   # fixup A - offset: 0, value: LBB0_4, kind: FK_BPF_PCRel_4
 
 begin:                                            ; preds = %next2, %next
   %s.0 = phi i32 [ %mul3, %next ], [ %mul7, %next2 ]
@@ -49,12 +49,12 @@ begin:                                            ; preds = %next2, %next
 
 ; case (2): conditional jmp
 ; CHECK:        w0 *= w1
-; CHECK-NEXT:   if w0 > w2 goto .LBB0_7
-; CHECK:        goto .LBB0_4
-; CHECK-LABEL:  .LBB0_7:
+; CHECK-NEXT:   if w0 > w2 goto LBB0_7
+; CHECK:        goto LBB0_4
+; CHECK-LABEL:  LBB0_7:
 ; CHECK:        gotol
 
-; CHECK-LABEL:  .LBB0_4:
+; CHECK-LABEL:  LBB0_4:
 
 if.then2:                                         ; preds = %begin
   %mul = mul i32 %div, %div
diff --git a/llvm/test/CodeGen/BPF/sanity.ll b/llvm/test/CodeGen/BPF/sanity.ll
index e84adea8b1990..a730457171f3e 100644
--- a/llvm/test/CodeGen/BPF/sanity.ll
+++ b/llvm/test/CodeGen/BPF/sanity.ll
@@ -76,10 +76,10 @@ define signext i8 @foo_cmp(i8 signext %a, i8 signext %b) #0 {
 ; CHECK-LABEL: foo_cmp:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    r0 = r1
-; CHECK-NEXT:    if r2 s> r0 goto .LBB5_2
+; CHECK-NEXT:    if r2 s> r0 goto LBB5_2
 ; CHECK-NEXT:  # %bb.1:
 ; CHECK-NEXT:    r0 = r2
-; CHECK-NEXT:  .LBB5_2:
+; CHECK-NEXT:  LBB5_2:
 ; CHECK-NEXT:    exit
   %1 = icmp slt i8 %a, %b
   %a.b = select i1 %1, i8 %a, i8 %b
@@ -91,18 +91,18 @@ define i32 @foo_muldiv(i8 signext %a, i16 signext %b, i32 %c, i64 %d) #0 {
 ; CHECK-LABEL: foo_muldiv:
 ; CHECK:       # %bb.0:
 ; CHECK-NEXT:    r0 = r2
-; CHECK-NEXT:    if r1 == 0 goto .LBB6_2
+; CHECK-NEXT:    if r1 == 0 goto LBB6_2
 ; CHECK-NEXT:  # %bb.1:
 ; CHECK-NEXT:    r0 *= r3
-; CHECK-NEXT:    goto .LBB6_3
-; CHECK-NEXT:  .LBB6_2:
+; CHECK-NEXT:    goto LBB6_3
+; CHECK-NEXT:  LBB6_2:
 ; CHECK-NEXT:    r3 <<= 32
 ; CHECK-NEXT:    r3 >>= 32
 ; CHECK-NEXT:    r4 <<= 32
 ; CHECK-NEXT:    r4 >>= 32
 ; CHECK-NEXT:    r4 /= r3
 ; CHECK-NEXT:    r0 = r4
-; CHECK-NEXT:  .LBB6_3:
+; CHECK-NEXT:  LBB6_3:
 ; CHECK-NEXT:    exit
   %1 = icmp eq i8 %a, 0
   br i1 %1, label %5, label %2
diff --git a/llvm/test/MC/BPF/insn-unit.s b/llvm/test/MC/BPF/insn-unit.s
index 84735d196030d..7608a5be2e67d 100644
--- a/llvm/test/MC/BPF/insn-unit.s
+++ b/llvm/test/MC/BPF/insn-unit.s
@@ -146,7 +146,6 @@ Llabel0 :
   r8 ^= r9    // BPF_XOR  | BPF_X
   r9 = r10    // BPF_MOV  | BPF_X
   r10 s>>= r0 // BPF_ARSH | BPF_X
-// CHECK: <Llabel0>:
 // CHECK: 87 02 00 00 00 00 00 00	r2 = -r2
 // CHECK: 4f 54 00 00 00 00 00 00 	r4 |= r5
 // CHECK: 5f 65 00 00 00 00 00 00 	r5 &= r6

>From 0f72c6d4ca80d5851d89242d639f2348c7f56a33 Mon Sep 17 00:00:00 2001
From: Alexis Engelke <engelke at in.tum.de>
Date: Wed, 12 Jun 2024 09:17:47 +0000
Subject: [PATCH 3/3] Add BPF mangling mode that uses "L" prefix

---
 llvm/include/llvm/IR/DataLayout.h             |   3 +
 llvm/lib/IR/DataLayout.cpp                    |   3 +
 llvm/lib/Target/BPF/BPFTargetMachine.cpp      |   4 +-
 llvm/lib/Target/TargetLoweringObjectFile.cpp  |   2 +-
 .../llvm-objdump/BPF/core-relo-formatting.s   | 162 +++++++++---------
 5 files changed, 90 insertions(+), 84 deletions(-)

diff --git a/llvm/include/llvm/IR/DataLayout.h b/llvm/include/llvm/IR/DataLayout.h
index d14adfe1590be..dc9f6df0f1b2e 100644
--- a/llvm/include/llvm/IR/DataLayout.h
+++ b/llvm/include/llvm/IR/DataLayout.h
@@ -129,6 +129,7 @@ class DataLayout {
 
   enum ManglingModeT {
     MM_None,
+    MM_BPF,
     MM_ELF,
     MM_MachO,
     MM_WinCOFF,
@@ -316,6 +317,7 @@ class DataLayout {
   char getGlobalPrefix() const {
     switch (ManglingMode) {
     case MM_None:
+    case MM_BPF:
     case MM_ELF:
     case MM_GOFF:
     case MM_Mips:
@@ -340,6 +342,7 @@ class DataLayout {
       return "L#";
     case MM_Mips:
       return "$";
+    case MM_BPF:
     case MM_MachO:
     case MM_WinCOFFX86:
       return "L";
diff --git a/llvm/lib/IR/DataLayout.cpp b/llvm/lib/IR/DataLayout.cpp
index 2741165332487..f6444c152d95c 100644
--- a/llvm/lib/IR/DataLayout.cpp
+++ b/llvm/lib/IR/DataLayout.cpp
@@ -518,6 +518,9 @@ Error DataLayout::parseSpecifier(StringRef Desc) {
       switch(Rest[0]) {
       default:
         return reportError("Unknown mangling in datalayout string");
+      case 'b':
+        ManglingMode = MM_BPF;
+        break;
       case 'e':
         ManglingMode = MM_ELF;
         break;
diff --git a/llvm/lib/Target/BPF/BPFTargetMachine.cpp b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
index 7b73c9f4a1e4c..3d0374c3e23ec 100644
--- a/llvm/lib/Target/BPF/BPFTargetMachine.cpp
+++ b/llvm/lib/Target/BPF/BPFTargetMachine.cpp
@@ -54,9 +54,9 @@ extern "C" LLVM_EXTERNAL_VISIBILITY void LLVMInitializeBPFTarget() {
 // DataLayout: little or big endian
 static std::string computeDataLayout(const Triple &TT) {
   if (TT.getArch() == Triple::bpfeb)
-    return "E-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
+    return "E-m:b-p:64:64-i64:64-i128:128-n32:64-S128";
   else
-    return "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128";
+    return "e-m:b-p:64:64-i64:64-i128:128-n32:64-S128";
 }
 
 static Reloc::Model getEffectiveRelocModel(std::optional<Reloc::Model> RM) {
diff --git a/llvm/lib/Target/TargetLoweringObjectFile.cpp b/llvm/lib/Target/TargetLoweringObjectFile.cpp
index 1206863010aa2..26e9f9eb3f327 100644
--- a/llvm/lib/Target/TargetLoweringObjectFile.cpp
+++ b/llvm/lib/Target/TargetLoweringObjectFile.cpp
@@ -129,7 +129,7 @@ MCSymbol *TargetLoweringObjectFile::getSymbolWithGlobalValueBase(
   assert(!Suffix.empty());
 
   SmallString<60> NameStr;
-  NameStr += getContext().getAsmInfo()->getPrivateGlobalPrefix();
+  NameStr += GV->getParent()->getDataLayout().getPrivateGlobalPrefix();
   TM.getNameWithPrefix(NameStr, GV, *Mang);
   NameStr.append(Suffix.begin(), Suffix.end());
   return getContext().getOrCreateSymbol(NameStr);
diff --git a/llvm/test/tools/llvm-objdump/BPF/core-relo-formatting.s b/llvm/test/tools/llvm-objdump/BPF/core-relo-formatting.s
index 98cd31f6406a4..2be1d6e0a8488 100644
--- a/llvm/test/tools/llvm-objdump/BPF/core-relo-formatting.s
+++ b/llvm/test/tools/llvm-objdump/BPF/core-relo-formatting.s
@@ -96,64 +96,64 @@
 	.p2align	3
 	.type	root, at function
 root:                                   # @root
-.Lfunc_begin0:
+Lfunc_begin0:
 	.cfi_sections .debug_frame
 	.cfi_startproc
 # %bb.0:                                # %entry
 	.loc	0 8 3 prologue_end      # t.c:8:3
-.Ltmp0:
+Ltmp0:
 	#APP
 	r0 = 42
 
 	#NO_APP
-.Ltmp1:
-.Ltmp2:
+Ltmp1:
+Ltmp2:
 	#DEBUG_VALUE: root:foo <- 0
 	.loc	0 10 3                  # t.c:10:3
-.Ltmp3:
-.Ltmp4:
+Ltmp3:
+Ltmp4:
 	r1 = 1
 	call consume
-.Ltmp5:
+Ltmp5:
 	.loc	0 11 3                  # t.c:11:3
-.Ltmp6:
-.Ltmp7:
+Ltmp6:
+Ltmp7:
 	r1 = 0
 	call consume
-.Ltmp8:
+Ltmp8:
 	.loc	0 12 3                  # t.c:12:3
-.Ltmp9:
-.Ltmp10:
+Ltmp9:
+Ltmp10:
 	r1 = 1 ll
 	call consume
-.Ltmp11:
+Ltmp11:
 	.loc	0 13 1                  # t.c:13:1
-.Ltmp12:
+Ltmp12:
 	exit
-.Ltmp13:
-.Ltmp14:
-.Lfunc_end0:
-	.size	root, .Lfunc_end0-root
+Ltmp13:
+Ltmp14:
+Lfunc_end0:
+	.size	root, Lfunc_end0-root
 	.cfi_endproc
                                         # -- End function
 	.section	.debug_loclists,"", at progbits
-	.long	.Ldebug_list_header_end0-.Ldebug_list_header_start0 # Length
-.Ldebug_list_header_start0:
+	.long	Ldebug_list_header_end0-Ldebug_list_header_start0 # Length
+Ldebug_list_header_start0:
 	.short	5                       # Version
 	.byte	8                       # Address size
 	.byte	0                       # Segment selector size
 	.long	1                       # Offset entry count
-.Lloclists_table_base0:
-	.long	.Ldebug_loc0-.Lloclists_table_base0
-.Ldebug_loc0:
+Lloclists_table_base0:
+	.long	Ldebug_loc0-Lloclists_table_base0
+Ldebug_loc0:
 	.byte	4                       # DW_LLE_offset_pair
-	.uleb128 .Ltmp1-.Lfunc_begin0   #   starting offset
-	.uleb128 .Lfunc_end0-.Lfunc_begin0 #   ending offset
+	.uleb128 Ltmp1-Lfunc_begin0     #   starting offset
+	.uleb128 Lfunc_end0-Lfunc_begin0 #   ending offset
 	.byte	2                       # Loc expr size
 	.byte	48                      # DW_OP_lit0
 	.byte	159                     # DW_OP_stack_value
 	.byte	0                       # DW_LLE_end_of_list
-.Ldebug_list_header_end0:
+Ldebug_list_header_end0:
 	.section	.debug_abbrev,"", at progbits
 	.byte	1                       # Abbreviation Code
 	.byte	17                      # DW_TAG_compile_unit
@@ -321,9 +321,9 @@ root:                                   # @root
 	.byte	0                       # EOM(2)
 	.byte	0                       # EOM(3)
 	.section	.debug_info,"", at progbits
-.Lcu_begin0:
-	.long	.Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
-.Ldebug_info_start0:
+Lcu_begin0:
+	.long	Ldebug_info_end0-Ldebug_info_start0 # Length of Unit
+Ldebug_info_start0:
 	.short	5                       # DWARF version number
 	.byte	1                       # DWARF Unit Type
 	.byte	8                       # Address Size (in bytes)
@@ -332,13 +332,13 @@ root:                                   # @root
 	.byte	0                       # DW_AT_producer
 	.short	29                      # DW_AT_language
 	.byte	1                       # DW_AT_name
-	.long	.Lstr_offsets_base0     # DW_AT_str_offsets_base
-	.long	.Lline_table_start0     # DW_AT_stmt_list
+	.long	Lstr_offsets_base0      # DW_AT_str_offsets_base
+	.long	Lline_table_start0      # DW_AT_stmt_list
 	.byte	2                       # DW_AT_comp_dir
 	.byte	0                       # DW_AT_low_pc
-	.long	.Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc
-	.long	.Laddr_table_base0      # DW_AT_addr_base
-	.long	.Lloclists_table_base0  # DW_AT_loclists_base
+	.long	Lfunc_end0-Lfunc_begin0 # DW_AT_high_pc
+	.long	Laddr_table_base0       # DW_AT_addr_base
+	.long	Lloclists_table_base0   # DW_AT_loclists_base
 	.byte	2                       # Abbrev [2] 0x27:0x10 DW_TAG_enumeration_type
 	.long	55                      # DW_AT_type
 	.byte	6                       # DW_AT_name
@@ -362,7 +362,7 @@ root:                                   # @root
 	.byte	8                       # DW_AT_byte_size
 	.byte	5                       # Abbrev [5] 0x3f:0x27 DW_TAG_subprogram
 	.byte	0                       # DW_AT_low_pc
-	.long	.Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc
+	.long	Lfunc_end0-Lfunc_begin0 # DW_AT_high_pc
 	.byte	1                       # DW_AT_frame_base
 	.byte	90
                                         # DW_AT_call_all_calls
@@ -415,65 +415,65 @@ root:                                   # @root
 	.byte	5                       # DW_AT_encoding
 	.byte	4                       # DW_AT_byte_size
 	.byte	0                       # End Of Children Mark
-.Ldebug_info_end0:
+Ldebug_info_end0:
 	.section	.debug_str_offsets,"", at progbits
 	.long	56                      # Length of String Offsets Set
 	.short	5
 	.short	0
-.Lstr_offsets_base0:
+Lstr_offsets_base0:
 	.section	.debug_str,"MS", at progbits,1
-.Linfo_string0:
+Linfo_string0:
 	.asciz	"clang version 17.0.0 (/home/eddy/work/llvm-project/clang 76d673bb89f8ec8cf65a4294a98a83c9d6646b11)" # string offset=0
-.Linfo_string1:
+Linfo_string1:
 	.asciz	"t.c"                   # string offset=99
-.Linfo_string2:
+Linfo_string2:
 	.asciz	"/home/eddy/work/tmp"   # string offset=103
-.Linfo_string3:
+Linfo_string3:
 	.asciz	"unsigned int"          # string offset=123
-.Linfo_string4:
+Linfo_string4:
 	.asciz	"U"                     # string offset=136
-.Linfo_string5:
+Linfo_string5:
 	.asciz	"V"                     # string offset=138
-.Linfo_string6:
+Linfo_string6:
 	.asciz	"bar"                   # string offset=140
-.Linfo_string7:
+Linfo_string7:
 	.asciz	"unsigned long"         # string offset=144
-.Linfo_string8:
+Linfo_string8:
 	.asciz	"consume"               # string offset=158
-.Linfo_string9:
+Linfo_string9:
 	.asciz	"root"                  # string offset=166
-.Linfo_string10:
+Linfo_string10:
 	.asciz	"foo"                   # string offset=171
-.Linfo_string11:
+Linfo_string11:
 	.asciz	"a"                     # string offset=175
-.Linfo_string12:
+Linfo_string12:
 	.asciz	"int"                   # string offset=177
 	.section	.debug_str_offsets,"", at progbits
-	.long	.Linfo_string0
-	.long	.Linfo_string1
-	.long	.Linfo_string2
-	.long	.Linfo_string3
-	.long	.Linfo_string4
-	.long	.Linfo_string5
-	.long	.Linfo_string6
-	.long	.Linfo_string7
-	.long	.Linfo_string8
-	.long	.Linfo_string9
-	.long	.Linfo_string10
-	.long	.Linfo_string11
-	.long	.Linfo_string12
+	.long	Linfo_string0
+	.long	Linfo_string1
+	.long	Linfo_string2
+	.long	Linfo_string3
+	.long	Linfo_string4
+	.long	Linfo_string5
+	.long	Linfo_string6
+	.long	Linfo_string7
+	.long	Linfo_string8
+	.long	Linfo_string9
+	.long	Linfo_string10
+	.long	Linfo_string11
+	.long	Linfo_string12
 	.section	.debug_addr,"", at progbits
-	.long	.Ldebug_addr_end0-.Ldebug_addr_start0 # Length of contribution
-.Ldebug_addr_start0:
+	.long	Ldebug_addr_end0-Ldebug_addr_start0 # Length of contribution
+Ldebug_addr_start0:
 	.short	5                       # DWARF version number
 	.byte	8                       # Address size
 	.byte	0                       # Segment selector size
-.Laddr_table_base0:
-	.quad	.Lfunc_begin0
-	.quad	.Ltmp5
-	.quad	.Ltmp8
-	.quad	.Ltmp11
-.Ldebug_addr_end0:
+Laddr_table_base0:
+	.quad	Lfunc_begin0
+	.quad	Ltmp5
+	.quad	Ltmp8
+	.quad	Ltmp11
+Ldebug_addr_end0:
 	.section	.BTF,"", at progbits
 	.short	60319                   # 0xeb9f
 	.byte	1
@@ -569,46 +569,46 @@ root:                                   # @root
 	.long	8                       # FuncInfo
 	.long	6                       # FuncInfo section string offset=6
 	.long	1
-	.long	.Lfunc_begin0
+	.long	Lfunc_begin0
 	.long	2
 	.long	16                      # LineInfo
 	.long	6                       # LineInfo section string offset=6
 	.long	5
-	.long	.Ltmp0
+	.long	Ltmp0
 	.long	12
 	.long	36
 	.long	8195                    # Line 8 Col 3
-	.long	.Ltmp4
+	.long	Ltmp4
 	.long	12
 	.long	79
 	.long	10243                   # Line 10 Col 3
-	.long	.Ltmp7
+	.long	Ltmp7
 	.long	12
 	.long	155
 	.long	11267                   # Line 11 Col 3
-	.long	.Ltmp10
+	.long	Ltmp10
 	.long	12
 	.long	199
 	.long	12291                   # Line 12 Col 3
-	.long	.Ltmp12
+	.long	Ltmp12
 	.long	12
 	.long	260
 	.long	13313                   # Line 13 Col 1
 	.long	16                      # FieldReloc
 	.long	6                       # Field reloc section string offset=6
 	.long	3
-	.long	.Ltmp3
+	.long	Ltmp3
 	.long	3
 	.long	77
 	.long	8
-	.long	.Ltmp6
+	.long	Ltmp6
 	.long	3
 	.long	151
 	.long	0
-	.long	.Ltmp9
+	.long	Ltmp9
 	.long	8
 	.long	77
 	.long	10
 	.addrsig
 	.section	.debug_line,"", at progbits
-.Lline_table_start0:
+Lline_table_start0:



More information about the llvm-commits mailing list