Skip to content

Update how OSR and PGO interact #61453

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
AndyAyersMS merged 8 commits into from
Nov 13, 2021
Merged

Update how OSR and PGO interact #61453

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
138893c
Update how OSR and PGO interact
AndyAyersMS Nov 11, 2021
1f8800b
fix linux build issues
AndyAyersMS Nov 11, 2021
44ed72b
really fix linux build
AndyAyersMS Nov 11, 2021
e8dadc8
review feedback
AndyAyersMS Nov 12, 2021
432ca0f
simplify compatability checking
AndyAyersMS Nov 12, 2021
cf0d1b4
Fix phase ordering so partially jitted methods don't lose probes.
AndyAyersMS Nov 12, 2021
bc3a3b9
Fix issues with PGO and OSR methods with complex entry flow.
AndyAyersMS Nov 12, 2021
70f10ce
A few more fixes for partial compilation, because the number of things
AndyAyersMS Nov 12, 2021
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
Prev Previous commit
Next Next commit
fix linux build issues
  • Loading branch information
@AndyAyersMS
AndyAyersMS committed Nov 11, 2021
commit 1f8800b5c938826c4fe283198f3882204a9fd052
3 changes: 1 addition & 2 deletions src/coreclr/inc/pgo_formatprocessing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,14 +367,13 @@ bool ReadInstrumentationSchemaWithLayout(const uint8_t *pByte, size_t cbDataMax,
//
inline bool ComparePgoSchemaCompatible(const uint8_t *pByte, size_t cbDataMax, ICorJitInfo::PgoInstrumentationSchema* schemaTable, size_t cSchemas)
Copy link
Member

@jakobbotsch jakobbotsch Nov 11, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was a little surprised that this mutates the schema. Maybe rename it to something like SetOffsetsForSchemaSubsequence or similar?

Copy link
Member Author

@AndyAyersMS AndyAyersMS Nov 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about CheckIfPgoSchemaIsCompatibleAndSetOffsets?

{
size_t iSchema = 0;
size_t nSchema = 0;
size_t nMatched = 0;
size_t nUnmatched = 0;
size_t initialOffset = cbDataMax;

ReadInstrumentationSchemaWithLayout(pByte, cbDataMax, initialOffset,
[schemaTable, cSchemas, &iSchema, &nSchema, &nMatched, &nUnmatched](const ICorJitInfo::PgoInstrumentationSchema& schema)
[schemaTable, &nSchema, &nMatched, &nUnmatched](const ICorJitInfo::PgoInstrumentationSchema& schema)
{
const size_t iSchemaAdj = nSchema - nUnmatched;
Copy link
Member

@jakobbotsch jakobbotsch Nov 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this the same as nMatched?

Copy link
Member

@jakobbotsch jakobbotsch Nov 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And thinking a little bit more about it, that means this might index off the end of schemaTable.

Copy link
Member Author

@AndyAyersMS AndyAyersMS Nov 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is, yeah.


Expand Down