Skip to content
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

Few workarounds for the next manual perf run #2282

Merged
merged 5 commits into from
Mar 1, 2022
Merged

Few workarounds for the next manual perf run #2282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2eb830c
define NET7_0_PREVIEW2_OR_GREATER const for .NET 7 Preview2+ builds
adamsitnik Mar 1, 2022
defd009
don't use Regex.Count API for older versions of .NET 7 (used as basel…
adamsitnik Mar 1, 2022
15f5498
don't try to run AddRemoveFromDifferentThreads.ConcurrentStack benchm…
adamsitnik Mar 1, 2022
eeca195
don't try to run Json_FromString.Jil_ benchmark on ARM64 as it throws…
adamsitnik Mar 1, 2022
2e6a17e
fix the namespaces
adamsitnik Mar 1, 2022
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
1 change: 1 addition & 0 deletions src/benchmarks/micro/MicroBenchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<DebugSymbols>true</DebugSymbols>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<EnableXlfLocalization>false</EnableXlfLocalization>
<DefineConstants Condition=" '$(MSBuildFileVersion)' > '17.2.0.10401' AND $(NETCoreSdkVersion.StartsWith(7.0.100-preview))">$(DefineConstants);NET7_0_PREVIEW2_OR_GREATER</DefineConstants>
</PropertyGroup>
<!-- out-of-band packages that are not included in NetCoreApp have TFM-specific versions -->
<Choose>
Expand Down
3 changes: 3 additions & 0 deletions src/benchmarks/micro/Serializers/Json_FromString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ public class Json_FromString<T>

[BenchmarkCategory(Categories.ThirdParty)]
[Benchmark(Description = "Jil")]
#if NET7_0 // https://github.com/dotnet/runtime/issues/64657
[OperatingSystemsArchitectureFilter(false, System.Runtime.InteropServices.Architecture.Arm64)]
#endif
public T Jil_() => Jil.JSON.Deserialize<T>(serialized, Jil.Options.ISO8601);

[GlobalSetup(Target = nameof(JsonNet_))]
Expand Down
3 changes: 3 additions & 0 deletions ...benchmarks/micro/libraries/System.Collections/Concurrent/AddRemoveFromDifferentThreads.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ public void SetupConcurrentStackIteration()
}

[Benchmark]
#if NET7_0 // https://github.com/dotnet/runtime/issues/64980
[OperatingSystemsArchitectureFilter(false, System.Runtime.InteropServices.Architecture.Arm64)]
#endif
public void ConcurrentStack() => SignalAndWaitForAllTasks();

[IterationSetup(Target = nameof(ConcurrentQueue))]
Expand Down
2 changes: 1 addition & 1 deletion src/benchmarks/micro/libraries/System.Text.RegularExpressions/Perf.Regex.Industry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static string ReadInputFile(string name)

public static int Count(Regex r, string input)
{
#if NET7_0_OR_GREATER
#if NET7_0_PREVIEW2_OR_GREATER
return r.Count(input);
#else
int count = 0;
Expand Down