diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
--- a/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
+++ b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
@@ -2415,6 +2415,7 @@
   MachineInstr *CondBr =
     BuildMI(&MBB, DL, get(Opcode))
     .addMBB(TBB);
+  fixImplicitOperands(*CondBr);
   BuildMI(&MBB, DL, get(AMDGPU::S_BRANCH))
     .addMBB(FBB);
 
diff --git a/llvm/test/CodeGen/AMDGPU/skip-if-dead.ll b/llvm/test/CodeGen/AMDGPU/skip-if-dead.ll
--- a/llvm/test/CodeGen/AMDGPU/skip-if-dead.ll
+++ b/llvm/test/CodeGen/AMDGPU/skip-if-dead.ll
@@ -1,6 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc -march=amdgcn -mcpu=tahiti -verify-machineinstrs -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefixes=GCN,SI %s
-; RUN: llc -march=amdgcn -mcpu=gfx1010 -mattr=-wavefrontsize32,+wavefrontsize64 -verify-machineinstrs -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefixes=GCN,GFX10 %s
+; RUN: llc -march=amdgcn -mcpu=tahiti -verify-machineinstrs -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefixes=GCN,WAVE64,SI %s
+; RUN: llc -march=amdgcn -mcpu=gfx1010 -mattr=-wavefrontsize32,+wavefrontsize64 -verify-machineinstrs -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefixes=GCN,WAVE64,GFX10-WAVE64 %s
+; RUN: llc -march=amdgcn -mcpu=gfx1010 -verify-machineinstrs -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefixes=GCN,GFX10-WAVE32 %s
 
 define amdgpu_ps void @test_kill_depth_0_imm_pos() #0 {
 ; GCN-LABEL: test_kill_depth_0_imm_pos:
@@ -11,51 +12,87 @@
 }
 
 define amdgpu_ps void @test_kill_depth_0_imm_neg() #0 {
-; GCN-LABEL: test_kill_depth_0_imm_neg:
-; GCN:       ; %bb.0:
-; GCN-NEXT:    s_andn2_b64 exec, exec, exec
-; GCN-NEXT:    s_cbranch_scc0 BB1_1
-; GCN-NEXT:    s_endpgm
-; GCN-NEXT:  BB1_1:
-; GCN-NEXT:    s_mov_b64 exec, 0
-; GCN-NEXT:    exp null off, off, off, off done vm
-; GCN-NEXT:    s_endpgm
+; WAVE64-LABEL: test_kill_depth_0_imm_neg:
+; WAVE64:       ; %bb.0:
+; WAVE64-NEXT:    s_andn2_b64 exec, exec, exec
+; WAVE64-NEXT:    s_cbranch_scc0 BB1_1
+; WAVE64-NEXT:    s_endpgm
+; WAVE64-NEXT:  BB1_1:
+; WAVE64-NEXT:    s_mov_b64 exec, 0
+; WAVE64-NEXT:    exp null off, off, off, off done vm
+; WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: test_kill_depth_0_imm_neg:
+; GFX10-WAVE32:       ; %bb.0:
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, exec_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB1_1
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB1_1:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
   call void @llvm.amdgcn.kill(i1 false)
   ret void
 }
 
 ; FIXME: Ideally only one early-exit would be emitted
 define amdgpu_ps void @test_kill_depth_0_imm_neg_x2() #0 {
-; GCN-LABEL: test_kill_depth_0_imm_neg_x2:
-; GCN:       ; %bb.0:
-; GCN-NEXT:    s_mov_b64 s[0:1], exec
-; GCN-NEXT:    s_andn2_b64 s[0:1], s[0:1], exec
-; GCN-NEXT:    s_cbranch_scc0 BB2_2
-; GCN-NEXT:  ; %bb.1:
-; GCN-NEXT:    s_mov_b64 exec, 0
-; GCN-NEXT:    s_andn2_b64 s[0:1], s[0:1], exec
-; GCN-NEXT:    s_cbranch_scc0 BB2_2
-; GCN-NEXT:    s_endpgm
-; GCN-NEXT:  BB2_2:
-; GCN-NEXT:    s_mov_b64 exec, 0
-; GCN-NEXT:    exp null off, off, off, off done vm
-; GCN-NEXT:    s_endpgm
+; WAVE64-LABEL: test_kill_depth_0_imm_neg_x2:
+; WAVE64:       ; %bb.0:
+; WAVE64-NEXT:    s_mov_b64 s[0:1], exec
+; WAVE64-NEXT:    s_andn2_b64 s[0:1], s[0:1], exec
+; WAVE64-NEXT:    s_cbranch_scc0 BB2_2
+; WAVE64-NEXT:  ; %bb.1:
+; WAVE64-NEXT:    s_mov_b64 exec, 0
+; WAVE64-NEXT:    s_andn2_b64 s[0:1], s[0:1], exec
+; WAVE64-NEXT:    s_cbranch_scc0 BB2_2
+; WAVE64-NEXT:    s_endpgm
+; WAVE64-NEXT:  BB2_2:
+; WAVE64-NEXT:    s_mov_b64 exec, 0
+; WAVE64-NEXT:    exp null off, off, off, off done vm
+; WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: test_kill_depth_0_imm_neg_x2:
+; GFX10-WAVE32:       ; %bb.0:
+; GFX10-WAVE32-NEXT:    s_mov_b32 s0, exec_lo
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s0, s0, exec_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB2_2
+; GFX10-WAVE32-NEXT:  ; %bb.1:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s0, s0, exec_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB2_2
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB2_2:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
   call void @llvm.amdgcn.kill(i1 false)
   call void @llvm.amdgcn.kill(i1 false)
   ret void
 }
 
 define amdgpu_ps void @test_kill_depth_var(float %x) #0 {
-; GCN-LABEL: test_kill_depth_var:
-; GCN:       ; %bb.0:
-; GCN-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
-; GCN-NEXT:    s_andn2_b64 exec, exec, vcc
-; GCN-NEXT:    s_cbranch_scc0 BB3_1
-; GCN-NEXT:    s_endpgm
-; GCN-NEXT:  BB3_1:
-; GCN-NEXT:    s_mov_b64 exec, 0
-; GCN-NEXT:    exp null off, off, off, off done vm
-; GCN-NEXT:    s_endpgm
+; WAVE64-LABEL: test_kill_depth_var:
+; WAVE64:       ; %bb.0:
+; WAVE64-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
+; WAVE64-NEXT:    s_andn2_b64 exec, exec, vcc
+; WAVE64-NEXT:    s_cbranch_scc0 BB3_1
+; WAVE64-NEXT:    s_endpgm
+; WAVE64-NEXT:  BB3_1:
+; WAVE64-NEXT:    s_mov_b64 exec, 0
+; WAVE64-NEXT:    exp null off, off, off, off done vm
+; WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: test_kill_depth_var:
+; GFX10-WAVE32:       ; %bb.0:
+; GFX10-WAVE32-NEXT:    v_cmp_ngt_f32_e32 vcc_lo, 0, v0
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB3_1
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB3_1:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
   %cmp = fcmp olt float %x, 0.0
   call void @llvm.amdgcn.kill(i1 %cmp)
   ret void
@@ -63,22 +100,39 @@
 
 ; FIXME: Ideally only one early-exit would be emitted
 define amdgpu_ps void @test_kill_depth_var_x2_same(float %x) #0 {
-; GCN-LABEL: test_kill_depth_var_x2_same:
-; GCN:       ; %bb.0:
-; GCN-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
-; GCN-NEXT:    s_mov_b64 s[0:1], exec
-; GCN-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
-; GCN-NEXT:    s_cbranch_scc0 BB4_2
-; GCN-NEXT:  ; %bb.1:
-; GCN-NEXT:    s_andn2_b64 exec, exec, vcc
-; GCN-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
-; GCN-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
-; GCN-NEXT:    s_cbranch_scc0 BB4_2
-; GCN-NEXT:    s_endpgm
-; GCN-NEXT:  BB4_2:
-; GCN-NEXT:    s_mov_b64 exec, 0
-; GCN-NEXT:    exp null off, off, off, off done vm
-; GCN-NEXT:    s_endpgm
+; WAVE64-LABEL: test_kill_depth_var_x2_same:
+; WAVE64:       ; %bb.0:
+; WAVE64-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
+; WAVE64-NEXT:    s_mov_b64 s[0:1], exec
+; WAVE64-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
+; WAVE64-NEXT:    s_cbranch_scc0 BB4_2
+; WAVE64-NEXT:  ; %bb.1:
+; WAVE64-NEXT:    s_andn2_b64 exec, exec, vcc
+; WAVE64-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
+; WAVE64-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
+; WAVE64-NEXT:    s_cbranch_scc0 BB4_2
+; WAVE64-NEXT:    s_endpgm
+; WAVE64-NEXT:  BB4_2:
+; WAVE64-NEXT:    s_mov_b64 exec, 0
+; WAVE64-NEXT:    exp null off, off, off, off done vm
+; WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: test_kill_depth_var_x2_same:
+; GFX10-WAVE32:       ; %bb.0:
+; GFX10-WAVE32-NEXT:    v_cmp_ngt_f32_e32 vcc_lo, 0, v0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s0, exec_lo
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s0, s0, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB4_2
+; GFX10-WAVE32-NEXT:  ; %bb.1:
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:    v_cmp_ngt_f32_e32 vcc_lo, 0, v0
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s0, s0, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB4_2
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB4_2:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
   %cmp = fcmp olt float %x, 0.0
   call void @llvm.amdgcn.kill(i1 %cmp)
   call void @llvm.amdgcn.kill(i1 %cmp)
@@ -87,22 +141,39 @@
 
 ; FIXME: Ideally only one early-exit would be emitted
 define amdgpu_ps void @test_kill_depth_var_x2(float %x, float %y) #0 {
-; GCN-LABEL: test_kill_depth_var_x2:
-; GCN:       ; %bb.0:
-; GCN-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
-; GCN-NEXT:    s_mov_b64 s[0:1], exec
-; GCN-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
-; GCN-NEXT:    s_cbranch_scc0 BB5_2
-; GCN-NEXT:  ; %bb.1:
-; GCN-NEXT:    s_andn2_b64 exec, exec, vcc
-; GCN-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v1
-; GCN-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
-; GCN-NEXT:    s_cbranch_scc0 BB5_2
-; GCN-NEXT:    s_endpgm
-; GCN-NEXT:  BB5_2:
-; GCN-NEXT:    s_mov_b64 exec, 0
-; GCN-NEXT:    exp null off, off, off, off done vm
-; GCN-NEXT:    s_endpgm
+; WAVE64-LABEL: test_kill_depth_var_x2:
+; WAVE64:       ; %bb.0:
+; WAVE64-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
+; WAVE64-NEXT:    s_mov_b64 s[0:1], exec
+; WAVE64-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
+; WAVE64-NEXT:    s_cbranch_scc0 BB5_2
+; WAVE64-NEXT:  ; %bb.1:
+; WAVE64-NEXT:    s_andn2_b64 exec, exec, vcc
+; WAVE64-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v1
+; WAVE64-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
+; WAVE64-NEXT:    s_cbranch_scc0 BB5_2
+; WAVE64-NEXT:    s_endpgm
+; WAVE64-NEXT:  BB5_2:
+; WAVE64-NEXT:    s_mov_b64 exec, 0
+; WAVE64-NEXT:    exp null off, off, off, off done vm
+; WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: test_kill_depth_var_x2:
+; GFX10-WAVE32:       ; %bb.0:
+; GFX10-WAVE32-NEXT:    v_cmp_ngt_f32_e32 vcc_lo, 0, v0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s0, exec_lo
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s0, s0, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB5_2
+; GFX10-WAVE32-NEXT:  ; %bb.1:
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:    v_cmp_ngt_f32_e32 vcc_lo, 0, v1
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s0, s0, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB5_2
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB5_2:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
   %cmp.x = fcmp olt float %x, 0.0
   call void @llvm.amdgcn.kill(i1 %cmp.x)
   %cmp.y = fcmp olt float %y, 0.0
