Merge main to feature/flat_set

.clang-format

@@ -1,7 +1,18 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-# https://releases.llvm.org/17.0.1/tools/clang/docs/ClangFormatStyleOptions.html
+# https://releases.llvm.org/18.1.8/tools/clang/docs/ClangFormatStyleOptions.html
+
+# To update this .clang-format file for a new clang-format version:
+# 1. Update the documentation link above.
+# 2. Copy the output of `clang-format -dump-config` into a temporary file.
+#    a. Comment out all of its lines.
+#    b. Uncomment `BasedOnStyle:  LLVM`.
+# 3. Compare that temporary file to this .clang-format file.
+# 4. Adjust this .clang-format file to record new and updated options.
+#    a. Read the new documentation to understand such changes.
+# 5. The goal is for the comparison from the temporary file to this .clang-format file to be pure additions (green).
+#    a. That is, comments here are recording the defaults, while added lines are our customized settings.
 
 ---
 # Language:        Cpp
@@ -11,31 +22,34 @@ AccessModifierOffset: -4
 # AlignAfterOpenBracket: Align
 AlignAfterOpenBracket: DontAlign
 # AlignArrayOfStructures: None
-# TRANSITION, LLVM-51935 (try using AlignArrayOfStructures after this crash is fixed)
 # AlignConsecutiveAssignments:
 #   Enabled:         false
 #   AcrossEmptyLines: false
 #   AcrossComments:  false
 #   AlignCompound:   false
+#   AlignFunctionPointers: false
 #   PadOperators:    true
 AlignConsecutiveAssignments: Consecutive
 # AlignConsecutiveBitFields:
 #   Enabled:         false
 #   AcrossEmptyLines: false
 #   AcrossComments:  false
 #   AlignCompound:   false
+#   AlignFunctionPointers: false
 #   PadOperators:    false
 # AlignConsecutiveDeclarations:
 #   Enabled:         false
 #   AcrossEmptyLines: false
 #   AcrossComments:  false
 #   AlignCompound:   false
+#   AlignFunctionPointers: false
 #   PadOperators:    false
 # AlignConsecutiveMacros:
 #   Enabled:         false
 #   AcrossEmptyLines: false
 #   AcrossComments:  false
 #   AlignCompound:   false
+#   AlignFunctionPointers: false
 #   PadOperators:    false
 AlignConsecutiveMacros: Consecutive
 # AlignConsecutiveShortCaseStatements:
@@ -54,8 +68,11 @@ AlignTrailingComments:
   Kind:            Never
 # AllowAllArgumentsOnNextLine: true
 # AllowAllParametersOfDeclarationOnNextLine: true
+# AllowBreakBeforeNoexceptSpecifier: Never
+AllowBreakBeforeNoexceptSpecifier: OnlyWithParen
 # AllowShortBlocksOnASingleLine: Never
 # AllowShortCaseLabelsOnASingleLine: false
+# AllowShortCompoundRequirementOnASingleLine: true
 # AllowShortEnumsOnASingleLine: true
 # AllowShortFunctionsOnASingleLine: All
 AllowShortFunctionsOnASingleLine: Empty
@@ -91,7 +108,9 @@ AlwaysBreakTemplateDeclarations: Yes
 #   SplitEmptyFunction: true
 #   SplitEmptyRecord: true
 #   SplitEmptyNamespace: true
-# BreakAfterAttributes: Never
+# BreakAdjacentStringLiterals: true
+# BreakAfterAttributes: Leave
+BreakAfterAttributes: Never
 # BreakAfterJavaFieldAnnotations: false
 # BreakArrays:     true
 # BreakBeforeBinaryOperators: None
@@ -138,20 +157,23 @@ IncludeBlocks:   Regroup
 #     SortPriority:    0
 #     CaseSensitive:   false
 IncludeCategories:
-  - Regex:           '^<yvals(_core)?\.h>$'
-    Priority:        1
-  - Regex:           '^<(Windows|userenv)\.h>$'
-    Priority:        3
-    SortPriority:    3
-  - Regex:           '^<WinIoCtl\.h>$'
-    Priority:        3
-    SortPriority:    4
-  - Regex:           '^<__.*\.hpp>$'
-    Priority:        2
+  - Regex:           '^<(yvals|yvals_core)\.h>$'
+    Priority:        10
+  - Regex:           '^<__msvc_.*\.hpp>$'
+    Priority:        20
+  - Regex:           '^<initguid\.h>$' # <initguid.h> should be included before any header that includes <guiddef.h>
+    Priority:        30
+    SortPriority:    30
+  - Regex:           '^<(DbgEng|DbgHelp|Shlwapi|Windows)\.h>$'
+    Priority:        30
+    SortPriority:    31
+  - Regex:           '^<winioctl\.h>$'
+    Priority:        30
+    SortPriority:    32
   - Regex:           '\.hpp[>"]$'
-    Priority:        5
+    Priority:        40
   - Regex:           '.*'
