Skip to content

Commit

Permalink
Add Intel TBB
Browse files Browse the repository at this point in the history
  • Loading branch information
Xottab-DUTY committed Jan 12, 2018
1 parent de37d6a commit 842ba40
Show file tree
Hide file tree
Showing 6 changed files with 1,043 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@
[submodule "Externals/gli"]
path = Externals/gli
url = https://github.com/g-truc/gli.git
[submodule "Externals/tbb"]
path = Externals/tbb
url = https://github.com/01org/tbb.git
1 change: 1 addition & 0 deletions Externals/tbb
Submodule tbb added at 4c73c3
432 changes: 432 additions & 0 deletions Externals/tbb.vcxproj

Large diffs are not rendered by default.

341 changes: 341 additions & 0 deletions Externals/tbbmalloc.vcxproj

Large diffs are not rendered by default.

221 changes: 221 additions & 0 deletions Externals/tbbmalloc_proxy.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Mixed|Win32">
<Configuration>Mixed</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Mixed|x64">
<Configuration>Mixed</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}</ProjectGuid>
<RootNamespace>tbbmalloc_proxy</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(SolutionDir)Common.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules />
<CodeAnalysisRuleAssemblies />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHsc /GR /DTBB_USE_DEBUG /D__TBB_LIB_NAME=tbb_debug.lib /DDO_ITT_NOTIFY /GS /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0502 /W4 /D__TBBMALLOC_BUILD=1 /Itbb/src /Itbb/src/rml/include /Itbb/include /Itbb/src/tbbmalloc /Itbb/src/tbbmalloc</AdditionalOptions>
<AdditionalIncludeDirectories>tbb/build/vs2013;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ExceptionHandling>Sync</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<Link>
<AdditionalOptions>/DLL /MAP /DEBUG /fixed:no %(AdditionalOptions)</AdditionalOptions>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>tbb\build\vs2013;</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalOptions> /c /MDd /Od /Ob0 /Zi /EHsc /GR /DTBB_USE_DEBUG /D__TBB_LIB_NAME=tbb_debug.lib /DDO_ITT_NOTIFY /GS /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0502 /W4 /D__TBBMALLOC_BUILD=1 /Itbb/src /Itbb/src/rml/include /Itbb/include /Itbb/src/tbbmalloc /Itbb/src/tbbmalloc</AdditionalOptions>
<AdditionalIncludeDirectories>tbb/build/vs2013;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<Link>
<AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>tbb\build\vs2013;</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions> /c /MD /O2 /Zi /EHsc /GR /D__TBB_LIB_NAME=tbb.lib /DDO_ITT_NOTIFY /GS /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0502 /W4 /D__TBBMALLOC_BUILD=1 /Itbb/src /Itbb/src/rml/include /Itbb/include /Itbb/src/tbbmalloc /Itbb/src/tbbmalloc</AdditionalOptions>
<AdditionalIncludeDirectories>tbb/build/vs2013;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<Link>
<AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no %(AdditionalOptions)</AdditionalOptions>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>tbb\build\vs2013;</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
<ClCompile>
<AdditionalOptions> /c /MD /O2 /Zi /EHsc /GR /D__TBB_LIB_NAME=tbb.lib /DDO_ITT_NOTIFY /GS /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0502 /W4 /D__TBBMALLOC_BUILD=1 /Itbb/src /Itbb/src/rml/include /Itbb/include /Itbb/src/tbbmalloc /Itbb/src/tbbmalloc</AdditionalOptions>
<AdditionalIncludeDirectories>tbb/build/vs2013;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<Link>
<AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no %(AdditionalOptions)</AdditionalOptions>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>tbb\build\vs2013;</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions> /c /MD /O2 /Zi /EHsc /GR /D__TBB_LIB_NAME=tbb.lib /DDO_ITT_NOTIFY /GS /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0502 /W4 /D__TBBMALLOC_BUILD=1 /Itbb/src /Itbb/src/rml/include /Itbb/include /Itbb/src/tbbmalloc /Itbb/src/tbbmalloc</AdditionalOptions>
<AdditionalIncludeDirectories>tbb/build/vs2013;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<Link>
<AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>tbb\build\vs2013;</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
<ClCompile>
<AdditionalOptions> /c /MD /O2 /Zi /EHsc /GR /D__TBB_LIB_NAME=tbb.lib /DDO_ITT_NOTIFY /GS /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0502 /W4 /D__TBBMALLOC_BUILD=1 /Itbb/src /Itbb/src/rml/include /Itbb/include /Itbb/src/tbbmalloc /Itbb/src/tbbmalloc</AdditionalOptions>
<AdditionalIncludeDirectories>tbb/build/vs2013;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ExceptionHandling>
</ExceptionHandling>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<Link>
<AdditionalOptions>/nologo /DLL /MAP /DEBUG /fixed:no /INCREMENTAL:NO %(AdditionalOptions)</AdditionalOptions>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>tbb\build\vs2013;</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="tbbmalloc.vcxproj">
<Project>{b15f131e-328a-4d42-adc2-9ff4ca6306d8}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClInclude Include="tbb\src\tbbmalloc\proxy.h" />
<ClInclude Include="tbb\src\tbbmalloc\tbb_function_replacement.h" />
<ClInclude Include="tbb\include\tbb\tbbmalloc_proxy.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="tbb\src\tbbmalloc\tbbmalloc.rc">
<AdditionalOptions>/Itbb/src /Itbb/include /DDO_ITT_NOTIFY /DUSE_WINTHREAD /D_CRT_SECURE_NO_DEPRECATE /D_WIN32_WINNT=0x0400 %(AdditionalOptions)</AdditionalOptions>
</ResourceCompile>
<ClCompile Include="tbb\src\tbbmalloc\proxy.cpp" />
<ClCompile Include="tbb\src\tbbmalloc\tbb_function_replacement.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>
45 changes: 45 additions & 0 deletions src/engine.sln
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\Externals\lib
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OPCODE", "..\Externals\OPCODE\OPCODE.vcxproj", "{DAFD6D98-3DCD-40AD-BC85-EC71797B6767}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbb", "..\Externals\tbb.vcxproj", "{F62787DD-1327-448B-9818-030062BCFAA5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbbmalloc", "..\Externals\tbbmalloc.vcxproj", "{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tbbmalloc_proxy", "..\Externals\tbbmalloc_proxy.vcxproj", "{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Expand Down Expand Up @@ -1071,6 +1077,42 @@ Global
{DAFD6D98-3DCD-40AD-BC85-EC71797B6767}.Release|x64.Build.0 = Release|x64
{DAFD6D98-3DCD-40AD-BC85-EC71797B6767}.Release|x86.ActiveCfg = Release|Win32
{DAFD6D98-3DCD-40AD-BC85-EC71797B6767}.Release|x86.Build.0 = Release|Win32
{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.ActiveCfg = Debug|x64
{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x64.Build.0 = Debug|x64
{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x86.ActiveCfg = Debug|Win32
{F62787DD-1327-448B-9818-030062BCFAA5}.Debug|x86.Build.0 = Debug|Win32
{F62787DD-1327-448B-9818-030062BCFAA5}.Mixed|x64.ActiveCfg = Mixed|x64
{F62787DD-1327-448B-9818-030062BCFAA5}.Mixed|x64.Build.0 = Mixed|x64
{F62787DD-1327-448B-9818-030062BCFAA5}.Mixed|x86.ActiveCfg = Mixed|Win32
{F62787DD-1327-448B-9818-030062BCFAA5}.Mixed|x86.Build.0 = Mixed|Win32
{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.ActiveCfg = Release|x64
{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x64.Build.0 = Release|x64
{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x86.ActiveCfg = Release|Win32
{F62787DD-1327-448B-9818-030062BCFAA5}.Release|x86.Build.0 = Release|Win32
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.ActiveCfg = Debug|x64
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x64.Build.0 = Debug|x64
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x86.ActiveCfg = Debug|Win32
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Debug|x86.Build.0 = Debug|Win32
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Mixed|x64.ActiveCfg = Mixed|x64
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Mixed|x64.Build.0 = Mixed|x64
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Mixed|x86.ActiveCfg = Mixed|Win32
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Mixed|x86.Build.0 = Mixed|Win32
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.ActiveCfg = Release|x64
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x64.Build.0 = Release|x64
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x86.ActiveCfg = Release|Win32
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8}.Release|x86.Build.0 = Release|Win32
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Debug|x64.ActiveCfg = Debug|x64
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Debug|x64.Build.0 = Debug|x64
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Debug|x86.ActiveCfg = Debug|Win32
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Debug|x86.Build.0 = Debug|Win32
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Mixed|x64.ActiveCfg = Mixed|x64
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Mixed|x64.Build.0 = Mixed|x64
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Mixed|x86.ActiveCfg = Mixed|Win32
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Mixed|x86.Build.0 = Mixed|Win32
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Release|x64.ActiveCfg = Release|x64
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Release|x64.Build.0 = Release|x64
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Release|x86.ActiveCfg = Release|Win32
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1141,6 +1183,9 @@ Global
{632AEEB6-DC06-4E15-9551-B2B09A4B73C5} = {DAEF6FB5-4F98-4B34-B049-8828EFEC9250}
{3593C424-83CC-4445-BE1A-97DDE88FE386} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{DAFD6D98-3DCD-40AD-BC85-EC71797B6767} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{F62787DD-1327-448B-9818-030062BCFAA5} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{B15F131E-328A-4D42-ADC2-9FF4CA6306D8} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{02F61511-D5B6-46E6-B4BB-DEAA96E6BCC7} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C5A32302-94F5-41B8-9606-017BB6BA69A6}
Expand Down

0 comments on commit 842ba40

Please sign in to comment.