From: inikep Date: Thu, 19 May 2016 10:16:14 +0000 (+0200) Subject: added datagen in Visual Studio project X-Git-Tag: v0.7.0^2~54^2^2~9^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44bb2f6c89161915c8ff46ddc3b3492116b1c377;p=thirdparty%2Fzstd.git added datagen in Visual Studio project --- diff --git a/appveyor.yml b/appveyor.yml index e002d89ef..a68e12eab 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,9 +28,7 @@ install: SET "PATH_MINGW64=c:\msys64\mingw64\bin;c:\msys64\usr\bin" && COPY C:\MinGW\bin\mingw32-make.exe C:\MinGW\bin\make.exe ) else ( - IF [%PLATFORM%]==[x64] (SET ADDITIONALPARAM=/p:LibraryPath="C:\Program Files\Microsoft SDKs\Windows\v7.1\lib\x64;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64;C:\Program Files (x86)\Microsoft Visual Studio 10.0\;C:\Program Files (x86)\Microsoft Visual Studio 10.0\lib\amd64;") && - COPY programs\tests\playTests.bat playTests.bat && - COPY programs\tests\roundTripTest.bat roundTripTest.bat + IF [%PLATFORM%]==[x64] (SET ADDITIONALPARAM=/p:LibraryPath="C:\Program Files\Microsoft SDKs\Windows\v7.1\lib\x64;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64;C:\Program Files (x86)\Microsoft Visual Studio 10.0\;C:\Program Files (x86)\Microsoft Visual Studio 10.0\lib\amd64;") ) build_script: @@ -81,7 +79,8 @@ build_script: ECHO *** && msbuild "projects\VS2010\zstd.sln" /m /verbosity:normal /property:PlatformToolset=v140 /t:Clean,Build /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" && COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\fuzzer.exe projects\fuzzer_VS2015_%PLATFORM%_%CONFIGURATION%.exe && - COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\zstd.exe zstd_VS2015_%PLATFORM%_%CONFIGURATION%.exe + COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\zstd.exe projects\zstd_VS2015_%PLATFORM%_%CONFIGURATION%.exe && + COPY projects\VS2010\bin\%PLATFORM%\%CONFIGURATION%\datagen.exe projects\datagen_VS2015_%PLATFORM%_%CONFIGURATION%.exe ) test_script: @@ -95,5 +94,8 @@ test_script: projects\fuzzer_VS2012_%PLATFORM%_Release.exe %FUZZERTEST% && projects\fuzzer_VS2013_%PLATFORM%_Release.exe %FUZZERTEST% && projects\fuzzer_VS2015_%PLATFORM%_Release.exe %FUZZERTEST% && - REM zstd_VS2015_%PLATFORM%_Release.exe + CD programs && + SET ZSTD=..\projects\zstd_VS2015_%PLATFORM%_Release.exe && + SET DATAGEN=..\projects\datagen_VS2015_%PLATFORM%_Release.exe && + CALL tests\playTests.bat --test-large-data ) diff --git a/programs/datagencli.c b/programs/datagencli.c index 6122c29bd..d437d5cb3 100644 --- a/programs/datagencli.c +++ b/programs/datagencli.c @@ -27,8 +27,8 @@ /*-************************************ * Includes **************************************/ +#include "util.h" /* Compiler options */ #include /* fprintf, stderr */ -#include "mem.h" #include "datagen.h" /* RDG_generate */ diff --git a/programs/tests/playTests.bat b/programs/tests/playTests.bat index 19c57d5fc..6e9fd53ff 100644 --- a/programs/tests/playTests.bat +++ b/programs/tests/playTests.bat @@ -1,8 +1,11 @@ @echo off if [%ZSTD%]==[] echo ZSTD variable must be defined! && exit /b 1 +if [%DATAGEN%]==[] echo DATAGEN variable must be defined! && exit /b 1 + +SET ROUNDTRIPTEST=tests\roundTripTest.bat echo. && echo **** simple tests **** -datagen > tmp +%DATAGEN% > tmp %ZSTD% -f tmp && REM trivial compression case, creates tmp.zst %ZSTD% -df tmp.zst && REM trivial decompression case (overwrites tmp) echo test : too large compression level (must fail) @@ -55,9 +58,9 @@ REM echo foo | %ZSTD% | %ZSTD% -d > /dev/full && (echo write error not detected! echo. && echo **** dictionary tests **** -datagen > tmpDict -datagen -g1M | md5sum > tmp1 -datagen -g1M | %ZSTD% -D tmpDict | %ZSTD% -D tmpDict -dvq | md5sum > tmp2 +%DATAGEN% > tmpDict +%DATAGEN% -g1M | md5sum > tmp1 +%DATAGEN% -g1M | %ZSTD% -D tmpDict | %ZSTD% -D tmpDict -dvq | md5sum > tmp2 fc tmp1 tmp2 %ZSTD% --train *.c *.h -o tmpDict %ZSTD% xxhash.c -D tmpDict -of tmp @@ -67,9 +70,9 @@ fc xxhash.c result echo. && echo **** multiple files tests **** -datagen -s1 > tmp1 2> NUL -datagen -s2 -g100K > tmp2 2> NUL -datagen -s3 -g1M > tmp3 2> NUL +%DATAGEN% -s1 > tmp1 2> NUL +%DATAGEN% -s2 -g100K > tmp2 2> NUL +%DATAGEN% -s3 -g1M > tmp3 2> NUL %ZSTD% -f tmp* echo compress tmp* : ls -ls tmp* @@ -101,14 +104,14 @@ echo test good and bad files (*) echo. && echo **** zstd round-trip tests **** -CALL roundTripTest.bat -CALL roundTripTest.bat -g15K && REM TableID==3 -CALL roundTripTest.bat -g127K && REM TableID==2 -CALL roundTripTest.bat -g255K && REM TableID==1 -CALL roundTripTest.bat -g513K && REM TableID==0 -CALL roundTripTest.bat -g512K 6 && REM greedy, hash chain -CALL roundTripTest.bat -g512K 16 && REM btlazy2 -CALL roundTripTest.bat -g512K 19 && REM btopt +CALL %ROUNDTRIPTEST% +CALL %ROUNDTRIPTEST% -g15K && REM TableID==3 +CALL %ROUNDTRIPTEST% -g127K && REM TableID==2 +CALL %ROUNDTRIPTEST% -g255K && REM TableID==1 +CALL %ROUNDTRIPTEST% -g513K && REM TableID==0 +CALL %ROUNDTRIPTEST% -g512K 6 && REM greedy, hash chain +CALL %ROUNDTRIPTEST% -g512K 16 && REM btlazy2 +CALL %ROUNDTRIPTEST% -g512K 19 && REM btopt rm tmp* echo Param = %1 @@ -117,33 +120,33 @@ if NOT "%1"=="--test-large-data" ( exit /b 0 ) -CALL roundTripTest.bat -g270000000 1 -CALL roundTripTest.bat -g270000000 2 -CALL roundTripTest.bat -g270000000 3 +CALL %ROUNDTRIPTEST% -g270000000 1 +CALL %ROUNDTRIPTEST% -g270000000 2 +CALL %ROUNDTRIPTEST% -g270000000 3 -CALL roundTripTest.bat -g140000000 -P60 4 -CALL roundTripTest.bat -g140000000 -P60 5 -CALL roundTripTest.bat -g140000000 -P60 6 +CALL %ROUNDTRIPTEST% -g140000000 -P60 4 +CALL %ROUNDTRIPTEST% -g140000000 -P60 5 +CALL %ROUNDTRIPTEST% -g140000000 -P60 6 -CALL roundTripTest.bat -g70000000 -P70 7 -CALL roundTripTest.bat -g70000000 -P70 8 -CALL roundTripTest.bat -g70000000 -P70 9 +CALL %ROUNDTRIPTEST% -g70000000 -P70 7 +CALL %ROUNDTRIPTEST% -g70000000 -P70 8 +CALL %ROUNDTRIPTEST% -g70000000 -P70 9 -CALL roundTripTest.bat -g35000000 -P75 10 -CALL roundTripTest.bat -g35000000 -P75 11 -CALL roundTripTest.bat -g35000000 -P75 12 +CALL %ROUNDTRIPTEST% -g35000000 -P75 10 +CALL %ROUNDTRIPTEST% -g35000000 -P75 11 +CALL %ROUNDTRIPTEST% -g35000000 -P75 12 -CALL roundTripTest.bat -g18000000 -P80 13 -CALL roundTripTest.bat -g18000000 -P80 14 -CALL roundTripTest.bat -g18000000 -P80 15 -CALL roundTripTest.bat -g18000000 -P80 16 -CALL roundTripTest.bat -g18000000 -P80 17 +CALL %ROUNDTRIPTEST% -g18000000 -P80 13 +CALL %ROUNDTRIPTEST% -g18000000 -P80 14 +CALL %ROUNDTRIPTEST% -g18000000 -P80 15 +CALL %ROUNDTRIPTEST% -g18000000 -P80 16 +CALL %ROUNDTRIPTEST% -g18000000 -P80 17 -CALL roundTripTest.bat -g50000000 -P94 18 -CALL roundTripTest.bat -g50000000 -P94 19 +CALL %ROUNDTRIPTEST% -g50000000 -P94 18 +CALL %ROUNDTRIPTEST% -g50000000 -P94 19 -CALL roundTripTest.bat -g99000000 -P99 20 -CALL roundTripTest.bat -g6000000000 -P99 1 +CALL %ROUNDTRIPTEST% -g99000000 -P99 20 +CALL %ROUNDTRIPTEST% -g6000000000 -P99 1 rm tmp* exit /b 0 diff --git a/programs/tests/roundTripTest.bat b/programs/tests/roundTripTest.bat index b1541bd14..759891f0b 100644 --- a/programs/tests/roundTripTest.bat +++ b/programs/tests/roundTripTest.bat @@ -2,7 +2,7 @@ if [%3]==[] (SET C=%2 && SET P=) ELSE (SET C=%3 && SET P=%2) rm -f tmp1 tmp2 echo roundTripTest: datagen %1 %P% ^| %ZSTD% -v%C% ^| %ZSTD% -d -datagen %1 %P% | md5sum > tmp1 -datagen %1 %P% | %ZSTD% -vq%C% | %ZSTD% -d | md5sum > tmp2 +%DATAGEN% %1 %P% | md5sum > tmp1 +%DATAGEN% %1 %P% | %ZSTD% -vq%C% | %ZSTD% -d | md5sum > tmp2 fc tmp1 tmp2 EXIT /B %ERRORLEVEL% diff --git a/projects/VS2010/datagen/datagen.vcxproj b/projects/VS2010/datagen/datagen.vcxproj new file mode 100644 index 000000000..fe2b7eec6 --- /dev/null +++ b/projects/VS2010/datagen/datagen.vcxproj @@ -0,0 +1,168 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {037E781E-81A6-494B-B1B3-438AB1200523} + Win32Proj + datagen + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + + + + Application + true + MultiByte + + + Application + true + MultiByte + + + Application + false + true + MultiByte + + + Application + false + true + MultiByte + + + + + + + + + + + + + + + + + + + true + false + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); + $(Platform)\$(Configuration)\ + + + true + false + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); + + + false + false + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); + $(Platform)\$(Configuration)\ + + + false + false + $(IncludePath);$(SolutionDir)..\..\programs\legacy;$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib\common;$(UniversalCRT_IncludePath); + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + false + + + Console + true + + + + + + + Level4 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + false + + + Console + true + + + + + Level4 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + false + MultiThreaded + + + Console + true + true + true + + + + + Level4 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + false + MultiThreaded + + + Console + true + true + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/projects/VS2010/datagen/datagen.vcxproj.filters b/projects/VS2010/datagen/datagen.vcxproj.filters new file mode 100644 index 000000000..1ebbd6b03 --- /dev/null +++ b/projects/VS2010/datagen/datagen.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/projects/VS2010/zstd.sln b/projects/VS2010/zstd.sln index 825d7a130..698b8fe50 100644 --- a/projects/VS2010/zstd.sln +++ b/projects/VS2010/zstd.sln @@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench", "fullbench\full EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstdlib", "zstdlib\zstdlib.vcxproj", "{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "datagen", "datagen\datagen.vcxproj", "{037E781E-81A6-494B-B1B3-438AB1200523}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -49,6 +51,14 @@ Global {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|Win32.Build.0 = Release|Win32 {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.ActiveCfg = Release|x64 {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.Build.0 = Release|x64 + {037E781E-81A6-494B-B1B3-438AB1200523}.Debug|Win32.ActiveCfg = Debug|Win32 + {037E781E-81A6-494B-B1B3-438AB1200523}.Debug|Win32.Build.0 = Debug|Win32 + {037E781E-81A6-494B-B1B3-438AB1200523}.Debug|x64.ActiveCfg = Debug|x64 + {037E781E-81A6-494B-B1B3-438AB1200523}.Debug|x64.Build.0 = Debug|x64 + {037E781E-81A6-494B-B1B3-438AB1200523}.Release|Win32.ActiveCfg = Release|Win32 + {037E781E-81A6-494B-B1B3-438AB1200523}.Release|Win32.Build.0 = Release|Win32 + {037E781E-81A6-494B-B1B3-438AB1200523}.Release|x64.ActiveCfg = Release|x64 + {037E781E-81A6-494B-B1B3-438AB1200523}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE