From 4581f37e7c361b6755cd36ae92f65b4fb1b84fb6 Mon Sep 17 00:00:00 2001
From: Krzysztof Parzyszek <kparzysz@codeaurora.org>
Date: Mon, 25 Jun 2018 13:46:41 +0000
Subject: Improve handling of COPY instructions with identical value numbers

Testcases provided by Tim Renouf.

Differential Revision: https://reviews.llvm.org/D48102

llvm-svn: 335472
---
 .../AMDGPU/coalescer-extend-pruned-subrange.mir    | 116 +++++++++
 .../AMDGPU/coalescer-identical-values-undef.mir    |  29 +++
 ...coalescer-subranges-another-copymi-not-live.mir | 133 ++++++++++
 .../coalescer-subranges-another-prune-error.mir    | 268 +++++++++++++++++++++
 .../AMDGPU/coalescer-subregjoin-fullcopy.mir       | 177 ++++++++++++++
 .../coalescer-with-subregs-bad-identical.mir       | 184 ++++++++++++++
 .../AMDGPU/coalescing-with-subregs-in-loop-bug.mir |  98 ++++++++
 7 files changed, 1005 insertions(+)
 create mode 100644 llvm/test/CodeGen/AMDGPU/coalescer-extend-pruned-subrange.mir
 create mode 100644 llvm/test/CodeGen/AMDGPU/coalescer-identical-values-undef.mir
 create mode 100644 llvm/test/CodeGen/AMDGPU/coalescer-subranges-another-copymi-not-live.mir
 create mode 100644 llvm/test/CodeGen/AMDGPU/coalescer-subranges-another-prune-error.mir
 create mode 100644 llvm/test/CodeGen/AMDGPU/coalescer-subregjoin-fullcopy.mir
 create mode 100644 llvm/test/CodeGen/AMDGPU/coalescer-with-subregs-bad-identical.mir
 create mode 100644 llvm/test/CodeGen/AMDGPU/coalescing-with-subregs-in-loop-bug.mir

(limited to 'llvm/test/CodeGen/AMDGPU')

