This is an archive of the discontinued LLVM Phabricator instance.

Differential D157456

[JT] Fixes typo in assertions and updates test.
Needs ReviewPublic

Authored by red1bluelost on Aug 8 2023, 4:56 PM.

Details

Reviewers
ebrevnov
Summary

Noticed a typo in Jump Threading when checking BPI and BFI. This
lead to a test failing which needed BPI.

Ran check-llvm to verify no regressions.

Diff Detail

Unit TestsFailed

TimeTest
60,040 msx64 debian > MLIR.Examples/standalone::test.toy

Event Timeline

red1bluelost created this revision.Aug 8 2023, 4:56 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 8 2023, 4:56 PM
Herald added a subscriber: hiraditya. · View Herald Transcript
red1bluelost requested review of this revision.Aug 8 2023, 4:56 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 8 2023, 4:56 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B251236: Diff 548403.Aug 8 2023, 9:12 PM

Revision Contents

PathSize
llvm/
lib/
Transforms/
Scalar/
2 lines
test/
Transforms/
JumpThreading/
2 lines

Diff 548403

llvm/lib/Transforms/Scalar/JumpThreading.cpp

Show First 20 Lines • Show All 2,475 Lines • ▼ Show 20 Lines
/// Freq(PredBB->BB) / Freq(BB->SuccBB). /// Freq(PredBB->BB) / Freq(BB->SuccBB).
void JumpThreadingPass::updateBlockFreqAndEdgeWeight(BasicBlock *PredBB, void JumpThreadingPass::updateBlockFreqAndEdgeWeight(BasicBlock *PredBB,
BasicBlock *BB, BasicBlock *BB,
BasicBlock *NewBB, BasicBlock *NewBB,
BasicBlock *SuccBB, BasicBlock *SuccBB,
BlockFrequencyInfo *BFI, BlockFrequencyInfo *BFI,
BranchProbabilityInfo *BPI, BranchProbabilityInfo *BPI,
bool HasProfile) { bool HasProfile) {
assert(((BFI && BPI) || (!BFI && !BFI)) && assert(((BFI && BPI) || (!BFI && !BPI)) &&
"Both BFI & BPI should either be set or unset"); "Both BFI & BPI should either be set or unset");
if (!BFI) { if (!BFI) {
assert(!HasProfile && assert(!HasProfile &&
"It's expected to have BFI/BPI when profile info exists"); "It's expected to have BFI/BPI when profile info exists");
return; return;
} }
▲ Show 20 Lines • Show All 674 Lines • Show Last 20 Lines

llvm/test/Transforms/JumpThreading/select.ll

; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals
; RUN: opt -S -passes="jump-threading" -debug-only=branch-prob < %s 2>&1 | FileCheck %s ; RUN: opt -S -passes="jump-threading" -debug-only=branch-prob < %s 2>&1 | FileCheck %s
; RUN: opt -S -passes="require<branch-prob>,jump-threading" -debug-only=branch-prob < %s 2>&1 | FileCheck -check-prefixes=CHECK,CHECK-BPI %s ; RUN: opt -S -passes="require<branch-prob>,require<block-freq>,jump-threading" -debug-only=branch-prob < %s 2>&1 | FileCheck -check-prefixes=CHECK,CHECK-BPI %s
; REQUIRES: asserts ; REQUIRES: asserts
; CHECK-BPI-LABEL: ---- Branch Probability Info : unfold1 ---- ; CHECK-BPI-LABEL: ---- Branch Probability Info : unfold1 ----
; CHECK-BPI: set edge cond.false -> 0 successor probability to 0x20000000 / 0x80000000 = 25.00% ; CHECK-BPI: set edge cond.false -> 0 successor probability to 0x20000000 / 0x80000000 = 25.00%
; CHECK-BPI: set edge cond.false -> 1 successor probability to 0x60000000 / 0x80000000 = 75.00% ; CHECK-BPI: set edge cond.false -> 1 successor probability to 0x60000000 / 0x80000000 = 75.00%
; CHECK-BPI-LABEL: ---- Branch Probability Info : unfold2 ---- ; CHECK-BPI-LABEL: ---- Branch Probability Info : unfold2 ----
; CHECK-BPI: set edge cond.false -> 0 successor probability to 0x20000000 / 0x80000000 = 25.00% ; CHECK-BPI: set edge cond.false -> 0 successor probability to 0x20000000 / 0x80000000 = 25.00%
; CHECK-BPI: set edge cond.false -> 1 successor probability to 0x60000000 / 0x80000000 = 75.00% ; CHECK-BPI: set edge cond.false -> 1 successor probability to 0x60000000 / 0x80000000 = 75.00%
▲ Show 20 Lines • Show All 665 Lines • Show Last 20 Lines