[llvm] 34dc4f2 - Revert rG939291041bb35b8088e3b61be2b8b3bc950f64a7 "[AMDGPU] Regenerate wave32.ll test checks"

Simon Pilgrim via llvm-commits llvm-commits at lists.llvm.org
Sun Jul 25 07:59:41 PDT 2021


Author: Simon Pilgrim
Date: 2021-07-25T15:59:26+01:00
New Revision: 34dc4f24f2d38b18cccbc2dc0aaa7cb44cd54313

URL: https://github.com/llvm/llvm-project/commit/34dc4f24f2d38b18cccbc2dc0aaa7cb44cd54313
DIFF: https://github.com/llvm/llvm-project/commit/34dc4f24f2d38b18cccbc2dc0aaa7cb44cd54313.diff

LOG: Revert rG939291041bb35b8088e3b61be2b8b3bc950f64a7 "[AMDGPU] Regenerate wave32.ll test checks"

This still breaks buildbots

Added: 
    

Modified: 
    llvm/test/CodeGen/AMDGPU/wave32.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/CodeGen/AMDGPU/wave32.ll b/llvm/test/CodeGen/AMDGPU/wave32.ll
index 1591f2a2b607..6379944daa2e 100644
--- a/llvm/test/CodeGen/AMDGPU/wave32.ll
+++ b/llvm/test/CodeGen/AMDGPU/wave32.ll
@@ -1,34 +1,15 @@
-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
 ; RUN: llc -march=amdgcn -mcpu=gfx1010 -mattr=+wavefrontsize32,-wavefrontsize64 -verify-machineinstrs -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefixes=GCN,GFX1032 %s
 ; RUN: llc -march=amdgcn -mcpu=gfx1010 -mattr=-wavefrontsize32,+wavefrontsize64 -verify-machineinstrs -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefixes=GCN,GFX1064 %s
 ; RUN: llc -march=amdgcn -mcpu=gfx1010 -mattr=+wavefrontsize32,-wavefrontsize64 -amdgpu-early-ifcvt=1 -verify-machineinstrs -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefixes=GCN,GFX1032 %s
 ; RUN: llc -march=amdgcn -mcpu=gfx1010 -mattr=-wavefrontsize32,+wavefrontsize64 -amdgpu-early-ifcvt=1 -verify-machineinstrs -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefixes=GCN,GFX1064 %s
 ; RUN: llc -march=amdgcn -mcpu=gfx1010 -verify-machineinstrs -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck -check-prefixes=GCN,GFX1032,GFX10DEFWAVE %s
 
+; GCN-LABEL: {{^}}test_vopc_i32:
+; GFX1032: v_cmp_lt_i32_e32 vcc_lo, 0, v{{[0-9]+}}
+; GFX1032: v_cndmask_b32_e64 v{{[0-9]+}}, 2, 1, vcc_lo
+; GFX1064: v_cmp_lt_i32_e32 vcc, 0, v{{[0-9]+}}
+; GFX1064: v_cndmask_b32_e64 v{{[0-9]+}}, 2, 1, vcc{{$}}
 define amdgpu_kernel void @test_vopc_i32(i32 addrspace(1)* %arg) {
-; GFX1032-LABEL: test_vopc_i32:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dword v1, v0, s[0:1]
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_cmp_lt_i32_e32 vcc_lo, 0, v1
-; GFX1032-NEXT:    v_cndmask_b32_e64 v1, 2, 1, vcc_lo
-; GFX1032-NEXT:    global_store_dword v0, v1, s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_vopc_i32:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dword v1, v0, s[0:1]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_cmp_lt_i32_e32 vcc, 0, v1
-; GFX1064-NEXT:    v_cndmask_b32_e64 v1, 2, 1, vcc
-; GFX1064-NEXT:    global_store_dword v0, v1, s[0:1]
-; GFX1064-NEXT:    s_endpgm
   %lid = tail call i32 @llvm.amdgcn.workitem.id.x()
   %gep = getelementptr inbounds i32, i32 addrspace(1)* %arg, i32 %lid
   %load = load i32, i32 addrspace(1)* %gep, align 4
@@ -38,30 +19,12 @@ define amdgpu_kernel void @test_vopc_i32(i32 addrspace(1)* %arg) {
   ret void
 }
 
+; GCN-LABEL: {{^}}test_vopc_f32:
+; GFX1032: v_cmp_nge_f32_e32 vcc_lo, 0, v{{[0-9]+}}
+; GFX1032: v_cndmask_b32_e64 v{{[0-9]+}}, 2.0, 1.0, vcc_lo
+; GFX1064: v_cmp_nge_f32_e32 vcc, 0, v{{[0-9]+}}
+; GFX1064: v_cndmask_b32_e64 v{{[0-9]+}}, 2.0, 1.0, vcc{{$}}
 define amdgpu_kernel void @test_vopc_f32(float addrspace(1)* %arg) {
-; GFX1032-LABEL: test_vopc_f32:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dword v1, v0, s[0:1]
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_cmp_nge_f32_e32 vcc_lo, 0, v1
-; GFX1032-NEXT:    v_cndmask_b32_e64 v1, 2.0, 1.0, vcc_lo
-; GFX1032-NEXT:    global_store_dword v0, v1, s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_vopc_f32:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dword v1, v0, s[0:1]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_cmp_nge_f32_e32 vcc, 0, v1
-; GFX1064-NEXT:    v_cndmask_b32_e64 v1, 2.0, 1.0, vcc
-; GFX1064-NEXT:    global_store_dword v0, v1, s[0:1]
-; GFX1064-NEXT:    s_endpgm
   %lid = tail call i32 @llvm.amdgcn.workitem.id.x()
   %gep = getelementptr inbounds float, float addrspace(1)* %arg, i32 %lid
   %load = load float, float addrspace(1)* %gep, align 4
@@ -71,59 +34,21 @@ define amdgpu_kernel void @test_vopc_f32(float addrspace(1)* %arg) {
   ret void
 }
 
+; GCN-LABEL: {{^}}test_vopc_vcmp:
+; GFX1032: v_cmp_nle_f32_e32 vcc_lo, 0, v{{[0-9]+}}
+; GFX1064: v_cmp_nle_f32_e32 vcc, 0, v{{[0-9]+}}
 define amdgpu_ps void @test_vopc_vcmp(float %x) {
-; GFX1032-LABEL: test_vopc_vcmp:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    v_cmp_nle_f32_e32 vcc_lo, 0, v0
-; GFX1032-NEXT:    s_andn2_b32 exec_lo, exec_lo, vcc_lo
-; GFX1032-NEXT:    s_cbranch_scc0 BB2_1
-; GFX1032-NEXT:    s_endpgm
-; GFX1032-NEXT:  BB2_1:
-; GFX1032-NEXT:    s_mov_b32 exec_lo, 0
-; GFX1032-NEXT:    exp null off, off, off, off done vm
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_vopc_vcmp:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    v_cmp_nle_f32_e32 vcc, 0, v0
-; GFX1064-NEXT:    s_andn2_b64 exec, exec, vcc
-; GFX1064-NEXT:    s_cbranch_scc0 BB2_1
-; GFX1064-NEXT:    s_endpgm
-; GFX1064-NEXT:  BB2_1:
-; GFX1064-NEXT:    s_mov_b64 exec, 0
-; GFX1064-NEXT:    exp null off, off, off, off done vm
-; GFX1064-NEXT:    s_endpgm
   %cmp = fcmp oge float %x, 0.0
   call void @llvm.amdgcn.kill(i1 %cmp)
   ret void
 }
 
+; GCN-LABEL: {{^}}test_vopc_2xf16:
+; GFX1032: v_cmp_le_f16_sdwa [[SC:vcc_lo|s[0-9]+]], {{[vs][0-9]+}}, v{{[0-9]+}} src0_sel:WORD_1 src1_sel:DWORD
+; GFX1032: v_cndmask_b32_e32 v{{[0-9]+}}, 0x3c003c00, v{{[0-9]+}}, [[SC]]
+; GFX1064: v_cmp_le_f16_sdwa [[SC:vcc|s\[[0-9:]+\]]], {{[vs][0-9]+}}, v{{[0-9]+}} src0_sel:WORD_1 src1_sel:DWORD
+; GFX1064: v_cndmask_b32_e32 v{{[0-9]+}}, 0x3c003c00, v{{[0-9]+}}, [[SC]]
 define amdgpu_kernel void @test_vopc_2xf16(<2 x half> addrspace(1)* %arg) {
-; GFX1032-LABEL: test_vopc_2xf16:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1032-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dword v1, v0, s[0:1]
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_cmp_le_f16_sdwa vcc_lo, v1, v2 src0_sel:WORD_1 src1_sel:DWORD
-; GFX1032-NEXT:    v_cndmask_b32_e32 v1, 0x3c003c00, v1, vcc_lo
-; GFX1032-NEXT:    global_store_dword v0, v1, s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_vopc_2xf16:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1064-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dword v1, v0, s[0:1]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_cmp_le_f16_sdwa vcc, v1, v2 src0_sel:WORD_1 src1_sel:DWORD
-; GFX1064-NEXT:    v_cndmask_b32_e32 v1, 0x3c003c00, v1, vcc
-; GFX1064-NEXT:    global_store_dword v0, v1, s[0:1]
-; GFX1064-NEXT:    s_endpgm
   %lid = tail call i32 @llvm.amdgcn.workitem.id.x()
   %gep = getelementptr inbounds <2 x half>, <2 x half> addrspace(1)* %arg, i32 %lid
   %load = load <2 x half>, <2 x half> addrspace(1)* %gep, align 4
@@ -134,30 +59,12 @@ define amdgpu_kernel void @test_vopc_2xf16(<2 x half> addrspace(1)* %arg) {
   ret void
 }
 
+; GCN-LABEL: {{^}}test_vopc_class:
+; GFX1032: v_cmp_class_f32_e64 [[C:vcc_lo|s[0-9:]+]], s{{[0-9]+}}, 0x204
+; GFX1032: v_cndmask_b32_e64 v{{[0-9]+}}, 0, 1, [[C]]
+; GFX1064: v_cmp_class_f32_e64 [[C:vcc|s\[[0-9:]+\]]], s{{[0-9]+}}, 0x204
+; GFX1064: v_cndmask_b32_e64 v{{[0-9]+}}, 0, 1, [[C]]{{$}}
 define amdgpu_kernel void @test_vopc_class(i32 addrspace(1)* %out, float %x) #0 {
-; GFX1032-LABEL: test_vopc_class:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dword s4, s[0:1], 0x2c
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_cmp_class_f32_e64 s0, s4, 0x204
-; GFX1032-NEXT:    v_cndmask_b32_e64 v1, 0, 1, s0
-; GFX1032-NEXT:    global_store_dword v0, v1, s[2:3]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_vopc_class:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dword s4, s[0:1], 0x2c
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_cmp_class_f32_e64 s[0:1], s4, 0x204
-; GFX1064-NEXT:    v_cndmask_b32_e64 v1, 0, 1, s[0:1]
-; GFX1064-NEXT:    global_store_dword v0, v1, s[2:3]
-; GFX1064-NEXT:    s_endpgm
   %fabs = tail call float @llvm.fabs.f32(float %x)
   %cmp = fcmp oeq float %fabs, 0x7FF0000000000000
   %ext = zext i1 %cmp to i32
@@ -165,66 +72,29 @@ define amdgpu_kernel void @test_vopc_class(i32 addrspace(1)* %out, float %x) #0
   ret void
 }
 
+; GCN-LABEL: {{^}}test_vcmp_vcnd_f16:
+; GFX1032: v_cmp_neq_f16_e64 [[C:vcc_lo|s\[[0-9:]+\]]], 0x7c00, s{{[0-9]+}}
+; GFX1032: v_cndmask_b32_e32 v{{[0-9]+}}, 0x3c00, v{{[0-9]+}}, [[C]]
+
+; GFX1064: v_cmp_neq_f16_e64 [[C:vcc|s\[[0-9:]+\]]], 0x7c00, s{{[0-9]+}}
+; GFX1064: v_cndmask_b32_e32 v{{[0-9]+}}, 0x3c00, v{{[0-9]+}}, [[C]]{{$}}
 define amdgpu_kernel void @test_vcmp_vcnd_f16(half addrspace(1)* %out, half %x) #0 {
-; GFX1032-LABEL: test_vcmp_vcnd_f16:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dword s4, s[0:1], 0x2c
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_mov_b32_e32 v0, s4
-; GFX1032-NEXT:    v_cmp_neq_f16_e64 vcc_lo, 0x7c00, s4
-; GFX1032-NEXT:    v_cndmask_b32_e32 v0, 0x3c00, v0, vcc_lo
-; GFX1032-NEXT:    global_store_short v1, v0, s[2:3]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_vcmp_vcnd_f16:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dword s4, s[0:1], 0x2c
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_mov_b32_e32 v0, s4
-; GFX1064-NEXT:    v_cmp_neq_f16_e64 vcc, 0x7c00, s4
-; GFX1064-NEXT:    v_cndmask_b32_e32 v0, 0x3c00, v0, vcc
-; GFX1064-NEXT:    global_store_short v1, v0, s[2:3]
-; GFX1064-NEXT:    s_endpgm
   %cmp = fcmp oeq half %x, 0x7FF0000000000000
   %sel = select i1 %cmp, half 1.0, half %x
   store half %sel, half addrspace(1)* %out, align 2
   ret void
 }
 
+; GCN-LABEL: {{^}}test_vop3_cmp_f32_sop_and:
+; GFX1032: v_cmp_nge_f32_e32 vcc_lo, 0, v{{[0-9]+}}
+; GFX1032: v_cmp_nle_f32_e64 [[C2:s[0-9]+]], 1.0, v{{[0-9]+}}
+; GFX1032: s_and_b32 [[AND:s[0-9]+]], vcc_lo, [[C2]]
+; GFX1032: v_cndmask_b32_e64 v{{[0-9]+}}, 2.0, 1.0, [[AND]]
+; GFX1064: v_cmp_nge_f32_e32 vcc, 0, v{{[0-9]+}}
+; GFX1064: v_cmp_nle_f32_e64 [[C2:s\[[0-9:]+\]]], 1.0, v{{[0-9]+}}
+; GFX1064: s_and_b64 [[AND:s\[[0-9:]+\]]], vcc, [[C2]]
+; GFX1064: v_cndmask_b32_e64 v{{[0-9]+}}, 2.0, 1.0, [[AND]]
 define amdgpu_kernel void @test_vop3_cmp_f32_sop_and(float addrspace(1)* %arg) {
-; GFX1032-LABEL: test_vop3_cmp_f32_sop_and:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dword v1, v0, s[2:3]
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_cmp_nge_f32_e32 vcc_lo, 0, v1
-; GFX1032-NEXT:    v_cmp_nle_f32_e64 s0, 1.0, v1
-; GFX1032-NEXT:    s_and_b32 s0, vcc_lo, s0
-; GFX1032-NEXT:    v_cndmask_b32_e64 v1, 2.0, 1.0, s0
-; GFX1032-NEXT:    global_store_dword v0, v1, s[2:3]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_vop3_cmp_f32_sop_and:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dword v1, v0, s[2:3]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_cmp_nge_f32_e32 vcc, 0, v1
-; GFX1064-NEXT:    v_cmp_nle_f32_e64 s[0:1], 1.0, v1
-; GFX1064-NEXT:    s_and_b64 s[0:1], vcc, s[0:1]
-; GFX1064-NEXT:    v_cndmask_b32_e64 v1, 2.0, 1.0, s[0:1]
-; GFX1064-NEXT:    global_store_dword v0, v1, s[2:3]
-; GFX1064-NEXT:    s_endpgm
   %lid = tail call i32 @llvm.amdgcn.workitem.id.x()
   %gep = getelementptr inbounds float, float addrspace(1)* %arg, i32 %lid
   %load = load float, float addrspace(1)* %gep, align 4
@@ -236,34 +106,16 @@ define amdgpu_kernel void @test_vop3_cmp_f32_sop_and(float addrspace(1)* %arg) {
   ret void
 }
 
+; GCN-LABEL: {{^}}test_vop3_cmp_i32_sop_xor:
+; GFX1032: v_cmp_lt_i32_e32 vcc_lo, 0, v{{[0-9]+}}
+; GFX1032: v_cmp_gt_i32_e64 [[C2:s[0-9]+]], 1, v{{[0-9]+}}
+; GFX1032: s_xor_b32 [[AND:s[0-9]+]], vcc_lo, [[C2]]
+; GFX1032: v_cndmask_b32_e64 v{{[0-9]+}}, 2, 1, [[AND]]
+; GFX1064: v_cmp_lt_i32_e32 vcc, 0, v{{[0-9]+}}
+; GFX1064: v_cmp_gt_i32_e64 [[C2:s\[[0-9:]+\]]], 1, v{{[0-9]+}}
+; GFX1064: s_xor_b64 [[AND:s\[[0-9:]+\]]], vcc, [[C2]]
+; GFX1064: v_cndmask_b32_e64 v{{[0-9]+}}, 2, 1, [[AND]]
 define amdgpu_kernel void @test_vop3_cmp_i32_sop_xor(i32 addrspace(1)* %arg) {
-; GFX1032-LABEL: test_vop3_cmp_i32_sop_xor:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dword v1, v0, s[2:3]
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_cmp_lt_i32_e32 vcc_lo, 0, v1
-; GFX1032-NEXT:    v_cmp_gt_i32_e64 s0, 1, v1
-; GFX1032-NEXT:    s_xor_b32 s0, vcc_lo, s0
-; GFX1032-NEXT:    v_cndmask_b32_e64 v1, 2, 1, s0
-; GFX1032-NEXT:    global_store_dword v0, v1, s[2:3]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_vop3_cmp_i32_sop_xor:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dword v1, v0, s[2:3]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_cmp_lt_i32_e32 vcc, 0, v1
-; GFX1064-NEXT:    v_cmp_gt_i32_e64 s[0:1], 1, v1
-; GFX1064-NEXT:    s_xor_b64 s[0:1], vcc, s[0:1]
-; GFX1064-NEXT:    v_cndmask_b32_e64 v1, 2, 1, s[0:1]
-; GFX1064-NEXT:    global_store_dword v0, v1, s[2:3]
-; GFX1064-NEXT:    s_endpgm
   %lid = tail call i32 @llvm.amdgcn.workitem.id.x()
   %gep = getelementptr inbounds i32, i32 addrspace(1)* %arg, i32 %lid
   %load = load i32, i32 addrspace(1)* %gep, align 4
@@ -275,34 +127,16 @@ define amdgpu_kernel void @test_vop3_cmp_i32_sop_xor(i32 addrspace(1)* %arg) {
   ret void
 }
 
+; GCN-LABEL: {{^}}test_vop3_cmp_u32_sop_or:
+; GFX1032: v_cmp_lt_u32_e32 vcc_lo, 3, v{{[0-9]+}}
+; GFX1032: v_cmp_gt_u32_e64 [[C2:s[0-9]+]], 2, v{{[0-9]+}}
+; GFX1032: s_or_b32 [[AND:s[0-9]+]], vcc_lo, [[C2]]
+; GFX1032: v_cndmask_b32_e64 v{{[0-9]+}}, 2, 1, [[AND]]
+; GFX1064: v_cmp_lt_u32_e32 vcc, 3, v{{[0-9]+}}
+; GFX1064: v_cmp_gt_u32_e64 [[C2:s\[[0-9:]+\]]], 2, v{{[0-9]+}}
+; GFX1064: s_or_b64 [[AND:s\[[0-9:]+\]]], vcc, [[C2]]
+; GFX1064: v_cndmask_b32_e64 v{{[0-9]+}}, 2, 1, [[AND]]
 define amdgpu_kernel void @test_vop3_cmp_u32_sop_or(i32 addrspace(1)* %arg) {
-; GFX1032-LABEL: test_vop3_cmp_u32_sop_or:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dword v1, v0, s[2:3]
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_cmp_lt_u32_e32 vcc_lo, 3, v1
-; GFX1032-NEXT:    v_cmp_gt_u32_e64 s0, 2, v1
-; GFX1032-NEXT:    s_or_b32 s0, vcc_lo, s0
-; GFX1032-NEXT:    v_cndmask_b32_e64 v1, 2, 1, s0
-; GFX1032-NEXT:    global_store_dword v0, v1, s[2:3]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_vop3_cmp_u32_sop_or:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dword v1, v0, s[2:3]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_cmp_lt_u32_e32 vcc, 3, v1
-; GFX1064-NEXT:    v_cmp_gt_u32_e64 s[0:1], 2, v1
-; GFX1064-NEXT:    s_or_b64 s[0:1], vcc, s[0:1]
-; GFX1064-NEXT:    v_cndmask_b32_e64 v1, 2, 1, s[0:1]
-; GFX1064-NEXT:    global_store_dword v0, v1, s[2:3]
-; GFX1064-NEXT:    s_endpgm
   %lid = tail call i32 @llvm.amdgcn.workitem.id.x()
   %gep = getelementptr inbounds i32, i32 addrspace(1)* %arg, i32 %lid
   %load = load i32, i32 addrspace(1)* %gep, align 4
@@ -314,32 +148,11 @@ define amdgpu_kernel void @test_vop3_cmp_u32_sop_or(i32 addrspace(1)* %arg) {
   ret void
 }
 
+; GCN-LABEL: {{^}}test_mask_if:
+; GFX1032: s_and_saveexec_b32 s{{[0-9]+}}, vcc_lo
+; GFX1064: s_and_saveexec_b64 s[{{[0-9:]+}}], vcc{{$}}
+; GCN: s_cbranch_execz
 define amdgpu_kernel void @test_mask_if(i32 addrspace(1)* %arg) #0 {
-; GFX1032-LABEL: test_mask_if:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    v_cmp_lt_u32_e32 vcc_lo, 10, v0
-; GFX1032-NEXT:    s_and_saveexec_b32 s2, vcc_lo
-; GFX1032-NEXT:    s_cbranch_execz BB9_2
-; GFX1032-NEXT:  ; %bb.1: ; %if
-; GFX1032-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_store_dword v0, v0, s[0:1]
-; GFX1032-NEXT:  BB9_2: ; %endif
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_mask_if:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    v_cmp_lt_u32_e32 vcc, 10, v0
-; GFX1064-NEXT:    s_and_saveexec_b64 s[2:3], vcc
-; GFX1064-NEXT:    s_cbranch_execz BB9_2
-; GFX1064-NEXT:  ; %bb.1: ; %if
-; GFX1064-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_store_dword v0, v0, s[0:1]
-; GFX1064-NEXT:  BB9_2: ; %endif
-; GFX1064-NEXT:    s_endpgm
   %lid = tail call i32 @llvm.amdgcn.workitem.id.x()
   %cmp = icmp ugt i32 %lid, 10
   br i1 %cmp, label %if, label %endif
@@ -352,130 +165,31 @@ endif:
   ret void
 }
 
+; GCN-LABEL: {{^}}test_loop_with_if:
+; GFX1032: s_or_b32 s{{[0-9]+}}, vcc_lo, s{{[0-9]+}}
+; GFX1032: s_andn2_b32 exec_lo, exec_lo, s{{[0-9]+}}
+; GFX1064: s_or_b64 s[{{[0-9:]+}}], vcc, s[{{[0-9:]+}}]
+; GFX1064: s_andn2_b64 exec, exec, s[{{[0-9:]+}}]
+; GCN:     s_cbranch_execz
+; GCN:   BB{{.*}}:
+; GFX1032: s_and_saveexec_b32 s{{[0-9]+}}, vcc_lo
+; GFX1064: s_and_saveexec_b64 s[{{[0-9:]+}}], vcc{{$}}
+; GCN:     s_cbranch_execz
+; GCN:   ; %bb.{{[0-9]+}}:
+; GCN:   BB{{.*}}:
+; GFX1032: s_xor_b32 s{{[0-9]+}}, exec_lo, s{{[0-9]+}}
+; GFX1064: s_xor_b64 s[{{[0-9:]+}}], exec, s[{{[0-9:]+}}]
+; GCN:   ; %bb.{{[0-9]+}}:
+; GCN:   ; %bb.{{[0-9]+}}:
+; GFX1032: s_or_b32 exec_lo, exec_lo, s{{[0-9]+}}
+; GFX1032: s_and_saveexec_b32 s{{[0-9]+}}, s{{[0-9]+}}
+; GFX1064: s_or_b64 exec, exec, s[{{[0-9:]+}}]
+; GFX1064: s_and_saveexec_b64 s[{{[0-9:]+}}], s[{{[0-9:]+}}]{{$}}
+; GCN:     s_cbranch_execz BB
+; GCN:   ; %bb.{{[0-9]+}}:
+; GCN:   BB{{.*}}:
+; GCN:     s_endpgm
 define amdgpu_kernel void @test_loop_with_if(i32 addrspace(1)* %arg) #0 {
-; GFX1032-LABEL: test_loop_with_if:
-; GFX1032:       ; %bb.0: ; %bb
-; GFX1032-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1032-NEXT:    s_mov_b32 s2, 0
-; GFX1032-NEXT:    ; implicit-def: $vgpr2_vgpr3
-; GFX1032-NEXT:    s_branch BB10_2
-; GFX1032-NEXT:  BB10_1: ; %bb13
-; GFX1032-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1032-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1032-NEXT:    s_or_b32 exec_lo, exec_lo, s4
-; GFX1032-NEXT:    v_cmp_lt_i32_e32 vcc_lo, 0xfe, v4
-; GFX1032-NEXT:    v_add_nc_u32_e32 v1, 1, v4
-; GFX1032-NEXT:    s_or_b32 s2, vcc_lo, s2
-; GFX1032-NEXT:    s_andn2_b32 exec_lo, exec_lo, s2
-; GFX1032-NEXT:    s_cbranch_execz BB10_8
-; GFX1032-NEXT:  BB10_2: ; %bb2
-; GFX1032-NEXT:    ; =>This Inner Loop Header: Depth=1
-; GFX1032-NEXT:    v_cmp_ge_i32_e64 s4, v1, v0
-; GFX1032-NEXT:    v_cmp_lt_i32_e32 vcc_lo, v1, v0
-; GFX1032-NEXT:    s_mov_b32 s3, 0
-; GFX1032-NEXT:    s_and_saveexec_b32 s5, vcc_lo
-; GFX1032-NEXT:    s_cbranch_execz BB10_4
-; GFX1032-NEXT:  ; %bb.3: ; %bb5
-; GFX1032-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1032-NEXT:    v_ashrrev_i32_e32 v2, 31, v1
-; GFX1032-NEXT:    s_andn2_b32 s4, s4, exec_lo
-; GFX1032-NEXT:    s_mov_b32 s3, exec_lo
-; GFX1032-NEXT:    v_lshlrev_b64 v[2:3], 2, v[1:2]
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_add_co_u32 v2, vcc_lo, s0, v2
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v3, vcc_lo, s1, v3, vcc_lo
-; GFX1032-NEXT:    global_load_dword v4, v[2:3], off
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_cmp_gt_i32_e32 vcc_lo, 11, v4
-; GFX1032-NEXT:    s_and_b32 s6, vcc_lo, exec_lo
-; GFX1032-NEXT:    s_or_b32 s4, s4, s6
-; GFX1032-NEXT:  BB10_4: ; %Flow
-; GFX1032-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1032-NEXT:    s_or_b32 exec_lo, exec_lo, s5
-; GFX1032-NEXT:    ; implicit-def: $vgpr4
-; GFX1032-NEXT:    s_and_saveexec_b32 s5, s4
-; GFX1032-NEXT:    s_xor_b32 s4, exec_lo, s5
-; GFX1032-NEXT:  ; %bb.5: ; %bb11
-; GFX1032-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1032-NEXT:    v_lshrrev_b32_e32 v4, 31, v1
-; GFX1032-NEXT:    s_andn2_b32 s3, s3, exec_lo
-; GFX1032-NEXT:    v_add_nc_u32_e32 v4, v1, v4
-; GFX1032-NEXT:    v_ashrrev_i32_e32 v4, 1, v4
-; GFX1032-NEXT:  ; %bb.6: ; %Flow1
-; GFX1032-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1032-NEXT:    s_or_b32 exec_lo, exec_lo, s4
-; GFX1032-NEXT:    s_and_saveexec_b32 s4, s3
-; GFX1032-NEXT:    s_cbranch_execz BB10_1
-; GFX1032-NEXT:  ; %bb.7: ; %bb10
-; GFX1032-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1032-NEXT:    v_mov_b32_e32 v4, v1
-; GFX1032-NEXT:    global_store_dword v[2:3], v0, off
-; GFX1032-NEXT:    s_branch BB10_1
-; GFX1032-NEXT:  BB10_8: ; %bb1
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_loop_with_if:
-; GFX1064:       ; %bb.0: ; %bb
-; GFX1064-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1064-NEXT:    s_mov_b64 s[2:3], 0
-; GFX1064-NEXT:    ; implicit-def: $vgpr2_vgpr3
-; GFX1064-NEXT:    s_branch BB10_2
-; GFX1064-NEXT:  BB10_1: ; %bb13
-; GFX1064-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1064-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1064-NEXT:    s_or_b64 exec, exec, s[6:7]
-; GFX1064-NEXT:    v_cmp_lt_i32_e32 vcc, 0xfe, v4
-; GFX1064-NEXT:    v_add_nc_u32_e32 v1, 1, v4
-; GFX1064-NEXT:    s_or_b64 s[2:3], vcc, s[2:3]
-; GFX1064-NEXT:    s_andn2_b64 exec, exec, s[2:3]
-; GFX1064-NEXT:    s_cbranch_execz BB10_8
-; GFX1064-NEXT:  BB10_2: ; %bb2
-; GFX1064-NEXT:    ; =>This Inner Loop Header: Depth=1
-; GFX1064-NEXT:    v_cmp_ge_i32_e64 s[6:7], v1, v0
-; GFX1064-NEXT:    v_cmp_lt_i32_e32 vcc, v1, v0
-; GFX1064-NEXT:    s_mov_b64 s[4:5], 0
-; GFX1064-NEXT:    s_and_saveexec_b64 s[8:9], vcc
-; GFX1064-NEXT:    s_cbranch_execz BB10_4
-; GFX1064-NEXT:  ; %bb.3: ; %bb5
-; GFX1064-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1064-NEXT:    v_ashrrev_i32_e32 v2, 31, v1
-; GFX1064-NEXT:    s_andn2_b64 s[6:7], s[6:7], exec
-; GFX1064-NEXT:    s_mov_b64 s[4:5], exec
-; GFX1064-NEXT:    v_lshlrev_b64 v[2:3], 2, v[1:2]
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_add_co_u32 v2, vcc, s0, v2
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v3, vcc, s1, v3, vcc
-; GFX1064-NEXT:    global_load_dword v4, v[2:3], off
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_cmp_gt_i32_e32 vcc, 11, v4
-; GFX1064-NEXT:    s_and_b64 s[10:11], vcc, exec
-; GFX1064-NEXT:    s_or_b64 s[6:7], s[6:7], s[10:11]
-; GFX1064-NEXT:  BB10_4: ; %Flow
-; GFX1064-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1064-NEXT:    s_or_b64 exec, exec, s[8:9]
-; GFX1064-NEXT:    ; implicit-def: $vgpr4
-; GFX1064-NEXT:    s_and_saveexec_b64 s[8:9], s[6:7]
-; GFX1064-NEXT:    s_xor_b64 s[6:7], exec, s[8:9]
-; GFX1064-NEXT:  ; %bb.5: ; %bb11
-; GFX1064-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1064-NEXT:    v_lshrrev_b32_e32 v4, 31, v1
-; GFX1064-NEXT:    s_andn2_b64 s[4:5], s[4:5], exec
-; GFX1064-NEXT:    v_add_nc_u32_e32 v4, v1, v4
-; GFX1064-NEXT:    v_ashrrev_i32_e32 v4, 1, v4
-; GFX1064-NEXT:  ; %bb.6: ; %Flow1
-; GFX1064-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1064-NEXT:    s_or_b64 exec, exec, s[6:7]
-; GFX1064-NEXT:    s_and_saveexec_b64 s[6:7], s[4:5]
-; GFX1064-NEXT:    s_cbranch_execz BB10_1
-; GFX1064-NEXT:  ; %bb.7: ; %bb10
-; GFX1064-NEXT:    ; in Loop: Header=BB10_2 Depth=1
-; GFX1064-NEXT:    v_mov_b32_e32 v4, v1
-; GFX1064-NEXT:    global_store_dword v[2:3], v0, off
-; GFX1064-NEXT:    s_branch BB10_1
-; GFX1064-NEXT:  BB10_8: ; %bb1
-; GFX1064-NEXT:    s_endpgm
 bb:
   %tmp = tail call i32 @llvm.amdgcn.workitem.id.x()
   br label %bb2
@@ -510,100 +224,38 @@ bb13:
   br i1 %tmp16, label %bb2, label %bb1
 }
 
+; GCN-LABEL: {{^}}test_loop_with_if_else_break:
+; GFX1032: s_and_saveexec_b32 s{{[0-9]+}}, vcc_lo
+; GFX1064: s_and_saveexec_b64 s[{{[0-9:]+}}], vcc{{$}}
+; GCN:     s_cbranch_execz
+; GCN:   ; %bb.{{[0-9]+}}: ; %.preheader
+; GCN:   BB{{.*}}:
+
+; GCN:     global_store_dword
+; GFX1032: s_or_b32 [[MASK0:s[0-9]+]], [[MASK0]], vcc_lo
+; GFX1064: s_or_b64 [[MASK0:s\[[0-9:]+\]]], [[MASK0]], vcc
+; GFX1032: s_andn2_b32 [[MASK1:s[0-9]+]], [[MASK1]], exec_lo
+; GFX1064: s_andn2_b64 [[MASK1:s\[[0-9:]+\]]], [[MASK1]], exec
+; GFX1032: s_and_b32 [[MASK0]], [[MASK0]], exec_lo
+; GFX1064: s_and_b64 [[MASK0]], [[MASK0]], exec
+; GFX1032: s_or_b32 [[MASK1]], [[MASK1]], [[MASK0]]
+; GFX1064: s_or_b64 [[MASK1]], [[MASK1]], [[MASK0]]
+; GCN:   BB{{.*}}: ; %Flow
+; GFX1032: s_and_b32 [[TMP0:s[0-9]+]], exec_lo, [[MASK1]]
+; GFX1064: s_and_b64 [[TMP0:s\[[0-9:]+\]]], exec, [[MASK1]]
+; GFX1032: s_or_b32  [[ACC:s[0-9]+]], [[TMP0]], [[ACC]]
+; GFX1064: s_or_b64  [[ACC:s\[[0-9:]+\]]], [[TMP0]], [[ACC]]
+; GFX1032: s_andn2_b32 exec_lo, exec_lo, [[ACC]]
+; GFX1064: s_andn2_b64 exec, exec, [[ACC]]
+; GCN:     s_cbranch_execz
+; GCN:   BB{{.*}}:
+
+; GFX1032: s_or_b32 [[MASK1]], [[MASK1]], exec_lo
+; GFX1064: s_or_b64 [[MASK1]], [[MASK1]], exec
+; GCN: global_load_dword [[LOAD:v[0-9]+]]
+; GFX1032: v_cmp_gt_i32_e32 vcc_lo, 11, [[LOAD]]
+; GFX1064: v_cmp_gt_i32_e32 vcc, 11, [[LOAD]]
 define amdgpu_kernel void @test_loop_with_if_else_break(i32 addrspace(1)* %arg) #0 {
-; GFX1032-LABEL: test_loop_with_if_else_break:
-; GFX1032:       ; %bb.0: ; %bb
-; GFX1032-NEXT:    v_cmp_ne_u32_e32 vcc_lo, 0, v0
-; GFX1032-NEXT:    s_mov_b32 s2, 0
-; GFX1032-NEXT:    s_and_saveexec_b32 s3, vcc_lo
-; GFX1032-NEXT:    s_cbranch_execz BB11_6
-; GFX1032-NEXT:  ; %bb.1: ; %.preheader
-; GFX1032-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1032-NEXT:    s_mov_b32 s3, 1
-; GFX1032-NEXT:    ; implicit-def: $sgpr4
-; GFX1032-NEXT:    s_branch BB11_4
-; GFX1032-NEXT:  BB11_2: ; %bb8
-; GFX1032-NEXT:    ; in Loop: Header=BB11_4 Depth=1
-; GFX1032-NEXT:    v_cmp_lt_u32_e64 s5, 0xff, s3
-; GFX1032-NEXT:    v_cmp_ge_u32_e32 vcc_lo, s3, v0
-; GFX1032-NEXT:    s_add_i32 s3, s3, 1
-; GFX1032-NEXT:    global_store_dword v1, v0, s[0:1]
-; GFX1032-NEXT:    s_or_b32 s5, s5, vcc_lo
-; GFX1032-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1032-NEXT:    s_add_u32 s0, s0, 4
-; GFX1032-NEXT:    s_addc_u32 s1, s1, 0
-; GFX1032-NEXT:    s_andn2_b32 s4, s4, exec_lo
-; GFX1032-NEXT:    s_and_b32 s5, s5, exec_lo
-; GFX1032-NEXT:    s_or_b32 s4, s4, s5
-; GFX1032-NEXT:  BB11_3: ; %Flow
-; GFX1032-NEXT:    ; in Loop: Header=BB11_4 Depth=1
-; GFX1032-NEXT:    s_and_b32 s5, exec_lo, s4
-; GFX1032-NEXT:    s_or_b32 s2, s5, s2
-; GFX1032-NEXT:    s_andn2_b32 exec_lo, exec_lo, s2
-; GFX1032-NEXT:    s_cbranch_execz BB11_6
-; GFX1032-NEXT:  BB11_4: ; %bb2
-; GFX1032-NEXT:    ; =>This Inner Loop Header: Depth=1
-; GFX1032-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1032-NEXT:    s_or_b32 s4, s4, exec_lo
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dword v2, v1, s[0:1]
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_cmp_gt_i32_e32 vcc_lo, 11, v2
-; GFX1032-NEXT:    s_and_b32 vcc_lo, exec_lo, vcc_lo
-; GFX1032-NEXT:    s_cbranch_vccz BB11_2
-; GFX1032-NEXT:  ; %bb.5: ; in Loop: Header=BB11_4 Depth=1
-; GFX1032-NEXT:    ; implicit-def: $sgpr3
-; GFX1032-NEXT:    ; implicit-def: $sgpr0_sgpr1
-; GFX1032-NEXT:    s_branch BB11_3
-; GFX1032-NEXT:  BB11_6: ; %.loopexit
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_loop_with_if_else_break:
-; GFX1064:       ; %bb.0: ; %bb
-; GFX1064-NEXT:    v_cmp_ne_u32_e32 vcc, 0, v0
-; GFX1064-NEXT:    s_and_saveexec_b64 s[2:3], vcc
-; GFX1064-NEXT:    s_cbranch_execz BB11_6
-; GFX1064-NEXT:  ; %bb.1: ; %.preheader
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1064-NEXT:    s_mov_b32 s4, 1
-; GFX1064-NEXT:    s_mov_b64 s[0:1], 0
-; GFX1064-NEXT:    ; implicit-def: $sgpr6_sgpr7
-; GFX1064-NEXT:    s_branch BB11_4
-; GFX1064-NEXT:  BB11_2: ; %bb8
-; GFX1064-NEXT:    ; in Loop: Header=BB11_4 Depth=1
-; GFX1064-NEXT:    v_cmp_lt_u32_e64 s[8:9], 0xff, s4
-; GFX1064-NEXT:    v_cmp_ge_u32_e32 vcc, s4, v0
-; GFX1064-NEXT:    s_add_i32 s4, s4, 1
-; GFX1064-NEXT:    global_store_dword v1, v0, s[2:3]
-; GFX1064-NEXT:    s_or_b64 s[8:9], s[8:9], vcc
-; GFX1064-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1064-NEXT:    s_add_u32 s2, s2, 4
-; GFX1064-NEXT:    s_addc_u32 s3, s3, 0
-; GFX1064-NEXT:    s_andn2_b64 s[6:7], s[6:7], exec
-; GFX1064-NEXT:    s_and_b64 s[8:9], s[8:9], exec
-; GFX1064-NEXT:    s_or_b64 s[6:7], s[6:7], s[8:9]
-; GFX1064-NEXT:  BB11_3: ; %Flow
-; GFX1064-NEXT:    ; in Loop: Header=BB11_4 Depth=1
-; GFX1064-NEXT:    s_and_b64 s[8:9], exec, s[6:7]
-; GFX1064-NEXT:    s_or_b64 s[0:1], s[8:9], s[0:1]
-; GFX1064-NEXT:    s_andn2_b64 exec, exec, s[0:1]
-; GFX1064-NEXT:    s_cbranch_execz BB11_6
-; GFX1064-NEXT:  BB11_4: ; %bb2
-; GFX1064-NEXT:    ; =>This Inner Loop Header: Depth=1
-; GFX1064-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1064-NEXT:    s_or_b64 s[6:7], s[6:7], exec
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dword v2, v1, s[2:3]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_cmp_gt_i32_e32 vcc, 11, v2
-; GFX1064-NEXT:    s_and_b64 vcc, exec, vcc
-; GFX1064-NEXT:    s_cbranch_vccz BB11_2
-; GFX1064-NEXT:  ; %bb.5: ; in Loop: Header=BB11_4 Depth=1
-; GFX1064-NEXT:    ; implicit-def: $sgpr4
-; GFX1064-NEXT:    ; implicit-def: $sgpr2_sgpr3
-; GFX1064-NEXT:    s_branch BB11_3
-; GFX1064-NEXT:  BB11_6: ; %.loopexit
-; GFX1064-NEXT:    s_endpgm
 bb:
   %tmp = tail call i32 @llvm.amdgcn.workitem.id.x()
   %tmp1 = icmp eq i32 %tmp, 0
@@ -632,30 +284,12 @@ bb8:
   ret void
 }
 
+; GCN-LABEL: {{^}}test_addc_vop2b:
+; GFX1032: v_add_co_u32 v{{[0-9]+}}, vcc_lo, v{{[0-9]+}}, s{{[0-9]+}}
+; GFX1032: v_add_co_ci_u32_e32 v{{[0-9]+}}, vcc_lo, s{{[0-9]+}}, v{{[0-9]+}}, vcc_lo
+; GFX1064: v_add_co_u32 v{{[0-9]+}}, vcc, v{{[0-9]+}}, s{{[0-9]+}}
+; GFX1064: v_add_co_ci_u32_e32 v{{[0-9]+}}, vcc, s{{[0-9]+}}, v{{[0-9]+}}, vcc{{$}}
 define amdgpu_kernel void @test_addc_vop2b(i64 addrspace(1)* %arg, i64 %arg1) #0 {
-; GFX1032-LABEL: test_addc_vop2b:
-; GFX1032:       ; %bb.0: ; %bb
-; GFX1032-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v2, 3, v0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dwordx2 v[0:1], v2, s[0:1]
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_add_co_u32 v0, vcc_lo, v0, s2
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v1, vcc_lo, s3, v1, vcc_lo
-; GFX1032-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_addc_vop2b:
-; GFX1064:       ; %bb.0: ; %bb
-; GFX1064-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v2, 3, v0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dwordx2 v[0:1], v2, s[0:1]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_add_co_u32 v0, vcc, v0, s2
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v1, vcc, s3, v1, vcc
-; GFX1064-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1064-NEXT:    s_endpgm
 bb:
   %tmp = tail call i32 @llvm.amdgcn.workitem.id.x()
   %tmp3 = getelementptr inbounds i64, i64 addrspace(1)* %arg, i32 %tmp
@@ -665,30 +299,12 @@ bb:
   ret void
 }
 
