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

Jump to bottom

Use BinaryPrimitives for ObjectDataBuilder primitive emit logic #102394

Merged
merged 9 commits into from
May 18, 2024
Merged

Use BinaryPrimitives for ObjectDataBuilder primitive emit logic #102394

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9fe722c
Add ArrayBuilder.Append(ROS<T>)
PaulusParssinen May 17, 2024
f7e82e6
Use BinaryPrimitives to emit integer primitives in ObjectDataBuilder
PaulusParssinen May 17, 2024
2caf45b
Use BinaryPrimitives to emit reserved integer primitives in ObjectDat…
PaulusParssinen May 17, 2024
94cb4cc
Mark some ArrayBuilder members as readonly
PaulusParssinen May 17, 2024
b7047cb
Ask ArrayBuilder for a buffer instead of stackalloc + append
PaulusParssinen May 17, 2024
bd0acd9
Follow ValueStringBuilder's AppendSpan implementation
PaulusParssinen May 18, 2024
1508892
Don't inline ArrayBuilder resize
PaulusParssinen May 18, 2024
5b48ae2
Initialize ArrayBuilder._items with empty array
PaulusParssinen May 18, 2024
2ff11b0
Revert "Initialize ArrayBuilder._items with empty array"
PaulusParssinen May 18, 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
51 changes: 20 additions & 31 deletions src/coreclr/tools/Common/Compiler/DependencyAnalysis/ObjectDataBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Buffers.Binary;
using System.Collections.Generic;
using Internal.TypeSystem;

Expand Down Expand Up @@ -85,42 +86,37 @@ public void EmitByte(byte emit)

public void EmitShort(short emit)
{
EmitByte((byte)(emit & 0xFF));
EmitByte((byte)((emit >> 8) & 0xFF));
Span<byte> buffer = stackalloc byte[sizeof(short)];
PaulusParssinen marked this conversation as resolved.
Show resolved Hide resolved
BinaryPrimitives.WriteInt16LittleEndian(buffer, emit);
_data.Append(buffer);
PaulusParssinen marked this conversation as resolved.
Show resolved Hide resolved
}

public void EmitUShort(ushort emit)
{
EmitByte((byte)(emit & 0xFF));
EmitByte((byte)((emit >> 8) & 0xFF));
Span<byte> buffer = stackalloc byte[sizeof(ushort)];
BinaryPrimitives.WriteUInt16LittleEndian(buffer, emit);
_data.Append(buffer);
}

public void EmitInt(int emit)
{
EmitByte((byte)(emit & 0xFF));
EmitByte((byte)((emit >> 8) & 0xFF));
EmitByte((byte)((emit >> 16) & 0xFF));
EmitByte((byte)((emit >> 24) & 0xFF));
Span<byte> buffer = stackalloc byte[sizeof(int)];
BinaryPrimitives.WriteInt32LittleEndian(buffer, emit);
_data.Append(buffer);
}

public void EmitUInt(uint emit)
{
EmitByte((byte)(emit & 0xFF));
EmitByte((byte)((emit >> 8) & 0xFF));
EmitByte((byte)((emit >> 16) & 0xFF));
EmitByte((byte)((emit >> 24) & 0xFF));
Span<byte> buffer = stackalloc byte[sizeof(uint)];
BinaryPrimitives.WriteUInt32LittleEndian(buffer, emit);
_data.Append(buffer);
}

public void EmitLong(long emit)
{
EmitByte((byte)(emit & 0xFF));
EmitByte((byte)((emit >> 8) & 0xFF));
EmitByte((byte)((emit >> 16) & 0xFF));
EmitByte((byte)((emit >> 24) & 0xFF));
EmitByte((byte)((emit >> 32) & 0xFF));
EmitByte((byte)((emit >> 40) & 0xFF));
EmitByte((byte)((emit >> 48) & 0xFF));
EmitByte((byte)((emit >> 56) & 0xFF));
Span<byte> buffer = stackalloc byte[sizeof(long)];
BinaryPrimitives.WriteInt64LittleEndian(buffer, emit);
_data.Append(buffer);
}

public void EmitNaturalInt(int emit)
Expand Down Expand Up @@ -180,7 +176,7 @@ public void EmitCompressedUInt(uint emit)
}
}

public void EmitBytes(byte[] bytes)
public void EmitBytes(scoped ReadOnlySpan<byte> bytes)
{
_data.Append(bytes);
}
Expand Down Expand Up @@ -245,8 +241,7 @@ public Reservation ReserveShort()
public void EmitShort(Reservation reservation, short emit)
{
int offset = ReturnReservationTicket(reservation);
_data[offset] = (byte)(emit & 0xFF);
_data[offset + 1] = (byte)((emit >> 8) & 0xFF);
BinaryPrimitives.WriteInt16LittleEndian(_data.AsSpan(offset), emit);
}

public Reservation ReserveInt()
Expand All @@ -257,19 +252,13 @@ public Reservation ReserveInt()
public void EmitInt(Reservation reservation, int emit)
{
int offset = ReturnReservationTicket(reservation);
_data[offset] = (byte)(emit & 0xFF);
_data[offset + 1] = (byte)((emit >> 8) & 0xFF);
_data[offset + 2] = (byte)((emit >> 16) & 0xFF);
_data[offset + 3] = (byte)((emit >> 24) & 0xFF);
BinaryPrimitives.WriteInt32LittleEndian(_data.AsSpan(offset), emit);
}

public void EmitUInt(Reservation reservation, uint emit)
{
int offset = ReturnReservationTicket(reservation);
_data[offset] = (byte)(emit & 0xFF);
_data[offset + 1] = (byte)((emit >> 8) & 0xFF);
_data[offset + 2] = (byte)((emit >> 16) & 0xFF);
_data[offset + 3] = (byte)((emit >> 24) & 0xFF);
BinaryPrimitives.WriteUInt32LittleEndian(_data.AsSpan(offset), emit);
}

public void EmitReloc(ISymbolNode symbol, RelocType relocType, int delta = 0)
Expand Down
38 changes: 20 additions & 18 deletions src/coreclr/tools/Common/System/Collections/Generic/ArrayBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,20 @@ public void Add(T item)
_items[_count++] = item;
}

#if NET
public readonly Span<T> AsSpan(int start) => _items.AsSpan(start);
PaulusParssinen marked this conversation as resolved.
Show resolved Hide resolved

public void Append(scoped ReadOnlySpan<T> newItems)
{
if (newItems.Length == 0)
return;

EnsureCapacity(_count + newItems.Length);
newItems.CopyTo(_items.AsSpan(_count));
_count += newItems.Length;
}
#endif

public void Append(T[] newItems)
{
Append(newItems, 0, newItems.Length);
Expand Down Expand Up @@ -72,27 +86,15 @@ public void EnsureCapacity(int requestedCapacity)
}
}

public int Count
{
get
{
return _count;
}
}
public readonly int Count => _count;

public T this[int index]
public readonly T this[int index]
{
get
{
return _items[index];
}
set
{
_items[index] = value;
}
get => _items[index];
set => _items[index] = value;
}

public bool Contains(T t)
public readonly bool Contains(T t)
{
for (int i = 0; i < _count; i++)
{
Expand All @@ -105,7 +107,7 @@ public bool Contains(T t)
return false;
}

public bool Any(Func<T, bool> func)
public readonly bool Any(Func<T, bool> func)
{
for (int i = 0; i < _count; i++)
{
Expand Down
Loading