Skip to content
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
20 changes: 7 additions & 13 deletions eng/pipelines/templates/runtime-perf-job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,11 @@ jobs:

displayName: 'Android Sample App'

- task: DownloadBuildArtifacts@0
- task: DownloadPipelineArtifact@2
displayName: 'Download binlog files'
inputs:
buildType: current
downloadType: single
downloadPath: '$(builtAppDir)/androidHelloWorldBinlog'
targetPath: '$(builtAppDir)/androidHelloWorldBinlog'
# AndroidMono
${{ if eq(parameters.runtimeType, 'AndroidMono')}}:
${{ if eq(parameters.codeGenType, 'JIT') }}:
Expand All @@ -199,7 +198,6 @@ jobs:
artifactName: 'AndroidCoreCLRArm64BuildLog'
${{ if eq(parameters.codeGenType, 'R2R') }}:
artifactName: 'AndroidCoreCLRR2RArm64BuildLog'
checkDownloadedFiles: true

# Disabled due to not working and needing consistent normal android results. https://github.com/dotnet/performance/issues/4729
# - template: /eng/pipelines/templates/download-artifact-step.yml
Expand Down Expand Up @@ -233,12 +231,11 @@ jobs:
artifactFileName: 'iOSSampleAppNativeAOTNoSymbols.zip'
displayName: 'iOS Sample App'
# same artifact as above but don't extract .zip
- task: DownloadBuildArtifacts@0
- task: DownloadPipelineArtifact@2
displayName: 'Download iOS Sample App'
inputs:
buildType: current
downloadType: single
downloadPath: '$(builtAppDir)/iosHelloWorldZip'
targetPath: '$(builtAppDir)/iosHelloWorldZip'
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.codeGenType, 'FullAOT'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
artifactName: 'iOSSampleAppMonoFullAOTNoLLVMNoSymbols'
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.codeGenType, 'FullAOT'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
Expand All @@ -249,13 +246,11 @@ jobs:
artifactName: 'iOSSampleAppCoreCLRR2RNoSymbols'
${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
artifactName: 'iOSSampleAppNativeAOTNoSymbols'
checkDownloadedFiles: true
- task: DownloadBuildArtifacts@0
- task: DownloadPipelineArtifact@2
displayName: 'Download binlog files'
inputs:
buildType: current
downloadType: single
downloadPath: '$(builtAppDir)/iosHelloWorldBinlog'
targetPath: '$(builtAppDir)/iosHelloWorldBinlog'
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.codeGenType, 'FullAOT'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
artifactName: 'iOSMonoFullAOTArm64NoLLVMStripSymbolsBuildLog'
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.codeGenType, 'FullAOT'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
Expand All @@ -265,5 +260,4 @@ jobs:
${{ if and(eq(parameters.runtimeType, 'iOSCoreCLR'), eq(parameters.codeGenType, 'R2R'), eq(parameters.iOSStripSymbols, 'True')) }}:
artifactName: 'iOSCoreCLRR2RArm64StripSymbolsBuildLog'
${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
artifactName: 'iOSNativeAOTArm64StripSymbolsBuildLog'
checkDownloadedFiles: true
artifactName: 'iOSNativeAOTArm64StripSymbolsBuildLog'
6 changes: 3 additions & 3 deletions scripts/run_performance_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@ def run_performance_job(args: RunPerformanceJobArgs):
android_binlog_dir = os.path.join(root_payload_dir, "androidHelloWorldBinlog")
shutil.copytree(os.path.join(args.built_app_dir, "androidHelloWorldBinlog"), android_binlog_dir)

binlog_files = glob(os.path.join(android_binlog_dir, "**", "*.binlog"))
binlog_files = glob(os.path.join(android_binlog_dir, "**", "*.binlog"), recursive=True)
if binlog_files:
dest = os.path.join(android_binlog_dir, "msbuild.binlog")
getLogger().info(f"Moving {binlog_files[0]} to {dest}")
Expand All @@ -1093,7 +1093,7 @@ def run_performance_job(args: RunPerformanceJobArgs):
shutil.copytree(os.path.join(args.built_app_dir, "iosHelloWorldZip"), ios_hello_world_zip_dir)

# Find the zip file in the directory and move it to iOSSampleApp.zip
zip_files = glob(os.path.join(ios_hello_world_zip_dir, "**", "*.zip"))
zip_files = glob(os.path.join(ios_hello_world_zip_dir, "**", "*.zip"), recursive=True)
if zip_files:
dest = os.path.join(ios_hello_world_zip_dir, "iOSSampleApp.zip")
getLogger().info(f"Moving {zip_files[0]} to {dest}")
Expand All @@ -1102,7 +1102,7 @@ def run_performance_job(args: RunPerformanceJobArgs):
ios_hello_world_binlog_dir = os.path.join(payload_dir, "iosHelloWorldBinlog")
shutil.copytree(os.path.join(args.built_app_dir, "iosHelloWorldBinlog"), ios_hello_world_binlog_dir)

binlog_files = glob(os.path.join(ios_hello_world_binlog_dir, "**", "*.binlog"))
binlog_files = glob(os.path.join(ios_hello_world_binlog_dir, "**", "*.binlog"), recursive=True)
if binlog_files:
dest = os.path.join(ios_hello_world_binlog_dir, "msbuild.binlog")
getLogger().info(f"Moving {binlog_files[0]} to {dest}")
Expand Down