Accelerate NVDEC VIC surface read/write and colorspace conversion with Arm64 HW intrinsics (#4351)
* Accelerate NVDEC VIC surface read/write and colorspace conversion with Arm64 HW intrinsics * Improve ReadNv12 x86 SSE path
This commit is contained in:
gdkchan
GitHub
parent
7528f94536
commit
cb250162cb
3 changed files with 420 additions and 13 deletions
|
|
@ -4,6 +4,7 @@ using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Runtime.Intrinsics;
|
using System.Runtime.Intrinsics;
|
||||||
|
using System.Runtime.Intrinsics.Arm;
|
||||||
using System.Runtime.Intrinsics.X86;
|
using System.Runtime.Intrinsics.X86;
|
||||||
|
|
||||||
namespace Ryujinx.Graphics.Vic
|
namespace Ryujinx.Graphics.Vic
|
||||||
|
|
@ -17,10 +18,18 @@ namespace Ryujinx.Graphics.Vic
|
||||||
int x2 = Math.Min(src.Width, x1 + targetRect.Width);
|
int x2 = Math.Min(src.Width, x1 + targetRect.Width);
|
||||||
int y2 = Math.Min(src.Height, y1 + targetRect.Height);
|
int y2 = Math.Min(src.Height, y1 + targetRect.Height);
|
||||||
|
|
||||||
if (Sse41.IsSupported && ((x1 | x2) & 3) == 0)
|
if (((x1 | x2) & 3) == 0)
|
||||||
{
|
{
|
||||||
BlendOneSse41(dst, src, ref slot, x1, y1, x2, y2);
|
if (Sse41.IsSupported)
|
||||||
return;
|
{
|
||||||
|
BlendOneSse41(dst, src, ref slot, x1, y1, x2, y2);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else if (AdvSimd.IsSupported)
|
||||||
|
{
|
||||||
|
BlendOneAdvSimd(dst, src, ref slot, x1, y1, x2, y2);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int y = y1; y < y2; y++)
|
for (int y = y1; y < y2; y++)
|
||||||
|
|
@ -105,6 +114,84 @@ namespace Ryujinx.Graphics.Vic
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private unsafe static void BlendOneAdvSimd(Surface dst, Surface src, ref SlotStruct slot, int x1, int y1, int x2, int y2)
|
||||||
|
{
|
||||||
|
Debug.Assert(((x1 | x2) & 3) == 0);
|
||||||
|
|
||||||
|
ref MatrixStruct mtx = ref slot.ColorMatrixStruct;
|
||||||
|
|
||||||
|
Vector128<int> col1 = Vector128.Create(mtx.MatrixCoeff00, mtx.MatrixCoeff10, mtx.MatrixCoeff20, 0);
|
||||||
|
Vector128<int> col2 = Vector128.Create(mtx.MatrixCoeff01, mtx.MatrixCoeff11, mtx.MatrixCoeff21, 0);
|
||||||
|
Vector128<int> col3 = Vector128.Create(mtx.MatrixCoeff02, mtx.MatrixCoeff12, mtx.MatrixCoeff22, 0);
|
||||||
|
Vector128<int> col4 = Vector128.Create(mtx.MatrixCoeff03, mtx.MatrixCoeff13, mtx.MatrixCoeff23, 0);
|
||||||
|
|
||||||
|
Vector128<int> rShift = Vector128.Create(-mtx.MatrixRShift);
|
||||||
|
Vector128<int> selMask = Vector128.Create(0, 0, 0, -1);
|
||||||
|
Vector128<ushort> clMin = Vector128.Create((ushort)slot.SlotConfig.SoftClampLow);
|
||||||
|
Vector128<ushort> clMax = Vector128.Create((ushort)slot.SlotConfig.SoftClampHigh);
|
||||||
|
|
||||||
|
fixed (Pixel* srcPtr = src.Data, dstPtr = dst.Data)
|
||||||
|
{
|
||||||
|
Pixel* ip = srcPtr;
|
||||||
|
Pixel* op = dstPtr;
|
||||||
|
|
||||||
|
if (mtx.MatrixEnable)
|
||||||
|
{
|
||||||
|
for (int y = y1; y < y2; y++, ip += src.Width, op += dst.Width)
|
||||||
|
{
|
||||||
|
for (int x = x1; x < x2; x += 4)
|
||||||
|
{
|
||||||
|
Vector128<ushort> pixel12 = AdvSimd.LoadVector128((ushort*)(ip + (uint)x));
|
||||||
|
Vector128<ushort> pixel34 = AdvSimd.LoadVector128((ushort*)(ip + (uint)x + 2));
|
||||||
|
|
||||||
|
Vector128<uint> pixel1 = AdvSimd.ZeroExtendWideningLower(pixel12.GetLower());
|
||||||
|
Vector128<uint> pixel2 = AdvSimd.ZeroExtendWideningUpper(pixel12);
|
||||||
|
Vector128<uint> pixel3 = AdvSimd.ZeroExtendWideningLower(pixel34.GetLower());
|
||||||
|
Vector128<uint> pixel4 = AdvSimd.ZeroExtendWideningUpper(pixel34);
|
||||||
|
|
||||||
|
Vector128<int> t1 = MatrixMultiplyAdvSimd(pixel1.AsInt32(), col1, col2, col3, col4, rShift, selMask);
|
||||||
|
Vector128<int> t2 = MatrixMultiplyAdvSimd(pixel2.AsInt32(), col1, col2, col3, col4, rShift, selMask);
|
||||||
|
Vector128<int> t3 = MatrixMultiplyAdvSimd(pixel3.AsInt32(), col1, col2, col3, col4, rShift, selMask);
|
||||||
|
Vector128<int> t4 = MatrixMultiplyAdvSimd(pixel4.AsInt32(), col1, col2, col3, col4, rShift, selMask);
|
||||||
|
|
||||||
|
Vector64<ushort> lower1 = AdvSimd.ExtractNarrowingSaturateUnsignedLower(t1);
|
||||||
|
Vector64<ushort> lower3 = AdvSimd.ExtractNarrowingSaturateUnsignedLower(t3);
|
||||||
|
|
||||||
|
pixel12 = AdvSimd.ExtractNarrowingSaturateUnsignedUpper(lower1, t2);
|
||||||
|
pixel34 = AdvSimd.ExtractNarrowingSaturateUnsignedUpper(lower3, t4);
|
||||||
|
|
||||||
|
pixel12 = AdvSimd.Min(pixel12, clMax);
|
||||||
|
pixel34 = AdvSimd.Min(pixel34, clMax);
|
||||||
|
pixel12 = AdvSimd.Max(pixel12, clMin);
|
||||||
|
pixel34 = AdvSimd.Max(pixel34, clMin);
|
||||||
|
|
||||||
|
AdvSimd.Store((ushort*)(op + (uint)x + 0), pixel12);
|
||||||
|
AdvSimd.Store((ushort*)(op + (uint)x + 2), pixel34);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (int y = y1; y < y2; y++, ip += src.Width, op += dst.Width)
|
||||||
|
{
|
||||||
|
for (int x = x1; x < x2; x += 4)
|
||||||
|
{
|
||||||
|
Vector128<ushort> pixel12 = AdvSimd.LoadVector128((ushort*)(ip + (uint)x));
|
||||||
|
Vector128<ushort> pixel34 = AdvSimd.LoadVector128((ushort*)(ip + (uint)x + 2));
|
||||||
|
|
||||||
|
pixel12 = AdvSimd.Min(pixel12, clMax);
|
||||||
|
pixel34 = AdvSimd.Min(pixel34, clMax);
|
||||||
|
pixel12 = AdvSimd.Max(pixel12, clMin);
|
||||||
|
pixel34 = AdvSimd.Max(pixel34, clMin);
|
||||||
|
|
||||||
|
AdvSimd.Store((ushort*)(op + (uint)x + 0), pixel12);
|
||||||
|
AdvSimd.Store((ushort*)(op + (uint)x + 2), pixel34);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
private static void MatrixMultiply(ref MatrixStruct mtx, int x, int y, int z, out int r, out int g, out int b)
|
private static void MatrixMultiply(ref MatrixStruct mtx, int x, int y, int z, out int r, out int g, out int b)
|
||||||
{
|
{
|
||||||
|
|
@ -159,5 +246,33 @@ namespace Ryujinx.Graphics.Vic
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
|
private static Vector128<int> MatrixMultiplyAdvSimd(
|
||||||
|
Vector128<int> pixel,
|
||||||
|
Vector128<int> col1,
|
||||||
|
Vector128<int> col2,
|
||||||
|
Vector128<int> col3,
|
||||||
|
Vector128<int> col4,
|
||||||
|
Vector128<int> rShift,
|
||||||
|
Vector128<int> selectMask)
|
||||||
|
{
|
||||||
|
Vector128<int> x = AdvSimd.DuplicateSelectedScalarToVector128(pixel, 0);
|
||||||
|
Vector128<int> y = AdvSimd.DuplicateSelectedScalarToVector128(pixel, 1);
|
||||||
|
Vector128<int> z = AdvSimd.DuplicateSelectedScalarToVector128(pixel, 2);
|
||||||
|
|
||||||
|
col1 = AdvSimd.Multiply(col1, x);
|
||||||
|
col2 = AdvSimd.Multiply(col2, y);
|
||||||
|
col3 = AdvSimd.Multiply(col3, z);
|
||||||
|
|
||||||
|
Vector128<int> res = AdvSimd.Add(col3, AdvSimd.Add(col1, col2));
|
||||||
|
|
||||||
|
res = AdvSimd.ShiftArithmetic(res, rShift);
|
||||||
|
res = AdvSimd.Add(res, col4);
|
||||||
|
res = AdvSimd.ShiftRightArithmetic(res, 8);
|
||||||
|
res = AdvSimd.BitwiseSelect(selectMask, pixel, res);
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ using Ryujinx.Graphics.Vic.Types;
|
||||||
using System;
|
using System;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Runtime.Intrinsics;
|
using System.Runtime.Intrinsics;
|
||||||
|
using System.Runtime.Intrinsics.Arm;
|
||||||
using System.Runtime.Intrinsics.X86;
|
using System.Runtime.Intrinsics.X86;
|
||||||
using static Ryujinx.Graphics.Vic.Image.SurfaceCommon;
|
using static Ryujinx.Graphics.Vic.Image.SurfaceCommon;
|
||||||
|
|
||||||
|
|
@ -54,7 +55,7 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
(byte)4, (byte)6, (byte)7, (byte)5,
|
(byte)4, (byte)6, (byte)7, (byte)5,
|
||||||
(byte)8, (byte)10, (byte)11, (byte)9,
|
(byte)8, (byte)10, (byte)11, (byte)9,
|
||||||
(byte)12, (byte)14, (byte)15, (byte)13);
|
(byte)12, (byte)14, (byte)15, (byte)13);
|
||||||
Vector128<short> alphaMask = Vector128.Create(0xffUL << 48).AsInt16();
|
Vector128<short> alphaMask = Vector128.Create(0xff << 24).AsInt16();
|
||||||
|
|
||||||
int yStrideGap = yStride - width;
|
int yStrideGap = yStride - width;
|
||||||
int uvStrideGap = uvStride - input.UvWidth;
|
int uvStrideGap = uvStride - input.UvWidth;
|
||||||
|
|
@ -95,6 +96,11 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
rgba2 = Ssse3.Shuffle(rgba2.AsByte(), shufMask).AsInt16();
|
rgba2 = Ssse3.Shuffle(rgba2.AsByte(), shufMask).AsInt16();
|
||||||
rgba3 = Ssse3.Shuffle(rgba3.AsByte(), shufMask).AsInt16();
|
rgba3 = Ssse3.Shuffle(rgba3.AsByte(), shufMask).AsInt16();
|
||||||
|
|
||||||
|
rgba0 = Sse2.Or(rgba0, alphaMask);
|
||||||
|
rgba1 = Sse2.Or(rgba1, alphaMask);
|
||||||
|
rgba2 = Sse2.Or(rgba2, alphaMask);
|
||||||
|
rgba3 = Sse2.Or(rgba3, alphaMask);
|
||||||
|
|
||||||
Vector128<short> rgba16_0 = Sse41.ConvertToVector128Int16(rgba0.AsByte());
|
Vector128<short> rgba16_0 = Sse41.ConvertToVector128Int16(rgba0.AsByte());
|
||||||
Vector128<short> rgba16_1 = Sse41.ConvertToVector128Int16(HighToLow(rgba0.AsByte()));
|
Vector128<short> rgba16_1 = Sse41.ConvertToVector128Int16(HighToLow(rgba0.AsByte()));
|
||||||
Vector128<short> rgba16_2 = Sse41.ConvertToVector128Int16(rgba1.AsByte());
|
Vector128<short> rgba16_2 = Sse41.ConvertToVector128Int16(rgba1.AsByte());
|
||||||
|
|
@ -104,15 +110,6 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
Vector128<short> rgba16_6 = Sse41.ConvertToVector128Int16(rgba3.AsByte());
|
Vector128<short> rgba16_6 = Sse41.ConvertToVector128Int16(rgba3.AsByte());
|
||||||
Vector128<short> rgba16_7 = Sse41.ConvertToVector128Int16(HighToLow(rgba3.AsByte()));
|
Vector128<short> rgba16_7 = Sse41.ConvertToVector128Int16(HighToLow(rgba3.AsByte()));
|
||||||
|
|
||||||
rgba16_0 = Sse2.Or(rgba16_0, alphaMask);
|
|
||||||
rgba16_1 = Sse2.Or(rgba16_1, alphaMask);
|
|
||||||
rgba16_2 = Sse2.Or(rgba16_2, alphaMask);
|
|
||||||
rgba16_3 = Sse2.Or(rgba16_3, alphaMask);
|
|
||||||
rgba16_4 = Sse2.Or(rgba16_4, alphaMask);
|
|
||||||
rgba16_5 = Sse2.Or(rgba16_5, alphaMask);
|
|
||||||
rgba16_6 = Sse2.Or(rgba16_6, alphaMask);
|
|
||||||
rgba16_7 = Sse2.Or(rgba16_7, alphaMask);
|
|
||||||
|
|
||||||
rgba16_0 = Sse2.ShiftLeftLogical(rgba16_0, 2);
|
rgba16_0 = Sse2.ShiftLeftLogical(rgba16_0, 2);
|
||||||
rgba16_1 = Sse2.ShiftLeftLogical(rgba16_1, 2);
|
rgba16_1 = Sse2.ShiftLeftLogical(rgba16_1, 2);
|
||||||
rgba16_2 = Sse2.ShiftLeftLogical(rgba16_2, 2);
|
rgba16_2 = Sse2.ShiftLeftLogical(rgba16_2, 2);
|
||||||
|
|
@ -149,6 +146,98 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (AdvSimd.Arm64.IsSupported)
|
||||||
|
{
|
||||||
|
Vector128<int> alphaMask = Vector128.Create(0xffu << 24).AsInt32();
|
||||||
|
|
||||||
|
int yStrideGap = yStride - width;
|
||||||
|
int uvStrideGap = uvStride - input.UvWidth;
|
||||||
|
|
||||||
|
int widthTrunc = width & ~0xf;
|
||||||
|
|
||||||
|
fixed (Pixel* dstPtr = output.Data)
|
||||||
|
{
|
||||||
|
Pixel* op = dstPtr;
|
||||||
|
|
||||||
|
fixed (byte* src0Ptr = input.Buffer0, src1Ptr = input.Buffer1)
|
||||||
|
{
|
||||||
|
byte* i0p = src0Ptr;
|
||||||
|
|
||||||
|
for (int y = 0; y < height; y++)
|
||||||
|
{
|
||||||
|
byte* i1p = src1Ptr + (y >> 1) * uvStride;
|
||||||
|
|
||||||
|
int x = 0;
|
||||||
|
|
||||||
|
for (; x < widthTrunc; x += 16, i0p += 16, i1p += 16)
|
||||||
|
{
|
||||||
|
Vector128<byte> ya = AdvSimd.LoadVector128(i0p);
|
||||||
|
Vector128<byte> uv = AdvSimd.LoadVector128(i1p);
|
||||||
|
|
||||||
|
Vector128<short> ya0 = AdvSimd.ZeroExtendWideningLower(ya.GetLower()).AsInt16();
|
||||||
|
Vector128<short> ya1 = AdvSimd.ZeroExtendWideningUpper(ya).AsInt16();
|
||||||
|
|
||||||
|
Vector128<short> uv0 = AdvSimd.Arm64.ZipLow(uv.AsInt16(), uv.AsInt16());
|
||||||
|
Vector128<short> uv1 = AdvSimd.Arm64.ZipHigh(uv.AsInt16(), uv.AsInt16());
|
||||||
|
|
||||||
|
ya0 = AdvSimd.ShiftLeftLogical(ya0, 8);
|
||||||
|
ya1 = AdvSimd.ShiftLeftLogical(ya1, 8);
|
||||||
|
|
||||||
|
Vector128<short> rgba0 = AdvSimd.Arm64.ZipLow(ya0, uv0);
|
||||||
|
Vector128<short> rgba1 = AdvSimd.Arm64.ZipHigh(ya0, uv0);
|
||||||
|
Vector128<short> rgba2 = AdvSimd.Arm64.ZipLow(ya1, uv1);
|
||||||
|
Vector128<short> rgba3 = AdvSimd.Arm64.ZipHigh(ya1, uv1);
|
||||||
|
|
||||||
|
rgba0 = AdvSimd.ShiftRightLogicalAdd(alphaMask, rgba0.AsInt32(), 8).AsInt16();
|
||||||
|
rgba1 = AdvSimd.ShiftRightLogicalAdd(alphaMask, rgba1.AsInt32(), 8).AsInt16();
|
||||||
|
rgba2 = AdvSimd.ShiftRightLogicalAdd(alphaMask, rgba2.AsInt32(), 8).AsInt16();
|
||||||
|
rgba3 = AdvSimd.ShiftRightLogicalAdd(alphaMask, rgba3.AsInt32(), 8).AsInt16();
|
||||||
|
|
||||||
|
Vector128<short> rgba16_0 = AdvSimd.ZeroExtendWideningLower(rgba0.AsByte().GetLower()).AsInt16();
|
||||||
|
Vector128<short> rgba16_1 = AdvSimd.ZeroExtendWideningUpper(rgba0.AsByte()).AsInt16();
|
||||||
|
Vector128<short> rgba16_2 = AdvSimd.ZeroExtendWideningLower(rgba1.AsByte().GetLower()).AsInt16();
|
||||||
|
Vector128<short> rgba16_3 = AdvSimd.ZeroExtendWideningUpper(rgba1.AsByte()).AsInt16();
|
||||||
|
Vector128<short> rgba16_4 = AdvSimd.ZeroExtendWideningLower(rgba2.AsByte().GetLower()).AsInt16();
|
||||||
|
Vector128<short> rgba16_5 = AdvSimd.ZeroExtendWideningUpper(rgba2.AsByte()).AsInt16();
|
||||||
|
Vector128<short> rgba16_6 = AdvSimd.ZeroExtendWideningLower(rgba3.AsByte().GetLower()).AsInt16();
|
||||||
|
Vector128<short> rgba16_7 = AdvSimd.ZeroExtendWideningUpper(rgba3.AsByte()).AsInt16();
|
||||||
|
|
||||||
|
rgba16_0 = AdvSimd.ShiftLeftLogical(rgba16_0, 2);
|
||||||
|
rgba16_1 = AdvSimd.ShiftLeftLogical(rgba16_1, 2);
|
||||||
|
rgba16_2 = AdvSimd.ShiftLeftLogical(rgba16_2, 2);
|
||||||
|
rgba16_3 = AdvSimd.ShiftLeftLogical(rgba16_3, 2);
|
||||||
|
rgba16_4 = AdvSimd.ShiftLeftLogical(rgba16_4, 2);
|
||||||
|
rgba16_5 = AdvSimd.ShiftLeftLogical(rgba16_5, 2);
|
||||||
|
rgba16_6 = AdvSimd.ShiftLeftLogical(rgba16_6, 2);
|
||||||
|
rgba16_7 = AdvSimd.ShiftLeftLogical(rgba16_7, 2);
|
||||||
|
|
||||||
|
AdvSimd.Store((short*)(op + (uint)x + 0), rgba16_0);
|
||||||
|
AdvSimd.Store((short*)(op + (uint)x + 2), rgba16_1);
|
||||||
|
AdvSimd.Store((short*)(op + (uint)x + 4), rgba16_2);
|
||||||
|
AdvSimd.Store((short*)(op + (uint)x + 6), rgba16_3);
|
||||||
|
AdvSimd.Store((short*)(op + (uint)x + 8), rgba16_4);
|
||||||
|
AdvSimd.Store((short*)(op + (uint)x + 10), rgba16_5);
|
||||||
|
AdvSimd.Store((short*)(op + (uint)x + 12), rgba16_6);
|
||||||
|
AdvSimd.Store((short*)(op + (uint)x + 14), rgba16_7);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (; x < width; x++, i1p += (x & 1) * 2)
|
||||||
|
{
|
||||||
|
Pixel* px = op + (uint)x;
|
||||||
|
|
||||||
|
px->R = Upsample(*i0p++);
|
||||||
|
px->G = Upsample(*i1p);
|
||||||
|
px->B = Upsample(*(i1p + 1));
|
||||||
|
px->A = 0x3ff;
|
||||||
|
}
|
||||||
|
|
||||||
|
op += width;
|
||||||
|
i0p += yStrideGap;
|
||||||
|
i1p += uvStrideGap;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
for (int y = 0; y < height; y++)
|
for (int y = 0; y < height; y++)
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ using Ryujinx.Graphics.Texture;
|
||||||
using Ryujinx.Graphics.Vic.Types;
|
using Ryujinx.Graphics.Vic.Types;
|
||||||
using System;
|
using System;
|
||||||
using System.Runtime.Intrinsics;
|
using System.Runtime.Intrinsics;
|
||||||
|
using System.Runtime.Intrinsics.Arm;
|
||||||
using System.Runtime.Intrinsics.X86;
|
using System.Runtime.Intrinsics.X86;
|
||||||
using static Ryujinx.Graphics.Vic.Image.SurfaceCommon;
|
using static Ryujinx.Graphics.Vic.Image.SurfaceCommon;
|
||||||
|
|
||||||
|
|
@ -93,6 +94,64 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (AdvSimd.IsSupported)
|
||||||
|
{
|
||||||
|
int widthTrunc = width & ~7;
|
||||||
|
int strideGap = stride - width * 4;
|
||||||
|
|
||||||
|
fixed (Pixel* srcPtr = input.Data)
|
||||||
|
{
|
||||||
|
Pixel* ip = srcPtr;
|
||||||
|
|
||||||
|
fixed (byte* dstPtr = dst)
|
||||||
|
{
|
||||||
|
byte* op = dstPtr;
|
||||||
|
|
||||||
|
for (int y = 0; y < height; y++, ip += input.Width)
|
||||||
|
{
|
||||||
|
int x = 0;
|
||||||
|
|
||||||
|
for (; x < widthTrunc; x += 8)
|
||||||
|
{
|
||||||
|
Vector128<ushort> pixel12 = AdvSimd.LoadVector128((ushort*)(ip + (uint)x));
|
||||||
|
Vector128<ushort> pixel34 = AdvSimd.LoadVector128((ushort*)(ip + (uint)x + 2));
|
||||||
|
Vector128<ushort> pixel56 = AdvSimd.LoadVector128((ushort*)(ip + (uint)x + 4));
|
||||||
|
Vector128<ushort> pixel78 = AdvSimd.LoadVector128((ushort*)(ip + (uint)x + 6));
|
||||||
|
|
||||||
|
pixel12 = AdvSimd.ShiftRightLogical(pixel12, 2);
|
||||||
|
pixel34 = AdvSimd.ShiftRightLogical(pixel34, 2);
|
||||||
|
pixel56 = AdvSimd.ShiftRightLogical(pixel56, 2);
|
||||||
|
pixel78 = AdvSimd.ShiftRightLogical(pixel78, 2);
|
||||||
|
|
||||||
|
Vector64<byte> lower12 = AdvSimd.ExtractNarrowingLower(pixel12.AsUInt16());
|
||||||
|
Vector64<byte> lower56 = AdvSimd.ExtractNarrowingLower(pixel56.AsUInt16());
|
||||||
|
|
||||||
|
Vector128<byte> pixel1234 = AdvSimd.ExtractNarrowingUpper(lower12, pixel34.AsUInt16());
|
||||||
|
Vector128<byte> pixel5678 = AdvSimd.ExtractNarrowingUpper(lower56, pixel78.AsUInt16());
|
||||||
|
|
||||||
|
AdvSimd.Store(op + 0x00, pixel1234);
|
||||||
|
AdvSimd.Store(op + 0x10, pixel5678);
|
||||||
|
|
||||||
|
op += 0x20;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (; x < width; x++)
|
||||||
|
{
|
||||||
|
Pixel* px = ip + (uint)x;
|
||||||
|
|
||||||
|
*(op + 0) = Downsample(px->R);
|
||||||
|
*(op + 1) = Downsample(px->G);
|
||||||
|
*(op + 2) = Downsample(px->B);
|
||||||
|
*(op + 3) = Downsample(px->A);
|
||||||
|
|
||||||
|
op += 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
op += strideGap;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
for (int y = 0; y < height; y++)
|
for (int y = 0; y < height; y++)
|
||||||
|
|
@ -302,6 +361,87 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (AdvSimd.IsSupported)
|
||||||
|
{
|
||||||
|
Vector128<ushort> mask = Vector128.Create(0xffffUL).AsUInt16();
|
||||||
|
|
||||||
|
int widthTrunc = width & ~0xf;
|
||||||
|
int strideGap = yStride - width;
|
||||||
|
|
||||||
|
fixed (Pixel* srcPtr = input.Data)
|
||||||
|
{
|
||||||
|
Pixel* ip = srcPtr;
|
||||||
|
|
||||||
|
fixed (byte* dstPtr = dstY)
|
||||||
|
{
|
||||||
|
byte* op = dstPtr;
|
||||||
|
|
||||||
|
for (int y = 0; y < height; y++, ip += input.Width)
|
||||||
|
{
|
||||||
|
int x = 0;
|
||||||
|
|
||||||
|
for (; x < widthTrunc; x += 16)
|
||||||
|
{
|
||||||
|
byte* baseOffset = (byte*)(ip + (ulong)(uint)x);
|
||||||
|
|
||||||
|
Vector128<ushort> pixelp1 = AdvSimd.LoadVector128((ushort*)baseOffset);
|
||||||
|
Vector128<ushort> pixelp2 = AdvSimd.LoadVector128((ushort*)(baseOffset + 0x10));
|
||||||
|
Vector128<ushort> pixelp3 = AdvSimd.LoadVector128((ushort*)(baseOffset + 0x20));
|
||||||
|
Vector128<ushort> pixelp4 = AdvSimd.LoadVector128((ushort*)(baseOffset + 0x30));
|
||||||
|
Vector128<ushort> pixelp5 = AdvSimd.LoadVector128((ushort*)(baseOffset + 0x40));
|
||||||
|
Vector128<ushort> pixelp6 = AdvSimd.LoadVector128((ushort*)(baseOffset + 0x50));
|
||||||
|
Vector128<ushort> pixelp7 = AdvSimd.LoadVector128((ushort*)(baseOffset + 0x60));
|
||||||
|
Vector128<ushort> pixelp8 = AdvSimd.LoadVector128((ushort*)(baseOffset + 0x70));
|
||||||
|
|
||||||
|
pixelp1 = AdvSimd.And(pixelp1, mask);
|
||||||
|
pixelp2 = AdvSimd.And(pixelp2, mask);
|
||||||
|
pixelp3 = AdvSimd.And(pixelp3, mask);
|
||||||
|
pixelp4 = AdvSimd.And(pixelp4, mask);
|
||||||
|
pixelp5 = AdvSimd.And(pixelp5, mask);
|
||||||
|
pixelp6 = AdvSimd.And(pixelp6, mask);
|
||||||
|
pixelp7 = AdvSimd.And(pixelp7, mask);
|
||||||
|
pixelp8 = AdvSimd.And(pixelp8, mask);
|
||||||
|
|
||||||
|
Vector64<ushort> lowerp1 = AdvSimd.ExtractNarrowingLower(pixelp1.AsUInt32());
|
||||||
|
Vector64<ushort> lowerp3 = AdvSimd.ExtractNarrowingLower(pixelp3.AsUInt32());
|
||||||
|
Vector64<ushort> lowerp5 = AdvSimd.ExtractNarrowingLower(pixelp5.AsUInt32());
|
||||||
|
Vector64<ushort> lowerp7 = AdvSimd.ExtractNarrowingLower(pixelp7.AsUInt32());
|
||||||
|
|
||||||
|
Vector128<ushort> pixelq1 = AdvSimd.ExtractNarrowingUpper(lowerp1, pixelp2.AsUInt32());
|
||||||
|
Vector128<ushort> pixelq2 = AdvSimd.ExtractNarrowingUpper(lowerp3, pixelp4.AsUInt32());
|
||||||
|
Vector128<ushort> pixelq3 = AdvSimd.ExtractNarrowingUpper(lowerp5, pixelp6.AsUInt32());
|
||||||
|
Vector128<ushort> pixelq4 = AdvSimd.ExtractNarrowingUpper(lowerp7, pixelp8.AsUInt32());
|
||||||
|
|
||||||
|
Vector64<ushort> lowerq1 = AdvSimd.ExtractNarrowingLower(pixelq1.AsUInt32());
|
||||||
|
Vector64<ushort> lowerq3 = AdvSimd.ExtractNarrowingLower(pixelq3.AsUInt32());
|
||||||
|
|
||||||
|
pixelq1 = AdvSimd.ExtractNarrowingUpper(lowerq1, pixelq2.AsUInt32());
|
||||||
|
pixelq2 = AdvSimd.ExtractNarrowingUpper(lowerq3, pixelq4.AsUInt32());
|
||||||
|
|
||||||
|
pixelq1 = AdvSimd.ShiftRightLogical(pixelq1, 2);
|
||||||
|
pixelq2 = AdvSimd.ShiftRightLogical(pixelq2, 2);
|
||||||
|
|
||||||
|
Vector64<byte> pixelLower = AdvSimd.ExtractNarrowingLower(pixelq1.AsUInt16());
|
||||||
|
|
||||||
|
Vector128<byte> pixel = AdvSimd.ExtractNarrowingUpper(pixelLower, pixelq2.AsUInt16());
|
||||||
|
|
||||||
|
AdvSimd.Store(op, pixel);
|
||||||
|
|
||||||
|
op += 0x10;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (; x < width; x++)
|
||||||
|
{
|
||||||
|
Pixel* px = ip + (uint)x;
|
||||||
|
|
||||||
|
*op++ = Downsample(px->R);
|
||||||
|
}
|
||||||
|
|
||||||
|
op += strideGap;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
for (int y = 0; y < height; y++)
|
for (int y = 0; y < height; y++)
|
||||||
|
|
@ -392,6 +532,69 @@ namespace Ryujinx.Graphics.Vic.Image
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (AdvSimd.Arm64.IsSupported)
|
||||||
|
{
|
||||||
|
int widthTrunc = uvWidth & ~7;
|
||||||
|
int strideGap = uvStride - uvWidth * 2;
|
||||||
|
|
||||||
|
fixed (Pixel* srcPtr = input.Data)
|
||||||
|
{
|
||||||
|
Pixel* ip = srcPtr;
|
||||||
|
|
||||||
|
fixed (byte* dstPtr = dstUv)
|
||||||
|
{
|
||||||
|
byte* op = dstPtr;
|
||||||
|
|
||||||
|
for (int y = 0; y < uvHeight; y++, ip += input.Width * 2)
|
||||||
|
{
|
||||||
|
int x = 0;
|
||||||
|
|
||||||
|
for (; x < widthTrunc; x += 8)
|
||||||
|
{
|
||||||
|
byte* baseOffset = (byte*)ip + (ulong)(uint)x * 16;
|
||||||
|
|
||||||
|
Vector128<uint> pixel1 = AdvSimd.LoadAndReplicateToVector128((uint*)(baseOffset + 0x02));
|
||||||
|
Vector128<uint> pixel2 = AdvSimd.LoadAndReplicateToVector128((uint*)(baseOffset + 0x12));
|
||||||
|
Vector128<uint> pixel3 = AdvSimd.LoadAndReplicateToVector128((uint*)(baseOffset + 0x22));
|
||||||
|
Vector128<uint> pixel4 = AdvSimd.LoadAndReplicateToVector128((uint*)(baseOffset + 0x32));
|
||||||
|
Vector128<uint> pixel5 = AdvSimd.LoadAndReplicateToVector128((uint*)(baseOffset + 0x42));
|
||||||
|
Vector128<uint> pixel6 = AdvSimd.LoadAndReplicateToVector128((uint*)(baseOffset + 0x52));
|
||||||
|
Vector128<uint> pixel7 = AdvSimd.LoadAndReplicateToVector128((uint*)(baseOffset + 0x62));
|
||||||
|
Vector128<uint> pixel8 = AdvSimd.LoadAndReplicateToVector128((uint*)(baseOffset + 0x72));
|
||||||
|
|
||||||
|
Vector128<uint> pixel12 = AdvSimd.Arm64.ZipLow(pixel1, pixel2);
|
||||||
|
Vector128<uint> pixel34 = AdvSimd.Arm64.ZipLow(pixel3, pixel4);
|
||||||
|
Vector128<uint> pixel56 = AdvSimd.Arm64.ZipLow(pixel5, pixel6);
|
||||||
|
Vector128<uint> pixel78 = AdvSimd.Arm64.ZipLow(pixel7, pixel8);
|
||||||
|
|
||||||
|
Vector128<ulong> pixel1234 = AdvSimd.Arm64.ZipLow(pixel12.AsUInt64(), pixel34.AsUInt64());
|
||||||
|
Vector128<ulong> pixel5678 = AdvSimd.Arm64.ZipLow(pixel56.AsUInt64(), pixel78.AsUInt64());
|
||||||
|
|
||||||
|
pixel1234 = AdvSimd.ShiftRightLogical(pixel1234, 2);
|
||||||
|
pixel5678 = AdvSimd.ShiftRightLogical(pixel5678, 2);
|
||||||
|
|
||||||
|
Vector64<byte> pixelLower = AdvSimd.ExtractNarrowingLower(pixel1234.AsUInt16());
|
||||||
|
|
||||||
|
Vector128<byte> pixel = AdvSimd.ExtractNarrowingUpper(pixelLower, pixel5678.AsUInt16());
|
||||||
|
|
||||||
|
AdvSimd.Store(op, pixel);
|
||||||
|
|
||||||
|
op += 0x10;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (; x < uvWidth; x++)
|
||||||
|
{
|
||||||
|
Pixel* px = ip + (uint)(x << 1);
|
||||||
|
|
||||||
|
*op++ = Downsample(px->G);
|
||||||
|
*op++ = Downsample(px->B);
|
||||||
|
}
|
||||||
|
|
||||||
|
op += strideGap;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
for (int y = 0; y < uvHeight; y++)
|
for (int y = 0; y < uvHeight; y++)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue