summaryrefslogtreecommitdiff
path: root/pgosupport.cmake
diff options
context:
space:
mode:
authorDaniel Podder <dpodder@gmail.com>2017-09-14 17:35:42 (GMT)
committerGitHub <noreply@github.com>2017-09-14 17:35:42 (GMT)
commit6ac4c997b65d45a460368463f342477326cecd1f (patch)
tree662dd64841d1774fa53ad697a2fa83dac949820a /pgosupport.cmake
parentb5bcc13876b31e6ab83c58e7bf362410124d681f (diff)
downloadcoreclr-6ac4c997b65d45a460368463f342477326cecd1f.zip
coreclr-6ac4c997b65d45a460368463f342477326cecd1f.tar.gz
coreclr-6ac4c997b65d45a460368463f342477326cecd1f.tar.bz2
PGI: Load pgort<ver>.dll from the VS native tools env; do not `install` it (#12581)
On Windows, PGO instrumented builds (build.cmd release <arch> pgoinstrument) introduce a runtime dependency on pgort<ver>.dll for instrumented binaries. This DLL is distributed alongside the C++ compiler, and is made available via the native tools environment that ships with Visual Studio. Previously, we were using cmake to find and "install" this binary alongside the product when doing an instrumented build, so that the resulting bin\Product drop is free of any added external dependencies. However, this approach is fragile, and despite a best effort to make the implementation work across multiple VS releases, it already broke with VS 2017. To fix support for pgoinstrument on VS 2017, and to harden the implementation for future releases of VS, I'm removing the custom cmake install logic for the pgort DLL. Instead, we fall back to the officially supported method: load the correct (native tools) environment before invoking any command that uses an instrumented binary. This happens in one place in the build today--loading the JIT to crossgen System.Private.CoreLib.dll. Note that there's still an existing CLI/Setup bug that requires copying the pgort DLL. We're now doing it from within build.cmd, which is not nearly as fragile for this as cmake is. The workaround is also isolated, so when the referenced issue is fixed, the workaround (as documented) can simply be removed. Fixes #12347.
Diffstat (limited to 'pgosupport.cmake')
-rw-r--r--pgosupport.cmake38
1 files changed, 0 insertions, 38 deletions
diff --git a/pgosupport.cmake b/pgosupport.cmake
index 9472866..96ff80a 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)