Skip to content

JIT: Port loop alignment to new loop representation #95836

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

Merged
jakobbotsch merged 5 commits into from
Dec 11, 2023
Merged

JIT: Port loop alignment to new loop representation #95836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d17c72
JIT: Port loop alignment to new loop representation
jakobbotsch Dec 10, 2023
79755ab
bbNums are not ordered at this point
jakobbotsch Dec 10, 2023
6db355e
Revert superpmi.py JitAlignLoops change
jakobbotsch Dec 10, 2023
6a5bb78
Address feedback
jakobbotsch Dec 11, 2023
38ea65a
Merge branch 'main' of github.com:dotnet/runtime into align-new-repre…
jakobbotsch Dec 11, 2023
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
19 changes: 0 additions & 19 deletions src/coreclr/jit/block.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1783,25 +1783,6 @@ BBehfDesc::BBehfDesc(Compiler* comp, const BBehfDesc* other) : bbeCount(other->b
}
}

//------------------------------------------------------------------------
// unmarkLoopAlign: Unmarks the LOOP_ALIGN flag from the block and reduce the
// loop alignment count.
//
// Arguments:
// compiler - Compiler instance
// reason - Reason to print in JITDUMP
//
void BasicBlock::unmarkLoopAlign(Compiler* compiler DEBUG_ARG(const char* reason))
{
// Make sure we unmark and count just once.
if (isLoopAlign())
{
compiler->loopAlignCandidates--;
RemoveFlags(BBF_LOOP_ALIGN);
JITDUMP("Unmarking LOOP_ALIGN from " FMT_BB ". Reason= %s.\n", bbNum, reason);
}
}

//------------------------------------------------------------------------
// getCalledCount: get the value used to normalized weights for this method
//
Expand Down
5 changes: 2 additions & 3 deletions src/coreclr/jit/block.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ enum BasicBlockFlags : unsigned __int64
// and should be treated as if it falls through.
// This is just to reduce diffs from removing BBJ_NONE.
// (TODO: Remove this quirk after refactoring Compiler::fgFindInsertPoint)
BBF_OLD_LOOP_HEADER_QUIRK = MAKE_BBFLAG(42), // Block was the header ('entry') of a loop recognized by old loop finding

// The following are sets of flags.

Expand All @@ -440,7 +441,7 @@ enum BasicBlockFlags : unsigned __int64
// Flags to update when two blocks are compacted

BBF_COMPACT_UPD = BBF_GC_SAFE_POINT | BBF_NEEDS_GCPOLL | BBF_HAS_JMP | BBF_HAS_IDX_LEN | BBF_HAS_MD_IDX_LEN | BBF_BACKWARD_JUMP | \
BBF_HAS_NEWOBJ | BBF_HAS_NULLCHECK | BBF_HAS_MDARRAYREF | BBF_LOOP_PREHEADER,
BBF_HAS_NEWOBJ | BBF_HAS_NULLCHECK | BBF_HAS_MDARRAYREF | BBF_LOOP_PREHEADER | BBF_OLD_LOOP_HEADER_QUIRK,

// Flags a block should not have had before it is split.

Expand Down Expand Up @@ -873,8 +874,6 @@ struct BasicBlock : private LIR::Range
return HasFlag(BBF_LOOP_ALIGN);
}

void unmarkLoopAlign(Compiler* comp DEBUG_ARG(const char* reason));

bool hasAlign() const
{
return HasFlag(BBF_HAS_ALIGN);
Expand Down
Loading