diff options
| author | Daniel Podder <dapodd@microsoft.com> | 2017-06-13 01:14:34 -0700 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-06-13 10:14:34 +0200 |
| commit | a3ebe55ad325b1a68c5418a5e163ddbf71168a73 (patch) | |
| tree | 9f652c026eb3d32d54cacc42b08fc0fe3ff1cc1f | |
| parent | e977dde4c5f5210447564ca8779d3c6c00eaf7c1 (diff) | |
| download | coreclr-a3ebe55ad325b1a68c5418a5e163ddbf71168a73.tar.gz coreclr-a3ebe55ad325b1a68c5418a5e163ddbf71168a73.tar.bz2 coreclr-a3ebe55ad325b1a68c5418a5e163ddbf71168a73.zip | |
Fix Linux PGO optdata consumption + PGO count update (#12239)
* Update PGO package version to 20170612-1411
* Fix PGO optdata path issue on Linux
| -rw-r--r-- | dir.props | 2 | ||||
| -rw-r--r-- | pgosupport.cmake | 8 |
2 files changed, 6 insertions, 4 deletions
@@ -23,7 +23,7 @@ <!-- Profile-based optimization data package versions --> <PropertyGroup> - <PgoDataPackageVersion>99.99.99-master-20170609-1125</PgoDataPackageVersion> + <PgoDataPackageVersion>99.99.99-master-20170612-1411</PgoDataPackageVersion> <!--<IbcDataPackageVersion></IbcDataPackageVersion>--> </PropertyGroup> diff --git a/pgosupport.cmake b/pgosupport.cmake index 1f8ee9c8db..f3d00b7505 100644 --- a/pgosupport.cmake +++ b/pgosupport.cmake @@ -15,12 +15,14 @@ function(add_pgo TargetName) endif(WIN32) set(CLR_CMAKE_OPTDATA_PACKAGEWITHRID "optimization.${CLR_CMAKE_TARGET_OS}-${CLR_CMAKE_TARGET_ARCH}.PGO.CoreCLR") + + # On case-sensitive file systems, NuGet packages are restored to lowercase paths + string(TOLOWER "${CLR_CMAKE_OPTDATA_PACKAGEWITHRID}/${CLR_CMAKE_OPTDATA_VERSION}" OptDataVersionedSubPath) + file(TO_NATIVE_PATH - "${CLR_CMAKE_PACKAGES_DIR}/${CLR_CMAKE_OPTDATA_PACKAGEWITHRID}/${CLR_CMAKE_OPTDATA_VERSION}/data/${ProfileFileName}" + "${CLR_CMAKE_PACKAGES_DIR}/${OptDataVersionedSubPath}/data/${ProfileFileName}" ProfilePath ) - # NuGet packages are restored to lowercase paths - string(TOLOWER "${ProfilePath}" ProfilePath) if(CLR_CMAKE_PGO_INSTRUMENT) if(WIN32) |