JavaScriptCore:
authorsfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Mar 2008 05:40:03 +0000 (05:40 +0000)
committersfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Mar 2008 05:40:03 +0000 (05:40 +0000)
        Disable LTCG/PGO for grammar.cpp and nodes.cpp.
        PGO on these files causes us to hang.

        Copy newer vsprops files from relative WebKitLibraries path to environment variable based path.

        Reviewed by Oliver.

        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:

WebCore:

        Disable LTCG/PGO for all of WebCore for now.
        We'll re-enable this as part of follow-on PGO work.

        Reviewed by Oliver.

        * WebCore.vcproj/WebCore.vcproj:

WebKit/win:

        Use PGO to build WebKit.dll.

        Reviewed by Oliver.

        * WebKit.vcproj/WebKit.pgd: Added.
        * WebKit.vcproj/WebKit.vcproj:

WebKitLibraries:

        Disable two PGO/LTCG specific warnings.

        Reviewed by Oliver.

        * win/tools/vsprops/common.vsprops:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30981 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
WebCore/ChangeLog
WebCore/WebCore.vcproj/WebCore.vcproj
WebKit/win/ChangeLog
WebKit/win/WebKit.vcproj/WebKit.pgd [new file with mode: 0755]
WebKit/win/WebKit.vcproj/WebKit.vcproj
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/common.vsprops

index 76b8bff..98d6c52 100644 (file)
@@ -1,3 +1,15 @@
+2008-03-11  Steve Falkenburg  <sfalken@apple.com>
+
+        Disable LTCG/PGO for grammar.cpp and nodes.cpp.
+        PGO on these files causes us to hang.
+        
+        Copy newer vsprops files from relative WebKitLibraries path to environment variable based path.
+        
+        Reviewed by Oliver.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
+
 2008-03-10  Darin Adler  <darin@apple.com>
 
         - Windows build fix
index 8d49609..23c1c78 100644 (file)
                        <File\r
                                RelativePath="..\..\kjs\nodes.cpp"\r
                                >\r
+                               <FileConfiguration\r
+                                       Name="Release|Win32"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               WholeProgramOptimization="false"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\kjs\nodes.h"\r
                                <File\r
                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\grammar.cpp"\r
                                        >\r
+                                       <FileConfiguration\r
+                                               Name="Release|Win32"\r
+                                               >\r
+                                               <Tool\r
+                                                       Name="VCCLCompilerTool"\r
+                                                       WholeProgramOptimization="false"\r
+                                               />\r
+                                       </FileConfiguration>\r
                                </File>\r
                                <File\r
                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\grammar.h"\r
index 2dcc8d2..5e8be71 100644 (file)
@@ -1,4 +1,5 @@
 all:
+    -xcopy /y/d/e/i "..\..\..\WebKitLibraries\win\tools" "$(WEBKITLIBRARIESDIR)\tools"
     set PATH=%PATH%;%SystemDrive%\cygwin\bin
     touch "$(WEBKITOUTPUTDIR)\buildfailed"
     bash build-generated-files.sh "$(WEBKITOUTPUTDIR)" "$(WEBKITLIBRARIESDIR)"
index bb936b0..22e6ab4 100644 (file)
@@ -1,3 +1,12 @@
+2008-03-11  Steve Falkenburg  <sfalken@apple.com>
+
+        Disable LTCG/PGO for all of WebCore for now.
+        We'll re-enable this as part of follow-on PGO work.
+        
+        Reviewed by Oliver.
+
+        * WebCore.vcproj/WebCore.vcproj:
+
 2008-03-11  Darin Adler  <darin@apple.com>
 
         Reviewed by Sam.