@@ -111,25 +182,45 @@
 }
 
 define amdgpu_ps void @test_kill_depth_var_x2_instructions(float %x) #0 {
-; GCN-LABEL: test_kill_depth_var_x2_instructions:
-; GCN:       ; %bb.0:
-; GCN-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
-; GCN-NEXT:    s_mov_b64 s[0:1], exec
-; GCN-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
-; GCN-NEXT:    s_cbranch_scc0 BB6_2
-; GCN-NEXT:  ; %bb.1:
-; GCN-NEXT:    s_andn2_b64 exec, exec, vcc
-; GCN-NEXT:    ;;#ASMSTART
-; GCN-NEXT:    v_mov_b32_e64 v7, -1
-; GCN-NEXT:    ;;#ASMEND
-; GCN-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v7
-; GCN-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
-; GCN-NEXT:    s_cbranch_scc0 BB6_2
-; GCN-NEXT:    s_endpgm
-; GCN-NEXT:  BB6_2:
-; GCN-NEXT:    s_mov_b64 exec, 0
-; GCN-NEXT:    exp null off, off, off, off done vm
-; GCN-NEXT:    s_endpgm
+; WAVE64-LABEL: test_kill_depth_var_x2_instructions:
+; WAVE64:       ; %bb.0:
+; WAVE64-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
+; WAVE64-NEXT:    s_mov_b64 s[0:1], exec
+; WAVE64-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
+; WAVE64-NEXT:    s_cbranch_scc0 BB6_2
+; WAVE64-NEXT:  ; %bb.1:
+; WAVE64-NEXT:    s_andn2_b64 exec, exec, vcc
+; WAVE64-NEXT:    ;;#ASMSTART
+; WAVE64-NEXT:    v_mov_b32_e64 v7, -1
+; WAVE64-NEXT:    ;;#ASMEND
+; WAVE64-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v7
+; WAVE64-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
+; WAVE64-NEXT:    s_cbranch_scc0 BB6_2
+; WAVE64-NEXT:    s_endpgm
+; WAVE64-NEXT:  BB6_2:
+; WAVE64-NEXT:    s_mov_b64 exec, 0
+; WAVE64-NEXT:    exp null off, off, off, off done vm
+; WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: test_kill_depth_var_x2_instructions:
+; GFX10-WAVE32:       ; %bb.0:
+; GFX10-WAVE32-NEXT:    v_cmp_ngt_f32_e32 vcc_lo, 0, v0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s0, exec_lo
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s0, s0, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB6_2
+; GFX10-WAVE32-NEXT:  ; %bb.1:
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:    ;;#ASMSTART
+; GFX10-WAVE32-NEXT:    v_mov_b32_e64 v7, -1
+; GFX10-WAVE32-NEXT:    ;;#ASMEND
+; GFX10-WAVE32-NEXT:    v_cmp_ngt_f32_e32 vcc_lo, 0, v7
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s0, s0, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB6_2
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB6_2:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
   %cmp.x = fcmp olt float %x, 0.0
   call void @llvm.amdgcn.kill(i1 %cmp.x)
   %y = call float asm sideeffect "v_mov_b32_e64 v7, -1", "={v7}"()
@@ -140,40 +231,75 @@
 
 ; FIXME: why does the skip depend on the asm length in the same block?
 define amdgpu_ps float @test_kill_control_flow(i32 inreg %arg) #0 {
-; GCN-LABEL: test_kill_control_flow:
-; GCN:       ; %bb.0: ; %entry
-; GCN-NEXT:    s_cmp_lg_u32 s0, 0
-; GCN-NEXT:    s_cbranch_scc0 BB7_2
-; GCN-NEXT:  ; %bb.1: ; %exit
-; GCN-NEXT:    v_mov_b32_e32 v0, 1.0
-; GCN-NEXT:    s_branch BB7_5
-; GCN-NEXT:  BB7_2: ; %bb
-; GCN-NEXT:    ;;#ASMSTART
-; GCN-NEXT:    v_mov_b32_e64 v7, -1
-; GCN-NEXT:    v_nop_e64
-; GCN-NEXT:    v_nop_e64
-; GCN-NEXT:    v_nop_e64
-; GCN-NEXT:    v_nop_e64
-; GCN-NEXT:    v_nop_e64
-; GCN-NEXT:    v_nop_e64
-; GCN-NEXT:    v_nop_e64
-; GCN-NEXT:    v_nop_e64
-; GCN-NEXT:    v_nop_e64
-; GCN-NEXT:    v_nop_e64
-; GCN-NEXT:    ;;#ASMEND
-; GCN-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v7
-; GCN-NEXT:    s_mov_b64 s[2:3], exec
-; GCN-NEXT:    s_andn2_b64 s[2:3], s[2:3], vcc
-; GCN-NEXT:    s_cbranch_scc0 BB7_4
-; GCN-NEXT:  ; %bb.3: ; %bb
-; GCN-NEXT:    s_andn2_b64 exec, exec, vcc
-; GCN-NEXT:    v_mov_b32_e32 v0, 1.0
-; GCN-NEXT:    s_branch BB7_5
-; GCN-NEXT:  BB7_4:
-; GCN-NEXT:    s_mov_b64 exec, 0
-; GCN-NEXT:    exp null off, off, off, off done vm
-; GCN-NEXT:    s_endpgm
-; GCN-NEXT:  BB7_5:
+; WAVE64-LABEL: test_kill_control_flow:
+; WAVE64:       ; %bb.0: ; %entry
+; WAVE64-NEXT:    s_cmp_lg_u32 s0, 0
+; WAVE64-NEXT:    s_cbranch_scc0 BB7_2
+; WAVE64-NEXT:  ; %bb.1: ; %exit
+; WAVE64-NEXT:    v_mov_b32_e32 v0, 1.0
+; WAVE64-NEXT:    s_branch BB7_5
+; WAVE64-NEXT:  BB7_2: ; %bb
+; WAVE64-NEXT:    ;;#ASMSTART
+; WAVE64-NEXT:    v_mov_b32_e64 v7, -1
+; WAVE64-NEXT:    v_nop_e64
+; WAVE64-NEXT:    v_nop_e64
+; WAVE64-NEXT:    v_nop_e64
+; WAVE64-NEXT:    v_nop_e64
+; WAVE64-NEXT:    v_nop_e64
+; WAVE64-NEXT:    v_nop_e64
+; WAVE64-NEXT:    v_nop_e64
+; WAVE64-NEXT:    v_nop_e64
+; WAVE64-NEXT:    v_nop_e64
+; WAVE64-NEXT:    v_nop_e64
+; WAVE64-NEXT:    ;;#ASMEND
+; WAVE64-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v7
+; WAVE64-NEXT:    s_mov_b64 s[2:3], exec
+; WAVE64-NEXT:    s_andn2_b64 s[2:3], s[2:3], vcc
+; WAVE64-NEXT:    s_cbranch_scc0 BB7_4
+; WAVE64-NEXT:  ; %bb.3: ; %bb
+; WAVE64-NEXT:    s_andn2_b64 exec, exec, vcc
+; WAVE64-NEXT:    v_mov_b32_e32 v0, 1.0
+; WAVE64-NEXT:    s_branch BB7_5
+; WAVE64-NEXT:  BB7_4:
+; WAVE64-NEXT:    s_mov_b64 exec, 0
+; WAVE64-NEXT:    exp null off, off, off, off done vm
+; WAVE64-NEXT:    s_endpgm
+; WAVE64-NEXT:  BB7_5:
+;
+; GFX10-WAVE32-LABEL: test_kill_control_flow:
+; GFX10-WAVE32:       ; %bb.0: ; %entry
+; GFX10-WAVE32-NEXT:    s_cmp_lg_u32 s0, 0
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB7_2
+; GFX10-WAVE32-NEXT:  ; %bb.1: ; %exit
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v0, 1.0
+; GFX10-WAVE32-NEXT:    s_branch BB7_5
+; GFX10-WAVE32-NEXT:  BB7_2: ; %bb
+; GFX10-WAVE32-NEXT:    ;;#ASMSTART
+; GFX10-WAVE32-NEXT:    v_mov_b32_e64 v7, -1
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    ;;#ASMEND
+; GFX10-WAVE32-NEXT:    v_cmp_ngt_f32_e32 vcc_lo, 0, v7
+; GFX10-WAVE32-NEXT:    s_mov_b32 s1, exec_lo
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s1, s1, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB7_4
+; GFX10-WAVE32-NEXT:  ; %bb.3: ; %bb
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v0, 1.0
+; GFX10-WAVE32-NEXT:    s_branch BB7_5
+; GFX10-WAVE32-NEXT:  BB7_4:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB7_5:
 entry:
   %cmp = icmp eq i32 %arg, 0
   br i1 %cmp, label %bb, label %exit
@@ -246,49 +372,93 @@
 ; SI-NEXT:    exp null off, off, off, off done vm
 ; SI-NEXT:    s_endpgm
 ;
