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.

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

Jump to bottom

cross-crossgen job, reduce workitem size #33436

Merged
merged 4 commits into from
Mar 11, 2020
Merged

cross-crossgen job, reduce workitem size #33436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff581d0
cross-crossgen job, reduce workitem size
Mar 10, 2020
70b7846
Fix yml authoring error
Mar 10, 2020
2b98ed2
Fix typo and add validation to corelib location
Mar 10, 2020
5731f96
Print run time
Mar 11, 2020
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
41 changes: 28 additions & 13 deletions eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,17 @@ jobs:
value: $(artifactsDirectory)/bin
- name: productDirectory
value: $(binDirectory)/coreclr
- name: workItemDirectory
value: $(artifactsDirectory)/cross-crossgen
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- name: artifactsDirectory
value: $(Build.SourcesDirectory)\artifacts
- name: binDirectory
value: $(artifactsDirectory)\bin
- name: productDirectory
value: $(binDirectory)\coreclr
- name: workItemDirectory
value: $(artifactsDirectory)\cross-crossgen

- ${{ parameters.variables }}

Expand Down Expand Up @@ -102,18 +106,29 @@ jobs:
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: |
chmod +x $(productDirectory)/$(targetFlavor)/$(hostArchType)/crossgen
mkdir -p $(artifactsDirectory)/log/$(crossFlavor)
mkdir -p $(workItemDirectory)/log/$(crossFlavor)
displayName: Create directories and ensure crossgen is executable
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: |
mkdir $(artifactsDirectory)\log\$(crossFlavor)
mkdir $(workItemDirectory)\log\$(crossFlavor)
displayName: Create directories


# Populate Core_Root
- script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
displayName: Populate Core_Root

# Populate the workitem directory
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: |
jashook marked this conversation as resolved.
Show resolved Hide resolved
cp -r $(artifactsDirectory)/tests/coreclr/$(targetFlavor)/Tests/Core_Root $(workItemDirectory)/Core_Root
displayName: Populate the workitem directory
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: |
mkdir $(workItemDirectory)\Core_Root
xcopy /s $(artifactsDirectory)\tests\coreclr\$(targetFlavor)\Tests\Core_Root $(workItemDirectory)\Core_Root
displayName: Populate the workitem directory


# Create baseline output on the host (x64) machine
- task: PythonScript@0
Expand All @@ -127,14 +142,14 @@ jobs:
--crossgen $(productDirectory)/$(targetFlavor)/$(hostArchType)/crossgen
--il_corelib $(productDirectory)/$(targetFlavor)/IL/System.Private.CoreLib.dll
--core_root $(artifactsDirectory)/tests/coreclr/$(targetFlavor)/Tests/Core_Root
--result_dir $(artifactsDirectory)/log/$(crossFlavor)
--result_dir $(workItemDirectory)/log/$(crossFlavor)
${{ if eq(parameters.osGroup, 'Windows_NT') }}:
arguments:
crossgen_framework
--crossgen $(productDirectory)\$(targetFlavor)\$(hostArchType)\crossgen
--il_corelib $(productDirectory)\$(targetFlavor)\IL\System.Private.CoreLib.dll
--core_root $(artifactsDirectory)\tests\coreclr\$(targetFlavor)\Tests\Core_Root
--result_dir $(artifactsDirectory)\log\$(crossFlavor)
--result_dir $(workItemDirectory)\log\$(crossFlavor)


