[llvm] r315361 - AMDGPU: Fix missing skipFunction calls

[Matt Arsenault via llvm-commits]

Author: arsenm
Date: Tue Oct 10 13:48:36 2017
New Revision: 315361

URL: http://llvm.org/viewvc/llvm-project?rev=315361&view=rev
Log:
AMDGPU: Fix missing skipFunction calls

Modified:
    llvm/trunk/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp
    llvm/trunk/lib/Target/AMDGPU/SIPeepholeSDWA.cpp
    llvm/trunk/test/CodeGen/AMDGPU/control-flow-optnone.ll

Modified: llvm/trunk/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp?rev=315361&r1=315360&r2=315361&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/SIOptimizeExecMasking.cpp Tue Oct 10 13:48:36 2017
@@ -205,6 +205,9 @@ static bool isLiveOut(const MachineBasic
 }
 
 bool SIOptimizeExecMasking::runOnMachineFunction(MachineFunction &MF) {
+  if (skipFunction(*MF.getFunction()))
+    return false;
+
   const SISubtarget &ST = MF.getSubtarget<SISubtarget>();
   const SIRegisterInfo *TRI = ST.getRegisterInfo();
   const SIInstrInfo *TII = ST.getInstrInfo();

Modified: llvm/trunk/lib/Target/AMDGPU/SIPeepholeSDWA.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/SIPeepholeSDWA.cpp?rev=315361&r1=315360&r2=315361&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/SIPeepholeSDWA.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/SIPeepholeSDWA.cpp Tue Oct 10 13:48:36 2017
@@ -830,7 +830,7 @@ void SIPeepholeSDWA::legalizeScalarOpera
 bool SIPeepholeSDWA::runOnMachineFunction(MachineFunction &MF) {
   const SISubtarget &ST = MF.getSubtarget<SISubtarget>();
 
-  if (!ST.hasSDWA())
+  if (!ST.hasSDWA() || skipFunction(*MF.getFunction()))
     return false;
 
   MRI = &MF.getRegInfo();

Modified: llvm/trunk/test/CodeGen/AMDGPU/control-flow-optnone.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/control-flow-optnone.ll?rev=315361&r1=315360&r2=315361&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/control-flow-optnone.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/control-flow-optnone.ll Tue Oct 10 13:48:36 2017
@@ -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