diff options
| -rw-r--r-- | build.cmd | 25 | ||||
| -rw-r--r-- | pgosupport.cmake | 38 |
2 files changed, 25 insertions, 38 deletions
@@ -540,6 +540,31 @@ set PATH=%PATH%;%WinDir%\Microsoft.Net\Framework64\V4.0.30319;%WinDir%\Microsoft if %__BuildNativeCoreLib% EQU 1 ( echo %__MsgPrefix%Generating native image of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType% + REM Need VS native tools environment for the **target** arch when running instrumented binaries + if %__PgoInstrument% EQU 1 ( + set __VCExecArch=%__BuildArch% + if /i [%__BuildArch%] == [x64] set __VCExecArch=amd64 + echo %__MsgPrefix%Using environment: "%__VCToolsRoot%\vcvarsall.bat" !__VCExecArch! + call "%__VCToolsRoot%\vcvarsall.bat" !__VCExecArch! + @if defined _echo @echo on + if NOT !errorlevel! == 0 ( + echo %__MsgPrefix%Error: Failed to load native tools environment for !__VCExecArch! + goto CrossgenFailure + ) + + REM HACK: Workaround for [dotnet/coreclr#13970](https://github.com/dotnet/coreclr/issues/13970) + set __PgoRtPath= + for /f "tokens=*" %%f in ('where pgort*.dll') do ( + if not defined __PgoRtPath set "__PgoRtPath=%%~f" + ) + echo %__MsgPrefix%Copying "!__PgoRtPath!" into "%__BinDir%" + copy /y "!__PgoRtPath!" "%__BinDir%" || ( + echo %__MsgPrefix%Error: copy failed + goto CrossgenFailure + ) + REM End HACK + ) + set NEXTCMD="%__CrossgenExe%" %__IbcTuning% /Platform_Assemblies_Paths "%__BinDir%"\IL /out "%__BinDir%\System.Private.CoreLib.dll" "%__BinDir%\IL\System.Private.CoreLib.dll" echo %__MsgPrefix%!NEXTCMD! !NEXTCMD! > "%__CrossGenCoreLibLog%" 2>&1 diff --git a/pgosupport.cmake b/pgosupport.cmake index 947286628c..96ff80af8d 100644 --- a/pgosupport.cmake +++ b/pgosupport.cmake @@ -1,11 +1,3 @@ -function(clr_pgo_unknown_arch) - if (WIN32) - message(FATAL_ERROR "Only AMD64, ARM and I386 are supported for PGO") - else() - message(FATAL_ERROR "PGO not currently supported on the current platform") - endif() -endfunction(clr_pgo_unknown_arch) - # Adds Profile Guided Optimization (PGO) flags to the current target function(add_pgo TargetName) if(WIN32) @@ -57,33 +49,3 @@ function(add_pgo TargetName) endif(EXISTS ${ProfilePath}) endif(CLR_CMAKE_PGO_INSTRUMENT) endfunction(add_pgo) - -if(WIN32) - if(CLR_CMAKE_PGO_INSTRUMENT) - # Instrumented PGO binaries on Windows introduce an additional runtime dependency, pgort<ver>.dll. - # Make sure we copy it next to the installed product to make it easier to redistribute the package. - - string(SUBSTRING ${CMAKE_VS_PLATFORM_TOOLSET} 1 -1 VS_PLATFORM_VERSION_NUMBER) - set(PGORT_FILENAME "pgort${VS_PLATFORM_VERSION_NUMBER}.dll") - - get_filename_component(PATH_CXX_ROOTDIR ${CMAKE_CXX_COMPILER} DIRECTORY) - - if(CLR_CMAKE_PLATFORM_ARCH_I386) - set(PATH_VS_PGORT_DLL "${PATH_CXX_ROOTDIR}/${PGORT_FILENAME}") - elseif(CLR_CMAKE_PLATFORM_ARCH_AMD64) - set(PATH_VS_PGORT_DLL "${PATH_CXX_ROOTDIR}/../amd64/${PGORT_FILENAME}") - elseif(CLR_CMAKE_PLATFORM_ARCH_ARM) - set(PATH_VS_PGORT_DLL "${PATH_CXX_ROOTDIR}/../arm/${PGORT_FILENAME}") - else() - clr_pgo_unknown_arch() - endif() - - if (EXISTS ${PATH_VS_PGORT_DLL}) - message(STATUS "Found PGO runtime: ${PATH_VS_PGORT_DLL}") - install(PROGRAMS ${PATH_VS_PGORT_DLL} DESTINATION .) - else() - message(FATAL_ERROR "file not found: ${PATH_VS_PGORT_DLL}") - endif() - - endif(CLR_CMAKE_PGO_INSTRUMENT) -endif(WIN32) |