Skip to content

Conversation

@jakobbotsch
Copy link
Member

fb67dba changed the JIT-EE GUID, but it includes no changes under src/coreclr/jit/*. The result is that jitrollingbuild built a JIT on that version but overrode the JIT on the parent commit 7060c62 with it. That means the JIT for 7060c62 now has a wrong JIT-EE GUID.

Fix the baseline detection so that it includes changes in the JIT-EE GUID. Also log the GUIDs when there is a mismatch in SPMI.

fb67dba changed the JIT-EE GUID, but it
includes no changes under src/coreclr/jit/*. The result is that
jitrollingbuild built a JIT on that version but overrode the JIT on the
parent commit 7060c62 with it. That
means the JIT for 7060c62 now has a
wrong JIT-EE GUID.

Fix the baseline detection so that it includes changes in the JIT-EE
GUID. Also log the GUIDs when there is a mismatch in SPMI.
Copilot AI review requested due to automatic review settings February 22, 2025 18:46
@ghost ghost added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Feb 22, 2025
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Copilot reviewed 2 out of 3 changed files in this pull request and generated no comments.

Files not reviewed (1)
  • src/coreclr/tools/superpmi/superpmi/jitinstance.cpp: Language not supported

@dotnet-policy-service
Copy link
Contributor

Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Copy link
Member

@EgorBo EgorBo left a comment

Choose a reason for hiding this comment

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

I vaguely remember we hit this in the past, I though we fixed it

# Enumerate the last 20 changes, starting with the baseline, that included JIT changes.
command = [ "git", "log", "--pretty=format:%H", baseline_hash, "-20", "--", "src/coreclr/jit/*" ]
# Enumerate the last 20 changes, starting with the baseline, that included JIT and JIT-EE GUID changes.
command = [ "git", "log", "--pretty=format:%H", baseline_hash, "-20", "--", "src/coreclr/jit/*", "src/coreclr/inc/jiteeversionguid.h" ]
Copy link
Member

Choose a reason for hiding this comment

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

does git log support multiple paths?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, it does

@jakobbotsch jakobbotsch merged commit e8a1e2d into dotnet:main Feb 23, 2025
96 of 98 checks passed
@jakobbotsch jakobbotsch deleted the spmi-version-guid-fixes branch February 23, 2025 11:50
@github-actions github-actions bot locked and limited conversation to collaborators Mar 26, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants