Skip to content

[InstrProf] Support conditional counter updates for integer counters #109222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[InstrProf] Support conditional counter updates for integer counters #109222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be6ff5f
[InstrProf] Support conditional counter updates for integer counters
alanzhao1 Sep 18, 2024
2139501
spacing
alanzhao1 Sep 19, 2024
869a60b
use add only per code review suggestion; -O3 lowers this to a store i…
alanzhao1 Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,15 @@ void InstrLowerer::lowerIncrement(InstrProfIncrementInst *Inc) {
MaybeAlign(), AtomicOrdering::Monotonic);
} else {
Value *IncStep = Inc->getStep();
Value *Load = Builder.CreateLoad(IncStep->getType(), Addr, "pgocount");
auto *CtrTy = IncStep->getType();
Value *Load = Builder.CreateLoad(CtrTy, Addr, "pgocount");
if (ConditionalCounterUpdate) {
Instruction *SplitBefore = Inc->getNextNode();
Value *Cmp = Builder.CreateIsNull(Load, "pgocount.ifzero");
Instruction *ThenBranch =
SplitBlockAndInsertIfThen(Cmp, SplitBefore, false);
Builder.SetInsertPoint(ThenBranch);
}
auto *Count = Builder.CreateAdd(Load, Inc->getStep());
auto *Store = Builder.CreateStore(Count, Addr);
if (isCounterPromotionEnabled())
Expand Down
96 changes: 96 additions & 0 deletions llvm/test/Instrumentation/InstrProfiling/conditional-counter-updates.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ target triple = "x86_64-unknown-linux-gnu"
@__profn_foo = private constant [3 x i8] c"foo"
@__profn_bar = private constant [3 x i8] c"bar"

@__profn_fooint = private constant [6 x i8] c"fooint"
@__profn_barint = private constant [6 x i8] c"barint"

; CHECK-LABEL: define void @foo
; CHECK-NEXT: %pgocount = load i8, ptr @__profc_foo, align 1
; CHECK-NEXT: %pgocount.ifnonzero = icmp ne i8 %pgocount, 0
Expand Down Expand Up @@ -67,3 +70,96 @@ return: ; preds = %if.end, %if.then
%1 = load i32, ptr %retval, align 4
ret i32 %1
}

; CHECK-LABEL: define void @fooint
; CHECK-NEXT: %pgocount = load i64, ptr @__profc_fooint, align 8
; CHECK-NEXT: %pgocount.ifzero = icmp eq i64 %pgocount, 0
; CHECK-NEXT: br i1 %pgocount.ifzero, label %1, label %3

; CHECK-LABEL: 1:
; CHECK-NEXT: %2 = add i64 %pgocount, 1
; CHECK-NEXT: store i64 %2, ptr @__profc_fooint, align 8
; CHECK-NEXT: br label %3

; CHECK-LABEL: 3:
; CHECK-NEXT: ret void
define void @fooint() {
call void @llvm.instrprof.increment(ptr @__profn_fooint, i64 0, i32 1, i32 0)
ret void
}

; CHECK-LABEL: define i32 @barint
; CHECK-LABEL: entry:
; CHECK-NEXT: %retval = alloca i32, align 4
; CHECK-NEXT: %cond.addr = alloca i32, align 4
; CHECK-NEXT: store i32 %cond, ptr %cond.addr, align 4
; CHECK-NEXT: %pgocount = load i64, ptr @__profc_barint, align 8
; CHECK-NEXT: %pgocount.ifzero = icmp eq i64 %pgocount, 0
; CHECK-NEXT: br i1 %pgocount.ifzero, label %0, label %2

; CHECK-LABEL: 0: ; preds = %entry
; CHECK-NEXT: %1 = add i64 %pgocount, 1
; CHECK-NEXT: store i64 %1, ptr @__profc_barint, align 8
; CHECK-NEXT: br label %2

; CHECK-LABEL: 2: ; preds = %entry, %0
; CHECK-NEXT: %3 = load i32, ptr %cond.addr, align 4
; CHECK-NEXT: %cmp = icmp slt i32 %3, 0
; CHECK-NEXT: br i1 %cmp, label %if.then, label %if.end

; CHECK-LABEL: if.then: ; preds = %2
; CHECK-NEXT: %pgocount1 = load i64, ptr getelementptr inbounds ([3 x i64], ptr @__profc_barint, i32 0, i32 1), align 8
; CHECK-NEXT: %pgocount.ifzero2 = icmp eq i64 %pgocount1, 0
; CHECK-NEXT: br i1 %pgocount.ifzero2, label %4, label %6

; CHECK-LABEL: 4: ; preds = %if.then
; CHECK-NEXT: %5 = add i64 %pgocount1, 1
; CHECK-NEXT: store i64 %5, ptr getelementptr inbounds ([3 x i64], ptr @__profc_barint, i32 0, i32 1), align 8
; CHECK-NEXT: br label %6
;
; CHECK-LABEL: 6: ; preds = %if.then, %4
; CHECK-NEXT: store i32 -1, ptr %retval, align 4
; CHECK-NEXT: br label %return
;
; CHECK-LABEL: if.end: ; preds = %2
; CHECK-NEXT: %pgocount3 = load i64, ptr getelementptr inbounds ([3 x i64], ptr @__profc_barint, i32 0, i32 2), align 8
; CHECK-NEXT: %pgocount.ifzero4 = icmp eq i64 %pgocount3, 0
; CHECK-NEXT: br i1 %pgocount.ifzero4, label %7, label %9
;
; CHECK-LABEL: 7: ; preds = %if.end
; CHECK-NEXT: %8 = add i64 %pgocount3, 1
; CHECK-NEXT: store i64 %8, ptr getelementptr inbounds ([3 x i64], ptr @__profc_barint, i32 0, i32 2), align 8
; CHECK-NEXT: br label %9
;
; CHECK-LABEL: 9: ; preds = %if.end, %7
; CHECK-NEXT: store i32 0, ptr %retval, align 4
; CHECK-NEXT: br label %return
;
; CHECK-LABEL: return: ; preds = %9, %6
; CHECK-NEXT: %10 = load i32, ptr %retval, align 4
; CHECK-NEXT: ret i32 %10
define i32 @barint(i32 %cond) #0 {
entry:
%retval = alloca i32, align 4
%cond.addr = alloca i32, align 4
store i32 %cond, ptr %cond.addr, align 4
call void @llvm.instrprof.increment(ptr @__profn_barint, i64 0, i32 3, i32 0)
%0 = load i32, ptr %cond.addr, align 4
%cmp = icmp slt i32 %0, 0
br i1 %cmp, label %if.then, label %if.end

if.then: ; preds = %entry
call void @llvm.instrprof.increment(ptr @__profn_barint, i64 0, i32 3, i32 1)
store i32 -1, ptr %retval, align 4
br label %return

if.end: ; preds = %entry
call void @llvm.instrprof.increment(ptr @__profn_barint, i64 0, i32 3, i32 2)
store i32 0, ptr %retval, align 4
br label %return

return: ; preds = %if.end, %if.then
%1 = load i32, ptr %retval, align 4
ret i32 %1
}

Loading