-    Priority:        2
+    Priority:        20
 # IncludeIsMainRegex: '(Test)?$'
 # IncludeIsMainSourceRegex: ''
 # IndentAccessModifiers: false
@@ -203,6 +225,7 @@ NamespaceIndentation: All
 # PenaltyBreakComment: 300
 # PenaltyBreakFirstLessLess: 120
 # PenaltyBreakOpenParenthesis: 0
+# PenaltyBreakScopeResolution: 500
 # PenaltyBreakString: 1000
 # PenaltyBreakTemplateDeclaration: 10
 # PenaltyExcessCharacter: 1000000
@@ -222,6 +245,7 @@ RemoveSemicolon: true
 # RequiresExpressionIndentation: OuterScope
 # SeparateDefinitionBlocks: Leave
 # ShortNamespaceLines: 1
+# SkipMacroDefinitionBody: false
 # SortIncludes:    CaseSensitive
 # SortJavaStaticImport: Before
 # SortUsingDeclarations: LexicographicNumeric
@@ -244,6 +268,7 @@ SpaceAfterCStyleCast: true
 #   AfterFunctionDeclarationName: false
 #   AfterIfMacros:   true
 #   AfterOverloadedOperator: false
+#   AfterPlacementOperator: true
 #   AfterRequiresInClause: false
 #   AfterRequiresInExpression: false
 #   BeforeNonEmptyParentheses: false

README.md

@@ -141,7 +141,7 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
 
 # How To Build With The Visual Studio IDE
 
-1. Install Visual Studio 2022 17.12 Preview 1 or later.
+1. Install Visual Studio 2022 17.12 Preview 2 or later.
     * Select "Windows 11 SDK (10.0.22621.0)" in the VS Installer.
     * Select "MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest)" in the VS Installer
     if you would like to build the ARM64/ARM64EC target.
@@ -160,7 +160,7 @@ Just try to follow these rules, so we can spend more time fixing bugs and implem
 
 # How To Build With A Native Tools Command Prompt
 
-1. Install Visual Studio 2022 17.12 Preview 1 or later.
+1. Install Visual Studio 2022 17.12 Preview 2 or later.
     * Select "Windows 11 SDK (10.0.22621.0)" in the VS Installer.
     * Select "MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest)" in the VS Installer
     if you would like to build the ARM64/ARM64EC target.

azure-devops/config.yml

@@ -5,7 +5,7 @@
 
 variables:
 - name: poolName
-  value: 'StlBuild-2024-08-14T0018-Pool'
+  value: 'StlBuild-2024-09-10T1506-Pool'
   readonly: true
 - name: poolDemands
   value: 'EnableSpotVM -equals false'

azure-devops/provision-image.ps1

@@ -40,10 +40,10 @@ foreach ($workload in $VisualStudioWorkloads) {
 }
 
 # https://github.com/PowerShell/PowerShell/releases/latest
-$PowerShellUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.4/PowerShell-7.4.4-win-x64.msi'
+$PowerShellUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.5/PowerShell-7.4.5-win-x64.msi'
 $PowerShellArgs = @('/quiet', '/norestart')
 
-$PythonUrl = 'https://www.python.org/ftp/python/3.12.5/python-3.12.5-amd64.exe'
+$PythonUrl = 'https://www.python.org/ftp/python/3.12.6/python-3.12.6-amd64.exe'
 $PythonArgs = @('/quiet', 'InstallAllUsers=1', 'PrependPath=1', 'CompileAll=1', 'Include_doc=0')
 
 $CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/12.4.0/local_installers/cuda_12.4.0_551.61_windows.exe'

benchmarks/CMakeLists.txt

@@ -104,11 +104,10 @@ function(add_benchmark name)
     target_compile_features(benchmark-${name} PRIVATE cxx_std_${arg_CXX_STANDARD})
     target_include_directories(benchmark-${name} PRIVATE inc)
     target_link_libraries(benchmark-${name} PRIVATE benchmark::benchmark)
-    # TRANSITION, google/benchmark#1450
-    target_compile_definitions(benchmark-${name} PRIVATE BENCHMARK_STATIC_DEFINE)
 endfunction()
 
 add_benchmark(bitset_to_string src/bitset_to_string.cpp)
+add_benchmark(efficient_nonlocking_print src/efficient_nonlocking_print.cpp)
 add_benchmark(find_and_count src/find_and_count.cpp)
 add_benchmark(find_first_of src/find_first_of.cpp)
 add_benchmark(iota src/iota.cpp)
@@ -121,6 +120,7 @@ add_benchmark(random_integer_generation src/random_integer_generation.cpp)
 add_benchmark(replace src/replace.cpp)
 add_benchmark(search src/search.cpp)
 add_benchmark(std_copy src/std_copy.cpp)
+add_benchmark(sv_equal src/sv_equal.cpp)
 add_benchmark(swap_ranges src/swap_ranges.cpp)
 
 add_benchmark(vector_bool_copy src/std/containers/sequences/vector.bool/copy/test.cpp)

benchmarks/src/efficient_nonlocking_print.cpp

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+// This benchmark inherently prints many lines to stdout. To view its results, run it with these options:
+// --benchmark_out=efficient_nonlocking_print.log --benchmark_out_format=console
+
+#include <benchmark/benchmark.h>
+#include <cstdio>
+#include <format>
+#include <print>
+#include <string>
+#include <string_view>
+#include <utility>
+
+namespace {
+    using PrintType = void (*)(FILE*, std::string_view, std::format_args);
+
+    template <PrintType PrintFunction>
+    void BM_vprint(benchmark::State& state) {
+        for (auto _ : state) {
+            PrintFunction(stdout, "Hello cool I am going to print as unicode\n", std::make_format_args());
+        }
+    }
+    BENCHMARK(BM_vprint<&std::vprint_unicode>);
+    BENCHMARK(BM_vprint<&std::vprint_unicode_buffered>);
+
+    template <PrintType PrintFunction>
+    void BM_vprint_complex(benchmark::State& state) {
+        const int i           = 42;
+        const std::string str = "Hello world!!!!!!!!!!!!!!!!!!!!!!!!";
+        const double f        = -902.16283758;
+        const std::pair<int, double> p{16, 2.073f};
+        for (auto _ : state) {
+            PrintFunction(stdout,
+                "Hello cool I am going to print as unicode!! {:X}, {}, {:a}, "
+                "I am a big string, lots of words, multiple {} formats\n",
+                std::make_format_args(i, str, f, p));
+        }
+    }
+    BENCHMARK(BM_vprint_complex<&std::vprint_unicode>);
+    BENCHMARK(BM_vprint_complex<&std::vprint_unicode_buffered>);
+} // namespace
+
+BENCHMARK_MAIN();

benchmarks/src/find_first_of.cpp

@@ -7,20 +7,26 @@
 #include <cstdint>
 #include <cstdlib>
 #include <numeric>
+#include <string>
+#include <type_traits>
 #include <vector>
 
 using namespace std;
 
-template <class T>
+enum class AlgType : bool { std_func, str_member };
+
+template <AlgType Alg, class T, T Start = T{'a'}>
 void bm(benchmark::State& state) {
     const size_t Pos   = static_cast<size_t>(state.range(0));
     const size_t NSize = static_cast<size_t>(state.range(1));
     const size_t HSize = Pos * 2;
     const size_t Which = 0;
 
-    vector<T> h(HSize, T{'.'});
-    vector<T> n(NSize);
-    iota(n.begin(), n.end(), T{'a'});
+    using container = conditional_t<Alg == AlgType::str_member, basic_string<T>, vector<T>>;
+
+    container h(HSize, T{'.'});
+    container n(NSize, T{0});
+    iota(n.begin(), n.end(), Start);
 
     if (Pos >= HSize || Which >= NSize) {
         abort();
@@ -29,18 +35,28 @@ void bm(benchmark::State& state) {
     h[Pos] = n[Which];
 
     for (auto _ : state) {
-        benchmark::DoNotOptimize(find_first_of(h.begin(), h.end(), n.begin(), n.end()));
+        benchmark::DoNotOptimize(h);
+        benchmark::DoNotOptimize(n);
+        if constexpr (Alg == AlgType::str_member) {
+            benchmark::DoNotOptimize(h.find_first_of(n.data(), 0, n.size()));
+        } else {
+            benchmark::DoNotOptimize(find_first_of(h.begin(), h.end(), n.begin(), n.end()));
+        }
     }
 }
 
 void common_args(auto bm) {
     bm->Args({2, 3})->Args({7, 4})->Args({9, 3})->Args({22, 5})->Args({58, 2});
-    bm->Args({102, 4})->Args({325, 1})->Args({1011, 11})->Args({3056, 7});
+    bm->Args({102, 4})->Args({325, 1})->Args({1011, 11})->Args({1502, 23})->Args({3056, 7});
 }
 
-BENCHMARK(bm<uint8_t>)->Apply(common_args);
-BENCHMARK(bm<uint16_t>)->Apply(common_args);
-BENCHMARK(bm<uint32_t>)->Apply(common_args);
-BENCHMARK(bm<uint64_t>)->Apply(common_args);
+BENCHMARK(bm<AlgType::std_func, uint8_t>)->Apply(common_args);
+BENCHMARK(bm<AlgType::std_func, uint16_t>)->Apply(common_args);
+BENCHMARK(bm<AlgType::std_func, uint32_t>)->Apply(common_args);
+BENCHMARK(bm<AlgType::std_func, uint64_t>)->Apply(common_args);
+
+BENCHMARK(bm<AlgType::str_member, char>)->Apply(common_args);
+BENCHMARK(bm<AlgType::str_member, wchar_t>)->Apply(common_args);
+BENCHMARK(bm<AlgType::str_member, wchar_t, L'\x03B1'>)->Apply(common_args);
 
 BENCHMARK_MAIN();