refactor: Crc32C

Author: HMBSbige

…c/CryptoBase/Digests/CRC32C/Crc32CX86.cs src/CryptoBase/Digests/CRC32C/Crc32C.cssrc/CryptoBase/Digests/CRC32C/Crc32CX86.cs renamed to src/CryptoBase/Digests/CRC32C/Crc32C.cs src/CryptoBase/Digests/CRC32C/Crc32CX86.cs renamed to src/CryptoBase/Digests/CRC32C/Crc32C.cs

@@ -1,21 +1,18 @@
+using System.Numerics;
+
 namespace CryptoBase.Digests.CRC32C;
 
-/// <summary>
-/// Same as <see cref="Crc32X86" /> , but different constants.
-/// </summary>
-public class Crc32CX86 : IHash
+public class Crc32C : IHash
 {
 	public string Name => @"CRC-32C";
 
 	public int Length => HashConstants.Crc32Length;
 
 	public int BlockSize => HashConstants.Crc32BlockSize;
 
-	public static bool IsSupport => Sse42.IsSupported || Sse2.IsSupported && Pclmulqdq.IsSupported;
-
 	private uint _state;
 
-	public Crc32CX86()
+	public Crc32C()
 	{
 		Reset();
 	}
@@ -28,20 +25,19 @@ public void UpdateFinal(ReadOnlySpan<byte> origin, Span<byte> destination)
 
 	public void Update(ReadOnlySpan<byte> source)
 	{
+		if (Sse42.X64.IsSupported || Crc32.Arm64.IsSupported)
+		{
+			UpdateDefault(source);
+			return;
+		}
+
 		if (Sse2.IsSupported && Pclmulqdq.IsSupported && source.Length >= 64)
 		{
 			_state = Update(source, _state);
 			source = source.Slice(source.Length - source.Length % 0x10);
 		}
 
-		if (Sse42.IsSupported)
-		{
-			UpdateSse42(source);
-		}
-		else
-		{
-			_state = ~Crc32Table.Crc32C.Append(~_state, source);
-		}
+		UpdateDefault(source);
 	}
 
 	public void GetHash(Span<byte> destination)
@@ -151,53 +147,42 @@ private static uint Update(ReadOnlySpan<byte> buffer, uint crc)
 	}
 
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
-	private void UpdateSse42(ReadOnlySpan<byte> source)
+	private void UpdateDefault(ReadOnlySpan<byte> source)
 	{
 		int length = source.Length;
 		int offset = 0;
 		ref byte sourceRef = ref source.GetReference();
-		ref uint state = ref _state;
 
-		if (Sse42.X64.IsSupported)
+		if (Sse42.X64.IsSupported || Crc32.Arm64.IsSupported)
 		{
 			while (length >= 8)
 			{
 				ref ulong data = ref Unsafe.As<byte, ulong>(ref Unsafe.Add(ref sourceRef, offset));
-				state = (uint)Sse42.X64.Crc32(state, data);
+				_state = BitOperations.Crc32C(_state, data);
 				offset += 8;
 				length -= 8;
 			}
-
-			if (length >= 4)
-			{
-				ref uint data = ref Unsafe.As<byte, uint>(ref Unsafe.Add(ref sourceRef, offset));
-				state = Sse42.Crc32(state, data);
-				offset += 4;
-				length -= 4;
-			}
 		}
-		else
+
+		while (length >= 4)
 		{
-			while (length >= 4)
-			{
-				ref uint data = ref Unsafe.As<byte, uint>(ref Unsafe.Add(ref sourceRef, offset));
-				state = Sse42.Crc32(state, data);
-				offset += 4;
-				length -= 4;
-			}
+			ref uint data = ref Unsafe.As<byte, uint>(ref Unsafe.Add(ref sourceRef, offset));
+			_state = BitOperations.Crc32C(_state, data);
+			offset += 4;
+			length -= 4;
 		}
 
 		if (length >= 2)
 		{
 			ref ushort data = ref Unsafe.As<byte, ushort>(ref Unsafe.Add(ref sourceRef, offset));
-			state = Sse42.Crc32(state, data);
+			_state = BitOperations.Crc32C(_state, data);
 			offset += 2;
 			length -= 2;
 		}
 
 		if (length > 0)
 		{
-			state = Sse42.Crc32(state, Unsafe.Add(ref sourceRef, offset));
+			_state = BitOperations.Crc32C(_state, Unsafe.Add(ref sourceRef, offset));
 		}
 	}
 