+; GCN-LABEL: {{^}}test_subbrev_vop2b:
+; GFX1032: v_sub_co_u32 v{{[0-9]+}}, [[A0:s[0-9]+|vcc_lo]], v{{[0-9]+}}, s{{[0-9]+}}{{$}}
+; GFX1032: v_subrev_co_ci_u32_e32 v{{[0-9]+}}, vcc_lo, {{[vs][0-9]+}}, {{[vs][0-9]+}}, [[A0]]{{$}}
+; GFX1064: v_sub_co_u32 v{{[0-9]+}}, [[A0:s\[[0-9:]+\]|vcc]], v{{[0-9]+}}, s{{[0-9]+}}{{$}}
+; GFX1064: v_subrev_co_ci_u32_e32 v{{[0-9]+}}, vcc, {{[vs][0-9]+}}, {{[vs][0-9]+}}, [[A0]]{{$}}
 define amdgpu_kernel void @test_subbrev_vop2b(i64 addrspace(1)* %arg, i64 %arg1) #0 {
-; GFX1032-LABEL: test_subbrev_vop2b:
-; GFX1032:       ; %bb.0: ; %bb
-; GFX1032-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v2, 3, v0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dwordx2 v[0:1], v2, s[0:1]
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_sub_co_u32 v0, vcc_lo, v0, s2
-; GFX1032-NEXT:    v_subrev_co_ci_u32_e32 v1, vcc_lo, s3, v1, vcc_lo
-; GFX1032-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_subbrev_vop2b:
-; GFX1064:       ; %bb.0: ; %bb
-; GFX1064-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v2, 3, v0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dwordx2 v[0:1], v2, s[0:1]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_sub_co_u32 v0, vcc, v0, s2
-; GFX1064-NEXT:    v_subrev_co_ci_u32_e32 v1, vcc, s3, v1, vcc
-; GFX1064-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1064-NEXT:    s_endpgm
 bb:
   %tmp = tail call i32 @llvm.amdgcn.workitem.id.x()
   %tmp3 = getelementptr inbounds i64, i64 addrspace(1)* %arg, i32 %tmp
@@ -698,30 +314,12 @@ bb:
   ret void
 }
 
+; GCN-LABEL: {{^}}test_subb_vop2b:
+; GFX1032: v_sub_co_u32 v{{[0-9]+}}, [[A0:s[0-9]+|vcc_lo]], s{{[0-9]+}}, v{{[0-9]+}}{{$}}
+; GFX1032: v_sub_co_ci_u32_e32 v{{[0-9]+}}, vcc_lo, {{[vs][0-9]+}}, v{{[0-9]+}}, [[A0]]{{$}}
+; GFX1064: v_sub_co_u32 v{{[0-9]+}}, [[A0:s\[[0-9:]+\]|vcc]], s{{[0-9]+}}, v{{[0-9]+}}{{$}}
+; GFX1064: v_sub_co_ci_u32_e32 v{{[0-9]+}}, vcc, {{[vs][0-9]+}}, v{{[0-9]+}}, [[A0]]{{$}}
 define amdgpu_kernel void @test_subb_vop2b(i64 addrspace(1)* %arg, i64 %arg1) #0 {
-; GFX1032-LABEL: test_subb_vop2b:
-; GFX1032:       ; %bb.0: ; %bb
-; GFX1032-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v2, 3, v0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dwordx2 v[0:1], v2, s[0:1]
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_sub_co_u32 v0, vcc_lo, s2, v0
-; GFX1032-NEXT:    v_sub_co_ci_u32_e32 v1, vcc_lo, s3, v1, vcc_lo
-; GFX1032-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_subb_vop2b:
-; GFX1064:       ; %bb.0: ; %bb
-; GFX1064-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v2, 3, v0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dwordx2 v[0:1], v2, s[0:1]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_sub_co_u32 v0, vcc, s2, v0
-; GFX1064-NEXT:    v_sub_co_ci_u32_e32 v1, vcc, s3, v1, vcc
-; GFX1064-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1064-NEXT:    s_endpgm
 bb:
   %tmp = tail call i32 @llvm.amdgcn.workitem.id.x()
   %tmp3 = getelementptr inbounds i64, i64 addrspace(1)* %arg, i32 %tmp
@@ -731,306 +329,28 @@ bb:
   ret void
 }
 
