General refactor and cleanup.

This commit is contained in:
2024-04-30 04:30:11 +01:00
parent 886bd83e85
commit fa6f1b2e46
34 changed files with 2153 additions and 2226 deletions

View File

@@ -73,8 +73,7 @@ static class neon
{
uint n = Adler32Context.NMAX / BLOCK_SIZE; /* The NMAX constraint. */
if(n > blocks)
n = blocks;
if(n > blocks) n = blocks;
blocks -= n;
/*
@@ -93,21 +92,41 @@ static class neon
/*
* Load 32 input bytes.
*/
var bytes1 = Vector128.Create(buf[bufPos], buf[bufPos + 1], buf[bufPos + 2],
buf[bufPos + 3], buf[bufPos + 4], buf[bufPos + 5],
buf[bufPos + 6], buf[bufPos + 7], buf[bufPos + 8],
buf[bufPos + 9], buf[bufPos + 10], buf[bufPos + 11],
buf[bufPos + 12], buf[bufPos + 13], buf[bufPos + 14],
buf[bufPos + 15]);
var bytes1 = Vector128.Create(buf[bufPos],
buf[bufPos + 1],
buf[bufPos + 2],
buf[bufPos + 3],
buf[bufPos + 4],
buf[bufPos + 5],
buf[bufPos + 6],
buf[bufPos + 7],
buf[bufPos + 8],
buf[bufPos + 9],
buf[bufPos + 10],
buf[bufPos + 11],
buf[bufPos + 12],
buf[bufPos + 13],
buf[bufPos + 14],
buf[bufPos + 15]);
bufPos += 16;
var bytes2 = Vector128.Create(buf[bufPos], buf[bufPos + 1], buf[bufPos + 2],
buf[bufPos + 3], buf[bufPos + 4], buf[bufPos + 5],
buf[bufPos + 6], buf[bufPos + 7], buf[bufPos + 8],
buf[bufPos + 9], buf[bufPos + 10], buf[bufPos + 11],
buf[bufPos + 12], buf[bufPos + 13], buf[bufPos + 14],
buf[bufPos + 15]);
var bytes2 = Vector128.Create(buf[bufPos],
buf[bufPos + 1],
buf[bufPos + 2],
buf[bufPos + 3],
buf[bufPos + 4],
buf[bufPos + 5],
buf[bufPos + 6],
buf[bufPos + 7],
buf[bufPos + 8],
buf[bufPos + 9],
buf[bufPos + 10],
buf[bufPos + 11],
buf[bufPos + 12],
buf[bufPos + 13],
buf[bufPos + 14],
buf[bufPos + 15]);
bufPos += 16;
/*
@@ -118,11 +137,11 @@ static class neon
/*
* Horizontally add the bytes for s1.
*/
v_s1 =
AdvSimd.AddPairwiseWideningAndAdd(v_s1,
AdvSimd.
AddPairwiseWideningAndAdd(AdvSimd.AddPairwiseWidening(bytes1),
bytes2));
v_s1 = AdvSimd.AddPairwiseWideningAndAdd(v_s1,
AdvSimd
.AddPairwiseWideningAndAdd(AdvSimd
.AddPairwiseWidening(bytes1),
bytes2));
/*
* Vertically add the bytes for s2.
@@ -138,28 +157,36 @@ static class neon
/*
* Multiply-add bytes by [ 32, 31, 30, ... ] for s2.
*/
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2, v_column_sum_1.GetLower(),
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2,
v_column_sum_1.GetLower(),
Vector64.Create((ushort)32, 31, 30, 29));
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2, v_column_sum_1.GetUpper(),
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2,
v_column_sum_1.GetUpper(),
Vector64.Create((ushort)28, 27, 26, 25));
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2, v_column_sum_2.GetLower(),
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2,
v_column_sum_2.GetLower(),
Vector64.Create((ushort)24, 23, 22, 21));
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2, v_column_sum_2.GetUpper(),
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2,
v_column_sum_2.GetUpper(),
Vector64.Create((ushort)20, 19, 18, 17));
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2, v_column_sum_3.GetLower(),
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2,
v_column_sum_3.GetLower(),
Vector64.Create((ushort)16, 15, 14, 13));
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2, v_column_sum_3.GetUpper(),
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2,
v_column_sum_3.GetUpper(),
Vector64.Create((ushort)12, 11, 10, 9));
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2, v_column_sum_4.GetLower(),
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2,
v_column_sum_4.GetLower(),
Vector64.Create((ushort)8, 7, 6, 5));
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2, v_column_sum_4.GetUpper(),
v_s2 = AdvSimd.MultiplyWideningLowerAndAdd(v_s2,
v_column_sum_4.GetUpper(),
Vector64.Create((ushort)4, 3, 2, 1));
/*
@@ -203,11 +230,9 @@ static class neon
len -= 16;
}
while(len-- != 0)
s2 += s1 += buf[bufPos++];
while(len-- != 0) s2 += s1 += buf[bufPos++];
if(s1 >= Adler32Context.ADLER_MODULE)
s1 -= Adler32Context.ADLER_MODULE;
if(s1 >= Adler32Context.ADLER_MODULE) s1 -= Adler32Context.ADLER_MODULE;
s2 %= Adler32Context.ADLER_MODULE;
}

View File

@@ -70,13 +70,12 @@ static class ssse3
{
uint n = Adler32Context.NMAX / BLOCK_SIZE; /* The NMAX constraint. */
if(n > blocks)
n = blocks;
if(n > blocks) n = blocks;
blocks -= n;
Vector128<byte> tap1 = Vector128.Create(32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17).
AsByte();
Vector128<byte> tap1 = Vector128.Create(32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17)
.AsByte();
Vector128<byte> tap2 = Vector128.Create(16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1).AsByte();
Vector128<byte> zero = Vector128.Create(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0).AsByte();
@@ -167,11 +166,9 @@ static class ssse3
len -= 16;
}
while(len-- != 0)
s2 += s1 += buf[bufPos++];
while(len-- != 0) s2 += s1 += buf[bufPos++];
if(s1 >= Adler32Context.ADLER_MODULE)
s1 -= Adler32Context.ADLER_MODULE;
if(s1 >= Adler32Context.ADLER_MODULE) s1 -= Adler32Context.ADLER_MODULE;
s2 %= Adler32Context.ADLER_MODULE;
}