Skip to content

Commit

Permalink
Merge branch 'main' into merge-flat_map
Browse files Browse the repository at this point in the history
  • Loading branch information
StephanTLavavej committed Mar 16, 2024
2 parents a3bc9c7 + 191d51b commit 8e8edbf
Show file tree
Hide file tree
Showing 405 changed files with 2,985 additions and 52,964 deletions.
35 changes: 0 additions & 35 deletions .github/workflows/assign-new-prs.yml

This file was deleted.

68 changes: 0 additions & 68 deletions .github/workflows/move-ready-for-review-prs.yml

This file was deleted.

73 changes: 0 additions & 73 deletions .github/workflows/move-work-in-progress-prs.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/update-status-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: ">=21.4.0"
node-version: ">=21.7.1"
- name: Install Packages
run: |
npm ci
- name: Compile And Run gather_stats.ts
- name: Compile And Run gather_stats.mts
run: |
SECRET_GITHUB_PERSONAL_ACCESS_TOKEN="${{ github.token }}" npm run gather
- name: Compile And Bundle status_chart.ts
- name: Compile And Bundle status_chart.mts
run: |
npm run make
- name: Commit Changes
run: |
git config user.name "github-actions[bot]"
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
git add src/daily_table.ts src/monthly_table.ts built/status_chart.mjs
git add src/daily_table.mts src/monthly_table.mts built/status_chart.mjs
git diff-index --quiet HEAD || git commit -m "Automated update."
git push origin gh-pages
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ project(msvc_standard_libraries LANGUAGES CXX)
include(CheckCXXSourceCompiles)
check_cxx_source_compiles([=[
#include <sdkddkver.h>
static_assert(WDK_NTDDI_VERSION >= NTDDI_WIN10_CO, "Inspecting WDK_NTDDI_VERSION, the Windows SDK version.");
static_assert(WDK_NTDDI_VERSION >= NTDDI_WIN10_NI, "Inspecting WDK_NTDDI_VERSION, the Windows SDK version.");
int main() {}
]=] WINDOWS_SDK_VERSION_CHECK)

if(NOT WINDOWS_SDK_VERSION_CHECK)
message(FATAL_ERROR "The STL must be built with the Windows 11 SDK (10.0.22000.0) or later. Make sure it's available by selecting it in the Individual Components tab of the VS Installer.")
message(FATAL_ERROR "The STL must be built with the Windows 11 SDK (10.0.22621.0) or later. Make sure it's available by selecting it in the Individual Components tab of the VS Installer.")
endif()