+; GCN-LABEL: {{^}}test_udiv64:
+; GFX1032: v_add_co_u32 v{{[0-9]+}}, [[SDST:s[0-9]+]], v{{[0-9]+}}, v{{[0-9]+}}
+; GFX1032: v_add_co_ci_u32_e32 v{{[0-9]+}}, vcc_lo, 0, v{{[0-9]+}}, vcc_lo
+; GFX1032: v_add_co_ci_u32_e64 v{{[0-9]+}}, vcc_lo, v{{[0-9]+}}, v{{[0-9]+}}, [[SDST]]
+; GFX1032: v_add_co_u32 v{{[0-9]+}}, vcc_lo, v{{[0-9]+}}, v{{[0-9]+}}
+; GFX1032: v_add_co_u32 v{{[0-9]+}}, vcc_lo, v{{[0-9]+}}, v{{[0-9]+}}
+; GFX1032: v_add_co_u32 v{{[0-9]+}}, vcc_lo, v{{[0-9]+}}, v{{[0-9]+}}
+; GFX1032: v_add_co_ci_u32_e32 v{{[0-9]+}}, vcc_lo, 0, v{{[0-9]+}}, vcc_lo
+; GFX1032: v_sub_co_u32 v{{[0-9]+}}, vcc_lo, s{{[0-9]+}}, v{{[0-9]+}}
+; GFX1032: v_subrev_co_ci_u32_e64 v{{[0-9]+}}, s{{[0-9]+}}, {{[vs][0-9]+}}, v{{[0-9]+}}, vcc_lo
+; GFX1032: v_sub_co_ci_u32_e32 v{{[0-9]+}}, vcc_lo, {{[vs][0-9]+}}, v{{[0-9]+}}, vcc_lo
+; GFX1064: v_add_co_u32 v{{[0-9]+}}, [[SDST:s\[[0-9:]+\]]], v{{[0-9]+}}, v{{[0-9]+}}
+; GFX1064: v_add_co_ci_u32_e32 v{{[0-9]+}}, vcc, 0, v{{[0-9]+}}, vcc{{$}}
+; GFX1064: v_add_co_ci_u32_e64 v{{[0-9]+}}, vcc, v{{[0-9]+}}, v{{[0-9]+}}, [[SDST]]
+; GFX1064: v_add_co_u32 v{{[0-9]+}}, vcc, v{{[0-9]+}}, v{{[0-9]+}}
+; GFX1064: v_add_co_u32 v{{[0-9]+}}, vcc, v{{[0-9]+}}, v{{[0-9]+}}
+; GFX1064: v_add_co_u32 v{{[0-9]+}}, vcc, v{{[0-9]+}}, v{{[0-9]+}}
+; GFX1064: v_add_co_ci_u32_e32 v{{[0-9]+}}, vcc, 0, v{{[0-9]+}}, vcc{{$}}
+; GFX1064: v_sub_co_u32 v{{[0-9]+}}, s[{{[0-9:]+}}], s{{[0-9]+}}, v{{[0-9]+}}
+; GFX1064: v_subrev_co_ci_u32_e64 v{{[0-9]+}}, vcc, {{[vs][0-9]+}}, v{{[0-9]+}}, s[{{[0-9:]+}}]
+; GFX1064: v_sub_co_ci_u32_e64 v{{[0-9]+}}, s[{{[0-9:]+}}], {{[vs][0-9]+}}, v{{[0-9]+}}, s[{{[0-9:]+}}]
 define amdgpu_kernel void @test_udiv64(i64 addrspace(1)* %arg) #0 {
-; GFX1032-LABEL: test_udiv64:
-; GFX1032:       ; %bb.0: ; %bb
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    s_load_dwordx4 s[4:7], s[2:3], 0x0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    s_or_b64 s[8:9], s[6:7], s[4:5]
-; GFX1032-NEXT:    s_mov_b32 s8, 0
-; GFX1032-NEXT:    s_cmp_lg_u64 s[8:9], 0
-; GFX1032-NEXT:    s_cbranch_scc0 BB15_2
-; GFX1032-NEXT:  ; %bb.1:
-; GFX1032-NEXT:    v_cvt_f32_u32_e32 v0, s4
-; GFX1032-NEXT:    v_cvt_f32_u32_e32 v1, s5
-; GFX1032-NEXT:    s_sub_u32 s1, 0, s4
-; GFX1032-NEXT:    s_subb_u32 s9, 0, s5
-; GFX1032-NEXT:    v_mac_f32_e32 v0, 0x4f800000, v1
-; GFX1032-NEXT:    v_rcp_f32_e32 v0, v0
-; GFX1032-NEXT:    v_mul_f32_e32 v0, 0x5f7ffffc, v0
-; GFX1032-NEXT:    v_mul_f32_e32 v1, 0x2f800000, v0
-; GFX1032-NEXT:    v_trunc_f32_e32 v1, v1
-; GFX1032-NEXT:    v_mac_f32_e32 v0, 0xcf800000, v1
-; GFX1032-NEXT:    v_cvt_u32_f32_e32 v1, v1
-; GFX1032-NEXT:    v_cvt_u32_f32_e32 v0, v0
-; GFX1032-NEXT:    v_mul_lo_u32 v2, s1, v1
-; GFX1032-NEXT:    v_mul_hi_u32 v3, s1, v0
-; GFX1032-NEXT:    v_mul_lo_u32 v4, s9, v0
-; GFX1032-NEXT:    v_add_nc_u32_e32 v2, v3, v2
-; GFX1032-NEXT:    v_mul_lo_u32 v3, s1, v0
-; GFX1032-NEXT:    v_add_nc_u32_e32 v2, v2, v4
-; GFX1032-NEXT:    v_mul_hi_u32 v4, v0, v3
-; GFX1032-NEXT:    v_mul_lo_u32 v5, v0, v2
-; GFX1032-NEXT:    v_mul_hi_u32 v6, v0, v2
-; GFX1032-NEXT:    v_mul_hi_u32 v7, v1, v3
-; GFX1032-NEXT:    v_mul_lo_u32 v3, v1, v3
-; GFX1032-NEXT:    v_mul_hi_u32 v8, v1, v2
-; GFX1032-NEXT:    v_mul_lo_u32 v2, v1, v2
-; GFX1032-NEXT:    v_add_co_u32 v4, vcc_lo, v4, v5
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v5, vcc_lo, 0, v6, vcc_lo
-; GFX1032-NEXT:    v_add_co_u32 v3, vcc_lo, v4, v3
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v3, vcc_lo, v5, v7, vcc_lo
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v4, vcc_lo, 0, v8, vcc_lo
-; GFX1032-NEXT:    v_add_co_u32 v2, vcc_lo, v3, v2
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v3, vcc_lo, 0, v4, vcc_lo
-; GFX1032-NEXT:    v_add_co_u32 v0, s0, v0, v2
-; GFX1032-NEXT:    v_add_co_ci_u32_e64 v2, vcc_lo, v1, v3, s0
-; GFX1032-NEXT:    v_add_nc_u32_e32 v1, v1, v3
-; GFX1032-NEXT:    v_mul_hi_u32 v4, s1, v0
-; GFX1032-NEXT:    v_mul_lo_u32 v6, s9, v0
-; GFX1032-NEXT:    v_mul_lo_u32 v5, s1, v2
-; GFX1032-NEXT:    v_add_nc_u32_e32 v4, v4, v5
-; GFX1032-NEXT:    v_mul_lo_u32 v5, s1, v0
-; GFX1032-NEXT:    v_add_nc_u32_e32 v4, v4, v6
-; GFX1032-NEXT:    v_mul_hi_u32 v6, v0, v5
-; GFX1032-NEXT:    v_mul_lo_u32 v7, v0, v4
-; GFX1032-NEXT:    v_mul_hi_u32 v8, v0, v4
-; GFX1032-NEXT:    v_mul_hi_u32 v9, v2, v5
-; GFX1032-NEXT:    v_mul_lo_u32 v5, v2, v5
-; GFX1032-NEXT:    v_mul_hi_u32 v10, v2, v4
-; GFX1032-NEXT:    v_mul_lo_u32 v2, v2, v4
-; GFX1032-NEXT:    v_add_co_u32 v6, vcc_lo, v6, v7
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v7, vcc_lo, 0, v8, vcc_lo
-; GFX1032-NEXT:    v_add_co_u32 v4, vcc_lo, v6, v5
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v4, vcc_lo, v7, v9, vcc_lo
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v5, vcc_lo, 0, v10, vcc_lo
-; GFX1032-NEXT:    v_add_co_u32 v2, vcc_lo, v4, v2
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v3, vcc_lo, 0, v5, vcc_lo
-; GFX1032-NEXT:    v_add_co_ci_u32_e64 v1, vcc_lo, v1, v3, s0
-; GFX1032-NEXT:    v_add_co_u32 v0, vcc_lo, v0, v2
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v1, vcc_lo, 0, v1, vcc_lo
-; GFX1032-NEXT:    v_mul_hi_u32 v2, s6, v0
-; GFX1032-NEXT:    v_mul_hi_u32 v5, s7, v0
-; GFX1032-NEXT:    v_mul_lo_u32 v0, s7, v0
-; GFX1032-NEXT:    v_mul_lo_u32 v3, s6, v1
-; GFX1032-NEXT:    v_mul_hi_u32 v4, s6, v1
-; GFX1032-NEXT:    v_mul_hi_u32 v6, s7, v1
-; GFX1032-NEXT:    v_mul_lo_u32 v1, s7, v1
-; GFX1032-NEXT:    v_add_co_u32 v2, vcc_lo, v2, v3
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v3, vcc_lo, 0, v4, vcc_lo
-; GFX1032-NEXT:    v_add_co_u32 v0, vcc_lo, v2, v0
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v0, vcc_lo, v3, v5, vcc_lo
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v2, vcc_lo, 0, v6, vcc_lo
-; GFX1032-NEXT:    v_add_co_u32 v0, vcc_lo, v0, v1
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v1, vcc_lo, 0, v2, vcc_lo
-; GFX1032-NEXT:    v_mul_hi_u32 v2, s4, v0
-; GFX1032-NEXT:    v_mul_lo_u32 v4, s5, v0
-; GFX1032-NEXT:    v_mul_lo_u32 v3, s4, v1
-; GFX1032-NEXT:    v_add_nc_u32_e32 v2, v2, v3
-; GFX1032-NEXT:    v_mul_lo_u32 v3, s4, v0
-; GFX1032-NEXT:    v_add_nc_u32_e32 v2, v2, v4
-; GFX1032-NEXT:    v_sub_co_u32 v3, vcc_lo, s6, v3
-; GFX1032-NEXT:    v_sub_nc_u32_e32 v4, s7, v2
-; GFX1032-NEXT:    v_subrev_co_ci_u32_e64 v4, s0, s5, v4, vcc_lo
-; GFX1032-NEXT:    v_sub_co_u32 v5, s0, v3, s4
-; GFX1032-NEXT:    v_sub_co_ci_u32_e32 v2, vcc_lo, s7, v2, vcc_lo
-; GFX1032-NEXT:    v_subrev_co_ci_u32_e64 v4, s0, 0, v4, s0
-; GFX1032-NEXT:    v_add_co_u32 v6, s0, v0, 2
-; GFX1032-NEXT:    v_add_co_ci_u32_e64 v7, s0, 0, v1, s0
-; GFX1032-NEXT:    v_cmp_le_u32_e32 vcc_lo, s5, v4
-; GFX1032-NEXT:    v_cndmask_b32_e64 v8, 0, -1, vcc_lo
-; GFX1032-NEXT:    v_cmp_le_u32_e32 vcc_lo, s4, v5
-; GFX1032-NEXT:    v_cndmask_b32_e64 v5, 0, -1, vcc_lo
-; GFX1032-NEXT:    v_cmp_eq_u32_e32 vcc_lo, s5, v4
-; GFX1032-NEXT:    s_mov_b32 s0, vcc_lo
-; GFX1032-NEXT:    v_cmp_le_u32_e32 vcc_lo, s5, v2
-; GFX1032-NEXT:    v_cndmask_b32_e64 v4, 0, -1, vcc_lo
-; GFX1032-NEXT:    v_cmp_le_u32_e32 vcc_lo, s4, v3
-; GFX1032-NEXT:    v_cndmask_b32_e64 v5, v8, v5, s0
-; GFX1032-NEXT:    v_cndmask_b32_e64 v3, 0, -1, vcc_lo
-; GFX1032-NEXT:    v_add_co_u32 v8, vcc_lo, v0, 1
-; GFX1032-NEXT:    v_add_co_ci_u32_e32 v9, vcc_lo, 0, v1, vcc_lo
-; GFX1032-NEXT:    v_cmp_eq_u32_e32 vcc_lo, s5, v2
-; GFX1032-NEXT:    v_cndmask_b32_e32 v2, v4, v3, vcc_lo
-; GFX1032-NEXT:    v_cmp_ne_u32_e64 s0, 0, v5
-; GFX1032-NEXT:    v_cmp_ne_u32_e32 vcc_lo, 0, v2
-; GFX1032-NEXT:    v_cndmask_b32_e64 v3, v9, v7, s0
-; GFX1032-NEXT:    v_cndmask_b32_e64 v4, v8, v6, s0
-; GFX1032-NEXT:    v_cndmask_b32_e32 v1, v1, v3, vcc_lo
-; GFX1032-NEXT:    v_cndmask_b32_e32 v0, v0, v4, vcc_lo
-; GFX1032-NEXT:    s_andn2_b32 vcc_lo, exec_lo, s8
-; GFX1032-NEXT:    s_cbranch_vccz BB15_3
-; GFX1032-NEXT:    s_branch BB15_4
-; GFX1032-NEXT:  BB15_2:
-; GFX1032-NEXT:    ; implicit-def: $vgpr0_vgpr1
-; GFX1032-NEXT:  BB15_3:
-; GFX1032-NEXT:    v_cvt_f32_u32_e32 v0, s4
-; GFX1032-NEXT:    s_sub_i32 s0, 0, s4
-; GFX1032-NEXT:    v_rcp_iflag_f32_e32 v0, v0
-; GFX1032-NEXT:    v_mul_f32_e32 v0, 0x4f7ffffe, v0
-; GFX1032-NEXT:    v_cvt_u32_f32_e32 v0, v0
-; GFX1032-NEXT:    v_mul_lo_u32 v1, s0, v0
-; GFX1032-NEXT:    v_mul_hi_u32 v1, v0, v1
-; GFX1032-NEXT:    v_add_nc_u32_e32 v0, v0, v1
-; GFX1032-NEXT:    v_mul_hi_u32 v0, s6, v0
-; GFX1032-NEXT:    v_mul_lo_u32 v1, v0, s4
-; GFX1032-NEXT:    v_add_nc_u32_e32 v2, 1, v0
-; GFX1032-NEXT:    v_sub_nc_u32_e32 v1, s6, v1
-; GFX1032-NEXT:    v_cmp_le_u32_e32 vcc_lo, s4, v1
-; GFX1032-NEXT:    v_subrev_nc_u32_e32 v3, s4, v1
-; GFX1032-NEXT:    v_cndmask_b32_e32 v0, v0, v2, vcc_lo
-; GFX1032-NEXT:    v_cndmask_b32_e32 v1, v1, v3, vcc_lo
-; GFX1032-NEXT:    v_add_nc_u32_e32 v2, 1, v0
-; GFX1032-NEXT:    v_cmp_le_u32_e32 vcc_lo, s4, v1
-; GFX1032-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1032-NEXT:    v_cndmask_b32_e32 v0, v0, v2, vcc_lo
-; GFX1032-NEXT:  BB15_4:
-; GFX1032-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1032-NEXT:    global_store_dwordx2 v2, v[0:1], s[2:3] offset:16
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_udiv64:
-; GFX1064:       ; %bb.0: ; %bb
-; GFX1064-NEXT:    s_load_dwordx2 s[6:7], s[0:1], 0x24
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    s_load_dwordx4 s[8:11], s[6:7], 0x0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    s_or_b64 s[0:1], s[10:11], s[8:9]
-; GFX1064-NEXT:    s_mov_b32 s0, 0
-; GFX1064-NEXT:    s_cmp_lg_u64 s[0:1], 0
-; GFX1064-NEXT:    s_cbranch_scc0 BB15_2
-; GFX1064-NEXT:  ; %bb.1:
-; GFX1064-NEXT:    v_cvt_f32_u32_e32 v0, s8
-; GFX1064-NEXT:    v_cvt_f32_u32_e32 v1, s9
-; GFX1064-NEXT:    s_sub_u32 s2, 0, s8
-; GFX1064-NEXT:    s_subb_u32 s3, 0, s9
-; GFX1064-NEXT:    v_mac_f32_e32 v0, 0x4f800000, v1
-; GFX1064-NEXT:    v_rcp_f32_e32 v0, v0
-; GFX1064-NEXT:    v_mul_f32_e32 v0, 0x5f7ffffc, v0
-; GFX1064-NEXT:    v_mul_f32_e32 v1, 0x2f800000, v0
-; GFX1064-NEXT:    v_trunc_f32_e32 v1, v1
-; GFX1064-NEXT:    v_mac_f32_e32 v0, 0xcf800000, v1
-; GFX1064-NEXT:    v_cvt_u32_f32_e32 v1, v1
-; GFX1064-NEXT:    v_cvt_u32_f32_e32 v0, v0
-; GFX1064-NEXT:    v_mul_lo_u32 v2, s2, v1
-; GFX1064-NEXT:    v_mul_hi_u32 v3, s2, v0
-; GFX1064-NEXT:    v_mul_lo_u32 v4, s3, v0
-; GFX1064-NEXT:    v_add_nc_u32_e32 v2, v3, v2
-; GFX1064-NEXT:    v_mul_lo_u32 v3, s2, v0
-; GFX1064-NEXT:    v_add_nc_u32_e32 v2, v2, v4
-; GFX1064-NEXT:    v_mul_hi_u32 v4, v0, v3
-; GFX1064-NEXT:    v_mul_lo_u32 v5, v0, v2
-; GFX1064-NEXT:    v_mul_hi_u32 v6, v0, v2
-; GFX1064-NEXT:    v_mul_hi_u32 v7, v1, v3
-; GFX1064-NEXT:    v_mul_lo_u32 v3, v1, v3
-; GFX1064-NEXT:    v_mul_hi_u32 v8, v1, v2
-; GFX1064-NEXT:    v_mul_lo_u32 v2, v1, v2
-; GFX1064-NEXT:    v_add_co_u32 v4, vcc, v4, v5
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v5, vcc, 0, v6, vcc
-; GFX1064-NEXT:    v_add_co_u32 v3, vcc, v4, v3
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v3, vcc, v5, v7, vcc
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v4, vcc, 0, v8, vcc
-; GFX1064-NEXT:    v_add_co_u32 v2, vcc, v3, v2
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v3, vcc, 0, v4, vcc
-; GFX1064-NEXT:    v_add_co_u32 v0, s[0:1], v0, v2
-; GFX1064-NEXT:    v_add_co_ci_u32_e64 v2, vcc, v1, v3, s[0:1]
-; GFX1064-NEXT:    v_add_nc_u32_e32 v1, v1, v3
-; GFX1064-NEXT:    v_mul_hi_u32 v4, s2, v0
-; GFX1064-NEXT:    v_mul_lo_u32 v6, s3, v0
-; GFX1064-NEXT:    v_mul_lo_u32 v5, s2, v2
-; GFX1064-NEXT:    v_add_nc_u32_e32 v4, v4, v5
-; GFX1064-NEXT:    v_mul_lo_u32 v5, s2, v0
-; GFX1064-NEXT:    v_add_nc_u32_e32 v4, v4, v6
-; GFX1064-NEXT:    v_mul_hi_u32 v6, v0, v5
-; GFX1064-NEXT:    v_mul_lo_u32 v7, v0, v4
-; GFX1064-NEXT:    v_mul_hi_u32 v8, v0, v4
-; GFX1064-NEXT:    v_mul_hi_u32 v9, v2, v5
-; GFX1064-NEXT:    v_mul_lo_u32 v5, v2, v5
-; GFX1064-NEXT:    v_mul_hi_u32 v10, v2, v4
-; GFX1064-NEXT:    v_mul_lo_u32 v2, v2, v4
-; GFX1064-NEXT:    v_add_co_u32 v6, vcc, v6, v7
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v7, vcc, 0, v8, vcc
-; GFX1064-NEXT:    v_add_co_u32 v4, vcc, v6, v5
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v4, vcc, v7, v9, vcc
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v5, vcc, 0, v10, vcc
-; GFX1064-NEXT:    v_add_co_u32 v2, vcc, v4, v2
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v3, vcc, 0, v5, vcc
-; GFX1064-NEXT:    v_add_co_ci_u32_e64 v1, vcc, v1, v3, s[0:1]
-; GFX1064-NEXT:    v_add_co_u32 v0, vcc, v0, v2
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v1, vcc, 0, v1, vcc
-; GFX1064-NEXT:    v_mul_hi_u32 v2, s10, v0
-; GFX1064-NEXT:    v_mul_hi_u32 v5, s11, v0
-; GFX1064-NEXT:    v_mul_lo_u32 v0, s11, v0
-; GFX1064-NEXT:    v_mul_lo_u32 v3, s10, v1
-; GFX1064-NEXT:    v_mul_hi_u32 v4, s10, v1
-; GFX1064-NEXT:    v_mul_hi_u32 v6, s11, v1
-; GFX1064-NEXT:    v_mul_lo_u32 v1, s11, v1
-; GFX1064-NEXT:    v_add_co_u32 v2, vcc, v2, v3
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v3, vcc, 0, v4, vcc
-; GFX1064-NEXT:    v_add_co_u32 v0, vcc, v2, v0
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v0, vcc, v3, v5, vcc
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v2, vcc, 0, v6, vcc
-; GFX1064-NEXT:    v_add_co_u32 v0, vcc, v0, v1
-; GFX1064-NEXT:    v_add_co_ci_u32_e32 v1, vcc, 0, v2, vcc
-; GFX1064-NEXT:    v_mul_hi_u32 v2, s8, v0
-; GFX1064-NEXT:    v_mul_lo_u32 v4, s9, v0
-; GFX1064-NEXT:    v_mul_lo_u32 v3, s8, v1
-; GFX1064-NEXT:    v_add_nc_u32_e32 v2, v2, v3
-; GFX1064-NEXT:    v_mul_lo_u32 v3, s8, v0
-; GFX1064-NEXT:    v_add_nc_u32_e32 v2, v2, v4
-; GFX1064-NEXT:    v_sub_co_u32 v3, s[0:1], s10, v3
-; GFX1064-NEXT:    v_sub_nc_u32_e32 v4, s11, v2
-; GFX1064-NEXT:    v_subrev_co_ci_u32_e64 v4, vcc, s9, v4, s[0:1]
-; GFX1064-NEXT:    v_sub_co_u32 v5, vcc, v3, s8
-; GFX1064-NEXT:    v_sub_co_ci_u32_e64 v2, s[0:1], s11, v2, s[0:1]
-; GFX1064-NEXT:    v_subrev_co_ci_u32_e32 v4, vcc, 0, v4, vcc
-; GFX1064-NEXT:    v_cmp_le_u32_e32 vcc, s9, v4
-; GFX1064-NEXT:    s_mov_b64 s[2:3], vcc
-; GFX1064-NEXT:    v_cmp_le_u32_e32 vcc, s8, v5
-; GFX1064-NEXT:    s_mov_b64 s[4:5], vcc
-; GFX1064-NEXT:    v_cmp_eq_u32_e32 vcc, s9, v4
-; GFX1064-NEXT:    v_cndmask_b32_e64 v4, 0, -1, s[2:3]
-; GFX1064-NEXT:    v_cndmask_b32_e64 v5, 0, -1, s[4:5]
-; GFX1064-NEXT:    s_mov_b64 s[0:1], vcc
-; GFX1064-NEXT:    v_cmp_le_u32_e32 vcc, s9, v2
-; GFX1064-NEXT:    v_cndmask_b32_e64 v4, v4, v5, s[0:1]
-; GFX1064-NEXT:    s_mov_b64 s[2:3], vcc
-; GFX1064-NEXT:    v_cmp_le_u32_e32 vcc, s8, v3
-; GFX1064-NEXT:    v_cndmask_b32_e64 v5, 0, -1, s[2:3]
-; GFX1064-NEXT:    v_add_co_u32 v3, s[4:5], v0, 2
-; GFX1064-NEXT:    v_add_co_ci_u32_e64 v6, s[4:5], 0, v1, s[4:5]
-; GFX1064-NEXT:    v_cndmask_b32_e64 v7, 0, -1, vcc
-; GFX1064-NEXT:    v_cmp_eq_u32_e32 vcc, s9, v2
-; GFX1064-NEXT:    v_add_co_u32 v2, s[0:1], v0, 1
-; GFX1064-NEXT:    v_add_co_ci_u32_e64 v8, s[0:1], 0, v1, s[0:1]
-; GFX1064-NEXT:    v_cmp_ne_u32_e64 s[0:1], 0, v4
-; GFX1064-NEXT:    v_cndmask_b32_e32 v4, v5, v7, vcc
-; GFX1064-NEXT:    v_cndmask_b32_e64 v5, v8, v6, s[0:1]
-; GFX1064-NEXT:    v_cndmask_b32_e64 v2, v2, v3, s[0:1]
-; GFX1064-NEXT:    v_cmp_ne_u32_e32 vcc, 0, v4
-; GFX1064-NEXT:    v_cndmask_b32_e32 v1, v1, v5, vcc
-; GFX1064-NEXT:    v_cndmask_b32_e32 v0, v0, v2, vcc
-; GFX1064-NEXT:    s_cbranch_execz BB15_3
-; GFX1064-NEXT:    s_branch BB15_4
-; GFX1064-NEXT:  BB15_2:
-; GFX1064-NEXT:    ; implicit-def: $vgpr0_vgpr1
-; GFX1064-NEXT:  BB15_3:
-; GFX1064-NEXT:    v_cvt_f32_u32_e32 v0, s8
-; GFX1064-NEXT:    s_sub_i32 s0, 0, s8
-; GFX1064-NEXT:    v_rcp_iflag_f32_e32 v0, v0
-; GFX1064-NEXT:    v_mul_f32_e32 v0, 0x4f7ffffe, v0
-; GFX1064-NEXT:    v_cvt_u32_f32_e32 v0, v0
-; GFX1064-NEXT:    v_mul_lo_u32 v1, s0, v0
-; GFX1064-NEXT:    v_mul_hi_u32 v1, v0, v1
-; GFX1064-NEXT:    v_add_nc_u32_e32 v0, v0, v1
-; GFX1064-NEXT:    v_mul_hi_u32 v0, s10, v0
-; GFX1064-NEXT:    v_mul_lo_u32 v1, v0, s8
-; GFX1064-NEXT:    v_add_nc_u32_e32 v2, 1, v0
-; GFX1064-NEXT:    v_sub_nc_u32_e32 v1, s10, v1
-; GFX1064-NEXT:    v_cmp_le_u32_e32 vcc, s8, v1
-; GFX1064-NEXT:    v_subrev_nc_u32_e32 v3, s8, v1
-; GFX1064-NEXT:    v_cndmask_b32_e32 v0, v0, v2, vcc
-; GFX1064-NEXT:    v_cndmask_b32_e32 v1, v1, v3, vcc
-; GFX1064-NEXT:    v_add_nc_u32_e32 v2, 1, v0
-; GFX1064-NEXT:    v_cmp_le_u32_e32 vcc, s8, v1
-; GFX1064-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1064-NEXT:    v_cndmask_b32_e32 v0, v0, v2, vcc
-; GFX1064-NEXT:  BB15_4:
-; GFX1064-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1064-NEXT:    global_store_dwordx2 v2, v[0:1], s[6:7] offset:16
-; GFX1064-NEXT:    s_endpgm
 bb:
   %tmp = getelementptr inbounds i64, i64 addrspace(1)* %arg, i64 1
   %tmp1 = load i64, i64 addrspace(1)* %tmp, align 8