-; GFX10-LABEL: test_kill_control_flow_remainder:
-; GFX10:       ; %bb.0: ; %entry
-; GFX10-NEXT:    v_mov_b32_e32 v9, 0
-; GFX10-NEXT:    s_cmp_lg_u32 s0, 0
-; GFX10-NEXT:    s_cbranch_scc0 BB8_2
-; GFX10-NEXT:  ; %bb.1: ; %exit
-; GFX10-NEXT:    global_store_dword v[0:1], v9, off
-; GFX10-NEXT:    s_endpgm
-; GFX10-NEXT:  BB8_2: ; %bb
-; GFX10-NEXT:    ;;#ASMSTART
-; GFX10-NEXT:    v_mov_b32_e64 v7, -1
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    ;;#ASMEND
-; GFX10-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v7
-; GFX10-NEXT:    s_mov_b64 s[2:3], exec
-; GFX10-NEXT:    ;;#ASMSTART
-; GFX10-NEXT:    v_mov_b32_e64 v8, -1
-; GFX10-NEXT:    ;;#ASMEND
-; GFX10-NEXT:    s_andn2_b64 s[2:3], s[2:3], vcc
-; GFX10-NEXT:    s_cbranch_scc0 BB8_4
-; GFX10-NEXT:  ; %bb.3: ; %bb
-; GFX10-NEXT:    s_andn2_b64 exec, exec, vcc
-; GFX10-NEXT:    global_store_dword v[0:1], v8, off
-; GFX10-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX10-NEXT:    ;;#ASMSTART
-; GFX10-NEXT:    v_mov_b32_e64 v9, -2
-; GFX10-NEXT:    ;;#ASMEND
-; GFX10-NEXT:    global_store_dword v[0:1], v9, off
-; GFX10-NEXT:    s_endpgm
-; GFX10-NEXT:  BB8_4:
-; GFX10-NEXT:    s_mov_b64 exec, 0
-; GFX10-NEXT:    exp null off, off, off, off done vm
-; GFX10-NEXT:    s_endpgm
+; GFX10-WAVE64-LABEL: test_kill_control_flow_remainder:
+; GFX10-WAVE64:       ; %bb.0: ; %entry
+; GFX10-WAVE64-NEXT:    v_mov_b32_e32 v9, 0
+; GFX10-WAVE64-NEXT:    s_cmp_lg_u32 s0, 0
+; GFX10-WAVE64-NEXT:    s_cbranch_scc0 BB8_2
+; GFX10-WAVE64-NEXT:  ; %bb.1: ; %exit
+; GFX10-WAVE64-NEXT:    global_store_dword v[0:1], v9, off
+; GFX10-WAVE64-NEXT:    s_endpgm
+; GFX10-WAVE64-NEXT:  BB8_2: ; %bb
+; GFX10-WAVE64-NEXT:    ;;#ASMSTART
+; GFX10-WAVE64-NEXT:    v_mov_b32_e64 v7, -1
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    ;;#ASMEND
+; GFX10-WAVE64-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v7
+; GFX10-WAVE64-NEXT:    s_mov_b64 s[2:3], exec
+; GFX10-WAVE64-NEXT:    ;;#ASMSTART
+; GFX10-WAVE64-NEXT:    v_mov_b32_e64 v8, -1
+; GFX10-WAVE64-NEXT:    ;;#ASMEND
+; GFX10-WAVE64-NEXT:    s_andn2_b64 s[2:3], s[2:3], vcc
+; GFX10-WAVE64-NEXT:    s_cbranch_scc0 BB8_4
+; GFX10-WAVE64-NEXT:  ; %bb.3: ; %bb
+; GFX10-WAVE64-NEXT:    s_andn2_b64 exec, exec, vcc
+; GFX10-WAVE64-NEXT:    global_store_dword v[0:1], v8, off
+; GFX10-WAVE64-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE64-NEXT:    ;;#ASMSTART
+; GFX10-WAVE64-NEXT:    v_mov_b32_e64 v9, -2
+; GFX10-WAVE64-NEXT:    ;;#ASMEND
+; GFX10-WAVE64-NEXT:    global_store_dword v[0:1], v9, off
+; GFX10-WAVE64-NEXT:    s_endpgm
+; GFX10-WAVE64-NEXT:  BB8_4:
+; GFX10-WAVE64-NEXT:    s_mov_b64 exec, 0
+; GFX10-WAVE64-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: test_kill_control_flow_remainder:
+; GFX10-WAVE32:       ; %bb.0: ; %entry
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v9, 0
+; GFX10-WAVE32-NEXT:    s_cmp_lg_u32 s0, 0
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB8_2
+; GFX10-WAVE32-NEXT:  ; %bb.1: ; %exit
+; GFX10-WAVE32-NEXT:    global_store_dword v[0:1], v9, off
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB8_2: ; %bb
+; GFX10-WAVE32-NEXT:    ;;#ASMSTART
+; GFX10-WAVE32-NEXT:    v_mov_b32_e64 v7, -1
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    ;;#ASMEND
+; GFX10-WAVE32-NEXT:    v_cmp_ngt_f32_e32 vcc_lo, 0, v7
+; GFX10-WAVE32-NEXT:    s_mov_b32 s1, exec_lo
+; GFX10-WAVE32-NEXT:    ;;#ASMSTART
+; GFX10-WAVE32-NEXT:    v_mov_b32_e64 v8, -1
+; GFX10-WAVE32-NEXT:    ;;#ASMEND
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s1, s1, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB8_4
+; GFX10-WAVE32-NEXT:  ; %bb.3: ; %bb
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:    global_store_dword v[0:1], v8, off
+; GFX10-WAVE32-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE32-NEXT:    ;;#ASMSTART
+; GFX10-WAVE32-NEXT:    v_mov_b32_e64 v9, -2
+; GFX10-WAVE32-NEXT:    ;;#ASMEND
+; GFX10-WAVE32-NEXT:    global_store_dword v[0:1], v9, off
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB8_4:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
 entry:
   %cmp = icmp eq i32 %arg, 0
   br i1 %cmp, label %bb, label %exit
@@ -357,41 +527,77 @@
 ; SI-NEXT:    s_endpgm
 ; SI-NEXT:  BB9_5:
 ;
-; GFX10-LABEL: test_kill_control_flow_return:
-; GFX10:       ; %bb.0: ; %entry
-; GFX10-NEXT:    v_cmp_eq_u32_e64 s[4:5], s0, 1
-; GFX10-NEXT:    s_mov_b64 s[2:3], exec
-; GFX10-NEXT:    s_xor_b64 s[4:5], s[4:5], exec
-; GFX10-NEXT:    s_andn2_b64 s[2:3], s[2:3], s[4:5]
-; GFX10-NEXT:    s_cbranch_scc0 BB9_4
-; GFX10-NEXT:  ; %bb.1: ; %entry
-; GFX10-NEXT:    s_and_b64 exec, exec, s[2:3]
-; GFX10-NEXT:    v_mov_b32_e32 v0, 0
-; GFX10-NEXT:    s_cmp_lg_u32 s0, 0
-; GFX10-NEXT:    s_cbranch_scc0 BB9_3
-; GFX10-NEXT:  ; %bb.2: ; %exit
-; GFX10-NEXT:    s_branch BB9_5
-; GFX10-NEXT:  BB9_3: ; %bb
-; GFX10-NEXT:    ;;#ASMSTART
-; GFX10-NEXT:    v_mov_b32_e64 v7, -1
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    ;;#ASMEND
-; GFX10-NEXT:    v_mov_b32_e32 v0, v7
-; GFX10-NEXT:    s_branch BB9_5
-; GFX10-NEXT:  BB9_4:
-; GFX10-NEXT:    s_mov_b64 exec, 0
-; GFX10-NEXT:    exp null off, off, off, off done vm
-; GFX10-NEXT:    s_endpgm
-; GFX10-NEXT:  BB9_5:
+; GFX10-WAVE64-LABEL: test_kill_control_flow_return:
+; GFX10-WAVE64:       ; %bb.0: ; %entry
+; GFX10-WAVE64-NEXT:    v_cmp_eq_u32_e64 s[4:5], s0, 1
+; GFX10-WAVE64-NEXT:    s_mov_b64 s[2:3], exec
+; GFX10-WAVE64-NEXT:    s_xor_b64 s[4:5], s[4:5], exec
+; GFX10-WAVE64-NEXT:    s_andn2_b64 s[2:3], s[2:3], s[4:5]
+; GFX10-WAVE64-NEXT:    s_cbranch_scc0 BB9_4
+; GFX10-WAVE64-NEXT:  ; %bb.1: ; %entry
+; GFX10-WAVE64-NEXT:    s_and_b64 exec, exec, s[2:3]
+; GFX10-WAVE64-NEXT:    v_mov_b32_e32 v0, 0
+; GFX10-WAVE64-NEXT:    s_cmp_lg_u32 s0, 0
+; GFX10-WAVE64-NEXT:    s_cbranch_scc0 BB9_3
+; GFX10-WAVE64-NEXT:  ; %bb.2: ; %exit
+; GFX10-WAVE64-NEXT:    s_branch BB9_5
+; GFX10-WAVE64-NEXT:  BB9_3: ; %bb
+; GFX10-WAVE64-NEXT:    ;;#ASMSTART
+; GFX10-WAVE64-NEXT:    v_mov_b32_e64 v7, -1
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    ;;#ASMEND
+; GFX10-WAVE64-NEXT:    v_mov_b32_e32 v0, v7
+; GFX10-WAVE64-NEXT:    s_branch BB9_5
+; GFX10-WAVE64-NEXT:  BB9_4:
+; GFX10-WAVE64-NEXT:    s_mov_b64 exec, 0
+; GFX10-WAVE64-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE64-NEXT:    s_endpgm
+; GFX10-WAVE64-NEXT:  BB9_5:
+;
+; GFX10-WAVE32-LABEL: test_kill_control_flow_return:
+; GFX10-WAVE32:       ; %bb.0: ; %entry
+; GFX10-WAVE32-NEXT:    v_cmp_eq_u32_e64 s2, s0, 1
+; GFX10-WAVE32-NEXT:    s_mov_b32 s1, exec_lo
+; GFX10-WAVE32-NEXT:    s_xor_b32 s2, s2, exec_lo
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s1, s1, s2
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB9_4
+; GFX10-WAVE32-NEXT:  ; %bb.1: ; %entry
+; GFX10-WAVE32-NEXT:    s_and_b32 exec_lo, exec_lo, s1
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v0, 0
+; GFX10-WAVE32-NEXT:    s_cmp_lg_u32 s0, 0
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB9_3
+; GFX10-WAVE32-NEXT:  ; %bb.2: ; %exit
+; GFX10-WAVE32-NEXT:    s_branch BB9_5
+; GFX10-WAVE32-NEXT:  BB9_3: ; %bb
+; GFX10-WAVE32-NEXT:    ;;#ASMSTART
+; GFX10-WAVE32-NEXT:    v_mov_b32_e64 v7, -1
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    ;;#ASMEND
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v0, v7
+; GFX10-WAVE32-NEXT:    s_branch BB9_5
+; GFX10-WAVE32-NEXT:  BB9_4:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB9_5:
 entry:
   %kill = icmp eq i32 %arg, 1
   %cmp = icmp eq i32 %arg, 0
@@ -467,49 +673,93 @@
 ; SI-NEXT:    exp null off, off, off, off done vm
 ; SI-NEXT:    s_endpgm
 ;
