Skip to content
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.

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

JIT: Fix reporting of tier name metadata #110610

Merged
merged 1 commit into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 5 additions & 7 deletions src/coreclr/jit/compiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4053,6 +4053,11 @@ void Compiler::compSetOptimizationLevel()
{
codeGen->SetAlignLoops(JitConfig.JitAlignLoops() == 1);
}

#ifdef DEBUG
const char* tieringName = compGetTieringName(true);
JitMetadata::report(this, JitMetadata::TieringName, tieringName, strlen(tieringName));
#endif
}

fgCanRelocateEHRegions = true;
Expand Down Expand Up @@ -7152,13 +7157,6 @@ int Compiler::compCompileHelper(CORINFO_MODULE_HANDLE classPtr,
opts.disAsm = false;
}

#ifdef DEBUG
{
const char* tieringName = compGetTieringName(true);
JitMetadata::report(this, JitMetadata::TieringName, tieringName, strlen(tieringName));
}
#endif

#if COUNT_BASIC_BLOCKS
bbCntTable.record(fgBBcount);

Expand Down
6 changes: 3 additions & 3 deletions src/coreclr/tools/superpmi/superpmi/superpmi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,12 +157,12 @@ static void PrintDiffsCsvRow(
bool hasDiff)
{
fw.Printf("%d,%u,", context, contextSize);
fw.PrintQuotedCsvField(baseRes.CompileResults->MethodFullName == nullptr ? "" : baseRes.CompileResults->MethodFullName);
fw.PrintQuotedCsvField(diffRes.CompileResults->MethodFullName == nullptr ? "" : diffRes.CompileResults->MethodFullName);
fw.Printf(
",%s,%s,%s,%s,%s,%lld,%lld",
baseRes.CompileResults->TieringName == nullptr ? "" : baseRes.CompileResults->TieringName,
diffRes.CompileResults->TieringName == nullptr ? "" : diffRes.CompileResults->TieringName,
ResultToString(baseRes.Result), ResultToString(diffRes.Result),
baseRes.IsMinOpts ? "True" : "False",
diffRes.IsMinOpts ? "True" : "False",
hasDiff ? "True" : "False",
baseRes.NumExecutedInstructions, diffRes.NumExecutedInstructions);
Comment on lines +160 to 167
Copy link
Member Author

Choose a reason for hiding this comment

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

Somewhat unrelated change, but I was a bit confused for a while when my change did not have any effect on my asmdiffs details. Turned out to be because the base JIT continued to contain the bug.


Expand Down
Loading