Skip to content

Commit 0a768f0

Browse files
committed
[SLU][profcheck] create likely branch weights for guard->branch
1 parent e80795e commit 0a768f0

File tree

2 files changed

+25
-13
lines changed

2 files changed

+25
-13
lines changed

llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include "llvm/IR/Instruction.h"
4141
#include "llvm/IR/Instructions.h"
4242
#include "llvm/IR/IntrinsicInst.h"
43+
#include "llvm/IR/MDBuilder.h"
4344
#include "llvm/IR/Module.h"
4445
#include "llvm/IR/PatternMatch.h"
4546
#include "llvm/IR/ProfDataUtils.h"
@@ -2831,9 +2832,14 @@ static BranchInst *turnGuardIntoBranch(IntrinsicInst *GI, Loop &L,
28312832
MSSAU->getMemorySSA()->verifyMemorySSA();
28322833

28332834
DomTreeUpdater DTU(DT, DomTreeUpdater::UpdateStrategy::Eager);
2834-
Instruction *DeoptBlockTerm =
2835-
SplitBlockAndInsertIfThen(GI->getArgOperand(0), GI, true,
2836-
GI->getMetadata(LLVMContext::MD_prof), &DTU, &LI);
2835+
// llvm.experimental.guard doesn't have branch weights. We can assume,
2836+
// however, that the deopt path is unlikely.
2837+
Instruction *DeoptBlockTerm = SplitBlockAndInsertIfThen(
2838+
GI->getArgOperand(0), GI, true,
2839+
!ProfcheckDisableMetadataFixes && EstimateProfile
2840+
? MDBuilder(GI->getContext()).createUnlikelyBranchWeights()
2841+
: nullptr,
2842+
&DTU, &LI);
28372843
BranchInst *CheckBI = cast<BranchInst>(CheckBB->getTerminator());
28382844
// SplitBlockAndInsertIfThen inserts control flow that branches to
28392845
// DeoptBlockTerm if the condition is true. We want the opposite.

llvm/test/Transforms/SimpleLoopUnswitch/guards.ll

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals all --version 5
22
; RUN: opt -passes='loop(simple-loop-unswitch<nontrivial>),verify<loops>' -simple-loop-unswitch-guards -S < %s | FileCheck %s
33
; RUN: opt -passes='simple-loop-unswitch<nontrivial>' -simple-loop-unswitch-guards -S < %s | FileCheck %s
44
; RUN: opt -passes='loop-mssa(simple-loop-unswitch<nontrivial>),verify<loops>' -simple-loop-unswitch-guards -verify-memoryssa -verify-loop-info -S < %s | FileCheck %s
55

66
declare void @llvm.experimental.guard(i1, ...)
77

8-
define void @test_simple_case(i1 %cond, i32 %N) {
8+
define void @test_simple_case(i1 %cond, i32 %N) !prof !0 {
99
; CHECK-LABEL: define void @test_simple_case(
10-
; CHECK-SAME: i1 [[COND:%.*]], i32 [[N:%.*]]) {
10+
; CHECK-SAME: i1 [[COND:%.*]], i32 [[N:%.*]]) !prof [[PROF0:![0-9]+]] {
1111
; CHECK-NEXT: [[ENTRY:.*:]]
12-
; CHECK-NEXT: br i1 [[COND]], label %[[ENTRY_SPLIT_US:.*]], label %[[ENTRY_SPLIT:.*]]
12+
; CHECK-NEXT: br i1 [[COND]], label %[[ENTRY_SPLIT_US:.*]], label %[[ENTRY_SPLIT:.*]], !prof [[PROF1:![0-9]+]]
1313
; CHECK: [[ENTRY_SPLIT_US]]:
1414
; CHECK-NEXT: br label %[[LOOP_US:.*]]
1515
; CHECK: [[LOOP_US]]:
@@ -50,9 +50,9 @@ define void @test_two_guards(i1 %cond1, i1 %cond2, i32 %N) {
5050
; CHECK-LABEL: define void @test_two_guards(
5151
; CHECK-SAME: i1 [[COND1:%.*]], i1 [[COND2:%.*]], i32 [[N:%.*]]) {
5252
; CHECK-NEXT: [[ENTRY:.*:]]
53-
; CHECK-NEXT: br i1 [[COND1]], label %[[ENTRY_SPLIT_US:.*]], label %[[ENTRY_SPLIT:.*]]
53+
; CHECK-NEXT: br i1 [[COND1]], label %[[ENTRY_SPLIT_US:.*]], label %[[ENTRY_SPLIT:.*]], !prof [[PROF1]]
5454
; CHECK: [[ENTRY_SPLIT_US]]:
55-
; CHECK-NEXT: br i1 [[COND2]], label %[[ENTRY_SPLIT_US_SPLIT_US:.*]], label %[[ENTRY_SPLIT_US_SPLIT:.*]]
55+
; CHECK-NEXT: br i1 [[COND2]], label %[[ENTRY_SPLIT_US_SPLIT_US:.*]], label %[[ENTRY_SPLIT_US_SPLIT:.*]], !prof [[PROF1]]
5656
; CHECK: [[ENTRY_SPLIT_US_SPLIT_US]]:
5757
; CHECK-NEXT: br label %[[LOOP_US_US:.*]]
5858
; CHECK: [[LOOP_US_US]]:
@@ -108,7 +108,7 @@ define void @test_conditional_guards(i1 %cond, i32 %N) {
108108
; CHECK-SAME: i1 [[COND:%.*]], i32 [[N:%.*]]) {
109109
; CHECK-NEXT: [[ENTRY:.*:]]
110110
; CHECK-NEXT: [[COND_FR:%.*]] = freeze i1 [[COND]]
111-
; CHECK-NEXT: br i1 [[COND_FR]], label %[[ENTRY_SPLIT_US:.*]], label %[[ENTRY_SPLIT:.*]]
111+
; CHECK-NEXT: br i1 [[COND_FR]], label %[[ENTRY_SPLIT_US:.*]], label %[[ENTRY_SPLIT:.*]], !prof [[PROF1]]
112112
; CHECK: [[ENTRY_SPLIT_US]]:
113113
; CHECK-NEXT: br label %[[LOOP_US:.*]]
114114
; CHECK: [[LOOP_US]]:
@@ -171,7 +171,7 @@ define void @test_nested_loop(i1 %cond, i32 %N, i1 %arg) {
171171
; CHECK-LABEL: define void @test_nested_loop(
172172
; CHECK-SAME: i1 [[COND:%.*]], i32 [[N:%.*]], i1 [[ARG:%.*]]) {
173173
; CHECK-NEXT: [[ENTRY:.*:]]
174-
; CHECK-NEXT: br i1 [[COND]], label %[[ENTRY_SPLIT:.*]], label %[[OUTER_LOOP_SPLIT:.*]]
174+
; CHECK-NEXT: br i1 [[COND]], label %[[ENTRY_SPLIT:.*]], label %[[OUTER_LOOP_SPLIT:.*]], !prof [[PROF1]]
175175
; CHECK: [[ENTRY_SPLIT]]:
176176
; CHECK-NEXT: br i1 [[ARG]], label %[[ENTRY_SPLIT_SPLIT_US:.*]], label %[[ENTRY_SPLIT_SPLIT:.*]]
177177
; CHECK: [[ENTRY_SPLIT_SPLIT_US]]:
@@ -243,7 +243,7 @@ define void @test_sibling_loops(i1 %cond1, i1 %cond2, i32 %N) {
243243
; CHECK-LABEL: define void @test_sibling_loops(
244244
; CHECK-SAME: i1 [[COND1:%.*]], i1 [[COND2:%.*]], i32 [[N:%.*]]) {
245245
; CHECK-NEXT: [[ENTRY:.*:]]
246-
; CHECK-NEXT: br i1 [[COND1]], label %[[ENTRY_SPLIT_US:.*]], label %[[ENTRY_SPLIT:.*]]
246+
; CHECK-NEXT: br i1 [[COND1]], label %[[ENTRY_SPLIT_US:.*]], label %[[ENTRY_SPLIT:.*]], !prof [[PROF1]]
247247
; CHECK: [[ENTRY_SPLIT_US]]:
248248
; CHECK-NEXT: br label %[[LOOP1_US:.*]]
249249
; CHECK: [[LOOP1_US]]:
@@ -263,7 +263,7 @@ define void @test_sibling_loops(i1 %cond1, i1 %cond2, i32 %N) {
263263
; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 false) [ "deopt"() ]
264264
; CHECK-NEXT: unreachable
265265
; CHECK: [[BETWEEN]]:
266-
; CHECK-NEXT: br i1 [[COND2]], label %[[BETWEEN_SPLIT_US2:.*]], label %[[BETWEEN_SPLIT:.*]]
266+
; CHECK-NEXT: br i1 [[COND2]], label %[[BETWEEN_SPLIT_US2:.*]], label %[[BETWEEN_SPLIT:.*]], !prof [[PROF1]]
267267
; CHECK: [[BETWEEN_SPLIT_US2]]:
268268
; CHECK-NEXT: br label %[[LOOP2_US:.*]]
269269
; CHECK: [[LOOP2_US]]:
@@ -343,3 +343,9 @@ exit:
343343

344344
declare void @may_throw(i32 %i)
345345
declare i32 @__CxxFrameHandler3(...)
346+
347+
!0 = !{!"function_entry_count", i32 10}
348+
;.
349+
; CHECK: [[PROF0]] = !{!"function_entry_count", i32 10}
350+
; CHECK: [[PROF1]] = !{!"branch_weights", i32 1048575, i32 1}
351+
;.

0 commit comments

Comments
 (0)