superpmi.py script improvements #42668
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Dotnet-GitSync-Bot
added
the
area-CodeGen-coreclr
1. Simplify and regularize superpmi and mcs tool finding: they are both looked for first in Core_Root, then in the built product directory, then on the PATH. 2. Improve JIT-EE version determination: first, search for the GUID by parsing corinfo.h, if found. Otherwise, use "mcs -printJITEEVersion" as before. 3. Improve JIT dll finding: search first in Core_Root, then in the built product directory. 4. When downloading coredistools, create the Core_Root if it doesn't exist. With these changes, you can build the "clr.runtime" subset then immediately run a replay or asmdiffs, without first generating a Core_Root directory. The script will automatically create the Core_Root directory simply to put coredistools in it (and also use it as the "current directory" when running superpmi commands).
BruceForstall
force-pushed
the
SuperPmiScriptUpdates
branch
from
d78a9d5 to
25b13f6
Compare
Contributor
Author
|
cc @dotnet/jit-contrib |
| 2. Find the mcs tool and run "mcs -printJITEEVersion". | ||
| 3. Otherwise, just use "unknown-jit-ee-version", which will probably cause downstream failures. | ||
| NOTE: When using mcs, we need to run the tool. So we need a version that will run. If a user specifies |
Contributor
There was a problem hiding this comment.
We discussed lot of things today, so it is easy for me to forget. But remind me, even we will figure out guid in superpmi.py script itself, but in #42053 , I will still need coreclr x64 so I can run mcs.exe (eventually via superpmi.py) to merge/dedup .mcs files. Yes?
Contributor
Author
There was a problem hiding this comment.
I will still need coreclr x64 so I can run mcs.exe (eventually via superpmi.py) to merge/dedup .mcs files. Yes?
Yes.
| corinfo_h_jit_ee_version = match_obj.group(1) | ||
| print("Using JIT/EE Version from corinfo.h: {}".format(corinfo_h_jit_ee_version)) | ||
| return corinfo_h_jit_ee_version | ||
| print("Warning: couldn't find JITEEVersionIdentifier in {}; is the file corrupt?".format(corinfo_h_path)) |
Contributor
There was a problem hiding this comment.
nit: put the "Warning: ..." under if verbose?
Contributor
Author
There was a problem hiding this comment.
Well, it's a pretty bad situation, so it probably warrants always being displayed.
I'm planning to revamp the whole output situation, creating log files, verbosity levels, etc.
kunalspathak
approved these changes
Sep 24, 2020
Contributor
kunalspathak
left a comment
kunalspathak
left a comment
There was a problem hiding this comment.
LGTM with a question.
am11
reviewed
Sep 24, 2020
src/coreclr/scripts/superpmi.py
Outdated
| # Make a more intelligent decision about the arch and build type | ||
| # based on the path of the jit passed | ||
| if standard_location and not coreclr_args.build_type in coreclr_args.jit_path: | ||
| if jit_in_product_location and not coreclr_args.build_type in coreclr_args.jit_path: |
Member
There was a problem hiding this comment.
a nit: one operator versus two
Suggested change
| if jit_in_product_location and not coreclr_args.build_type in coreclr_args.jit_path: | |
| if jit_in_product_location and coreclr_args.build_type not in coreclr_args.jit_path: |
am11
reviewed
Sep 24, 2020
src/coreclr/scripts/superpmi.py
Outdated
| # Make a more intelligent decision about the arch and build type | ||
| # based on the path of the jit passed | ||
| if standard_location and not coreclr_args.build_type in coreclr_args.base_jit_path: | ||
| if jit_in_product_location and not coreclr_args.build_type in coreclr_args.base_jit_path: |
Member
There was a problem hiding this comment.
Suggested change
| if jit_in_product_location and not coreclr_args.build_type in coreclr_args.base_jit_path: | |
| if jit_in_product_location and coreclr_args.build_type not in coreclr_args.base_jit_path: |
am11
reviewed
Sep 24, 2020
src/coreclr/scripts/superpmi.py
Outdated
| "Invalid build_type") | ||
|
|
||
| if standard_location and not coreclr_args.arch in coreclr_args.base_jit_path: | ||
| if jit_in_product_location and not coreclr_args.arch in coreclr_args.base_jit_path: |
Member
There was a problem hiding this comment.
Suggested change
| if jit_in_product_location and not coreclr_args.arch in coreclr_args.base_jit_path: | |
| if jit_in_product_location and coreclr_args.arch not in coreclr_args.base_jit_path: |
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
for first in Core_Root, then in the built product directory, then on the PATH.
corinfo.h, if found. Otherwise, use "mcs -printJITEEVersion" as before.
product directory.
With these changes, you can build the "clr.runtime" subset then immediately run
a replay or asmdiffs, without first generating a Core_Root directory. The script
will automatically create the Core_Root directory simply to put coredistools in
it (and also use it as the "current directory" when running superpmi commands).