respect existing attribute

llvm · Feb 5, 2024 · 38b397d · 38b397d
1 parent c3a1e7a
commit 38b397d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 36 deletions.
diff --git a/llvm/lib/Transforms/Instrumentation/PGOForceFunctionAttrs.cpp b/llvm/lib/Transforms/Instrumentation/PGOForceFunctionAttrs.cpp
@@ -16,6 +16,11 @@ using namespace llvm;
 
 static bool shouldRunOnFunction(Function &F, ProfileSummaryInfo &PSI,
                                 FunctionAnalysisManager &FAM) {
+  if (F.isDeclaration())
+    return false;
+  // Respect existing attributes.
+  if (F.hasOptNone() || F.hasOptSize() || F.hasMinSize())
+    return false;
   if (F.hasFnAttribute(Attribute::Cold))
     return true;
   if (!PSI.hasProfileSummary())
@@ -33,39 +38,22 @@ PreservedAnalyses PGOForceFunctionAttrsPass::run(Module &M,
       AM.getResult<FunctionAnalysisManagerModuleProxy>(M).getManager();
   bool MadeChange = false;
   for (Function &F : M) {
-    if (F.isDeclaration())
-      continue;
     if (!shouldRunOnFunction(F, PSI, FAM))
       continue;
-    // Add optsize/minsize/optnone if requested.
+    MadeChange = true;
     switch (ColdType) {
     case PGOOptions::ColdFuncOpt::Default:
       llvm_unreachable("bailed out for default above");
       break;
     case PGOOptions::ColdFuncOpt::OptSize:
-      if (!F.hasFnAttribute(Attribute::OptimizeNone) &&
-          !F.hasFnAttribute(Attribute::OptimizeForSize) &&
-          !F.hasFnAttribute(Attribute::MinSize)) {
-        F.addFnAttr(Attribute::OptimizeForSize);
-        MadeChange = true;
-      }
+      F.addFnAttr(Attribute::OptimizeForSize);
       break;
     case PGOOptions::ColdFuncOpt::MinSize:
-      // Change optsize to minsize.
-      if (!F.hasFnAttribute(Attribute::OptimizeNone) &&
-          !F.hasFnAttribute(Attribute::MinSize)) {
-        F.removeFnAttr(Attribute::OptimizeForSize);
-        F.addFnAttr(Attribute::MinSize);
-        MadeChange = true;
-      }
+      F.addFnAttr(Attribute::MinSize);
       break;
     case PGOOptions::ColdFuncOpt::OptNone:
-      // Strip optsize/minsize.
-      F.removeFnAttr(Attribute::OptimizeForSize);
-      F.removeFnAttr(Attribute::MinSize);
       F.addFnAttr(Attribute::OptimizeNone);
       F.addFnAttr(Attribute::NoInline);
-      MadeChange = true;
       break;
     }
   }

diff --git a/llvm/test/Instrumentation/PGOForceFunctionAttrs/basic.ll b/llvm/test/Instrumentation/PGOForceFunctionAttrs/basic.ll
@@ -12,26 +12,20 @@
 ; OPTNONE: Function Attrs: noinline optnone{{$}}
 ; CHECK: define void @cold()
 
-; NONE: Function Attrs: optsize{{$}}
-; OPTSIZE: Function Attrs: optsize{{$}}
-; MINSIZE: Function Attrs: minsize{{$}}
-; OPTNONE: Function Attrs: noinline optnone{{$}}
-; CHECK-NEXT: define void @cold1()
+; CHECK: Function Attrs: optsize{{$}}
+; CHECK-NEXT: define void @cold_optsize()
 
-; NONE: Function Attrs: minsize{{$}}
-; OPTSIZE: Function Attrs: minsize{{$}}
-; MINSIZE: Function Attrs: minsize{{$}}
-; OPTNONE: Function Attrs: noinline optnone{{$}}
-; CHECK-NEXT: define void @cold2()
+; CHECK: Function Attrs: minsize{{$}}
+; CHECK-NEXT: define void @cold_minsize()
 
 ; CHECK: Function Attrs: noinline optnone{{$}}
-; CHECK-NEXT: define void @cold3()
+; CHECK-NEXT: define void @cold_optnone()
 
 ; NONE: Function Attrs: cold{{$}}
 ; OPTSIZE: Function Attrs: cold optsize{{$}}
 ; MINSIZE: Function Attrs: cold minsize{{$}}
 ; OPTNONE: Function Attrs: cold noinline optnone{{$}}
-; CHECK-NEXT: define void @cold4()
+; CHECK-NEXT: define void @cold_attr()
 
 ; CHECK-NOT: Function Attrs: {{.*}}optsize
 ; CHECK-NOT: Function Attrs: {{.*}}minsize
@@ -44,22 +38,22 @@ define void @cold() !prof !27 {
   ret void
 }
 
-define void @cold1() optsize !prof !27 {
+define void @cold_optsize() optsize !prof !27 {
   store i32 1, ptr @s, align 4
   ret void
 }
 
-define void @cold2() minsize !prof !27 {
+define void @cold_minsize() minsize !prof !27 {
   store i32 1, ptr @s, align 4
   ret void
 }
 
-define void @cold3() noinline optnone !prof !27 {
+define void @cold_optnone() noinline optnone !prof !27 {
   store i32 1, ptr @s, align 4
   ret void
 }
 
-define void @cold4() cold {
+define void @cold_attr() cold {
   store i32 1, ptr @s, align 4
   ret void
 }