Update libp2p

sekrit-twc · Aug 29, 2021 · fe40c79 · fe40c79
1 parent 666337c
commit fe40c79
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 29 deletions.
diff --git a/libp2p b/libp2p
diff --git a/msvc/avsproxy.sln b/msvc/avsproxy.sln
@@ -1,10 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31605.320
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avsproxy", "avsproxy\avsproxy.vcxproj", "{552A627B-59C7-44FA-96AA-110766783B83}"
 	ProjectSection(ProjectDependencies) = postProject
+		{0955E601-DABB-442D-AFFF-EB4B2BF331FD} = {0955E601-DABB-442D-AFFF-EB4B2BF331FD}
 		{65E94A7A-365E-4CCE-8999-B1E475C02A3F} = {65E94A7A-365E-4CCE-8999-B1E475C02A3F}
 	EndProjectSection
 EndProject
@@ -17,32 +18,65 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipc32", "ipc32\ipc32.vcxpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipc64", "ipc64\ipc64.vcxproj", "{65E94A7A-365E-4CCE-8999-B1E475C02A3F}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libp2p", "libp2p", "{688CBAB8-6F09-4C76-9F38-743FCC437360}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libp2p_simd", "..\libp2p\_msvc\libp2p_simd\libp2p_simd.vcxproj", "{0955E601-DABB-442D-AFFF-EB4B2BF331FD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{552A627B-59C7-44FA-96AA-110766783B83}.Debug|x64.ActiveCfg = Debug|x64
 		{552A627B-59C7-44FA-96AA-110766783B83}.Debug|x64.Build.0 = Debug|x64
+		{552A627B-59C7-44FA-96AA-110766783B83}.Debug|x86.ActiveCfg = Debug|Win32
+		{552A627B-59C7-44FA-96AA-110766783B83}.Debug|x86.Build.0 = Debug|Win32
 		{552A627B-59C7-44FA-96AA-110766783B83}.Release|x64.ActiveCfg = Release|x64
 		{552A627B-59C7-44FA-96AA-110766783B83}.Release|x64.Build.0 = Release|x64
+		{552A627B-59C7-44FA-96AA-110766783B83}.Release|x86.ActiveCfg = Release|Win32
+		{552A627B-59C7-44FA-96AA-110766783B83}.Release|x86.Build.0 = Release|Win32
 		{00433F94-D81F-4A12-B5CF-EAE9AF1BCE69}.Debug|x64.ActiveCfg = Debug|Win32
 		{00433F94-D81F-4A12-B5CF-EAE9AF1BCE69}.Debug|x64.Build.0 = Debug|Win32
+		{00433F94-D81F-4A12-B5CF-EAE9AF1BCE69}.Debug|x86.ActiveCfg = Debug|Win32
+		{00433F94-D81F-4A12-B5CF-EAE9AF1BCE69}.Debug|x86.Build.0 = Debug|Win32
 		{00433F94-D81F-4A12-B5CF-EAE9AF1BCE69}.Release|x64.ActiveCfg = Release|Win32
 		{00433F94-D81F-4A12-B5CF-EAE9AF1BCE69}.Release|x64.Build.0 = Release|Win32
+		{00433F94-D81F-4A12-B5CF-EAE9AF1BCE69}.Release|x86.ActiveCfg = Release|Win32
+		{00433F94-D81F-4A12-B5CF-EAE9AF1BCE69}.Release|x86.Build.0 = Release|Win32
 		{FA633448-2C1C-4655-9976-D637390CE8C5}.Debug|x64.ActiveCfg = Debug|Win32
 		{FA633448-2C1C-4655-9976-D637390CE8C5}.Debug|x64.Build.0 = Debug|Win32
+		{FA633448-2C1C-4655-9976-D637390CE8C5}.Debug|x86.ActiveCfg = Debug|Win32
+		{FA633448-2C1C-4655-9976-D637390CE8C5}.Debug|x86.Build.0 = Debug|Win32
 		{FA633448-2C1C-4655-9976-D637390CE8C5}.Release|x64.ActiveCfg = Release|Win32
 		{FA633448-2C1C-4655-9976-D637390CE8C5}.Release|x64.Build.0 = Release|Win32
+		{FA633448-2C1C-4655-9976-D637390CE8C5}.Release|x86.ActiveCfg = Release|Win32
+		{FA633448-2C1C-4655-9976-D637390CE8C5}.Release|x86.Build.0 = Release|Win32
 		{65E94A7A-365E-4CCE-8999-B1E475C02A3F}.Debug|x64.ActiveCfg = Debug|x64
 		{65E94A7A-365E-4CCE-8999-B1E475C02A3F}.Debug|x64.Build.0 = Debug|x64
+		{65E94A7A-365E-4CCE-8999-B1E475C02A3F}.Debug|x86.ActiveCfg = Debug|Win32
+		{65E94A7A-365E-4CCE-8999-B1E475C02A3F}.Debug|x86.Build.0 = Debug|Win32
 		{65E94A7A-365E-4CCE-8999-B1E475C02A3F}.Release|x64.ActiveCfg = Release|x64
 		{65E94A7A-365E-4CCE-8999-B1E475C02A3F}.Release|x64.Build.0 = Release|x64
+		{65E94A7A-365E-4CCE-8999-B1E475C02A3F}.Release|x86.ActiveCfg = Release|Win32
+		{65E94A7A-365E-4CCE-8999-B1E475C02A3F}.Release|x86.Build.0 = Release|Win32
+		{0955E601-DABB-442D-AFFF-EB4B2BF331FD}.Debug|x64.ActiveCfg = Debug|x64
+		{0955E601-DABB-442D-AFFF-EB4B2BF331FD}.Debug|x64.Build.0 = Debug|x64
+		{0955E601-DABB-442D-AFFF-EB4B2BF331FD}.Debug|x86.ActiveCfg = Debug|Win32
+		{0955E601-DABB-442D-AFFF-EB4B2BF331FD}.Debug|x86.Build.0 = Debug|Win32
+		{0955E601-DABB-442D-AFFF-EB4B2BF331FD}.Release|x64.ActiveCfg = Release|x64
+		{0955E601-DABB-442D-AFFF-EB4B2BF331FD}.Release|x64.Build.0 = Release|x64
+		{0955E601-DABB-442D-AFFF-EB4B2BF331FD}.Release|x86.ActiveCfg = Release|Win32
+		{0955E601-DABB-442D-AFFF-EB4B2BF331FD}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{0955E601-DABB-442D-AFFF-EB4B2BF331FD} = {688CBAB8-6F09-4C76-9F38-743FCC437360}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {417B92DB-F06B-4497-B91E-B73045D8615D}
 	EndGlobalSection

diff --git a/msvc/avsproxy/avsproxy.vcxproj b/msvc/avsproxy/avsproxy.vcxproj
@@ -80,7 +80,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ipc64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>p2p_simd.lib;ipc64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -94,7 +94,7 @@
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;NOMINMAX;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>ipc64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>p2p_simd.lib;ipc64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -112,7 +112,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ipc64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>p2p_simd.lib;ipc64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
@@ -130,19 +130,15 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>ipc64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>p2p_simd.lib;ipc64.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\avsproxy\avsproxy.cpp" />
-    <ClCompile Include="..\..\libp2p\p2p_api.cpp" />
-    <ClCompile Include="..\..\libp2p\v210.cpp" />
     <ClCompile Include="..\..\vsxx\vsxx_pluginmain.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libp2p\p2p.h" />
-    <ClInclude Include="..\..\libp2p\p2p_api.h" />
     <ClInclude Include="..\..\vsxx\VapourSynth++.hpp" />
     <ClInclude Include="..\..\vsxx\VapourSynth.h" />
     <ClInclude Include="..\..\vsxx\VSHelper.h" />

diff --git a/msvc/avsproxy/avsproxy.vcxproj.filters b/msvc/avsproxy/avsproxy.vcxproj.filters
@@ -13,12 +13,6 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
-    <Filter Include="Header Files\libp2p">
-      <UniqueIdentifier>{69e46d67-5883-41c1-be96-e80f8dada110}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\libp2p">
-      <UniqueIdentifier>{a03ddded-98a8-49ba-9b65-cd5e5d4c8d66}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\vsxx">
       <UniqueIdentifier>{35d6a7aa-b110-4234-9d63-9d8f0e806a3e}</UniqueIdentifier>
     </Filter>
@@ -30,23 +24,11 @@
     <ClCompile Include="..\..\avsproxy\avsproxy.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\libp2p\p2p_api.cpp">
-      <Filter>Source Files\libp2p</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\libp2p\v210.cpp">
-      <Filter>Source Files\libp2p</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\vsxx\vsxx_pluginmain.cpp">
       <Filter>Source Files\vsxx</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\libp2p\p2p.h">
-      <Filter>Header Files\libp2p</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\libp2p\p2p_api.h">
-      <Filter>Header Files\libp2p</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\vsxx\VapourSynth.h">
       <Filter>Header Files\vsxx</Filter>
     </ClInclude>
+8 −1		.gitignore
+3 −0		.gitmodules
+35 −0		Makefile
+64 −0		_msvc/libp2p.sln
+138 −0		_msvc/libp2p/libp2p.vcxproj
+33 −0		_msvc/libp2p/libp2p.vcxproj.filters
+164 −0		_msvc/libp2p_simd/libp2p_simd.vcxproj
+54 −0		_msvc/libp2p_simd/libp2p_simd.vcxproj.filters
+159 −0		_msvc/simd_test/simd_test.vcxproj
+22 −0		_msvc/simd_test/simd_test.vcxproj.filters
+161 −0		_msvc/unit_test/unit_test.vcxproj
+28 −0		_msvc/unit_test/unit_test.vcxproj.filters
+0 −17		build.sh
+0 −241		main.c
+74 −5		p2p.h
+382 −0		simd/cpuinfo_x86.cpp
+91 −0		simd/cpuinfo_x86.h
+94 −0		simd/p2p_simd.cpp
+38 −0		simd/p2p_simd.h
+214 −0		simd/p2p_sse41.cpp
+148 −0		test/api_formats_test.cpp
+279 −0		test/api_test.cpp
+1 −0		test/googletest
+210 −0		test/simd_test.cpp
+77 −0		test/v210_test.cpp