index 222e193..c0267bc 100644 (file)
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               WholeProgramOptimization="false"\r
                                AdditionalIncludeDirectories="&quot;$(ProjectDir)..\&quot;;&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\bridge&quot;;&quot;$(ProjectDir)..\bridge\c&quot;;&quot;$(ProjectDir)..\css&quot;;&quot;$(ProjectDir)..\editing&quot;;&quot;$(ProjectDir)..\rendering&quot;;&quot;$(ProjectDir)..\bindings\js&quot;;&quot;$(ProjectDir)..\dom&quot;;&quot;$(ProjectDir)..\history&quot;;&quot;$(ProjectDir)..\html&quot;;&quot;$(ProjectDir)..\loader&quot;;&quot;$(ProjectDir)..\loader\icon&quot;;&quot;$(ProjectDir)..\page&quot;;&quot;$(ProjectDir)..\page\win&quot;;&quot;$(ProjectDir)..\platform&quot;;&quot;$(ProjectDir)..\platform\sql&quot;;&quot;$(ProjectDir)..\platform\win&quot;;&quot;$(ProjectDir)..\platform\network&quot;;&quot;$(ProjectDir)..\platform\network\win&quot;;&quot;$(ProjectDir)..\platform\cf&quot;;&quot;$(ProjectDir)..\platform\network\cf&quot;;&quot;$(ProjectDir)..\platform\graphics&quot;;&quot;$(ProjectDir)..\platform\text&quot;;&quot;$(ProjectDir)..\platform\graphics\cairo&quot;;&quot;$(ProjectDir)..\platform\graphics\cg&quot;;&quot;$(ProjectDir)..\platform\graphics\win&quot;;&quot;$(ProjectDir)..\platform\image-decoders&quot;;&quot;$(ProjectDir)..\platform\image-decoders\bmp&quot;;&quot;$(ProjectDir)..\platform\image-decoders\gif&quot;;&quot;$(ProjectDir)..\platform\image-decoders\ico&quot;;&quot;$(ProjectDir)..\platform\image-decoders\jpeg&quot;;&quot;$(ProjectDir)..\platform\image-decoders\png&quot;;&quot;$(ProjectDir)..\platform\image-decoders\xbm&quot;;&quot;$(ProjectDir)..\platform\image-decoders\zlib&quot;;&quot;$(ProjectDir)..\xml&quot;;&quot;$(WebKitOutputDir)\obj\WebCore\DerivedSources&quot;;&quot;$(ProjectDir)..\plugins&quot;;&quot;$(ProjectDir)..\plugins\win&quot;;&quot;$(ProjectDir)..\platform\cairo\pixman\src&quot;;&quot;$(ProjectDir)..\platform\cairo\cairo\src&quot;;&quot;$(ProjectDir)..\svg\graphics&quot;;&quot;$(ProjectDir)..\svg\graphics\cg&quot;;&quot;$(ProjectDir)..\svg\graphics\filters&quot;;&quot;$(ProjectDir)..\kcanvas&quot;;&quot;$(ProjectDir)..\kcanvas\device&quot;;&quot;$(ProjectDir)..\kcanvas\device\quartz&quot;;&quot;$(ProjectDir)..\svg&quot;;&quot;$(ProjectDir)..\storage&quot;;&quot;$(WebKitOutputDir)\include&quot;;&quot;$(WebKitOutputDir)\include\JavaScriptCore&quot;;&quot;$(ProjectDir)..\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\include&quot;;&quot;$(WebKitLibrariesDir)\include\icu&quot;;&quot;$(WebKitLibrariesDir)\include\iconv&quot;;&quot;$(WebKitLibrariesDir)\include\sqlite&quot;;&quot;$(WebKitLibrariesDir)\include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;;&quot;$(WebKitOutputDir)\include\QtMovieWin&quot;"\r
                                PreprocessorDefinitions="__WIN32__;ENABLE_CROSS_DOCUMENT_MESSAGING;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;ENABLE_SVG_AS_IMAGE;ENABLE_SVG_USE;ENABLE_SVG_FOREIGN_OBJECT;ENABLE_SVG_FONTS;WEBCORE_CONTEXT_MENUS;ENABLE_VIDEO"\r
                                UsePrecompiledHeader="2"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
+                                               WholeProgramOptimization="false"\r
                                                UsePrecompiledHeader="0"\r
                                                DisableSpecificWarnings="4065;4702"\r
                                                ForcedIncludeFiles="$(NOINHERIT)"\r