@@ -1041,34 +361,10 @@ bb:
   ret void
 }
 
+; GCN-LABEL: {{^}}test_div_scale_f32:
+; GFX1032: v_div_scale_f32 v{{[0-9]+}}, s{{[0-9]+}}, v{{[0-9]+}}, v{{[0-9]+}}, v{{[0-9]+}}
+; GFX1064: v_div_scale_f32 v{{[0-9]+}}, s[{{[0-9:]+}}], v{{[0-9]+}}, v{{[0-9]+}}, v{{[0-9]+}}
 define amdgpu_kernel void @test_div_scale_f32(float addrspace(1)* %out, float addrspace(1)* %in) #0 {
-; GFX1032-LABEL: test_div_scale_f32:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dword v1, v0, s[2:3] glc dlc
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    global_load_dword v2, v0, s[2:3] offset:4 glc dlc
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    v_div_scale_f32 v1, s2, v2, v2, v1
-; GFX1032-NEXT:    global_store_dword v0, v1, s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_div_scale_f32:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v0, 2, v0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dword v1, v0, s[2:3] glc dlc
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    global_load_dword v2, v0, s[2:3] offset:4 glc dlc
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    v_div_scale_f32 v1, s[2:3], v2, v2, v1
-; GFX1064-NEXT:    global_store_dword v0, v1, s[0:1]
-; GFX1064-NEXT:    s_endpgm
   %tid = call i32 @llvm.amdgcn.workitem.id.x() nounwind readnone
   %gep.0 = getelementptr float, float addrspace(1)* %in, i32 %tid
   %gep.1 = getelementptr float, float addrspace(1)* %gep.0, i32 1
@@ -1082,36 +378,10 @@ define amdgpu_kernel void @test_div_scale_f32(float addrspace(1)* %out, float ad
   ret void
 }
 
+; GCN-LABEL: {{^}}test_div_scale_f64:
+; GFX1032: v_div_scale_f64 v[{{[0-9:]+}}], s{{[0-9]+}}, v[{{[0-9:]+}}], v[{{[0-9:]+}}], v[{{[0-9:]+}}]
+; GFX1064: v_div_scale_f64 v[{{[0-9:]+}}], s[{{[0-9:]+}}], v[{{[0-9:]+}}], v[{{[0-9:]+}}], v[{{[0-9:]+}}]
 define amdgpu_kernel void @test_div_scale_f64(double addrspace(1)* %out, double addrspace(1)* %aptr, double addrspace(1)* %in) #0 {
-; GFX1032-LABEL: test_div_scale_f64:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x34
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v4, 3, v0
-; GFX1032-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dwordx2 v[0:1], v4, s[2:3] glc dlc
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    global_load_dwordx2 v[2:3], v4, s[2:3] offset:8 glc dlc
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_div_scale_f64 v[0:1], s2, v[0:1], v[2:3], v[0:1]
-; GFX1032-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1032-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_div_scale_f64:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x34
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v4, 3, v0
-; GFX1064-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dwordx2 v[0:1], v4, s[2:3] glc dlc
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    global_load_dwordx2 v[2:3], v4, s[2:3] offset:8 glc dlc
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_div_scale_f64 v[0:1], s[2:3], v[0:1], v[2:3], v[0:1]
-; GFX1064-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1064-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1064-NEXT:    s_endpgm
   %tid = call i32 @llvm.amdgcn.workitem.id.x() nounwind readnone
   %gep.0 = getelementptr double, double addrspace(1)* %in, i32 %tid
   %gep.1 = getelementptr double, double addrspace(1)* %gep.0, i32 1
@@ -1125,20 +395,10 @@ define amdgpu_kernel void @test_div_scale_f64(double addrspace(1)* %out, double
   ret void
 }
 
+; GCN-LABEL: {{^}}test_mad_i64_i32:
+; GFX1032: v_mad_i64_i32 v[{{[0-9:]+}}], s{{[0-9]+}}, v{{[0-9]+}}, v{{[0-9]+}}, v[{{[0-9:]+}}]
+; GFX1064: v_mad_i64_i32 v[{{[0-9:]+}}], s[{{[0-9:]+}}], v{{[0-9]+}}, v{{[0-9]+}}, v[{{[0-9:]+}}]
 define i64 @test_mad_i64_i32(i32 %arg0, i32 %arg1, i64 %arg2) #0 {
-; GFX1032-LABEL: test_mad_i64_i32:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
-; GFX1032-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX1032-NEXT:    v_mad_i64_i32 v[0:1], s4, v0, v1, v[2:3]
-; GFX1032-NEXT:    s_setpc_b64 s[30:31]
-;
-; GFX1064-LABEL: test_mad_i64_i32:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
-; GFX1064-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX1064-NEXT:    v_mad_i64_i32 v[0:1], s[4:5], v0, v1, v[2:3]
-; GFX1064-NEXT:    s_setpc_b64 s[30:31]
   %sext0 = sext i32 %arg0 to i64
   %sext1 = sext i32 %arg1 to i64
   %mul = mul i64 %sext0, %sext1
@@ -1146,20 +406,10 @@ define i64 @test_mad_i64_i32(i32 %arg0, i32 %arg1, i64 %arg2) #0 {
   ret i64 %mad
 }
 
+; GCN-LABEL: {{^}}test_mad_u64_u32:
+; GFX1032: v_mad_u64_u32 v[{{[0-9:]+}}], s{{[0-9]+}}, v{{[0-9]+}}, v{{[0-9]+}}, v[{{[0-9:]+}}]
+; GFX1064: v_mad_u64_u32 v[{{[0-9:]+}}], s[{{[0-9:]+}}], v{{[0-9]+}}, v{{[0-9]+}}, v[{{[0-9:]+}}]
 define i64 @test_mad_u64_u32(i32 %arg0, i32 %arg1, i64 %arg2) #0 {
-; GFX1032-LABEL: test_mad_u64_u32:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
-; GFX1032-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX1032-NEXT:    v_mad_u64_u32 v[0:1], s4, v0, v1, v[2:3]
-; GFX1032-NEXT:    s_setpc_b64 s[30:31]
-;
-; GFX1064-LABEL: test_mad_u64_u32:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
-; GFX1064-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX1064-NEXT:    v_mad_u64_u32 v[0:1], s[4:5], v0, v1, v[2:3]
-; GFX1064-NEXT:    s_setpc_b64 s[30:31]
   %sext0 = zext i32 %arg0 to i64
   %sext1 = zext i32 %arg1 to i64
   %mul = mul i64 %sext0, %sext1
@@ -1167,134 +417,40 @@ define i64 @test_mad_u64_u32(i32 %arg0, i32 %arg1, i64 %arg2) #0 {
   ret i64 %mad
 }
 
+; GCN-LABEL: {{^}}test_div_fmas_f32:
+; GFX1032: v_cmp_eq_u32_e64 vcc_lo,
+; GFX1064: v_cmp_eq_u32_e64 vcc,
+; GCN:     v_div_fmas_f32 v{{[0-9]+}}, {{[vs][0-9]+}}, v{{[0-9]+}}, v{{[0-9]+}}
 define amdgpu_kernel void @test_div_fmas_f32(float addrspace(1)* %out, float %a, float %b, float %c, i1 %d) nounwind {
-; GFX1032-LABEL: test_div_fmas_f32:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dwordx4 s[4:7], s[0:1], 0x2c
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_mov_b32_e32 v0, s5
-; GFX1032-NEXT:    v_mov_b32_e32 v1, s6
-; GFX1032-NEXT:    s_and_b32 s0, 1, s7
-; GFX1032-NEXT:    v_cmp_eq_u32_e64 vcc_lo, s0, 1
-; GFX1032-NEXT:    v_div_fmas_f32 v0, s4, v0, v1
-; GFX1032-NEXT:    global_store_dword v2, v0, s[2:3]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_div_fmas_f32:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dwordx4 s[4:7], s[0:1], 0x2c
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    s_and_b32 s0, 1, s7
-; GFX1064-NEXT:    v_mov_b32_e32 v0, s5
-; GFX1064-NEXT:    v_cmp_eq_u32_e64 vcc, s0, 1
-; GFX1064-NEXT:    v_mov_b32_e32 v1, s6
-; GFX1064-NEXT:    v_div_fmas_f32 v0, s4, v0, v1
-; GFX1064-NEXT:    global_store_dword v2, v0, s[2:3]
-; GFX1064-NEXT:    s_endpgm
   %result = call float @llvm.amdgcn.div.fmas.f32(float %a, float %b, float %c, i1 %d) nounwind readnone
   store float %result, float addrspace(1)* %out, align 4
   ret void
 }
 
+; GCN-LABEL: {{^}}test_div_fmas_f64:
+; GFX1032: v_cmp_eq_u32_e64 vcc_lo,
+; GFX1064: v_cmp_eq_u32_e64 vcc,
+; GCN-DAG: v_div_fmas_f64 v[{{[0-9:]+}}], {{[vs]}}[{{[0-9:]+}}], v[{{[0-9:]+}}], v[{{[0-9:]+}}]
 define amdgpu_kernel void @test_div_fmas_f64(double addrspace(1)* %out, double %a, double %b, double %c, i1 %d) nounwind {
-; GFX1032-LABEL: test_div_fmas_f64:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dwordx8 s[4:11], s[0:1], 0x24
-; GFX1032-NEXT:    s_load_dword s2, s[0:1], 0x44
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_mov_b32_e32 v0, s8
-; GFX1032-NEXT:    v_mov_b32_e32 v1, s9
-; GFX1032-NEXT:    v_mov_b32_e32 v2, s10
-; GFX1032-NEXT:    v_mov_b32_e32 v3, s11
-; GFX1032-NEXT:    s_and_b32 s0, 1, s2
-; GFX1032-NEXT:    v_cmp_eq_u32_e64 vcc_lo, s0, 1
-; GFX1032-NEXT:    v_div_fmas_f64 v[0:1], s[6:7], v[0:1], v[2:3]
-; GFX1032-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1032-NEXT:    global_store_dwordx2 v2, v[0:1], s[4:5]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_div_fmas_f64:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dwordx8 s[4:11], s[0:1], 0x24
-; GFX1064-NEXT:    s_load_dword s2, s[0:1], 0x44
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_mov_b32_e32 v0, s8
-; GFX1064-NEXT:    s_and_b32 s0, 1, s2
-; GFX1064-NEXT:    v_mov_b32_e32 v1, s9
-; GFX1064-NEXT:    v_cmp_eq_u32_e64 vcc, s0, 1
-; GFX1064-NEXT:    v_mov_b32_e32 v2, s10
-; GFX1064-NEXT:    v_mov_b32_e32 v3, s11
-; GFX1064-NEXT:    v_div_fmas_f64 v[0:1], s[6:7], v[0:1], v[2:3]
-; GFX1064-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1064-NEXT:    global_store_dwordx2 v2, v[0:1], s[4:5]
-; GFX1064-NEXT:    s_endpgm
   %result = call double @llvm.amdgcn.div.fmas.f64(double %a, double %b, double %c, i1 %d) nounwind readnone
   store double %result, double addrspace(1)* %out, align 8
   ret void
 }
 
+; GCN-LABEL: {{^}}test_div_fmas_f32_i1_phi_vcc:
+; GFX1032: s_mov_b32 [[VCC:vcc_lo]], 0{{$}}
+; GFX1064: s_mov_b64 [[VCC:vcc]], 0{{$}}
+; GFX1032: s_and_saveexec_b32 [[SAVE:s[0-9]+]], s{{[0-9]+}}{{$}}
+; GFX1064: s_and_saveexec_b64 [[SAVE:s\[[0-9]+:[0-9]+\]]], s[{{[0-9:]+}}]{{$}}
+
+; GCN: load_dword [[LOAD:v[0-9]+]]
+; GCN: v_cmp_ne_u32_e32 [[VCC]], 0, [[LOAD]]
+
+; GCN: BB{{[0-9_]+}}:
+; GFX1032: s_or_b32 exec_lo, exec_lo, [[SAVE]]
+; GFX1064: s_or_b64 exec, exec, [[SAVE]]
+; GCN: v_div_fmas_f32 {{v[0-9]+}}, {{v[0-9]+}}, {{v[0-9]+}}, {{v[0-9]+}}
 define amdgpu_kernel void @test_div_fmas_f32_i1_phi_vcc(float addrspace(1)* %out, float addrspace(1)* %in, i32 addrspace(1)* %dummy) #0 {
-; GFX1032-LABEL: test_div_fmas_f32_i1_phi_vcc:
-; GFX1032:       ; %bb.0: ; %entry
-; GFX1032-NEXT:    s_load_dwordx4 s[4:7], s[0:1], 0x24
-; GFX1032-NEXT:    v_lshlrev_b32_e32 v1, 2, v0
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x34
-; GFX1032-NEXT:    s_mov_b32 null, 0
-; GFX1032-NEXT:    v_cmp_eq_u32_e64 s0, 0, v0
-; GFX1032-NEXT:    s_mov_b32 vcc_lo, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_load_dwordx3 v[1:3], v1, s[6:7]
-; GFX1032-NEXT:    s_and_saveexec_b32 s1, s0
-; GFX1032-NEXT:    s_cbranch_execz BB22_2
-; GFX1032-NEXT:  ; %bb.1: ; %bb
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    global_load_dword v0, v0, s[2:3] glc dlc
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_cmp_ne_u32_e32 vcc_lo, 0, v0
-; GFX1032-NEXT:    s_and_b32 vcc_lo, vcc_lo, exec_lo
-; GFX1032-NEXT:  BB22_2: ; %exit
-; GFX1032-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1032-NEXT:    s_or_b32 exec_lo, exec_lo, s1
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_div_fmas_f32 v1, v1, v2, v3
-; GFX1032-NEXT:    global_store_dword v0, v1, s[4:5] offset:8
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_div_fmas_f32_i1_phi_vcc:
-; GFX1064:       ; %bb.0: ; %entry
-; GFX1064-NEXT:    s_load_dwordx4 s[4:7], s[0:1], 0x24
-; GFX1064-NEXT:    v_lshlrev_b32_e32 v1, 2, v0
-; GFX1064-NEXT:    s_load_dwordx2 s[8:9], s[0:1], 0x34
-; GFX1064-NEXT:    s_mov_b32 null, 0
-; GFX1064-NEXT:    v_cmp_eq_u32_e64 s[0:1], 0, v0
-; GFX1064-NEXT:    s_mov_b64 vcc, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_load_dwordx3 v[1:3], v1, s[6:7]
-; GFX1064-NEXT:    s_and_saveexec_b64 s[2:3], s[0:1]
-; GFX1064-NEXT:    s_cbranch_execz BB22_2
-; GFX1064-NEXT:  ; %bb.1: ; %bb
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    global_load_dword v0, v0, s[8:9] glc dlc
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_cmp_ne_u32_e32 vcc, 0, v0
-; GFX1064-NEXT:    s_and_b64 vcc, vcc, exec
-; GFX1064-NEXT:  BB22_2: ; %exit
-; GFX1064-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1064-NEXT:    s_or_b64 exec, exec, s[2:3]
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_div_fmas_f32 v1, v1, v2, v3
-; GFX1064-NEXT:    global_store_dword v0, v1, s[4:5] offset:8
-; GFX1064-NEXT:    s_endpgm
 entry:
   %tid = call i32 @llvm.amdgcn.workitem.id.x() nounwind readnone
   %gep.out = getelementptr float, float addrspace(1)* %out, i32 2
@@ -1321,98 +477,29 @@ exit:
   ret void
 }
 
+; GCN-LABEL: {{^}}fdiv_f32:
+; GFX1032: v_div_scale_f32 v{{[0-9]+}}, s{{[0-9]+}}, s{{[0-9]+}}, s{{[0-9]+}}, s{{[0-9]+}}
+; GFX1064: v_div_scale_f32 v{{[0-9]+}}, s{{\[[0-9]+:[0-9]+\]}}, s{{[0-9]+}}, s{{[0-9]+}}, s{{[0-9]+}}
+; GCN: v_rcp_f32_e32 v{{[0-9]+}}, v{{[0-9]+}}
+; GFX1032: v_div_scale_f32 v{{[0-9]+}}, vcc_lo, s{{[0-9]+}}, s{{[0-9]+}}, s{{[0-9]+}}
+; GFX1064: v_div_scale_f32 v{{[0-9]+}}, vcc, s{{[0-9]+}}, s{{[0-9]+}}, s{{[0-9]+}}
+
+; GCN-NOT: vcc
+; GCN: v_div_fmas_f32 v{{[0-9]+}}, v{{[0-9]+}}, v{{[0-9]+}}, v{{[0-9]+}}
 define amdgpu_kernel void @fdiv_f32(float addrspace(1)* %out, float %a, float %b) #0 {
-; GFX1032-LABEL: fdiv_f32:
-; GFX1032:       ; %bb.0: ; %entry
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x2c
-; GFX1032-NEXT:    s_nop 0
-; GFX1032-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_div_scale_f32 v0, s4, s3, s3, s2
-; GFX1032-NEXT:    v_rcp_f32_e32 v1, v0
-; GFX1032-NEXT:    v_fma_f32 v2, -v0, v1, 1.0
-; GFX1032-NEXT:    v_fmac_f32_e32 v1, v2, v1
-; GFX1032-NEXT:    v_div_scale_f32 v2, vcc_lo, s2, s3, s2
-; GFX1032-NEXT:    v_mul_f32_e32 v3, v2, v1
-; GFX1032-NEXT:    v_fma_f32 v4, v3, -v0, v2
-; GFX1032-NEXT:    v_fmac_f32_e32 v3, v4, v1
-; GFX1032-NEXT:    v_fmac_f32_e64 v2, -v0, v3
-; GFX1032-NEXT:    v_div_fmas_f32 v0, v2, v1, v3
-; GFX1032-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1032-NEXT:    v_div_fixup_f32 v0, v0, s3, s2
-; GFX1032-NEXT:    global_store_dword v1, v0, s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: fdiv_f32:
-; GFX1064:       ; %bb.0: ; %entry
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dwordx2 s[4:5], s[0:1], 0x2c
-; GFX1064-NEXT:    s_nop 0
-; GFX1064-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_div_scale_f32 v0, s[2:3], s5, s5, s4
-; GFX1064-NEXT:    v_rcp_f32_e32 v1, v0
-; GFX1064-NEXT:    v_fma_f32 v2, -v0, v1, 1.0
-; GFX1064-NEXT:    v_fmac_f32_e32 v1, v2, v1
-; GFX1064-NEXT:    v_div_scale_f32 v2, vcc, s4, s5, s4
-; GFX1064-NEXT:    v_mul_f32_e32 v3, v2, v1
-; GFX1064-NEXT:    v_fma_f32 v4, v3, -v0, v2
-; GFX1064-NEXT:    v_fmac_f32_e32 v3, v4, v1
-; GFX1064-NEXT:    v_fmac_f32_e64 v2, -v0, v3
-; GFX1064-NEXT:    v_div_fmas_f32 v0, v2, v1, v3
-; GFX1064-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1064-NEXT:    v_div_fixup_f32 v0, v0, s5, s4
-; GFX1064-NEXT:    global_store_dword v1, v0, s[0:1]
-; GFX1064-NEXT:    s_endpgm
 entry:
   %fdiv = fdiv float %a, %b
   store float %fdiv, float addrspace(1)* %out
   ret void
 }
 
+; GCN-LABEL: {{^}}test_br_cc_f16:
+; GFX1032:  v_cmp_nlt_f16_e32 vcc_lo,
+; GFX1032:  s_and_b32 vcc_lo, exec_lo, vcc_lo
+; GFX1064:  v_cmp_nlt_f16_e32 vcc,
+; GFX1064:  s_and_b64 vcc, exec, vcc{{$}}
+; GCN-NEXT: s_cbranch_vccnz
 define amdgpu_kernel void @test_br_cc_f16(
-; GFX1032-LABEL: test_br_cc_f16:
-; GFX1032:       ; %bb.0: ; %entry
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dwordx4 s[4:7], s[0:1], 0x24
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x34
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    global_load_ushort v1, v0, s[6:7]
-; GFX1032-NEXT:    global_load_ushort v2, v0, s[2:3]
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_cmp_nlt_f16_e32 vcc_lo, v1, v2
-; GFX1032-NEXT:    s_and_b32 vcc_lo, exec_lo, vcc_lo
-; GFX1032-NEXT:    s_cbranch_vccnz BB24_2
-; GFX1032-NEXT:  ; %bb.1: ; %one
-; GFX1032-NEXT:    global_store_short v0, v1, s[4:5]
-; GFX1032-NEXT:    s_endpgm
-; GFX1032-NEXT:  BB24_2: ; %two
-; GFX1032-NEXT:    global_store_short v0, v2, s[4:5]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_br_cc_f16:
-; GFX1064:       ; %bb.0: ; %entry
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dwordx4 s[4:7], s[0:1], 0x24
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x34
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    global_load_ushort v1, v0, s[6:7]
-; GFX1064-NEXT:    global_load_ushort v2, v0, s[2:3]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_cmp_nlt_f16_e32 vcc, v1, v2
-; GFX1064-NEXT:    s_and_b64 vcc, exec, vcc
-; GFX1064-NEXT:    s_cbranch_vccnz BB24_2
-; GFX1064-NEXT:  ; %bb.1: ; %one
-; GFX1064-NEXT:    global_store_short v0, v1, s[4:5]
-; GFX1064-NEXT:    s_endpgm
-; GFX1064-NEXT:  BB24_2: ; %two
-; GFX1064-NEXT:    global_store_short v0, v2, s[4:5]
-; GFX1064-NEXT:    s_endpgm
     half addrspace(1)* %r,
     half addrspace(1)* %a,
     half addrspace(1)* %b) {
@@ -1431,22 +518,10 @@ two:
   ret void
 }
 
+; GCN-LABEL: {{^}}test_brcc_i1:
+; GCN:      s_cmp_eq_u32 s{{[0-9]+}}, 0
+; GCN-NEXT: s_cbranch_scc1
 define amdgpu_kernel void @test_brcc_i1(i32 addrspace(1)* noalias %out, i32 addrspace(1)* noalias %in, i1 %val) #0 {
-; GCN-LABEL: test_brcc_i1:
-; GCN:       ; %bb.0:
-; GCN-NEXT:    s_load_dword s2, s[0:1], 0x34
-; GCN-NEXT:    s_waitcnt lgkmcnt(0)
-; GCN-NEXT:    s_and_b32 s2, s2, 1
-; GCN-NEXT:    s_cmp_eq_u32 s2, 0
-; GCN-NEXT:    s_cbranch_scc1 BB25_2
-; GCN-NEXT:  ; %bb.1: ; %store
-; GCN-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GCN-NEXT:    v_mov_b32_e32 v0, 0
-; GCN-NEXT:    v_mov_b32_e32 v1, 0xde
-; GCN-NEXT:    s_waitcnt lgkmcnt(0)
-; GCN-NEXT:    global_store_dword v0, v1, s[0:1]
-; GCN-NEXT:  BB25_2: ; %end
-; GCN-NEXT:    s_endpgm
   %cmp0 = icmp ne i1 %val, 0
   br i1 %cmp0, label %store, label %end
 
@@ -1458,46 +533,21 @@ end:
   ret void
 }
 
+; GCN-LABEL: {{^}}test_preserve_condition_undef_flag:
+; GFX1032-DAG: v_cmp_nlt_f32_e64 s{{[0-9]+}}, s{{[0-9]+}}, 1.0
+; GFX1032-DAG: v_cmp_ngt_f32_e64 s{{[0-9]+}}, s{{[0-9]+}}, 0
+; GFX1032: v_cmp_nlt_f32_e64 s{{[0-9]+}}, s{{[0-9]+}}, 1.0
+; GFX1032: s_or_b32 [[OR1:s[0-9]+]], s{{[0-9]+}}, s{{[0-9]+}}
+; GFX1032: s_or_b32 [[OR2:s[0-9]+]], [[OR1]], s{{[0-9]+}}
+; GFX1032: s_and_b32 vcc_lo, exec_lo, [[OR2]]
+; GFX1064-DAG: v_cmp_nlt_f32_e64 s[{{[0-9:]+}}], s{{[0-9]+}}, 1.0
+; GFX1064-DAG: v_cmp_ngt_f32_e64 s[{{[0-9:]+}}], s{{[0-9]+}}, 0
+; GFX1064: v_cmp_nlt_f32_e64 s[{{[0-9:]+}}], s{{[0-9]+}}, 1.0
+; GFX1064: s_or_b64 [[OR1:s\[[0-9:]+\]]], s[{{[0-9:]+}}], s[{{[0-9:]+}}]
+; GFX1064: s_or_b64 [[OR2:s\[[0-9:]+\]]], [[OR1]], s[{{[0-9:]+}}]
+; GFX1064: s_and_b64 vcc, exec, [[OR2]]
+; GCN:     s_cbranch_vccnz
 define amdgpu_kernel void @test_preserve_condition_undef_flag(float %arg, i32 %arg1, float %arg2) #0 {
-; GFX1032-LABEL: test_preserve_condition_undef_flag:
-; GFX1032:       ; %bb.0: ; %bb0
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dword s2, s[0:1], 0x2c
-; GFX1032-NEXT:    s_load_dword s3, s[0:1], 0x24
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_cmp_ngt_f32_e64 s0, s2, 0
-; GFX1032-NEXT:    v_cmp_nlt_f32_e64 s1, s2, 1.0
-; GFX1032-NEXT:    v_cmp_nlt_f32_e64 s2, s3, 1.0
-; GFX1032-NEXT:    s_or_b32 s0, s0, s1
-; GFX1032-NEXT:    s_or_b32 s0, s0, s2
-; GFX1032-NEXT:    s_and_b32 vcc_lo, exec_lo, s0
-; GFX1032-NEXT:    s_cbranch_vccnz BB26_2
-; GFX1032-NEXT:  ; %bb.1: ; %bb1
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    global_store_dword v[0:1], v0, off
-; GFX1032-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX1032-NEXT:  BB26_2: ; %bb2
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_preserve_condition_undef_flag:
-; GFX1064:       ; %bb.0: ; %bb0
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dword s2, s[0:1], 0x2c
-; GFX1064-NEXT:    s_load_dword s4, s[0:1], 0x24
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_cmp_ngt_f32_e64 s[0:1], s2, 0
-; GFX1064-NEXT:    v_cmp_nlt_f32_e64 s[2:3], s2, 1.0
-; GFX1064-NEXT:    v_cmp_nlt_f32_e64 s[4:5], s4, 1.0
-; GFX1064-NEXT:    s_or_b64 s[0:1], s[0:1], s[2:3]
-; GFX1064-NEXT:    s_or_b64 s[0:1], s[0:1], s[4:5]
-; GFX1064-NEXT:    s_and_b64 vcc, exec, s[0:1]
-; GFX1064-NEXT:    s_cbranch_vccnz BB26_2
-; GFX1064-NEXT:  ; %bb.1: ; %bb1
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    global_store_dword v[0:1], v0, off
-; GFX1064-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX1064-NEXT:  BB26_2: ; %bb2
-; GFX1064-NEXT:    s_endpgm
 bb0:
   %tmp = icmp sgt i32 %arg1, 4
   %undef = call i1 @llvm.amdgcn.class.f32(float undef, i32 undef)
@@ -1517,82 +567,12 @@ bb2:
   ret void
 }
 
+; GCN-LABEL: {{^}}test_invert_true_phi_cond_break_loop:
+; GFX1032: s_xor_b32 s{{[0-9]+}}, s{{[0-9]+}}, -1
+; GFX1032: s_or_b32 s{{[0-9]+}}, s{{[0-9]+}}, s{{[0-9]+}}
+; GFX1064: s_xor_b64 s[{{[0-9:]+}}], s[{{[0-9:]+}}], -1
+; GFX1064: s_or_b64 s[{{[0-9:]+}}], s[{{[0-9:]+}}], s[{{[0-9:]+}}]
 define amdgpu_kernel void @test_invert_true_phi_cond_break_loop(i32 %arg) #0 {
-; GFX1032-LABEL: test_invert_true_phi_cond_break_loop:
-; GFX1032:       ; %bb.0: ; %bb
-; GFX1032-NEXT:    s_load_dword s0, s[0:1], 0x24
-; GFX1032-NEXT:    ; implicit-def: $sgpr1
-; GFX1032-NEXT:    ; implicit-def: $sgpr2
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_subrev_nc_u32_e32 v0, s0, v0
-; GFX1032-NEXT:    s_mov_b32 s0, 0
-; GFX1032-NEXT:    s_branch BB27_2
-; GFX1032-NEXT:  BB27_1: ; %Flow
-; GFX1032-NEXT:    ; in Loop: Header=BB27_2 Depth=1
-; GFX1032-NEXT:    s_xor_b32 s3, s1, -1
-; GFX1032-NEXT:    s_add_i32 s2, s2, 1
-; GFX1032-NEXT:    s_and_b32 s3, exec_lo, s3
-; GFX1032-NEXT:    s_or_b32 s0, s3, s0
-; GFX1032-NEXT:    s_andn2_b32 exec_lo, exec_lo, s0
-; GFX1032-NEXT:    s_cbranch_execz BB27_4
-; GFX1032-NEXT:  BB27_2: ; %bb1
-; GFX1032-NEXT:    ; =>This Inner Loop Header: Depth=1
-; GFX1032-NEXT:    s_or_b32 s1, s1, exec_lo
-; GFX1032-NEXT:    s_cmp_gt_i32 s2, -1
-; GFX1032-NEXT:    s_cbranch_scc1 BB27_1
-; GFX1032-NEXT:  ; %bb.3: ; %bb4
-; GFX1032-NEXT:    ; in Loop: Header=BB27_2 Depth=1
-; GFX1032-NEXT:    global_load_dword v1, v[0:1], off glc dlc
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    s_andn2_b32 s1, s1, exec_lo
-; GFX1032-NEXT:    v_cmp_ge_i32_e32 vcc_lo, v0, v1
-; GFX1032-NEXT:    s_and_b32 s3, vcc_lo, exec_lo
-; GFX1032-NEXT:    s_or_b32 s1, s1, s3
-; GFX1032-NEXT:    s_branch BB27_1
-; GFX1032-NEXT:  BB27_4: ; %bb9
-; GFX1032-NEXT:    s_or_b32 exec_lo, exec_lo, s0
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 7
-; GFX1032-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX1032-NEXT:    ds_write_b32 v0, v0
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_invert_true_phi_cond_break_loop:
-; GFX1064:       ; %bb.0: ; %bb
-; GFX1064-NEXT:    s_load_dword s0, s[0:1], 0x24
-; GFX1064-NEXT:    ; implicit-def: $sgpr2_sgpr3
-; GFX1064-NEXT:    ; implicit-def: $sgpr4
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_subrev_nc_u32_e32 v0, s0, v0
-; GFX1064-NEXT:    s_mov_b64 s[0:1], 0
-; GFX1064-NEXT:    s_branch BB27_2
-; GFX1064-NEXT:  BB27_1: ; %Flow
-; GFX1064-NEXT:    ; in Loop: Header=BB27_2 Depth=1
-; GFX1064-NEXT:    s_xor_b64 s[6:7], s[2:3], -1
-; GFX1064-NEXT:    s_add_i32 s4, s4, 1
-; GFX1064-NEXT:    s_and_b64 s[6:7], exec, s[6:7]
-; GFX1064-NEXT:    s_or_b64 s[0:1], s[6:7], s[0:1]
-; GFX1064-NEXT:    s_andn2_b64 exec, exec, s[0:1]
-; GFX1064-NEXT:    s_cbranch_execz BB27_4
-; GFX1064-NEXT:  BB27_2: ; %bb1
-; GFX1064-NEXT:    ; =>This Inner Loop Header: Depth=1
-; GFX1064-NEXT:    s_or_b64 s[2:3], s[2:3], exec
-; GFX1064-NEXT:    s_cmp_gt_i32 s4, -1
-; GFX1064-NEXT:    s_cbranch_scc1 BB27_1
-; GFX1064-NEXT:  ; %bb.3: ; %bb4
-; GFX1064-NEXT:    ; in Loop: Header=BB27_2 Depth=1
-; GFX1064-NEXT:    global_load_dword v1, v[0:1], off glc dlc
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    s_andn2_b64 s[2:3], s[2:3], exec
-; GFX1064-NEXT:    v_cmp_ge_i32_e32 vcc, v0, v1
-; GFX1064-NEXT:    s_and_b64 s[6:7], vcc, exec
-; GFX1064-NEXT:    s_or_b64 s[2:3], s[2:3], s[6:7]
-; GFX1064-NEXT:    s_branch BB27_1
-; GFX1064-NEXT:  BB27_4: ; %bb9
-; GFX1064-NEXT:    s_or_b64 exec, exec, s[0:1]
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 7
-; GFX1064-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX1064-NEXT:    ds_write_b32 v0, v0
-; GFX1064-NEXT:    s_endpgm
 bb:
   %id = call i32 @llvm.amdgcn.workitem.id.x()
   %tmp = sub i32 %id, %arg
@@ -1619,36 +599,20 @@ bb9:                                              ; preds = %Flow
   ret void
 }
 
+; GCN-LABEL: {{^}}test_movrels_extract_neg_offset_vgpr:
+; GFX1032: v_cmp_eq_u32_e32 vcc_lo, 1, v{{[0-9]+}}
+; GFX1032: v_cndmask_b32_e64 v{{[0-9]+}}, 0, 1, vcc_lo
+; GFX1032: v_cmp_ne_u32_e32 vcc_lo, 2, v{{[0-9]+}}
+; GFX1032: v_cndmask_b32_e32 v{{[0-9]+}}, 2, v{{[0-9]+}}, vcc_lo
+; GFX1032: v_cmp_ne_u32_e32 vcc_lo, 3, v{{[0-9]+}}
+; GFX1032: v_cndmask_b32_e32 v{{[0-9]+}}, 3, v{{[0-9]+}}, vcc_lo
+; GFX1064: v_cmp_eq_u32_e32 vcc, 1, v{{[0-9]+}}
+; GFX1064: v_cndmask_b32_e64 v{{[0-9]+}}, 0, 1, vcc
+; GFX1064: v_cmp_ne_u32_e32 vcc, 2, v{{[0-9]+}}
+; GFX1064: v_cndmask_b32_e32 v{{[0-9]+}}, 2, v{{[0-9]+}}, vcc
+; GFX1064: v_cmp_ne_u32_e32 vcc, 3, v{{[0-9]+}}
+; GFX1064: v_cndmask_b32_e32 v{{[0-9]+}}, 3, v{{[0-9]+}}, vcc
 define amdgpu_kernel void @test_movrels_extract_neg_offset_vgpr(i32 addrspace(1)* %out) #0 {
-; GFX1032-LABEL: test_movrels_extract_neg_offset_vgpr:
-; GFX1032:       ; %bb.0: ; %entry
-; GFX1032-NEXT:    v_add_nc_u32_e32 v0, 0xfffffe00, v0
-; GFX1032-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1032-NEXT:    v_cmp_eq_u32_e32 vcc_lo, 1, v0
-; GFX1032-NEXT:    v_cndmask_b32_e64 v1, 0, 1, vcc_lo
-; GFX1032-NEXT:    v_cmp_ne_u32_e32 vcc_lo, 2, v0
-; GFX1032-NEXT:    v_cndmask_b32_e32 v1, 2, v1, vcc_lo
-; GFX1032-NEXT:    v_cmp_ne_u32_e32 vcc_lo, 3, v0
-; GFX1032-NEXT:    v_cndmask_b32_e32 v0, 3, v1, vcc_lo
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    global_store_dword v2, v0, s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_movrels_extract_neg_offset_vgpr:
-; GFX1064:       ; %bb.0: ; %entry
-; GFX1064-NEXT:    v_add_nc_u32_e32 v0, 0xfffffe00, v0
-; GFX1064-NEXT:    s_load_dwordx2 s[0:1], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1064-NEXT:    v_cmp_eq_u32_e32 vcc, 1, v0
-; GFX1064-NEXT:    v_cndmask_b32_e64 v1, 0, 1, vcc
-; GFX1064-NEXT:    v_cmp_ne_u32_e32 vcc, 2, v0
-; GFX1064-NEXT:    v_cndmask_b32_e32 v1, 2, v1, vcc
-; GFX1064-NEXT:    v_cmp_ne_u32_e32 vcc, 3, v0
-; GFX1064-NEXT:    v_cndmask_b32_e32 v0, 3, v1, vcc
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    global_store_dword v2, v0, s[0:1]
-; GFX1064-NEXT:    s_endpgm
 entry:
   %id = call i32 @llvm.amdgcn.workitem.id.x() #1
   %index = add i32 %id, -512
@@ -1657,128 +621,54 @@ entry:
   ret void
 }
 
+; GCN-LABEL: {{^}}test_set_inactive:
+; GFX1032: s_not_b32 exec_lo, exec_lo
+; GFX1032: v_mov_b32_e32 {{v[0-9]+}}, 42
+; GFX1032: s_not_b32 exec_lo, exec_lo
+; GFX1064: s_not_b64 exec, exec{{$}}
+; GFX1064: v_mov_b32_e32 {{v[0-9]+}}, 42
+; GFX1064: s_not_b64 exec, exec{{$}}
 define amdgpu_kernel void @test_set_inactive(i32 addrspace(1)* %out, i32 %in) #0 {
-; GFX1032-LABEL: test_set_inactive:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dword s4, s[0:1], 0x2c
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_mov_b32_e32 v0, s4
-; GFX1032-NEXT:    s_not_b32 exec_lo, exec_lo
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 42
-; GFX1032-NEXT:    s_not_b32 exec_lo, exec_lo
-; GFX1032-NEXT:    global_store_dword v1, v0, s[2:3]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_set_inactive:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dword s4, s[0:1], 0x2c
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_mov_b32_e32 v0, s4
-; GFX1064-NEXT:    s_not_b64 exec, exec
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 42
-; GFX1064-NEXT:    s_not_b64 exec, exec
-; GFX1064-NEXT:    global_store_dword v1, v0, s[2:3]
-; GFX1064-NEXT:    s_endpgm
   %tmp = call i32 @llvm.amdgcn.set.inactive.i32(i32 %in, i32 42)
   store i32 %tmp, i32 addrspace(1)* %out
   ret void
 }
 
+; GCN-LABEL: {{^}}test_set_inactive_64:
+; GFX1032: s_not_b32 exec_lo, exec_lo
+; GFX1032: v_mov_b32_e32 {{v[0-9]+}}, 0
+; GFX1032: v_mov_b32_e32 {{v[0-9]+}}, 0
+; GFX1032: s_not_b32 exec_lo, exec_lo
+; GFX1064: s_not_b64 exec, exec{{$}}
+; GFX1064: v_mov_b32_e32 {{v[0-9]+}}, 0
+; GFX1064: v_mov_b32_e32 {{v[0-9]+}}, 0
+; GFX1064: s_not_b64 exec, exec{{$}}
 define amdgpu_kernel void @test_set_inactive_64(i64 addrspace(1)* %out, i64 %in) #0 {
-; GFX1032-LABEL: test_set_inactive_64:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_mov_b32_e32 v0, s2
-; GFX1032-NEXT:    v_mov_b32_e32 v1, s3
-; GFX1032-NEXT:    s_not_b32 exec_lo, exec_lo
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1032-NEXT:    s_not_b32 exec_lo, exec_lo
-; GFX1032-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_set_inactive_64:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_mov_b32_e32 v0, s2
-; GFX1064-NEXT:    v_mov_b32_e32 v1, s3
-; GFX1064-NEXT:    s_not_b64 exec, exec
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1064-NEXT:    s_not_b64 exec, exec
-; GFX1064-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1064-NEXT:    s_endpgm
   %tmp = call i64 @llvm.amdgcn.set.inactive.i64(i64 %in, i64 0)
   store i64 %tmp, i64 addrspace(1)* %out
   ret void
 }
 
+; GCN-LABEL: {{^}}test_kill_i1_terminator_float:
+; GFX1032: s_mov_b32 exec_lo, 0
+; GFX1064: s_mov_b64 exec, 0
 define amdgpu_ps void @test_kill_i1_terminator_float() #0 {
-; GFX1032-LABEL: test_kill_i1_terminator_float:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_andn2_b32 exec_lo, exec_lo, exec_lo
-; GFX1032-NEXT:    s_cbranch_scc0 BB31_1
-; GFX1032-NEXT:    s_endpgm
-; GFX1032-NEXT:  BB31_1:
-; GFX1032-NEXT:    s_mov_b32 exec_lo, 0
-; GFX1032-NEXT:    exp null off, off, off, off done vm
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_kill_i1_terminator_float:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_andn2_b64 exec, exec, exec
-; GFX1064-NEXT:    s_cbranch_scc0 BB31_1
-; GFX1064-NEXT:    s_endpgm
-; GFX1064-NEXT:  BB31_1:
-; GFX1064-NEXT:    s_mov_b64 exec, 0
-; GFX1064-NEXT:    exp null off, off, off, off done vm
-; GFX1064-NEXT:    s_endpgm
   call void @llvm.amdgcn.kill(i1 false)
   ret void
 }
 
+; GCN-LABEL: {{^}}test_kill_i1_terminator_i1:
+; GFX1032: s_mov_b32 [[LIVE:s[0-9]+]], exec_lo
+; GFX1032: s_or_b32 [[OR:s[0-9]+]],
+; GFX1032: s_xor_b32 [[KILL:s[0-9]+]], [[OR]], exec_lo
+; GFX1032: s_andn2_b32 [[MASK:s[0-9]+]], [[LIVE]], [[KILL]]
+; GFX1032: s_and_b32 exec_lo, exec_lo, [[MASK]]
+; GFX1064: s_mov_b64 [[LIVE:s\[[0-9:]+\]]], exec
+; GFX1064: s_or_b64 [[OR:s\[[0-9:]+\]]],
+; GFX1064: s_xor_b64 [[KILL:s\[[0-9:]+\]]], [[OR]], exec
+; GFX1064: s_andn2_b64 [[MASK:s\[[0-9:]+\]]], [[LIVE]], [[KILL]]
+; GFX1064: s_and_b64 exec, exec, [[MASK]]
 define amdgpu_gs void @test_kill_i1_terminator_i1(i32 %a, i32 %b, i32 %c, i32 %d) #0 {
-; GFX1032-LABEL: test_kill_i1_terminator_i1:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    v_cmp_lt_i32_e32 vcc_lo, v0, v1
-; GFX1032-NEXT:    v_cmp_lt_i32_e64 s0, v2, v3
-; GFX1032-NEXT:    s_mov_b32 s1, exec_lo
-; GFX1032-NEXT:    s_or_b32 s0, vcc_lo, s0
-; GFX1032-NEXT:    s_xor_b32 s0, s0, exec_lo
-; GFX1032-NEXT:    s_andn2_b32 s1, s1, s0
-; GFX1032-NEXT:    s_and_b32 exec_lo, exec_lo, s1
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    exp mrt0 off, off, off, off
-; GFX1032-NEXT:    s_endpgm
-; GFX1032-NEXT:  ; %bb.1:
-; GFX1032-NEXT:    s_mov_b32 exec_lo, 0
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_kill_i1_terminator_i1:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    v_cmp_lt_i32_e32 vcc, v0, v1
-; GFX1064-NEXT:    v_cmp_lt_i32_e64 s[0:1], v2, v3
-; GFX1064-NEXT:    s_mov_b64 s[2:3], exec
-; GFX1064-NEXT:    s_or_b64 s[0:1], vcc, s[0:1]
-; GFX1064-NEXT:    s_xor_b64 s[0:1], s[0:1], exec
-; GFX1064-NEXT:    s_andn2_b64 s[2:3], s[2:3], s[0:1]
-; GFX1064-NEXT:    s_and_b64 exec, exec, s[2:3]
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    exp mrt0 off, off, off, off
-; GFX1064-NEXT:    s_endpgm
-; GFX1064-NEXT:  ; %bb.1:
-; GFX1064-NEXT:    s_mov_b64 exec, 0
-; GFX1064-NEXT:    s_endpgm
   %c1 = icmp slt i32 %a, %b
   %c2 = icmp slt i32 %c, %d
   %x = or i1 %c1, %c2
@@ -1787,90 +677,11 @@ define amdgpu_gs void @test_kill_i1_terminator_i1(i32 %a, i32 %b, i32 %c, i32 %d
   ret void
 }
 
+; GCN-LABEL: {{^}}test_loop_vcc:
+; GFX1032: v_cmp_lt_f32_e32 vcc_lo,
+; GFX1064: v_cmp_lt_f32_e32 vcc,
+; GCN: s_cbranch_vccz
 define amdgpu_ps <4 x float> @test_loop_vcc(<4 x float> %in) #0 {
