Skip to content

Update runtime repo to use Preview 7 SDK #72145

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
jkoritzinsky merged 19 commits into from
Aug 15, 2022
Merged

Update runtime repo to use Preview 7 SDK #72145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d27729f
Update runtime repo to use Preview 6 SDK
agocke Jul 13, 2022
f276db3
Fix json encoding
agocke Jul 14, 2022
0c66891
Use TrimMode=full instead of TrimmerDefaultAction
agocke Jul 14, 2022
556bb8a
Also set TrimMode=full in TrimmingTests props file
agocke Jul 14, 2022
b40a841
Add TrimmerDefaultAction for NativeAOT library testing
agocke Jul 15, 2022
5af1afa
Remove usage of default trim mode
agocke Jul 15, 2022
e1b012a
Replace with TrimMode partial
agocke Jul 15, 2022
890efef
Merge remote-tracking branch 'upstream/main' into runtime-p6
agocke Jul 15, 2022
2c4a9ca
Merge branch 'runtime-p6' of github.com:agocke/runtime into p7-sdk
jkoritzinsky Aug 11, 2022
b137f4d
Update SDK to preview 7
jkoritzinsky Aug 11, 2022
a3ee434
Merge branch 'main' of github.com:dotnet/runtime into p7-sdk
jkoritzinsky Aug 11, 2022
8774ee3
Update Roslyn to 4.4.0-2.22412.11
hoyosjs Aug 13, 2022
9d0508a
Merge remote-tracking branch 'upstream/main' into runtime-p6
AaronRobinsonMSFT Aug 13, 2022
459a67a
Merge in main and update pgo project
AaronRobinsonMSFT Aug 13, 2022
79ff97d
Add ByRefFields feature flag.
AaronRobinsonMSFT Aug 13, 2022
99af1bd
Inline deleted ILLink.targets logic
MichalStrehovsky Aug 15, 2022
6fa5900
Cleanups
MichalStrehovsky Aug 15, 2022
cedada9
Ensure no GC hole for LbrTraceEventData
jakobbotsch Aug 15, 2022
17a4e22
Use static workaround since UnscopedRef is not yet available
jakobbotsch Aug 15, 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
Prev Previous commit
Use static workaround since UnscopedRef is not yet available
  • Loading branch information
@jakobbotsch
jakobbotsch committed Aug 15, 2022
commit 17a4e22734b6bfe1450b228682b89d22d7fb174f
4 changes: 2 additions & 2 deletions src/coreclr/tools/dotnet-pgo/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1626,7 +1626,7 @@ void AddToInstrumentationData(int eventClrInstanceId, long methodID, int methodF
if (data->ProcessId != p.ProcessID)
continue;

Span<LbrEntry32> lbr32 = data->Entries(e.EventDataLength);
Span<LbrEntry32> lbr32 = LbrTraceEventData32.Entries(ref *data, e.EventDataLength);
correlator.AttributeSampleToLbrRuns(lbr32);
}
else
Expand All @@ -1640,7 +1640,7 @@ void AddToInstrumentationData(int eventClrInstanceId, long methodID, int methodF
if (data->ProcessId != p.ProcessID)
continue;

Span<LbrEntry64> lbr64 = data->Entries(e.EventDataLength);
Span<LbrEntry64> lbr64 = LbrTraceEventData64.Entries(ref *data, e.EventDataLength);
correlator.AttributeSampleToLbrRuns(lbr64);
}
}
Expand Down
15 changes: 6 additions & 9 deletions src/coreclr/tools/dotnet-pgo/SPGO/LbrEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
Expand Down Expand Up @@ -56,11 +55,10 @@ public unsafe struct LbrTraceEventData32
public LbrOptionFlags Options;
private LbrEntry32 _entries;

[UnscopedRef]
public Span<LbrEntry32> Entries(int totalSize)
public static Span<LbrEntry32> Entries(ref LbrTraceEventData32 data, int totalSize)
{
IntPtr entriesOffset = Unsafe.ByteOffset(ref Unsafe.As<LbrTraceEventData32, byte>(ref this), ref Unsafe.As<LbrEntry32, byte>(ref _entries));
return MemoryMarshal.CreateSpan(ref _entries, (totalSize - (int)entriesOffset) / sizeof(LbrEntry32));
IntPtr entriesOffset = Unsafe.ByteOffset(ref Unsafe.As<LbrTraceEventData32, byte>(ref data), ref Unsafe.As<LbrEntry32, byte>(ref data._entries));
return MemoryMarshal.CreateSpan(ref data._entries, (totalSize - (int)entriesOffset) / sizeof(LbrEntry32));
}
}

Expand All @@ -73,11 +71,10 @@ public unsafe struct LbrTraceEventData64
public LbrOptionFlags Options;
private LbrEntry64 _entries;

[UnscopedRef]
public Span<LbrEntry64> Entries(int totalSize)
public static Span<LbrEntry64> Entries(ref LbrTraceEventData64 data, int totalSize)
{
IntPtr entriesOffset = Unsafe.ByteOffset(ref Unsafe.As<LbrTraceEventData64, byte>(ref this), ref Unsafe.As<LbrEntry64, byte>(ref _entries));
return MemoryMarshal.CreateSpan(ref _entries, (totalSize - (int)entriesOffset) / sizeof(LbrEntry64));
IntPtr entriesOffset = Unsafe.ByteOffset(ref Unsafe.As<LbrTraceEventData64, byte>(ref data), ref Unsafe.As<LbrEntry64, byte>(ref data._entries));
return MemoryMarshal.CreateSpan(ref data._entries, (totalSize - (int)entriesOffset) / sizeof(LbrEntry64));
}
}
}