maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[FuncSpec] Don't specialise functions with NoDuplicate instructions. 

getSpecializationCost was returning INT_MAX for a case when specialisation
shouldn't happen, but this wasn't properly checked if specialisation was
forced.

Differential Revision: https://reviews.llvm.org/D104461
This commit is contained in:
Sjoerd Meijer 2021-06-17 14:43:02 +01:00
parent 225b960cfc
commit 342bbb7832
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/lib/Transforms/IPO/FunctionSpecialization.cpp
View File

@ -248,9 +248,12 @@ private:
Metrics.analyzeBasicBlock(&BB, (GetTTI)(*F), EphValues);
// If the code metrics reveal that we shouldn't duplicate the function, we
// shouldn't specialize it. Set the specialization cost to the maximum.
if (Metrics.notDuplicatable)
return std::numeric_limits<unsigned>::max();
// shouldn't specialize it. Set the specialization cost to Invalid.
if (Metrics.notDuplicatable) {
InstructionCost C{};
C.setInvalid();
return C;
}
// Otherwise, set the specialization cost to be the cost of all the
// instructions in the function and penalty for specializing more functions.
@ -417,6 +420,11 @@ private:
// function where the argument takes on the given constant value. If so,
// add the constant to Constants.
auto FnSpecCost = getSpecializationCost(F);
if (!FnSpecCost.isValid()) {
LLVM_DEBUG(dbgs() << "FnSpecialization: Invalid specialisation cost.\n");
return false;
}
LLVM_DEBUG(dbgs() << "FnSpecialization: func specialisation cost: ";
FnSpecCost.print(dbgs()); dbgs() << "\n");

6
llvm/test/Transforms/FunctionSpecialization/function-specialization-nodup2.ll
View File

@ -1,12 +1,12 @@
; RUN: opt -function-specialization -force-function-specialization -S < %s | FileCheck %s
; FIXME: Function foo gets specialised even though it contains an instrinsic
; Check that function foo does not gets specialised as it contains an instrinsic
; that is marked as NoDuplicate.
; Please note that the use of the hardwareloop intrinsic is arbitrary; it's
; just an easy to use intrinsic that has NoDuplicate.
; CHECK: @foo.1(
; CHECK: @foo.2(
; CHECK-NOT: @foo.1(
; CHECK-NOT: @foo.2(
target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"