-; GFX1032-LABEL: test_loop_vcc:
-; GFX1032:       ; %bb.0: ; %entry
-; GFX1032-NEXT:    s_mov_b32 s0, exec_lo
-; GFX1032-NEXT:    s_wqm_b32 exec_lo, exec_lo
-; GFX1032-NEXT:    v_mov_b32_e32 v7, v3
-; GFX1032-NEXT:    v_mov_b32_e32 v6, v2
-; GFX1032-NEXT:    v_mov_b32_e32 v5, v1
-; GFX1032-NEXT:    v_mov_b32_e32 v4, v0
-; GFX1032-NEXT:    v_mov_b32_e32 v8, 0
-; GFX1032-NEXT:    s_mov_b32 s4, 0
-; GFX1032-NEXT:    s_branch BB33_2
-; GFX1032-NEXT:  BB33_1: ; %body
-; GFX1032-NEXT:    ; in Loop: Header=BB33_2 Depth=1
-; GFX1032-NEXT:    s_mov_b32 s5, s4
-; GFX1032-NEXT:    s_mov_b32 s6, s4
-; GFX1032-NEXT:    s_mov_b32 s7, s4
-; GFX1032-NEXT:    s_mov_b32 s8, s4
-; GFX1032-NEXT:    s_mov_b32 s9, s4
-; GFX1032-NEXT:    s_mov_b32 s10, s4
-; GFX1032-NEXT:    s_mov_b32 s11, s4
-; GFX1032-NEXT:    v_add_f32_e32 v8, 2.0, v8
-; GFX1032-NEXT:    image_sample v[4:7], v0, s[4:11], s[0:3] dmask:0xf dim:SQ_RSRC_IMG_1D
-; GFX1032-NEXT:    s_cbranch_execz BB33_4
-; GFX1032-NEXT:  BB33_2: ; %loop
-; GFX1032-NEXT:    ; =>This Inner Loop Header: Depth=1
-; GFX1032-NEXT:    v_cmp_lt_f32_e32 vcc_lo, 0x40e00000, v8
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_mov_b32_e32 v0, v4
-; GFX1032-NEXT:    v_mov_b32_e32 v1, v5
-; GFX1032-NEXT:    v_mov_b32_e32 v2, v6
-; GFX1032-NEXT:    v_mov_b32_e32 v3, v7
-; GFX1032-NEXT:    s_and_b32 vcc_lo, exec_lo, vcc_lo
-; GFX1032-NEXT:    s_cbranch_vccz BB33_1
-; GFX1032-NEXT:  ; %bb.3:
-; GFX1032-NEXT:    ; implicit-def: $vgpr4_vgpr5_vgpr6_vgpr7
-; GFX1032-NEXT:    ; implicit-def: $vgpr8
-; GFX1032-NEXT:  BB33_4: ; %break
-; GFX1032-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1032-NEXT:    s_and_b32 exec_lo, exec_lo, s0
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    ; return to shader part epilog
-;
-; GFX1064-LABEL: test_loop_vcc:
-; GFX1064:       ; %bb.0: ; %entry
-; GFX1064-NEXT:    s_mov_b64 s[0:1], exec
-; GFX1064-NEXT:    s_wqm_b64 exec, exec
-; GFX1064-NEXT:    v_mov_b32_e32 v7, v3
-; GFX1064-NEXT:    v_mov_b32_e32 v6, v2
-; GFX1064-NEXT:    v_mov_b32_e32 v5, v1
-; GFX1064-NEXT:    v_mov_b32_e32 v4, v0
-; GFX1064-NEXT:    v_mov_b32_e32 v8, 0
-; GFX1064-NEXT:    s_mov_b32 s4, 0
-; GFX1064-NEXT:    s_branch BB33_2
-; GFX1064-NEXT:  BB33_1: ; %body
-; GFX1064-NEXT:    ; in Loop: Header=BB33_2 Depth=1
-; GFX1064-NEXT:    s_mov_b32 s5, s4
-; GFX1064-NEXT:    s_mov_b32 s6, s4
-; GFX1064-NEXT:    s_mov_b32 s7, s4
-; GFX1064-NEXT:    s_mov_b32 s8, s4
-; GFX1064-NEXT:    s_mov_b32 s9, s4
-; GFX1064-NEXT:    s_mov_b32 s10, s4
-; GFX1064-NEXT:    s_mov_b32 s11, s4
-; GFX1064-NEXT:    v_add_f32_e32 v8, 2.0, v8
-; GFX1064-NEXT:    image_sample v[4:7], v0, s[4:11], s[0:3] dmask:0xf dim:SQ_RSRC_IMG_1D
-; GFX1064-NEXT:    s_cbranch_execz BB33_4
-; GFX1064-NEXT:  BB33_2: ; %loop
-; GFX1064-NEXT:    ; =>This Inner Loop Header: Depth=1
-; GFX1064-NEXT:    v_cmp_lt_f32_e32 vcc, 0x40e00000, v8
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_mov_b32_e32 v0, v4
-; GFX1064-NEXT:    v_mov_b32_e32 v1, v5
-; GFX1064-NEXT:    v_mov_b32_e32 v2, v6
-; GFX1064-NEXT:    v_mov_b32_e32 v3, v7
-; GFX1064-NEXT:    s_and_b64 vcc, exec, vcc
-; GFX1064-NEXT:    s_cbranch_vccz BB33_1
-; GFX1064-NEXT:  ; %bb.3:
-; GFX1064-NEXT:    ; implicit-def: $vgpr4_vgpr5_vgpr6_vgpr7
-; GFX1064-NEXT:    ; implicit-def: $vgpr8
-; GFX1064-NEXT:  BB33_4: ; %break
-; GFX1064-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1064-NEXT:    s_and_b64 exec, exec, s[0:1]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    ; return to shader part epilog
 entry:
   br label %loop
 
@@ -1891,72 +702,30 @@ break:
 }
 
 ; NOTE: llvm.amdgcn.wwm is deprecated, use llvm.amdgcn.strict.wwm instead.
+; GCN-LABEL: {{^}}test_wwm1:
+; GFX1032: s_or_saveexec_b32 [[SAVE:s[0-9]+]], -1
+; GFX1032: s_mov_b32 exec_lo, [[SAVE]]
+; GFX1064: s_or_saveexec_b64 [[SAVE:s\[[0-9]+:[0-9]+\]]], -1
+; GFX1064: s_mov_b64 exec, [[SAVE]]
 define amdgpu_ps float @test_wwm1(i32 inreg %idx0, i32 inreg %idx1, float %src0, float %src1) {
-; GFX1032-LABEL: test_wwm1:
-; GFX1032:       ; %bb.0: ; %main_body
-; GFX1032-NEXT:    s_or_saveexec_b32 s0, -1
-; GFX1032-NEXT:    v_mov_b32_e32 v2, v0
-; GFX1032-NEXT:    v_add_f32_e32 v2, v2, v1
-; GFX1032-NEXT:    s_mov_b32 exec_lo, s0
-; GFX1032-NEXT:    v_mov_b32_e32 v0, v2
-; GFX1032-NEXT:    ; return to shader part epilog
-;
-; GFX1064-LABEL: test_wwm1:
-; GFX1064:       ; %bb.0: ; %main_body
-; GFX1064-NEXT:    s_or_saveexec_b64 s[0:1], -1
-; GFX1064-NEXT:    v_mov_b32_e32 v2, v0
-; GFX1064-NEXT:    v_add_f32_e32 v2, v2, v1
-; GFX1064-NEXT:    s_mov_b64 exec, s[0:1]
-; GFX1064-NEXT:    v_mov_b32_e32 v0, v2
-; GFX1064-NEXT:    ; return to shader part epilog
 main_body:
   %out = fadd float %src0, %src1
   %out.0 = call float @llvm.amdgcn.wwm.f32(float %out)
   ret float %out.0
 }
 
+; GCN-LABEL: {{^}}test_wwm2:
+; GFX1032: v_cmp_gt_u32_e32 vcc_lo, 32, v{{[0-9]+}}
+; GFX1032: s_and_saveexec_b32 [[SAVE1:s[0-9]+]], vcc_lo
+; GFX1032: s_or_saveexec_b32 [[SAVE2:s[0-9]+]], -1
+; GFX1032: s_mov_b32 exec_lo, [[SAVE2]]
+; GFX1032: s_or_b32 exec_lo, exec_lo, [[SAVE1]]
+; GFX1064: v_cmp_gt_u32_e32 vcc, 32, v{{[0-9]+}}
+; GFX1064: s_and_saveexec_b64 [[SAVE1:s\[[0-9:]+\]]], vcc{{$}}
+; GFX1064: s_or_saveexec_b64 [[SAVE2:s\[[0-9:]+\]]], -1
+; GFX1064: s_mov_b64 exec, [[SAVE2]]
+; GFX1064: s_or_b64 exec, exec, [[SAVE1]]
 define amdgpu_ps float @test_wwm2(i32 inreg %idx) {
-; GFX1032-LABEL: test_wwm2:
-; GFX1032:       ; %bb.0: ; %main_body
-; GFX1032-NEXT:    v_mbcnt_lo_u32_b32 v0, -1, 0
-; GFX1032-NEXT:    v_mbcnt_hi_u32_b32 v0, -1, v0
-; GFX1032-NEXT:    v_cmp_gt_u32_e32 vcc_lo, 32, v0
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    s_and_saveexec_b32 s1, vcc_lo
-; GFX1032-NEXT:    s_cbranch_execz BB35_2
-; GFX1032-NEXT:  ; %bb.1: ; %if
-; GFX1032-NEXT:    s_or_saveexec_b32 s2, -1
-; GFX1032-NEXT:    v_mov_b32_e32 v1, s0
-; GFX1032-NEXT:    buffer_load_dword v1, v1, s[0:3], 0 idxen
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_add_f32_e32 v2, v1, v1
-; GFX1032-NEXT:    s_mov_b32 exec_lo, s2
-; GFX1032-NEXT:    v_mov_b32_e32 v0, v2
-; GFX1032-NEXT:    v_add_f32_e32 v0, v1, v0
-; GFX1032-NEXT:  BB35_2: ; %endif
-; GFX1032-NEXT:    s_or_b32 exec_lo, exec_lo, s1
-; GFX1032-NEXT:    ; return to shader part epilog
-;
-; GFX1064-LABEL: test_wwm2:
-; GFX1064:       ; %bb.0: ; %main_body
-; GFX1064-NEXT:    v_mbcnt_lo_u32_b32 v0, -1, 0
-; GFX1064-NEXT:    v_mbcnt_hi_u32_b32 v0, -1, v0
-; GFX1064-NEXT:    v_cmp_gt_u32_e32 vcc, 32, v0
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    s_and_saveexec_b64 s[2:3], vcc
-; GFX1064-NEXT:    s_cbranch_execz BB35_2
-; GFX1064-NEXT:  ; %bb.1: ; %if
-; GFX1064-NEXT:    s_or_saveexec_b64 s[4:5], -1
-; GFX1064-NEXT:    v_mov_b32_e32 v1, s0
-; GFX1064-NEXT:    buffer_load_dword v1, v1, s[0:3], 0 idxen
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_add_f32_e32 v2, v1, v1
-; GFX1064-NEXT:    s_mov_b64 exec, s[4:5]
-; GFX1064-NEXT:    v_mov_b32_e32 v0, v2
-; GFX1064-NEXT:    v_add_f32_e32 v0, v1, v0
-; GFX1064-NEXT:  BB35_2: ; %endif
-; GFX1064-NEXT:    s_or_b64 exec, exec, s[2:3]
-; GFX1064-NEXT:    ; return to shader part epilog
 main_body:
   ; use mbcnt to make sure the branch is divergent
   %lo = call i32 @llvm.amdgcn.mbcnt.lo(i32 -1, i32 0)
@@ -1976,72 +745,30 @@ endif:
   ret float %out.2
 }
 
+; GCN-LABEL: {{^}}test_strict_wwm1:
+; GFX1032: s_or_saveexec_b32 [[SAVE:s[0-9]+]], -1
+; GFX1032: s_mov_b32 exec_lo, [[SAVE]]
+; GFX1064: s_or_saveexec_b64 [[SAVE:s\[[0-9]+:[0-9]+\]]], -1
+; GFX1064: s_mov_b64 exec, [[SAVE]]
 define amdgpu_ps float @test_strict_wwm1(i32 inreg %idx0, i32 inreg %idx1, float %src0, float %src1) {
-; GFX1032-LABEL: test_strict_wwm1:
-; GFX1032:       ; %bb.0: ; %main_body
-; GFX1032-NEXT:    s_or_saveexec_b32 s0, -1
-; GFX1032-NEXT:    v_mov_b32_e32 v2, v0
-; GFX1032-NEXT:    v_add_f32_e32 v2, v2, v1
-; GFX1032-NEXT:    s_mov_b32 exec_lo, s0
-; GFX1032-NEXT:    v_mov_b32_e32 v0, v2
-; GFX1032-NEXT:    ; return to shader part epilog
-;
-; GFX1064-LABEL: test_strict_wwm1:
-; GFX1064:       ; %bb.0: ; %main_body
-; GFX1064-NEXT:    s_or_saveexec_b64 s[0:1], -1
-; GFX1064-NEXT:    v_mov_b32_e32 v2, v0
-; GFX1064-NEXT:    v_add_f32_e32 v2, v2, v1
-; GFX1064-NEXT:    s_mov_b64 exec, s[0:1]
-; GFX1064-NEXT:    v_mov_b32_e32 v0, v2
-; GFX1064-NEXT:    ; return to shader part epilog
 main_body:
   %out = fadd float %src0, %src1
   %out.0 = call float @llvm.amdgcn.strict.wwm.f32(float %out)
   ret float %out.0
 }
 
+; GCN-LABEL: {{^}}test_strict_wwm2:
+; GFX1032: v_cmp_gt_u32_e32 vcc_lo, 32, v{{[0-9]+}}
+; GFX1032: s_and_saveexec_b32 [[SAVE1:s[0-9]+]], vcc_lo
+; GFX1032: s_or_saveexec_b32 [[SAVE2:s[0-9]+]], -1
+; GFX1032: s_mov_b32 exec_lo, [[SAVE2]]
+; GFX1032: s_or_b32 exec_lo, exec_lo, [[SAVE1]]
+; GFX1064: v_cmp_gt_u32_e32 vcc, 32, v{{[0-9]+}}
+; GFX1064: s_and_saveexec_b64 [[SAVE1:s\[[0-9:]+\]]], vcc{{$}}
+; GFX1064: s_or_saveexec_b64 [[SAVE2:s\[[0-9:]+\]]], -1
+; GFX1064: s_mov_b64 exec, [[SAVE2]]
+; GFX1064: s_or_b64 exec, exec, [[SAVE1]]
 define amdgpu_ps float @test_strict_wwm2(i32 inreg %idx) {
-; GFX1032-LABEL: test_strict_wwm2:
-; GFX1032:       ; %bb.0: ; %main_body
-; GFX1032-NEXT:    v_mbcnt_lo_u32_b32 v0, -1, 0
-; GFX1032-NEXT:    v_mbcnt_hi_u32_b32 v0, -1, v0
-; GFX1032-NEXT:    v_cmp_gt_u32_e32 vcc_lo, 32, v0
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    s_and_saveexec_b32 s1, vcc_lo
-; GFX1032-NEXT:    s_cbranch_execz BB37_2
-; GFX1032-NEXT:  ; %bb.1: ; %if
-; GFX1032-NEXT:    s_or_saveexec_b32 s2, -1
-; GFX1032-NEXT:    v_mov_b32_e32 v1, s0
-; GFX1032-NEXT:    buffer_load_dword v1, v1, s[0:3], 0 idxen
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_add_f32_e32 v2, v1, v1
-; GFX1032-NEXT:    s_mov_b32 exec_lo, s2
-; GFX1032-NEXT:    v_mov_b32_e32 v0, v2
-; GFX1032-NEXT:    v_add_f32_e32 v0, v1, v0
-; GFX1032-NEXT:  BB37_2: ; %endif
-; GFX1032-NEXT:    s_or_b32 exec_lo, exec_lo, s1
-; GFX1032-NEXT:    ; return to shader part epilog
-;
-; GFX1064-LABEL: test_strict_wwm2:
-; GFX1064:       ; %bb.0: ; %main_body
-; GFX1064-NEXT:    v_mbcnt_lo_u32_b32 v0, -1, 0
-; GFX1064-NEXT:    v_mbcnt_hi_u32_b32 v0, -1, v0
-; GFX1064-NEXT:    v_cmp_gt_u32_e32 vcc, 32, v0
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    s_and_saveexec_b64 s[2:3], vcc
-; GFX1064-NEXT:    s_cbranch_execz BB37_2
-; GFX1064-NEXT:  ; %bb.1: ; %if
-; GFX1064-NEXT:    s_or_saveexec_b64 s[4:5], -1
-; GFX1064-NEXT:    v_mov_b32_e32 v1, s0
-; GFX1064-NEXT:    buffer_load_dword v1, v1, s[0:3], 0 idxen
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_add_f32_e32 v2, v1, v1
-; GFX1064-NEXT:    s_mov_b64 exec, s[4:5]
-; GFX1064-NEXT:    v_mov_b32_e32 v0, v2
-; GFX1064-NEXT:    v_add_f32_e32 v0, v1, v0
-; GFX1064-NEXT:  BB37_2: ; %endif
-; GFX1064-NEXT:    s_or_b64 exec, exec, s[2:3]
-; GFX1064-NEXT:    ; return to shader part epilog
 main_body:
   ; use mbcnt to make sure the branch is divergent
   %lo = call i32 @llvm.amdgcn.mbcnt.lo(i32 -1, i32 0)
@@ -2061,34 +788,15 @@ endif:
   ret float %out.2
 }
 
+
+; GCN-LABEL: {{^}}test_wqm1:
+; GFX1032: s_mov_b32 [[ORIG:s[0-9]+]], exec_lo
+; GFX1032: s_wqm_b32 exec_lo, exec_lo
+; GFX1032: s_and_b32 exec_lo, exec_lo, [[ORIG]]
+; GFX1064: s_mov_b64 [[ORIG:s\[[0-9]+:[0-9]+\]]], exec{{$}}
+; GFX1064: s_wqm_b64 exec, exec{{$}}
+; GFX1064: s_and_b64 exec, exec, [[ORIG]]
 define amdgpu_ps <4 x float> @test_wqm1(i32 inreg, i32 inreg, i32 inreg, i32 inreg %m0, <8 x i32> inreg %rsrc, <4 x i32> inreg %sampler, <2 x float> %pos) #0 {
-; GFX1032-LABEL: test_wqm1:
-; GFX1032:       ; %bb.0: ; %main_body
-; GFX1032-NEXT:    s_mov_b32 s0, exec_lo
-; GFX1032-NEXT:    s_wqm_b32 exec_lo, exec_lo
-; GFX1032-NEXT:    s_mov_b32 m0, s3
-; GFX1032-NEXT:    v_interp_p1_f32_e32 v2, v0, attr0.x
-; GFX1032-NEXT:    v_interp_p1_f32_e32 v3, v0, attr0.y
-; GFX1032-NEXT:    v_interp_p2_f32_e32 v2, v1, attr0.x
-; GFX1032-NEXT:    v_interp_p2_f32_e32 v3, v1, attr0.y
-; GFX1032-NEXT:    s_and_b32 exec_lo, exec_lo, s0
-; GFX1032-NEXT:    image_sample v[0:3], v[2:3], s[4:11], s[12:15] dmask:0xf dim:SQ_RSRC_IMG_2D
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    ; return to shader part epilog
-;
-; GFX1064-LABEL: test_wqm1:
-; GFX1064:       ; %bb.0: ; %main_body
-; GFX1064-NEXT:    s_mov_b64 s[0:1], exec
-; GFX1064-NEXT:    s_wqm_b64 exec, exec
-; GFX1064-NEXT:    s_mov_b32 m0, s3
-; GFX1064-NEXT:    v_interp_p1_f32_e32 v2, v0, attr0.x
-; GFX1064-NEXT:    v_interp_p1_f32_e32 v3, v0, attr0.y
-; GFX1064-NEXT:    v_interp_p2_f32_e32 v2, v1, attr0.x
-; GFX1064-NEXT:    v_interp_p2_f32_e32 v3, v1, attr0.y
-; GFX1064-NEXT:    s_and_b64 exec, exec, s[0:1]
-; GFX1064-NEXT:    image_sample v[0:3], v[2:3], s[4:11], s[12:15] dmask:0xf dim:SQ_RSRC_IMG_2D
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    ; return to shader part epilog
 main_body:
   %inst23 = extractelement <2 x float> %pos, i32 0
   %inst24 = extractelement <2 x float> %pos, i32 1
@@ -2100,36 +808,12 @@ main_body:
   ret <4 x float> %tex
 }
 
+; GCN-LABEL: {{^}}test_wqm2:
+; GFX1032: s_wqm_b32 exec_lo, exec_lo
+; GFX1032: s_and_b32 exec_lo, exec_lo, s{{[0-9]+}}
+; GFX1064: s_wqm_b64 exec, exec{{$}}
+; GFX1064: s_and_b64 exec, exec, s[{{[0-9:]+}}]
 define amdgpu_ps float @test_wqm2(i32 inreg %idx0, i32 inreg %idx1) #0 {
-; GFX1032-LABEL: test_wqm2:
-; GFX1032:       ; %bb.0: ; %main_body
-; GFX1032-NEXT:    s_mov_b32 s2, exec_lo
-; GFX1032-NEXT:    s_wqm_b32 exec_lo, exec_lo
-; GFX1032-NEXT:    v_mov_b32_e32 v0, s0
-; GFX1032-NEXT:    v_mov_b32_e32 v1, s1
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    buffer_load_dword v2, v0, s[0:3], 0 idxen
-; GFX1032-NEXT:    buffer_load_dword v3, v1, s[0:3], 0 idxen
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    v_add_f32_e32 v0, v2, v3
-; GFX1032-NEXT:    ; kill: def $vgpr0 killed $vgpr0 killed $exec killed $exec
-; GFX1032-NEXT:    s_and_b32 exec_lo, exec_lo, s2
-; GFX1032-NEXT:    ; return to shader part epilog
-;
-; GFX1064-LABEL: test_wqm2:
-; GFX1064:       ; %bb.0: ; %main_body
-; GFX1064-NEXT:    s_mov_b64 s[2:3], exec
-; GFX1064-NEXT:    s_wqm_b64 exec, exec
-; GFX1064-NEXT:    v_mov_b32_e32 v0, s0
-; GFX1064-NEXT:    v_mov_b32_e32 v1, s1
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    buffer_load_dword v2, v0, s[0:3], 0 idxen
-; GFX1064-NEXT:    buffer_load_dword v3, v1, s[0:3], 0 idxen
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    v_add_f32_e32 v0, v2, v3
-; GFX1064-NEXT:    ; kill: def $vgpr0 killed $vgpr0 killed $exec killed $exec
-; GFX1064-NEXT:    s_and_b64 exec, exec, s[2:3]
-; GFX1064-NEXT:    ; return to shader part epilog
 main_body:
   %src0 = call float @llvm.amdgcn.struct.buffer.load.f32(<4 x i32> undef, i32 %idx0, i32 0, i32 0, i32 0)
   %src1 = call float @llvm.amdgcn.struct.buffer.load.f32(<4 x i32> undef, i32 %idx1, i32 0, i32 0, i32 0)
@@ -2140,162 +824,74 @@ main_body:
   ret float %out.2
 }
 
+; GCN-LABEL: {{^}}test_intr_fcmp_i64:
+; GFX1032-DAG: v_mov_b32_e32 v[[V_HI:[0-9]+]], 0{{$}}
+; GFX1032-DAG: v_cmp_eq_f32_e64 s[[C_LO:[0-9]+]], {{s[0-9]+}}, |{{[vs][0-9]+}}|
+; GFX1032-DAG: v_mov_b32_e32 v[[V_LO:[0-9]+]], s[[C_LO]]
+; GFX1064:     v_cmp_eq_f32_e64 s{{\[}}[[C_LO:[0-9]+]]:[[C_HI:[0-9]+]]], {{s[0-9]+}}, |{{[vs][0-9]+}}|
+; GFX1064-DAG: v_mov_b32_e32 v[[V_LO:[0-9]+]], s[[C_LO]]
+; GFX1064-DAG: v_mov_b32_e32 v[[V_HI:[0-9]+]], s[[C_HI]]
+; GCN:         store_dwordx2 v{{[0-9]+}}, v{{\[}}[[V_LO]]:[[V_HI]]], s
 define amdgpu_kernel void @test_intr_fcmp_i64(i64 addrspace(1)* %out, float %src, float %a) {
-; GFX1032-LABEL: test_intr_fcmp_i64:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x2c
-; GFX1032-NEXT:    s_load_dwordx2 s[4:5], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_cmp_eq_f32_e64 s0, s2, |s3|
-; GFX1032-NEXT:    v_mov_b32_e32 v0, s0
-; GFX1032-NEXT:    global_store_dwordx2 v1, v[0:1], s[4:5]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_intr_fcmp_i64:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x2c
-; GFX1064-NEXT:    s_load_dwordx2 s[4:5], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_cmp_eq_f32_e64 s[0:1], s2, |s3|
-; GFX1064-NEXT:    v_mov_b32_e32 v0, s0
-; GFX1064-NEXT:    v_mov_b32_e32 v1, s1
-; GFX1064-NEXT:    global_store_dwordx2 v2, v[0:1], s[4:5]
-; GFX1064-NEXT:    s_endpgm
   %temp = call float @llvm.fabs.f32(float %a)
   %result = call i64 @llvm.amdgcn.fcmp.i64.f32(float %src, float %temp, i32 1)
   store i64 %result, i64 addrspace(1)* %out
   ret void
 }
 
