[nativeaot][tests] Update bundle zip path for NativeAOT sample app#87049

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
kotlarmilos merged 15 commits into from
Jun 5, 2023
Merged

[nativeaot][tests] Update bundle zip path for NativeAOT sample app #87049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e53fdd2
Update bundle zip path for NativeAOT sample app
kotlarmilos Jun 2, 2023
599971d
Test perf pipeline
kotlarmilos Jun 2, 2023
904b592
Add shared path for Mono and Native AOT
kotlarmilos Jun 2, 2023
402e656
Use common display name
kotlarmilos Jun 2, 2023
c0c2a88
Use common display name
kotlarmilos Jun 2, 2023
a24ba92
Use common display name
kotlarmilos Jun 2, 2023
c646652
Parametrize bundle download step
kotlarmilos Jun 2, 2023
d0763db
Parametrize bundle download step
kotlarmilos Jun 2, 2023
779a8aa
Parametrize bundle download step
kotlarmilos Jun 2, 2023
d596c72
Parametrize bundle download step
kotlarmilos Jun 2, 2023
851dbd8
Update Helix item name and fix find command
kotlarmilos Jun 2, 2023
4bc3259
Update Helix item name and fix bundle path
kotlarmilos Jun 2, 2023
29d3935
Add runtime type parameter
kotlarmilos Jun 2, 2023
b16484e
Enable other jobs
kotlarmilos Jun 2, 2023
51f4ac0
Remove duplicate property
kotlarmilos Jun 2, 2023
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
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/perf-non-wasm-jobs.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,7 +228,7 @@ jobs:
jobParameters:
testGroup: perf
runtimeType: iOSNativeAOT
projectFile: ios_nativeaot_scenarios.proj
projectFile: ios_scenarios.proj
runKind: ios_scenarios
runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
logicalmachine: 'perfiphone12mini'
Expand All@@ -244,7 +244,7 @@ jobs:
jobParameters:
testGroup: perf
runtimeType: iOSNativeAOT
projectFile: ios_nativeaot_scenarios.proj
projectFile: ios_scenarios.proj
runKind: ios_scenarios
runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
logicalmachine: 'perfiphone12mini'
Expand Down
132 changes: 35 additions & 97 deletions eng/pipelines/coreclr/templates/perf-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -228,113 +228,51 @@ jobs:
artifactName: 'AndroidBDNApk'
displayName: 'Mono Android BDN Apk'

# Download iOSMono tests
- ${{ if eq(parameters.runtimeType, 'iOSMono') }}:
- ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
- template: /eng/pipelines/common/download-artifact-step.yml
parameters:
unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmsymbols
cleanUnpackFolder: false
artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
artifactName: 'iOSSampleAppNoLLVMSymbols'
displayName: 'iOS Sample App NoLLVM Symbols'
# same artifact as above but don't extract .zip
- task: DownloadBuildArtifacts@0
displayName: 'Download iOS Sample App NoLLVM Symbols'
inputs:
buildType: current
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmsymbolszip'
# Download iOSMono and Native AOT tests
- ${{ if or(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.runtimeType, 'iOSNativeAOT')) }}:
- template: /eng/pipelines/common/download-artifact-step.yml
parameters:
unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld
cleanUnpackFolder: false
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
artifactName: 'iOSSampleAppNoLLVMSymbols'
checkDownloadedFiles: true
- ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
- template: /eng/pipelines/common/download-artifact-step.yml
parameters:
unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmsymbols
cleanUnpackFolder: false
artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
artifactName: 'iOSSampleAppLLVMSymbols'
displayName: 'iOS Sample App LLVM Symbols'
# same artifact as above but don't extract .zip
- task: DownloadBuildArtifacts@0
displayName: 'Download iOS Sample App LLVM Symbols'
inputs:
buildType: current
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmsymbolszip'
artifactName: 'iOSSampleAppLLVMSymbols'
checkDownloadedFiles: true
- ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
- template: /eng/pipelines/common/download-artifact-step.yml
parameters:
unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmnosymbols
cleanUnpackFolder: false
artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
artifactName: 'iOSSampleAppNoLLVMNoSymbols'
displayName: 'iOS Sample App NoLLVM NoSymbols'
# same artifact as above but don't extract .zip
- task: DownloadBuildArtifacts@0
displayName: 'Download iOS Sample App NoLLVM NoSymbols'
inputs:
buildType: current
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmnosymbolszip'
artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
artifactName: 'iOSSampleAppNoLLVMNoSymbols'
checkDownloadedFiles: true
- ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
- template: /eng/pipelines/common/download-artifact-step.yml
parameters:
unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmnosymbols
cleanUnpackFolder: false
artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
artifactName: 'iOSSampleAppLLVMNoSymbols'
displayName: 'iOS Sample App LLVM NoSymbols'
# same artifact as above but don't extract .zip
- task: DownloadBuildArtifacts@0
displayName: 'Download iOS Sample App LLVM NoSymbols'
inputs:
buildType: current
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmnosymbolszip'
artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
artifactName: 'iOSSampleAppLLVMSymbols'
artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
artifactName: 'iOSSampleAppLLVMNoSymbols'
checkDownloadedFiles: true

# Download iOSNativeAOT tests
- ${{ if eq(parameters.runtimeType, 'iOSNativeAOT') }}:
- ${{ if eq(parameters.iOSStripSymbols, 'False') }}:
- template: /eng/pipelines/common/download-artifact-step.yml
parameters:
unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/symbols
cleanUnpackFolder: false
artifactFileName: 'iOSSampleAppSymbols.zip'
artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
artifactName: 'iOSSampleAppSymbols'
Comment thread
kotlarmilos marked this conversation as resolved.
displayName: 'iOS Sample App Symbols'
artifactFileName: 'iOSSampleAppSymbols.zip'
${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
artifactName: 'iOSSampleAppNoSymbols'
artifactFileName: 'iOSSampleAppNoSymbols.zip'
displayName: 'iOS Sample App'
# same artifact as above but don't extract .zip
- task: DownloadBuildArtifacts@0
displayName: 'Download iOS Sample App Symbols'
displayName: 'Download iOS Sample App'
inputs:
buildType: current
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/symbols'
artifactName: 'iOSSampleAppSymbols'
checkDownloadedFiles: true
- ${{ if eq(parameters.iOSStripSymbols, 'True') }}:
- template: /eng/pipelines/common/download-artifact-step.yml
parameters:
unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nosymbols
cleanUnpackFolder: false
artifactFileName: 'iOSSampleAppNoSymbols.zip'
artifactName: 'iOSSampleAppNoSymbols'
displayName: 'iOS Sample App NoSymbols'
# same artifact as above but don't extract .zip
- task: DownloadBuildArtifacts@0
displayName: 'Download iOS Sample App NoSymbols'
inputs:
buildType: current
downloadType: single
downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nosymbols'
downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip'
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
artifactName: 'iOSSampleAppNoLLVMSymbols'
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
artifactName: 'iOSSampleAppNoLLVMNoSymbols'
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
artifactName: 'iOSSampleAppLLVMSymbols'
${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
artifactName: 'iOSSampleAppLLVMNoSymbols'
${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
artifactName: 'iOSSampleAppSymbols'
${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
artifactName: 'iOSSampleAppNoSymbols'
checkDownloadedFiles: true
checkDownloadedFiles: true

# Create Core_Root
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) generatelayoutonly $(librariesOverrideArg) $(_crossBuildPropertyArg)
Expand Down
70 changes: 0 additions & 70 deletions eng/testing/performance/ios_nativeaot_scenarios.proj
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions eng/testing/performance/ios_scenarios.proj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,19 +30,19 @@
</PropertyGroup>

<ItemGroup>
<HelixWorkItem Include="SOD - iOS HelloWorld Mono .app Size $(LlvmPath) $(SymbolsPath)">
<HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) .app Size $(LlvmPath) $(SymbolsPath)">
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath) ./app;$(Python) pre.py --name app</PreCommands>
<PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld ./app;$(Python) pre.py --name app</PreCommands>
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
<PostCommands>$(Python) post.py</PostCommands>
</HelixWorkItem>
<HelixWorkItem Include="SOD - iOS HelloWorld Mono Zip Size $(LlvmPath) $(SymbolsPath)">
<HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) Zip Size $(LlvmPath) $(SymbolsPath)">
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
<PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/$(LlvmPath)$(SymbolsPath)zip/iOSSampleApp$(LlvmPath)$(SymbolsPath)/iOSSampleApp$(LlvmPath)$(SymbolsPath).zip .;$(Python) pre.py --name iOSSampleApp$(LlvmPath)$(SymbolsPath).zip</PreCommands>
<PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/iOSSampleApp.zip .;$(Python) pre.py --name iOSSampleApp.zip</PreCommands>
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
<PostCommands>$(Python) post.py</PostCommands>
</HelixWorkItem>
<XHarnessAppBundleToTest Include="Device Startup - iOS Mono HelloWorld $(LlvmPath) $(SymbolsPath)">
<XHarnessAppBundleToTest Include="Device Startup - iOS $(RuntimeType) HelloWorld $(LlvmPath) $(SymbolsPath)">
<AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
<WorkItemTimeout>00:15:00</WorkItemTimeout>
<TestTarget>ios-device</TestTarget>
Expand All@@ -51,7 +51,7 @@
# PreCommands
export XHARNESSPATH=$XHARNESS_CLI_PATH

cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath)/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/iosHelloWorld/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
cp -f embedded.mobileprovision $(ScenarioDirectory)helloios/HelloiOS.app
cd $(ScenarioDirectory)helloios
sign HelloiOS.app
Expand Down
47 changes: 11 additions & 36 deletions eng/testing/performance/performance-setup.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,10 @@ use_latest_dotnet=false
logical_machine=
javascript_engine="v8"
iosmono=false
iosnativeaot=false
runtimetype=""
iosllvmbuild=""
iosstripsymbols=""
iosnativeaot=false
maui_version=""
use_local_commit_time=false
only_sanity=false
Expand DownExpand Up@@ -341,12 +342,14 @@ if [[ "$monoaot" == "true" ]]; then
fi

if [[ "$iosmono" == "true" ]]; then
configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols"
runtimetype="Mono"
configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

if [[ "$iosnativeaot" == "true" ]]; then
configurations="$configurations iOSStripSymbols=$iosstripsymbols"
runtimetype="NativeAOT"
configurations="$configurations iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

Expand DownExpand Up@@ -453,40 +456,11 @@ if [[ "$use_baseline_core_run" == true ]]; then
mv $baseline_core_root_directory $new_baseline_core_root
fi

if [[ "$iosmono" == "true" ]]; then
if [[ "$iosllvmbuild" == "True" ]]; then
if [[ "$iosstripsymbols" == "True" ]]; then
# LLVM NoSymbols Mono .app
mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmnosymbols $payload_directory/iosHelloWorld
mkdir -p $payload_directory/iosHelloWorldZip/llvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmnosymbolszip $payload_directory/iosHelloWorldZip
else
# LLVM Symbols Mono .app
mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmsymbols $payload_directory/iosHelloWorld
mkdir -p $payload_directory/iosHelloWorldZip/llvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmsymbolszip $payload_directory/iosHelloWorldZip
fi
else
if [[ "$iosstripsymbols" == "True" ]]; then
# NoLLVM NoSymbols Mono .app
mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmnosymbols $payload_directory/iosHelloWorld
mkdir -p $payload_directory/iosHelloWorldZip/nollvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmnosymbolszip $payload_directory/iosHelloWorldZip
else
# NoLLVM Symbols Mono .app
mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmsymbols $payload_directory/iosHelloWorld
mkdir -p $payload_directory/iosHelloWorldZip/nollvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmsymbolszip $payload_directory/iosHelloWorldZip
fi
fi
fi
if [[ "$iosmono" == "true" || "$iosnativeaot" == "true" ]]; then
mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld $payload_directory/iosHelloWorld
mkdir -p $payload_directory/iosHelloWorldZip && cp -rv $source_directory/iosHelloWorldZip $payload_directory/iosHelloWorldZip

if [[ "$iosnativeaot" == "true" ]]; then
if [[ "$iosstripsymbols" == "True" ]]; then
# NoSymbols Mono .app
mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nosymbols $payload_directory/iosHelloWorld
mkdir -p $payload_directory/iosHelloWorldZip/nosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nosymbolszip $payload_directory/iosHelloWorldZip
else
# NoSymbols Mono .app
mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/symbols $payload_directory/iosHelloWorld
mkdir -p $payload_directory/iosHelloWorldZip/symbolszip && cp -rv $source_directory/iosHelloWorldZip/symbolszip $payload_directory/iosHelloWorldZip
fi
find "$payload_directory/iosHelloWorldZip/" -type f -name "*.zip" -execdir mv {} "$payload_directory/iosHelloWorldZip/iOSSampleApp.zip" \;
fi

ci=true
Expand DownExpand Up@@ -521,6 +495,7 @@ Write-PipelineSetVariable -name "MonoDotnet" -value "$using_mono" -is_multi_job_
Write-PipelineSetVariable -name "WasmDotnet" -value "$using_wasm" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSLlvmBuild' -Value "$iosllvmbuild" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSStripSymbols' -Value "$iosstripsymbols" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'RuntimeType' -Value "$runtimetype" -is_multi_job_variable false
Write-PipelineSetVariable -name "OnlySanityCheck" -value "$only_sanity" -is_multi_job_variable false

# Put it back to what was set on top of this script
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[nativeaot][tests] Update bundle zip path for NativeAOT sample app#87049

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

kotlarmilos
merged 15 commits into

from

Jun 5, 2023
 Merged


[nativeaot][tests] Update bundle zip path for NativeAOT sample app
#87049
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
e53fdd2

Update bundle zip path for NativeAOT sample app


kotlarmilos Jun 2, 2023
599971d

Test perf pipeline


kotlarmilos Jun 2, 2023
904b592

Add shared path for Mono and Native AOT


kotlarmilos Jun 2, 2023
402e656

Use common display name


kotlarmilos Jun 2, 2023
c0c2a88

Use common display name


kotlarmilos Jun 2, 2023
a24ba92

Use common display name


kotlarmilos Jun 2, 2023
c646652

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d0763db

Parametrize bundle download step


kotlarmilos Jun 2, 2023
779a8aa

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d596c72

Parametrize bundle download step


kotlarmilos Jun 2, 2023
851dbd8

Update Helix item name and fix find command


kotlarmilos Jun 2, 2023
4bc3259

Update Helix item name and fix bundle path


kotlarmilos Jun 2, 2023
29d3935

Add runtime type parameter


kotlarmilos Jun 2, 2023
b16484e

Enable other jobs


kotlarmilos Jun 2, 2023
51f4ac0

Remove duplicate property


kotlarmilos Jun 2, 2023

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


4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/perf-non-wasm-jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,7 +228,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand All@@ -244,7 +244,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand Down