index e243bf9..4723530 100644 (file)
@@ -1,3 +1,12 @@
+2008-03-11  Steve Falkenburg  <sfalken@apple.com>
+
+        Use PGO to build WebKit.dll.
+        
+        Reviewed by Oliver.
+
+        * WebKit.vcproj/WebKit.pgd: Added.
+        * WebKit.vcproj/WebKit.vcproj:
+
 2008-03-11  Brent Fulgham  <bfulgham@gmail.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit/win/WebKit.vcproj/WebKit.pgd b/WebKit/win/WebKit.vcproj/WebKit.pgd
new file mode 100755 (executable)
index 0000000..08c8bee
Binary files /dev/null and b/WebKit/win/WebKit.vcproj/WebKit.pgd differ
index fb811c9..408dad0 100644 (file)
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
+                               WholeProgramOptimization="false"\r
                                AdditionalIncludeDirectories="&quot;$(WebKitOutputDir)\include\WebKit&quot;;&quot;$(WebKitOutputDir)\Include&quot;;&quot;$(WebKitLibrariesDir)\Include&quot;;&quot;$(WebKitOutputDir)\Include\WebCore&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore&quot;;&quot;$(WebKitOutputDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\WebCore\ForwardingHeaders&quot;;&quot;$(WebKitOutputDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitLibrariesDir)\Include\JavaScriptCore&quot;;&quot;$(WebKitOutputDir)\Include\icu&quot;;&quot;$(WebKitLibrariesDir)\Include\icu&quot;;&quot;$(WebKitLibrariesDir)\include\pthreads&quot;;&quot;$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders&quot;;&quot;$(WebKitOutputDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;;&quot;$(WebKitLibrariesDir)\Include\CoreFoundation\OSXCompatibilityHeaders\GNUCompatibility&quot;;&quot;$(ProjectDir)\..&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\..\WebCoreSupport&quot;;&quot;$(IntDir)\include&quot;;&quot;$(WebKitOutputDir)\obj\WebKit\DerivedSources&quot;"\r
                                PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;ENABLE_CROSS_DOCUMENT_MESSAGING;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit"\r
                                UsePrecompiledHeader="2"\r
                                AdditionalLibraryDirectories=""\r
                                ModuleDefinitionFile="WebKit$(WebKitDLLConfigSuffix).def"\r
                                DelayLoadDLLs="comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll"\r
+                               LinkTimeCodeGeneration="4"\r
+                               ProfileGuidedDatabase="$(TargetName).pgd"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
index aa0539d..252f527 100644 (file)
@@ -1,3 +1,11 @@
+2008-03-11  Steve Falkenburg  <sfalken@apple.com>
+
+        Disable two PGO/LTCG specific warnings.
+        
+        Reviewed by Oliver.
+
+        * win/tools/vsprops/common.vsprops:
+
 2008-02-29  Mark Rowe  <mrowe@apple.com>
 
         Update Tiger version of WebKitSystemInterface to match r30690.
index 2f247f9..6b86b33 100644 (file)
@@ -15,7 +15,7 @@
                WarningLevel="4"
                WarnAsError="true"
                DebugInformationFormat="3"
-               DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4189;4244;4275;4291;4355;4389;4510;4512;4610;4706;4800;4996;6011;6031;6211;6246;6255;6387"
+               DisableSpecificWarnings="4018;4068;4099;4100;4127;4138;4189;4244;4275;4291;4355;4389;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387"
        />
        <Tool
                Name="VCLibrarianTool"
                HeaderFileName="$(OutDir)\$(InputName).h"
        />
        <Tool
+               Name="VCPostBuildEventTool"
+               CommandLine=""
+       />
+       <Tool
+               Name="VCPreBuildEventTool"
+               CommandLine=""
+       />
+       <Tool
                Name="VCResourceCompilerTool"
                Culture="1033"
                AdditionalIncludeDirectories="&quot;$(IntDir)\include&quot;"