-; GFX10-LABEL: test_kill_divergent_loop:
-; GFX10:       ; %bb.0: ; %entry
-; GFX10-NEXT:    v_cmp_eq_u32_e32 vcc, 0, v0
-; GFX10-NEXT:    s_mov_b64 s[0:1], exec
-; GFX10-NEXT:    s_and_saveexec_b64 s[2:3], vcc
-; GFX10-NEXT:    s_xor_b64 s[2:3], exec, s[2:3]
-; GFX10-NEXT:    s_cbranch_execz BB10_3
-; GFX10-NEXT:  BB10_1: ; %bb
-; GFX10-NEXT:    ; =>This Inner Loop Header: Depth=1
-; GFX10-NEXT:    ;;#ASMSTART
-; GFX10-NEXT:    v_mov_b32_e64 v7, -1
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    v_nop_e64
-; GFX10-NEXT:    ;;#ASMEND
-; GFX10-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v7
-; GFX10-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
-; GFX10-NEXT:    s_cbranch_scc0 BB10_4
-; GFX10-NEXT:  ; %bb.2: ; %bb
-; GFX10-NEXT:    ; in Loop: Header=BB10_1 Depth=1
-; GFX10-NEXT:    s_andn2_b64 exec, exec, vcc
-; GFX10-NEXT:    global_load_dword v0, v[0:1], off glc dlc
-; GFX10-NEXT:    s_waitcnt vmcnt(0)
-; GFX10-NEXT:    v_cmp_eq_u32_e32 vcc, 0, v0
-; GFX10-NEXT:    s_and_b64 vcc, exec, vcc
-; GFX10-NEXT:    s_cbranch_vccnz BB10_1
-; GFX10-NEXT:  BB10_3: ; %Flow1
-; GFX10-NEXT:    s_or_b64 exec, exec, s[2:3]
-; GFX10-NEXT:    v_mov_b32_e32 v0, 8
-; GFX10-NEXT:    global_store_dword v[0:1], v0, off
-; GFX10-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX10-NEXT:    s_endpgm
-; GFX10-NEXT:  BB10_4:
-; GFX10-NEXT:    s_mov_b64 exec, 0
-; GFX10-NEXT:    exp null off, off, off, off done vm
-; GFX10-NEXT:    s_endpgm
+; GFX10-WAVE64-LABEL: test_kill_divergent_loop:
+; GFX10-WAVE64:       ; %bb.0: ; %entry
+; GFX10-WAVE64-NEXT:    v_cmp_eq_u32_e32 vcc, 0, v0
+; GFX10-WAVE64-NEXT:    s_mov_b64 s[0:1], exec
+; GFX10-WAVE64-NEXT:    s_and_saveexec_b64 s[2:3], vcc
+; GFX10-WAVE64-NEXT:    s_xor_b64 s[2:3], exec, s[2:3]
+; GFX10-WAVE64-NEXT:    s_cbranch_execz BB10_3
+; GFX10-WAVE64-NEXT:  BB10_1: ; %bb
+; GFX10-WAVE64-NEXT:    ; =>This Inner Loop Header: Depth=1
+; GFX10-WAVE64-NEXT:    ;;#ASMSTART
+; GFX10-WAVE64-NEXT:    v_mov_b32_e64 v7, -1
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    v_nop_e64
+; GFX10-WAVE64-NEXT:    ;;#ASMEND
+; GFX10-WAVE64-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v7
+; GFX10-WAVE64-NEXT:    s_andn2_b64 s[0:1], s[0:1], vcc
+; GFX10-WAVE64-NEXT:    s_cbranch_scc0 BB10_4
+; GFX10-WAVE64-NEXT:  ; %bb.2: ; %bb
+; GFX10-WAVE64-NEXT:    ; in Loop: Header=BB10_1 Depth=1
+; GFX10-WAVE64-NEXT:    s_andn2_b64 exec, exec, vcc
+; GFX10-WAVE64-NEXT:    global_load_dword v0, v[0:1], off glc dlc
+; GFX10-WAVE64-NEXT:    s_waitcnt vmcnt(0)
+; GFX10-WAVE64-NEXT:    v_cmp_eq_u32_e32 vcc, 0, v0
+; GFX10-WAVE64-NEXT:    s_and_b64 vcc, exec, vcc
+; GFX10-WAVE64-NEXT:    s_cbranch_vccnz BB10_1
+; GFX10-WAVE64-NEXT:  BB10_3: ; %Flow1
+; GFX10-WAVE64-NEXT:    s_or_b64 exec, exec, s[2:3]
+; GFX10-WAVE64-NEXT:    v_mov_b32_e32 v0, 8
+; GFX10-WAVE64-NEXT:    global_store_dword v[0:1], v0, off
+; GFX10-WAVE64-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE64-NEXT:    s_endpgm
+; GFX10-WAVE64-NEXT:  BB10_4:
+; GFX10-WAVE64-NEXT:    s_mov_b64 exec, 0
+; GFX10-WAVE64-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: test_kill_divergent_loop:
+; GFX10-WAVE32:       ; %bb.0: ; %entry
+; GFX10-WAVE32-NEXT:    v_cmp_eq_u32_e32 vcc_lo, 0, v0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s0, exec_lo
+; GFX10-WAVE32-NEXT:    s_and_saveexec_b32 s1, vcc_lo
+; GFX10-WAVE32-NEXT:    s_xor_b32 s1, exec_lo, s1
+; GFX10-WAVE32-NEXT:    s_cbranch_execz BB10_3
+; GFX10-WAVE32-NEXT:  BB10_1: ; %bb
+; GFX10-WAVE32-NEXT:    ; =>This Inner Loop Header: Depth=1
+; GFX10-WAVE32-NEXT:    ;;#ASMSTART
+; GFX10-WAVE32-NEXT:    v_mov_b32_e64 v7, -1
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    v_nop_e64
+; GFX10-WAVE32-NEXT:    ;;#ASMEND
+; GFX10-WAVE32-NEXT:    v_cmp_ngt_f32_e32 vcc_lo, 0, v7
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s0, s0, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB10_4
+; GFX10-WAVE32-NEXT:  ; %bb.2: ; %bb
+; GFX10-WAVE32-NEXT:    ; in Loop: Header=BB10_1 Depth=1
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:    global_load_dword v0, v[0:1], off glc dlc
+; GFX10-WAVE32-NEXT:    s_waitcnt vmcnt(0)
+; GFX10-WAVE32-NEXT:    v_cmp_eq_u32_e32 vcc_lo, 0, v0
+; GFX10-WAVE32-NEXT:    s_and_b32 vcc_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_vccnz BB10_1
+; GFX10-WAVE32-NEXT:  BB10_3: ; %Flow1
+; GFX10-WAVE32-NEXT:    s_or_b32 exec_lo, exec_lo, s1
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v0, 8
+; GFX10-WAVE32-NEXT:    global_store_dword v[0:1], v0, off
+; GFX10-WAVE32-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB10_4:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
 entry:
   %cmp = icmp eq i32 %arg, 0
   br i1 %cmp, label %bb, label %exit
@@ -574,36 +824,67 @@
 ; SI-NEXT:    exp null off, off, off, off done vm
 ; SI-NEXT:    s_endpgm
 ;
-; GFX10-LABEL: phi_use_def_before_kill:
-; GFX10:       ; %bb.0: ; %bb
-; GFX10-NEXT:    v_add_f32_e64 v1, s0, 1.0
-; GFX10-NEXT:    v_cmp_lt_f32_e32 vcc, 0, v1
-; GFX10-NEXT:    v_cndmask_b32_e64 v0, 0, -1.0, vcc
-; GFX10-NEXT:    v_cmp_nlt_f32_e32 vcc, 0, v1
-; GFX10-NEXT:    s_andn2_b64 exec, exec, vcc
-; GFX10-NEXT:    s_cbranch_scc0 BB11_6
-; GFX10-NEXT:  ; %bb.1: ; %bb
-; GFX10-NEXT:    s_andn2_b64 exec, exec, vcc
-; GFX10-NEXT:    s_cbranch_scc0 BB11_3
-; GFX10-NEXT:  ; %bb.2: ; %bb8
-; GFX10-NEXT:    v_mov_b32_e32 v1, 8
-; GFX10-NEXT:    v_mov_b32_e32 v0, 4.0
-; GFX10-NEXT:    global_store_dword v[0:1], v1, off
-; GFX10-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX10-NEXT:  BB11_3: ; %phibb
-; GFX10-NEXT:    v_cmp_eq_f32_e32 vcc, 0, v0
-; GFX10-NEXT:    s_and_b64 vcc, exec, vcc
-; GFX10-NEXT:    s_cbranch_vccz BB11_5
-; GFX10-NEXT:  ; %bb.4: ; %bb10
-; GFX10-NEXT:    v_mov_b32_e32 v0, 9
-; GFX10-NEXT:    global_store_dword v[0:1], v0, off
-; GFX10-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX10-NEXT:  BB11_5: ; %end
-; GFX10-NEXT:    s_endpgm
-; GFX10-NEXT:  BB11_6:
-; GFX10-NEXT:    s_mov_b64 exec, 0
-; GFX10-NEXT:    exp null off, off, off, off done vm
-; GFX10-NEXT:    s_endpgm
+; GFX10-WAVE64-LABEL: phi_use_def_before_kill:
+; GFX10-WAVE64:       ; %bb.0: ; %bb
+; GFX10-WAVE64-NEXT:    v_add_f32_e64 v1, s0, 1.0
+; GFX10-WAVE64-NEXT:    v_cmp_lt_f32_e32 vcc, 0, v1
+; GFX10-WAVE64-NEXT:    v_cndmask_b32_e64 v0, 0, -1.0, vcc
+; GFX10-WAVE64-NEXT:    v_cmp_nlt_f32_e32 vcc, 0, v1
+; GFX10-WAVE64-NEXT:    s_andn2_b64 exec, exec, vcc
+; GFX10-WAVE64-NEXT:    s_cbranch_scc0 BB11_6
+; GFX10-WAVE64-NEXT:  ; %bb.1: ; %bb
+; GFX10-WAVE64-NEXT:    s_andn2_b64 exec, exec, vcc
+; GFX10-WAVE64-NEXT:    s_cbranch_scc0 BB11_3
+; GFX10-WAVE64-NEXT:  ; %bb.2: ; %bb8
+; GFX10-WAVE64-NEXT:    v_mov_b32_e32 v1, 8
+; GFX10-WAVE64-NEXT:    v_mov_b32_e32 v0, 4.0
+; GFX10-WAVE64-NEXT:    global_store_dword v[0:1], v1, off
+; GFX10-WAVE64-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE64-NEXT:  BB11_3: ; %phibb
+; GFX10-WAVE64-NEXT:    v_cmp_eq_f32_e32 vcc, 0, v0
+; GFX10-WAVE64-NEXT:    s_and_b64 vcc, exec, vcc
+; GFX10-WAVE64-NEXT:    s_cbranch_vccz BB11_5
+; GFX10-WAVE64-NEXT:  ; %bb.4: ; %bb10
+; GFX10-WAVE64-NEXT:    v_mov_b32_e32 v0, 9
+; GFX10-WAVE64-NEXT:    global_store_dword v[0:1], v0, off
+; GFX10-WAVE64-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE64-NEXT:  BB11_5: ; %end
+; GFX10-WAVE64-NEXT:    s_endpgm
+; GFX10-WAVE64-NEXT:  BB11_6:
+; GFX10-WAVE64-NEXT:    s_mov_b64 exec, 0
+; GFX10-WAVE64-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: phi_use_def_before_kill:
+; GFX10-WAVE32:       ; %bb.0: ; %bb
+; GFX10-WAVE32-NEXT:    v_add_f32_e64 v1, s0, 1.0
+; GFX10-WAVE32-NEXT:    v_cmp_lt_f32_e32 vcc_lo, 0, v1
+; GFX10-WAVE32-NEXT:    v_cndmask_b32_e64 v0, 0, -1.0, vcc_lo
+; GFX10-WAVE32-NEXT:    v_cmp_nlt_f32_e32 vcc_lo, 0, v1
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB11_6
+; GFX10-WAVE32-NEXT:  ; %bb.1: ; %bb
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB11_3
+; GFX10-WAVE32-NEXT:  ; %bb.2: ; %bb8
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v1, 8
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v0, 4.0
+; GFX10-WAVE32-NEXT:    global_store_dword v[0:1], v1, off
+; GFX10-WAVE32-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE32-NEXT:  BB11_3: ; %phibb
+; GFX10-WAVE32-NEXT:    v_cmp_eq_f32_e32 vcc_lo, 0, v0
+; GFX10-WAVE32-NEXT:    s_and_b32 vcc_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_vccz BB11_5
+; GFX10-WAVE32-NEXT:  ; %bb.4: ; %bb10
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v0, 9
+; GFX10-WAVE32-NEXT:    global_store_dword v[0:1], v0, off
+; GFX10-WAVE32-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE32-NEXT:  BB11_5: ; %end
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB11_6:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
 bb:
   %tmp = fadd float %x, 1.000000e+00
   %tmp1 = fcmp olt float 0.000000e+00, %tmp