+; GCN-LABEL: {{^}}test_intr_icmp_i64:
+; GFX1032-DAG: v_mov_b32_e32 v[[V_HI:[0-9]+]], 0{{$}}
+; GFX1032-DAG: v_cmp_eq_u32_e64 [[C_LO:vcc_lo|s[0-9]+]], 0x64, {{s[0-9]+}}
+; GFX1032-DAG: v_mov_b32_e32 v[[V_LO:[0-9]+]], [[C_LO]]
+; GFX1064:     v_cmp_eq_u32_e64 s{{\[}}[[C_LO:[0-9]+]]:[[C_HI:[0-9]+]]], 0x64, {{s[0-9]+}}
+; GFX1064-DAG: v_mov_b32_e32 v[[V_LO:[0-9]+]], s[[C_LO]]
+; GFX1064-DAG: v_mov_b32_e32 v[[V_HI:[0-9]+]], s[[C_HI]]
+; GCN:         store_dwordx2 v{{[0-9]+}}, v{{\[}}[[V_LO]]:[[V_HI]]], s
 define amdgpu_kernel void @test_intr_icmp_i64(i64 addrspace(1)* %out, i32 %src) {
-; GFX1032-LABEL: test_intr_icmp_i64:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dword s4, s[0:1], 0x2c
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v1, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_cmp_eq_u32_e64 s0, 0x64, s4
-; GFX1032-NEXT:    v_mov_b32_e32 v0, s0
-; GFX1032-NEXT:    global_store_dwordx2 v1, v[0:1], s[2:3]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_intr_icmp_i64:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dword s4, s[0:1], 0x2c
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_cmp_eq_u32_e64 s[0:1], 0x64, s4
-; GFX1064-NEXT:    v_mov_b32_e32 v0, s0
-; GFX1064-NEXT:    v_mov_b32_e32 v1, s1
-; GFX1064-NEXT:    global_store_dwordx2 v2, v[0:1], s[2:3]
-; GFX1064-NEXT:    s_endpgm
   %result = call i64 @llvm.amdgcn.icmp.i64.i32(i32 %src, i32 100, i32 32)
   store i64 %result, i64 addrspace(1)* %out
   ret void
 }
 
+; GCN-LABEL: {{^}}test_intr_fcmp_i32:
+; GFX1032-DAG: v_cmp_eq_f32_e64 s[[C_LO:[0-9]+]], {{s[0-9]+}}, |{{[vs][0-9]+}}|
+; GFX1032-DAG: v_mov_b32_e32 v[[V_LO:[0-9]+]], s[[C_LO]]
+; GFX1064:     v_cmp_eq_f32_e64 s{{\[}}[[C_LO:[0-9]+]]:[[C_HI:[0-9]+]]], {{s[0-9]+}}, |{{[vs][0-9]+}}|
+; GFX1064-DAG: v_mov_b32_e32 v[[V_LO:[0-9]+]], s[[C_LO]]
+; GCN:         store_dword v{{[0-9]+}}, v[[V_LO]], s
 define amdgpu_kernel void @test_intr_fcmp_i32(i32 addrspace(1)* %out, float %src, float %a) {
-; GFX1032-LABEL: test_intr_fcmp_i32:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x2c
-; GFX1032-NEXT:    s_load_dwordx2 s[4:5], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_cmp_eq_f32_e64 s0, s2, |s3|
-; GFX1032-NEXT:    v_mov_b32_e32 v1, s0
-; GFX1032-NEXT:    global_store_dword v0, v1, s[4:5]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_intr_fcmp_i32:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x2c
-; GFX1064-NEXT:    s_load_dwordx2 s[4:5], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_cmp_eq_f32_e64 s[0:1], s2, |s3|
-; GFX1064-NEXT:    v_mov_b32_e32 v1, s0
-; GFX1064-NEXT:    global_store_dword v0, v1, s[4:5]
-; GFX1064-NEXT:    s_endpgm
   %temp = call float @llvm.fabs.f32(float %a)
   %result = call i32 @llvm.amdgcn.fcmp.i32.f32(float %src, float %temp, i32 1)
   store i32 %result, i32 addrspace(1)* %out
   ret void
 }
 
+; GCN-LABEL: {{^}}test_intr_icmp_i32:
+; GFX1032-DAG: v_cmp_eq_u32_e64 s[[C_LO:[0-9]+]], 0x64, {{s[0-9]+}}
+; GFX1032-DAG: v_mov_b32_e32 v[[V_LO:[0-9]+]], s[[C_LO]]{{$}}
+; GFX1064:     v_cmp_eq_u32_e64 s{{\[}}[[C_LO:[0-9]+]]:{{[0-9]+}}], 0x64, {{s[0-9]+}}
+; GFX1064-DAG: v_mov_b32_e32 v[[V_LO:[0-9]+]], s[[C_LO]]{{$}}
+; GCN:         store_dword v{{[0-9]+}}, v[[V_LO]], s
 define amdgpu_kernel void @test_intr_icmp_i32(i32 addrspace(1)* %out, i32 %src) {
-; GFX1032-LABEL: test_intr_icmp_i32:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_clause 0x1
-; GFX1032-NEXT:    s_load_dword s4, s[0:1], 0x2c
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_cmp_eq_u32_e64 s0, 0x64, s4
-; GFX1032-NEXT:    v_mov_b32_e32 v1, s0
-; GFX1032-NEXT:    global_store_dword v0, v1, s[2:3]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_intr_icmp_i32:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_clause 0x1
-; GFX1064-NEXT:    s_load_dword s4, s[0:1], 0x2c
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[0:1], 0x24
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_cmp_eq_u32_e64 s[0:1], 0x64, s4
-; GFX1064-NEXT:    v_mov_b32_e32 v1, s0
-; GFX1064-NEXT:    global_store_dword v0, v1, s[2:3]
-; GFX1064-NEXT:    s_endpgm
   %result = call i32 @llvm.amdgcn.icmp.i32.i32(i32 %src, i32 100, i32 32)
   store i32 %result, i32 addrspace(1)* %out
   ret void
 }
 
+; GCN-LABEL: {{^}}test_wqm_vote:
+; GFX1032: v_cmp_neq_f32_e32 vcc_lo, 0
+; GFX1032: s_mov_b32 [[LIVE:s[0-9]+]], exec_lo
+; GFX1032: s_wqm_b32 [[WQM:s[0-9]+]], vcc_lo
+; GFX1032: s_xor_b32 [[KILL:s[0-9]+]], [[WQM]], exec_lo
+; GFX1032: s_andn2_b32 [[MASK:s[0-9]+]], [[LIVE]], [[KILL]]
+; GFX1032: s_and_b32 exec_lo, exec_lo, [[MASK]]
+; GFX1064: v_cmp_neq_f32_e32 vcc, 0
+; GFX1064: s_mov_b64 [[LIVE:s\[[0-9:]+\]]], exec
+; GFX1064: s_wqm_b64 [[WQM:s\[[0-9:]+\]]], vcc
+; GFX1064: s_xor_b64 [[KILL:s\[[0-9:]+\]]], [[WQM]], exec
+; GFX1064: s_andn2_b64 [[MASK:s\[[0-9:]+\]]], [[LIVE]], [[KILL]]
+; GFX1064: s_and_b64 exec, exec, [[MASK]]
 define amdgpu_ps void @test_wqm_vote(float %a) {
-; GFX1032-LABEL: test_wqm_vote:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    v_cmp_neq_f32_e32 vcc_lo, 0, v0
-; GFX1032-NEXT:    s_mov_b32 s0, exec_lo
-; GFX1032-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1032-NEXT:    s_wqm_b32 s1, vcc_lo
-; GFX1032-NEXT:    s_xor_b32 s1, s1, exec_lo
-; GFX1032-NEXT:    s_andn2_b32 s0, s0, s1
-; GFX1032-NEXT:    s_cbranch_scc0 BB44_2
-; GFX1032-NEXT:  ; %bb.1:
-; GFX1032-NEXT:    s_and_b32 exec_lo, exec_lo, s0
-; GFX1032-NEXT:    exp mrt0 off, off, off, off
-; GFX1032-NEXT:    s_endpgm
-; GFX1032-NEXT:  BB44_2:
-; GFX1032-NEXT:    s_mov_b32 exec_lo, 0
-; GFX1032-NEXT:    exp null off, off, off, off done vm
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_wqm_vote:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    v_cmp_neq_f32_e32 vcc, 0, v0
-; GFX1064-NEXT:    s_mov_b64 s[0:1], exec
-; GFX1064-NEXT:    v_mov_b32_e32 v0, 0
-; GFX1064-NEXT:    s_wqm_b64 s[2:3], vcc
-; GFX1064-NEXT:    s_xor_b64 s[2:3], s[2:3], exec
-; GFX1064-NEXT:    s_andn2_b64 s[0:1], s[0:1], s[2:3]
-; GFX1064-NEXT:    s_cbranch_scc0 BB44_2
-; GFX1064-NEXT:  ; %bb.1:
-; GFX1064-NEXT:    s_and_b64 exec, exec, s[0:1]
-; GFX1064-NEXT:    exp mrt0 off, off, off, off
-; GFX1064-NEXT:    s_endpgm
-; GFX1064-NEXT:  BB44_2:
-; GFX1064-NEXT:    s_mov_b64 exec, 0
-; GFX1064-NEXT:    exp null off, off, off, off done vm
-; GFX1064-NEXT:    s_endpgm
   %c1 = fcmp une float %a, 0.0
   %c2 = call i1 @llvm.amdgcn.wqm.vote(i1 %c1)
   call void @llvm.amdgcn.kill(i1 %c2)
@@ -2303,36 +899,10 @@ define amdgpu_ps void @test_wqm_vote(float %a) {
   ret void
 }
 
+; GCN-LABEL: {{^}}test_branch_true:
+; GFX1032: s_mov_b32 vcc_lo, exec_lo
+; GFX1064: s_mov_b64 vcc, exec
 define amdgpu_kernel void @test_branch_true() #2 {
-; GFX1032-LABEL: test_branch_true:
-; GFX1032:       ; %bb.0: ; %entry
-; GFX1032-NEXT:    s_mov_b32 vcc_lo, exec_lo
-; GFX1032-NEXT:    s_cbranch_execnz BB45_2
-; GFX1032-NEXT:  ; %bb.1: ; %for.body.lr.ph
-; GFX1032-NEXT:    s_branch BB45_3
-; GFX1032-NEXT:  BB45_2: ; %Flow
-; GFX1032-NEXT:    s_branch BB45_5
-; GFX1032-NEXT:  BB45_3: ; %for.body
-; GFX1032-NEXT:    s_mov_b32 vcc_lo, 0
-; GFX1032-NEXT:  ; %bb.4: ; %for.end.loopexit
-; GFX1032-NEXT:    s_branch BB45_2
-; GFX1032-NEXT:  BB45_5: ; %for.end
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_branch_true:
-; GFX1064:       ; %bb.0: ; %entry
-; GFX1064-NEXT:    s_mov_b64 vcc, exec
-; GFX1064-NEXT:    s_cbranch_execnz BB45_2
-; GFX1064-NEXT:  ; %bb.1: ; %for.body.lr.ph
-; GFX1064-NEXT:    s_branch BB45_3
-; GFX1064-NEXT:  BB45_2: ; %Flow
-; GFX1064-NEXT:    s_branch BB45_5
-; GFX1064-NEXT:  BB45_3: ; %for.body
-; GFX1064-NEXT:    s_mov_b64 vcc, 0
-; GFX1064-NEXT:  ; %bb.4: ; %for.end.loopexit
-; GFX1064-NEXT:    s_branch BB45_2
-; GFX1064-NEXT:  BB45_5: ; %for.end
-; GFX1064-NEXT:    s_endpgm
 entry:
   br i1 true, label %for.end, label %for.body.lr.ph
 
@@ -2346,64 +916,23 @@ for.end:                                          ; preds = %for.body, %entry
   ret void
 }
 
+; GCN-LABEL: {{^}}test_ps_live:
+; GFX1032: s_mov_b32 [[C:s[0-9]+]], exec_lo
+; GFX1064: s_mov_b64 [[C:s\[[0-9:]+\]]], exec{{$}}
+; GCN: v_cndmask_b32_e64 v{{[0-9]+}}, 0, 1, [[C]]
 define amdgpu_ps float @test_ps_live() #0 {
-; GFX1032-LABEL: test_ps_live:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_mov_b32 s0, exec_lo
-; GFX1032-NEXT:    v_cndmask_b32_e64 v0, 0, 1, s0
-; GFX1032-NEXT:    ; return to shader part epilog
-;
-; GFX1064-LABEL: test_ps_live:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_mov_b64 s[0:1], exec
-; GFX1064-NEXT:    v_cndmask_b32_e64 v0, 0, 1, s[0:1]
-; GFX1064-NEXT:    ; return to shader part epilog
   %live = call i1 @llvm.amdgcn.ps.live()
   %live.32 = zext i1 %live to i32
   %r = bitcast i32 %live.32 to float
   ret float %r
 }
 
+; GCN-LABEL: {{^}}test_vccnz_ifcvt_triangle64:
+; GFX1032: v_cmp_neq_f64_e64 [[C:s[0-9]+]], s[{{[0-9:]+}}], 1.0
+; GFX1032: s_and_b32 vcc_lo, exec_lo, [[C]]
+; GFX1064: v_cmp_neq_f64_e64 [[C:s\[[0-9:]+\]]], s[{{[0-9:]+}}], 1.0
+; GFX1064: s_and_b64 vcc, exec, [[C]]
 define amdgpu_kernel void @test_vccnz_ifcvt_triangle64(double addrspace(1)* %out, double addrspace(1)* %in) #0 {
-; GFX1032-LABEL: test_vccnz_ifcvt_triangle64:
-; GFX1032:       ; %bb.0: ; %entry
-; GFX1032-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    s_load_dwordx2 s[2:3], s[2:3], 0x0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_cmp_neq_f64_e64 s4, s[2:3], 1.0
-; GFX1032-NEXT:    s_and_b32 vcc_lo, exec_lo, s4
-; GFX1032-NEXT:    s_cbranch_vccnz BB47_2
-; GFX1032-NEXT:  ; %bb.1: ; %if
-; GFX1032-NEXT:    v_add_f64 v[0:1], s[2:3], s[2:3]
-; GFX1032-NEXT:    s_branch BB47_3
-; GFX1032-NEXT:  BB47_2:
-; GFX1032-NEXT:    v_mov_b32_e32 v0, s2
-; GFX1032-NEXT:    v_mov_b32_e32 v1, s3
-; GFX1032-NEXT:  BB47_3: ; %endif
-; GFX1032-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1032-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: test_vccnz_ifcvt_triangle64:
-; GFX1064:       ; %bb.0: ; %entry
-; GFX1064-NEXT:    s_load_dwordx4 s[0:3], s[0:1], 0x24
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    s_load_dwordx2 s[2:3], s[2:3], 0x0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_cmp_neq_f64_e64 s[4:5], s[2:3], 1.0
-; GFX1064-NEXT:    s_and_b64 vcc, exec, s[4:5]
-; GFX1064-NEXT:    s_cbranch_vccnz BB47_2
-; GFX1064-NEXT:  ; %bb.1: ; %if
-; GFX1064-NEXT:    v_add_f64 v[0:1], s[2:3], s[2:3]
-; GFX1064-NEXT:    s_branch BB47_3
-; GFX1064-NEXT:  BB47_2:
-; GFX1064-NEXT:    v_mov_b32_e32 v0, s2
-; GFX1064-NEXT:    v_mov_b32_e32 v1, s3
-; GFX1064-NEXT:  BB47_3: ; %endif
-; GFX1064-NEXT:    v_mov_b32_e32 v2, 0
-; GFX1064-NEXT:    global_store_dwordx2 v2, v[0:1], s[0:1]
-; GFX1064-NEXT:    s_endpgm
 entry:
   %v = load double, double addrspace(1)* %in
   %cc = fcmp oeq double %v, 1.000000e+00
@@ -2419,22 +948,11 @@ endif:
   ret void
 }
 
+; GCN-LABEL: {{^}}test_vgprblocks_w32_attr:
 ; Test that the wave size can be overridden in function attributes and that the block size is correct as a result
-define amdgpu_gs float @test_vgprblocks_w32_attr(float %a, float %b, float %c, float %d, float %e, float %f, float %g, float %h, float %i, float %j, float %k, float %l) #3 {
-; GCN-LABEL: test_vgprblocks_w32_attr:
-; GCN:       ; %bb.0: ; %main_body
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v1
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v2
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v3
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v4
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v5
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v6
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v7
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v8
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v9
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v10
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v11
-; GCN-NEXT:    ; return to shader part epilog
+; GFX10DEFWAVE: ; VGPRBlocks: 1
+define amdgpu_gs float @test_vgprblocks_w32_attr(float %a, float %b, float %c, float %d, float %e,
+                                        float %f, float %g, float %h, float %i, float %j, float %k, float %l) #3 {
 main_body:
   %s = fadd float %a, %b
   %s.1 = fadd float %s, %c
@@ -2449,24 +967,12 @@ main_body:
   %s.10 = fadd float %s.9, %l
   ret float %s.10
 }
-; GFX10DEFWAVE: ; VGPRBlocks: 1
 
+; GCN-LABEL: {{^}}test_vgprblocks_w64_attr:
 ; Test that the wave size can be overridden in function attributes and that the block size is correct as a result
-define amdgpu_gs float @test_vgprblocks_w64_attr(float %a, float %b, float %c, float %d, float %e, float %f, float %g, float %h, float %i, float %j, float %k, float %l) #4 {
-; GCN-LABEL: test_vgprblocks_w64_attr:
-; GCN:       ; %bb.0: ; %main_body
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v1
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v2
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v3
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v4
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v5
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v6
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v7
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v8
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v9
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v10
-; GCN-NEXT:    v_add_f32_e32 v0, v0, v11
-; GCN-NEXT:    ; return to shader part epilog
+; GFX10DEFWAVE: ; VGPRBlocks: 2
+define amdgpu_gs float @test_vgprblocks_w64_attr(float %a, float %b, float %c, float %d, float %e,
+                                        float %f, float %g, float %h, float %i, float %j, float %k, float %l) #4 {
 main_body:
   %s = fadd float %a, %b
   %s.1 = fadd float %s, %c
@@ -2481,81 +987,11 @@ main_body:
   %s.10 = fadd float %s.9, %l
   ret float %s.10
 }
-; GFX10DEFWAVE: ; VGPRBlocks: 2
 
+; GCN-LABEL: {{^}}icmp64:
+; GFX1032: v_cmp_eq_u32_e32 vcc_lo, 0, v
+; GFX1064: v_cmp_eq_u32_e32 vcc, 0, v
 define amdgpu_kernel void @icmp64(i32 %n, i32 %s) {
-; GFX1032-LABEL: icmp64:
-; GFX1032:       ; %bb.0: ; %entry
-; GFX1032-NEXT:    s_load_dword s0, s[0:1], 0x28
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_cvt_f32_u32_e32 v1, s0
-; GFX1032-NEXT:    s_sub_i32 s1, 0, s0
-; GFX1032-NEXT:    v_rcp_iflag_f32_e32 v1, v1
-; GFX1032-NEXT:    v_mul_f32_e32 v1, 0x4f7ffffe, v1
-; GFX1032-NEXT:    v_cvt_u32_f32_e32 v1, v1
-; GFX1032-NEXT:    v_mul_lo_u32 v2, s1, v1
-; GFX1032-NEXT:    v_mul_hi_u32 v2, v1, v2
-; GFX1032-NEXT:    v_add_nc_u32_e32 v1, v1, v2
-; GFX1032-NEXT:    v_mul_hi_u32 v1, v0, v1
-; GFX1032-NEXT:    v_mul_lo_u32 v1, v1, s0
-; GFX1032-NEXT:    v_sub_nc_u32_e32 v0, v0, v1
-; GFX1032-NEXT:    v_subrev_nc_u32_e32 v1, s0, v0
-; GFX1032-NEXT:    v_cmp_le_u32_e32 vcc_lo, s0, v0
-; GFX1032-NEXT:    v_cndmask_b32_e32 v0, v0, v1, vcc_lo
-; GFX1032-NEXT:    v_subrev_nc_u32_e32 v1, s0, v0
-; GFX1032-NEXT:    v_cmp_le_u32_e32 vcc_lo, s0, v0
-; GFX1032-NEXT:    s_ff1_i32_b32 s0, 0x80000000
-; GFX1032-NEXT:    s_add_i32 s1, s0, 32
-; GFX1032-NEXT:    v_cndmask_b32_e32 v0, v0, v1, vcc_lo
-; GFX1032-NEXT:    v_cmp_eq_u32_e32 vcc_lo, 0, v0
-; GFX1032-NEXT:    v_alignbit_b32 v0, 0, vcc_lo, 1
-; GFX1032-NEXT:    v_ffbl_b32_e32 v1, v0
-; GFX1032-NEXT:    v_cmp_eq_u32_e64 s0, 0, v0
-; GFX1032-NEXT:    v_cndmask_b32_e64 v0, v1, s1, s0
-; GFX1032-NEXT:    v_cmp_lt_u32_e64 s0, 9, v0
-; GFX1032-NEXT:    s_and_b32 s0, vcc_lo, s0
-; GFX1032-NEXT:    s_and_saveexec_b32 s1, s0
-; GFX1032-NEXT:  ; %bb.1: ; %if.then
-; GFX1032-NEXT:    ; divergent unreachable
-; GFX1032-NEXT:  ; %bb.2: ; %UnifiedReturnBlock
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: icmp64:
-; GFX1064:       ; %bb.0: ; %entry
-; GFX1064-NEXT:    s_load_dword s0, s[0:1], 0x28
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_cvt_f32_u32_e32 v1, s0
-; GFX1064-NEXT:    s_sub_i32 s1, 0, s0
-; GFX1064-NEXT:    v_rcp_iflag_f32_e32 v1, v1
-; GFX1064-NEXT:    v_mul_f32_e32 v1, 0x4f7ffffe, v1
-; GFX1064-NEXT:    v_cvt_u32_f32_e32 v1, v1
-; GFX1064-NEXT:    v_mul_lo_u32 v2, s1, v1
-; GFX1064-NEXT:    v_mul_hi_u32 v2, v1, v2
-; GFX1064-NEXT:    v_add_nc_u32_e32 v1, v1, v2
-; GFX1064-NEXT:    v_mul_hi_u32 v1, v0, v1
-; GFX1064-NEXT:    v_mul_lo_u32 v1, v1, s0
-; GFX1064-NEXT:    v_sub_nc_u32_e32 v0, v0, v1
-; GFX1064-NEXT:    v_subrev_nc_u32_e32 v1, s0, v0
-; GFX1064-NEXT:    v_cmp_le_u32_e32 vcc, s0, v0
-; GFX1064-NEXT:    v_cndmask_b32_e32 v0, v0, v1, vcc
-; GFX1064-NEXT:    v_subrev_nc_u32_e32 v1, s0, v0
-; GFX1064-NEXT:    v_cmp_le_u32_e32 vcc, s0, v0
-; GFX1064-NEXT:    v_cndmask_b32_e32 v0, v0, v1, vcc
-; GFX1064-NEXT:    v_cmp_eq_u32_e32 vcc, 0, v0
-; GFX1064-NEXT:    v_lshrrev_b64 v[0:1], 1, vcc
-; GFX1064-NEXT:    v_or_b32_e32 v1, 0x80000000, v1
-; GFX1064-NEXT:    v_ffbl_b32_e32 v2, v0
-; GFX1064-NEXT:    v_cmp_eq_u32_e64 s[0:1], 0, v0
-; GFX1064-NEXT:    v_ffbl_b32_e32 v1, v1
-; GFX1064-NEXT:    v_add_nc_u32_e32 v1, 32, v1
-; GFX1064-NEXT:    v_cndmask_b32_e64 v0, v2, v1, s[0:1]
-; GFX1064-NEXT:    v_cmp_lt_u32_e64 s[0:1], 9, v0
-; GFX1064-NEXT:    s_and_b64 s[0:1], vcc, s[0:1]
-; GFX1064-NEXT:    s_and_saveexec_b64 s[2:3], s[0:1]
-; GFX1064-NEXT:  ; %bb.1: ; %if.then
-; GFX1064-NEXT:    ; divergent unreachable
-; GFX1064-NEXT:  ; %bb.2: ; %UnifiedReturnBlock
-; GFX1064-NEXT:    s_endpgm
 entry:
   %id = tail call i32 @llvm.amdgcn.workitem.id.x()
   %mul4 = mul nsw i32 %s, %n
@@ -2583,75 +1019,10 @@ if.end2:                                          ; preds = %if.end
   ret void
 }
 
