[AMDGPU] Allow frontends to disable null export for pixel shaders

[critson]

Summary

Disable null export (for kills) when a frontend defines a pixel
shader as not exporting using amdgpu-color-export and
amdgpu-depth-export function attrbutes.
This allows the generation of export free pixel shaders.

[foad]

LGTM.

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

1353

Do these newly invented attributes need to be documented somewhere?

[critson]

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

1353

I cannot find anywhere the existing ones like InitialPSInputAddr are documented?

[foad]

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

1353

OK then I guess you're off the hook :-/

[ruiling]

llvm/lib/Target/AMDGPU/SILateBranchLowering.cpp

70–82

Do you think we need to define a subtarget feature like AllowNoExportPS and check it here? The hardware behavior is different before and after gfx10, if we do not check this hardware difference, then this attributes will be gpu-generation-dependent (frontend should not set this attribute before gfx10). I am not sure whether this sounds a issue to others?

[critson]

llvm/lib/Target/AMDGPU/SILateBranchLowering.cpp

70–82

It depends, it seems we are going in the direction that it is up to frontends to ensure correct behaviour of exports. Rather than adding a subtarget feature we could just add an architecture check here.

[ruiling]

llvm/lib/Target/AMDGPU/SILateBranchLowering.cpp

70–82

Frontends are responsible for correctly inserting exp/exp_done to meet hardware requirement for most cases, there is only one exception AFAIK, the kill case which is what we are dealing with here. Architecture check sounds quite good to me. That would make the attribute just match the high level shader behavior.

[critson]

• Only allow no export PS on GFX10

[critson]

• Rename attributes to HasColorExport and HasDepthExport

[arsenm]

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

1355

Should stick to lowercase - separated naming convention with amdgpu- prefix

[critson]

• Rename function attributes to amdgpu-color-export and amdgpu-depth-export

[ruiling]

The logic looks good to me now. Any concern from others?

[foad]

LGTM.

llvm/lib/Target/AMDGPU/SILateBranchLowering.cpp

74

Maybe add a brief comment explaining what changed in the hardware in GFX10?

[critson]

• Add comments

[critson]

@arsenm are you happy for this to proceed now?

[foad]

llvm/lib/Target/AMDGPU/SILateBranchLowering.cpp

78

Typo "once" :)

[critson]

• Fix typo in comment

