fixed for avx

bab2min · Jul 16, 2021 · 7fc41db · 7fc41db
1 parent be2b4dd
commit 7fc41db
Show file tree

Hide file tree

Showing 3 changed files with 133 additions and 66 deletions.
diff --git a/EigenRand.sln b/EigenRand.sln
@@ -25,10 +25,6 @@ Global
 		RelAVX2|ARM64 = RelAVX2|ARM64
 		RelAVX2|x64 = RelAVX2|x64
 		RelAVX2|x86 = RelAVX2|x86
-		Release|ARM = Release|ARM
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 		RelNoVect|ARM = RelNoVect|ARM
 		RelNoVect|ARM64 = RelNoVect|ARM64
 		RelNoVect|x64 = RelNoVect|x64
@@ -63,14 +59,6 @@ Global
 		{F45E39EE-2863-4550-8531-31723AD0BC09}.RelAVX2|x64.Build.0 = RelAVX2|x64
 		{F45E39EE-2863-4550-8531-31723AD0BC09}.RelAVX2|x86.ActiveCfg = RelAVX2|Win32
 		{F45E39EE-2863-4550-8531-31723AD0BC09}.RelAVX2|x86.Build.0 = RelAVX2|Win32
-		{F45E39EE-2863-4550-8531-31723AD0BC09}.Release|ARM.ActiveCfg = RelSSE2|ARM
-		{F45E39EE-2863-4550-8531-31723AD0BC09}.Release|ARM.Build.0 = RelSSE2|ARM
-		{F45E39EE-2863-4550-8531-31723AD0BC09}.Release|ARM64.ActiveCfg = RelSSE2|ARM64
-		{F45E39EE-2863-4550-8531-31723AD0BC09}.Release|ARM64.Build.0 = RelSSE2|ARM64
-		{F45E39EE-2863-4550-8531-31723AD0BC09}.Release|x64.ActiveCfg = RelSSE2|x64
-		{F45E39EE-2863-4550-8531-31723AD0BC09}.Release|x64.Build.0 = RelSSE2|x64
-		{F45E39EE-2863-4550-8531-31723AD0BC09}.Release|x86.ActiveCfg = RelSSE2|Win32
-		{F45E39EE-2863-4550-8531-31723AD0BC09}.Release|x86.Build.0 = RelSSE2|Win32
 		{F45E39EE-2863-4550-8531-31723AD0BC09}.RelNoVect|ARM.ActiveCfg = RelNoVect|ARM
 		{F45E39EE-2863-4550-8531-31723AD0BC09}.RelNoVect|ARM.Build.0 = RelNoVect|ARM
 		{F45E39EE-2863-4550-8531-31723AD0BC09}.RelNoVect|ARM64.ActiveCfg = RelNoVect|ARM64
@@ -111,14 +99,6 @@ Global
 		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.RelAVX2|x64.Build.0 = RelAVX2|x64
 		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.RelAVX2|x86.ActiveCfg = RelAVX2|Win32
 		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.RelAVX2|x86.Build.0 = RelAVX2|Win32
-		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.Release|ARM.ActiveCfg = RelSSE2|ARM
-		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.Release|ARM.Build.0 = RelSSE2|ARM
-		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.Release|ARM64.ActiveCfg = RelSSE2|ARM64
-		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.Release|ARM64.Build.0 = RelSSE2|ARM64
-		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.Release|x64.ActiveCfg = RelSSE2|x64
-		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.Release|x64.Build.0 = RelSSE2|x64
-		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.Release|x86.ActiveCfg = RelSSE2|Win32
-		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.Release|x86.Build.0 = RelSSE2|Win32
 		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.RelNoVect|ARM.ActiveCfg = RelNoVect|ARM
 		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.RelNoVect|ARM.Build.0 = RelNoVect|ARM
 		{8A7F8C9A-2E06-4767-8BBA-E1DE1CB341AB}.RelNoVect|ARM64.ActiveCfg = RelNoVect|ARM64
@@ -159,14 +139,6 @@ Global
 		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.RelAVX2|x64.Build.0 = RelAVX2|x64
 		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.RelAVX2|x86.ActiveCfg = RelAVX2|Win32
 		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.RelAVX2|x86.Build.0 = RelAVX2|Win32
-		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.Release|ARM.ActiveCfg = RelSSE2|ARM
-		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.Release|ARM.Build.0 = RelSSE2|ARM
-		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.Release|ARM64.ActiveCfg = RelSSE2|ARM64
-		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.Release|ARM64.Build.0 = RelSSE2|ARM64
-		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.Release|x64.ActiveCfg = RelSSE2|x64
-		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.Release|x64.Build.0 = RelSSE2|x64
-		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.Release|x86.ActiveCfg = RelSSE2|Win32
-		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.Release|x86.Build.0 = RelSSE2|Win32
 		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.RelNoVect|ARM.ActiveCfg = RelNoVect|ARM
 		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.RelNoVect|ARM.Build.0 = RelNoVect|ARM
 		{85BACD1D-1D4F-4084-8C6A-5C3AC938FE50}.RelNoVect|ARM64.ActiveCfg = RelNoVect|ARM64
