From 9221614551012c271ce0594450a7f5c90a43566d Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Wed, 26 Jun 2024 11:40:01 +0000 Subject: [PATCH 1/2] Limit CI for debugging AOT HG. --- .../runtime-extra-platforms-wasm.yml | 510 +++++++++--------- eng/pipelines/runtime.yml | 88 +-- 2 files changed, 299 insertions(+), 299 deletions(-) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml index f5f51cd1fd244..bca546cf73211 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-wasm.yml @@ -19,52 +19,52 @@ jobs: # - only run eat and aot tests # - rest are covered by runtime # -- ${{ if eq(parameters.isRollingBuild, true) }}: - # AOT Library tests - browser_wasm - - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml - parameters: - platforms: - - browser_wasm - - browser_wasm_win - nameSuffix: _AOT - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - runAOT: true - alwaysRun: true +# - ${{ if eq(parameters.isRollingBuild, true) }}: +# # AOT Library tests - browser_wasm +# - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml +# parameters: +# platforms: +# - browser_wasm +# - browser_wasm_win +# nameSuffix: _AOT +# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# runAOT: true +# alwaysRun: true - # AOT Library tests - wasi_wasm - - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml - parameters: - platforms: - - wasi_wasm - - wasi_wasm_win - nameSuffix: _AOT - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - runAOT: true - alwaysRun: true - shouldContinueOnError: true +# # AOT Library tests - wasi_wasm +# - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml +# parameters: +# platforms: +# - wasi_wasm +# - wasi_wasm_win +# nameSuffix: _AOT +# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# runAOT: true +# alwaysRun: true +# shouldContinueOnError: true - # High resource AOT Library tests - - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml - parameters: - platforms: - - browser_wasm - - browser_wasm_win - nameSuffix: _HighResource_AOT - extraBuildArgs: /p:TestAssemblies=false /p:RunHighAOTResourceRequiringTestsOnly=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - buildAOTOnHelix: false - runAOT: true - alwaysRun: true +# # High resource AOT Library tests +# - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml +# parameters: +# platforms: +# - browser_wasm +# - browser_wasm_win +# nameSuffix: _HighResource_AOT +# extraBuildArgs: /p:TestAssemblies=false /p:RunHighAOTResourceRequiringTestsOnly=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# buildAOTOnHelix: false +# runAOT: true +# alwaysRun: true - # Wasm Debugger tests - firefox - - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml - parameters: - platforms: - - browser_wasm_firefox - browser: firefox - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - ## ff tests are unstable currently - shouldContinueOnError: true - alwaysRun: true +# # Wasm Debugger tests - firefox +# - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml +# parameters: +# platforms: +# - browser_wasm_firefox +# browser: firefox +# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# ## ff tests are unstable currently +# shouldContinueOnError: true +# alwaysRun: true # Disabled for now #- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml @@ -78,247 +78,247 @@ jobs: # - For runtime-wasm, force run all the jobs # - ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}: - # Library tests - # these run on runtime also - - template: /eng/pipelines/common/templates/wasm-library-tests.yml - parameters: - platforms: - - browser_wasm - # Don't run for rolling builds, as this is covered - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - scenarios: - - WasmTestOnV8 - - WasmTestOnChrome - - # this only runs on the extra pipeline - - template: /eng/pipelines/common/templates/wasm-library-tests.yml - parameters: - platforms: - - browser_wasm - nameSuffix: _NodeJs - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - alwaysRun: ${{ parameters.isWasmOnlyBuild }} - scenarios: - - WasmTestOnNodeJS - - # Library tests - Windows - - template: /eng/pipelines/common/templates/wasm-library-tests.yml - parameters: - platforms: - - browser_wasm_win - # Don't run for rolling builds, as this is covered - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - scenarios: - - WasmTestOnChrome - - WasmTestOnNodeJS - - # EAT Library tests - only run on linux - - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml - parameters: - platforms: - - browser_wasm - nameSuffix: _EAT - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /maxcpucount:1 - runAOT: false - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} + # # Library tests + # # these run on runtime also + # - template: /eng/pipelines/common/templates/wasm-library-tests.yml + # parameters: + # platforms: + # - browser_wasm + # # Don't run for rolling builds, as this is covered + # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} + # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} + # scenarios: + # - WasmTestOnV8 + # - WasmTestOnChrome - # AOT Library tests - browser_wasm - - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml - parameters: - platforms: - - browser_wasm - - browser_wasm_win - nameSuffix: _AOT - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - runAOT: true - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - alwaysRun: ${{ parameters.isWasmOnlyBuild }} + # # this only runs on the extra pipeline + # - template: /eng/pipelines/common/templates/wasm-library-tests.yml + # parameters: + # platforms: + # - browser_wasm + # nameSuffix: _NodeJs + # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} + # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} + # alwaysRun: ${{ parameters.isWasmOnlyBuild }} + # scenarios: + # - WasmTestOnNodeJS - # AOT Library tests - wasi_wasm - - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml - parameters: - platforms: - - wasi_wasm - - wasi_wasm_win - nameSuffix: _AOT - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - runAOT: true - shouldContinueOnError: true - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - alwaysRun: ${{ parameters.isWasmOnlyBuild }} + # # Library tests - Windows + # - template: /eng/pipelines/common/templates/wasm-library-tests.yml + # parameters: + # platforms: + # - browser_wasm_win + # # Don't run for rolling builds, as this is covered + # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} + # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} + # scenarios: + # - WasmTestOnChrome + # - WasmTestOnNodeJS - # High resource AOT Library tests - - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml - parameters: - platforms: - - browser_wasm - - browser_wasm_win - nameSuffix: _HighResource_AOT - extraBuildArgs: /p:TestAssemblies=false /p:RunHighAOTResourceRequiringTestsOnly=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - buildAOTOnHelix: false - runAOT: true - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - alwaysRun: ${{ parameters.isWasmOnlyBuild }} + # # EAT Library tests - only run on linux + # - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml + # parameters: + # platforms: + # - browser_wasm + # nameSuffix: _EAT + # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /maxcpucount:1 + # runAOT: false + # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} + # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - # Wasi - run only smoke tests by default - - template: /eng/pipelines/common/templates/wasm-library-tests.yml - parameters: - platforms: - - wasi_wasm - - wasi_wasm_win - nameSuffix: '_Smoke' - extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - shouldRunSmokeOnly: true - # ignore test failures for runtime-extra-platforms, but not when this - # is run as part of a wasm specific pipeline like runtime-wasm - shouldContinueOnError: ${{ not(parameters.isWasmOnlyBuild) }} - alwaysRun: ${{ variables.isRollingBuild }} - scenarios: - - WasmTestOnV8 + # # AOT Library tests - browser_wasm + # - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml + # parameters: + # platforms: + # - browser_wasm + # - browser_wasm_win + # nameSuffix: _AOT + # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + # runAOT: true + # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} + # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} + # alwaysRun: ${{ parameters.isWasmOnlyBuild }} - # Hybrid Globalization tests - - template: /eng/pipelines/common/templates/wasm-library-tests.yml - parameters: - platforms: - - browser_wasm - - browser_wasm_win - nameSuffix: _HybridGlobalization - extraBuildArgs: /p:HybridGlobalization=true - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - alwaysRun: true - scenarios: - - WasmTestOnChrome - - WasmTestOnFirefox - - WasmTestOnNodeJS + # # AOT Library tests - wasi_wasm + # - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml + # parameters: + # platforms: + # - wasi_wasm + # - wasi_wasm_win + # nameSuffix: _AOT + # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + # runAOT: true + # shouldContinueOnError: true + # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} + # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} + # alwaysRun: ${{ parameters.isWasmOnlyBuild }} - # # Hybrid Globalization AOT tests - # # ActiveIssue: https://github.com/dotnet/runtime/issues/51746 + # # High resource AOT Library tests # - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml # parameters: # platforms: # - browser_wasm # - browser_wasm_win - # nameSuffix: _HybridGlobalization_AOT - # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /p:HybridGlobalization=true + # nameSuffix: _HighResource_AOT + # extraBuildArgs: /p:TestAssemblies=false /p:RunHighAOTResourceRequiringTestsOnly=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + # buildAOTOnHelix: false # runAOT: true # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} + # alwaysRun: ${{ parameters.isWasmOnlyBuild }} + + # # Wasi - run only smoke tests by default + # - template: /eng/pipelines/common/templates/wasm-library-tests.yml + # parameters: + # platforms: + # - wasi_wasm + # - wasi_wasm_win + # nameSuffix: '_Smoke' + # extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + # shouldRunSmokeOnly: true + # # ignore test failures for runtime-extra-platforms, but not when this + # # is run as part of a wasm specific pipeline like runtime-wasm + # shouldContinueOnError: ${{ not(parameters.isWasmOnlyBuild) }} + # alwaysRun: ${{ variables.isRollingBuild }} + # scenarios: + # - WasmTestOnV8 + + # # Hybrid Globalization tests + # - template: /eng/pipelines/common/templates/wasm-library-tests.yml + # parameters: + # platforms: + # - browser_wasm + # - browser_wasm_win + # nameSuffix: _HybridGlobalization + # extraBuildArgs: /p:HybridGlobalization=true + # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} + # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} # alwaysRun: true # scenarios: # - WasmTestOnChrome + # - WasmTestOnFirefox # - WasmTestOnNodeJS -- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}: - # Builds only - - template: /eng/pipelines/common/templates/wasm-build-only.yml + # Hybrid Globalization AOT tests + # ActiveIssue: https://github.com/dotnet/runtime/issues/51746 + - template: /eng/pipelines/common/templates/wasm-library-aot-tests.yml parameters: platforms: - browser_wasm - browser_wasm_win - nameSuffix: SingleThreaded - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - condition: ne(variables['wasmSingleThreadedBuildOnlyNeededOnDefaultPipeline'], true) - publishArtifactsForWorkload: true - publishWBT: true + nameSuffix: _HybridGlobalization_AOT + extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /p:HybridGlobalization=true + runAOT: true + isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} + isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} + alwaysRun: true + scenarios: + - WasmTestOnChrome + - WasmTestOnNodeJS - - template: /eng/pipelines/common/templates/wasm-build-only.yml - parameters: - platforms: - - browser_wasm - - browser_wasm_win - nameSuffix: MultiThreaded - extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - condition: ne(variables['wasmMultiThreadedBuildOnlyNeededOnDefaultPipeline'], true) - publishArtifactsForWorkload: true - publishWBT: false +# - ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeNonLibTests, true), ne(parameters.debuggerTestsOnly, true)) }}: +# # Builds only +# - template: /eng/pipelines/common/templates/wasm-build-only.yml +# parameters: +# platforms: +# - browser_wasm +# - browser_wasm_win +# nameSuffix: SingleThreaded +# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# condition: ne(variables['wasmSingleThreadedBuildOnlyNeededOnDefaultPipeline'], true) +# publishArtifactsForWorkload: true +# publishWBT: true - # Browser Wasm.Build.Tests - - template: /eng/pipelines/common/templates/browser-wasm-build-tests.yml - parameters: - platforms: - - browser_wasm - - browser_wasm_win - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# - template: /eng/pipelines/common/templates/wasm-build-only.yml +# parameters: +# platforms: +# - browser_wasm +# - browser_wasm_win +# nameSuffix: MultiThreaded +# extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# condition: ne(variables['wasmMultiThreadedBuildOnlyNeededOnDefaultPipeline'], true) +# publishArtifactsForWorkload: true +# publishWBT: false - - template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml - parameters: - platforms: - - wasi_wasm - - wasi_wasm_win - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} +# # Browser Wasm.Build.Tests +# - template: /eng/pipelines/common/templates/browser-wasm-build-tests.yml +# parameters: +# platforms: +# - browser_wasm +# - browser_wasm_win +# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - - template: /eng/pipelines/common/templates/wasm-runtime-tests.yml - parameters: - platforms: - - browser_wasm - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} +# - template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml +# parameters: +# platforms: +# - wasi_wasm +# - wasi_wasm_win +# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} +# isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} -- ${{ if and(ne(parameters.isRollingBuild, true), or(ne(parameters.excludeNonLibTests, true), eq(parameters.debuggerTestsOnly, true))) }}: - # Debugger tests - - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml - parameters: - platforms: - - browser_wasm - - browser_wasm_win - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} +# - template: /eng/pipelines/common/templates/wasm-runtime-tests.yml +# parameters: +# platforms: +# - browser_wasm +# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} +# isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml - parameters: - platforms: - - browser_wasm_firefox - browser: firefox - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - alwaysRun: ${{ parameters.isWasmOnlyBuild }} - # ff tests are unstable currently - shouldContinueOnError: true +# - ${{ if and(ne(parameters.isRollingBuild, true), or(ne(parameters.excludeNonLibTests, true), eq(parameters.debuggerTestsOnly, true))) }}: +# # Debugger tests +# - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml +# parameters: +# platforms: +# - browser_wasm +# - browser_wasm_win +# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} +# isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - # Active Issue https://github.com/dotnet/runtime/issues/98771 - # - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml - # parameters: - # platforms: - # - Browser_wasm - # - Browser_wasm_win - # extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - # nameSuffix: DebuggerTests_MultiThreaded - # alwaysRun: ${{ parameters.isWasmOnlyBuild }} - # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - # runOnlyOnWasmOnlyPipelines: true +# - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml +# parameters: +# platforms: +# - browser_wasm_firefox +# browser: firefox +# extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} +# isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} +# alwaysRun: ${{ parameters.isWasmOnlyBuild }} +# # ff tests are unstable currently +# shouldContinueOnError: true - # Disable for now - #- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml - #parameters: - #runProfile: 'v8' - #onlySanityCheck: true +# # Active Issue https://github.com/dotnet/runtime/issues/98771 +# # - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml +# # parameters: +# # platforms: +# # - Browser_wasm +# # - Browser_wasm_win +# # extraBuildArgs: /p:WasmEnableThreads=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# # nameSuffix: DebuggerTests_MultiThreaded +# # alwaysRun: ${{ parameters.isWasmOnlyBuild }} +# # isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} +# # isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} +# # runOnlyOnWasmOnlyPipelines: true -- ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeOptional, true)) }}: - - template: /eng/pipelines/common/templates/wasm-library-tests.yml - parameters: - platforms: - - wasi_wasm - - wasi_wasm_win - extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - # always run for wasm only pipelines - alwaysRun: ${{ parameters.isWasmOnlyBuild }} - isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} - isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} - scenarios: - - WasmTestOnWasmtime +# # Disable for now +# #- template: /eng/pipelines/coreclr/perf-wasm-jobs.yml +# #parameters: +# #runProfile: 'v8' +# #onlySanityCheck: true + +# - ${{ if and(ne(parameters.isRollingBuild, true), ne(parameters.excludeOptional, true)) }}: +# - template: /eng/pipelines/common/templates/wasm-library-tests.yml +# parameters: +# platforms: +# - wasi_wasm +# - wasi_wasm_win +# extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) +# # always run for wasm only pipelines +# alwaysRun: ${{ parameters.isWasmOnlyBuild }} +# isExtraPlatformsBuild: ${{ parameters.isExtraPlatformsBuild }} +# isWasmOnlyBuild: ${{ parameters.isWasmOnlyBuild }} +# scenarios: +# - WasmTestOnWasmtime diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 0cdcd022a4102..1647f7077c8c2 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -896,53 +896,53 @@ extends: publishArtifactsForWorkload: true publishWBT: false - # Browser Wasm.Build.Tests - - template: /eng/pipelines/common/templates/browser-wasm-build-tests.yml - parameters: - platforms: - - browser_wasm - - browser_wasm_win - alwaysRun: ${{ variables.isRollingBuild }} - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - - # Wasm Debugger tests - - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml - parameters: - platforms: - - browser_wasm - - browser_wasm_win - alwaysRun: ${{ variables.isRollingBuild }} - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - - # Wasm runtime tests - - template: /eng/pipelines/common/templates/wasm-runtime-tests.yml - parameters: - platforms: - - browser_wasm - alwaysRun: ${{ variables.isRollingBuild }} - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + # # Browser Wasm.Build.Tests + # - template: /eng/pipelines/common/templates/browser-wasm-build-tests.yml + # parameters: + # platforms: + # - browser_wasm + # - browser_wasm_win + # alwaysRun: ${{ variables.isRollingBuild }} + # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + + # # Wasm Debugger tests + # - template: /eng/pipelines/common/templates/wasm-debugger-tests.yml + # parameters: + # platforms: + # - browser_wasm + # - browser_wasm_win + # alwaysRun: ${{ variables.isRollingBuild }} + # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + + # # Wasm runtime tests + # - template: /eng/pipelines/common/templates/wasm-runtime-tests.yml + # parameters: + # platforms: + # - browser_wasm + # alwaysRun: ${{ variables.isRollingBuild }} + # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) # WASI/WASM - - template: /eng/pipelines/common/templates/wasm-library-tests.yml - parameters: - platforms: - - wasi_wasm - - wasi_wasm_win - nameSuffix: '_Smoke' - extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - shouldRunSmokeOnly: true - alwaysRun: ${{ variables.isRollingBuild }} - scenarios: - - WasmTestOnWasmtime - - - template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml - parameters: - platforms: - - wasi_wasm - - wasi_wasm_win - extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) - alwaysRun: ${{ variables.isRollingBuild }} + # - template: /eng/pipelines/common/templates/wasm-library-tests.yml + # parameters: + # platforms: + # - wasi_wasm + # - wasi_wasm_win + # nameSuffix: '_Smoke' + # extraBuildArgs: /p:EnableAggressiveTrimming=true /p:RunWasmSamples=true /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + # shouldRunSmokeOnly: true + # alwaysRun: ${{ variables.isRollingBuild }} + # scenarios: + # - WasmTestOnWasmtime + + # - template: /eng/pipelines/common/templates/simple-wasm-build-tests.yml + # parameters: + # platforms: + # - wasi_wasm + # - wasi_wasm_win + # extraBuildArgs: /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) + # alwaysRun: ${{ variables.isRollingBuild }} # # Android devices From e5e4feace8d7a94d6949db288a414a01fa5e74bf Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Thu, 4 Jul 2024 10:50:45 +0000 Subject: [PATCH 2/2] Debug --- src/mono/browser/build/BrowserWasmApp.targets | 14 ++++++++++++-- src/mono/browser/build/EmSdkRepo.Defaults.props | 1 + src/mono/wasi/build/WasiApp.targets | 2 +- src/mono/wasm/build/WasmApp.Common.targets | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/mono/browser/build/BrowserWasmApp.targets b/src/mono/browser/build/BrowserWasmApp.targets index ae7ea4f7f781d..c02e80016b349 100644 --- a/src/mono/browser/build/BrowserWasmApp.targets +++ b/src/mono/browser/build/BrowserWasmApp.targets @@ -174,19 +174,29 @@ - + + + + + + + <_EMSDKMissingPaths Condition="'$(_EMSDKMissingPaths)' == '' and ('$(EmscriptenSdkToolsPath)' == '' or !Exists('$(EmscriptenSdkToolsPath)'))">%24(EmscriptenSdkToolsPath)=$(EmscriptenSdkToolsPath) + <_EMSDKMissingPaths Condition="'$(_EMSDKMissingPaths)' == '' and ('$(EmscriptenNodeToolsPath)' == '' or !Exists('$(EmscriptenNodeToolsPath)'))">%24(EmscriptenNodeToolsPath)=$(EmscriptenNodeToolsPath) <_EMSDKMissingPaths Condition="'$(_EMSDKMissingPaths)' == '' and ('$(EmscriptenUpstreamBinPath)' == '' or !Exists('$(EmscriptenUpstreamBinPath)'))">%24(EmscriptenUpstreamBinPath)=$(EmscriptenUpstreamBinPath) + + @(EmscriptenSdkToolsContents->'%(FullPath)', ',') + <_ToolchainMissingErrorMessage Condition="'$(EMSDK_PATH)' == '' and '$(EmscriptenSdkToolsPath)' == ''">Could not find emscripten sdk. Either set %24(EMSDK_PATH), or use workloads to get the sdk. <_ToolchainMissingErrorMessage Condition="'$(_ToolchainMissingErrorMessage)' == '' and '$(_UsingEMSDK_PATH)' != 'true' and '$(_EMSDKMissingPaths)' != ''">Emscripten from the workload is missing some paths: $(_EMSDKMissingPaths). <_ToolchainMissingErrorMessage Condition="'$(_ToolchainMissingErrorMessage)' == '' and '$(_UsingEMSDK_PATH)' == 'true' and !Exists($(EMSDK_PATH))">Could not find Emscripten sdk at %24(EMSDK_PATH)=$(EMSDK_PATH) . - <_ToolchainMissingErrorMessage Condition="'$(_ToolchainMissingErrorMessage)' == '' and '$(_UsingEMSDK_PATH)' == 'true' and '$(_EMSDKMissingPaths)' != ''">Specified Emscripten sdk at %24(EMSDK_PATH)=$(EMSDK_PATH) is missing some paths: $(_EMSDKMissingPaths). + <_ToolchainMissingErrorMessage Condition="'$(_ToolchainMissingErrorMessage)' == '' and '$(_UsingEMSDK_PATH)' == 'true' and '$(_EMSDKMissingPaths)' != ''">[DEBUG] Specified Emscripten sdk at %24(EMSDK_PATH)=$(EMSDK_PATH) is missing some paths: $(_EMSDKMissingPaths). EmscriptenSdkToolsPath=$(EmscriptenSdkToolsPath) <_IsToolchainMissing Condition="'$(_ToolchainMissingErrorMessage)' != ''">true diff --git a/src/mono/browser/build/EmSdkRepo.Defaults.props b/src/mono/browser/build/EmSdkRepo.Defaults.props index aa94ded228bfc..0eccde88a73c2 100644 --- a/src/mono/browser/build/EmSdkRepo.Defaults.props +++ b/src/mono/browser/build/EmSdkRepo.Defaults.props @@ -8,6 +8,7 @@ $([MSBuild]::NormalizeDirectory($(EmscriptenSdkToolsPath), 'emscripten')) + $([MSBuild]::NormalizeDirectory($(EmscriptenSdkToolsPath), 'node', 'bin')) <_UsingEMSDK_PATH>true diff --git a/src/mono/wasi/build/WasiApp.targets b/src/mono/wasi/build/WasiApp.targets index 40664b86a7d42..51f3a827416ca 100644 --- a/src/mono/wasi/build/WasiApp.targets +++ b/src/mono/wasi/build/WasiApp.targets @@ -95,7 +95,7 @@ - + <_ToolchainMissingPaths Condition="'$(_ToolchainMissingPaths)' == '' and ('$(WasiClang)' == '' or !Exists('$(WasiClang)'))">%24(WasiClang)=$(WasiClang) diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 6aafca7d110a2..71a8347c6ae8a 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -116,7 +116,7 @@ $(PrepareInputsForWasmBuildDependsOn); - _SetupToolchain; + SetupToolchainPRIV; _ReadWasmProps; _SetWasmBuildNativeDefaults; _GetDefaultWasmAssembliesToBundle; @@ -912,7 +912,7 @@ - +