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

experiments with ZSTD_decodeSequence

Browse Source
This commit is contained in:
inikep
2016-04-05 10:08:25 +02:00
parent 2ec2698ef9
commit b3532793a9
2 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zstd_decompress.c
+44 -30
View File
@@ -687,45 +687,59 @@ static void ZSTD_decodeSequence(seq_t* seq, seqState_t* seqState, const U32 mls)
{ size_t offset; { size_t offset;
if (ofCode) { #if 0
offset = OF_base[ofCode] + BIT_readBits(&(seqState->DStream), ofBits); /* <= 26 bits */ if (!ofCode) {
if (MEM_32bits()) BIT_reloadDStream(&(seqState->DStream)); if (!llCode) {
offset = seqState->prevOffset[1];
} else {
offset = 0;
}
if (offset < ZSTD_REP_NUM) {
if (llCode == 0 && offset <= 1) offset = 1-offset;
if (offset != 0) {
size_t temp = seqState->prevOffset[offset];
if (offset != 1) {
if (offset == 3) seqState->prevOffset[3] = seqState->prevOffset[2];
seqState->prevOffset[2] = seqState->prevOffset[1];
}
seqState->prevOffset[1] = seqState->prevOffset[0]; seqState->prevOffset[1] = seqState->prevOffset[0];
seqState->prevOffset[0] = offset = temp; seqState->prevOffset[0] = offset;
} else { } else {
offset = seqState->prevOffset[0]; offset = seqState->prevOffset[0];
} }
} else { } else {
offset -= ZSTD_REP_MOVE; offset = OF_base[ofCode] + BIT_readBits(&(seqState->DStream), ofBits); /* <= 26 bits */
#if 1 // faster without kSlotNew if (MEM_32bits()) BIT_reloadDStream(&(seqState->DStream));
seqState->prevOffset[3] = seqState->prevOffset[2];
seqState->prevOffset[2] = seqState->prevOffset[1];
seqState->prevOffset[1] = seqState->prevOffset[0];
seqState->prevOffset[0] = offset;
#else #else
if (kSlotNew < 3) seqState->prevOffset[3] = seqState->prevOffset[2]; if (!ofCode)
if (kSlotNew < 2) seqState->prevOffset[2] = seqState->prevOffset[1]; offset = 0;
if (kSlotNew < 1) seqState->prevOffset[1] = seqState->prevOffset[0]; else {
seqState->prevOffset[kSlotNew] = offset; offset = OF_base[ofCode] + BIT_readBits(&(seqState->DStream), ofBits); /* <= 26 bits */
#endif if (MEM_32bits()) BIT_reloadDStream(&(seqState->DStream));
} }
{
#endif
if (offset < ZSTD_REP_NUM) {
if (llCode == 0 && offset <= 1) offset = 1-offset;
if (offset != 0) {
size_t temp = seqState->prevOffset[offset];
if (offset != 1) {
if (offset == 3) seqState->prevOffset[3] = seqState->prevOffset[2];
seqState->prevOffset[2] = seqState->prevOffset[1];
}
seqState->prevOffset[1] = seqState->prevOffset[0];
seqState->prevOffset[0] = offset = temp;
} else {
offset = seqState->prevOffset[0];
}
} else {
offset -= ZSTD_REP_MOVE;
#if 1 // faster without kSlotNew
seqState->prevOffset[3] = seqState->prevOffset[2];
seqState->prevOffset[2] = seqState->prevOffset[1];
seqState->prevOffset[1] = seqState->prevOffset[0];
seqState->prevOffset[0] = offset;
#else
if (kSlotNew < 3) seqState->prevOffset[3] = seqState->prevOffset[2];
if (kSlotNew < 2) seqState->prevOffset[2] = seqState->prevOffset[1];
if (kSlotNew < 1) seqState->prevOffset[1] = seqState->prevOffset[0];
seqState->prevOffset[kSlotNew] = offset;
#endif
}
}
seq->offset = offset; seq->offset = offset;
} }
lib/zstd_internal.h
+11
View File
@@ -46,6 +46,17 @@
#define MIN(a,b) ((a)<(b) ? (a) : (b)) #define MIN(a,b) ((a)<(b) ? (a) : (b))
#define MAX(a,b) ((a)>(b) ? (a) : (b)) #define MAX(a,b) ((a)>(b) ? (a) : (b))
#define ZSTD_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
#if (ZSTD_GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__)
# define expect(expr,value) (__builtin_expect ((expr),(value)) )
#else
# define expect(expr,value) (expr)
#endif
#define likely(expr) expect((expr) != 0, 1)
#define unlikely(expr) expect((expr) != 0, 0)
/*-************************************* /*-*************************************
* Common constants * Common constants