Merge pull request #2365 from senhuang42/move_opt_parser_test_to_long_tests
Move ldm + opt parser no regression test to long testsdev
commit
d6dae2000b
|
@ -793,44 +793,6 @@ static int basicUnitTests(U32 const seed, double compressibility)
|
||||||
}
|
}
|
||||||
DISPLAYLEVEL(3, "OK \n");
|
DISPLAYLEVEL(3, "OK \n");
|
||||||
|
|
||||||
DISPLAYLEVEL(3, "test%3i : testing ldm no regressions in size for opt parser : ", testNb++);
|
|
||||||
{
|
|
||||||
size_t cSizeLdm;
|
|
||||||
size_t cSizeNoLdm;
|
|
||||||
ZSTD_CCtx* const cctx = ZSTD_createCCtx();
|
|
||||||
|
|
||||||
RDG_genBuffer(CNBuffer, CNBuffSize, 0.5, 0.5, seed);
|
|
||||||
|
|
||||||
/* Enable checksum to verify round trip. */
|
|
||||||
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_checksumFlag, 1));
|
|
||||||
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_enableLongDistanceMatching, 1));
|
|
||||||
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, 19));
|
|
||||||
|
|
||||||
/* Round trip once with ldm. */
|
|
||||||
cSizeLdm = ZSTD_compress2(cctx, compressedBuffer, compressedBufferSize, CNBuffer, CNBuffSize);
|
|
||||||
CHECK_Z(cSizeLdm);
|
|
||||||
CHECK_Z(ZSTD_decompress(decodedBuffer, CNBuffSize, compressedBuffer, cSizeLdm));
|
|
||||||
|
|
||||||
ZSTD_CCtx_reset(cctx, ZSTD_reset_session_and_parameters);
|
|
||||||
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_checksumFlag, 1));
|
|
||||||
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_enableLongDistanceMatching, 0));
|
|
||||||
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, 19));
|
|
||||||
|
|
||||||
/* Round trip once without ldm. */
|
|
||||||
cSizeNoLdm = ZSTD_compress2(cctx, compressedBuffer, compressedBufferSize, CNBuffer, CNBuffSize);
|
|
||||||
CHECK_Z(cSizeNoLdm);
|
|
||||||
CHECK_Z(ZSTD_decompress(decodedBuffer, CNBuffSize, compressedBuffer, cSizeNoLdm));
|
|
||||||
|
|
||||||
if (cSizeLdm > cSizeNoLdm) {
|
|
||||||
DISPLAY("Using long mode should not cause regressions for btopt+\n");
|
|
||||||
testResult = 1;
|
|
||||||
goto _end;
|
|
||||||
}
|
|
||||||
|
|
||||||
ZSTD_freeCCtx(cctx);
|
|
||||||
}
|
|
||||||
DISPLAYLEVEL(3, "OK \n");
|
|
||||||
|
|
||||||
/* Note: this test takes 0.5 seconds to run */
|
/* Note: this test takes 0.5 seconds to run */
|
||||||
DISPLAYLEVEL(3, "test%3i : testing refPrefx vs refPrefx + ldm (size comparison) : ", testNb++);
|
DISPLAYLEVEL(3, "test%3i : testing refPrefx vs refPrefx + ldm (size comparison) : ", testNb++);
|
||||||
{
|
{
|
||||||
|
@ -3053,6 +3015,44 @@ static int longUnitTests(U32 const seed, double compressibility)
|
||||||
}
|
}
|
||||||
DISPLAYLEVEL(3, "OK \n");
|
DISPLAYLEVEL(3, "OK \n");
|
||||||
|
|
||||||
|
DISPLAYLEVEL(3, "longtest%3i : testing ldm no regressions in size for opt parser : ", testNb++);
|
||||||
|
{
|
||||||
|
size_t cSizeLdm;
|
||||||
|
size_t cSizeNoLdm;
|
||||||
|
ZSTD_CCtx* const cctx = ZSTD_createCCtx();
|
||||||
|
|
||||||
|
RDG_genBuffer(CNBuffer, CNBuffSize, 0.5, 0.5, seed);
|
||||||
|
|
||||||
|
/* Enable checksum to verify round trip. */
|
||||||
|
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_checksumFlag, 1));
|
||||||
|
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_enableLongDistanceMatching, 1));
|
||||||
|
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, 19));
|
||||||
|
|
||||||
|
/* Round trip once with ldm. */
|
||||||
|
cSizeLdm = ZSTD_compress2(cctx, compressedBuffer, compressedBufferSize, CNBuffer, CNBuffSize);
|
||||||
|
CHECK_Z(cSizeLdm);
|
||||||
|
CHECK_Z(ZSTD_decompress(decodedBuffer, CNBuffSize, compressedBuffer, cSizeLdm));
|
||||||
|
|
||||||
|
ZSTD_CCtx_reset(cctx, ZSTD_reset_session_and_parameters);
|
||||||
|
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_checksumFlag, 1));
|
||||||
|
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_enableLongDistanceMatching, 0));
|
||||||
|
CHECK_Z(ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, 19));
|
||||||
|
|
||||||
|
/* Round trip once without ldm. */
|
||||||
|
cSizeNoLdm = ZSTD_compress2(cctx, compressedBuffer, compressedBufferSize, CNBuffer, CNBuffSize);
|
||||||
|
CHECK_Z(cSizeNoLdm);
|
||||||
|
CHECK_Z(ZSTD_decompress(decodedBuffer, CNBuffSize, compressedBuffer, cSizeNoLdm));
|
||||||
|
|
||||||
|
if (cSizeLdm > cSizeNoLdm) {
|
||||||
|
DISPLAY("Using long mode should not cause regressions for btopt+\n");
|
||||||
|
testResult = 1;
|
||||||
|
goto _end;
|
||||||
|
}
|
||||||
|
|
||||||
|
ZSTD_freeCCtx(cctx);
|
||||||
|
}
|
||||||
|
DISPLAYLEVEL(3, "OK \n");
|
||||||
|
|
||||||
DISPLAYLEVEL(3, "longtest%3i : testing cdict compression with different attachment strategies : ", testNb++);
|
DISPLAYLEVEL(3, "longtest%3i : testing cdict compression with different attachment strategies : ", testNb++);
|
||||||
{ ZSTD_CCtx* const cctx = ZSTD_createCCtx();
|
{ ZSTD_CCtx* const cctx = ZSTD_createCCtx();
|
||||||
ZSTD_DCtx* const dctx = ZSTD_createDCtx();
|
ZSTD_DCtx* const dctx = ZSTD_createDCtx();
|
||||||
|
|
Loading…
Reference in New Issue