From 76c5b62988ffa2cd64facc48074e5cb355c8a5f4 Mon Sep 17 00:00:00 2001 From: Mark Searles Date: Sat, 27 Apr 2019 00:51:18 +0000 Subject: Revert "AMDGPU: Split block for si_end_cf" This reverts commit 7a6ef3004655dd86d722199c471ae78c28e31bb4. We discovered some internal test failures, so reverting for now. Differential Revision: https://reviews.llvm.org/D61213 llvm-svn: 359363 --- llvm/lib/Target/AMDGPU/SIOptimizeExecMaskingPreRA.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Target/AMDGPU/SIOptimizeExecMaskingPreRA.cpp') diff --git a/llvm/lib/Target/AMDGPU/SIOptimizeExecMaskingPreRA.cpp b/llvm/lib/Target/AMDGPU/SIOptimizeExecMaskingPreRA.cpp index 6340615244c..b4a573a9dba 100644 --- a/llvm/lib/Target/AMDGPU/SIOptimizeExecMaskingPreRA.cpp +++ b/llvm/lib/Target/AMDGPU/SIOptimizeExecMaskingPreRA.cpp @@ -83,7 +83,7 @@ FunctionPass *llvm::createSIOptimizeExecMaskingPreRAPass() { } static bool isEndCF(const MachineInstr& MI, const SIRegisterInfo* TRI) { - return MI.getOpcode() == AMDGPU::S_OR_B64_term && + return MI.getOpcode() == AMDGPU::S_OR_B64 && MI.modifiesRegister(AMDGPU::EXEC, TRI); } @@ -367,7 +367,7 @@ bool SIOptimizeExecMaskingPreRA::runOnMachineFunction(MachineFunction &MF) { // Try to collapse adjacent endifs. auto E = MBB.end(); - auto Lead = MBB.getFirstTerminator(); + auto Lead = skipDebugInstructionsForward(MBB.begin(), E); if (MBB.succ_size() != 1 || Lead == E || !isEndCF(*Lead, TRI)) continue; -- cgit v1.2.3