@@ -189,44 +161,38 @@ Global
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.Debug|x64.Build.0 = Debug|x64
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.Debug|x86.ActiveCfg = Debug|Win32
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.Debug|x86.Build.0 = Debug|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|ARM.ActiveCfg = Debug|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|ARM.Build.0 = Debug|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|ARM.ActiveCfg = RelAVX|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|ARM.Build.0 = RelAVX|Win32
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|ARM64.ActiveCfg = Debug|Win32
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|ARM64.Build.0 = Debug|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|x64.ActiveCfg = Release|x64
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|x64.Build.0 = Release|x64
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|x86.ActiveCfg = Release|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|x86.Build.0 = Release|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|ARM.ActiveCfg = Debug|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|ARM.Build.0 = Debug|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|x64.ActiveCfg = RelAVX|x64
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|x64.Build.0 = RelAVX|x64
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|x86.ActiveCfg = RelSSE2|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX|x86.Build.0 = RelSSE2|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|ARM.ActiveCfg = RelAVX2|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|ARM.Build.0 = RelAVX2|Win32
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|ARM64.ActiveCfg = Debug|Win32
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|ARM64.Build.0 = Debug|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|x64.ActiveCfg = Release|x64
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|x64.Build.0 = Release|x64
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|x86.ActiveCfg = Release|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|x86.Build.0 = Release|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.Release|ARM.ActiveCfg = Release|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.Release|ARM64.ActiveCfg = Release|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.Release|x64.ActiveCfg = Release|x64
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.Release|x64.Build.0 = Release|x64
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.Release|x86.ActiveCfg = Release|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.Release|x86.Build.0 = Release|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|x64.ActiveCfg = RelAVX2|x64
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|x64.Build.0 = RelAVX2|x64
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|x86.ActiveCfg = RelSSE2|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelAVX2|x86.Build.0 = RelSSE2|Win32
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|ARM.ActiveCfg = Debug|Win32
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|ARM.Build.0 = Debug|Win32
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|ARM64.ActiveCfg = Debug|Win32
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|ARM64.Build.0 = Debug|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|x64.ActiveCfg = Release|x64
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|x64.Build.0 = Release|x64
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|x86.ActiveCfg = Release|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|x86.Build.0 = Release|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|ARM.ActiveCfg = Debug|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|ARM.Build.0 = Debug|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|x64.ActiveCfg = RelSSE2|x64
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|x64.Build.0 = RelSSE2|x64
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|x86.ActiveCfg = RelSSE2|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelNoVect|x86.Build.0 = RelSSE2|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|ARM.ActiveCfg = RelSSE2|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|ARM.Build.0 = RelSSE2|Win32
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|ARM64.ActiveCfg = Debug|Win32
 		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|ARM64.Build.0 = Debug|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|x64.ActiveCfg = Release|x64
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|x64.Build.0 = Release|x64
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|x86.ActiveCfg = Release|Win32
-		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|x86.Build.0 = Release|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|x64.ActiveCfg = RelSSE2|x64
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|x64.Build.0 = RelSSE2|x64
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|x86.ActiveCfg = RelSSE2|Win32
+		{643D8602-FE0D-4EAF-841C-E690EE6E53FD}.RelSSE2|x86.Build.0 = RelSSE2|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/EigenRand/arch/AVX/MorePacketMath.h b/EigenRand/arch/AVX/MorePacketMath.h
@@ -18,7 +18,6 @@ namespace Eigen
 {
 	namespace internal
 	{
-#ifdef EIGEN_VECTORIZE_AVX2
 		template<>
 		struct IsIntPacket<Packet8i> : std::true_type {};
 
@@ -33,7 +32,7 @@ namespace Eigen
 		{
 			using type = Packet4f;
 		};
-#endif
+
 		template<>
 		struct IsFloatPacket<Packet8f> : std::true_type {};
 

diff --git a/test/test.vcxproj b/test/test.vcxproj
@@ -5,16 +5,32 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+    <ProjectConfiguration Include="RelSSE2|Win32">
+      <Configuration>RelSSE2</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+    <ProjectConfiguration Include="RelSSE2|x64">
+      <Configuration>RelSSE2</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelAVX2|Win32">
+      <Configuration>RelAVX2</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelAVX2|x64">
+      <Configuration>RelAVX2</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelAVX|Win32">
+      <Configuration>RelAVX</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelAVX|x64">
+      <Configuration>RelAVX</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -35,13 +51,25 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <IncludePath>$(SolutionDir);E:\AddInclude;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelSSE2|Win32'">
+    <IncludePath>$(SolutionDir);E:\AddInclude;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelAVX2|Win32'">
+    <IncludePath>$(SolutionDir);E:\AddInclude;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelAVX|Win32'">
     <IncludePath>$(SolutionDir);E:\AddInclude;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IncludePath>$(SolutionDir);E:\AddInclude;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelSSE2|x64'">
+    <IncludePath>$(SolutionDir);E:\AddInclude;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelAVX2|x64'">
+    <IncludePath>$(SolutionDir);E:\AddInclude;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelAVX|x64'">
     <IncludePath>$(SolutionDir);E:\AddInclude;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
   <ItemGroup>
@@ -87,7 +115,43 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelSSE2|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelAVX2|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelAVX|Win32'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>
@@ -96,6 +160,43 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelSSE2|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelAVX2|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -104,7 +205,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelAVX|x64'">
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>
@@ -113,6 +214,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>