Skip to content

AOT compatibility #55

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

Open
AnthonyLloyd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AOT compatibility #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 14 additions & 17 deletions CsCheck/Check.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2026 Anthony Lloyd
// Copyright 2026 Anthony Lloyd
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,7 +40,6 @@ public static partial class Check
public static int Ulps = ParseEnvironmentVariableToInt("CsCheck_Ulps", 4);
/// <summary>The number of Where Gne iterations before throwing an exception.</summary>
public static int WhereLimit = ParseEnvironmentVariableToInt("CsCheck_WhereLimit", 100);
internal static bool IsDebug = Assembly.GetCallingAssembly().GetCustomAttribute<DebuggableAttribute>()?.IsJITTrackingEnabled ?? false;

sealed class SampleActionWorker<T>(Gen<T> gen, Action<T> assert, CountdownEvent cde, string? seed, long target, bool isIter) : IThreadPoolWorkItem
{
Expand Down Expand Up @@ -1408,7 +1407,7 @@ public static void SampleModelBased<Actual, Model>(this Gen<(Actual, Model)> ini
}

new GenInitial<Actual, Model>(initial)
.Select(Gen.OneOf(opNameActions).Array, (a, b) => new ModelBasedData<Actual, Model>(a.Actual, a.Model, a.Stream, a.Seed, b))
.Select(Gen.OneOf(opNameActions).Array(), (a, b) => new ModelBasedData<Actual, Model>(a.Actual, a.Model, a.Stream, a.Seed, b))
.Sample(d =>
{
try
Expand Down Expand Up @@ -1754,7 +1753,7 @@ public static void SampleParallel<T>(this Gen<T> initial, GenOperation<T>[] oper
Gen.Int[2, maxParallelOperations]
.SelectMany(np => Gen.Int[2, Math.Min(threads, np)].Select(nt => (nt, np)))
.SelectMany((nt, np) => Gen.Int[0, maxSequentialOperations].Select(ns => (ns, nt, np)))
.SelectMany((ns, nt, np) => new GenSampleParallel<T>(initial).Select(genOps.Array[ns], genOps.Array[np])
.SelectMany((ns, nt, np) => new GenSampleParallel<T>(initial).Select(genOps.Array()[ns], genOps.Array()[np])
.Select((initial, sequential, parallel) => (initial, sequential, nt, parallel)))
.Select((initial, sequential, threads, parallel) => new SampleParallelData<T>(initial.Value, initial.Stream, initial.Seed, sequential, parallel, threads))
.Sample(spd =>
Expand Down Expand Up @@ -2018,7 +2017,7 @@ public static void SampleParallel<Actual, Model>(this Gen<(Actual, Model)> initi
Gen.Int[2, maxParallelOperations]
.SelectMany(np => Gen.Int[2, Math.Min(threads, np)].Select(nt => (nt, np)))
.SelectMany((nt, np) => Gen.Int[0, maxSequentialOperations].Select(ns => (ns, nt, np)))
.SelectMany((ns, nt, np) => new GenSampleParallel<Actual, Model>(initial).Select(genOps.Array[ns], genOps.Array[np])
.SelectMany((ns, nt, np) => new GenSampleParallel<Actual, Model>(initial).Select(genOps.Array()[ns], genOps.Array()[np])
.Select((initial, sequential, parallel) => (initial, sequential, nt, parallel)))
.Select((initial, sequential, threads, parallel) => new SampleParallelData<Actual, Model>(initial.Actual, initial.Model, initial.Stream, initial.Seed, sequential, parallel, threads))
.Sample(spd =>
Expand Down Expand Up @@ -2268,7 +2267,7 @@ public void Execute()
{
if (result.Add(fasterTimer.Time(), slowerTimer.Time()))
{
if (raiseexception && result.NotFaster && !IsDebug)
if (raiseexception && result.NotFaster)
result.Exception ??= new CsCheckException(result.ToString());
running = false;
return;
Expand Down Expand Up @@ -2354,7 +2353,7 @@ public void Execute()
{
if (result.Add(fasterTimer.Time(out var fasterValue), slowerTimer.Time(out var slowerValue)))
{
if (raiseexception && result.NotFaster && !IsDebug)
if (raiseexception && result.NotFaster)
result.Exception ??= new CsCheckException(result.ToString());
running = false;
return;
Expand Down Expand Up @@ -2410,7 +2409,7 @@ public static void Faster<T>(Func<T> faster, Func<T> slower, Func<T, T, bool>? e
while (--threads > 0)
ThreadPool.UnsafeQueueUserWorkItem(worker, false);
worker.Execute();
if (raiseexception && result.NotFaster && !IsDebug)
if (raiseexception && result.NotFaster)
throw new CsCheckException(result.ToString());
if (result.Exception is not null) throw result.Exception;
if (writeLine is not null) result.Output(writeLine);
Expand Down Expand Up @@ -2441,7 +2440,7 @@ async Task Worker()
{
if (result.Add(await fasterTimer.Time().ConfigureAwait(false), await slowerTimer.Time().ConfigureAwait(false)))
{
if (raiseexception && result.NotFaster && !IsDebug)
if (raiseexception && result.NotFaster)
result.Exception ??= new CsCheckException(result.ToString());
running = false;
return;
Expand Down Expand Up @@ -2498,7 +2497,7 @@ async Task Worker()
var (slowerTime, slowerValue) = await slowerTimer.Time().ConfigureAwait(false);
if (result.Add(fasterTime, slowerTime))
{
if (raiseexception && result.NotFaster && !IsDebug)
if (raiseexception && result.NotFaster)
result.Exception ??= new CsCheckException(result.ToString());
running = false;
return;
Expand Down Expand Up @@ -2552,7 +2551,7 @@ public void Execute()
t = gen.Generate(pcg, null, out _);
if (running && result.Add(fasterTimer.Time(t), slowerTimer.Time(t)))
{
if (raiseexception && result.NotFaster && !IsDebug)
if (raiseexception && result.NotFaster)
result.Exception ??= new CsCheckException(result.ToString());
running = false;
return;
Expand Down Expand Up @@ -2757,7 +2756,7 @@ async Task Worker()
if (!running) return;
if (result.Add(await fasterTimer.Time(t).ConfigureAwait(false), await slowerTimer.Time(t).ConfigureAwait(false)))
{
if (raiseexception && result.NotFaster && !IsDebug)
if (raiseexception && result.NotFaster)
result.Exception ??= new CsCheckException(result.ToString());
running = false;
return;
Expand Down Expand Up @@ -2918,7 +2917,7 @@ public void Execute()
t = gen.Generate(pcg, null, out _);
if (result.Add(fasterTimer.Time(t, out var fasterValue), slowerTimer.Time(t, out var slowerValue)))
{
if (raiseexception && result.NotFaster && !IsDebug)
if (raiseexception && result.NotFaster)
result.Exception ??= new CsCheckException(result.ToString());
running = false;
return;
Expand Down Expand Up @@ -3180,7 +3179,7 @@ async Task Worker()
var (slowerTime, slowerValue) = await slowerTimer.Time(t).ConfigureAwait(false);
if (result.Add(fasterTime, slowerTime))
{
if (raiseexception && result.NotFaster && !IsDebug)
if (raiseexception && result.NotFaster)
result.Exception ??= new CsCheckException(result.ToString());
running = false;
return;
Expand Down Expand Up @@ -3555,9 +3554,7 @@ public override string ToString()
var result = $"{Median.Median:P2}[{Median.Q1:P2}..{Median.Q3:P2}] {times:#0.00}x[{q1Times:#0.00}x..{q3Times:#0.00}x] {faster}";
if (double.IsNaN(Median.Median)) result = $"Time resolution too small try using repeat.\n{result}";
else if ((Median.Median >= 0.0) != (Faster > Slower)) result = $"Inconsistent result try using repeat or increasing sigma.\n{result}";
result = $"{result}, sigma = {Math.Sqrt(SigmaSquared):#0.0} ({Faster:#,0} vs {Slower:#,0}), min = {timeString((double)FasterMin / repeat)}{timeUnit} vs {timeString((double)SlowerMin / repeat)}{timeUnit}";
if (Check.IsDebug) result += " - DEBUG MODE - DO NOT TRUST THESE RESULTS";
return result;
return $"{result}, sigma = {Math.Sqrt(SigmaSquared):#0.0} ({Faster:#,0} vs {Slower:#,0}), min = {timeString((double)FasterMin / repeat)}{timeUnit} vs {timeString((double)SlowerMin / repeat)}{timeUnit}";
}

private static (Func<double, string>, string) TimeFormat(double maxValue) =>
Expand Down
3 changes: 2 additions & 1 deletion CsCheck/CsCheck.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ Fixed Faster statistics locking.
<NoWarn>CS1591,MA0143</NoWarn>
<PackageReadmeFile>README.md</PackageReadmeFile>
<AnalysisMode>All</AnalysisMode>
<IsAotCompatible>true</IsAotCompatible>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.103" PrivateAssets="All" />
<PackageReference Include="Meziantou.Analyzer" Version="3.0.4" PrivateAssets="All" />
<PackageReference Include="Meziantou.Analyzer" Version="3.0.20" PrivateAssets="All" />
<None Include="../CsCheck.png" Pack="true" PackagePath="" Visible="False" />
<None Include="../README.md" Pack="true" PackagePath="" Visible="False" />
</ItemGroup>
Expand Down
61 changes: 26 additions & 35 deletions CsCheck/Dbg.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public static IEnumerable<string> Output()
lock (stats)
{
var now = Stopwatch.GetTimestamp();
return stats.Select(i =>
return [.. stats.Select(i =>
{
var (completed, starts) = i.Value;
lock (starts)
Expand All @@ -101,7 +101,7 @@ public static IEnumerable<string> Output()
running.Add(now - start);
return KeyValuePair.Create(i.Key, (completed, running));
}
}).ToArray();
})];
}
}

Expand All @@ -120,11 +120,8 @@ public static void Clear()
objects = new();
functions = new();
times = new();
if (regressionStream is not null)
{
regressionStream.Dispose();
regressionStream = null;
}
regressionStream?.Dispose();
regressionStream = null;
}

/// <summary>Save object by name.</summary>
Expand Down Expand Up @@ -363,20 +360,14 @@ public IEnumerator<T> GetEnumerator()
_cache.Add(current);
yield return current;
}
if (_enumerator is not null)
{
_enumerator.Dispose();
_enumerator = null;
}
_enumerator?.Dispose();
_enumerator = null;
for (; index < _cache.Count; index++) yield return _cache[index];
}
public void Dispose()
{
if (_enumerator is not null)
{
_enumerator.Dispose();
_enumerator = null;
}
_enumerator?.Dispose();
_enumerator = null;
}
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
}
Expand Down Expand Up @@ -841,143 +832,143 @@ public static class RegressionExtensions
public static void Add(this IRegression r, IEnumerable<bool> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<bool> ?? val.ToArray();
var col = val as IReadOnlyCollection<bool> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<byte> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<byte> ?? val.ToArray();
var col = val as IReadOnlyCollection<byte> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<char> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<char> ?? val.ToArray();
var col = val as IReadOnlyCollection<char> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<DateTime> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<DateTime> ?? val.ToArray();
var col = val as IReadOnlyCollection<DateTime> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<DateTimeOffset> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<DateTimeOffset> ?? val.ToArray();
var col = val as IReadOnlyCollection<DateTimeOffset> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<decimal> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<decimal> ?? val.ToArray();
var col = val as IReadOnlyCollection<decimal> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<double> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<double> ?? val.ToArray();
var col = val as IReadOnlyCollection<double> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<float> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<float> ?? val.ToArray();
var col = val as IReadOnlyCollection<float> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<Guid> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<Guid> ?? val.ToArray();
var col = val as IReadOnlyCollection<Guid> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<int> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<int> ?? val.ToArray();
var col = val as IReadOnlyCollection<int> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<long> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<long> ?? val.ToArray();
var col = val as IReadOnlyCollection<long> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<sbyte> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<sbyte> ?? val.ToArray();
var col = val as IReadOnlyCollection<sbyte> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<short> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<short> ?? val.ToArray();
var col = val as IReadOnlyCollection<short> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<string> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<string> ?? val.ToArray();
var col = val as IReadOnlyCollection<string> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<TimeSpan> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<TimeSpan> ?? val.ToArray();
var col = val as IReadOnlyCollection<TimeSpan> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<uint> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<uint> ?? val.ToArray();
var col = val as IReadOnlyCollection<uint> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<ulong> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<ulong> ?? val.ToArray();
var col = val as IReadOnlyCollection<ulong> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}

public static void Add(this IRegression r, IEnumerable<ushort> val)
{
if (val is null) { r.Add(NULL); return; }
var col = val as ICollection<ushort> ?? val.ToArray();
var col = val as IReadOnlyCollection<ushort> ?? [.. val];
r.Add((uint)col.Count);
foreach (var v in col) r.Add(v);
}
Expand Down
Loading