Commit 5aebe18a by Nicolas Capens

Build Subzero from the subtree directory.

The submodule is at /third-party/pnacl-subzero The subtree is at /third-party/subzero Bug swiftshader:47 Bug b/37478805 Change-Id: I2da86151f111448e962b6b24c085a2f288de18b4 Reviewed-on: https://swiftshader-review.googlesource.com/9608Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarCorentin Wallez <cwallez@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent f110e4d2
...@@ -114,7 +114,7 @@ set(SOURCE_DIR ${CMAKE_SOURCE_DIR}/src) ...@@ -114,7 +114,7 @@ set(SOURCE_DIR ${CMAKE_SOURCE_DIR}/src)
set(OPENGL_DIR ${SOURCE_DIR}/OpenGL) set(OPENGL_DIR ${SOURCE_DIR}/OpenGL)
set(OPENGL_COMPILER_DIR ${OPENGL_DIR}/compiler) set(OPENGL_COMPILER_DIR ${OPENGL_DIR}/compiler)
set(LLVM_DIR ${CMAKE_SOURCE_DIR}/third_party/LLVM) set(LLVM_DIR ${CMAKE_SOURCE_DIR}/third_party/LLVM)
set(SUBZERO_DIR ${CMAKE_SOURCE_DIR}/third_party/pnacl-subzero) set(SUBZERO_DIR ${CMAKE_SOURCE_DIR}/third_party/subzero)
set(SUBZERO_LLVM_DIR ${CMAKE_SOURCE_DIR}/third_party/llvm-subzero) set(SUBZERO_LLVM_DIR ${CMAKE_SOURCE_DIR}/third_party/llvm-subzero)
set(TESTS_DIR ${CMAKE_SOURCE_DIR}/tests) set(TESTS_DIR ${CMAKE_SOURCE_DIR}/tests)
set(HELLO2_DIR ${CMAKE_SOURCE_DIR}/third_party/PowerVR_SDK/Examples/Beginner/01_HelloAPI/OGLES2) set(HELLO2_DIR ${CMAKE_SOURCE_DIR}/third_party/PowerVR_SDK/Examples/Beginner/01_HelloAPI/OGLES2)
......
...@@ -17,10 +17,10 @@ COMMON_C_INCLUDES += \ ...@@ -17,10 +17,10 @@ COMMON_C_INCLUDES += \
ifdef use_subzero ifdef use_subzero
COMMON_C_INCLUDES += \ COMMON_C_INCLUDES += \
$(LOCAL_PATH)/../third_party/pnacl-subzero/ \ $(LOCAL_PATH)/../third_party/subzero/ \
$(LOCAL_PATH)/../third_party/llvm-subzero/include/ \ $(LOCAL_PATH)/../third_party/llvm-subzero/include/ \
$(LOCAL_PATH)/../third_party/llvm-subzero/build/Android/include/ \ $(LOCAL_PATH)/../third_party/llvm-subzero/build/Android/include/ \
$(LOCAL_PATH)/../third_party/pnacl-subzero/pnacl-llvm/include/ $(LOCAL_PATH)/../third_party/subzero/pnacl-llvm/include/
else else
COMMON_C_INCLUDES += \ COMMON_C_INCLUDES += \
$(LOCAL_PATH)/../third_party/LLVM/include $(LOCAL_PATH)/../third_party/LLVM/include
......
...@@ -22,7 +22,7 @@ LOCAL_CLANG := true ...@@ -22,7 +22,7 @@ LOCAL_CLANG := true
LOCAL_MODULE := libsubzero LOCAL_MODULE := libsubzero
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
SUBZERO_PATH := ../../third_party/pnacl-subzero SUBZERO_PATH := ../../third_party/subzero
LLVMDEPENDENCIES_PATH := ../../third_party/llvm-subzero LLVMDEPENDENCIES_PATH := ../../third_party/llvm-subzero
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
......
...@@ -48,8 +48,8 @@ config("swiftshader_subzero_common_private_config") { ...@@ -48,8 +48,8 @@ config("swiftshader_subzero_common_private_config") {
} }
include_dirs = [ include_dirs = [
"../../third_party/pnacl-subzero", "../../third_party/subzero",
"../../third_party/pnacl-subzero/pnacl-llvm/include/", "../../third_party/subzero/pnacl-llvm/include/",
"../../third_party/llvm-subzero/include/", "../../third_party/llvm-subzero/include/",
] ]
...@@ -155,7 +155,7 @@ config("swiftshader_reactor_private_config") { ...@@ -155,7 +155,7 @@ config("swiftshader_reactor_private_config") {
if (use_swiftshader_with_subzero) { if (use_swiftshader_with_subzero) {
source_set("swiftshader_subzero") { source_set("swiftshader_subzero") {
subzero_dir = "../../third_party/pnacl-subzero" subzero_dir = "../../third_party/subzero"
subzero_llvm_dir = "../../third_party/llvm-subzero" subzero_llvm_dir = "../../third_party/llvm-subzero"
sources = [ sources = [
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>SZTARGET=X8632;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SZTARGET=X8632;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\pnacl-subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\pnacl-subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles> <ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>SZTARGET=X8664;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SZTARGET=X8664;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\pnacl-subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\pnacl-subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles> <ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>SZTARGET=X8632;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SZTARGET=X8632;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\pnacl-subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\pnacl-subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories>
<ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles> <ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>SZTARGET=X8664;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SZTARGET=X8664;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories> <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\pnacl-subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\pnacl-subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)third_party\subzero;$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;$(SolutionDir)third_party\subzero\pnacl-llvm\include;SubmoduleCheck</AdditionalIncludeDirectories>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations> <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
...@@ -164,120 +164,120 @@ ...@@ -164,120 +164,120 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8632.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceInstX8632.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8664.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceInstX8664.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8632.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8632.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8664.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8664.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssembler.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceAssembler.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceCfg.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceCfg.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceCfgNode.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceCfgNode.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceClFlags.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceClFlags.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceELFObjectWriter.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceELFObjectWriter.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceELFSection.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceELFSection.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceFixups.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceFixups.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceGlobalContext.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceGlobalContext.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceGlobalInits.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceGlobalInits.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInst.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceInst.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstrumentation.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceInstrumentation.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceIntrinsics.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceIntrinsics.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceLiveness.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceLiveness.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceLoopAnalyzer.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceLoopAnalyzer.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceMangling.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceMangling.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceMemory.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceMemory.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceOperand.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceOperand.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRangeSpec.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceRangeSpec.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRegAlloc.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceRegAlloc.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRevision.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceRevision.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRNG.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceRNG.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceSwitchLowering.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceSwitchLowering.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLowering.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTargetLowering.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX86.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX86.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceThreading.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceThreading.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTimerTree.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTimerTree.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTypes.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTypes.cpp" />
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceVariableSplitting.cpp" /> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceVariableSplitting.cpp" />
<ClCompile Include="Optimizer.cpp" /> <ClCompile Include="Optimizer.cpp" />
<ClCompile Include="Routine.cpp" /> <ClCompile Include="Routine.cpp" />
<ClCompile Include="SubzeroReactor.cpp" /> <ClCompile Include="SubzeroReactor.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssembler.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceAssembler.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssemblerX8632.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceAssemblerX8632.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssemblerX86Base.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceAssemblerX86Base.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssemblerX86BaseImpl.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceAssemblerX86BaseImpl.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceBitVector.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceBitVector.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceBuildDefs.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceBuildDefs.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceCfg.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceCfg.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceCfgNode.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceCfgNode.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceClFlags.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceClFlags.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceConditionCodesX8632.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceConditionCodesX8632.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceDefs.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceDefs.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceELFObjectWriter.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceELFObjectWriter.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceELFSection.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceELFSection.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceELFStreamer.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceELFStreamer.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceFixups.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceFixups.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceGlobalContext.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceGlobalContext.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceGlobalInits.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceGlobalInits.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInst.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInst.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstrumentation.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInstrumentation.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstVarIter.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInstVarIter.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8632.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInstX8632.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX86Base.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInstX86Base.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\iceinstx86baseimpl.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\iceinstx86baseimpl.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceIntrinsics.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceIntrinsics.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceLiveness.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceLiveness.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceLoopAnalyzer.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceLoopAnalyzer.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceMangling.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceMangling.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceMemory.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceMemory.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceOperand.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceOperand.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IcePhiLoweringImpl.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IcePhiLoweringImpl.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRangeSpec.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRangeSpec.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRegAlloc.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRegAlloc.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRegistersX8632.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRegistersX8632.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRegList.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRegList.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRevision.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRevision.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRNG.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRNG.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceStringPool.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceStringPool.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceSwitchLowering.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceSwitchLowering.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLowering.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLowering.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8632.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8632.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8632Traits.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8632Traits.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX86Base.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX86Base.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\icetargetloweringx86baseimpl.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\icetargetloweringx86baseimpl.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX86RegClass.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX86RegClass.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceThreading.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceThreading.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTimerTree.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTimerTree.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTLS.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTLS.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTypes.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTypes.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceUtils.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceUtils.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceVariableSplitting.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceVariableSplitting.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8664.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8664.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8664Traits.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8664Traits.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssemblerX8664.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceAssemblerX8664.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceConditionCodesX8664.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceConditionCodesX8664.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8664.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInstX8664.h" />
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRegistersX8664.h" /> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRegistersX8664.h" />
<ClInclude Include="Optimizer.hpp" /> <ClInclude Include="Optimizer.hpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceClFlags.def" /> <None Include="$(SolutionDir)third_party\subzero\src\IceClFlags.def" />
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInst.def" /> <None Include="$(SolutionDir)third_party\subzero\src\IceInst.def" />
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLowering.def" /> <None Include="$(SolutionDir)third_party\subzero\src\IceTargetLowering.def" />
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTimerTree.def" /> <None Include="$(SolutionDir)third_party\subzero\src\IceTimerTree.def" />
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTypes.def" /> <None Include="$(SolutionDir)third_party\subzero\src\IceTypes.def" />
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\SZTargets.def" /> <None Include="$(SolutionDir)third_party\subzero\src\SZTargets.def" />
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8632.def" /> <None Include="$(SolutionDir)third_party\subzero\src\IceInstX8632.def" />
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8664.def" /> <None Include="$(SolutionDir)third_party\subzero\src\IceInstX8664.def" />
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8632.def" /> <None Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8632.def" />
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8664.def" /> <None Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8664.def" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="SubzeroLLVMDependencies.vcxproj"> <ProjectReference Include="SubzeroLLVMDependencies.vcxproj">
......
...@@ -15,88 +15,88 @@ ...@@ -15,88 +15,88 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssembler.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceAssembler.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceCfg.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceCfg.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceCfgNode.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceCfgNode.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceClFlags.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceClFlags.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceELFObjectWriter.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceELFObjectWriter.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceELFSection.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceELFSection.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceFixups.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceFixups.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceGlobalContext.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceGlobalContext.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceGlobalInits.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceGlobalInits.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInst.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceInst.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstrumentation.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceInstrumentation.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceIntrinsics.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceIntrinsics.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceLiveness.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceLiveness.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceLoopAnalyzer.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceLoopAnalyzer.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceMangling.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceMangling.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceMemory.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceMemory.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceOperand.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceOperand.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRangeSpec.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceRangeSpec.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRegAlloc.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceRegAlloc.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRevision.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceRevision.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRNG.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceRNG.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceSwitchLowering.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceSwitchLowering.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLowering.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTargetLowering.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX86.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX86.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceThreading.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceThreading.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTimerTree.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTimerTree.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTypes.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTypes.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceVariableSplitting.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceVariableSplitting.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="SubzeroReactor.cpp"> <ClCompile Include="SubzeroReactor.cpp">
...@@ -105,16 +105,16 @@ ...@@ -105,16 +105,16 @@
<ClCompile Include="Routine.cpp"> <ClCompile Include="Routine.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8632.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceInstX8632.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8664.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceInstX8664.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8632.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8632.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8664.cpp"> <ClCompile Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8664.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Optimizer.cpp"> <ClCompile Include="Optimizer.cpp">
...@@ -122,172 +122,172 @@ ...@@ -122,172 +122,172 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssembler.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceAssembler.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssemblerX8632.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceAssemblerX8632.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssemblerX86Base.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceAssemblerX86Base.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssemblerX86BaseImpl.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceAssemblerX86BaseImpl.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceBitVector.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceBitVector.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceBuildDefs.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceBuildDefs.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceCfg.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceCfg.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceCfgNode.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceCfgNode.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceClFlags.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceClFlags.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceConditionCodesX8632.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceConditionCodesX8632.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceDefs.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceDefs.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceELFObjectWriter.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceELFObjectWriter.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceELFSection.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceELFSection.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceELFStreamer.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceELFStreamer.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceFixups.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceFixups.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceGlobalContext.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceGlobalContext.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceGlobalInits.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceGlobalInits.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInst.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInst.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstrumentation.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInstrumentation.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstVarIter.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInstVarIter.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8632.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInstX8632.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX86Base.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInstX86Base.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\iceinstx86baseimpl.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\iceinstx86baseimpl.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceIntrinsics.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceIntrinsics.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceLiveness.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceLiveness.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceLoopAnalyzer.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceLoopAnalyzer.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceMangling.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceMangling.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceMemory.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceMemory.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceOperand.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceOperand.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IcePhiLoweringImpl.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IcePhiLoweringImpl.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRangeSpec.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRangeSpec.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRegAlloc.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRegAlloc.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRegistersX8632.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRegistersX8632.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRegList.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRegList.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRevision.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRevision.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRNG.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRNG.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceStringPool.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceStringPool.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceSwitchLowering.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceSwitchLowering.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLowering.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLowering.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8632.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8632.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8632Traits.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8632Traits.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX86Base.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX86Base.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\icetargetloweringx86baseimpl.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\icetargetloweringx86baseimpl.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX86RegClass.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX86RegClass.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceThreading.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceThreading.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTimerTree.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTimerTree.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTLS.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTLS.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTypes.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTypes.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceUtils.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceUtils.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceVariableSplitting.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceVariableSplitting.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8664Traits.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8664Traits.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8664.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8664.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceAssemblerX8664.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceAssemblerX8664.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceConditionCodesX8664.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceConditionCodesX8664.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8664.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceInstX8664.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)third_party\pnacl-subzero\src\IceRegistersX8664.h"> <ClInclude Include="$(SolutionDir)third_party\subzero\src\IceRegistersX8664.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Optimizer.hpp"> <ClInclude Include="Optimizer.hpp">
...@@ -295,34 +295,34 @@ ...@@ -295,34 +295,34 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceClFlags.def"> <None Include="$(SolutionDir)third_party\subzero\src\IceClFlags.def">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInst.def"> <None Include="$(SolutionDir)third_party\subzero\src\IceInst.def">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLowering.def"> <None Include="$(SolutionDir)third_party\subzero\src\IceTargetLowering.def">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTimerTree.def"> <None Include="$(SolutionDir)third_party\subzero\src\IceTimerTree.def">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTypes.def"> <None Include="$(SolutionDir)third_party\subzero\src\IceTypes.def">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\SZTargets.def"> <None Include="$(SolutionDir)third_party\subzero\src\SZTargets.def">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8632.def"> <None Include="$(SolutionDir)third_party\subzero\src\IceInstX8632.def">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceInstX8664.def"> <None Include="$(SolutionDir)third_party\subzero\src\IceInstX8664.def">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8632.def"> <None Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8632.def">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
<None Include="$(SolutionDir)third_party\pnacl-subzero\src\IceTargetLoweringX8664.def"> <None Include="$(SolutionDir)third_party\subzero\src\IceTargetLoweringX8664.def">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</None> </None>
</ItemGroup> </ItemGroup>
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>SZTARGET=X8632;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SZTARGET=X8632;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\pnacl-subzero\src\;$(SolutionDir)third_party\pnacl-subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\subzero\src\;$(SolutionDir)third_party\subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles> <ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>SZTARGET=X8664;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SZTARGET=X8664;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\pnacl-subzero\src\;$(SolutionDir)third_party\pnacl-subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\subzero\src\;$(SolutionDir)third_party\subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles> <ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>SZTARGET=X8632;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SZTARGET=X8632;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\pnacl-subzero\src\;$(SolutionDir)third_party\pnacl-subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\subzero\src\;$(SolutionDir)third_party\subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles> <ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>SZTARGET=X8664;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SZTARGET=X8664;ALLOW_DUMP=0;ALLOW_TIMERS=0;ALLOW_LLVM_CL=0;ALLOW_LLVM_IR=0;ALLOW_LLVM_IR_AS_INPUT=0;ALLOW_MINIMAL_BUILD=0;ALLOW_WASM=0;ICE_THREAD_LOCAL_HACK=0;SUBZERO_USE_MICROSOFT_ABI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\pnacl-subzero\src\;$(SolutionDir)third_party\pnacl-subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\subzero\src\;$(SolutionDir)third_party\subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles> <ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles>
</ClCompile> </ClCompile>
<Link> <Link>
...@@ -167,54 +167,54 @@ ...@@ -167,54 +167,54 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\third_party\googletest\googletest\src\gtest-all.cc" /> <ClCompile Include="..\..\third_party\googletest\googletest\src\gtest-all.cc" />
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\ControlFlow.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\ControlFlow.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\DataMov.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\DataMov.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\LowLevel.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\LowLevel.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\Other.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\Other.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\XmmArith.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\XmmArith.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\ControlFlow.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\ControlFlow.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\DataMov.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\DataMov.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\LowLevel.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\LowLevel.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\Other.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\Other.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\XmmArith.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\XmmArith.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="Main.cpp" /> <ClCompile Include="Main.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\TestUtil.h"> <ClInclude Include="..\..\third_party\subzero\unittest\AssemblerX8632\TestUtil.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\TestUtil.h"> <ClInclude Include="..\..\third_party\subzero\unittest\AssemblerX8664\TestUtil.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</ClInclude> </ClInclude>
......
...@@ -21,42 +21,42 @@ ...@@ -21,42 +21,42 @@
<ClCompile Include="..\..\third_party\googletest\googletest\src\gtest-all.cc"> <ClCompile Include="..\..\third_party\googletest\googletest\src\gtest-all.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\XmmArith.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\XmmArith.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\XmmArith.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\XmmArith.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\DataMov.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\DataMov.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\DataMov.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\DataMov.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\ControlFlow.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\ControlFlow.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\ControlFlow.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\ControlFlow.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\LowLevel.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\LowLevel.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\Other.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8664\Other.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\LowLevel.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\LowLevel.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\Other.cpp"> <ClCompile Include="..\..\third_party\subzero\unittest\AssemblerX8632\Other.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8632\TestUtil.h"> <ClInclude Include="..\..\third_party\subzero\unittest\AssemblerX8632\TestUtil.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\third_party\pnacl-subzero\unittest\AssemblerX8664\TestUtil.h"> <ClInclude Include="..\..\third_party\subzero\unittest\AssemblerX8664\TestUtil.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment