Merge pull request #52 from pps83/master-msvc-fixes

Port maskedvbyte/streamvbyte/varintgb to Visual Studio + msvc fixes
fast-pack · Jun 9, 2019 · 055d1c5 · 055d1c5
2 parents 19c9e6e + b6c613d
commit 055d1c5
Show file tree

Hide file tree

Showing 26 changed files with 79 additions and 1,158 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+*.sln eol=crlf
+*.vcxproj eol=crlf
+*.vcxproj.filters eol=crlf
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,12 @@
+*.o
+*.lo
+.DS_Store
+/msvc/.vs
+/msvc/Debug
+/msvc/Release
+/msvc/x64/Debug
+/msvc/x64/Release
+*.suo
+*.VC.db
+*.VC.opendb
+*.vcxproj.user
diff --git a/headers/VarIntG8IU.h b/headers/VarIntG8IU.h
@@ -2,10 +2,14 @@
  * This code is released under the
  * Apache License Version 2.0 http://www.apache.org/licenses/.
  */
-#ifndef __SSSE3__
+#if !defined(__SSSE3__) && !(defined(_MSC_VER) && defined(__AVX__))
+#ifndef _MSC_VER
 #pragma message                                                                \
     "Disabling varintg8iu due to lack of SSSE3 support, try adding -mssse3 or the equivalent on your compiler"
 #else
+#pragma message("Disabling varintg8iu due to lack of SSSE3 support, try adding -mssse3 or the equivalent on your compiler")
+#endif
+#else
 #ifndef VARINTG8IU_H__
 #define VARINTG8IU_H__
 #include <emmintrin.h>
