Changeset 30981

Show
Ignore:
Timestamp:
03/11/08 22:40:03 (2 years ago)
Author:
sfalken@apple.com
Message:

JavaScriptCore:

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:
Location:
trunk
Files:
1 added
9 modified

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r30953 r30981  
     12008-03-11  Steve Falkenburg  <sfalken@apple.com> 
     2 
     3        Disable LTCG/PGO for grammar.cpp and nodes.cpp. 
     4        PGO on these files causes us to hang. 
     5         
     6        Copy newer vsprops files from relative WebKitLibraries path to environment variable based path. 
     7         
     8        Reviewed by Oliver. 
     9 
     10        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: 
     11        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make: 
     12 
    1132008-03-10  Darin Adler  <darin@apple.com> 
    214 
  • trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj

    r30920 r30981  
    442442                                RelativePath="..\..\kjs\nodes.cpp" 
    443443                                > 
     444                                <FileConfiguration 
     445                                        Name="Release|Win32" 
     446                                        > 
     447                                        <Tool 
     448                                                Name="VCCLCompilerTool" 
     449                                                WholeProgramOptimization="false" 
     450                                        /> 
     451                                </FileConfiguration> 
    444452                        </File> 
    445453                        <File 
     
    605613                                        RelativePath="$(WebKitOutputDir)\obj\$(ProjectName)\DerivedSources\grammar.cpp" 
    606614                                        > 
     615                                        <FileConfiguration 
     616                                                Name="Release|Win32" 
     617                                                > 
     618                                                <Tool 
     619                                                        Name="VCCLCompilerTool" 
     620                                                        WholeProgramOptimization="false" 
     621                                                /> 
     622                                        </FileConfiguration> 
    607623                                </File> 
    608624                                <File 
  • trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make

    r30946 r30981  
    11all: 
     2    -xcopy /y/d/e/i "..\..\..\WebKitLibraries\win\tools" "$(WEBKITLIBRARIESDIR)\tools" 
    23    set PATH=%PATH%;%SystemDrive%\cygwin\bin 
    34    touch "$(WEBKITOUTPUTDIR)\buildfailed" 
  • trunk/WebCore/ChangeLog

    r30980 r30981  
     12008-03-11  Steve Falkenburg  <sfalken@apple.com> 
     2 
     3        Disable LTCG/PGO for all of WebCore for now. 
     4        We'll re-enable this as part of follow-on PGO work. 
     5         
     6        Reviewed by Oliver. 
     7 
     8        * WebCore.vcproj/WebCore.vcproj: 
     9 
    1102008-03-11  Darin Adler  <darin@apple.com> 
    211 
  • trunk/WebCore/WebCore.vcproj/WebCore.vcproj

    r30974 r30981  
    103103                        <Tool 
    104104                                Name="VCCLCompilerTool" 
     105                                WholeProgramOptimization="false" 
    105106                                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;" 
    106107                                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" 
     
    394395                                        <Tool 
    395396                                                Name="VCCLCompilerTool" 
     397                                                WholeProgramOptimization="false" 
    396398                                                UsePrecompiledHeader="0" 
    397399                                                DisableSpecificWarnings="4065;4702" 
  • trunk/WebKit/win/ChangeLog

    r30967 r30981  
     12008-03-11  Steve Falkenburg  <sfalken@apple.com> 
     2 
     3        Use PGO to build WebKit.dll. 
     4         
     5        Reviewed by Oliver. 
     6 
     7        * WebKit.vcproj/WebKit.pgd: Added. 
     8        * WebKit.vcproj/WebKit.vcproj: 
     9 
    1102008-03-11  Brent Fulgham  <bfulgham@gmail.com> 
    211 
  • trunk/WebKit/win/WebKit.vcproj/WebKit.vcproj

    r30920 r30981  
    116116                        <Tool 
    117117                                Name="VCCLCompilerTool" 
     118                                WholeProgramOptimization="false" 
    118119                                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;" 
    119120                                PreprocessorDefinitions="_USRDLL;WEBKIT_EXPORTS;ENABLE_CROSS_DOCUMENT_MESSAGING;ENABLE_XSLT;ENABLE_XPATH;ENABLE_SVG;FRAMEWORK_NAME=WebKit" 
     
    140141                                ModuleDefinitionFile="WebKit$(WebKitDLLConfigSuffix).def" 
    141142                                DelayLoadDLLs="comdlg32.dll;usp10.dll;comctl32.dll;version.dll;libxslt$(LibraryConfigSuffix).dll;SQLite3$(LibraryConfigSuffix).dll;msimg32.dll;QTMovieWin$(WebKitConfigSuffix).dll" 
     143                                LinkTimeCodeGeneration="4" 
     144                                ProfileGuidedDatabase="$(TargetName).pgd" 
    142145                        /> 
    143146                        <Tool 
  • trunk/WebKitLibraries/ChangeLog

    r30691 r30981  
     12008-03-11  Steve Falkenburg  <sfalken@apple.com> 
     2 
     3        Disable two PGO/LTCG specific warnings. 
     4         
     5        Reviewed by Oliver. 
     6 
     7        * win/tools/vsprops/common.vsprops: 
     8 
    192008-02-29  Mark Rowe  <mrowe@apple.com> 
    210 
  • trunk/WebKitLibraries/win/tools/vsprops/common.vsprops

    r29916 r30981  
    1616                WarnAsError="true" 
    1717                DebugInformationFormat="3" 
    18                 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" 
     18                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" 
    1919        /> 
    2020        <Tool 
     
    4040        /> 
    4141        <Tool 
     42                Name="VCPostBuildEventTool" 
     43                CommandLine="" 
     44        /> 
     45        <Tool 
     46                Name="VCPreBuildEventTool" 
     47                CommandLine="" 
     48        /> 
     49        <Tool 
    4250                Name="VCResourceCompilerTool" 
    4351                Culture="1033"