daiduo/TurboPFor-Integer-Compression
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #62 from pps83/master-merge-fixes

Browse Source 
Master merge fixes
This commit is contained in:
powturbo
2020-02-06 14:05:07 +01:00
committed by GitHub
parent e29cc7cd1b 6c6ac490e9
commit 3f6b82225e
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
conf.h
View File

@ -254,4 +254,3 @@ struct _PACKED doubleu { double d; };
#define die(fmt,args...) do { fprintf(stderr, "%s:%s:%d:", __FILE__, __FUNCTION__, __LINE__); fprintf(stderr, fmt, ## args ); fflush(stderr); exit(-1); } while(0)
#endif
#endif

4
makefile.vs
View File

@ -24,10 +24,10 @@ OBJS_AVX2 = vs\bitpack_avx2.obj vs\bitunpack_avx2.obj vs\vp4c_avx2.obj vs\vp4d_a
CFLAGS = $(CFLAGS) /DNSIMD
!else
OBJS = $(OBJS) $(OBJS_SSE)
CFLAGS = $(CFLAGS) /D__SSE__ /D__SSE2__ /D__SSE3__ /D__SSSE3__ /D__SSE4_1__ /D__SSE4_2__ /DUSE_SSE
CFLAGS = $(CFLAGS) /D__SSE__ /D__SSE2__ /D__SSE3__ /D__SSSE3__ /D__SSE4_1__ /D__SSE4_2__
!if "$(AVX2)" == "1"
OBJS = $(OBJS) $(OBJS_AVX2)
CFLAGS = $(CFLAGS) /D__AVX2__ /DUSE_AVX2
CFLAGS = $(CFLAGS) /D__AVX2__
ARCH = /arch:AVX2
!endif
!endif

6
plugins.cc
View File

@ -114,7 +114,7 @@ enum {
TB_BPN128V,
TB_EF128V,
#if defined(__AVX2__) && defined(USE_AVX2)
#if defined(__AVX2__)
#define C_TURBOPFOR256 CODEC0V
#else
#define C_TURBOPFOR256 0
@ -172,7 +172,7 @@ enum {
#endif
LI_HORPACK,
#if defined(__AVX2__) && defined(USE_AVX2)
#if defined(__AVX2__)
#define C_LITTLEPACKBMI CODEC1
#else
#define C_LITTLEPACKBMI 0
@ -224,7 +224,7 @@ enum {
SC_FORDA,
SC_SIMDPACK128,
#if defined(__AVX2__) && defined(USE_AVX2)
#if defined(__AVX2__)
#define C_SIMDCOMP256 CODEC0V
#else
#define C_SIMDCOMP256 0

4
vs/vs2017/TurboPFor.vcxproj
View File

@ -101,7 +101,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;USE_SSE;USE_AVX2;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
@ -130,7 +130,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;USE_SSE;USE_AVX2;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>__SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;_CRT_SECURE_NO_WARNINGS=;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>