Skip to content

Commit

Permalink
Adjust PGO for VS files.
Browse files Browse the repository at this point in the history
- Remove extra PGO configuration from VS2017 project.
- Make sure all PGO files point to temporary paths not commited to the repository.
- Remove shared PGO file from repository.
- Remove unused VS2015 GUI project file
- Remove vs2019 project filter file
  • Loading branch information
scamille committed Sep 4, 2020
1 parent 6640d3a commit f64c5b3
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 836 deletions.
Binary file removed SimulationCraft.pgd
Binary file not shown.
8 changes: 4 additions & 4 deletions simulationcraft.pri
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ win32 {
}

# Allow PGO builds on Visual Studio 2015+
!isEmpty(PGO):win32-msvc:greaterThan(QMAKE_MSC_VER, 1899) {
QMAKE_CXXFLAGS_RELEASE += /GL
QMAKE_LFLAGS_RELEASE += /LTCG /USEPROFILE /PGD:"..\SimulationCraft.pgd"
}
#!isEmpty(PGO):win32-msvc:greaterThan(QMAKE_MSC_VER, 1899) {
# QMAKE_CXXFLAGS_RELEASE += /GL
# QMAKE_LFLAGS_RELEASE += /LTCG /USEPROFILE /PGD:"..\SimulationCraft.pgd"
#}
}

# Curl is now required for everything, on MacOS use the default system curl (library with
Expand Down
47 changes: 2 additions & 45 deletions vs/simc_vs2017.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
<Profile>false</Profile>
<LargeAddressAware>true</LargeAddressAware>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<ProfileGuidedDatabase>$(SolutionDir)\$(PlatformShortName)\$(Configuration)\Simulationcraft.pgd</ProfileGuidedDatabase>
<ProfileGuidedDatabase>$(SolutionDir)\$(PlatformShortName)\$(Configuration)\simc.pgd</ProfileGuidedDatabase>
<AdditionalDependencies>crypt32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
Expand Down Expand Up @@ -197,52 +197,9 @@
<Profile>false</Profile>
<LargeAddressAware>true</LargeAddressAware>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
<ProfileGuidedDatabase>$(SolutionDir)\$(PlatformShortName)\$(Configuration)\Simulationcraft.pgd</ProfileGuidedDatabase>
<ProfileGuidedDatabase>$(SolutionDir)\$(PlatformShortName)\$(Configuration)\simc.pgd</ProfileGuidedDatabase>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='WebEngine-PGO|x64'">
<ClCompile>
<AdditionalOptions> /w34263 /w34264 /w34265 /w34266 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Full</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<PreprocessorDefinitions>SC_DEFAULT_APIKEY="$(SC_DEFAULT_APIKEY)";WIN32;NDEBUG;_NO_DEBUG;_CONSOLE;WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>TurnOffAllWarnings</WarningLevel>
<Debug-WebEngineInformationFormat>ProgramDatabase</Debug-WebEngineInformationFormat>
<DisableSpecificWarnings>4005;4996;6011;6386;6246;6313;6102;6330;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<OmitFramePointers>true</OmitFramePointers>
<EnablePREfast>false</EnablePREfast>
<StringPooling>true</StringPooling>
<AdditionalIncludeDirectories>$(ProjectDir)..\engine;$(ProjectDir)..\engine/util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<FloatingPointModel>Fast</FloatingPointModel>
<WholeProgramOptimization>true</WholeProgramOptimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<BrowseInformation>false</BrowseInformation>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<GenerateDebug-WebEngineInformation>false</GenerateDebug-WebEngineInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<Profile>false</Profile>
<LargeAddressAware>true</LargeAddressAware>
<LinkTimeCodeGeneration>PGUpdate</LinkTimeCodeGeneration>
<ProfileGuidedDatabase>$(SolutionDir)\Simulationcraft.pgd</ProfileGuidedDatabase>
<GenerateDebugInformation>No</GenerateDebugInformation>
<AdditionalDependencies>crypt32.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command />
</PostBuildEvent>
<PostBuildEvent>
<Message />
</PostBuildEvent>
</ItemDefinitionGroup>
<Import Project="..\source_files\VS_engine.props" />
<Import Project="..\source_files\VS_engine_main.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
Loading

0 comments on commit f64c5b3

Please sign in to comment.