diff --git a/llvm/test/CodeGen/AMDGPU/coalescer-extend-pruned-subrange.mir b/llvm/test/CodeGen/AMDGPU/coalescer-extend-pruned-subrange.mir
new file mode 100644
index 00000000000..864933af546
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/coalescer-extend-pruned-subrange.mir
@@ -0,0 +1,116 @@
+# RUN: llc -mtriple=amdgcn--amdpal -mcpu=gfx803 -run-pass=simple-register-coalescing -o - %s | FileCheck -check-prefix=GCN %s
+
+# GCN: {{^body}}
+
+---
+name: foo
+tracksRegLiveness: true
+body: |
+  bb.0:
+    successors: %bb.2
+    %0:sreg_32_xm0 = S_MOV_B32 1
+    %1:vgpr_32 = COPY %0
+    INLINEASM &"; %1", 1, 327690, def %1, 2147483657, %1(tied-def 3)
+    %2:sreg_64 = V_CMP_NE_U32_e64 0, %1, implicit $exec
+    undef %3.sub0:sreg_128 = COPY %0
+    %3.sub1:sreg_128 = COPY %0
+    %3.sub2:sreg_128 = COPY %0
+    %4:sreg_128 = COPY %3
+    %5:vgpr_32 = V_MOV_B32_e32 -64, implicit $exec
+    %6:vreg_128 = COPY %4
+    %7:sreg_32_xm0 = S_AND_B32 target-flags(amdgpu-gotprel) 1, %2.sub0, implicit-def dead $scc
+    %8:sreg_32_xm0 = S_MOV_B32 0
+    %9:vgpr_32 = COPY %5
+    %10:vreg_128 = COPY %6
+    S_BRANCH %bb.2
+
+  bb.1:
+    %11:vgpr_32 = V_OR_B32_e32 %12.sub0, %12.sub1, implicit $exec
+    %13:vgpr_32 = V_OR_B32_e32 %11, %12.sub2, implicit $exec
+    %14:vgpr_32 = V_AND_B32_e32 1, %13, implicit $exec
+    %15:sreg_64_xexec = V_CMP_EQ_U32_e64 0, %14, implicit $exec
+    %16:vgpr_32 = V_CNDMASK_B32_e64 0, 1, %15, implicit $exec
+    BUFFER_STORE_DWORD_OFFEN_exact %16, undef %17:vgpr_32, undef %18:sreg_128, 0, 0, 0, 0, 0, implicit $exec :: (dereferenceable store 4 into constant-pool, align 1, addrspace 4)
+    S_ENDPGM
+
+  bb.2:
+    successors: %bb.3, %bb.4
+    %19:sreg_64 = V_CMP_EQ_U32_e64 1, %7, implicit $exec
+    %20:sreg_64 = COPY $exec, implicit-def $exec
+    %21:sreg_64 = S_AND_B64 %20, %19, implicit-def dead $scc
+    $exec = S_MOV_B64_term %21
+    SI_MASK_BRANCH %bb.4, implicit $exec
+    S_BRANCH %bb.3
+
+  bb.3:
+    successors: %bb.4
+    undef %22.sub0:sreg_128 = COPY %8
+    %22.sub1:sreg_128 = COPY %8
+    %22.sub2:sreg_128 = COPY %8
+    %23:sreg_128 = COPY %22
+    %24:vreg_128 = COPY %23
+    %10:vreg_128 = COPY %24
+
+  bb.4:
+    successors: %bb.5
+    $exec = S_OR_B64 $exec, %20, implicit-def $scc
+
+  bb.5:
+    successors: %bb.7, %bb.6
+    S_CBRANCH_SCC0 %bb.7, implicit undef $scc
+
+  bb.6:
+    successors: %bb.9
+    %12:vreg_128 = COPY %10
+    S_BRANCH %bb.9
+
+  bb.7:
+    successors: %bb.8, %bb.10
+    %25:vgpr_32 = V_AND_B32_e32 target-flags(amdgpu-gotprel32-hi) 1, %10.sub2, implicit $exec
+    %26:sreg_64 = V_CMP_EQ_U32_e64 1, %25, implicit $exec
+    %27:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
+    %28:vreg_1 = COPY %27
+    %29:sreg_64 = COPY $exec, implicit-def $exec
+    %30:sreg_64 = S_AND_B64 %29, %26, implicit-def dead $scc
+    $exec = S_MOV_B64_term %30
+    SI_MASK_BRANCH %bb.10, implicit $exec
+    S_BRANCH %bb.8
+
+  bb.8:
+    successors: %bb.10
+    %31:vgpr_32 = BUFFER_LOAD_DWORD_OFFEN undef %32:vgpr_32, undef %33:sreg_128, 0, 0, 0, 0, 0, implicit $exec :: (dereferenceable load 4 from constant-pool, align 1, addrspace 4)
+    %34:sreg_64_xexec = V_CMP_NE_U32_e64 0, %31, implicit $exec
+    %35:vgpr_32 = V_CNDMASK_B32_e64 0, -1, %34, implicit $exec
+    %28:vreg_1 = COPY %35
+    S_BRANCH %bb.10
+
+  bb.9:
+    successors: %bb.11
+    S_BRANCH %bb.11
+
+  bb.10:
+    successors: %bb.9
+    $exec = S_OR_B64 $exec, %29, implicit-def $scc
+    %36:vreg_1 = COPY %28
+    %37:sreg_64_xexec = V_CMP_NE_U32_e64 0, %36, implicit $exec
+    %38:vgpr_32 = V_CNDMASK_B32_e64 0, 1, %37, implicit $exec
+    %39:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
+    undef %40.sub0:vreg_128 = COPY %39
+    %40.sub1:vreg_128 = COPY %39
+    %40.sub2:vreg_128 = COPY %38
+    %41:vreg_128 = COPY %40
+    %12:vreg_128 = COPY %41
+    S_BRANCH %bb.9
+
+  bb.11:
+    successors: %bb.2, %bb.1
+    %42:vgpr_32 = V_ADD_I32_e32 32, %9, implicit-def dead $vcc, implicit $exec
+    V_CMP_EQ_U32_e32 0, %42, implicit-def $vcc, implicit $exec
+    %43:vgpr_32 = COPY %42
+    $vcc = S_AND_B64 $exec, killed $vcc, implicit-def dead $scc
+    %44:vreg_128 = COPY %12
+    %9:vgpr_32 = COPY %43
+    %10:vreg_128 = COPY %44
+    S_CBRANCH_VCCNZ %bb.1, implicit killed $vcc
+    S_BRANCH %bb.2
+...
diff --git a/llvm/test/CodeGen/AMDGPU/coalescer-identical-values-undef.mir b/llvm/test/CodeGen/AMDGPU/coalescer-identical-values-undef.mir
new file mode 100644
index 00000000000..f0f46b4f311
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/coalescer-identical-values-undef.mir
@@ -0,0 +1,29 @@
+# RUN: llc -mtriple=amdgcn--amdpal -run-pass=simple-register-coalescing -o - %s | FileCheck %s
+
+# Check that this doesn't crash. Check for some legitimate output.
+# CHECK: S_CBRANCH_SCC1
+
+---
+name: fred
+tracksRegLiveness: true
+body: |
+  bb.0:
+    successors: %bb.1, %bb.2
+    liveins: $sgpr4
+    undef %0.sub2:sreg_128 = COPY $sgpr4
+    %3 = IMPLICIT_DEF
+    S_CBRANCH_SCC1 %bb.2, implicit undef $scc
+
+  bb.1:
+    successors: %bb.2
+    %0.sub0:sreg_128 = COPY %0.sub2
+    %0.sub1:sreg_128 = COPY %0.sub2
+    %1:sreg_128 = COPY %0
+    %2:sreg_128 = COPY %0
+    %0:sreg_128 = COPY %2
+    %3:sreg_128 = COPY %1
+
+  bb.2:
+    $sgpr1 = COPY %3
+    $sgpr2 = COPY %0.sub2
+...
diff --git a/llvm/test/CodeGen/AMDGPU/coalescer-subranges-another-copymi-not-live.mir b/llvm/test/CodeGen/AMDGPU/coalescer-subranges-another-copymi-not-live.mir
new file mode 100644
index 00000000000..1bc8922cf41
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/coalescer-subranges-another-copymi-not-live.mir
@@ -0,0 +1,133 @@
+# RUN: llc -mtriple=amdgcn--amdpal -mcpu=gfx803 -run-pass=simple-register-coalescing -o - %s | FileCheck -check-prefix=GCN %s
+
+# With one version of the D48102 fix, this test failed with
+# Assertion failed: (ValNo && "CopyMI input register not live"), function reMaterializeTrivialDef, file ../lib/CodeGen/RegisterCoalescer.cpp, line 1107.
+
+# GCN: {{^body}}
+
+--- |
+  target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5"
+  target triple = "amdgcn--amdpal"
+
+  define amdgpu_cs void @_amdgpu_cs_main(<3 x i32>) #0 {
+    ret void
+  }
+
+  attributes #0 = { nounwind "target-cpu"="gfx803" }
+...
+
+---
+name:            _amdgpu_cs_main
+tracksRegLiveness: true
+body:             |
+  bb.0:
+    successors: %bb.1(0x40000000), %bb.2(0x40000000)
+    %0:vgpr_32 = V_MUL_F32_e32 0, undef %1:vgpr_32, implicit $exec
+    %2:vgpr_32 = V_CVT_U32_F32_e32 killed %0, implicit $exec
+    %3:vgpr_32 = V_CVT_F32_I32_e32 killed %2, implicit $exec
+    %4:vgpr_32 = V_CVT_U32_F32_e32 killed %3, implicit $exec
+    %5:vgpr_32 = V_LSHRREV_B32_e32 4, killed %4, implicit $exec
+    S_CBRANCH_SCC0 %bb.2, implicit undef $scc
+
+  bb.1:
+    successors: %bb.5(0x80000000)
+    undef %6.sub1:vreg_128 = COPY killed %5
+    %7:vreg_128 = COPY killed %6
+    S_BRANCH %bb.5
+
+  bb.2:
+    successors: %bb.3(0x40000000), %bb.4(0x40000000)
+    S_CBRANCH_SCC0 %bb.4, implicit undef $scc
+
+  bb.3:
+    successors: %bb.5(0x80000000)
+    %8:sreg_32_xm0 = S_MOV_B32 0
+    undef %9.sub0:sreg_128 = COPY %8
+    %9.sub1:sreg_128 = COPY %8
+    %9.sub2:sreg_128 = COPY %8
+    %9.sub3:sreg_128 = COPY killed %8
+    %10:vreg_128 = COPY killed %9
+    %7:vreg_128 = COPY killed %10
+    S_BRANCH %bb.5
+
+  bb.4:
+    successors: %bb.5(0x80000000)
+    %11:sreg_32_xm0 = S_MOV_B32 0
+    undef %12.sub0:sreg_128 = COPY %11
+    %12.sub1:sreg_128 = COPY %11
+    %12.sub2:sreg_128 = COPY %11
+    %12.sub3:sreg_128 = COPY killed %11
+    %13:sreg_128 = COPY killed %12
+    %14:vreg_128 = COPY killed %13
+    %7:vreg_128 = COPY killed %14
+
+  bb.5:
+    successors: %bb.8(0x40000000), %bb.6(0x40000000)
+    %15:vreg_128 = COPY killed %7
+    S_CBRANCH_SCC0 %bb.8, implicit undef $scc
+
+  bb.6:
+    successors: %bb.7(0x80000000)
+    %16:vreg_128 = COPY killed %15
+
+  bb.7:
+    successors: %bb.14(0x80000000)
+    %17:vreg_128 = COPY killed %16
+    S_BRANCH %bb.14
+
+  bb.8:
+    successors: %bb.9(0x40000000), %bb.11(0x40000000)
+    %18:vgpr_32 = V_MUL_LO_I32 %15.sub1, target-flags(amdgpu-gotprel32-lo) 7, implicit $exec
+    S_CBRANCH_SCC1 %bb.11, implicit undef $scc
+    S_BRANCH %bb.9
+
+  bb.9:
+    successors: %bb.10(0x80000000)
+    %19:vreg_128 = BUFFER_LOAD_FORMAT_XYZW_IDXEN killed %18, undef %20:sreg_128, 0, 0, 0, 0, 0, implicit $exec :: (dereferenceable load 16 from constant-pool, align 1, addrspace 4)
+    %21:sreg_64 = V_CMP_NE_U32_e64 target-flags(amdgpu-gotprel) 0, killed %19.sub0, implicit $exec
+    %22:sreg_64 = COPY $exec, implicit-def $exec
+    %23:sreg_64 = S_AND_B64 %22, %21, implicit-def dead $scc
+    $exec = S_MOV_B64_term killed %23
+
+  bb.10:
+    successors: %bb.12(0x80000000)
+    $exec = S_OR_B64 $exec, killed %22, implicit-def $scc
+    S_BRANCH %bb.12
+
+  bb.11:
+    successors: %bb.13(0x80000000)
+    %24:vreg_128 = COPY killed %15
+    %24.sub0:vreg_128 = COPY undef %18
+    S_BRANCH %bb.13
+
+  bb.12:
+    successors: %bb.11(0x80000000)
+    S_BRANCH %bb.11
+
+  bb.13:
+    successors: %bb.7(0x80000000)
+    %16:vreg_128 = COPY killed %24
+    S_BRANCH %bb.7
+
+  bb.14:
+    successors: %bb.15(0x80000000)
+    S_CBRANCH_SCC1 %bb.15, implicit undef $scc
+    S_BRANCH %bb.15
+
+  bb.15:
+    undef %25.sub2:vreg_128 = COPY killed %17.sub2
+    %26:sreg_32_xm0 = S_MOV_B32 0
+    undef %27.sub0:sreg_256 = COPY %26
+    %27.sub1:sreg_256 = COPY %26
+    %27.sub2:sreg_256 = COPY %26
+    %27.sub3:sreg_256 = COPY %26
+    %27.sub4:sreg_256 = COPY %26
+    %27.sub5:sreg_256 = COPY %26
+    %27.sub6:sreg_256 = COPY %26
+    %27.sub7:sreg_256 = COPY killed %26
+    %28:vgpr_32 = IMAGE_LOAD_V1_V4 killed %25, killed %27, 2, -1, 0, 0, 0, 0, 0, 0, 0, implicit $exec :: (dereferenceable load 16 from constant-pool, addrspace 4)
+    %29:vgpr_32 = V_ADD_F32_e32 0, killed %28, implicit $exec
+    $m0 = S_MOV_B32 -1
+    DS_WRITE_B32 undef %30:vgpr_32, killed %29, 0, 0, implicit $m0, implicit $exec :: (store 4 into `i32 addrspace(3)* undef`, addrspace 3)
+    S_ENDPGM
+...
diff --git a/llvm/test/CodeGen/AMDGPU/coalescer-subranges-another-prune-error.mir b/llvm/test/CodeGen/AMDGPU/coalescer-subranges-another-prune-error.mir
new file mode 100644
index 00000000000..4e5408f946f
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/coalescer-subranges-another-prune-error.mir
@@ -0,0 +1,268 @@
+# RUN: llc -mtriple=amdgcn--amdpal -mcpu=gfx803 -run-pass=simple-register-coalescing -o - %s | FileCheck -check-prefix=GCN %s
+
+# With one version of the D48102 fix, this test failed with
+# Assertion failed: (Id != S.end() && T != S.end() && T->valno == Id->valno), function pruneSubRegValues, file ../lib/CodeGen/RegisterCoalescer.cpp, line 2875.
+
+# GCN: {{^body}}
+
+--- |
+  target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5"
+  target triple = "amdgcn--amdpal"
+
+  ; Function Attrs: nounwind
+  define amdgpu_ps void @_amdgpu_ps_main(float %arg) #0 {
+    ret void
+  }
+
+  attributes #0 = { nounwind "InitialPSInputAddr"="3842" "target-cpu"="gfx803" }
+...
+
+---
+name:            _amdgpu_ps_main
+tracksRegLiveness: true
+body:             |
+  bb.0:
+    successors: %bb.2(0x40000000), %bb.1(0x40000000)
+    %0:sreg_64 = COPY $exec
+    %1:sgpr_32 = S_MOV_B32 0
+    undef %2.sub0:sreg_128 = COPY %1
+    %2.sub1:sreg_128 = COPY %1
+    %2.sub2:sreg_128 = COPY %1
+    %2.sub3:sreg_128 = COPY %1
+    $exec = S_WQM_B64 $exec, implicit-def dead $scc
+    S_CBRANCH_SCC0 %bb.2, implicit undef $scc
+
+  bb.1:
+    successors: %bb.3(0x80000000)
+    %3:sreg_128 = COPY killed %2
+    %4:vreg_128 = COPY killed %3
+    %5:vreg_128 = COPY killed %4
+    S_BRANCH %bb.3
+
+  bb.2:
+    successors: %bb.4(0x80000000)
+    %6:vgpr_32 = V_MUL_F32_e32 1031798784, undef %7:vgpr_32, implicit $exec
+    %8:vgpr_32 = V_FLOOR_F32_e32 killed %6, implicit $exec
+    %9:vgpr_32 = V_ADD_F32_e32 0, killed %8, implicit $exec
+    %10:vgpr_32 = V_CVT_U32_F32_e32 killed %9, implicit $exec
+    %11:vgpr_32 = V_LSHLREV_B32_e32 1, killed %10, implicit $exec
+    %12:sreg_64 = S_MOV_B64 0
+    %13:sreg_128 = COPY killed %2
+    %14:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
+    %15:vreg_128 = COPY killed %13
+    %16:sreg_64 = COPY killed %12
+    %17:vreg_128 = IMPLICIT_DEF
+    %18:vgpr_32 = COPY killed %14
+    %19:vreg_128 = COPY killed %15
+    S_BRANCH %bb.4
+
+  bb.3:
+    successors: %bb.17(0x80000000)
+    %20:vreg_128 = COPY killed %5
+    S_BRANCH %bb.17
+
+  bb.4:
+    successors: %bb.8(0x40000000), %bb.9(0x40000000)
+    %21:vreg_128 = COPY killed %19
+    %22:vgpr_32 = COPY killed %18
+    %23:vreg_128 = COPY killed %17
+    %24:sreg_64 = COPY killed %16
+    %25:vgpr_32 = V_OR_B32_e32 %22, %11, implicit $exec
+    %26:vreg_128 = BUFFER_LOAD_FORMAT_XYZW_IDXEN killed %25, undef %27:sreg_128, 0, 0, 0, 0, 0, implicit $exec :: (dereferenceable load 16 from constant-pool, align 1, addrspace 4)
+    %28:vgpr_32 = V_LSHRREV_B32_e32 30, killed %26.sub0, implicit $exec
+    %29:vreg_128 = COPY killed %21
+    %29.sub0:vreg_128 = COPY %1
+    %30:sreg_64 = V_CMP_NE_U32_e64 0, %28, implicit $exec
+    %31:sreg_64_xexec = V_CMP_EQ_U32_e64 0, %28, implicit $exec
+    dead %32:vgpr_32 = V_CNDMASK_B32_e64 0, -1, killed %31, implicit $exec
+    %33:vreg_128 = COPY %29
+    %33.sub1:vreg_128 = COPY undef %32
+    %34:vgpr_32 = V_MOV_B32_e32 -1, implicit $exec
+    %35:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
+    %36:sreg_64 = COPY %24
+    %37:vreg_128 = COPY %23
+    %38:vreg_128 = IMPLICIT_DEF
+    %39:vreg_128 = IMPLICIT_DEF
+    %40:vgpr_32 = IMPLICIT_DEF
+    %41:vreg_1 = COPY killed %35
+    %42:vreg_1 = COPY killed %34
+    %43:sreg_64 = COPY $exec, implicit-def $exec
+    %44:sreg_64 = S_AND_B64 %43, %30, implicit-def dead $scc
+    %45:sreg_64 = S_XOR_B64 %44, %43, implicit-def dead $scc
+    $exec = S_MOV_B64_term killed %44
+    SI_MASK_BRANCH %bb.9, implicit $exec
+    S_BRANCH %bb.8
+
+  bb.5:
+    successors: %bb.9(0x80000000)
+    $exec = S_OR_B64 $exec, %46, implicit-def $scc
+    %47:vreg_1 = COPY killed %48
+    %49:vgpr_32 = COPY killed %50
+    %51:vreg_128 = COPY killed %52
+    %53:vreg_128 = COPY killed %54
+    %55:sreg_64 = COPY killed %56
+    %57:sreg_64 = S_AND_B64 $exec, %46, implicit-def $scc
+    %57:sreg_64 = S_OR_B64 %57, killed %55, implicit-def $scc
+    %58:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
+    %36:sreg_64 = COPY killed %57
+    %37:vreg_128 = COPY killed %53
+    %38:vreg_128 = COPY killed %59
+    %39:vreg_128 = COPY killed %51
+    %40:vgpr_32 = COPY killed %49
+    %41:vreg_1 = COPY killed %47
+    %42:vreg_1 = COPY killed %58
+    S_BRANCH %bb.9
+
+  bb.6:
+    successors: %bb.7(0x40000000), %bb.13(0x40000000)
+    $exec = S_OR_B64 $exec, killed %60, implicit-def $scc
+    %61:sreg_64 = V_CMP_NE_U32_e64 0, killed %62, implicit $exec
+    %63:vreg_128 = COPY killed %64
+    %65:vreg_1 = COPY killed %66
+    %67:sreg_64 = COPY $exec, implicit-def $exec
+    %68:sreg_64 = S_AND_B64 %67, %61, implicit-def dead $scc
+    $exec = S_MOV_B64_term killed %68
+    SI_MASK_BRANCH %bb.13, implicit $exec
+    S_BRANCH %bb.7
+
+  bb.7:
+    successors: %bb.13(0x80000000)
+    %69:vgpr_32 = V_MOV_B32_e32 -1, implicit $exec
+    %70:vreg_128 = COPY killed %33
+    %63:vreg_128 = COPY killed %70
+    %65:vreg_1 = COPY killed %69
+    S_BRANCH %bb.13
+
+  bb.8:
+    successors: %bb.10(0x80000000)
+    %71:sreg_64 = S_MOV_B64 0
+    %72:vreg_128 = COPY %33
+    %73:sreg_64 = COPY killed %71
+    %74:vreg_128 = COPY killed %72
+    %75:vreg_128 = COPY killed %29
+    S_BRANCH %bb.10
+
+  bb.9:
+    successors: %bb.6(0x04000000), %bb.4(0x7c000000)
+    $exec = S_OR_B64 $exec, %45, implicit-def $scc
+    %62:vreg_1 = COPY killed %42
+    %66:vreg_1 = COPY killed %41
+    %76:vgpr_32 = COPY killed %40
+    %77:vreg_128 = COPY killed %39
+    %64:vreg_128 = COPY killed %38
+    %78:vreg_128 = COPY killed %37
+    %79:sreg_64 = COPY killed %36
+    %60:sreg_64 = S_AND_B64 $exec, %45, implicit-def $scc
+    %60:sreg_64 = S_OR_B64 %60, killed %79, implicit-def $scc
+    %80:vreg_128 = COPY %78
+    %16:sreg_64 = COPY %60
+    %17:vreg_128 = COPY killed %80
+    %18:vgpr_32 = COPY killed %76
+    %19:vreg_128 = COPY killed %77
+    $exec = S_ANDN2_B64_term $exec, %60
+    S_CBRANCH_EXECNZ %bb.4, implicit $exec
+    S_BRANCH %bb.6
+
+  bb.10:
+    successors: %bb.11(0x80000000)
+    %81:vreg_128 = COPY killed %75
+    %82:vreg_128 = COPY killed %74
+    %83:sreg_64 = COPY killed %73
+
+  bb.11:
+    successors: %bb.12(0x04000000), %bb.10(0x7c000000)
+    undef %59.sub0:vreg_128 = COPY %81.sub0
+    %59.sub2:vreg_128 = COPY %82.sub2
+    %59.sub3:vreg_128 = COPY killed %82.sub3
+    %84:sreg_64 = V_CMP_GE_U32_e64 killed %81.sub0, %28, implicit $exec
+    %85:sreg_64 = S_OR_B64 killed %84, killed %83, implicit-def $scc
+    %86:vreg_128 = COPY %59
+    %73:sreg_64 = COPY %85
+    %74:vreg_128 = COPY %59
+    %75:vreg_128 = COPY killed %86
+    $exec = S_ANDN2_B64_term $exec, %85
+    S_CBRANCH_EXECNZ %bb.10, implicit $exec
+    S_BRANCH %bb.12
+
+  bb.12:
+    successors: %bb.15(0x40000000), %bb.5(0x40000000)
+    $exec = S_OR_B64 $exec, killed %85, implicit-def $scc
+    %87:sreg_64 = V_CMP_LT_U32_e64 11, killed %28, implicit $exec
+    %88:vgpr_32 = V_MOV_B32_e32 -1, implicit $exec
+    %56:sreg_64 = COPY %24
+    %54:vreg_128 = COPY killed %23
+    %52:vreg_128 = IMPLICIT_DEF
+    %50:vgpr_32 = IMPLICIT_DEF
+    %48:vreg_1 = COPY killed %88
+    %89:sreg_64 = COPY $exec, implicit-def $exec
+    %90:sreg_64 = S_AND_B64 %89, %87, implicit-def dead $scc
+    %46:sreg_64 = S_XOR_B64 %90, %89, implicit-def dead $scc
+    $exec = S_MOV_B64_term killed %90
+    SI_MASK_BRANCH %bb.5, implicit $exec
+    S_BRANCH %bb.15
+
+  bb.13:
+    successors: %bb.14(0x40000000), %bb.16(0x40000000)
+    $exec = S_OR_B64 $exec, killed %67, implicit-def $scc
+    %91:vreg_1 = COPY killed %65
+    %92:vreg_128 = COPY killed %63
+    %93:sreg_64 = V_CMP_NE_U32_e64 0, killed %91, implicit $exec
+    %94:vreg_128 = COPY killed %78
+    %95:sreg_64 = COPY $exec, implicit-def $exec
+    %96:sreg_64 = S_AND_B64 %95, %93, implicit-def dead $scc
+    $exec = S_MOV_B64_term killed %96
+    SI_MASK_BRANCH %bb.16, implicit $exec
+    S_BRANCH %bb.14
+
+  bb.14:
+    successors: %bb.16(0x80000000)
+    %97:vreg_128 = COPY killed %92
+    %94:vreg_128 = COPY killed %97
+    S_BRANCH %bb.16
+
+  bb.15:
+    successors: %bb.5(0x80000000)
+    %98:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
+    %99:sreg_64 = V_CMP_NE_U32_e64 0, killed %22, implicit $exec
+    %100:sreg_64 = S_OR_B64 killed %99, killed %24, implicit-def $scc
+    %101:vreg_128 = COPY %59
+    %102:vgpr_32 = V_MOV_B32_e32 1, implicit $exec
+    %56:sreg_64 = COPY killed %100
+    %54:vreg_128 = COPY killed %101
+    %52:vreg_128 = COPY %59
+    %50:vgpr_32 = COPY killed %102
+    %48:vreg_1 = COPY killed %98
+    S_BRANCH %bb.5
+
+  bb.16:
+    successors: %bb.3(0x80000000)
+    $exec = S_OR_B64 $exec, killed %95, implicit-def $scc
+    %103:vreg_128 = COPY killed %94
+    %104:vreg_128 = COPY killed %103
+    %5:vreg_128 = COPY killed %104
+    S_BRANCH %bb.3
+
+  bb.17:
+    %105:vgpr_32 = V_ADD_F32_e32 target-flags(amdgpu-rel32-lo) 0, %20.sub3, implicit $exec
+    %106:vgpr_32 = V_ADD_F32_e32 target-flags(amdgpu-gotprel32-hi) 0, killed %20.sub2, implicit $exec
+    undef %107.sub0:vreg_64 = COPY killed %106
+    %107.sub1:vreg_64 = COPY killed %105
+    $exec = S_AND_B64 $exec, killed %0, implicit-def dead $scc
+    %108:sreg_32_xm0 = S_MOV_B32 0
+    undef %109.sub0:sreg_256 = COPY %108
+    %109.sub1:sreg_256 = COPY %108
+    %109.sub2:sreg_256 = COPY %108
+    %109.sub3:sreg_256 = COPY %108
+    %109.sub4:sreg_256 = COPY %108
+    %109.sub5:sreg_256 = COPY %108
+    %109.sub6:sreg_256 = COPY %108
+    %109.sub7:sreg_256 = COPY killed %108
+    %110:vgpr_32 = IMAGE_SAMPLE_V1_V2 killed %107, killed %109, undef %111:sreg_128, 8, 0, 0, 0, 0, 0, 0, 0, 0, implicit $exec :: (dereferenceable load 16 from constant-pool, addrspace 4)
+    %112:vgpr_32 = V_MUL_F32_e32 0, killed %110, implicit $exec
+    %113:vgpr_32 = V_MUL_F32_e32 0, killed %112, implicit $exec
+    %114:vgpr_32 = V_MAD_F32 0, killed %113, 0, 0, 0, 0, 0, 0, implicit $exec
+    %115:vgpr_32 = V_MAX_F32_e32 0, killed %114, implicit $exec
+    %116:vgpr_32 = V_CVT_PKRTZ_F16_F32_e64 0, killed %115, 0, 1065353216, 0, implicit $exec
+    EXP 0, undef %117:vgpr_32, killed %116, undef %118:vgpr_32, undef %119:vgpr_32, -1, -1, 15, implicit $exec
+    S_ENDPGM
+...
diff --git a/llvm/test/CodeGen/AMDGPU/coalescer-subregjoin-fullcopy.mir b/llvm/test/CodeGen/AMDGPU/coalescer-subregjoin-fullcopy.mir
new file mode 100644
index 00000000000..3f0f5e6bfbd
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/coalescer-subregjoin-fullcopy.mir
@@ -0,0 +1,177 @@
+# RUN: llc -march=amdgcn -run-pass simple-register-coalescing -verify-machineinstrs -o - %s | FileCheck --check-prefix=GCN %s
+#
+# See bug http://llvm.org/PR33152 for details of the bug this test is checking
+# for.
+# This test will provoke a subrange join during simple register
+# coalescing. Withough a fix for PR33152 this causes an unreachable in SubRange
+# Join
+#
+# The lines where the problem exhibits are the last 2 copy instructions in the
+# BB (bb.25)
+#
+# GCN-LABEL: bb.6:
+# GCN: successors: %bb.7(0x{{[0-9]+}}), %bb.18(0x{{[0-9]+}})
+# GCN: %{{[0-9]+}}:vreg_128 = BUFFER_LOAD_DWORDX4_OFFSET %{{[0-9]+}}, 0, 0, 0, 0, 0, implicit $exec
+#
+
+--- |
+  target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5"
+  target triple = "amdgcn--amdpal"
+
+  define amdgpu_ps void @main() #0 {
+    ret void
+  }
+
+  attributes #0 = { "target-cpu"="gfx803" }
+...
+
+---
+name:            main
+tracksRegLiveness: true
+body: |
+  bb.0:
+    successors: %bb.2(0x40000000), %bb.1(0x40000000)
+    S_CBRANCH_SCC0 %bb.2, implicit undef $scc
+
+  bb.1:
+    successors: %bb.9(0x80000000)
+    %0:vreg_128 = IMPLICIT_DEF
+    S_BRANCH %bb.9
+
+  bb.2:
+    successors: %bb.4(0x40000000), %bb.3(0x40000000)
+    S_CBRANCH_SCC0 %bb.4, implicit undef $scc
+
+  bb.3:
+    successors: %bb.5(0x80000000)
+    %1:vreg_128 = IMPLICIT_DEF
+    S_BRANCH %bb.5
+
+  bb.4:
+    successors: %bb.6(0x80000000)
+    %2:sreg_64 = S_MOV_B64 0
+    %3:sreg_32_xm0 = S_MOV_B32 61440
+    %4:sreg_32_xm0 = S_MOV_B32 -1
+    %5:sreg_64 = COPY killed %2
+    %6:vreg_128 = IMPLICIT_DEF
+    S_BRANCH %bb.6
+
+  bb.5:
+    successors: %bb.9(0x80000000)
+    %7:vreg_128 = COPY killed %1
+    %8:vreg_128 = COPY killed %7
+    %0:vreg_128 = COPY killed %8
+    S_BRANCH %bb.9
+
+  bb.6:
+    successors: %bb.7(0x40000000), %bb.18(0x40000000)
+    %9:vreg_128 = COPY killed %6
+    %10:sreg_64 = COPY killed %5
+    undef %11.sub2:sreg_128 = COPY %4
+    %11.sub3:sreg_128 = COPY %3
+    %12:vreg_128 = BUFFER_LOAD_DWORDX4_OFFSET killed %11, 0, 0, 0, 0, 0, implicit $exec
+    undef %13.sub1:vreg_128 = COPY %9.sub1
+    %13.sub2:vreg_128 = COPY %9.sub2
+    %14:sreg_64 = V_CMP_GT_F32_e64 0, target-flags(amdgpu-rel32-lo) 0, 0, killed %12.sub3, 0, implicit $exec
+    %15:vgpr_32 = V_ADD_F32_e32 1065353216, undef %16:vgpr_32, implicit $exec
+    %17:sreg_64 = V_CMP_GT_F32_e64 0, 0, 0, killed %15, 0, implicit $exec
+    %18:sreg_64 = S_AND_B64 killed %17, killed %14, implicit-def dead $scc
+    %19:sreg_64 = COPY %10
+    %20:vreg_128 = COPY %13
+    %21:vreg_128 = IMPLICIT_DEF
+    %22:sreg_64 = COPY $exec, implicit-def $exec
+    %23:sreg_64 = S_AND_B64 %22, %18, implicit-def dead $scc
+    %24:sreg_64 = S_XOR_B64 %23, %22, implicit-def dead $scc
+    $exec = S_MOV_B64_term killed %23
+    SI_MASK_BRANCH %bb.7, implicit $exec
+    S_BRANCH %bb.18
+
+  bb.7:
+    successors: %bb.6(0x40000000), %bb.8(0x40000000)
+    $exec = S_OR_B64 $exec, %24, implicit-def $scc
+    %25:vreg_128 = COPY killed %21
+    %26:vreg_128 = COPY killed %20
+    %27:sreg_64 = COPY killed %19
+    %28:sreg_64 = S_OR_B64 %24, killed %27, implicit-def dead $scc
+    %5:sreg_64 = COPY %28
+    %6:vreg_128 = COPY killed %25
+    $exec = S_ANDN2_B64_term $exec, %28
+    S_CBRANCH_EXECNZ %bb.6, implicit $exec
+    S_BRANCH %bb.8
+
+  bb.8:
+    successors: %bb.5(0x80000000)
+    $exec = S_OR_B64 $exec, killed %28, implicit-def $scc
+    %29:vreg_128 = COPY killed %26
+    %1:vreg_128 = COPY killed %29
+    S_BRANCH %bb.5
+
+  bb.9:
+    successors: %bb.10(0x80000000)
+    %30:vreg_128 = COPY killed %0
+    S_BRANCH %bb.10
+
+  bb.10:
+    successors: %bb.12(0x40000000), %bb.11(0x40000000)
+    S_CBRANCH_SCC0 %bb.12, implicit undef $scc
+
+  bb.11:
+    successors: %bb.14(0x80000000)
+    %31:vreg_128 = IMPLICIT_DEF
+    S_BRANCH %bb.14
+
+  bb.12:
+    successors: %bb.13(0x80000000)
+    S_CBRANCH_SCC1 %bb.13, implicit undef $scc
+    S_BRANCH %bb.13
+
+  bb.13:
+    successors: %bb.14(0x80000000)
+    %32:vgpr_32 = V_MUL_F32_e32 undef %33:vgpr_32, killed %30.sub1, implicit $exec
+    %34:vgpr_32 = V_MUL_F32_e32 undef %35:vgpr_32, killed %32, implicit $exec
+    undef %36.sub0:vreg_128 = COPY %34
+    %31:vreg_128 = COPY killed %36
+
+  bb.14:
+    successors: %bb.16(0x40000000), %bb.15(0x40000000)
+    %37:vreg_128 = COPY killed %31
+    S_CBRANCH_SCC0 %bb.16, implicit undef $scc
+
+  bb.15:
+    successors: %bb.17(0x80000000)
+    %38:vreg_128 = IMPLICIT_DEF
+    S_BRANCH %bb.17
+
+  bb.16:
+    successors: %bb.17(0x80000000)
+    %39:vgpr_32 = V_FMA_F32 0, undef %40:vgpr_32, 0, killed %37.sub0, 0, undef %41:vgpr_32, 0, 0, implicit $exec
+    %42:vgpr_32 = V_FMA_F32 0, undef %43:vgpr_32, 0, undef %44:vgpr_32, 0, killed %39, 0, 0, implicit $exec
+    %45:vgpr_32 = V_FMA_F32 0, undef %46:vgpr_32, 0, undef %47:vgpr_32, 0, killed %42, 0, 0, implicit $exec
+    dead %48:vgpr_32 = V_MUL_F32_e32 undef %49:vgpr_32, killed %45, implicit $exec
+    %50:vgpr_32 = V_MUL_F32_e32 undef %51:vgpr_32, undef %52:vgpr_32, implicit $exec
+    undef %53.sub1:vreg_128 = COPY %50
+    %38:vreg_128 = COPY killed %53
+
+  bb.17:
+    %54:vreg_128 = COPY killed %38
+    %55:vgpr_32 = V_FMA_F32 0, killed %54.sub1, 0, target-flags(amdgpu-gotprel32-lo) 1056964608, 0, 1056964608, 0, 0, implicit $exec
+    EXP 1, undef %56:vgpr_32, killed %55, undef %57:vgpr_32, undef %58:vgpr_32, -1, 0, 15, implicit $exec
+    S_ENDPGM
+
+  bb.18:
+    successors: %bb.7(0x80000000)
+    dead %59:vgpr_32 = V_FMA_F32 0, killed %9.sub2, 0, undef %60:vgpr_32, 0, undef %61:vgpr_32, 0, 0, implicit $exec
+    dead %62:vgpr_32 = BUFFER_LOAD_DWORD_OFFEN undef %63:vgpr_32, undef %64:sreg_128, undef %65:sreg_32, 0, 0, 0, 0, implicit $exec
+    undef %66.sub1:vreg_128 = COPY %13.sub1
+    %66.sub2:vreg_128 = COPY %13.sub2
+    %67:sreg_64 = V_CMP_NGT_F32_e64 0, 0, 0, undef %68:vgpr_32, 0, implicit $exec
+    %69:vgpr_32 = V_ADD_F32_e32 1065353216, undef %70:vgpr_32, implicit $exec
+    %71:vgpr_32 = V_ADD_F32_e32 1065353216, killed %69, implicit $exec
+    %72:sreg_64 = V_CMP_NGT_F32_e64 0, 0, 0, killed %71, 0, implicit $exec
+    %73:sreg_64 = S_OR_B64 killed %72, killed %67, implicit-def dead $scc
+    %74:sreg_64 = S_OR_B64 killed %73, killed %10, implicit-def dead $scc
+    %19:sreg_64 = COPY killed %74
+    %20:vreg_128 = COPY %66
+    %21:vreg_128 = COPY killed %66
+    S_BRANCH %bb.7
+...
diff --git a/llvm/test/CodeGen/AMDGPU/coalescer-with-subregs-bad-identical.mir b/llvm/test/CodeGen/AMDGPU/coalescer-with-subregs-bad-identical.mir
new file mode 100644
index 00000000000..3f57981052c
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/coalescer-with-subregs-bad-identical.mir
@@ -0,0 +1,184 @@
+# RUN: llc -mtriple=amdgcn--amdpal -mcpu=gfx803 -run-pass=simple-register-coalescing -o - %s | FileCheck -check-prefix=GCN %s
+
+# With one version of the D48102 fix, this test failed with
+# Assertion failed: (Id != S.end() && T != S.end() && T->valno == Id->valno), function pruneSubRegValues, file ../lib/CodeGen/RegisterCoalescer.cpp, line 2870.
+
+# GCN: {{^body}}
+
+--- |
+  target datalayout = "e-p:64:64-p1:64:64-p2:32:32-p3:32:32-p4:64:64-p5:32:32-p6:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5"
+  target triple = "amdgcn--amdpal"
+
+  ; Function Attrs: nounwind
+  define amdgpu_cs void @_amdgpu_cs_main(<3 x i32> %arg) #0 {
+    ret void
+  }
+
+  attributes #0 = { nounwind "target-cpu"="gfx803" }
+...
+
+---
+name:            _amdgpu_cs_main
+tracksRegLiveness: true
+liveins:
+  - { reg: '$vgpr0', virtual-reg: '%0' }
+body: |
+  bb.0:
+    successors: %bb.1(0x40000000), %bb.21(0x40000000)
+    liveins: $vgpr0, $vgpr1, $vgpr2
+    %0:vgpr_32 = COPY killed $vgpr0
+    S_CBRANCH_SCC1 %bb.21, implicit undef $scc
+
+  bb.1:
+    successors: %bb.2(0x40000000), %bb.17(0x40000000)
+    S_CBRANCH_SCC1 %bb.17, implicit undef $scc
+
+  bb.2:
+    successors: %bb.4(0x40000000), %bb.3(0x40000000)
+    %1:sreg_32_xm0 = S_MOV_B32 0
+    %2:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
+    undef %3.sub0:vreg_128 = COPY killed %0
+    %3.sub2:vreg_128 = COPY killed %2
+    undef %4.sub0:sreg_256 = COPY %1
+    %4.sub1:sreg_256 = COPY %1
+    %4.sub2:sreg_256 = COPY %1
+    %4.sub3:sreg_256 = COPY %1
+    %4.sub4:sreg_256 = COPY %1
+    %4.sub5:sreg_256 = COPY %1
+    %4.sub6:sreg_256 = COPY %1
+    %4.sub7:sreg_256 = COPY killed %1
+    %5:vgpr_32 = IMAGE_LOAD_V1_V4 killed %3, killed %4, 1, -1, 0, 0, 0, 0, 0, 0, 0, implicit $exec :: (dereferenceable load 16 from constant-pool, addrspace 4)
+    %6:vgpr_32 = V_MAD_F32 0, killed %5, 0, 0, 0, 0, 0, 0, implicit $exec
+    %7:vgpr_32 = V_RCP_F32_e32 killed %6, implicit $exec
+    %8:vgpr_32 = V_MUL_F32_e32 0, killed %7, implicit $exec
+    %9:vgpr_32 = V_MAD_F32 0, killed %8, 0, 0, 0, 0, 0, 0, implicit $exec
+    dead %10:vgpr_32 = V_MAC_F32_e32 undef %11:vgpr_32, undef %12:vgpr_32, undef %10, implicit $exec
+    undef %13.sub0:vreg_128 = COPY %9
+    %14:vgpr_32 = V_MOV_B32_e32 -1, implicit $exec
+    S_CBRANCH_SCC0 %bb.4, implicit undef $scc
+
+  bb.3:
+    successors: %bb.6(0x80000000)
+    %15:vreg_128 = IMPLICIT_DEF
+    %16:vreg_1 = COPY killed %14
+    S_BRANCH %bb.6
+
+  bb.4:
+    successors: %bb.5(0x40000000), %bb.7(0x40000000)
+    %17:vgpr_32 = V_MAD_F32 0, killed %9, 0, 0, 0, 0, 0, 0, implicit $exec
+    %18:vgpr_32 = V_MIN_F32_e32 1065353216, killed %17, implicit $exec
+    %19:sreg_64_xexec = V_CMP_NEQ_F32_e64 0, 1065353216, 0, killed %18, 0, implicit $exec
+    %20:vgpr_32 = V_MOV_B32_e32 2143289344, implicit $exec
+    %21:vgpr_32 = V_CNDMASK_B32_e64 0, killed %20, killed %19, implicit $exec
+    %22:sreg_64 = V_CMP_LT_F32_e64 0, 0, 0, killed %21, 0, implicit $exec
+    %23:sreg_64 = COPY $exec, implicit-def $exec
+    %24:sreg_64 = S_AND_B64 %23, %22, implicit-def dead $scc
+    $exec = S_MOV_B64_term killed %24
+    SI_MASK_BRANCH %bb.7, implicit $exec
+    S_BRANCH %bb.5
+
+  bb.5:
+    successors: %bb.7(0x80000000)
+    S_BRANCH %bb.7
+
+  bb.6:
+    successors: %bb.8(0x40000000), %bb.10(0x40000000)
+    %25:vreg_1 = COPY killed %16
+    %26:vreg_128 = COPY killed %15
+    %27:sreg_64 = V_CMP_NE_U32_e64 0, killed %25, implicit $exec
+    %28:sreg_64 = S_AND_B64 $exec, killed %27, implicit-def dead $scc
+    $vcc = COPY killed %28
+    %29:vreg_128 = COPY killed %26
+    S_CBRANCH_VCCNZ %bb.8, implicit killed $vcc
+    S_BRANCH %bb.10
+
+  bb.7:
+    successors: %bb.6(0x80000000)
+    $exec = S_OR_B64 $exec, killed %23, implicit-def $scc
+    %30:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
+    %15:vreg_128 = COPY %13
+    %16:vreg_1 = COPY killed %30
+    S_BRANCH %bb.6
+
+  bb.8:
+    successors: %bb.9(0x40000000), %bb.11(0x40000000)
+    %31:vreg_128 = COPY killed %13
+    S_CBRANCH_SCC1 %bb.11, implicit undef $scc
+    S_BRANCH %bb.9
+
+  bb.9:
+    successors: %bb.11(0x80000000)
+    %32:sreg_32_xm0 = S_MOV_B32 0
+    undef %33.sub0:sreg_128 = COPY %32
+    %33.sub1:sreg_128 = COPY %32
+    %33.sub2:sreg_128 = COPY %32
+    %33.sub3:sreg_128 = COPY killed %32
+    %34:sreg_128 = COPY killed %33
+    %35:vreg_128 = COPY killed %34
+    %31:vreg_128 = COPY killed %35
+    S_BRANCH %bb.11
+
+  bb.10:
+    successors: %bb.14(0x80000000)
+    %36:vreg_128 = COPY killed %29
+    S_BRANCH %bb.14
+
+  bb.11:
+    successors: %bb.13(0x40000000), %bb.12(0x40000000)
+    %37:vreg_128 = COPY killed %31
+    S_CBRANCH_SCC0 %bb.13, implicit undef $scc
+
+  bb.12:
+    successors: %bb.10(0x80000000)
+    %29:vreg_128 = COPY killed %37
+    S_BRANCH %bb.10
+
+  bb.13:
+    successors: %bb.10(0x80000000)
+    %29:vreg_128 = COPY killed %37
+    S_BRANCH %bb.10
+
+  bb.14:
+    successors: %bb.15(0x40000000), %bb.16(0x40000000)
+    %38:vgpr_32 = V_MAD_F32 0, killed %36.sub0, 0, target-flags(amdgpu-gotprel) 0, 0, 0, 0, 0, implicit $exec
+    %39:vgpr_32 = V_MAD_F32 0, killed %38, 0, 0, 0, 0, 0, 0, implicit $exec
+    %40:vgpr_32 = V_MAD_F32 0, killed %39, 0, -1090519040, 0, 1056964608, 0, 0, implicit $exec
+    %41:vgpr_32 = V_MAD_F32 0, killed %40, 0, 0, 0, -1090519040, 0, 0, implicit $exec
+    %42:vgpr_32 = V_CVT_I32_F32_e32 killed %41, implicit $exec
+    %43:sreg_32_xm0_xexec = S_BUFFER_LOAD_DWORD_IMM undef %44:sreg_128, 12, 0 :: (dereferenceable invariant load 4)
+    %45:vgpr_32 = V_MUL_LO_I32 killed %42, killed %43, implicit $exec
+    %46:vgpr_32 = V_LSHLREV_B32_e32 2, killed %45, implicit $exec
+    %47:vgpr_32 = BUFFER_LOAD_FORMAT_X_IDXEN killed %46, undef %48:sreg_128, 0, 0, 0, 0, 0, implicit $exec :: (dereferenceable load 4 from constant-pool, align 1, addrspace 4)
+    %49:sreg_64 = V_CMP_NE_U32_e64 0, killed %47, implicit $exec
+    %50:sreg_64 = COPY $exec, implicit-def $exec
+    %51:sreg_64 = S_AND_B64 %50, %49, implicit-def dead $scc
+    $exec = S_MOV_B64_term killed %51
+    SI_MASK_BRANCH %bb.16, implicit $exec
+    S_BRANCH %bb.15
+
+  bb.15:
+    successors: %bb.16(0x80000000)
+
+  bb.16:
+    successors: %bb.17(0x80000000)
+    $exec = S_OR_B64 $exec, killed %50, implicit-def $scc
+    S_BRANCH %bb.17
+
+  bb.17:
+    successors: %bb.21(0x40000000), %bb.18(0x40000000)
+    S_CBRANCH_SCC1 %bb.21, implicit undef $scc
+
+  bb.18:
+    successors: %bb.19(0x40000000), %bb.20(0x40000000)
+    S_CBRANCH_SCC1 %bb.19, implicit undef $scc
+    S_BRANCH %bb.20
+
+  bb.19:
+    successors: %bb.20(0x80000000)
+
+  bb.20:
+    successors: %bb.21(0x80000000)
+
+  bb.21:
+    S_ENDPGM
+...
diff --git a/llvm/test/CodeGen/AMDGPU/coalescing-with-subregs-in-loop-bug.mir b/llvm/test/CodeGen/AMDGPU/coalescing-with-subregs-in-loop-bug.mir
new file mode 100644
index 00000000000..062e1af4927
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/coalescing-with-subregs-in-loop-bug.mir
@@ -0,0 +1,98 @@
+# RUN: llc -mtriple=amdgcn--amdpal -mcpu=gfx803 -run-pass=simple-register-coalescing,rename-independent-subregs %s -o - | FileCheck -check-prefix=GCN %s
+
+# This test is for a bug where the following happens:
+#
+# Inside the loop, %29.sub2 is used in a V_LSHLREV whose result is then used
+# in an LDS read. %29 is a 128 bit value that is linked by copies to
+# %45 (from phi elimination), %28 (the value in the loop pre-header),
+# %31 (defined and subreg-modified in the loop, and used after the loop)
+# and %30:
+#
+#     %45:vreg_128 = COPY killed %28
+# bb.1:
+#     %29:vreg_128 = COPY killed %45
+#     %39:vgpr_32 = V_LSHLREV_B32_e32 2, %29.sub2, implicit $exec
+#     %31:vreg_128 = COPY killed %29
+#     %31.sub1:vreg_128 = COPY %34
+#     %30:vreg_128 = COPY %31
+#     %45:vreg_128 = COPY killed %30
+#     S_CBRANCH_EXECNZ %bb.39, implicit $exec
+#     S_BRANCH %bb.40
+# bb.2:
+#     undef %32.sub0:vreg_128 = COPY killed %31.sub0
+#
+# So this coalesces together into a single 128 bit value whose sub1 is modified
+# in the loop, but the sub2 used in the V_LSHLREV is not modified in the loop.
+#
+# The bug is that the coalesced value has a L00000004 subrange (for sub2) that
+# says that it is not live up to the end of the loop block. The symptom is that
+# Rename Independent Subregs separates sub2 into its own register, and it is
+# not live round the loop, so that pass adds an IMPLICIT_DEF for it just before
+# the loop backedge.
+
+# GCN: bb.1:
+# GCN: V_LSHLREV_B32_e32 2, [[val:%[0-9][0-9]*]].sub2
+# GCN-NOT: [[val]]:vreg_128 = IMPLICIT_DEF
+
+---
+name: _amdgpu_cs_main
+tracksRegLiveness: true
+body: |
+  bb.0:
+    successors: %bb.1
+
+    %3:sgpr_32 = S_MOV_B32 0
+    undef %19.sub1:vreg_128 = COPY undef %3
+    %4:sgpr_32 = S_MOV_B32 1
+    %5:sgpr_32 = S_MOV_B32 2
+    %11:sreg_32_xm0 = S_MOV_B32 255
+    undef %28.sub0:vreg_128 = COPY killed %3
+    %28.sub1:vreg_128 = COPY killed %4
+    %28.sub2:vreg_128 = COPY killed %11
+    %28.sub3:vreg_128 = COPY killed %5
+    %2:sreg_64 = S_MOV_B64 0
+    %34:sreg_32 = S_MOV_B32 7
+    %37:vreg_128 = COPY undef %42:vreg_128
+    %43:sreg_64 = COPY killed %2
+    %44:vreg_128 = COPY killed %37
+    %45:vreg_128 = COPY killed %28
+
+  bb.1:
+    successors: %bb.1, %bb.2
+
+    %29:vreg_128 = COPY killed %45
+    %36:vreg_128 = COPY killed %44
+    %0:sreg_64 = COPY killed %43
+    %39:vgpr_32 = V_LSHLREV_B32_e32 2, %29.sub2, implicit $exec
+    %41:vgpr_32 = V_ADD_I32_e32 1152, %39, implicit-def dead $vcc, implicit $exec
+    $m0 = S_MOV_B32 -1
+    %12:vreg_64 = DS_READ2_B32 killed %41, 0, 1, 0, implicit $m0, implicit $exec
+    %13:vreg_64 = DS_READ2_B32 %39, -112, -111, 0, implicit $m0, implicit $exec
+    %14:vreg_64 = DS_READ2_B32 %39, 0, 1, 0, implicit $m0, implicit $exec
+    %40:vgpr_32 = V_ADD_I32_e32 1160, %39, implicit-def dead $vcc, implicit $exec
+    %15:vreg_64 = DS_READ2_B32 killed %40, 0, 1, 0, implicit $m0, implicit $exec
+    %16:vreg_64 = DS_READ2_B32 %39, -110, -109, 0, implicit $m0, implicit $exec
+    %17:vreg_64 = DS_READ2_B32 %39, 2, 3, 0, implicit $m0, implicit $exec
+    undef %35.sub1:vreg_128 = COPY undef %34
+    %31:vreg_128 = COPY killed %29
+    %31.sub1:vreg_128 = COPY %34
+    %38:vgpr_32 = V_ADD_I32_e32 1, %36.sub0, implicit-def dead $vcc, implicit $exec
+    %18:sreg_64 = V_CMP_LT_I32_e64 5, %38, implicit $exec
+    %1:sreg_64 = S_OR_B64 killed %18, killed %0, implicit-def $scc
+    %30:vreg_128 = COPY %31
+    %43:sreg_64 = COPY %1
+    %44:vreg_128 = COPY %35
+    %45:vreg_128 = COPY killed %30
+    $exec = S_ANDN2_B64_term $exec, %1
+    S_CBRANCH_EXECNZ %bb.1, implicit $exec
+    S_BRANCH %bb.2
+
+  bb.2:
+    $exec = S_OR_B64 $exec, killed %1, implicit-def $scc
+    %33:vgpr_32 = V_MOV_B32_e32 0, implicit $exec
+    undef %32.sub0:vreg_128 = COPY killed %31.sub0
+    %32.sub2:vreg_128 = COPY %33
+    $vgpr0_vgpr1_vgpr2_vgpr3 = COPY %32:vreg_128
+    S_ENDPGM
+
+...
-- 
cgit v1.2.3