+; GCN-LABEL: {{^}}fcmp64:
+; GFX1032: v_cmp_eq_f32_e32 vcc_lo, 0, v
+; GFX1064: v_cmp_eq_f32_e32 vcc, 0, v
 define amdgpu_kernel void @fcmp64(float %n, float %s) {
-; GFX1032-LABEL: fcmp64:
-; GFX1032:       ; %bb.0: ; %entry
-; GFX1032-NEXT:    s_load_dword s0, s[0:1], 0x28
-; GFX1032-NEXT:    v_cvt_f32_u32_e32 v0, v0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_div_scale_f32 v1, s1, s0, s0, v0
-; GFX1032-NEXT:    v_div_scale_f32 v4, vcc_lo, v0, s0, v0
-; GFX1032-NEXT:    v_rcp_f32_e32 v2, v1
-; GFX1032-NEXT:    v_fma_f32 v3, -v1, v2, 1.0
-; GFX1032-NEXT:    v_fmac_f32_e32 v2, v3, v2
-; GFX1032-NEXT:    v_mul_f32_e32 v3, v4, v2
-; GFX1032-NEXT:    v_fma_f32 v5, v3, -v1, v4
-; GFX1032-NEXT:    v_fmac_f32_e32 v3, v5, v2
-; GFX1032-NEXT:    v_fmac_f32_e64 v4, -v1, v3
-; GFX1032-NEXT:    v_div_fmas_f32 v1, v4, v2, v3
-; GFX1032-NEXT:    v_div_fixup_f32 v1, v1, s0, v0
-; GFX1032-NEXT:    v_trunc_f32_e32 v1, v1
-; GFX1032-NEXT:    v_fmac_f32_e64 v0, -v1, s0
-; GFX1032-NEXT:    s_ff1_i32_b32 s0, 0x80000000
-; GFX1032-NEXT:    s_add_i32 s0, s0, 32
-; GFX1032-NEXT:    v_cmp_eq_f32_e32 vcc_lo, 0, v0
-; GFX1032-NEXT:    v_alignbit_b32 v1, 0, vcc_lo, 1
-; GFX1032-NEXT:    v_ffbl_b32_e32 v2, v1
-; GFX1032-NEXT:    v_cmp_eq_u32_e32 vcc_lo, 0, v1
-; GFX1032-NEXT:    v_cndmask_b32_e64 v1, v2, s0, vcc_lo
-; GFX1032-NEXT:    v_cmp_nlg_f32_e64 s0, 0, v0
-; GFX1032-NEXT:    v_cmp_lt_u32_e32 vcc_lo, 9, v1
-; GFX1032-NEXT:    s_and_b32 s0, s0, vcc_lo
-; GFX1032-NEXT:    s_and_saveexec_b32 s1, s0
-; GFX1032-NEXT:  ; %bb.1: ; %if.then
-; GFX1032-NEXT:    ; divergent unreachable
-; GFX1032-NEXT:  ; %bb.2: ; %UnifiedReturnBlock
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: fcmp64:
-; GFX1064:       ; %bb.0: ; %entry
-; GFX1064-NEXT:    s_load_dword s0, s[0:1], 0x28
-; GFX1064-NEXT:    v_cvt_f32_u32_e32 v0, v0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_div_scale_f32 v1, s[2:3], s0, s0, v0
-; GFX1064-NEXT:    v_div_scale_f32 v4, vcc, v0, s0, v0
-; GFX1064-NEXT:    v_rcp_f32_e32 v2, v1
-; GFX1064-NEXT:    v_fma_f32 v3, -v1, v2, 1.0
-; GFX1064-NEXT:    v_fmac_f32_e32 v2, v3, v2
-; GFX1064-NEXT:    v_mul_f32_e32 v3, v4, v2
-; GFX1064-NEXT:    v_fma_f32 v5, v3, -v1, v4
-; GFX1064-NEXT:    v_fmac_f32_e32 v3, v5, v2
-; GFX1064-NEXT:    v_fmac_f32_e64 v4, -v1, v3
-; GFX1064-NEXT:    v_div_fmas_f32 v1, v4, v2, v3
-; GFX1064-NEXT:    v_div_fixup_f32 v1, v1, s0, v0
-; GFX1064-NEXT:    v_trunc_f32_e32 v1, v1
-; GFX1064-NEXT:    v_fmac_f32_e64 v0, -v1, s0
-; GFX1064-NEXT:    v_cmp_eq_f32_e32 vcc, 0, v0
-; GFX1064-NEXT:    v_cmp_nlg_f32_e64 s[0:1], 0, v0
-; GFX1064-NEXT:    v_lshrrev_b64 v[1:2], 1, vcc
-; GFX1064-NEXT:    v_or_b32_e32 v2, 0x80000000, v2
-; GFX1064-NEXT:    v_ffbl_b32_e32 v3, v1
-; GFX1064-NEXT:    v_cmp_eq_u32_e32 vcc, 0, v1
-; GFX1064-NEXT:    v_ffbl_b32_e32 v2, v2
-; GFX1064-NEXT:    v_add_nc_u32_e32 v2, 32, v2
-; GFX1064-NEXT:    v_cndmask_b32_e32 v1, v3, v2, vcc
-; GFX1064-NEXT:    v_cmp_lt_u32_e32 vcc, 9, v1
-; GFX1064-NEXT:    s_and_b64 s[0:1], s[0:1], vcc
-; GFX1064-NEXT:    s_and_saveexec_b64 s[2:3], s[0:1]
-; GFX1064-NEXT:  ; %bb.1: ; %if.then
-; GFX1064-NEXT:    ; divergent unreachable
-; GFX1064-NEXT:  ; %bb.2: ; %UnifiedReturnBlock
-; GFX1064-NEXT:    s_endpgm
 entry:
   %id = tail call i32 @llvm.amdgcn.workitem.id.x()
   %id.f = uitofp i32 %id to float
@@ -2680,72 +1051,10 @@ if.end2:                                          ; preds = %if.end
   ret void
 }
 
+; GCN-LABEL: {{^}}icmp32:
+; GFX1032: v_cmp_eq_u32_e32 vcc_lo, 0, v
+; GFX1064: v_cmp_eq_u32_e32 vcc, 0, v
 define amdgpu_kernel void @icmp32(i32 %n, i32 %s) {
-; GFX1032-LABEL: icmp32:
-; GFX1032:       ; %bb.0: ; %entry
-; GFX1032-NEXT:    s_load_dword s0, s[0:1], 0x28
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_cvt_f32_u32_e32 v1, s0
-; GFX1032-NEXT:    s_sub_i32 s1, 0, s0
-; GFX1032-NEXT:    v_rcp_iflag_f32_e32 v1, v1
-; GFX1032-NEXT:    v_mul_f32_e32 v1, 0x4f7ffffe, v1
-; GFX1032-NEXT:    v_cvt_u32_f32_e32 v1, v1
-; GFX1032-NEXT:    v_mul_lo_u32 v2, s1, v1
-; GFX1032-NEXT:    v_mul_hi_u32 v2, v1, v2
-; GFX1032-NEXT:    v_add_nc_u32_e32 v1, v1, v2
-; GFX1032-NEXT:    v_mul_hi_u32 v1, v0, v1
-; GFX1032-NEXT:    v_mul_lo_u32 v1, v1, s0
-; GFX1032-NEXT:    v_sub_nc_u32_e32 v0, v0, v1
-; GFX1032-NEXT:    v_subrev_nc_u32_e32 v1, s0, v0
-; GFX1032-NEXT:    v_cmp_le_u32_e32 vcc_lo, s0, v0
-; GFX1032-NEXT:    v_cndmask_b32_e32 v0, v0, v1, vcc_lo
-; GFX1032-NEXT:    v_subrev_nc_u32_e32 v1, s0, v0
-; GFX1032-NEXT:    v_cmp_le_u32_e32 vcc_lo, s0, v0
-; GFX1032-NEXT:    v_cndmask_b32_e32 v0, v0, v1, vcc_lo
-; GFX1032-NEXT:    v_cmp_eq_u32_e32 vcc_lo, 0, v0
-; GFX1032-NEXT:    v_lshrrev_b32_e64 v0, 1, vcc_lo
-; GFX1032-NEXT:    v_or_b32_e32 v0, 0x80000000, v0
-; GFX1032-NEXT:    v_ffbl_b32_e32 v0, v0
-; GFX1032-NEXT:    v_cmp_lt_u32_e64 s0, 9, v0
-; GFX1032-NEXT:    s_and_b32 s0, vcc_lo, s0
-; GFX1032-NEXT:    s_and_saveexec_b32 s1, s0
-; GFX1032-NEXT:  ; %bb.1: ; %if.then
-; GFX1032-NEXT:    ; divergent unreachable
-; GFX1032-NEXT:  ; %bb.2: ; %UnifiedReturnBlock
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: icmp32:
-; GFX1064:       ; %bb.0: ; %entry
-; GFX1064-NEXT:    s_load_dword s0, s[0:1], 0x28
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_cvt_f32_u32_e32 v1, s0
-; GFX1064-NEXT:    s_sub_i32 s1, 0, s0
-; GFX1064-NEXT:    v_rcp_iflag_f32_e32 v1, v1
-; GFX1064-NEXT:    v_mul_f32_e32 v1, 0x4f7ffffe, v1
-; GFX1064-NEXT:    v_cvt_u32_f32_e32 v1, v1
-; GFX1064-NEXT:    v_mul_lo_u32 v2, s1, v1
-; GFX1064-NEXT:    v_mul_hi_u32 v2, v1, v2
-; GFX1064-NEXT:    v_add_nc_u32_e32 v1, v1, v2
-; GFX1064-NEXT:    v_mul_hi_u32 v1, v0, v1
-; GFX1064-NEXT:    v_mul_lo_u32 v1, v1, s0
-; GFX1064-NEXT:    v_sub_nc_u32_e32 v0, v0, v1
-; GFX1064-NEXT:    v_subrev_nc_u32_e32 v1, s0, v0
-; GFX1064-NEXT:    v_cmp_le_u32_e32 vcc, s0, v0
-; GFX1064-NEXT:    v_cndmask_b32_e32 v0, v0, v1, vcc
-; GFX1064-NEXT:    v_subrev_nc_u32_e32 v1, s0, v0
-; GFX1064-NEXT:    v_cmp_le_u32_e32 vcc, s0, v0
-; GFX1064-NEXT:    v_cndmask_b32_e32 v0, v0, v1, vcc
-; GFX1064-NEXT:    v_cmp_eq_u32_e32 vcc, 0, v0
-; GFX1064-NEXT:    v_lshrrev_b32_e64 v0, 1, vcc_lo
-; GFX1064-NEXT:    v_or_b32_e32 v0, 0x80000000, v0
-; GFX1064-NEXT:    v_ffbl_b32_e32 v0, v0
-; GFX1064-NEXT:    v_cmp_lt_u32_e64 s[0:1], 9, v0
-; GFX1064-NEXT:    s_and_b64 s[0:1], vcc, s[0:1]
-; GFX1064-NEXT:    s_and_saveexec_b64 s[2:3], s[0:1]
-; GFX1064-NEXT:  ; %bb.1: ; %if.then
-; GFX1064-NEXT:    ; divergent unreachable
-; GFX1064-NEXT:  ; %bb.2: ; %UnifiedReturnBlock
-; GFX1064-NEXT:    s_endpgm
 entry:
   %id = tail call i32 @llvm.amdgcn.workitem.id.x()
   %mul4 = mul nsw i32 %s, %n
@@ -2772,68 +1081,10 @@ if.end2:                                          ; preds = %if.end
   ret void
 }
 
+; GCN-LABEL: {{^}}fcmp32:
+; GFX1032: v_cmp_eq_f32_e32 vcc_lo, 0, v
+; GFX1064: v_cmp_eq_f32_e32 vcc, 0, v
 define amdgpu_kernel void @fcmp32(float %n, float %s) {
-; GFX1032-LABEL: fcmp32:
-; GFX1032:       ; %bb.0: ; %entry
-; GFX1032-NEXT:    s_load_dword s0, s[0:1], 0x28
-; GFX1032-NEXT:    v_cvt_f32_u32_e32 v0, v0
-; GFX1032-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1032-NEXT:    v_div_scale_f32 v1, s1, s0, s0, v0
-; GFX1032-NEXT:    v_div_scale_f32 v4, vcc_lo, v0, s0, v0
-; GFX1032-NEXT:    v_rcp_f32_e32 v2, v1
-; GFX1032-NEXT:    v_fma_f32 v3, -v1, v2, 1.0
-; GFX1032-NEXT:    v_fmac_f32_e32 v2, v3, v2
-; GFX1032-NEXT:    v_mul_f32_e32 v3, v4, v2
-; GFX1032-NEXT:    v_fma_f32 v5, v3, -v1, v4
-; GFX1032-NEXT:    v_fmac_f32_e32 v3, v5, v2
-; GFX1032-NEXT:    v_fmac_f32_e64 v4, -v1, v3
-; GFX1032-NEXT:    v_div_fmas_f32 v1, v4, v2, v3
-; GFX1032-NEXT:    v_div_fixup_f32 v1, v1, s0, v0
-; GFX1032-NEXT:    v_trunc_f32_e32 v1, v1
-; GFX1032-NEXT:    v_fmac_f32_e64 v0, -v1, s0
-; GFX1032-NEXT:    v_cmp_eq_f32_e32 vcc_lo, 0, v0
-; GFX1032-NEXT:    v_cmp_nlg_f32_e64 s0, 0, v0
-; GFX1032-NEXT:    v_lshrrev_b32_e64 v1, 1, vcc_lo
-; GFX1032-NEXT:    v_or_b32_e32 v1, 0x80000000, v1
-; GFX1032-NEXT:    v_ffbl_b32_e32 v1, v1
-; GFX1032-NEXT:    v_cmp_lt_u32_e32 vcc_lo, 9, v1
-; GFX1032-NEXT:    s_and_b32 s0, s0, vcc_lo
-; GFX1032-NEXT:    s_and_saveexec_b32 s1, s0
-; GFX1032-NEXT:  ; %bb.1: ; %if.then
-; GFX1032-NEXT:    ; divergent unreachable
-; GFX1032-NEXT:  ; %bb.2: ; %UnifiedReturnBlock
-; GFX1032-NEXT:    s_endpgm
-;
-; GFX1064-LABEL: fcmp32:
-; GFX1064:       ; %bb.0: ; %entry
-; GFX1064-NEXT:    s_load_dword s0, s[0:1], 0x28
-; GFX1064-NEXT:    v_cvt_f32_u32_e32 v0, v0
-; GFX1064-NEXT:    s_waitcnt lgkmcnt(0)
-; GFX1064-NEXT:    v_div_scale_f32 v1, s[2:3], s0, s0, v0
-; GFX1064-NEXT:    v_div_scale_f32 v4, vcc, v0, s0, v0
-; GFX1064-NEXT:    v_rcp_f32_e32 v2, v1
-; GFX1064-NEXT:    v_fma_f32 v3, -v1, v2, 1.0
-; GFX1064-NEXT:    v_fmac_f32_e32 v2, v3, v2
-; GFX1064-NEXT:    v_mul_f32_e32 v3, v4, v2
-; GFX1064-NEXT:    v_fma_f32 v5, v3, -v1, v4
-; GFX1064-NEXT:    v_fmac_f32_e32 v3, v5, v2
-; GFX1064-NEXT:    v_fmac_f32_e64 v4, -v1, v3
-; GFX1064-NEXT:    v_div_fmas_f32 v1, v4, v2, v3
-; GFX1064-NEXT:    v_div_fixup_f32 v1, v1, s0, v0
-; GFX1064-NEXT:    v_trunc_f32_e32 v1, v1
-; GFX1064-NEXT:    v_fmac_f32_e64 v0, -v1, s0
-; GFX1064-NEXT:    v_cmp_eq_f32_e32 vcc, 0, v0
-; GFX1064-NEXT:    v_cmp_nlg_f32_e64 s[0:1], 0, v0
-; GFX1064-NEXT:    v_lshrrev_b32_e64 v1, 1, vcc_lo
-; GFX1064-NEXT:    v_or_b32_e32 v1, 0x80000000, v1
-; GFX1064-NEXT:    v_ffbl_b32_e32 v1, v1
-; GFX1064-NEXT:    v_cmp_lt_u32_e32 vcc, 9, v1
-; GFX1064-NEXT:    s_and_b64 s[0:1], s[0:1], vcc
-; GFX1064-NEXT:    s_and_saveexec_b64 s[2:3], s[0:1]
-; GFX1064-NEXT:  ; %bb.1: ; %if.then
-; GFX1064-NEXT:    ; divergent unreachable
-; GFX1064-NEXT:  ; %bb.2: ; %UnifiedReturnBlock
-; GFX1064-NEXT:    s_endpgm
 entry:
   %id = tail call i32 @llvm.amdgcn.workitem.id.x()
   %id.f = uitofp i32 %id to float
@@ -2864,62 +1115,43 @@ if.end2:                                          ; preds = %if.end
 declare void @external_void_func_void() #1
 
 ; Test save/restore of VGPR needed for SGPR spilling.
+
+; GCN-LABEL: {{^}}callee_no_stack_with_call:
+; GCN: s_waitcnt
+; GCN-NEXT: s_waitcnt_vscnt
+
+; GFX1064-NEXT: s_or_saveexec_b64 [[COPY_EXEC0:s\[[0-9]+:[0-9]+\]]], -1{{$}}
+; GFX1032-NEXT: s_or_saveexec_b32 [[COPY_EXEC0:s[0-9]+]], -1{{$}}
+; GCN-NEXT: buffer_store_dword v40, off, s[0:3], s32 ; 4-byte Folded Spill
+; GCN-NEXT: s_waitcnt_depctr 0xffe3
+; GFX1064-NEXT: s_mov_b64 exec, [[COPY_EXEC0]]
+; GFX1032-NEXT: s_mov_b32 exec_lo, [[COPY_EXEC0]]
+
+; GCN-NEXT: v_writelane_b32 v40, s33, 2
+; GCN: s_mov_b32 s33, s32
+; GFX1064: s_addk_i32 s32, 0x400
+; GFX1032: s_addk_i32 s32, 0x200
+
+
+; GCN-DAG: v_writelane_b32 v40, s30, 0
+; GCN-DAG: v_writelane_b32 v40, s31, 1
+; GCN: s_swappc_b64
+; GCN-DAG: v_readlane_b32 s4, v40, 0
+; GCN-DAG: v_readlane_b32 s5, v40, 1
+
+
+; GFX1064: s_addk_i32 s32, 0xfc00
+; GFX1032: s_addk_i32 s32, 0xfe00
+; GCN: v_readlane_b32 s33, v40, 2
+; GFX1064: s_or_saveexec_b64 [[COPY_EXEC1:s\[[0-9]+:[0-9]+\]]], -1{{$}}
+; GFX1032: s_or_saveexec_b32 [[COPY_EXEC1:s[0-9]]], -1{{$}}
+; GCN-NEXT: buffer_load_dword v40, off, s[0:3], s32 ; 4-byte Folded Reload
+; GCN-NEXT: s_waitcnt_depctr 0xffe3
+; GFX1064-NEXT: s_mov_b64 exec, [[COPY_EXEC1]]
+; GFX1032-NEXT: s_mov_b32 exec_lo, [[COPY_EXEC1]]
+; GCN-NEXT: s_waitcnt vmcnt(0)
+; GCN-NEXT: s_setpc_b64
 define void @callee_no_stack_with_call() #1 {
-; GFX1032-LABEL: callee_no_stack_with_call:
-; GFX1032:       ; %bb.0:
-; GFX1032-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
-; GFX1032-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX1032-NEXT:    s_or_saveexec_b32 s4, -1
-; GFX1032-NEXT:    buffer_store_dword v40, off, s[0:3], s32 ; 4-byte Folded Spill
-; GFX1032-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1032-NEXT:    s_mov_b32 exec_lo, s4
-; GFX1032-NEXT:    v_writelane_b32 v40, s33, 2
-; GFX1032-NEXT:    s_mov_b32 s33, s32
-; GFX1032-NEXT:    s_addk_i32 s32, 0x200
-; GFX1032-NEXT:    s_getpc_b64 s[4:5]
-; GFX1032-NEXT:    s_add_u32 s4, s4, external_void_func_void at rel32@lo+4
-; GFX1032-NEXT:    s_addc_u32 s5, s5, external_void_func_void at rel32@hi+12
-; GFX1032-NEXT:    v_writelane_b32 v40, s30, 0
-; GFX1032-NEXT:    v_writelane_b32 v40, s31, 1
-; GFX1032-NEXT:    s_swappc_b64 s[30:31], s[4:5]
-; GFX1032-NEXT:    v_readlane_b32 s4, v40, 0
-; GFX1032-NEXT:    v_readlane_b32 s5, v40, 1
-; GFX1032-NEXT:    s_addk_i32 s32, 0xfe00
-; GFX1032-NEXT:    v_readlane_b32 s33, v40, 2
-; GFX1032-NEXT:    s_or_saveexec_b32 s6, -1
-; GFX1032-NEXT:    buffer_load_dword v40, off, s[0:3], s32 ; 4-byte Folded Reload
-; GFX1032-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1032-NEXT:    s_mov_b32 exec_lo, s6
-; GFX1032-NEXT:    s_waitcnt vmcnt(0)
-; GFX1032-NEXT:    s_setpc_b64 s[4:5]
-;
-; GFX1064-LABEL: callee_no_stack_with_call:
-; GFX1064:       ; %bb.0:
-; GFX1064-NEXT:    s_waitcnt vmcnt(0) expcnt(0) lgkmcnt(0)
-; GFX1064-NEXT:    s_waitcnt_vscnt null, 0x0
-; GFX1064-NEXT:    s_or_saveexec_b64 s[4:5], -1
-; GFX1064-NEXT:    buffer_store_dword v40, off, s[0:3], s32 ; 4-byte Folded Spill
-; GFX1064-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1064-NEXT:    s_mov_b64 exec, s[4:5]
-; GFX1064-NEXT:    v_writelane_b32 v40, s33, 2
-; GFX1064-NEXT:    s_mov_b32 s33, s32
-; GFX1064-NEXT:    s_addk_i32 s32, 0x400
-; GFX1064-NEXT:    s_getpc_b64 s[4:5]
-; GFX1064-NEXT:    s_add_u32 s4, s4, external_void_func_void at rel32@lo+4
-; GFX1064-NEXT:    s_addc_u32 s5, s5, external_void_func_void at rel32@hi+12
-; GFX1064-NEXT:    v_writelane_b32 v40, s30, 0
-; GFX1064-NEXT:    v_writelane_b32 v40, s31, 1
-; GFX1064-NEXT:    s_swappc_b64 s[30:31], s[4:5]
-; GFX1064-NEXT:    v_readlane_b32 s4, v40, 0
-; GFX1064-NEXT:    v_readlane_b32 s5, v40, 1
-; GFX1064-NEXT:    s_addk_i32 s32, 0xfc00
-; GFX1064-NEXT:    v_readlane_b32 s33, v40, 2
-; GFX1064-NEXT:    s_or_saveexec_b64 s[6:7], -1
-; GFX1064-NEXT:    buffer_load_dword v40, off, s[0:3], s32 ; 4-byte Folded Reload
-; GFX1064-NEXT:    s_waitcnt_depctr 0xffe3
-; GFX1064-NEXT:    s_mov_b64 exec, s[6:7]
-; GFX1064-NEXT:    s_waitcnt vmcnt(0)
-; GFX1064-NEXT:    s_setpc_b64 s[4:5]
   call void @external_void_func_void()
   ret void
 }


        


More information about the llvm-commits mailing list