@@ -651,25 +932,45 @@
 ; SI-NEXT:    exp null off, off, off, off done vm
 ; SI-NEXT:    s_endpgm
 ;
-; GFX10-LABEL: no_skip_no_successors:
-; GFX10:       ; %bb.0: ; %bb
-; GFX10-NEXT:    v_cmp_nge_f32_e64 s[4:5], s1, 0
-; GFX10-NEXT:    s_and_b64 vcc, exec, s[4:5]
-; GFX10-NEXT:    s_cbranch_vccz BB12_3
-; GFX10-NEXT:  ; %bb.1: ; %bb6
-; GFX10-NEXT:    s_mov_b64 s[2:3], exec
-; GFX10-NEXT:    s_andn2_b64 s[2:3], s[2:3], exec
-; GFX10-NEXT:    s_cbranch_scc0 BB12_5
-; GFX10-NEXT:  ; %bb.2: ; %bb6
-; GFX10-NEXT:    s_mov_b64 exec, 0
-; GFX10-NEXT:  BB12_3: ; %bb3
-; GFX10-NEXT:    v_cmp_nle_f32_e64 s[0:1], 0x3e7ae148, s0
-; GFX10-NEXT:    s_and_b64 vcc, exec, s[0:1]
-; GFX10-NEXT:  ; %bb.4: ; %bb5
-; GFX10-NEXT:  BB12_5:
-; GFX10-NEXT:    s_mov_b64 exec, 0
-; GFX10-NEXT:    exp null off, off, off, off done vm
-; GFX10-NEXT:    s_endpgm
+; GFX10-WAVE64-LABEL: no_skip_no_successors:
+; GFX10-WAVE64:       ; %bb.0: ; %bb
+; GFX10-WAVE64-NEXT:    v_cmp_nge_f32_e64 s[4:5], s1, 0
+; GFX10-WAVE64-NEXT:    s_and_b64 vcc, exec, s[4:5]
+; GFX10-WAVE64-NEXT:    s_cbranch_vccz BB12_3
+; GFX10-WAVE64-NEXT:  ; %bb.1: ; %bb6
+; GFX10-WAVE64-NEXT:    s_mov_b64 s[2:3], exec
+; GFX10-WAVE64-NEXT:    s_andn2_b64 s[2:3], s[2:3], exec
+; GFX10-WAVE64-NEXT:    s_cbranch_scc0 BB12_5
+; GFX10-WAVE64-NEXT:  ; %bb.2: ; %bb6
+; GFX10-WAVE64-NEXT:    s_mov_b64 exec, 0
+; GFX10-WAVE64-NEXT:  BB12_3: ; %bb3
+; GFX10-WAVE64-NEXT:    v_cmp_nle_f32_e64 s[0:1], 0x3e7ae148, s0
+; GFX10-WAVE64-NEXT:    s_and_b64 vcc, exec, s[0:1]
+; GFX10-WAVE64-NEXT:  ; %bb.4: ; %bb5
+; GFX10-WAVE64-NEXT:  BB12_5:
+; GFX10-WAVE64-NEXT:    s_mov_b64 exec, 0
+; GFX10-WAVE64-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: no_skip_no_successors:
+; GFX10-WAVE32:       ; %bb.0: ; %bb
+; GFX10-WAVE32-NEXT:    v_cmp_nge_f32_e64 s1, s1, 0
+; GFX10-WAVE32-NEXT:    s_and_b32 vcc_lo, exec_lo, s1
+; GFX10-WAVE32-NEXT:    s_cbranch_vccz BB12_3
+; GFX10-WAVE32-NEXT:  ; %bb.1: ; %bb6
+; GFX10-WAVE32-NEXT:    s_mov_b32 s2, exec_lo
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s2, s2, exec_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB12_5
+; GFX10-WAVE32-NEXT:  ; %bb.2: ; %bb6
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:  BB12_3: ; %bb3
+; GFX10-WAVE32-NEXT:    v_cmp_nle_f32_e64 s0, 0x3e7ae148, s0
+; GFX10-WAVE32-NEXT:    s_and_b32 vcc_lo, exec_lo, s0
+; GFX10-WAVE32-NEXT:  ; %bb.4: ; %bb5
+; GFX10-WAVE32-NEXT:  BB12_5:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
 bb:
   %tmp = fcmp ult float %arg1, 0.000000e+00
   %tmp2 = fcmp ult float %arg, 0x3FCF5C2900000000
@@ -734,44 +1035,83 @@
 ; SI-NEXT:    exp null off, off, off, off done vm
 ; SI-NEXT:    s_endpgm
 ;
-; GFX10-LABEL: if_after_kill_block:
-; GFX10:       ; %bb.0: ; %bb
-; GFX10-NEXT:    s_mov_b64 s[2:3], exec
-; GFX10-NEXT:    s_wqm_b64 exec, exec
-; GFX10-NEXT:    v_cmp_nle_f32_e32 vcc, 0, v1
-; GFX10-NEXT:    s_mov_b32 s0, 0
-; GFX10-NEXT:    s_and_saveexec_b64 s[4:5], vcc
-; GFX10-NEXT:    s_xor_b64 s[4:5], exec, s[4:5]
-; GFX10-NEXT:  ; %bb.1: ; %bb3
-; GFX10-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
-; GFX10-NEXT:    s_andn2_b64 s[2:3], s[2:3], vcc
-; GFX10-NEXT:    s_cbranch_scc0 BB13_6
-; GFX10-NEXT:  ; %bb.2: ; %bb3
-; GFX10-NEXT:    s_andn2_b64 exec, exec, vcc
-; GFX10-NEXT:  ; %bb.3: ; %bb4
-; GFX10-NEXT:    s_or_b64 exec, exec, s[4:5]
-; GFX10-NEXT:    s_mov_b32 s1, s0
-; GFX10-NEXT:    s_mov_b32 s2, s0
-; GFX10-NEXT:    s_mov_b32 s3, s0
-; GFX10-NEXT:    s_mov_b32 s4, s0
-; GFX10-NEXT:    s_mov_b32 s5, s0
-; GFX10-NEXT:    s_mov_b32 s6, s0
-; GFX10-NEXT:    s_mov_b32 s7, s0
-; GFX10-NEXT:    image_sample_c v0, v[2:3], s[0:7], s[0:3] dmask:0x10 dim:SQ_RSRC_IMG_1D
-; GFX10-NEXT:    s_waitcnt vmcnt(0)
-; GFX10-NEXT:    v_cmp_neq_f32_e32 vcc, 0, v0
-; GFX10-NEXT:    s_and_saveexec_b64 s[0:1], vcc
-; GFX10-NEXT:    s_cbranch_execz BB13_5
-; GFX10-NEXT:  ; %bb.4: ; %bb8
-; GFX10-NEXT:    v_mov_b32_e32 v0, 9
-; GFX10-NEXT:    global_store_dword v[0:1], v0, off
-; GFX10-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX10-NEXT:  BB13_5: ; %UnifiedReturnBlock
-; GFX10-NEXT:    s_endpgm
-; GFX10-NEXT:  BB13_6:
-; GFX10-NEXT:    s_mov_b64 exec, 0
-; GFX10-NEXT:    exp null off, off, off, off done vm
-; GFX10-NEXT:    s_endpgm
+; GFX10-WAVE64-LABEL: if_after_kill_block:
+; GFX10-WAVE64:       ; %bb.0: ; %bb
+; GFX10-WAVE64-NEXT:    s_mov_b64 s[2:3], exec
+; GFX10-WAVE64-NEXT:    s_wqm_b64 exec, exec
+; GFX10-WAVE64-NEXT:    v_cmp_nle_f32_e32 vcc, 0, v1
+; GFX10-WAVE64-NEXT:    s_mov_b32 s0, 0
+; GFX10-WAVE64-NEXT:    s_and_saveexec_b64 s[4:5], vcc
+; GFX10-WAVE64-NEXT:    s_xor_b64 s[4:5], exec, s[4:5]
+; GFX10-WAVE64-NEXT:  ; %bb.1: ; %bb3
+; GFX10-WAVE64-NEXT:    v_cmp_ngt_f32_e32 vcc, 0, v0
+; GFX10-WAVE64-NEXT:    s_andn2_b64 s[2:3], s[2:3], vcc
+; GFX10-WAVE64-NEXT:    s_cbranch_scc0 BB13_6
+; GFX10-WAVE64-NEXT:  ; %bb.2: ; %bb3
+; GFX10-WAVE64-NEXT:    s_andn2_b64 exec, exec, vcc
+; GFX10-WAVE64-NEXT:  ; %bb.3: ; %bb4
+; GFX10-WAVE64-NEXT:    s_or_b64 exec, exec, s[4:5]
+; GFX10-WAVE64-NEXT:    s_mov_b32 s1, s0
+; GFX10-WAVE64-NEXT:    s_mov_b32 s2, s0
+; GFX10-WAVE64-NEXT:    s_mov_b32 s3, s0
+; GFX10-WAVE64-NEXT:    s_mov_b32 s4, s0
+; GFX10-WAVE64-NEXT:    s_mov_b32 s5, s0
+; GFX10-WAVE64-NEXT:    s_mov_b32 s6, s0
+; GFX10-WAVE64-NEXT:    s_mov_b32 s7, s0
+; GFX10-WAVE64-NEXT:    image_sample_c v0, v[2:3], s[0:7], s[0:3] dmask:0x10 dim:SQ_RSRC_IMG_1D
+; GFX10-WAVE64-NEXT:    s_waitcnt vmcnt(0)
+; GFX10-WAVE64-NEXT:    v_cmp_neq_f32_e32 vcc, 0, v0
+; GFX10-WAVE64-NEXT:    s_and_saveexec_b64 s[0:1], vcc
+; GFX10-WAVE64-NEXT:    s_cbranch_execz BB13_5
+; GFX10-WAVE64-NEXT:  ; %bb.4: ; %bb8
+; GFX10-WAVE64-NEXT:    v_mov_b32_e32 v0, 9
+; GFX10-WAVE64-NEXT:    global_store_dword v[0:1], v0, off
+; GFX10-WAVE64-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE64-NEXT:  BB13_5: ; %UnifiedReturnBlock
+; GFX10-WAVE64-NEXT:    s_endpgm
+; GFX10-WAVE64-NEXT:  BB13_6:
+; GFX10-WAVE64-NEXT:    s_mov_b64 exec, 0
+; GFX10-WAVE64-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: if_after_kill_block:
+; GFX10-WAVE32:       ; %bb.0: ; %bb
+; GFX10-WAVE32-NEXT:    s_mov_b32 s1, exec_lo
+; GFX10-WAVE32-NEXT:    s_wqm_b32 exec_lo, exec_lo
+; GFX10-WAVE32-NEXT:    v_cmp_nle_f32_e32 vcc_lo, 0, v1
+; GFX10-WAVE32-NEXT:    s_mov_b32 s0, 0
+; GFX10-WAVE32-NEXT:    s_and_saveexec_b32 s2, vcc_lo
+; GFX10-WAVE32-NEXT:    s_xor_b32 s2, exec_lo, s2
+; GFX10-WAVE32-NEXT:  ; %bb.1: ; %bb3
+; GFX10-WAVE32-NEXT:    v_cmp_ngt_f32_e32 vcc_lo, 0, v0
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s1, s1, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB13_6
+; GFX10-WAVE32-NEXT:  ; %bb.2: ; %bb3
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, vcc_lo
+; GFX10-WAVE32-NEXT:  ; %bb.3: ; %bb4
+; GFX10-WAVE32-NEXT:    s_or_b32 exec_lo, exec_lo, s2
+; GFX10-WAVE32-NEXT:    s_mov_b32 s1, s0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s2, s0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s3, s0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s4, s0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s5, s0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s6, s0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s7, s0
+; GFX10-WAVE32-NEXT:    image_sample_c v0, v[2:3], s[0:7], s[0:3] dmask:0x10 dim:SQ_RSRC_IMG_1D
+; GFX10-WAVE32-NEXT:    s_waitcnt vmcnt(0)
+; GFX10-WAVE32-NEXT:    v_cmp_neq_f32_e32 vcc_lo, 0, v0
+; GFX10-WAVE32-NEXT:    s_and_saveexec_b32 s0, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_execz BB13_5
+; GFX10-WAVE32-NEXT:  ; %bb.4: ; %bb8
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v0, 9
+; GFX10-WAVE32-NEXT:    global_store_dword v[0:1], v0, off
+; GFX10-WAVE32-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE32-NEXT:  BB13_5: ; %UnifiedReturnBlock
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB13_6:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
 bb:
   %tmp = fcmp ult float %arg1, 0.000000e+00
   br i1 %tmp, label %bb3, label %bb4
