[llvm] 87f1467 - Place the "cold" code piece into the same section as the original function

[Bill Wendling via llvm-commits]

I submitted a fix for the test. Sorry about the breakage!

On Mon, Dec 2, 2019 at 4:01 PM Voss, Matthew <Matthew.Voss at sony.com> wrote:
>
> Hi Bill,
>
> Looks like some test failures were introduced by this commit on the PS4 Ubuntu bot and our internal CI. Could you take a look?
>
> http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/58840
>
> Thanks,
> Matthew
>
> > -----Original Message-----
> > From: llvm-commits <llvm-commits-bounces at lists.llvm.org> On Behalf Of Bill
> > Wendling via llvm-commits
> > Sent: Monday, December 2, 2019 3:26 PM
> > To: llvm-commits at lists.llvm.org
> > Subject: [llvm] 87f1467 - Place the "cold" code piece into the same
> > section as the original function
> >
> >
> > Author: Bill Wendling
> > Date: 2019-12-02T15:24:59-08:00
> > New Revision: 87f146767ed709f6e354fe46f325c5b6848ad428
> >
> > URL: https://github.com/llvm/llvm-
> > project/commit/87f146767ed709f6e354fe46f325c5b6848ad428
> > DIFF: https://github.com/llvm/llvm-
> > project/commit/87f146767ed709f6e354fe46f325c5b6848ad428.diff
> >
> > LOG: Place the "cold" code piece into the same section as the original
> > function
> >
> > Summary:
> > This cropped up in the Linux kernel where cold code was placed in an
> > incompatible section.
> >
> > Reviewers: compnerd, vsk, tejohnson
> >
> > Reviewed By: vsk
> >
> > Subscribers: hiraditya, llvm-commits
> >
> > Tags: #llvm
> >
> > Differential Revision: https://reviews.llvm.org/D70925
> >
> > Added:
> >     llvm/test/Transforms/HotColdSplit/retain-section.ll
> >
> > Modified:
> >     llvm/lib/Transforms/IPO/HotColdSplitting.cpp
> >
> > Removed:
> >
> >
> >
> > ##########################################################################
> > ######
> > diff  --git a/llvm/lib/Transforms/IPO/HotColdSplitting.cpp
> > b/llvm/lib/Transforms/IPO/HotColdSplitting.cpp
> > index 9db079c7734e..2bd3df3add7a 100644
> > --- a/llvm/lib/Transforms/IPO/HotColdSplitting.cpp
> > +++ b/llvm/lib/Transforms/IPO/HotColdSplitting.cpp
> > @@ -328,6 +328,9 @@ Function *HotColdSplitting::extractColdRegion(
> >      }
> >      CI->setIsNoInline();
> >
> > +    if (OrigF->hasSection())
> > +      OutF->setSection(OrigF->getSection());
> > +
> >      markFunctionCold(*OutF, BFI != nullptr);
> >
> >      LLVM_DEBUG(llvm::dbgs() << "Outlined Region: " << *OutF);
> >
> > diff  --git a/llvm/test/Transforms/HotColdSplit/retain-section.ll
> > b/llvm/test/Transforms/HotColdSplit/retain-section.ll
> > new file mode 100644
> > index 000000000000..8c0cf6049620
> > --- /dev/null
> > +++ b/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
> >
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at lists.llvm.org
> > https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits