Skip to content

SPMI: Switch back to unpinned 9.0 SDK for micro benchmarks #109992

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
merged 10 commits into from
Nov 26, 2024
Merged

SPMI: Switch back to unpinned 9.0 SDK for micro benchmarks #109992

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a1c74fa
SPMI: Switch back to unpinned 9.0 SDK for micro benchmarks
jakobbotsch Nov 19, 2024
56384da
Restore with target framework
jakobbotsch Nov 20, 2024
1786b0e
Also restore netstandard2.0
jakobbotsch Nov 21, 2024
249c6e1
Invoke dotnet restore multiple times
jakobbotsch Nov 22, 2024
f580ec6
Switch to a retrying dotnet build
jakobbotsch Nov 22, 2024
7029061
Nit
jakobbotsch Nov 22, 2024
c024466
Set PERFLAB_TARGET_FRAMEWORKS
jakobbotsch Nov 25, 2024
13a148a
Set env var for both invocations
jakobbotsch Nov 25, 2024
28d2524
Set PERFLAB_TARGET_FRAMEWORKS globally in environment
jakobbotsch Nov 25, 2024
aa002fc
Fix collect
jakobbotsch Nov 26, 2024
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
5 changes: 3 additions & 2 deletions src/coreclr/scripts/superpmi_benchmarks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,13 @@ def build_and_run(coreclr_args, output_mch_name):
env_copy["NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY"] = "9,2000"

# If `dotnet restore` fails, retry.
tfm = "net9.0"
Copy link
Member

@am11 am11 Nov 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another option is to turn it into superpmi_benchmarks.py.template with markers like {TargetFramework} which some .proj would replace at build time to generate the real superpmi_benchmarks.py somewhere under artificats/obj. linker testing uses that mechanism to avoid updating the files each time the TFM version is bumped:

runtime/eng/testing/linker/trimmingTests.targets

Line 94 in b85f9f6

<WriteLinesToFile File="$(_projectFile)"

template:

runtime/eng/testing/linker/project.csproj.template

Line 1 in b85f9f6

<Project Sdk="Microsoft.NET.Sdk">

Copy link
Member Author

@jakobbotsch jakobbotsch Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good idea, but a bit more work than I'd like to take on here -- I opened #110043 about it

num_tries = 3
for try_num in range(num_tries):
# On the last try, exit on fail
exit_on_fail = try_num + 1 == num_tries
(_, _, return_code) = run_command(
[dotnet_exe, "restore", project_file, "--packages", artifacts_packages_directory],
[dotnet_exe, "restore", project_file, "--packages", artifacts_packages_directory, "-p:TargetFramework=" + tfm],
_exit_on_fail=exit_on_fail, _env=env_copy)
if return_code == 0:
# It succeeded!
Expand All @@ -203,7 +204,7 @@ def build_and_run(coreclr_args, output_mch_name):

run_command(
[dotnet_exe, "build", project_file, "--configuration", "Release",
"--framework", "net9.0", "--no-restore", "/p:NuGetPackageRoot=" + artifacts_packages_directory,
"--framework", tfm, "--no-restore", "/p:NuGetPackageRoot=" + artifacts_packages_directory,
"-o", artifacts_directory], _exit_on_fail=True)

# This is specifically for PowerShell.Benchmarks.
Expand Down
5 changes: 1 addition & 4 deletions src/coreclr/scripts/superpmi_collect_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,11 +404,8 @@ def setup_benchmark(workitem_directory, arch):
print("Missing " + dotnet_install_script)
return

# Sometimes the dotnet version installed by the script is latest and expect certain versions of SDK that
# 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 9" in the script.
run_command(
get_python_name() + [dotnet_install_script, "install", "--dotnet-versions", "9.0.100-rc.2.24474.11", "--architecture", arch, "--install-dir",
get_python_name() + [dotnet_install_script, "install", "--channels", "9.0", "--architecture", arch, "--install-dir",
dotnet_directory, "--verbose"])


Expand Down
Loading