From 403689aae3f3bbfb29b073764abbc769dbfa05d8 Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Mon, 27 Nov 2023 07:47:48 -0800 Subject: [PATCH 1/3] Upgrade to net9 --- src/coreclr/scripts/superpmi_aspnet.py | 2 +- src/coreclr/scripts/superpmi_benchmarks.py | 2 +- src/coreclr/scripts/superpmi_collect_setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/scripts/superpmi_aspnet.py b/src/coreclr/scripts/superpmi_aspnet.py index a25d402f5575c..1ac3792894585 100644 --- a/src/coreclr/scripts/superpmi_aspnet.py +++ b/src/coreclr/scripts/superpmi_aspnet.py @@ -230,7 +230,7 @@ def remove_readonly(func, path, _): crank_arguments = ["--config", configFile, "--profile", benchmark_machine, "--scenario", scenario, - "--application.framework", "net8.0", + "--application.framework", "net9.0", "--application.channel", "edge", "--application.sdkVersion", "latest", "--application.environmentVariables", "DOTNET_JitName=" + spminame, diff --git a/src/coreclr/scripts/superpmi_benchmarks.py b/src/coreclr/scripts/superpmi_benchmarks.py index d7f329d67e8c3..ace3ea6f76d9d 100644 --- a/src/coreclr/scripts/superpmi_benchmarks.py +++ b/src/coreclr/scripts/superpmi_benchmarks.py @@ -203,7 +203,7 @@ def build_and_run(coreclr_args, output_mch_name): run_command( [dotnet_exe, "build", project_file, "--configuration", "Release", - "--framework", "net8.0", "--no-restore", "/p:NuGetPackageRoot=" + artifacts_packages_directory, + "--framework", "net9.0", "--no-restore", "/p:NuGetPackageRoot=" + artifacts_packages_directory, "-o", artifacts_directory], _exit_on_fail=True) # This is specifically for PowerShell.Benchmarks. diff --git a/src/coreclr/scripts/superpmi_collect_setup.py b/src/coreclr/scripts/superpmi_collect_setup.py index 92b0aa46da272..54cd78f63e12d 100644 --- a/src/coreclr/scripts/superpmi_collect_setup.py +++ b/src/coreclr/scripts/superpmi_collect_setup.py @@ -405,7 +405,7 @@ def setup_benchmark(workitem_directory, arch): # have not published yet. As a result, we hit errors of "dotnet restore". As a workaround, hard code the # working version until we move to ".NET 8" in the script. run_command( - get_python_name() + [dotnet_install_script, "install", "--channels", "8.0-preview", "--architecture", arch, "--install-dir", + get_python_name() + [dotnet_install_script, "install", "--channels", "9.0", "--architecture", arch, "--install-dir", dotnet_directory, "--verbose"]) From 2c4dae9f7ff527b08ed5fbf46ca5fecb26b7a3d4 Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Tue, 28 Nov 2023 11:13:31 -0800 Subject: [PATCH 2/3] REVERT: comment other collections --- eng/pipelines/coreclr/superpmi-collect.yml | 254 ++++++++++----------- 1 file changed, 127 insertions(+), 127 deletions(-) diff --git a/eng/pipelines/coreclr/superpmi-collect.yml b/eng/pipelines/coreclr/superpmi-collect.yml index 336125d43bc13..b55f5318fff40 100644 --- a/eng/pipelines/coreclr/superpmi-collect.yml +++ b/eng/pipelines/coreclr/superpmi-collect.yml @@ -76,45 +76,45 @@ extends: jobParameters: testGroup: outerloop - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml - buildConfig: checked - platforms: - - osx_arm64 - - linux_arm - - linux_arm64 - - linux_x64 - - windows_x64 - - windows_x86 - - windows_arm64 - helixQueueGroup: ci - helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - jobParameters: - testGroup: outerloop - liveLibrariesBuildConfig: Release - collectionType: pmi - collectionName: libraries + # - template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml + # buildConfig: checked + # platforms: + # - osx_arm64 + # - linux_arm + # - linux_arm64 + # - linux_x64 + # - windows_x64 + # - windows_x86 + # - windows_arm64 + # helixQueueGroup: ci + # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + # jobParameters: + # testGroup: outerloop + # liveLibrariesBuildConfig: Release + # collectionType: pmi + # collectionName: libraries - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml - buildConfig: checked - platforms: - - osx_arm64 - - linux_arm - - linux_arm64 - - linux_x64 - - windows_x64 - - windows_x86 - - windows_arm64 - helixQueueGroup: ci - helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - jobParameters: - testGroup: outerloop - liveLibrariesBuildConfig: Release - collectionType: crossgen2 - collectionName: libraries + # - template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml + # buildConfig: checked + # platforms: + # - osx_arm64 + # - linux_arm + # - linux_arm64 + # - linux_x64 + # - windows_x64 + # - windows_x86 + # - windows_arm64 + # helixQueueGroup: ci + # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + # jobParameters: + # testGroup: outerloop + # liveLibrariesBuildConfig: Release + # collectionType: crossgen2 + # collectionName: libraries - template: /eng/pipelines/common/platform-matrix.yml parameters: @@ -196,95 +196,95 @@ extends: collectionType: run_pgo collectionName: benchmarks - # - # Collection of coreclr test run - # - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml - buildConfig: checked - platforms: - - osx_arm64 - - linux_arm - - linux_arm64 - - linux_x64 - - windows_x64 - - windows_x86 - - windows_arm64 - helixQueueGroup: superpmi - helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - jobParameters: - testGroup: outerloop - liveLibrariesBuildConfig: Release - SuperPmiCollect: true + # # + # # Collection of coreclr test run + # # + # - template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml + # buildConfig: checked + # platforms: + # - osx_arm64 + # - linux_arm + # - linux_arm64 + # - linux_x64 + # - windows_x64 + # - windows_x86 + # - windows_arm64 + # helixQueueGroup: superpmi + # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + # jobParameters: + # testGroup: outerloop + # liveLibrariesBuildConfig: Release + # SuperPmiCollect: true - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml - buildConfig: checked - platforms: - - linux_arm64 - - linux_x64 - - windows_x64 - - windows_arm64 - helixQueueGroup: ci - helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - jobParameters: - testGroup: outerloop - liveLibrariesBuildConfig: Release - collectionType: nativeaot - collectionName: smoke_tests + # - template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml + # buildConfig: checked + # platforms: + # - linux_arm64 + # - linux_x64 + # - windows_x64 + # - windows_arm64 + # helixQueueGroup: ci + # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + # jobParameters: + # testGroup: outerloop + # liveLibrariesBuildConfig: Release + # collectionType: nativeaot + # collectionName: smoke_tests - # - # Collection of libraries test run: normal - # Libraries Test Run using Release libraries, and Checked CoreCLR - # - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/libraries/run-test-job.yml - buildConfig: Release - platforms: - - osx_arm64 - - linux_arm - - linux_arm64 - - linux_x64 - - windows_x64 - - windows_x86 - - windows_arm64 - helixQueueGroup: superpmi - helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - jobParameters: - testScope: innerloop - liveRuntimeBuildConfig: checked - dependsOnTestBuildConfiguration: Release - dependsOnTestArchitecture: x64 - coreclrTestGroup: superpmi_collection - SuperPmiCollect: true - SuperPmiCollectionName: libraries_tests + # # + # # Collection of libraries test run: normal + # # Libraries Test Run using Release libraries, and Checked CoreCLR + # # + # - template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/libraries/run-test-job.yml + # buildConfig: Release + # platforms: + # - osx_arm64 + # - linux_arm + # - linux_arm64 + # - linux_x64 + # - windows_x64 + # - windows_x86 + # - windows_arm64 + # helixQueueGroup: superpmi + # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + # jobParameters: + # testScope: innerloop + # liveRuntimeBuildConfig: checked + # dependsOnTestBuildConfiguration: Release + # dependsOnTestArchitecture: x64 + # coreclrTestGroup: superpmi_collection + # SuperPmiCollect: true + # SuperPmiCollectionName: libraries_tests - # - # Collection of libraries test run: no_tiered_compilation - # Libraries Test Run using Release libraries, and Checked CoreCLR - # - - template: /eng/pipelines/common/platform-matrix.yml - parameters: - jobTemplate: /eng/pipelines/libraries/run-test-job.yml - buildConfig: Release - platforms: - - osx_arm64 - - linux_arm - - linux_arm64 - - linux_x64 - - windows_x64 - - windows_x86 - - windows_arm64 - helixQueueGroup: superpmi - helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - jobParameters: - testScope: innerloop - liveRuntimeBuildConfig: checked - dependsOnTestBuildConfiguration: Release - dependsOnTestArchitecture: x64 - coreclrTestGroup: superpmi_collection_no_tiered_compilation - SuperPmiCollect: true - SuperPmiCollectionName: libraries_tests_no_tiered_compilation + # # + # # Collection of libraries test run: no_tiered_compilation + # # Libraries Test Run using Release libraries, and Checked CoreCLR + # # + # - template: /eng/pipelines/common/platform-matrix.yml + # parameters: + # jobTemplate: /eng/pipelines/libraries/run-test-job.yml + # buildConfig: Release + # platforms: + # - osx_arm64 + # - linux_arm + # - linux_arm64 + # - linux_x64 + # - windows_x64 + # - windows_x86 + # - windows_arm64 + # helixQueueGroup: superpmi + # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + # jobParameters: + # testScope: innerloop + # liveRuntimeBuildConfig: checked + # dependsOnTestBuildConfiguration: Release + # dependsOnTestArchitecture: x64 + # coreclrTestGroup: superpmi_collection_no_tiered_compilation + # SuperPmiCollect: true + # SuperPmiCollectionName: libraries_tests_no_tiered_compilation From 3ca6f7aedabe4621e002aee1d12b7bf4e5f22db4 Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Tue, 28 Nov 2023 15:56:00 -0800 Subject: [PATCH 3/3] Revert "REVERT: comment other collections" This reverts commit 2c4dae9f7ff527b08ed5fbf46ca5fecb26b7a3d4. --- eng/pipelines/coreclr/superpmi-collect.yml | 254 ++++++++++----------- 1 file changed, 127 insertions(+), 127 deletions(-) diff --git a/eng/pipelines/coreclr/superpmi-collect.yml b/eng/pipelines/coreclr/superpmi-collect.yml index b55f5318fff40..336125d43bc13 100644 --- a/eng/pipelines/coreclr/superpmi-collect.yml +++ b/eng/pipelines/coreclr/superpmi-collect.yml @@ -76,45 +76,45 @@ extends: jobParameters: testGroup: outerloop - # - template: /eng/pipelines/common/platform-matrix.yml - # parameters: - # jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml - # buildConfig: checked - # platforms: - # - osx_arm64 - # - linux_arm - # - linux_arm64 - # - linux_x64 - # - windows_x64 - # - windows_x86 - # - windows_arm64 - # helixQueueGroup: ci - # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - # jobParameters: - # testGroup: outerloop - # liveLibrariesBuildConfig: Release - # collectionType: pmi - # collectionName: libraries + - template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml + buildConfig: checked + platforms: + - osx_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - windows_x64 + - windows_x86 + - windows_arm64 + helixQueueGroup: ci + helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + jobParameters: + testGroup: outerloop + liveLibrariesBuildConfig: Release + collectionType: pmi + collectionName: libraries - # - template: /eng/pipelines/common/platform-matrix.yml - # parameters: - # jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml - # buildConfig: checked - # platforms: - # - osx_arm64 - # - linux_arm - # - linux_arm64 - # - linux_x64 - # - windows_x64 - # - windows_x86 - # - windows_arm64 - # helixQueueGroup: ci - # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - # jobParameters: - # testGroup: outerloop - # liveLibrariesBuildConfig: Release - # collectionType: crossgen2 - # collectionName: libraries + - template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml + buildConfig: checked + platforms: + - osx_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - windows_x64 + - windows_x86 + - windows_arm64 + helixQueueGroup: ci + helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + jobParameters: + testGroup: outerloop + liveLibrariesBuildConfig: Release + collectionType: crossgen2 + collectionName: libraries - template: /eng/pipelines/common/platform-matrix.yml parameters: @@ -196,95 +196,95 @@ extends: collectionType: run_pgo collectionName: benchmarks - # # - # # Collection of coreclr test run - # # - # - template: /eng/pipelines/common/platform-matrix.yml - # parameters: - # jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml - # buildConfig: checked - # platforms: - # - osx_arm64 - # - linux_arm - # - linux_arm64 - # - linux_x64 - # - windows_x64 - # - windows_x86 - # - windows_arm64 - # helixQueueGroup: superpmi - # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - # jobParameters: - # testGroup: outerloop - # liveLibrariesBuildConfig: Release - # SuperPmiCollect: true + # + # Collection of coreclr test run + # + - template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml + buildConfig: checked + platforms: + - osx_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - windows_x64 + - windows_x86 + - windows_arm64 + helixQueueGroup: superpmi + helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + jobParameters: + testGroup: outerloop + liveLibrariesBuildConfig: Release + SuperPmiCollect: true - # - template: /eng/pipelines/common/platform-matrix.yml - # parameters: - # jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml - # buildConfig: checked - # platforms: - # - linux_arm64 - # - linux_x64 - # - windows_x64 - # - windows_arm64 - # helixQueueGroup: ci - # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - # jobParameters: - # testGroup: outerloop - # liveLibrariesBuildConfig: Release - # collectionType: nativeaot - # collectionName: smoke_tests + - template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/coreclr/templates/superpmi-collect-job.yml + buildConfig: checked + platforms: + - linux_arm64 + - linux_x64 + - windows_x64 + - windows_arm64 + helixQueueGroup: ci + helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + jobParameters: + testGroup: outerloop + liveLibrariesBuildConfig: Release + collectionType: nativeaot + collectionName: smoke_tests - # # - # # Collection of libraries test run: normal - # # Libraries Test Run using Release libraries, and Checked CoreCLR - # # - # - template: /eng/pipelines/common/platform-matrix.yml - # parameters: - # jobTemplate: /eng/pipelines/libraries/run-test-job.yml - # buildConfig: Release - # platforms: - # - osx_arm64 - # - linux_arm - # - linux_arm64 - # - linux_x64 - # - windows_x64 - # - windows_x86 - # - windows_arm64 - # helixQueueGroup: superpmi - # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - # jobParameters: - # testScope: innerloop - # liveRuntimeBuildConfig: checked - # dependsOnTestBuildConfiguration: Release - # dependsOnTestArchitecture: x64 - # coreclrTestGroup: superpmi_collection - # SuperPmiCollect: true - # SuperPmiCollectionName: libraries_tests + # + # Collection of libraries test run: normal + # Libraries Test Run using Release libraries, and Checked CoreCLR + # + - template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/libraries/run-test-job.yml + buildConfig: Release + platforms: + - osx_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - windows_x64 + - windows_x86 + - windows_arm64 + helixQueueGroup: superpmi + helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + jobParameters: + testScope: innerloop + liveRuntimeBuildConfig: checked + dependsOnTestBuildConfiguration: Release + dependsOnTestArchitecture: x64 + coreclrTestGroup: superpmi_collection + SuperPmiCollect: true + SuperPmiCollectionName: libraries_tests - # # - # # Collection of libraries test run: no_tiered_compilation - # # Libraries Test Run using Release libraries, and Checked CoreCLR - # # - # - template: /eng/pipelines/common/platform-matrix.yml - # parameters: - # jobTemplate: /eng/pipelines/libraries/run-test-job.yml - # buildConfig: Release - # platforms: - # - osx_arm64 - # - linux_arm - # - linux_arm64 - # - linux_x64 - # - windows_x64 - # - windows_x86 - # - windows_arm64 - # helixQueueGroup: superpmi - # helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml - # jobParameters: - # testScope: innerloop - # liveRuntimeBuildConfig: checked - # dependsOnTestBuildConfiguration: Release - # dependsOnTestArchitecture: x64 - # coreclrTestGroup: superpmi_collection_no_tiered_compilation - # SuperPmiCollect: true - # SuperPmiCollectionName: libraries_tests_no_tiered_compilation + # + # Collection of libraries test run: no_tiered_compilation + # Libraries Test Run using Release libraries, and Checked CoreCLR + # + - template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/libraries/run-test-job.yml + buildConfig: Release + platforms: + - osx_arm64 + - linux_arm + - linux_arm64 + - linux_x64 + - windows_x64 + - windows_x86 + - windows_arm64 + helixQueueGroup: superpmi + helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml + jobParameters: + testScope: innerloop + liveRuntimeBuildConfig: checked + dependsOnTestBuildConfiguration: Release + dependsOnTestArchitecture: x64 + coreclrTestGroup: superpmi_collection_no_tiered_compilation + SuperPmiCollect: true + SuperPmiCollectionName: libraries_tests_no_tiered_compilation