youmuliu/stgsharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing tile fma

Browse Source
This commit is contained in:
Youmu Liu
2026-01-11 15:28:30 +08:00
parent 4be5c1c7c9
commit cd8210d9a1
8 changed files with 198 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
StgSharp.Common/HighPerformance/MatrixKernel.cs
+8 -3
View File
@@ -53,17 +53,22 @@ namespace StgSharp.HighPerformance
Unsafe.SkipInit(out this);
}
public MatrixKernel(bool clear)
public MatrixKernel(
bool clear
)
{
if (!clear) {
Unsafe.SkipInit(out this);
}
}
public ref T this[int row, int column]
public ref T this[
int x,
int y
]
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => ref Unsafe.Add(ref c0r0, (row * 4) + column);
get => ref Unsafe.Add(ref c0r0, (x * 4) + y);
}
}
StgSharp.Common/Mathematics/Linear/Matrix.cs
+11 -21
View File
@@ -70,11 +70,11 @@ namespace StgSharp.Mathematics.Numeric
int
k_c = y / 4,
k_r = x / 4,
c = y % 4,
k_r = x / 4,
r = x % 4;
ref MatrixKernel<T> kernel = ref GetMatrixKernel(k_c, k_r);
return Unsafe.IsNullRef(ref kernel) ? T.Zero : kernel[c, r];
ref MatrixKernel<T> kernel = ref GetMatrixKernel(k_r, k_c);
return Unsafe.IsNullRef(ref kernel) ? T.Zero : kernel[r, c];
}
set
{
@@ -84,12 +84,12 @@ namespace StgSharp.Mathematics.Numeric
int
k_c = y / 4,
k_r = x / 4,
c = y % 4,
k_r = x / 4,
r = x % 4;
ref MatrixKernel<T> kernel = ref GetMatrixKernel(k_c, k_r);
ref MatrixKernel<T> kernel = ref GetMatrixKernel(k_r, k_c);
if (!Unsafe.IsNullRef(ref kernel)) {
kernel[c, r] = value;
kernel[r, c] = value;
}
}
}
@@ -146,10 +146,8 @@ namespace StgSharp.Mathematics.Numeric
int y
)
{
MatrixKernelEnumerator enumerator = new(_size.KernelColumnLength, _size.KernelRowLength,
x, y);
return ref _boarder.IsInBuffer(x, y, in enumerator) ?
ref _buffer[_boarder.GetIndexOffset(x, y, in enumerator)] :
return ref _boarder.IsInBuffer(x, y, in _size) ?
ref _buffer[_boarder.GetIndexOffset(x, y, in _size)] :
ref Unsafe.NullRef<MatrixKernel<T>>();
}
@@ -165,9 +163,7 @@ namespace StgSharp.Mathematics.Numeric
int c = y & 3;
int r = x & 3;
MatrixKernelEnumerator enumerator = new(_size.KernelColumnLength, _size.KernelRowLength,
k_c, k_r);
ref MatrixKernel<T> kernel = ref _buffer[_boarder.GetIndexOffset(k_c, k_r, in enumerator)];
ref MatrixKernel<T> kernel = ref _buffer[_boarder.GetIndexOffset(k_c, k_r, in _size)];
return ref kernel[c, r];
}
@@ -177,10 +173,7 @@ namespace StgSharp.Mathematics.Numeric
int y
)
{
// Caller guarantees: indices in range, layout is dense square.
MatrixKernelEnumerator enumerator = new(_size.KernelColumnLength, _size.KernelRowLength,
x, y);
return Buffer + _boarder.GetIndexOffset(x, y, in enumerator);
return Buffer + _boarder.GetIndexOffset(x, y, in _size);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -194,10 +187,7 @@ namespace StgSharp.Mathematics.Numeric
int k_r = x >> 2;
int c = y & 3;
int r = x & 3;
MatrixKernelEnumerator enumerator = new(_size.KernelColumnLength, _size.KernelRowLength,
k_c, k_r);
return ref _buffer[_boarder.GetIndexOffset(k_c, k_r, in enumerator)];
return ref _buffer[_boarder.GetIndexOffset(k_c, k_r, in _size)];
}
}
StgSharp.Common/Mathematics/Linear/MatrixMetadata.cs
+36 -18
View File
@@ -48,7 +48,9 @@ namespace StgSharp.Mathematics.Numeric
private static readonly MatrixKernelBoarder UpperTriangleInstance = new UpperTriangleKernelBoarder();
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static MatrixKernelBoarder Create(MatrixLayout layout)
public static MatrixKernelBoarder Create(
MatrixLayout layout
)
{
return layout switch
{
@@ -63,25 +65,30 @@ namespace StgSharp.Mathematics.Numeric
public abstract long GetIndexOffset(
int xKernel,
int yKernel,
in MatrixKernelEnumerator enumerator);
in MatrixSize size
);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public abstract bool IsInBuffer(
int xKernel,
int yKernel,
in MatrixKernelEnumerator enumerator);
in MatrixSize enumerator
);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
protected static long GetTriangularOrder(in MatrixKernelEnumerator enumerator)
protected static long GetTriangularOrder(
in MatrixSize enumerator
)
{
return Math.Min(enumerator.KernelColumnLength, enumerator.KernelRowLength);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
protected static bool IsWithinKernelDomain(
in MatrixKernelEnumerator enumerator,
in MatrixSize enumerator,
int xKernel,
int yKernel)
int yKernel
)
{
return xKernel >= 0 &&
yKernel >= 0 &&
@@ -91,9 +98,10 @@ namespace StgSharp.Mathematics.Numeric
[MethodImpl(MethodImplOptions.AggressiveInlining)]
protected static bool IsWithinTriangularDomain(
in MatrixKernelEnumerator enumerator,
in MatrixSize enumerator,
int xKernel,
int yKernel)
int yKernel
)
{
long order = GetTriangularOrder(enumerator);
return xKernel >= 0 && yKernel >= 0 && xKernel < order && yKernel < order;
@@ -106,19 +114,23 @@ namespace StgSharp.Mathematics.Numeric
public override long GetIndexOffset(
int xKernel,
int yKernel,
in MatrixKernelEnumerator enumerator)
in MatrixSize enumerator
)
{
long x = xKernel;
long y = yKernel;
long rows = enumerator.KernelRowLength;
return x * rows + y;
long col = enumerator.KernelColumnLength;
Console.Write($"Attempt to get offset at ({x},{y}), offset is {x * col + y} ");
return x * col + y;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public override bool IsInBuffer(
int xKernel,
int yKernel,
in MatrixKernelEnumerator enumerator)
in MatrixSize enumerator
)
{
return IsWithinKernelDomain(enumerator, xKernel, yKernel);
}
@@ -132,7 +144,8 @@ namespace StgSharp.Mathematics.Numeric
public override long GetIndexOffset(
int xKernel,
int yKernel,
in MatrixKernelEnumerator enumerator)
in MatrixSize enumerator
)
{
long order = GetTriangularOrder(enumerator);
long x = xKernel;
@@ -146,7 +159,8 @@ namespace StgSharp.Mathematics.Numeric
public override bool IsInBuffer(
int xKernel,
int yKernel,
in MatrixKernelEnumerator enumerator)
in MatrixSize enumerator
)
{
return IsWithinTriangularDomain(enumerator, xKernel, yKernel) && yKernel >= xKernel;
}
@@ -160,7 +174,8 @@ namespace StgSharp.Mathematics.Numeric
public override long GetIndexOffset(
int xKernel,
int yKernel,
in MatrixKernelEnumerator enumerator)
in MatrixSize enumerator
)
{
long x = xKernel;
long y = yKernel;
@@ -173,7 +188,8 @@ namespace StgSharp.Mathematics.Numeric
public override bool IsInBuffer(
int xKernel,
int yKernel,
in MatrixKernelEnumerator enumerator)
in MatrixSize enumerator
)
{
return IsWithinTriangularDomain(enumerator, xKernel, yKernel) && yKernel <= xKernel;
}
@@ -197,7 +213,8 @@ namespace StgSharp.Mathematics.Numeric
int elementColumnLength,
int elementRowLength,
int kernelColumnLength,
int kernelRowLength)
int kernelRowLength
)
{
ElementColumnLength = elementColumnLength;
ElementRowLength = elementRowLength;
@@ -222,7 +239,8 @@ namespace StgSharp.Mathematics.Numeric
int kernelColumnLength,
int kernelRowLength,
int currentColumn = 0,
int currentRow = 0)
int currentRow = 0
)
{
CurrentColumn = currentColumn;
CurrentRow = currentRow;