diff options
author | Bill Wert <billwert@microsoft.com> | 2021-07-06 22:00:30 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-06 22:00:30 +0300 |
commit | 656775f584f8b4dc291d4050d57fbb8466bc15a4 (patch) | |
tree | dd737ab98667b7cbebe9f3e4928b8620c4897a6b /eng | |
parent | 331078a8cc98a24ea8bb6a669cedb2bb1b68f1f7 (diff) |
Add llvm ios (#55222)
* add LLVM scenario
* add copy to payload
* reverse paths
* fix log path
* Move log fix
* remove extra scenario
Diffstat (limited to 'eng')
-rw-r--r-- | eng/pipelines/coreclr/perf.yml | 16 | ||||
-rw-r--r-- | eng/pipelines/coreclr/templates/build-perf-sample-apps.yml | 23 | ||||
-rw-r--r-- | eng/pipelines/coreclr/templates/perf-job.yml | 8 | ||||
-rw-r--r-- | eng/pipelines/coreclr/templates/run-performance-job.yml | 3 | ||||
-rw-r--r-- | eng/pipelines/coreclr/templates/run-scenarios-job.yml | 2 | ||||
-rw-r--r-- | eng/testing/performance/performance-setup.ps1 | 7 |
6 files changed, 54 insertions, 5 deletions
diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index 0db890a8e57..6fc0b85de73 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -237,6 +237,22 @@ jobs: logicalmachine: 'perfpixel4a' iosLlvmBuild: False + - template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/coreclr/templates/perf-job.yml + buildConfig: release + runtimeFlavor: mono + platforms: + - Windows_x64 + jobParameters: + testGroup: perf + runtimeType: iOSMono + projectFile: ios_scenarios.proj + runKind: ios_scenarios + runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml + logicalmachine: 'perfpixel4a' + iosLlvmBuild: True + # run mono microbenchmarks perf job - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml index 6bfd8637bfa..65b6226093a 100644 --- a/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-sample-apps.yml @@ -44,6 +44,29 @@ steps: archiveExtension: '.tar.gz' archiveType: tar tarCompression: gz + - script: rm -r -f $(Build.SourcesDirectory)/src/mono/sample/iOS/bin + workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS + displayName: Clean bindir + - script: make build-appbundle TARGET=iOS MONO_ARCH=arm64 MONO_CONFIG=Release AOT=True USE_LLVM=True + env: + DevTeamProvisioning: '-' + workingDirectory: $(Build.SourcesDirectory)/src/mono/sample/iOS + displayName: Build HelloiOS AOT sample app LLVM=True + - task: PublishBuildArtifacts@1 + condition: succeededOrFailed() + displayName: 'Publish binlog' + inputs: + pathtoPublish: $(Build.SourcesDirectory)/src/mono/sample/iOS/msbuild.binlog + artifactName: ${{ parameters.artifactName }} + - template: /eng/pipelines/common/upload-artifact-step.yml + parameters: + rootFolder: $(Build.SourcesDirectory)/src/mono/sample/iOS/bin/ios-arm64/publish/app/HelloiOS/Release-iphoneos/HelloiOS.app + includeRootFolder: true + displayName: iOS Sample App LLVM + artifactName: iOSSampleAppLLVM + archiveExtension: '.tar.gz' + archiveType: tar + tarCompression: gz - template: /eng/pipelines/common/upload-artifact-step.yml parameters: diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index 3dee80bb370..59b7843925e 100644 --- a/eng/pipelines/coreclr/templates/perf-job.yml +++ b/eng/pipelines/coreclr/templates/perf-job.yml @@ -165,7 +165,13 @@ jobs: artifactFileName: 'iOSSampleAppNoLLVM.tar.gz' artifactName: 'iOSSampleAppNoLLVM' displayName: 'iOS Sample App NoLLVM' - + - template: /eng/pipelines/common/download-artifact-step.yml + parameters: + unpackFolder: $(Build.SourcesDirectory)/iosHelloWorld/llvm + cleanUnpackFolder: false + artifactFileName: 'iOSSampleAppLLVM.tar.gz' + artifactName: 'iOSSampleAppLLVM' + displayName: 'iOS Sample App LLVM' # Create Core_Root - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) generatelayoutonly $(librariesOverrideArg) diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml index e031d0fa1ce..de523bb2d99 100644 --- a/eng/pipelines/coreclr/templates/run-performance-job.yml +++ b/eng/pipelines/coreclr/templates/run-performance-job.yml @@ -23,7 +23,6 @@ parameters: runKind: '' # required -- test category logicalMachine: '' # required -- Used to specify a which pool of machines the test should run against javascriptEngine: 'NoJS' - iosLlvmBuild: 'False' jobs: - template: xplat-pipeline-job.yml @@ -143,6 +142,6 @@ jobs: displayName: Publish Logs inputs: targetPath: $(Build.SourcesDirectory)/artifacts/log - artifactName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}_${{ parameters.logicalMachine }}_${{ parameters.javascriptEngine }}_${{ parameters.pgoRunType }}_${{ parameters.iosLlvmBuild }}' + artifactName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}_${{ parameters.logicalMachine }}_${{ parameters.javascriptEngine }}_${{ parameters.pgoRunType }}' continueOnError: true condition: always() diff --git a/eng/pipelines/coreclr/templates/run-scenarios-job.yml b/eng/pipelines/coreclr/templates/run-scenarios-job.yml index 075807453ec..2fa6822205a 100644 --- a/eng/pipelines/coreclr/templates/run-scenarios-job.yml +++ b/eng/pipelines/coreclr/templates/run-scenarios-job.yml @@ -157,6 +157,6 @@ jobs: displayName: Publish Logs inputs: targetPath: $(Build.SourcesDirectory)/artifacts/log - artifactName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}' + artifactName: 'Performance_Run_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.runtimeType }}_${{ parameters.codeGenType }}_${{ parameters.runKind }}_$(iOSLlvmBuild)' continueOnError: true condition: always() diff --git a/eng/testing/performance/performance-setup.ps1 b/eng/testing/performance/performance-setup.ps1 index 03aff42d25f..078cad080a4 100644 --- a/eng/testing/performance/performance-setup.ps1 +++ b/eng/testing/performance/performance-setup.ps1 @@ -152,7 +152,12 @@ if ($iOSMono) { { mkdir $WorkItemDirectory } - Copy-Item -path "$SourceDirectory\iosHelloWorld\nollvm" $PayloadDirectory\iosHelloWorld\nollvm -Recurse + if($iOSLlvmBuild) { + Copy-Item -path "$SourceDirectory\iosHelloWorld\nollvm" $PayloadDirectory\iosHelloWorld\llvm -Recurse + } else { + Copy-Item -path "$SourceDirectory\iosHelloWorld\llvm" $PayloadDirectory\iosHelloWorld\nollvm -Recurse + } + $SetupArguments = $SetupArguments -replace $Architecture, 'arm64' } |