From 2d1082f2c000ac09d7aea70cf1fb300827049400 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Tue, 10 Oct 2017 20:48:36 +0000 Subject: [PATCH] AMDGPU: Fix missing skipFunction calls git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315361 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AMDGPU/SIOptimizeExecMasking.cpp | 3 +++ lib/Target/AMDGPU/SIPeepholeSDWA.cpp | 2 +- test/CodeGen/AMDGPU/control-flow-optnone.ll | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp b/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp index 46e58a2ca5f..4c991c7c21a 100644 --- a/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp +++ b/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp @@ -205,6 +205,9 @@ static bool isLiveOut(const MachineBasicBlock &MBB, unsigned Reg) { } bool SIOptimizeExecMasking::runOnMachineFunction(MachineFunction &MF) { + if (skipFunction(*MF.getFunction())) + return false; + const SISubtarget &ST = MF.getSubtarget(); const SIRegisterInfo *TRI = ST.getRegisterInfo(); const SIInstrInfo *TII = ST.getInstrInfo(); diff --git a/lib/Target/AMDGPU/SIPeepholeSDWA.cpp b/lib/Target/AMDGPU/SIPeepholeSDWA.cpp index 24b7fe0f991..939062817a1 100644 --- a/lib/Target/AMDGPU/SIPeepholeSDWA.cpp +++ b/lib/Target/AMDGPU/SIPeepholeSDWA.cpp @@ -830,7 +830,7 @@ void SIPeepholeSDWA::legalizeScalarOperands(MachineInstr &MI, const SISubtarget bool SIPeepholeSDWA::runOnMachineFunction(MachineFunction &MF) { const SISubtarget &ST = MF.getSubtarget(); - if (!ST.hasSDWA()) + if (!ST.hasSDWA() || skipFunction(*MF.getFunction())) return false; MRI = &MF.getRegInfo(); diff --git a/test/CodeGen/AMDGPU/control-flow-optnone.ll b/test/CodeGen/AMDGPU/control-flow-optnone.ll index 269f582bccf..2122af62735 100644 --- a/test/CodeGen/AMDGPU/control-flow-optnone.ll +++ b/test/CodeGen/AMDGPU/control-flow-optnone.ll @@ -12,7 +12,7 @@ ; GCN-DAG: v_cmp_lt_i32 ; GCN-DAG: v_cmp_gt_i32 ; GCN: s_and_b64 -; GCN: s_and_saveexec_b64 +; GCN: s_mov_b64 exec ; GCN: s_or_b64 exec, exec ; GCN: v_cmp_eq_u32 -- 2.40.0