[SelectOptimize] Respect optnone

[nikic]

Add the missing skipFunction() call so that optnone attributes and opt-bisect-limit is respected.

[llvmbot]

@llvm/pr-subscribers-backend-x86

Author: Nikita Popov (nikic)

Changes

Add the missing skipFunction() call so that optnone attributes and opt-bisect-limit is respected.

---

Full diff: https://github.com/llvm/llvm-project/pull/170858.diff

2 Files Affected:

• (modified) llvm/lib/CodeGen/SelectOptimize.cpp (+3)
• (modified) llvm/test/CodeGen/X86/select-optimize.ll (+10)

diff --git a/llvm/lib/CodeGen/SelectOptimize.cpp b/llvm/lib/CodeGen/SelectOptimize.cpp
index 13ed8f28d5507..691dcd072679b 100644
--- a/llvm/lib/CodeGen/SelectOptimize.cpp
+++ b/llvm/lib/CodeGen/SelectOptimize.cpp
@@ -313,6 +313,9 @@ class SelectOptimize : public FunctionPass {
   }
 
   bool runOnFunction(Function &F) override {
+    if (skipFunction(F))
+      return false;
+
     return Impl.runOnFunction(F, *this);
   }
 
diff --git a/llvm/test/CodeGen/X86/select-optimize.ll b/llvm/test/CodeGen/X86/select-optimize.ll
index 6cb49f243ec69..b8f7f7578a3d1 100644
--- a/llvm/test/CodeGen/X86/select-optimize.ll
+++ b/llvm/test/CodeGen/X86/select-optimize.ll
@@ -23,6 +23,16 @@ define i32 @weighted_select1(i32 %a, i32 %b, i1 %cmp) {
   ret i32 %sel
 }
 
+; But don't do anything for optnone functions.
+define i32 @weighted_select1_optnone(i32 %a, i32 %b, i1 %cmp) optnone noinline {
+; CHECK-LABEL: @weighted_select1_optnone(
+; CHECK-NEXT:    [[SEL:%.*]] = select i1 [[CMP:%.*]], i32 [[A:%.*]], i32 [[B:%.*]], !prof [[PROF16]]
+; CHECK-NEXT:    ret i32 [[SEL]]
+;
+  %sel = select i1 %cmp, i32 %a, i32 %b, !prof !15
+  ret i32 %sel
+}
+
 ; If a select is obviously predictable (reversed profile weights),
 ; turn it into a branch.
 define i32 @weighted_select2(i32 %a, i32 %b, i1 %cmp) {

[dianqk]

LG

[fhahn]

LGTM, thanks