llvm/lib/Target/AMDGPU/SILateBranchLowering.cpp

 INITIALIZE_PASS_DEPENDENCY(MachineDominatorTree)
 INITIALIZE_PASS_END(SILateBranchLowering, DEBUG_TYPE,
                     "SI insert s_cbranch_execz instructions", false, false)
 
 char &llvm::SILateBranchLoweringPassID = SILateBranchLowering::ID;
 
 static void generateEndPgm(MachineBasicBlock &MBB,
                            MachineBasicBlock::iterator I, DebugLoc DL,
-                           const SIInstrInfo *TII, bool IsPS) {
-  // "null export"
-  if (IsPS) {
+                           const SIInstrInfo *TII, MachineFunction &MF) {
+  const Function &F = MF.getFunction();
+  bool IsPS = F.getCallingConv() == CallingConv::AMDGPU_PS;
+
+  // Check if hardware has been configured to expect color or depth exports.
+  bool HasExports =
+      AMDGPU::getHasColorExport(F) || AMDGPU::getHasDepthExport(F);
+
+  // Prior to GFX10, hardware always expects at least one export for PS.
+  bool MustExport = !AMDGPU::isGFX10Plus(TII->getSubtarget());
+
+  if (IsPS && (HasExports || MustExport)) {
+    // Generate "null export" if hardware is expecting PS to export.
     BuildMI(MBB, I, DL, TII->get(AMDGPU::EXP_DONE))
         .addImm(AMDGPU::Exp::ET_NULL)
         .addReg(AMDGPU::VGPR0, RegState::Undef)
         .addReg(AMDGPU::VGPR0, RegState::Undef)
         .addReg(AMDGPU::VGPR0, RegState::Undef)
         .addReg(AMDGPU::VGPR0, RegState::Undef)
         .addImm(1)  // vm
         .addImm(0)  // compr
         .addImm(0); // en
   }
+
   // s_endpgm
   BuildMI(MBB, I, DL, TII->get(AMDGPU::S_ENDPGM)).addImm(0);
 }
 
 static void splitBlock(MachineBasicBlock &MBB, MachineInstr &MI,
                        MachineDominatorTree *MDT) {
   MachineBasicBlock *SplitBB = MBB.splitAt(MI, /*UpdateLiveIns*/ true);
 
bool SILateBranchLowering::runOnMachineFunction(MachineFunction &MF) {
   if (!EarlyTermInstrs.empty()) {
     MachineBasicBlock *EarlyExitBlock = MF.CreateMachineBasicBlock();
     DebugLoc DL;
 
     MF.insert(MF.end(), EarlyExitBlock);
     BuildMI(*EarlyExitBlock, EarlyExitBlock->end(), DL, TII->get(MovOpc),
             ExecReg)
         .addImm(0);
-    generateEndPgm(*EarlyExitBlock, EarlyExitBlock->end(), DL, TII,
-                   MF.getFunction().getCallingConv() == CallingConv::AMDGPU_PS);
+    generateEndPgm(*EarlyExitBlock, EarlyExitBlock->end(), DL, TII, MF);
 
     for (MachineInstr *Instr : EarlyTermInstrs) {
       // Early termination in GS does nothing
       if (MF.getFunction().getCallingConv() != CallingConv::AMDGPU_GS)
         earlyTerm(*Instr, EarlyExitBlock);
       Instr->eraseFromParent();
     }
 

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.h

uint64_t encodeMsg(uint64_t MsgId,
                    uint64_t OpId,
                    uint64_t StreamId);
 
 } // namespace SendMsg
 
 
 unsigned getInitialPSInputAddr(const Function &F);
 
+bool getHasColorExport(const Function &F);
+
+bool getHasDepthExport(const Function &F);
+
 LLVM_READNONE
 bool isShader(CallingConv::ID CC);
 
 LLVM_READNONE
 bool isGraphics(CallingConv::ID CC);
 
 LLVM_READNONE
 bool isCompute(CallingConv::ID CC);

llvm/lib/Target/AMDGPU/Utils/AMDGPUBaseInfo.cpp

 //===----------------------------------------------------------------------===//
 //
 //===----------------------------------------------------------------------===//
 
 unsigned getInitialPSInputAddr(const Function &F) {
   return getIntegerAttribute(F, "InitialPSInputAddr", 0);
 }
 
+bool getHasColorExport(const Function &F) {
+  // As a safe default always respond as if PS has color exports.
+  return getIntegerAttribute(
+             F, "amdgpu-color-export",
+             F.getCallingConv() == CallingConv::AMDGPU_PS ? 1 : 0) != 0;
+}
+
+bool getHasDepthExport(const Function &F) {
+  return getIntegerAttribute(F, "amdgpu-depth-export", 0) != 0;
+}
+
 bool isShader(CallingConv::ID cc) {
   switch(cc) {
     case CallingConv::AMDGPU_VS:
     case CallingConv::AMDGPU_LS:
     case CallingConv::AMDGPU_HS:
     case CallingConv::AMDGPU_ES:
     case CallingConv::AMDGPU_GS:
     case CallingConv::AMDGPU_PS:

llvm/test/CodeGen/AMDGPU/early-term.mir

-# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
-# RUN: llc -march=amdgcn -mcpu=gfx1010 -run-pass=si-late-branch-lowering -verify-machineinstrs  %s -o - | FileCheck -check-prefix=GFX10 %s
+# RUN: llc -march=amdgcn -mcpu=gfx900 -run-pass=si-late-branch-lowering -verify-machineinstrs  %s -o - | FileCheck -check-prefixes=GCN,GFX9 %s
+# RUN: llc -march=amdgcn -mcpu=gfx1010 -mattr=-wavefrontsize32,+wavefrontsize64 -run-pass=si-late-branch-lowering -verify-machineinstrs  %s -o - | FileCheck -check-prefixes=GCN,GFX10 %s
 
 --- |
   define amdgpu_ps void @early_term_scc0_end_block() {
     ret void
   }
 
   define amdgpu_ps void @early_term_scc0_next_terminator() {
     ret void
   }
 
   define amdgpu_ps void @early_term_scc0_in_block() {
     ret void
   }
 
   define amdgpu_gs void @early_term_scc0_gs() {
     ret void
   }
 
   define amdgpu_cs void @early_term_scc0_cs() {
     ret void
   }
+
+  define amdgpu_ps void @early_term_no_export() #0 {
+    ret void
+  }
+
+  attributes #0 = { "amdgpu-color-export"="0" "amdgpu-depth-export"="0" }
 ...
 
 ---
 name: early_term_scc0_end_block
 tracksRegLiveness: true
 liveins:
   - { reg: '$sgpr0' }
   - { reg: '$sgpr1' }
 body: |
-  ; GFX10-LABEL: name: early_term_scc0_end_block
-  ; GFX10: bb.0:
-  ; GFX10:   successors: %bb.1(0x80000000), %bb.2(0x00000000)
-  ; GFX10:   liveins: $sgpr0, $sgpr1
-  ; GFX10:   $vgpr0 = V_MOV_B32_e32 0, implicit $exec
-  ; GFX10:   dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
-  ; GFX10:   S_CBRANCH_SCC0 %bb.2, implicit $scc
-  ; GFX10: bb.1:
-  ; GFX10:   liveins: $vgpr0
-  ; GFX10:   EXP_DONE 0, $vgpr0, $vgpr0, $vgpr0, $vgpr0, -1, -1, 15, implicit $exec
-  ; GFX10:   S_ENDPGM 0
-  ; GFX10: bb.2:
-  ; GFX10:   $exec_lo = S_MOV_B32 0
-  ; GFX10:   EXP_DONE 9, undef $vgpr0, undef $vgpr0, undef $vgpr0, undef $vgpr0, 1, 0, 0, implicit $exec
-  ; GFX10:   S_ENDPGM 0
+  ; GCN-LABEL: name: early_term_scc0_end_block
+  ; GCN: bb.0:
+  ; GCN:   successors: %bb.1(0x80000000), %bb.2(0x00000000)
+  ; GCN:   liveins: $sgpr0, $sgpr1
+  ; GCN:   $vgpr0 = V_MOV_B32_e32 0, implicit $exec
+  ; GCN:   dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
+  ; GCN:   S_CBRANCH_SCC0 %bb.2, implicit $scc
+  ; GCN: bb.1:
+  ; GCN:   liveins: $vgpr0
+  ; GCN:   EXP_DONE 0, $vgpr0, $vgpr0, $vgpr0, $vgpr0, -1, -1, 15, implicit $exec
+  ; GCN:   S_ENDPGM 0
+  ; GCN: bb.2:
+  ; GCN:   $exec = S_MOV_B64 0
+  ; GCN:   EXP_DONE 9, undef $vgpr0, undef $vgpr0, undef $vgpr0, undef $vgpr0, 1, 0, 0, implicit $exec
+  ; GCN:   S_ENDPGM 0
   bb.0:
     liveins: $sgpr0, $sgpr1
     successors: %bb.1
 
     $vgpr0 = V_MOV_B32_e32 0, implicit $exec
     dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
     SI_EARLY_TERMINATE_SCC0 implicit $scc, implicit $exec
 
   bb.1:
     liveins: $vgpr0
     EXP_DONE 0, $vgpr0, $vgpr0, $vgpr0, $vgpr0, -1, -1, 15, implicit $exec
     S_ENDPGM 0
 ...
 
 ---
 name: early_term_scc0_next_terminator
 tracksRegLiveness: true
 liveins:
   - { reg: '$sgpr0' }
   - { reg: '$sgpr1' }
 body: |
-  ; GFX10-LABEL: name: early_term_scc0_next_terminator
-  ; GFX10: bb.0:
-  ; GFX10:   successors: %bb.2(0x80000000), %bb.3(0x00000000)
-  ; GFX10:   liveins: $sgpr0, $sgpr1
-  ; GFX10:   $vgpr0 = V_MOV_B32_e32 0, implicit $exec
-  ; GFX10:   dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
-  ; GFX10:   S_CBRANCH_SCC0 %bb.3, implicit $scc
-  ; GFX10:   S_BRANCH %bb.2
-  ; GFX10: bb.1:
-  ; GFX10:   successors: %bb.2(0x80000000)
-  ; GFX10:   $vgpr0 = V_MOV_B32_e32 1, implicit $exec
-  ; GFX10: bb.2:
-  ; GFX10:   liveins: $vgpr0
-  ; GFX10:   EXP_DONE 0, $vgpr0, $vgpr0, $vgpr0, $vgpr0, -1, -1, 15, implicit $exec
-  ; GFX10:   S_ENDPGM 0
-  ; GFX10: bb.3:
-  ; GFX10:   $exec_lo = S_MOV_B32 0
-  ; GFX10:   EXP_DONE 9, undef $vgpr0, undef $vgpr0, undef $vgpr0, undef $vgpr0, 1, 0, 0, implicit $exec
-  ; GFX10:   S_ENDPGM 0
+  ; GCN-LABEL: name: early_term_scc0_next_terminator
+  ; GCN: bb.0:
+  ; GCN:   successors: %bb.2(0x80000000), %bb.3(0x00000000)
+  ; GCN:   liveins: $sgpr0, $sgpr1
+  ; GCN:   $vgpr0 = V_MOV_B32_e32 0, implicit $exec
+  ; GCN:   dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
+  ; GCN:   S_CBRANCH_SCC0 %bb.3, implicit $scc
+  ; GCN:   S_BRANCH %bb.2
+  ; GCN: bb.1:
+  ; GCN:   successors: %bb.2(0x80000000)
+  ; GCN:   $vgpr0 = V_MOV_B32_e32 1, implicit $exec
+  ; GCN: bb.2:
+  ; GCN:   liveins: $vgpr0
+  ; GCN:   EXP_DONE 0, $vgpr0, $vgpr0, $vgpr0, $vgpr0, -1, -1, 15, implicit $exec
+  ; GCN:   S_ENDPGM 0
+  ; GCN: bb.3:
+  ; GCN:   $exec = S_MOV_B64 0
+  ; GCN:   EXP_DONE 9, undef $vgpr0, undef $vgpr0, undef $vgpr0, undef $vgpr0, 1, 0, 0, implicit $exec
+  ; GCN:   S_ENDPGM 0
   bb.0:
     liveins: $sgpr0, $sgpr1
     successors: %bb.2
 
     $vgpr0 = V_MOV_B32_e32 0, implicit $exec
     dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
     SI_EARLY_TERMINATE_SCC0 implicit $scc, implicit $exec
     S_BRANCH %bb.2

 
 ---
 name: early_term_scc0_in_block
 tracksRegLiveness: true
 liveins:
   - { reg: '$sgpr0' }
   - { reg: '$sgpr1' }
 body: |
-  ; GFX10-LABEL: name: early_term_scc0_in_block
-  ; GFX10: bb.0:
-  ; GFX10:   successors: %bb.3(0x40000000), %bb.2(0x40000000)
-  ; GFX10:   liveins: $sgpr0, $sgpr1
-  ; GFX10:   $vgpr0 = V_MOV_B32_e32 0, implicit $exec
-  ; GFX10:   dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
-  ; GFX10:   S_CBRANCH_SCC0 %bb.2, implicit $scc
-  ; GFX10: bb.3:
-  ; GFX10:   successors: %bb.1(0x80000000)
-  ; GFX10:   liveins: $vgpr0, $scc
-  ; GFX10:   $vgpr1 = V_MOV_B32_e32 1, implicit $exec
-  ; GFX10: bb.1:
-  ; GFX10:   liveins: $vgpr0, $vgpr1
-  ; GFX10:   EXP 1, $vgpr1, $vgpr1, $vgpr1, $vgpr1, -1, -1, 15, implicit $exec
-  ; GFX10:   EXP_DONE 0, $vgpr0, $vgpr0, $vgpr0, $vgpr0, -1, -1, 15, implicit $exec
-  ; GFX10:   S_ENDPGM 0
-  ; GFX10: bb.2:
-  ; GFX10:   $exec_lo = S_MOV_B32 0
-  ; GFX10:   EXP_DONE 9, undef $vgpr0, undef $vgpr0, undef $vgpr0, undef $vgpr0, 1, 0, 0, implicit $exec
-  ; GFX10:   S_ENDPGM 0
+  ; GCN-LABEL: name: early_term_scc0_in_block
+  ; GCN: bb.0:
+  ; GCN:   successors: %bb.3(0x40000000), %bb.2(0x40000000)
+  ; GCN:   liveins: $sgpr0, $sgpr1
+  ; GCN:   $vgpr0 = V_MOV_B32_e32 0, implicit $exec
+  ; GCN:   dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
+  ; GCN:   S_CBRANCH_SCC0 %bb.2, implicit $scc
+  ; GCN: bb.3:
+  ; GCN:   successors: %bb.1(0x80000000)
+  ; GCN:   liveins: $vgpr0, $scc
+  ; GCN:   $vgpr1 = V_MOV_B32_e32 1, implicit $exec
+  ; GCN: bb.1:
+  ; GCN:   liveins: $vgpr0, $vgpr1
+  ; GCN:   EXP 1, $vgpr1, $vgpr1, $vgpr1, $vgpr1, -1, -1, 15, implicit $exec
+  ; GCN:   EXP_DONE 0, $vgpr0, $vgpr0, $vgpr0, $vgpr0, -1, -1, 15, implicit $exec
+  ; GCN:   S_ENDPGM 0
+  ; GCN: bb.2:
+  ; GCN:   $exec = S_MOV_B64 0
+  ; GCN:   EXP_DONE 9, undef $vgpr0, undef $vgpr0, undef $vgpr0, undef $vgpr0, 1, 0, 0, implicit $exec
+  ; GCN:   S_ENDPGM 0
   bb.0:
     liveins: $sgpr0, $sgpr1
     successors: %bb.1
 
     $vgpr0 = V_MOV_B32_e32 0, implicit $exec
     dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
     SI_EARLY_TERMINATE_SCC0 implicit $scc, implicit $exec
     $vgpr1 = V_MOV_B32_e32 1, implicit $exec
 
   bb.1:
     liveins: $vgpr0, $vgpr1
     EXP 1, $vgpr1, $vgpr1, $vgpr1, $vgpr1, -1, -1, 15, implicit $exec
     EXP_DONE 0, $vgpr0, $vgpr0, $vgpr0, $vgpr0, -1, -1, 15, implicit $exec
     S_ENDPGM 0
 ...
 
 ---
 name: early_term_scc0_gs
 tracksRegLiveness: true
 liveins:
   - { reg: '$sgpr0' }
   - { reg: '$sgpr1' }
 body: |
-  ; GFX10-LABEL: name: early_term_scc0_gs
-  ; GFX10: bb.0:
-  ; GFX10:   successors: %bb.1(0x80000000)
-  ; GFX10:   liveins: $sgpr0, $sgpr1
-  ; GFX10:   $vgpr0 = V_MOV_B32_e32 0, implicit $exec
-  ; GFX10:   dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
-  ; GFX10: bb.1:
-  ; GFX10:   liveins: $vgpr0
-  ; GFX10:   S_ENDPGM 0
+  ; GCN-LABEL: name: early_term_scc0_gs
+  ; GCN: bb.0:
+  ; GCN:   successors: %bb.1(0x80000000)
+  ; GCN:   liveins: $sgpr0, $sgpr1
+  ; GCN:   $vgpr0 = V_MOV_B32_e32 0, implicit $exec
+  ; GCN:   dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
+  ; GCN: bb.1:
+  ; GCN:   liveins: $vgpr0
+  ; GCN:   S_ENDPGM 0
+  ; GCN: bb.2:
+  ; GCN:   $exec = S_MOV_B64 0
+  ; GCN:   S_ENDPGM 0
   bb.0:
     liveins: $sgpr0, $sgpr1
     successors: %bb.1
 
     $vgpr0 = V_MOV_B32_e32 0, implicit $exec
     dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
     SI_EARLY_TERMINATE_SCC0 implicit $scc, implicit $exec
 
   bb.1:
     liveins: $vgpr0
     S_ENDPGM 0
 ...
 
 ---
 name: early_term_scc0_cs
 tracksRegLiveness: true
 liveins:
   - { reg: '$sgpr0' }
   - { reg: '$sgpr1' }
 body: |
-  ; GFX10-LABEL: name: early_term_scc0_cs
-  ; GFX10: bb.0:
-  ; GFX10:   successors: %bb.1(0x80000000), %bb.2(0x00000000)
-  ; GFX10:   liveins: $sgpr0, $sgpr1
-  ; GFX10:   $vgpr0 = V_MOV_B32_e32 0, implicit $exec
-  ; GFX10:   dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
-  ; GFX10:   S_CBRANCH_SCC0 %bb.2, implicit $scc
-  ; GFX10: bb.1:
-  ; GFX10:   liveins: $vgpr0
-  ; GFX10:   S_ENDPGM 0
-  ; GFX10: bb.2:
-  ; GFX10:   $exec_lo = S_MOV_B32 0
-  ; GFX10:   S_ENDPGM 0
+  ; GCN-LABEL: name: early_term_scc0_cs
+  ; GCN: bb.0:
+  ; GCN:   successors: %bb.1(0x80000000), %bb.2(0x00000000)
+  ; GCN:   liveins: $sgpr0, $sgpr1
+  ; GCN:   $vgpr0 = V_MOV_B32_e32 0, implicit $exec
+  ; GCN:   dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
+  ; GCN:   S_CBRANCH_SCC0 %bb.2, implicit $scc
+  ; GCN: bb.1:
+  ; GCN:   liveins: $vgpr0
+  ; GCN:   S_ENDPGM 0
+  ; GCN: bb.2:
+  ; GCN:   $exec = S_MOV_B64 0
+  ; GCN:   S_ENDPGM 0
+  bb.0:
+    liveins: $sgpr0, $sgpr1
+    successors: %bb.1
+
+    $vgpr0 = V_MOV_B32_e32 0, implicit $exec
+    dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
+    SI_EARLY_TERMINATE_SCC0 implicit $scc, implicit $exec
+
+  bb.1:
+    liveins: $vgpr0
+    S_ENDPGM 0
+...
+
+---
+name: early_term_no_export
+tracksRegLiveness: true
+liveins:
+  - { reg: '$sgpr0' }
+  - { reg: '$sgpr1' }
+body: |
+  ; GCN-LABEL: name: early_term_no_export
+  ; GCN: bb.0:
+  ; GCN:   successors: %bb.1(0x80000000), %bb.2(0x00000000)
+  ; GCN:   liveins: $sgpr0, $sgpr1
+  ; GCN:   $vgpr0 = V_MOV_B32_e32 0, implicit $exec
+  ; GCN:   dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
+  ; GCN:   S_CBRANCH_SCC0 %bb.2, implicit $scc
+  ; GCN: bb.1:
+  ; GCN:   liveins: $vgpr0
+  ; GCN:   EXP_DONE 0, $vgpr0, $vgpr0, $vgpr0, $vgpr0, -1, -1, 15, implicit $exec
+  ; GCN:   S_ENDPGM 0
+  ; GCN: bb.2:
+  ; GCN:   $exec = S_MOV_B64 0
+  ; GFX9:  EXP_DONE 9, undef $vgpr0, undef $vgpr0, undef $vgpr0, undef $vgpr0, 1, 0, 0, implicit $exec
+  ; GFX10-NOT: EXP_DONE
+  ; GCN:   S_ENDPGM 0
   bb.0:
     liveins: $sgpr0, $sgpr1
     successors: %bb.1
 
     $vgpr0 = V_MOV_B32_e32 0, implicit $exec
     dead $sgpr0 = S_AND_B32 $sgpr0, killed $sgpr1, implicit-def $scc
     SI_EARLY_TERMINATE_SCC0 implicit $scc, implicit $exec
 
   bb.1:
     liveins: $vgpr0
+    EXP_DONE 0, $vgpr0, $vgpr0, $vgpr0, $vgpr0, -1, -1, 15, implicit $exec
     S_ENDPGM 0
 ...