@@ -31,8 +35,6 @@ namespace FastPForLib {
  * This code was originally written by M. Caron and then
  * optimized by D. Lemire.
  *
- *
- *
  */
 class VarIntG8IU : public IntegerCODEC {
 
@@ -210,4 +212,4 @@ class VarIntG8IU : public IntegerCODEC {
 } // namespace FastPFor
 
 #endif // VARINTG8IU_H__
-#endif //__SSE3__
+#endif // __SSSE3__
diff --git a/headers/codecfactory.h b/headers/codecfactory.h
@@ -125,15 +125,9 @@ static inline CodecMap initializefactory() {
       new CompositeCodec<SIMDOPTPFor<4, Simple16<false>>, VariableByte>());
   map["varint"] = std::shared_ptr<IntegerCODEC>(new VariableByte());
   map["vbyte"] = std::shared_ptr<IntegerCODEC>(new VByte());
-#if !(defined(_MSC_VER)) // todo: port to Visual Studio
   map["maskedvbyte"] = std::shared_ptr<IntegerCODEC>(new MaskedVByte());
-#endif 
-#if !(defined(_MSC_VER)) // todo: streamvbyte needs to be ported to Visual Studio
   map["streamvbyte"] = std::shared_ptr<IntegerCODEC>(new StreamVByte());
-#endif
-#if !defined(_MSC_VER) || (_MSC_VER != 1900)
   map["varintgb"] = std::shared_ptr<IntegerCODEC>(new VarIntGB<>());
-#endif
   map["simple16"] = std::shared_ptr<IntegerCODEC>(new Simple16<true>());
   map["simple9"] = std::shared_ptr<IntegerCODEC>(new Simple9<true>());
   map["simple9_rle"] = std::shared_ptr<IntegerCODEC>(new Simple9_RLE<true>());

diff --git a/headers/horizontalbitpacking.h b/headers/horizontalbitpacking.h
@@ -21,10 +21,12 @@
 #ifndef HORIZONTALBITPACKING_H_
 #define HORIZONTALBITPACKING_H_
 
-#ifndef __SSE4_1__
+#if !defined(__SSE4_1__) && !(defined(_MSC_VER) && defined(__AVX__))
 
 #ifndef _MSC_VER
-#pragma message "No SSSE4.1 support? try adding -msse4.1"
+#pragma message "No SSSE4.1 support? try adding -msse4.1 or the equivalent on your compiler"
+#else
+#pragma message("No SSSE4.1 support? try adding -msse4.1 or the equivalent on your compiler")
 #endif
 #endif
 #include "common.h"

diff --git a/headers/simdvariablebyte.h b/headers/simdvariablebyte.h
@@ -10,9 +10,6 @@
 #ifndef SIMDVARIABLEBYTE_H_
 #define SIMDVARIABLEBYTE_H_
 
-#if ! defined(_MSC_VER) // code relies on compound literals which Visual Studio fails to support. TODO: code a workaround
-
-
 #include "common.h"
 #include "codecs.h"
 
@@ -97,5 +94,4 @@ class MaskedVByte : public FastPForLib::IntegerCODEC {
 
   std::string name() const { return "MaskedVByte"; }
 };
-#endif
 #endif /* SIMDVARIABLEBYTE_H_ */
diff --git a/headers/streamvariablebyte.h b/headers/streamvariablebyte.h
@@ -5,11 +5,9 @@
  * (c) Daniel Lemire, http://lemire.me/en/
  */
 
-
-
 #ifndef _STREAMVARIABLEBYTE_
 #define _STREAMVARIABLEBYTE_
-#if !(defined(_MSC_VER)) // todo : need to be ported to Visual Studio
+
 #include "common.h"
 #include "codecs.h"
 
@@ -77,4 +75,3 @@ class StreamVByte : public IntegerCODEC {
 };
 }
 #endif
-#endif
diff --git a/msvc/FastPFor.sln b/msvc/FastPFor.sln
@@ -7,8 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "codecs", "codecs.vcxproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FastPFor", "FastPFor.vcxproj", "{42D8ABA4-FC4E-426C-A833-D64D06081F92}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "getopt", "getopt.vcxproj", "{D0D480B3-816E-4A04-8AE4-75210F8701E0}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inmemorybenchmark", "inmemorybenchmark.vcxproj", "{635B18E0-2AD7-45A7-914E-831A6B711F89}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit", "unit.vcxproj", "{8B2ED3AF-F2E8-480B-BE7D-7B6E44DC4BFE}"
@@ -37,10 +35,6 @@ Global
 		{42D8ABA4-FC4E-426C-A833-D64D06081F92}.Debug|x64.Build.0 = Debug|x64
 		{42D8ABA4-FC4E-426C-A833-D64D06081F92}.Release|x64.ActiveCfg = Release|x64
 		{42D8ABA4-FC4E-426C-A833-D64D06081F92}.Release|x64.Build.0 = Release|x64
-		{D0D480B3-816E-4A04-8AE4-75210F8701E0}.Debug|x64.ActiveCfg = Debug|x64
-		{D0D480B3-816E-4A04-8AE4-75210F8701E0}.Debug|x64.Build.0 = Debug|x64
-		{D0D480B3-816E-4A04-8AE4-75210F8701E0}.Release|x64.ActiveCfg = Release|x64
-		{D0D480B3-816E-4A04-8AE4-75210F8701E0}.Release|x64.Build.0 = Release|x64
 		{635B18E0-2AD7-45A7-914E-831A6B711F89}.Debug|x64.ActiveCfg = Debug|x64
 		{635B18E0-2AD7-45A7-914E-831A6B711F89}.Debug|x64.Build.0 = Debug|x64
 		{635B18E0-2AD7-45A7-914E-831A6B711F89}.Release|x64.ActiveCfg = Release|x64

diff --git a/msvc/FastPFor.vcxproj b/msvc/FastPFor.vcxproj
@@ -48,6 +48,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -61,6 +62,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -75,6 +77,8 @@
     <ClCompile Include="..\src\horizontalbitpacking.cpp" />
     <ClCompile Include="..\src\simdbitpacking.cpp" />
     <ClCompile Include="..\src\simdunalignedbitpacking.cpp" />
+    <ClCompile Include="..\src\streamvbyte.c" />
+    <ClCompile Include="..\src\varintdecode.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/msvc/benchbitpacking.vcxproj b/msvc/benchbitpacking.vcxproj
@@ -48,6 +48,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -63,6 +64,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

diff --git a/msvc/codecs.vcxproj b/msvc/codecs.vcxproj
@@ -48,6 +48,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../headers;./getopt</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -63,6 +64,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../headers;./getopt</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -77,9 +79,6 @@
     <ProjectReference Include="FastPFor.vcxproj">
       <Project>{42d8aba4-fc4e-426c-a833-d64d06081f92}</Project>
     </ProjectReference>
-    <ProjectReference Include="getopt.vcxproj">
-      <Project>{d0d480b3-816e-4a04-8ae4-75210f8701e0}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/msvc/csv2maropu.vcxproj b/msvc/csv2maropu.vcxproj
@@ -49,6 +49,7 @@
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -65,6 +66,7 @@
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

diff --git a/msvc/entropy.vcxproj b/msvc/entropy.vcxproj
@@ -49,6 +49,7 @@
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -65,6 +66,7 @@
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

diff --git a/msvc/example.vcxproj b/msvc/example.vcxproj
@@ -48,6 +48,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -63,6 +64,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

diff --git a/msvc/gapstats.vcxproj b/msvc/gapstats.vcxproj
@@ -49,6 +49,7 @@
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -65,6 +66,7 @@
       <AdditionalIncludeDirectories>../headers</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

diff --git a/msvc/getopt.vcxproj b/msvc/getopt.vcxproj