Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

utils/build-presets.ini

@@ -748,6 +748,9 @@ build-swift-stdlib-unittest-extra
 
 test-installable-package
 
+# Build the benchmarks against the toolchain.
+toolchain-benchmarks
+
 # Path to the root of the installation filesystem.
 install-destdir=%(install_destdir)s
 
@@ -953,6 +956,9 @@ skip-test-lldb
 # FIXME: Disabled until a home for the swift-snapshot-tests can be found.
 #test-installable-package
 
+# Make sure we can build the benchmarks against the toolchain.
+toolchain-benchmarks
+
 # Path to the root of the installation filesystem.
 install-destdir=%(install_destdir)s
 
@@ -1126,6 +1132,9 @@ install-prefix=%(install_toolchain_dir)s/usr
 
 test-installable-package
 
+# Make sure that we can build the benchmarks with swiftpm against the toolchain
+toolchain-benchmarks
+
 # If someone uses this for incremental builds, force reconfiguration.
 reconfigure