From 064d6c9ee8f74cd7f1b88d02354c834a7c079b9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 May 2023 12:11:04 +0000 Subject: [PATCH 1/7] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20230517.3 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.23260.3 -> To Version 1.0.0-prerelease.23267.3 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 8.0.0-beta.23252.2 -> To Version 8.0.0-beta.23218.3 (parent: Microsoft.DotNet.Arcade.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 12 ++++++------ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 770749c4dc384b..fb8fca7e266512 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,4 +1,4 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac4120c1678b95..79152a2fc28bc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -112,14 +112,14 @@ 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://github.com/dotnet/sourcelink - 3f43bf1b2dead2cb51f20dc47f6dfd7981248820 + 47c52dd2ebf9edfd40abdcff999c13eb461f6ce2 - + https://github.com/dotnet/xliff-tasks - b7fb98b199d0b1b6188da4f4bf4f5accddac98d4 + 3f7d6c7e742012d9437fcb0d04cac63202d37621 @@ -319,21 +319,21 @@ https://github.com/dotnet/arcade 2d8d59065b5e090584a8e90c4371fc06ed60bdc5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - baa0269a2e1d895c328c64b6aa1bfad619a8cc7b + 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - baa0269a2e1d895c328c64b6aa1bfad619a8cc7b + 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - baa0269a2e1d895c328c64b6aa1bfad619a8cc7b + 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - baa0269a2e1d895c328c64b6aa1bfad619a8cc7b + 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc https://github.com/dotnet/hotreload-utils @@ -369,13 +369,13 @@ 2fd62c3936f5336b836f6b12df170aa0e90da767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - baa0269a2e1d895c328c64b6aa1bfad619a8cc7b + 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - baa0269a2e1d895c328c64b6aa1bfad619a8cc7b + 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc diff --git a/eng/Versions.props b/eng/Versions.props index 80f7e7edc3233f..3e98fa3de08f2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,12 +155,12 @@ 8.0.0-beta.23252.1 8.0.0-beta.23252.1 - 1.0.0-prerelease.23260.3 - 1.0.0-prerelease.23260.3 - 1.0.0-prerelease.23260.3 - 1.0.0-prerelease.23260.3 - 1.0.0-prerelease.23260.3 - 1.0.0-prerelease.23260.3 + 1.0.0-prerelease.23267.3 + 1.0.0-prerelease.23267.3 + 1.0.0-prerelease.23267.3 + 1.0.0-prerelease.23267.3 + 1.0.0-prerelease.23267.3 + 1.0.0-prerelease.23267.3 16.11.23-beta1.23063.1 2.0.0-beta4.22564.1 From 304ece0f89d511b79150429c80973d3485bcb2ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 May 2023 12:10:54 +0000 Subject: [PATCH 2/7] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20230518.7 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.23260.3 -> To Version 1.0.0-prerelease.23268.7 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09e97478e44bdc..304fc304678089 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -319,21 +319,21 @@ https://github.com/dotnet/arcade f4269875971171c278c2cd695e9ef94b6516e4be - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc + 2edc10919806c440df828bcb40543020948183aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc + 2edc10919806c440df828bcb40543020948183aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc + 2edc10919806c440df828bcb40543020948183aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc + 2edc10919806c440df828bcb40543020948183aa https://github.com/dotnet/hotreload-utils @@ -369,13 +369,13 @@ 2fd62c3936f5336b836f6b12df170aa0e90da767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc + 2edc10919806c440df828bcb40543020948183aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1ba3a8d9e6597964d0db2c58744f6541a0a4b3bc + 2edc10919806c440df828bcb40543020948183aa diff --git a/eng/Versions.props b/eng/Versions.props index e99fb07a7835a9..50e2e904c6d294 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,12 +155,12 @@ 8.0.0-beta.23252.1 8.0.0-beta.23252.1 - 1.0.0-prerelease.23267.3 - 1.0.0-prerelease.23267.3 - 1.0.0-prerelease.23267.3 - 1.0.0-prerelease.23267.3 - 1.0.0-prerelease.23267.3 - 1.0.0-prerelease.23267.3 + 1.0.0-prerelease.23268.7 + 1.0.0-prerelease.23268.7 + 1.0.0-prerelease.23268.7 + 1.0.0-prerelease.23268.7 + 1.0.0-prerelease.23268.7 + 1.0.0-prerelease.23268.7 16.11.23-beta1.23063.1 2.0.0-beta4.22564.1 From f46ce1caa941c89beb187b85ff1bcaaec2e6886e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 May 2023 12:10:41 +0000 Subject: [PATCH 3/7] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20230519.15 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.23260.3 -> To Version 1.0.0-prerelease.23269.15 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 304fc304678089..e86be61c77f095 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -319,21 +319,21 @@ https://github.com/dotnet/arcade f4269875971171c278c2cd695e9ef94b6516e4be - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2edc10919806c440df828bcb40543020948183aa + 455ffb4bacb3e200016620aeb73d9e8a9d67b56e - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2edc10919806c440df828bcb40543020948183aa + 455ffb4bacb3e200016620aeb73d9e8a9d67b56e - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2edc10919806c440df828bcb40543020948183aa + 455ffb4bacb3e200016620aeb73d9e8a9d67b56e - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2edc10919806c440df828bcb40543020948183aa + 455ffb4bacb3e200016620aeb73d9e8a9d67b56e https://github.com/dotnet/hotreload-utils @@ -369,13 +369,13 @@ 2fd62c3936f5336b836f6b12df170aa0e90da767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2edc10919806c440df828bcb40543020948183aa + 455ffb4bacb3e200016620aeb73d9e8a9d67b56e - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2edc10919806c440df828bcb40543020948183aa + 455ffb4bacb3e200016620aeb73d9e8a9d67b56e diff --git a/eng/Versions.props b/eng/Versions.props index 50e2e904c6d294..7c8e34efe88e00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,12 +155,12 @@ 8.0.0-beta.23252.1 8.0.0-beta.23252.1 - 1.0.0-prerelease.23268.7 - 1.0.0-prerelease.23268.7 - 1.0.0-prerelease.23268.7 - 1.0.0-prerelease.23268.7 - 1.0.0-prerelease.23268.7 - 1.0.0-prerelease.23268.7 + 1.0.0-prerelease.23269.15 + 1.0.0-prerelease.23269.15 + 1.0.0-prerelease.23269.15 + 1.0.0-prerelease.23269.15 + 1.0.0-prerelease.23269.15 + 1.0.0-prerelease.23269.15 16.11.23-beta1.23063.1 2.0.0-beta4.22564.1 From 4c21be19d7f90857e3a92c3f9a240e38b11bb66f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 21 May 2023 12:09:18 +0000 Subject: [PATCH 4/7] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20230520.4 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.23260.3 -> To Version 1.0.0-prerelease.23270.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e86be61c77f095..59b0a498124662 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -319,21 +319,21 @@ https://github.com/dotnet/arcade f4269875971171c278c2cd695e9ef94b6516e4be - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 455ffb4bacb3e200016620aeb73d9e8a9d67b56e + b33335b1e2c8c644b84c8eb6b9d69c8799423a64 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 455ffb4bacb3e200016620aeb73d9e8a9d67b56e + b33335b1e2c8c644b84c8eb6b9d69c8799423a64 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 455ffb4bacb3e200016620aeb73d9e8a9d67b56e + b33335b1e2c8c644b84c8eb6b9d69c8799423a64 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 455ffb4bacb3e200016620aeb73d9e8a9d67b56e + b33335b1e2c8c644b84c8eb6b9d69c8799423a64 https://github.com/dotnet/hotreload-utils @@ -369,13 +369,13 @@ 2fd62c3936f5336b836f6b12df170aa0e90da767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 455ffb4bacb3e200016620aeb73d9e8a9d67b56e + b33335b1e2c8c644b84c8eb6b9d69c8799423a64 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 455ffb4bacb3e200016620aeb73d9e8a9d67b56e + b33335b1e2c8c644b84c8eb6b9d69c8799423a64 diff --git a/eng/Versions.props b/eng/Versions.props index 7c8e34efe88e00..3dc8d94c4fc137 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,12 +155,12 @@ 8.0.0-beta.23252.1 8.0.0-beta.23252.1 - 1.0.0-prerelease.23269.15 - 1.0.0-prerelease.23269.15 - 1.0.0-prerelease.23269.15 - 1.0.0-prerelease.23269.15 - 1.0.0-prerelease.23269.15 - 1.0.0-prerelease.23269.15 + 1.0.0-prerelease.23270.4 + 1.0.0-prerelease.23270.4 + 1.0.0-prerelease.23270.4 + 1.0.0-prerelease.23270.4 + 1.0.0-prerelease.23270.4 + 1.0.0-prerelease.23270.4 16.11.23-beta1.23063.1 2.0.0-beta4.22564.1 From cfea85a32d4709a38578d8c863b8fdc5aa8a6deb Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Sun, 21 May 2023 18:35:17 +0000 Subject: [PATCH 5/7] Require clang-16 for PGO optimization --- src/coreclr/pgosupport.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/coreclr/pgosupport.cmake b/src/coreclr/pgosupport.cmake index edcffea53954fb..719ac14ad990b4 100644 --- a/src/coreclr/pgosupport.cmake +++ b/src/coreclr/pgosupport.cmake @@ -64,7 +64,7 @@ function(add_pgo TargetName) add_compile_definitions(WITH_NATIVE_PGO) else(CLR_CMAKE_HOST_WIN32) if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELWITHDEBINFO) - if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.6)) + if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)) if(HAVE_LTO) target_compile_options(${TargetName} PRIVATE -flto -fprofile-instr-use=${ProfilePath} -Wno-profile-instr-out-of-date -Wno-profile-instr-unprofiled) set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS " -flto -fprofile-instr-use=${ProfilePath}") @@ -75,9 +75,9 @@ function(add_pgo TargetName) else(HAVE_LTO) message(WARNING "LTO is not supported, skipping profile guided optimizations") endif(HAVE_LTO) - else((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.6)) - message(WARNING "PGO is not supported; Clang 3.6 or later is required for profile guided optimizations") - endif((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.6)) + else((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)) + message(WARNING "PGO is not supported; Clang 16 or later is required for profile guided optimizations") + endif((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)) endif(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELWITHDEBINFO) endif(CLR_CMAKE_HOST_WIN32) endif(NOT EXISTS ${ProfilePath}) From f83c48b905d0dc21fa2f015c0e09ff1de7d43b50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 May 2023 12:09:43 +0000 Subject: [PATCH 6/7] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20230521.4 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.23260.3 -> To Version 1.0.0-prerelease.23271.4 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59b0a498124662..850a682e565e74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -319,21 +319,21 @@ https://github.com/dotnet/arcade f4269875971171c278c2cd695e9ef94b6516e4be - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - b33335b1e2c8c644b84c8eb6b9d69c8799423a64 + 85af145192ce699ffcc16bd1a7b565820b6a2dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - b33335b1e2c8c644b84c8eb6b9d69c8799423a64 + 85af145192ce699ffcc16bd1a7b565820b6a2dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - b33335b1e2c8c644b84c8eb6b9d69c8799423a64 + 85af145192ce699ffcc16bd1a7b565820b6a2dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - b33335b1e2c8c644b84c8eb6b9d69c8799423a64 + 85af145192ce699ffcc16bd1a7b565820b6a2dff https://github.com/dotnet/hotreload-utils @@ -369,13 +369,13 @@ 2fd62c3936f5336b836f6b12df170aa0e90da767 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - b33335b1e2c8c644b84c8eb6b9d69c8799423a64 + 85af145192ce699ffcc16bd1a7b565820b6a2dff - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - b33335b1e2c8c644b84c8eb6b9d69c8799423a64 + 85af145192ce699ffcc16bd1a7b565820b6a2dff diff --git a/eng/Versions.props b/eng/Versions.props index 3dc8d94c4fc137..e6699a8c1d5eea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,12 +155,12 @@ 8.0.0-beta.23252.1 8.0.0-beta.23252.1 - 1.0.0-prerelease.23270.4 - 1.0.0-prerelease.23270.4 - 1.0.0-prerelease.23270.4 - 1.0.0-prerelease.23270.4 - 1.0.0-prerelease.23270.4 - 1.0.0-prerelease.23270.4 + 1.0.0-prerelease.23271.4 + 1.0.0-prerelease.23271.4 + 1.0.0-prerelease.23271.4 + 1.0.0-prerelease.23271.4 + 1.0.0-prerelease.23271.4 + 1.0.0-prerelease.23271.4 16.11.23-beta1.23063.1 2.0.0-beta4.22564.1 From e997dc9c799d1f5145b4c93e5aa7d185755e0ebe Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Mon, 22 May 2023 16:23:00 +0000 Subject: [PATCH 7/7] Revert sourcelink and xliff-tasks downgrades --- eng/Version.Details.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 850a682e565e74..0163f9cd31332d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -112,14 +112,14 @@ f4269875971171c278c2cd695e9ef94b6516e4be - + https://github.com/dotnet/sourcelink - 47c52dd2ebf9edfd40abdcff999c13eb461f6ce2 + 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 - + https://github.com/dotnet/xliff-tasks - 3f7d6c7e742012d9437fcb0d04cac63202d37621 + 9e7fbcab4e5275f63c0cd37553ba426de9194309