Skip to content

Spmi replay asmdiffs mac os arm64 #64119

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
echesakov merged 3 commits into from
Jan 23, 2022
Merged

Spmi replay asmdiffs mac os arm64 #64119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acc638b
Split unix-arm64 into linux-arm64 and osx-arm64 in src/coreclr/script…
echesakov Jan 21, 2022
7db0744
Split unix-arm64 into linux-arm64 and osx-arm64 in src/coreclr/script…
echesakov Jan 21, 2022
6c7705c
Add all subdirectories of $(SuperPMIDirectory) as PMIPATH in src/core…
echesakov Jan 21, 2022
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
3 changes: 2 additions & 1 deletion src/coreclr/scripts/superpmi-asmdiffs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
<SPMI_Partition Include="win-x64" Platform="windows" Architecture="x64" />
<SPMI_Partition Include="win-arm64" Platform="windows" Architecture="arm64" />
<SPMI_Partition Include="unix-x64" Platform="Linux" Architecture="x64" />
Copy link
Contributor

@kunalspathak kunalspathak Jan 21, 2022

Choose a reason for hiding this comment

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

should it be linux-x64?

Copy link
Contributor Author

@echesakov echesakov Jan 21, 2022

Choose a reason for hiding this comment

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

I think in this case we mean unix (i.e. both osx and linux) since the calling conventions on x64 are identical (System V)

<SPMI_Partition Include="unix-arm64" Platform="Linux" Architecture="arm64" />
<SPMI_Partition Include="linux-arm64" Platform="Linux" Architecture="arm64" />
<SPMI_Partition Include="osx-arm64" Platform="OSX" Architecture="arm64" />
</ItemGroup>

<ItemGroup Condition="'$(Architecture)' == 'x86'">
Expand Down
9 changes: 7 additions & 2 deletions src/coreclr/scripts/superpmi-collect.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
PmiAssembliesPayload - Path that will be sent to helix machine to run collection on
PmiAssembliesDirectory - Path on helix machine itself where superpmi.py will discover the sent assemblies.
-->

<ItemGroup>
<PmiPathDirectories Include="$([System.IO.Directory]::GetDirectories($(SuperPMIDirectory)))" />
</ItemGroup>

<PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
<Python>%HELIX_PYTHONPATH%</Python>
<PmiAssembliesPayload>$(WorkItemDirectory)\pmiAssembliesDirectory</PmiAssembliesPayload>
Expand All @@ -54,7 +59,7 @@
<OutputMchPath>%HELIX_WORKITEM_UPLOAD_ROOT%</OutputMchPath>
<!-- Workaround until https://github.com/dotnet/arcade/pull/6179 is not available -->
<HelixResultsDestinationDir>$(BUILD_SOURCESDIRECTORY)\artifacts\helixresults</HelixResultsDestinationDir>
<WorkItemCommand>$(SuperPMIDirectory)\superpmi.py collect -log_level DEBUG --$(CollectionType) -pmi_location $(SuperPMIDirectory)\pmi.dll -pmi_path $(SuperPMIDirectory)\crossgen2</WorkItemCommand>
<WorkItemCommand>$(SuperPMIDirectory)\superpmi.py collect -log_level DEBUG --$(CollectionType) -pmi_location $(SuperPMIDirectory)\pmi.dll -pmi_path @(PmiPathDirectories->'%(FullPath)', ' ')</WorkItemCommand>
Copy link
Contributor

@kunalspathak kunalspathak Jan 21, 2022

Choose a reason for hiding this comment

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

this will expand to -pmi_path <folder1> <folder2>? I thought you wanted -pmi_path folder1 -pmi_path folder2?

Copy link
Contributor Author

@echesakov echesakov Jan 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Yes, I was mistaken how nargs="*" works in Python.
This needs to be expanded to -pmi_path <folder1> <folder2> - I found this while locally testing the change.

</PropertyGroup>
<PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
<Python>$HELIX_PYTHONPATH</Python>
Expand All @@ -68,7 +73,7 @@
<OutputMchPath>$HELIX_WORKITEM_UPLOAD_ROOT</OutputMchPath>
<!-- Workaround until https://github.com/dotnet/arcade/pull/6179 is not available -->
<HelixResultsDestinationDir>$(BUILD_SOURCESDIRECTORY)/artifacts/helixresults</HelixResultsDestinationDir>
<WorkItemCommand>$(SuperPMIDirectory)/superpmi.py collect -log_level DEBUG --$(CollectionType) -pmi_location $(SuperPMIDirectory)/pmi.dll -pmi_path $(SuperPMIDirectory)/crossgen2</WorkItemCommand>
<WorkItemCommand>$(SuperPMIDirectory)/superpmi.py collect -log_level DEBUG --$(CollectionType) -pmi_location $(SuperPMIDirectory)/pmi.dll -pmi_path @(PmiPathDirectories->'%(FullPath)', ' ')</WorkItemCommand>
</PropertyGroup>

<PropertyGroup Condition="'$(WorkItemCommand)' != ''">
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/scripts/superpmi-replay.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
<SPMI_Partition Include="win-x64" Platform="windows" Architecture="x64" />
<SPMI_Partition Include="win-arm64" Platform="windows" Architecture="arm64" />
<SPMI_Partition Include="unix-x64" Platform="Linux" Architecture="x64" />
Copy link
Contributor

@kunalspathak kunalspathak Jan 21, 2022

Choose a reason for hiding this comment

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

same here...change to linux-x64 for consistency.

<SPMI_Partition Include="unix-arm64" Platform="Linux" Architecture="arm64" />
<SPMI_Partition Include="linux-arm64" Platform="Linux" Architecture="arm64" />
<SPMI_Partition Include="osx-arm64" Platform="OSX" Architecture="arm64" />
</ItemGroup>

<ItemGroup Condition="'$(Architecture)' == 'x86'">
Expand Down