mirror of https://github.com/SixLabors/ImageSharp
James Jackson-South
3 years ago
98 changed files with 185 additions and 776 deletions
@ -1 +1 @@ |
|||||
Subproject commit 353b9afe32a8000410312d17263407cd7bb82d19 |
Subproject commit 1c526a97eea8bcbc7c79de095676f7fb975a9fb1 |
||||
@ -1,69 +0,0 @@ |
|||||
// Copyright (c) Six Labors.
|
|
||||
// Licensed under the Six Labors Split License.
|
|
||||
|
|
||||
namespace SixLabors.ImageSharp.Compression.Zlib; |
|
||||
|
|
||||
/// <content>
|
|
||||
/// Contains precalulated tables for scalar calculations.
|
|
||||
/// </content>
|
|
||||
internal static partial class Crc32 |
|
||||
{ |
|
||||
/// <summary>
|
|
||||
/// The table of all possible eight bit values for fast scalar lookup.
|
|
||||
/// </summary>
|
|
||||
private static readonly uint[] CrcTable = |
|
||||
{ |
|
||||
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, |
|
||||
0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, |
|
||||
0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, |
|
||||
0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, |
|
||||
0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, |
|
||||
0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, |
|
||||
0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, |
|
||||
0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, |
|
||||
0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, |
|
||||
0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, |
|
||||
0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, |
|
||||
0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, |
|
||||
0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, |
|
||||
0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, |
|
||||
0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, |
|
||||
0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, |
|
||||
0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, |
|
||||
0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, |
|
||||
0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, |
|
||||
0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, |
|
||||
0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, |
|
||||
0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, |
|
||||
0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, |
|
||||
0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, |
|
||||
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, |
|
||||
0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, |
|
||||
0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, |
|
||||
0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, |
|
||||
0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, |
|
||||
0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, |
|
||||
0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, |
|
||||
0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, |
|
||||
0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, |
|
||||
0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, |
|
||||
0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, |
|
||||
0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, |
|
||||
0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, |
|
||||
0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, |
|
||||
0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, |
|
||||
0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, |
|
||||
0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, |
|
||||
0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, |
|
||||
0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, |
|
||||
0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, |
|
||||
0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, |
|
||||
0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, |
|
||||
0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, |
|
||||
0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, |
|
||||
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, |
|
||||
0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, |
|
||||
0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, |
|
||||
0x2D02EF8D |
|
||||
}; |
|
||||
} |
|
||||
@ -1,308 +0,0 @@ |
|||||
// Copyright (c) Six Labors.
|
|
||||
// Licensed under the Six Labors Split License.
|
|
||||
|
|
||||
using System.Runtime.CompilerServices; |
|
||||
using System.Runtime.InteropServices; |
|
||||
using System.Runtime.Intrinsics; |
|
||||
using System.Runtime.Intrinsics.X86; |
|
||||
using ArmCrc32 = System.Runtime.Intrinsics.Arm.Crc32; |
|
||||
|
|
||||
namespace SixLabors.ImageSharp.Compression.Zlib; |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Calculates the 32 bit Cyclic Redundancy Check (CRC) checksum of a given buffer
|
|
||||
/// according to the IEEE 802.3 specification.
|
|
||||
/// </summary>
|
|
||||
internal static partial class Crc32 |
|
||||
{ |
|
||||
/// <summary>
|
|
||||
/// The default initial seed value of a Crc32 checksum calculation.
|
|
||||
/// </summary>
|
|
||||
public const uint SeedValue = 0U; |
|
||||
|
|
||||
private const int MinBufferSize = 64; |
|
||||
private const int ChunksizeMask = 15; |
|
||||
|
|
||||
// Definitions of the bit-reflected domain constants k1, k2, k3, etc and
|
|
||||
// the CRC32+Barrett polynomials given at the end of the paper.
|
|
||||
private static readonly ulong[] K05Poly = |
|
||||
{ |
|
||||
0x0154442bd4, 0x01c6e41596, // k1, k2
|
|
||||
0x01751997d0, 0x00ccaa009e, // k3, k4
|
|
||||
0x0163cd6124, 0x0000000000, // k5, k0
|
|
||||
0x01db710641, 0x01f7011641 // polynomial
|
|
||||
}; |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Calculates the CRC checksum with the bytes taken from the span.
|
|
||||
/// </summary>
|
|
||||
/// <param name="buffer">The readonly span of bytes.</param>
|
|
||||
/// <returns>The <see cref="uint"/>.</returns>
|
|
||||
[MethodImpl(InliningOptions.ShortMethod)] |
|
||||
public static uint Calculate(ReadOnlySpan<byte> buffer) |
|
||||
=> Calculate(SeedValue, buffer); |
|
||||
|
|
||||
/// <summary>
|
|
||||
/// Calculates the CRC checksum with the bytes taken from the span and seed.
|
|
||||
/// </summary>
|
|
||||
/// <param name="crc">The input CRC value.</param>
|
|
||||
/// <param name="buffer">The readonly span of bytes.</param>
|
|
||||
/// <returns>The <see cref="uint"/>.</returns>
|
|
||||
[MethodImpl(InliningOptions.ShortMethod)] |
|
||||
public static uint Calculate(uint crc, ReadOnlySpan<byte> buffer) |
|
||||
{ |
|
||||
if (buffer.IsEmpty) |
|
||||
{ |
|
||||
return crc; |
|
||||
} |
|
||||
|
|
||||
if (Sse41.IsSupported && Pclmulqdq.IsSupported && buffer.Length >= MinBufferSize) |
|
||||
{ |
|
||||
return ~CalculateSse(~crc, buffer); |
|
||||
} |
|
||||
|
|
||||
if (ArmCrc32.Arm64.IsSupported) |
|
||||
{ |
|
||||
return ~CalculateArm64(~crc, buffer); |
|
||||
} |
|
||||
|
|
||||
if (ArmCrc32.IsSupported) |
|
||||
{ |
|
||||
return ~CalculateArm(~crc, buffer); |
|
||||
} |
|
||||
|
|
||||
return ~CalculateScalar(~crc, buffer); |
|
||||
} |
|
||||
|
|
||||
// Based on https://github.com/chromium/chromium/blob/master/third_party/zlib/crc32_simd.c
|
|
||||
[MethodImpl(InliningOptions.HotPath | InliningOptions.ShortMethod)] |
|
||||
private static unsafe uint CalculateSse(uint crc, ReadOnlySpan<byte> buffer) |
|
||||
{ |
|
||||
int chunksize = buffer.Length & ~ChunksizeMask; |
|
||||
int length = chunksize; |
|
||||
|
|
||||
fixed (byte* bufferPtr = buffer) |
|
||||
{ |
|
||||
fixed (ulong* k05PolyPtr = K05Poly) |
|
||||
{ |
|
||||
byte* localBufferPtr = bufferPtr; |
|
||||
ulong* localK05PolyPtr = k05PolyPtr; |
|
||||
|
|
||||
// There's at least one block of 64.
|
|
||||
Vector128<ulong> x1 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x00)); |
|
||||
Vector128<ulong> x2 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x10)); |
|
||||
Vector128<ulong> x3 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x20)); |
|
||||
Vector128<ulong> x4 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x30)); |
|
||||
Vector128<ulong> x5; |
|
||||
|
|
||||
x1 = Sse2.Xor(x1, Sse2.ConvertScalarToVector128UInt32(crc).AsUInt64()); |
|
||||
|
|
||||
// k1, k2
|
|
||||
Vector128<ulong> x0 = Sse2.LoadVector128(localK05PolyPtr + 0x0); |
|
||||
|
|
||||
localBufferPtr += 64; |
|
||||
length -= 64; |
|
||||
|
|
||||
// Parallel fold blocks of 64, if any.
|
|
||||
while (length >= 64) |
|
||||
{ |
|
||||
x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00); |
|
||||
Vector128<ulong> x6 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x00); |
|
||||
Vector128<ulong> x7 = Pclmulqdq.CarrylessMultiply(x3, x0, 0x00); |
|
||||
Vector128<ulong> x8 = Pclmulqdq.CarrylessMultiply(x4, x0, 0x00); |
|
||||
|
|
||||
x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11); |
|
||||
x2 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x11); |
|
||||
x3 = Pclmulqdq.CarrylessMultiply(x3, x0, 0x11); |
|
||||
x4 = Pclmulqdq.CarrylessMultiply(x4, x0, 0x11); |
|
||||
|
|
||||
Vector128<ulong> y5 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x00)); |
|
||||
Vector128<ulong> y6 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x10)); |
|
||||
Vector128<ulong> y7 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x20)); |
|
||||
Vector128<ulong> y8 = Sse2.LoadVector128((ulong*)(localBufferPtr + 0x30)); |
|
||||
|
|
||||
x1 = Sse2.Xor(x1, x5); |
|
||||
x2 = Sse2.Xor(x2, x6); |
|
||||
x3 = Sse2.Xor(x3, x7); |
|
||||
x4 = Sse2.Xor(x4, x8); |
|
||||
|
|
||||
x1 = Sse2.Xor(x1, y5); |
|
||||
x2 = Sse2.Xor(x2, y6); |
|
||||
x3 = Sse2.Xor(x3, y7); |
|
||||
x4 = Sse2.Xor(x4, y8); |
|
||||
|
|
||||
localBufferPtr += 64; |
|
||||
length -= 64; |
|
||||
} |
|
||||
|
|
||||
// Fold into 128-bits.
|
|
||||
// k3, k4
|
|
||||
x0 = Sse2.LoadVector128(k05PolyPtr + 0x2); |
|
||||
|
|
||||
x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00); |
|
||||
x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11); |
|
||||
x1 = Sse2.Xor(x1, x2); |
|
||||
x1 = Sse2.Xor(x1, x5); |
|
||||
|
|
||||
x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00); |
|
||||
x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11); |
|
||||
x1 = Sse2.Xor(x1, x3); |
|
||||
x1 = Sse2.Xor(x1, x5); |
|
||||
|
|
||||
x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00); |
|
||||
x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11); |
|
||||
x1 = Sse2.Xor(x1, x4); |
|
||||
x1 = Sse2.Xor(x1, x5); |
|
||||
|
|
||||
// Single fold blocks of 16, if any.
|
|
||||
while (length >= 16) |
|
||||
{ |
|
||||
x2 = Sse2.LoadVector128((ulong*)localBufferPtr); |
|
||||
|
|
||||
x5 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00); |
|
||||
x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x11); |
|
||||
x1 = Sse2.Xor(x1, x2); |
|
||||
x1 = Sse2.Xor(x1, x5); |
|
||||
|
|
||||
localBufferPtr += 16; |
|
||||
length -= 16; |
|
||||
} |
|
||||
|
|
||||
// Fold 128 - bits to 64 - bits.
|
|
||||
x2 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x10); |
|
||||
x3 = Vector128.Create(~0, 0, ~0, 0).AsUInt64(); // _mm_setr_epi32 on x86
|
|
||||
x1 = Sse2.ShiftRightLogical128BitLane(x1, 8); |
|
||||
x1 = Sse2.Xor(x1, x2); |
|
||||
|
|
||||
// k5, k0
|
|
||||
x0 = Sse2.LoadScalarVector128(localK05PolyPtr + 0x4); |
|
||||
|
|
||||
x2 = Sse2.ShiftRightLogical128BitLane(x1, 4); |
|
||||
x1 = Sse2.And(x1, x3); |
|
||||
x1 = Pclmulqdq.CarrylessMultiply(x1, x0, 0x00); |
|
||||
x1 = Sse2.Xor(x1, x2); |
|
||||
|
|
||||
// Barret reduce to 32-bits.
|
|
||||
// polynomial
|
|
||||
x0 = Sse2.LoadVector128(localK05PolyPtr + 0x6); |
|
||||
|
|
||||
x2 = Sse2.And(x1, x3); |
|
||||
x2 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x10); |
|
||||
x2 = Sse2.And(x2, x3); |
|
||||
x2 = Pclmulqdq.CarrylessMultiply(x2, x0, 0x00); |
|
||||
x1 = Sse2.Xor(x1, x2); |
|
||||
|
|
||||
crc = (uint)Sse41.Extract(x1.AsInt32(), 1); |
|
||||
return buffer.Length - chunksize == 0 ? crc : CalculateScalar(crc, buffer[chunksize..]); |
|
||||
} |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
[MethodImpl(InliningOptions.HotPath | InliningOptions.ShortMethod)] |
|
||||
private static unsafe uint CalculateArm(uint crc, ReadOnlySpan<byte> buffer) |
|
||||
{ |
|
||||
fixed (byte* bufferPtr = buffer) |
|
||||
{ |
|
||||
byte* localBufferPtr = bufferPtr; |
|
||||
int len = buffer.Length; |
|
||||
|
|
||||
while (len > 0 && ((ulong)localBufferPtr & 3) != 0) |
|
||||
{ |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *localBufferPtr++); |
|
||||
len--; |
|
||||
} |
|
||||
|
|
||||
uint* intBufferPtr = (uint*)localBufferPtr; |
|
||||
|
|
||||
while (len >= 8 * sizeof(uint)) |
|
||||
{ |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *intBufferPtr++); |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *intBufferPtr++); |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *intBufferPtr++); |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *intBufferPtr++); |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *intBufferPtr++); |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *intBufferPtr++); |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *intBufferPtr++); |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *intBufferPtr++); |
|
||||
len -= 8 * sizeof(uint); |
|
||||
} |
|
||||
|
|
||||
while (len >= sizeof(uint)) |
|
||||
{ |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *intBufferPtr++); |
|
||||
len -= sizeof(uint); |
|
||||
} |
|
||||
|
|
||||
localBufferPtr = (byte*)intBufferPtr; |
|
||||
|
|
||||
while (len > 0) |
|
||||
{ |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *localBufferPtr++); |
|
||||
len--; |
|
||||
} |
|
||||
|
|
||||
return crc; |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
[MethodImpl(InliningOptions.HotPath | InliningOptions.ShortMethod)] |
|
||||
private static unsafe uint CalculateArm64(uint crc, ReadOnlySpan<byte> buffer) |
|
||||
{ |
|
||||
fixed (byte* bufferPtr = buffer) |
|
||||
{ |
|
||||
byte* localBufferPtr = bufferPtr; |
|
||||
int len = buffer.Length; |
|
||||
|
|
||||
while (len > 0 && ((ulong)localBufferPtr & 7) != 0) |
|
||||
{ |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *localBufferPtr++); |
|
||||
len--; |
|
||||
} |
|
||||
|
|
||||
ulong* longBufferPtr = (ulong*)localBufferPtr; |
|
||||
|
|
||||
while (len >= 8 * sizeof(ulong)) |
|
||||
{ |
|
||||
crc = ArmCrc32.Arm64.ComputeCrc32(crc, *longBufferPtr++); |
|
||||
crc = ArmCrc32.Arm64.ComputeCrc32(crc, *longBufferPtr++); |
|
||||
crc = ArmCrc32.Arm64.ComputeCrc32(crc, *longBufferPtr++); |
|
||||
crc = ArmCrc32.Arm64.ComputeCrc32(crc, *longBufferPtr++); |
|
||||
crc = ArmCrc32.Arm64.ComputeCrc32(crc, *longBufferPtr++); |
|
||||
crc = ArmCrc32.Arm64.ComputeCrc32(crc, *longBufferPtr++); |
|
||||
crc = ArmCrc32.Arm64.ComputeCrc32(crc, *longBufferPtr++); |
|
||||
crc = ArmCrc32.Arm64.ComputeCrc32(crc, *longBufferPtr++); |
|
||||
len -= 8 * sizeof(ulong); |
|
||||
} |
|
||||
|
|
||||
while (len >= sizeof(ulong)) |
|
||||
{ |
|
||||
crc = ArmCrc32.Arm64.ComputeCrc32(crc, *longBufferPtr++); |
|
||||
len -= sizeof(ulong); |
|
||||
} |
|
||||
|
|
||||
localBufferPtr = (byte*)longBufferPtr; |
|
||||
|
|
||||
while (len > 0) |
|
||||
{ |
|
||||
crc = ArmCrc32.ComputeCrc32(crc, *localBufferPtr++); |
|
||||
len--; |
|
||||
} |
|
||||
|
|
||||
return crc; |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
[MethodImpl(InliningOptions.HotPath | InliningOptions.ShortMethod)] |
|
||||
private static uint CalculateScalar(uint crc, ReadOnlySpan<byte> buffer) |
|
||||
{ |
|
||||
ref uint crcTableRef = ref MemoryMarshal.GetReference(CrcTable.AsSpan()); |
|
||||
ref byte bufferRef = ref MemoryMarshal.GetReference(buffer); |
|
||||
|
|
||||
for (int i = 0; i < buffer.Length; i++) |
|
||||
{ |
|
||||
crc = Unsafe.Add(ref crcTableRef, (crc ^ Unsafe.Add(ref bufferRef, i)) & 0xFF) ^ (crc >> 8); |
|
||||
} |
|
||||
|
|
||||
return crc; |
|
||||
} |
|
||||
} |
|
||||
Binary file not shown.
@ -1,42 +0,0 @@ |
|||||
// Copyright (c) Six Labors.
|
|
||||
// Licensed under the Six Labors Split License.
|
|
||||
#if NET6_0
|
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
|
||||
namespace System.Diagnostics.CodeAnalysis |
|
||||
{ |
|
||||
/// <summary>
|
|
||||
/// Used to indicate a byref escapes and is not scoped.
|
|
||||
/// </summary>
|
|
||||
/// <remarks>
|
|
||||
/// <para>
|
|
||||
/// There are several cases where the C# compiler treats a <see langword="ref"/> as implicitly
|
|
||||
/// <see langword="scoped"/> - where the compiler does not allow the <see langword="ref"/> to escape the method.
|
|
||||
/// </para>
|
|
||||
/// <para>
|
|
||||
/// For example:
|
|
||||
/// <list type="number">
|
|
||||
/// <item><see langword="this"/> for <see langword="struct"/> instance methods.</item>
|
|
||||
/// <item><see langword="ref"/> parameters that refer to <see langword="ref"/> <see langword="struct"/> types.</item>
|
|
||||
/// <item><see langword="out"/> parameters.</item>
|
|
||||
/// </list>
|
|
||||
/// </para>
|
|
||||
/// <para>
|
|
||||
/// This attribute is used in those instances where the <see langword="ref"/> should be allowed to escape.
|
|
||||
/// </para>
|
|
||||
/// <para>
|
|
||||
/// Applying this attribute, in any form, has impact on consumers of the applicable API. It is necessary for
|
|
||||
/// API authors to understand the lifetime implications of applying this attribute and how it may impact their users.
|
|
||||
/// </para>
|
|
||||
/// </remarks>
|
|
||||
[global::System.AttributeUsage( |
|
||||
global::System.AttributeTargets.Method | |
|
||||
global::System.AttributeTargets.Property | |
|
||||
global::System.AttributeTargets.Parameter, |
|
||||
AllowMultiple = false, |
|
||||
Inherited = false)] |
|
||||
internal sealed class UnscopedRefAttribute : global::System.Attribute |
|
||||
{ |
|
||||
} |
|
||||
} |
|
||||
#endif
|
|
||||
@ -1,70 +0,0 @@ |
|||||
// Copyright (c) Six Labors.
|
|
||||
// Licensed under the Six Labors Split License.
|
|
||||
|
|
||||
using BenchmarkDotNet.Attributes; |
|
||||
using SixLabors.ImageSharp.Compression.Zlib; |
|
||||
using SharpCrc32 = ICSharpCode.SharpZipLib.Checksum.Crc32; |
|
||||
|
|
||||
namespace SixLabors.ImageSharp.Benchmarks.General; |
|
||||
|
|
||||
[Config(typeof(Config.ShortMultiFramework))] |
|
||||
public class Crc32Benchmark |
|
||||
{ |
|
||||
private byte[] data; |
|
||||
private readonly SharpCrc32 crc = new SharpCrc32(); |
|
||||
|
|
||||
[Params(1024, 2048, 4096)] |
|
||||
public int Count { get; set; } |
|
||||
|
|
||||
[GlobalSetup] |
|
||||
public void SetUp() |
|
||||
{ |
|
||||
this.data = new byte[this.Count]; |
|
||||
new Random(1).NextBytes(this.data); |
|
||||
} |
|
||||
|
|
||||
[Benchmark(Baseline = true)] |
|
||||
public long SharpZipLibCalculate() |
|
||||
{ |
|
||||
this.crc.Reset(); |
|
||||
this.crc.Update(this.data); |
|
||||
return this.crc.Value; |
|
||||
} |
|
||||
|
|
||||
[Benchmark] |
|
||||
public long SixLaborsCalculate() |
|
||||
{ |
|
||||
return Crc32.Calculate(this.data); |
|
||||
} |
|
||||
} |
|
||||
|
|
||||
// ########## 17/05/2020 ##########
|
|
||||
//
|
|
||||
// | Method | Runtime | Count | Mean | Error | StdDev | Ratio | RatioSD | Gen 0 | Gen 1 | Gen 2 | Allocated |
|
|
||||
// |--------------------- |-------------- |------ |-------------:|-------------:|-----------:|------:|--------:|------:|------:|------:|----------:|
|
|
||||
// | SharpZipLibCalculate | .NET 4.7.2 | 1024 | 2,797.77 ns | 278.697 ns | 15.276 ns | 1.00 | 0.00 | - | - | - | - |
|
|
||||
// | SixLaborsCalculate | .NET 4.7.2 | 1024 | 2,275.56 ns | 216.100 ns | 11.845 ns | 0.81 | 0.01 | - | - | - | - |
|
|
||||
// | | | | | | | | | | | | |
|
|
||||
// | SharpZipLibCalculate | .NET Core 2.1 | 1024 | 2,923.43 ns | 2,656.882 ns | 145.633 ns | 1.00 | 0.00 | - | - | - | - |
|
|
||||
// | SixLaborsCalculate | .NET Core 2.1 | 1024 | 2,257.79 ns | 75.081 ns | 4.115 ns | 0.77 | 0.04 | - | - | - | - |
|
|
||||
// | | | | | | | | | | | | |
|
|
||||
// | SharpZipLibCalculate | .NET Core 3.1 | 1024 | 2,764.14 ns | 86.281 ns | 4.729 ns | 1.00 | 0.00 | - | - | - | - |
|
|
||||
// | SixLaborsCalculate | .NET Core 3.1 | 1024 | 49.32 ns | 1.813 ns | 0.099 ns | 0.02 | 0.00 | - | - | - | - |
|
|
||||
// | | | | | | | | | | | | |
|
|
||||
// | SharpZipLibCalculate | .NET 4.7.2 | 2048 | 5,603.71 ns | 427.240 ns | 23.418 ns | 1.00 | 0.00 | - | - | - | - |
|
|
||||
// | SixLaborsCalculate | .NET 4.7.2 | 2048 | 4,525.02 ns | 33.931 ns | 1.860 ns | 0.81 | 0.00 | - | - | - | - |
|
|
||||
// | | | | | | | | | | | | |
|
|
||||
// | SharpZipLibCalculate | .NET Core 2.1 | 2048 | 5,563.32 ns | 49.337 ns | 2.704 ns | 1.00 | 0.00 | - | - | - | - |
|
|
||||
// | SixLaborsCalculate | .NET Core 2.1 | 2048 | 4,519.61 ns | 29.837 ns | 1.635 ns | 0.81 | 0.00 | - | - | - | - |
|
|
||||
// | | | | | | | | | | | | |
|
|
||||
// | SharpZipLibCalculate | .NET Core 3.1 | 2048 | 5,543.37 ns | 518.551 ns | 28.424 ns | 1.00 | 0.00 | - | - | - | - |
|
|
||||
// | SixLaborsCalculate | .NET Core 3.1 | 2048 | 89.07 ns | 3.312 ns | 0.182 ns | 0.02 | 0.00 | - | - | - | - |
|
|
||||
// | | | | | | | | | | | | |
|
|
||||
// | SharpZipLibCalculate | .NET 4.7.2 | 4096 | 11,396.95 ns | 373.450 ns | 20.470 ns | 1.00 | 0.00 | - | - | - | - |
|
|
||||
// | SixLaborsCalculate | .NET 4.7.2 | 4096 | 9,070.35 ns | 271.083 ns | 14.859 ns | 0.80 | 0.00 | - | - | - | - |
|
|
||||
// | | | | | | | | | | | | |
|
|
||||
// | SharpZipLibCalculate | .NET Core 2.1 | 4096 | 11,127.81 ns | 239.177 ns | 13.110 ns | 1.00 | 0.00 | - | - | - | - |
|
|
||||
// | SixLaborsCalculate | .NET Core 2.1 | 4096 | 9,050.46 ns | 230.916 ns | 12.657 ns | 0.81 | 0.00 | - | - | - | - |
|
|
||||
// | | | | | | | | | | | | |
|
|
||||
// | SharpZipLibCalculate | .NET Core 3.1 | 4096 | 11,098.62 ns | 687.978 ns | 37.710 ns | 1.00 | 0.00 | - | - | - | - |
|
|
||||
// | SixLaborsCalculate | .NET Core 3.1 | 4096 | 168.11 ns | 3.633 ns | 0.199 ns | 0.02 | 0.00 | - | - | - | - |
|
|
||||
@ -1,66 +0,0 @@ |
|||||
// Copyright (c) Six Labors.
|
|
||||
// Licensed under the Six Labors Split License.
|
|
||||
|
|
||||
using SixLabors.ImageSharp.Compression.Zlib; |
|
||||
using SixLabors.ImageSharp.Tests.TestUtilities; |
|
||||
using SharpCrc32 = ICSharpCode.SharpZipLib.Checksum.Crc32; |
|
||||
|
|
||||
namespace SixLabors.ImageSharp.Tests.Formats.Png; |
|
||||
|
|
||||
[Trait("Format", "Png")] |
|
||||
public class Crc32Tests |
|
||||
{ |
|
||||
[Theory] |
|
||||
[InlineData(0)] |
|
||||
[InlineData(1)] |
|
||||
[InlineData(2)] |
|
||||
public void CalculateCrc_ReturnsCorrectResultWhenEmpty(uint input) => Assert.Equal(input, Crc32.Calculate(input, default)); |
|
||||
|
|
||||
[Theory] |
|
||||
[InlineData(0)] |
|
||||
[InlineData(8)] |
|
||||
[InlineData(215)] |
|
||||
[InlineData(1024)] |
|
||||
[InlineData(1024 + 15)] |
|
||||
[InlineData(2034)] |
|
||||
[InlineData(4096)] |
|
||||
public void CalculateCrc_MatchesReference(int length) => CalculateCrcAndCompareToReference(length); |
|
||||
|
|
||||
private static void CalculateCrcAndCompareToReference(int length) |
|
||||
{ |
|
||||
// arrange
|
|
||||
byte[] data = GetBuffer(length); |
|
||||
SharpCrc32 crc = new(); |
|
||||
crc.Update(data); |
|
||||
long expected = crc.Value; |
|
||||
|
|
||||
// act
|
|
||||
long actual = Crc32.Calculate(data); |
|
||||
|
|
||||
// assert
|
|
||||
Assert.Equal(expected, actual); |
|
||||
} |
|
||||
|
|
||||
private static byte[] GetBuffer(int length) |
|
||||
{ |
|
||||
byte[] data = new byte[length]; |
|
||||
new Random(1).NextBytes(data); |
|
||||
|
|
||||
return data; |
|
||||
} |
|
||||
|
|
||||
[Fact] |
|
||||
public void RunCalculateCrcTest_WithHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCalculateCrcTest, HwIntrinsics.AllowAll); |
|
||||
|
|
||||
[Fact] |
|
||||
public void RunCalculateCrcTest_WithoutHardwareIntrinsics_Works() => FeatureTestRunner.RunWithHwIntrinsicsFeature(RunCalculateCrcTest, HwIntrinsics.DisableHWIntrinsic); |
|
||||
|
|
||||
private static void RunCalculateCrcTest() |
|
||||
{ |
|
||||
int[] testData = { 0, 8, 215, 1024, 1024 + 15, 2034, 4096 }; |
|
||||
for (int i = 0; i < testData.Length; i++) |
|
||||
{ |
|
||||
CalculateCrcAndCompareToReference(testData[i]); |
|
||||
} |
|
||||
} |
|
||||
} |
|
||||
Loading…
Reference in new issue