ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert ZSTD_reduceTable_internal()'s modificatiion

Browse Source
This commit is contained in:
caoyzh
2020-05-07 13:10:46 -07:00
committed by Nick Terrell
parent 9e802ede9c
commit a7e34ff693
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/compress/zstd_compress.c
+1 -17
View File
@@ -1865,20 +1865,6 @@ ZSTD_reduceTable_internal (U32* const table, U32 const size, U32 const reducerVa
for (rowNb=0 ; rowNb < nbRows ; rowNb++) { for (rowNb=0 ; rowNb < nbRows ; rowNb++) {
int column; int column;
#ifdef __aarch64__
for (column=0; column<ZSTD_ROWSIZE; column+=4) {
uint32x4_t const zero = {0, 0, 0, 0};
uint32x4_t const reducer = vdupq_n_u32(reducerValue);
uint32x4_t data = vld1q_u32(table + cellNb);
if (preserveMark) {
uint32x4_t const mark = {ZSTD_DUBT_UNSORTED_MARK, ZSTD_DUBT_UNSORTED_MARK, ZSTD_DUBT_UNSORTED_MARK, ZSTD_DUBT_UNSORTED_MARK};
data = vbslq_u32(vceqq_u32(data, mark), vaddq_u32(data, reducer), data);
}
data = vbslq_u32(vcltq_u32(data, reducer), zero, vsubq_u32(data, reducer));
vst1q_u32(table + cellNb, data);
cellNb+=4;
}
#else
for (column=0; column<ZSTD_ROWSIZE; column++) { for (column=0; column<ZSTD_ROWSIZE; column++) {
if (preserveMark) { if (preserveMark) {
U32 const adder = (table[cellNb] == ZSTD_DUBT_UNSORTED_MARK) ? reducerValue : 0; U32 const adder = (table[cellNb] == ZSTD_DUBT_UNSORTED_MARK) ? reducerValue : 0;
@@ -1887,9 +1873,7 @@ ZSTD_reduceTable_internal (U32* const table, U32 const size, U32 const reducerVa
if (table[cellNb] < reducerValue) table[cellNb] = 0; if (table[cellNb] < reducerValue) table[cellNb] = 0;
else table[cellNb] -= reducerValue; else table[cellNb] -= reducerValue;
cellNb++; cellNb++;
} } }
#endif
}
} }
static void ZSTD_reduceTable(U32* const table, U32 const size, U32 const reducerValue) static void ZSTD_reduceTable(U32* const table, U32 const size, U32 const reducerValue)