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

[AMDGPU] Simplify MergeInfo calculations. NFC. 

This makes the definition and uses of NewUB more symmetrical, and makes
it clear that ScoreLBs[T] does not change.
This commit is contained in:
Jay Foad 2020-04-29 16:58:07 +01:00
parent 4c53f4202a
commit 777f91f47e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
llvm/lib/Target/AMDGPU/SIInsertWaitcnts.cpp
View File

@ -1299,17 +1299,17 @@ bool WaitcntBrackets::merge(const WaitcntBrackets &Other) {
// Merge scores for this counter
const uint32_t MyPending = ScoreUBs[T] - ScoreLBs[T];
const uint32_t OtherPending = Other.ScoreUBs[T] - Other.ScoreLBs[T];
const uint32_t NewUB = ScoreLBs[T] + std::max(MyPending, OtherPending);
if (NewUB < ScoreLBs[T])
report_fatal_error("waitcnt score overflow");
MergeInfo M;
M.OldLB = ScoreLBs[T];
M.OtherLB = Other.ScoreLBs[T];
M.MyShift = OtherPending > MyPending ? OtherPending - MyPending : 0;
M.OtherShift = ScoreUBs[T] - Other.ScoreUBs[T] + M.MyShift;
M.MyShift = NewUB - ScoreUBs[T];
M.OtherShift = NewUB - Other.ScoreUBs[T];
const uint32_t NewUB = ScoreUBs[T] + M.MyShift;
if (NewUB < ScoreUBs[T])
report_fatal_error("waitcnt score overflow");
ScoreUBs[T] = NewUB;
ScoreLBs[T] = std::min(M.OldLB + M.MyShift, M.OtherLB + M.OtherShift);
StrictDom |= mergeScore(M, LastFlat[T], Other.LastFlat[T]);