[PATCH] D70925: Place the "cold" code piece into the same section as the original function

[Bill Wendling via Phabricator via llvm-commits]

void created this revision.
void added reviewers: compnerd, vsk, tejohnson.
Herald added subscribers: llvm-commits, hiraditya.
Herald added a project: LLVM.

This cropped up in the Linux kernel where cold code was placed in an
incompatible section.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D70925

Files:
  llvm/lib/Transforms/IPO/HotColdSplitting.cpp
  llvm/test/Transforms/HotColdSplit/retain-section.ll


Index: llvm/test/Transforms/HotColdSplit/retain-section.ll
===================================================================
--- /dev/null
+++ llvm/test/Transforms/HotColdSplit/retain-section.ll
@@ -0,0 +1,33 @@
+; RUN: opt -hotcoldsplit -hotcoldsplit-threshold=0 -S < %s | FileCheck %s
+
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx10.14.0"
+
+; Retain section after cold code is split off.
+
+; CHECK-LABEL: @fun
+; CHECK: call void @fun.cold.1{{.*}} section ".text.cold"
+define void @fun() section ".text.cold" {
+entry:
+  br i1 undef, label %if.then, label %if.else
+
+if.then:
+  ret void
+
+if.else:
+  call void @sink()
+  ret void
+}
+
+; CHECK: define {{.*}} @foo{{.*}}#[[outlined_func_attr:[0-9]+]]
+define void @foo() cold {
+  ret void
+}
+
+declare void @sink() cold
+
+; CHECK: define {{.*}} @fun.cold.1{{.*}}#[[outlined_func_attr]]
+
+; CHECK: attributes #[[outlined_func_attr]] = {
+; CHECK-SAME: cold
+; CHECK-SAME: minsize
Index: llvm/lib/Transforms/IPO/HotColdSplitting.cpp
===================================================================
--- llvm/lib/Transforms/IPO/HotColdSplitting.cpp
+++ llvm/lib/Transforms/IPO/HotColdSplitting.cpp
@@ -328,6 +328,9 @@
     }
     CI->setIsNoInline();
 
+    if (OrigF->hasSection())
+      OutF->setSection(OrigF->getSection());
+
     markFunctionCold(*OutF, BFI != nullptr);
 
     LLVM_DEBUG(llvm::dbgs() << "Outlined Region: " << *OutF);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D70925.231779.patch
Type: text/x-patch
Size: 1461 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191202/c73fa965/attachment.bin>