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

Extend uses count from ushort to uint on Operand Data structure #3374

Merged
merged 1 commit into from Jun 5, 2022
Merged

Extend uses count from ushort to uint on Operand Data structure #3374

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
72 changes: 67 additions & 5 deletions ARMeilleure/IntermediateRepresentation/Operand.cs
View file
Open in desktop
Expand Up @@ -14,10 +14,11 @@ internal struct Data
public byte Kind;
public byte Type;
public byte SymbolType;
public byte Padding; // Unused space.
public ushort AssignmentsCount;
public ushort AssignmentsCapacity;
public ushort UsesCount;
public ushort UsesCapacity;
public uint UsesCount;
public uint UsesCapacity;
public Operation* Assignments;
public Operation* Uses;
public ulong Value;
Expand Down Expand Up @@ -84,11 +85,11 @@ public ReadOnlySpan<Operation> Uses
{
Debug.Assert(Kind != OperandKind.Memory);

return new ReadOnlySpan<Operation>(_data->Uses, _data->UsesCount);
return new ReadOnlySpan<Operation>(_data->Uses, (int)_data->UsesCount);
}
}

public int UsesCount => _data->UsesCount;
public int UsesCount => (int)_data->UsesCount;
public int AssignmentsCount => _data->AssignmentsCount;

public bool Relocatable => Symbol.Type != SymbolType.None;
Expand Down Expand Up @@ -178,7 +179,7 @@ public void AddAssignment(Operation operation)
{
Add(operation, ref addr._data->Assignments, ref addr._data->AssignmentsCount, ref addr._data->AssignmentsCapacity);
}

if (index != default)
{
Add(operation, ref index._data->Assignments, ref index._data->AssignmentsCount, ref index._data->AssignmentsCapacity);
Expand Down Expand Up @@ -265,6 +266,13 @@ public void RemoveUse(Operation operation)
data = Allocators.References.Allocate<T>(initialCapacity);
}

private static void New<T>(ref T* data, ref uint count, ref uint capacity, uint initialCapacity) where T : unmanaged
{
count = 0;
capacity = initialCapacity;
data = Allocators.References.Allocate<T>(initialCapacity);
}

private static void Add<T>(T item, ref T* data, ref ushort count, ref ushort capacity) where T : unmanaged
{
if (count < capacity)
Expand Down Expand Up @@ -294,6 +302,40 @@ static void ExpandAdd(T item, ref T* data, ref ushort count, ref ushort capacity
}
}

private static void Add<T>(T item, ref T* data, ref uint count, ref uint capacity) where T : unmanaged
{
if (count < capacity)
{
data[count++] = item;

return;
}

// Could not add item in the fast path, fallback onto the slow path.
ExpandAdd(item, ref data, ref count, ref capacity);

static void ExpandAdd(T item, ref T* data, ref uint count, ref uint capacity)
{
uint newCount = checked(count + 1);
uint newCapacity = (uint)Math.Min(capacity * 2, int.MaxValue);

if (newCapacity <= capacity)
{
throw new OverflowException();
}

var oldSpan = new Span<T>(data, (int)count);

capacity = newCapacity;
data = Allocators.References.Allocate<T>(capacity);

oldSpan.CopyTo(new Span<T>(data, (int)count));

data[count] = item;
count = newCount;
}
}

private static void Remove<T>(in T item, ref T* data, ref ushort count) where T : unmanaged
{
var span = new Span<T>(data, count);
Expand All @@ -314,6 +356,26 @@ static void ExpandAdd(T item, ref T* data, ref ushort count, ref ushort capacity
}
}

private static void Remove<T>(in T item, ref T* data, ref uint count) where T : unmanaged
{
var span = new Span<T>(data, (int)count);

for (int i = 0; i < span.Length; i++)
{
if (EqualityComparer<T>.Default.Equals(span[i], item))
{
if (i + 1 < count)
{
span.Slice(i + 1).CopyTo(span.Slice(i));
}

count--;

return;
}
}
}

public override int GetHashCode()
{
if (Kind == OperandKind.LocalVariable)
Expand Down