@@ -795,15 +1135,13 @@
   ret void
 }
 
-define amdgpu_ps void @cbranch_kill(i32 inreg %0, <2 x float> %1) {
+define amdgpu_ps void @cbranch_kill(i32 inreg %0, float %val0, float %val1) {
 ; SI-LABEL: cbranch_kill:
 ; SI:       ; %bb.0: ; %.entry
-; SI-NEXT:    s_mov_b32 m0, s0
 ; SI-NEXT:    s_mov_b32 s4, 0
-; SI-NEXT:    v_interp_p1_f32 v2, v0, attr1.x
-; SI-NEXT:    s_mov_b64 s[2:3], exec
-; SI-NEXT:    v_mov_b32_e32 v3, v2
-; SI-NEXT:    v_mov_b32_e32 v4, v2
+; SI-NEXT:    s_mov_b64 s[0:1], exec
+; SI-NEXT:    v_mov_b32_e32 v2, v1
+; SI-NEXT:    v_mov_b32_e32 v3, v1
 ; SI-NEXT:    s_mov_b32 s5, s4
 ; SI-NEXT:    s_mov_b32 s6, s4
 ; SI-NEXT:    s_mov_b32 s7, s4
@@ -811,101 +1149,104 @@
 ; SI-NEXT:    s_mov_b32 s9, s4
 ; SI-NEXT:    s_mov_b32 s10, s4
 ; SI-NEXT:    s_mov_b32 s11, s4
-; SI-NEXT:    image_sample_lz v2, v[2:4], s[4:11], s[0:3] dmask:0x1 da
+; SI-NEXT:    image_sample_lz v1, v[1:3], s[4:11], s[0:3] dmask:0x1 da
 ; SI-NEXT:    s_waitcnt vmcnt(0)
-; SI-NEXT:    v_cmp_ge_f32_e32 vcc, 0, v2
-; SI-NEXT:    s_and_saveexec_b64 s[4:5], vcc
-; SI-NEXT:    s_xor_b64 s[4:5], exec, s[4:5]
+; SI-NEXT:    v_cmp_ge_f32_e32 vcc, 0, v1
+; SI-NEXT:    s_and_saveexec_b64 s[2:3], vcc
+; SI-NEXT:    s_xor_b64 s[2:3], exec, s[2:3]
 ; SI-NEXT:  ; %bb.1: ; %kill
-; SI-NEXT:    s_andn2_b64 s[2:3], s[2:3], exec
+; SI-NEXT:    s_andn2_b64 s[0:1], s[0:1], exec
 ; SI-NEXT:    s_cbranch_scc0 BB14_6
 ; SI-NEXT:  ; %bb.2: ; %kill
 ; SI-NEXT:    s_mov_b64 exec, 0
 ; SI-NEXT:  ; %bb.3: ; %Flow
-; SI-NEXT:    s_or_saveexec_b64 s[2:3], s[4:5]
-; SI-NEXT:    ; implicit-def: $vgpr3
-; SI-NEXT:    ; implicit-def: $vgpr4
-; SI-NEXT:    ; implicit-def: $vgpr5
-; SI-NEXT:    ; implicit-def: $vgpr6
-; SI-NEXT:    s_xor_b64 exec, exec, s[2:3]
+; SI-NEXT:    s_or_saveexec_b64 s[0:1], s[2:3]
+; SI-NEXT:    ; implicit-def: $vgpr2
+; SI-NEXT:    s_xor_b64 exec, exec, s[0:1]
 ; SI-NEXT:  ; %bb.4: ; %live
-; SI-NEXT:    s_mov_b32 m0, s0
-; SI-NEXT:    v_interp_p1_f32 v4, v0, attr0.x
-; SI-NEXT:    v_interp_p1_f32 v0, v0, attr0.y
-; SI-NEXT:    v_mul_f32_e32 v3, v4, v2
-; SI-NEXT:    v_interp_p2_f32 v4, v1, attr0.x
-; SI-NEXT:    v_mul_f32_e32 v5, v0, v2
-; SI-NEXT:    v_interp_p2_f32 v0, v1, attr0.y
-; SI-NEXT:    v_mul_f32_e32 v4, v4, v2
-; SI-NEXT:    v_mul_f32_e32 v6, v0, v2
+; SI-NEXT:    v_mul_f32_e32 v2, v0, v1
 ; SI-NEXT:  ; %bb.5: ; %export
-; SI-NEXT:    s_or_b64 exec, exec, s[2:3]
-; SI-NEXT:    v_cvt_pkrtz_f16_f32_e32 v0, v3, v4
-; SI-NEXT:    v_cvt_pkrtz_f16_f32_e32 v1, v5, v6
-; SI-NEXT:    exp mrt0 v0, v0, v1, v1 done compr vm
+; SI-NEXT:    s_or_b64 exec, exec, s[0:1]
+; SI-NEXT:    exp mrt0 v2, v2, v2, v2 done compr vm
 ; SI-NEXT:    s_endpgm
 ; SI-NEXT:  BB14_6:
 ; SI-NEXT:    s_mov_b64 exec, 0
 ; SI-NEXT:    exp null off, off, off, off done vm
 ; SI-NEXT:    s_endpgm
 ;
-; GFX10-LABEL: cbranch_kill:
-; GFX10:       ; %bb.0: ; %.entry
-; GFX10-NEXT:    s_mov_b32 m0, s0
-; GFX10-NEXT:    s_mov_b32 s4, 0
-; GFX10-NEXT:    v_interp_p1_f32_e32 v2, v0, attr1.x
-; GFX10-NEXT:    s_mov_b64 s[2:3], exec
-; GFX10-NEXT:    s_mov_b32 s5, s4
-; GFX10-NEXT:    s_mov_b32 s6, s4
-; GFX10-NEXT:    s_mov_b32 s7, s4
-; GFX10-NEXT:    s_mov_b32 s8, s4
-; GFX10-NEXT:    s_mov_b32 s9, s4
-; GFX10-NEXT:    s_mov_b32 s10, s4
-; GFX10-NEXT:    s_mov_b32 s11, s4
-; GFX10-NEXT:    image_sample_lz v2, [v2, v2, v2], s[4:11], s[0:3] dmask:0x1 dim:SQ_RSRC_IMG_2D_ARRAY
-; GFX10-NEXT:    s_waitcnt vmcnt(0)
-; GFX10-NEXT:    v_cmp_ge_f32_e32 vcc, 0, v2
-; GFX10-NEXT:    s_and_saveexec_b64 s[4:5], vcc
-; GFX10-NEXT:    s_xor_b64 s[4:5], exec, s[4:5]
-; GFX10-NEXT:  ; %bb.1: ; %kill
-; GFX10-NEXT:    s_andn2_b64 s[2:3], s[2:3], exec
-; GFX10-NEXT:    s_cbranch_scc0 BB14_6
-; GFX10-NEXT:  ; %bb.2: ; %kill
-; GFX10-NEXT:    s_mov_b64 exec, 0
-; GFX10-NEXT:  ; %bb.3: ; %Flow
-; GFX10-NEXT:    s_or_saveexec_b64 s[2:3], s[4:5]
-; GFX10-NEXT:    ; implicit-def: $vgpr3
-; GFX10-NEXT:    ; implicit-def: $vgpr5
-; GFX10-NEXT:    ; implicit-def: $vgpr4
-; GFX10-NEXT:    ; implicit-def: $vgpr6
-; GFX10-NEXT:    s_xor_b64 exec, exec, s[2:3]
-; GFX10-NEXT:  ; %bb.4: ; %live
-; GFX10-NEXT:    s_mov_b32 m0, s0
-; GFX10-NEXT:    v_interp_p1_f32_e32 v3, v0, attr0.x
-; GFX10-NEXT:    v_interp_p1_f32_e32 v0, v0, attr0.y
-; GFX10-NEXT:    v_mov_b32_e32 v7, v3
-; GFX10-NEXT:    v_mov_b32_e32 v11, v0
-; GFX10-NEXT:    v_mul_f32_e32 v3, v3, v2
-; GFX10-NEXT:    v_mul_f32_e32 v4, v0, v2
-; GFX10-NEXT:    v_interp_p2_f32_e32 v7, v1, attr0.x
-; GFX10-NEXT:    v_interp_p2_f32_e32 v11, v1, attr0.y
-; GFX10-NEXT:    v_mul_f32_e32 v5, v7, v2
-; GFX10-NEXT:    v_mul_f32_e32 v6, v11, v2
-; GFX10-NEXT:  ; %bb.5: ; %export
-; GFX10-NEXT:    s_or_b64 exec, exec, s[2:3]
-; GFX10-NEXT:    v_cvt_pkrtz_f16_f32_e32 v0, v3, v5
-; GFX10-NEXT:    v_cvt_pkrtz_f16_f32_e32 v1, v4, v6
-; GFX10-NEXT:    exp mrt0 v0, v0, v1, v1 done compr vm
-; GFX10-NEXT:    s_endpgm
-; GFX10-NEXT:  BB14_6:
-; GFX10-NEXT:    s_mov_b64 exec, 0
-; GFX10-NEXT:    exp null off, off, off, off done vm
-; GFX10-NEXT:    s_endpgm
+; GFX10-WAVE64-LABEL: cbranch_kill:
+; GFX10-WAVE64:       ; %bb.0: ; %.entry
+; GFX10-WAVE64-NEXT:    s_mov_b32 s4, 0
+; GFX10-WAVE64-NEXT:    s_mov_b64 s[0:1], exec
+; GFX10-WAVE64-NEXT:    s_mov_b32 s5, s4
+; GFX10-WAVE64-NEXT:    s_mov_b32 s6, s4
+; GFX10-WAVE64-NEXT:    s_mov_b32 s7, s4
+; GFX10-WAVE64-NEXT:    s_mov_b32 s8, s4
+; GFX10-WAVE64-NEXT:    s_mov_b32 s9, s4
+; GFX10-WAVE64-NEXT:    s_mov_b32 s10, s4
+; GFX10-WAVE64-NEXT:    s_mov_b32 s11, s4
+; GFX10-WAVE64-NEXT:    image_sample_lz v1, [v1, v1, v1], s[4:11], s[0:3] dmask:0x1 dim:SQ_RSRC_IMG_2D_ARRAY
+; GFX10-WAVE64-NEXT:    s_waitcnt vmcnt(0)
+; GFX10-WAVE64-NEXT:    v_cmp_ge_f32_e32 vcc, 0, v1
+; GFX10-WAVE64-NEXT:    s_and_saveexec_b64 s[2:3], vcc
+; GFX10-WAVE64-NEXT:    s_xor_b64 s[2:3], exec, s[2:3]
+; GFX10-WAVE64-NEXT:  ; %bb.1: ; %kill
+; GFX10-WAVE64-NEXT:    s_andn2_b64 s[0:1], s[0:1], exec
+; GFX10-WAVE64-NEXT:    s_cbranch_scc0 BB14_6
+; GFX10-WAVE64-NEXT:  ; %bb.2: ; %kill
+; GFX10-WAVE64-NEXT:    s_mov_b64 exec, 0
+; GFX10-WAVE64-NEXT:  ; %bb.3: ; %Flow
+; GFX10-WAVE64-NEXT:    s_or_saveexec_b64 s[0:1], s[2:3]
+; GFX10-WAVE64-NEXT:    ; implicit-def: $vgpr2
+; GFX10-WAVE64-NEXT:    s_xor_b64 exec, exec, s[0:1]
+; GFX10-WAVE64-NEXT:  ; %bb.4: ; %live
+; GFX10-WAVE64-NEXT:    v_mul_f32_e32 v2, v0, v1
+; GFX10-WAVE64-NEXT:  ; %bb.5: ; %export
+; GFX10-WAVE64-NEXT:    s_or_b64 exec, exec, s[0:1]
+; GFX10-WAVE64-NEXT:    exp mrt0 v2, v2, v2, v2 done compr vm
+; GFX10-WAVE64-NEXT:    s_endpgm
+; GFX10-WAVE64-NEXT:  BB14_6:
+; GFX10-WAVE64-NEXT:    s_mov_b64 exec, 0
+; GFX10-WAVE64-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: cbranch_kill:
+; GFX10-WAVE32:       ; %bb.0: ; %.entry
+; GFX10-WAVE32-NEXT:    s_mov_b32 s4, 0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s0, exec_lo
+; GFX10-WAVE32-NEXT:    s_mov_b32 s5, s4
+; GFX10-WAVE32-NEXT:    s_mov_b32 s6, s4
+; GFX10-WAVE32-NEXT:    s_mov_b32 s7, s4
+; GFX10-WAVE32-NEXT:    s_mov_b32 s8, s4
+; GFX10-WAVE32-NEXT:    s_mov_b32 s9, s4
+; GFX10-WAVE32-NEXT:    s_mov_b32 s10, s4
+; GFX10-WAVE32-NEXT:    s_mov_b32 s11, s4
+; GFX10-WAVE32-NEXT:    image_sample_lz v1, [v1, v1, v1], s[4:11], s[0:3] dmask:0x1 dim:SQ_RSRC_IMG_2D_ARRAY
+; GFX10-WAVE32-NEXT:    s_waitcnt vmcnt(0)
+; GFX10-WAVE32-NEXT:    v_cmp_ge_f32_e32 vcc_lo, 0, v1
+; GFX10-WAVE32-NEXT:    s_and_saveexec_b32 s1, vcc_lo
+; GFX10-WAVE32-NEXT:    s_xor_b32 s1, exec_lo, s1
+; GFX10-WAVE32-NEXT:  ; %bb.1: ; %kill
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s0, s0, exec_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB14_6
+; GFX10-WAVE32-NEXT:  ; %bb.2: ; %kill
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:  ; %bb.3: ; %Flow
+; GFX10-WAVE32-NEXT:    s_or_saveexec_b32 s0, s1
+; GFX10-WAVE32-NEXT:    ; implicit-def: $vgpr2
+; GFX10-WAVE32-NEXT:    s_xor_b32 exec_lo, exec_lo, s0
+; GFX10-WAVE32-NEXT:  ; %bb.4: ; %live
+; GFX10-WAVE32-NEXT:    v_mul_f32_e32 v2, v0, v1
+; GFX10-WAVE32-NEXT:  ; %bb.5: ; %export
+; GFX10-WAVE32-NEXT:    s_or_b32 exec_lo, exec_lo, s0
+; GFX10-WAVE32-NEXT:    exp mrt0 v2, v2, v2, v2 done compr vm
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB14_6:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
 .entry:
-  %val0 = extractelement <2 x float> %1, i32 0
-  %val1 = extractelement <2 x float> %1, i32 1
-  %p0 = call float @llvm.amdgcn.interp.p1(float %val0, i32 immarg 0, i32 immarg 1, i32 %0) #2
-  %sample = call float @llvm.amdgcn.image.sample.l.2darray.f32.f32(i32 1, float %p0, float %p0, float %p0, float 0.000000e+00, <8 x i32> undef, <4 x i32> undef, i1 false, i32 0, i32 0)
+  %sample = call float @llvm.amdgcn.image.sample.l.2darray.f32.f32(i32 1, float %val1, float %val1, float %val1, float 0.000000e+00, <8 x i32> undef, <4 x i32> undef, i1 false, i32 0, i32 0)
   %cond0 = fcmp ugt float %sample, 0.000000e+00
   br i1 %cond0, label %live, label %kill
 
@@ -914,27 +1255,17 @@
   br label %export
 
 live:
-  %i0 = call float @llvm.amdgcn.interp.p1(float %val0, i32 immarg 0, i32 immarg 0, i32 %0) #2
-  %i1 = call float @llvm.amdgcn.interp.p2(float %i0, float %val1, i32 immarg 0, i32 immarg 0, i32 %0) #2
-  %i2 = call float @llvm.amdgcn.interp.p1(float %val0, i32 immarg 1, i32 immarg 0, i32 %0) #2
-  %i3 = call float @llvm.amdgcn.interp.p2(float %i2, float %val1, i32 immarg 1, i32 immarg 0, i32 %0) #2
-  %scale.i0 = fmul reassoc nnan nsz arcp contract float %i0, %sample
-  %scale.i1 = fmul reassoc nnan nsz arcp contract float %i1, %sample
-  %scale.i2 = fmul reassoc nnan nsz arcp contract float %i2, %sample
-  %scale.i3 = fmul reassoc nnan nsz arcp contract float %i3, %sample
+  %scale = fmul reassoc nnan nsz arcp contract float %val0, %sample
   br label %export
 
 export:
-  %proxy.0.0 = phi float [ undef, %kill ], [ %scale.i0, %live ]
-  %proxy.0.1 = phi float [ undef, %kill ], [ %scale.i1, %live ]
-  %proxy.0.2 = phi float [ undef, %kill ], [ %scale.i2, %live ]
-  %proxy.0.3 = phi float [ undef, %kill ], [ %scale.i3, %live ]
-  %out.0 = call <2 x half> @llvm.amdgcn.cvt.pkrtz(float %proxy.0.0, float %proxy.0.1) #2
-  %out.1 = call <2 x half> @llvm.amdgcn.cvt.pkrtz(float %proxy.0.2, float %proxy.0.3) #2
-  call void @llvm.amdgcn.exp.compr.v2f16(i32 immarg 0, i32 immarg 15, <2 x half> %out.0, <2 x half> %out.1, i1 immarg true, i1 immarg true) #3
+  %proxy = phi float [ undef, %kill ], [ %scale, %live ]
+  %proxyh = bitcast float %proxy to <2 x half>
+  call void @llvm.amdgcn.exp.compr.v2f16(i32 immarg 0, i32 immarg 15, <2 x half> %proxyh, <2 x half> %proxyh, i1 immarg true, i1 immarg true) #3
   ret void
 }
 
+
 define amdgpu_ps void @complex_loop(i32 inreg %cmpa, i32 %cmpb, i32 %cmpc) {
 ; SI-LABEL: complex_loop:
 ; SI:       ; %bb.0: ; %.entry
@@ -979,48 +1310,91 @@
 ; SI-NEXT:    exp null off, off, off, off done vm
 ; SI-NEXT:    s_endpgm
 ;
-; GFX10-LABEL: complex_loop:
-; GFX10:       ; %bb.0: ; %.entry
-; GFX10-NEXT:    v_mov_b32_e32 v2, -1
-; GFX10-NEXT:    s_cmp_lt_i32 s0, 1
-; GFX10-NEXT:    s_cbranch_scc1 BB15_7
-; GFX10-NEXT:  ; %bb.1: ; %.lr.ph
-; GFX10-NEXT:    s_mov_b64 s[2:3], exec
-; GFX10-NEXT:    s_mov_b32 s4, 0
-; GFX10-NEXT:    s_mov_b64 s[0:1], 0
-; GFX10-NEXT:    s_branch BB15_3
-; GFX10-NEXT:  BB15_2: ; %latch
-; GFX10-NEXT:    ; in Loop: Header=BB15_3 Depth=1
-; GFX10-NEXT:    s_or_b64 exec, exec, s[6:7]
-; GFX10-NEXT:    s_add_i32 s4, s4, 1
-; GFX10-NEXT:    v_cmp_ge_i32_e32 vcc, s4, v1
-; GFX10-NEXT:    v_mov_b32_e32 v2, s4
-; GFX10-NEXT:    s_or_b64 s[0:1], vcc, s[0:1]
-; GFX10-NEXT:    s_andn2_b64 exec, exec, s[0:1]
-; GFX10-NEXT:    s_cbranch_execz BB15_6
-; GFX10-NEXT:  BB15_3: ; %hdr
-; GFX10-NEXT:    ; =>This Inner Loop Header: Depth=1
-; GFX10-NEXT:    v_cmp_gt_u32_e32 vcc, s4, v0
-; GFX10-NEXT:    s_and_saveexec_b64 s[6:7], vcc
-; GFX10-NEXT:    s_xor_b64 s[6:7], exec, s[6:7]
-; GFX10-NEXT:    s_cbranch_execz BB15_2
-; GFX10-NEXT:  ; %bb.4: ; %kill
-; GFX10-NEXT:    ; in Loop: Header=BB15_3 Depth=1
-; GFX10-NEXT:    s_andn2_b64 s[2:3], s[2:3], exec
-; GFX10-NEXT:    s_cbranch_scc0 BB15_8
-; GFX10-NEXT:  ; %bb.5: ; %kill
-; GFX10-NEXT:    ; in Loop: Header=BB15_3 Depth=1
-; GFX10-NEXT:    s_mov_b64 exec, 0
-; GFX10-NEXT:    s_branch BB15_2
-; GFX10-NEXT:  BB15_6: ; %Flow
-; GFX10-NEXT:    s_or_b64 exec, exec, s[0:1]
-; GFX10-NEXT:  BB15_7: ; %._crit_edge
-; GFX10-NEXT:    exp mrt0 v2, v2, v0, v0 done compr vm
-; GFX10-NEXT:    s_endpgm
-; GFX10-NEXT:  BB15_8:
-; GFX10-NEXT:    s_mov_b64 exec, 0
-; GFX10-NEXT:    exp null off, off, off, off done vm
-; GFX10-NEXT:    s_endpgm
+; GFX10-WAVE64-LABEL: complex_loop:
+; GFX10-WAVE64:       ; %bb.0: ; %.entry
+; GFX10-WAVE64-NEXT:    v_mov_b32_e32 v2, -1
+; GFX10-WAVE64-NEXT:    s_cmp_lt_i32 s0, 1
+; GFX10-WAVE64-NEXT:    s_cbranch_scc1 BB15_7
+; GFX10-WAVE64-NEXT:  ; %bb.1: ; %.lr.ph
+; GFX10-WAVE64-NEXT:    s_mov_b64 s[2:3], exec
+; GFX10-WAVE64-NEXT:    s_mov_b32 s4, 0
+; GFX10-WAVE64-NEXT:    s_mov_b64 s[0:1], 0
+; GFX10-WAVE64-NEXT:    s_branch BB15_3
+; GFX10-WAVE64-NEXT:  BB15_2: ; %latch
+; GFX10-WAVE64-NEXT:    ; in Loop: Header=BB15_3 Depth=1
+; GFX10-WAVE64-NEXT:    s_or_b64 exec, exec, s[6:7]
+; GFX10-WAVE64-NEXT:    s_add_i32 s4, s4, 1
+; GFX10-WAVE64-NEXT:    v_cmp_ge_i32_e32 vcc, s4, v1
+; GFX10-WAVE64-NEXT:    v_mov_b32_e32 v2, s4
+; GFX10-WAVE64-NEXT:    s_or_b64 s[0:1], vcc, s[0:1]
+; GFX10-WAVE64-NEXT:    s_andn2_b64 exec, exec, s[0:1]
+; GFX10-WAVE64-NEXT:    s_cbranch_execz BB15_6
+; GFX10-WAVE64-NEXT:  BB15_3: ; %hdr
+; GFX10-WAVE64-NEXT:    ; =>This Inner Loop Header: Depth=1
+; GFX10-WAVE64-NEXT:    v_cmp_gt_u32_e32 vcc, s4, v0
+; GFX10-WAVE64-NEXT:    s_and_saveexec_b64 s[6:7], vcc
+; GFX10-WAVE64-NEXT:    s_xor_b64 s[6:7], exec, s[6:7]
+; GFX10-WAVE64-NEXT:    s_cbranch_execz BB15_2
+; GFX10-WAVE64-NEXT:  ; %bb.4: ; %kill
+; GFX10-WAVE64-NEXT:    ; in Loop: Header=BB15_3 Depth=1
+; GFX10-WAVE64-NEXT:    s_andn2_b64 s[2:3], s[2:3], exec
+; GFX10-WAVE64-NEXT:    s_cbranch_scc0 BB15_8
+; GFX10-WAVE64-NEXT:  ; %bb.5: ; %kill
+; GFX10-WAVE64-NEXT:    ; in Loop: Header=BB15_3 Depth=1
+; GFX10-WAVE64-NEXT:    s_mov_b64 exec, 0
+; GFX10-WAVE64-NEXT:    s_branch BB15_2
+; GFX10-WAVE64-NEXT:  BB15_6: ; %Flow
+; GFX10-WAVE64-NEXT:    s_or_b64 exec, exec, s[0:1]
+; GFX10-WAVE64-NEXT:  BB15_7: ; %._crit_edge
+; GFX10-WAVE64-NEXT:    exp mrt0 v2, v2, v0, v0 done compr vm
+; GFX10-WAVE64-NEXT:    s_endpgm
+; GFX10-WAVE64-NEXT:  BB15_8:
+; GFX10-WAVE64-NEXT:    s_mov_b64 exec, 0
+; GFX10-WAVE64-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE64-NEXT:    s_endpgm
+;
+; GFX10-WAVE32-LABEL: complex_loop:
+; GFX10-WAVE32:       ; %bb.0: ; %.entry
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v2, -1
+; GFX10-WAVE32-NEXT:    s_cmp_lt_i32 s0, 1
+; GFX10-WAVE32-NEXT:    s_cbranch_scc1 BB15_7
+; GFX10-WAVE32-NEXT:  ; %bb.1: ; %.lr.ph
+; GFX10-WAVE32-NEXT:    s_mov_b32 s1, exec_lo
+; GFX10-WAVE32-NEXT:    s_mov_b32 s0, 0
+; GFX10-WAVE32-NEXT:    s_mov_b32 s2, 0
+; GFX10-WAVE32-NEXT:    s_branch BB15_3
+; GFX10-WAVE32-NEXT:  BB15_2: ; %latch
+; GFX10-WAVE32-NEXT:    ; in Loop: Header=BB15_3 Depth=1
+; GFX10-WAVE32-NEXT:    s_or_b32 exec_lo, exec_lo, s3
+; GFX10-WAVE32-NEXT:    s_add_i32 s2, s2, 1
+; GFX10-WAVE32-NEXT:    v_cmp_ge_i32_e32 vcc_lo, s2, v1
+; GFX10-WAVE32-NEXT:    v_mov_b32_e32 v2, s2
+; GFX10-WAVE32-NEXT:    s_or_b32 s0, vcc_lo, s0
+; GFX10-WAVE32-NEXT:    s_andn2_b32 exec_lo, exec_lo, s0
+; GFX10-WAVE32-NEXT:    s_cbranch_execz BB15_6
+; GFX10-WAVE32-NEXT:  BB15_3: ; %hdr
+; GFX10-WAVE32-NEXT:    ; =>This Inner Loop Header: Depth=1
+; GFX10-WAVE32-NEXT:    v_cmp_gt_u32_e32 vcc_lo, s2, v0
+; GFX10-WAVE32-NEXT:    s_and_saveexec_b32 s3, vcc_lo
+; GFX10-WAVE32-NEXT:    s_xor_b32 s3, exec_lo, s3
+; GFX10-WAVE32-NEXT:    s_cbranch_execz BB15_2
+; GFX10-WAVE32-NEXT:  ; %bb.4: ; %kill
+; GFX10-WAVE32-NEXT:    ; in Loop: Header=BB15_3 Depth=1
+; GFX10-WAVE32-NEXT:    s_andn2_b32 s1, s1, exec_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_scc0 BB15_8
+; GFX10-WAVE32-NEXT:  ; %bb.5: ; %kill
+; GFX10-WAVE32-NEXT:    ; in Loop: Header=BB15_3 Depth=1
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    s_branch BB15_2
+; GFX10-WAVE32-NEXT:  BB15_6: ; %Flow
+; GFX10-WAVE32-NEXT:    s_or_b32 exec_lo, exec_lo, s0
+; GFX10-WAVE32-NEXT:  BB15_7: ; %._crit_edge
+; GFX10-WAVE32-NEXT:    exp mrt0 v2, v2, v0, v0 done compr vm
+; GFX10-WAVE32-NEXT:    s_endpgm
+; GFX10-WAVE32-NEXT:  BB15_8:
+; GFX10-WAVE32-NEXT:    s_mov_b32 exec_lo, 0
+; GFX10-WAVE32-NEXT:    exp null off, off, off, off done vm
+; GFX10-WAVE32-NEXT:    s_endpgm
 .entry:
   %flaga = icmp sgt i32 %cmpa, 0
   br i1 %flaga, label %.lr.ph, label %._crit_edge
@@ -1062,18 +1436,31 @@
 ; SI-NEXT:    s_or_b64 exec, exec, s[4:5]
 ; SI-NEXT:    s_setpc_b64 s[30:31]
 ;
-; GFX10-LABEL: skip_mode_switch:
-; GFX10:       ; %bb.0: ; %entry
-; GFX10-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
-; GFX10-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX10-NEXT:    v_cmp_eq_u32_e32 vcc, 0, v0
-; GFX10-NEXT:    s_and_saveexec_b64 s[4:5], vcc
-; GFX10-NEXT:    s_cbranch_execz BB16_2
-; GFX10-NEXT:  ; %bb.1: ; %bb.0
-; GFX10-NEXT:    s_setreg_imm32_b32 hwreg(HW_REG_MODE, 0, 2), 3
-; GFX10-NEXT:  BB16_2: ; %bb.1
-; GFX10-NEXT:    s_or_b64 exec, exec, s[4:5]
-; GFX10-NEXT:    s_setpc_b64 s[30:31]
+; GFX10-WAVE64-LABEL: skip_mode_switch:
+; GFX10-WAVE64:       ; %bb.0: ; %entry
+; GFX10-WAVE64-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
+; GFX10-WAVE64-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE64-NEXT:    v_cmp_eq_u32_e32 vcc, 0, v0
+; GFX10-WAVE64-NEXT:    s_and_saveexec_b64 s[4:5], vcc
+; GFX10-WAVE64-NEXT:    s_cbranch_execz BB16_2
+; GFX10-WAVE64-NEXT:  ; %bb.1: ; %bb.0
+; GFX10-WAVE64-NEXT:    s_setreg_imm32_b32 hwreg(HW_REG_MODE, 0, 2), 3
+; GFX10-WAVE64-NEXT:  BB16_2: ; %bb.1
+; GFX10-WAVE64-NEXT:    s_or_b64 exec, exec, s[4:5]
+; GFX10-WAVE64-NEXT:    s_setpc_b64 s[30:31]
+;
+; GFX10-WAVE32-LABEL: skip_mode_switch:
+; GFX10-WAVE32:       ; %bb.0: ; %entry
+; GFX10-WAVE32-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
+; GFX10-WAVE32-NEXT:    s_waitcnt_vscnt null, 0x0
+; GFX10-WAVE32-NEXT:    v_cmp_eq_u32_e32 vcc_lo, 0, v0
+; GFX10-WAVE32-NEXT:    s_and_saveexec_b32 s4, vcc_lo
+; GFX10-WAVE32-NEXT:    s_cbranch_execz BB16_2
+; GFX10-WAVE32-NEXT:  ; %bb.1: ; %bb.0
+; GFX10-WAVE32-NEXT:    s_setreg_imm32_b32 hwreg(HW_REG_MODE, 0, 2), 3
+; GFX10-WAVE32-NEXT:  BB16_2: ; %bb.1
+; GFX10-WAVE32-NEXT:    s_or_b32 exec_lo, exec_lo, s4
+; GFX10-WAVE32-NEXT:    s_setpc_b64 s[30:31]
 entry:
   %cmp = icmp eq i32 %arg, 0
   br i1 %cmp, label %bb.0, label %bb.1
@@ -1086,10 +1473,7 @@
   ret void
 }
 
-declare float @llvm.amdgcn.interp.p1(float, i32 immarg, i32 immarg, i32) #2
-declare float @llvm.amdgcn.interp.p2(float, float, i32 immarg, i32 immarg, i32) #2
 declare void @llvm.amdgcn.exp.compr.v2f16(i32 immarg, i32 immarg, <2 x half>, <2 x half>, i1 immarg, i1 immarg) #3
-declare <2 x half> @llvm.amdgcn.cvt.pkrtz(float, float) #2
 declare float @llvm.amdgcn.image.sample.l.2darray.f32.f32(i32 immarg, float, float, float, float, <8 x i32>, <4 x i32>, i1 immarg, i32 immarg, i32 immarg) #1
 declare <4 x float> @llvm.amdgcn.image.sample.c.1d.v4f32.f32(i32, float, float, <8 x i32>, <4 x i32>, i1, i32, i32) #1
 declare void @llvm.amdgcn.kill(i1) #0