if(NOT DEFINED VCLIBS_TARGET_ARCHITECTURE)
Expand Down Expand Up @@ -95,15 +95,15 @@ set(STL_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/out/lib/${VCLIBS_I386_OR
set(STL_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/out/bin/${VCLIBS_I386_OR_AMD64}")
add_compile_definitions(
_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH WIN32_LEAN_AND_MEAN STRICT _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS
_WIN32_WINNT=0x0A00 NTDDI_VERSION=NTDDI_WIN10_CO)
_WIN32_WINNT=0x0A00 NTDDI_VERSION=NTDDI_WIN10_NI)

if(STL_USE_ANALYZE)
# TRANSITION OS-40109504: Windows SDK: incorrect SAL annotations on functions the STL uses
# warning C6553: The annotation for function 'LCMapStringEx' on _Param_(9)
# does not apply to a value type.
# There's a bug in the declaration for LCMapStringEx - it applies _In_opt_ to an LPARAM.
# LPARAM is a LONG_PTR (intptr_t), and it's invalid to apply _In_opt_ to a non-pointer.
# As of the Windows 11 SDK (10.0.22000.0), there are 5 total occurrences of warning C6553 affecting the STL's build.
# As of the Windows 11 SDK (10.0.22621.0), there are 5 total occurrences of warning C6553 affecting the STL's build.
add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/analyze:autolog-;/wd6553>")
endif()

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ 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.10 Preview 1 or later.
* Select "Windows 11 SDK (10.0.22000.0)" in the VS Installer.
1. Install Visual Studio 2022 17.10 Preview 2 or later.
* Select "Windows 11 SDK (10.0.22621.0)" in the VS Installer.
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
This will ensure that you're using supported versions of CMake and Ninja.
* Otherwise, install [CMake][] 3.28.0 or later, and [Ninja][] 1.11.0 or later.
Expand All @@ -156,8 +156,8 @@ 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.10 Preview 1 or later.
* Select "Windows 11 SDK (10.0.22000.0)" in the VS Installer.
1. Install Visual Studio 2022 17.10 Preview 2 or later.
* Select "Windows 11 SDK (10.0.22621.0)" in the VS Installer.
* We recommend selecting "C++ CMake tools for Windows" in the VS Installer.
This will ensure that you're using supported versions of CMake and Ninja.
* Otherwise, install [CMake][] 3.28.0 or later, and [Ninja][] 1.11.0 or later.
Expand Down
2 changes: 1 addition & 1 deletion azure-devops/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

variables:
- name: poolName
value: 'StlBuild-2024-02-13T1246-Pool'
value: 'StlBuild-2024-03-12T1202-Pool'
readonly: true
- name: poolDemands
value: 'EnableSpotVM -equals true'
Expand Down
13 changes: 2 additions & 11 deletions azure-devops/provision-image.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,13 @@ $Workloads = @(
'Microsoft.VisualStudio.Component.VC.Tools.ARM64',
'Microsoft.VisualStudio.Component.VC.Tools.ARM64EC',
'Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
'Microsoft.VisualStudio.Component.Windows11SDK.22000'
'Microsoft.VisualStudio.Component.Windows11SDK.22621'
)

$VisualStudioBootstrapperUrl = 'https://aka.ms/vs/17/pre/vs_enterprise.exe'
$PythonUrl = 'https://www.python.org/ftp/python/3.12.2/python-3.12.2-amd64.exe'

$CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/11.6.0/local_installers/cuda_11.6.0_511.23_windows.exe'
$CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/12.4.0/local_installers/cuda_12.4.0_551.61_windows.exe'

$ErrorActionPreference = 'Stop'
$ProgressPreference = 'SilentlyContinue'
Expand Down Expand Up @@ -302,15 +302,6 @@ Write-Host 'AdminUser password not supplied; assuming already running as AdminUs
# Print the Windows version, so we can verify whether Patch Tuesday has been picked up.
cmd /c ver

Write-Host 'Configuring AntiVirus exclusions...'
Add-MpPreference -ExclusionPath C:\agent
Add-MpPreference -ExclusionPath D:\
Add-MpPreference -ExclusionProcess ninja.exe
Add-MpPreference -ExclusionProcess clang-cl.exe
Add-MpPreference -ExclusionProcess cl.exe
Add-MpPreference -ExclusionProcess link.exe
Add-MpPreference -ExclusionProcess python.exe

InstallPython $PythonUrl
InstallVisualStudio -Workloads $Workloads -BootstrapperUrl $VisualStudioBootstrapperUrl
InstallCuda -Url $CudaUrl
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/inc/utility.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
template <class Contained>
std::vector<Contained> random_vector(size_t n) {
std::random_device rd;
std::uniform_int_distribution<uint64_t> id64;
std::uniform_int_distribution<std::uint64_t> id64;
xoshiro256ss prng{id64(rd), id64(rd), id64(rd), id64(rd)};

std::vector<Contained> res(n);
Expand Down
17 changes: 9 additions & 8 deletions benchmarks/inc/xoshiro.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@ SPDX-License-Identifier: CC0-1.0 */
#pragma once

#include <bit>
#include <stdint.h>
#include <cstdint>

struct xoshiro256ss {
xoshiro256ss() = delete;
xoshiro256ss(uint64_t s0, uint64_t s1, uint64_t s2, uint64_t s3) : s0_(s0), s1_(s1), s2_(s2), s3_(s3) {}
xoshiro256ss(std::uint64_t s0, std::uint64_t s1, std::uint64_t s2, std::uint64_t s3)
: s0_(s0), s1_(s1), s2_(s2), s3_(s3) {}

uint64_t next() {
std::uint64_t next() {
auto result = std::rotl(s1_ * 5, 7) * 9;

const uint64_t t = s1_ << 17;
const std::uint64_t t = s1_ << 17;

s2_ ^= s0_;
s3_ ^= s1_;
Expand All @@ -34,8 +35,8 @@ struct xoshiro256ss {
}

private:
uint64_t s0_;
uint64_t s1_;
uint64_t s2_;
uint64_t s3_;
std::uint64_t s0_;
std::uint64_t s1_;
std::uint64_t s2_;
std::uint64_t s3_;
};
2 changes: 2 additions & 0 deletions benchmarks/src/bitset_to_string.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@ namespace {

BENCHMARK(BM_bitset_to_string<15, char>);
BENCHMARK(BM_bitset_to_string<64, char>);
BENCHMARK(BM_bitset_to_string<512, char>);
BENCHMARK(BM_bitset_to_string_large_single<char>);
BENCHMARK(BM_bitset_to_string<7, wchar_t>);
BENCHMARK(BM_bitset_to_string<64, wchar_t>);
BENCHMARK(BM_bitset_to_string<512, wchar_t>);
BENCHMARK(BM_bitset_to_string_large_single<wchar_t>);

BENCHMARK_MAIN();
2 changes: 1 addition & 1 deletion docs/cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"type": "git",
"git": {
"repositoryUrl": "https://github.com/llvm/llvm-project.git",
"commitHash": "b8d38e8b4fcab071c5c4cb698e154023d06de69e"
"commitHash": "2e2b6b53f5f63179b52168ee156df7c76b90bc71"
}
}
},
Expand Down
Loading

0 comments on commit 8e8edbf

Please sign in to comment.