132 changes: 35 additions & 97 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,113 +228,51 @@ jobs:
 artifactName: 'AndroidBDNApk'
 displayName: 'Mono Android BDN Apk'

 # Download iOSMono tests
 - ${{ if eq(parameters.runtimeType, 'iOSMono') }}:
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 displayName: 'iOS Sample App NoLLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmsymbolszip'
 # Download iOSMono and Native AOT tests
 - ${{ if or(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.runtimeType, 'iOSNativeAOT')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld
 cleanUnpackFolder: false
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 displayName: 'iOS Sample App LLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmsymbolszip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 displayName: 'iOS Sample App NoLLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 displayName: 'iOS Sample App LLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 checkDownloadedFiles: true

 # Download iOSNativeAOT tests
 - ${{ if eq(parameters.runtimeType, 'iOSNativeAOT') }}:
 - ${{ if eq(parameters.iOSStripSymbols, 'False') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/symbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppSymbols.zip'
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
Comment thread
kotlarmilos marked this conversation as resolved.

 displayName: 'iOS Sample App Symbols'
 artifactFileName: 'iOSSampleAppSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 displayName: 'iOS Sample App'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App Symbols'
 displayName: 'Download iOS Sample App'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/symbols'
 artifactName: 'iOSSampleAppSymbols'
 checkDownloadedFiles: true
 - ${{ if eq(parameters.iOSStripSymbols, 'True') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 artifactName: 'iOSSampleAppNoSymbols'
 displayName: 'iOS Sample App NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nosymbols'
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
checkDownloadedFiles: true
 checkDownloadedFiles: true

 # Create Core_Root
 - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) generatelayoutonly $(librariesOverrideArg) $(_crossBuildPropertyArg)
Expand Down

70 changes: 0 additions & 70 deletions
eng/testing/performance/ios_nativeaot_scenarios.proj

View file


Open in desktop


This file was deleted.


12 changes: 6 additions & 6 deletions
eng/testing/performance/ios_scenarios.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,19 +30,19 @@
 </PropertyGroup>

 <ItemGroup>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono .app Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) .app Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath) ./app;$(Python) pre.py --name app</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld ./app;$(Python) pre.py --name app</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono Zip Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) Zip Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/$(LlvmPath)$(SymbolsPath)zip/iOSSampleApp$(LlvmPath)$(SymbolsPath)/iOSSampleApp$(LlvmPath)$(SymbolsPath).zip .;$(Python) pre.py --name iOSSampleApp$(LlvmPath)$(SymbolsPath).zip</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/iOSSampleApp.zip .;$(Python) pre.py --name iOSSampleApp.zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <XHarnessAppBundleToTest Include="Device Startup - iOS Mono HelloWorld $(LlvmPath) $(SymbolsPath)">
 <XHarnessAppBundleToTest Include="Device Startup - iOS $(RuntimeType) HelloWorld $(LlvmPath) $(SymbolsPath)">
 <AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
 <WorkItemTimeout>00:15:00</WorkItemTimeout>
 <TestTarget>ios-device</TestTarget>
Expand All@@ -51,7 +51,7 @@
 # PreCommands
 export XHARNESSPATH=$XHARNESS_CLI_PATH

 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath)/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/iosHelloWorld/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -f embedded.mobileprovision $(ScenarioDirectory)helloios/HelloiOS.app
 cd $(ScenarioDirectory)helloios
 sign HelloiOS.app
Expand Down

47 changes: 11 additions & 36 deletions
eng/testing/performance/performance-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,10 @@ use_latest_dotnet=false
logical_machine=
javascript_engine="v8"
iosmono=false
iosnativeaot=false
runtimetype=""
iosllvmbuild=""
iosstripsymbols=""
iosnativeaot=false
maui_version=""
use_local_commit_time=false
only_sanity=false
Expand DownExpand Up@@ -341,12 +342,14 @@ if [[ "$monoaot" == "true" ]]; then
fi

if [[ "$iosmono" == "true" ]]; then
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols"
 runtimetype="Mono"
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

if [[ "$iosnativeaot" == "true" ]]; then
 configurations="$configurations iOSStripSymbols=$iosstripsymbols"
 runtimetype="NativeAOT"
 configurations="$configurations iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

Expand DownExpand Up@@ -453,40 +456,11 @@ if [[ "$use_baseline_core_run" == true ]]; then
 mv $baseline_core_root_directory $new_baseline_core_root
fi

if [[ "$iosmono" == "true" ]]; then
 if [[ "$iosllvmbuild" == "True" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # LLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # LLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 else
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoLLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoLLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 fi
fi
if [[ "$iosmono" == "true" || "$iosnativeaot" == "true" ]]; then
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip && cp -rv $source_directory/iosHelloWorldZip $payload_directory/iosHelloWorldZip

if [[ "$iosnativeaot" == "true" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/symbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/symbolszip && cp -rv $source_directory/iosHelloWorldZip/symbolszip $payload_directory/iosHelloWorldZip
 fi
 find "$payload_directory/iosHelloWorldZip/" -type f -name "*.zip" -execdir mv {} "$payload_directory/iosHelloWorldZip/iOSSampleApp.zip" \;
fi

ci=true
Expand DownExpand Up@@ -521,6 +495,7 @@ Write-PipelineSetVariable -name "MonoDotnet" -value "$using_mono" -is_multi_job_
Write-PipelineSetVariable -name "WasmDotnet" -value "$using_wasm" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSLlvmBuild' -Value "$iosllvmbuild" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSStripSymbols' -Value "$iosstripsymbols" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'RuntimeType' -Value "$runtimetype" -is_multi_job_variable false
Write-PipelineSetVariable -name "OnlySanityCheck" -value "$only_sanity" -is_multi_job_variable false

# Put it back to what was set on top of this script
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[nativeaot][tests] Update bundle zip path for NativeAOT sample app#87049

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

kotlarmilos
merged 15 commits into

from

Jun 5, 2023
 Merged


[nativeaot][tests] Update bundle zip path for NativeAOT sample app
#87049
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
e53fdd2

Update bundle zip path for NativeAOT sample app


kotlarmilos Jun 2, 2023
599971d

Test perf pipeline


kotlarmilos Jun 2, 2023
904b592

Add shared path for Mono and Native AOT


kotlarmilos Jun 2, 2023
402e656

Use common display name


kotlarmilos Jun 2, 2023
c0c2a88

Use common display name


kotlarmilos Jun 2, 2023
a24ba92

Use common display name


kotlarmilos Jun 2, 2023
c646652

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d0763db

Parametrize bundle download step


kotlarmilos Jun 2, 2023
779a8aa

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d596c72

Parametrize bundle download step


kotlarmilos Jun 2, 2023
851dbd8

Update Helix item name and fix find command


kotlarmilos Jun 2, 2023
4bc3259

Update Helix item name and fix bundle path


kotlarmilos Jun 2, 2023
29d3935

Add runtime type parameter


kotlarmilos Jun 2, 2023
b16484e

Enable other jobs


kotlarmilos Jun 2, 2023
51f4ac0

Remove duplicate property


kotlarmilos Jun 2, 2023

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


4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/perf-non-wasm-jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,7 +228,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand All@@ -244,7 +244,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand Down

132 changes: 35 additions & 97 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,113 +228,51 @@ jobs:
 artifactName: 'AndroidBDNApk'
 displayName: 'Mono Android BDN Apk'

 # Download iOSMono tests
 - ${{ if eq(parameters.runtimeType, 'iOSMono') }}:
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 displayName: 'iOS Sample App NoLLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmsymbolszip'
 # Download iOSMono and Native AOT tests
 - ${{ if or(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.runtimeType, 'iOSNativeAOT')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld
 cleanUnpackFolder: false
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 displayName: 'iOS Sample App LLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmsymbolszip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 displayName: 'iOS Sample App NoLLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 displayName: 'iOS Sample App LLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 checkDownloadedFiles: true

 # Download iOSNativeAOT tests
 - ${{ if eq(parameters.runtimeType, 'iOSNativeAOT') }}:
 - ${{ if eq(parameters.iOSStripSymbols, 'False') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/symbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppSymbols.zip'
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
Comment thread
kotlarmilos marked this conversation as resolved.

 displayName: 'iOS Sample App Symbols'
 artifactFileName: 'iOSSampleAppSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 displayName: 'iOS Sample App'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App Symbols'
 displayName: 'Download iOS Sample App'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/symbols'
 artifactName: 'iOSSampleAppSymbols'
 checkDownloadedFiles: true
 - ${{ if eq(parameters.iOSStripSymbols, 'True') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 artifactName: 'iOSSampleAppNoSymbols'
 displayName: 'iOS Sample App NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nosymbols'
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
checkDownloadedFiles: true
 checkDownloadedFiles: true

 # Create Core_Root
 - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) generatelayoutonly $(librariesOverrideArg) $(_crossBuildPropertyArg)
Expand Down

70 changes: 0 additions & 70 deletions
eng/testing/performance/ios_nativeaot_scenarios.proj

View file


Open in desktop


This file was deleted.


12 changes: 6 additions & 6 deletions
eng/testing/performance/ios_scenarios.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,19 +30,19 @@
 </PropertyGroup>

 <ItemGroup>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono .app Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) .app Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath) ./app;$(Python) pre.py --name app</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld ./app;$(Python) pre.py --name app</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono Zip Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) Zip Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/$(LlvmPath)$(SymbolsPath)zip/iOSSampleApp$(LlvmPath)$(SymbolsPath)/iOSSampleApp$(LlvmPath)$(SymbolsPath).zip .;$(Python) pre.py --name iOSSampleApp$(LlvmPath)$(SymbolsPath).zip</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/iOSSampleApp.zip .;$(Python) pre.py --name iOSSampleApp.zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <XHarnessAppBundleToTest Include="Device Startup - iOS Mono HelloWorld $(LlvmPath) $(SymbolsPath)">
 <XHarnessAppBundleToTest Include="Device Startup - iOS $(RuntimeType) HelloWorld $(LlvmPath) $(SymbolsPath)">
 <AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
 <WorkItemTimeout>00:15:00</WorkItemTimeout>
 <TestTarget>ios-device</TestTarget>
Expand All@@ -51,7 +51,7 @@
 # PreCommands
 export XHARNESSPATH=$XHARNESS_CLI_PATH

 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath)/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/iosHelloWorld/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -f embedded.mobileprovision $(ScenarioDirectory)helloios/HelloiOS.app
 cd $(ScenarioDirectory)helloios
 sign HelloiOS.app
Expand Down

47 changes: 11 additions & 36 deletions
eng/testing/performance/performance-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,10 @@ use_latest_dotnet=false
logical_machine=
javascript_engine="v8"
iosmono=false
iosnativeaot=false
runtimetype=""
iosllvmbuild=""
iosstripsymbols=""
iosnativeaot=false
maui_version=""
use_local_commit_time=false
only_sanity=false
Expand DownExpand Up@@ -341,12 +342,14 @@ if [[ "$monoaot" == "true" ]]; then
fi

if [[ "$iosmono" == "true" ]]; then
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols"
 runtimetype="Mono"
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

if [[ "$iosnativeaot" == "true" ]]; then
 configurations="$configurations iOSStripSymbols=$iosstripsymbols"
 runtimetype="NativeAOT"
 configurations="$configurations iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

Expand DownExpand Up@@ -453,40 +456,11 @@ if [[ "$use_baseline_core_run" == true ]]; then
 mv $baseline_core_root_directory $new_baseline_core_root
fi

if [[ "$iosmono" == "true" ]]; then
 if [[ "$iosllvmbuild" == "True" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # LLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # LLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 else
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoLLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoLLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 fi
fi
if [[ "$iosmono" == "true" || "$iosnativeaot" == "true" ]]; then
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip && cp -rv $source_directory/iosHelloWorldZip $payload_directory/iosHelloWorldZip

if [[ "$iosnativeaot" == "true" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/symbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/symbolszip && cp -rv $source_directory/iosHelloWorldZip/symbolszip $payload_directory/iosHelloWorldZip
 fi
 find "$payload_directory/iosHelloWorldZip/" -type f -name "*.zip" -execdir mv {} "$payload_directory/iosHelloWorldZip/iOSSampleApp.zip" \;
fi

ci=true
Expand DownExpand Up@@ -521,6 +495,7 @@ Write-PipelineSetVariable -name "MonoDotnet" -value "$using_mono" -is_multi_job_
Write-PipelineSetVariable -name "WasmDotnet" -value "$using_wasm" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSLlvmBuild' -Value "$iosllvmbuild" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSStripSymbols' -Value "$iosstripsymbols" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'RuntimeType' -Value "$runtimetype" -is_multi_job_variable false
Write-PipelineSetVariable -name "OnlySanityCheck" -value "$only_sanity" -is_multi_job_variable false

# Put it back to what was set on top of this script
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[nativeaot][tests] Update bundle zip path for NativeAOT sample app#87049

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

kotlarmilos
merged 15 commits into

from

Jun 5, 2023
 Merged


[nativeaot][tests] Update bundle zip path for NativeAOT sample app
#87049
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
e53fdd2

Update bundle zip path for NativeAOT sample app


kotlarmilos Jun 2, 2023
599971d

Test perf pipeline


kotlarmilos Jun 2, 2023
904b592

Add shared path for Mono and Native AOT


kotlarmilos Jun 2, 2023
402e656

Use common display name


kotlarmilos Jun 2, 2023
c0c2a88

Use common display name


kotlarmilos Jun 2, 2023
a24ba92

Use common display name


kotlarmilos Jun 2, 2023
c646652

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d0763db

Parametrize bundle download step


kotlarmilos Jun 2, 2023
779a8aa

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d596c72

Parametrize bundle download step


kotlarmilos Jun 2, 2023
851dbd8

Update Helix item name and fix find command


kotlarmilos Jun 2, 2023
4bc3259

Update Helix item name and fix bundle path


kotlarmilos Jun 2, 2023
29d3935

Add runtime type parameter


kotlarmilos Jun 2, 2023
b16484e

Enable other jobs


kotlarmilos Jun 2, 2023
51f4ac0

Remove duplicate property


kotlarmilos Jun 2, 2023

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


4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/perf-non-wasm-jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,7 +228,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand All@@ -244,7 +244,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand Down

132 changes: 35 additions & 97 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,113 +228,51 @@ jobs:
 artifactName: 'AndroidBDNApk'
 displayName: 'Mono Android BDN Apk'

 # Download iOSMono tests
 - ${{ if eq(parameters.runtimeType, 'iOSMono') }}:
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 displayName: 'iOS Sample App NoLLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmsymbolszip'
 # Download iOSMono and Native AOT tests
 - ${{ if or(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.runtimeType, 'iOSNativeAOT')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld
 cleanUnpackFolder: false
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 displayName: 'iOS Sample App LLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmsymbolszip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 displayName: 'iOS Sample App NoLLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 displayName: 'iOS Sample App LLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 checkDownloadedFiles: true

 # Download iOSNativeAOT tests
 - ${{ if eq(parameters.runtimeType, 'iOSNativeAOT') }}:
 - ${{ if eq(parameters.iOSStripSymbols, 'False') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/symbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppSymbols.zip'
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
Comment thread
kotlarmilos marked this conversation as resolved.

 displayName: 'iOS Sample App Symbols'
 artifactFileName: 'iOSSampleAppSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 displayName: 'iOS Sample App'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App Symbols'
 displayName: 'Download iOS Sample App'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/symbols'
 artifactName: 'iOSSampleAppSymbols'
 checkDownloadedFiles: true
 - ${{ if eq(parameters.iOSStripSymbols, 'True') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 artifactName: 'iOSSampleAppNoSymbols'
 displayName: 'iOS Sample App NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nosymbols'
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
checkDownloadedFiles: true
 checkDownloadedFiles: true

 # Create Core_Root
 - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) generatelayoutonly $(librariesOverrideArg) $(_crossBuildPropertyArg)
Expand Down

70 changes: 0 additions & 70 deletions
eng/testing/performance/ios_nativeaot_scenarios.proj

View file


Open in desktop


This file was deleted.


12 changes: 6 additions & 6 deletions
eng/testing/performance/ios_scenarios.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,19 +30,19 @@
 </PropertyGroup>

 <ItemGroup>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono .app Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) .app Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath) ./app;$(Python) pre.py --name app</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld ./app;$(Python) pre.py --name app</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono Zip Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) Zip Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/$(LlvmPath)$(SymbolsPath)zip/iOSSampleApp$(LlvmPath)$(SymbolsPath)/iOSSampleApp$(LlvmPath)$(SymbolsPath).zip .;$(Python) pre.py --name iOSSampleApp$(LlvmPath)$(SymbolsPath).zip</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/iOSSampleApp.zip .;$(Python) pre.py --name iOSSampleApp.zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <XHarnessAppBundleToTest Include="Device Startup - iOS Mono HelloWorld $(LlvmPath) $(SymbolsPath)">
 <XHarnessAppBundleToTest Include="Device Startup - iOS $(RuntimeType) HelloWorld $(LlvmPath) $(SymbolsPath)">
 <AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
 <WorkItemTimeout>00:15:00</WorkItemTimeout>
 <TestTarget>ios-device</TestTarget>
Expand All@@ -51,7 +51,7 @@
 # PreCommands
 export XHARNESSPATH=$XHARNESS_CLI_PATH

 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath)/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/iosHelloWorld/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -f embedded.mobileprovision $(ScenarioDirectory)helloios/HelloiOS.app
 cd $(ScenarioDirectory)helloios
 sign HelloiOS.app
Expand Down

47 changes: 11 additions & 36 deletions
eng/testing/performance/performance-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,10 @@ use_latest_dotnet=false
logical_machine=
javascript_engine="v8"
iosmono=false
iosnativeaot=false
runtimetype=""
iosllvmbuild=""
iosstripsymbols=""
iosnativeaot=false
maui_version=""
use_local_commit_time=false
only_sanity=false
Expand DownExpand Up@@ -341,12 +342,14 @@ if [[ "$monoaot" == "true" ]]; then
fi

if [[ "$iosmono" == "true" ]]; then
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols"
 runtimetype="Mono"
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

if [[ "$iosnativeaot" == "true" ]]; then
 configurations="$configurations iOSStripSymbols=$iosstripsymbols"
 runtimetype="NativeAOT"
 configurations="$configurations iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

Expand DownExpand Up@@ -453,40 +456,11 @@ if [[ "$use_baseline_core_run" == true ]]; then
 mv $baseline_core_root_directory $new_baseline_core_root
fi

if [[ "$iosmono" == "true" ]]; then
 if [[ "$iosllvmbuild" == "True" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # LLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # LLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 else
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoLLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoLLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 fi
fi
if [[ "$iosmono" == "true" || "$iosnativeaot" == "true" ]]; then
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip && cp -rv $source_directory/iosHelloWorldZip $payload_directory/iosHelloWorldZip

if [[ "$iosnativeaot" == "true" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/symbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/symbolszip && cp -rv $source_directory/iosHelloWorldZip/symbolszip $payload_directory/iosHelloWorldZip
 fi
 find "$payload_directory/iosHelloWorldZip/" -type f -name "*.zip" -execdir mv {} "$payload_directory/iosHelloWorldZip/iOSSampleApp.zip" \;
fi

ci=true
Expand DownExpand Up@@ -521,6 +495,7 @@ Write-PipelineSetVariable -name "MonoDotnet" -value "$using_mono" -is_multi_job_
Write-PipelineSetVariable -name "WasmDotnet" -value "$using_wasm" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSLlvmBuild' -Value "$iosllvmbuild" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSStripSymbols' -Value "$iosstripsymbols" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'RuntimeType' -Value "$runtimetype" -is_multi_job_variable false
Write-PipelineSetVariable -name "OnlySanityCheck" -value "$only_sanity" -is_multi_job_variable false

# Put it back to what was set on top of this script
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[nativeaot][tests] Update bundle zip path for NativeAOT sample app#87049

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

kotlarmilos
merged 15 commits into

from

Jun 5, 2023
 Merged


[nativeaot][tests] Update bundle zip path for NativeAOT sample app
#87049
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
e53fdd2

Update bundle zip path for NativeAOT sample app


kotlarmilos Jun 2, 2023
599971d

Test perf pipeline


kotlarmilos Jun 2, 2023
904b592

Add shared path for Mono and Native AOT


kotlarmilos Jun 2, 2023
402e656

Use common display name


kotlarmilos Jun 2, 2023
c0c2a88

Use common display name


kotlarmilos Jun 2, 2023
a24ba92

Use common display name


kotlarmilos Jun 2, 2023
c646652

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d0763db

Parametrize bundle download step


kotlarmilos Jun 2, 2023
779a8aa

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d596c72

Parametrize bundle download step


kotlarmilos Jun 2, 2023
851dbd8

Update Helix item name and fix find command


kotlarmilos Jun 2, 2023
4bc3259

Update Helix item name and fix bundle path


kotlarmilos Jun 2, 2023
29d3935

Add runtime type parameter


kotlarmilos Jun 2, 2023
b16484e

Enable other jobs


kotlarmilos Jun 2, 2023
51f4ac0

Remove duplicate property


kotlarmilos Jun 2, 2023

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


4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/perf-non-wasm-jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,7 +228,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand All@@ -244,7 +244,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand Down

132 changes: 35 additions & 97 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,113 +228,51 @@ jobs:
 artifactName: 'AndroidBDNApk'
 displayName: 'Mono Android BDN Apk'

 # Download iOSMono tests
 - ${{ if eq(parameters.runtimeType, 'iOSMono') }}:
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 displayName: 'iOS Sample App NoLLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmsymbolszip'
 # Download iOSMono and Native AOT tests
 - ${{ if or(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.runtimeType, 'iOSNativeAOT')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld
 cleanUnpackFolder: false
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 displayName: 'iOS Sample App LLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmsymbolszip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 displayName: 'iOS Sample App NoLLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 displayName: 'iOS Sample App LLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 checkDownloadedFiles: true

 # Download iOSNativeAOT tests
 - ${{ if eq(parameters.runtimeType, 'iOSNativeAOT') }}:
 - ${{ if eq(parameters.iOSStripSymbols, 'False') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/symbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppSymbols.zip'
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
Comment thread
kotlarmilos marked this conversation as resolved.

 displayName: 'iOS Sample App Symbols'
 artifactFileName: 'iOSSampleAppSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 displayName: 'iOS Sample App'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App Symbols'
 displayName: 'Download iOS Sample App'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/symbols'
 artifactName: 'iOSSampleAppSymbols'
 checkDownloadedFiles: true
 - ${{ if eq(parameters.iOSStripSymbols, 'True') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 artifactName: 'iOSSampleAppNoSymbols'
 displayName: 'iOS Sample App NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nosymbols'
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
checkDownloadedFiles: true
 checkDownloadedFiles: true

 # Create Core_Root
 - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) generatelayoutonly $(librariesOverrideArg) $(_crossBuildPropertyArg)
Expand Down

70 changes: 0 additions & 70 deletions
eng/testing/performance/ios_nativeaot_scenarios.proj

View file


Open in desktop


This file was deleted.


12 changes: 6 additions & 6 deletions
eng/testing/performance/ios_scenarios.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,19 +30,19 @@
 </PropertyGroup>

 <ItemGroup>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono .app Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) .app Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath) ./app;$(Python) pre.py --name app</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld ./app;$(Python) pre.py --name app</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono Zip Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) Zip Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/$(LlvmPath)$(SymbolsPath)zip/iOSSampleApp$(LlvmPath)$(SymbolsPath)/iOSSampleApp$(LlvmPath)$(SymbolsPath).zip .;$(Python) pre.py --name iOSSampleApp$(LlvmPath)$(SymbolsPath).zip</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/iOSSampleApp.zip .;$(Python) pre.py --name iOSSampleApp.zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <XHarnessAppBundleToTest Include="Device Startup - iOS Mono HelloWorld $(LlvmPath) $(SymbolsPath)">
 <XHarnessAppBundleToTest Include="Device Startup - iOS $(RuntimeType) HelloWorld $(LlvmPath) $(SymbolsPath)">
 <AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
 <WorkItemTimeout>00:15:00</WorkItemTimeout>
 <TestTarget>ios-device</TestTarget>
Expand All@@ -51,7 +51,7 @@
 # PreCommands
 export XHARNESSPATH=$XHARNESS_CLI_PATH

 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath)/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/iosHelloWorld/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -f embedded.mobileprovision $(ScenarioDirectory)helloios/HelloiOS.app
 cd $(ScenarioDirectory)helloios
 sign HelloiOS.app
Expand Down

47 changes: 11 additions & 36 deletions
eng/testing/performance/performance-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,10 @@ use_latest_dotnet=false
logical_machine=
javascript_engine="v8"
iosmono=false
iosnativeaot=false
runtimetype=""
iosllvmbuild=""
iosstripsymbols=""
iosnativeaot=false
maui_version=""
use_local_commit_time=false
only_sanity=false
Expand DownExpand Up@@ -341,12 +342,14 @@ if [[ "$monoaot" == "true" ]]; then
fi

if [[ "$iosmono" == "true" ]]; then
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols"
 runtimetype="Mono"
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

if [[ "$iosnativeaot" == "true" ]]; then
 configurations="$configurations iOSStripSymbols=$iosstripsymbols"
 runtimetype="NativeAOT"
 configurations="$configurations iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

Expand DownExpand Up@@ -453,40 +456,11 @@ if [[ "$use_baseline_core_run" == true ]]; then
 mv $baseline_core_root_directory $new_baseline_core_root
fi

if [[ "$iosmono" == "true" ]]; then
 if [[ "$iosllvmbuild" == "True" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # LLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # LLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 else
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoLLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoLLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 fi
fi
if [[ "$iosmono" == "true" || "$iosnativeaot" == "true" ]]; then
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip && cp -rv $source_directory/iosHelloWorldZip $payload_directory/iosHelloWorldZip

if [[ "$iosnativeaot" == "true" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/symbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/symbolszip && cp -rv $source_directory/iosHelloWorldZip/symbolszip $payload_directory/iosHelloWorldZip
 fi
 find "$payload_directory/iosHelloWorldZip/" -type f -name "*.zip" -execdir mv {} "$payload_directory/iosHelloWorldZip/iOSSampleApp.zip" \;
fi

ci=true
Expand DownExpand Up@@ -521,6 +495,7 @@ Write-PipelineSetVariable -name "MonoDotnet" -value "$using_mono" -is_multi_job_
Write-PipelineSetVariable -name "WasmDotnet" -value "$using_wasm" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSLlvmBuild' -Value "$iosllvmbuild" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSStripSymbols' -Value "$iosstripsymbols" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'RuntimeType' -Value "$runtimetype" -is_multi_job_variable false
Write-PipelineSetVariable -name "OnlySanityCheck" -value "$only_sanity" -is_multi_job_variable false

# Put it back to what was set on top of this script
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[nativeaot][tests] Update bundle zip path for NativeAOT sample app#87049

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

kotlarmilos
merged 15 commits into

from

Jun 5, 2023
 Merged


[nativeaot][tests] Update bundle zip path for NativeAOT sample app
#87049
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
e53fdd2

Update bundle zip path for NativeAOT sample app


kotlarmilos Jun 2, 2023
599971d

Test perf pipeline


kotlarmilos Jun 2, 2023
904b592

Add shared path for Mono and Native AOT


kotlarmilos Jun 2, 2023
402e656

Use common display name


kotlarmilos Jun 2, 2023
c0c2a88

Use common display name


kotlarmilos Jun 2, 2023
a24ba92

Use common display name


kotlarmilos Jun 2, 2023
c646652

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d0763db

Parametrize bundle download step


kotlarmilos Jun 2, 2023
779a8aa

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d596c72

Parametrize bundle download step


kotlarmilos Jun 2, 2023
851dbd8

Update Helix item name and fix find command


kotlarmilos Jun 2, 2023
4bc3259

Update Helix item name and fix bundle path


kotlarmilos Jun 2, 2023
29d3935

Add runtime type parameter


kotlarmilos Jun 2, 2023
b16484e

Enable other jobs


kotlarmilos Jun 2, 2023
51f4ac0

Remove duplicate property


kotlarmilos Jun 2, 2023

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


4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/perf-non-wasm-jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,7 +228,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand All@@ -244,7 +244,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand Down

132 changes: 35 additions & 97 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,113 +228,51 @@ jobs:
 artifactName: 'AndroidBDNApk'
 displayName: 'Mono Android BDN Apk'

 # Download iOSMono tests
 - ${{ if eq(parameters.runtimeType, 'iOSMono') }}:
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 displayName: 'iOS Sample App NoLLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmsymbolszip'
 # Download iOSMono and Native AOT tests
 - ${{ if or(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.runtimeType, 'iOSNativeAOT')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld
 cleanUnpackFolder: false
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 displayName: 'iOS Sample App LLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmsymbolszip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 displayName: 'iOS Sample App NoLLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 displayName: 'iOS Sample App LLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 checkDownloadedFiles: true

 # Download iOSNativeAOT tests
 - ${{ if eq(parameters.runtimeType, 'iOSNativeAOT') }}:
 - ${{ if eq(parameters.iOSStripSymbols, 'False') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/symbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppSymbols.zip'
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
Comment thread
kotlarmilos marked this conversation as resolved.

 displayName: 'iOS Sample App Symbols'
 artifactFileName: 'iOSSampleAppSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 displayName: 'iOS Sample App'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App Symbols'
 displayName: 'Download iOS Sample App'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/symbols'
 artifactName: 'iOSSampleAppSymbols'
 checkDownloadedFiles: true
 - ${{ if eq(parameters.iOSStripSymbols, 'True') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 artifactName: 'iOSSampleAppNoSymbols'
 displayName: 'iOS Sample App NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nosymbols'
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
checkDownloadedFiles: true
 checkDownloadedFiles: true

 # Create Core_Root
 - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) generatelayoutonly $(librariesOverrideArg) $(_crossBuildPropertyArg)
Expand Down

70 changes: 0 additions & 70 deletions
eng/testing/performance/ios_nativeaot_scenarios.proj

View file


Open in desktop


This file was deleted.


12 changes: 6 additions & 6 deletions
eng/testing/performance/ios_scenarios.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,19 +30,19 @@
 </PropertyGroup>

 <ItemGroup>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono .app Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) .app Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath) ./app;$(Python) pre.py --name app</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld ./app;$(Python) pre.py --name app</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono Zip Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) Zip Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/$(LlvmPath)$(SymbolsPath)zip/iOSSampleApp$(LlvmPath)$(SymbolsPath)/iOSSampleApp$(LlvmPath)$(SymbolsPath).zip .;$(Python) pre.py --name iOSSampleApp$(LlvmPath)$(SymbolsPath).zip</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/iOSSampleApp.zip .;$(Python) pre.py --name iOSSampleApp.zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <XHarnessAppBundleToTest Include="Device Startup - iOS Mono HelloWorld $(LlvmPath) $(SymbolsPath)">
 <XHarnessAppBundleToTest Include="Device Startup - iOS $(RuntimeType) HelloWorld $(LlvmPath) $(SymbolsPath)">
 <AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
 <WorkItemTimeout>00:15:00</WorkItemTimeout>
 <TestTarget>ios-device</TestTarget>
Expand All@@ -51,7 +51,7 @@
 # PreCommands
 export XHARNESSPATH=$XHARNESS_CLI_PATH

 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath)/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/iosHelloWorld/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -f embedded.mobileprovision $(ScenarioDirectory)helloios/HelloiOS.app
 cd $(ScenarioDirectory)helloios
 sign HelloiOS.app
Expand Down

47 changes: 11 additions & 36 deletions
eng/testing/performance/performance-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,10 @@ use_latest_dotnet=false
logical_machine=
javascript_engine="v8"
iosmono=false
iosnativeaot=false
runtimetype=""
iosllvmbuild=""
iosstripsymbols=""
iosnativeaot=false
maui_version=""
use_local_commit_time=false
only_sanity=false
Expand DownExpand Up@@ -341,12 +342,14 @@ if [[ "$monoaot" == "true" ]]; then
fi

if [[ "$iosmono" == "true" ]]; then
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols"
 runtimetype="Mono"
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

if [[ "$iosnativeaot" == "true" ]]; then
 configurations="$configurations iOSStripSymbols=$iosstripsymbols"
 runtimetype="NativeAOT"
 configurations="$configurations iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

Expand DownExpand Up@@ -453,40 +456,11 @@ if [[ "$use_baseline_core_run" == true ]]; then
 mv $baseline_core_root_directory $new_baseline_core_root
fi

if [[ "$iosmono" == "true" ]]; then
 if [[ "$iosllvmbuild" == "True" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # LLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # LLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 else
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoLLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoLLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 fi
fi
if [[ "$iosmono" == "true" || "$iosnativeaot" == "true" ]]; then
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip && cp -rv $source_directory/iosHelloWorldZip $payload_directory/iosHelloWorldZip

if [[ "$iosnativeaot" == "true" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/symbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/symbolszip && cp -rv $source_directory/iosHelloWorldZip/symbolszip $payload_directory/iosHelloWorldZip
 fi
 find "$payload_directory/iosHelloWorldZip/" -type f -name "*.zip" -execdir mv {} "$payload_directory/iosHelloWorldZip/iOSSampleApp.zip" \;
fi

ci=true
Expand DownExpand Up@@ -521,6 +495,7 @@ Write-PipelineSetVariable -name "MonoDotnet" -value "$using_mono" -is_multi_job_
Write-PipelineSetVariable -name "WasmDotnet" -value "$using_wasm" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSLlvmBuild' -Value "$iosllvmbuild" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSStripSymbols' -Value "$iosstripsymbols" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'RuntimeType' -Value "$runtimetype" -is_multi_job_variable false
Write-PipelineSetVariable -name "OnlySanityCheck" -value "$only_sanity" -is_multi_job_variable false

# Put it back to what was set on top of this script
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[nativeaot][tests] Update bundle zip path for NativeAOT sample app#87049

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

kotlarmilos
merged 15 commits into

from

Jun 5, 2023
 Merged


[nativeaot][tests] Update bundle zip path for NativeAOT sample app
#87049
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
e53fdd2

Update bundle zip path for NativeAOT sample app


kotlarmilos Jun 2, 2023
599971d

Test perf pipeline


kotlarmilos Jun 2, 2023
904b592

Add shared path for Mono and Native AOT


kotlarmilos Jun 2, 2023
402e656

Use common display name


kotlarmilos Jun 2, 2023
c0c2a88

Use common display name


kotlarmilos Jun 2, 2023
a24ba92

Use common display name


kotlarmilos Jun 2, 2023
c646652

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d0763db

Parametrize bundle download step


kotlarmilos Jun 2, 2023
779a8aa

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d596c72

Parametrize bundle download step


kotlarmilos Jun 2, 2023
851dbd8

Update Helix item name and fix find command


kotlarmilos Jun 2, 2023
4bc3259

Update Helix item name and fix bundle path


kotlarmilos Jun 2, 2023
29d3935

Add runtime type parameter


kotlarmilos Jun 2, 2023
b16484e

Enable other jobs


kotlarmilos Jun 2, 2023
51f4ac0

Remove duplicate property


kotlarmilos Jun 2, 2023

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


4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/perf-non-wasm-jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,7 +228,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand All@@ -244,7 +244,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand Down

132 changes: 35 additions & 97 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,113 +228,51 @@ jobs:
 artifactName: 'AndroidBDNApk'
 displayName: 'Mono Android BDN Apk'

 # Download iOSMono tests
 - ${{ if eq(parameters.runtimeType, 'iOSMono') }}:
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 displayName: 'iOS Sample App NoLLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmsymbolszip'
 # Download iOSMono and Native AOT tests
 - ${{ if or(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.runtimeType, 'iOSNativeAOT')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld
 cleanUnpackFolder: false
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 displayName: 'iOS Sample App LLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmsymbolszip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 displayName: 'iOS Sample App NoLLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 displayName: 'iOS Sample App LLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 checkDownloadedFiles: true

 # Download iOSNativeAOT tests
 - ${{ if eq(parameters.runtimeType, 'iOSNativeAOT') }}:
 - ${{ if eq(parameters.iOSStripSymbols, 'False') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/symbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppSymbols.zip'
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
Comment thread
kotlarmilos marked this conversation as resolved.

 displayName: 'iOS Sample App Symbols'
 artifactFileName: 'iOSSampleAppSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 displayName: 'iOS Sample App'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App Symbols'
 displayName: 'Download iOS Sample App'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/symbols'
 artifactName: 'iOSSampleAppSymbols'
 checkDownloadedFiles: true
 - ${{ if eq(parameters.iOSStripSymbols, 'True') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 artifactName: 'iOSSampleAppNoSymbols'
 displayName: 'iOS Sample App NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nosymbols'
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
checkDownloadedFiles: true
 checkDownloadedFiles: true

 # Create Core_Root
 - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) generatelayoutonly $(librariesOverrideArg) $(_crossBuildPropertyArg)
Expand Down

70 changes: 0 additions & 70 deletions
eng/testing/performance/ios_nativeaot_scenarios.proj

View file


Open in desktop


This file was deleted.


12 changes: 6 additions & 6 deletions
eng/testing/performance/ios_scenarios.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,19 +30,19 @@
 </PropertyGroup>

 <ItemGroup>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono .app Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) .app Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath) ./app;$(Python) pre.py --name app</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld ./app;$(Python) pre.py --name app</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono Zip Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) Zip Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/$(LlvmPath)$(SymbolsPath)zip/iOSSampleApp$(LlvmPath)$(SymbolsPath)/iOSSampleApp$(LlvmPath)$(SymbolsPath).zip .;$(Python) pre.py --name iOSSampleApp$(LlvmPath)$(SymbolsPath).zip</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/iOSSampleApp.zip .;$(Python) pre.py --name iOSSampleApp.zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <XHarnessAppBundleToTest Include="Device Startup - iOS Mono HelloWorld $(LlvmPath) $(SymbolsPath)">
 <XHarnessAppBundleToTest Include="Device Startup - iOS $(RuntimeType) HelloWorld $(LlvmPath) $(SymbolsPath)">
 <AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
 <WorkItemTimeout>00:15:00</WorkItemTimeout>
 <TestTarget>ios-device</TestTarget>
Expand All@@ -51,7 +51,7 @@
 # PreCommands
 export XHARNESSPATH=$XHARNESS_CLI_PATH

 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath)/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/iosHelloWorld/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -f embedded.mobileprovision $(ScenarioDirectory)helloios/HelloiOS.app
 cd $(ScenarioDirectory)helloios
 sign HelloiOS.app
Expand Down

47 changes: 11 additions & 36 deletions
eng/testing/performance/performance-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,10 @@ use_latest_dotnet=false
logical_machine=
javascript_engine="v8"
iosmono=false
iosnativeaot=false
runtimetype=""
iosllvmbuild=""
iosstripsymbols=""
iosnativeaot=false
maui_version=""
use_local_commit_time=false
only_sanity=false
Expand DownExpand Up@@ -341,12 +342,14 @@ if [[ "$monoaot" == "true" ]]; then
fi

if [[ "$iosmono" == "true" ]]; then
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols"
 runtimetype="Mono"
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

if [[ "$iosnativeaot" == "true" ]]; then
 configurations="$configurations iOSStripSymbols=$iosstripsymbols"
 runtimetype="NativeAOT"
 configurations="$configurations iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

Expand DownExpand Up@@ -453,40 +456,11 @@ if [[ "$use_baseline_core_run" == true ]]; then
 mv $baseline_core_root_directory $new_baseline_core_root
fi

if [[ "$iosmono" == "true" ]]; then
 if [[ "$iosllvmbuild" == "True" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # LLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # LLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 else
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoLLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoLLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 fi
fi
if [[ "$iosmono" == "true" || "$iosnativeaot" == "true" ]]; then
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip && cp -rv $source_directory/iosHelloWorldZip $payload_directory/iosHelloWorldZip

if [[ "$iosnativeaot" == "true" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/symbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/symbolszip && cp -rv $source_directory/iosHelloWorldZip/symbolszip $payload_directory/iosHelloWorldZip
 fi
 find "$payload_directory/iosHelloWorldZip/" -type f -name "*.zip" -execdir mv {} "$payload_directory/iosHelloWorldZip/iOSSampleApp.zip" \;
fi

ci=true
Expand DownExpand Up@@ -521,6 +495,7 @@ Write-PipelineSetVariable -name "MonoDotnet" -value "$using_mono" -is_multi_job_
Write-PipelineSetVariable -name "WasmDotnet" -value "$using_wasm" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSLlvmBuild' -Value "$iosllvmbuild" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSStripSymbols' -Value "$iosstripsymbols" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'RuntimeType' -Value "$runtimetype" -is_multi_job_variable false
Write-PipelineSetVariable -name "OnlySanityCheck" -value "$only_sanity" -is_multi_job_variable false

# Put it back to what was set on top of this script
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[nativeaot][tests] Update bundle zip path for NativeAOT sample app#87049

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

kotlarmilos
merged 15 commits into

from

Jun 5, 2023
 Merged


[nativeaot][tests] Update bundle zip path for NativeAOT sample app
#87049
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
e53fdd2

Update bundle zip path for NativeAOT sample app


kotlarmilos Jun 2, 2023
599971d

Test perf pipeline


kotlarmilos Jun 2, 2023
904b592

Add shared path for Mono and Native AOT


kotlarmilos Jun 2, 2023
402e656

Use common display name


kotlarmilos Jun 2, 2023
c0c2a88

Use common display name


kotlarmilos Jun 2, 2023
a24ba92

Use common display name


kotlarmilos Jun 2, 2023
c646652

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d0763db

Parametrize bundle download step


kotlarmilos Jun 2, 2023
779a8aa

Parametrize bundle download step


kotlarmilos Jun 2, 2023
d596c72

Parametrize bundle download step


kotlarmilos Jun 2, 2023
851dbd8

Update Helix item name and fix find command


kotlarmilos Jun 2, 2023
4bc3259

Update Helix item name and fix bundle path


kotlarmilos Jun 2, 2023
29d3935

Add runtime type parameter


kotlarmilos Jun 2, 2023
b16484e

Enable other jobs


kotlarmilos Jun 2, 2023
51f4ac0

Remove duplicate property


kotlarmilos Jun 2, 2023

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


4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/perf-non-wasm-jobs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,7 +228,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand All@@ -244,7 +244,7 @@ jobs:
 jobParameters:
 testGroup: perf
 runtimeType: iOSNativeAOT
 projectFile: ios_nativeaot_scenarios.proj
 projectFile: ios_scenarios.proj
 runKind: ios_scenarios
 runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
 logicalmachine: 'perfiphone12mini'
Expand Down

132 changes: 35 additions & 97 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -228,113 +228,51 @@ jobs:
 artifactName: 'AndroidBDNApk'
 displayName: 'Mono Android BDN Apk'

 # Download iOSMono tests
 - ${{ if eq(parameters.runtimeType, 'iOSMono') }}:
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 displayName: 'iOS Sample App NoLLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmsymbolszip'
 # Download iOSMono and Native AOT tests
 - ${{ if or(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.runtimeType, 'iOSNativeAOT')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld
 cleanUnpackFolder: false
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmsymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 displayName: 'iOS Sample App LLVM Symbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM Symbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmsymbolszip'
 artifactName: 'iOSSampleAppLLVMSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nollvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 displayName: 'iOS Sample App NoLLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoLLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nollvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 checkDownloadedFiles: true
 - ${{ if and(eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvmnosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 displayName: 'iOS Sample App LLVM NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App LLVM NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/llvmnosymbolszip'
 artifactFileName: 'iOSSampleAppNoLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 artifactFileName: 'iOSSampleAppLLVMSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 checkDownloadedFiles: true

 # Download iOSNativeAOT tests
 - ${{ if eq(parameters.runtimeType, 'iOSNativeAOT') }}:
 - ${{ if eq(parameters.iOSStripSymbols, 'False') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/symbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppSymbols.zip'
 artifactFileName: 'iOSSampleAppLLVMNoSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
Comment thread
kotlarmilos marked this conversation as resolved.

 displayName: 'iOS Sample App Symbols'
 artifactFileName: 'iOSSampleAppSymbols.zip'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 displayName: 'iOS Sample App'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App Symbols'
 displayName: 'Download iOS Sample App'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/symbols'
 artifactName: 'iOSSampleAppSymbols'
 checkDownloadedFiles: true
 - ${{ if eq(parameters.iOSStripSymbols, 'True') }}:
 - template: /eng/pipelines/common/download-artifact-step.yml
 parameters:
 unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/nosymbols
 cleanUnpackFolder: false
 artifactFileName: 'iOSSampleAppNoSymbols.zip'
 artifactName: 'iOSSampleAppNoSymbols'
 displayName: 'iOS Sample App NoSymbols'
 # same artifact as above but don't extract .zip
 - task: DownloadBuildArtifacts@0
 displayName: 'Download iOS Sample App NoSymbols'
 inputs:
 buildType: current
 downloadType: single
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip/nosymbols'
 downloadPath: '$(Build.SourcesDirectory)/iosHelloWorldZip'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppNoLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'False'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppLLVMSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSMono'), eq(parameters.iOSLlvmBuild, 'True'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppLLVMNoSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'False')) }}:
 artifactName: 'iOSSampleAppSymbols'
 ${{ if and(eq(parameters.runtimeType, 'iOSNativeAOT'), eq(parameters.iOSStripSymbols, 'True')) }}:
 artifactName: 'iOSSampleAppNoSymbols'
checkDownloadedFiles: true
 checkDownloadedFiles: true

 # Create Core_Root
 - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) generatelayoutonly $(librariesOverrideArg) $(_crossBuildPropertyArg)
Expand Down

70 changes: 0 additions & 70 deletions
eng/testing/performance/ios_nativeaot_scenarios.proj

View file


Open in desktop


This file was deleted.


12 changes: 6 additions & 6 deletions
eng/testing/performance/ios_scenarios.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,19 +30,19 @@
 </PropertyGroup>

 <ItemGroup>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono .app Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) .app Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath) ./app;$(Python) pre.py --name app</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -rf $HELIX_CORRELATION_PAYLOAD/iosHelloWorld ./app;$(Python) pre.py --name app</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <HelixWorkItem Include="SOD - iOS HelloWorld Mono Zip Size $(LlvmPath) $(SymbolsPath)">
 <HelixWorkItem Include="SOD - iOS HelloWorld $(RuntimeType) Zip Size $(LlvmPath) $(SymbolsPath)">
 <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/$(LlvmPath)$(SymbolsPath)zip/iOSSampleApp$(LlvmPath)$(SymbolsPath)/iOSSampleApp$(LlvmPath)$(SymbolsPath).zip .;$(Python) pre.py --name iOSSampleApp$(LlvmPath)$(SymbolsPath).zip</PreCommands>
 <PreCommands>cd $(ScenarioDirectory)helloios;cp -v $HELIX_CORRELATION_PAYLOAD/iosHelloWorldZip/iOSSampleApp.zip .;$(Python) pre.py --name iOSSampleApp.zip</PreCommands>
 <Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
 <PostCommands>$(Python) post.py</PostCommands>
 </HelixWorkItem>
 <XHarnessAppBundleToTest Include="Device Startup - iOS Mono HelloWorld $(LlvmPath) $(SymbolsPath)">
 <XHarnessAppBundleToTest Include="Device Startup - iOS $(RuntimeType) HelloWorld $(LlvmPath) $(SymbolsPath)">
 <AppBundlePath>$(WorkItemDirectory).zip</AppBundlePath>
 <WorkItemTimeout>00:15:00</WorkItemTimeout>
 <TestTarget>ios-device</TestTarget>
Expand All@@ -51,7 +51,7 @@
 # PreCommands
 export XHARNESSPATH=$XHARNESS_CLI_PATH

 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/$(LlvmPath)$(SymbolsPath)/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -r $HELIX_CORRELATION_PAYLOAD/iosHelloWorld/iosHelloWorld/HelloiOS.app $(ScenarioDirectory)helloios/HelloiOS.app
 cp -f embedded.mobileprovision $(ScenarioDirectory)helloios/HelloiOS.app
 cd $(ScenarioDirectory)helloios
 sign HelloiOS.app
Expand Down

47 changes: 11 additions & 36 deletions
eng/testing/performance/performance-setup.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,9 +36,10 @@ use_latest_dotnet=false
logical_machine=
javascript_engine="v8"
iosmono=false
iosnativeaot=false
runtimetype=""
iosllvmbuild=""
iosstripsymbols=""
iosnativeaot=false
maui_version=""
use_local_commit_time=false
only_sanity=false
Expand DownExpand Up@@ -341,12 +342,14 @@ if [[ "$monoaot" == "true" ]]; then
fi

if [[ "$iosmono" == "true" ]]; then
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols"
 runtimetype="Mono"
 configurations="$configurations iOSLlvmBuild=$iosllvmbuild iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

if [[ "$iosnativeaot" == "true" ]]; then
 configurations="$configurations iOSStripSymbols=$iosstripsymbols"
 runtimetype="NativeAOT"
 configurations="$configurations iOSStripSymbols=$iosstripsymbols RuntimeType=$runtimetype"
 extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments"
fi

Expand DownExpand Up@@ -453,40 +456,11 @@ if [[ "$use_baseline_core_run" == true ]]; then
 mv $baseline_core_root_directory $new_baseline_core_root
fi

if [[ "$iosmono" == "true" ]]; then
 if [[ "$iosllvmbuild" == "True" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # LLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # LLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/llvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/llvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/llvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 else
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoLLVM NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmnosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmnosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmnosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoLLVM Symbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nollvmsymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nollvmsymbolszip && cp -rv $source_directory/iosHelloWorldZip/nollvmsymbolszip $payload_directory/iosHelloWorldZip
 fi
 fi
fi
if [[ "$iosmono" == "true" || "$iosnativeaot" == "true" ]]; then
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip && cp -rv $source_directory/iosHelloWorldZip $payload_directory/iosHelloWorldZip

if [[ "$iosnativeaot" == "true" ]]; then
 if [[ "$iosstripsymbols" == "True" ]]; then
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/nosymbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/nosymbolszip && cp -rv $source_directory/iosHelloWorldZip/nosymbolszip $payload_directory/iosHelloWorldZip
 else
 # NoSymbols Mono .app
 mkdir -p $payload_directory/iosHelloWorld && cp -rv $source_directory/iosHelloWorld/symbols $payload_directory/iosHelloWorld
 mkdir -p $payload_directory/iosHelloWorldZip/symbolszip && cp -rv $source_directory/iosHelloWorldZip/symbolszip $payload_directory/iosHelloWorldZip
 fi
 find "$payload_directory/iosHelloWorldZip/" -type f -name "*.zip" -execdir mv {} "$payload_directory/iosHelloWorldZip/iOSSampleApp.zip" \;
fi

ci=true
Expand DownExpand Up@@ -521,6 +495,7 @@ Write-PipelineSetVariable -name "MonoDotnet" -value "$using_mono" -is_multi_job_
Write-PipelineSetVariable -name "WasmDotnet" -value "$using_wasm" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSLlvmBuild' -Value "$iosllvmbuild" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'iOSStripSymbols' -Value "$iosstripsymbols" -is_multi_job_variable false
Write-PipelineSetVariable -Name 'RuntimeType' -Value "$runtimetype" -is_multi_job_variable false
Write-PipelineSetVariable -name "OnlySanityCheck" -value "$only_sanity" -is_multi_job_variable false

# Put it back to what was set on top of this script
Expand Down