# Send payload to Helix where the native output is generated and compared to the baseline
Expand All @@ -149,16 +164,16 @@ jobs:
${{ if ne(variables['System.TeamProject'], 'internal') }}:
Creator: $(Creator)
WorkItemTimeout: 3:00 # 3 hours
WorkItemDirectory: '$(artifactsDirectory)'
WorkItemDirectory: '$(workItemDirectory)'
CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
${{ if ne(parameters.osName, 'Windows_NT') }}:
WorkItemCommand:
chmod +x $HELIX_WORKITEM_PAYLOAD/bin/coreclr/$(targetFlavor)/crossgen;
chmod +x $HELIX_WORKITEM_PAYLOAD/Core_Root/crossgen;
mkdir -p $HELIX_WORKITEM_PAYLOAD/log/$(targetFlavor);
python -u $HELIX_CORRELATION_PAYLOAD/crossgen_comparison.py crossgen_framework
--crossgen $HELIX_WORKITEM_PAYLOAD/bin/coreclr/$(targetFlavor)/crossgen
--il_corelib $HELIX_WORKITEM_PAYLOAD/bin/coreclr/$(targetFlavor)/IL/System.Private.CoreLib.dll
--core_root $HELIX_WORKITEM_PAYLOAD/tests/coreclr/$(targetFlavor)/Tests/Core_Root
--crossgen $HELIX_WORKITEM_PAYLOAD/Core_Root/crossgen
--il_corelib $HELIX_WORKITEM_PAYLOAD/Core_Root/IL/System.Private.CoreLib.dll
--core_root $HELIX_WORKITEM_PAYLOAD/Core_Root
--result_dir $HELIX_WORKITEM_PAYLOAD/log/$(targetFlavor);
python -u $HELIX_CORRELATION_PAYLOAD/crossgen_comparison.py compare
--base_dir $HELIX_WORKITEM_PAYLOAD/log/$(crossFlavor)
Expand All @@ -167,9 +182,9 @@ jobs:
WorkItemCommand:
mkdir %HELIX_WORKITEM_PAYLOAD%\log\$(targetFlavor);
python -u %HELIX_CORRELATION_PAYLOAD%\crossgen_comparison.py crossgen_framework
--crossgen %HELIX_WORKITEM_PAYLOAD%\bin\coreclr\$(targetFlavor)\crossgen
--il_corelib %HELIX_WORKITEM_PAYLOAD%\bin\coreclr\$(targetFlavor)\IL\System.Private.CoreLib.dll
--core_root %HELIX_WORKITEM_PAYLOAD%\tests\coreclr\$(targetFlavor)\Tests\Core_Root
--crossgen %HELIX_WORKITEM_PAYLOAD%\Core_Root\crossgen
--il_corelib %HELIX_WORKITEM_PAYLOAD%\Core_Root\IL\System.Private.CoreLib.dll
--core_root %HELIX_WORKITEM_PAYLOAD%\Core_Root
--result_dir %HELIX_WORKITEM_PAYLOAD%\log\$(targetFlavor);
python -u %HELIX_CORRELATION_PAYLOAD%\crossgen_comparison.py compare
--base_dir %HELIX_WORKITEM_PAYLOAD%\log\$(crossFlavor)
Expand All @@ -179,7 +194,7 @@ jobs:
- task: PublishPipelineArtifact@1
displayName: Publish log
inputs:
pathtoPublish: $(artifactsDirectory)/log
pathtoPublish: $(workItemDirectory)/log
artifactName: ${{ format('Testlog_crossgen_comparison_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
continueOnError: true
condition: always()
14 changes: 14 additions & 0 deletions src/coreclr/tests/scripts/crossgen_comparison.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
################################################################################

import argparse
import datetime
import glob
import json
import hashlib
Expand Down Expand Up @@ -526,6 +527,12 @@ def crossgen_corelib(args):
ni_corelib_dirname, debugging_files_dirname = create_output_folders()
ni_corelib_filename = os.path.join(ni_corelib_dirname, assembly_name)
platform_assemblies_paths = [os.path.dirname(il_corelib_filename)]

# Validate the paths are correct.
if not os.path.exists(il_corelib_filename):
print("IL Corelib path does not exist.")
sys.exit(1)

crossgen_results = run_crossgen(args.crossgen_executable_filename, il_corelib_filename, ni_corelib_filename, platform_assemblies_paths, debugging_files_dirname)
shutil.rmtree(ni_corelib_dirname, ignore_errors=True)
save_crossgen_results_to_json_files(crossgen_results, args.result_dirname)
Expand Down Expand Up @@ -688,6 +695,13 @@ def compare_results(args):
################################################################################

if __name__ == '__main__':
start = datetime.datetime.now()

parser = build_argument_parser()
args = parser.parse_args()
func = args.func(args)

end = datetime.datetime.now()
elapsed = end - start

print("Elapsed time: {}".format(elapsed.total_seconds()))