From 7543b056d8ae0654f266b6298e8c14c0fb69f871 Mon Sep 17 00:00:00 2001 From: Kunal Pathak Date: Tue, 28 Nov 2023 16:40:47 -0800 Subject: [PATCH] Upgrade superpmi benchmarks to 9.0 (#95372) * Upgrade to net9 * REVERT: comment other collections * Revert "REVERT: comment other collections" This reverts commit 2c4dae9f7ff527b08ed5fbf46ca5fecb26b7a3d4. --- 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"])