src/CryptoBase/Digests/CRC32C/Crc32CSF.cs

@@ -34,12 +34,7 @@ private static IHash CreateCrc32()
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	private static IHash CreateCrc32C()
 	{
-		if (Crc32CX86.IsSupport)
-		{
-			return new Crc32CX86();
-		}
-
-		return new Crc32CSF();
+		return new Crc32C();
 	}
 
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]

src/CryptoBase/Digests/DigestUtils.cs

@@ -20,33 +20,25 @@ public void Setup()
 	}
 
 	[Benchmark(Baseline = true)]
-	public void Crc32SF()
-	{
-		using var hasher = new Crc32SF();
-		Span<byte> hash = stackalloc byte[hasher.Length];
-		hasher.UpdateFinal(_randombytes, hash);
-	}
-
-	[Benchmark]
-	public void Crc32X86()
+	public void Crc32C()
 	{
-		using var hasher = new Crc32X86();
+		using Crc32C hasher = new();
 		Span<byte> hash = stackalloc byte[hasher.Length];
 		hasher.UpdateFinal(_randombytes, hash);
 	}
 
 	[Benchmark]
-	public void Crc32CSF()
+	public void Crc32SF()
 	{
-		using var hasher = new Crc32CSF();
+		using Crc32SF hasher = new();
 		Span<byte> hash = stackalloc byte[hasher.Length];
 		hasher.UpdateFinal(_randombytes, hash);
 	}
 
 	[Benchmark]
-	public void Crc32CX86()
+	public void Crc32X86()
 	{
-		using var hasher = new Crc32CX86();
+		using Crc32X86 hasher = new();
 		Span<byte> hash = stackalloc byte[hasher.Length];
 		hasher.UpdateFinal(_randombytes, hash);
 	}

test/CryptoBase.Benchmark/CRC32Benchmark.cs

@@ -2,7 +2,6 @@
 using CryptoBase.DataFormatExtensions;
 using CryptoBase.Digests;
 using CryptoBase.Digests.CRC32;
-using CryptoBase.Digests.CRC32C;
 using System.Text;
 
 namespace CryptoBase.Tests;
@@ -73,7 +72,6 @@ public void CRC32(string message, string expected)
 	[InlineData(@"5c6f1913817f054beaa45c911b141120ad3822a5d1d27c38362b0b0498bc1e82d7806444f7d25b2ac8581626b6c4c37811c3e5a85e6007fc4dce60e9ab257349281db35eeef273ce326942deec8f9f046240e61072b32733e4be09e8753e53a2294b7bd7b3b1474fcd4bafa88ab0c8fc36ce4696ee093e4a3300064303430eff32d41657783a660fe72086f94db23b194b1d96f44283323a67e80e475c1afe08b910a1e2e5c242a5ed33c9a26135a66ecb766e514f20bd4a631d80f886408d7507238f5b505b2cc1df4092f4c400955de89dfc2136bad7e292ba6091c19c64d86cfa6870bb35af7930a730362b0c0deace27b46f48cdccd02231c1f22f8029", @"83c1318e")]
 	public void CRC32C(string message, string expected)
 	{
-		TestC(new Crc32CSF(), message, expected);
 		TestC(DigestUtils.Create(DigestType.Crc32C), message, expected);
 	}
 }